From 708d76162bea35e2c02c5054fe9bf9d8aa38a34a Mon Sep 17 00:00:00 2001
From: itmonkey <itmonkeyws@163.com>
Date: Mon, 30 Aug 2021 10:24:51 +0800
Subject: [PATCH] v1.3.6

---
 App.vue                                       |   58 +-
 README.md                                     |   20 +
 .../shopro-auth-modal/shopro-auth-modal.vue   |  595 ++-
 components/shopro-canvas/shopro-canvas.vue    |   48 +-
 components/shopro-coupon/shopro-coupon.vue    |   23 +-
 components/shopro-empty/shopro-empty.vue      |    4 +-
 .../shopro-float-btn/shopro-float-btn.vue     |   34 +-
 .../shopro-goods-card/shopro-goods-card.vue   |   53 +-
 .../shopro-live-card/shopro-live-card.vue     |   25 +-
 .../shopro-mini-card/shopro-mini-card.vue     |    8 +-
 components/shopro-navbar/shopro-navbar.vue    |  120 +
 .../shopro-notice-modal.vue                   |   30 +-
 components/shopro-share/shopro-share.vue      |  157 +-
 components/shopro-sku/shopro-sku.vue          |  130 +-
 components/shopro-tabbar/shopro-tabbar.vue    |   26 +-
 env.js                                        |    6 +-
 main.js                                       |   91 +-
 manifest.json                                 |  152 +-
 package.json                                  |    1 -
 pages.json                                    |   12 +-
 pages/activity/discounts/list.vue             |  157 +-
 pages/activity/groupon/detail.vue             |   34 +-
 pages/activity/groupon/list.vue               |   22 +-
 pages/activity/groupon/my-groupon.vue         |   18 +-
 pages/activity/seckill/list.vue               |   24 +-
 pages/activity/sign/index.vue                 |   28 +-
 pages/app/commission/apply.vue                |    2 +-
 pages/app/commission/commission-log.vue       |   22 +-
 pages/app/commission/goods.vue                |    8 +-
 pages/app/commission/index.vue                |   19 +-
 pages/app/commission/order.vue                |   15 +-
 pages/app/commission/rankings.vue             |    7 +-
 pages/app/commission/share-log.vue            |    7 +-
 pages/app/commission/team.vue                 |   31 +-
 pages/app/components/sh-collapse-item.vue     |    2 +-
 pages/app/coupon/detail.vue                   |   15 +-
 pages/app/coupon/list.vue                     |  115 +-
 pages/app/live/list.vue                       |   79 +-
 pages/app/merchant/apply.vue                  |   25 +-
 pages/app/merchant/detail.vue                 |    5 +-
 pages/app/merchant/index.vue                  |  111 +-
 pages/app/merchant/info.vue                   |    4 +-
 pages/app/merchant/list.vue                   |    2 +-
 pages/app/score/list.vue                      |  118 +-
 pages/goods/comment/comment-list.vue          |    4 +-
 pages/goods/components/sh-activity.vue        |   52 +-
 pages/goods/components/sh-filter.vue          |    8 +-
 pages/goods/components/sh-groupon.vue         |    6 +-
 pages/goods/components/sh-serve.vue           |    2 +-
 pages/goods/detail.vue                        |   66 +-
 pages/goods/list.vue                          |  179 +-
 pages/index/cart.vue                          |   25 +-
 pages/index/category.vue                      |    5 +-
 pages/index/category/one-catgory.vue          |    4 +-
 pages/index/category/takeout-catgory.vue      |   28 +-
 pages/index/category/three-catgory.vue        |    8 +-
 pages/index/category/two-catgory.vue          |   12 +-
 pages/index/components/sh-adv.vue             |   59 +-
 pages/index/components/sh-banner.vue          |   72 +-
 pages/index/components/sh-category-tabs.vue   |  267 +-
 pages/index/components/sh-cell.vue            |   37 +-
 pages/index/components/sh-coupon.vue          |  147 +-
 pages/index/components/sh-goods-card.vue      |   31 +-
 pages/index/components/sh-grid-swiper.vue     |   43 +-
 pages/index/components/sh-grid.vue            |   43 +-
 pages/index/components/sh-groupon.vue         |   23 +-
 pages/index/components/sh-hot-goods.vue       |   93 +-
 pages/index/components/sh-live.vue            |   18 +-
 pages/index/components/sh-order-card.vue      |   10 +-
 pages/index/components/sh-search.vue          |   20 +-
 pages/index/components/sh-seckill.vue         |   21 +-
 pages/index/components/sh-wallet.vue          |    9 +-
 pages/index/index.vue                         |   62 +-
 pages/index/index/home-head.vue               |  183 +-
 pages/index/index/privacy-modal.vue           |   10 +-
 pages/index/user.vue                          |   93 +-
 pages/index/user/userinfo-card.vue            |  114 +-
 pages/index/view.vue                          |    6 +-
 pages/order/after-sale/detail.vue             |    6 +-
 pages/order/after-sale/list.vue               |    8 +-
 pages/order/after-sale/log.vue                |    5 +-
 pages/order/after-sale/refund.vue             |   26 +-
 pages/order/components/sh-select-coupon.vue   |    2 +-
 pages/order/confirm.vue                       |   44 +-
 pages/order/detail.vue                        |   48 +-
 pages/order/express/distribution-detail.vue   |   18 +-
 pages/order/express/express-detail.vue        |    2 +-
 pages/order/express/store-address.vue         |   42 +-
 pages/order/list.vue                          |    5 +-
 pages/order/payment/method.vue                |   24 +-
 pages/order/payment/result.vue                |   23 +-
 pages/public/chat/index.vue                   |   80 +-
 pages/public/chat/shopro/index.vue            |   45 +-
 pages/public/chat/wm/index.vue                |   14 +-
 pages/public/feedback.vue                     |    2 +-
 pages/public/loading.vue                      |    1 +
 pages/public/search.vue                       |    2 +-
 pages/user/address/edit.vue                   |    5 +-
 pages/user/address/list.vue                   |    5 +-
 pages/user/favorite.vue                       |    4 +-
 pages/user/info.vue                           |   44 +-
 pages/user/set.vue                            |   71 +-
 pages/user/view-log.vue                       |    4 +-
 pages/user/wallet/index.vue                   |   17 +-
 pages/user/wallet/score-balance.vue           |   21 +-
 pages/user/wallet/withdraw-log.vue            |    2 +-
 pages/user/wallet/withdraw.vue                |   21 +-
 shopro/apple/index.js                         |    2 -
 shopro/index.js                               |   58 +
 shopro/mixins/index.js                        |   56 +-
 shopro/mixins/share.js                        |   85 -
 shopro/pay/index.js                           |    2 +-
 .../poster/QS-SharePoster/QS-SharePoster.js   |    2 +
 shopro/poster/QS-SharePoster/app.js           |   53 +-
 shopro/poster/tools.js                        |   12 +-
 shopro/request/apis.js                        |  462 +-
 shopro/router/index.js                        |    8 +-
 shopro/router/uni-simple-router.js            |    1 +
 shopro/share/index.js                         |   14 +-
 shopro/store/modules/cart.js                  |  226 +-
 shopro/store/modules/shopro.js                |  197 +-
 shopro/store/modules/user.js                  |  217 +-
 shopro/store/types.js                         |   12 -
 shopro/utils/tools.js                         |    2 +-
 shopro/wechat/sdk.js                          |   55 +-
 shopro/wechat/wechat.js                       |  150 +-
 static/font/shopro-icon.css                   |   92 +-
 static/style/colorui.css                      | 3924 +++++++++++++++++
 static/style/index.scss                       |   29 +
 template.h5.html                              |   23 +-
 .../u-action-sheet/u-action-sheet.vue         |  190 -
 .../components/u-alert-tips/u-alert-tips.vue  |  256 --
 .../u-avatar-cropper/u-avatar-cropper.vue     |  290 --
 .../components/u-avatar-cropper/weCropper.js  | 1265 ------
 uview-ui/components/u-avatar/u-avatar.vue     |  244 -
 uview-ui/components/u-back-top/u-back-top.vue |  153 -
 uview-ui/components/u-badge/u-badge.vue       |  192 -
 uview-ui/components/u-button/u-button.vue     |  599 ---
 uview-ui/components/u-calendar/u-calendar.vue |    6 +-
 .../u-car-keyboard/u-car-keyboard.vue         |  257 --
 uview-ui/components/u-card/u-card.vue         |  299 --
 .../components/u-cell-group/u-cell-group.vue  |   70 -
 .../components/u-cell-item/u-cell-item.vue    |  316 --
 .../u-circle-progress/u-circle-progress.vue   |  220 -
 uview-ui/components/u-col/u-col.vue           |  156 -
 uview-ui/components/u-count-to/u-count-to.vue |  241 -
 uview-ui/components/u-divider/u-divider.vue   |  153 -
 .../u-dropdown-item/u-dropdown-item.vue       |  232 +-
 uview-ui/components/u-field/u-field.vue       |  384 --
 .../u-full-screen/u-full-screen.vue           |   52 -
 uview-ui/components/u-gap/u-gap.vue           |   54 -
 .../components/u-grid-item/u-grid-item.vue    |  126 -
 uview-ui/components/u-grid/u-grid.vue         |  108 -
 uview-ui/components/u-image/u-image.vue       |  266 --
 .../u-index-anchor/u-index-anchor.vue         |   89 -
 .../components/u-index-list/u-index-list.vue  |  315 --
 uview-ui/components/u-keyboard/u-keyboard.vue |  217 -
 .../components/u-lazy-load/u-lazy-load.vue    |  244 -
 uview-ui/components/u-link/u-link.vue         |   89 -
 .../u-loading-page/u-loading-page.vue         |   25 -
 uview-ui/components/u-loading/u-loading.vue   |  103 -
 uview-ui/components/u-loadmore/u-loadmore.vue |    7 -
 .../u-message-input/u-message-input.vue       |  311 --
 uview-ui/components/u-modal/u-modal.vue       |  496 ++-
 uview-ui/components/u-navbar/u-navbar.vue     |  309 --
 .../components/u-number-box/u-number-box.vue  |    8 +-
 .../u-number-keyboard/u-number-keyboard.vue   |  158 -
 uview-ui/components/u-parse/u-parse.vue       |    4 +-
 uview-ui/components/u-picker/u-picker.vue     |   12 +-
 .../components/u-read-more/u-read-more.vue    |  179 -
 uview-ui/components/u-row/u-row.vue           |   84 -
 uview-ui/components/u-section/u-section.vue   |  154 -
 uview-ui/components/u-skeleton/u-skeleton.vue |  199 -
 uview-ui/components/u-slider/u-slider.vue     |  257 --
 .../components/u-subsection/u-subsection.vue  |  355 --
 .../u-swipe-action/u-swipe-action.vue         |  255 --
 uview-ui/components/u-switch/u-switch.vue     |  286 +-
 uview-ui/components/u-tabbar/u-tabbar.vue     |  345 --
 uview-ui/components/u-table/u-table.vue       |   84 -
 .../u-tabs-swiper/u-tabs-swiper.vue           |  488 --
 uview-ui/components/u-tabs/u-tabs.vue         |  415 --
 uview-ui/components/u-tag/u-tag.vue           |  294 --
 uview-ui/components/u-td/u-td.vue             |   66 -
 uview-ui/components/u-th/u-th.vue             |   62 -
 uview-ui/components/u-toast/u-toast.vue       |  220 -
 uview-ui/components/u-top-tips/u-top-tips.vue |  121 -
 uview-ui/components/u-tr/u-tr.vue             |   25 -
 .../u-verification-code.vue                   |  162 -
 .../components/u-waterfall/u-waterfall.vue    |  176 -
 uview-ui/iconfont.css                         |   28 +-
 uview-ui/index.js                             |   60 +-
 uview-ui/index.scss                           |   14 +-
 uview-ui/libs/function/bem.js                 |    5 -
 uview-ui/libs/function/color.js               |   37 -
 uview-ui/libs/function/colorGradient.js       |  134 -
 uview-ui/libs/function/deepMerge.js           |   30 -
 uview-ui/libs/function/getParent.js           |   47 -
 uview-ui/libs/function/md5.js                 |  385 --
 uview-ui/libs/function/queryParams.js         |   58 -
 uview-ui/libs/function/random.js              |   10 -
 uview-ui/libs/function/randomArray.js         |    7 -
 uview-ui/libs/function/type2icon.js           |   35 -
 uview-ui/libs/mixin/mixin.js                  |   13 +-
 uview-ui/libs/mixin/mpShare.js                |   18 -
 uview-ui/libs/util/area.js                    |    1 -
 uview-ui/libs/util/city.js                    |    1 -
 uview-ui/libs/util/province.js                |    1 -
 207 files changed, 8012 insertions(+), 16111 deletions(-)
 create mode 100644 components/shopro-navbar/shopro-navbar.vue
 create mode 100644 shopro/index.js
 delete mode 100644 shopro/mixins/share.js
 create mode 100644 shopro/router/uni-simple-router.js
 delete mode 100644 shopro/store/types.js
 create mode 100644 static/style/colorui.css
 create mode 100644 static/style/index.scss
 delete mode 100644 uview-ui/components/u-action-sheet/u-action-sheet.vue
 delete mode 100644 uview-ui/components/u-alert-tips/u-alert-tips.vue
 delete mode 100644 uview-ui/components/u-avatar-cropper/u-avatar-cropper.vue
 delete mode 100644 uview-ui/components/u-avatar-cropper/weCropper.js
 delete mode 100644 uview-ui/components/u-avatar/u-avatar.vue
 delete mode 100644 uview-ui/components/u-back-top/u-back-top.vue
 delete mode 100644 uview-ui/components/u-badge/u-badge.vue
 delete mode 100644 uview-ui/components/u-button/u-button.vue
 delete mode 100644 uview-ui/components/u-car-keyboard/u-car-keyboard.vue
 delete mode 100644 uview-ui/components/u-card/u-card.vue
 delete mode 100644 uview-ui/components/u-cell-group/u-cell-group.vue
 delete mode 100644 uview-ui/components/u-cell-item/u-cell-item.vue
 delete mode 100644 uview-ui/components/u-circle-progress/u-circle-progress.vue
 delete mode 100644 uview-ui/components/u-col/u-col.vue
 delete mode 100644 uview-ui/components/u-count-to/u-count-to.vue
 delete mode 100644 uview-ui/components/u-divider/u-divider.vue
 delete mode 100644 uview-ui/components/u-field/u-field.vue
 delete mode 100644 uview-ui/components/u-full-screen/u-full-screen.vue
 delete mode 100644 uview-ui/components/u-gap/u-gap.vue
 delete mode 100644 uview-ui/components/u-grid-item/u-grid-item.vue
 delete mode 100644 uview-ui/components/u-grid/u-grid.vue
 delete mode 100644 uview-ui/components/u-image/u-image.vue
 delete mode 100644 uview-ui/components/u-index-anchor/u-index-anchor.vue
 delete mode 100644 uview-ui/components/u-index-list/u-index-list.vue
 delete mode 100644 uview-ui/components/u-keyboard/u-keyboard.vue
 delete mode 100644 uview-ui/components/u-lazy-load/u-lazy-load.vue
 delete mode 100644 uview-ui/components/u-link/u-link.vue
 delete mode 100644 uview-ui/components/u-loading-page/u-loading-page.vue
 delete mode 100644 uview-ui/components/u-loading/u-loading.vue
 delete mode 100644 uview-ui/components/u-message-input/u-message-input.vue
 delete mode 100644 uview-ui/components/u-navbar/u-navbar.vue
 delete mode 100644 uview-ui/components/u-number-keyboard/u-number-keyboard.vue
 delete mode 100644 uview-ui/components/u-read-more/u-read-more.vue
 delete mode 100644 uview-ui/components/u-row/u-row.vue
 delete mode 100644 uview-ui/components/u-section/u-section.vue
 delete mode 100644 uview-ui/components/u-skeleton/u-skeleton.vue
 delete mode 100644 uview-ui/components/u-slider/u-slider.vue
 delete mode 100644 uview-ui/components/u-subsection/u-subsection.vue
 delete mode 100644 uview-ui/components/u-swipe-action/u-swipe-action.vue
 delete mode 100644 uview-ui/components/u-tabbar/u-tabbar.vue
 delete mode 100644 uview-ui/components/u-table/u-table.vue
 delete mode 100644 uview-ui/components/u-tabs-swiper/u-tabs-swiper.vue
 delete mode 100644 uview-ui/components/u-tabs/u-tabs.vue
 delete mode 100644 uview-ui/components/u-tag/u-tag.vue
 delete mode 100644 uview-ui/components/u-td/u-td.vue
 delete mode 100644 uview-ui/components/u-th/u-th.vue
 delete mode 100644 uview-ui/components/u-toast/u-toast.vue
 delete mode 100644 uview-ui/components/u-top-tips/u-top-tips.vue
 delete mode 100644 uview-ui/components/u-tr/u-tr.vue
 delete mode 100644 uview-ui/components/u-verification-code/u-verification-code.vue
 delete mode 100644 uview-ui/components/u-waterfall/u-waterfall.vue
 delete mode 100644 uview-ui/libs/function/bem.js
 delete mode 100644 uview-ui/libs/function/color.js
 delete mode 100644 uview-ui/libs/function/colorGradient.js
 delete mode 100644 uview-ui/libs/function/deepMerge.js
 delete mode 100644 uview-ui/libs/function/getParent.js
 delete mode 100644 uview-ui/libs/function/md5.js
 delete mode 100644 uview-ui/libs/function/queryParams.js
 delete mode 100644 uview-ui/libs/function/random.js
 delete mode 100644 uview-ui/libs/function/randomArray.js
 delete mode 100644 uview-ui/libs/function/type2icon.js
 delete mode 100644 uview-ui/libs/mixin/mpShare.js
 delete mode 100644 uview-ui/libs/util/area.js
 delete mode 100644 uview-ui/libs/util/city.js
 delete mode 100644 uview-ui/libs/util/province.js

diff --git a/App.vue b/App.vue
index 33305ae4..f6a91f1e 100644
--- a/App.vue
+++ b/App.vue
@@ -1,56 +1,14 @@
 <script>
-import { mapMutations, mapActions, mapState } from 'vuex';
-import wechat from '@/shopro/wechat/wechat';
-
-export default {
-	globalData: {},
-	onLaunch(options) {
-		let that = this;
-		// #ifdef H5
-		that.$platform.entry();
-		// #endif
-		// #ifdef MP-WEIXIN
-		// 检测小程序更新(如果从朋友圈场景进入则无此API)
-		options.scene !== 1154 && wechat.checkMiniProgramUpdate();
-		// #endif
-		that.appInit(options);
-		if (process.env.NODE_ENV === 'development') {
-			this.syncPages();
+	import {
+		init
+	} from "@/shopro";
+	export default {
+		onLaunch(options) {
+			init(options);
 		}
-	},
-	methods: {
-		//应用初始化,获取模板数据，自动同步新页面到后台,获取用户信息
-		...mapActions(['appInit', 'syncPages'])
-	}
-};
+	};
 </script>
 
 <style lang="scss">
-@import 'uview-ui/index.scss';
-@import 'static/font/shopro-icon.css';
-
-/* 字体文件 */
-@font-face {
-	font-family: OPPOSANS;
-	src: url('~@/static/font/OPPOSANS-M-subfont.ttf');
-}
-.font-OPPOSANS {
-	font-family: OPPOSANS;
-}
-page {
-	-webkit-overflow-scrolling: touch; // ios滑动不流畅
-	height: 100%;
-	background: #f6f6f6;
-	width: 100%;
-	font-size: 30rpx;
-	font-family: OPPOSANS;
-	word-break: break-all; //英文文本不换行
-	color: $u-main-color;
-}
-::-webkit-scrollbar {
-	width: 0;
-	height: 0;
-	color: transparent;
-	display: none;
-}
+	@import 'static/style/index.scss';
 </style>
diff --git a/README.md b/README.md
index facad7e2..ac3b8cc4 100644
--- a/README.md
+++ b/README.md
@@ -36,6 +36,26 @@
 
 
 # 更新日志
+
+## V1.3.6(2021-8-30)
+1. 优化 小程序性能问题，更换router底层依赖版本，精简店铺装修组件
+2. 修复 登录卡片隐藏后，需要点击两次才能调起的问题
+3. 修复 微信小程序，进入直播内容页面，跳转商品详情后，无法返回上一级的问题
+4. 修复搜索页跳转商品列表，商品卡片偶尔重复问题
+5. 修复门店中心的订单详情，下单时间NaN问题
+6. 修复微信小程序真机测试时，自提商品核销码生成不稳定的问题
+7. 修复微信小程序，登录错误，显示The given payload报错的问题。
+8. 修复ios部分机型，首页装修优惠券背景空白问题
+9. 重构 入口文件和shopro启动流程
+10. 重构 vuex相关代码，拆分精简数据。
+11. 优化 优惠券相关逻辑和样式
+12. 修复 门店禁用后，前台还展示的问题
+13. 优化 购物车逻辑
+14. 优化 瀑布流排版不稳定（左右排列错误）
+15. 优化 日历无法快速切换年份
+16. 优化 选择商品规格组件
+17. 优化 分享海报
+
 ## V1.3.2(2021-6-30)
 1. 修复秒杀卡片百分比改为件数，统一百分比计算 
 2. 修复门店地址信息过长会被遮盖
diff --git a/components/shopro-auth-modal/shopro-auth-modal.vue b/components/shopro-auth-modal/shopro-auth-modal.vue
index 9c63deca..8f1ccbee 100644
--- a/components/shopro-auth-modal/shopro-auth-modal.vue
+++ b/components/shopro-auth-modal/shopro-auth-modal.vue
@@ -1,29 +1,53 @@
-<template v-if="showAuth">
-	<u-popup v-model="showAuth" safe-area-inset-bottom mode="bottom" border-radius="20" :closeable="true" close-icon-pos="top-right" @close="closeAuthModal">
-		<view class="login-wrap">
+<template>
+	<view class="cu-modal bottom-modal" :class="{ show: showAuth }" @tap="closeAuthModal" style="z-index: 10080;">
+		<view class="login-wrap cu-dialog form-wrap  safe-area-inset-bottom" @tap.stop style="border-radius: 20rpx 20rpx 0 0;">
 			<!-- 1.账号密码登录 -->
-			<u-form v-if="authType === 'accountLogin'" :model="form['accountLogin'].data" :rules="form['accountLogin'].rules" ref="accountLogin" :errorType="errorType">
+			<view v-if="authType === 'accountLogin'">
 				<!-- 标题 -->
-				<view class="head-box u-m-b-60">
+				<view class="head-box u-m-b-60 u-flex-col ">
 					<view class="u-flex u-m-b-20">
 						<view class="head-title u-m-r-40 head-title-animation">账号登录</view>
 						<view class="head-title-active head-title-line" @tap="showAuthModal('smsLogin')">短信登录</view>
 					</view>
 					<view class="head-subtitle">如果未设置过密码，请点击忘记密码</view>
 				</view>
-				<u-form-item :labelStyle="labelStyle" label-width="150" label-position="left" label="账号" prop="account">
-					<u-input placeholder="请输入账号" :placeholderStyle="placeholderStyle" v-model="form['accountLogin'].data.account" type="text"></u-input>
-					<button class="u-reset-button forgot-btn" slot="right" @tap="showAuthModal('forgotPwd')">忘记密码</button>
-				</u-form-item>
-				<u-form-item :labelStyle="labelStyle" label-position="left" label=" 密码" prop="password" label-width="150">
-					<u-input placeholder="请输入密码" :placeholderStyle="placeholderStyle" v-model="form['accountLogin'].data.password" type="password"></u-input>
-					<button slot="right" class="u-reset-button login-btn-start" @tap="accountLoginSubmit">登录</button>
-				</u-form-item>
+				<view class="form-item  u-border-bottom ">
+					<view class="item-content u-flex u-col-center">
+						<view class="item-title">账号</view>
+						<u-input
+							class="u-m-r-10 u-flex-1"
+							placeholder="请输入账号"
+							@blur="checkValue($event, 'account')"
+							@input="checkValue($event, 'account')"
+							:placeholderStyle="placeholderStyle"
+							v-model="form['accountLogin'].data.account"
+							type="text"
+						></u-input>
+						<button class="u-reset-button forgot-btn" @tap="showAuthModal('forgotPwd')">忘记密码</button>
+					</view>
+					<view class="message-error">{{ form['accountLogin'].error.account || '' }}</view>
+				</view>
+				<view class="form-item u-border-bottom">
+					<view class="item-content u-flex u-col-center">
+						<view class="item-title">密码</view>
+						<u-input
+							class="u-m-r-10 u-flex-1"
+							placeholder="请输入密码"
+							:placeholderStyle="placeholderStyle"
+							v-model="form['accountLogin'].data.password"
+							type="password"
+							@blur="checkValue($event, 'password')"
+							@input="checkValue($event, 'password')"
+						></u-input>
+						<button class="u-reset-button login-btn-start" @tap="accountLoginSubmit">登录</button>
+					</view>
+					<view class="message-error">{{ form['accountLogin'].error.password || '' }}</view>
+				</view>
 				<button class="u-reset-button type-btn" @tap="showAuthModal('register')">立即注册</button>
-			</u-form>
+			</view>
 
 			<!-- 2.短信登录 -->
-			<u-form v-if="authType === 'smsLogin'" :model="form['smsLogin'].data" :rules="form.smsLogin.rules" ref="smsLogin" :errorType="errorType">
+			<view v-if="authType === 'smsLogin'">
 				<view class="head-box u-m-b-60">
 					<view class="u-flex u-m-b-20">
 						<view class="head-title-active u-m-r-40" @tap="showAuthModal('accountLogin')">账号登录</view>
@@ -31,127 +55,280 @@
 					</view>
 					<view class="head-subtitle">未注册手机号请先点击下方立即注册</view>
 				</view>
-				<u-form-item :labelStyle="labelStyle" label-width="150" label-position="left" label="手机号" prop="mobile">
-					<u-input placeholder="请输入手机号" @input="mobileInput" :placeholderStyle="placeholderStyle" v-model="form['smsLogin'].data.mobile" type="number"></u-input>
-					<button
-						class="u-reset-button code-btn code-btn-start"
-						:disabled="!form['smsLogin'].data.isMobileEnd"
-						:class="{ 'code-btn-end': form['smsLogin'].data.isMobileEnd }"
-						slot="right"
-						@tap="getSmsCode('mobilelogin')"
-					>
-						{{ codeText }}
-					</button>
-				</u-form-item>
-				<u-form-item :labelStyle="labelStyle" label-position="left" label="验证码" prop="code" label-width="150">
-					<u-input placeholder="请输入验证码" :placeholderStyle="placeholderStyle" v-model="form['smsLogin'].data.code" type="number"></u-input>
-					<button slot="right" class="u-reset-button login-btn-start" @tap="smsLoginSubmit">登录</button>
-				</u-form-item>
+				<view class="form-item u-border-bottom">
+					<view class="item-content u-flex u-col-center">
+						<view class="item-title">手机号</view>
+						<u-input
+							class="u-m-r-10 u-flex-1"
+							placeholder="请输入手机号"
+							@blur="checkValue($event, 'mobile')"
+							@input="mobileInput($event, 'mobile')"
+							:placeholderStyle="placeholderStyle"
+							v-model="form['smsLogin'].data.mobile"
+							type="number"
+						></u-input>
+						<button
+							class="u-reset-button code-btn code-btn-start"
+							:disabled="!form['smsLogin'].data.isMobileEnd"
+							:class="{ 'code-btn-end': form['smsLogin'].data.isMobileEnd }"
+							@tap="getSmsCode('mobilelogin')"
+						>
+							{{ codeText }}
+						</button>
+					</view>
+					<view class="message-error">{{ form['smsLogin'].error.mobile || '' }}</view>
+				</view>
+				<view class="form-item u-border-bottom">
+					<view class="item-content u-flex u-col-center">
+						<view class="item-title">验证码</view>
+						<u-input
+							class="u-m-r-10 u-flex-1"
+							@blur="checkValue($event, 'code')"
+							@input="checkValue($event, 'code')"
+							placeholder="请输入验证码"
+							:placeholderStyle="placeholderStyle"
+							v-model="form['smsLogin'].data.code"
+							type="number"
+						></u-input>
+						<button class="u-reset-button login-btn-start" @tap="smsLoginSubmit">登录</button>
+					</view>
+					<view class="message-error">{{ form['smsLogin'].error.code || '' }}</view>
+				</view>
 				<button class="u-reset-button type-btn" @tap="showAuthModal('register')">立即注册</button>
-			</u-form>
+			</view>
 
 			<!-- 3.注册 -->
-			<u-form v-if="authType === 'register'" :model="form['register'].data" :rules="form.register.rules" ref="register" :errorType="errorType">
+			<view v-if="authType === 'register'">
 				<view class="head-box u-m-b-60">
 					<view class="head-title u-m-b-20">注册</view>
 					<view class="head-subtitle">请使用本人手机号完成注册</view>
 				</view>
-				<u-form-item :labelStyle="labelStyle" label-width="150" label-position="left" label="手机号" prop="mobile">
-					<u-input placeholder="请输入手机号" @input="mobileInput" :placeholderStyle="placeholderStyle" v-model="form['register'].data.mobile" type="number"></u-input>
-					<button
-						class="u-reset-button code-btn code-btn-start"
-						:disabled="!form['register'].data.isMobileEnd"
-						:class="{ 'code-btn-end': form['register'].data.isMobileEnd }"
-						slot="right"
-						@tap="getSmsCode('register')"
-					>
-						{{ codeText }}
-					</button>
-				</u-form-item>
-				<u-form-item :labelStyle="labelStyle" label-position="left" label=" 密码" prop="password" label-width="150">
-					<u-input placeholder="请输入密码" :placeholderStyle="placeholderStyle" v-model="form['register'].data.password" type="password"></u-input>
-				</u-form-item>
-				<u-form-item :labelStyle="labelStyle" label-position="left" label="验证码" prop="code" label-width="150">
-					<u-input placeholder="请输入验证码" :placeholderStyle="placeholderStyle" v-model="form['register'].data.code" type="number"></u-input>
-					<button slot="right" class="u-reset-button login-btn-start" @tap="registerSubmit">注册</button>
-				</u-form-item>
+				<view class="form-item u-border-bottom">
+					<view class="item-content u-flex u-col-center">
+						<view class="item-title">手机号</view>
+						<u-input
+							class="u-m-r-10 u-flex-1"
+							placeholder="请输入手机号"
+							@blur="checkValue($event, 'mobile')"
+							@input="mobileInput($event, 'mobile')"
+							:placeholderStyle="placeholderStyle"
+							v-model="form['register'].data.mobile"
+							type="number"
+						></u-input>
+						<button
+							class="u-reset-button code-btn code-btn-start"
+							:disabled="!form['register'].data.isMobileEnd"
+							:class="{ 'code-btn-end': form['register'].data.isMobileEnd }"
+							@tap="getSmsCode('register')"
+						>
+							{{ codeText }}
+						</button>
+					</view>
+					<view class="message-error">{{ form['register'].error.mobile || '' }}</view>
+				</view>
+				<view class="form-item u-border-bottom">
+					<view class="item-content u-flex u-col-center">
+						<view class="item-title">密码</view>
+						<u-input
+							class="u-m-r-10 u-flex-1"
+							@blur="checkValue($event, 'password')"
+							@input="checkValue($event, 'password')"
+							placeholder="请输入密码"
+							:placeholderStyle="placeholderStyle"
+							v-model="form['register'].data.password"
+							type="password"
+						></u-input>
+					</view>
+					<view class="message-error">{{ form['register'].error.password || '' }}</view>
+				</view>
+				<view class="form-item u-border-bottom">
+					<view class="item-content u-flex u-col-center">
+						<view class="item-title">验证码</view>
+						<u-input
+							class="u-m-r-10 u-flex-1"
+							@blur="checkValue($event, 'code')"
+							@input="checkValue($event, 'code')"
+							placeholder="请输入验证码"
+							:placeholderStyle="placeholderStyle"
+							v-model="form['register'].data.code"
+							type="number"
+						></u-input>
+						<button class="u-reset-button login-btn-start" @tap="registerSubmit">注册</button>
+					</view>
+					<view class="message-error">{{ form['register'].error.code || '' }}</view>
+				</view>
 				<button v-if="!isLogin" class="u-reset-button type-btn" @tap="showAuthModal('accountLogin')">返回登录</button>
-			</u-form>
+			</view>
 
 			<!-- 4.忘记密码 -->
-			<u-form v-if="authType === 'forgotPwd'" :model="form['forgotPwd'].data" :rules="form['forgotPwd'].rules" ref="forgotPwd" :errorType="errorType">
+			<view v-if="authType === 'forgotPwd'">
 				<view class="head-box u-m-b-60">
 					<view class="head-title u-m-b-20">忘记密码</view>
 					<view class="head-subtitle">为了您的账号安全，修改密码前请先进行安全验证</view>
 				</view>
-				<u-form-item :labelStyle="labelStyle" label-width="150" label-position="left" label="手机号" prop="mobile">
-					<u-input placeholder="请输入手机号" @input="mobileInput" :placeholderStyle="placeholderStyle" v-model="form['forgotPwd'].data.mobile" type="number"></u-input>
-					<button
-						class="u-reset-button code-btn code-btn-start"
-						:disabled="!form['forgotPwd'].data.isMobileEnd"
-						:class="{ 'code-btn-end': form['forgotPwd'].data.isMobileEnd }"
-						slot="right"
-						@tap="getSmsCode('resetpwd')"
-					>
-						{{ codeText }}
-					</button>
-				</u-form-item>
-
-				<u-form-item :labelStyle="labelStyle" label-position="left" label="验证码" prop="code" label-width="150">
-					<u-input placeholder="请输入验证码" :placeholderStyle="placeholderStyle" v-model="form['forgotPwd'].data.code" type="number"></u-input>
-				</u-form-item>
-
-				<u-form-item :labelStyle="labelStyle" label-position="left" label="新密码" prop="password" label-width="150">
-					<u-input placeholder="请输入密码" :placeholderStyle="placeholderStyle" v-model="form['forgotPwd'].data.password" type="password"></u-input>
-					<button slot="right" class="u-reset-button login-btn-start" @tap="forgotPwdSubmit">确认</button>
-				</u-form-item>
+				<view class="form-item u-border-bottom">
+					<view class="item-content u-flex u-col-center">
+						<view class="item-title">手机号</view>
+						<u-input
+							class="u-m-r-10 u-flex-1"
+							@blur="checkValue($event, 'mobile')"
+							@input="mobileInput($event, 'mobile')"
+							:placeholderStyle="placeholderStyle"
+							v-model="form['forgotPwd'].data.mobile"
+							type="number"
+						></u-input>
+						<button
+							class="u-reset-button code-btn code-btn-start"
+							:disabled="!form['forgotPwd'].data.isMobileEnd"
+							:class="{ 'code-btn-end': form['forgotPwd'].data.isMobileEnd }"
+							slot="right"
+							@tap="getSmsCode('resetpwd')"
+						>
+							{{ codeText }}
+						</button>
+					</view>
+					<view class="message-error">{{ form['forgotPwd'].error.mobile || '' }}</view>
+				</view>
+
+				<view class="form-item u-border-bottom">
+					<view class="item-content u-flex u-col-center">
+						<view class="item-title">验证码</view>
+						<u-input
+							class="u-m-r-10 u-flex-1"
+							@blur="checkValue($event, 'code')"
+							@input="checkValue($event, 'code')"
+							placeholder="请输入验证码"
+							:placeholderStyle="placeholderStyle"
+							v-model="form['forgotPwd'].data.code"
+							type="number"
+						></u-input>
+					</view>
+					<view class="message-error">{{ form['forgotPwd'].error.code || '' }}</view>
+				</view>
+
+				<view class="form-item u-border-bottom">
+					<view class="item-content u-flex u-col-center">
+						<view class="item-title">密码</view>
+						<u-input
+							class="u-m-r-10 u-flex-1"
+							@blur="checkValue($event, 'password')"
+							@input="checkValue($event, 'password')"
+							placeholder="请输入密码"
+							:placeholderStyle="placeholderStyle"
+							v-model="form['forgotPwd'].data.password"
+							type="password"
+						></u-input>
+						<button class="u-reset-button login-btn-start" @tap="forgotPwdSubmit">确认</button>
+					</view>
+					<view class="message-error">{{ form['forgotPwd'].error.password || '' }}</view>
+				</view>
 				<button v-if="!isLogin" class="u-reset-button type-btn" @tap="showAuthModal('accountLogin')">返回登录</button>
-			</u-form>
+			</view>
 
 			<!-- 5.绑定手机号 -->
-			<u-form v-if="authType === 'bindMobile'" :model="form['bindMobile'].data" :rules="form['bindMobile'].rules" ref="bindMobile" :errorType="errorType">
+			<view v-if="authType === 'bindMobile'">
 				<view class="head-box u-m-b-60">
 					<view class="head-title u-m-b-20">绑定手机号</view>
 					<view class="head-subtitle">为了您的账号安全，请绑定手机号</view>
 				</view>
-				<u-form-item :labelStyle="labelStyle" label-width="150" label-position="left" label="手机号" prop="mobile">
-					<u-input placeholder="请输入手机号" @input="mobileInput" :placeholderStyle="placeholderStyle" v-model="form['bindMobile'].data.mobile" type="number"></u-input>
-					<button
-						class="u-reset-button code-btn code-btn-start"
-						:disabled="!form['bindMobile'].data.isMobileEnd"
-						:class="{ 'code-btn-end': form['bindMobile'].data.isMobileEnd }"
-						slot="right"
-						@tap="getSmsCode('changemobile')"
-					>
-						{{ codeText }}
-					</button>
-				</u-form-item>
-				<u-form-item :labelStyle="labelStyle" label-position="left" label="验证码" prop="code" label-width="150">
-					<u-input placeholder="请输入验证码" :placeholderStyle="placeholderStyle" v-model="form['bindMobile'].data.code" type="number"></u-input>
-					<button slot="right" class="u-reset-button login-btn-start" @tap="bindMobileSubmit">立即绑定</button>
-				</u-form-item>
-			</u-form>
+				<view class="form-item u-border-bottom">
+					<view class="item-content u-flex u-col-center">
+						<view class="item-title">手机号</view>
+						<u-input
+							class="u-m-r-10 u-flex-1"
+							@blur="checkValue($event, 'mobile')"
+							@input="mobileInput($event, 'mobile')"
+							placeholder="请输入手机号"
+							:placeholderStyle="placeholderStyle"
+							v-model="form['bindMobile'].data.mobile"
+							type="number"
+						></u-input>
+						<button
+							class="u-reset-button code-btn code-btn-start"
+							:disabled="!form['bindMobile'].data.isMobileEnd"
+							:class="{ 'code-btn-end': form['bindMobile'].data.isMobileEnd }"
+							slot="right"
+							@tap="getSmsCode('changemobile')"
+						>
+							{{ codeText }}
+						</button>
+					</view>
+					<view class="message-error">{{ form['bindMobile'].error.mobile || '' }}</view>
+				</view>
+				<view class="form-item u-border-bottom">
+					<view class="item-content u-flex u-col-center">
+						<view class="item-title">验证码</view>
+						<u-input
+							class="u-m-r-10 u-flex-1"
+							@blur="checkValue($event, 'code')"
+							@input="checkValue($event, 'code')"
+							placeholder="请输入验证码"
+							:placeholderStyle="placeholderStyle"
+							v-model="form['bindMobile'].data.code"
+							type="number"
+						></u-input>
+						<button class="u-reset-button login-btn-start" @tap="bindMobileSubmit">立即绑定</button>
+					</view>
+					<view class="message-error">{{ form['bindMobile'].error.code || '' }}</view>
+				</view>
+			</view>
 
 			<!-- 6.修改密码 -->
-			<u-form v-if="authType === 'changePwd'" :model="form['changePwd'].data" :rules="form['changePwd'].rules" ref="changePwd" :errorType="errorType">
+			<view v-if="authType === 'changePwd'">
 				<view class="head-box u-m-b-60">
 					<view class="head-title u-m-b-20">修改密码</view>
 					<view class="head-subtitle"></view>
 				</view>
-				<u-form-item :labelStyle="labelStyle" label-position="left" label="旧密码" prop="oldPassword" label-width="150">
-					<u-input placeholder="请输入旧密码" :placeholderStyle="placeholderStyle" v-model="form['changePwd'].data.oldPassword" type="password"></u-input>
-				</u-form-item>
-				<u-form-item :labelStyle="labelStyle" label-position="left" label="新密码" prop="newPassword" label-width="150">
-					<u-input placeholder="请输入新密码" :placeholderStyle="placeholderStyle" v-model="form['changePwd'].data.newPassword" type="password"></u-input>
-				</u-form-item>
-				<u-form-item :labelStyle="labelStyle" label-position="left" label="确认密码" prop="reNewPassword" label-width="150">
-					<u-input placeholder="再次输入新密码" :placeholderStyle="placeholderStyle" v-model="form['changePwd'].data.reNewPassword" type="password"></u-input>
-				</u-form-item>
+				<view class="form-item u-border-bottom">
+					<view class="item-content u-flex u-col-center">
+						<view class="item-title">旧密码</view>
+						<u-input
+							class="u-m-r-10 u-flex-1"
+							@blur="checkValue($event, 'oldPassword')"
+							@input="checkValue($event, 'oldPassword')"
+							placeholder="请输入旧密码"
+							:placeholderStyle="placeholderStyle"
+							v-model="form['changePwd'].data.oldPassword"
+							type="password"
+						></u-input>
+					</view>
+					<view class="message-error">{{ form['changePwd'].error.oldPassword || '' }}</view>
+				</view>
+				<view class="form-item u-border-bottom">
+					<view class="item-content u-flex u-col-center">
+						<view class="item-title">新密码</view>
+						<u-input
+							class="u-m-r-10 u-flex-1"
+							@blur="checkValue($event, 'newPassword')"
+							@input="checkValue($event, 'newPassword')"
+							placeholder="请输入新密码"
+							:placeholderStyle="placeholderStyle"
+							v-model="form['changePwd'].data.newPassword"
+							type="password"
+						></u-input>
+					</view>
+					<view class="message-error">{{ form['changePwd'].error.newPassword || '' }}</view>
+				</view>
+				<view class="form-item u-border-bottom">
+					<view class="item-content u-flex u-col-center">
+						<view class="item-title">确认密码</view>
+						<u-input
+							class="u-m-r-10 u-flex-1"
+							@blur="checkValue($event, 'reNewPassword')"
+							@input="checkValue($event, 'reNewPassword')"
+							placeholder="再次输入新密码"
+							:placeholderStyle="placeholderStyle"
+							v-model="form['changePwd'].data.reNewPassword"
+							type="password"
+						></u-input>
+					</view>
+					<view class="message-error">{{ form['changePwd'].error.reNewPassword || '' }}</view>
+				</view>
 				<view class="editPwd-btn-box u-m-t-80">
 					<button class="u-reset-button save-btn" @tap="changePwdSubmit">保存</button>
 					<button class="u-reset-button forgot-btn" @tap="showAuthModal('forgotPwd')">忘记密码</button>
 				</view>
-			</u-form>
+			</view>
 
 			<!-- 第三方登录 -->
 			<view v-if="authType === 'accountLogin' || authType === 'smsLogin'" class="auto-login-box u-flex u-row-center u-col-center">
@@ -183,18 +360,15 @@
 					<view class="agreement-text tcp-text u-flex u-col-center">
 						我已阅读并遵守
 						<view class="tcp-text u-flex u-col-center">
-							<view @tap.stop="$Router.push({ path: '/pages/public/richtext', query: { id: config.shop.user_protocol || 0 } })">《用户协议》</view>
+							<view @tap.stop="$Router.push({ path: '/pages/public/richtext', query: { id: initStore.shop.user_protocol || 0 } })">《用户协议》</view>
 							与
-							<view @tap.stop="$Router.push({ path: '/pages/public/richtext', query: { id: config.shop.privacy_protocol || 0 } })">《隐私协议》</view>
+							<view @tap.stop="$Router.push({ path: '/pages/public/richtext', query: { id: initStore.shop.privacy_protocol || 0 } })">《隐私协议》</view>
 						</view>
 					</view>
 				</u-checkbox>
 			</view>
-
-			<!-- 公用验证码倒计时，防止恶意请求短信验证 -->
-			<u-verification-code changeText="Xs" seconds="10" ref="code" @change="codeChange"></u-verification-code>
 		</view>
-	</u-popup>
+	</view>
 </template>
 
 <script>
@@ -202,8 +376,9 @@
  * 登录提示页
  */
 import FormValidate from '@/shopro/validate/form';
+import schema from '@/uview-ui/libs/util/async-validator';
 import wechat from '@/shopro/wechat/wechat';
-import { mapMutations, mapActions, mapState } from 'vuex';
+import { mapMutations, mapActions, mapState, mapGetters } from 'vuex';
 // #ifdef APP-PLUS
 import apple from '@/shopro/apple';
 // #endif
@@ -223,6 +398,10 @@ export default {
 					rules: {
 						account: FormValidate.account,
 						password: FormValidate.password
+					},
+					error: {
+						account: '',
+						password: ''
 					}
 				},
 
@@ -236,6 +415,10 @@ export default {
 					rules: {
 						code: FormValidate.code,
 						mobile: FormValidate.mobile
+					},
+					error: {
+						mobile: '', // 手机号
+						code: '' // 验证码
 					}
 				},
 				// 3.注册
@@ -250,6 +433,11 @@ export default {
 						code: FormValidate.code,
 						mobile: FormValidate.mobile,
 						password: FormValidate.password
+					},
+					error: {
+						mobile: '', // 手机号
+						code: '', // 验证码
+						password: '' // 密码
 					}
 				},
 
@@ -265,6 +453,11 @@ export default {
 						mobile: FormValidate.mobile,
 						code: FormValidate.code,
 						password: FormValidate.password
+					},
+					error: {
+						mobile: '', //手机号
+						code: '', //验证码
+						password: '' //密码
 					}
 				},
 				// 5.绑定手机号
@@ -277,6 +470,10 @@ export default {
 					rules: {
 						code: FormValidate.code,
 						mobile: FormValidate.mobile
+					},
+					error: {
+						mobile: '', //手机号
+						code: '' //验证码
 					}
 				},
 				// 6.修改密码
@@ -303,28 +500,23 @@ export default {
 								trigger: ['change', 'blur']
 							}
 						]
+					},
+					error: {
+						oldPassword: '', //旧密码
+						newPassword: '', //新密码
+						reNewPassword: '' //确认密码
 					}
 				}
 			},
 			codeText: '获取验证码',
+			disabledCode: false,
 			protocol: false, //是否同意隐私协议
-			// 表单样式
-			errorType: ['message'],
-			labelStyle: {
-				'font-size': '30rpx',
-				'font-weight': '600',
-				color: '#333'
-			},
 			placeholderStyle: 'font-size: 30rpx; font-weight: 500;color:#C2C7CF;'
 		};
 	},
 
 	computed: {
-		...mapState({
-			authType: ({ user }) => user.authType,
-			config: ({ shopro }) => shopro.config,
-			isLogin: ({ user }) => user.isLogin
-		}),
+		...mapGetters(['initStore', 'isLogin','authType']),
 		showAuth: {
 			get() {
 				return !!this.authType;
@@ -334,40 +526,92 @@ export default {
 			}
 		}
 	},
-	mounted() {
-		this.switchModalType(this.authType);
-	},
-	watch: {
-		authType(newValue, oldValue) {
-			delete this.$refs[oldValue];
-			this.switchModalType(newValue);
-		}
-	},
+	mounted() {},
 	methods: {
 		...mapActions(['getUserInfo', 'showAuthModal']),
 
-		// 手机号是否输入完毕
-		mobileInput() {
-			this.form[this.authType].data.isMobileEnd = this.$u.test.mobile(this.form[this.authType].data.mobile);
+		// 检测
+		checkValue(e, key) {
+			this.validation(key);
+		},
+
+		// 校验数据
+		validation(key, callback = () => {}) {
+			let that = this;
+			//拿到需要校验的数据
+			let fieldValue = this.form[this.authType].data[key];
+			//拿到需要检验的规则
+			let rules = this.form[this.authType].rules[key];
+			// 判空
+			if (!rules || rules.length === 0) {
+				return callback('');
+			}
+			// 设置当前的装填，标识为校验中
+			let validateState = 'validating';
+			// 调用async-validator的方法
+			let validator = new schema({
+				[key]: rules
+			});
+			// 校验
+			validator.validate(
+				{
+					[key]: fieldValue
+				},
+				{
+					firstFields: true
+				},
+				(errors, fields) => {
+					// 记录状态和报错信息
+					validateState = !errors ? 'success' : 'error';
+					let validateMessage = errors ? errors[0].message : '';
+					that.form[that.authType].error[key] = validateMessage;
+					callback(validateMessage);
+				}
+			);
 		},
 
-		// 切换表单模式
-		switchModalType(type) {
-			type &&
-				this.$nextTick(() => {
-					this.$refs[type].resetFields();
-					this.$refs[type].setRules(this.form[type].rules);
+		// 校验全部数据
+		validateAll(callback) {
+			let that = this;
+			return new Promise(resolve => {
+				// 对当前所有表单检验
+				let valid = true; // 默认通过
+				let count = 0; // 用于标记是否检查完毕
+				let errorArr = []; // 存放错误信息
+				let curFormData = that.form[that.authType].data;
+				Object.keys(curFormData).map(field => {
+					that.validation(field, error => {
+						// 如果回调有error
+						if (error) {
+							valid = false;
+							errorArr.push(error);
+						}
+						if (++count === Object.keys(curFormData).length) {
+							resolve(valid);
+							if (errorArr.length) {
+								this.$u.toast(errorArr[0]);
+							}
+							if (typeof callback == 'function') callback(valid);
+						}
+					});
 				});
+			});
 		},
+
+		// 手机号是否输入完毕
+		mobileInput(e, key) {
+			this.form[this.authType].data.isMobileEnd = this.$u.test.mobile(this.form[this.authType].data.mobile);
+			this.validation(key);
+		},
+
 		closeAuthModal() {
-			this.showAuth = false;
 			this.$store.dispatch('showAuthModal', '');
 		},
 
 		// 获取短信验证码
 		getSmsCode(type) {
 			const that = this;
-			if (that.form[this.authType].data.isMobileEnd && that.$refs['code'].canGetCode) {
+			if (that.form[this.authType].data.isMobileEnd && !that.disabledCode) {
 				that.$http(
 					'common.smsSend',
 					{
@@ -377,7 +621,7 @@ export default {
 					'获取验证码中...'
 				).then(res => {
 					if (res.code === 1) {
-						that.$refs['code'].start();
+						that.codeChange();
 						that.$u.toast('验证码已发送，请注意查收短信');
 					} else {
 						that.$u.toast(res.msg);
@@ -389,8 +633,22 @@ export default {
 		},
 
 		// 倒计时
-		codeChange(e, type) {
-			this.codeText = e;
+		codeChange() {
+			if (this.disabledCode) return;
+			this.disabledCode = true;
+			let n = 10;
+			this.codeText = n + 's';
+			const run = setInterval(() => {
+				n -= 1;
+				if (n < 0) {
+					clearInterval(run);
+				}
+				this.codeText = n + 's';
+				if (this.codeText < 0 + 's') {
+					this.disabledCode = false;
+					this.codeText = '重新获取';
+				}
+			}, 1000);
 		},
 
 		// 规则校验
@@ -399,7 +657,7 @@ export default {
 				this.$u.toast('请同意用户协议');
 				return false;
 			}
-			return this.$refs[this.authType].validate();
+			return this.validateAll();
 		},
 
 		// 第三方登录
@@ -422,7 +680,7 @@ export default {
 				default:
 					break;
 			}
-			if(token) {
+			if (token) {
 				that.closeAuthModal();
 				that.getUserInfo(token);
 			}
@@ -570,7 +828,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@keyframes title {
+@keyframes title-animation {
 	0% {
 		font-size: 32rpx;
 	}
@@ -580,9 +838,38 @@ export default {
 	}
 }
 
+.form-wrap {
+	.form-item {
+		display: flex;
+		flex-direction: column;
+		font-size: 28rpx;
+		padding: 20rpx 0;
+		color: $u-main-color;
+		box-sizing: border-box;
+		line-height: $u-form-item-height;
+		width: 100%;
+		.item-title {
+			width: 140rpx;
+			font-size: 30rpx;
+			color: #333;
+			font-weight: 600;
+			text-align: left;
+		}
+		.message-error {
+			text-align: left;
+			font-size: 24rpx;
+			line-height: 24rpx;
+			color: $u-type-error;
+			margin-top: 12rpx;
+			margin-left: 120rpx;
+		}
+	}
+}
+
 .login-wrap {
 	padding: 50rpx 34rpx;
 	min-height: 700rpx;
+	background-color: #fff;
 
 	.head-box {
 		.head-title {
@@ -600,7 +887,7 @@ export default {
 			line-height: 36rpx;
 		}
 		.head-title-animation {
-			animation-name: title;
+			animation-name: title-animation;
 			animation-duration: 0.1s;
 			animation-timing-function: ease-out;
 			animation-fill-mode: forwards;
@@ -623,6 +910,8 @@ export default {
 			font-size: 26rpx;
 			font-weight: 400;
 			color: #c2c7cf;
+			text-align: left;
+			display: flex;
 		}
 	}
 	.code-btn[disabled] {
@@ -684,7 +973,9 @@ export default {
 
 	.agreement-box {
 		margin: 80rpx auto 0;
-
+		.protocol-check {
+			transform: scale(0.7);
+		}
 		.agreement-text {
 			font-size: 26rpx;
 			font-weight: 500;
diff --git a/components/shopro-canvas/shopro-canvas.vue b/components/shopro-canvas/shopro-canvas.vue
index 604fbc79..48127633 100644
--- a/components/shopro-canvas/shopro-canvas.vue
+++ b/components/shopro-canvas/shopro-canvas.vue
@@ -1,5 +1,6 @@
 <template>
 	<view class="invite-poster-content">
+		 <!-- TODO: 小程序端使用type='2d'会有报错 -->
 		<canvas class="hideCanvas" canvas-id="self_canvas" :style="{ width: (poster.width || 1) + 'px', height: (poster.height || 1) + 'px' }"></canvas>
 	</view>
 </template>
@@ -8,7 +9,7 @@
 import _app from '@/shopro/poster/QS-SharePoster/app.js';
 import { getSharePoster } from '@/shopro/poster/QS-SharePoster/QS-SharePoster.js';
 import tools from '@/shopro/poster/tools.js';
-import { mapMutations, mapActions, mapState } from 'vuex';
+import { mapMutations, mapActions, mapState, mapGetters } from 'vuex';
 let ctx = null;
 export default {
 	components: {},
@@ -26,10 +27,7 @@ export default {
 		}
 	},
 	computed: {
-		...mapState({
-			userInfo: ({ user }) => user.userInfo,
-			shareData: ({ shopro }) => shopro.config.share
-		})
+		...mapGetters(['initShare', 'userInfo'])
 	},
 	async mounted() {
 		ctx = uni.createCanvasContext(this.canvasId, this);
@@ -75,29 +73,33 @@ export default {
 						this.poster = bgObj;
 					}
 				});
-				ctx.draw(false, () => {
-					uni.canvasToTempFilePath(
-						{
-							canvasId: that.canvasId,
-							success: res => {
-								_app.hideLoading();
-								that.posterImage = res.tempFilePath;
-								that.$emit('success', res.tempFilePath);
-								_app.log('海报生成成功, 时间:' + new Date() + '， 临时路径: ' + res.tempFilePath);
-							},
-							fail: err => {
-								_app.hideLoading();
-								console.log('生成异常', err);
-							}
-						},
-						that
-					);
-				});
+				await that.drawPoster();
 			} catch (e) {
 				_app.hideLoading();
 				_app.showToast(JSON.stringify(e));
 				console.log(JSON.stringify(e));
 			}
+		},
+		async drawPoster() {
+			let that = this;
+			ctx.draw(false, () => {
+				uni.canvasToTempFilePath(
+					{
+						canvasId: that.canvasId,
+						success: res => {
+							_app.hideLoading();
+							that.posterImage = res.tempFilePath;
+							that.$emit('success', res.tempFilePath);
+							_app.log('海报生成成功, 时间:' + new Date() + '， 临时路径: ' + res.tempFilePath);
+						},
+						fail: err => {
+							_app.hideLoading();
+							console.log('生成异常', err);
+						}
+					},
+					that
+				);
+			});
 		}
 	}
 };
diff --git a/components/shopro-coupon/shopro-coupon.vue b/components/shopro-coupon/shopro-coupon.vue
index 3e20fa1b..16b3ed99 100644
--- a/components/shopro-coupon/shopro-coupon.vue
+++ b/components/shopro-coupon/shopro-coupon.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="">
 		<!-- 未领取，已领取 -->
-		<view class="coupon-wrap" :style="gradientColor" :class="{ 'gray-wrap': state === 3 }">
+		<view class="coupon-wrap" :style="gradientColor" :class="{ 'gray-wrap': state === 3 || state === 2 || couponData.status_code == 'cannot_get' }">
 			<view class="coupon-item u-flex u-row-between">
 				<view class="coupon-left  u-flex-col ">
 					<view class="sum-box">
@@ -15,10 +15,10 @@
 					</view>
 				</view>
 				<view class="coupon-right u-flex-col">
-					<button class=" get-btn" :style="{ color: btnTextColor }" v-if="state === 0" @tap.stop="getCoupon">立即领取</button>
-					<button class=" get-btn" :style="{ color: btnTextColor }" v-if="state === 1">去使用</button>
-					<button class=" get-btn" :style="{ color: btnTextColor }" v-if="state === 2">查看详情</button>
-					<button class="cu-btn get-btn" v-if="state === 3">已失效</button>
+					<button class="get-btn" :style="{ color: btnTextColor }" v-if="state === 0" @tap.stop="getCoupon">{{ stateMap[couponData.status_code] ||　'立即领取' }}</button>
+					<button class="get-btn" :style="{ color: btnTextColor }" v-if="state === 1">去使用</button>
+					<button class="get-btn" :style="{ color: btnTextColor }" v-if="state === 2">暂不可用</button>
+					<button class="get-btn" v-if="state === 3">{{ stateMap[couponData.status_code] }}</button>
 					<view class="surplus-num" :style="{ color: color }" v-if="state === 0">仅剩{{ stock }}张</view>
 				</view>
 			</view>
@@ -37,7 +37,15 @@ export default {
 	components: {},
 	data() {
 		return {
-			stock: 0
+			stock: 0,
+			stateMap: {
+				can_use: '立即使用',
+				used: '已使用',
+				expired: '已失效',
+				cannot_use: '暂不可用',
+				can_get: '立即领取',
+				cannot_get: '已领取'
+			}
 		};
 	},
 	props: {
@@ -79,6 +87,7 @@ export default {
 			).then(res => {
 				if (res.code === 1) {
 					that.stock -= 1;
+					that.$u.toast('领取成功');
 				}
 			});
 		}
@@ -96,6 +105,7 @@ export default {
 // 未领取，已领取
 .coupon-wrap {
 	mask: url($IMG_URL+'/imgs/coupon_bg1.png');
+	-webkit-mask-box-image: url($IMG_URL+'/imgs/coupon_bg1.png');
 	mask-size: 100% 100%;
 	position: relative;
 	border-radius: 10rpx;
@@ -156,7 +166,6 @@ export default {
 
 			.surplus-num {
 				font-size: 22rpx;
-
 				font-weight: 500;
 				color: #fff;
 				margin-top: 14rpx;
diff --git a/components/shopro-empty/shopro-empty.vue b/components/shopro-empty/shopro-empty.vue
index 2a0dc139..7ceb170a 100644
--- a/components/shopro-empty/shopro-empty.vue
+++ b/components/shopro-empty/shopro-empty.vue
@@ -22,8 +22,8 @@ export default {
 	name: 'shoproEmpty',
 	props: {
 		image: {
-			type: String,
-			default: ''
+			type: [String,null],
+			default: '/static/images/empty_network.png'
 		},
 		tipText: {
 			type: String,
diff --git a/components/shopro-float-btn/shopro-float-btn.vue b/components/shopro-float-btn/shopro-float-btn.vue
index 17611abc..6548e165 100644
--- a/components/shopro-float-btn/shopro-float-btn.vue
+++ b/components/shopro-float-btn/shopro-float-btn.vue
@@ -1,12 +1,11 @@
 <template>
 	<view class="" v-if="floatList && floatList.length">
-		<u-mask v-if="showMask" :z-index="10001" :show="showMask" @click="hideModal"></u-mask>
+		<view class="cu-modal" :class="{ show: showMask }" @tap="hideMask"></view>
+		<!-- 悬浮按钮菜单 -->
 		<view class="shopro-float-btn">
-			<!-- 悬浮按钮 -->
 			<button class="wechat-btn u-reset-button" @tap="onBtn">
 				<image class="wechat_img" :src="floatList.length == 1 ? floatList[0].btnimage : floatData.image" mode="widthFix"></image>
 			</button>
-			<!-- 菜单列表 -->
 			<view :class="showBtnList ? 'float--active' : 'float-list-box'">
 				<view class="btn-img-box u-flex-col" @tap="onBtnItem(item)" v-for="item in floatList" :key="item.btnimage">
 					<view class="btn-item u-flex-col u-row-center u-col-center">
@@ -17,22 +16,11 @@
 			</view>
 		</view>
 		<!-- 弹窗 -->
-		<u-popup
-			v-model="showModal"
-			@close="hideModal"
-			:bgStyle="{
-				background: 'none'
-			}"
-			:border-radius="20"
-			:mask="false"
-			mode="center"
-			length="auto"
-			:closeable="false"
-		>
-			<view class="img-box">
-				<view class="img-wrap"><image class="modal-img" :src="modalImg" mode="aspectFit" @tap="saveImage(modalImg)"></image></view>
+		<view class="cu-modal" :class="{ show: showModal }" @tap="showModal = false">
+			<view class="cu-dialog" style="width: 610rpx;background: none;">
+				<view class="img-box"><image class="modal-img" :src="modalImg" mode="aspectFit" @tap="saveImage(modalImg)"></image></view>
 			</view>
-		</u-popup>
+		</view>
 	</view>
 </template>
 
@@ -56,9 +44,7 @@ export default {
 	},
 	props: {},
 	computed: {
-		...mapState({
-			floatData: ({ shopro }) => shopro.template['float-button']?.[0]?.content
-		}),
+		...mapGetters(['floatData']),
 		// 悬浮按钮数据列表
 		floatList() {
 			if (this.floatData) {
@@ -68,8 +54,7 @@ export default {
 	},
 	created() {},
 	methods: {
-		hideModal() {
-			this.showModal = false;
+		hideMask() {
 			this.showBtnList = false;
 			this.showMask = false;
 		},
@@ -93,6 +78,7 @@ export default {
 				this.$tools.routerTo(item.path);
 			} else {
 				this.modalImg = item.image;
+				this.showMask = false;
 				this.showModal = true;
 				this.showBtnList = false;
 				!item.image && console.log(`%cerr:弹窗图片未配置`, 'color:green;background:yellow');
@@ -139,7 +125,7 @@ export default {
 	position: fixed;
 	bottom: calc(var(--window-bottom) + 100rpx);
 	right: 30rpx;
-	z-index: 10002;
+	z-index: 9999;
 	.float--active {
 		position: absolute;
 		bottom: 80rpx;
diff --git a/components/shopro-goods-card/shopro-goods-card.vue b/components/shopro-goods-card/shopro-goods-card.vue
index 67ee78c2..421fa1a6 100644
--- a/components/shopro-goods-card/shopro-goods-card.vue
+++ b/components/shopro-goods-card/shopro-goods-card.vue
@@ -1,37 +1,20 @@
 <template>
 	<!-- m -->
 	<view class="goods-box" @tap="click">
-		<view class="img-box"><u-image ref="uImage" :width="345" :height="345" :src="image" mode="aspectFill"></u-image></view>
+		<view class="img-box"><image class="goods-img" lazy-load fade-show :src="image" mode="aspectFill"></image></view>
 		<view class="goods-bottom u-p-14" :style="type ? 'background-image: url(' + $IMG_URL + typeMap[type].goodsBg + ')' : ''">
 			<view class="title u-ellipsis-2 u-m-b-10">
-				<u-tag
-					class="title-tag u-m-r-10"
-					v-if="type"
-					:text="typeMap[type].text"
-					size="mini"
-					:bg-color="typeMap[type].tagBg"
-					:border-color="typeMap[type].tagBg"
-					color="#fff"
-				/>
+				<view class=" sm cu-tag radius title-tag u-m-r-10" :style="{ backgroundColor: typeMap[type].tagBg, color: '#fff' }" v-if="type">{{ typeMap[type].text }}</view>
 				{{ title }}
 			</view>
 			<view class="sub-title u-ellipsis-1 u-m-b-10" v-show="subtitle">{{ subtitle }}</view>
 			<view class="u-m-b-20">
-				<u-tag
-					class="u-m-t-10  u-m-r-10"
-					v-for="(item, index) in tagTextList"
-					:key="index"
-					:text="item"
-					size="mini"
-					bg-color="#fff"
-					border-color="#FF0000"
-					color="#FF0000"
-				/>
+				<view class="cu-tag line-red sm radius" v-for="(item, index) in tagTextList" :key="index">{{ item }}</view>
 			</view>
 
 			<slot name="cardBottom">
 				<view class="u-flex u-col-center u-row-between">
-					<view class="price-box font-OPPOSANS">
+					<view class="price-box">
 						<view class="price u-m-b-10">{{ price }}</view>
 						<view class="origin-price">￥{{ originPrice }}</view>
 					</view>
@@ -40,7 +23,7 @@
 						<!-- 单规格 -->
 						<view class="" v-if="!detail.is_sku">
 							<button class="u-reset-button cart-btn u-flex u-col-center u-row-center" v-if="!isCart(detail.id)" @tap.stop="addCart(detail.sku_price[0])">
-								<u-icon name="shopping-cart-fill" size="32" color="#fff"></u-icon>
+								<view class="u-iconfont uicon-shopping-cart-fill" style="color: #fff;"></view>
 							</button>
 							<view class="num-step" v-else>
 								<u-number-box
@@ -57,7 +40,7 @@
 						</view>
 						<!-- 多规格 -->
 						<button class="u-reset-button item-btn cart-btn  u-flex u-col-center u-row-center" @tap.stop="selSku(detail)" v-else>
-							<u-icon name="shopping-cart-fill" size="32" color="#fff"></u-icon>
+							<view class="u-iconfont uicon-shopping-cart-fill" style="color: #fff;"></view>
 						</button>
 					</view>
 				</view>
@@ -82,7 +65,7 @@
  * @property {Array} tagTextList - 活动标签
  * @event {Function} click 商品被点击
  */
-import { mapMutations, mapActions, mapState } from 'vuex';
+import { mapMutations, mapActions, mapState, mapGetters } from 'vuex';
 export default {
 	components: {},
 	data() {
@@ -105,10 +88,7 @@ export default {
 		};
 	},
 	computed: {
-		...mapState({
-			cartList: ({ cart }) => cart.cartList,
-			checkCart: ({ cart }) => cart.checkCart
-		})
+		...mapGetters(['cartList', 'checkCart'])
 	},
 	props: {
 		detail: {
@@ -118,7 +98,7 @@ export default {
 			}
 		},
 		type: {
-			type: String,
+			type: [String,null],
 			default: ''
 		},
 		image: {
@@ -277,24 +257,24 @@ export default {
 </script>
 
 <style lang="scss">
-.goods-bottom {
-	background-size: 100% 100%;
-	background-position: bottom center;
-	background-repeat: no-repeat;
-}
 .goods-box {
 	width: 345rpx;
 	background: #fff;
 	border-radius: 20rpx;
 	overflow: hidden;
-
+	.goods-bottom {
+		background-size: 100% 100%;
+		background-position: bottom center;
+		background-repeat: no-repeat;
+	}
 	.img-box {
 		width: 345rpx;
 		height: 345rpx;
 		overflow: hidden;
 		position: relative;
 		background-color: #fff;
-		.img {
+		border-radius: 6rpx;
+		.goods-img {
 			width: 345rpx;
 			height: 345rpx;
 			background-color: #ccc;
@@ -311,7 +291,6 @@ export default {
 		padding-top: 6rpx;
 
 		.title-tag {
-			transform: scale(0.9);
 			position: relative;
 			top: -6rpx;
 		}
diff --git a/components/shopro-live-card/shopro-live-card.vue b/components/shopro-live-card/shopro-live-card.vue
index 94f12ea2..3ea10b36 100644
--- a/components/shopro-live-card/shopro-live-card.vue
+++ b/components/shopro-live-card/shopro-live-card.vue
@@ -1,12 +1,12 @@
 <template>
 	<view class="live-card-wrap">
 		<!-- 小卡片 -->
-		<view class="sp-live-card" v-if="type == 2" :style="{ width: wh + 'rpx' }">
+		<view class="sp-live-card" v-if="liveType == 2" :style="{ width: wh + 'rpx' }">
 			<view class="live-content" @tap="goRoom" :style="{ width: wh + 'rpx' }">
 				<image class="item-cover" :src="detail.share_img" mode="aspectFill"></image>
 				<view class="item-status">
-					<image class="status-img" :src="liveStatus[detail.live_status].img" mode=""></image>
-					<text class="status-text">{{ liveStatus[detail.live_status].title }}</text>
+					<image class="status-img" :src="liveStatus[liveState].img" mode=""></image>
+					<text class="status-text">{{ liveStatus[liveState].title }}</text>
 				</view>
 				<view class="item-title u-ellipsis-1" :style="{ width: wh + 'rpx' }">{{ detail.name }}</view>
 			</view>
@@ -17,12 +17,12 @@
 					</view>
 				</view>
 				<slot name="liveGoods">
-					<view class="live-goods" v-if="detail.goods.length">
-						<view class="live-goods__item" v-for="(goods, index) in detail.goods" :key="goods.id" v-if="index < 3">
+					<view class="live-goods" v-if="liveGoodsList.length">
+						<view class="live-goods__item" v-for="(goods, index) in liveGoodsList" :key="goods.id" v-if="index < 3">
 							<image class="live-goods__img" :src="goods.cover_img" mode=""></image>
 							<view class="live-goods__price" v-if="index < 2">￥{{ goods.price }}</view>
 							<view class="live-goods__mark" v-else>
-								<text>{{ detail.goods.length }}+</text>
+								<text>{{ liveGoodsList.length }}+</text>
 							</view>
 						</view>
 					</view>
@@ -30,12 +30,12 @@
 			</view>
 		</view>
 		<!-- 大卡片 -->
-		<view class="big-card-wrap" v-if="type == 1">
+		<view class="big-card-wrap" v-if="liveType == 1">
 			<view class="content-one__item" @tap="goRoom">
 				<image class="item-cover" :src="detail.share_img" mode="widthFix"></image>
 				<view class="item-status">
-					<image class="status-img" :src="liveStatus[detail.live_status].img" mode=""></image>
-					<text class="status-text">{{ liveStatus[detail.live_status].title }}</text>
+					<image class="status-img" :src="liveStatus[liveState].img" mode=""></image>
+					<text class="status-text">{{ liveStatus[liveState].title }}</text>
 				</view>
 				<view class="item-title u-ellipsis-1">{{ detail.name }}</view>
 			</view>
@@ -64,6 +64,9 @@ export default {
 	components: {},
 	data() {
 		return {
+			liveType: this.type,
+			liveState: this.detail.live_status,
+			liveGoodsList: this.detail.goods,
 			liveStatus: {
 				'101': {
 					img: this.$IMG_URL + '/imgs/live/live.png',
@@ -138,7 +141,7 @@ export default {
 				let that = this;
 				let date = '';
 
-				if (that.detail.live_status == 102) {
+				if (that.liveState == 102) {
 					date = that.$u.timeFormat(that.detail.starttime, 'mm-dd hh:MM');
 					that.liveStatus['102'].title = '预告 ' + date;
 				}
@@ -146,7 +149,7 @@ export default {
 					.getLiveStatus({ room_id: that.detail.room_id })
 					.then(res => {
 						// 101: 直播中, 102: 未开始, 103: 已结束, 104: 禁播, 105: 暂停中, 106: 异常，107：已过期
-						that.detail.live_status = res.liveStatus;
+						that.liveState = res.liveStatus;
 					})
 					.catch(err => {
 						console.log('get live status', err);
diff --git a/components/shopro-mini-card/shopro-mini-card.vue b/components/shopro-mini-card/shopro-mini-card.vue
index edd99f85..ab6ba0b9 100644
--- a/components/shopro-mini-card/shopro-mini-card.vue
+++ b/components/shopro-mini-card/shopro-mini-card.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="goods-box u-flex u-col-top" @tap="click">
 		<view class="goods__tag" v-show="tag"><image class="tag-img" :src="tag" mode="widthFix"></image></view>
-		<u-image ref="uImage" :width="180" :height="180" :src="image" mode="aspectFill"></u-image>
+		<image class="goods_img"  lazy-load fade-show :src="image" mode="aspectFill"></u-image>
 		<view class="u-m-l-20">
 			<view class="goods-title u-ellipsis-2 u-m-b-10">{{ title }}</view>
 			<view v-if="subtitle" class="describe-text u-m-b-10 u-ellipsis-1">{{ subtitle }}</view>
@@ -90,9 +90,13 @@ export default {
 			width: 60rpx;
 		}
 	}
+	.goods_img{
+		width: 180rpx;
+		height: 180rpx;
+		border-radius: 6rpx;
+	}
 	.goods-title {
 		font-size: 28rpx;
-		
 		font-weight: 500;
 		color: rgba(51, 51, 51, 1);
 		width: 450rpx;
diff --git a/components/shopro-navbar/shopro-navbar.vue b/components/shopro-navbar/shopro-navbar.vue
new file mode 100644
index 00000000..9b89e574
--- /dev/null
+++ b/components/shopro-navbar/shopro-navbar.vue
@@ -0,0 +1,120 @@
+<template>
+	<view>
+		<view class="cu-custom" :style="[{ height: customBar + 'px' }]">
+			<view class="cu-bar fixed u-flex u-row-between" :style="[style]">
+				<view class="action u-flex" @tap="goBack" v-if="isBack">
+					<view class="u-iconfont" :class="'uicon-' + backIconName" :style="{ color: backIconColor, fontSize: backIconSize+'rpx' }"></view>
+					<view class="u-back-text u-line-1 u-m-l-20" v-if="backText" :style="[backTextStyle]">{{ backText || '' }}</view>
+				</view>
+				<view class="content" :style="[{ top: statusBarHeight + 'px' }]"><slot name="content"></slot></view>
+				<slot name="right"></slot>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+// 获取系统状态栏的高度
+let systemInfo = uni.getSystemInfoSync();
+let menuButtonInfo = {};
+// #ifdef MP-WEIXIN || MP-BAIDU || MP-TOUTIAO || MP-QQ
+menuButtonInfo = uni.getMenuButtonBoundingClientRect();
+// #endif
+export default {
+	name: 'shopro-tabbar',
+	data() {
+		return {
+			statusBarHeight: systemInfo.statusBarHeight
+		};
+	},
+	computed: {
+		// tabbar样式
+		style() {
+			let statusBarHeight = systemInfo.statusBarHeight;
+			let style = {};
+			style.height = `${this.customBar}px`;
+			style.paddingTop = `${statusBarHeight}px`;
+			Object.assign(style, this.background);
+			return style;
+		},
+		// 高度
+		customBar() {
+			let statusBarHeight = systemInfo.statusBarHeight;
+			// #ifndef MP
+			return systemInfo.platform == 'android' ? statusBarHeight + 50 : statusBarHeight + 45;
+			// #endif
+			// #ifdef MP-WEIXIN
+			return menuButtonInfo.bottom + menuButtonInfo.top - statusBarHeight;
+			// #endif
+			// #ifdef MP-ALIPAY
+			return statusBarHeight + systemInfo.titleBarHeight;
+			// #endif
+		}
+	},
+	props: {
+		isBack: {
+			type: Boolean,
+			default: true
+		},
+		background: {
+			type: Object,
+			default() {
+				return {
+					background: '#ffffff'
+				};
+			}
+		},
+		// 返回箭头的颜色
+		backIconColor: {
+			type: String,
+			default: '#606266'
+		},
+		// 左边返回的图标
+		backIconName: {
+			type: String,
+			default: 'arrow-left'
+		},
+		// 左边返回图标的大小，rpx
+		backIconSize: {
+			type: [String, Number],
+			default: '44'
+		},
+		// 返回的文字提示
+		backText: {
+			type: String,
+			default: ''
+		},
+		// 返回的文字的 样式
+		backTextStyle: {
+			type: Object,
+			default() {
+				return {
+					color: '#606266'
+				};
+			}
+		}
+	},
+	methods: {
+		goBack() {
+			uni.navigateBack();
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+.cu-custom {
+	width: 100%;
+}
+.cu-bar {
+	width: 100%;
+	.content {
+		width: 560rpx;
+		display: flex;
+		flex-direction: row;
+		flex: 1;
+		align-items: center;
+		pointer-events: auto;
+	}
+}
+</style>
diff --git a/components/shopro-notice-modal/shopro-notice-modal.vue b/components/shopro-notice-modal/shopro-notice-modal.vue
index e79836d4..5fc954e1 100644
--- a/components/shopro-notice-modal/shopro-notice-modal.vue
+++ b/components/shopro-notice-modal/shopro-notice-modal.vue
@@ -1,22 +1,11 @@
 <template>
-	<view class="popup-box" v-if="newPopupList && newPopupList.length">
-		<view v-for="(p, index) in newPopupList" :key="index">
-			<u-popup
-				v-if="popupCurrent === index && p.image"
-				v-model="showModal"
-				:bgStyle="{
-					background: 'none'
-				}"
-				@close="hideModal(p, index)"
-				:border-radius="20"
-				mode="center"
-				length="auto"
-				:closeable="false"
-			>
-				<view class="cu-dialog" @tap.stop="onPopup(p.path)">
-					<view class="img-box"><image class="modal-img" :src="p.image" mode="aspectFit"></image></view>
+	<view class="popup-box" v-show="newPopupList && newPopupList.length">
+		<view class="" v-for="(p, index) in newPopupList" :key="index">
+			<view class="cu-modal" :class="{ show: showModal }" @tap="hideModal(p, index)" v-if="popupCurrent === index && p.image">
+				<view class="cu-dialog" style="width: 610rpx;background: none;">
+					<view class="img-box" @tap.stop="onPopup(p.path)"><image class="modal-img" :src="p.image" mode="aspectFit"></image></view>
 				</view>
-			</u-popup>
+			</view>
 		</view>
 	</view>
 </template>
@@ -26,7 +15,7 @@
  * 广告模态框。连续弹窗和只弹一次。
  * @property {Object} newPopupList  - vuex 初始化传过来的数据
  */
-import { mapMutations, mapActions, mapState } from 'vuex';
+import { mapMutations, mapActions, mapState, mapGetters } from 'vuex';
 let timer = null;
 export default {
 	name: 'shoproNoticeModal',
@@ -39,10 +28,7 @@ export default {
 	},
 	props: {},
 	computed: {
-		...mapState({
-			popupData: ({ shopro }) => shopro.template?.popup?.[0]?.content,
-			isLogin: ({ user }) => user.isLogin
-		}),
+		...mapGetters(['popupData', 'isLogin']),
 		newPopupList() {
 			if (this.popupData) {
 				return this.popupData.list;
diff --git a/components/shopro-share/shopro-share.vue b/components/shopro-share/shopro-share.vue
index 999f313f..c451b257 100644
--- a/components/shopro-share/shopro-share.vue
+++ b/components/shopro-share/shopro-share.vue
@@ -1,48 +1,52 @@
 <template>
 	<view class="content">
 		<!-- 海报弹窗 -->
-		<u-popup v-model="showPoster" @close="onClosePoster" mode="center" :bgStyle="{ background: 'none' }" border-radius="20" :z-index="10078" :closeable="false" :mask="true">
-			<view class="poster-img-box"><image class="poster-img" :src="posterImage" mode="widthFix"></image></view>
-			<view class="poster-btn-box u-m-t-20 u-flex u-row-between u-col-center" v-show="posterImage">
-				<button class="cancel-btn u-reset-button" @tap="showPoster = false">取消</button>
-				<button class="save-btn u-reset-button" @tap="saveImage">{{ ['wxOfficialAccount', 'H5'].includes(platform) ? '长按图片保存' : '保存图片' }}</button>
+		<view class="cu-modal" :class="{ show: showPoster }" @tap="onClosePoster">
+			<view class="cu-dialog" style="width: 640rpx;background: none;">
+				<view class="poster-img-box"><image class="poster-img" :src="posterImage" mode="widthFix"></image></view>
+				<view class="poster-btn-box u-m-t-20 u-flex u-row-between u-col-center" v-show="posterImage">
+					<button class="cancel-btn u-reset-button" @tap="showPoster = false">取消</button>
+					<button class="save-btn u-reset-button" @tap="saveImage">{{ ['wxOfficialAccount', 'H5'].includes(platform) ? '长按图片保存' : '保存图片' }}</button>
+				</view>
 			</view>
-		</u-popup>
-
+		</view>
 		<!-- 分享tools -->
-		<u-popup v-model="showShare" @close="showShare = false" safe-area-inset-bottom mode="bottom" border-radius="20" :closeable="false">
-			<view class="share-box">
-				<view class="share-list-box u-flex">
-					<!-- #ifdef MP-WEIXIN -->
-					<button class="share-item share-btn u-flex-col u-col-center" open-type="share">
-						<image class="share-img" :src="$IMG_URL + '/imgs/share/share_wx.png'" mode=""></image>
-						<text class="share-title">微信好友</text>
-					</button>
-					<!-- #endif -->
-					<!-- #ifndef MP-WEIXIN  -->
-					<view v-if="platform !== 'H5'" class="share-item u-flex-col u-col-center" @tap="shareFriend">
-						<image class="share-img" :src="$IMG_URL + '/imgs/share/share_wx.png'" mode=""></image>
-						<text class="share-title">微信好友</text>
-					</view>
-					<!-- #endif -->
-					<view class="share-item u-flex-col u-col-center" @tap="onPoster">
-						<image class="share-img" :src="$IMG_URL + '/imgs/share/share_poster.png'" mode=""></image>
-						<text class="share-title">生成海报</text>
-					</view>
+		<view class="cu-modal bottom-modal" :class="{ show: showShare }" @tap="showShare = false">
+			<view class="cu-dialog safe-area-inset-bottom" style="border-radius: 20rpx 20rpx 0 0;background: none;">
+				<view class="share-box">
+					<view class="share-list-box u-flex">
+						<!-- #ifdef MP-WEIXIN -->
+						<button class="share-item share-btn u-flex-col u-col-center" open-type="share">
+							<image class="share-img" :src="$IMG_URL + '/imgs/share/share_wx.png'" mode=""></image>
+							<text class="share-title">微信好友</text>
+						</button>
+						<!-- #endif -->
+						<!-- #ifndef MP-WEIXIN  -->
+						<view v-if="platform !== 'H5'" class="share-item u-flex-col u-col-center" @tap="shareFriend">
+							<image class="share-img" :src="$IMG_URL + '/imgs/share/share_wx.png'" mode=""></image>
+							<text class="share-title">微信好友</text>
+						</view>
+						<!-- #endif -->
+						<view class="share-item u-flex-col u-col-center" @tap="onPoster">
+							<image class="share-img" :src="$IMG_URL + '/imgs/share/share_poster.png'" mode=""></image>
+							<text class="share-title">生成海报</text>
+						</view>
 
-					<view class="share-item u-flex-col u-col-center" @tap="copySharePath">
-						<image class="share-img" :src="$IMG_URL + '/imgs/share/share_link.png'" mode=""></image>
-						<text class="share-title">复制链接</text>
+						<view class="share-item u-flex-col u-col-center" @tap="copySharePath">
+							<image class="share-img" :src="$IMG_URL + '/imgs/share/share_link.png'" mode=""></image>
+							<text class="share-title">复制链接</text>
+						</view>
 					</view>
+					<view class="share-foot u-flex u-row-center u-col-center" @tap="showShare = false">取消</view>
 				</view>
-				<view class="share-foot u-flex u-row-center u-col-center" @tap="showShare = false">取消</view>
 			</view>
-		</u-popup>
-
+		</view>
 		<!-- 分享指引 -->
-		<u-popup v-model="showShareGuide" safe-area-inset-bottom mode="top" :closeable="false" :bgStyle="{ background: 'none' }">
-			<view class="guide-wrap u-flex u-col-top u-row-center"><image class="guide-img" :src="$IMG_URL + '/imgs/share/share_guide.png'" mode=""></image></view>
-		</u-popup>
+		<view class="cu-modal bottom-modal" :class="{ show: showShareGuide }" @tap="showShareGuide = false">
+			<view class="cu-dialog safe-area-inset-bottom" style="border-radius: 20rpx 20rpx 0 0;background: none;vertical-align: top;">
+				<view class="guide-wrap u-flex u-col-top u-row-center"><image class="guide-img" :src="$IMG_URL + '/imgs/share/share_guide.png'" mode=""></image></view>
+			</view>
+		</view>
 
 		<!-- 各海报模块 -->
 		<shopro-canvas v-if="showPoster" ref="shoproCanvas" :canvasParams="canvasParams" @success="onSuccess"></shopro-canvas>
@@ -54,9 +58,8 @@
  * @property {Boolean} value = showModal - v-model控制显隐
  * @property {String} posterType - 海报类别
  * @property {Object} posterInfo - 海报数据
- * @property {Object} shareDetail - 分享信息
  */
-import { mapMutations, mapActions, mapState } from 'vuex';
+import { mapMutations, mapActions, mapState, mapGetters } from 'vuex';
 import Auth from '@/shopro/permission/index.js';
 export default {
 	name: 'shoproShare',
@@ -79,17 +82,10 @@ export default {
 			type: Object,
 			default: () => {}
 		},
-		shareDetail: {
-			type: Object,
-			default: () => {}
-		},
 		value: {}
 	},
 	computed: {
-		...mapState({
-			userInfo: ({ user }) => user.userInfo,
-			configShare: ({ shopro }) => shopro.config.share
-		}),
+		...mapGetters(['initShare', 'userInfo', 'isLogin', 'shareInfo']),
 		showShare: {
 			get() {
 				return this.value;
@@ -114,6 +110,22 @@ export default {
 			this.showPoster = false;
 			uni.showTabBar();
 		},
+		// 绘制成功
+		onSuccess(e) {
+			this.posterImage = e;
+		},
+		// 开始绘制
+		onPoster() {
+			this.posterImage = '';
+			uni.hideTabBar();
+			if (this.$store.getters.isLogin) {
+				this.canvasParams = this.getPosterFormatter();
+				this.showPoster = true;
+			} else {
+				this.$store.dispatch('showAuthModal', 'accountLogin');
+			}
+			this.showShare = false;
+		},
 		// 分享好友
 		shareFriend() {
 			let that = this;
@@ -122,10 +134,10 @@ export default {
 				provider: 'weixin',
 				scene: 'WXSceneSession',
 				type: 0,
-				href: that.shareDetail.path,
-				title: that.shareDetail.title,
-				summary: that.shareDetail.title,
-				image: that.shareDetail.image,
+				href: that.shareInfo.path,
+				title: that.shareInfo.title,
+				summary: that.shareInfo.title,
+				image: that.shareInfo.image,
 				success: res => {
 					console.log('success:' + JSON.stringify(res));
 					this.showShare = false;
@@ -138,12 +150,6 @@ export default {
 			// #ifdef H5
 			this.showShare = false;
 			this.showShareGuide = true;
-			this.$wxsdk.share({
-				title: that.shareDetail.title,
-				desc: that.shareDetail.subtitle || '',
-				path: that.shareDetail.path,
-				image: that.shareDetail.image
-			});
 			// #endif
 		},
 
@@ -173,7 +179,7 @@ export default {
 		copySharePath() {
 			let that = this;
 			uni.setClipboardData({
-				data: that.shareDetail.copyLink,
+				data: that.shareInfo.copyLink,
 				success: data => {
 					that.$u.toast('已复制到剪切板');
 					that.showShare = false;
@@ -187,7 +193,7 @@ export default {
 			switch (this.posterType) {
 				case 'user':
 					data = {
-						backgroundImage: that.configShare.user_poster_bg,
+						backgroundImage: that.initShare.user_poster_bg,
 						drawArray: [
 							{
 								name: '用户昵称',
@@ -215,7 +221,7 @@ export default {
 							{
 								name: 'wxCode',
 								type: 'image',
-								url: `${that.$API_URL}wechat/wxacode?scene=${that.shareDetail.query}`,
+								url: `${that.$API_URL}wechat/wxacode?scene=${that.shareInfo.query}`,
 								alpha: 1,
 								dy: 560,
 								isBgCenter: true,
@@ -227,7 +233,7 @@ export default {
 							{
 								name: '普通二维码',
 								type: 'qrcode',
-								text: that.shareDetail.path,
+								text: that.shareInfo.path,
 								size: 180,
 								dy: 560,
 								isBgCenter: true
@@ -238,7 +244,7 @@ export default {
 					break;
 				case 'goods':
 					data = {
-						backgroundImage: that.configShare.goods_poster_bg,
+						backgroundImage: that.initShare.goods_poster_bg,
 						drawArray: [
 							{
 								name: 'avatar',
@@ -334,7 +340,7 @@ export default {
 							{
 								name: 'wxCode',
 								type: 'image', //微信小程序码
-								url: `${that.$API_URL}wechat/wxacode?scene=${that.shareDetail.query}`,
+								url: `${that.$API_URL}wechat/wxacode?scene=${that.shareInfo.query}`,
 								alpha: 1,
 								dx: 522,
 								dy: 911,
@@ -345,7 +351,7 @@ export default {
 							// #ifndef MP-WEIXIN
 							{
 								type: 'qrcode',
-								text: that.shareDetail.copyLink,
+								text: that.shareInfo.copyLink,
 								size: 110,
 								dx: 530,
 								dy: 930
@@ -356,7 +362,7 @@ export default {
 					break;
 				case 'groupon':
 					data = {
-						backgroundImage: that.configShare.groupon_poster_bg,
+						backgroundImage: that.initShare.groupon_poster_bg,
 						drawArray: [
 							{
 								name: 'avatar',
@@ -443,16 +449,16 @@ export default {
 								textAlign: 'left',
 								textBaseline: 'top',
 								dx: 565,
-								dy: 862
+								dy: 863
 							},
 							// #ifdef MP-WEIXIN
 							{
 								name: 'wxCode',
 								type: 'image', //微信小程序码
-								url: `${that.$API_URL}wechat/wxacode?scene=${that.shareDetail.query}`,
+								url: `${that.$API_URL}wechat/wxacode?scene=${that.shareInfo.query}`,
 								alpha: 1,
-								dx: 522,
-								dy: 911,
+								dx: 530,
+								dy: 930,
 								dWidth: 110,
 								dHeight: 110
 							},
@@ -460,7 +466,7 @@ export default {
 							// #ifndef MP-WEIXIN
 							{
 								type: 'qrcode',
-								text: that.shareDetail.path,
+								text: that.shareInfo.path,
 								size: 110,
 								dx: 530,
 								dy: 930
@@ -474,21 +480,6 @@ export default {
 					break;
 			}
 			return data;
-		},
-		// 绘制成功
-		onSuccess(e) {
-			this.posterImage = e;
-		},
-		// 开始绘制
-		onPoster() {
-			this.posterImage = '';
-			if (this.$store.state.user.isLogin) {
-				this.canvasParams = this.getPosterFormatter();
-				this.showPoster = true;
-			} else {
-				this.$store.dispatch('showAuthModal', 'accountLogin');
-			}
-			this.showShare = false;
 		}
 	}
 };
diff --git a/components/shopro-sku/shopro-sku.vue b/components/shopro-sku/shopro-sku.vue
index 2956b8f3..3f47bceb 100644
--- a/components/shopro-sku/shopro-sku.vue
+++ b/components/shopro-sku/shopro-sku.vue
@@ -1,63 +1,64 @@
 <template>
 	<!-- 规格 -->
-	<u-popup v-model="showModal" :closeable="true" mode="bottom" close-icon-pos="top-right" border-radius="30" v-if="goodsInfo.sku_price">
-		<view class="shop-modal page_box" :style="goodsInfo.is_sku == 0 ? 'height:700rpx' : ''">
-			<!-- 商品卡片-->
-			<view class="top u-flex modal-head__box">
-				<image class="shop-img" :src="currentSkuPrice.image ? currentSkuPrice.image : goodsInfo.image" mode="aspectFill"></image>
-				<view class=" goods-box u-flex-col u-row-between">
-					<view class="goods-title u-ellipsis-2">{{ goodsInfo.title }}</view>
-					<view class="u-flex u-row-between goods-bottom">
-						<view class="price-box u-flex">
-							<view v-if="goodsType === 'score'">{{ currentSkuPrice.price_text || goodsInfo.price }}</view>
-							<view v-else-if="grouponBuyType === 'groupon'">
-								￥{{ currentSkuPrice.groupon_price || (goodsInfo.activity_type === 'groupon' ? goodsInfo.groupon_price : goodsInfo.price) }}
+	<view class="cu-modal bottom-modal" @touchmove.stop.prevent="" :class="{ show: showModal }" @tap.stop="showModal = false" v-if="goodsInfo.sku_price">
+		<view class="cu-dialog" @tap.stop style="border-radius: 30rpx 30rpx 0 0;">
+			<view class="shop-modal page_box" :style="goodsInfo.is_sku == 0 ? 'height:700rpx' : ''">
+				<text class="u-iconfont uicon-close-circle-fill close-icon" @tap.stop="showModal = false"></text>
+				<!-- 商品卡片-->
+				<view class="top u-flex modal-head__box">
+					<image class="shop-img" :src="currentSkuPrice.image ? currentSkuPrice.image : goodsInfo.image" mode="aspectFill"></image>
+					<view class=" goods-box u-flex-col u-row-between">
+						<view class="goods-title u-ellipsis-2">{{ goodsInfo.title }}</view>
+						<view class="u-flex u-row-between goods-bottom">
+							<view class="price-box u-flex">
+								<view v-if="goodsType === 'score'">{{ currentSkuPrice.price_text || goodsInfo.price }}</view>
+								<view v-else-if="grouponBuyType === 'groupon'">
+									￥{{ currentSkuPrice.groupon_price || (goodsInfo.activity_type === 'groupon' ? goodsInfo.groupon_price : goodsInfo.price) }}
+								</view>
+								<view v-else>￥{{ currentSkuPrice.price || goodsInfo.price }}</view>
 							</view>
-							<view v-else>￥{{ currentSkuPrice.price || goodsInfo.price }}</view>
+							<text class="stock">库存{{ currentSkuPrice.stock || goodsInfo.stock }}件</text>
 						</view>
-						<text class="stock">库存{{ currentSkuPrice.stock || goodsInfo.stock }}件</text>
 					</view>
 				</view>
-			</view>
 
-			<!-- 规格选项 -->
-			<scroll-view scroll-y class="content_box">
-				<view class="select-box u-felx-col u-row-left" v-for="(s, x) in skuList" :key="s.id">
-					<view class="type-title">{{ s.name }}</view>
-					<view class="tag-box u-flex u-flex-wrap">
-						<button
-							class="tag u-reset-button"
-							v-for="(sc, y) in s.content"
-							:key="sc.id"
-							:class="{ 'tag-active': currentSkuArray[sc.pid] == sc.id, 'tag-disabled': sc.disabled == true }"
-							:disabled="sc.disabled == true"
-							@tap="chooseSku(sc.pid, sc.id)"
-						>
-							{{ sc.name }}
-						</button>
+				<!-- 规格选项 -->
+				<scroll-view scroll-y class="content_box">
+					<view class="select-box u-flex-col u-row-left" v-for="(s, x) in skuList" :key="s.id">
+						<view class="type-title u-flex">{{ s.name }}</view>
+						<view class="tag-box u-flex u-flex-wrap">
+							<button
+								class="tag u-reset-button"
+								v-for="(sc, y) in s.content"
+								:key="sc.id"
+								:class="{ 'tag-active': currentSkuArray[sc.pid] == sc.id, 'tag-disabled': sc.disabled == true }"
+								:disabled="sc.disabled == true"
+								@tap="chooseSku(sc.pid, sc.id)"
+							>
+								{{ sc.name }}
+							</button>
+						</view>
 					</view>
-				</view>
 
-				<!-- 计步器 -->
-				<view class="buy-num-box u-flex u-row-between">
-					<view class="num-title">购买数量</view>
-					<u-number-box v-model="goodsNum" :min="1" :step="1" :max="maxStep" disabled-input @plus="plus" @change="changeNum"></u-number-box>
+					<!-- 计步器 -->
+					<view class="buy-num-box u-flex u-row-between">
+						<view class="num-title">购买数量</view>
+						<u-number-box v-model="goodsNum" :min="1" :step="1" :max="maxStep" disabled-input @plus="plus" @change="changeNum"></u-number-box>
+					</view>
+				</scroll-view>
+
+				<!-- 功能按钮 -->
+				<view class="btn-box foot_box u-flex u-row-between" v-if="buyType === 'cart' || buyType === 'buy'">
+					<button class="u-reset-button cu-btn save-btn" v-if="(activityRules && activityRules.status === 'ing') || !goodsInfo.activity_type" @tap="confirm">确认</button>
+					<button class="u-reset-button cu-btn cancel-btn" v-if="activityRules && activityRules.status !== 'ing' && goodsInfo.activity_type" @tap="confirm">确定</button>
+				</view>
+				<view class="btn-box foot_box u-flex u-row-between" v-else>
+					<button class="u-reset-button cu-btn  cart-btn" @tap="confirmCart">加入购物车</button>
+					<button class="u-reset-button cu-btn  buy-btn" @tap="confirmBuy">立即购买</button>
 				</view>
-			</scroll-view>
-
-			<!-- 功能按钮 -->
-			<view class="btn-box foot_box u-flex u-row-between" v-if="buyType === 'cart' || buyType === 'buy'">
-				<button class="u-reset-button cu-btn save-btn" v-if="(activityRules && activityRules.status === 'ing') || !goodsInfo.activity_type" @tap="confirm">确认</button>
-				<button class="u-reset-button cu-btn cancel-btn" v-if="activityRules && activityRules.status !== 'ing' && goodsInfo.activity_type" @tap="showModal = false">
-					确定
-				</button>
-			</view>
-			<view class="btn-box foot_box u-flex u-row-between" v-else>
-				<button class="u-reset-button cu-btn  cart-btn" @tap="confirmCart">加入购物车</button>
-				<button class="u-reset-button cu-btn  buy-btn" @tap="confirmBuy">立即购买</button>
 			</view>
 		</view>
-	</u-popup>
+	</view>
 </template>
 
 <script>
@@ -134,6 +135,7 @@ export default {
 			set(val) {
 				val ? uni.hideTabBar() : uni.showTabBar();
 				this.$emit('input', val);
+				return val;
 			}
 		},
 		currentSkuText() {
@@ -364,15 +366,16 @@ export default {
 		},
 		// 确定
 		confirm() {
-			this.confirmSku();
-			switch (this.buyType) {
-				case 'cart':
-					this.confirmCart();
-					break;
-				case 'buy':
-					this.confirmBuy();
-					break;
-				default:
+			if (this.confirmSku()) {
+				switch (this.buyType) {
+					case 'cart':
+						this.confirmCart();
+						break;
+					case 'buy':
+						this.confirmBuy();
+						break;
+					default:
+				}
 			}
 		},
 		// 确定规格
@@ -415,11 +418,6 @@ export default {
 		color: #999;
 		margin-right: 20rpx;
 	}
-
-	.cuIcon-right {
-		color: #bfbfbf;
-		font-size: 36rpx;
-	}
 }
 
 // 规格
@@ -428,6 +426,14 @@ export default {
 	height: 950rpx;
 	background: rgba(255, 255, 255, 1);
 	padding: 20rpx 20rpx 30rpx;
+	position: relative;
+	.close-icon {
+		font-size: 34rpx;
+		color: #e0e0e0;
+		position: absolute;
+		top: 20rpx;
+		right: 20rpx;
+	}
 	// 商品卡片
 	.top {
 		margin: 30rpx 0;
diff --git a/components/shopro-tabbar/shopro-tabbar.vue b/components/shopro-tabbar/shopro-tabbar.vue
index 9d105921..9998f086 100644
--- a/components/shopro-tabbar/shopro-tabbar.vue
+++ b/components/shopro-tabbar/shopro-tabbar.vue
@@ -37,33 +37,21 @@ export default {
 	name: 'shoproTabbar',
 	components: {},
 	data() {
-		return {};
+		return {
+			currentPath: '' //当前页面路径
+		};
+	},
+	mounted() {
+		this.currentPath = this.$Route.path === '/pages/index/index' ? this.$Route.path : this.$Route.fullPath;
 	},
 	computed: {
-		...mapState({
-			tabbarInfo: ({ shopro }) => shopro?.template?.tabbar,
-			cartNum: ({ cart }) => cart.cartNum
-		}),
-		// 底部导航栏配置数据
-		tabbarData() {
-			if (this.tabbarInfo) {
-				return this.tabbarInfo[0].content;
-			}
-		},
+		...mapGetters(['cartNum', 'tabbarData']),
 		// 底部导航栏列表
 		tabbarList() {
 			if (this.tabbarData) {
 				return this.tabbarData.list;
 			}
 		},
-
-		/**
-		 * 当前页面路径
-		 * 去掉首页携带的参数拼接，后台装修是不会带参数
-		 */
-		currentPath() {
-			return this.$Route.path === '/pages/index/index' ? this.$Route.path : this.$Route.fullPath;
-		},
 		// 后台tabbarList数据中必需含有'/pages/index/index',不然逻辑混乱
 		showTabbar() {
 			if (this.tabbarData && this.tabbarData.list) {
diff --git a/env.js b/env.js
index 9dd11b18..74cd31b7 100644
--- a/env.js
+++ b/env.js
@@ -1,9 +1,9 @@
 /**
- *  Shopro全局配置文件 v1.3.2
+ *  Shopro全局配置文件
  */
 
 export const BASE_URL = 'https://demo.shopro.top' //后台根域名
 export const API_URL = `${BASE_URL}/addons/shopro/` //后台接口域名
 export const IMG_URL = 'http://file.shopro.top' //全局网络图片地址变量，css背景图片地址变量在uni.scss
-export const MAP_KEY = '426ebc3f1*****0689ee6061a98'; //高德地图开发者Web服务key,逆坐标解析
-export const HAS_LIVE = false //后台是否开通直播权限,根据情况在manifest.json中，开启注释相应组件的引入。
+export const MAP_KEY = '426ebc3f1bbaced***89ee6061a98'; //高德地图开发者Web服务key,逆坐标解析
+export const HAS_LIVE = false //后台是否开通直播权限,根据情况在manifest.json中，开启注释相应组件的引入，pages.json中打开直播
diff --git a/main.js b/main.js
index 87fd44f9..4c7c646b 100644
--- a/main.js
+++ b/main.js
@@ -1,68 +1,33 @@
-import Vue from 'vue';
-import App from './App';
-// 挂载变量
-import {
-	API_URL,
-	IMG_URL
-} from './env.js';
-Vue.prototype.$API_URL = API_URL;
-Vue.prototype.$IMG_URL = IMG_URL;
-
-// uni方法重写, h5的粘贴板的设置，获取。图片视频的保存
-import '@/shopro/utils/sdk-h5.js'
-
-// 引入路由
+import Vue from "vue";
+import App from "./App";
 import {
 	router,
 	RouterMount
-} from '@/shopro/router';
-Vue.use(router);
-
-// 引入全局uView
-import uView from 'uview-ui';
-Vue.use(uView);
-
-// 挂载请求
-import http from '@/shopro/request';
-Vue.prototype.$http = http;
-
-// 平台判断
-import platform from '@/shopro/platform';
-Vue.prototype.$platform = platform;
-
-// 挂载store状态管理
-import store from '@/shopro/store';
-Vue.prototype.$store = store;
-
-// 挂载工具函数
-import tools from '@/shopro/utils/tools'
-Vue.prototype.$tools = tools;
-
-// mixin混入
-import mixin from '@/shopro/mixins';
-import mixinShare from '@/shopro/mixins/share';
-Vue.mixin(mixin);
-Vue.mixin(mixinShare);
-
-App.mpType = 'app';
-
-const app = new Vue({
-	store,
-	...App
-});
-
-// #ifdef H5
-// 微信H5,sdk挂载
-import wxsdk from '@/shopro/wechat/sdk'
-Vue.prototype.$wxsdk = wxsdk;
-RouterMount(app, router, '#app')
-import VConsole from 'vconsole'
-if (process.env.NODE_ENV === 'development') { // 调试微信jssdk
-	new VConsole()
+} from "@/shopro/router";
+import store from "@/shopro/store";
+import uView from "uview-ui";
+import shopro from "@/shopro";
+
+
+async function bootstrap() {
+	App.mpType = "app";
+	//引入路由
+	Vue.use(router);
+	// 引入全局uView
+	Vue.use(uView);
+	// 加载shopro
+	Vue.use(shopro);
+
+	const app = new Vue({
+		store,
+		...App
+	});
+	// #ifdef H5
+	RouterMount(app, router, "#app");
+	// #endif
+	// #ifndef H5
+	app.$mount();
+	// #endif
 }
-// #endif
 
-// #ifndef H5
-// 为了兼容小程序及app端必须这样写才有效果
-app.$mount();
-// #endif
+bootstrap();
diff --git a/manifest.json b/manifest.json
index e323467b..c2379bdb 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,9 +1,9 @@
 {
-	"name": "Shopro开源商城",
-	"appid": "__UNI__*****",
-	"description": "Shopro开源商城",
-	"versionName": "1.3.2",
-	"versionCode": "100",
+	"name": "Shopro商城",
+	"appid": "__UNI_*****06",
+	"description": "Shopro商城",
+	"versionName": "1.3.6",
+	"versionCode": 137,
 	"transformPx": false,
 	"app-plus": {
 		// APP-VUE分包，可提APP升启动速度，2.7.12开始支持，兼容微信小程序分包方案，默认关闭
@@ -11,7 +11,8 @@
 			"subPackages": true
 		},
 		"runmode": "liberate", // 开启分包优化后，必须配置资源释放模式
-		"safearea": { //APP底部安全区域
+		"safearea": {
+			//APP底部安全区域
 			"background": "#fff",
 			"bottom": {
 				"offset": "auto"
@@ -29,12 +30,10 @@
 		"modules": {
 			"Geolocation": {},
 			"Maps": {},
-			"Webview-x5": {},
 			"OAuth": {},
 			"Payment": {},
 			"Share": {},
-			"VideoPlayer": {},
-			"UIWebview": {}
+			"VideoPlayer": {}
 		},
 		"distribute": {
 			"android": {
@@ -70,17 +69,17 @@
 			"ios": {
 				"capabilities": {
 					"entitlements": {
-						"com.apple.developer.associated-domains": ["applinks:*****top"]
+						"com.apple.developer.associated-domains": ["applinks:m.*****.top"]
 					}
 				},
 				"privacyDescription": {
-					"NSLocalNetworkUsageDescription": "",
 					"NSLocationAlwaysAndWhenInUseUsageDescription": "需要同意获取您的位置信息才能展示附近信息",
 					"NSLocationAlwaysUsageDescription": "需要同意获取您的位置信息才能展示附近信息",
 					"NSLocationWhenInUseUsageDescription": "需要同意获取您的位置信息才能展示附近信息",
 					"NSPhotoLibraryAddUsageDescription": "需要同意访问您的相册才能保存图片",
 					"NSPhotoLibraryUsageDescription": "需要同意访问您的相册才能选取图片",
-					"NSCameraUsageDescription": "需要同意访问您的摄像头才能拍摄照片"
+					"NSCameraUsageDescription": "需要同意访问您的摄像头才能拍摄照片",
+					"NSUserTrackingUsageDescription": "请放心,开启权限不会获取您在其他站点的隐私信息,该权限仅用于标识设备并保障服务安全与提升浏览体验"
 				}
 			},
 			"sdkConfigs": {
@@ -91,77 +90,79 @@
 					},
 					"weixin": {
 						"__platform__": ["ios", "android"],
-						"appid": "wx522*****319ae",
-						"UniversalLinks": "https://*****/uni-universallinks/__UNI__EB95F06"
+						"appid": "wx522b*****ae",
+						"UniversalLinks": "https://m.*****.top/uni-universallinks/__U*****"
 					}
 				},
 				"geolocation": {
 					"amap": {
-						"__platform__": ["ios", "android"],
-						"appkey_ios": "949f86b55*****8632de010206494",
-						"appkey_android": "0d51d7add*****2bcbe264dac409"
+						"__platform__": ["android"],
+						"appkey_ios": "949f86b55f*****de010206494",
+						"appkey_android": "0d51d7*****ebf2bcbe264dac409"
 					}
 				},
 				"maps": {
 					"amap": {
-						"appkey_ios": "949f86b55f78c*****de010206494",
-						"appkey_android": "0d51d7add8*****bcbe264dac409"
+						"appkey_ios": "949f86b55f*****de010206494",
+						"appkey_android": "0d51d7a*****f2bcbe264dac409"
 					}
 				},
 				"oauth": {
 					"weixin": {
-						"appid": "wx522bf*****319ae",
-						"appsecret": "531b39d*****2bf5f6e83c7238fb4dc",
-						"UniversalLinks": "https://*****/uni-universallinks/__UNI__EB95F06"
-					}
+						"appid": "wx522b*****319ae",
+						"appsecret": "531b39d953f9*****e83c7238fb4dc",
+						"UniversalLinks": "https://m.*****.top/uni-universallinks/*****"
+					},
+					"apple": {}
 				},
 				"share": {
 					"weixin": {
-						"appid": "wx522bf*****19ae",
-						"UniversalLinks": "https://*****/uni-universallinks/__UNI__EB95F06"
+						"appid": "wx522*****319ae",
+						"UniversalLinks": "https://m.*****.top/uni-universallinks/__*****"
 					}
-				}
+				},
+				"push": {}
 			},
 			"icons": {
 				"android": {
-					"hdpi": "",
-					"xhdpi": "",
-					"xxhdpi": "",
-					"xxxhdpi": ""
+					"hdpi": "unpackage/res/icons/72x72.png",
+					"xhdpi": "unpackage/res/icons/96x96.png",
+					"xxhdpi": "unpackage/res/icons/144x144.png",
+					"xxxhdpi": "unpackage/res/icons/192x192.png"
 				},
 				"ios": {
-					"appstore": "",
+					"appstore": "unpackage/res/icons/1024x1024.png",
 					"ipad": {
-						"app": "",
-						"app@2x": "",
-						"notification": "",
-						"notification@2x": "",
-						"proapp@2x": "",
-						"settings": "",
-						"settings@2x": "",
-						"spotlight": "",
-						"spotlight@2x": ""
+						"app": "unpackage/res/icons/76x76.png",
+						"app@2x": "unpackage/res/icons/152x152.png",
+						"notification": "unpackage/res/icons/20x20.png",
+						"notification@2x": "unpackage/res/icons/40x40.png",
+						"proapp@2x": "unpackage/res/icons/167x167.png",
+						"settings": "unpackage/res/icons/29x29.png",
+						"settings@2x": "unpackage/res/icons/58x58.png",
+						"spotlight": "unpackage/res/icons/40x40.png",
+						"spotlight@2x": "unpackage/res/icons/80x80.png"
 					},
 					"iphone": {
-						"app@2x": "",
-						"app@3x": "",
-						"notification@2x": "",
-						"notification@3x": "",
-						"settings@2x": "",
-						"settings@3x": "",
-						"spotlight@2x": "",
-						"spotlight@3x": ""
+						"app@2x": "unpackage/res/icons/120x120.png",
+						"app@3x": "unpackage/res/icons/180x180.png",
+						"notification@2x": "unpackage/res/icons/40x40.png",
+						"notification@3x": "unpackage/res/icons/60x60.png",
+						"settings@2x": "unpackage/res/icons/58x58.png",
+						"settings@3x": "unpackage/res/icons/87x87.png",
+						"spotlight@2x": "unpackage/res/icons/80x80.png",
+						"spotlight@3x": "unpackage/res/icons/120x120.png"
 					}
 				}
 			}
 		},
-		"uniStatistics": {
-			"enable": true
+		"kernel": {
+			"ios": "WKWebview" //或者 "WKWebview"  
 		}
 	},
 	"quickapp": {},
 	"mp-weixin": {
-		"appid": "wx39cd*****dd0",
+		"appid": "wx3*****67dd0",
 		"setting": {
 			"urlCheck": false,
 			"es6": true, //消除大多数样式警告
@@ -175,55 +176,38 @@
 		"plugins": {
 			//这段代码，需要放到plugins中。
 			//只有后台开通小程序直播功能权限，才可以打开，不然报错，程序无法运行。
-			// "live-player-plugin" : {
-			//     "version" : "1.3.0", // 注意填写该直播组件最新版本号，微信开发者工具调试时可获取最新版本号
-			//     "provider" : "wx2b03c6e691cd7370" // 必须填该直播组件appid，该示例值即为直播组件appid
+			// "live-player-plugin": {
+			// 	"version": "1.3.2", // 注意填写该直播组件最新版本号，微信开发者工具调试时可获取最新版本号
+			// 	"provider": "wx2b03c6e691cd7370" // 必须填该直播组件appid，该示例值即为直播组件appid
 			// }
 		},
+
 		"usingComponents": true,
 		"permission": {
 			"scope.userLocation": {
 				"desc": "计算附近商家位置"
 			}
-		},
-		"uniStatistics": {
-			"enable": true
 		}
 	},
 	"mp-alipay": {
 		"usingComponents": true,
-		"component2": true,
-		"uniStatistics": {
-			"enable": false
-		}
+		"component2": true
 	},
 	"mp-qq": {
-		"optimization": {
-			"subPackages": true
-		},
-		"appid": "",
-		"uniStatistics": {
-			"enable": false
-		}
+		"appid": ""
 	},
 	"mp-baidu": {
 		"usingComponents": true,
-		"appid": "",
-		"uniStatistics": {
-			"enable": false
-		}
+		"appid": ""
 	},
 	"mp-toutiao": {
 		"usingComponents": true,
-		"appid": "",
-		"uniStatistics": {
-			"enable": false
-		}
+		"appid": ""
 	},
 	"h5": {
 		"template": "template.h5.html",
 		"router": {
-			"mode": "hash",
+			"mode": "history",
 			"base": ""
 		},
 		"optimization": {
@@ -231,9 +215,9 @@
 				"enable": true
 			}
 		},
-		"title": "Shopro开源商城",
+		"title": "Shopro商城",
 		"devServer": {
-			"https": true,
+			"https": false,
 			"port": ""
 		},
 		"sdkConfigs": {
@@ -243,13 +227,7 @@
 				}
 			}
 		},
-		"domain": "*****.com",
-		"uniStatistics": {
-			"enable": true
-		}
+		"domain": "*****.com"
 	},
-	"_spaceID": "f0536ae9*****a7c3e11334",
-	"uniStatistics": {
-		"enable": false
-	}
+	"_spaceID": "f0536a*****8350-2aa7c3e11334"
 }
diff --git a/package.json b/package.json
index 23367581..1bf7a106 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,6 @@
 	"dependencies": {
 		"jweixin-module": "^1.6.0",
 		"uni-read-pages": "^1.0.5",
-		"uni-simple-router": "^2.0.1",
 		"vconsole": "^3.7.0"
 	},
 	"description": ""
diff --git a/pages.json b/pages.json
index cde20b1a..763f03fc 100644
--- a/pages.json
+++ b/pages.json
@@ -127,7 +127,7 @@
 						"enablePullDownRefresh": true
 					},
 					"meta": {
-						"auth": true,
+						"auth": false,
 						"async": false,
 						"title": "拼团详情",
 						"group": "拼团"
@@ -190,7 +190,8 @@
 				{
 					"path": "coupon/list",
 					"style": {
-						"navigationBarTitleText": "优惠券中心"
+						"navigationBarTitleText": "优惠券中心",
+						"navigationStyle": "custom"
 
 
 					},
@@ -417,8 +418,7 @@
 					"path": "detail",
 					"style": {
 						"navigationBarTitleText": "商品详情",
-						"navigationStyle": "custom",
-						"navigationBarTextStyle": "white"
+						"navigationStyle": "custom"
 					},
 					"meta": {
 						"auth": false,
@@ -701,10 +701,12 @@
 					"style": {
 						"navigationBarTitleText": "页面不存在"
 					}
-				}, {
+				},
+				{
 					"path": "loading",
 					"style": {
 						"navigationBarTitleText": "",
+						"navigationStyle": "custom",
 						"enablePullDownRefresh": false
 					}
 
diff --git a/pages/activity/discounts/list.vue b/pages/activity/discounts/list.vue
index 0f86e333..b2d2163e 100644
--- a/pages/activity/discounts/list.vue
+++ b/pages/activity/discounts/list.vue
@@ -20,55 +20,54 @@
 						></u-count-down>
 					</view>
 					<view class="u-flex u-flex-1 u-col-center modal-item u-flex-wrap u-m-t-10" v-if="activityInfo.tags">
-						<u-tag class="title-tag u-m-r-10 u-m-t-10" :text="activityInfo.title" size="mini" bg-color="#FF0000" border-color="#FF0000" color="#fff" />
-						<view class="tag-box u-m-r-10 u-m-t-10" v-for="(tag, index) in activityInfo.tags" :key="tag">{{ tag }}</view>
+						<view class="title-tag cu-tag bg-red sm radius u-m-r-10 u-m-t-10" >{{ activityInfo.title }}</view>
+						<view class="tag-box cu-tag line-red sm radius u-m-r-10 u-m-t-10" v-for="(tag, index) in activityInfo.tags" :key="tag">{{ tag }}</view>
 					</view>
 				</view>
 			</view>
 		</u-sticky>
 		<!-- 商品列表 -->
-		<view class="goods-wrap u-p-10">
-			<u-waterfall v-model="goodsList" ref="uWaterfall">
-				<template v-slot:left="{ leftList }">
-					<view class="goods-item u-m-b-20 u-flex u-row-center u-col-center" v-for="leftGoods in leftList" :key="leftGoods.id">
-						<shopro-goods-card
-							:detail="leftGoods"
-							:type="leftGoods.activity_type"
-							:image="leftGoods.image"
-							:title="leftGoods.title"
-							:subtitle="leftGoods.subtitle"
-							:price="leftGoods.price"
-							:originPrice="leftGoods.original_price"
-							:sales="leftGoods.sales"
-							:tagTextList="leftGoods.activity_discounts_tags"
-							@click="$Router.push({ path: '/pages/goods/detail', query: { id: leftGoods.id } })"
-						></shopro-goods-card>
-					</view>
-				</template>
-				<template v-slot:right="{ rightList }">
-					<view class="goods-item u-m-b-20 u-flex u-row-center u-col-center" v-for="rightGoods in rightList" :key="rightGoods.id">
-						<shopro-goods-card
-							:detail="rightGoods"
-							:type="rightGoods.activity_type"
-							:image="rightGoods.image"
-							:title="rightGoods.title"
-							:subtitle="rightGoods.subtitle"
-							:price="rightGoods.price"
-							:originPrice="rightGoods.original_price"
-							:sales="rightGoods.sales"
-							:tagTextList="rightGoods.activity_discounts_tags"
-							@click="$Router.push({ path: '/pages/goods/detail', query: { id: rightGoods.id } })"
-						></shopro-goods-card>
-					</view>
-				</template>
-			</u-waterfall>
+		<view class="u-waterfall u-p-16" v-if="!isEmpty">
+			<view id="u-left-column" class="u-column">
+				<view class="goods-item u-m-b-16 u-flex u-row-center u-col-center" v-for="leftGoods in leftList" :key="leftGoods.id">
+					<shopro-goods-card
+						:detail="leftGoods"
+						:type="leftGoods.activity_type"
+						:image="leftGoods.image"
+						:title="leftGoods.title"
+						:subtitle="leftGoods.subtitle"
+						:price="leftGoods.price"
+						:originPrice="leftGoods.original_price"
+						:sales="leftGoods.sales"
+						:tagTextList="leftGoods.activity_discounts_tags"
+						@click="$Router.push({ path: '/pages/goods/detail', query: { id: leftGoods.id } })"
+					></shopro-goods-card>
+				</view>
+			</view>
+			<view id="u-right-column" class="u-column">
+				<view class="goods-item u-m-b-16 u-flex u-row-center u-col-center" v-for="rightGoods in rightList" :key="rightGoods.id">
+					<shopro-goods-card
+						:detail="rightGoods"
+						:type="rightGoods.activity_type"
+						:image="rightGoods.image"
+						:title="rightGoods.title"
+						:subtitle="rightGoods.subtitle"
+						:price="rightGoods.price"
+						:originPrice="rightGoods.original_price"
+						:sales="rightGoods.sales"
+						:tagTextList="rightGoods.activity_discounts_tags"
+						@click="$Router.push({ path: '/pages/goods/detail', query: { id: rightGoods.id } })"
+					></shopro-goods-card>
+				</view>
+			</view>
+		</view>
 
-			<!-- 缺省页 -->
-			<shopro-empty v-show="isEmpty" :image="$IMG_URL + '/imgs/empty/empty_goods.png'" tipText="暂无该商品，还有更多好货等着你噢~"></shopro-empty>
+		<!-- 缺省页 -->
+		<shopro-empty v-if="isEmpty" :image="$IMG_URL + '/imgs/empty/empty_goods.png'" tipText="暂无该商品，还有更多好货等着你噢~"></shopro-empty>
+
+		<!-- 加载更多 -->
+		<u-loadmore v-show="goodsList.length" height="80rpx" :status="loadStatus" icon-type="flower" color="#ccc" />
 
-			<!-- 加载更多 -->
-			<u-loadmore v-show="goodsList.length" height="80rpx" :status="loadStatus" icon-type="flower" color="#ccc" />
-		</view>
 		<!-- 登录弹窗 -->
 		<shopro-auth-modal></shopro-auth-modal>
 	</view>
@@ -89,7 +88,15 @@ export default {
 			goodsList: [],
 			loadStatus: 'loadmore', //loadmore-加载前的状态，loading-加载中的状态，nomore-没有更多的状态
 			lastPage: 1,
-			currentPage: 1
+			currentPage: 1,
+			
+			// 瀑布流 350-330
+			addTime: 100, //排序间隙时间
+			leftHeight: 0,
+			rightHeight: 0,
+			leftList: [],
+			rightList: [],
+			tempList: []
 		};
 	},
 	// 触底加载更多
@@ -111,6 +118,40 @@ export default {
 	},
 	methods: {
 		...mapActions(['getCartList']),
+		// 瀑布流相关
+		async splitData() {
+			if (!this.tempList.length) return;
+			let item = this.tempList[0];
+			if (!item) return;
+		
+			// 分左右
+			if (this.leftHeight < this.rightHeight) {
+				this.leftHeight += item.activity_discounts_tags.length ? 350 : 330;
+				this.leftList.push(item);
+			} else if (this.leftHeight > this.rightHeight) {
+				this.rightHeight += item.activity_discounts_tags.length ? 350 : 330;
+				this.rightList.push(item);
+			} else {
+				this.leftHeight += item.activity_discounts_tags.length ? 350 : 330;
+				this.leftList.push(item);
+			}
+		
+			// 移除临时列表的第一项，如果临时数组还有数据，继续循环
+			this.tempList.splice(0, 1);
+			if (this.tempList.length) {
+				setTimeout(() => {
+					this.splitData();
+				}, this.addTime);
+			}
+		},
+		clear() {
+			this.leftList = [];
+			this.rightList = [];
+			this.leftHeight = 0;
+			this.rightHeight = 0;
+			this.tempList = [];
+		},
+		
 		// 计算倒计时
 		getTime() {
 			let nowTime = new Date().getTime();
@@ -146,6 +187,8 @@ export default {
 					that.isEmpty = !that.goodsList.length;
 					that.lastPage = res.data.last_page;
 					that.loadStatus = that.currentPage < res.data.last_page ? 'loadmore' : 'nomore';
+					that.tempList = res.data.data;
+					that.splitData();
 				}
 			});
 		}
@@ -154,6 +197,24 @@ export default {
 </script>
 
 <style lang="scss">
+@mixin vue-flex($direction: row) {
+	/* #ifndef APP-NVUE */
+	display: flex;
+	flex-direction: $direction;
+	/* #endif */
+}
+.u-waterfall {
+	@include vue-flex;
+	flex-direction: row;
+	align-items: flex-start;
+}
+
+.u-column {
+	@include vue-flex;
+	flex: 1;
+	flex-direction: column;
+	height: auto;
+}
 .tip-list-box {
 	background-color: #f6f6f6;
 	padding: 20rpx;
@@ -162,15 +223,5 @@ export default {
 	font-size: 28rpx;
 	background-color: #fff;
 	border-radius: 20rpx;
-
-	.tag-box {
-		border: 1px solid #ff0000;
-		display: inline-block;
-		font-size: 20rpx;
-		line-height: 30rpx;
-		padding: 0 10rpx;
-		color: #ff0000;
-		border-radius: 8rpx;
-	}
 }
 </style>
diff --git a/pages/activity/groupon/detail.vue b/pages/activity/groupon/detail.vue
index a0fcaec7..9e42faa9 100644
--- a/pages/activity/groupon/detail.vue
+++ b/pages/activity/groupon/detail.vue
@@ -14,7 +14,7 @@
 					<template #describe>
 						<view class="u-flex u-m-b-20">
 							<view class="sell-box">
-								<text class=" hot-icon iconfont iconicon-test"></text>
+								<text class=" hot-icon iconfont icon-icon-test"></text>
 								<text class="sell-num">已拼{{ grouponDetail.goods.sales }}件</text>
 							</view>
 							<text class="group-num">{{ grouponDetail.num || 0 }}人团</text>
@@ -29,11 +29,11 @@
 				<!-- 拼团成功 -->
 				<view class="u-flex u-row-center u-col-center" v-if="grouponDetail.status === 'finish' || grouponDetail.status === 'finish-fictitious'">
 					<view class="tip-box u-flex" v-if="grouponDetail.my">
-						<u-icon class="u-m-r-10" name="checkmark-circle-fill" color="#42B111" size="34"></u-icon>
+						<view class="u-iconfont uicon-checkmark-circle-fill u-m-r-10" style="color:#42B111;font-size:34rpx ;"></view>
 						<text>恭喜您~拼团成功！</text>
 					</view>
 					<view class="tip-box u-flex" v-else>
-						<u-icon class="u-m-r-10" name="error-circle-fill" color="#E1212B" size="34"></u-icon>
+						<view class="u-iconfont uicon-close-circle-fill u-m-r-10" style="color:#E1212B;font-size:34rpx ;"></view>
 						<text>对不起~您来晚了，该团已满</text>
 					</view>
 				</view>
@@ -41,7 +41,7 @@
 				<!--  拼团失败-->
 				<view class="u-flex u-row-center u-col-center" v-if="grouponDetail.status === 'invalid'">
 					<view class="tip-box u-flex">
-						<u-icon class="u-m-r-10" name="error-circle-fill" color="#E1212B" size="34"></u-icon>
+						<view class="u-iconfont uicon-close-circle-fill u-m-r-10" style="color:#E1212B;font-size:34rpx ;"></view>
 						<text>{{ grouponDetail.my ? '对不起~拼团已过期！已全额退款' : '对不起~拼团已过期！您来晚了~' }}</text>
 					</view>
 				</view>
@@ -50,8 +50,8 @@
 				<view class="title-box u-flex u-row-center u-col-center" v-if="grouponDetail.status === 'ing'">
 					<!-- 活动结束 -->
 					<view class="" v-if="grouponDetail.activity_status === 'ended'">
-						<view class="tip-box u-flex">
-							<u-icon class="u-m-r-10" name="error-circle-fill" color="#E1212B" size="34"></u-icon>
+						<view class="tip-box u-flex u-col-center">
+							<view class="u-iconfont uicon-close-circle-fill u-m-r-10" style="color:#E1212B;font-size:34rpx ;"></view>
 							<text>对不起~拼团活动已结束！您来晚了~</text>
 						</view>
 					</view>
@@ -106,17 +106,17 @@
 			</view>
 
 			<!-- 玩法 -->
-			<view v-if="activity && activity.id" class="groupon-play u-flex u-row-between" @tap="jump('/pages/public/richtext', { id: activity.richtext_id })">
+			<view v-if="activity && activity.id" class="groupon-play u-flex u-row-between u-col-center" @tap="jump('/pages/public/richtext', { id: activity.richtext_id })">
 				<text class="title">玩法</text>
-				<view class="u-flex">
+				<view class="u-flex u-col-center">
 					<view class="description u-ellipsis-1">{{ activity.richtext_title || '开团/参团·邀请好友·人满发货（不满退款' }}</view>
-					<u-icon name="arrow-right" size="28" color="#666"></u-icon>
+					<view class="u-iconfont uicon-arrow-right u-m-r-10" style="color:#999;font-size:28rpx ;"></view>
 				</view>
 			</view>
 		</view>
 
 		<!-- 邀请好友 -->
-		<shopro-share v-model="showShare" :shareDetail="shareInfo" 　 :posterInfo="grouponDetail" :posterType="'groupon'"></shopro-share>
+		<shopro-share v-model="showShare" :posterInfo="grouponDetail" :posterType="'groupon'"></shopro-share>
 		<!-- 规格弹窗 -->
 
 		<shopro-sku
@@ -160,11 +160,9 @@ export default {
 		clearInterval(timer);
 		timer = null;
 	},
-	// #ifdef H5
 	onUnload() {
 		share.setShareInfo();
 	},
-	// #endif
 	methods: {
 		// 路由跳转
 		jump(path, parmas) {
@@ -208,7 +206,7 @@ export default {
 				that.countDown(t / 1000);
 
 				// 设置分享信息
-				that.shareInfo = share.setShareInfo({
+				share.setShareInfo({
 					title: that.grouponDetail.goods.title,
 					desc: that.grouponDetail.goods.subtitle,
 					image: that.grouponDetail.goods.image,
@@ -268,16 +266,6 @@ export default {
 	.tip-box {
 		font-size: 28rpx;
 		font-weight: bold;
-		.cuIcon-roundcheckfill {
-			color: #42b111;
-			font-size: 34rpx;
-			margin-right: 20rpx;
-		}
-		.cuIcon-roundclosefill {
-			color: #d81e06;
-			font-size: 34rpx;
-			margin-right: 20rpx;
-		}
 	}
 	.title-box {
 		font-size: 26rpx;
diff --git a/pages/activity/groupon/list.vue b/pages/activity/groupon/list.vue
index 26886783..c02bb36f 100644
--- a/pages/activity/groupon/list.vue
+++ b/pages/activity/groupon/list.vue
@@ -9,11 +9,11 @@
 			<view class="goods-item u-m-b-16" v-for="(item, index) in grouponList" :key="item.id" @tap="$Router.push({ path: '/pages/goods/detail', query: { id: item.id } })">
 				<view class="big-goods u-p-20 u-flex u-col-top">
 					<image v-if="index < 3" class="top-tag" :src="tagMap[index]" mode=""></image>
-					<u-image ref="uImage" :width="220" :height="220" border-radius="10" :src="item.image" mode="aspectFill"></u-image>
+					<image class="goods-img" lazy-load fade-show :src="item.image" mode="aspectFill"></image>
 					<view class=" card-right u-m-l-20 u-flex-col u-row-between">
 						<view class="">
 							<view class="goods-title u-ellipsis-1  u-m-t-10 u-m-b-10">
-								<u-tag class="title-tag u-m-r-10" text="拼团" size="mini" bg-color="#FF6600" border-color="#FF6600" color="#fff" />
+								<view class="title-tag cu-tag bg-orange sm radius u-m-r-10">拼团</view>
 								{{ item.title }}
 							</view>
 							<view v-show="item.subtitle" class="subtitle-text u-m-b-10 u-ellipsis-1">{{ item.subtitle }}</view>
@@ -21,7 +21,7 @@
 
 						<view class="u-flex u-m-y-20">
 							<view class="sell-box">
-								<text class=" hot-icon iconfont iconicon-test"></text>
+								<text class=" hot-icon iconfont icon-icon-test"></text>
 								<text class="sell-num">已拼{{ item.sales }}件</text>
 							</view>
 							<text class="group-num">{{ item.activity.rules.team_num || 0 }}人团</text>
@@ -39,20 +39,16 @@
 			</view>
 			<!-- 空白 -->
 			<shopro-empty
+				v-if="!grouponList.length && !isLoading"
 				style="padding-top: 200rpx;"
 				marginTop="0"
-				v-if="!grouponList.length && !isLoading"
 				:image="$IMG_URL + '/imgs/empty/empty_goods.png'"
-				@click="$Router.pushTab('/pages/index/index')"
-				btnText="去首页逛逛"
-				tipText="还没有拼团商品噢，去首页看看吧~"
+				tipText="暂无拼团商品，敬请期待~"
 			></shopro-empty>
 			<!-- 加载更多 -->
 		</view>
 
 		<u-loadmore v-if="grouponList.length" height="80rpx" :status="loadStatus" icon-type="flower" color="#ccc" />
-		<!-- 登录提示 -->
-		<shopro-auth-modal></shopro-auth-modal>
 	</view>
 </template>
 
@@ -162,6 +158,11 @@ export default {
 			box-shadow: 0px 7rpx 8rpx 1rpx rgba(254, 76, 29, 0.05);
 			border-radius: 20rpx;
 			position: relative;
+			.goods-img {
+				width: 220rpx;
+				height: 220rpx;
+				border-radius: 6rpx;
+			}
 			.top-tag {
 				position: absolute;
 				z-index: 3;
@@ -180,9 +181,6 @@ export default {
 				width: 400rpx;
 				color: #000000;
 				vertical-align: middle;
-				.title-tag {
-					transform: scale(0.9);
-				}
 			}
 			.subtitle-text {
 				font-size: 22rpx;
diff --git a/pages/activity/groupon/my-groupon.vue b/pages/activity/groupon/my-groupon.vue
index 352588e1..d11fcbfd 100644
--- a/pages/activity/groupon/my-groupon.vue
+++ b/pages/activity/groupon/my-groupon.vue
@@ -28,7 +28,7 @@
 								<template #describe>
 									<view class="u-flex u-m-b-20">
 										<view class="sell-box">
-											<text class="cuIcon-hotfill"></text>
+											<text class="iconfont  icon-fire"></text>
 											<text class="sell-num">已拼{{ groupon.goods.sales }}件</text>
 										</view>
 										<text class="group-num">{{ groupon.groupon.num || 0 }}人团</text>
@@ -55,8 +55,6 @@
 				<u-loadmore v-if="myGrouponList.length" height="80rpx" :status="loadStatus" icon-type="flower" color="#ccc" />
 			</scroll-view>
 		</view>
-		<!-- 登录提示 -->
-		<shopro-auth-modal></shopro-auth-modal>
 	</view>
 </template>
 
@@ -135,10 +133,14 @@ export default {
 		getMyGroupon() {
 			let that = this;
 			that.loadStatus = 'loading';
-			that.$http('goods.myGroupon', {
-				type: that.stateId,
-				page: that.currentPage
-			}, '加载中').then(res => {
+			that.$http(
+				'goods.myGroupon',
+				{
+					type: that.stateId,
+					page: that.currentPage
+				},
+				'加载中'
+			).then(res => {
 				uni.stopPullDownRefresh();
 				if (res.code === 1) {
 					that.myGrouponList = [...that.myGrouponList, ...res.data.data];
@@ -212,7 +214,7 @@ export default {
 			border-radius: 16rpx;
 			padding: 0 10rpx;
 
-			.cuIcon-hotfill {
+			.icon-fire {
 				color: #e1212b;
 				font-size: 26rpx;
 				margin-right: 10rpx;
diff --git a/pages/activity/seckill/list.vue b/pages/activity/seckill/list.vue
index ae0da03a..4e582052 100644
--- a/pages/activity/seckill/list.vue
+++ b/pages/activity/seckill/list.vue
@@ -14,26 +14,18 @@
 			<scroll-view scroll-y="true" enable-back-to-top @scrolltolower="loadMore" class="scroll-box">
 				<view class="goods-item u-m-b-16" v-for="item in goodsList" :key="item.id" @tap="toSeckillDetail(item.id)">
 					<view class="big-goods  u-flex u-p-20 u-col-top ">
-						<u-image ref="uImage" :width="220" :height="220" border-radius="10" :src="item.image" mode="aspectFill"></u-image>
+						<image class="goods-img"  lazy-load fade-show :src="item.image" mode="aspectFill"></image>
 						<view class=" card-right u-m-l-20 u-flex-col u-row-between">
 							<view class="">
 								<view class="goods-title u-ellipsis-1 u-m-t-10 u-m-b-10">
-									<u-tag class="title-tag u-m-r-10" text="秒杀" size="mini" bg-color="#FF2621" border-color="#FF2621" color="#fff" />
+									<view class="title-tag cu-tag bg-red sm radius u-m-r-10">秒杀</view>
 									{{ item.title }}
 								</view>
 								<view v-show="item.subtitle" class="subtitle-text u-m-b-10 u-ellipsis-1">{{ item.subtitle }}</view>
 							</view>
 
 							<view class="u-flex u-m-y-20">
-								<u-line-progress
-									style="width:210rpx;"
-									height="18"
-									:show-percent="false"
-									:percent="Number(item.percent)"
-									inactive-color=" #e7e7e7"
-									active-color="#ffbbbb "
-								></u-line-progress>
-
+								<view class="cu-progress round sm" style="width:210rpx;"><view :style="[{ width: item.percent + '%',backgroundColor:'#ffbbbb' }]"></view></view>
 								<view class="progress-text">已售出{{ item.sales }}件</view>
 							</view>
 
@@ -53,8 +45,6 @@
 				<u-loadmore v-if="!isEmpty" height="80rpx" :status="loadStatus" icon-type="flower" color="#ccc" />
 			</scroll-view>
 		</view>
-		<!-- 登录提示 -->
-		<shopro-auth-modal></shopro-auth-modal>
 	</view>
 </template>
 
@@ -180,6 +170,11 @@ export default {
 		background: #ffffff;
 		box-shadow: 0px 7rpx 8rpx 1rpx rgba(254, 76, 29, 0.05);
 		border-radius: 20rpx;
+		.goods-img {
+			width: 220rpx;
+			height: 220rpx;
+			border-radius: 6rpx;
+		}
 		.card-right {
 			width: 430rpx;
 			height: 220rpx;
@@ -189,9 +184,6 @@ export default {
 			font-weight: 600;
 			width: 400rpx;
 			color: #000000;
-			.title-tag {
-				transform: scale(0.9);
-			}
 		}
 		.subtitle-text {
 			font-size: 22rpx;
diff --git a/pages/activity/sign/index.vue b/pages/activity/sign/index.vue
index d3f47bbc..bdced6e9 100644
--- a/pages/activity/sign/index.vue
+++ b/pages/activity/sign/index.vue
@@ -15,11 +15,11 @@
 			<!-- 切换年月 -->
 			<view class="bar u-flex u-row-center">
 				<view class="previous" @tap="handleCalendar(0)">
-					<button class="u-reset-button bar-btn u-p-r-30"><u-icon name="arrow-left" size="28" color="#c4c4c4"></u-icon></button>
+					<button class="u-reset-button bar-btn u-p-r-30"><view class="u-iconfont uicon-arrow-left" style="color:#c4c4c4 ;font-size:28rpx ;"></view></button>
 				</view>
 				<view class="date">{{ cur_year || '--' }} 年 {{ cur_month || '--' }} 月</view>
 				<view class="next" @tap="handleCalendar(1)">
-					<button class="u-reset-button bar-btn u-p-l-30"><u-icon name="arrow-right" size="28" color="#c4c4c4"></u-icon></button>
+					<button class="u-reset-button bar-btn u-p-l-30"><view class="u-iconfont uicon-arrow-right" style="color:#c4c4c4 ;font-size:28rpx ;"></view></button>
 				</view>
 			</view>
 
@@ -50,8 +50,8 @@
 				</view>
 			</view>
 		</view>
-		<u-popup v-model="showSign" mode="center" border-radius="20">
-			<view class="sign-modal-box">
+		<view class="cu-modal" :class="{ show: showSign }" @tap="showSign = false">
+			<view class="sign-modal-box cu-dialog" style="width: 610rpx;">
 				<view class="modal-head u-flex-col u-col-center">
 					<image class="modal-bg" :src="$IMG_URL + '/imgs/modal/sign_modal_bg.jpg'" mode=""></image>
 					<image class="sign-tag" :src="$IMG_URL + '/imgs/modal/sign_modal_succeed.png'" mode=""></image>
@@ -67,9 +67,7 @@
 				</view>
 				<view class="modal-bottom u-flex u-row-center"><button class="u-reset-button confirem-btn" @tap="showSign = false">确认</button></view>
 			</view>
-		</u-popup>
-		<!-- 登录 -->
-		<shopro-auth-modal ></shopro-auth-modal>
+		</view>
 	</view>
 </template>
 
@@ -152,10 +150,12 @@ export default {
 			let that = this;
 			let month = that.cur_month.toString().padStart(2, '0');
 			let query = `${that.cur_year}-${month}`;
-			that.$http('user.sign', {
-				month: query
-			},
-			'签到中...'
+			that.$http(
+				'user.sign',
+				{
+					month: query
+				},
+				'签到中...'
 			).then(res => {
 				if (res.code == 1) {
 					that.getSignList();
@@ -331,13 +331,13 @@ export default {
 		padding: 30rpx 0;
 		.sign-success {
 			font-size: 34rpx;
-			
+
 			font-weight: bold;
 			color: rgba(227, 173, 91, 1);
 		}
 		.sign-score {
 			font-size: 26rpx;
-			
+
 			font-weight: 500;
 			color: rgba(153, 153, 153, 1);
 			padding-top: 16rpx;
@@ -352,7 +352,7 @@ export default {
 			border-radius: 35rpx;
 			padding: 0;
 			font-size: 28rpx;
-			
+
 			font-weight: 500;
 			color: rgba(255, 255, 255, 0.9);
 		}
diff --git a/pages/app/commission/apply.vue b/pages/app/commission/apply.vue
index 22ae3c06..175614d6 100644
--- a/pages/app/commission/apply.vue
+++ b/pages/app/commission/apply.vue
@@ -3,7 +3,7 @@
 	<view class="apply-commission-wrap">
 		<!-- 标题栏 -->
 		<view class="head-box" :style="{ backgroundImage: ' url(' + formHeadImg + ')' }">
-			<u-navbar :isFixed="false" :borderBottom="false" back-icon-color="#fff" :background="{}"></u-navbar>
+			<shopro-navbar back-icon-color="#fff" :background="{}"></shopro-navbar>
 		</view>
 
 		<!-- 表单 -->
diff --git a/pages/app/commission/commission-log.vue b/pages/app/commission/commission-log.vue
index c5113b5c..52c49a95 100644
--- a/pages/app/commission/commission-log.vue
+++ b/pages/app/commission/commission-log.vue
@@ -7,7 +7,7 @@
 				<view class="head-box u-flex">
 					<view class="head-title">总收益（元）</view>
 					<button class="u-reset-button look-btn" @tap="showMoney = !showMoney">
-						<u-icon :name="showMoney ? 'eye-fill' : 'eye-off'" size="50" color="#fff"></u-icon>
+						<view class="u-iconfont" :class="showMoney ? 'uicon-eye-fill' : 'uicon-eye-off'" style="color: #fff;font-size: 50rpx;"></view>
 					</button>
 				</view>
 				<view class="card-num">{{ showMoney ? agentInfo.total_income || '0.00' : '***' }}</view>
@@ -28,9 +28,9 @@
 		<!-- 筛选 -->
 		<u-sticky offset-top="0" :enable="true">
 			<view class="head_box u-flex u-row-between">
-				<button class="u-reset-button date-btn" @tap="showCalendar = true">
+				<button class="u-reset-button date-btn u-flex u-col-center" @tap="showCalendar = true">
 					{{ selDateText }}
-					<u-icon class="u-m-l-20" name="arrow-down-fill" size="28" color="#e5e5e5"></u-icon>
+					<text class="u-iconfont uicon-arrow-down-fill u-m-l-20" style="color:#e5e5e5 ; font-size: 34rpx;"></text>
 				</button>
 				<view class="">
 					<view class="total-box">{{ stateMap[stateCurrent] }}￥{{ totalMoney || '0.00' }}</view>
@@ -63,7 +63,7 @@
 			<!-- 更多 -->
 			<u-loadmore v-if="rewardLog.length" height="80rpx" :status="loadStatus" icon-type="flower" color="#ccc" />
 			<!-- 缺省页 -->
-			<shopro-empty v-show="isEmpty" marginTop="100rpx" :image="$IMG_URL + '/imgs/empty/no_data.png'" tipText="暂无数据"></shopro-empty>
+			<shopro-empty v-if="isEmpty" marginTop="100rpx" :image="$IMG_URL + '/imgs/empty/no_data.png'" tipText="暂无数据"></shopro-empty>
 		</view>
 		<!-- 日期选择 -->
 		<u-calendar
@@ -84,7 +84,7 @@
 </template>
 
 <script>
-import { mapMutations, mapActions, mapState } from 'vuex';
+import { mapMutations, mapActions, mapState, mapGetters } from 'vuex';
 export default {
 	components: {},
 	data() {
@@ -139,10 +139,7 @@ export default {
 		};
 	},
 	computed: {
-		...mapState({
-			userInfo: ({ user }) => user.userInfo,
-			agentInfo: ({ user }) => user.agentInfo
-		})
+		...mapGetters(['userInfo', 'agentInfo'])
 	},
 	onLoad() {
 		this.getToday();
@@ -294,13 +291,6 @@ export default {
 			background: none;
 			padding: 0;
 			margin-left: 20rpx;
-			.cuIcon-attentionfill,
-			.cuIcon-attentionforbidfill {
-				line-height: 30rpx;
-			}
-			.cuIcon-attentionfill {
-				line-height: 30rpx;
-			}
 		}
 	}
 	.card-num {
diff --git a/pages/app/commission/goods.vue b/pages/app/commission/goods.vue
index c7c200f1..d76f9d9d 100644
--- a/pages/app/commission/goods.vue
+++ b/pages/app/commission/goods.vue
@@ -16,9 +16,9 @@
 		</view>
 
 		<!-- 	分享组件 -->
-		<shopro-share v-model="showShare" :shareDetail="shareInfo" :posterInfo="posterInfo" :posterType="'goods'"></shopro-share>
+		<shopro-share v-model="showShare" :posterInfo="posterInfo" :posterType="'goods'"></shopro-share>
 		<!-- 缺省页 -->
-		<shopro-empty v-show="isEmpty" :image="$IMG_URL + '/imgs/empty/no_data.png'" tipText="暂无数据"></shopro-empty>
+		<shopro-empty v-if="isEmpty" :image="$IMG_URL + '/imgs/empty/no_data.png'" tipText="暂无数据"></shopro-empty>
 		<!-- 更多 -->
 		<u-loadmore v-if="goodsList.length" height="80rpx" :status="loadStatus" icon-type="flower" color="#ccc" />
 	</view>
@@ -43,11 +43,9 @@ export default {
 	onLoad() {
 		this.getGoodList();
 	},
-	// #ifdef H5
 	onUnload() {
 		share.setShareInfo();
 	},
-	// #endif
 	onReachBottom() {
 		if (this.currentPage < this.lastPage) {
 			this.currentPage += 1;
@@ -66,7 +64,7 @@ export default {
 			const that = this;
 			let goodsInfo = this.goodsList[index];
 			this.posterInfo = goodsInfo;
-			that.shareInfo = share.setShareInfo({
+			share.setShareInfo({
 				title: goodsInfo.title,
 				desc: goodsInfo.subtitle,
 				image: goodsInfo.image,
diff --git a/pages/app/commission/index.vue b/pages/app/commission/index.vue
index 45866517..bf12aa98 100644
--- a/pages/app/commission/index.vue
+++ b/pages/app/commission/index.vue
@@ -3,7 +3,7 @@
 	<view style="width:100%;height: 100%;">
 		<view class="commission-wrap" :class="{ blur: !hasAuth }">
 			<!-- 标题栏 -->
-			<u-navbar :isFixed="false" :borderBottom="false" back-icon-color="#fff" :background="{}"></u-navbar>
+			<shopro-navbar back-icon-color="#fff" :background="{}"></shopro-navbar>
 
 			<!-- 用户资料 -->
 			<view class="user-card">
@@ -16,7 +16,7 @@
 								<view class="tag-box u-flex" v-if="commissionLv">
 									<image v-if="commissionLv.image" class="tag-img" :src="commissionLv.image" mode=""></image>
 									<text class="tag-title">{{ commissionLv.name }}</text>
-									<u-icon v-show="showLv" name="arrow-right" size="28" color="#fff"></u-icon>
+									<view v-show="showLv" class="u-iconfont uicon-arrow-right" style="color: #fff;font-size: 28rpx;"></view>
 								</view>
 							</view>
 						</view>
@@ -25,7 +25,7 @@
 						<view class="u-flex-col u-col-center">
 							<button class="u-reset-button log-btn u-m-b-20" @tap="jump('/pages/app/commission/commission-log')">明细</button>
 							<button class="u-reset-button look-btn" @tap="showMoney = !showMoney">
-								<u-icon :name="showMoney ? 'eye-fill' : 'eye-off'" size="50" color="#fff"></u-icon>
+								<view class="u-iconfont" :class="showMoney ? 'uicon-eye-fill' : 'uicon-eye-off'" style="color: #fff;font-size: 50rpx;"></view>
 							</button>
 						</view>
 					</view>
@@ -81,10 +81,7 @@
 		</view>
 
 		<!-- 	分享组件 -->
-		<shopro-share v-model="showShare" :shareDetail="shareInfo" posterType="user"></shopro-share>
-
-		<!-- 登录提示 -->
-		<shopro-auth-modal></shopro-auth-modal>
+		<shopro-share v-model="showShare" posterType="user"></shopro-share>
 
 		<!-- 佣金中心权限验证 -->
 		<u-popup v-if="showAuthModal" class="auth-box" :mask="false" v-model="showAuthModal" mode="center" :mask-close-able="false" close-icon-pos="top-left" border-radius="20">
@@ -183,7 +180,7 @@
 </template>
 
 <script>
-import { mapMutations, mapActions, mapState } from 'vuex';
+import { mapMutations, mapActions, mapState, mapGetters } from 'vuex';
 import share from '@/shopro/share';
 export default {
 	components: {},
@@ -257,10 +254,7 @@ export default {
 		};
 	},
 	computed: {
-		...mapState({
-			userInfo: ({ user }) => user.userInfo,
-			agentInfo: ({ user }) => user.agentInfo
-		}),
+		...mapGetters(['userInfo', 'agentInfo']),
 		showAuthModal: {
 			get() {
 				return !!this.authNotice.title && !this.hasAuth;
@@ -296,7 +290,6 @@ export default {
 		// 跳转
 		jump(path, query) {
 			if (!path) {
-				this.shareInfo = share.setShareInfo();
 				this.showShare = true;
 			} else {
 				this.$Router.push({
diff --git a/pages/app/commission/order.vue b/pages/app/commission/order.vue
index 75e11ee8..b7d332be 100644
--- a/pages/app/commission/order.vue
+++ b/pages/app/commission/order.vue
@@ -3,7 +3,7 @@
 	<view class="page_box commission-order-wrap">
 		<view class="head_box">
 			<!-- 标题栏 -->
-			<u-navbar :isFixed="false" :borderBottom="false" back-icon-color="#fff" :background="{}" :backTextStyle="backTextStyle" backText="分销订单"></u-navbar>
+			<shopro-navbar back-icon-color="#fff" :background="{}" :backTextStyle="{ color: '#fff', fontSize: '40rpx', fontWeight: '500' }" backText="分销订单"></shopro-navbar>
 
 			<!-- 团队数据总览 -->
 			<view class="team-data-box u-flex u-row-between">
@@ -57,9 +57,9 @@
 			<view class="">
 				<!-- 日期筛选 -->
 				<view class="filter-box u-flex u-row-between">
-					<button class="u-reset-button date-btn" @tap="showCalendar = true">
+					<button class="u-reset-button date-btn u-flex u-col-center" @tap="showCalendar = true">
 						{{ selDateText }}
-						<u-icon class="u-m-l-20" name="arrow-down-fill" size="28" color="#e5e5e5"></u-icon>
+						<text class="u-iconfont uicon-arrow-down-fill u-m-l-20" style="color:#e5e5e5 ; font-size: 34rpx;"></text>
 					</button>
 					<view class="">
 						<view class="total-box">{{ stateMap[stateCurrent] }}￥{{ amount || '0.00' }}</view>
@@ -110,7 +110,7 @@
 					</view>
 				</view>
 				<!-- 缺省页 -->
-				<shopro-empty marginTop="100rpx" v-show="isEmpty" :image="$IMG_URL + '/imgs/empty/no_order.png'" tipText="暂无订单"></shopro-empty>
+				<shopro-empty marginTop="100rpx" v-if="isEmpty" :image="$IMG_URL + '/imgs/empty/no_order.png'" tipText="暂无订单"></shopro-empty>
 				<!-- 更多 -->
 				<u-loadmore v-if="orderList.length" height="80rpx" :status="loadStatus" icon-type="flower" color="#ccc" />
 			</scroll-view>
@@ -134,7 +134,7 @@
 </template>
 
 <script>
-import { mapMutations, mapActions, mapState } from 'vuex';
+import { mapMutations, mapActions, mapState, mapGetters } from 'vuex';
 export default {
 	components: {},
 	data() {
@@ -187,10 +187,7 @@ export default {
 		};
 	},
 	computed: {
-		...mapState({
-			userInfo: state => state.user.userInfo,
-			agentInfo: ({ user }) => user.agentInfo
-		})
+		...mapGetters(['userInfo', 'agentInfo'])
 	},
 	onLoad() {
 		this.getToday();
diff --git a/pages/app/commission/rankings.vue b/pages/app/commission/rankings.vue
index ddd70d55..809cf859 100644
--- a/pages/app/commission/rankings.vue
+++ b/pages/app/commission/rankings.vue
@@ -2,7 +2,7 @@
 <template>
 	<view class="rankings-wrap">
 		<!-- 标题栏 -->
-		<u-navbar :isFixed="false" :borderBottom="false" back-icon-color="#fff" :background="{}" :backTextStyle="backTextStyle" backText="分销排行"></u-navbar>
+		<shopro-navbar back-icon-color="#fff" :background="{}" :backTextStyle="{ color: '#fff', fontSize: '40rpx', fontWeight: '500' }" backText="分销排行榜"></shopro-navbar>
 
 		<!-- 排行榜 -->
 		<view class="rankings-list-box">
@@ -37,11 +37,6 @@ export default {
 	components: {},
 	data() {
 		return {
-			backTextStyle: {
-				color: '#fff',
-				fontSize: '40rpx',
-				fontWeight: '500'
-			},
 			rankingsIcon: {
 				0: this.$IMG_URL + '/imgs/commission/01.png',
 				1: this.$IMG_URL + '/imgs/commission/02.png',
diff --git a/pages/app/commission/share-log.vue b/pages/app/commission/share-log.vue
index 52fc1753..14b8e24c 100644
--- a/pages/app/commission/share-log.vue
+++ b/pages/app/commission/share-log.vue
@@ -5,7 +5,7 @@
 		<view class="head_box">
 			<view class="nav-box">
 				<!-- 标题栏 -->
-				<u-navbar :isFixed="false" :borderBottom="false" back-icon-color="#fff" :background="{}" :backTextStyle="backTextStyle" backText="分享记录"></u-navbar>
+				<shopro-navbar back-icon-color="#fff" :background="{}" :backTextStyle="{ color: '#fff', fontSize: '40rpx', fontWeight: '500' }" backText="分享记录"></shopro-navbar>
 			</view>
 			<!-- 分类tab -->
 			<view class="tab-box u-flex">
@@ -50,11 +50,6 @@ export default {
 	components: {},
 	data() {
 		return {
-			backTextStyle: {
-				color: '#fff',
-				fontSize: '40rpx',
-				fontWeight: '500'
-			},
 			shareLogList: [], //分享记录
 			tabCurrent: 'all', //默认
 			tabsList: [
diff --git a/pages/app/commission/team.vue b/pages/app/commission/team.vue
index de88b438..42b71d2a 100644
--- a/pages/app/commission/team.vue
+++ b/pages/app/commission/team.vue
@@ -3,7 +3,7 @@
 	<view class="page_box team-wrap">
 		<view class="head_box">
 			<!-- 标题栏 -->
-			<u-navbar :isFixed="false" :borderBottom="false" back-icon-color="#fff" :background="{}" :backTextStyle="backTextStyle" backText="我的团队"></u-navbar>
+			<shopro-navbar back-icon-color="#fff" :background="{}" :backTextStyle="{ color: '#fff', fontSize: '40rpx', fontWeight: '500' }" backText="我的团队"></shopro-navbar>
 			<!-- 推荐人 -->
 			<view class="referrer-box u-flex u-p-x-20" v-if="referrerInfo && referrerInfo.avatar">
 				推荐人：
@@ -77,14 +77,12 @@
 									</view>
 								</view>
 								<button class="cu-btn refresh-btn u-flex u-row-center u-col-center" @tap.stop="childrenLoadMore(item.id)">
-									<u-icon
+									<view
 										v-if="childrenCurrentPage < childrenLastPage"
+										class="u-iconfont uicon-reload u-m-r-10"
 										:class="{ 'refresh-active': isRefresh }"
-										class="u-m-r-10"
-										name="reload"
-										size="26"
-										color="#999"
-									></u-icon>
+										style="color: #999;font-size: 26rpx;"
+									></view>
 									{{ childrenLoad ? '点击加载更多' : '没有更多~' }}
 								</button>
 							</view>
@@ -92,7 +90,7 @@
 					</view>
 				</view>
 				<!-- 缺省页 -->
-				<shopro-empty v-show="isEmpty" marginTop="50rpx" :image="$IMG_URL + '/imgs/empty/no_team.png'" tipText="暂无团队人员"></shopro-empty>
+				<shopro-empty v-if="isEmpty" marginTop="50rpx" :image="$IMG_URL + '/imgs/empty/no_team.png'" tipText="暂无团队人员"></shopro-empty>
 				<!-- 更多 -->
 				<u-loadmore v-if="teamList.length" height="80rpx" :status="loadStatus" icon-type="flower" color="#ccc" />
 			</scroll-view>
@@ -102,18 +100,13 @@
 
 <script>
 import shCollapseItem from '../components/sh-collapse-item.vue';
-import { mapMutations, mapActions, mapState } from 'vuex';
+import { mapMutations, mapActions, mapState, mapGetters } from 'vuex';
 export default {
 	components: {
 		shCollapseItem
 	},
 	data() {
 		return {
-			backTextStyle: {
-				color: '#fff',
-				fontSize: '40rpx',
-				fontWeight: '500'
-			},
 			isEmpty: false,
 			referrerInfo: {}, //推荐人信息
 			twoTeamCount: 0, //二级成员
@@ -130,10 +123,7 @@ export default {
 		};
 	},
 	computed: {
-		...mapState({
-			userInfo: ({ user }) => user.userInfo,
-			agentInfo: ({ user }) => user.agentInfo
-		})
+		...mapGetters(['userInfo', 'agentInfo'])
 	},
 	onLoad() {
 		this.getTeam();
@@ -244,11 +234,6 @@ export default {
 	font-weight: 500;
 	color: #999999;
 	white-space: nowrap;
-	.cuIcon-refresh {
-		color: #dbdbdb;
-		margin-right: 12rpx;
-		font-size: 32rpx;
-	}
 }
 .refresh-active {
 	transform: rotate(360deg);
diff --git a/pages/app/components/sh-collapse-item.vue b/pages/app/components/sh-collapse-item.vue
index 804e72cc..64eb503d 100644
--- a/pages/app/components/sh-collapse-item.vue
+++ b/pages/app/components/sh-collapse-item.vue
@@ -18,7 +18,7 @@
 				</view>
 			</view>
 			<button v-if="childNum" class="u-reset-button arrow-btn" :class="{ 'arrow-active': showUnfold }" @tap="onArrow">
-				<u-icon class="u-m-l-20" name="arrow-down" size="26" color="#999"></u-icon>
+				<view class="u-iconfont uicon-arrow-down u-m-l-20" style="color: #999;font-size: 26rpx;"></view>
 			</button>
 		</view>
 		<slot v-if="showUnfold" name="collapse-children"></slot>
diff --git a/pages/app/coupon/detail.vue b/pages/app/coupon/detail.vue
index 63fefbc7..314fe527 100644
--- a/pages/app/coupon/detail.vue
+++ b/pages/app/coupon/detail.vue
@@ -2,7 +2,7 @@
 <template>
 	<view class="page_box">
 		<!-- 标题栏 -->
-		<u-navbar backText="优惠券详情" :borderBottom="false" :background="{}" :z-index="99" :is-fixed="true"></u-navbar>
+		<shopro-navbar back-icon-color="#fff" :background="{}" :backTextStyle="{ color: '#fff', fontSize: '36rpx', fontWeight: '500' }" backText="优惠券详情"></shopro-navbar>
 		<view class="content_box">
 			<scroll-view class="scroll-box" scroll-y="true" scroll-with-animation enable-back-to-top :scroll-into-view="scrollId" @scroll="onScroll">
 				<!-- 详情卡片 -->
@@ -11,7 +11,7 @@
 						<view class="img-box u-flex u-row-center u-col-center"><image class="coupon-img" :src="$IMG_URL + '/imgs/coupon.png'" mode=""></image></view>
 						<view class="title">{{ couponDetail.amount || '0.00' }}元优惠券</view>
 						<view class="tip">满{{ couponDetail.enough || '0.00' }}元可用</view>
-						<button class="u-reset-button" :class="btnStataus == 'no_use' || !btnStataus ? 'use-btn' : 'fail-btn'" @tap="goScroll">
+						<button class="u-reset-button" :class="['can_use', 'can_get'].includes(btnStataus) ||　!btnStataus ? 'use-btn' : 'fail-btn'" @tap="goScroll">
 							{{ btnStatusText[btnStataus] || '立即领取' }}
 						</button>
 						<view class="time" v-if="couponDetail.usetime && couponDetail.usetime.start">
@@ -43,8 +43,6 @@
 				</view>
 			</scroll-view>
 		</view>
-		<!-- 登录提示 -->
-		<shopro-auth-modal></shopro-auth-modal>
 	</view>
 </template>
 
@@ -59,10 +57,12 @@ export default {
 			nowTime: new Date().getTime(),
 			options: {},
 			btnStatusText: {
-				no_use: '立即使用',
+				can_use: '立即使用',
 				used: '已使用',
 				expired: '已失效',
-				no_can_use: '暂不可用'
+				cannot_use: '暂不可用',
+				can_get: '立即领取',
+				cannot_get: '不可领取'
 			},
 			btnStataus: ''
 		};
@@ -87,6 +87,7 @@ export default {
 				if (res.code === 1) {
 					this.options.userCouponId = res.data.id;
 					that.getCouponDetail();
+					that.$u.toast('领取成功')
 				}
 			});
 		},
@@ -123,7 +124,7 @@ export default {
 			if (!this.options.userCouponId) {
 				this.getCoupon();
 			} else {
-				if (this.couponDetail.goods_ids === '0' && this.btnStataus == 'no_use') {
+				if (this.couponDetail.goods_ids === '0' && this.btnStataus == 'can_use') {
 					this.$Router.push({
 						path: '/pages/goods/list'
 					});
diff --git a/pages/app/coupon/list.vue b/pages/app/coupon/list.vue
index ce6a127f..71470248 100644
--- a/pages/app/coupon/list.vue
+++ b/pages/app/coupon/list.vue
@@ -2,11 +2,24 @@
 <template>
 	<view class="page_box">
 		<view class="head_box u-m-b-20">
-			<view class="coupon-nav u-flex">
-				<view class="nav-item u-flex-col u-flex-1 u-row-center u-col-center" v-for="nav in couponsState" :key="nav.id" @tap="onNav(nav.id)">
-					<view class="item-title">{{ nav.title }}</view>
-					<text class="nav-line" :class="{ 'line-active': stateCurrent === nav.id }"></text>
+			<shopro-navbar back-icon-color="#333" :background="{ backgroundColor: '#fff' }">
+				<view slot="content" class="u-flex nav-wrap">
+					<view class="nav-item u-flex-1 u-flex-col u-row-center u-col-center" v-for="nav in navbarHeadState" :key="nav.value" @tap="onHead(nav.value)">
+						<view class="item-title" :class="{ 'title-active': navState === nav.value }">{{ nav.title }}</view>
+						<text class="nav-line" :class="{ 'line-active': navState === nav.value }"></text>
+					</view>
 				</view>
+			</shopro-navbar>
+			<view class="coupon-nav u-flex" v-show="navState === 'user'">
+				<button
+					class=" cu-btn nav-btn u-flex-col u-row-center u-col-center"
+					:class="{ 'btn-active': nav.id == stateCurrent }"
+					v-for="nav in couponsState"
+					:key="nav.id"
+					@tap="onNav(nav.id)"
+				>
+					<view class="item-title">{{ nav.title }}</view>
+				</button>
 			</view>
 		</view>
 		<view class="content_box">
@@ -14,10 +27,8 @@
 				<shopro-coupon :state="stateCurrent" :couponData="c"></shopro-coupon>
 			</view>
 			<!-- 缺省页 -->
-			<shopro-empty marginTop="300rpx" v-show="isEmpty" :image="$IMG_URL + '/imgs/empty/empty_goods.png'" tipText="暂无此类优惠券"></shopro-empty>
+			<shopro-empty marginTop="300rpx" v-if="isEmpty" :image="$IMG_URL + '/imgs/empty/empty_goods.png'" tipText="暂无此类优惠券"></shopro-empty>
 		</view>
-		<!-- 登录提示 -->
-		<shopro-auth-modal></shopro-auth-modal>
 	</view>
 </template>
 
@@ -28,22 +39,29 @@ export default {
 		return {
 			stateCurrent: 0,
 			isEmpty: false,
-			couponsState: [
+			navState: 'event',
+			navbarHeadState: [
 				{
-					id: 0,
+					value: 'event',
 					title: '领券中心'
 				},
+				{
+					value: 'user',
+					title: '我的优惠券'
+				}
+			],
+			couponsState: [
 				{
 					id: 1,
 					title: '可使用'
 				},
 				{
 					id: 2,
-					title: '已使用'
+					title: '暂不可用'
 				},
 				{
 					id: 3,
-					title: '已失效'
+					title: '无效优惠券'
 				}
 			],
 			couponList: []
@@ -61,6 +79,19 @@ export default {
 				this.getCouponList();
 			}
 		},
+		onHead(value) {
+			if (this.navState !== value) {
+				this.navState = value;
+				if (value === 'event') {
+					this.stateCurrent = 0;
+				}
+				if (value === 'user') {
+					this.stateCurrent = 1;
+				}
+				this.couponList = [];
+				this.getCouponList();
+			}
+		},
 		jump(path, parmas) {
 			this.$Router.push({
 				path: path,
@@ -92,29 +123,51 @@ export default {
 </script>
 
 <style lang="scss">
+.nav-item {
+	flex: 1;
+	height: 100%;
+	.item-title {
+		font-size: 30rpx;
+		font-weight: 400;
+		color: #666;
+	}
+	.title-active {
+		font-size: 32rpx;
+		font-weight: 500;
+		color: #333;
+	}
+	.nav-line {
+		width: 128rpx;
+		height: 6rpx;
+		border-radius: 3rpx;
+		background: #fff;
+	}
+
+	.line-active {
+		background: #e9b664;
+	}
+}
+.nav-wrap {
+	/* #ifdef MP-WEIXIN */
+	width: 460rpx;
+	/* #endif */
+	/* #ifndef MP-WEIXIN */
+	width: 100%;
+	/* #endif */
+}
 .coupon-nav {
 	background: #fff;
 	height: 100rpx;
-
-	.nav-item {
-		flex: 1;
-		height: 100%;
-		.item-title {
-			font-size: 30rpx;
-			font-weight: 400;
-			color: rgba(51, 51, 51, 1);
-			line-height: 94rpx;
-		}
-
-		.nav-line {
-			width: 120rpx;
-			height: 4rpx;
-			background: #fff;
-		}
-
-		.line-active {
-			background: rgba(230, 184, 115, 1);
-		}
+	padding: 0 30rpx;
+	.nav-btn {
+		margin-right: 10rpx;
+		font-size: 26rpx;
+		color: #666;
+	}
+	.btn-active {
+		font-size: 26rpx;
+		color: #fff;
+		background-color: #faae0c;
 	}
 }
 .coupon-list {
diff --git a/pages/app/live/list.vue b/pages/app/live/list.vue
index da210480..3ee250ef 100644
--- a/pages/app/live/list.vue
+++ b/pages/app/live/list.vue
@@ -11,26 +11,25 @@
 		</view>
 		<view class="content_box">
 			<scroll-view enable-back-to-top scroll-y="true" @scrolltolower="loadMore" class="scroll-box">
-				<u-waterfall v-model="liveList" ref="uWaterfall" v-if="liveList.length">
-					<template v-slot:left="{ leftList }">
+				<view class="u-waterfall" v-if="!isEmpty">
+					<view id="u-left-column" class="u-column">
 						<view class="u-flex u-row-center u-col-center u-m-b-20" v-for="live in leftList" :key="live.id">
 							<shopro-live-card :type="2" :detail="live"></shopro-live-card>
 						</view>
-					</template>
-					<template v-slot:right="{ rightList }">
+					</view>
+					<view id="u-left-column" class="u-column">
 						<view class="u-flex u-row-center u-col-center u-m-b-20" v-for="live in rightList" :key="live.id">
 							<shopro-live-card :type="2" :detail="live"></shopro-live-card>
 						</view>
-					</template>
-				</u-waterfall>
+					</view>
+				</view>
 
 				<!-- 更多 -->
-				<u-loadmore v-if="liveList.length" height="80rpx" :status="loadStatus" color="#ccc" />
+				<u-loadmore v-if="!isEmpty" height="80rpx" :status="loadStatus" color="#ccc" />
 				<!-- 置空页 -->
 				<u-empty :show="isEmpty" mode="list"></u-empty>
 			</scroll-view>
 		</view>
-		<shopro-auth-modal></shopro-auth-modal>
 	</view>
 </template>
 
@@ -62,7 +61,15 @@ export default {
 			liveList: [],
 			loadStatus: 'loadmore', //loadmore-加载前的状态，loading-加载中的状态，nomore-没有更多的状态
 			currentPage: 1,
-			lastPage: 1
+			lastPage: 1,
+
+			// 瀑布流 300-220
+			addTime: 100, //排序间隙时间
+			leftHeight: 0,
+			rightHeight: 0,
+			leftList: [],
+			rightList: [],
+			tempList: []
 		};
 	},
 	computed: {},
@@ -71,6 +78,39 @@ export default {
 	},
 	onHide() {},
 	methods: {
+		// 瀑布流相关
+		async splitData() {
+			if (!this.tempList.length) return;
+			let item = this.tempList[0];
+			if (!item) return;
+
+			// 分左右
+			if (this.leftHeight < this.rightHeight) {
+				this.leftHeight += item.goods.length ? 300 : 220;
+				this.leftList.push(item);
+			} else if (this.leftHeight > this.rightHeight) {
+				this.rightHeight += item.goods.length ? 300 : 220;
+				this.rightList.push(item);
+			} else {
+				this.leftHeight += item.goods.length ? 300 : 220;
+				this.leftList.push(item);
+			}
+
+			// 移除临时列表的第一项，如果临时数组还有数据，继续循环
+			this.tempList.splice(0, 1);
+			if (this.tempList.length) {
+				setTimeout(() => {
+					this.splitData();
+				}, this.addTime);
+			}
+		},
+		clear() {
+			this.leftList = [];
+			this.rightList = [];
+			this.leftHeight = 0;
+			this.rightHeight = 0;
+			this.tempList = [];
+		},
 		// 切换tab
 		selTab(cur) {
 			if (this.tabCur !== cur) {
@@ -78,6 +118,7 @@ export default {
 				this.liveList = [];
 				this.currentPage = 1;
 				this.lastPage = 1;
+				this.clear();
 				this.getLiveList();
 			}
 		},
@@ -101,6 +142,8 @@ export default {
 					that.isEmpty = !that.liveList.length;
 					that.lastPage = res.data.last_page;
 					that.loadStatus = that.currentPage < res.data.last_page ? 'loadmore' : 'nomore';
+					that.tempList = res.data.data;
+					that.splitData();
 				}
 			});
 		}
@@ -109,6 +152,24 @@ export default {
 </script>
 
 <style lang="scss">
+@mixin vue-flex($direction: row) {
+	/* #ifndef APP-NVUE */
+	display: flex;
+	flex-direction: $direction;
+	/* #endif */
+}
+.u-waterfall {
+	@include vue-flex;
+	flex-direction: row;
+	align-items: flex-start;
+}
+
+.u-column {
+	@include vue-flex;
+	flex: 1;
+	flex-direction: column;
+	height: auto;
+}
 // tab
 .live-tab {
 	width: 100%;
diff --git a/pages/app/merchant/apply.vue b/pages/app/merchant/apply.vue
index eaf549ba..88e17317 100644
--- a/pages/app/merchant/apply.vue
+++ b/pages/app/merchant/apply.vue
@@ -2,7 +2,7 @@
 <template>
 	<view class="apply-commission-wrap page_box">
 		<!-- 标题栏 -->
-		<view class="head-box"><u-navbar :isFixed="false" :borderBottom="false" back-icon-color="#fff" :background="{}"></u-navbar></view>
+		<view class="head-box"><shopro-navbar back-icon-color="#fff" :background="{}"></shopro-navbar></view>
 
 		<!-- 表单 -->
 		<view class="apply-form content_box">
@@ -39,15 +39,14 @@
 						@click="onSelect('time')"
 					></u-input>
 				</u-form-item>
-				<u-form-item :labelStyle="labelStyle" 　 label-width="150" label-position="left" label="营业天数" prop="weeks">
+				<u-form-item :labelStyle="labelStyle" label-width="150" label-position="left" label="营业天数" prop="weeks">
 					<u-input type="select" placeholder="请选择营业天数" disabled :placeholderStyle="placeholderStyle" v-model="model.weeks" @click="onSelect('week')"></u-input>
 				</u-form-item>
-				<u-form-item :labelStyle="labelStyle" label-width="150" label-position="left" label="所在地区" prop="area">
+				<u-form-item :labelStyle="labelStyle" right-icon="map-fill" :right-icon-style="{color:'#4CB89D'}" label-width="150" label-position="left" label="所在地区" prop="area">
 					<u-input type="text" disabled v-model="model.area" placeholder="请点击定位" @click="chooseLocation"></u-input>
-					<u-icon slot="right" name="map-fill" size="40" color="#4CB89D" @click="chooseLocation"></u-icon>
 				</u-form-item>
-				<u-form-item :labelStyle="labelStyle" label-width="150" label-position="left" label="详细地址" prop="address">
-					<u-input type="textarea" placeholder="请输入详细地址~" :placeholderStyle="placeholderStyle" v-model="model.address"></u-input>
+				<u-form-item :border-bottom="false" :labelStyle="labelStyle" label-width="150" label-position="left" label="详细地址" prop="address">
+					<u-input type="textarea" border placeholder="请输入详细地址~" :placeholderStyle="placeholderStyle" v-model="model.address"></u-input>
 				</u-form-item>
 				<view class="agreement u-flex u-col-center">
 					<u-checkbox v-model="model.agreement" activeColor="#4CB89D" shape="circle" @change="onAgreement"></u-checkbox>
@@ -59,7 +58,6 @@
 
 		<!-- 弹窗 -->
 		<u-select v-if="selectShow" :mode="selectMode" :list="selectList" v-model="selectShow" @confirm="selectConfirm"></u-select>
-		<u-picker mode="region" v-model="pickerShow" @confirm="regionConfirm"></u-picker>
 
 		<!-- 选择星期 -->
 		<u-popup v-model="showWeeksModal" safe-area-inset-bottom mode="bottom">
@@ -68,9 +66,9 @@
 					<view></view>
 					<view class="action text-green" @tap="saveWeekModal">确定</view>
 				</view>
-				<view class="u-flex u-flex-wrap u-p-x-30 u-p-y-30 u-row-between week-modal--content">
+				<view class="u-flex u-flex-wrap u-p-x-30 u-p-y-30 week-modal--content">
 					<view v-for="(item, index) in weekcheckbox" class="week-btn" :key="index">
-						<u-button @click="onSelectWeek(index)" :plain="!item.checked" size="medium" type="success">{{ item.name }}</u-button>
+						<button @tap="onSelectWeek(index)" class="cu-btn" :class="!item.checked ? 'line-green' : 'bg-green'">{{ item.name }}</button>
 					</view>
 				</view>
 			</view>
@@ -141,7 +139,6 @@ export default {
 			authNotice: {},
 			// 表单
 			errorType: ['message'],
-			pickerShow: false,
 			selectShow: false,
 			selectMode: 'mutil-column', // single-column, mutil-column, mutil-column-auto
 			selectType: '',
@@ -465,7 +462,7 @@ export default {
 				this.isFormEnd = true;
 				if (res.code === 1) {
 					//  #ifdef MP-WEIXIN
-					this.$store.dispatch('getMessageIds', 'storeApply');
+					this.$store.commit('subscribeMessage', 'storeApply');
 					//  #endif
 					uni.showToast({
 						title: res.msg,
@@ -553,9 +550,9 @@ export default {
 	}
 	.week-modal--content {
 		.week-btn {
-			margin-right: 20rpx;
-			margin-bottom: 20rpx;
-			&:nth-of-type(3n) {
+			margin-right: 56rpx;
+			margin-bottom: 30rpx;
+			&:nth-of-type(4n) {
 				margin-right: 0;
 			}
 		}
diff --git a/pages/app/merchant/detail.vue b/pages/app/merchant/detail.vue
index be80ce64..efe07e6a 100644
--- a/pages/app/merchant/detail.vue
+++ b/pages/app/merchant/detail.vue
@@ -3,7 +3,7 @@
 	<view class="order-detail-wrap">
 		<!-- 订单卡片 -->
 		<view class="card-box">
-			<view class="order-goods-item" v-for="item in orderDetail.item" :key="item.id">
+			<view class="order-goods-item u-m-b-10" v-for="item in orderDetail.item" :key="item.id">
 				<shopro-mini-card :title="item.goods_title" :image="item.goods_image">
 					<template #describe>
 						<view class="order-sku u-ellipsis-1">
@@ -43,7 +43,7 @@
 				</view>
 				<view class="detail-item u-flex">
 					<view class="item-title">下单时间：</view>
-					<view class="item-content">{{ $u.timeFormat(orderDetail.paytime, 'yyyy-mm-dd hh:MM') }}</view>
+					<view class="item-content">{{ orderDetail.paytime }}</view>
 				</view>
 				<view class="detail-item u-flex" v-if="orderDetail.remark">
 					<view class="item-title">备注：</view>
@@ -146,6 +146,7 @@ export default {
 	margin-bottom: 20rpx;
 	background-color: #fff;
 	.order-goods-item {
+		border-bottom: 1rpx solid rgba(237, 237, 237, 1);
 		padding: 20rpx;
 		.card-item {
 			line-height: 60rpx;
diff --git a/pages/app/merchant/index.vue b/pages/app/merchant/index.vue
index c5ae1d11..d6c0878b 100644
--- a/pages/app/merchant/index.vue
+++ b/pages/app/merchant/index.vue
@@ -3,13 +3,13 @@
 	<view class="merchant-wrap">
 		<view class="shopinfo-box">
 			<!-- 标题栏 -->
-			<u-navbar backIconName="" :isFixed="false" :borderBottom="false" :background="navbar.background" :backTextStyle="navbar.backTextStyle" backText="商家中心"></u-navbar>
+			<shopro-navbar back-icon-color="#fff" :background="{}" :backTextStyle="{ color: '#fff', fontSize: '36rpx', fontWeight: '500' }" backText="商家中心"></shopro-navbar>
 			<!-- 商家信息 -->
 			<view class="user-head u-flex u-row-between">
 				<view class="shop-info">
 					<view class="u-flex u-m-b-10" @tap="goStoreList">
 						<text class="shop-title u-m-r-20">{{ storeDetail.name }}</text>
-						<text class="iconfont iconxiala"></text>
+						<text class="iconfont icon-xiala"></text>
 					</view>
 					<view class="shop-address u-ellipsis-2" @tap="jump('/pages/app/merchant/info')">
 						{{ storeDetail.province_name || '' }}{{ storeDetail.city_name || '' }}{{ storeDetail.area_name || '' }}{{ storeDetail.address || '' }}
@@ -26,7 +26,7 @@
 				<view class="card-content u-flex-col">
 					<view class="card-title">输码核销</view>
 					<view class="u-flex card-detail-box" @tap="showInputModal = true">
-						<text class="iconfont icon21shuru icon-color1"></text>
+						<text class="iconfont icon-21shuru icon-color1"></text>
 						<text class="icon-color1 u-m-l-20">输码</text>
 					</view>
 				</view>
@@ -36,7 +36,7 @@
 				<view class="card-content u-flex-col">
 					<view class="card-title">扫码核销</view>
 					<view class="u-flex card-detail-box">
-						<text class="iconfont iconicon-test1  icon-color2"></text>
+						<text class="iconfont icon-icon-test1  icon-color2"></text>
 						<text class="icon-color2 u-m-l-20">扫码</text>
 					</view>
 				</view>
@@ -116,6 +116,17 @@
 				<button class="u-reset-button post-btn" @tap="onConfirm">核销</button>
 			</view>
 		</u-popup>
+		<!-- 禁用弹窗 -->
+		<u-modal
+			ref="uModal"
+			v-model="showModal"
+			:show-cancel-button="false"
+			confirm-color="#999"
+			confirm-text="返回"
+			content="当前门店已被禁用,是否返回重新选择？"
+			title="提示"
+			@confirm="$Router.back()"
+		></u-modal>
 	</view>
 </template>
 
@@ -127,17 +138,7 @@ export default {
 	data() {
 		return {
 			isEmpty: false,
-			navbar: {
-				//标题栏
-				background: {
-					background: 'none'
-				},
-				backTextStyle: {
-					color: '#fff',
-					fontSize: '40rpx',
-					fontWeight: '800'
-				}
-			},
+			showModal: false,
 			// 筛选
 			filter1: 'today',
 			filter1Value: 0,
@@ -176,7 +177,7 @@ export default {
 	},
 	computed: {},
 	onLoad(options) {
-		options.storeId && uni.setStorageSync('storeId', options.storeId);
+		options && options.storeId && uni.setStorageSync('storeId', options.storeId);
 		this.getStoreDetail();
 	},
 	onShow() {
@@ -236,6 +237,9 @@ export default {
 			}).then(res => {
 				if (res.code === 1) {
 					that.storeDetail = res.data;
+				} else {
+					uni.removeStorageSync('storeId')
+					that.showModal = true;
 				}
 			});
 		},
@@ -279,10 +283,14 @@ export default {
 		// 核销
 		postOrderConfirm() {
 			let that = this;
-			that.$http('store.orderConfirm', {
-				codes: that.scanCodes,
-				store_id: uni.getStorageSync('storeId')
-			}, '核销中...').then(res => {
+			that.$http(
+				'store.orderConfirm',
+				{
+					codes: that.scanCodes,
+					store_id: uni.getStorageSync('storeId')
+				},
+				'核销中...'
+			).then(res => {
 				uni.vibrateLong({
 					success: () => {
 						that.$u.toast(res.msg);
@@ -302,13 +310,17 @@ export default {
 		getStoreOrder() {
 			let that = this;
 			that.loadStatus = 'loading';
-			that.$http('store.order', {
-				date_type: that.filter1,
-				date: that.custom,
-				type: that.filter2,
-				page: that.currentPage,
-				store_id: uni.getStorageSync('storeId')
-			}, '加载中...').then(res => {
+			that.$http(
+				'store.order',
+				{
+					date_type: that.filter1,
+					date: that.custom,
+					type: that.filter2,
+					page: that.currentPage,
+					store_id: uni.getStorageSync('storeId')
+				},
+				'加载中...'
+			).then(res => {
 				uni.stopPullDownRefresh();
 				if (res.code == 1) {
 					that.storeOrderList = [...that.storeOrderList, ...res.data.result.data];
@@ -359,11 +371,10 @@ export default {
 			padding-left: 30rpx;
 			.shop-title {
 				font-size: 34rpx;
-
 				font-weight: bold;
 				color: rgba(255, 255, 255, 1);
 			}
-			.iconxiala {
+			.icon-xiala {
 				font-size: 34rpx;
 				color: rgba(255, 255, 255, 1);
 			}
@@ -445,48 +456,6 @@ export default {
 	margin: 10rpx 0 0;
 	position: relative;
 	z-index: 22;
-	.nav-item {
-		flex: 1;
-		&:first-child {
-			&::after {
-				content: '';
-				height: 30rpx;
-				width: 2rpx;
-				background-color: #bdbdbd;
-				display: inline-block;
-			}
-		}
-
-		.item-title {
-			font-size: 30rpx;
-
-			font-weight: 400;
-			color: #666;
-			line-height: 100rpx;
-		}
-		.cuIcon-triangleupfill {
-			color: #666;
-			transition: all linear 0.2s;
-		}
-		.icon-active {
-			transition: all linear 0.2s;
-			transform: rotate(180deg);
-			color: #4cb89d;
-		}
-		.title-active {
-			color: #4cb89d;
-		}
-		.nav-line {
-			width: 100%;
-			height: 2rpx;
-			background: rgba(#ccc, 0.5);
-		}
-
-		.line-active {
-			background: #4cb89d;
-			height: 2rpx;
-		}
-	}
 }
 
 // 销量
diff --git a/pages/app/merchant/info.vue b/pages/app/merchant/info.vue
index 5d082d99..bafb5360 100644
--- a/pages/app/merchant/info.vue
+++ b/pages/app/merchant/info.vue
@@ -18,9 +18,9 @@
 		<view class="u-flex u-col-top form-item u-m-b-20">
 			<text class="form-tilte">营业星期：</text>
 			<view class="form-content u-flex u-flex-wrap u-row-left">
-				<u-button class="u-m-r-10 u-m-b-10 u-m-l-0" v-for="week in weekList" :key="week.title" shape="circle" :plain="!storeWeek.includes(week.value)" size="mini" type="success">
+				<button class="cu-btn sm u-m-r-10 u-m-b-10 u-m-l-0" :class="!storeWeek.includes(week.value)?'line-green':'bg-green'" v-for="week in weekList" :key="week.title">
 					{{ week.title }}
-				</u-button>
+				</button>
 			</view>
 		</view>
 
diff --git a/pages/app/merchant/list.vue b/pages/app/merchant/list.vue
index 948a9d3f..c7cef817 100644
--- a/pages/app/merchant/list.vue
+++ b/pages/app/merchant/list.vue
@@ -13,7 +13,7 @@
 						</view>
 					</view>
 
-					<radio style="transform: scale(0.7);" class="orange" :checked="storeId == store.id" :class="{ checked: storeId == store.id }"></radio>
+					<u-checkbox :value="storeId == store.id" activeColor="#4CB89D" shape="circle"></u-checkbox>
 				</view>
 			</label>
 		</view>
diff --git a/pages/app/score/list.vue b/pages/app/score/list.vue
index b996fc51..7742af82 100644
--- a/pages/app/score/list.vue
+++ b/pages/app/score/list.vue
@@ -1,60 +1,35 @@
+<!-- 积分商品列表 -->
 <template>
 	<view class="score-wrap">
-		<view class="goods-wrap u-p-20">
-			<view class="goods-list u-flex">
-				<u-waterfall v-model="scoreList" ref="uWaterfall">
-					<template v-slot:left="{ leftList }">
-						<view class="goods-item u-m-b-20" v-for="leftGoods in leftList" :key="leftGoods.id">
-							<shopro-goods-card
-								:image="leftGoods.image"
-								:title="leftGoods.title"
-								@click="$Router.push({ path: '/pages/goods/detail', query: { id: leftGoods.id, type: 'score' } })"
-							>
-								<template #cardBottom>
-									<view class="price-box u-flex u-row-between u-flex-wrap">
-										<view class="beans-box u-flex u-m-10 font-OPPOSANS">
-											<image class="bean-img" :src="$IMG_URL + '/imgs/score/score.png'" mode=""></image>
-											{{ leftGoods.price }}
-										</view>
-										<view class="sales-box u-m-10">已兑换{{ leftGoods.sales }}件</view>
-									</view>
-								</template>
-							</shopro-goods-card>
+		<view class="goods-wrap u-p-20 u-flex u-flex-wrap">
+			<view class="goods-item u-m-b-20" v-for="leftGoods in scoreList" :key="leftGoods.id">
+				<shopro-goods-card
+					:image="leftGoods.image"
+					:title="leftGoods.title"
+					@click="$Router.push({ path: '/pages/goods/detail', query: { id: leftGoods.id, type: 'score' } })"
+				>
+					<template #cardBottom>
+						<view class="price-box u-flex u-row-between u-flex-wrap">
+							<view class="beans-box u-flex u-m-10">
+								<image class="bean-img u-m-r-10" :src="$IMG_URL + '/imgs/score/score.png'" mode=""></image>
+								{{ leftGoods.price }}
+							</view>
+							<view class="sales-box u-m-10">已兑换{{ leftGoods.sales }}件</view>
 						</view>
 					</template>
-					<template v-slot:right="{ rightList }">
-						<view class="goods-item u-m-b-20" v-for="rightGoods in rightList" :key="rightGoods.id">
-							<shopro-goods-card
-								:image="rightGoods.image"
-								:title="rightGoods.title"
-								@click="$Router.push({ path: '/pages/goods/detail', query: { id: rightGoods.id, type: 'score' } })"
-							>
-								<template #cardBottom>
-									<view class="price-box u-flex u-row-between u-flex-wrap">
-										<view class="beans-box u-flex u-m-10 font-OPPOSANS">
-											<image class="bean-img" :src="$IMG_URL + '/imgs/score/score.png'" mode=""></image>
-											{{ rightGoods.price }}
-										</view>
-										<view class="sales-box u-m-10">已兑换{{ rightGoods.sales }}件</view>
-									</view>
-								</template>
-							</shopro-goods-card>
-						</view>
-					</template>
-				</u-waterfall>
+				</shopro-goods-card>
 			</view>
-			<!-- 缺省页 -->
-			<shopro-empty
-				v-show="isEmpty"
-				@click="$Router.pushTab('/pages/index/index')"
-				:image="$IMG_URL + '/imgs/empty/empty_goods.png'"
-				tipText="暂无积分商品"
-				btnText="去首页逛逛"
-			></shopro-empty>
-			<!-- 加载更多 -->
-			<u-loadmore v-if="!isEmpty" height="80rpx" :status="loadStatus" icon-type="flower" color="#ccc" />
 		</view>
-		<shopro-auth-modal ></shopro-auth-modal>
+		<!-- 缺省页 -->
+		<shopro-empty
+			v-if="isEmpty"
+			@click="$Router.pushTab('/pages/index/index')"
+			:image="$IMG_URL + '/imgs/empty/empty_goods.png'"
+			tipText="暂无积分商品"
+			btnText="去首页逛逛"
+		></shopro-empty>
+		<!-- 加载更多 -->
+		<u-loadmore v-if="!isEmpty" height="80rpx" :status="loadStatus" icon-type="flower" color="#ccc" />
 	</view>
 </template>
 
@@ -102,32 +77,29 @@ export default {
 </script>
 
 <style lang="scss">
-.goods-list {
-	flex-wrap: wrap;
-	.goods-item {
-		margin-right: 20rpx;
-		margin-bottom: 20rpx;
+.goods-item {
+	margin-right: 20rpx;
+	margin-bottom: 20rpx;
 
-		&:nth-child(2n) {
-			margin-right: 0;
-		}
-		.price-box {
-			.beans-box {
-				font-size: 32upx;
-				font-weight: bold;
-				color: rgba(228, 141, 4, 1);
+	&:nth-child(2n) {
+		margin-right: 0;
+	}
+	.price-box {
+		.beans-box {
+			font-size: 32upx;
+			font-weight: bold;
+			color: rgba(228, 141, 4, 1);
 
-				.bean-img {
-					width: 36upx;
-					height: 36upx;
-				}
-			}
-			.sales-box {
-				font-size: 22rpx;
-				font-weight: 500;
-				color: rgba(153, 153, 153, 1);
+			.bean-img {
+				width: 36upx;
+				height: 36upx;
 			}
 		}
+		.sales-box {
+			font-size: 22rpx;
+			font-weight: 500;
+			color: rgba(153, 153, 153, 1);
+		}
 	}
 }
 </style>
diff --git a/pages/goods/comment/comment-list.vue b/pages/goods/comment/comment-list.vue
index 71393a96..306277ca 100644
--- a/pages/goods/comment/comment-list.vue
+++ b/pages/goods/comment/comment-list.vue
@@ -11,13 +11,11 @@
 				<view class="comment-list">
 					<block v-for="comment in commentList" :key="comment.id"><sh-comment :comment="comment"></sh-comment></block>
 				</view>
-				<shopro-empty v-show="isEmpty" :image="$IMG_URL + '/imgs/empty/comment_empty.png'" tipText="暂无此类评价~"></shopro-empty>
+				<shopro-empty v-if="isEmpty" :image="$IMG_URL + '/imgs/empty/comment_empty.png'" tipText="暂无此类评价~"></shopro-empty>
 				<!-- 加载更多 -->
 				<u-loadmore v-if="commentList.length" height="80rpx" :status="loadStatus" icon-type="flower" color="#ccc" />
 			</scroll-view>
 		</view>
-		<!-- 登录提示 -->
-		<shopro-auth-modal></shopro-auth-modal>
 	</view>
 </template>
 
diff --git a/pages/goods/components/sh-activity.vue b/pages/goods/components/sh-activity.vue
index e7024250..3530cb8a 100644
--- a/pages/goods/components/sh-activity.vue
+++ b/pages/goods/components/sh-activity.vue
@@ -5,20 +5,10 @@
 			<view class="activity-content u-flex-1">
 				<view class="tip-list u-flex u-flex-1 u-col-center" v-for="item in detail" :key="item.id" @tap="showActivity(item.type)">
 					<view class="u-flex u-flex-1 u-col-center">
-						<u-tag class="title-tag u-m-r-10" :text="item.title" size="mini" bg-color="#FF0000" border-color="#FF0000" color="#fff" />
-						<u-tag
-							v-if="index < 3"
-							class="tag-box u-m-r-10"
-							v-for="(tag, index) in item.tags"
-							:key="index"
-							:text="tag"
-							size="mini"
-							bg-color="#fff"
-							border-color="#FF0000"
-							color="#FF0000"
-						/>
+						<view class="title-tag cu-tag bg-red sm radius u-m-r-10">{{ item.title }}</view>
+						<view class="tag-box cu-tag line-red sm radius u-m-r-10" v-if="index < 3" v-for="(tag, index) in item.tags" :key="tag">{{ tag }}</view>
 					</view>
-					<u-icon name="arrow-right" size="28" color="#bfbfbf"></u-icon>
+					<view class="u-iconfont uicon-arrow-right" style="color: #bfbfbf;font-size: 28rpx;"></view>
 				</view>
 			</view>
 		</view>
@@ -31,31 +21,12 @@
 				<view class="modal-content content_box">
 					<view class="tip-list u-flex u-flex-1 u-col-center" @tap="toSelGoods">
 						<view class="u-flex u-flex-1 modal-item u-row-between u-col-center">
-							<view class="" style="white-space: nowrap">
-								<u-tag
-									class="title-tag u-m-r-10 u-m-b-10"
-									:text="activityMap[activityType].title"
-									size="mini"
-									bg-color="#FF0000"
-									border-color="#FF0000"
-									color="#fff"
-								/>
-							</view>
-
-							<view class="">
-								<u-tag
-									class=" u-m-r-10 u-m-b-10"
-									v-for="(tag, index) in activityMap[activityType].tags"
-									:key="index"
-									:text="tag"
-									size="mini"
-									bg-color="#fff"
-									border-color="#FF0000"
-									color="#FF0000"
-								/>
+							<view class="title-tag cu-tag bg-red sm radius u-m-r-10">{{ activityMap[activityType].title }}</view>
+							<view class="u-flex u-col-center">
+								<view class="tag-box cu-tag line-red sm radius u-m-r-10" v-for="(tag, index) in activityMap[activityType].tags" :key="tag">{{ tag }}</view>
 							</view>
 						</view>
-						<u-icon name="arrow-right" size="28" color="#bfbfbf"></u-icon>
+						<view class="u-iconfont uicon-arrow-right" style="color: #bfbfbf;font-size: 28rpx;"></view>
 					</view>
 
 					<view class="all-goods-num">共有{{ activityMap[activityType].num }}件商品参加此活动</view>
@@ -175,15 +146,6 @@ export default {
 			padding: 20rpx 0;
 			border-bottom: 1rpx solid #eeeeee;
 		}
-		.tag-box {
-			border: 1rpx solid #ff0000;
-			display: inline-block;
-			font-size: 20rpx;
-			line-height: 30rpx;
-			padding: 0 10rpx;
-			color: #ff0000;
-			border-radius: 8rpx;
-		}
 		.all-goods-num {
 			font-size: 28rpx;
 			font-weight: 500;
diff --git a/pages/goods/components/sh-filter.vue b/pages/goods/components/sh-filter.vue
index ba01e9ba..2dcebaa7 100644
--- a/pages/goods/components/sh-filter.vue
+++ b/pages/goods/components/sh-filter.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="filter-box">
-		<u-mask v-if="showSel" :z-index="-1" :show="showSel" @click="hideModal"></u-mask>
+		<view class="cu-modal" style="z-index: -1;" :class="{ show: showSel }" @tap="hideModal"></view>
 		<view class="navbar">
 			<view class="sel-box u-flex-col" v-show="showSel">
 				<view class="sel-item" @tap="onSel(0)" :class="{ 'sel-active': defaultOrder === 0 && filterIndex === 0 }">综合推荐</view>
@@ -9,7 +9,7 @@
 			<view class="nav-item u-flex-col" :class="{ current: filterIndex === 0 }" @tap="tabClick(0)">
 				<view class="title-box  u-flex u-col-center">
 					<text class="filter-title">{{ defaultOrder === 1 ? '自定义' : '综合推荐' }}</text>
-					<view class="p-box"><text :class="{ active: filterIndex === 0 }" class="yticon cuIcon-fold xia"></text></view>
+					<view class="p-box"><text :class="{ active: filterIndex === 0 }" class="yticon u-iconfont uicon-arrow-up xia u-m-l-6"></text></view>
 				</view>
 				<view class="line" :class="{ 'line-active': filterIndex === 0 }"></view>
 			</view>
@@ -21,8 +21,8 @@
 				<view class="title-box u-flex">
 					<text class="filter-title">价格</text>
 					<view class="p-box u-flex-col u-m-l-6">
-						<u-icon name="arrow-up" size="20" :color="priceOrder === 1 && filterIndex === 2 ? '#d5a65a' : '#333'"></u-icon>
-						<u-icon name="arrow-down" size="20" :color="priceOrder === 2 && filterIndex === 2 ? '#d5a65a' : '#333'"></u-icon>
+						<view class="u-iconfont uicon-arrow-up" :style="{ fontSize: '22rpx', color: priceOrder === 1 && filterIndex === 2 ? '#d5a65a' : '#333' }"></view>
+						<view class="u-iconfont uicon-arrow-down" :style="{ fontSize: '22rpx', color: priceOrder === 2 && filterIndex === 2 ? '#d5a65a' : '#333' }"></view>
 					</view>
 				</view>
 				<view class="line" :class="{ 'line-active': filterIndex === 2 }"></view>
diff --git a/pages/goods/components/sh-groupon.vue b/pages/goods/components/sh-groupon.vue
index 5f5b081e..013d332d 100644
--- a/pages/goods/components/sh-groupon.vue
+++ b/pages/goods/components/sh-groupon.vue
@@ -3,7 +3,7 @@
 		<block v-if="grouponTeamList.length">
 			<view class="into-title u-flex u-row-between">
 				<text>已有{{ grouponData.sales }}人参与活动</text>
-				<u-icon name="arrow-right" size="28" color="#bfbfbf" @click="onMoreGrouponTeam"></u-icon>
+				<view class="u-iconfont uicon-arrow-right" style="color: #bfbfbf;font-size: 28rpx;" @tap="onMoreGrouponTeam"></view>
 			</view>
 			<view class="into-item u-flex u-row-between" v-for="(g, index) in grouponTeamList" :key="g.id" v-if="index < 2">
 				<view class="u-flex">
@@ -26,10 +26,8 @@
 		<!-- 弹窗 -->
 		<u-popup v-model="showModal" mode="bottom" :closeable="true" close-icon-pos="top-right">
 			<view class="modal-box page_box">
-				<view class="modal-head u-flex u-row-between">
-					<text></text>
+				<view class="modal-head u-flex u-row-center">
 					<text class="head-title">正在拼团</text>
-					<text class="cuIcon-roundclosefill" @tap="hideModal"></text>
 				</view>
 				<view class="modal-content content_box y-f">
 					<view class="into-item u-flex u-row-between" v-for="g in grouponTeamList" :key="g.id">
diff --git a/pages/goods/components/sh-serve.vue b/pages/goods/components/sh-serve.vue
index 74cfe90e..df936c7c 100644
--- a/pages/goods/components/sh-serve.vue
+++ b/pages/goods/components/sh-serve.vue
@@ -12,7 +12,7 @@
 					</view>
 				</view>
 			</view>
-			<u-icon name="arrow-right" size="28" color="#bfbfbf"></u-icon>
+			<view class="u-iconfont uicon-arrow-right" style="color: #bfbfbf;font-size: 28rpx;"></view>
 		</view>
 		<u-popup v-model="showModal" mode="bottom" :closeable="true" close-icon-pos="top-right">
 			<view class=" server-modal">
diff --git a/pages/goods/detail.vue b/pages/goods/detail.vue
index ffc9cd2c..132f729e 100644
--- a/pages/goods/detail.vue
+++ b/pages/goods/detail.vue
@@ -5,7 +5,9 @@
 		<view class="nav-box">
 			<view class="state-hack"></view>
 			<view :style="{ height: navbarHeight + 'px' }">
-				<view hover-class="back-hover" class="back-box u-m-x-30 u-flex u-row-center u-col-center" @tap="goBack"><u-icon :name="backIconName" color="#fff"></u-icon></view>
+				<view hover-class="back-hover" class="back-box u-m-x-30 u-flex u-row-center u-col-center" @tap="goBack">
+					<view class="u-iconfont uicon-arrow-left" style="color: #fff;font-size: 28rpx;"></view>
+				</view>
 			</view>
 		</view>
 
@@ -30,12 +32,12 @@
 
 				<!-- 规格选择 -->
 				<view class="sku-box" @tap="showSku = true" v-if="activityRules.status !== 'waiting' && checkActivity(goodsInfo.activity_type, 'groupon') && goodsInfo.is_sku">
-					<view class="x-bc">
+					<view class="u-flex u-row-between u-col-center">
 						<view class="u-flex">
 							<text class="title">规格</text>
 							<text class="tip">{{ currentSkuText || '请选择规格' }}</text>
 						</view>
-						<text class="cuIcon-right"></text>
+						<text class="u-iconfont uicon-arrow-right" style="color: #bfbfbf;"></text>
 					</view>
 				</view>
 
@@ -64,7 +66,7 @@
 						<text class="title">玩法</text>
 						<view class="description u-ellipsis-1">{{ goodsInfo.activity.richtext_title || '开团/参团·邀请好友·人满发货（不满退款' }}</view>
 					</view>
-					<u-icon name="arrow-right" size="28" color="#bfbfbf"></u-icon>
+					<view class="u-iconfont uicon-arrow-right" style="color:#bfbfbf ;font-size: 28rpx;"></view>
 				</view>
 
 				<!-- 选项卡 -->
@@ -96,7 +98,7 @@
 						<view class="more-box u-flex u-row-center u-col-center" v-show="commentNum > 3">
 							<button class="u-reset-button more-btn u-flex u-row-center u-col-center" @tap="jump('/pages/goods/comment/comment-list', { goodsId: goodsInfo.id })">
 								查看全部
-								<u-icon name="arrow-right" size="28" color="#d5a65a"></u-icon>
+								<view class="u-iconfont uicon-arrow-right" style="color:#d5a65a ;font-size: 28rpx;"></view>
 							</button>
 						</view>
 					</view>
@@ -190,7 +192,7 @@
 			></shopro-sku>
 
 			<!-- 	分享组件 -->
-			<shopro-share v-model="showShare" :shareDetail="shareInfo" :posterInfo="goodsInfo" :posterType="'goods'"></shopro-share>
+			<shopro-share v-model="showShare" :posterInfo="goodsInfo" :posterType="'goods'"></shopro-share>
 			<!-- 登录 -->
 			<shopro-auth-modal v-if="authType"></shopro-auth-modal>
 		</view>
@@ -207,7 +209,7 @@ import shCoupon from './components/sh-coupon.vue';
 import shComment from './components/sh-comment.vue';
 import share from '@/shopro/share';
 
-import { mapMutations, mapActions, mapState } from 'vuex';
+import { mapMutations, mapActions, mapState, mapGetters } from 'vuex';
 export default {
 	components: {
 		shServe,
@@ -258,10 +260,7 @@ export default {
 	},
 	// 是否登录
 	computed: {
-		...mapState({
-			isLogin: ({ user }) => user.isLogin,
-			authType: ({ user }) => user.authType
-		}),
+		...mapGetters(['isLogin', 'authType']),
 		navbarHeight() {
 			// #ifdef APP-PLUS || H5
 			return 48;
@@ -284,29 +283,29 @@ export default {
 			default:
 				await this.getGoodsDetail();
 		}
-		that.shareInfo = share.setShareInfo({
-			title: that.goodsInfo.title,
-			desc: that.goodsInfo.subtitle,
-			image: that.goodsInfo.image,
-			params: {
-				page: 2,
-				pageId: that.$Route.query.id
-			}
-		});
 	},
 
-	// #ifdef H5
 	onUnload() {
 		share.setShareInfo();
 	},
-	// #endif
 
 	methods: {
 		// goBack
+		// 微信直播商品跳转详情，需要用小程序原生接口才能返回。
 		goBack() {
 			let pageList = getCurrentPages();
-			pageList.length > 1 ? this.$Router.back() : this.$Router.pushTab('/pages/index/index');
+			if (pageList.length > 1) {
+				// #ifdef MP-WEIXIN
+				wx.navigateBack();
+				// #endif
+				// #ifndef MP-WEIXIN
+				uni.navigateBack();
+				// #endif
+			} else {
+				this.$Router.pushTab('/pages/index/index');
+			}
 		},
+
 		// 轮播图预览
 		onGoodsSwiper(e) {
 			this.$tools.previewImage(this.goodsInfo.images, e);
@@ -376,8 +375,17 @@ export default {
 						if (that.goodsInfo.activity_type) {
 							that.activityRules.status = that.goodsInfo.activity.status_code;
 						}
-						resolve(res.data);
+						share.setShareInfo({
+							title: that.goodsInfo.title,
+							desc: that.goodsInfo.subtitle,
+							image: that.goodsInfo.image,
+							params: {
+								page: 2,
+								pageId: that.$Route.query.id
+							}
+						});
 						that.getCommentList();
+						resolve(res.data);
 					} else {
 						resolve(false);
 						// that.$u.toast(res.msg);
@@ -599,11 +607,6 @@ export default {
 				color: rgba(168, 112, 13, 1);
 				padding: 0;
 				background: #fff;
-
-				.cuIcon-right {
-					font-size: 30rpx;
-					margin-left: 10rpx;
-				}
 			}
 		}
 	}
@@ -621,11 +624,6 @@ export default {
 		color: #999;
 		margin-right: 20rpx;
 	}
-
-	.cuIcon-right {
-		color: #bfbfbf;
-		font-size: 36rpx;
-	}
 }
 
 // 标题卡片
diff --git a/pages/goods/list.vue b/pages/goods/list.vue
index 0b43b482..766f03cc 100644
--- a/pages/goods/list.vue
+++ b/pages/goods/list.vue
@@ -3,65 +3,54 @@
 	<view class="list-box">
 		<view class="head-box">
 			<!-- 标题栏 -->
-			<u-navbar :borderBottom="true" :background="nav.bg" :z-index="99" :is-fixed="false">
-				<view class="u-flex-1 u-flex u-col-center">
-					<u-search
-						class="u-m-r-20"
-						placeholder="请输入搜索关键字"
-						@change="onSearch"
-						@search="onSearch"
-						@clear="clearSearch"
-						v-model="searchVal"
-						:showAction="false"
-						height="60"
-					></u-search>
+			<shopro-navbar>
+				<view class="u-flex-1 u-flex u-col-center u-m-x-20" slot="content">
+					<u-search placeholder="请输入关键字" @change="onSearch" @search="onSearch" @clear="clearSearch" v-model="searchVal" :showAction="false" height="60"></u-search>
 				</view>
-			</u-navbar>
+			</shopro-navbar>
 			<!-- 筛选栏 -->
 			<sh-filter @change="onFilter"></sh-filter>
 		</view>
-		<view class="goods-wrap u-p-10">
-			<u-waterfall v-model="goodsList" ref="uWaterfall">
-				<template v-slot:left="{ leftList }">
-					<view class="goods-item u-m-b-20 u-flex u-row-center u-col-center" v-for="leftGoods in leftList" :key="leftGoods.id">
-						<shopro-goods-card
-							:detail="leftGoods"
-							:type="leftGoods.activity_type"
-							:image="leftGoods.image"
-							:title="leftGoods.title"
-							:subtitle="leftGoods.subtitle"
-							:price="leftGoods.price"
-							:originPrice="leftGoods.original_price"
-							:sales="leftGoods.sales"
-							:tagTextList="leftGoods.activity_discounts_tags"
-							@click="$Router.push({ path: '/pages/goods/detail', query: { id: leftGoods.id } })"
-						></shopro-goods-card>
-					</view>
-				</template>
-				<template v-slot:right="{ rightList }">
-					<view class="goods-item u-m-b-20 u-flex u-row-center u-col-center" v-for="rightGoods in rightList" :key="rightGoods.id">
-						<shopro-goods-card
-							:detail="rightGoods"
-							:type="rightGoods.activity_type"
-							:image="rightGoods.image"
-							:title="rightGoods.title"
-							:subtitle="rightGoods.subtitle"
-							:price="rightGoods.price"
-							:originPrice="rightGoods.original_price"
-							:sales="rightGoods.sales"
-							:tagTextList="rightGoods.activity_discounts_tags"
-							@click="$Router.push({ path: '/pages/goods/detail', query: { id: rightGoods.id } })"
-						></shopro-goods-card>
-					</view>
-				</template>
-			</u-waterfall>
 
-			<!-- 缺省页 -->
-			<shopro-empty v-show="isEmpty" :image="$IMG_URL + '/imgs/empty/empty_goods.png'" tipText="暂无该商品，还有更多好货等着你噢~"></shopro-empty>
-
-			<!-- 加载更多 -->
-			<u-loadmore v-show="goodsList.length" height="80rpx" :status="loadStatus" icon-type="flower" color="#ccc" />
+		<view class="u-waterfall u-p-16" v-if="!isEmpty">
+			<view id="u-left-column" class="u-column">
+				<view class="goods-item u-m-b-16 u-flex u-row-center u-col-center" v-for="leftGoods in leftList" :key="leftGoods.id">
+					<shopro-goods-card
+						:detail="leftGoods"
+						:type="leftGoods.activity_type"
+						:image="leftGoods.image"
+						:title="leftGoods.title"
+						:subtitle="leftGoods.subtitle"
+						:price="leftGoods.price"
+						:originPrice="leftGoods.original_price"
+						:sales="leftGoods.sales"
+						:tagTextList="leftGoods.activity_discounts_tags"
+						@click="$Router.push({ path: '/pages/goods/detail', query: { id: leftGoods.id } })"
+					></shopro-goods-card>
+				</view>
+			</view>
+			<view id="u-right-column" class="u-column">
+				<view class="goods-item u-m-b-16 u-flex u-row-center u-col-center" v-for="rightGoods in rightList" :key="rightGoods.id">
+					<shopro-goods-card
+						:detail="rightGoods"
+						:type="rightGoods.activity_type"
+						:image="rightGoods.image"
+						:title="rightGoods.title"
+						:subtitle="rightGoods.subtitle"
+						:price="rightGoods.price"
+						:originPrice="rightGoods.original_price"
+						:sales="rightGoods.sales"
+						:tagTextList="rightGoods.activity_discounts_tags"
+						@click="$Router.push({ path: '/pages/goods/detail', query: { id: rightGoods.id } })"
+					></shopro-goods-card>
+				</view>
+			</view>
 		</view>
+
+		<!-- 缺省页 -->
+		<shopro-empty v-if="isEmpty" :image="$IMG_URL + '/imgs/empty/empty_goods.png'" tipText="暂无该商品，还有更多好货等着你噢~"></shopro-empty>
+		<!-- 加载更多 -->
+		<u-loadmore v-show="!isEmpty" height="80rpx" :status="loadStatus" icon-type="flower" color="#ccc" />
 		<!-- 登录弹窗 -->
 		<shopro-auth-modal></shopro-auth-modal>
 	</view>
@@ -78,11 +67,6 @@ export default {
 	data() {
 		return {
 			isEmpty: false,
-			nav: {
-				bg: {
-					background: '#fff'
-				}
-			},
 			goodsList: [],
 			searchVal: '',
 			listParams: {
@@ -91,7 +75,15 @@ export default {
 				page: 1
 			},
 			loadStatus: 'loadmore', //loadmore-加载前的状态，loading-加载中的状态，nomore-没有更多的状态
-			lastPage: 1
+			lastPage: 1,
+
+			// 瀑布流 350-330
+			addTime: 100, //排序间隙时间
+			leftHeight: 0,
+			rightHeight: 0,
+			leftList: [],
+			rightList: [],
+			tempList: []
 		};
 	},
 	// 触底加载更多
@@ -104,35 +96,72 @@ export default {
 	onLoad() {
 		if (this.$Route.query.id) {
 			this.listParams.category_id = this.$Route.query.id;
-		}
-		if (this.$Route.query.keywords) {
-			this.listParams.keywords = this.$Route.query.keywords
+			this.getGoodsList();
+		} else if (this.$Route.query.hasOwnProperty('keywords')) {
+			this.listParams.keywords = this.$Route.query.keywords;
 			this.searchVal = this.$Route.query.keywords;
+			!this.$Route.query.keywords && this.getGoodsList();
+		} else {
+			this.getGoodsList();
 		}
-		this.getGoodsList();
 	},
 	methods: {
+		// 瀑布流相关
+		async splitData() {
+			if (!this.tempList.length) return;
+			let item = this.tempList[0];
+			if (!item) return;
+
+			// 分左右
+			if (this.leftHeight < this.rightHeight) {
+				this.leftHeight += item.activity_discounts_tags.length ? 350 : 330;
+				this.leftList.push(item);
+			} else if (this.leftHeight > this.rightHeight) {
+				this.rightHeight += item.activity_discounts_tags.length ? 350 : 330;
+				this.rightList.push(item);
+			} else {
+				this.leftHeight += item.activity_discounts_tags.length ? 350 : 330;
+				this.leftList.push(item);
+			}
+
+			// 移除临时列表的第一项，如果临时数组还有数据，继续循环
+			this.tempList.splice(0, 1);
+			if (this.tempList.length) {
+				setTimeout(() => {
+					this.splitData();
+				}, this.addTime);
+			}
+		},
+		clear() {
+			this.leftList = [];
+			this.rightList = [];
+			this.leftHeight = 0;
+			this.rightHeight = 0;
+			this.tempList = [];
+		},
+
 		onFilter(e) {
 			this.listParams.order = e;
-			this.$refs.uWaterfall.clear();
 			this.goodsList = [];
 			this.listParams.page = 1;
 			this.lastPage = 1;
+			this.clear();
 			this.$u.debounce(this.getGoodsList);
 		},
 		// 键盘搜索,输入搜索
 		onSearch() {
-			this.$refs.uWaterfall.clear();
 			this.goodsList = [];
 			this.listParams.page = 1;
 			this.lastPage = 1;
 			this.listParams.keywords = this.searchVal;
+			this.clear();
 			this.$u.debounce(this.getGoodsList);
 		},
 
 		// 清除搜索框
 		clearSearch() {
 			this.searchVal = '';
+			this.clear();
 		},
 		// 商品列表
 		getGoodsList() {
@@ -144,6 +173,8 @@ export default {
 					that.isEmpty = !that.goodsList.length;
 					that.lastPage = res.data.last_page;
 					that.loadStatus = that.listParams.page < res.data.last_page ? 'loadmore' : 'nomore';
+					that.tempList = res.data.data;
+					that.splitData();
 				}
 			});
 		}
@@ -152,6 +183,24 @@ export default {
 </script>
 
 <style lang="scss">
+@mixin vue-flex($direction: row) {
+	/* #ifndef APP-NVUE */
+	display: flex;
+	flex-direction: $direction;
+	/* #endif */
+}
+.u-waterfall {
+	@include vue-flex;
+	flex-direction: row;
+	align-items: flex-start;
+}
+
+.u-column {
+	@include vue-flex;
+	flex: 1;
+	flex-direction: column;
+	height: auto;
+}
 .head-box {
 	position: -webkit-sticky;
 	position: sticky;
diff --git a/pages/index/cart.vue b/pages/index/cart.vue
index b8d27c9e..95c17cff 100644
--- a/pages/index/cart.vue
+++ b/pages/index/cart.vue
@@ -20,7 +20,7 @@
 					<u-checkbox class="u-p-l-10" :name="g.goods_id" shape="circle" v-model="g.checked"><view style="height: 160rpx"></view></u-checkbox>
 					<view class="goods-wrap">
 						<view class="lose-box" v-if="g.cart_type === 'invalid' || (g.cart_type === 'activity' && !isActivityPay)">
-							<text v-if="g.cart_type === 'invalid'" class="iconfont iconyishixiao"></text>
+							<text v-if="g.cart_type === 'invalid'" class="iconfont icon-yishixiao"></text>
 							<view v-if="g.cart_type === 'activity' && !isActivityPay" class="invalid-tips u-flex u-row-center u-col-center">活动商品,仅支持单独购买</view>
 						</view>
 						<shopro-mini-card :image="g.goods.image" :title="g.goods.title" @click="$Router.push({ path: '/pages/goods/detail', query: { id: g.goods.id } })">
@@ -41,7 +41,8 @@
 										:max="g.sku_price ? g.sku_price.stock : 0"
 										disabled-input
 										@min="onMin(g)"
-										@change="changeNum($event, g)"
+										@minus="changeNum($event, g)"
+										@plus="changeNum($event, g)"
 									></u-number-box>
 								</view>
 							</template>
@@ -51,13 +52,13 @@
 			</u-checkbox-group>
 
 			<!-- 数据为空 -->
-			<shopro-empty v-show="isEmpty" :image="$IMG_URL + '/imgs/empty/empty_cart.png'" tipText="购物车空空如也,快去逛逛吧~"></shopro-empty>
+			<shopro-empty v-if="isEmpty" :image="$IMG_URL + '/imgs/empty/empty_cart.png'" tipText="购物车空空如也,快去逛逛吧~"></shopro-empty>
 		</view>
 
 		<!-- 底部按钮 -->
 		<view class="foot_box " v-show="!isEmpty">
 			<view class="tools-box u-flex u-row-between">
-				<u-checkbox @change="onAllSel" activeColor="#e9b461" shape="circle" :value="allSel">全选（{{ totalCount.totalNum }}）</u-checkbox>
+				<u-checkbox @change="onAllSel" activeColor="#e9b461" shape="circle" :value="allSelected">全选（{{ totalCount.totalNum }}）</u-checkbox>
 				<view class="u-flex">
 					<view class="price font-OPPOSANS" v-show="!isTool">￥{{ totalCount.totalPrice.toFixed(2) }}</view>
 					<button class="u-reset-button pay-btn" :disabled="!isSel" v-show="!isTool" @tap="onPay">结算</button>
@@ -65,6 +66,7 @@
 				</view>
 			</view>
 		</view>
+		<!-- <shopro-tabbar></shopro-tabbar> -->
 	</view>
 </template>
 
@@ -79,18 +81,13 @@ export default {
 		};
 	},
 	computed: {
-		...mapState({
-			cartList: ({ cart }) => cart.cartList,
-			allSel: ({ cart }) => cart.allSelected,
-			authType: ({ user }) => user.authType
-		}),
+		...mapGetters(['totalCount', 'isSel', 'isActivityPay', 'cartList', 'allSelected', 'authType','isLogin']),
 		isEmpty() {
 			return !this.cartList.length;
-		},
-		...mapGetters(['totalCount', 'isSel', 'isActivityPay'])
+		}
 	},
 	onShow() {
-		this.$store.state.user.isLogin && this.getCartList();
+		this.isLogin && this.getCartList();
 	},
 	onHide() {
 		this.isTool = false;
@@ -136,7 +133,7 @@ export default {
 		onAllSel() {
 			let that = this;
 			that.$store.commit('changeAllSellect'); //按钮切换全选。
-			that.$store.commit('getAllSellectCartList', that.allSel); //列表全选
+			that.$store.commit('getAllSellectCartList', that.allSelected); //列表全选
 		},
 
 		// 结算
@@ -259,7 +256,7 @@ export default {
 			width: 100%;
 			height: 100%;
 			background-color: rgba(#fff, 0.8);
-			.iconyishixiao {
+			.icon-yishixiao {
 				position: absolute;
 				bottom: 0rpx;
 				right: 80rpx;
diff --git a/pages/index/category.vue b/pages/index/category.vue
index 1b101ddc..019790df 100644
--- a/pages/index/category.vue
+++ b/pages/index/category.vue
@@ -11,6 +11,7 @@
 		<takeout-catgory :categoryStyleId="categoryStyleId" v-if="categoryType === 1"></takeout-catgory>
 		<!-- 登录提示 -->
 		<shopro-auth-modal v-if="authType"></shopro-auth-modal>
+		<!-- <shopro-tabbar></shopro-tabbar> -->
 	</view>
 </template>
 
@@ -34,9 +35,7 @@ export default {
 		};
 	},
 	computed: {
-		...mapState({
-			authType: ({ user }) => user.authType
-		})
+		...mapGetters(['authType'])
 	},
 	onLoad() {
 		this.getCategory();
diff --git a/pages/index/category/one-catgory.vue b/pages/index/category/one-catgory.vue
index 9dffaa19..ac8d59be 100644
--- a/pages/index/category/one-catgory.vue
+++ b/pages/index/category/one-catgory.vue
@@ -2,7 +2,7 @@
 	<view class="content_box">
 		<view class="u-flex u-col-center wrapper-box">
 			<view class="scroll-box" style="background-color: #F6F6F6;">
-				<scroll-view class="left u-flex-col u-col-center" enable-back-to-top scroll-y>
+				<scroll-view class="left u-flex-col u-col-center" enable-flex enable-back-to-top scroll-y>
 					<view class="type-list u-ellipsis-1" :class="[{ 'list-active': listId == index }]" v-for="(item, index) in categoryData" :key="index" @tap="onType(index)">
 						<view class="line" :class="[{ 'line-active': listId == index }]"></view>
 						{{ item.name }}
@@ -235,7 +235,7 @@ export default {
 					width: 245rpx;
 					height: 246rpx;
 					border-radius: 10rpx 10rpx 0px 0px;
-					// background: #ccc;
+					background: #f5f5f5;
 				}
 
 				.item-title {
diff --git a/pages/index/category/takeout-catgory.vue b/pages/index/category/takeout-catgory.vue
index edbde5a8..3955ce52 100644
--- a/pages/index/category/takeout-catgory.vue
+++ b/pages/index/category/takeout-catgory.vue
@@ -2,7 +2,7 @@
 	<view class="catgory-wrap">
 		<view class="u-flex wrapper-box">
 			<!-- 左侧分类列表 -->
-			<scroll-view scroll-y scroll-with-animation class="u-tab-view menu-scroll-view" :scroll-top="scrollLeftTop">
+			<scroll-view enable-flex scroll-y scroll-with-animation class="u-tab-view menu-scroll-view" :scroll-top="scrollLeftTop">
 				<view
 					v-for="(item, index) in tabbarList"
 					:key="index"
@@ -31,15 +31,13 @@
 								<image class="goods-tag" v-if="item.is_hot && !item.activity" :src="$IMG_URL + '/goods/goods_hot_tag.png'" mode=""></image>
 							</view>
 							<view class="goods-title u-p-x-20 u-m-b-10 u-ellipsis-2">
-								<u-tag
-									class="title-tag u-m-r-10"
+								<view
 									v-if="item.activity_type"
-									:text="typeMap[item.activity_type].text"
-									size="mini"
-									:bg-color="typeMap[item.activity_type].tagBg"
-									:border-color="typeMap[item.activity_type].tagBg"
-									color="#fff"
-								/>
+									class=" sm cu-tag radius title-tag u-m-r-10"
+									:style="{ backgroundColor: typeMap[item.activity_type].tagBg, color: '#fff' }"
+								>
+									{{ typeMap[item.activity_type].text }}
+								</view>
 								{{ item.title }}
 							</view>
 							<view class="goods-subtitle u-p-x-20 u-m-b-10 u-ellipsis-1">{{ item.subtitle }}</view>
@@ -102,7 +100,7 @@
 					</view>
 
 					<!-- 缺省页 -->
-					<shopro-empty v-show="isEmpty" marginTop="200rpx" :image="$IMG_URL + '/imgs/empty/empty_goods.png'" tipText="暂无该商品，还有更多好货等着你噢~"></shopro-empty>
+					<shopro-empty v-if="isEmpty" marginTop="200rpx" :image="$IMG_URL + '/imgs/empty/empty_goods.png'" tipText="暂无该商品，还有更多好货等着你噢~"></shopro-empty>
 
 					<!-- 加载更多 -->
 					<u-loadmore v-if="goodsList.length" height="80rpx" :status="loadStatus" icon-type="flower" color="#ccc" />
@@ -162,11 +160,7 @@ export default {
 		}
 	},
 	computed: {
-		...mapState({
-			cartNum: ({ cart }) => cart.cartNum,
-			cartList: ({ cart }) => cart.cartList
-		}),
-		...mapGetters(['totalCount', 'isSel']),
+		...mapGetters(['totalCount', 'isSel', 'cartNum', 'cartList','isLogin']),
 		// 购物车检测
 		checkCart() {
 			let obj = {};
@@ -245,7 +239,7 @@ export default {
 					}
 				})
 				.then(() => {
-					that.$store.state.user.isLogin && that.getCartList();
+					that.isLogin && that.getCartList();
 				});
 		},
 
@@ -490,7 +484,7 @@ export default {
 			width: 100%;
 			height: 256rpx;
 			border-radius: 20rpx 20rpx 0 0;
-			background-color: #ccc;
+			background: #f5f5f5;
 		}
 		.goods-tag {
 			position: absolute;
diff --git a/pages/index/category/three-catgory.vue b/pages/index/category/three-catgory.vue
index 67fdb61e..ce7ae394 100644
--- a/pages/index/category/three-catgory.vue
+++ b/pages/index/category/three-catgory.vue
@@ -2,7 +2,7 @@
 	<view class="content_box">
 		<view class="u-flex u-col-center wrapper-box">
 			<view class="scroll-box" style="background-color: #F6F6F6;">
-				<scroll-view class="left u-flex-col u-col-center" enable-back-to-top scroll-y>
+				<scroll-view class="left u-flex-col u-col-center" enable-flex enable-back-to-top scroll-y>
 					<view class="type-list u-ellipsis-1" :class="[{ 'list-active': listId == index }]" v-for="(item, index) in categoryData" :key="index" @tap="onType(index)">
 						<view class="line" :class="[{ 'line-active': listId == index }]"></view>
 						{{ item.name }}
@@ -18,9 +18,9 @@
 						<view class="item-list" v-for="(list, index1) in categoryData[listId].children" :key="index1">
 							<view class="type-box u-flex u-row-between u-col-center">
 								<text class="type-title">{{ list.name }}</text>
-								<view class="more" @tap="jump('/pages/goods/list', { id: list.id })">
+								<view class="more u-flex u-col-center" @tap="jump('/pages/goods/list', { id: list.id })">
 									<text>查看更多</text>
-									<u-icon name="arrow-right" size="28" color="#999"></u-icon>
+									<view class="u-iconfont uicon-arrow-right" style="color: #999;font-size: 28rpx;"></view>
 								</view>
 							</view>
 							<view class="item-box u-flex">
@@ -191,7 +191,7 @@ export default {
 				.item-img {
 					width: 150rpx;
 					height: 150rpx;
-					// background: #ccc;
+					background: #f5f5f5;
 					border-radius: 6rpx;
 				}
 
diff --git a/pages/index/category/two-catgory.vue b/pages/index/category/two-catgory.vue
index 9277923d..8077c2f3 100644
--- a/pages/index/category/two-catgory.vue
+++ b/pages/index/category/two-catgory.vue
@@ -2,7 +2,7 @@
 	<view class="content_box">
 		<view class="u-flex u-col-center wrapper-box">
 			<view class="scroll-box" style="background-color: #F6F6F6;">
-				<scroll-view class="left u-flex-col u-col-center" enable-back-to-top scroll-y>
+				<scroll-view class="left u-flex-col u-col-center" enable-flex enable-back-to-top scroll-y>
 					<view
 						class="type-list u-flex u-col-center"
 						:class="[{ 'list-active': listId == index }]"
@@ -20,9 +20,9 @@
 					<view class="right" v-if="categoryData.length">
 						<image class="type-img" v-if="categoryData[listId].image" :src="categoryData[listId].image" lazy-load mode="aspectFill"></image>
 						<view class="type-box u-flex u-col-center u-row-center">
-							<u-icon class="" name="minus" size="26" color="#d3d3d3"></u-icon>
+							<view class="u-iconfont uicon-minus" style="color: #d3d3d3;font-size: 28rpx;"></view>
 							<text class="type-title">{{ categoryData[listId].name }}</text>
-							<u-icon class="" name="minus" size="26" color="#d3d3d3"></u-icon>
+							<view class="u-iconfont uicon-minus" style="color: #d3d3d3;font-size: 28rpx;"></view>
 						</view>
 						<view class="item-list">
 							<view class="item-box u-flex">
@@ -175,10 +175,6 @@ export default {
 			font-weight: bold;
 			padding: 0 16rpx;
 		}
-		.cuIcon-move {
-			color: #d3d3d3;
-		}
-
 		.more {
 			font-size: 26rpx;
 			color: #999;
@@ -201,7 +197,7 @@ export default {
 					width: 150rpx;
 					height: 150rpx;
 					border-radius: 6rpx;
-					// background: #ccc;
+					background: #f5f5f5;
 				}
 
 				.item-title {
diff --git a/pages/index/components/sh-adv.vue b/pages/index/components/sh-adv.vue
index e84064cc..77913235 100644
--- a/pages/index/components/sh-adv.vue
+++ b/pages/index/components/sh-adv.vue
@@ -1,56 +1,56 @@
 <template>
 	<view class="adv-box u-m-y-10 u-m-x-20">
 		<!-- 模板1-->
-		<view class="u-flex" v-if="detail.style === 1">
-			<image style="width:710rpx;height:220rpx;border-radius: 10rpx;" @tap="jump(detail.list[0].path)" :src="detail.list[0].image" mode="aspectFill"></image>
+		<view class="u-flex" v-if="advType === 1">
+			<image style="width:710rpx;height:220rpx;border-radius: 10rpx;" @tap="jump(advList[0].path)" :src="advList[0].image" mode="aspectFill"></image>
 		</view>
 		<!-- 模板2-->
-		<view class="type1 u-flex" v-if="detail.style === 2">
-			<image class="type1-img u-m-r-10" @tap="jump(detail.list[0].path)" :src="detail.list[0].image" mode="aspectFill"></image>
-			<image class="type1-img" @tap="jump(detail.list[1].path)" :src="detail.list[1].image" mode="aspectFill"></image>
+		<view class="type1 u-flex" v-if="advType === 2">
+			<image class="type1-img u-m-r-10" @tap="jump(advList[0].path)" :src="advList[0].image" mode="aspectFill"></image>
+			<image class="type1-img" @tap="jump(advList[1].path)" :src="advList[1].image" mode="aspectFill"></image>
 		</view>
 		<!-- 模板3-->
-		<view class="type2 u-flex" v-if="detail.style === 3">
-			<view class="type2-img1 u-m-r-10"><image class="type2-img1 " @tap="jump(detail.list[0].path)" :src="detail.list[0].image" mode="aspectFill"></image></view>
+		<view class="type2 u-flex" v-if="advType === 3">
+			<view class="type2-img1 u-m-r-10"><image class="type2-img1 " @tap="jump(advList[0].path)" :src="advList[0].image" mode="aspectFill"></image></view>
 			<view class="type2-box">
-				<image class="type2-img2" @tap="jump(detail.list[1].path)" :src="detail.list[1].image" mode="aspectFill"></image>
-				<image class="type2-img2" @tap="jump(detail.list[2].path)" :src="detail.list[2].image" mode="aspectFill"></image>
+				<image class="type2-img2" @tap="jump(advList[1].path)" :src="advList[1].image" mode="aspectFill"></image>
+				<image class="type2-img2" @tap="jump(advList[2].path)" :src="advList[2].image" mode="aspectFill"></image>
 			</view>
 		</view>
 		<!-- 模板4-->
-		<view class="type3 u-flex" v-if="detail.style === 4">
+		<view class="type3 u-flex" v-if="advType === 4">
 			<view class="type3-box">
-				<image class="type3-img1" @tap="jump(detail.list[0].path)" :src="detail.list[0].image" mode="aspectFill"></image>
-				<image class="type3-img1" @tap="jump(detail.list[1].path)" :src="detail.list[1].image" mode="aspectFill"></image>
+				<image class="type3-img1" @tap="jump(advList[0].path)" :src="advList[0].image" mode="aspectFill"></image>
+				<image class="type3-img1" @tap="jump(advList[1].path)" :src="advList[1].image" mode="aspectFill"></image>
 			</view>
-			<view class="type3-img2 u-m-l-10"><image class="type3-img2" @tap="jump(detail.list[2].path)" :src="detail.list[2].image" mode="aspectFill"></image></view>
+			<view class="type3-img2 u-m-l-10"><image class="type3-img2" @tap="jump(advList[2].path)" :src="advList[2].image" mode="aspectFill"></image></view>
 		</view>
 		<!-- 模板5-->
-		<view class="type4 " v-if="detail.style === 5">
+		<view class="type4 " v-if="advType === 5">
 			<view class="type4-box u-flex">
-				<image class="type4-img1 u-m-r-10" @tap="jump(detail.list[0].path)" :src="detail.list[0].image" mode="aspectFill"></image>
-				<image class="type4-img1" @tap="jump(detail.list[1].path)" :src="detail.list[1].image" mode="aspectFill"></image>
+				<image class="type4-img1 u-m-r-10" @tap="jump(advList[0].path)" :src="advList[0].image" mode="aspectFill"></image>
+				<image class="type4-img1" @tap="jump(advList[1].path)" :src="advList[1].image" mode="aspectFill"></image>
 			</view>
-			<view class="type4-img2 u-m-t-10"><image class="type4-img2" @tap="jump(detail.list[2].path)" :src="detail.list[2].image" mode="aspectFill"></image></view>
+			<view class="type4-img2 u-m-t-10"><image class="type4-img2" @tap="jump(advList[2].path)" :src="advList[2].image" mode="aspectFill"></image></view>
 		</view>
 		<!-- 模板6-->
-		<view class="type5" v-if="detail.style === 6">
-			<view class="type5-img1 u-m-b-10"><image class="type5-img1" @tap="jump(detail.list[0].path)" :src="detail.list[0].image" mode="aspectFill"></image></view>
+		<view class="type5" v-if="advType === 6">
+			<view class="type5-img1 u-m-b-10"><image class="type5-img1" @tap="jump(advList[0].path)" :src="advList[0].image" mode="aspectFill"></image></view>
 			<view class="type5-box u-flex">
-				<image class="type5-img2 u-m-r-10" @tap="jump(detail.list[1].path)" :src="detail.list[1].image" mode="aspectFill"></image>
-				<image class="type5-img2" @tap="jump(detail.list[2].path)" :src="detail.list[2].image" mode="aspectFill"></image>
+				<image class="type5-img2 u-m-r-10" @tap="jump(advList[1].path)" :src="advList[1].image" mode="aspectFill"></image>
+				<image class="type5-img2" @tap="jump(advList[2].path)" :src="advList[2].image" mode="aspectFill"></image>
 			</view>
 		</view>
 		<!-- 模板7-->
-		<view class="type6" v-if="detail.style === 7">
+		<view class="type6" v-if="advType === 7">
 			<view class="u-flex type6-box1 u-m-b-10">
-				<image class="type6-img1 u-m-r-10" @tap="jump(detail.list[0].path)" :src="detail.list[0].image" mode="aspectFill"></image>
-				<image class="type6-img1" @tap="jump(detail.list[1].path)" :src="detail.list[1].image" mode="aspectFill"></image>
+				<image class="type6-img1 u-m-r-10" @tap="jump(advList[0].path)" :src="advList[0].image" mode="aspectFill"></image>
+				<image class="type6-img1" @tap="jump(advList[1].path)" :src="advList[1].image" mode="aspectFill"></image>
 			</view>
 			<view class="u-flex type6-box2">
-				<image class="type6-img2 u-m-r-10" @tap="jump(detail.list[2].path)" :src="detail.list[2].image" mode="aspectFill"></image>
-				<image class="type6-img2 u-m-r-10" @tap="jump(detail.list[3].path)" :src="detail.list[3].image" mode="aspectFill"></image>
-				<image class="type6-img2" @tap="jump(detail.list[4].path)" :src="detail.list[4].image" mode="aspectFill"></image>
+				<image class="type6-img2 u-m-r-10" @tap="jump(advList[2].path)" :src="advList[2].image" mode="aspectFill"></image>
+				<image class="type6-img2 u-m-r-10" @tap="jump(advList[3].path)" :src="advList[3].image" mode="aspectFill"></image>
+				<image class="type6-img2" @tap="jump(advList[4].path)" :src="advList[4].image" mode="aspectFill"></image>
 			</view>
 		</view>
 	</view>
@@ -64,7 +64,10 @@
 export default {
 	components: {},
 	data() {
-		return {};
+		return {
+			advType: this.detail.style ,// 模板样式
+			advList:this.detail.list // adv数据
+		};
 	},
 	props: {
 		detail: {}
diff --git a/pages/index/components/sh-banner.vue b/pages/index/components/sh-banner.vue
index 5ae9fce8..97e34ab5 100644
--- a/pages/index/components/sh-banner.vue
+++ b/pages/index/components/sh-banner.vue
@@ -1,37 +1,20 @@
 <template>
 	<!-- 轮播 -->
 	<view class="banner-swiper-wrap u-m-b-10" :style="{ padding: `${Py}rpx ${Px}rpx` }">
-		<u-swiper
-			:height="height"
-			:list="list"
-			:autoplay="autoplay"
-			:borderRadius="borderRadius"
-			:indicator-pos="indicatorPos"
-			:mode="mode"
-			:interval="interval"
-			:duration="duration"
-			:circular="circular"
-			:imgMode="imgMode"
-			:bgColor="bgColor"
-			@click="onSwiper"
-		></u-swiper>
+		<swiper class="screen-swiper square-dot" :style="{ height: height + 'rpx' }" :indicator-dots="true" :circular="true" :autoplay="true" interval="5000" duration="500">
+			<swiper-item :style="{ borderRadius: borderRadius + 'rpx' }" v-for="(item, index) in list" :key="index" @tap="onSwiper(index)">
+				<image :src="item.image" mode="aspectFill"></image>
+			</swiper-item>
+		</swiper>
 	</view>
 </template>
 
 <script>
 /**
- * shBanner-轮播卡片,主要为了处理数据,去掉了标题相关
+ * shBanner-轮播卡片
  * @property {Array} list 轮播图数据，
- * @property {String} mode 指示器模式
  * @property {String Number} height 轮播图组件高度，单位rpx（默认250）
- * @property {String} indicator-pos 指示器的位置（默认bottomCenter）
- * @property {Boolean} autoplay 是否自动播放（默认true）
- * @property {Boolean} circular 是否衔接播放（默认true）
- * @property {String Number} interval 隔多久换，单位ms（默认2500）
- * @property {String Number} duration 自动轮播时间间隔，单位ms（默认500）
- * @property {String} img-mode 图片的裁剪模式，详见image组件裁剪模式（默认aspectFill）
  * @property {String} borderRadius 圆角值
- * @property {String} bgColor 背景色
  * @event {Function} click 点击轮播图时触发
  */
 export default {
@@ -60,51 +43,10 @@ export default {
 			type: [Number, String],
 			default: 0
 		},
-		// 隔多久自动切换
-		interval: {
-			type: [String, Number],
-			default: 3000
-		},
-		// 指示器的模式，rect|dot|number|round
-		mode: {
-			type: String,
-			default: 'round'
-		},
 		// list的高度，单位rpx
 		height: {
 			type: [Number, String],
 			default: 250
-		},
-		// 指示器的位置，topLeft|topCenter|topRight|bottomLeft|bottomCenter|bottomRight
-		indicatorPos: {
-			type: String,
-			default: 'bottomCenter'
-		},
-
-		// 是否自动播放
-		autoplay: {
-			type: Boolean,
-			default: true
-		},
-		// 自动轮播时间间隔，单位ms
-		duration: {
-			type: [Number, String],
-			default: 500
-		},
-		// 是否衔接滑动，即到最后一张时接着滑动，是否自动切换到第一张
-		circular: {
-			type: Boolean,
-			default: true
-		},
-		// 图片的裁剪模式
-		imgMode: {
-			type: String,
-			default: 'aspectFill'
-		},
-		// 背景颜色
-		bgColor: {
-			type: String,
-			default: '#f3f4f6'
 		}
 	},
 	computed: {},
@@ -117,4 +59,4 @@ export default {
 };
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped></style>
diff --git a/pages/index/components/sh-category-tabs.vue b/pages/index/components/sh-category-tabs.vue
index 5ff69381..1999a87c 100644
--- a/pages/index/components/sh-category-tabs.vue
+++ b/pages/index/components/sh-category-tabs.vue
@@ -1,51 +1,57 @@
 <template>
 	<!-- 分类选项卡 -->
 	<view class="category-tabs-wrap">
-		<u-sticky ref="uSticky" :h5NavHeight="0" @fixed="stickyTabs" @unfixed="unStickyTabs" :bgColor="isSticky ? '#fff' : '#f6f6f6'" :enable="enable" :isPxNum="stickyTop">
-			<view class="tabs-wrap u-p-y-20" :style="isSticky ? 'border-bottom:1px solid #eee;background-color:#fff' : ''">
-				<scroll-view scroll-x class="tabs-content" enable-flex scroll-with-animation :scroll-left="scrollLeft">
-					<view class="u-flex u-row-cetner u-flex-1 u-col-center">
-						<view class="tab-item u-flex-col u-col-center u-row-center" v-for="(item, index) in tabsList" :key="index" @tap="tabChange(index)">
-							<view class="tab-title u-m-y-6" :class="{ 'title-active': tabCur == index }">{{ item.name }}</view>
-							<view class="tab-des" :class="{ 'des-active': tabCur == index }">{{ item.description }}</view>
+		<!-- 吸顶 -->
+		<view class="u-sticky-wrap" :class="[elClass]" :style="{ height: fixed ? height + 'px' : 'auto', backgroundColor: isSticky ? '#fff' : '#f6f6f6' }">
+			<view
+				class="u-sticky"
+				:style="{ position: fixed ? 'fixed' : 'static', top: stickyTop + 'px', left: left + 'px', width: width == 'auto' ? 'auto' : width + 'px', zIndex: 9999999999 }"
+			>
+				<view class="tabs-wrap u-p-y-20" :style="isSticky ? 'border-bottom:1px solid #eee;background-color:#fff' : ''">
+					<scroll-view scroll-x class="tabs-content" enable-flex scroll-with-animation :scroll-left="scrollLeft">
+						<view class="u-flex u-row-cetner u-flex-1 u-col-center">
+							<view class="tab-item u-flex-col u-col-center u-row-center" v-for="(item, index) in tabsList" :key="index" @tap="tabChange(index)">
+								<view class="tab-title u-m-y-6" :class="{ 'title-active': tabCur == index }">{{ item.name }}</view>
+								<view class="tab-des" :class="{ 'des-active': tabCur == index }">{{ item.description }}</view>
+							</view>
 						</view>
-					</view>
-				</scroll-view>
+					</scroll-view>
+				</view>
+			</view>
+		</view>
+
+		<!-- 瀑布流 -->
+		<view class="u-waterfall u-p-16" v-if="styleType == 1">
+			<view id="u-left-column" class="u-column">
+				<view class="goods-item u-m-b-16 u-flex u-row-center u-col-center" v-for="leftGoods in leftList" :key="leftGoods.id">
+					<shopro-goods-card
+						:detail="leftGoods"
+						:type="leftGoods.activity_type || ''"
+						:image="leftGoods.image"
+						:title="leftGoods.title"
+						:subtitle="leftGoods.subtitle"
+						:price="leftGoods.price"
+						:originPrice="leftGoods.original_price"
+						:tagTextList="leftGoods.activity_discounts_tags"
+						@click="$Router.push({ path: '/pages/goods/detail', query: { id: leftGoods.id } })"
+					></shopro-goods-card>
+				</view>
+			</view>
+			<view id="u-right-column" class="u-column">
+				<view class="goods-item u-m-b-16 u-flex u-row-center u-col-center" v-for="rightGoods in rightList" :key="rightGoods.id">
+					<shopro-goods-card
+						:detail="rightGoods"
+						:type="rightGoods.activity_type || ''"
+						:image="rightGoods.image"
+						:title="rightGoods.title"
+						:subtitle="rightGoods.subtitle"
+						:price="rightGoods.price"
+						:originPrice="rightGoods.original_price"
+						:tagTextList="rightGoods.activity_discounts_tags"
+						@click="$Router.push({ path: '/pages/goods/detail', query: { id: rightGoods.id } })"
+					></shopro-goods-card>
+				</view>
 			</view>
-		</u-sticky>
-		<view class="goods-wrap u-p-16" v-if="styleType == 1">
-			<u-waterfall v-model="goodsList" ref="uWaterfall">
-				<template v-slot:left="{ leftList }">
-					<view class="goods-item u-m-b-16 u-flex u-row-center u-col-center" v-for="leftGoods in leftList" :key="leftGoods.id">
-						<shopro-goods-card
-							:detail="leftGoods"
-							:type="leftGoods.activity_type"
-							:image="leftGoods.image"
-							:title="leftGoods.title"
-							:subtitle="leftGoods.subtitle"
-							:price="leftGoods.price"
-							:originPrice="leftGoods.original_price"
-							:tagTextList="leftGoods.activity_discounts_tags"
-							@click="$Router.push({ path: '/pages/goods/detail', query: { id: leftGoods.id } })"
-						></shopro-goods-card>
-					</view>
-				</template>
-				<template v-slot:right="{ rightList }">
-					<view class="goods-item u-m-b-16 u-flex u-row-center u-col-center" v-for="rightGoods in rightList" :key="rightGoods.id">
-						<shopro-goods-card
-							:detail="rightGoods"
-							:type="rightGoods.activity_type"
-							:image="rightGoods.image"
-							:title="rightGoods.title"
-							:subtitle="rightGoods.subtitle"
-							:price="rightGoods.price"
-							:originPrice="rightGoods.original_price"
-							:tagTextList="rightGoods.activity_discounts_tags"
-							@click="$Router.push({ path: '/pages/goods/detail', query: { id: rightGoods.id } })"
-						></shopro-goods-card>
-					</view>
-				</template>
-			</u-waterfall>
 		</view>
 
 		<!-- m -->
@@ -53,7 +59,7 @@
 			<block v-for="item in goodsList" :key="item.id">
 				<sh-goods-card
 					:detail="item"
-					:type="item.activity_type"
+					:type="item.activity_type || ''"
 					:image="item.image"
 					:title="item.title"
 					:subtitle="item.subtitle"
@@ -68,7 +74,7 @@
 
 		<view class="x-c" style="width: 100%;">
 			<!-- 缺省页 -->
-			<shopro-empty v-show="isEmpty" marginTop="200rpx" :image="$IMG_URL + '/imgs/empty/empty_goods.png'" tipText="暂无该商品，还有更多好货等着你噢~"></shopro-empty>
+			<shopro-empty v-if="isEmpty" marginTop="200rpx" :image="$IMG_URL + '/imgs/empty/empty_goods.png'" tipText="暂无该商品，还有更多好货等着你噢~"></shopro-empty>
 
 			<!-- 更多 -->
 			<u-loadmore v-show="!isEmpty" height="80rpx" :status="loadStatus" icon-type="flower" color="#ccc" />
@@ -95,11 +101,27 @@ export default {
 	},
 	data() {
 		return {
+			// 吸顶相关
+			fixed: false,
+			height: 'auto',
+			elClass: this.$u.guid(),
+			left: 0,
+			width: 'auto',
+			stickyTop: 0,
+			isSticky: false, //是否吸顶
+
+			// 瀑布流 350-330
+			addTime: 100, //排序间隙时间
+			leftHeight: 0,
+			rightHeight: 0,
+			leftList: [],
+			rightList: [],
+			tempList: [],
+
 			tabCur: 0,
 			scrollLeft: 0,
 			isEmpty: true,
-			isSticky: false, //是否吸顶
-			categoryId: 0,
+			categoryId: this.tabsList[0]?.id,
 			goodsList: [],
 			tabCurrent: 0,
 			loadStatus: 'loadmore', //loadmore-加载前的状态，loading-加载中的状态，nomore-没有更多的状态
@@ -107,14 +129,23 @@ export default {
 			lastPage: 1
 		};
 	},
-	watch: {},
+	watch: {
+		enable(val) {
+			if (val == false) {
+				this.fixed = false;
+				this.disconnectObserver('contentObserver');
+			} else {
+				this.initObserver();
+			}
+		}
+	},
 	props: {
 		tabsList: {
 			type: Array,
 			default: () => []
 		},
 		styleType: {
-			type: [Array, Number],
+			type: [String, Number],
 			default: 1
 		},
 		enable: {
@@ -122,20 +153,7 @@ export default {
 			default: false
 		}
 	},
-	computed: {
-		stickyTop() {
-			// #ifdef APP-PLUS || H5
-			return systemInfo.statusBarHeight + 44;
-			// #endif
-			// #ifdef MP
-			let height = systemInfo.platform == 'ios' ? 44 : 48;
-			let top = systemInfo.statusBarHeight + height;
-			return top;
-			// #endif
-		}
-	},
 	created() {
-		this.categoryId = this.tabsList[0]?.id;
 		this.getGoodsList();
 		// 触底监听
 		uni.$on('uOnReachBottom', data => {
@@ -145,7 +163,97 @@ export default {
 			}
 		});
 	},
+	mounted() {
+		this.initObserver();
+	},
+	beforeDestroy() {
+		this.disconnectObserver('contentObserver');
+	},
 	methods: {
+		// 瀑布流相关
+		async splitData() {
+			if (!this.tempList.length) return;
+			let item = this.tempList[0];
+			if (!item) return;
+
+			// 分左右
+			if (this.leftHeight < this.rightHeight) {
+				this.leftHeight += item.activity_discounts_tags.length ? 350 : 330;
+				this.leftList.push(item);
+			} else if (this.leftHeight > this.rightHeight) {
+				this.rightHeight += item.activity_discounts_tags.length ? 350 : 330;
+				this.rightList.push(item);
+			} else {
+				this.leftHeight += item.activity_discounts_tags.length ? 350 : 330;
+				this.leftList.push(item);
+			}
+
+			// 移除临时列表的第一项，如果临时数组还有数据，继续循环
+			this.tempList.splice(0, 1);
+			if (this.tempList.length) {
+				setTimeout(() => {
+					this.splitData();
+				}, this.addTime);
+			}
+		},
+		clear() {
+			this.leftList = [];
+			this.rightList = [];
+			this.leftHeight = 0;
+			this.rightHeight = 0;
+			this.tempList = [];
+		},
+
+		// 吸顶相关
+		initObserver() {
+			if (!this.enable) return;
+			// #ifdef APP-PLUS || H5
+			this.stickyTop = systemInfo.statusBarHeight + 44;
+			// #endif
+			// #ifdef MP
+			let height = systemInfo.platform == 'ios' ? 44 : 48;
+			let top = systemInfo.statusBarHeight + height;
+			this.stickyTop = systemInfo.statusBarHeight + height;
+			// #endif
+			this.disconnectObserver('contentObserver');
+
+			this.$uGetRect('.' + this.elClass).then(res => {
+				this.height = res.height;
+				this.left = res.left;
+				this.width = res.width;
+				this.$nextTick(() => {
+					this.observeContent();
+				});
+			});
+		},
+		observeContent() {
+			this.disconnectObserver('contentObserver');
+			const contentObserver = this.createIntersectionObserver({
+				thresholds: [0.95, 0.98, 1]
+			});
+			contentObserver.relativeToViewport({
+				top: -this.stickyTop
+			});
+			contentObserver.observe('.' + this.elClass, res => {
+				if (!this.enable) return;
+				this.setFixed(res.boundingClientRect.top);
+			});
+			this.contentObserver = contentObserver;
+		},
+		setFixed(top) {
+			const fixed = top < this.stickyTop;
+			if (fixed) {
+				this.isSticky = true;
+			} else if (this.fixed) {
+				this.isSticky = false;
+			}
+			this.fixed = fixed;
+		},
+		disconnectObserver(observerName) {
+			const observer = this[observerName];
+			observer && observer.disconnect();
+		},
+
 		// 商品列表
 		getGoodsList() {
 			let that = this;
@@ -155,9 +263,11 @@ export default {
 			}).then(res => {
 				if (res.code === 1) {
 					that.goodsList = [...that.goodsList, ...res.data.data];
+					that.tempList = res.data.data;
 					that.isEmpty = !that.goodsList.length;
 					that.lastPage = res.data.last_page;
 					that.loadStatus = that.currentPage < res.data.last_page ? 'loadmore' : 'nomore';
+					that.splitData();
 				}
 			});
 		},
@@ -167,28 +277,43 @@ export default {
 			this.tabCur = index;
 			this.scrollLeft = (index - 1) * 60;
 			this.categoryId = this.tabsList[index].id;
-			this.styleType === 1 && this.$refs.uWaterfall.clear();
+			this.styleType === 1 && this.clear();
 			this.goodsList = [];
 			this.currentPage = 1;
 			this.lastPage = 1;
 			this.loadStatus = 'loadmore';
 			this.getGoodsList();
-		},
-		stickyTabs() {
-			this.isSticky = true;
-			this.$refs.uSticky.initObserver();
-		},
-		unStickyTabs() {
-			this.isSticky = false;
-			this.$refs.uSticky.initObserver();
 		}
 	}
 };
 </script>
 
 <style lang="scss" scoped>
+@mixin vue-flex($direction: row) {
+	/* #ifndef APP-NVUE */
+	display: flex;
+	flex-direction: $direction;
+	/* #endif */
+}
 .category-tabs-wrap {
 	min-height: 1000rpx;
+	// 吸顶
+	.u-sticky-wrap {
+		background-color: #fff;
+	}
+	// 瀑布流
+	.u-waterfall {
+		@include vue-flex;
+		flex-direction: row;
+		align-items: flex-start;
+	}
+
+	.u-column {
+		@include vue-flex;
+		flex: 1;
+		flex-direction: column;
+		height: auto;
+	}
 }
 // 滑动分类
 .tabs-content {
diff --git a/pages/index/components/sh-cell.vue b/pages/index/components/sh-cell.vue
index 7d8b4092..2b5c4317 100644
--- a/pages/index/components/sh-cell.vue
+++ b/pages/index/components/sh-cell.vue
@@ -1,17 +1,12 @@
 <template>
 	<view class="sh-user-menu-box u-m-b-10">
-		<u-cell-group class="menu-list-box">
-			<u-cell-item
-				class="menu-item u-flex u-row-between"
-				v-for="(item, index) in list"
-				:key="index"
-				@tap="jump(item)"
-				:icon="item.image"
-				:title="item.name"
-				:titleStyle="{ color: '#999999', fontSize: '26rpx' }"
-				:icon-style="{ width: '36rpx', height: '36rpx' }"
-			></u-cell-item>
-		</u-cell-group>
+		<view class="menu-item u-flex u-row-between u-border-bottom" hover-stay-time="150" hover-class="u-cell-hover" v-for="(item, index) in list" :key="index" @tap="jump(item)">
+			<view class="menu-head u-flex u-col-center">
+				<image class="menu-img u-m-r-10" :src="item.image" mode=""></image>
+				<view class="menu-title ">{{ item.name }}</view>
+			</view>
+			<view class="u-iconfont uicon-arrow-right" style="color: #969799;font-size: 28rpx;"></view>
+		</view>
 	</view>
 </template>
 
@@ -42,4 +37,20 @@ export default {
 };
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+.menu-item {
+	background-color: #fff;
+	width: 100%;
+	padding: 26rpx 32rpx;
+	font-size: 28rpx;
+	line-height: 54rpx;
+	.menu-img {
+		width: 36rpx;
+		height: 36rpx;
+	}
+	.menu-title {
+		font-size: 26rpx;
+		color: #999;
+	}
+}
+</style>
diff --git a/pages/index/components/sh-coupon.vue b/pages/index/components/sh-coupon.vue
index 5f8c65a4..038deab6 100644
--- a/pages/index/components/sh-coupon.vue
+++ b/pages/index/components/sh-coupon.vue
@@ -5,7 +5,7 @@
 			<view class="head-title u-ellipsis-1">领券专区</view>
 			<view class="head-more u-flex u-col-center" @tap="$Router.push('/pages/app/coupon/list')">
 				<text class="more-text u-m-r-10">查看更多</text>
-				<text class="iconfont iconyoujiantou-tianchong more-icon"></text>
+				<text class="iconfont icon-youjiantou-tianchong more-icon"></text>
 			</view>
 		</view>
 		<scroll-view class="groupon-scroll" enable-flex scroll-anchoring scroll-x scroll-with-animation>
@@ -14,28 +14,39 @@
 					<!-- mini -->
 					<view
 						class="coupon-card u-flex u-row-between u-m-r-16"
-						v-if="detail.style === 2"
-						:style="{ background: `linear-gradient(to right, ${detail.bgcolor1}, ${detail.bgcolor2})` }"
+						v-if="couponType === 2"
+						:style="{ background: `linear-gradient(to right, ${bgColor1}, ${bgColor2})` }"
 					>
 						<view class="card-left u-flex-col u-row-center u-p-l-30">
-							<view class="price u-m-b-10" :style="{ color: detail.pricecolor }">{{ item.amount }}</view>
-							<view class="notice" :style="{ color: detail.color }">满{{ item.enough }}元可用</view>
-							<view class="notice u-m-b-10" :style="{ color: detail.color }">仅剩{{ item.stock }}张</view>
+							<view class="price u-m-b-10" :style="{ color: priceColor }">{{ item.amount }}</view>
+							<view class="notice" :style="{ color: color }">满{{ item.enough }}元可用</view>
+							<view class="notice u-m-b-10" :style="{ color: color }">仅剩{{ item.stock }}张</view>
 						</view>
 						<view class="card-right u-p-y-20 u-p-r-10 u-flex-col u-row-center u-col-center">
-							<button class="u-reset-button get-btn u-m-b-10" :style="{ color: detail.color }" @tap="getCoupon(item.id, index)">领券购买</button>
+							<button class="u-reset-button get-btn u-m-b-10" :style="{ color: color }" @tap="getCoupon(item.id, index)">领券购买</button>
 						</view>
 					</view>
 					<!-- big -->
-					<view v-if="detail.style === 1" class="u-p-r-16">
-						<shopro-coupon
-							:couponData="item"
-							:gradientColor="`background: linear-gradient(to right, ${detail.bgcolor1}, ${detail.bgcolor2});`"
-							:priceColor="detail.pricecolor"
-							:color="detail.color"
-							:btnTextColor="detail.bgcolor1"
-							:state="0"
-						></shopro-coupon>
+					<view v-if="couponType === 1" class="u-p-r-16">
+						<view class="coupon-wrap" :style="{ background: `linear-gradient(to right, ${bgColor1}, ${bgColor2})` }">
+							<view class="coupon-item u-flex u-row-between">
+								<view class="coupon-left  u-flex-col ">
+									<view class="sum-box">
+										<text class="unit " :style="{ color: priceColor }">￥</text>
+										<text class="sum " :style="{ color: priceColor }">{{ item.amount }}</text>
+										<text class="sub " :style="{ color: priceColor }">{{ item.name }}</text>
+									</view>
+									<view class="notice " :style="{ color: color }">满{{ item.enough }}元可用</view>
+									<view class="notice" :style="{ color: color }">
+										有效期：{{ $u.timeFormat(item.usetime.start, 'yyyy-mm-dd') }} 至 {{ $u.timeFormat(item.usetime.end, 'yyyy-mm-dd') }}
+									</view>
+								</view>
+								<view class="coupon-right u-flex-col">
+									<button class=" get-btn" :style="{ color: bgColor1 }" @tap.stop="getCoupon(item.id, index)">立即领取</button>
+									<view class="surplus-num" :style="{ color: color }">仅剩{{ item.stock }}张</view>
+								</view>
+							</view>
+						</view>
 					</view>
 				</view>
 			</view>
@@ -53,7 +64,13 @@ export default {
 	data() {
 		return {
 			currentIndex: 0,
-			couponList: []
+			couponList: [],
+
+			couponType: this.detail.style,
+			priceColor: this.detail.pricecolor,
+			color: this.detail.color,
+			bgColor1:this.detail.bgcolor1,
+			bgColor2:this.detail.bgcolor2
 		};
 	},
 	props: {
@@ -84,16 +101,16 @@ export default {
 		// 领取
 		getCoupon(id, index) {
 			let that = this;
-
-			that.$http(
-				'coupons.get',
-				{
-					id: id
-				},
-				'领取中...'
-			).then(res => {
+			uni.showLoading({
+				title: '领取中'
+			});
+			that.$http('coupons.get', {
+				id: id
+			}).then(res => {
+				uni.hideLoading();
 				if (res.code === 1) {
 					that.couponList[index].stock -= 1;
+					this.$u.toast('领取成功');
 				}
 			});
 		}
@@ -105,10 +122,10 @@ export default {
 .groupon-scroll {
 	height: 170rpx;
 	width: 730rpx;
-}
-.groupon-card-wrap {
-	height: 170rpx;
-	width: 730rpx;
+	.groupon-card-wrap {
+		height: 170rpx;
+		width: 730rpx;
+	}
 }
 
 .coupon-box {
@@ -172,4 +189,76 @@ export default {
 		}
 	}
 }
+
+// 未领取，已领取
+.coupon-wrap {
+	mask: url($IMG_URL+'/imgs/coupon_bg1.png');
+	mask-size: 100% 100%;
+	position: relative;
+	border-radius: 10rpx;
+	width: 710rpx;
+	height: 170rpx;
+	background: linear-gradient(to right, $u-type-warning-disabled, $u-type-warning);
+	.coupon-item {
+		width: 100%;
+		height: 168rpx;
+		border-radius: 10rpx;
+
+		.coupon-left {
+			height: 100%;
+			justify-content: center;
+			padding-left: 40rpx;
+
+			.unit {
+				font-size: 24rpx;
+				color: #fff;
+			}
+
+			.sum {
+				font-size: 55rpx;
+				font-weight: bold;
+				color: #fff;
+				line-height: 55rpx;
+				padding-right: 10rpx;
+			}
+
+			.sub {
+				font-size: 26rpx;
+				color: #fff;
+			}
+
+			.notice {
+				font-size: 22rpx;
+				color: rgba(#fff, 0.7);
+				margin-top: 6rpx;
+			}
+		}
+
+		.coupon-right {
+			height: 100%;
+			width: 220rpx;
+			justify-content: center;
+			align-items: center;
+
+			.get-btn {
+				width: 142rpx;
+				height: 54rpx;
+				background: #ffffff;
+				border-radius: 27rpx;
+				padding: 0;
+				font-size: 24rpx;
+				font-weight: 500;
+				color: $u-type-warning;
+			}
+
+			.surplus-num {
+				font-size: 22rpx;
+
+				font-weight: 500;
+				color: #fff;
+				margin-top: 14rpx;
+			}
+		}
+	}
+}
 </style>
diff --git a/pages/index/components/sh-goods-card.vue b/pages/index/components/sh-goods-card.vue
index 29bf5735..802703a0 100644
--- a/pages/index/components/sh-goods-card.vue
+++ b/pages/index/components/sh-goods-card.vue
@@ -1,19 +1,11 @@
+<!-- 横版大图，商品卡片 -->
 <template>
-	<!--b-->
 	<view class="big-goods u-flex u-p-20 u-col-top u-m-b-16" @tap="click" :style="type ? 'background-image: url(' + $IMG_URL + typeMap[type].goodsBg + ')' : ''">
-		<u-image ref="uImage" :width="220" :height="220" border-radius="10" :src="image" mode="aspectFill"></u-image>
+		<image class="goods-img" lazy-load fade-show :src="image" mode="aspectFill"></image>
 		<view class=" card-right u-m-l-20 u-flex-col u-row-between">
 			<view class="">
 				<view class="goods-title u-ellipsis-1 u-m-t-10 u-m-b-10">
-					<u-tag
-						class="title-tag u-m-r-10"
-						v-if="type"
-						:text="typeMap[type].text"
-						size="mini"
-						:bg-color="typeMap[type].tagBg"
-						:border-color="typeMap[type].tagBg"
-						color="#fff"
-					/>
+					<view v-if="type" class=" sm cu-tag radius title-tag u-m-r-10" :style="{ backgroundColor: typeMap[type].tagBg, color: '#fff' }">{{ typeMap[type].text }}</view>
 					{{ title }}
 				</view>
 				<view v-show="subtitle" class="subtitle-text u-m-b-10 u-ellipsis-1">{{ subtitle }}</view>
@@ -80,7 +72,7 @@
  * @property {Array} tagTextList - 活动标签
  * @event {Function} click 商品被点击
  */
-import { mapMutations, mapActions, mapState } from 'vuex';
+import { mapMutations, mapActions, mapState, mapGetters } from 'vuex';
 export default {
 	components: {},
 	data() {
@@ -106,10 +98,7 @@ export default {
 		};
 	},
 	computed: {
-		...mapState({
-			cartList: ({ cart }) => cart.cartList,
-			checkCart: ({ cart }) => cart.checkCart
-		})
+		...mapGetters(['cartList', 'checkCart'])
 	},
 	props: {
 		detail: {
@@ -119,7 +108,7 @@ export default {
 			}
 		},
 		type: {
-			type: String,
+			type: [String,null],
 			default: ''
 		},
 		image: {
@@ -280,11 +269,17 @@ export default {
 // 大商品卡片
 .big-goods {
 	width: 710rpx;
-	height: 260rpx;
+	min-height: 260rpx;
 	background: #ffffff;
 	border-radius: 20rpx;
 	background-repeat: no-repeat;
 	background-size: 100% 100%;
+	.goods-img {
+		width: 260rpx;
+		height: 260rpx;
+		background-color: #f5f5f5;
+		border-radius: 6rpx;
+	}
 	.card-right {
 		width: 430rpx;
 		height: 220rpx;
diff --git a/pages/index/components/sh-grid-swiper.vue b/pages/index/components/sh-grid-swiper.vue
index aa2c536a..ab20d975 100644
--- a/pages/index/components/sh-grid-swiper.vue
+++ b/pages/index/components/sh-grid-swiper.vue
@@ -1,7 +1,7 @@
 <template>
 	<!-- 产品分类导航 -->
 	<view class="wrap">
-		<view v-if="true" class="menu-category-box u-m-b-10" :style="list.length <= oneRowNum ? `height:180rpx` : `height:380rpx`">
+		<view class="menu-category-box u-m-b-10" :style="list.length <= oneRowNum ? `height:180rpx` : `height:380rpx`">
 			<swiper
 				class="menu-swiper-box"
 				@change="onSwiper"
@@ -30,23 +30,6 @@
 				<text :class="categoryCurrent === index ? 'category-dot-active' : 'category-dot'" v-for="(dot, index) in newList.length" :key="index"></text>
 			</view>
 		</view>
-
-		<!-- cell -->
-		<view class="menu-list-box" v-else>
-			<view
-				class="menu-item u-flex u-col-center u-row-between"
-				hover-stay-time="150"
-				hover-class="u-cell-hover"
-				v-for="(nav, index) in list"
-				:key="nav.name"
-				@tap="jump(nav)"
-			>
-				<view class="u-flex u-col-center">
-					<image v-if="nav.image" class="item-img" :src="nav.image" mode=""></image>
-					<text class="item-title">{{ nav.name }}</text>
-				</view>
-				<u-icon class="u-m-l-20" name="arrow-right" size="26" color="#999"></u-icon>
-			</view>
 		</view>
 	</view>
 </template>
@@ -61,7 +44,7 @@ export default {
 	components: {},
 	data() {
 		return {
-			categoryCurrent: 0 //分类轮播下标
+			categoryCurrent: 0 ,//分类轮播下标
 		};
 	},
 	props: {
@@ -148,26 +131,4 @@ export default {
 		}
 	}
 }
-// cell
-.menu-list-box {
-	.menu-item {
-		height: 100rpx;
-		padding: 0 30rpx;
-		background: #fff;
-		border-bottom: 1rpx solid #f3f3f3;
-		.item-img {
-			width: 44rpx;
-			height: 44rpx;
-			margin-right: 20rpx;
-		}
-
-		.item-title {
-			font-size: 24rpx;
-			font-family: PingFang SC;
-			font-weight: 500;
-			color: rgba(153, 153, 153, 1);
-			line-height: 24rpx;
-		}
-	}
-}
 </style>
diff --git a/pages/index/components/sh-grid.vue b/pages/index/components/sh-grid.vue
index 7586a6d8..3e245c07 100644
--- a/pages/index/components/sh-grid.vue
+++ b/pages/index/components/sh-grid.vue
@@ -1,11 +1,9 @@
 <template>
-	<view class="sh-grid-box u-m-b-10" 　v-if="list.length">
-		<u-grid :col="4" :border="false">
-			<u-grid-item :border="false" name="item1" v-for="(menu, index) in list" :key="index" @click="jump(menu)">
-				<image class="tool-img" :src="menu.image" mode="aspectFill"></image>
-				<view class="item-title">{{ menu.name }}</view>
-			</u-grid-item>
-		</u-grid>
+	<view class="grid-wap u-m-b-10 u-flex u-flex-wrap u-col-center" v-if="list.length">
+		<view class="grid-item u-flex-col u-row-center u-col-center" v-for="(menu, index) in list" :key="index" @tap="jump(menu)">
+			<image class="tool-img" :src="menu.image" mode="aspectFill"></image>
+			<view class="item-title">{{ menu.name }}</view>
+		</view>
 	</view>
 </template>
 
@@ -28,6 +26,7 @@ export default {
 			}
 		}
 	},
+	created() {},
 	methods: {
 		jump(data) {
 			this.$tools.routerTo(data.path);
@@ -38,20 +37,24 @@ export default {
 
 <style lang="scss">
 // 宫格
-.sh-grid-box {
+.grid-wap {
 	background: #fff;
-	display: flex;
-	flex-wrap: wrap;
-	.tool-img {
-		width: 44rpx;
-		height: 44rpx;
-	}
-	.item-title {
-		font-size: 26rpx;
-		font-weight: 500;
-		color: rgba(153, 153, 153, 1);
-		line-height: 24rpx;
-		padding-top: 30rpx;
+	width: 750rpx;
+	padding: 30rpx 0 0;
+	.grid-item {
+		width: 25%;
+		margin-bottom: 40rpx;
+		.tool-img {
+			width: 44rpx;
+			height: 44rpx;
+		}
+		.item-title {
+			font-size: 26rpx;
+			font-weight: 500;
+			color: rgba(153, 153, 153, 1);
+			line-height: 24rpx;
+			padding-top: 20rpx;
+		}
 	}
 }
 </style>
diff --git a/pages/index/components/sh-groupon.vue b/pages/index/components/sh-groupon.vue
index e43bd55c..cd94caaa 100644
--- a/pages/index/components/sh-groupon.vue
+++ b/pages/index/components/sh-groupon.vue
@@ -4,16 +4,16 @@
 		<!-- 标题栏 -->
 		<view class="title-box u-flex u-row-between u-p-y-20 groupon-title">
 			<view class="u-flex u-col-center">
-				<view class="title-text u-m-r-20 u-ellipsis-1">{{ detail.name }}</view>
+				<view class="title-text u-m-r-20 u-ellipsis-1">{{ detail.title }}</view>
 			</view>
 			<view class="more-box u-flex" @tap="$Router.push('/pages/activity/groupon/list')">
 				<text class="more-text u-m-r-10">更多拼团</text>
-				<text class="iconfont iconyoujiantou-tianchong more-icon"></text>
+				<text class="iconfont icon-youjiantou-tianchong more-icon"></text>
 			</view>
 		</view>
 		<!-- 活动商品 -->
 		<!-- m -->
-		<scroll-view v-if="detail.style === 1" class="scroll-box" scroll-x scroll-anchoring>
+		<scroll-view v-if="grouponType === 1" class="scroll-box" scroll-x scroll-anchoring>
 			<view class="goods-box u-flex">
 				<view class="min-goods u-m-r-14" v-for="mgoods in goodsList" :key="mgoods.id" @tap="jump('/pages/goods/detail', { id: mgoods.id })">
 					<view class="img-box"><image class="img" :src="mgoods.image" mode=""></image></view>
@@ -31,17 +31,17 @@
 		</scroll-view>
 		<!--b-->
 		<view
-			v-if="detail.style === 2"
+			v-if="grouponType === 2"
 			class="big-goods  u-flex u-p-20 u-col-top u-m-b-16"
 			v-for="item in goodsList"
 			:key="item.id"
 			@tap="jump('/pages/goods/detail', { id: item.id })"
 		>
-			<u-image ref="uImage" :width="220" :height="220" border-radius="10" :src="item.image" mode="aspectFill"></u-image>
+			<image class="goods-img" :src="item.image" mode="aspectFill"></image>
 			<view class=" card-right u-m-l-20 u-flex-col u-row-between">
 				<view class="">
 					<view class="goods-title u-ellipsis-1  u-m-t-10 u-m-b-10">
-						<u-tag class="title-tag u-m-r-10" text="拼团" size="mini" bg-color="#FF6600" border-color="#FF6600" color="#fff" />
+						<view class=" sm cu-tag radius title-tag u-m-r-10" style="{ backgroundColor: #FF6600, color: '#fff' }">拼团</view>
 						{{ item.title }}
 					</view>
 					<view v-show="item.subtitle" class="subtitle-text u-m-b-10 u-ellipsis-1">{{ item.subtitle }}</view>
@@ -49,7 +49,7 @@
 
 				<view class="u-flex u-m-y-20">
 					<view class="sell-box">
-						<text class=" hot-icon iconfont iconicon-test"></text>
+						<text class=" hot-icon iconfont icon-icon-test"></text>
 						<text class="sell-num">已拼{{ item.sales }}件</text>
 					</view>
 					<text class="group-num">{{ item.activity.rules.team_num || 0 }}人团</text>
@@ -78,7 +78,8 @@ export default {
 		return {
 			timestamp: 0, //倒计时
 			goodsList: [],
-			showActivity: true //是否显示活动。
+			showActivity: true, //是否显示活动。
+			grouponType: this.detail.style
 		};
 	},
 	props: {
@@ -112,6 +113,7 @@ export default {
 			}).then(res => {
 				if (res.code === 1) {
 					that.goodsList = res.data.goods.data;
+					that.showActivity = that.goodsList.length;
 				} else {
 					that.showActivity = false;
 					console.log(`%cerr:拼团活动已结束`, 'color:green;background:yellow');
@@ -236,6 +238,11 @@ export default {
 	background: #ffffff;
 	box-shadow: 0px 7rpx 8rpx 1rpx #fffaef;
 	border-radius: 20rpx;
+	.goods-img {
+		width: 220rpx;
+		height: 220rpx;
+		border-radius: 6rpx;
+	}
 	.card-right {
 		width: 430rpx;
 		height: 100%;
diff --git a/pages/index/components/sh-hot-goods.vue b/pages/index/components/sh-hot-goods.vue
index a3aee275..f323be69 100644
--- a/pages/index/components/sh-hot-goods.vue
+++ b/pages/index/components/sh-hot-goods.vue
@@ -1,9 +1,8 @@
 <template>
 	<!-- 为你推荐 -->
 	<view class="hot-goods u-m-b-10 u-p-x-16">
-		<!-- s -->
-		<u-waterfall v-model="goodsList" ref="uWaterfall" v-if="detail.style === 1">
-			<template v-slot:left="{ leftList }">
+		<view class="u-waterfall" v-if="goodsType === 1">
+			<view id="u-left-column" class="u-column">
 				<view class="goods-item u-m-b-16 u-flex u-row-center u-col-center" v-for="leftGoods in leftList" :key="leftGoods.id">
 					<shopro-goods-card
 						:detail="leftGoods"
@@ -18,8 +17,8 @@
 						@click="$Router.push({ path: '/pages/goods/detail', query: { id: leftGoods.id } })"
 					></shopro-goods-card>
 				</view>
-			</template>
-			<template v-slot:right="{ rightList }">
+			</view>
+			<view id="u-right-column" class="u-column">
 				<view class="goods-item  u-m-b-16 u-flex u-row-center u-col-center" v-for="rightGoods in rightList" :key="rightGoods.id">
 					<shopro-goods-card
 						:detail="rightGoods"
@@ -34,10 +33,10 @@
 						@click="$Router.push({ path: '/pages/goods/detail', query: { id: rightGoods.id } })"
 					></shopro-goods-card>
 				</view>
-			</template>
-		</u-waterfall>
+			</view>
+		</view>
 		<!-- m -->
-		<view class="big-card-wrap u-p-10" v-if="detail.style === 2">
+		<view class="big-card-wrap u-p-10" v-if="goodsType === 2">
 			<block v-for="item in goodsList" :key="item.id">
 				<sh-goods-card
 					:detail="item"
@@ -54,7 +53,7 @@
 			</block>
 		</view>
 		<button v-show="total > perPage" class="u-reset-button refresh-btn u-m-y-20 u-flex u-col-center u-row-center" @tap.stop="loadMore">
-			<u-icon class="u-m-r-6" name="reload" size="28" color="#999" :class="{ 'refresh-active': isRefresh }"></u-icon>
+			<text class="u-m-r-6 u-iconfont uicon-reload" style="font-size: 28rpx;color: #999" :class="{ 'refresh-active': isRefresh }"></text>
 			{{ listParams.page >= lastPage ? '收起' : '加载更多' }}
 		</button>
 	</view>
@@ -79,13 +78,24 @@ export default {
 			total: 0, //总商品数
 			perPage: 0, //单页商品数
 			goodsList: [],
-			isRefresh: false
+			isRefresh: false,
+
+			// 瀑布流 350-330
+			addTime: 100, //排序间隙时间
+			leftHeight: 0,
+			rightHeight: 0,
+			leftList: [],
+			rightList: [],
+			tempList: [],
+
+			goodsType: this.detail.style // 商品模板
 		};
 	},
+
 	props: {
 		detail: {
 			type: Object,
-			default: null
+			default: () => {}
 		}
 	},
 	created() {
@@ -98,8 +108,41 @@ export default {
 			this.getGoodsList();
 		}
 	},
-	computed: {},
 	methods: {
+		// 瀑布流相关
+		async splitData() {
+			if (!this.tempList.length) return;
+			let item = this.tempList[0];
+			if (!item) return;
+
+			// 分左右
+			if (this.leftHeight < this.rightHeight) {
+				this.leftHeight += item.activity_discounts_tags?.length ? 350 : 330;
+				this.leftList.push(item);
+			} else if (this.leftHeight > this.rightHeight) {
+				this.rightHeight += item.activity_discounts_tags?.length ? 350 : 330;
+				this.rightList.push(item);
+			} else {
+				this.leftHeight += item.activity_discounts_tags?.length ? 350 : 330;
+				this.leftList.push(item);
+			}
+
+			// 移除临时列表的第一项，如果临时数组还有数据，继续循环
+			this.tempList.splice(0, 1);
+			if (this.tempList.length) {
+				setTimeout(() => {
+					this.splitData();
+				}, this.addTime);
+			}
+		},
+		clear() {
+			this.leftList = [];
+			this.rightList = [];
+			this.leftHeight = 0;
+			this.rightHeight = 0;
+			this.tempList = [];
+		},
+
 		// 商品列表
 		getGoodsList() {
 			let that = this;
@@ -110,6 +153,8 @@ export default {
 					this.perPage = res.data.per_page;
 					this.isRefresh = false;
 					that.goodsList = [...that.goodsList, ...res.data.data];
+					that.tempList = res.data.data;
+					that.goodsList.length && that.splitData();
 				}
 			});
 		},
@@ -127,7 +172,7 @@ export default {
 					this.listParams.page = 1;
 					this.lastPage = 1;
 					this.goodsList = [];
-					this.$refs.uWaterfall.clear();
+					this.clear();
 					this.getGoodsList();
 				}
 			}
@@ -137,6 +182,28 @@ export default {
 </script>
 
 <style lang="scss">
+@mixin vue-flex($direction: row) {
+	/* #ifndef APP-NVUE */
+	display: flex;
+	flex-direction: $direction;
+	/* #endif */
+}
+.u-waterfall {
+	@include vue-flex;
+	flex-direction: row;
+	align-items: flex-start;
+}
+
+.u-column {
+	@include vue-flex;
+	flex: 1;
+	flex-direction: column;
+	height: auto;
+}
+
+.u-image {
+	width: 100%;
+}
 // 为你推荐
 .hot-goods {
 	background: none;
diff --git a/pages/index/components/sh-live.vue b/pages/index/components/sh-live.vue
index 6db50b2d..b3871d26 100644
--- a/pages/index/components/sh-live.vue
+++ b/pages/index/components/sh-live.vue
@@ -1,18 +1,18 @@
 <template>
-	<view class="live-el u-m-p-20 u-m-b-10" v-if="detail.ids">
+	<view class="live-el u-m-p-20 u-m-b-10" v-if="showLive">
 		<view class="head">
 			<text class="head-title">{{ detail.name }}</text>
 			<view class="head-more u-flex u-col-center" @tap="$Router.push('/pages/app/live/list')">
 				<text class="u-m-r-10 more-text">更多直播</text>
-				<text class="iconfont iconyoujiantou-tianchong more-icon"></text>
+				<text class="iconfont icon-youjiantou-tianchong more-icon"></text>
 			</view>
 		</view>
-		
+
 		<!-- 大图 -->
-		<view v-if="detail.style == 1" v-for="live in liveList" :key="live.id"><shopro-live-card :type="1" :detail="live"></shopro-live-card></view>
-		
+		<view v-if="liveType == 1" v-for="live in liveList" :key="live.id"><shopro-live-card :type="1" :detail="live"></shopro-live-card></view>
+
 		<!-- 小图 -->
-		<view class="content-two" v-if="detail.style == 2">
+		<view class="content-two" v-if="liveType == 2">
 			<view class="content-two__item" v-for="live in liveList" :key="live.id">
 				<shopro-live-card :type="2" :detail="live" :wh="345">
 					<block slot="liveGoods"><text></text></block>
@@ -31,14 +31,16 @@ export default {
 	components: {},
 	data() {
 		return {
-			liveList: []
+			liveList: [],
+			showLive: this.detail.ids,
+			liveType: this.detail.style
 		};
 	},
 	props: {
 		detail: {}
 	},
 	created() {
-		this.detail.ids && this.getLiveList();
+		this.showLive && this.getLiveList();
 	},
 	computed: {},
 	methods: {
diff --git a/pages/index/components/sh-order-card.vue b/pages/index/components/sh-order-card.vue
index e172ce04..da40d8ab 100644
--- a/pages/index/components/sh-order-card.vue
+++ b/pages/index/components/sh-order-card.vue
@@ -32,7 +32,7 @@
  * 订单中心卡片
  *
  */
-import { mapMutations, mapActions, mapState } from 'vuex';
+import { mapMutations, mapActions, mapState, mapGetters } from 'vuex';
 export default {
 	components: {},
 	data() {
@@ -72,10 +72,10 @@ export default {
 		};
 	},
 	computed: {
-		...mapState({
-			orderNum: ({ user }) => user.userData?.order_num,
-			isLogin: ({ user }) => user.isLogin
-		})
+		...mapGetters(['isLogin', 'userOtherData']),
+		orderNum() {
+			return this.userOtherData.order_num || 0;
+		}
 	},
 	methods: {
 		jump(path, query) {
diff --git a/pages/index/components/sh-search.vue b/pages/index/components/sh-search.vue
index 0863bdb9..e11a3df1 100644
--- a/pages/index/components/sh-search.vue
+++ b/pages/index/components/sh-search.vue
@@ -1,6 +1,9 @@
 <template>
 	<view class="search u-flex u-row-center u-col-center u-m-b-10 u-p-x-20" @tap="$Router.push('/pages/public/search')">
-		<view style="width: 710rpx;"><u-search disabled :show-action="false" placeholder="搜索"></u-search></view>
+		<view class="search-content u-flex u-col-center">
+			<text class="u-iconfont uicon-search search-icon"></text>
+			<view class="pl-text">搜索</view>
+		</view>
 	</view>
 </template>
 
@@ -24,5 +27,20 @@ export default {
 	height: 100rpx;
 	width: 750rpx;
 	background: #fff;
+	.search-content {
+		width: 710rpx;
+		padding: 0 18rpx;
+		background-color: #f2f2f2;
+		border-radius: 100rpx;
+		height: 64rpx;
+		.search-icon {
+			color: #606266;
+			size: 34rpx;
+		}
+		.pl-text {
+			color: $u-tips-color;
+			margin-left: 10rpx;
+		}
+	}
 }
 </style>
diff --git a/pages/index/components/sh-seckill.vue b/pages/index/components/sh-seckill.vue
index 0fe796ad..f168a0a0 100644
--- a/pages/index/components/sh-seckill.vue
+++ b/pages/index/components/sh-seckill.vue
@@ -18,12 +18,12 @@
 			</view>
 			<view class="more-box u-flex" @tap="$Router.push('/pages/activity/seckill/list')">
 				<text class="more-text u-m-r-10">更多抢购</text>
-				<text class="iconfont iconyoujiantou-tianchong more-icon"></text>
+				<text class="iconfont icon-youjiantou-tianchong more-icon"></text>
 			</view>
 		</view>
 		<!-- 活动商品 -->
 		<!-- m -->
-		<scroll-view v-if="detail.style === 1" class="scroll-box" scroll-x scroll-anchoring>
+		<scroll-view v-if="seckillType === 1" class="scroll-box" scroll-x scroll-anchoring>
 			<view class="goods-box u-flex">
 				<view class="min-goods u-m-r-14" v-for="mgoods in goodsList" :key="mgoods.id" @tap="jump('/pages/goods/detail', { id: mgoods.id })">
 					<view class="img-box"><image class="img" :src="mgoods.image" mode=""></image></view>
@@ -39,17 +39,17 @@
 		</scroll-view>
 		<!--b-->
 		<view
-			v-if="detail.style === 2"
+			v-if="seckillType === 2"
 			class="big-goods  u-flex u-p-20 u-col-top u-m-b-16"
 			v-for="item in goodsList"
 			:key="item.id"
 			@tap="jump('/pages/goods/detail', { id: item.id })"
 		>
-			<u-image ref="uImage" :width="220" :height="220" border-radius="10" :src="item.image" mode="aspectFill"></u-image>
+			<image class="goods-img" :src="item.image" mode="aspectFill"></u-image>
 			<view class=" card-right u-m-l-20 u-flex-col u-row-between">
 				<view class="">
 					<view class="goods-title u-ellipsis-1 u-m-t-10 u-m-b-10">
-						<u-tag class="title-tag u-m-r-10" text="秒杀" size="mini" bg-color="#FF2621" border-color="#FF2621" color="#fff" />
+						<view class=" sm cu-tag bg-red radius title-tag u-m-r-10" >秒杀</view>
 						{{ item.title }}
 					</view>
 					<view v-show="item.subtitle" class="subtitle-text u-m-b-10 u-ellipsis-1">{{ item.subtitle }}</view>
@@ -91,7 +91,8 @@ export default {
 		return {
 			timestamp: 0, //倒计时
 			goodsList: [],
-			showActivity: true //是否显示活动。
+			showActivity: true, //是否显示活动。
+			seckillType: this.detail.style
 		};
 	},
 	props: {
@@ -242,6 +243,11 @@ export default {
 	background: #ffffff;
 	box-shadow: 0px 7rpx 8rpx 1rpx rgba(254, 76, 29, 0.05);
 	border-radius: 20rpx;
+	.goods-img{
+		width: 220rpx;
+		height: 220rpx;
+		border-radius: 6rpx;
+	}
 	.card-right {
 		width: 430rpx;
 		height: 100%;
@@ -251,9 +257,6 @@ export default {
 		font-weight: 600;
 		width: 400rpx;
 		color: #000000;
-		.title-tag {
-			transform: scale(0.9);
-		}
 	}
 	.subtitle-text {
 		font-size: 22rpx;
diff --git a/pages/index/components/sh-wallet.vue b/pages/index/components/sh-wallet.vue
index a8d643d9..fc1b39f3 100644
--- a/pages/index/components/sh-wallet.vue
+++ b/pages/index/components/sh-wallet.vue
@@ -11,7 +11,7 @@
 				<text class="wallet-item__title">积分</text>
 			</view>
 			<view class="wallet-item u-flex-col u-col-center" @tap="jump('/pages/app/coupon/list')">
-				<text class="wallet-item__detail item-coupon u-ellipsis-1">{{ userData.coupons_num || '0' }}</text>
+				<text class="wallet-item__detail item-coupon u-ellipsis-1">{{ userOtherData.coupons_num || '0' }}</text>
 				<text class="wallet-item__title">优惠券</text>
 			</view>
 		</view>
@@ -27,17 +27,14 @@
 /**
  * 钱包样式卡片
  */
-import { mapMutations, mapActions, mapState } from 'vuex';
+import { mapMutations, mapActions, mapState, mapGetters } from 'vuex';
 export default {
 	components: {},
 	data() {
 		return {};
 	},
 	computed: {
-		...mapState({
-			userInfo: ({ user }) => user.userInfo,
-			userData: ({ user }) => user.userData
-		})
+		...mapGetters(['userInfo', 'userOtherData'])
 	},
 	methods: {
 		jump(path, query) {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 5f85273e..020678b6 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -2,13 +2,14 @@
 <template>
 	<view class="home-wrap u-m-b-20">
 		<!-- 空白页 -->
+		<!-- #ifdef APP-PLUS -->
 		<u-no-network @retry="init"></u-no-network>
+		<!-- #endif -->
 		<shopro-empty v-if="!hasTemplate" :image="$IMG_URL + '/imgs/empty/template_empty.png'" tipText="暂未找到模板，请前往装修~"></shopro-empty>
 
 		<view v-else-if="isConnected && isRefresh" class="content-box">
 			<!-- 导航栏 -->
-			<home-head v-if="headSwiperList && headSwiperList.length" :isScorll="isScorll" borderRadius="0" :navTitle="appName" :list="headSwiperList"></home-head>
-
+			<home-head v-if="headSwiperList && headSwiperList.length" :isScorll="isScorll" borderRadius="0" :navTitle="initShop.name" :list="headSwiperList"></home-head>
 			<!-- 自定义模块 -->
 			<view class="template-box">
 				<block v-for="(item, index) in homeTemplate" :key="item.id">
@@ -40,22 +41,15 @@
 					<sh-groupon v-if="item.type === 'groupon'" :detail="item.content"></sh-groupon>
 					<!-- 富文本 -->
 					<sh-richtext v-if="item.type === 'rich-text'" :richId="item.content.id"></sh-richtext>
-					<!-- 功能列表 -->
-					<sh-cell v-if="item.type === 'nav-list'" :list="item.content.list"></sh-cell>
-					<!-- 九宫格列表 -->
-					<sh-grid v-if="item.type === 'grid-list'" :detail="item.content.list"></sh-grid>
 					<!-- 功能标题 -->
 					<sh-title-card v-if="item.type === 'title-block'" :title="item.content.name" :bgImage="item.content.image" :titleColor="item.content.color"></sh-title-card>
-					<!-- 钱包 -->
-					<sh-wallet v-if="item.type === 'wallet-card'"></sh-wallet>
-					<!-- 订单卡片 -->
-					<sh-order-card v-if="item.type === 'order-card'"></sh-order-card>
 					<!-- 直播 -->
 					<!-- #ifdef MP-WEIXIN -->
 					<sh-live v-if="item.type === 'live' && HAS_LIVE" :detail="item.content"></sh-live>
 					<!-- #endif -->
 				</block>
 			</view>
+
 			<!-- 分类选项卡 -->
 			<sh-category-tabs
 				v-if="categoryTabsData && categoryTabsData.category_arr && categoryTabsData.category_arr.length"
@@ -71,12 +65,13 @@
 			<shopro-notice-modal v-if="!showPrivacy && isLogin"></shopro-notice-modal>
 			<!-- 隐私协议 -->
 			<!-- #ifdef APP-PLUS -->
-			<privacy-modal v-if="shopInfo && shopInfo.name" v-model="showPrivacy"></privacy-modal>
+			<privacy-modal v-if="initShop && initShop.name" v-model="showPrivacy"></privacy-modal>
 			<!-- #endif -->
 			<!-- #ifdef H5 -->
 			<view class="tabbar-hack" style="height: 120rpx; width:100%;"></view>
 			<!-- #endif -->
 		</view>
+		<!-- <shopro-tabbar></shopro-tabbar> -->
 	</view>
 </template>
 
@@ -89,14 +84,9 @@ import shCoupon from './components/sh-coupon.vue';
 import shSeckill from './components/sh-seckill.vue';
 import shGroupon from './components/sh-groupon.vue';
 import shRichtext from './components/sh-richtext.vue';
-import shCell from './components/sh-cell.vue';
-import shGrid from './components/sh-grid.vue';
 import shTitleCard from './components/sh-title-card.vue';
-import shOrderCard from './components/sh-order-card.vue';
-import shWallet from './components/sh-wallet.vue';
 import shSearch from './components/sh-search.vue';
 import shCategoryTabs from './components/sh-category-tabs.vue';
-import { mapMutations, mapActions, mapState } from 'vuex';
 
 import privacyModal from './index/privacy-modal.vue';
 import homeHead from './index/home-head.vue';
@@ -106,13 +96,7 @@ import { HAS_LIVE } from '@/env';
 import shLive from './components/sh-live.vue';
 // #endif
 
-// #ifdef H5
-let listenMove = document.body; //禁止手机h5下拉刷新带动整个页面。
-let handle = function(e) {
-	e.preventDefault();
-};
-// #endif
-
+import { mapMutations, mapActions, mapState, mapGetters } from 'vuex';
 export default {
 	components: {
 		shBanner,
@@ -123,11 +107,7 @@ export default {
 		shCoupon,
 		shSeckill,
 		shRichtext,
-		shCell,
-		shGrid,
 		shTitleCard,
-		shWallet,
-		shOrderCard,
 		shSearch,
 		shCategoryTabs,
 
@@ -144,6 +124,7 @@ export default {
 			HAS_LIVE: HAS_LIVE,
 			// #endif
 			isRefresh: true,
+
 			enable: false, //是否开启吸顶。
 			isConnected: true, //是否有网
 			showPrivacy: false, //协议
@@ -151,26 +132,14 @@ export default {
 		};
 	},
 	computed: {
-		...mapState({
-			config: ({ shopro }) => shopro.config,
-			shopInfo: ({ shopro }) => shopro.config?.shop,
-			isLogin: ({ user }) => user.isLogin,
-			homeTemplate: ({ shopro }) => shopro.template?.home,
-			hasTemplate: ({ shopro }) => shopro.hasTemplate
-		}),
-		// 项目标题
-		appName() {
-			if (this.config?.shop) {
-				return this.config?.shop?.name;
-			}
-		},
+		...mapGetters(['initShop', 'homeTemplate', 'hasTemplate', 'isLogin']),
 		// 头部模块数据
 		headSwiperList() {
 			if (this.homeTemplate?.length) {
 				return this.homeTemplate[0]?.content?.list;
 			}
 		},
-		//分类选项卡数据
+		// 分类选项卡数据
 		categoryTabsData() {
 			if (this.homeTemplate?.length) {
 				return this.homeTemplate[this.homeTemplate.length - 1]?.content;
@@ -187,17 +156,11 @@ export default {
 		let that = this;
 		this.enable = true;
 		this.isLogin && this.getCartList();
-		// #ifdef APP-VUE
 		// 网络变化检测
 		uni.onNetworkStatusChange(res => {
 			this.isConnected = res.isConnected;
+			res.isConnected && this.init();
 		});
-		uni.getNetworkType({
-			success: res => {
-				res.networkType == 'none' ? (this.isConnected = false) : (this.isConnected = true);
-			}
-		});
-		// #endif
 	},
 	onHide() {
 		this.enable = false;
@@ -213,9 +176,6 @@ export default {
 	},
 	methods: {
 		...mapActions(['appInit', 'getTemplate', 'getCartList']),
-		jweixin() {
-			this.$wxsdk.openLocation();
-		},
 		// 初始化
 		init() {
 			this.isRefresh = false;
diff --git a/pages/index/index/home-head.vue b/pages/index/index/home-head.vue
index a0a09112..d0e8bcf2 100644
--- a/pages/index/index/home-head.vue
+++ b/pages/index/index/home-head.vue
@@ -1,54 +1,37 @@
 <template>
-	<!-- 轮播 -->
+	<!-- 首页标题栏，轮播图整合插件 -->
 	<view class="banner-swiper-wrap u-m-b-10">
-		<u-navbar
-			backIconName=""
-			immersive
-			:borderBottom="false"
-			:is-fixed="true"
-			:background="{ background: changeNavBackground ? `url(${navBgImage}) no-repeat top / 100% auto` : 'none' }"
-			:backTextStyle="navTitleStyle"
-			:backText="navTitle"
-		>
-			<view slot="right" hover-class="hover-search" class="search-box u-flex u-row-center u-col-center u-m-r-30" @tap="$Router.push('/pages/public/search')">
-				<u-icon name="search" color="#fff"></u-icon>
+		<!-- 标题栏 -->
+		<view class="u-navbar u-navbar-fixed" :style="[navbarStyle]">
+			<view class="u-status-bar" :style="{ height: statusBarHeight + 'px' }"></view>
+			<view class="u-navbar-inner" :style="[navbarInnerStyle]">
+				<view class="u-back-wrap">
+					<view class="u-icon-wrap u-back-text u-line-1" :style="[navTitleStyle]">{{ navTitle || '' }}</view>
+				</view>
+				<view hover-class="hover-search" class="search-box u-flex u-row-center u-col-center u-m-r-30" @tap="$Router.push('/pages/public/search')">
+					<view class="u-iconfont uicon-search" style="color: #fff"></view>
+				</view>
 			</view>
-		</u-navbar>
-
-		<u-swiper
-			:height="height"
-			:list="list"
-			:autoplay="autoplay"
-			:borderRadius="borderRadius"
-			:indicator-pos="indicatorPos"
-			:mode="mode"
-			:interval="interval"
-			:duration="duration"
-			:circular="circular"
-			:imgMode="imgMode"
-			:bgColor="bgColor"
-			@click="onSwiper"
-			@change="onChange"
-		></u-swiper>
+		</view>
+		<!-- 轮播组件 -->
+		<swiper class="screen-swiper square-dot" @change="onChange" style="height: 520rpx" :indicator-dots="true" :circular="true" :autoplay="true" interval="5000" duration="500">
+			<swiper-item v-for="(item, index) in list" :key="index" @tap="onSwiper(index)"><image :src="item.image" mode="aspectFill"></image></swiper-item>
+		</swiper>
 	</view>
 </template>
 
 <script>
+// 获取系统状态栏的高度
+let systemInfo = uni.getSystemInfoSync();
+let menuButtonInfo = {};
+// #ifdef MP-WEIXIN || MP-BAIDU || MP-TOUTIAO || MP-QQ
+menuButtonInfo = uni.getMenuButtonBoundingClientRect();
+// #endif
 /**
  * home-head-轮播卡片,主要为了处理数据
  * @property {Array} list 轮播图数据，
  * @property {String} mode 指示器模式
  * @property {String} navTitle 项目名称
- * @property {String Number} height 轮播图组件高度，单位rpx（默认250）
- * @property {String} indicator-pos 指示器的位置（默认bottomCenter）
- * @property {Boolean} autoplay 是否自动播放（默认true）
- * @property {Boolean} circular 是否衔接播放（默认true）
- * @property {String Number} interval 隔多久换，单位ms（默认2500）
- * @property {String Number} duration 自动轮播时间间隔，单位ms（默认500）
- * @property {String} img-mode 图片的裁剪模式，详见image组件裁剪模式（默认aspectFill）
- * @property {String} borderRadius 圆角值
- * @property {String} bgColor 背景色
- * @event {Function} click 点击轮播图时触发
  */
 export default {
 	components: {},
@@ -56,7 +39,8 @@ export default {
 		return {
 			navBgImage: '',
 			changeNavBackground: false,
-			swiperCur: 0
+			swiperCur: 0,
+			statusBarHeight: systemInfo.statusBarHeight
 		};
 	},
 	props: {
@@ -83,57 +67,6 @@ export default {
 					fontSize: '38rpx'
 				};
 			}
-		},
-		// 圆角值
-		borderRadius: {
-			type: [Number, String],
-			default: 0
-		},
-		// 隔多久自动切换
-		interval: {
-			type: [String, Number],
-			default: 3000
-		},
-		// 指示器的模式，rect|dot|number|round
-		mode: {
-			type: String,
-			default: 'round'
-		},
-		// list的高度，单位rpx
-		height: {
-			type: [Number, String],
-			default: 520
-		},
-		// 指示器的位置，topLeft|topCenter|topRight|bottomLeft|bottomCenter|bottomRight
-		indicatorPos: {
-			type: String,
-			default: 'bottomCenter'
-		},
-
-		// 是否自动播放
-		autoplay: {
-			type: Boolean,
-			default: true
-		},
-		// 自动轮播时间间隔，单位ms
-		duration: {
-			type: [Number, String],
-			default: 500
-		},
-		// 是否衔接滑动，即到最后一张时接着滑动，是否自动切换到第一张
-		circular: {
-			type: Boolean,
-			default: true
-		},
-		// 图片的裁剪模式
-		imgMode: {
-			type: String,
-			default: 'aspectFill'
-		},
-		// 背景颜色
-		bgColor: {
-			type: String,
-			default: '#f3f4f6'
 		}
 	},
 	watch: {
@@ -142,7 +75,34 @@ export default {
 			this.navBgImage = this.list[this.swiperCur].image;
 		}
 	},
-	computed: {},
+	computed: {
+		// 导航栏内部盒子的样式
+		navbarInnerStyle() {
+			let style = {};
+			style.height = this.navbarHeight + 'px';
+			// #ifdef MP
+			let rightButtonWidth = systemInfo.windowWidth - menuButtonInfo.left;
+			style.marginRight = rightButtonWidth + 'px';
+			// #endif
+			return style;
+		},
+		// 整个导航栏的样式
+		navbarStyle() {
+			let style = {};
+			style.zIndex = this.$u.zIndex.navbar;
+			style.background = this.changeNavBackground ? `url(${this.navBgImage}) no-repeat top / 100% auto` : 'none';
+			Object.assign(style, this.background);
+			return style;
+		},
+		navbarHeight() {
+			// #ifdef APP-PLUS || H5
+			return 44;
+			// #endif
+			// #ifdef MP
+			return systemInfo.platform == 'ios' ? 44 : 48;
+			// #endif
+		}
+	},
 	created() {
 		this.navBgImage = this.list[0].image;
 	},
@@ -151,13 +111,19 @@ export default {
 			this.$tools.routerTo(this.list[e].path);
 		},
 		onChange(e) {
-			this.swiperCur = e;
+			this.swiperCur = e.detail.current;
 		}
 	}
 };
 </script>
 
 <style lang="scss" scoped>
+@mixin vue-flex($direction: row) {
+	/* #ifndef APP-NVUE */
+	display: flex;
+	flex-direction: $direction;
+	/* #endif */
+}
 // 轮播
 .banner-swiper-wrap {
 	height: 520rpx;
@@ -173,4 +139,35 @@ export default {
 		background: rgba(#fff, 0.18);
 	}
 }
+
+.u-navbar {
+	width: 100%;
+}
+
+.u-navbar-fixed {
+	position: fixed;
+	left: 0;
+	right: 0;
+	top: 0;
+	z-index: 991;
+}
+
+.u-status-bar {
+	width: 100%;
+}
+
+.u-navbar-inner {
+	@include vue-flex;
+	justify-content: space-between;
+	position: relative;
+	align-items: center;
+}
+
+.u-back-wrap {
+	@include vue-flex;
+	align-items: center;
+	flex: 1;
+	flex-grow: 0;
+	padding: 14rpx 14rpx 14rpx 24rpx;
+}
 </style>
diff --git a/pages/index/index/privacy-modal.vue b/pages/index/index/privacy-modal.vue
index dd310c6c..48efafb0 100644
--- a/pages/index/index/privacy-modal.vue
+++ b/pages/index/index/privacy-modal.vue
@@ -4,8 +4,8 @@
 			<image class="service-head-img" :src="$IMG_URL + '/imgs/modal/servece_head.png'" mode="widthFix"></image>
 			<view class="service-title">用户隐私协议概况</view>
 			<view class="service-content ">
-				感谢您使用{{ shopInfo.name }}，我们非常重视您的个人信息和隐私保护，在您使用服务前，请仔细阅读
-				<text style="color: #EAB866;" @tap="jump('/pages/public/richtext', { id: shopInfo.privacy_protocol })">《{{ shopInfo.name }}隐私协议》</text>
+				感谢您使用{{ initShop.name }}，我们非常重视您的个人信息和隐私保护，在您使用服务前，请仔细阅读
+				<text style="color: #EAB866;" @tap="jump('/pages/public/richtext', { id: initShop.privacy_protocol })">《{{ initShop.name }}隐私协议》</text>
 				，我们将会严格按照经您同意的各项条款使用您的个人信息，以便为您提供更好的服务。
 			</view>
 			<view class="service-tip ">如您同意此条款，请点击“同意”并开始使用我们的产品和服务，我们将尽全力保护您的个人信息安全。</view>
@@ -15,7 +15,7 @@
 </template>
 
 <script>
-import { mapMutations, mapActions, mapState } from 'vuex';
+import { mapMutations, mapActions, mapState,mapGetters } from 'vuex';
 export default {
 	components: {},
 	data() {
@@ -25,9 +25,7 @@ export default {
 		value: {}
 	},
 	computed: {
-		...mapState({
-			shopInfo: ({ shopro }) => shopro.config?.shop
-		}),
+		...mapGetters(['initShop']),
 		showModal: {
 			get() {
 				return this.value;
diff --git a/pages/index/user.vue b/pages/index/user.vue
index f11f93cf..e18f8437 100644
--- a/pages/index/user.vue
+++ b/pages/index/user.vue
@@ -2,8 +2,7 @@
 <template>
 	<view class="personal-wrap">
 		<!-- 个人信息卡片 -->
-		<userinfo-card :scrollTop="scrollTop" :detail="userHeadData" @onShare="onShare"></userinfo-card>
-
+		<userinfo-card v-if="userHeadData && userHeadData.style" :scrollTop="scrollTop" :detail="userHeadData" @onShare="onShare"></userinfo-card>
 		<!-- 自定义模块 -->
 		<view v-for="(item, index) in userTemplate" :key="item.id">
 			<!-- 轮播 -->
@@ -15,53 +14,27 @@
 				:height="item.content.height"
 				:list="item.content.list"
 			></sh-banner>
-
-			<!-- 搜索 -->
-			<sh-search v-if="item.type === 'search'"></sh-search>
-
 			<!-- 滑动宫格 -->
 			<sh-grid-swiper v-if="item.type === 'menu'" :list="item.content.list" :oneRowNum="item.content.style"></sh-grid-swiper>
-
-			<!-- 推荐商品 -->
-			<sh-hot-goods v-if="item.type === 'goods-list' || item.type === 'goods-group'" :detail="item.content"></sh-hot-goods>
 			<!-- 广告魔方 -->
 			<sh-adv v-if="item.type === 'adv'" :detail="item.content"></sh-adv>
-			<!-- 优惠券 -->
-			<sh-coupon v-if="item.type === 'coupons'" :detail="item.content"></sh-coupon>
-			<!-- 秒杀-->
-			<sh-seckill v-if="item.type === 'seckill'" :detail="item.content"></sh-seckill>
-			<!-- 拼团 -->
-			<sh-groupon v-if="item.type === 'groupon'" :detail="item.content"></sh-groupon>
+			<!-- 推荐商品 -->
+			<sh-hot-goods v-if="item.type === 'goods-list' || item.type === 'goods-group'" :detail="item.content"></sh-hot-goods>
 			<!-- 富文本 -->
 			<sh-richtext v-if="item.type === 'rich-text'" :richId="item.content.id"></sh-richtext>
 			<!-- 功能列表 -->
 			<sh-cell v-if="item.type === 'nav-list'" :list="item.content.list"></sh-cell>
 			<!-- 九宫格列表 -->
 			<sh-grid v-if="item.type === 'grid-list'" :list="item.content.list"></sh-grid>
-			<!-- 功能标题 -->
-			<sh-title-card v-if="item.type === 'title-block'" :title="item.content.name" :bgImage="item.content.image" :titleColor="item.content.color"></sh-title-card>
 			<!-- 钱包 -->
 			<sh-wallet v-if="item.type === 'wallet-card'"></sh-wallet>
 			<!-- 订单卡片 -->
 			<sh-order-card v-if="item.type === 'order-card'"></sh-order-card>
-			<!-- 直播 -->
-			<!-- #ifdef MP-WEIXIN -->
-			<sh-live v-if="item.type === 'live' && HAS_LIVE" :detail="item.content"></sh-live>
-			<!-- #endif -->
 		</view>
-
-		<!-- 分类选项卡 -->
-		<sh-category-tabs
-			v-if="categoryTabsData.category_arr && categoryTabsData.category_arr.length"
-			:enable="enable"
-			:styleType="categoryTabsData.style"
-			:tabsList="categoryTabsData.category_arr"
-		></sh-category-tabs>
-
 		<!-- copyright -->
-		<view class="copyright-box u-flex-col u-row-center u-col-center u-p-t-80 u-p-b-50" v-if="shop.copyright">
-			<view class="copyright-text">{{ shop.copyright[0] }}</view>
-			<view class="copyright-text">{{ shop.copyright[1] }}</view>
+		<view class="copyright-box u-flex-col u-row-center u-col-center u-p-t-80 u-p-b-50" v-if="initShop.copyright">
+			<view class="copyright-text">{{ initShop.copyright[0] }}</view>
+			<view class="copyright-text">{{ initShop.copyright[1] }}</view>
 		</view>
 
 		<!-- #ifdef H5 -->
@@ -70,37 +43,27 @@
 		<!-- 关注弹窗 -->
 		<shopro-float-btn></shopro-float-btn>
 		<!-- 登录提示 -->
-		<shopro-auth-modal v-if="authType"></shopro-auth-modal>
+		<shopro-auth-modal></shopro-auth-modal>
 		<!-- 分享组件 -->
-		<shopro-share v-model="showShare" :shareDetail="shareInfo" posterType="user"></shopro-share>
+		<shopro-share v-model="showShare" posterType="user"></shopro-share>
+		<!-- <shopro-tabbar></shopro-tabbar> -->
 	</view>
 </template>
 
 <script>
 import shBanner from './components/sh-banner.vue';
 import shGridSwiper from './components/sh-grid-swiper.vue';
-import shHotGoods from './components/sh-hot-goods.vue';
 import shAdv from './components/sh-adv.vue';
-import shCoupon from './components/sh-coupon.vue';
-import shSeckill from './components/sh-seckill.vue';
-import shGroupon from './components/sh-groupon.vue';
 import shRichtext from './components/sh-richtext.vue';
 import shCell from './components/sh-cell.vue';
 import shGrid from './components/sh-grid.vue';
-import shTitleCard from './components/sh-title-card.vue';
 import shOrderCard from './components/sh-order-card.vue';
 import shWallet from './components/sh-wallet.vue';
-import shSearch from './components/sh-search.vue';
-import shCategoryTabs from './components/sh-category-tabs.vue';
+import shHotGoods from './components/sh-hot-goods.vue';
 
 import userinfoCard from './user/userinfo-card.vue';
 
-import { mapMutations, mapActions, mapState } from 'vuex';
-
-// #ifdef MP-WEIXIN
-import { HAS_LIVE } from '@/env';
-import shLive from './components/sh-live.vue';
-// #endif
+import { mapMutations, mapActions, mapState, mapGetters } from 'vuex';
 
 import share from '@/shopro/share';
 
@@ -108,54 +71,29 @@ export default {
 	components: {
 		shBanner,
 		shGridSwiper,
-		shGroupon,
-		shHotGoods,
 		shAdv,
-		shCoupon,
-		shSeckill,
 		shRichtext,
 		shCell,
 		shGrid,
-		shTitleCard,
 		shWallet,
 		shOrderCard,
-		shSearch,
-		shCategoryTabs,
-
-		userinfoCard,
+		shHotGoods,
 
-		// #ifdef MP-WEIXIN
-		shLive
-		// #endif
+		userinfoCard
 	},
 	data() {
 		return {
-			// #ifdef MP-WEIXIN
-			HAS_LIVE: HAS_LIVE,
-			// #endif
 			scrollTop: 0,
 			showShare: false,
 			enable: false //是否开启吸顶。
 		};
 	},
 	computed: {
-		...mapState({
-			shop: ({ shopro }) => shopro.config?.shop, // 版本信息
-			userTemplate: ({ shopro }) => shopro.template?.user, //模板数据
-			userInfo: ({ user }) => user.userInfo,
-			isLogin: ({ user }) => user.isLogin,
-			authType: ({ user }) => user.authType
-		}),
+		...mapGetters(['initShop', 'userTemplate', 'isLogin', 'userInfo', 'authType']),
 		userHeadData() {
 			if (this.userTemplate?.length) {
 				return this.userTemplate[0].content;
 			}
-		},
-		//分类选项卡数据
-		categoryTabsData() {
-			if (this.userTemplate?.length) {
-				return this.userTemplate[this.userTemplate.length - 1].content;
-			}
 		}
 	},
 	// 下拉刷新
@@ -172,14 +110,13 @@ export default {
 			this.getUserData();
 		}
 		this.enable = true;
-		this.$store.commit('CART_NUM');
 	},
 
 	methods: {
 		...mapActions(['getUserInfo', 'showAuthModal', 'getUserData']),
 		onShare() {
-			this.shareInfo = share.setShareInfo();
 			this.showShare = true;
+			uni.hideTabBar();
 		},
 		// 初始化
 		init() {
diff --git a/pages/index/user/userinfo-card.vue b/pages/index/user/userinfo-card.vue
index 4eec95e5..89a3e86f 100644
--- a/pages/index/user/userinfo-card.vue
+++ b/pages/index/user/userinfo-card.vue
@@ -3,11 +3,21 @@
 		<view class="sh-userinfo-box">
 			<view class="head-wrap" :style="{ background: detail.image ? `url(${detail.image}) no-repeat center / 100% 100%` : detail.color }">
 				<!-- 标题栏 -->
-				<u-navbar backIconName="" :isFixed="isFixed" :borderBottom="isFixed" :background="navBackground" :backTextStyle="navbackTextStyle" backText="我的">
-					<view slot="right" class="u-flex u-row-center u-col-center u-m-r-20" v-if="userData.is_store" @tap="goStore">
+				<shopro-navbar
+					backIconName=""
+					backText="我的"
+					:backTextStyle="{
+						color: '#fff',
+						fontSize: '40rpx',
+						fontWeight: '500'
+					}"
+					:background="navBackground"
+				>
+					<view slot="right" class="u-flex u-row-center u-col-center u-m-r-20" v-if="userOtherData.is_store" @tap="goStore">
 						<button class="u-reset-button merchant-btn">切换商家版</button>
 					</view>
-				</u-navbar>
+				</shopro-navbar>
+
 				<view class="user-head u-flex u-row-between">
 					<view class="u-flex">
 						<!-- 个人信息 -->
@@ -18,7 +28,7 @@
 									<!-- 同步信息 -->
 									<block v-if="showRefresh">
 										<button @tap.stop="showModal = true" class="u-reset-button u-flex u-row-center u-col-center refresh-btn">
-											<u-icon name="reload" size="24" color="#fff"></u-icon>
+											<view class="u-iconfont uicon-reload" style="color: #fff;font-size: 24rpx;"></view>
 										</button>
 									</block>
 								</view>
@@ -32,7 +42,7 @@
 						</view>
 					</view>
 					<view class="u-flex" v-if="userInfo.nickname">
-						<button class=" u-reset-button code-btn" @tap="onShare"><text class="iconfont iconqrcode"></text></button>
+						<button class=" u-reset-button code-btn" @tap="onShare"><text class="iconfont icon-qrcode"></text></button>
 					</view>
 				</view>
 			</view>
@@ -42,19 +52,19 @@
 			<view class="notice-detail">点击绑定手机号，确保账户安全</view>
 			<button class="u-reset-button bindPhone">去绑定</button>
 		</view>
-		<!-- modal -->
-		<u-modal
-			ref="uModal"
-			v-model="showModal"
-			:show-cancel-button="true"
-			confirm-color="#e9b461"
-			cancel-color="#666666"
-			@confirm="refreshWechatUser"
-			confirm-text="确定"
-			cancel-text="取消"
-			content="更新微信信息？"
-			title="提示"
-		></u-modal>
+		<!-- 更新信息 -->
+		<view class="cu-modal" :class="{ show: showModal }" @tap="showModal = false">
+			<view class="cu-dialog" style="width: 600rpx;">
+				<view class="modal-box">
+					<view class="modal-head">提示</view>
+					<view class="modal-content">更新微信信息？</view>
+					<view class="modal-bottom u-flex u-col-center">
+						<button class="u-reset-button modal-btn cancel-btn" :hover-stay-time="100" hover-class="btn-hover" @tap="showModal = false">取消</button>
+						<button class="u-reset-button  modal-btn save-btn" :hover-stay-time="100" hover-class="btn-hover" @tap="refreshWechatUser">确定</button>
+					</view>
+				</view>
+			</view>
+		</view>
 	</view>
 </template>
 
@@ -63,7 +73,7 @@
  * 自定义之个人信息
  * @property {Object} detail - 个人信息
  */
-import { mapMutations, mapActions, mapState } from 'vuex';
+import { mapMutations, mapActions, mapState, mapGetters } from 'vuex';
 import wechat from '@/shopro/wechat/wechat';
 export default {
 	components: {},
@@ -74,11 +84,6 @@ export default {
 			isFixed: false,
 			navBackground: {
 				background: 'none'
-			},
-			navbackTextStyle: {
-				color: '#fff',
-				fontSize: '40rpx',
-				fontWeight: '500'
 			}
 		};
 	},
@@ -98,15 +103,11 @@ export default {
 		}
 	},
 	computed: {
-		...mapState({
-			userInfo: ({ user }) => user.userInfo,
-			isLogin: ({ user }) => user.isLogin,
-			userData: ({ user }) => user.userData
-		}),
+		...mapGetters(['isLogin', 'userInfo', 'userOtherData']),
 		showRefresh() {
 			if (this.isLogin) {
 				if (this.platform === 'wxOfficialAccount') {
-					return this.userInfo.verification.wxOfficialAccount;
+					return this.userInfo.verification?.wxOfficialAccount;
 				}
 				if (this.platform === 'wxMiniProgram') {
 					return this.userInfo.verification.wxMiniProgram;
@@ -132,16 +133,15 @@ export default {
 		},
 		// 同步用户信息
 		async refreshWechatUser() {
+			this.showModal = false;
 			let token = await wechat.refresh();
-			if (token) {
-				this.getUserInfo(token);
-			}
+			token && this.getUserInfo(token);
 		},
 		// 跳转门店
 		goStore() {
-			if (this.userData.store_id) {
-				uni.setStorageSync('storeId', this.userData.store_id);
-				this.jump('/pages/app/merchant/index', { storeId: this.userData.store_id });
+			if (this.userOtherData.store_id) {
+				uni.setStorageSync('storeId', this.userOtherData.store_id);
+				this.jump('/pages/app/merchant/index', { storeId: this.userOtherData.store_id });
 			} else {
 				if (uni.getStorageSync('storeId')) {
 					this.jump('/pages/app/merchant/index');
@@ -150,7 +150,7 @@ export default {
 				}
 			}
 			//  #ifdef MP-WEIXIN
-			this.$store.dispatch('getMessageIds', 'store');
+			this.$store.commit('subscribeMessage', 'store');
 			//  #endif
 		},
 		// 绑定手机号
@@ -162,6 +162,43 @@ export default {
 </script>
 
 <style lang="scss">
+// 更新信息
+.modal-box {
+	width: 600rpx;
+	.btn-hover {
+		background-color: rgb(230, 230, 230);
+	}
+	.modal-head {
+		padding-top: 48rpx;
+		font-weight: 500;
+		text-align: center;
+		color: $u-main-color;
+	}
+	.modal-content {
+		padding: 48rpx;
+		font-size: 30rpx;
+		text-align: center;
+		color: $u-content-color;
+	}
+	.modal-bottom {
+		.modal-btn {
+			flex: 1;
+			height: 100rpx;
+			line-height: 100rpx;
+			font-size: 32rpx;
+			box-sizing: border-box;
+			cursor: pointer;
+			text-align: center;
+			border-radius: 4rpx;
+		}
+		.cancel-btn {
+			color: #6666;
+		}
+		.save-btn {
+			color: #e9b461;
+		}
+	}
+}
 .sh-userinfo-box {
 	position: relative;
 	height: calc(var(--status-bar-height) + 300rpx);
@@ -210,7 +247,6 @@ export default {
 
 			.user-name {
 				font-size: 30rpx;
-
 				font-weight: 500;
 				color: #fff;
 				line-height: 30rpx;
@@ -237,7 +273,7 @@ export default {
 		}
 		.code-btn {
 			padding: 30rpx;
-			.iconqrcode {
+			.icon-qrcode {
 				font-size: 50rpx;
 				color: #fff;
 			}
diff --git a/pages/index/view.vue b/pages/index/view.vue
index 3f396f5a..a3b9b72a 100644
--- a/pages/index/view.vue
+++ b/pages/index/view.vue
@@ -85,7 +85,7 @@ import shOrderCard from './components/sh-order-card.vue';
 import shWallet from './components/sh-wallet.vue';
 import shSearch from './components/sh-search.vue';
 import shCategoryTabs from './components/sh-category-tabs.vue';
-import { mapMutations, mapActions, mapState } from 'vuex';
+import { mapMutations, mapActions, mapState, mapGetters } from 'vuex';
 
 // #ifdef MP-WEIXIN
 import { HAS_LIVE } from '@/env';
@@ -135,9 +135,7 @@ export default {
 		};
 	},
 	computed: {
-		...mapState({
-			isLogin: ({ user }) => user.isLogin
-		})
+		...mapGetters(['isLogin'])
 	},
 	onPullDownRefresh() {
 		this.getViewTemplate();
diff --git a/pages/order/after-sale/detail.vue b/pages/order/after-sale/detail.vue
index 3b28ad4c..b04df3eb 100644
--- a/pages/order/after-sale/detail.vue
+++ b/pages/order/after-sale/detail.vue
@@ -11,7 +11,7 @@
 					<view class="status-text">{{ aftersaleDetail.aftersale_status_desc }}</view>
 					<view class="status-time">{{ aftersaleDetail.updatetime }}</view>
 				</view>
-				<u-icon name="arrow-right" size="28" color="#666"></u-icon>
+				<text class="u-iconfont uicon-arrow-right" style="color: #666"></text>
 			</view>
 
 			<!-- 退款金额 -->
@@ -224,10 +224,6 @@ export default {
 		font-weight: 400;
 		color: rgba(153, 153, 153, 1);
 	}
-	.cuIcon-right {
-		color: rgba(153, 153, 153, 1);
-		font-size: 30rpx;
-	}
 }
 // 退款金额
 .aftersale-money {
diff --git a/pages/order/after-sale/list.vue b/pages/order/after-sale/list.vue
index e16b8c50..9c1ce521 100644
--- a/pages/order/after-sale/list.vue
+++ b/pages/order/after-sale/list.vue
@@ -42,7 +42,7 @@
 								<view class="serve-title">{{ order.aftersale_status_text }}</view>
 								<view class="serve-content">{{ order.aftersale_status_desc }}</view>
 							</view>
-							<u-icon name="arrow-right" size="28" color="#666"></u-icon>
+							<text class="u-iconfont uicon-arrow-right" style="color: #666"></text>
 						</view>
 						<view class="btn-box u-flex" v-for="orderBtn in order.btns" :key="orderBtn">
 							<button v-if="orderBtn === 'cancel'" @tap.stop="onCancel(order.id, orderIndex)" class="u-reset-button obtn">取消</button>
@@ -53,7 +53,7 @@
 					</view>
 				</view>
 				<!-- 缺省页 -->
-				<shopro-empty v-show="isEmpty" :image="$IMG_URL + '/imgs/empty/empty_groupon.png'" tipText="暂无相关记录~"></shopro-empty>
+				<shopro-empty v-if="isEmpty" :image="$IMG_URL + '/imgs/empty/empty_groupon.png'" tipText="暂无相关记录~"></shopro-empty>
 				<!-- 更多 -->
 				<u-loadmore v-if="orderList.length" height="80rpx" :status="loadStatus" icon-type="flower" color="#ccc" />
 			</scroll-view>
@@ -240,10 +240,6 @@ export default {
 				font-weight: 400;
 				color: rgba(102, 102, 102, 1);
 			}
-			.cuIcon-right {
-				color: #999999;
-				font-size: 20rpx;
-			}
 		}
 		.btn-box {
 			justify-content: flex-end;
diff --git a/pages/order/after-sale/log.vue b/pages/order/after-sale/log.vue
index 68c1099b..91a1361d 100644
--- a/pages/order/after-sale/log.vue
+++ b/pages/order/after-sale/log.vue
@@ -4,13 +4,13 @@
 		<u-time-line>
 			<u-time-line-item v-for="(log, index) in aftersaleLog" :key="log.id" nodeTop="4">
 				<template v-slot:node>
-					<view class="u-node" :style="index === 0 ? 'background: #19be6b;' : ''"><u-icon name="account-fill" color="#fff" :size="24"></u-icon></view>
+					<view class="u-node" :style="index === 0 ? 'background: #19be6b;' : ''"><text class="u-iconfont uicon-bell-fill" style="color: #fff;font-size: 26rpx;"></text></view>
 				</template>
 				<template v-slot:content>
 					<view class="u-order-title unacive u-m-b-20">{{ log.reason }}</view>
 					<view class="u-order-desc  u-m-b-10" v-show="log.content"><u-parse :html="log.content"></u-parse></view>
 					<view class="item-img-box u-flex u-flex-wrap" v-show="log.images.length">
-						<block v-for="(img,index) in log.images" :key="index"><image :src="img" class="log-img" mode="aspectFill"></image></block>
+						<block v-for="(img, index) in log.images" :key="index"><image :src="img" class="log-img" mode="aspectFill"></image></block>
 					</view>
 					<view class="u-order-time">{{ $u.timeFormat(log.createtime, 'yyyy-mm-dd hh:MM') }}</view>
 				</template>
@@ -86,6 +86,7 @@ export default {
 		background-color: #ccc;
 		margin-right: 20rpx;
 		margin-bottom: 20rpx;
+		border-radius: 6rpx;
 	}
 }
 .u-order-time {
diff --git a/pages/order/after-sale/refund.vue b/pages/order/after-sale/refund.vue
index c51a1a9f..060bea09 100644
--- a/pages/order/after-sale/refund.vue
+++ b/pages/order/after-sale/refund.vue
@@ -33,7 +33,7 @@
 			<view class="u-flex refund-cause">
 				<text class="u-m-r-20" style="color: #333;" v-if="refundCause">{{ refundCause }}</text>
 				<text class="u-m-r-20" v-else>请选择申请原因~</text>
-				<u-icon name="arrow-right" size="28" color="#666"></u-icon>
+				<text class="u-iconfont uicon-arrow-right" style="color: #666"></text>
 			</view>
 		</view>
 
@@ -202,7 +202,7 @@ export default {
 			}, '申请中...').then(res => {
 				if (res.code === 1) {
 					//  #ifdef MP-WEIXIN
-					that.$store.dispatch('getMessageIds', 'aftersale');
+					that.$store.commit('subscribeMessage', 'aftersale');
 					//  #endif
 					that.$Router.back();
 				}
@@ -317,10 +317,6 @@ export default {
 		font-size: 28rpx;
 	}
 
-	.cuIcon-right {
-		font-size: 32rpx;
-	}
-
 	.price {
 		font-size: 28rpx;
 		color: #a8700d;
@@ -353,28 +349,10 @@ export default {
 		&:nth-child(5n) {
 			margin-right: 0;
 		}
-
-		.cuIcon-cameraadd {
-			font-size: 50rpx;
-			color: #dfdfdf;
-		}
-
 		.preview-img {
 			width: 100%;
 			height: 100%;
 		}
-
-		.cuIcon-close {
-			background: linear-gradient(90deg, rgba(216, 159, 100, 1), rgba(235, 193, 150, 1));
-			border-radius: 50%;
-			width: 40rpx;
-			line-height: 40rpx;
-			color: #fff;
-			text-align: center;
-			position: absolute;
-			top: -10rpx;
-			right: -10rpx;
-		}
 	}
 }
 
diff --git a/pages/order/components/sh-select-coupon.vue b/pages/order/components/sh-select-coupon.vue
index 89f6dcc0..63977ad0 100644
--- a/pages/order/components/sh-select-coupon.vue
+++ b/pages/order/components/sh-select-coupon.vue
@@ -5,7 +5,7 @@
 			<view class="u-flex" @tap="showModal = true">
 				<text class="price" v-if="couponList.length">{{ title }}</text>
 				<text class="sel-coupon" v-else>暂无优惠券</text>
-				<u-icon name="arrow-right" size="28" color="#bfbfbf"></u-icon>
+				<text class="u-iconfont uicon-arrow-right" style="color: #bfbfbf"></text>
 			</view>
 		</view>
 
diff --git a/pages/order/confirm.vue b/pages/order/confirm.vue
index b37e0a1e..c9cdbe7c 100644
--- a/pages/order/confirm.vue
+++ b/pages/order/confirm.vue
@@ -6,7 +6,7 @@
 			<view class="add-address-box u-flex u-flex-1" v-if="!addressId">
 				<view class="box-bg u-p-30 u-flex-1 u-flex u-row-between">
 					<text class="select-notice">请选择收货地址</text>
-					<u-icon name="arrow-right" size="28" color="#bfbfbf"></u-icon>
+					<text class="u-iconfont uicon-arrow-right" style="color: #bfbfbf;"></text>
 				</view>
 			</view>
 			<view class="add-address-box u-p-30" v-else>
@@ -17,7 +17,7 @@
 				</view>
 				<view class="detail u-flex u-row-between">
 					<view class="address">{{ addressData.province_name }}{{ addressData.city_name }}{{ addressData.area_name }}{{ addressData.address }}</view>
-					<u-icon name="arrow-right" size="28" color="#bfbfbf"></u-icon>
+					<text class="u-iconfont uicon-arrow-right" style="color: #bfbfbf;"></text>
 				</view>
 			</view>
 		</view>
@@ -51,16 +51,16 @@
 					<view class="item-title">配送方式</view>
 					<view class="u-flex">
 						<view class="detail">{{ getCurGoodsExpress(g) }}</view>
-						<u-icon name="arrow-right" size="28" color="#bfbfbf"></u-icon>
+						<text class="u-iconfont uicon-arrow-right" style="color: #bfbfbf;"></text>
 					</view>
 				</view>
 			</view>
 
 			<block v-if="perGoodsList.length">
 				<!-- 备注 -->
-				<view class="remark-box u-flex item-list">
+				<view class="remark-box u-flex item-list u-p-30">
 					<view class="item-title">备注</view>
-					<input class="item-input u-p-30" placeholder-class="input-pl" type="text" v-model="remark" placeholder="建议留言前先于卖家沟通确认" />
+					<input class="item-input " placeholder-class="input-pl" type="text" v-model="remark" placeholder="建议留言前先于卖家沟通确认" />
 				</view>
 
 				<!-- 选择优惠券 -->
@@ -130,15 +130,10 @@
 						<text class="price">￥{{ orderPre.total_fee || '0.00' }}</text>
 					</view>
 				</view>
-				<u-button shape="circle" :disabled="isDisabled" :loading="isDisabled" :custom-style="customStyle" :hair-line="false" hover-class="btn-hover" @click="subOrder">
-					提交订单
-				</u-button>
+				<button class="cu-btn sub-btn" @tap="subOrder" :disabled="isDisabled" hover-class="btn-hover">提交订单</button>
 			</view>
 		</view>
 
-		<!-- 登录提示 -->
-		<shopro-auth-modal></shopro-auth-modal>
-
 		<!-- 配送方式弹窗 -->
 		<u-popup v-model="showExpressType" @close="showExpressType = false" safe-area-inset-bottom mode="bottom" :closeable="false" border-radius="20">
 			<!-- 配送方式tab-->
@@ -165,15 +160,15 @@
 					>
 						请选择收货地址
 
-						<u-icon name="arrow-right" size="28" color="#999"></u-icon>
+						<text class="u-iconfont uicon-arrow-right" style="color: #999;"></text>
 					</view>
 					<!-- 地址 -->
 					<view class="express-address" v-if="expressTypeCur == 'express' && addressId">
 						<view class="express-top  u-flex u-row-between" @tap="jump('/pages/user/address/list', { from: 'order' })">
-							<view class="">
-								<text class="tag" v-show="addressData.is_default == 1">默认</text>
+							<view class="u-flex">
+								<text class="tag" style="white-space: nowrap;" v-show="addressData.is_default == 1">默认</text>
 								<text class="address">{{ addressData.province_name }}{{ addressData.city_name }}{{ addressData.area_name }}{{ addressData.address }}</text>
-								<text class="address-guide"><u-icon name="arrow-right" size="28" color="#bfbfbf"></u-icon></text>
+								<view class="address-guide"><text class="u-iconfont uicon-arrow-right" style="color: #bfbfbf"></text></view>
 							</view>
 
 							<view class="address-location u-flex-col u-col-center">
@@ -203,10 +198,10 @@
 								class="express-top u-flex u-col-center u-row-between"
 								@tap="jump('/pages/order/express/store-address', { goodsId: currentGoodsId, lat: lat, lng: lng, storeId: storeInfo ? storeInfo.id : 0 })"
 							>
-								<view class="">
+								<view class="u-flex">
 									<text class="tag1" v-if="addressData.is_default == 1">最近</text>
 									<text class="address">{{ storeInfo ? storeInfo.name : '暂无自提点' }}</text>
-									<u-icon name="arrow-right" size="28" color="#999"></u-icon>
+									<text class="u-iconfont uicon-arrow-right" style="color: #999;"></text>
 								</view>
 								<view class="address-location u-flex-col u-col-center">
 									<image class="location-img" :src="$IMG_URL + '/imgs/order/e1.png'" mode=""></image>
@@ -218,7 +213,7 @@
 									<view class="box-title u-m-b-20">到店时间</view>
 									<view class="box-content u-flex u-col-center" @tap="checkExpressTime('selfetch')">
 										<text class="box-text">{{ checkTime['day'][checkDayCur].title }}{{ checkTime['time'][checkTimeCur] }}</text>
-										<u-icon name="arrow-right" size="28" color="#999"></u-icon>
+										<text class="u-iconfont uicon-arrow-right" style="color: #999;"></text>
 									</view>
 								</view>
 								<view class="box-line"></view>
@@ -253,7 +248,7 @@
 							<view class="">
 								<text class="tag" v-if="addressData.is_default == 1">默认</text>
 								<text class="address">{{ addressData.province_name }}{{ addressData.city_name }}{{ addressData.area_name }}{{ addressData.address }}</text>
-								<text class="address-guide"><u-icon name="arrow-right" size="28" color="#999"></u-icon></text>
+								<text class="address-guide u-iconfont uicon-arrow-right" style="color: #999;"></text>
 							</view>
 
 							<view class="address-location u-flex-col u-col-center">
@@ -264,9 +259,9 @@
 						<view class="express-content u-flex">
 							<view class="time-box">
 								<view class="box-title u-m-b-20">配送时间</view>
-								<view class="box-content" @tap="checkExpressTime('store')">
+								<view class="box-content u-flex" @tap="checkExpressTime('store')">
 									<text class="box-text">{{ checkTime['day'][checkDayCur].title }}{{ checkTime['time'][checkTimeCur] }}</text>
-									<u-icon name="arrow-right" size="28" color="#999"></u-icon>
+									<text class="u-iconfont uicon-arrow-right" style="color: #999"></text>
 								</view>
 							</view>
 							<view class="box-line"></view>
@@ -488,7 +483,7 @@ export default {
 		await this.init();
 	},
 	methods: {
-		...mapActions(['getCartList', 'getMessageIds']),
+		...mapActions(['getCartList']),
 		init() {
 			uni.showLoading({
 				title: '加载中...',
@@ -620,6 +615,7 @@ export default {
 				if (res.data) {
 					that.orderPre = res.data;
 					that.perGoodsList = res.data.new_goods_list;
+					that.totalNum = 0;
 					that.perGoodsList.map(item => {
 						item.selType = item.dispatch_type;
 						that.totalNum += item.goods_num;
@@ -923,9 +919,6 @@ export default {
 		color: #c4c4c4;
 		margin-right: 20rpx;
 	}
-	.cuIcon-right {
-		color: #c4c4c4;
-	}
 }
 .logistic,
 .price-box,
@@ -1151,7 +1144,6 @@ export default {
 				text-align: left;
 				.address {
 					font-size: 28rpx;
-
 					font-weight: 500;
 					color: rgba(51, 51, 51, 1);
 					line-height: 40rpx;
diff --git a/pages/order/detail.vue b/pages/order/detail.vue
index 3f498e71..3105796e 100644
--- a/pages/order/detail.vue
+++ b/pages/order/detail.vue
@@ -52,7 +52,7 @@
 						@tap="goDistribution(order.dispatch_type, orderDetail.id, order.id, order.dispatch_status)"
 					>
 						<text>详情</text>
-						<u-icon name="arrow-right" size="28" color="#666"></u-icon>
+						<text class="u-iconfont uicon-arrow-right" style="color: #666;"></text>
 					</view>
 				</view>
 
@@ -170,15 +170,12 @@
 						<button v-if="btn === 'groupon'" @tap.stop="jump('/pages/activity/groupon/detail', { id: orderDetail.ext_arr.groupon_id })" class="u-reset-button obtn2">
 							拼团详情
 						</button>
-						<button v-if="btn === 'delete'" style="background:#FFEEEE;color:#E50808" @tap.stop="onDelete(orderDetail.id)" class="u-reset-button obtn1">删除</button>
+						<button v-if="btn === 'delete'" @tap.stop="onDelete(orderDetail.id)" class="u-reset-button delete-btn">删除</button>
 						<button v-if="btn === 'express'" @tap.stop="onExpress(orderDetail.id)" class="u-reset-button obtn1">查看物流</button>
 					</view>
 				</view>
 			</view>
 		</view>
-
-		<!-- 登录提示 -->
-		<shopro-auth-modal></shopro-auth-modal>
 	</view>
 </template>
 
@@ -264,11 +261,13 @@ export default {
 		// 确认收货
 		onConfirm(id, itemId) {
 			let that = this;
-			that.$http('order.confirm', {
-				id: id,
-				order_item_id: itemId
-			},
-			'确认中...'
+			that.$http(
+				'order.confirm',
+				{
+					id: id,
+					order_item_id: itemId
+				},
+				'确认中...'
 			).then(res => {
 				if (res.code === 1) {
 					that.getOrderDetail();
@@ -292,10 +291,12 @@ export default {
 		// 取消订单
 		onCancel(id) {
 			let that = this;
-			that.$http('order.cancel', {
-				id: id
-			},
-			'取消中...'
+			that.$http(
+				'order.cancel',
+				{
+					id: id
+				},
+				'取消中...'
 			).then(res => {
 				if (res.code === 1) {
 					that.$Router.back();
@@ -518,12 +519,6 @@ export default {
 	margin-bottom: 20rpx;
 	.tip-box {
 		font-size: 28rpx;
-
-		.cuIcon-roundcheckfill {
-			color: #ecbe60;
-			font-size: 34rpx;
-			margin-right: 20rpx;
-		}
 	}
 	.title-box {
 		font-size: 26rpx;
@@ -699,13 +694,23 @@ export default {
 	.btn-box {
 		justify-content: flex-end;
 		margin-bottom: 20rpx;
+		.delete-btn {
+			background: #ffeeee;
+			color: #e50808;
+			width: 160rpx;
+			line-height: 60rpx;
+			border-radius: 30rpx;
+			font-size: 26rpx;
+			font-weight: 400;
+			margin-right: 20rpx;
+			padding: 0;
+		}
 		.obtn1 {
 			width: 160rpx;
 			line-height: 60rpx;
 			background: rgba(238, 238, 238, 1);
 			border-radius: 30rpx;
 			font-size: 26rpx;
-
 			font-weight: 400;
 			color: rgba(51, 51, 51, 1);
 			margin-right: 20rpx;
@@ -719,7 +724,6 @@ export default {
 			border-radius: 30rpx;
 			margin-right: 20rpx;
 			font-size: 26rpx;
-
 			font-weight: 400;
 			color: #fff;
 			padding: 0;
diff --git a/pages/order/express/distribution-detail.vue b/pages/order/express/distribution-detail.vue
index e69b10d5..67de0d6a 100644
--- a/pages/order/express/distribution-detail.vue
+++ b/pages/order/express/distribution-detail.vue
@@ -23,7 +23,7 @@
 
 				<!-- 到店自提 -->
 				<view class="u-flex-col u-col-center u-m-b-20 u-p-y-20" v-if="expressType == 'selfetch' && itemDetail.status_code !== 'refund_finish' && qrcodeList.length">
-					<image class="qr-code--img u-m-y-20" :src="allqrcodepath" mode=""></image>
+					<image class="qr-code--img u-m-y-20" v-if="allqrcodepath" :src="allqrcodepath" mode=""></image>
 					<view class="all-qrcode-title u-m-b-20">总核销码</view>
 					<view class="detail-item">
 						<view class="item-title u-flex">核销码</view>
@@ -51,7 +51,7 @@
 						<view class="item-content">营业时间：{{ storeInfo.openhours || '' }}</view>
 					</view>
 					<view class="u-flex-col u-col-center location-box" style="flex: 1;" @tap="openStoreMap">
-						<u-icon name="map-fill" size="34" color="#4fbbff"></u-icon>
+						<text class="u-iconfont uicon-map-fill" style="color: #4fbbff;font-size: 34rpx;"></text>
 						<text class="location-text u-m-t-10">到这去</text>
 					</view>
 				</view>
@@ -79,8 +79,8 @@
 			</view>
 		</view>
 		<view class="foot_box u-flex u-row-center u-col-center u-p-b-20" v-if="expressType == 'selfetch' || expressType == 'store'">
-			<button class="service-btn u-reset-button" @tap="onService">
-				<text class="cuIcon-dianhua"></text>
+			<button class="service-btn u-reset-button u-flex u-col-center u-row-center" @tap="onService">
+				<text class="u-iconfont uicon-phone-fill u-m-r-10" style="color: #fff;font-size: 40rpx;"></text>
 				联系商家
 			</button>
 		</view>
@@ -215,9 +215,7 @@ export default {
 							_arr.push(code.code);
 						});
 						that.qrcode = _arr.join(',');
-						if (that.qrcodeList.length) {
-							that.showPoster = true;
-						}
+						that.showPoster = true;
 					}
 				}
 			});
@@ -396,13 +394,7 @@ export default {
 	box-shadow: 0px 7rpx 6rpx 0px rgba(229, 138, 0, 0.22);
 	border-radius: 40rpx;
 	font-size: 30rpx;
-
 	font-weight: 500;
 	color: rgba(255, 255, 255, 1);
-	.cuIcon-dianhua {
-		color: #fff;
-		font-size: 40rpx;
-		margin-right: 10rpx;
-	}
 }
 </style>
diff --git a/pages/order/express/express-detail.vue b/pages/order/express/express-detail.vue
index b0fe1b54..da31e3c3 100644
--- a/pages/order/express/express-detail.vue
+++ b/pages/order/express/express-detail.vue
@@ -14,7 +14,7 @@
 			</view>
 			<view class="express-sn u-flex u-col-center ">
 				<text class="u-m-r-30">{{ expressDetail.express_name || '' }} {{ expressDetail.express_no || '' }}</text>
-				<u-icon name="file-text" size="32" color="#666" @click="copyCode(expressDetail.express_no)"></u-icon>
+				<text class="u-iconfont uicon-file-text" style="color: #666;font-size: 32rpx;" @tap="copyCode(expressDetail.express_no)"></text>
 			</view>
 		</view>
 
diff --git a/pages/order/express/store-address.vue b/pages/order/express/store-address.vue
index 705fca76..c6ebc77b 100644
--- a/pages/order/express/store-address.vue
+++ b/pages/order/express/store-address.vue
@@ -2,18 +2,20 @@
 <template>
 	<view class="map-box">
 		<!-- 标题栏 -->
-		<u-navbar :borderBottom="true" :background="{ background: '#fff' }" :z-index="99" :is-fixed="false">
-			<u-search
-				class="u-m-r-20"
-				placeholder="输入自提点名称"
-				@change="onSearch"
-				@search="onSearch"
-				@clear="clearSearch"
-				v-model="searchVal"
-				:showAction="false"
-				height="60"
-			></u-search>
-		</u-navbar>
+		<shopro-navbar>
+			<view class="search-wrap u-flex" slot="content">
+				<u-search
+					class="u-m-r-20"
+					placeholder="输入自提点名称"
+					@change="onSearch"
+					@search="onSearch"
+					@clear="clearSearch"
+					v-model="searchVal"
+					:showAction="false"
+					height="60"
+				></u-search>
+			</view>
+		</shopro-navbar>
 
 		<map id="map" :style="{ width: '750rpx', height: mapHeight + 'px' }" :latitude="latitude" :longitude="longitude" show-location @tap="onMap"></map>
 		<view class="dragLayer safe-area-inset-bottom" :class="moveCard">
@@ -37,7 +39,7 @@
 										<!-- 时间 -->
 										<view class="time-box ">
 											<view class=" u-flex u-col-center">
-												<u-icon class="u-m-r-20" name="clock" size="28" color="#999"></u-icon>
+												<text class="u-iconfont uicon-clock u-m-r-20" style="color: #999;"></text>
 												{{ address.openhours }}
 											</view>
 											<view class="u-flex u-col-center u-p-l-30 u-m-t-20">
@@ -46,16 +48,16 @@
 										</view>
 										<!-- 地址 -->
 										<view class="address-detail u-flex u-col-center">
-											<u-icon class="u-m-r-20" name="map" size="28" color="#999"></u-icon>
+											<text class="u-iconfont uicon-map u-m-r-20" style="color: #999;"></text>
 											{{ address.province_name }}{{ address.city_name }}{{ address.area_name }}{{ address.address }}
 										</view>
 										<!-- 电话 -->
 										<view class="address-phone u-flex u-col-center">
-											<u-icon class="u-m-r-20" name="phone" size="28" color="#999"></u-icon>
+											<text class="u-iconfont uicon-phone u-m-r-20" style="color: #999;"></text>
 											{{ address.phone }}
 										</view>
 									</view>
-									<view class="address-right u-flex-col">
+									<view class="address-right u-flex-col u-row-center u-col-center">
 										<u-radio :name="address.id"></u-radio>
 										<text class="address-distance u-m-t-10">{{ address.distance_text || 0 }}</text>
 									</view>
@@ -208,6 +210,14 @@ export default {
 </script>
 
 <style lang="scss">
+.search-wrap {
+	/* #ifdef MP-WEIXIN */
+	width: 460rpx;
+	/* #endif */
+	/* #ifndef MP-WEIXIN */
+	width: 100%;
+	/* #endif */
+}
 /* 浮层 */
 .dragLayer {
 	width: 750rpx;
diff --git a/pages/order/list.vue b/pages/order/list.vue
index f4db8620..618b02d2 100644
--- a/pages/order/list.vue
+++ b/pages/order/list.vue
@@ -66,13 +66,11 @@
 				</view>
 
 				<!-- 空白页 -->
-				<shopro-empty v-show="isEmpty" :image="$IMG_URL + '/imgs/empty/empty_groupon.png'" tipText="暂无商品，还有更多好货等着你噢~"></shopro-empty>
+				<shopro-empty v-if="isEmpty" :image="$IMG_URL + '/imgs/empty/empty_groupon.png'" tipText="暂无商品，还有更多好货等着你噢~"></shopro-empty>
 				<!-- 更多 -->
 				<u-loadmore v-show="orderList.length" height="80rpx" :status="loadStatus" icon-type="flower" color="#ccc" />
 			</scroll-view>
 		</view>
-		<!-- 登录提示 -->
-		<shopro-auth-modal></shopro-auth-modal>
 	</view>
 </template>
 
@@ -325,7 +323,6 @@ export default {
 			border-radius: 30rpx;
 			margin-right: 20rpx;
 			font-size: 26rpx;
-
 			font-weight: 400;
 			padding: 0;
 		}
diff --git a/pages/order/payment/method.vue b/pages/order/payment/method.vue
index b176f236..2be5ee1f 100644
--- a/pages/order/payment/method.vue
+++ b/pages/order/payment/method.vue
@@ -7,9 +7,9 @@
 		</view>
 
 		<!-- 支付方式单选项 -->
-		<u-radio-group v-if="payment" class="pay-box" v-model="payType" active-color="#f0c785">
+		<u-radio-group v-if="initPayment.length" class="pay-box" v-model="payType" active-color="#f0c785">
 			<!-- 微信支付 -->
-			<view class="u-flex u-row-between pay-item" v-show="payment.includes('wechat')" @tap="payType = 'wechat'">
+			<view class="u-flex u-row-between pay-item" v-show="initPayment.includes('wechat')" @tap="payType = 'wechat'">
 				<view class="u-flex">
 					<image class="pay-img" :src="$IMG_URL + '/imgs/order/order_wx_pay.png'" mode=""></image>
 					<text>微信支付</text>
@@ -17,7 +17,7 @@
 				<u-radio shape="circle" name="wechat"></u-radio>
 			</view>
 			<!-- 支付宝支付 -->
-			<view class="u-flex u-row-between pay-item" v-show="payment.includes('alipay')" @tap="payType = 'alipay'">
+			<view class="u-flex u-row-between pay-item" v-show="initPayment.includes('alipay')" @tap="payType = 'alipay'">
 				<view class="u-flex">
 					<image class="pay-img" :src="$IMG_URL + '/imgs/order/order_ali_pay.png'" mode=""></image>
 					<text>支付宝支付</text>
@@ -25,7 +25,7 @@
 				<u-radio shape="circle" name="alipay"></u-radio>
 			</view>
 			<!-- 苹果支付 -->
-			<view class="u-flex u-row-between pay-item" v-show="payment.includes('iospay') && appPlatfrom === 'ios'" @tap="payType = 'iospay'">
+			<view class="u-flex u-row-between pay-item" v-show="initPayment.includes('iospay') && appPlatfrom === 'ios'" @tap="payType = 'iospay'">
 				<view class="u-flex">
 					<image class="pay-img" :src="$IMG_URL + '/imgs/order/order_apple_pay.png'" mode=""></image>
 					<text>ApplePay</text>
@@ -33,7 +33,7 @@
 				<u-radio shape="circle" name="iospay"></u-radio>
 			</view>
 			<!-- 余额支付 -->
-			<view class="u-flex u-row-between pay-item" v-show="payment.includes('wallet')" @tap="payType = 'wallet'">
+			<view class="u-flex u-row-between pay-item" v-show="initPayment.includes('wallet')" @tap="payType = 'wallet'">
 				<view class="u-flex">
 					<image class="pay-img" :src="$IMG_URL + '/imgs/order/order_wallet_pay.png'" mode=""></image>
 					<text>余额支付</text>
@@ -43,14 +43,12 @@
 		</u-radio-group>
 
 		<button class="u-reset-button pay-btn" @tap="confirmPay">确认支付 ￥{{ orderDetail.total_fee || '0.00' }}</button>
-		<!-- 登录提示 -->
-		<shopro-auth-modal></shopro-auth-modal>
 	</view>
 </template>
 
 <script>
 import Pay from '@/shopro/pay';
-import { mapMutations, mapActions, mapState } from 'vuex';
+import { mapMutations, mapActions, mapState, mapGetters } from 'vuex';
 let timer;
 export default {
 	components: {},
@@ -65,18 +63,16 @@ export default {
 		};
 	},
 	computed: {
-		...mapState({
-			payment: ({ shopro }) => shopro.config.payment
-		})
+		...mapGetters(['initPayment'])
 	},
 	onShow() {
 		this.orderDetail.id && this.countDown();
 	},
 	onLoad() {
-		if(this.$platform.get() === 'wxOfficialAccount' && this.$platform.device() === 'ios' && this.$platform.entry() !== location.href) location.reload();
+		if (this.$platform.get() === 'wxOfficialAccount' && this.$platform.device() === 'ios' && this.$platform.entry() !== location.href) location.reload();
 		this.getOrderDetail();
-		if (this.payment.length) {
-			this.payType = this.payment[0];
+		if (this.initPayment.length) {
+			this.payType = this.initPayment[0];
 		}
 	},
 	onHide() {
diff --git a/pages/order/payment/result.vue b/pages/order/payment/result.vue
index 1a24fa4d..6eb01794 100644
--- a/pages/order/payment/result.vue
+++ b/pages/order/payment/result.vue
@@ -22,8 +22,6 @@
 				<button class="u-reset-button again-pay " v-show="payState === 'fail'" @tap="onPay">重新支付</button>
 			</view>
 		</view>
-		<!-- 登录提示 -->
-		<shopro-auth-modal></shopro-auth-modal>
 		<!-- modal -->
 		<!-- #ifdef MP-WEIXIN -->
 		<u-modal
@@ -45,7 +43,7 @@
 
 <script>
 import Pay from '@/shopro/pay';
-import { mapMutations, mapActions, mapState } from 'vuex';
+import { mapMutations, mapActions, mapState, mapGetters } from 'vuex';
 let payTimer = null;
 const payCount = 5;
 export default {
@@ -53,6 +51,7 @@ export default {
 	data() {
 		return {
 			showModal: false,
+			messageType: '',
 			templateIds: [],
 			wxOpenTags: '',
 			orderDetail: {}, //订单详情
@@ -69,7 +68,9 @@ export default {
 			payState: '' //支付状态
 		};
 	},
-	computed: {},
+	computed: {
+		...mapGetters(['subscribeMessageIdsMap'])
+	},
 	onLoad() {
 		this.payState = this.$Route.query.payState ? this.$Route.query.payState : '';
 		this.$Route.query.orderId && this.getOrderDetail();
@@ -96,16 +97,7 @@ export default {
 		// 订阅消息
 		onConfirm() {
 			//  #ifdef MP-WEIXIN
-			this.templateIds.length &&
-				uni.requestSubscribeMessage({
-					tmplIds: this.templateIds,
-					success: res => {
-						console.log(res);
-					},
-					fail: err => {
-						console.log(err);
-					}
-				});
+			this.templateIds.length && this.$store.commit('subscribeMessage', this.messageType);
 			//  #endif
 		},
 
@@ -118,7 +110,8 @@ export default {
 				if (res.code === 1) {
 					that.orderDetail = res.data;
 					if (res.data.status > 0) {
-						this.templateIds = await this.$store.dispatch('getMessageIds', this.orderDetail.activity_type == 'groupon' ? 'grouponResult' : 'result');
+						this.messageType = this.orderDetail.activity_type == 'groupon' ? 'grouponResult' : 'result';
+						this.templateIds = this.subscribeMessageIdsMap[this.messageType];
 						this.showModal = this.templateIds.length;
 					}
 				}
diff --git a/pages/public/chat/index.vue b/pages/public/chat/index.vue
index cf2dc581..f51291dd 100644
--- a/pages/public/chat/index.vue
+++ b/pages/public/chat/index.vue
@@ -7,47 +7,49 @@
 </template>
 
 <script>
-import { mapMutations, mapActions, mapState, mapGetters } from 'vuex';
-import Chat from './shopro/index.vue';
-import Wm from './wm/index.vue';
-export default {
-	components: {
-		Chat,
-		Wm
-	},
-	data() {
-		return {
-			isShoproChat: false,
-			kefuOptions: null,
-			showChat: false
-		};
-	},
-	computed: {
-		...mapState({
-			addons: ({ shopro }) => shopro.config?.addons, //插件配置
-			chatInfo: ({ shopro }) => shopro.config?.chat //客服配置
-		})
-	},
-	onLoad(options) {
-		this.kefuOptions = options;
-		//判断客服;
-		if (this.chatInfo && this.chatInfo.type === 'shopro') {
-			this.isShoproChat = true;
-		} else {
-			if (this.addons && this.addons.includes('kefu')) {
-				this.isShoproChat = false;
+	import {
+		mapMutations,
+		mapActions,
+		mapState,
+		mapGetters
+	} from "vuex";
+	import Chat from "./shopro/index.vue";
+	import Wm from "./wm/index.vue";
+	export default {
+		components: {
+			Chat,
+			Wm
+		},
+		data() {
+			return {
+				isShoproChat: false,
+				kefuOptions: null,
+				showChat: false
+			};
+		},
+		computed: {
+			...mapGetters(["initAddons", "initChat"])
+		},
+		onLoad(options) {
+			this.kefuOptions = options;
+			//判断客服;
+			if (this.initChat && this.initChat.type === "shopro") {
+				this.isShoproChat = true;
+			} else {
+				if (this.initAddons.length && this.initAddons.includes("kefu")) {
+					this.isShoproChat = false;
+				}
 			}
-		}
-		this.showChat = true;
-	},
-	methods: {}
-};
+			this.showChat = true;
+		},
+		methods: {}
+	};
 </script>
 
 <style lang="scss">
-.chat-template-box {
-	height: 100%;
-	width: 100%;
-	overflow: hidden;
-}
+	.chat-template-box {
+		height: 100%;
+		width: 100%;
+		overflow: hidden;
+	}
 </style>
diff --git a/pages/public/chat/shopro/index.vue b/pages/public/chat/shopro/index.vue
index afdbe854..611a262a 100644
--- a/pages/public/chat/shopro/index.vue
+++ b/pages/public/chat/shopro/index.vue
@@ -2,20 +2,25 @@
 <template>
 	<view class="chat-wrap">
 		<!-- 标题栏 -->
-		<u-navbar :borderBottom="true" :background="navBackground" back-icon-color="#fff">
-			<view class="u-flex u-col-bottom head-box">
+		<shopro-navbar
+			:background="{
+				backgroundImage: 'linear-gradient(45deg, #9000ff, #5e00ff)',
+				color: '#FFF'
+			}"
+			backIconColor="#fff"
+		>
+			<view class="u-flex u-col-bottom head-box" slot="content">
 				<view class="head-title u-m-r-20">{{ navTitle.split(',')[0] }}</view>
 				<view v-show="navTitle.split(',')[1] === '在线'" class="u-flex u-col-center">
-					<view class="iconfont iconyuandianxiao text-green head-icon"></view>
+					<view class="iconfont icon-yuandianxiao text-green head-icon"></view>
 					<view class="head-state">在线</view>
 				</view>
 				<view v-show="navTitle.split(',')[1] === '离线'" class="u-flex u-col-center">
-					<view class="iconfont iconyuandianxiao text-gray head-icon"></view>
+					<view class="iconfont icon-yuandianxiao text-gray head-icon"></view>
 					<view class="head-state">离线</view>
 				</view>
 			</view>
-		</u-navbar>
-
+		</shopro-navbar>
 		<!-- 提示 -->
 		<u-notice-bar
 			:autoplay="true"
@@ -113,11 +118,11 @@
 						@input="onInput"
 						@confirm="onSend"
 					/>
-					<view class="action u-p-10" @tap="selEmoji"><text class="iconfont iconbiaoqing text-grey"></text></view>
+					<view class="action u-p-10" @tap="selEmoji"><text class="iconfont icon-biaoqing text-grey"></text></view>
 				</view>
 				<button v-if="isFocus" class="u-reset-button send-btn shadow" @tap.stop="onSend">发送</button>
 				<button v-else class="u-reset-button more-btn" @tap.stop="onTools">
-					<view class="action" style="margin-right: 0;"><text class="iconfont icontianjia text-grey" :class="{ 'tools-active': showTools }"></text></view>
+					<view class="action" style="margin-right: 0;"><text class="iconfont icon-tianjia text-grey" :class="{ 'tools-active': showTools }"></text></view>
 				</button>
 			</view>
 			<!-- 工具栏 -->
@@ -175,7 +180,7 @@
 		<view class="cu-bar log-box foot input u-flex-col" v-if="showLogBox">
 			<view class="log-head u-flex u-row-between">
 				<view class="title-box">{{ logTitle }}</view>
-				<button class="u-reset-button close-btn" @tap="closeToolsItem"><u-icon name="close-circle-fill" size="36" color="#e0e0e0"></u-icon></button>
+				<button class="u-reset-button close-btn" @tap="closeToolsItem"><text class="u-iconfont uicon-close-circle-fill" style="#e0e0e0;font-size: 36rpx;"></text></button>
 			</view>
 			<view class="log-content">
 				<scroll-view class="card-scroll-box" scroll-y="true" :scroll-with-animation="true" :show-scrollbar="false" @scrolltolower="loadMore">
@@ -217,22 +222,16 @@
 		</view>
 		<!-- 遮罩 -->
 		<view class="cu-modal" @tap="onMask" :class="{ show: showTools || showEmoji }" style="z-index: 1000;"></view>
-		<!-- 登录提示 -->
-		<shopro-auth-modal></shopro-auth-modal>
 	</view>
 </template>
 
 <script>
 import Socket from './chat.js';
 import { BASE_URL, API_URL } from '@/env.js';
-import { mapMutations, mapActions, mapState } from 'vuex';
+import { mapMutations, mapActions, mapState, mapGetters } from 'vuex';
 export default {
 	data() {
 		return {
-			navBackground: {
-				backgroundImage: 'linear-gradient(45deg, #9000ff, #5e00ff)',
-				color: '#FFF'
-			},
 			socket: null, //socket服务
 			InputBottom: 0,
 			isPageHide: false,
@@ -258,7 +257,7 @@ export default {
 				// identify: 'customer_service', // 用户发送的为 user; 客服发送的为 customer_service
 				// type: 'text', //message:用户消息类型; message_list:请求消息列表
 				// msg: message.message,
-				// date: this.$u.date(message.createtime, 'yyyy年mm月dd日 hh时MM分')
+				// date: this.$u.timeFormat(message.createtime, 'yyyy年mm月dd日 hh时MM分')
 			],
 			msgText: '', //输入框内容
 			showNotice: true, //滚动提示
@@ -302,6 +301,7 @@ export default {
 		};
 	},
 	computed: {
+		...mapGetters(['userInfo']),
 		isFocus() {
 			//检测输入框是否有信息
 			let isMsg = false;
@@ -312,10 +312,7 @@ export default {
 			if (this.socket) {
 				return this.socket.isClose;
 			}
-		},
-		...mapState({
-			userInfo: state => state.user.userInfo //用户数据
-		})
+		}
 	},
 	created() {
 		this.init();
@@ -896,7 +893,7 @@ page {
 	.more-btn {
 		padding: 0;
 		background: none;
-		.icontianjia {
+		.icon-tianjia {
 			font-size: 44rpx;
 			background: linear-gradient(90deg, #a36fff, #5336ff);
 			-webkit-background-clip: text;
@@ -1009,10 +1006,6 @@ page {
 		.close-btn {
 			padding: 0;
 			background: none;
-			.cuIcon-roundclosefill {
-				font-size: 40rpx;
-				color: #e0e0e0;
-			}
 		}
 	}
 	.log-content {
diff --git a/pages/public/chat/wm/index.vue b/pages/public/chat/wm/index.vue
index e2e32770..08137cb0 100644
--- a/pages/public/chat/wm/index.vue
+++ b/pages/public/chat/wm/index.vue
@@ -1,12 +1,12 @@
 <!-- FastAdmin在线客服插件不是开源产品，所有文字、图片、样式、风格等版权归在线客服作者所有，如有复制、仿冒、抄袭、盗用，FastAdmin和在线客服作者将追究法律责任 -->
 <template>
 	<view>
-		<u-navbar :isFixed="true" :borderBottom="false" :background="{background:'#fff'}" :backTextStyle="{color:'#333'}" :backText="headTitle"></u-navbar>
+		<shopro-navbar backIconColor="#333":backText="headTitle"></shopro-navbar>
 		<view class="kefu_container">
 			<view v-if="errorTips" class="error_tips">{{ errorTips }}</view>
 			<view v-if="config.announcement && errorTips == ''" class="notice">
 				<text>{{ config.announcement }}</text>
-				<u-icon class="close_notice cuIcon-roundclose" name="close-circle-fill" size="36" color="#e0e0e0" @click="close_notice"></u-icon>
+				<text class="u-iconfont uicon-close-circle-fill close_notice" style="color: #e0e0e0;font-size: 36rpx;"  @tap="close_notice"></text>
 			</view>
 
 			<!--留言板 -->
@@ -196,7 +196,9 @@
 							<text class="title-line"></text>
 						</view>
 						
-						<view @tap="show_select_model(false)" class="close_select"><u-icon class="cuIcon-roundclose" name="close-circle-fill" size="36" color="#e0e0e0"></u-icon></view>
+						<view @tap="show_select_model(false)" class="close_select">
+							<text class="u-iconfont uicon-close-circle-fill" style="#e0e0e0;font-size: 36rpx;"></text>
+						</view>
 				</view>
 
 				<view class="project_list">
@@ -229,7 +231,7 @@ import Config from './config.js'; // 本地配置数据
 let token = uni.getStorageSync('token'); // 用户身份标识
 let fixedCsr = ''; // 指定客服
 let innerAudioContext = null;
-import { mapMutations, mapActions, mapState } from 'vuex';
+import { mapMutations, mapActions, mapState,mapGetters } from 'vuex';
 import Auth from '@/shopro/permission/index.js';
 
 export default {
@@ -279,9 +281,7 @@ export default {
 		};
 	},
 	computed: {
-		...mapState({
-			userInfo: state => state.user.userInfo
-		})
+			...mapGetters(['userInfo']),
 	},
 	props: {
 		options: null
diff --git a/pages/public/feedback.vue b/pages/public/feedback.vue
index f1822825..efe7a7bb 100644
--- a/pages/public/feedback.vue
+++ b/pages/public/feedback.vue
@@ -213,4 +213,4 @@ export default {
 		color: rgba(255, 255, 255, 1);
 	}
 }
-</style>
+</style>
diff --git a/pages/public/loading.vue b/pages/public/loading.vue
index 0f282fc6..4431305c 100644
--- a/pages/public/loading.vue
+++ b/pages/public/loading.vue
@@ -20,6 +20,7 @@
 				uni.showLoading({
 					title: '登录中...'
 				})
+				
 				await that.getUserInfo(options.token);
 				let lastPage = uni.getStorageSync('lastPage');
 				if(lastPage) {
diff --git a/pages/public/search.vue b/pages/public/search.vue
index 36badcf8..948180de 100644
--- a/pages/public/search.vue
+++ b/pages/public/search.vue
@@ -55,7 +55,7 @@ export default {
 				let searchHistoryArr = JSON.stringify(this.getArr(this.historyTag, e));
 				uni.setStorageSync('searchHistoryArr', searchHistoryArr);
 			}
-			this.$Router.replace(`/pages/goods/list?keywords=${e}`);
+			this.$Router.push(`/pages/goods/list?keywords=${e}`);
 			this.searchVal = '';
 		},
 		// 清除输入框
diff --git a/pages/user/address/edit.vue b/pages/user/address/edit.vue
index 1c9e3bfd..59949a84 100644
--- a/pages/user/address/edit.vue
+++ b/pages/user/address/edit.vue
@@ -5,10 +5,10 @@
 			<!-- 地址定位 -->
 			<view class="location-item u-flex u-row-between u-p-20 u-m-b-20" @tap="getLocation">
 				<view class="u-flex">
-					<u-icon name="map" size="28" color="#a76f0d"></u-icon>
+					<text class="u-iconfont uicon-map-fill" style="#a76f0d;"></text>
 					<text>{{ chooseAddress }}</text>
 				</view>
-				<u-icon name="arrow-right" size="28" color="#666"></u-icon>
+				<text class="u-iconfont uicon-arrow-right" style="color: #666"></text>
 			</view>
 
 			<view class="address-box">
@@ -262,7 +262,6 @@ export default {
 // 点击定位
 .location-item {
 	font-size: 28rpx;
-
 	font-weight: 500;
 	background-color: #fff;
 	color: rgba(167, 111, 13, 1);
diff --git a/pages/user/address/list.vue b/pages/user/address/list.vue
index fb673ceb..2548f96e 100644
--- a/pages/user/address/list.vue
+++ b/pages/user/address/list.vue
@@ -19,16 +19,13 @@
 					@tap="getWXaddress"
 					v-show="platform == 'wxMiniProgram' || platform == 'wxOfficialAccount'"
 				>
-					<u-icon class="u-m-r-10" name="weixin-fill" :size="42" color="rgb(9, 187, 7)"></u-icon>
+					<text class="u-iconfont uicon-weixin-fill u-p-r-10" style="color:#09bb07;font-size: 40rpx;"></text>
 
 					导入微信地址
 				</button>
 				<button class="u-reset-button add-btn u-m-20" @tap="jump('/pages/user/address/edit')">添加新的收货地址</button>
 			</view>
 		</view>
-
-		<!-- 登录提示 -->
-		<shopro-auth-modal></shopro-auth-modal>
 	</view>
 </template>
 
diff --git a/pages/user/favorite.vue b/pages/user/favorite.vue
index e0f10d35..38a31e1c 100644
--- a/pages/user/favorite.vue
+++ b/pages/user/favorite.vue
@@ -29,7 +29,7 @@
 				</u-checkbox-group>
 				<!-- 缺省页 -->
 				<shopro-empty
-					v-show="isEmpty"
+					v-if="isEmpty"
 					:image="$IMG_URL + '/imgs/empty/empty_goods.png'"
 					tipText="暂无收藏"
 					btnText="去首页逛逛"
@@ -45,8 +45,6 @@
 				<button class="u-reset-button close-btn" @tap="cancelFavorite">取消收藏</button>
 			</view>
 		</view>
-		<!-- 登录提示 -->
-		<shopro-auth-modal></shopro-auth-modal>
 	</view>
 </template>
 
diff --git a/pages/user/info.vue b/pages/user/info.vue
index df4f0bf1..1ea174f3 100644
--- a/pages/user/info.vue
+++ b/pages/user/info.vue
@@ -9,7 +9,7 @@
 			<text class="list-name">头像</text>
 			<view class="u-flex" @tap="onChooseImg">
 				<image class="avatar" :src="userData.avatar" mode=""></image>
-				<u-icon class="u-m-l-20" name="arrow-right" size="26" color="#999"></u-icon>
+				<text class="u-iconfont uicon-arrow-right u-m-l-20" style="color:#999;"></text>
 			</view>
 		</view>
 		<view class="user-list u-flex u-row-between">
@@ -25,14 +25,14 @@
 					maxlength="50"
 					placeholder-style="color:#c8c9cc;fontSize:28rpx"
 				/>
-				<u-icon class="u-m-l-20" name="arrow-right" size="26" color="#999"></u-icon>
+				<text class="u-iconfont uicon-arrow-right u-m-l-20" style="color:#999;"></text>
 			</view>
 		</view>
 		<view class="user-list  u-flex u-row-between u-m-b-10" @tap="showCalendar = true">
 			<text class="list-name">生日</text>
 			<view class="u-flex">
 				<text class="list-val">{{ userData.birthday || '请选择生日~' }}</text>
-				<u-icon class="u-m-l-20" name="arrow-right" size="26" color="#999"></u-icon>
+				<text class="u-iconfont uicon-arrow-right u-m-l-20" style="color:#999;"></text>
 			</view>
 		</view>
 
@@ -40,22 +40,22 @@
 			<text class="list-name">地址管理</text>
 			<view class="u-flex">
 				<text class="list-val"></text>
-				<u-icon class="u-m-l-20" name="arrow-right" size="26" color="#999"></u-icon>
+				<text class="u-iconfont uicon-arrow-right u-m-l-20" style="color:#999;"></text>
 			</view>
 		</view>
 		<view class="user-list u-flex u-row-between" @tap="changePwd">
 			<text class="list-name">修改密码</text>
 			<view class="u-flex">
 				<text class="list-val"></text>
-				<u-icon class="u-m-l-20" name="arrow-right" size="26" color="#999"></u-icon>
+				<text class="u-iconfont uicon-arrow-right u-m-l-20" style="color:#999;"></text>
 			</view>
 		</view>
 		<view class="user-list u-flex u-row-between" @tap="bindMobile">
 			<text class="list-name">手机号</text>
 			<view class="u-flex">
 				<text class="list-val">{{ userInfo.mobile || '暂未绑定手机号' }}</text>
-				<u-icon v-if="userInfo.id && !userInfo.verification.mobile" class="u-m-l-20" name="arrow-right" size="26" color="#999"></u-icon>
-				<u-icon v-else class="u-m-l-20" name="checkmark-circle-fill" size="36" color="#09BB07"></u-icon>
+				<text v-if="userInfo.id && !userInfo.verification.mobile" class="u-iconfont uicon-arrow-right u-m-l-20" style="color:#999;"></text>
+				<text v-else class="u-iconfont uicon-checkmark-circle-fill u-m-l-20" style="color:#09BB07;"></text>
 			</view>
 		</view>
 
@@ -131,22 +131,8 @@
 			<button hover-class="hover-logout-btn" class="u-reset-button logout-btn" @tap="showModal = true">退出登录</button>
 		</view>
 
-		<!-- 登录提示 -->
-		<shopro-auth-modal v-if="authType"></shopro-auth-modal>
 		<!-- 日历 -->
-		<u-calendar
-			v-if="showCalendar"
-			v-model="showCalendar"
-			ref="calendar"
-			safe-area-inset-bottom
-			activeBgColor="#e9b461"
-			toolTip="选择生日"
-			:customStyle="{
-				background: '#e9b461'
-			}"
-			mode="date"
-			@change="changeCalendar"
-		></u-calendar>
+		<u-picker @confirm="changeCalendar" mode="time" confirm-color="#e9b461" v-model="showCalendar" :params="{ year: true, month: true, day: true, hour: false, minute: false, second: false }"></u-picker>
 		<!-- modal -->
 		<u-modal
 			ref="uModal"
@@ -161,7 +147,7 @@
 </template>
 
 <script>
-import { mapMutations, mapActions, mapState } from 'vuex';
+import { mapMutations, mapActions, mapState, mapGetters } from 'vuex';
 import Auth from '@/shopro/permission/index.js';
 import wechat from '@/shopro/wechat/wechat';
 
@@ -178,10 +164,7 @@ export default {
 		};
 	},
 	computed: {
-		...mapState({
-			userInfo: ({ user }) => user.userInfo,
-			authType: ({ user }) => user.authType
-		})
+		...mapGetters(['userInfo', 'authType'])
 	},
 	onLoad() {
 		this.userData = JSON.parse(JSON.stringify(this.userInfo));
@@ -191,7 +174,7 @@ export default {
 		...mapActions(['getUserInfo', 'showAuthModal', 'logout']),
 		// 选择日期
 		changeCalendar(e) {
-			this.userData.birthday = e.result;
+			this.userData.birthday = `${e.year}-${e.month}-${e.day}`;
 			this.editInfoDisabled = this.userData.birthday == this.userInfo.birthday;
 		},
 		// 修改密码
@@ -425,9 +408,6 @@ export default {
 		height: 67rpx;
 		border-radius: 50%;
 	}
-	.cuIcon-right {
-		margin-left: 25rpx;
-	}
 	.list-val {
 		color: #999;
 		font-size: 28rpx;
@@ -459,4 +439,4 @@ export default {
 		color: #ffffff;
 	}
 }
-</style>
+</style>
diff --git a/pages/user/set.vue b/pages/user/set.vue
index 261b51ac..b9402696 100644
--- a/pages/user/set.vue
+++ b/pages/user/set.vue
@@ -2,36 +2,45 @@
 <template>
 	<view class="set-wrap">
 		<!-- logo -->
-		<view class="logo-box u-flex-col u-row-center u-col-center" v-if="shop.name">
-			<image class="logo-img" :src="shop.logo" mode="aspectFit"></image>
-			<view class="app-name u-m-t-50">{{ shop.name }}</view>
+		<view class="logo-box u-flex-col u-row-center u-col-center" v-if="initShop.name">
+			<image class="logo-img" :src="initShop.logo" mode="aspectFit"></image>
+			<view class="app-name u-m-t-50">{{ initShop.name }}</view>
 		</view>
 
 		<!-- cell -->
 		<view class="set-box">
-			<u-cell-group class="menu-list-box">
-				<u-cell-item class="menu-item" title="占用缓存" :titleStyle="{ color: '#333' }" :value="storageSize" :value-style="{ color: '#999' }"></u-cell-item>
-				<u-cell-item class="menu-item" title="当前版本" :titleStyle="{ color: '#333' }" :value="shop.version" :value-style="{ color: '#999' }"></u-cell-item>
-				<u-cell-item class="menu-item" title="意见反馈" :titleStyle="{ color: '#333', fontSize: '28rpx' }" @tap="$Router.push('/pages/public/feedback')"></u-cell-item>
-				<u-cell-item
-					class="menu-item"
-					title="关于我们"
-					:titleStyle="{ color: '#333', fontSize: '28rpx' }"
-					@tap="$Router.push(`/pages/public/richtext?id=${shop.about_us}`)"
-				></u-cell-item>
-				<u-cell-item
-					class="menu-item"
-					title="隐私协议"
-					:titleStyle="{ color: '#333', fontSize: '28rpx' }"
-					@tap="$Router.push(`/pages/public/richtext?id=${shop.privacy_protocol}`)"
-				></u-cell-item>
-			</u-cell-group>
+			<view class="cell-item u-flex u-col-center u-row-between u-p-x-30 u-p-y-20">
+				<view class="cell-title">占用缓存</view>
+				<view class="cell-right u-flex u-col-center">
+					<view class="cell-content">{{ storageSize }}</view>
+					<text class="u-iconfont uicon-arrow-right u-m-l-10" style="color: #999"></text>
+				</view>
+			</view>
+			<view class="cell-item u-flex u-col-center u-row-between u-p-x-30 u-p-y-20">
+				<view class="cell-title">当前版本</view>
+				<view class="cell-right u-flex u-col-center">
+					<view class="cell-content">{{ initShop.version }}</view>
+					<text class="u-iconfont uicon-arrow-right u-m-l-10" style="color: #999"></text>
+				</view>
+			</view>
+			<view class="cell-item u-flex u-col-center u-row-between u-p-x-30 u-p-y-20" @tap="$Router.push('/pages/public/feedback')">
+				<view class="cell-title">意见反馈</view>
+				<view class="cell-right u-flex u-col-center"><text class="u-iconfont uicon-arrow-right u-m-l-10" style="color: #999"></text></view>
+			</view>
+			<view class="cell-item u-flex u-col-center u-row-between u-p-x-30 u-p-y-20" @tap="$Router.push(`/pages/public/richtext?id=${initShop.about_us}`)">
+				<view class="cell-title">关于我们</view>
+				<view class="cell-right u-flex u-col-center"><text class="u-iconfont uicon-arrow-right u-m-l-10" style="color: #999"></text></view>
+			</view>
+			<view class="cell-item u-flex u-col-center u-row-between u-p-x-30 u-p-y-20" @tap="$Router.push(`/pages/public/richtext?id=${initShop.privacy_protocol}`)">
+				<view class="cell-title">隐私协议</view>
+				<view class="cell-right u-flex u-col-center"><text class="u-iconfont uicon-arrow-right u-m-l-10" style="color: #999"></text></view>
+			</view>
 		</view>
 
 		<!-- copyright -->
-		<view class="copyright-box u-flex-col u-row-center u-col-center u-p-t-80 u-p-b-50" v-if="shop.copyright">
-			<view class="copyright-text">{{ shop.copyright[0] }}</view>
-			<view class="copyright-text">{{ shop.copyright[1] }}</view>
+		<view class="copyright-box u-flex-col u-row-center u-col-center u-p-t-80 u-p-b-50" v-if="initShop.copyright">
+			<view class="copyright-text">{{ initShop.copyright[0] }}</view>
+			<view class="copyright-text">{{ initShop.copyright[1] }}</view>
 		</view>
 		<!-- 登录提示 -->
 		<shopro-auth-modal></shopro-auth-modal>
@@ -39,7 +48,7 @@
 </template>
 
 <script>
-import { mapState, mapActions } from 'vuex';
+import { mapState, mapActions, mapGetters } from 'vuex';
 export default {
 	components: {},
 	data() {
@@ -48,9 +57,7 @@ export default {
 		};
 	},
 	computed: {
-		...mapState({
-			shop: ({ shopro }) => shopro.config.shop //初始化数据
-		})
+		...mapGetters(['initShop'])
 	},
 
 	methods: {}
@@ -60,6 +67,16 @@ export default {
 <style lang="scss">
 .set-box {
 	background-color: #fff;
+	.cell-item {
+		border-bottom: 1px solid #f5f5f5;
+		.cell-title {
+			font-size: 28rpx;
+			color: #333;
+		}
+		.cell-content {
+			color: #999;
+		}
+	}
 }
 .logo-box {
 	padding: 110rpx 0;
diff --git a/pages/user/view-log.vue b/pages/user/view-log.vue
index ebf24a1f..f204077b 100644
--- a/pages/user/view-log.vue
+++ b/pages/user/view-log.vue
@@ -21,7 +21,7 @@
 				</u-checkbox-group>
 				<!-- 缺省页 -->
 				<shopro-empty
-					v-show="isEmpty"
+					v-if="isEmpty"
 					:image="$IMG_URL + '/imgs/empty/empty_goods.png'"
 					tipText="暂无浏览记录"
 					btnText="去首页逛逛"
@@ -37,8 +37,6 @@
 				<button class="u-reset-button close-btn" @tap="deleteLog">删除</button>
 			</view>
 		</view>
-		<!-- 登录提示 -->
-		<shopro-auth-modal></shopro-auth-modal>
 	</view>
 </template>
 
diff --git a/pages/user/wallet/index.vue b/pages/user/wallet/index.vue
index 2ef43da2..effaab29 100644
--- a/pages/user/wallet/index.vue
+++ b/pages/user/wallet/index.vue
@@ -6,18 +6,18 @@
 			<view class="card-box">
 				<view class="card-head u-flex u-col-center">
 					<view class="card-title u-m-r-10">可提现金额（元）</view>
-					<u-icon @click="showMoney = !showMoney" :name="showMoney ? 'eye-fill' : 'eye-off'" size="46" color="#fff"></u-icon>
+					<view class="u-iconfont" :class="showMoney ? 'uicon-eye' : 'uicon-eye-off'" style="color: #fff;font-size: 50rpx;"></view>
 				</view>
-				<view class="money-num u-p-t-50">{{ showMoney ? userinfo.money || '0.00' : '***' }}</view>
+				<view class="money-num u-p-t-50">{{ showMoney ? userInfo.money || '0.00' : '***' }}</view>
 				<button class="u-reset-button withdraw-btn" @tap="$Router.push('/pages/user/wallet/withdraw')">提现</button>
 			</view>
 		</view>
 		<!-- 筛选 -->
 		<u-sticky offset-top="0" :enable="true">
 			<view class="filter-box u-flex u-row-between">
-				<button class="u-reset-button date-btn" @tap="showCalendar = true">
+				<button class="u-reset-button date-btn u-flex" @tap="showCalendar = true">
 					{{ selDateText }}
-					<u-icon class="u-m-l-20" name="arrow-down-fill" size="28" color="#e5e5e5"></u-icon>
+					<text class="u-iconfont uicon-arrow-down-fill u-m-l-20" style="color: #e5e5e5"></text>
 				</button>
 				<view class="total-box">收入￥{{ incomeMoney || '0.00' }} 支出￥{{ expendMoney || '0.00' }}</view>
 			</view>
@@ -45,7 +45,7 @@
 			</view>
 		</view>
 		<!-- 空置页 -->
-		<shopro-empty v-show="isEmpty" marginTop="200rpx" :image="$IMG_URL + '/imgs/empty/no_data.png'" tipText="暂无数据~"></shopro-empty>
+		<shopro-empty v-if="isEmpty" marginTop="200rpx" :image="$IMG_URL + '/imgs/empty/no_data.png'" tipText="暂无数据~"></shopro-empty>
 		<!-- 更多 -->
 		<u-loadmore v-if="!isEmpty" height="80rpx" :status="loadStatus" icon-type="flower" color="#ccc" />
 		<!-- 日期选择 -->
@@ -67,7 +67,7 @@
 </template>
 
 <script>
-import { mapState, mapActions } from 'vuex';
+import { mapState, mapActions, mapGetters } from 'vuex';
 export default {
 	components: {},
 	data() {
@@ -102,10 +102,7 @@ export default {
 		};
 	},
 	computed: {
-		...mapState({
-			userinfo: ({ user }) => user.userInfo,
-			isLogin: ({ user }) => user.isLogin
-		})
+		...mapGetters(['isLogin', 'userInfo'])
 	},
 	onShow() {
 		this.isLogin && this.getUserInfo();
diff --git a/pages/user/wallet/score-balance.vue b/pages/user/wallet/score-balance.vue
index fa86f6d3..749d2142 100644
--- a/pages/user/wallet/score-balance.vue
+++ b/pages/user/wallet/score-balance.vue
@@ -2,9 +2,9 @@
 <template>
 	<view class="page_box">
 		<view class="head_box">
-			<u-navbar backIconColor="#333" :borderBottom="false" :background="navbar.background" :backTextStyle="navbar.backTextStyle" backText="积分余额"></u-navbar>
+			<shopro-navbar :background="{ background: 'none' }" backText="积分余额" backIconColor="#333"></shopro-navbar>
 			<view class="all-box u-flex-col u-row-center u-col-center">
-				<text class="all-num">{{ score }}</text>
+				<text class="all-num">{{ userInfo.score || 0 }}</text>
 				<text class="all-title u-m-b-30">当前积分</text>
 				<image class="score-card-bg" :src="$IMG_URL + '/imgs/score/score_wallet_bg.png'" mode=""></image>
 			</view>
@@ -25,7 +25,7 @@
 					<view class="num font-OPPOSANS" v-else>{{ log.wallet }}</view>
 				</view>
 				<!-- 空置页 -->
-				<shopro-empty v-show="isEmpty" marginTop="200rpx" :image="$IMG_URL + '/imgs/empty/comment_empty.png'" tipText="暂无数据~"></shopro-empty>
+				<shopro-empty v-if="isEmpty" marginTop="200rpx" :image="$IMG_URL + '/imgs/empty/comment_empty.png'" tipText="暂无数据~"></shopro-empty>
 				<!-- 更多 -->
 				<u-loadmore v-if="scoreLog.length" height="80rpx" :status="loadStatus" icon-type="flower" color="#ccc" />
 			</scroll-view>
@@ -34,21 +34,12 @@
 </template>
 
 <script>
-import { mapMutations, mapActions, mapState } from 'vuex';
+import { mapMutations, mapActions, mapState, mapGetters } from 'vuex';
 export default {
 	components: {},
 	data() {
 		return {
 			isEmpty: false,
-			navbar: {
-				background: {
-					background: 'none'
-				},
-				backTextStyle: {
-					color: '#333',
-					fontSize: '36rpx'
-				}
-			},
 			tabCur: 'all',
 			scoreLog: [],
 			loadStatus: 'loadmore', //loadmore-加载前的状态，loading-加载中的状态，nomore-没有更多的状态
@@ -57,9 +48,7 @@ export default {
 		};
 	},
 	computed: {
-		...mapState({
-			score: state => state.user.userInfo.score
-		})
+		...mapGetters(['userInfo'])
 	},
 	onLoad() {
 		this.getScoreLog();
diff --git a/pages/user/wallet/withdraw-log.vue b/pages/user/wallet/withdraw-log.vue
index 0d3966e3..b00726f8 100644
--- a/pages/user/wallet/withdraw-log.vue
+++ b/pages/user/wallet/withdraw-log.vue
@@ -31,7 +31,7 @@
 		<!-- 更多 -->
 		<u-loadmore v-show="!isEmpty" height="80rpx" :status="loadStatus" icon-type="flower" color="#ccc" />
 		<!-- 空置页 -->
-		<shopro-empty v-show="isEmpty" marginTop="300rpx" :image="$IMG_URL + '/imgs/empty/no_data.png'" tipText="暂无数据~"></shopro-empty>
+		<shopro-empty v-if="isEmpty" marginTop="300rpx" :image="$IMG_URL + '/imgs/empty/no_data.png'" tipText="暂无数据~"></shopro-empty>
 	</view>
 </template>
 
diff --git a/pages/user/wallet/withdraw.vue b/pages/user/wallet/withdraw.vue
index dad8eb73..7b96ed61 100644
--- a/pages/user/wallet/withdraw.vue
+++ b/pages/user/wallet/withdraw.vue
@@ -2,19 +2,12 @@
 <template>
 	<view class="draw-money-wrap">
 		<view class="head-box">
-			<u-navbar
-				backIconColor="#fff"
-				:borderBottom="false"
-				:background="{ background: 'none' }"
-				:backTextStyle="{ color: '#fff', fontSize: '32rpx' }"
-				backText="提现"
-				:isFixed="false"
-			></u-navbar>
+			<shopro-navbar :background="{ background: 'none' }" :backTextStyle="{ color: '#fff' }" backText="提现" backIconColor="#fff"></shopro-navbar>
 			<!-- 可提现 -->
 			<view class="wallet-num-box u-flex u-col-center u-row-between">
 				<view class="">
 					<view class="num-title">可提现金额（元）</view>
-					<view class="wallet-num">{{ userinfo.money || '0.00' }}</view>
+					<view class="wallet-num">{{ userInfo.money || '0.00' }}</view>
 				</view>
 				<button class="u-reset-button log-btn" @tap="$Router.push({ path: '/pages/user/wallet/withdraw-log' })">提现记录</button>
 			</view>
@@ -34,7 +27,7 @@
 						<image class="item-img" :src="withdrawList[withdrawType].icon" mode=""></image>
 						<view class="item-title u-m-l-20">{{ withdrawList[withdrawType].title }}</view>
 					</view>
-					<u-icon name="arrow-right" size="28" color="#C4C4C4"></u-icon>
+					<text class="u-iconfont uicon-arrow-right" style="#C4C4C4;"></text>
 				</view>
 			</view>
 			<!-- 提现信息 -->
@@ -138,7 +131,7 @@
 </template>
 
 <script>
-import { mapState, mapActions } from 'vuex';
+import { mapState, mapActions, mapGetters } from 'vuex';
 import FormValidate from '@/shopro/validate/form';
 import wechat from '@/shopro/wechat/wechat';
 export default {
@@ -198,9 +191,7 @@ export default {
 		};
 	},
 	computed: {
-		...mapState({
-			userinfo: ({ user }) => user.userInfo
-		})
+		...mapGetters(['userInfo'])
 	},
 	async onLoad() {
 		this.getWithdrawRules();
@@ -248,7 +239,7 @@ export default {
 					that.money = '';
 					that.showModal = true;
 					//  #ifdef MP-WEIXIN
-					this.$store.dispatch('getMessageIds', 'wallet');
+					this.$store.commit('subscribeMessage', 'wallet');
 					//  #endif
 					that.$store.dispatch('getUserInfo');
 				} else {
diff --git a/shopro/apple/index.js b/shopro/apple/index.js
index c014925e..b69849ce 100644
--- a/shopro/apple/index.js
+++ b/shopro/apple/index.js
@@ -40,12 +40,10 @@ export default {
 						            success(res) {
 										if(res.errMsg === 'getUserInfo:ok') {
 											let userInfo = res.userInfo;
-											console.log(userInfo,11)
 											api('user.appleIdOauth', {
 												userInfo,
 												event
 											}, that.eventMap(event)).then(res => {
-												console.log(res,22)
 												if (res.code === 1) {
 													resolve(res.data.token);
 												} else {
diff --git a/shopro/index.js b/shopro/index.js
new file mode 100644
index 00000000..bde383ab
--- /dev/null
+++ b/shopro/index.js
@@ -0,0 +1,58 @@
+// 挂载变量
+import {
+	API_URL,
+	IMG_URL
+} from '../env.js';
+import store from '@/shopro/store';
+import http from '@/shopro/request';
+import platform from '@/shopro/platform';
+import tools from '@/shopro/utils/tools'
+// mixin混入
+import mixin from '@/shopro/mixins';
+// #ifdef H5
+// uni方法重写, h5的粘贴板的设置，获取。图片视频的保存
+import wxsdk from '@/shopro/wechat/sdk'
+import VConsole from 'vconsole'
+import '@/shopro/utils/sdk-h5.js'
+// #endif
+
+import wechat from '@/shopro/wechat/wechat';
+
+const install = Vue => {
+	Vue.prototype.$API_URL = API_URL;
+	Vue.prototype.$IMG_URL = IMG_URL;
+	// 挂载请求
+	Vue.prototype.$http = http;
+	// 平台判断
+	Vue.prototype.$platform = platform;
+	// 挂载工具函数
+	Vue.prototype.$tools = tools;
+	Vue.mixin(mixin);
+
+	// #ifdef H5
+	// 微信H5,sdk挂载
+	Vue.prototype.$wxsdk = wxsdk;
+	//  调试微信jssdk
+	process.env.NODE_ENV === 'development' && new VConsole()
+	// #endif
+}
+
+export async function init(options) {
+	// #ifdef H5
+	platform.entry();
+	// #endif
+	// #ifdef MP-WEIXIN
+	// 检测小程序更新(如果从朋友圈场景进入则无此API)
+	options.scene !== 1154 && wechat.checkMiniProgramUpdate();
+	// #endif
+	await store.dispatch("appInit", options); // 加载商城基本信息
+	await store.dispatch("getTemplate", options); // 加载模板数据
+	// #ifdef MP-WEIXIN
+	await store.dispatch('getMessageIds'); //获取模板消息
+	// #endif
+	process.env.NODE_ENV === 'development' && store.dispatch("syncPages");
+}
+
+export default {
+	install
+}
diff --git a/shopro/mixins/index.js b/shopro/mixins/index.js
index b95fcc2b..3beaf8bd 100644
--- a/shopro/mixins/index.js
+++ b/shopro/mixins/index.js
@@ -41,7 +41,7 @@ export default {
 			let shareParams = share.getShareQuery(options.spm);
 			// 保存推荐信息
 			if (shareParams.shareUserId) {
-				if (store.state.user.isLogin) {
+				if (store.getters.isLogin) {
 					http('common.shareAdd', {
 						spm: options.spm
 					});
@@ -64,4 +64,58 @@ export default {
 			}
 		}
 	},
+	// #ifdef MP-WEIXIN
+	onShareAppMessage(res) {
+		let that = this;
+		// uni.$emit('ON_WX_SHARE')
+		let shareInfo = store.getters.shareInfo;
+		return {
+			title: shareInfo.title,
+			path: shareInfo.path,
+			imageUrl: shareInfo.image,
+			success(res) {
+				uni.showToast({
+					title: '分享成功'
+				})
+
+			},
+			fail(res) {
+				uni.showToast({
+					title: '分享失败',
+					icon: 'none'
+				})
+			},
+			complete() {}
+		}
+	},
+	onShareTimeline(res) {
+		let that = this;
+		let shareInfo = store.getters.shareInfo;
+		let query = shareInfo.query;
+		//携带当前页面资源ID参数
+		let currentPage = getCurrentPages()[getCurrentPages().length - 1];
+		let options = currentPage.options;
+		if (JSON.stringify(options) != '{}' && options.id) {
+			query += `&id=${options.id}`;
+		}
+
+		return {
+			title: shareInfo.title,
+			query: query,
+			imageUrl: shareInfo.image,
+			success(res) {
+				uni.showToast({
+					title: '分享成功'
+				})
+			},
+			fail(res) {
+				uni.showToast({
+					title: '分享失败',
+					icon: 'none'
+				})
+			},
+			complete() {}
+		}
+	}
+	// #endif
 }
diff --git a/shopro/mixins/share.js b/shopro/mixins/share.js
deleted file mode 100644
index f782124e..00000000
--- a/shopro/mixins/share.js
+++ /dev/null
@@ -1,85 +0,0 @@
-/**
- * MixinShare v1.0.0
- * @description shopro-mixin-share 1.0.0 shopro全局分享组件
- * @Author lidongtony
- * @Date 2021-04-18
- * @Email lidongtony@qq.com
- */
-import store from '@/shopro/store';
-import {
-	mapMutations,
-	mapActions,
-	mapState
-} from 'vuex';
-export default {
-	data() {
-		return {
-			shareInfo: {}
-		}
-	},
-	// 是否登录
-	computed: {
-		shareData: {
-			get() {
-				this.shareInfo = store.state.shopro.shareInfo;
-				return store.state.shopro.shareInfo;
-			},
-			set(val) {
-				this.shareInfo = val;
-			}
-		}
-	},
-	// #ifdef MP-WEIXIN
-	onShareAppMessage(res) {
-		let that = this;
-		uni.$emit('ON_WX_SHARE')
-		return {
-			title: that.shareInfo.title,
-			path: that.shareInfo.path,
-			imageUrl: that.shareInfo.image,
-			success(res) {
-				uni.showToast({
-					title: '分享成功'
-				})
-
-			},
-			fail(res) {
-				uni.showToast({
-					title: '分享失败',
-					icon: 'none'
-				})
-			},
-			complete() {}
-		}
-	},
-	onShareTimeline(res) {
-		let that = this;
-		let query = that.shareInfo.query;
-		//携带当前页面资源ID参数
-		let currentPage = getCurrentPages()[getCurrentPages().length - 1];
-		let options = currentPage.options;
-		if (JSON.stringify(options) != '{}' && options.id) {
-			query += `&id=${options.id}`;
-		}
-
-		return {
-			title: that.shareInfo.title,
-			query: query,
-			imageUrl: that.shareInfo.image,
-			success(res) {
-				uni.showToast({
-					title: '分享成功'
-				})
-			},
-			fail(res) {
-				uni.showToast({
-					title: '分享失败',
-					icon: 'none'
-				})
-			},
-			complete() {}
-		}
-	}
-	// #endif
-
-}
diff --git a/shopro/pay/index.js b/shopro/pay/index.js
index 6908e03b..b5737a7f 100644
--- a/shopro/pay/index.js
+++ b/shopro/pay/index.js
@@ -130,7 +130,7 @@ export default class ShoproPay {
 			var url = result.data.pay_data.match(/url\=\'(\S*)\'/);
 			let reg = new RegExp('&amp;', 'g') //g代表全部
 			let newUrl = url[1].replace(reg, '&');
-			let domain = store.state.shopro.config.shop.domain; //域名需要https
+			let domain =store.getters.initShop.domain; //域名需要https
 			let params = encodeURIComponent(
 				`${domain}pages/order/payment/result?orderId=${that.order.id}&type=${that.payment}`)
 			window.location.href = newUrl + '&redirect_url=' + params;
diff --git a/shopro/poster/QS-SharePoster/QS-SharePoster.js b/shopro/poster/QS-SharePoster/QS-SharePoster.js
index e3c5ef13..31619c7e 100644
--- a/shopro/poster/QS-SharePoster/QS-SharePoster.js
+++ b/shopro/poster/QS-SharePoster/QS-SharePoster.js
@@ -1533,9 +1533,11 @@ function getShreUserPosterBackgroundFc(objs, upimage) { //下载并保存背景
 	return new Promise(async (resolve, reject) => {
 		try {
 			_app.log('没有从后端获取的背景图片路径, 尝试从后端获取背景图片路径');
+
 			let image = backgroundImage ? backgroundImage : (await _app.getPosterUrl(objs));
 			image = (await base64ToPathFn(image));
 			_app.log('尝试下载并保存背景图:' + image);
+
 			const savedFilePath = await _app.downLoadAndSaveFile_PromiseFc(image);
 			if (savedFilePath) {
 				_app.log('下载并保存背景图成功:' + savedFilePath);
diff --git a/shopro/poster/QS-SharePoster/app.js b/shopro/poster/QS-SharePoster/app.js
index 4182126d..1dda9327 100644
--- a/shopro/poster/QS-SharePoster/app.js
+++ b/shopro/poster/QS-SharePoster/app.js
@@ -1,8 +1,8 @@
 let log = console.log; // 如果在项目的APP.vue文件中的onlaunch中设置 console.log = ()=> {} 则在此也不会有打印信息
 log = ()=>{};	// 打开注释则该插件不会打印任何信息
 let _app = {
-	lineFeedTags: ['<br />', '<br/>', '\r\n', '\n\t', '\r', '\n'],	//换行符识别列表
-	tagetLineFeedTag: `❤`,	//将lineFeedTags列表中的字符串替换为该字符, 代表换行符, 只要找一个特殊符号就行，必须是单字符单字符单字符!
+	lineFeedTags: ['<br />', '<br/>', '\r\n', '\n\t', '\r', '\n'], //换行符识别列表
+	tagetLineFeedTag: `❤`, //将lineFeedTags列表中的字符串替换为该字符, 代表换行符, 只要找一个特殊符号就行，必须是单字符单字符单字符!
 	//交互控制
 	log(t) {
 		// log(t);
@@ -32,7 +32,7 @@ let _app = {
 			let image;
 			if (backgroundImage) {
 				image = backgroundImage;
-			}else{
+			} else {
 				switch (type) { //根据type获取背景图, 一般要改成request获取
 					case 1:
 						image = '';
@@ -44,7 +44,7 @@ let _app = {
 			}
 			if (image) {
 				rs(image); // resolve图片的路径
-			}else{
+			} else {
 				rj('背景图片路径不存在');
 			}
 		})
@@ -144,7 +144,7 @@ let _app = {
 		return new Promise((rs, rj) => {
 			if (url.substring(0, 4) !== 'http') {
 				rs(url);
-			}else {
+			} else {
 				url = checkMPUrl(url);
 				log('url:' + url);
 				uni.downloadFile({
@@ -180,11 +180,11 @@ let _app = {
 					success(d_res) {
 						log('下载背景图成功：' + JSON.stringify(d_res));
 						if (d_res && d_res.tempFilePath) {
-							
+
 							// #ifdef H5
 							rs(d_res.tempFilePath);
 							// #endif
-							
+
 							// #ifndef H5
 							uni.saveFile({
 								tempFilePath: d_res.tempFilePath,
@@ -200,7 +200,7 @@ let _app = {
 								}
 							})
 							// #endif
-							
+
 						} else {
 							rj('not find tempFilePath');
 						}
@@ -209,7 +209,7 @@ let _app = {
 						rj(err);
 					}
 				})
-			}else{
+			} else {
 				rs(url);
 			}
 		})
@@ -365,19 +365,23 @@ let _app = {
 		})
 	},
 	// #ifdef APP-PLUS
-	getShare(providerName, WXScene, shareType, title, summary, href, imageUrl, miniProgramObj, mediaUrl, scb, fcb) { //miniProgram: {path: '', type: 0, webUrl: ''}
+	getShare(providerName, WXScene, shareType, title, summary, href, imageUrl, miniProgramObj, mediaUrl, scb,
+		fcb) { //miniProgram: {path: '', type: 0, webUrl: ''}
 		let _this = this;
 		if (typeof(shareType) == 'number' && !isNaN(shareType) && shareType >= 0) {
-			_this.readyShare(providerName, WXScene, shareType, title, summary, href, imageUrl, miniProgramObj, mediaUrl, scb,
+			_this.readyShare(providerName, WXScene, shareType, title, summary, href, imageUrl, miniProgramObj,
+				mediaUrl, scb,
 				fcb);
 		} else {
 			_this.actionSheet(_this.shareTypeListSheetArray, function(index) {
-				_this.readyShare(providerName, WXScene, _this.shareTypeListSheetArray.array[index], title, summary, href,
+				_this.readyShare(providerName, WXScene, _this.shareTypeListSheetArray.array[index], title,
+					summary, href,
 					imageUrl, miniProgramObj, mediaUrl, scb, fcb);
 			});
 		}
 	},
-	readyShare(providerName, WXScene, shareType, title, summary, href, imageUrl, miniProgramObj, mediaUrl, scb, fcb) {
+	readyShare(providerName, WXScene, shareType, title, summary, href, imageUrl, miniProgramObj, mediaUrl, scb,
+		fcb) {
 		let _this = this;
 		let shareObjData = {};
 		switch (shareType) {
@@ -419,7 +423,8 @@ let _app = {
 				break;
 			case 5:
 				shareObjData = {
-					miniProgram: { ...miniProgramObj,
+					miniProgram: {
+						...miniProgramObj,
 						id: miniProgramId,
 						type: miniProgramShareType
 					},
@@ -545,17 +550,15 @@ let _app = {
 
 function checkMPUrl(url) {
 	// #ifdef MP
-	// if(process.env.NODE_ENV !== 'development'){
-	// 	if(
-	// 		url.substring(0, 4) === 'http' && 
-	// 		url.substring(0, 5) !== 'https' && 
-	// 		url.substring(0, 12) !== 'http://store' && 
-	// 		url.substring(0, 10) !== 'http://tmp' && 
-	// 		url.substring(0, 10) !== 'http://usr'
-	// 	) {
-	// 		url = 'https' + url.substring(4, url.length);
-	// 	}
-	// }
+	if (
+		url.substring(0, 4) === 'http' &&
+		url.substring(0, 5) !== 'https' &&
+		url.substring(0, 12) !== 'http://store' &&
+		url.substring(0, 10) !== 'http://tmp' &&
+		url.substring(0, 10) !== 'http://usr'
+	) {
+		url = 'https' + url.substring(4, url.length);
+	}
 	// #endif
 	return url;
 }
diff --git a/shopro/poster/tools.js b/shopro/poster/tools.js
index 62cd1346..d3c31935 100644
--- a/shopro/poster/tools.js
+++ b/shopro/poster/tools.js
@@ -6,16 +6,16 @@ export default {
 			uni.hideLoading()
 			switch (type) {
 				case 'avatar':
-					console.log('%cerr:海报头像图片错误', 'color:green;background:yellow');
+					console.log('%cerr:海报头像图片错误: ' + imgPath, 'color:green;background:yellow');
 					break;
 				case 'bgImage':
-					console.log('%cerr:海报背景图片错误', 'color:green;background:yellow');
+					console.log('%cerr:海报背景图片错误: ' + imgPath, 'color:green;background:yellow');
 					break;
 				case 'wxCode':
-					console.log('%cerr:海报微信二维码图片错误', 'color:green;background:yellow');
+					console.log('%cerr:海报微信二维码图片错误: ' + imgPath, 'color:green;background:yellow');
 					break;
 				case 'goodsImage':
-					console.log('%cerr:海报商品图片错误', 'color:green;background:yellow');
+					console.log('%cerr:海报商品图片错误: ' + imgPath, 'color:green;background:yellow');
 					break;
 				default:
 					break;
@@ -44,6 +44,7 @@ export default {
 					rs(1);
 				},
 				fail: err => {
+					console.log(err)
 					rs(0);
 				}
 			})
@@ -65,6 +66,9 @@ export default {
 		return url;
 	},
 
+
+
+
 	/**
 	 * 相对比例
 	 * @param {Object} bgObj -  背景图片数据对象
diff --git a/shopro/request/apis.js b/shopro/request/apis.js
index 9b4bcb57..6d59acb7 100644
--- a/shopro/request/apis.js
+++ b/shopro/request/apis.js
@@ -6,75 +6,75 @@ export default {
 	/** 公共 ↓ **/
 	common: {
 		init: {
-			url: 'index/init',
+			url: "index/init",
 			auth: false,
-			method: 'GET',
+			method: "GET",
 			// desc: '初始化数据',end
 		},
 		chat: {
-			url: 'chat.index/init',
+			url: "chat.index/init",
 			auth: false,
-			method: 'GET',
+			method: "GET",
 			// desc: '初始化聊天配置',
 		},
 		upload: {
-			url: 'index/upload',
+			url: "index/upload",
 			auth: true,
-			method: 'POST',
+			method: "POST",
 			// desc: '上传图片',
 		},
 		template: {
-			url: 'index/template',
+			url: "index/template",
 			auth: false,
-			method: 'GET',
+			method: "GET",
 			// desc: '模板信息',end
 		},
 		custom: {
-			url: 'index/custom',
+			url: "index/custom",
 			auth: false,
-			method: 'GET',
+			method: "GET",
 			// desc: '自定义模板页面',
 		},
 		live: {
-			url: 'live',
+			url: "live",
 			auth: false,
-			method: 'GET',
+			method: "GET",
 			// desc: '直播列表',
 		},
 		wxJssdk: {
-			url: 'wechat/jssdk',
-			auth: false,
-			method: 'POST',
+			url: "wechat/jssdk",
+			auth: false, 
+			method: "POST",
 			// desc: '微信Jssdk',
 		},
 		syncPages: {
-			url: 'index/asyncPages',
+			url: "index/asyncPages",
 			auth: false,
-			method: 'POST',
+			method: "POST",
 			// desc: '路由表 DEV开发模式下有效',end
 		},
 		debug: {
-			url: 'index/debugLog',
+			url: "index/debugLog",
 			auth: false,
-			method: 'POST',
+			method: "POST",
 			// desc: '上传DEBUG信息',
 		},
 		richText: {
-			url: 'index/richtext',
+			url: "index/richtext",
 			auth: false,
-			method: 'GET',
+			method: "GET",
 			// desc: '富文本数据',
 		},
 		shareAdd: {
-			url: 'share/add',
+			url: "share/add",
 			auth: false,
-			method: 'POST',
+			method: "POST",
 			// desc: '添加分享记录',
 		},
 		smsSend: {
-			url: 'sms/send',
+			url: "sms/send",
 			auth: false,
-			method: 'POST',
+			method: "POST",
 			// desc: '发送短信',
 		},
 	},
@@ -82,21 +82,21 @@ export default {
 	/** 分类 ↓ **/
 	category: {
 		info: {
-			url: 'category/detail',
+			url: "category/detail",
 			auth: false,
-			method: 'GET',
+			method: "GET",
 			// desc: '分类类别',
 		},
 		detail: {
-			url: 'category',
+			url: "category",
 			auth: false,
-			method: 'GET',
+			method: "GET",
 			// desc: '分类详情',
 		},
 		list: {
-			url: 'category/list',
+			url: "category/list",
 			auth: false,
-			method: 'GET',
+			method: "GET",
 			// desc: '首页分类商品列表',
 		}
 	},
@@ -105,51 +105,51 @@ export default {
 	/** 门店 ↓ **/
 	store: {
 		list: {
-			url: 'store/index',
+			url: "store/index",
 			auth: true,
-			method: 'GET',
+			method: "GET",
 			// desc: '商户列表，不需要storeId',
 		},
 		info: {
-			url: 'store.store/index',
+			url: "store.store/index",
 			auth: true,
-			method: 'GET',
+			method: "GET",
 			// desc: '商户信息',
 		},
 		order: {
-			url: 'store.order/index',
+			url: "store.order/index",
 			auth: true,
-			method: 'GET',
+			method: "GET",
 			// desc: '商户订单',
 		},
 		orderDetail: {
-			url: 'store.order/detail',
+			url: "store.order/detail",
 			auth: true,
-			method: 'GET',
+			method: "GET",
 			// desc: '订单详情',
 		},
 		orderSend: {
-			url: 'store.order/send',
+			url: "store.order/send",
 			auth: true,
-			method: 'POST',
+			method: "POST",
 			// desc: '订单发货',
 		},
 		orderConfirm: {
-			url: 'store.order/confirm',
+			url: "store.order/confirm",
 			auth: true,
-			method: 'POST',
+			method: "POST",
 			// desc: '核销订单',
 		},
 		apply: {
-			url: 'store.apply/apply',
+			url: "store.apply/apply",
 			auth: true,
-			method: 'POST',
+			method: "POST",
 			// desc: '申请门店',
 		},
 		shopInfo: {
-			url: 'store.apply/info',
+			url: "store.apply/info",
 			auth: true,
-			method: 'POST',
+			method: "POST",
 			// desc: '门店信息',
 		}
 	},
@@ -157,88 +157,88 @@ export default {
 	/** 商品 ↓ **/
 	goods: {
 		lists: {
-			url: 'goods/lists',
+			url: "goods/lists",
 			auth: false,
-			method: 'GET',
+			method: "GET",
 			// desc: '商品列表',
 		},
 		seckillList: {
-			url: 'goods/seckillList',
+			url: "goods/seckillList",
 			auth: false,
-			method: 'GET',
+			method: "GET",
 			// desc: '秒杀列表',
 		},
 		activity: {
-			url: 'goods/activity',
+			url: "goods/activity",
 			auth: false,
-			method: 'GET',
+			method: "GET",
 			// desc: '活动商品',
 		},
 		myGroupon: {
-			url: 'activity_groupon/myGroupon',
+			url: "activity_groupon/myGroupon",
 			auth: true,
-			method: 'GET',
+			method: "GET",
 			// desc: '我的拼团',
 		},
 		grouponDetail: {
-			url: 'activity_groupon/detail',
-			auth: true,
-			method: 'GET',
+			url: "activity_groupon/detail",
+			auth: false,
+			method: "GET",
 			// desc: '拼团详情',
 		},
 		grouponItem: {
-			url: 'activity_groupon/index',
+			url: "activity_groupon/index",
 			auth: false,
-			method: 'GET',
+			method: "GET",
 			// desc: '拼购列表',
 		},
 		grouponList: {
-			url: 'goods/grouponList',
+			url: "goods/grouponList",
 			auth: false,
-			method: 'GET',
+			method: "GET",
 			// desc: '拼团商品列表',
 		},
 		detail: {
-			url: 'goods/detail',
+			url: "goods/detail",
 			auth: false,
-			method: 'GET',
+			method: "GET",
 			// desc: '商品详情',
 		},
 		favorite: {
-			url: 'goods/favorite',
+			url: "goods/favorite",
 			auth: true,
-			method: 'POST',
+			method: "POST",
 			// desc: '商品收藏',
 		},
 
 		storeAddress: {
-			url: 'goods/store',
+			url: "goods/store",
 			auth: true,
-			method: 'GET',
+			method: "GET",
 			// desc: '商品支持的自提点',
 		},
 		scoreList: {
-			url: 'score_goods_sku_price/index',
+			url: "score_goods_sku_price/index",
 			auth: false,
-			method: 'GET',
+			method: "GET",
 			// desc: '积分商品列表',
 		},
 		scoreDetail: {
-			url: 'score_goods_sku_price/detail',
+			url: "score_goods_sku_price/detail",
 			auth: false,
-			method: 'GET',
+			method: "GET",
 			// desc: '积分详情',
 		},
 		commentList: {
-			url: 'goods_comment/index',
+			url: "goods_comment/index",
 			auth: false,
-			method: 'GET',
+			method: "GET",
 			// desc: '商品评论列表',
 		},
 		commentType: {
-			url: 'goods_comment/type',
+			url: "goods_comment/type",
 			auth: false,
-			method: 'GET',
+			method: "GET",
 			// desc: '商品评论分类',
 		},
 	},
@@ -247,147 +247,147 @@ export default {
 	user: {
 
 		accountLogin: {
-			url: 'user/accountLogin',
+			url: "user/accountLogin",
 			auth: false,
-			method: 'POST',
+			method: "POST",
 			// desc: '账号密码登录',
 		},
 
 		smsLogin: {
-			url: 'user/smsLogin',
+			url: "user/smsLogin",
 			auth: false,
-			method: 'POST',
+			method: "POST",
 			// desc: '短信登录',
 		},
 
 		register: {
-			url: 'user/register',
+			url: "user/register",
 			auth: false,
-			method: 'POST',
+			method: "POST",
 			// desc: '注册',
 		},
 
 		forgotPwd: {
-			url: 'user/forgotPwd',
+			url: "user/forgotPwd",
 			auth: false,
-			method: 'POST',
+			method: "POST",
 			// desc: '重置密码',
 		},
 
 		bindMobile: {
-			url: 'user/bindMobile',
+			url: "user/bindMobile",
 			auth: true,
-			method: 'POST',
+			method: "POST",
 			// desc: '修改手机号',
 		},
 
 		changePwd: {
-			url: 'user/changePwd',
+			url: "user/changePwd",
 			auth: true,
-			method: 'POST',
+			method: "POST",
 			// desc: '修改密码',
 		},
 
 		info: {
-			url: 'user',
+			url: "user",
 			auth: true,
-			method: 'GET',
+			method: "GET",
 			// desc: '用户信息',end
 		},
 
 		profile: {
-			url: 'user/profile',
+			url: "user/profile",
 			auth: true,
-			method: 'POST',
+			method: "POST",
 			// desc: '修改用户信息',end
 		},
 		logout: {
-			url: 'user/logout',
+			url: "user/logout",
 			auth: true,
-			method: 'POST',
+			method: "POST",
 			// desc: '退出登录',end
 		},
 
 		getWxMiniProgramSessionKey: {
-			url: 'user/getWxMiniProgramSessionKey',
+			url: "user/getWxMiniProgramSessionKey",
 			auth: false,
-			method: 'POST',
+			method: "POST",
 			// desc: '获取用户session_key',
 		},
 
 		wxMiniProgramOauth: {
-			url: 'user/wxMiniProgramOauth',
+			url: "user/wxMiniProgramOauth",
 			auth: false,
-			method: 'POST',
+			method: "POST",
 			// desc: '微信小程序登录',
 		},
 
 		wxOpenPlatformOauth: {
-			url: 'user/wxOpenPlatformOauth',
+			url: "user/wxOpenPlatformOauth",
 			auth: false,
-			method: 'POST',
+			method: "POST",
 			// desc: '微信APP登录',
 		},
 
 		thirdOauthInfo: {
-			url: 'user/thirdOauthInfo',
+			url: "user/thirdOauthInfo",
 			auth: true,
-			method: 'GET',
+			method: "GET",
 			// desc: '第三方绑定信息',
 		},
 		unbindThirdOauth: {
-			url: 'user/unbindThirdOauth',
+			url: "user/unbindThirdOauth",
 			auth: true,
-			method: 'POST',
+			method: "POST",
 			// desc: '解绑信息',
 		},
 
 		signList: {
-			url: 'user_sign/index',
+			url: "user_sign/index",
 			auth: true,
-			method: 'GET',
+			method: "GET",
 			// desc: '签到记录',
 		},
 		sign: {
-			url: 'user_sign/sign',
+			url: "user_sign/sign",
 			auth: true,
-			method: 'POST',
+			method: "POST",
 			// desc: '签到',
 		},
 		messageIds: {
-			url: 'notification/template',
-			auth: true,
-			method: 'GET',
+			url: "notification/template",
+			auth: false,
+			method: "GET",
 			// desc: '订阅消息模板ids',
 		},
 		favoriteList: {
-			url: 'goods/favoriteList',
+			url: "goods/favoriteList",
 			auth: true,
-			method: 'GET',
+			method: "GET",
 			// desc: '商品收藏列表',
 		},
 		viewList: {
-			url: 'goods/viewList',
+			url: "goods/viewList",
 			auth: true,
-			method: 'GET',
+			method: "GET",
 			// desc: '足迹列表',end
 		},
 		viewDelete: {
-			url: 'goods/viewDelete',
+			url: "goods/viewDelete",
 			auth: true,
-			method: 'POST',
+			method: "POST",
 			// desc: '删除足迹',end
 		},
 		userData: {
-			url: 'user/userData',
+			url: "user/userData",
 			auth: true,
-			method: 'GET',
+			method: "GET",
 			// desc: '用户其他信息',
 		},
 		appleIdOauth: {
-			url: 'user/appleIdOauth',
+			url: "user/appleIdOauth",
 			auth: false,
-			method: 'POST',
+			method: "POST",
 			// desc: 'appleId授权',
 		}
 	},
@@ -395,39 +395,39 @@ export default {
 	/** 位置 ↓ **/
 	address: {
 		area: {
-			url: 'address/area',
+			url: "address/area",
 			auth: false,
-			method: 'GET',
+			method: "GET",
 			// desc: '省市区',
 		},
 		list: {
-			url: 'address',
+			url: "address",
 			auth: true,
-			method: 'GET',
+			method: "GET",
 			// desc: '地址列表',
 		},
 		edit: {
-			url: 'address/edit',
+			url: "address/edit",
 			auth: true,
-			method: 'POST',
+			method: "POST",
 			// desc: '修改地址',
 		},
 		defaults: {
-			url: 'address/defaults',
+			url: "address/defaults",
 			auth: true,
-			method: 'GET',
+			method: "GET",
 			// desc: '默认地址',
 		},
 		info: {
-			url: 'address/info',
+			url: "address/info",
 			auth: true,
-			method: 'GET',
+			method: "GET",
 			// desc: '地址详情',
 		},
 		del: {
-			url: 'address/del',
+			url: "address/del",
 			auth: true,
-			method: 'POST',
+			method: "POST",
 			// desc: '删除',
 		},
 	},
@@ -435,33 +435,33 @@ export default {
 	/** 常见问题 ↓ **/
 	other: {
 		faqList: {
-			url: 'faq',
+			url: "faq",
 			auth: false,
-			method: 'GET',
+			method: "GET",
 			// desc: '常见问题列表',
 		},
 		feedbackType: {
-			url: 'feedback/type',
+			url: "feedback/type",
 			auth: true,
-			method: 'GET',
+			method: "GET",
 			// desc: '意见反馈类型',
 		},
 		feedbackAdd: {
-			url: 'feedback/add',
+			url: "feedback/add",
 			auth: true,
-			method: 'POST',
+			method: "POST",
 			// desc: '提交意见',
 		},
 		commentAdd: {
-			url: 'comment/submit',
+			url: "comment/submit",
 			auth: true,
-			method: 'POST',
+			method: "POST",
 			// desc: '提交评论',
 		},
 		commentList: {
-			url: 'comment/list',
+			url: "comment/list",
 			auth: true,
-			method: 'GET',
+			method: "GET",
 			// desc: '评论列表',
 		}
 	},
@@ -469,22 +469,22 @@ export default {
 	/** 购物车 ↓ **/
 	cart: {
 		index: {
-			url: 'cart',
+			url: "cart",
 			auth: true,
-			method: 'POST',
+			method: "POST",
 			// desc: '购物车商品列表',
 		},
 		add: {
-			url: 'cart/add',
+			url: "cart/add",
 			auth: true,
-			method: 'POST',
+			method: "POST",
 			// desc: '添加购物车',
 		},
 
 		edit: {
-			url: 'cart/edit',
+			url: "cart/edit",
 			auth: true,
-			method: 'POST',
+			method: "POST",
 			// desc: '编辑购物车',
 		},
 	},
@@ -492,111 +492,111 @@ export default {
 	/** 订单 ↓ **/
 	order: {
 		index: {
-			url: 'order/index',
+			url: "order/index",
 			auth: true,
-			method: 'GET',
+			method: "GET",
 			// desc: '订单列表',
 		},
 		pre: {
-			url: 'order/pre',
+			url: "order/pre",
 			auth: true,
-			method: 'POST',
+			method: "POST",
 			// desc: '预备提交订单',
 		},
 		createOrder: {
-			url: 'order/createOrder',
+			url: "order/createOrder",
 			auth: true,
-			method: 'POST',
+			method: "POST",
 			// desc: '提交订单',
 		},
 		detail: {
-			url: 'order/detail',
+			url: "order/detail",
 			auth: true,
-			method: 'GET',
+			method: "GET",
 			// desc: '订单详情',
 		},
 		itemDetail: {
-			url: 'order/itemDetail',
+			url: "order/itemDetail",
 			auth: true,
-			method: 'GET',
+			method: "GET",
 			// desc: '订单商品详情',
 		},
 		confirm: {
-			url: 'order/confirm',
+			url: "order/confirm",
 			auth: true,
-			method: 'POST',
+			method: "POST",
 			// desc: '确认收货',
 		},
 		cancel: {
-			url: 'order/cancel',
+			url: "order/cancel",
 			auth: true,
-			method: 'POST',
+			method: "POST",
 			// desc: '取消订单',
 		},
 		comment: {
-			url: 'order/comment',
+			url: "order/comment",
 			auth: true,
-			method: 'POST',
+			method: "POST",
 			// desc: '评价商品',
 		},
 		coupons: {
-			url: 'order/coupons',
+			url: "order/coupons",
 			auth: true,
-			method: 'POST',
+			method: "POST",
 			// desc: '商品可用优惠券',
 		},
 		aftersale: {
-			url: 'order_aftersale/aftersale',
+			url: "order_aftersale/aftersale",
 			auth: true,
-			method: 'POST',
+			method: "POST",
 			// desc: '申请售后',
 		},
 		aftersaleList: {
-			url: 'order_aftersale/index',
+			url: "order_aftersale/index",
 			auth: true,
-			method: 'GET',
+			method: "GET",
 			// desc: '售后列表',
 		},
 		aftersaleDetail: {
-			url: 'order_aftersale/detail',
+			url: "order_aftersale/detail",
 			auth: true,
-			method: 'GET',
+			method: "GET",
 			// desc: '售后列表详情',
 		},
 		deleteOrder: {
-			url: 'order/delete',
+			url: "order/delete",
 			auth: true,
-			method: 'POST',
+			method: "POST",
 			// desc: '删除订单',
 		},
 		deleteAftersaleOrder: {
-			url: 'order_aftersale/delete',
+			url: "order_aftersale/delete",
 			auth: true,
-			method: 'POST',
+			method: "POST",
 			// desc: '删除售后订单',
 		},
 		cancelAftersaleOrder: {
-			url: 'order_aftersale/cancel',
+			url: "order_aftersale/cancel",
 			auth: true,
-			method: 'POST',
+			method: "POST",
 			// desc: '取消售后订单',
 		},
 		expressList: {
-			url: 'order_express/index',
+			url: "order_express/index",
 			auth: true,
-			method: 'GET',
+			method: "GET",
 			// desc: '包裹列表',
 		},
 		expressDetail: {
-			url: 'order_express/detail',
+			url: "order_express/detail",
 			auth: true,
-			method: 'GET',
+			method: "GET",
 			// desc: '包裹详情',
 		},
 		itemDetail: {
-			url: 'order/itemDetail',
+			url: "order/itemDetail",
 			auth: true,
-			method: 'GET',
+			method: "GET",
 			// desc: '订单商品详情',
 		}
 	},
@@ -604,45 +604,45 @@ export default {
 	/** 支付金钱 ↓ **/
 	money: {
 		prepay: {
-			url: 'pay/prepay',
+			url: "pay/prepay",
 			auth: true,
-			method: 'POST',
+			method: "POST",
 			// desc: '发起支付',
 		},
 		walletApply: {
-			url: 'user_wallet_apply/apply',
+			url: "user_wallet_apply/apply",
 			auth: true,
-			method: 'POST',
+			method: "POST",
 			// desc: '申请提现',end
 		},
 		walletRule: {
-			url: 'user_wallet_apply/rule',
+			url: "user_wallet_apply/rule",
 			auth: true,
-			method: 'GET',
+			method: "GET",
 			// desc: '提现规则',end
 		},
 		walletLog: {
-			url: 'user_wallet_log',
+			url: "user_wallet_log",
 			auth: true,
-			method: 'GET',
+			method: "GET",
 			// desc: '钱包,积分明细',end
 		},
 		bankInfo: {
-			url: 'user_bank/info',
+			url: "user_bank/info",
 			auth: true,
-			method: 'GET',
+			method: "GET",
 			// desc: '银行卡信息',end
 		},
 		bankEdit: {
-			url: 'user_bank/edit',
+			url: "user_bank/edit",
 			auth: true,
-			method: 'POST',
+			method: "POST",
 			// desc: '编辑银行卡信息',end
 		},
 		withdrawLog: {
-			url: 'user_wallet_apply/index',
+			url: "user_wallet_apply/index",
 			auth: true,
-			method: 'GET',
+			method: "GET",
 			// desc: '提现记录',end
 		}
 	},
@@ -650,33 +650,33 @@ export default {
 	/** 优惠券 ↓ **/
 	coupons: {
 		list: {
-			url: 'coupons',
+			url: "coupons",
 			auth: false,
-			method: 'GET',
+			method: "GET",
 			// desc: '个人中心优惠券列表',
 		},
 		templateList: {
-			url: 'coupons/lists',
+			url: "coupons/lists",
 			auth: false,
-			method: 'GET',
+			method: "GET",
 			// desc: '首页优惠券',
 		},
 		get: {
-			url: 'coupons/get',
+			url: "coupons/get",
 			auth: true,
-			method: 'GET',
+			method: "GET",
 			// desc: '领取',
 		},
 		detail: {
-			url: 'coupons/detail',
+			url: "coupons/detail",
 			auth: true,
-			method: 'GET',
+			method: "GET",
 			// desc: '购物券详情',
 		},
 		goods: {
-			url: 'coupons/goods',
+			url: "coupons/goods",
 			auth: false,
-			method: 'GET',
+			method: "GET",
 			// desc: '适用商品',
 		}
 	},
@@ -684,69 +684,69 @@ export default {
 	/** 分销 ↓ **/
 	commission: {
 		auth: {
-			url: 'commission.agent/info',
+			url: "commission.agent/info",
 			auth: true,
-			method: 'GET',
+			method: "GET",
 			// desc: '分销身份鉴权',
 		},
 		log: {
-			url: 'commission.log/index',
+			url: "commission.log/index",
 			auth: true,
-			method: 'GET',
+			method: "GET",
 			// desc: '分销动态',
 		},
 		goods: {
-			url: 'commission.goods/index',
+			url: "commission.goods/index",
 			auth: true,
-			method: 'GET',
+			method: "GET",
 			// desc: '分销商品',
 		},
 		ranking: {
-			url: 'commission.agent/ranking',
+			url: "commission.agent/ranking",
 			auth: true,
-			method: 'GET',
+			method: "GET",
 			// desc: '分销商排行榜',
 		},
 		form: {
-			url: 'commission.agent/agentForm',
+			url: "commission.agent/agentForm",
 			auth: true,
-			method: 'GET',
+			method: "GET",
 			// desc: '申请成为分销商表单',
 		},
 		apply: {
-			url: 'commission.agent/applyForm',
+			url: "commission.agent/applyForm",
 			auth: true,
-			method: 'POST',
+			method: "POST",
 			// desc: '申请成为分销商',
 		},
 		team: {
-			url: 'commission.agent/team',
+			url: "commission.agent/team",
 			auth: true,
-			method: 'GET',
+			method: "GET",
 			// desc: '我的团队',
 		},
 		share: {
-			url: 'share/index',
+			url: "share/index",
 			auth: true,
-			method: 'GET',
+			method: "GET",
 			// desc: '分享记录',
 		},
 		orderLog: {
-			url: 'commission.order/index',
+			url: "commission.order/index",
 			auth: true,
-			method: 'GET',
+			method: "GET",
 			// desc: '分销订单',
 		},
 		rewardLog: {
-			url: 'commission.reward/index',
+			url: "commission.reward/index",
 			auth: true,
-			method: 'GET',
+			method: "GET",
 			// desc: '佣金记录',
 		},
 		lv: {
-			url: 'commission.agent/level',
+			url: "commission.agent/level",
 			auth: true,
-			method: 'GET',
+			method: "GET",
 			// desc: '佣金记录',
 		}
 	}
diff --git a/shopro/router/index.js b/shopro/router/index.js
index bcbcb93e..2b89bd06 100644
--- a/shopro/router/index.js
+++ b/shopro/router/index.js
@@ -2,10 +2,13 @@
 import {
 	RouterMount,
 	createRouter
-} from 'uni-simple-router';
+} from './uni-simple-router.js'
 import store from '@/shopro/store'
 const router = createRouter({
 	platform: process.env.VUE_APP_PLATFORM,
+	applet: {
+		animationDuration: 0 //默认 300ms 
+	},
 	routerErrorEach: ({
 		type,
 		msg
@@ -26,6 +29,7 @@ const router = createRouter({
 				// #endif
 				break;
 			case 2:
+			case 0:
 				router.$lockStatus = false;
 				break;
 			default:
@@ -49,7 +53,7 @@ const router = createRouter({
 //全局路由前置守卫
 router.beforeEach((to, from, next) => {
 	// 权限控制登录
-	if (to.meta && to.meta.auth && !store.state.user.isLogin) {
+	if (to.meta && to.meta.auth && !store.getters.isLogin) {
 		store.dispatch('showAuthModal');
 		next(false);
 	} else {
diff --git a/shopro/router/uni-simple-router.js b/shopro/router/uni-simple-router.js
new file mode 100644
index 00000000..a68ff673
--- /dev/null
+++ b/shopro/router/uni-simple-router.js
@@ -0,0 +1 @@
+!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t():"function"==typeof define&&define.amd?define([],t):"object"==typeof exports?exports.Router=t():e.Router=t()}(self,(function(){return e={779:(e,t,r)=>{var o=r(173);e.exports=function e(t,r,n){return o(r)||(n=r||n,r=[]),n=n||{},t instanceof RegExp?function(e,t){var r=e.source.match(/\((?!\?)/g);if(r)for(var o=0;o<r.length;o++)t.push({name:o,prefix:null,delimiter:null,optional:!1,repeat:!1,partial:!1,asterisk:!1,pattern:null});return c(e,t)}(t,r):o(t)?function(t,r,o){for(var n=[],a=0;a<t.length;a++)n.push(e(t[a],r,o).source);return c(new RegExp("(?:"+n.join("|")+")",s(o)),r)}(t,r,n):function(e,t,r){return f(a(e,r),t,r)}(t,r,n)},e.exports.parse=a,e.exports.compile=function(e,t){return u(a(e,t),t)},e.exports.tokensToFunction=u,e.exports.tokensToRegExp=f;var n=new RegExp(["(\\\\.)","([\\/.])?(?:(?:\\:(\\w+)(?:\\(((?:\\\\.|[^\\\\()])+)\\))?|\\(((?:\\\\.|[^\\\\()])+)\\))([+*?])?|(\\*))"].join("|"),"g");function a(e,t){for(var r,o=[],a=0,i=0,u="",c=t&&t.delimiter||"/";null!=(r=n.exec(e));){var s=r[0],f=r[1],h=r.index;if(u+=e.slice(i,h),i=h+s.length,f)u+=f[1];else{var v=e[i],y=r[2],g=r[3],d=r[4],m=r[5],b=r[6],O=r[7];u&&(o.push(u),u="");var P=null!=y&&null!=v&&v!==y,k="+"===b||"*"===b,j="?"===b||"*"===b,w=r[2]||c,R=d||m;o.push({name:g||a++,prefix:y||"",delimiter:w,optional:j,repeat:k,partial:P,asterisk:!!O,pattern:R?p(R):O?".*":"[^"+l(w)+"]+?"})}}return i<e.length&&(u+=e.substr(i)),u&&o.push(u),o}function i(e){return encodeURI(e).replace(/[\/?#]/g,(function(e){return"%"+e.charCodeAt(0).toString(16).toUpperCase()}))}function u(e,t){for(var r=new Array(e.length),n=0;n<e.length;n++)"object"==typeof e[n]&&(r[n]=new RegExp("^(?:"+e[n].pattern+")$",s(t)));return function(t,n){for(var a="",u=t||{},l=(n||{}).pretty?i:encodeURIComponent,p=0;p<e.length;p++){var c=e[p];if("string"!=typeof c){var s,f=u[c.name];if(null==f){if(c.optional){c.partial&&(a+=c.prefix);continue}throw new TypeError('Expected "'+c.name+'" to be defined')}if(o(f)){if(!c.repeat)throw new TypeError('Expected "'+c.name+'" to not repeat, but received `'+JSON.stringify(f)+"`");if(0===f.length){if(c.optional)continue;throw new TypeError('Expected "'+c.name+'" to not be empty')}for(var h=0;h<f.length;h++){if(s=l(f[h]),!r[p].test(s))throw new TypeError('Expected all "'+c.name+'" to match "'+c.pattern+'", but received `'+JSON.stringify(s)+"`");a+=(0===h?c.prefix:c.delimiter)+s}}else{if(s=c.asterisk?encodeURI(f).replace(/[?#]/g,(function(e){return"%"+e.charCodeAt(0).toString(16).toUpperCase()})):l(f),!r[p].test(s))throw new TypeError('Expected "'+c.name+'" to match "'+c.pattern+'", but received "'+s+'"');a+=c.prefix+s}}else a+=c}return a}}function l(e){return e.replace(/([.+*?=^!:${}()[\]|\/\\])/g,"\\$1")}function p(e){return e.replace(/([=!:$\/()])/g,"\\$1")}function c(e,t){return e.keys=t,e}function s(e){return e&&e.sensitive?"":"i"}function f(e,t,r){o(t)||(r=t||r,t=[]);for(var n=(r=r||{}).strict,a=!1!==r.end,i="",u=0;u<e.length;u++){var p=e[u];if("string"==typeof p)i+=l(p);else{var f=l(p.prefix),h="(?:"+p.pattern+")";t.push(p),p.repeat&&(h+="(?:"+f+h+")*"),i+=h=p.optional?p.partial?f+"("+h+")?":"(?:"+f+"("+h+"))?":f+"("+h+")"}}var v=l(r.delimiter||"/"),y=i.slice(-v.length)===v;return n||(i=(y?i.slice(0,-v.length):i)+"(?:"+v+"(?=$))?"),i+=a?"$":n&&y?"":"(?="+v+"|$)",c(new RegExp("^"+i,s(r)),t)}},173:e=>{e.exports=Array.isArray||function(e){return"[object Array]"==Object.prototype.toString.call(e)}},844:function(e,t,r){"use strict";var o=this&&this.__assign||function(){return(o=Object.assign||function(e){for(var t,r=1,o=arguments.length;r<o;r++)for(var n in t=arguments[r])Object.prototype.hasOwnProperty.call(t,n)&&(e[n]=t[n]);return e}).apply(this,arguments)};Object.defineProperty(t,"__esModule",{value:!0}),t.buildVueRouter=t.buildVueRoutes=void 0;var n=r(366),a=r(883),i=r(789),u=r(169);t.buildVueRoutes=function(e,t){for(var r=e.routesMap,o=r.pathMap,l=r.finallyPathList,p=Object.keys(t),c=0;c<p.length;c++){var s=p[c],f=o[s],h=t[s];if(f){var v=i.getRoutePath(f,e).finallyPath;if(v instanceof Array)throw new Error("非 vueRouterDev 模式下，alias、aliasPath、path 无法提供数组类型！ "+JSON.stringify(f));null!=f.name&&(h.name=f.name);var y=h.path,g=h.alias;delete h.alias,h.path=v,"/"===y&&null!=g&&(h.alias=g,h.path=y),f.beforeEnter&&(h.beforeEnter=function(t,r,o){u.onTriggerEachHook(t,r,e,n.hookToggle.enterHooks,o)})}else a.warn(s+" 路由地址在路由表中未找到，确定是否传递漏啦",e,!0)}return l.includes("*")&&(t["*"]=o["*"]),t},t.buildVueRouter=function(e,t,r){var n;n="[object Array]"===i.getDataType(r)?r:Object.values(r);var a=e.options.h5,u=a.scrollBehavior,l=a.fallback,p=t.options.scrollBehavior;t.options.scrollBehavior=function(e,t,r){return p&&p(e,t,r),u(e,t,r)},t.fallback=l;var c=new t.constructor(o(o({},e.options.h5),{base:t.options.base,mode:t.options.mode,routes:n}));t.matcher=c.matcher}},147:function(e,t){"use strict";var r,o=this&&this.__extends||(r=function(e,t){return(r=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(e,t){e.__proto__=t}||function(e,t){for(var r in t)Object.prototype.hasOwnProperty.call(t,r)&&(e[r]=t[r])})(e,t)},function(e,t){function o(){this.constructor=e}r(e,t),e.prototype=null===t?Object.create(t):(o.prototype=t.prototype,new o)});Object.defineProperty(t,"__esModule",{value:!0}),t.proxyH5Mount=t.proxyEachHook=t.MyArray=void 0;var n=function(e){function t(r,o,n,a){var i=e.call(this)||this;return i.router=r,i.vueEachArray=o,i.myEachHook=n,i.hookName=a,Object.setPrototypeOf(i,t.prototype),i}return o(t,e),t.prototype.push=function(e){var t=this;this.vueEachArray.push(e);var r=this.length;this[this.length]=function(e,o,n){r>0?t.vueEachArray[r](e,o,(function(){n&&n()})):t.myEachHook(e,o,(function(a){!1===a?n(!1):t.vueEachArray[r](e,o,(function(e){n(a)}))}),t.router,!0)}},t}(Array);t.MyArray=n,t.proxyEachHook=function(e,t){for(var r=["beforeHooks","afterHooks"],o=0;o<r.length;o++){var a=r[o],i=e.lifeCycle[a][0];if(i){var u=t[a];t[a]=new n(e,u,i,a)}}},t.proxyH5Mount=function(e){var t;if(0===e.mount.length){if(null===(t=e.options.h5)||void 0===t?void 0:t.vueRouterDev)return;navigator.userAgent.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/)&&setTimeout((function(){if(document.getElementsByTagName("uni-page").length>0)return!1;window.location.reload()}),0)}else e.mount[0].app.$mount(),e.mount=[]}},814:function(e,t){"use strict";var r=this&&this.__assign||function(){return(r=Object.assign||function(e){for(var t,r=1,o=arguments.length;r<o;r++)for(var n in t=arguments[r])Object.prototype.hasOwnProperty.call(t,n)&&(e[n]=t[n]);return e}).apply(this,arguments)};Object.defineProperty(t,"__esModule",{value:!0}),t.tabIndexSelect=t.runtimeQuit=t.registerLoddingPage=void 0;var o=null,n=null;t.registerLoddingPage=function(e){if(e.options.registerLoadingPage){var t=e.options.APP,o=t.loadingPageHook,n=t.loadingPageStyle;o(new plus.nativeObj.View("router-loadding",r({top:"0px",left:"0px",height:"100%",width:"100%"},n())))}},t.runtimeQuit=function(e){void 0===e&&(e="再按一次退出应用");var t=+new Date;o?t-o<1e3&&plus.runtime.quit():(o=t,uni.showToast({title:e,icon:"none",position:"bottom",duration:1e3}),setTimeout((function(){o=null}),1e3))},t.tabIndexSelect=function(e,t){if(!__uniConfig.tabBar||!Array.isArray(__uniConfig.tabBar.list))return!1;for(var r=__uniConfig.tabBar.list,o=[],a=0,i=0;i<r.length;i++){var u=r[i];if("/"+u.pagePath!==e.path&&"/"+u.pagePath!==t.path||(u.pagePath===t.path&&(a=i),o.push(u)),2===o.length)break}return 2===o.length&&(null==n&&(n=uni.requireNativePlugin("uni-tabview")),n.switchSelect({index:a}),!0)}},334:(e,t)=>{"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.getEnterPath=void 0,t.getEnterPath=function(e,t){switch(t.options.platform){case"mp-alipay":case"mp-weixin":case"mp-toutiao":case"mp-qq":return e.$options.mpInstance.route;case"mp-baidu":return e.$options.mpInstance.is||e.$options.mpInstance.pageinstance.route}return e.$options.mpInstance.route}},282:function(e,t,r){"use strict";var o=this&&this.__assign||function(){return(o=Object.assign||function(e){for(var t,r=1,o=arguments.length;r<o;r++)for(var n in t=arguments[r])Object.prototype.hasOwnProperty.call(t,n)&&(e[n]=t[n]);return e}).apply(this,arguments)},n=this&&this.__rest||function(e,t){var r={};for(var o in e)Object.prototype.hasOwnProperty.call(e,o)&&t.indexOf(o)<0&&(r[o]=e[o]);if(null!=e&&"function"==typeof Object.getOwnPropertySymbols){var n=0;for(o=Object.getOwnPropertySymbols(e);n<o.length;n++)t.indexOf(o[n])<0&&Object.prototype.propertyIsEnumerable.call(e,o[n])&&(r[o[n]]=e[o[n]])}return r};Object.defineProperty(t,"__esModule",{value:!0}),t.notCallProxyHook=t.proxyVueSortHookName=t.indexProxyHook=t.appProxyHook=t.lifeCycle=t.baseConfig=t.mpPlatformReg=void 0;var a=r(883);t.mpPlatformReg="(^mp-weixin$)|(^mp-baidu$)|(^mp-alipay$)|(^mp-toutiao$)|(^mp-qq$)|(^mp-360$)",t.baseConfig={h5:{paramsToQuery:!1,vueRouterDev:!1,vueNext:!1,mode:"hash",base:"/",linkActiveClass:"router-link-active",linkExactActiveClass:"router-link-exact-active",scrollBehavior:function(e,t,r){return{x:0,y:0}},fallback:!0},APP:{registerLoadingPage:!0,loadingPageStyle:function(){return JSON.parse('{"backgroundColor":"#FFF"}')},loadingPageHook:function(e){e.show()},launchedHook:function(){plus.navigator.closeSplashscreen()},animation:{}},applet:{animationDuration:300},platform:"h5",keepUniOriginNav:!1,debugger:!1,routerBeforeEach:function(e,t,r){r()},routerAfterEach:function(e,t){},routerErrorEach:function(e,t){t.$lockStatus=!1,a.err(e,t,!0)},detectBeforeLock:function(e,t,r){},routes:[{path:"/choose-location"},{path:"/open-location"},{path:"/preview-image"}]},t.lifeCycle={beforeHooks:[],afterHooks:[],routerBeforeHooks:[],routerAfterHooks:[],routerErrorHooks:[]},t.appProxyHook={app:{created:[],beforeMount:[],mounted:[],onLaunch:[],onShow:[],onHide:[],beforeDestroy:[],destroyed:[]}},t.indexProxyHook={app:t.appProxyHook.app,page:function(e){e.onLaunch;var t=n(e,["onLaunch"]);return o(o({},t),{onLoad:[],onReady:[],onUnload:[],onResize:[]})}(JSON.parse(JSON.stringify(t.appProxyHook.app))),component:[]},t.proxyVueSortHookName={app:["created","beforeMount","mounted","onLaunch","onShow","onHide","beforeDestroy","destroyed"],page:["created","beforeMount","mounted","onLoad","onReady","onShow","onResize","onHide","beforeDestroy","destroyed","onUnload"],component:["created","beforeMount","mounted","beforeDestroy","destroyed"]},t.notCallProxyHook=["onHide","beforeDestroy","destroyed","destroyed","onUnload","onResize"]},801:(e,t,r)=>{"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.createRouteMap=void 0;var o=r(883),n=r(789);t.createRouteMap=function(e,t){var r={finallyPathList:[],finallyPathMap:Object.create(null),aliasPathMap:Object.create(null),pathMap:Object.create(null),vueRouteMap:Object.create(null),nameMap:Object.create(null)};return t.forEach((function(t){var a=n.getRoutePath(t,e),i=a.finallyPath,u=a.aliasPath,l=a.path;if(null==l)throw new Error("请提供一个完整的路由对象，包括以绝对路径开始的 ‘path’ 字符串 "+JSON.stringify(t));if(i instanceof Array&&!e.options.h5.vueRouterDev&&"h5"===e.options.platform)throw new Error("非 vueRouterDev 模式下，route.alias 目前无法提供数组类型！ "+JSON.stringify(t));var p=i,c=u;"h5"!==e.options.platform&&0!==p.indexOf("/")&&"*"!==l&&o.warn("当前路由对象下，route："+JSON.stringify(t)+" 是否缺少了前缀 ‘/’",e,!0),r.finallyPathMap[p]||(r.finallyPathMap[p]=t,r.aliasPathMap[c]=t,r.pathMap[l]=t,r.finallyPathList.push(p),null!=t.name&&(r.nameMap[t.name]=t))})),r}},662:(e,t,r)=>{"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.registerEachHooks=t.registerRouterHooks=t.registerHook=void 0;var o=r(366),n=r(169);function a(e,t){e[0]=t}t.registerHook=a,t.registerRouterHooks=function(e,t){return a(e.routerBeforeHooks,(function(e,r,o){t.routerBeforeEach(e,r,o)})),a(e.routerAfterHooks,(function(e,r){t.routerAfterEach(e,r)})),a(e.routerErrorHooks,(function(e,r){t.routerErrorEach(e,r)})),e},t.registerEachHooks=function(e,t,r){a(e.lifeCycle[t],(function(e,a,i,u,l){l?n.onTriggerEachHook(e,a,u,o.hookToggle[t],i):r(e,a,i)}))}},460:function(e,t,r){"use strict";var o=this&&this.__assign||function(){return(o=Object.assign||function(e){for(var t,r=1,o=arguments.length;r<o;r++)for(var n in t=arguments[r])Object.prototype.hasOwnProperty.call(t,n)&&(e[n]=t[n]);return e}).apply(this,arguments)};Object.defineProperty(t,"__esModule",{value:!0}),t.initMixins=t.getMixins=void 0;var n=r(801),a=r(844),i=r(147),u=r(814),l=r(845),p=r(890),c=r(789),s=r(334),f=r(282),h=!1,v=!1,y={app:!1,page:""};function g(e,t){var r=t.options.platform;return new RegExp(f.mpPlatformReg,"g").test(r)&&(r="app-lets"),{h5:{beforeCreate:function(){var e;if(this.$options.router){t.$route=this.$options.router;var r=[];(null===(e=t.options.h5)||void 0===e?void 0:e.vueRouterDev)?r=t.options.routes:(r=n.createRouteMap(t,this.$options.router.options.routes).finallyPathMap,t.routesMap.vueRouteMap=r,a.buildVueRoutes(t,r)),a.buildVueRouter(t,this.$options.router,r),i.proxyEachHook(t,this.$options.router)}}},"app-plus":{beforeCreate:function(){h||(h=!0,l.proxyPageHook(this,t,"appProxyHook","app"),u.registerLoddingPage(t))}},"app-lets":{beforeCreate:function(){var e=this.$options.mpType;"component"!==e||v?"component"!==e&&(y[e]||("page"===e?(y[e]=s.getEnterPath(this,t),t.enterPath=y[e]):y[e]=!0,l.proxyPageHook(this,t,"appletsProxyHook",e))):c.assertParentChild(y.page,this)&&l.proxyPageHook(this,t,"appletsProxyHook",e)},onLoad:function(){c.voidFun("UNI-SIMPLE-ROUTER"),!v&&c.assertParentChild(y.page,this)&&(v=!0,p.forceGuardEach(t))}}}[r]}t.getMixins=g,t.initMixins=function(e,t){var r=n.createRouteMap(t,t.options.routes);t.routesMap=r,e.mixin(o({},g(0,t)))}},789:function(e,t,r){"use strict";var o=this&&this.__assign||function(){return(o=Object.assign||function(e){for(var t,r=1,o=arguments.length;r<o;r++)for(var n in t=arguments[r])Object.prototype.hasOwnProperty.call(t,n)&&(e[n]=t[n]);return e}).apply(this,arguments)},n=this&&this.__rest||function(e,t){var r={};for(var o in e)Object.prototype.hasOwnProperty.call(e,o)&&t.indexOf(o)<0&&(r[o]=e[o]);if(null!=e&&"function"==typeof Object.getOwnPropertySymbols){var n=0;for(o=Object.getOwnPropertySymbols(e);n<o.length;n++)t.indexOf(o[n])<0&&Object.prototype.propertyIsEnumerable.call(e,o[n])&&(r[o[n]]=e[o[n]])}return r},a=this&&this.__spreadArrays||function(){for(var e=0,t=0,r=arguments.length;t<r;t++)e+=arguments[t].length;var o=Array(e),n=0;for(t=0;t<r;t++)for(var a=arguments[t],i=0,u=a.length;i<u;i++,n++)o[n]=a[i];return o};Object.defineProperty(t,"__esModule",{value:!0}),t.deepDecodeQuery=t.resolveAbsolutePath=t.assertParentChild=t.resetPageHook=t.callHook=t.replaceHook=t.lockDetectWarn=t.deepClone=t.baseClone=t.assertDeepObject=t.paramsToQuery=t.forMatNextToFrom=t.urlToJson=t.getUniCachePage=t.copyData=t.getDataType=t.routesForMapRoute=t.notRouteTo404=t.getWildcardRule=t.assertNewOptions=t.getRoutePath=t.notDeepClearNull=t.mergeConfig=t.timeOut=t.def=t.voidFun=void 0;var i=r(282),u=r(169),l=r(883),p=r(890),c=r(779);function s(e,t){for(var r=Object.create(null),n=Object.keys(e).concat(["resolveQuery","parseQuery"]),i=0;i<n.length;i+=1){var u=n[i];null!=t[u]?t[u].constructor===Object?r[u]=o(o({},e[u]),t[u]):r[u]="routes"===u?a(e[u],t[u]):t[u]:r[u]=e[u]}return r}function f(e,t){var r=e.aliasPath||e.alias||e.path;return"h5"!==t.options.platform&&(r=e.path),{finallyPath:r,aliasPath:e.aliasPath||e.path,path:e.path,alias:e.alias}}function h(e,t){var r=e.routesMap.finallyPathMap["*"];if(r)return r;throw t&&u.ERRORHOOK[0](t,e),new Error("当前路由表匹配规则已全部匹配完成，未找到满足的匹配规则。你可以使用 '*' 通配符捕捉最后的异常")}function v(e){return Object.prototype.toString.call(e)}function y(e,t){if(null==e)t=e;else for(var r=0,o=Object.keys(e);r<o.length;r++){var n=o[r],a=n;e[n]!==e&&("object"==typeof e[n]?(t[a]="[object Array]"===v(e[n])?[]:{},t[a]=y(e[n],t[a])):t[a]=e[n])}return t}function g(e){var t="[object Array]"===v(e)?[]:{};return y(e,t),t}function d(e,t,r){for(var o=[],n=i.proxyVueSortHookName[e],a=0;a<n.length;a++){var u=t[n[a]][0];u&&u.hook&&o.push(u.hook(r))}return o}t.voidFun=function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t]},t.def=function(e,t,r){Object.defineProperty(e,t,{get:function(){return r()}})},t.timeOut=function(e){return new Promise((function(t){setTimeout((function(){t()}),e)}))},t.mergeConfig=s,t.notDeepClearNull=function(e){for(var t in e)null==e[t]&&delete e[t];return e},t.getRoutePath=f,t.assertNewOptions=function(e){var t,r=e.platform,o=e.routes;if(null==r)throw new Error("你在实例化路由时必须传递 'platform'");if(null==o||0===o.length)throw new Error("你在实例化路由时必须传递 routes 为空，这是无意义的。");return"h5"===e.platform&&(null===(t=e.h5)||void 0===t?void 0:t.vueRouterDev)&&(i.baseConfig.routes=[]),s(i.baseConfig,e)},t.getWildcardRule=h,t.notRouteTo404=function(e,t,r,o){if("*"!==t.path)return t;var n=t.redirect;if(void 0===n)throw new Error(" *  通配符必须配合 redirect 使用。redirect: string | Location | Function");var a=n;return"function"==typeof a&&(a=a(r)),p.navjump(a,e,o,void 0,void 0,void 0,!1)},t.routesForMapRoute=function e(t,r,o,n){var a;if(void 0===n&&(n=!1),null===(a=t.options.h5)||void 0===a?void 0:a.vueRouterDev)return{path:r};for(var i=r.split("?")[0],u="",l=t.routesMap,p=0;p<o.length;p++)for(var s=l[o[p]],f=0,y=Object.entries(s);f<y.length;f++){var g=y[f],d=g[0],m=g[1];if("*"!==d){var b=m,O=d;if("[object Array]"===v(s)&&(O=b),null!=c(O).exec(i))return"[object String]"===v(b)?l.finallyPathMap[b]:b}else""===u&&(u="*")}if(n)return{};if(l.aliasPathMap){var P=e(t,r,["aliasPathMap"],!0);if(Object.keys(P).length>0)return P}if(""!==u)return h(t);throw new Error(r+" 路径无法在路由表中找到！检查跳转路径及路由表")},t.getDataType=v,t.copyData=function(e){return JSON.parse(JSON.stringify(e))},t.getUniCachePage=function(e){var t=getCurrentPages();if(null==e)return t;if(0===t.length)return t;var r=t.reverse()[e];return null==r?[]:r},t.urlToJson=function(e){var t={},r=e.split("?"),o=r[0],n=r[1];if(null!=n)for(var a=0,i=n.split("&");a<i.length;a++){var u=i[a].split("=");t[u[0]]=u[1]}return{path:o,query:t}},t.forMatNextToFrom=function(e,t,r){var o=[t,r],n=o[0],a=o[1];if("h5"===e.options.platform){var i=e.options.h5,u=i.vueNext,l=i.vueRouterDev;u||l||(n=p.createRoute(e,void 0,n),a=p.createRoute(e,void 0,a))}else n=p.createRoute(e,void 0,g(n)),a=p.createRoute(e,void 0,g(a));return{matTo:n,matFrom:a}},t.paramsToQuery=function(e,t){var r;if("h5"===e.options.platform&&!(null===(r=e.options.h5)||void 0===r?void 0:r.paramsToQuery))return t;if("[object Object]"===v(t)){var a=t,i=a.name,l=a.params,p=n(a,["name","params"]),c=l;if("h5"!==e.options.platform&&null==c&&(c={}),null!=i&&null!=c){var s=e.routesMap.nameMap[i];null==s&&(s=h(e,{type:2,msg:"命名路由为："+i+" 的路由，无法在路由表中找到！",toRule:t}));var y=f(s,e).finallyPath;if(!y.includes(":"))return o(o({},p),{path:y,query:c});u.ERRORHOOK[0]({type:2,msg:"动态路由："+y+" 无法使用 paramsToQuery！",toRule:t},e)}}return t},t.assertDeepObject=function(e){var t=null;try{t=JSON.stringify(e).match(/\{|\[|\}|\]/g)}catch(e){l.warnLock("传递的参数解析对象失败。"+e)}return null!=t&&t.length>3},t.baseClone=y,t.deepClone=g,t.lockDetectWarn=function(e,t,r,o,n){if("afterHooks"===n)o();else{var a=e.options.detectBeforeLock;a&&a(e,t,r),e.$lockStatus?e.options.routerErrorEach({type:2,msg:"当前页面正在处于跳转状态，请稍后再进行跳转...."},e):o()}},t.replaceHook=function(e,t,r,o){var n=t.$options,a=e[r][o],u={};if("[object Array]"===v(a)&&(u={beforeCreate:[],created:[],beforeMount:[],mounted:[],beforeDestroy:[],destroyed:[]}),null!=a){for(var l=i.proxyVueSortHookName[o],p=function(r){var p=l[r],c=n[p];if("[object Array]"===v(c)){if(1===c.length&&c.toString().includes("UNI-SIMPLE-ROUTER"))return"continue";var s={options:[],hook:Function},f=c.splice(c.length-1,1,(function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];return s.options=e}))[0];s.hook=function(r){return e.enterPath.replace(/^\//,"")!==r.replace(/^\//,"")&&"app"!==o?function(){}:(i.notCallProxyHook.includes(p)||f.apply(t,s.options),function(){c.splice(c.length-1,1,f)})},Object.keys(u).length>0?u[p]=[s]:a[p]=[s]}},c=0;c<l.length;c++)p(c);Object.keys(u).length>0&&a.push(u)}},t.callHook=d,t.resetPageHook=function(e,t){var r=t.trim().match(/^(\/?[^\?\s]+)(\?[\s\S]*$)?$/);if(null==r)throw new Error("还原hook失败。请检查 【"+t+"】 路径是否正确。");t=r[1];var o="appletsProxyHook";"app-plus"===e.options.platform&&(o="appProxyHook");for(var n=[],a=0,i=Object.entries(e[o]);a<i.length;a++){var u=i[a],l=u[0],p=u[1],c=l;if("[object Array]"===v(p))for(var s=0;s<p.length;s++)n=n.concat(d(c,p[s],t));else n=n.concat(d(c,p,t))}setTimeout((function(){for(var e=0;e<n.length;e++)n[e]()}),500)},t.assertParentChild=function(e,t){for(;null!=t.$parent;){var r=t.$parent.$mp;if(r.page&&r.page.is===e)return!0;t=t.$parent}try{if(t.$mp.page.is===e||t.$mp.page.route===e)return!0}catch(e){return!1}return!1},t.resolveAbsolutePath=function(e,t){var r=/^\/?([^\?\s]+)(\?.+)?$/,o=e.trim();if(!r.test(o))throw new Error("【"+e+"】 路径错误，请提供完整的路径(10001)。");var n=o.match(r);if(null==n)throw new Error("【"+e+"】 路径错误，请提供完整的路径(10002)。");var a=n[2]||"";if(/^\.\/[^\.]+/.test(o))return(t.currentRoute.path+e).replace(/[^\/]+\.\//,"");var i=n[1].replace(/\//g,"\\/").replace(/\.\./g,"[^\\/]+").replace(/\./g,"\\."),u=new RegExp("^\\/"+i+"$"),l=t.options.routes.filter((function(e){return u.test(e.path)}));if(1!==l.length)throw new Error("【"+e+"】 路径错误，尝试转成绝对路径失败，请手动转成绝对路径(10003)。");return l[0].path+a},t.deepDecodeQuery=function e(t){for(var r="[object Array]"===v(t)?[]:{},o=Object.keys(t),n=0;n<o.length;n++){var a=o[n],i=t[a];if("string"==typeof i)try{var u=JSON.parse(decodeURIComponent(i));"object"!=typeof u&&(u=i),r[a]=u}catch(e){try{r[a]=decodeURIComponent(i)}catch(e){r[a]=i}}else if("object"==typeof i){var l=e(i);r[a]=l}else r[a]=i}return r}},883:(e,t)=>{"use strict";function r(e,t,r,o){if(void 0===o&&(o=!1),!o){var n="[object Object]"===t.toString();if(!1===t)return!1;if(n&&!1===t[e])return!1}return console[e](r),!0}Object.defineProperty(t,"__esModule",{value:!0}),t.warnLock=t.log=t.warn=t.err=t.isLog=void 0,t.isLog=r,t.err=function(e,t,o){r("error",t.options.debugger,e,o)},t.warn=function(e,t,o){r("warn",t.options.debugger,e,o)},t.log=function(e,t,o){r("log",t.options.debugger,e,o)},t.warnLock=function(e){console.warn(e)}},607:function(e,t,r){"use strict";var o=this&&this.__createBinding||(Object.create?function(e,t,r,o){void 0===o&&(o=r),Object.defineProperty(e,o,{enumerable:!0,get:function(){return t[r]}})}:function(e,t,r,o){void 0===o&&(o=r),e[o]=t[r]}),n=this&&this.__exportStar||function(e,t){for(var r in e)"default"===r||Object.prototype.hasOwnProperty.call(t,r)||o(t,e,r)};Object.defineProperty(t,"__esModule",{value:!0}),t.createRouter=t.RouterMount=t.runtimeQuit=void 0,n(r(366),t),n(r(309),t);var a=r(814);Object.defineProperty(t,"runtimeQuit",{enumerable:!0,get:function(){return a.runtimeQuit}});var i=r(963);Object.defineProperty(t,"RouterMount",{enumerable:!0,get:function(){return i.RouterMount}}),Object.defineProperty(t,"createRouter",{enumerable:!0,get:function(){return i.createRouter}})},366:(e,t)=>{"use strict";var r,o,n;Object.defineProperty(t,"__esModule",{value:!0}),t.rewriteMethodToggle=t.navtypeToggle=t.hookToggle=void 0,(n=t.hookToggle||(t.hookToggle={})).beforeHooks="beforeEach",n.afterHooks="afterEach",n.enterHooks="beforeEnter",(o=t.navtypeToggle||(t.navtypeToggle={})).push="navigateTo",o.replace="redirectTo",o.replaceAll="reLaunch",o.pushTab="switchTab",o.back="navigateBack",(r=t.rewriteMethodToggle||(t.rewriteMethodToggle={})).navigateTo="push",r.navigate="push",r.redirectTo="replace",r.reLaunch="replaceAll",r.switchTab="pushTab",r.navigateBack="back"},309:(e,t)=>{"use strict";Object.defineProperty(t,"__esModule",{value:!0})},169:function(e,t,r){"use strict";var o=this&&this.__rest||function(e,t){var r={};for(var o in e)Object.prototype.hasOwnProperty.call(e,o)&&t.indexOf(o)<0&&(r[o]=e[o]);if(null!=e&&"function"==typeof Object.getOwnPropertySymbols){var n=0;for(o=Object.getOwnPropertySymbols(e);n<o.length;n++)t.indexOf(o[n])<0&&Object.prototype.propertyIsEnumerable.call(e,o[n])&&(r[o[n]]=e[o[n]])}return r};Object.defineProperty(t,"__esModule",{value:!0}),t.loopCallHook=t.transitionTo=t.onTriggerEachHook=t.callHook=t.callBeforeRouteLeave=t.HOOKLIST=t.ERRORHOOK=void 0;var n=r(789),a=r(890),i=r(147),u=r(814);function l(e,t,r,o){var a,i=n.getUniCachePage(0);if(Object.keys(i).length>0){var u=void 0;switch("h5"===e.options.platform?u=i.$options.beforeRouteLeave:null!=i.$vm&&(u=i.$vm.$options.beforeRouteLeave),n.getDataType(u)){case"[object Array]":a=(a=u[0]).bind(i);break;case"[object Function]":a=u.bind(i.$vm)}}return p(a,t,r,e,o)}function p(e,t,r,o,n,a){void 0===a&&(a=!0),null!=e&&e instanceof Function?!0===a?e(t,r,n,o,!1):(e(t,r,(function(){}),o,!1),n()):n()}function c(e,t,r,o,a,i){var u=n.forMatNextToFrom(e,t,r),l=u.matTo,p=u.matFrom;"h5"===e.options.platform?s(a,0,i,e,l,p,o):s(a.slice(0,4),0,(function(){i((function(){s(a.slice(4),0,n.voidFun,e,l,p,o)}))}),e,l,p,o)}function s(e,r,i,l,p,c,f){var h=n.routesForMapRoute(l,p.path,["finallyPathMap","pathMap"]);if(e.length-1<r)return i();var v=e[r],y=t.ERRORHOOK[0];v(l,p,c,h,(function(t){if("app-plus"===l.options.platform&&(!1!==t&&"string"!=typeof t&&"object"!=typeof t||u.tabIndexSelect(p,c)),!1===t)"h5"===l.options.platform&&i(!1),y({type:0,msg:"管道函数传递 false 导航被终止!",matTo:p,matFrom:c,nextTo:t},l);else if("string"==typeof t||"object"==typeof t){var n=f,h=t;if("object"==typeof t){var v=t.NAVTYPE;h=o(t,["NAVTYPE"]),null!=v&&(n=v)}a.navjump(h,l,n,{from:c,next:i})}else null==t?(r++,s(e,r,i,l,p,c,f)):y({type:1,msg:"管道函数传递未知类型，无法被识别。导航被终止！",matTo:p,matFrom:c,nextTo:t},l)}))}t.ERRORHOOK=[function(e,t){return t.lifeCycle.routerErrorHooks[0](e,t)}],t.HOOKLIST=[function(e,t,r,o,n){return p(e.lifeCycle.routerBeforeHooks[0],t,r,e,n)},function(e,t,r,o,n){return l(e,t,r,n)},function(e,t,r,o,n){return p(e.lifeCycle.beforeHooks[0],t,r,e,n)},function(e,t,r,o,n){return p(o.beforeEnter,t,r,e,n)},function(e,t,r,o,n){return p(e.lifeCycle.afterHooks[0],t,r,e,n,!1)},function(e,t,r,o,n){return e.$lockStatus=!1,"h5"===e.options.platform&&i.proxyH5Mount(e),p(e.lifeCycle.routerAfterHooks[0],t,r,e,n,!1)}],t.callBeforeRouteLeave=l,t.callHook=p,t.onTriggerEachHook=function(e,r,o,n,a){var i=[];switch(n){case"beforeEach":i=t.HOOKLIST.slice(0,3);break;case"afterEach":i=t.HOOKLIST.slice(4);break;case"beforeEnter":i=t.HOOKLIST.slice(3,4)}c(o,e,r,"push",i,a)},t.transitionTo=c,t.loopCallHook=s},890:function(e,t,r){"use strict";var o=this&&this.__assign||function(){return(o=Object.assign||function(e){for(var t,r=1,o=arguments.length;r<o;r++)for(var n in t=arguments[r])Object.prototype.hasOwnProperty.call(t,n)&&(e[n]=t[n]);return e}).apply(this,arguments)};Object.defineProperty(t,"__esModule",{value:!0}),t.createRoute=t.forceGuardEach=t.backOptionsBuild=t.navjump=t.lockNavjump=void 0;var n=r(366),a=r(99),i=r(789),u=r(169),l=r(845),p=r(169);function c(e,t,r,o,n){i.lockDetectWarn(t,e,r,(function(){"h5"!==t.options.platform&&(t.$lockStatus=!0),s(e,t,r,void 0,o,n)}))}function s(e,t,r,c,s,h,v){if(void 0===v&&(v=!0),"back"===r){var y;if(y="string"==typeof e?+e:e.delta||1,"h5"===t.options.platform){t.$route.go(-y);var g=(h||{success:i.voidFun}).success||i.voidFun,d=(h||{complete:i.voidFun}).complete||i.voidFun;return g({errMsg:"navigateBack:ok"}),void d({errMsg:"navigateBack:ok"})}e=f(t,y,h)}var m=a.queryPageToMap(e,t).rule;m.type=n.navtypeToggle[r];var b=i.paramsToQuery(t,m),O=a.resolveQuery(b,t);if("h5"===t.options.platform)if("push"!==r&&(r="replace"),null!=c)c.next(o({replace:"push"!==r},O));else if("push"===r&&Reflect.has(O,"events")){if(Reflect.has(O,"name"))throw new Error("在h5端上使用 'push'、'navigateTo' 跳转时，如果包含 events 不允许使用 name 跳转，因为 name 实现了动态路由。请更换为 path 或者 url 跳转！");uni.navigateTo(O,!0,i.voidFun,s)}else t.$route[r](O,O.success||i.voidFun,O.fail||i.voidFun);else{var P={path:""};if(null==c){var k=i.routesForMapRoute(t,O.path,["finallyPathMap","pathMap"]);k=i.notRouteTo404(t,k,O,r),O=o(o(o(o({},k),{params:{}}),O),{path:k.path}),P=l.createToFrom(O,t)}else P=c.from;if(l.createFullPath(O,P),!1===v)return O;u.transitionTo(t,O,P,r,p.HOOKLIST,(function(e){uni[n.navtypeToggle[r]](O,!0,e,s)}))}}function f(e,t,r){var n=h(e,t),a=o(o({},r||{}),{path:n.path,query:n.query,delta:t});if("[object Object]"===i.getDataType(r)){var u=r,l=u.animationDuration,p=u.animationType;null!=l&&(a.animationDuration=l),null!=p&&(a.animationType=p);var c=r.from;null!=c&&(a.BACKTYPE=c)}return a}function h(e,t,r){void 0===t&&(t=0);var u={name:"",meta:{},path:"",fullPath:"",NAVTYPE:"",query:{},params:{},BACKTYPE:(r||{BACKTYPE:""}).BACKTYPE||""};if(19970806===t)return u;if("h5"===e.options.platform){var l={path:""};l=null!=r?r:e.$route.currentRoute;var p=i.copyData(l.params);delete p.__id__;var c=a.parseQuery(o(o({},p),i.copyData(l.query)),e);l=o(o({},l),{query:c}),u.path=l.path,u.fullPath=l.fullPath||"",u.query=i.deepDecodeQuery(l.query||{}),u.NAVTYPE=n.rewriteMethodToggle[l.type||"reLaunch"]}else{var s={};if(null!=r)s=o(o({},r),{openType:r.type});else{var f=i.getUniCachePage(t);if(0===Object.keys(f).length)throw e.options.routerErrorEach({type:3,msg:"不存在的页面栈，请确保有足够的页面可用，当前 level:"+t},e),new Error("不存在的页面栈，请确保有足够的页面可用，当前 level:"+t);var h=f.options||{};s=o(o({},f.$page||{}),{query:i.deepDecodeQuery(h),fullPath:decodeURIComponent((f.$page||{}).fullPath||"/"+f.route)}),"app-plus"!==e.options.platform&&(s.path="/"+f.route)}var v=s.openType;u.query=s.query,u.path=s.path,u.fullPath=s.fullPath,u.NAVTYPE=n.rewriteMethodToggle[v||"reLaunch"]}var y=i.routesForMapRoute(e,u.path,["finallyPathMap","pathMap"]),g=o(o({},u),y);return g.query=a.parseQuery(g.query,e),g}t.lockNavjump=c,t.navjump=s,t.backOptionsBuild=f,t.forceGuardEach=function(e,t,r){if(void 0===t&&(t="replaceAll"),void 0===r&&(r=!1),"h5"===e.options.platform)throw new Error("在h5端上使用：forceGuardEach 是无意义的，目前 forceGuardEach 仅支持在非h5端上使用");var o=i.getUniCachePage(0);0===Object.keys(o).length&&e.options.routerErrorEach({type:3,msg:"不存在的页面栈，请确保有足够的页面可用，当前 level:0"},e);var n=o,a=n.route,u=n.options;c({path:"/"+a,query:i.deepDecodeQuery(u||{})},e,t,r)},t.createRoute=h},845:(e,t,r)=>{"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.proxyPageHook=t.createFullPath=t.createToFrom=void 0;var o=r(789),n=r(890),a=r(99);t.createToFrom=function(e,t){var r=o.getUniCachePage(0);return"[object Array]"===o.getDataType(r)?o.deepClone(e):n.createRoute(t)},t.createFullPath=function(e,t){if(null==e.fullPath){var r=a.stringifyQuery(e.query);e.fullPath=e.path+r}null==t.fullPath&&(r=a.stringifyQuery(t.query),t.fullPath=t.path+r)},t.proxyPageHook=function(e,t,r,n){o.replaceHook(t,e,r,n)}},99:function(e,t,r){"use strict";var o=this&&this.__assign||function(){return(o=Object.assign||function(e){for(var t,r=1,o=arguments.length;r<o;r++)for(var n in t=arguments[r])Object.prototype.hasOwnProperty.call(t,n)&&(e[n]=t[n]);return e}).apply(this,arguments)};Object.defineProperty(t,"__esModule",{value:!0}),t.stringifyQuery=t.parseQuery=t.resolveQuery=t.queryPageToMap=void 0;var n=r(789),a=r(169),i=r(883),u=/[!'()*]/g,l=function(e){return"%"+e.charCodeAt(0).toString(16)},p=/%2C/g,c=function(e){return encodeURIComponent(e).replace(u,l).replace(p,",")};t.queryPageToMap=function(e,t){var r={},i="",u=e.success,l=e.fail;if("[object Object]"===n.getDataType(e)){var p=e;if(null!=p.path){var c=n.urlToJson(p.path),s=c.path,f=c.query;i=n.routesForMapRoute(t,s,["finallyPathList","pathMap"]),r=o(o({},f),e.query||{}),p.path=s,p.query=r,delete e.params}else null!=p.name?null==(i=t.routesMap.nameMap[p.name])?i=n.getWildcardRule(t,{type:2,msg:"命名路由为："+p.name+" 的路由，无法在路由表中找到！",toRule:e}):(r=e.params||{},delete e.query):i=n.getWildcardRule(t,{type:2,msg:e+" 解析失败，请检测当前路由表下是否有包含。",toRule:e})}else e=n.urlToJson(e),i=n.routesForMapRoute(t,e.path,["finallyPathList","pathMap"]),r=e.query;if("h5"===t.options.platform){n.getRoutePath(i,t).finallyPath.includes(":")&&null==e.name&&a.ERRORHOOK[0]({type:2,msg:"当有设置 alias或者aliasPath 为动态路由时，不允许使用 path 跳转。请使用 name 跳转！",route:i},t);var h=e.complete,v=e.success,y=e.fail;if("[object Function]"===n.getDataType(h)){var g=function(e,t){"[object Function]"===n.getDataType(t)&&t.apply(this,e),h.apply(this,e)};u=function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];g.call(this,e,v)},l=function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];g.call(this,e,y)}}}var d=e;return"[object Function]"===n.getDataType(d.success)&&(d.success=u),"[object Function]"===n.getDataType(d.fail)&&(d.fail=l),{rule:d,route:i,query:r}},t.resolveQuery=function(e,t){var r="query";null!=e.params&&(r="params"),null!=e.query&&(r="query");var o=n.copyData(e[r]||{}),a=t.options.resolveQuery;if(a){var u=a(o);"[object Object]"!==n.getDataType(u)?i.warn("请按格式返回参数： resolveQuery?:(jsonQuery:{[propName: string]: any;})=>{[propName: string]: any;}",t):e[r]=u}else{if(!n.assertDeepObject(o))return e;var l=JSON.stringify(o);e[r]={query:l}}return e},t.parseQuery=function(e,t){var r=t.options.parseQuery;if(r)e=r(n.copyData(e)),"[object Object]"!==n.getDataType(e)&&i.warn("请按格式返回参数： parseQuery?:(jsonQuery:{[propName: string]: any;})=>{[propName: string]: any;}",t);else if(Reflect.get(e,"query")){var o=Reflect.get(e,"query");if("string"==typeof o)try{o=JSON.parse(o)}catch(e){i.warn("尝试解析深度对象失败，按原样输出。"+e,t)}if("object"==typeof o)return n.deepDecodeQuery(o)}return e},t.stringifyQuery=function(e){var t=e?Object.keys(e).map((function(t){var r=e[t];if(void 0===r)return"";if(null===r)return c(t);if(Array.isArray(r)){var o=[];return r.forEach((function(e){void 0!==e&&(null===e?o.push(c(t)):o.push(c(t)+"="+c(e)))})),o.join("&")}return c(t)+"="+c(r)})).filter((function(e){return e.length>0})).join("&"):null;return t?"?"+t:""}},314:(e,t,r)=>{"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.rewriteMethod=void 0;var o=r(366),n=r(789),a=r(883),i=r(809),u=["navigateTo","redirectTo","reLaunch","switchTab","navigateBack"];t.rewriteMethod=function(e){!1===e.options.keepUniOriginNav&&u.forEach((function(t){var r=uni[t];uni[t]=function(u,l,p,c){void 0===l&&(l=!1),l?i.uniOriginJump(e,r,t,u,p,c):("app-plus"===e.options.platform&&0===Object.keys(e.appMain).length&&(e.appMain={NAVTYPE:t,path:u.url}),function(e,t,r){if("app-plus"===r.options.platform){var i=null;e&&(i=e.openType),null!=i&&"appLaunch"===i&&(t="reLaunch")}if("reLaunch"===t&&'{"url":"/"}'===JSON.stringify(e)&&(a.warn("uni-app 原生方法：reLaunch({url:'/'}) 默认被重写啦！你可以使用 this.$Router.replaceAll() 或者 uni.reLaunch({url:'/?xxx=xxx'})",r,!0),t="navigateBack",e={from:"backbutton"}),"navigateBack"===t){var u=1;null==e&&(e={delta:1}),"[object Number]"===n.getDataType(e.delta)&&(u=e.delta),r.back(u,e)}else{var l=o.rewriteMethodToggle[t],p=e.url;if(!p.startsWith("/")){var c=n.resolveAbsolutePath(p,r);p=c,e.url=c}if("switchTab"===t){var s=n.routesForMapRoute(r,p,["pathMap","finallyPathList"]),f=n.getRoutePath(s,r).finallyPath;if("[object Array]"===n.getDataType(f)&&a.warn("uni-app 原生方法跳转路径为："+p+"。此路为是tab页面时，不允许设置 alias 为数组的情况，并且不能为动态路由！当然你可以通过通配符*解决！",r,!0),"*"===f&&a.warn("uni-app 原生方法跳转路径为："+p+"。在路由表中找不到相关路由表！当然你可以通过通配符*解决！",r,!0),"h5"===r.options.platform){var h=e.success;e.success=function(){for(var t=[],r=0;r<arguments.length;r++)t[r]=arguments[r];null==h||h.apply(null,t),n.timeOut(150).then((function(){var t=e.detail||{};if(Object.keys(t).length>0&&Reflect.has(t,"index")){var r=n.getUniCachePage(0);if(0===Object.keys(r).length)return!1;var o=r,a=o.$options.onTabItemTap;if(a)for(var i=0;i<a.length;i++)a[i].call(o,t)}}))}}p=f}var v=e,y=v.events,g=v.success,d=v.fail,m=v.complete,b=v.animationType,O={path:p,events:y,success:g,fail:d,complete:m,animationDuration:v.animationDuration,animationType:b};r[l](n.notDeepClearNull(O))}}(u,t,e))}}))}},963:function(e,t,r){"use strict";var o=this&&this.__assign||function(){return(o=Object.assign||function(e){for(var t,r=1,o=arguments.length;r<o;r++)for(var n in t=arguments[r])Object.prototype.hasOwnProperty.call(t,n)&&(e[n]=t[n]);return e}).apply(this,arguments)};Object.defineProperty(t,"__esModule",{value:!0}),t.createRouter=t.RouterMount=void 0;var n=r(282),a=r(789),i=r(662),u=r(460),l=r(890),p=r(314),c=function(){},s=new Promise((function(e){return c=e}));t.createRouter=function(e){var t=a.assertNewOptions(e),r={options:t,mount:[],Vue:null,appProxyHook:n.appProxyHook,appletsProxyHook:n.indexProxyHook,appMain:{},enterPath:"",$route:null,$lockStatus:!1,routesMap:{},lifeCycle:i.registerRouterHooks(n.lifeCycle,t),push:function(e){l.lockNavjump(e,r,"push")},replace:function(e){l.lockNavjump(e,r,"replace")},replaceAll:function(e){l.lockNavjump(e,r,"replaceAll")},pushTab:function(e){l.lockNavjump(e,r,"pushTab")},back:function(e,t){void 0===e&&(e=1),"[object Object]"!==a.getDataType(t)?t={from:"navigateBack"}:Reflect.has(t,"from")||(t=o(o({},t),{from:"navigateBack"})),l.lockNavjump(e+"",r,"back",void 0,t)},forceGuardEach:function(e,t){l.forceGuardEach(r,e,t)},beforeEach:function(e){i.registerEachHooks(r,"beforeHooks",e)},afterEach:function(e){i.registerEachHooks(r,"afterHooks",e)},install:function(e){r.Vue=e,p.rewriteMethod(this),u.initMixins(e,this),Object.defineProperty(e.prototype,"$Router",{get:function(){var e=r;return Object.defineProperty(this,"$Router",{value:e,writable:!1,configurable:!1,enumerable:!1}),Object.seal(e)}}),Object.defineProperty(e.prototype,"$Route",{get:function(){return l.createRoute(r)}}),Object.defineProperty(e.prototype,"$AppReady",{get:function(){return"h5"===r.options.platform?Promise.resolve():s},set:function(e){!0===e&&c()}})}};return a.def(r,"currentRoute",(function(){return l.createRoute(r)})),r.beforeEach((function(e,t,r){return r()})),r.afterEach((function(){})),r},t.RouterMount=function(e,t,r){if(void 0===r&&(r="#app"),"[object Array]"!==a.getDataType(t.mount))throw new Error("挂载路由失败，router.app 应该为数组类型。当前类型："+typeof t.mount);if(t.mount.push({app:e,el:r}),"h5"===t.options.platform){var o=t.$route;o.replace({path:o.currentRoute.fullPath})}}},809:function(e,t,r){"use strict";var o=this&&this.__assign||function(){return(o=Object.assign||function(e){for(var t,r=1,o=arguments.length;r<o;r++)for(var n in t=arguments[r])Object.prototype.hasOwnProperty.call(t,n)&&(e[n]=t[n]);return e}).apply(this,arguments)},n=this&&this.__awaiter||function(e,t,r,o){return new(r||(r=Promise))((function(n,a){function i(e){try{l(o.next(e))}catch(e){a(e)}}function u(e){try{l(o.throw(e))}catch(e){a(e)}}function l(e){var t;e.done?n(e.value):(t=e.value,t instanceof r?t:new r((function(e){e(t)}))).then(i,u)}l((o=o.apply(e,t||[])).next())}))},a=this&&this.__generator||function(e,t){var r,o,n,a,i={label:0,sent:function(){if(1&n[0])throw n[1];return n[1]},trys:[],ops:[]};return a={next:u(0),throw:u(1),return:u(2)},"function"==typeof Symbol&&(a[Symbol.iterator]=function(){return this}),a;function u(a){return function(u){return function(a){if(r)throw new TypeError("Generator is already executing.");for(;i;)try{if(r=1,o&&(n=2&a[0]?o.return:a[0]?o.throw||((n=o.return)&&n.call(o),0):o.next)&&!(n=n.call(o,a[1])).done)return n;switch(o=0,n&&(a=[2&a[0],n.value]),a[0]){case 0:case 1:n=a;break;case 4:return i.label++,{value:a[1],done:!1};case 5:i.label++,o=a[1],a=[0];continue;case 7:a=i.ops.pop(),i.trys.pop();continue;default:if(!((n=(n=i.trys).length>0&&n[n.length-1])||6!==a[0]&&2!==a[0])){i=0;continue}if(3===a[0]&&(!n||a[1]>n[0]&&a[1]<n[3])){i.label=a[1];break}if(6===a[0]&&i.label<n[1]){i.label=n[1],n=a;break}if(n&&i.label<n[2]){i.label=n[2],i.ops.push(a);break}n[2]&&i.ops.pop(),i.trys.pop();continue}a=t.call(e,i)}catch(e){a=[6,e],o=0}finally{r=n=0}if(5&a[0])throw a[1];return{value:a[0]?a[1]:void 0,done:!0}}([a,u])}}},i=this&&this.__rest||function(e,t){var r={};for(var o in e)Object.prototype.hasOwnProperty.call(e,o)&&t.indexOf(o)<0&&(r[o]=e[o]);if(null!=e&&"function"==typeof Object.getOwnPropertySymbols){var n=0;for(o=Object.getOwnPropertySymbols(e);n<o.length;n++)t.indexOf(o[n])<0&&Object.prototype.propertyIsEnumerable.call(e,o[n])&&(r[o[n]]=e[o[n]])}return r};Object.defineProperty(t,"__esModule",{value:!0}),t.formatOriginURLQuery=t.uniOriginJump=void 0;var u=r(99),l=r(789),p=r(282),c=0,s="reLaunch";function f(e,t,r){var n,a=t.url,i=t.path,p=t.query,c=t.animationType,s=t.animationDuration,f=t.events,h=t.success,v=t.fail,y=t.complete,g=t.delta,d=t.animation,m=u.stringifyQuery(p||{}),b=""===m?i||a:(i||a)+m,O={};return"app-plus"===e.options.platform&&"navigateBack"!==r&&(O=(null===(n=e.options.APP)||void 0===n?void 0:n.animation)||{},O=o(o({},O),d||{})),l.notDeepClearNull({delta:g,url:b,animationType:c||O.animationType,animationDuration:s||O.animationDuration,events:f,success:h,fail:v,complete:y})}t.uniOriginJump=function(e,t,r,u,h,v){var y=f(e,u,r),g=y.complete,d=i(y,["complete"]),m=e.options.platform.trim();0===c&&"h5"!==m&&l.resetPageHook(e,d.url),null!=v&&!1===v?(0===c&&(c++,"h5"!==m&&(e.Vue.prototype.$AppReady=!0)),g&&g.apply(null,{msg:"forceGuardEach强制触发并且不执行跳转"}),h&&h.apply(null,{msg:"forceGuardEach强制触发并且不执行跳转"})):t(o(o({},d),{from:u.BACKTYPE,complete:function(){for(var t,o,i,u,f=[],v=0;v<arguments.length;v++)f[v]=arguments[v];return n(this,void 0,void 0,(function(){var n,v,y;return a(this,(function(a){switch(a.label){case 0:return 0===c&&(c++,"h5"!==m&&(e.Vue.prototype.$AppReady=!0),"app-plus"===m&&((n=plus.nativeObj.View.getViewById("router-loadding"))&&n.close(),(v=null===(t=e.options.APP)||void 0===t?void 0:t.launchedHook)&&v())),y=0,new RegExp(p.mpPlatformReg,"g").test(m)?y=null===(o=e.options.applet)||void 0===o?void 0:o.animationDuration:"app-plus"===m&&"navigateBack"===r&&"navigateTo"===s&&(y=null===(u=null===(i=e.options.APP)||void 0===i?void 0:i.animation)||void 0===u?void 0:u.animationDuration),"navigateTo"!==r&&"navigateBack"!==r||0===y?[3,2]:[4,l.timeOut(y)];case 1:a.sent(),a.label=2;case 2:return s=r,g&&g.apply(null,f),h&&h.apply(null,f),[2]}}))}))}}))},t.formatOriginURLQuery=f}},t={},function r(o){if(t[o])return t[o].exports;var n=t[o]={exports:{}};return e[o].call(n.exports,n,n.exports,r),n.exports}(607);var e,t}));
\ No newline at end of file
diff --git a/shopro/share/index.js b/shopro/share/index.js
index dd27391f..f2a20a9a 100644
--- a/shopro/share/index.js
+++ b/shopro/share/index.js
@@ -30,8 +30,8 @@ export default {
 			copyLink: '', 	// 复制链接
 			query: ''		// 分享参数
 		}
-		let shareConfig = store.state.shopro.config.share;
-		let shopConfig = store.state.shopro.config.shop;
+		let shareConfig = store.getters.initShare;
+		let shopConfig = store.getters.initShop;
 		if (shopConfig?.domain === '' || shareConfig.title === '' || shareConfig.image === '') {
 			throw '请在商城配置中设置商城域名和分享信息'
 		}
@@ -47,16 +47,16 @@ export default {
 		shareInfo.path = `/pages/index/index?${query}`;
 		// #endif
 		// #ifndef MP
-		shareInfo.path = `${store.state.shopro.config.shop?.domain}?${query}`;
+		shareInfo.path = `${store.getters.initShop?.domain}?${query}`;
 		// #endif
-		shareInfo.copyLink = `${store.state.shopro.config.shop?.domain}?${query}`;
+		shareInfo.copyLink = `${store.getters.initShop?.domain}?${query}`;
 		shareInfo.query = query;
 		// #ifdef H5
 		if($platform.get() === 'wxOfficialAccount') {
 			wxsdk.share(shareInfo);
 		}
 		// #endif
-
+		store.commit("shareInfo", shareInfo);
 		return shareInfo;
 	},
 
@@ -64,8 +64,8 @@ export default {
 	setShareQuery(params) {
 		let shareUserId = '0'; // 设置分享者用户ID
 		if (params.shareId === undefined) {
-			if (store.state.user.isLogin) {
-				shareUserId = store.state.user.userInfo.id;
+			if (store.getters.isLogin) {
+				shareUserId = store.getters.userInfo.id;
 			}
 		}
 		let page = '1'; // 页面类型: 1=首页(默认),2=商品,3=拼团...按需扩展
diff --git a/shopro/store/modules/cart.js b/shopro/store/modules/cart.js
index 8b31799a..58e2b3a2 100644
--- a/shopro/store/modules/cart.js
+++ b/shopro/store/modules/cart.js
@@ -1,106 +1,85 @@
 // 购物车模块
 import http from '@/shopro/request/index'
-import store from '@/shopro/store/index.js'
-import {
-	CART_LIST,
-	CART_NUM
-} from '../types.js'
+
 const state = {
-	cartList: uni.getStorageSync('cartList') ? uni.getStorageSync('cartList') : [],
+	cartList: [], //购物车列表
 	checkCart: {}, //检测是否是购物车数据的对象
-	allSelected: false,
-	cartNum: uni.getStorageSync('cartNum') ? uni.getStorageSync('cartNum') : 0, //购物车,涉及到刷新数据丢失，所以存了本地,
+	allSelected: false, // 全选检测
+	cartNum: 0, //购物车,涉及到刷新数据丢失，所以存了本地,
 }
 
-const actions = {
-	// 购物车数据（查）
-	getCartList({
-		commit,
-		state
-	}) {
-		return new Promise((resolve, reject) => {
-			http('cart.index').then(res => {
-				if (res.code === 1) {
-					let cartData = res.data;
-					cartData.length && cartData.map(item => {
-						item.checked = true;
-					})
-					uni.setStorageSync('cartNum', cartData.length);
-					commit('CART_LIST', cartData);
-					commit('checkCartList');
-					commit('getCheckCart')
-					commit('CART_NUM');
-				}
 
-			}).catch(e => {
-				reject(e)
-			})
+const getters = {
+	cartList: state => state.cartList,
+	checkCart: state => state.checkCart,
+	allSelected: state => state.allSelected,
+	cartNum: state => state.cartNum,
+	// 购物车数量和总价
+	totalCount: state => {
+		let totalNum = 0;
+		let totalPrice = 0;
+		state.cartList.filter(item => {
+			if (item.checked) {
+				totalNum += 1;
+				totalPrice += item.goods_num * (item.sku_price ? item.sku_price.price : 0);
+			}
 		})
+		return {
+			totalNum,
+			totalPrice
+		}
 	},
-	// 添加到购物车（增）
-	addCartGoods({
-		commit,
-		dispatch,
-	}, data) {
-		return new Promise((resolve, reject) => {
-			http('cart.add', {
-				goods_list: data.list,
-				from: data.from
-			}).then(res => {
-				if (res.code === 1) {
-					dispatch('getCartList');
-				}
-				resolve(res)
-			}).catch(e => {
-				reject(e)
-			})
+
+	// 是否选择了商品
+	isSel: state => {
+		let isSel = false;
+		state.cartList.map(item => {
+			if (item.checked) {
+				isSel = true
+			}
 		})
+		return isSel
 	},
-	// 修改购物车商品数量（改）|| 删除购物车商品（删）
-	changeCartList({
-		commit,
-		state,
-		dispatch
-	}, param) {
-		return new Promise((resolve, reject) => {
-			http('cart.edit', {
-				cart_list: param.ids,
-				value: param.goodsNum || null,
-				act: param.art
-			}).then(res => {
-				if (param.art === 'delete' && res.code === 1) {
-					dispatch('getCartList');
+
+	// 活动商品唯一选中可以结算
+	isActivityPay() {
+		let num = 0
+		let activityNum = 0
+		state.cartList.map(item => {
+			if (item.checked) {
+				num += 1
+				if (item.cart_type === 'activity') {
+					activityNum += 1
 				}
-				resolve(res)
-				commit('checkCartList');
-			}).catch(e => {
-				reject(e)
-			})
+			}
 		})
-	},
+		if ((num === 1 && activityNum === 1) || activityNum === 0) {
+			return true
+		}
+		return false
+	}
+
 }
 
+
 const mutations = {
 	// cart数据获取变动。
-	[CART_LIST](state, data) {
-		uni.setStorageSync('cartList', data)
-		state.cartList = data
-	},
-	// cart数量角标更新。
-	[CART_NUM](state, data) {
-		let cartNum = uni.getStorageSync('cartNum') ? uni.getStorageSync('cartNum') : 0;
-		if (Number(cartNum)) {
+	CART_LIST(state, payload) {
+		state.cartList = payload;
+		let cartListNumber = payload.length;
+		if (Number(cartListNumber)) {
 			uni.setTabBarBadge({
 				index: 2,
-				text: String(cartNum)
+				text: String(cartListNumber)
 			})
 		} else {
 			uni.removeTabBarBadge({
 				index: 2
 			})
 		}
-		state.cartNum = cartNum
+		state.cartNum = cartListNumber;
 	},
+
 	// 切换全选。
 	changeAllSellect(state) {
 		state.allSelected = !state.allSelected;
@@ -134,52 +113,65 @@ const mutations = {
 	},
 }
 
-const getters = {
-	// 购物车数量和总价
-	totalCount: state => {
-		let totalNum = 0;
-		let totalPrice = 0;
-		state.cartList.filter(item => {
-			if (item.checked) {
-				totalNum += 1;
-				totalPrice += item.goods_num * (item.sku_price ? item.sku_price.price : 0);
-			}
+const actions = {
+	// 购物车数据（查）
+	getCartList({
+		commit
+	}) {
+		return new Promise((resolve, reject) => {
+			http('cart.index').then(res => {
+				if (res.code === 1) {
+					let cartData = res.data;
+					cartData.length && cartData.map(item => {
+						item.checked = true;
+					})
+					commit('CART_LIST', cartData);
+					commit('checkCartList');
+					commit('getCheckCart')
+				}
+
+			}).catch(e => {
+				reject(e)
+			})
 		})
-		return {
-			totalNum,
-			totalPrice
-		}
 	},
-
-	// 是否选择了商品
-	isSel: state => {
-		let isSel = false;
-		state.cartList.map(item => {
-			if (item.checked) {
-				isSel = true
-			}
+	// 添加到购物车（增）
+	addCartGoods({
+		dispatch
+	}, data) {
+		return new Promise((resolve, reject) => {
+			http('cart.add', {
+				goods_list: data.list,
+				from: data.from
+			}).then(res => {
+				res.code === 1 && dispatch('getCartList');
+				resolve(res)
+			}).catch(e => {
+				reject(e)
+			})
 		})
-		return isSel
 	},
-
-	// 活动商品唯一选中可以结算
-	isActivityPay() {
-		let num = 0
-		let activityNum = 0
-		state.cartList.map(item => {
-			if (item.checked) {
-				num += 1
-				if (item.cart_type === 'activity') {
-					activityNum += 1
+	// 修改购物车商品数量（改）|| 删除购物车商品（删）
+	changeCartList({
+		commit,
+		dispatch
+	}, param) {
+		return new Promise((resolve, reject) => {
+			http('cart.edit', {
+				cart_list: param.ids,
+				value: param.goodsNum || null,
+				act: param.art
+			}).then(res => {
+				if (param.art === 'delete' && res.code === 1) {
+					dispatch('getCartList');
 				}
-			}
+				commit('checkCartList');
+				resolve(res)
+			}).catch(e => {
+				reject(e)
+			})
 		})
-		if ((num === 1 && activityNum === 1) || activityNum === 0) {
-			return true
-		}
-		return false
-	}
-
+	},
 }
 
 export default {
diff --git a/shopro/store/modules/shopro.js b/shopro/store/modules/shopro.js
index 9b9f57db..e0035d24 100644
--- a/shopro/store/modules/shopro.js
+++ b/shopro/store/modules/shopro.js
@@ -1,139 +1,134 @@
-// 初始化数据模块
 import http from '@/shopro/request/index'
-import store from '@/shopro/store'
-import {
-	router
-} from '@/shopro/router';
 import share from '@/shopro/share';
-import {
-	CONFIG,
-	TEMPLATE,
-	SHARE_INFO,
-	PAGE_ROUTES,
-} from '../types.js'
+
 const state = {
-	config: uni.getStorageSync('config') ? uni.getStorageSync('config') : {},
-	routes: [],
-	template: uni.getStorageSync('template') ? uni.getStorageSync('template') : {},
+	shop: {}, // 商城信息
+	wechat: {}, // 微信配置
+	share: {}, // 分享配置
+	payment: {}, // 支付配置
+	addons: [], // 插件配置
+	chat: {}, // 客服配置
+	store: {}, // 商城信息
+	tabbarData: [], //自定义底部导航数据
+
+	homeTemplate: [], // 首页模板数据
+	userTemplate: [], // 个人中心模板数据
+	floatData: {}, // 悬浮按钮数据
+	popupData: {}, // 弹窗数据
 	hasTemplate: true, //是否有模板数据
-	shareInfo: {},
+	shareInfo: {} // 默认分享数据
 }
+const getters = {
+	initShop: state => state.shop,
+	initStore: state => state.store,
+	initShare: state => state.share,
+	initPayment: state => state.payment,
+	initAddons: state => state.addons,
+	initChat: state => state.chat,
+	initWechat: state => state.wechat,
 
-const actions = {
+	hasTemplate: state => state.hasTemplate,
+	homeTemplate: state => state.homeTemplate,
+	userTemplate: state => state.userTemplate,
+	floatData: state => state.floatData,
+	popupData: state => state.popupData,
+	tabbarData: state => state.tabbarData,
 
-	appInit({
-		commit
-	}, options) {
-		return new Promise((resolve, reject) => {
-			http('common.init').then(res => {
-				if (res.code === 1) {
-					commit('CONFIG', res.data);
-					if (!options?.query?.token) {
-						store.dispatch('autoLogin');
-						store.dispatch('getTemplate', options);
-						store.dispatch('getShareInfo');
-					}
+	shareInfo: state => state.shareInfo
+}
 
-				}
-				resolve(res.data)
-			}).catch(e => {
-				reject(e)
-			})
-		})
+
+const actions = {
+	// 初始化数据
+	async appInit({
+		commit,
+		dispatch
+	}, options) {
+		const result = await http('common.init');
+		if (result.code === 1) {
+			commit('CONFIG', result.data);
+			if (!options?.query?.token) {
+				dispatch('autoLogin');
+			}
+			return result.data;
+		}
+		return false;
 	},
 
 	// 获取模板数据
-	getTemplate({
+	async getTemplate({
 		commit
 	}, options) {
-		return new Promise((resolve, reject) => {
-			let shop_id = 0;
-			// #ifdef H5
-			if (options?.query.shop_id) {
-				shop_id = options.query.shop_id;
-			}
-			// #endif
+		let shop_id = 0;
+		// #ifdef H5
+		if (options?.query.shop_id) {
+			shop_id = options.query.shop_id;
+		}
+		// #endif
 
-			// #ifdef MP
-			if (options?.query.scene) {
-				let scene = decodeURIComponent(options?.query.scene);
-				let sceneObj = scene.split('=');
-				if (sceneObj[0] === 'shop_id') {
-					shop_id = sceneObj[1]
-				}
+		// #ifdef MP
+		if (options?.query.scene) {
+			let scene = decodeURIComponent(options?.query.scene);
+			let sceneObj = scene.split('=');
+			if (sceneObj[0] === 'shop_id') {
+				shop_id = sceneObj[1]
 			}
-			// #endif
-			http('common.template', {
-				shop_id
-			}).then(res => {
-				res.code === 0 ? commit('hasTemplate', false) : commit('hasTemplate', true);
-				if (res.code === 1) {
-					commit('TEMPLATE', res.data);
-					uni.setStorageSync('template', res.data);
-				}
-				resolve(res)
-			}).catch(e => {
-				reject(e)
-
-			})
-		})
+		}
+		// #endif
+		const result = await http('common.template', shop_id ? {
+			shop_id
+		} : {});
+		if (result.code === 1) {
+			commit("hasTemplate", true);
+			commit('TEMPLATE', result.data);
+			return result.data;
+		} else {
+			commit("hasTemplate", false);
+			return false;
+		}
 	},
 
-	getShareInfo({
-		commit
-	}) {
-		let shareInfo = share.setShareInfo();
-		commit('SHARE_INFO', shareInfo);
-		return shareInfo;
-	},
-
-	// 同步后端路由
+	// 同步路由到后端
 	syncPages({
 		commit
 	}) {
-		return new Promise((resolve, reject) => {
-			http('common.syncPages', {
-				data: ROUTES
-			}).then(res => {
-				commit('PAGE_ROUTES', res.data);
-				resolve(res)
-			}).catch(e => {
-				reject(e)
-			})
+		http('common.syncPages', {
+			data: ROUTES,
 		})
 	},
 }
 
+
 const mutations = {
-	[CONFIG](state, data) {
-		state.config = data
-		uni.setStorageSync('config', data);
-	},
-	[TEMPLATE](state, data) {
-		state.template = data
-	},
-	[PAGE_ROUTES](state, data) {
-		state.routes = data
+	CONFIG(state, payload) {
+		Object.keys(payload).forEach(k => {
+			state[k] = payload[k];
+		})
 	},
-	[SHARE_INFO](state, data) {
-		state.shareInfo = data
+
+	TEMPLATE(state, data) {
+		state.template = data;
+		state.homeTemplate = data.home
+		state.userTemplate = data.user
+		state.floatData = data['float-button']?. [0]?.content
+		state.popupData = data?.popup?. [0]?.content
+		state.tabbarData = data?.tabbar?. [0]?.content
 	},
+
 	hasTemplate(state, data) {
 		state.hasTemplate = data
 	},
 	// 弹窗一次的话，关闭的时候删除数据。
 	delPopup(state, index) {
-		let templateData = state.template;
-		uni.removeStorageSync('template');
-		templateData.popup[0].content.list.splice(index, 1)
-		uni.setStorageSync('template', templateData);
-		state.template = templateData;
+		let popupData = state.popupData;
+		popupData.list.splice(index, 1)
+		state.template = popupData;
+	},
+	shareInfo(state, shareInfo) {
+		state.shareInfo = shareInfo;
 	}
 }
 
-const getters = {
-
-}
 
 export default {
 	state,
diff --git a/shopro/store/modules/user.js b/shopro/store/modules/user.js
index 647528c9..bb8c5392 100644
--- a/shopro/store/modules/user.js
+++ b/shopro/store/modules/user.js
@@ -3,40 +3,46 @@ import http from '@/shopro/request/index'
 import store from '@/shopro/store'
 import tools from '@/shopro/utils/tools'
 import wechat from '@/shopro/wechat/wechat'
+import share from '@/shopro/share'
 
-import {
-	IS_LOGIN,
-	USER_INFO,
-	USER_DATA,
-	MESSAGE_IDS,
-	AGENT_INFO,
-	AUTH_TYPE
-} from '../types.js'
 const state = {
-	isLogin: uni.getStorageSync('isLogin') ? uni.getStorageSync('isLogin') : false,
-	userInfo: uni.getStorageSync('userInfo') ? uni.getStorageSync('userInfo') : {},
-	agentInfo: uni.getStorageSync('agentInfo') ? uni.getStorageSync('agentInfo') : {},
+	token: uni.getStorageSync("token") || "",
+	isLogin: uni.getStorageSync("isLogin") || false, // 是否登陆
+	userInfo: {}, // 用户信息
+	agentInfo: {}, //分销商信息
 	userData: {}, //用户其他相关信息
-	messageIds: {}, //小程序订阅消息模板ids
+	subscribeMessageIdsMap: [], //小程序订阅消息模板ids
 	authType: '' // smsLogin:手机号登录注册, accountLogin:密码登录, forgotPwd:忘记密码, changePwd:修改密码, bindMobile:绑定手机号
 }
 
+const getters = {
+	token: state => state.token,
+	isLogin: state => state.isLogin,
+	userInfo: state => state.userInfo,
+	agentInfo: state => state.agentInfo,
+	userOtherData: state => state.userData,
+	authType: state => state.authType,
+	subscribeMessageIdsMap: state => state.subscribeMessageIdsMap
+}
+
 const actions = {
 	// 获取用户信息
 	getUserInfo({
-		commit
+		commit,
+		dispatch,
+		getters,
+		state
 	}, token = '') {
 		return new Promise((resolve, reject) => {
 			token && uni.setStorageSync('token', token);
 			http('user.info').then(res => {
 					if (res.code === 1) {
-						store.dispatch('showAuthModal', '');
-						if (!store.state.user.isLogin) {
-							store.dispatch('getShareInfo');
-						}
-						commit('IS_LOGIN', true);
-						commit('USER_INFO', res.data);
-						uni.setStorageSync('userInfo', res.data);
+						let lastLoginStatus = getters.isLogin;
+						commit('userInfo', res.data);
+						commit('isLogin', true);
+						dispatch('showAuthModal', '');
+						!lastLoginStatus && share.setShareInfo();
+						// 存在分享信息 添加分享记录
 						let spm = uni.getStorageSync('spm');
 						if (spm) {
 							http('common.shareAdd', {
@@ -44,13 +50,13 @@ const actions = {
 							});
 							uni.removeStorageSync('spm');
 						}
-						resolve(res)
+						resolve(res.data)
 					}
 
 				}).then(() => {
 					// 只有在登录的时候请求购物车信息，订单信息，获取登录信息之后。
-					token && store.dispatch('getCartList');
-					token && store.dispatch('getUserData');
+					token && dispatch('getCartList');
+					token && dispatch('getUserData');
 				})
 				.catch(e => {
 					reject(e)
@@ -70,60 +76,6 @@ const actions = {
 			})
 		})
 	},
-	// 获取订阅消息模板ids;
-	getMessageIds({
-		commit
-	}, type) {
-		return new Promise((resolve, reject) => {
-			http('user.messageIds').then(res => {
-				let typeName = []; //模板键
-				let obj = res.data; //模板对象
-				let arr = []; //模板ids
-				switch (type) {
-					case 'result': //支付成功后
-						typeName = ['order_sended']
-						break;
-					case 'grouponResult': //拼团支付成功后
-						typeName = ['groupon_success', 'groupon_fail', 'order_sended']
-						break;
-					case 'aftersale': //点击售后
-						typeName = ['refund_agree', 'aftersale_change', 'wallet_change']
-						break;
-					case 'wallet': //提现提醒
-						typeName = ['score_change', 'wallet_apply', 'wallet_change']
-						break;
-					case 'store': //门店新订单通知
-						typeName = ['store_order_new']
-						break;
-					case 'storeApply': //门店申请通知
-						typeName = ['store_apply']
-						break;
-					default:
-						typeName = []
-						break;
-				}
-				typeName.forEach(item => {
-					obj[item] && arr.push(obj[item])
-				})
-				commit('MESSAGE_IDS', arr);
-				// #ifdef MP-WEIXIN
-				arr.length && uni.requestSubscribeMessage({
-					tmplIds: arr,
-					success: (res) => {
-						console.log(res);
-					},
-					fail: (err) => {
-						console.log(err);
-					}
-
-				});
-				// #endif
-				resolve(arr)
-			}).catch(e => {
-				reject(e)
-			})
-		})
-	},
 
 	// 获取分销商身份信息
 	getAgent({
@@ -133,7 +85,6 @@ const actions = {
 			http('commission.auth').then(res => {
 				if (res.code === 1) {
 					commit('AGENT_INFO', res.data.data);
-					uni.setStorageSync('agentInfo', res.data.data);
 				}
 				resolve(res)
 			}).catch(e => {
@@ -145,21 +96,28 @@ const actions = {
 
 	// 自动登录
 	async autoLogin({
-		commit
+		getters,
+		dispatch
 	}) {
-		if (store.state.shopro.config.wechat?.autologin && !store.state.user.isLogin) {
+		if (getters.initWechat?.autologin && !getters.isLogin) { // 微信开启自动登录 并且当前未登录，进入自动登录流程
 			let token = '';
 			// #ifdef H5
-			uni.setStorageSync('appid', store.state.shopro.config.wechat.appid);
 			wechat.login();
 			// #endif
 			// #ifdef MP-WEIXIN
 			token = await wechat.getWxMiniProgramSessionKey(true);
 			// #endif
-			if (token) {
-				store.dispatch('getUserInfo', token);
-			}
+			token && await dispatch('getUserInfo', token);
+		} else if (getters.isLogin) { // 已经登录，直接获取用户信息
+			await dispatch('getUserInfo');
+		}
+		share.setShareInfo();
+		// 初始化小程序session_key
+		// #ifdef MP-WEIXIN
+		if (!getters.initWechat?.autologin) {
+			await wechat.getWxMiniProgramSessionKey(false);
 		}
+		// #endif
 	},
 
 	// 登录弹窗控制
@@ -171,53 +129,104 @@ const actions = {
 
 	// 退出登录
 	logout({
-		commit
+		commit,
+		dispatch
 	}) {
 		uni.getStorageSync('token') && http('user.logout');
-		uni.removeStorageSync('token');
-		uni.removeStorageSync('session_key');
-		uni.removeStorageSync('userInfo');
-		uni.removeStorageSync('cartNum');
+		commit('token', "");
 		uni.removeStorageSync('chatSessionId');
-		commit('IS_LOGIN', false);
-		commit('USER_INFO', {});
+		commit('isLogin', false);
+		commit('userInfo', {});
 		commit('CART_LIST', []);
-		commit('CART_NUM');
 		commit('USER_DATA', {});
-	}
+		// 重置全局分享信息
+		share.setShareInfo();
+	},
+
+	// 获取订阅消息模板ids;
+	getMessageIds({
+		commit,
+		state
+	}) {
+		http('user.messageIds').then(res => {
+			commit('formatMessage', res.data)
+			Promise.resolve(res.data)
+		}).catch(e => {
+			Promise.reject(e)
+		})
+
+	},
 }
 
 const mutations = {
+	token(state, payload) {
+		state.token = payload;
+		uni.setStorageSync("token", payload);
+	},
 	// 登录态
-	[IS_LOGIN](state, data) {
-		uni.setStorageSync('isLogin', data);
+	isLogin(state, data) {
 		state.isLogin = data;
+		uni.setStorageSync('isLogin', data);
 	},
 	// 用户信息
-	[USER_INFO](state, data) {
+	userInfo(state, data) {
 		state.userInfo = data;
 	},
 	// 分销商信息
-	[AGENT_INFO](state, data) {
+	AGENT_INFO(state, data) {
 		state.agentInfo = data;
 	},
 	// 小程序订阅消息模板ids
-	[MESSAGE_IDS](state, data) {
-		state.messageIds = data;
+	MESSAGE_IDS(state, data) {
+		state.subscribeMessageIds = data;
 	},
-	[USER_DATA](state, data) {
+	USER_DATA(state, data) {
 		state.userData = data;
 	},
-	[AUTH_TYPE](state, data) {
+	AUTH_TYPE(state, data) {
 		data ? uni.hideTabBar() : uni.showTabBar();
 		state.authType = data;
-	}
-}
+	},
 
-const getters = {
+	// 订阅消息
+	subscribeMessage(state, type) {
+		let arr = state.subscribeMessageIdsMap[type];
+		arr.length && uni.requestSubscribeMessage({
+			tmplIds: arr,
+			success: (res) => {
+				console.log(res);
+			},
+			fail: (err) => {
+				console.log(err);
+			}
 
+		});
+	},
+
+	// 解析订阅消息数据
+	formatMessage(state, messageIdsObj) {
+		// 各场景下用到的订阅模板
+		let typeMap = {
+			'result': ['order_sended'], //支付成功
+			'grouponResult': ['groupon_success', 'groupon_fail', 'order_sended'], //拼团支付成功后
+			'aftersale': ['refund_agree', 'aftersale_change', 'wallet_change'], //点击售后
+			'wallet': ['score_change', 'wallet_apply', 'wallet_change'], //提现提醒
+			'store': ['store_order_new'], //门店新订单通知
+			'storeApply': ['store_apply'] //门店申请通知
+		}
+		let idsMap = {}
+		Object.keys(typeMap).forEach(key => {
+			idsMap[key] = []
+			typeMap[key].forEach(item => {
+				idsMap[key].push(messageIdsObj[item])
+			})
+		})
+		state.subscribeMessageIdsMap = idsMap
+	},
 }
 
+
+
 export default {
 	state,
 	mutations,
diff --git a/shopro/store/types.js b/shopro/store/types.js
deleted file mode 100644
index ee2c9ef7..00000000
--- a/shopro/store/types.js
+++ /dev/null
@@ -1,12 +0,0 @@
-export const CONFIG = 'CONFIG'				// 初始化数据
-export const TEMPLATE = 'TEMPLATE'			// 装修模板数据
-export const IS_LOGIN = 'IS_LOGIN'			// 登录态
-export const USER_INFO = 'USER_INFO'		// 用户信息
-export const SHARE_INFO = 'SHARE_INFO'		// 分享信息
-export const AGENT_INFO = 'AGENT_INFO'		//分销商
-export const USER_DATA = 'USER_DATA'		//用户相关信息
-export const CART_LIST = 'CART_LIST'		//购物车商品
-export const CART_NUM = 'CART_NUM'			//购物车商品数
-export const MESSAGE_IDS = 'MESSAGE_IDS'	// 小程序订阅消息模板ids
-export const AUTH_TYPE = 'AUTH_TYPE'		// 授权模态框
-export const PAGE_ROUTES = 'PAGE_ROUTES'	//路由表
diff --git a/shopro/utils/tools.js b/shopro/utils/tools.js
index 53bbda05..9c70f4af 100644
--- a/shopro/utils/tools.js
+++ b/shopro/utils/tools.js
@@ -31,7 +31,7 @@ export default {
 			if (isTabbar) {
 				router.replaceAll(path)
 			} else {
-				path.includes('/pages/index') && !path.includes('/pages/index/view') ? router.pushTab(path) : router
+				path.includes('/pages/index') && !path.includes('/pages/index/view') ? router.replaceAll(path) : router
 					.push(path)
 			}
 
diff --git a/shopro/wechat/sdk.js b/shopro/wechat/sdk.js
index eb884a8e..4c018e14 100644
--- a/shopro/wechat/sdk.js
+++ b/shopro/wechat/sdk.js
@@ -1,20 +1,19 @@
-var jweixin = require('jweixin-module');
-import http from '@/shopro/request/index';
-import $platform from '@/shopro/platform';
+var jweixin = require("jweixin-module");
+import http from "@/shopro/request/index";
+import $platform from "@/shopro/platform";
 export default {
 	//判断是否在微信中
 	isWechat() {
 		var ua = window.navigator.userAgent.toLowerCase();
-		if (ua.match(/micromessenger/i) == 'micromessenger') {
+		if (ua.match(/micromessenger/i) == "micromessenger") {
 			return true;
 		} else {
 			return false;
 		}
 	},
-
 	// 鉴权页面
 	initJssdk(callback) {
-		http('common.wxJssdk', {
+		http("common.wxJssdk", {
 			uri: encodeURIComponent($platform.entry())
 		}).then(res => {
 			jweixin.config({
@@ -29,7 +28,7 @@ export default {
 			if (callback) {
 				callback(res.data);
 			}
-		})
+		});
 	},
 
 	//在需要定位页面调用
@@ -37,13 +36,13 @@ export default {
 		this.isWechat() && this.initJssdk(function(res) {
 			jweixin.ready(function() {
 				jweixin.getLocation({
-					type: 'gcj02', // 默认为wgs84的gps坐标，如果要返回直接给openLocation用的火星坐标，可传入'gcj02'
+					type: "gcj02", // 默认为wgs84的gps坐标，如果要返回直接给openLocation用的火星坐标，可传入'gcj02'
 					success: function(res) {
-						callback(res)
+						callback(res);
 					},
 					fail: function(res) {
-						console.log(`%c微信H5sdk,getLocation失败：`,
-							'color:green;background:yellow');
+						console.log("%c微信H5sdk,getLocation失败：",
+							"color:green;background:yellow");
 					},
 				});
 			});
@@ -56,11 +55,11 @@ export default {
 			jweixin.ready(function() {
 				jweixin.openAddress({
 					success: function(res) {
-						callback(res)
+						callback(res);
 					},
 					fail: function(err) {
-						console.log(`%c微信H5sdk,openAddress失败：`,
-							'color:green;background:yellow');
+						console.log("%c微信H5sdk,openAddress失败：",
+							"color:green;background:yellow");
 					},
 					complete: function(msg) {}
 				});
@@ -76,11 +75,11 @@ export default {
 					needResult: 1, // 默认为0，扫描结果由微信处理，1则直接返回扫描结果，
 					scanType: ["qrCode", "barCode"], // 可以指定扫二维码还是一维码，默认二者都有
 					success: function(res) {
-						callback(res)
+						callback(res);
 					},
 					fail: function(res) {
-						console.log(`%c微信H5sdk,scanQRCode失败：`,
-							'color:green;background:yellow');
+						console.log("%c微信H5sdk,scanQRCode失败：",
+							"color:green;background:yellow");
 					},
 				});
 			});
@@ -97,7 +96,7 @@ export default {
 					link: data.path,
 					imgUrl: data.image,
 					success: function(res) {
-						callback(res)
+						callback(res);
 						// 分享后的一些操作,比如分享统计等等
 					},
 					cancel: function(res) {}
@@ -105,7 +104,7 @@ export default {
 
 				jweixin.updateAppMessageShareData(shareData); //新版接口
 				//分享到朋友圈接口
-				jweixin.updateTimelineShareData(shareData);
+				// jweixin.updateTimelineShareData(shareData);
 
 
 			});
@@ -131,12 +130,12 @@ export default {
 			jweixin.ready(function() {
 				jweixin.chooseImage({
 					count: 1,
-					sizeType: ['compressed'],
-					sourceType: ['album'],
+					sizeType: ["compressed"],
+					sourceType: ["album"],
 					success: function(rs) {
-						callback(rs)
+						callback(rs);
 					}
-				})
+				});
 			});
 		});
 	},
@@ -154,12 +153,12 @@ export default {
 					signType: data.signType, // 签名方式，默认为'SHA1'，使用新版支付需传入'MD5'
 					paySign: data.paySign, // 支付签名
 					success: function(res) {
-						callback(res)
+						callback(res);
 					},
 					fail: function(res) {
-						console.log(`%c微信H5sdk,chooseWXPay失败：`,
-							'color:green;background:yellow');
-						callback(res)
+						console.log("%c微信H5sdk,chooseWXPay失败：",
+							"color:green;background:yellow");
+						callback(res);
 					},
 					cancel: function(res) {
 
@@ -168,4 +167,4 @@ export default {
 			});
 		});
 	}
-}
+};
diff --git a/shopro/wechat/wechat.js b/shopro/wechat/wechat.js
index ebf82607..99b6b0c5 100644
--- a/shopro/wechat/wechat.js
+++ b/shopro/wechat/wechat.js
@@ -6,120 +6,117 @@
  * @Date 2020-05-20
  * @Email lidongtony@qq.com
  */
-import api from '@/shopro/request/index';
-import $platform from '@/shopro/platform';
-import store from '@/shopro/store';
+import api from "@/shopro/request/index";
+import $platform from "@/shopro/platform";
+import store from "@/shopro/store";
 import {
 	API_URL
-} from '@/env'
+} from "@/env";
 
 export default {
 	eventMap(event) {
-		let map = '';
+		let map = "";
 		switch (event) {
-			case 'login':
-				map = '登录中...';
+			case "login":
+				map = "登录中...";
 				break;
-			case 'refresh':
-				map = '更新中...';
+			case "refresh":
+				map = "更新中...";
 				break;
-			case 'bind':
-				map = '绑定中...';
+			case "bind":
+				map = "绑定中...";
 				break;
 		}
 		return map;
 	},
 
 	async login() {
-		let token = '';
+		let token = "";
 		// #ifdef MP-WEIXIN
-		token = await this.wxMiniProgramOauth('login');
+		token = await this.wxMiniProgramOauth("login");
 		return token;
 		// #endif
 		// #ifdef H5
-		this.wxOfficialAccountOauth('login');
+		this.wxOfficialAccountOauth("login");
 		// #endif
 		// #ifdef APP-PLUS
-		token = await this.wxOpenPlatformOauth('login');
+		token = await this.wxOpenPlatformOauth("login");
 		return token;
 		// #endif
 	},
 	async refresh() {
-		let token = '';
+		let token = "";
 		// #ifdef MP-WEIXIN
-		token = await this.wxMiniProgramOauth('refresh');
+		token = await this.wxMiniProgramOauth("refresh");
 		return token;
 		// #endif
 		// #ifdef H5
-		this.wxOfficialAccountOauth('refresh');
+		this.wxOfficialAccountOauth("refresh");
 		// #endif
 		// #ifdef APP-PLUS
-		token = await this.wxOpenPlatformOauth('refresh');
+		token = await this.wxOpenPlatformOauth("refresh");
 		return token;
 		// #endif
 	},
 	async bind() {
-		let token = '';
+		let token = "";
 		// #ifdef MP-WEIXIN
-		token = await this.wxMiniProgramOauth('bind');
+		token = await this.wxMiniProgramOauth("bind");
 		return token;
 		// #endif
 		// #ifdef H5
-		this.wxOfficialAccountOauth('bind');
+		this.wxOfficialAccountOauth("bind");
 		// #endif
 		// #ifdef APP-PLUS
-		token = await this.wxOpenPlatformOauth('bind');
+		token = await this.wxOpenPlatformOauth("bind");
 		return token;
 		// #endif
 	},
 
 	// #ifdef H5
 	// 微信公众号网页登录&刷新头像昵称&绑定
-	wxOfficialAccountOauth(event = 'login') {
-		if($platform.get() !== 'wxOfficialAccount') {
+	wxOfficialAccountOauth(event = "login") {
+		if ($platform.get() !== "wxOfficialAccount") {
 			uni.showToast({
-				title: '请在微信浏览器中打开',
-				icon: 'none'
-			})
+				title: "请在微信浏览器中打开",
+				icon: "none"
+			});
 			throw false;
 		}
 		let host = $platform.host();
 		let payloadObject = {
 			host: host,
 			event,
-			token: (event !== 'login' && uni.getStorageSync('token')) ? uni.getStorageSync('token') : ''
+			token: (event !== "login" && store.getters.isLogin) ? uni.getStorageSync("token") : ""
 		};
 		let payload = encodeURIComponent(JSON.stringify(payloadObject));
-
 		let redirect_uri = encodeURIComponent(`${API_URL}user/wxOfficialAccountOauth?payload=${payload}`);
-		let oauthUrl = 'https://open.weixin.qq.com/connect/oauth2/authorize?appid=' + store.state.shopro.config
-			.wechat.appid +
+		let oauthUrl = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=" + store.getters.initWechat.appid +
 			`&redirect_uri=${redirect_uri}&response_type=code&scope=snsapi_userinfo&state=1`;
-		uni.setStorageSync('lastPage', window.location.href);
+		uni.setStorageSync("lastPage", window.location.href);
 		window.location = oauthUrl;
 	},
 
 	// 微信公众号网页静默登录:临时登录获取OpenId 不入库不绑定用户
 	wxOfficialAccountBaseLogin() {
 		let state = encodeURIComponent(window.location.href);
-		window.location = 'https://open.weixin.qq.com/connect/oauth2/authorize?appid=' + store.state.config.wechat
-			.appid +
-			`&redirect_uri=${API_URL}user/wxOfficialAccountBaseLogin&response_type=code&scope=snsapi_base&state=${state}`
-		throw 'stop';
+		window.location = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=" + store.getters.initWechat.appid +
+			`&redirect_uri=${API_URL}user/wxOfficialAccountBaseLogin&response_type=code&scope=snsapi_base&state=${state}`;
+		throw "stop";
 	},
 	// #endif
 
 	// #ifdef APP-PLUS
 	// 微信开放平台登录
-	wxOpenPlatformOauth(event = 'login') {
+	wxOpenPlatformOauth(event = "login") {
 		let that = this;
 		return new Promise((resolve, reject) => {
 			uni.login({
-				provider: 'weixin',
+				provider: "weixin",
 				success: function(loginRes) {
 					if (loginRes.errMsg === "login:ok") {
 						let authResult = loginRes.authResult;
-						api('user.wxOpenPlatformOauth', {
+						api("user.wxOpenPlatformOauth", {
 							authResult,
 							event
 						}, that.eventMap(event)).then(res => {
@@ -133,15 +130,14 @@ export default {
 				},
 				fail: function(res) {
 					uni.showToast({
-						title: '登录失败,请稍后再试'
+						title: "登录失败,请稍后再试"
 					});
 					resolve(false);
-					api('common.debug', {
+					api("common.debug", {
 						info: res
-					})
+					});
 				},
-				complete: function(res) {
-				}
+				complete: function(res) {}
 			});
 		});
 	},
@@ -149,28 +145,27 @@ export default {
 
 	// #ifdef MP-WEIXIN
 	// 微信小程序静默登录
-	getWxMiniProgramSessionKey(autoLogin = true) {
-		let that = this;
+	async getWxMiniProgramSessionKey(autoLogin = true) {
 		let sessionStatus = false;
-		let session_key = '';
+		let session_key = "";
 		return new Promise((resolve, reject) => {
 			uni.checkSession({
 				success(res) {
-					if (res.errMsg === 'checkSession:ok') sessionStatus = true;
+					if (res.errMsg === "checkSession:ok") sessionStatus = true;
 				},
 				complete() {
-					if (uni.getStorageSync('session_key') && sessionStatus && !autoLogin) {
-						resolve(uni.getStorageSync('session_key'));
+					if (uni.getStorageSync("session_key") && sessionStatus && !autoLogin) {
+						resolve(uni.getStorageSync("session_key"));
 					} else {
 						uni.login({
 							success: function(info) {
 								let code = info.code;
-								api('user.getWxMiniProgramSessionKey', {
+								api("user.getWxMiniProgramSessionKey", {
 									code: code,
 									autoLogin: autoLogin
 								}).then(res => {
 									if (res.code === 1) {
-										uni.setStorageSync('session_key', res
+										uni.setStorageSync("session_key", res
 											.data.session_key);
 										if (autoLogin) {
 											if (res.data.token) {
@@ -188,32 +183,35 @@ export default {
 						});
 					}
 				}
-			})
+			});
 		});
 	},
 
 	// 微信小程序获取用户信息登录
-	wxMiniProgramOauth(event = 'login') {
+	wxMiniProgramOauth(event = "login") {
 		let that = this;
+		let session_key = uni.getStorageSync("session_key");
 		uni.showLoading({
 			title: that.eventMap(event)
-		})
+		});
 		return new Promise((resolve, reject) => {
 			uni.getUserProfile({ // 必须手动确认触发
-				desc: '完善会员资料', // 声明获取用户个人信息后的用途，后续会展示在弹窗中，请谨慎填写
-				success: async res => {
+				desc: "完善会员资料", // 声明获取用户个人信息后的用途，后续会展示在弹窗中，请谨慎填写
+				success: res => {
 					if (res.errMsg === "getUserProfile:ok") {
-						api('user.wxMiniProgramOauth', {
+						api("user.wxMiniProgramOauth", {
 							event,
-							session_key: await that.getWxMiniProgramSessionKey(false),
+							session_key,
 							encryptedData: res.encryptedData,
 							iv: res.iv,
 							signature: res.signature,
 						}).then(res => {
+							console.log(res)
 							if (res.code === 1) {
 								resolve(res.data.token);
 							} else {
-								uni.removeStorageSync('session_key');
+								uni.removeStorageSync("session_key");
+								that.getWxMiniProgramSessionKey(false);
 								resolve(false);
 							}
 						});
@@ -222,44 +220,42 @@ export default {
 				complete: res => {
 					uni.hideLoading();
 				}
-			})
+			});
 		});
 
 	},
 
 	// 小程序更新
 	checkMiniProgramUpdate() {
-		if (uni.canIUse('getUpdateManager')) {
-			const updateManager = uni.getUpdateManager()
+		if (uni.canIUse("getUpdateManager")) {
+			const updateManager = uni.getUpdateManager();
 			updateManager.onCheckForUpdate(function(res) {
 				// 请求完新版本信息的回调
 				if (res.hasUpdate) {
 					updateManager.onUpdateReady(function() {
 						uni.showModal({
-							title: '更新提示',
-							content: '新版本已经准备好，是否重启应用？',
+							title: "更新提示",
+							content: "新版本已经准备好，是否重启应用？",
 							success: function(res) {
 								if (res.confirm) {
 									// 新的版本已经下载好，调用 applyUpdate 应用新版本并重启
-									updateManager.applyUpdate()
+									updateManager.applyUpdate();
 								}
 							}
-						})
-					})
+						});
+					});
 					updateManager.onUpdateFailed(function() {
 						// 新的版本下载失败
 						uni.showModal({
-							title: '已经有新版本了哟~',
-							content: '新版本已经上线啦~，请您删除当前小程序，重新搜索打开哟~'
-						})
-					})
+							title: "已经有新版本了哟~",
+							content: "新版本已经上线啦~，请您删除当前小程序，重新搜索打开哟~"
+						});
+					});
 				}
-			})
+			});
 		}
 	},
 	// #endif
 
 
-
-
-}
+};
diff --git a/static/font/shopro-icon.css b/static/font/shopro-icon.css
index 228bfba5..a133a5b0 100644
--- a/static/font/shopro-icon.css
+++ b/static/font/shopro-icon.css
@@ -1,6 +1,8 @@
 @font-face {
 	font-family: "iconfont";
-	src: url('data:application/x-font-woff2;charset=utf-8;base64,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') format('woff2')
+	/* Project id 1678323 */
+	src:
+		url('data:application/x-font-woff2;charset=utf-8;base64,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') format('woff2')
 }
 
 .iconfont {
@@ -11,58 +13,94 @@
 	-moz-osx-font-smoothing: grayscale;
 }
 
-.iconweimingmingwenjianjia_jiantou:before {
-	content: "\e637";
+.icon-zhifubao:before {
+	content: "\e60a";
 }
 
-.icon21shuru:before {
-	content: "\e615";
+.icon-yinhangqia:before {
+	content: "\e767";
 }
 
-.iconicon-test1:before {
-	content: "\e603";
+.icon-zixun:before {
+	content: "\e771";
 }
 
-.icontianjia:before {
-	content: "\e61f";
+.icon-icon-test:before {
+	content: "\e6e7";
 }
 
-.iconbiaoqing:before {
-	content: "\e620";
+.icon-qrcode:before {
+	content: "\eb64";
 }
 
-.iconyuandianxiao:before {
-	content: "\e757";
+.icon-xiala:before {
+	content: "\e608";
 }
 
-.iconyoujiantou-tianchong:before {
+.icon-youjiantou-tianchong:before {
 	content: "\e73d";
 }
 
-.iconxiala:before {
-	content: "\e608";
+.icon-yuandianxiao:before {
+	content: "\e757";
 }
 
-.iconqrcode:before {
-	content: "\eb64";
+.icon-biaoqing:before {
+	content: "\e620";
 }
 
-.iconicon-test:before {
-	content: "\e6e7";
+.icon-tianjia:before {
+	content: "\e61f";
 }
 
-.iconyinhangqia:before {
-	content: "\e767";
+.icon-icon-test1:before {
+	content: "\e605";
 }
 
-.iconzixun:before {
-	content: "\e771";
+.icon-21shuru:before {
+	content: "\e615";
 }
 
-.iconyishixiao:before {
+.icon-fire:before {
+	content: "\e629";
+}
+
+.icon-zizhutuiguang:before {
+	content: "\e604";
+}
+
+.icon-quanping:before {
+	content: "\e66a";
+}
+
+.icon-yishixiao:before {
 	content: "\e6d9";
 }
 
-.iconzhifubao:before {
-	content: "\e60a";
+.icon-tuihuo1:before {
+	content: "\e601";
+}
+
+.icon-tuikuan1:before {
+	content: "\e600";
+}
+
+.icon-tuihuo:before {
+	content: "\e602";
+}
+
+.icon-huanhuo:before {
+	content: "\e603";
+}
+
+.icon-dingwei:before {
+	content: "\e86a";
+}
+
+.icon-add-fill:before {
+	content: "\e777";
+}
+
+.icon-reduce-fill:before {
+	content: "\e788";
 }
diff --git a/static/style/colorui.css b/static/style/colorui.css
new file mode 100644
index 00000000..513e1e90
--- /dev/null
+++ b/static/style/colorui.css
@@ -0,0 +1,3924 @@
+/*
+  ColorUi for uniApp  v2.1.6 | by 文晓港 2019-05-31 10:44:24
+  仅供学习交流，如作它用所承受的法律责任一概与作者无关  
+  
+  *使用ColorUi开发扩展与插件时，请注明基于ColorUi开发 
+  
+  （QQ交流群：240787041）
+*/
+
+/* ==================
+        初始化
+ ==================== */
+body {
+	background-color: #f1f1f1;
+	font-size: 28upx;
+	color: #333333;
+	font-family: Helvetica Neue, Helvetica, sans-serif;
+}
+
+view,
+scroll-view,
+swiper,
+button,
+input,
+textarea,
+label,
+navigator,
+image {
+	box-sizing: border-box;
+}
+
+.round {
+	border-radius: 5000upx;
+}
+
+.radius {
+	border-radius: 6upx;
+}
+
+/* ==================
+          图片
+ ==================== */
+
+image {
+	max-width: 100%;
+	display: inline-block;
+	position: relative;
+	z-index: 0;
+}
+
+image.loading::before {
+	content: "";
+	background-color: #f5f5f5;
+	display: block;
+	position: absolute;
+	width: 100%;
+	height: 100%;
+	z-index: -2;
+}
+
+image.loading::after {
+	content: "\e7f1";
+	font-family: "cuIcon";
+	position: absolute;
+	top: 0;
+	left: 0;
+	width: 32upx;
+	height: 32upx;
+	line-height: 32upx;
+	right: 0;
+	bottom: 0;
+	z-index: -1;
+	font-size: 32upx;
+	margin: auto;
+	color: #ccc;
+	-webkit-animation: cuIcon-spin 2s infinite linear;
+	animation: cuIcon-spin 2s infinite linear;
+	display: block;
+}
+
+.response {
+	width: 100%;
+}
+
+/* ==================
+         开关
+ ==================== */
+
+switch,
+checkbox,
+radio {
+	position: relative;
+}
+
+switch::after,
+switch::before {
+	font-family: "cuIcon";
+	content: "\e645";
+	position: absolute;
+	color: #ffffff !important;
+	top: 0%;
+	left: 0upx;
+	font-size: 26upx;
+	line-height: 26px;
+	width: 50%;
+	text-align: center;
+	pointer-events: none;
+	transform: scale(0, 0);
+	transition: all 0.3s ease-in-out 0s;
+	z-index: 9;
+	bottom: 0;
+	height: 26px;
+	margin: auto;
+}
+
+switch::before {
+	content: "\e646";
+	right: 0;
+	transform: scale(1, 1);
+	left: auto;
+}
+
+switch[checked]::after,
+switch.checked::after {
+	transform: scale(1, 1);
+}
+
+switch[checked]::before,
+switch.checked::before {
+	transform: scale(0, 0);
+}
+
+/* #ifndef MP-ALIPAY */
+radio::before,
+checkbox::before {
+	font-family: "cuIcon";
+	content: "\e645";
+	position: absolute;
+	color: #ffffff !important;
+	top: 50%;
+	margin-top: -8px;
+	right: 5px;
+	font-size: 32upx;
+	line-height: 16px;
+	pointer-events: none;
+	transform: scale(1, 1);
+	transition: all 0.3s ease-in-out 0s;
+	z-index: 9;
+}
+
+radio .wx-radio-input,
+checkbox .wx-checkbox-input,
+radio .uni-radio-input,
+checkbox .uni-checkbox-input {
+	margin: 0;
+	width: 24px;
+	height: 24px;
+}
+
+checkbox.round .wx-checkbox-input,
+checkbox.round .uni-checkbox-input {
+	border-radius: 100upx;
+}
+
+/* #endif */
+
+switch[checked]::before {
+	transform: scale(0, 0);
+}
+
+switch .wx-switch-input,
+switch .uni-switch-input {
+	border: none;
+	padding: 0 24px;
+	width: 48px;
+	height: 26px;
+	margin: 0;
+	border-radius: 100upx;
+}
+
+switch .wx-switch-input:not([class*="bg-"]),
+switch .uni-switch-input:not([class*="bg-"]) {
+	background: #8799a3 !important;
+}
+
+switch .wx-switch-input::after,
+switch .uni-switch-input::after {
+	margin: auto;
+	width: 26px;
+	height: 26px;
+	border-radius: 100upx;
+	left: 0upx;
+	top: 0upx;
+	bottom: 0upx;
+	position: absolute;
+	transform: scale(0.9, 0.9);
+	transition: all 0.1s ease-in-out 0s;
+}
+
+switch .wx-switch-input.wx-switch-input-checked::after,
+switch .uni-switch-input.uni-switch-input-checked::after {
+	margin: auto;
+	left: 22px;
+	box-shadow: none;
+	transform: scale(0.9, 0.9);
+}
+
+radio-group {
+	display: inline-block;
+}
+
+
+
+switch.radius .wx-switch-input::after,
+switch.radius .wx-switch-input,
+switch.radius .wx-switch-input::before,
+switch.radius .uni-switch-input::after,
+switch.radius .uni-switch-input,
+switch.radius .uni-switch-input::before {
+	border-radius: 10upx;
+}
+
+.uni-checkbox-input:hover {
+	border-color: #d1d1d1 !important;
+}
+
+switch .wx-switch-input::before,
+radio.radio::before,
+checkbox .wx-checkbox-input::before,
+radio .wx-radio-input::before,
+switch .uni-switch-input::before,
+radio.radio::before,
+checkbox .uni-checkbox-input::before,
+radio .uni-radio-input::before {
+	display: none;
+}
+
+radio.radio[checked]::after,
+radio.radio .uni-radio-input-checked::after {
+	content: "";
+	background-color: transparent;
+	display: block;
+	position: absolute;
+	width: 8px;
+	height: 8px;
+	z-index: 999;
+	top: 0upx;
+	left: 0upx;
+	right: 0;
+	bottom: 0;
+	margin: auto;
+	border-radius: 200upx;
+	/* #ifndef MP */
+	border: 7px solid #ffffff !important;
+	/* #endif */
+
+	/* #ifdef MP */
+	border: 8px solid #ffffff !important;
+	/* #endif */
+}
+
+.switch-sex::after {
+	content: "\e71c";
+}
+
+.switch-sex::before {
+	content: "\e71a";
+}
+
+.switch-sex .wx-switch-input,
+.switch-sex .uni-switch-input {
+	background: #e54d42 !important;
+	border-color: #e54d42 !important;
+}
+
+.switch-sex[checked] .wx-switch-input,
+.switch-sex.checked .uni-switch-input {
+	background: #0081ff !important;
+	border-color: #0081ff !important;
+}
+
+switch.red[checked] .wx-switch-input.wx-switch-input-checked,
+checkbox.red[checked] .wx-checkbox-input,
+radio.red[checked] .wx-radio-input,
+switch.red.checked .uni-switch-input.uni-switch-input-checked,
+checkbox.red.checked .uni-checkbox-input,
+radio.red.checked .uni-radio-input {
+	background-color: #e54d42 !important;
+	border-color: #e54d42 !important;
+	color: #ffffff !important;
+}
+
+switch.orange[checked] .wx-switch-input,
+checkbox.orange[checked] .wx-checkbox-input,
+radio.orange[checked] .wx-radio-input,
+switch.orange.checked .uni-switch-input,
+checkbox.orange.checked .uni-checkbox-input,
+radio.orange.checked .uni-radio-input {
+	background-color: #f37b1d !important;
+	border-color: #f37b1d !important;
+	color: #ffffff !important;
+}
+
+switch.yellow[checked] .wx-switch-input,
+checkbox.yellow[checked] .wx-checkbox-input,
+radio.yellow[checked] .wx-radio-input,
+switch.yellow.checked .uni-switch-input,
+checkbox.yellow.checked .uni-checkbox-input,
+radio.yellow.checked .uni-radio-input {
+	background-color: #fbbd08 !important;
+	border-color: #fbbd08 !important;
+	color: #333333 !important;
+}
+
+switch.olive[checked] .wx-switch-input,
+checkbox.olive[checked] .wx-checkbox-input,
+radio.olive[checked] .wx-radio-input,
+switch.olive.checked .uni-switch-input,
+checkbox.olive.checked .uni-checkbox-input,
+radio.olive.checked .uni-radio-input {
+	background-color: #8dc63f !important;
+	border-color: #8dc63f !important;
+	color: #ffffff !important;
+}
+
+switch.green[checked] .wx-switch-input,
+switch[checked] .wx-switch-input,
+checkbox.green[checked] .wx-checkbox-input,
+checkbox[checked] .wx-checkbox-input,
+radio.green[checked] .wx-radio-input,
+radio[checked] .wx-radio-input,
+switch.green.checked .uni-switch-input,
+switch.checked .uni-switch-input,
+checkbox.green.checked .uni-checkbox-input,
+checkbox.checked .uni-checkbox-input,
+radio.green.checked .uni-radio-input,
+radio.checked .uni-radio-input {
+	background-color: #39b54a !important;
+	border-color: #39b54a !important;
+	color: #ffffff !important;
+	border-color: #39B54A !important;
+}
+
+switch.cyan[checked] .wx-switch-input,
+checkbox.cyan[checked] .wx-checkbox-input,
+radio.cyan[checked] .wx-radio-input,
+switch.cyan.checked .uni-switch-input,
+checkbox.cyan.checked .uni-checkbox-input,
+radio.cyan.checked .uni-radio-input {
+	background-color: #1cbbb4 !important;
+	border-color: #1cbbb4 !important;
+	color: #ffffff !important;
+}
+
+switch.blue[checked] .wx-switch-input,
+checkbox.blue[checked] .wx-checkbox-input,
+radio.blue[checked] .wx-radio-input,
+switch.blue.checked .uni-switch-input,
+checkbox.blue.checked .uni-checkbox-input,
+radio.blue.checked .uni-radio-input {
+	background-color: #0081ff !important;
+	border-color: #0081ff !important;
+	color: #ffffff !important;
+}
+
+switch.purple[checked] .wx-switch-input,
+checkbox.purple[checked] .wx-checkbox-input,
+radio.purple[checked] .wx-radio-input,
+switch.purple.checked .uni-switch-input,
+checkbox.purple.checked .uni-checkbox-input,
+radio.purple.checked .uni-radio-input {
+	background-color: #6739b6 !important;
+	border-color: #6739b6 !important;
+	color: #ffffff !important;
+}
+
+switch.mauve[checked] .wx-switch-input,
+checkbox.mauve[checked] .wx-checkbox-input,
+radio.mauve[checked] .wx-radio-input,
+switch.mauve.checked .uni-switch-input,
+checkbox.mauve.checked .uni-checkbox-input,
+radio.mauve.checked .uni-radio-input {
+	background-color: #9c26b0 !important;
+	border-color: #9c26b0 !important;
+	color: #ffffff !important;
+}
+
+switch.pink[checked] .wx-switch-input,
+checkbox.pink[checked] .wx-checkbox-input,
+radio.pink[checked] .wx-radio-input,
+switch.pink.checked .uni-switch-input,
+checkbox.pink.checked .uni-checkbox-input,
+radio.pink.checked .uni-radio-input {
+	background-color: #e03997 !important;
+	border-color: #e03997 !important;
+	color: #ffffff !important;
+}
+
+switch.brown[checked] .wx-switch-input,
+checkbox.brown[checked] .wx-checkbox-input,
+radio.brown[checked] .wx-radio-input,
+switch.brown.checked .uni-switch-input,
+checkbox.brown.checked .uni-checkbox-input,
+radio.brown.checked .uni-radio-input {
+	background-color: #a5673f !important;
+	border-color: #a5673f !important;
+	color: #ffffff !important;
+}
+
+switch.grey[checked] .wx-switch-input,
+checkbox.grey[checked] .wx-checkbox-input,
+radio.grey[checked] .wx-radio-input,
+switch.grey.checked .uni-switch-input,
+checkbox.grey.checked .uni-checkbox-input,
+radio.grey.checked .uni-radio-input {
+	background-color: #8799a3 !important;
+	border-color: #8799a3 !important;
+	color: #ffffff !important;
+}
+
+switch.gray[checked] .wx-switch-input,
+checkbox.gray[checked] .wx-checkbox-input,
+radio.gray[checked] .wx-radio-input,
+switch.gray.checked .uni-switch-input,
+checkbox.gray.checked .uni-checkbox-input,
+radio.gray.checked .uni-radio-input {
+	background-color: #f0f0f0 !important;
+	border-color: #f0f0f0 !important;
+	color: #333333 !important;
+}
+
+switch.black[checked] .wx-switch-input,
+checkbox.black[checked] .wx-checkbox-input,
+radio.black[checked] .wx-radio-input,
+switch.black.checked .uni-switch-input,
+checkbox.black.checked .uni-checkbox-input,
+radio.black.checked .uni-radio-input {
+	background-color: #333333 !important;
+	border-color: #333333 !important;
+	color: #ffffff !important;
+}
+
+switch.white[checked] .wx-switch-input,
+checkbox.white[checked] .wx-checkbox-input,
+radio.white[checked] .wx-radio-input,
+switch.white.checked .uni-switch-input,
+checkbox.white.checked .uni-checkbox-input,
+radio.white.checked .uni-radio-input {
+	background-color: #ffffff !important;
+	border-color: #ffffff !important;
+	color: #333333 !important;
+}
+
+/* ==================
+          边框
+ ==================== */
+
+/* -- 实线 -- */
+
+.solid,
+.solid-top,
+.solid-right,
+.solid-bottom,
+.solid-left,
+.solids,
+.solids-top,
+.solids-right,
+.solids-bottom,
+.solids-left,
+.dashed,
+.dashed-top,
+.dashed-right,
+.dashed-bottom,
+.dashed-left {
+	position: relative;
+}
+
+.solid::after,
+.solid-top::after,
+.solid-right::after,
+.solid-bottom::after,
+.solid-left::after,
+.solids::after,
+.solids-top::after,
+.solids-right::after,
+.solids-bottom::after,
+.solids-left::after,
+.dashed::after,
+.dashed-top::after,
+.dashed-right::after,
+.dashed-bottom::after,
+.dashed-left::after {
+	content: " ";
+	width: 200%;
+	height: 200%;
+	position: absolute;
+	top: 0;
+	left: 0;
+	border-radius: inherit;
+	transform: scale(0.5);
+	transform-origin: 0 0;
+	pointer-events: none;
+	box-sizing: border-box;
+}
+
+.solid::after {
+	border: 1upx solid rgba(0, 0, 0, 0.1);
+}
+
+.solid-top::after {
+	border-top: 1upx solid rgba(0, 0, 0, 0.1);
+}
+
+.solid-right::after {
+	border-right: 1upx solid rgba(0, 0, 0, 0.1);
+}
+
+.solid-bottom::after {
+	border-bottom: 1upx solid rgba(0, 0, 0, 0.1);
+}
+
+.solid-left::after {
+	border-left: 1upx solid rgba(0, 0, 0, 0.1);
+}
+
+.solids::after {
+	border: 8upx solid #eee;
+}
+
+.solids-top::after {
+	border-top: 8upx solid #eee;
+}
+
+.solids-right::after {
+	border-right: 8upx solid #eee;
+}
+
+.solids-bottom::after {
+	border-bottom: 8upx solid #eee;
+}
+
+.solids-left::after {
+	border-left: 8upx solid #eee;
+}
+
+/* -- 虚线 -- */
+
+.dashed::after {
+	border: 1upx dashed #ddd;
+}
+
+.dashed-top::after {
+	border-top: 1upx dashed #ddd;
+}
+
+.dashed-right::after {
+	border-right: 1upx dashed #ddd;
+}
+
+.dashed-bottom::after {
+	border-bottom: 1upx dashed #ddd;
+}
+
+.dashed-left::after {
+	border-left: 1upx dashed #ddd;
+}
+
+/* -- 阴影 -- */
+
+.shadow[class*='white'] {
+	--ShadowSize: 0 1upx 6upx;
+}
+
+.shadow-lg {
+	--ShadowSize: 0upx 40upx 100upx 0upx;
+}
+
+.shadow-warp {
+	position: relative;
+	box-shadow: 0 0 10upx rgba(0, 0, 0, 0.1);
+}
+
+.shadow-warp:before,
+.shadow-warp:after {
+	position: absolute;
+	content: "";
+	top: 20upx;
+	bottom: 30upx;
+	left: 20upx;
+	width: 50%;
+	box-shadow: 0 30upx 20upx rgba(0, 0, 0, 0.2);
+	transform: rotate(-3deg);
+	z-index: -1;
+}
+
+.shadow-warp:after {
+	right: 20upx;
+	left: auto;
+	transform: rotate(3deg);
+}
+
+.shadow-blur {
+	position: relative;
+}
+
+.shadow-blur::before {
+	content: "";
+	display: block;
+	background: inherit;
+	filter: blur(10upx);
+	position: absolute;
+	width: 100%;
+	height: 100%;
+	top: 10upx;
+	left: 10upx;
+	z-index: -1;
+	opacity: 0.4;
+	transform-origin: 0 0;
+	border-radius: inherit;
+	transform: scale(1, 1);
+}
+
+/* ==================
+          按钮
+ ==================== */
+
+.cu-btn {
+	position: relative;
+	border: 0upx;
+	display: inline-flex;
+	align-items: center;
+	justify-content: center;
+	box-sizing: border-box;
+	padding: 0 30upx;
+	font-size: 28upx;
+	height: 64upx;
+	line-height: 1;
+	text-align: center;
+	text-decoration: none;
+	overflow: visible;
+	margin-left: initial;
+	transform: translate(0upx, 0upx);
+	margin-right: initial;
+}
+
+.cu-btn::after {
+	display: none;
+}
+
+.cu-btn:not([class*="bg-"]) {
+	background-color: #f0f0f0;
+}
+
+.cu-btn[class*="line"] {
+	background-color: transparent;
+}
+
+.cu-btn[class*="line"]::after {
+	content: " ";
+	display: block;
+	width: 200%;
+	height: 200%;
+	position: absolute;
+	top: 0;
+	left: 0;
+	border: 1upx solid currentColor;
+	transform: scale(0.5);
+	transform-origin: 0 0;
+	box-sizing: border-box;
+	border-radius: 12upx;
+	z-index: 1;
+	pointer-events: none;
+}
+
+.cu-btn.round[class*="line"]::after {
+	border-radius: 1000upx;
+}
+
+.cu-btn[class*="lines"]::after {
+	border: 6upx solid currentColor;
+}
+
+.cu-btn[class*="bg-"]::after {
+	display: none;
+}
+
+.cu-btn.sm {
+	padding: 0 20upx;
+	font-size: 20upx;
+	height: 48upx;
+}
+
+.cu-btn.lg {
+	padding: 0 40upx;
+	font-size: 32upx;
+	height: 80upx;
+}
+
+.cu-btn.cuIcon.sm {
+	width: 48upx;
+	height: 48upx;
+}
+
+.cu-btn.cuIcon {
+	width: 64upx;
+	height: 64upx;
+	border-radius: 500upx;
+	padding: 0;
+}
+
+button.cuIcon.lg {
+	width: 80upx;
+	height: 80upx;
+}
+
+.cu-btn.shadow-blur::before {
+	top: 4upx;
+	left: 4upx;
+	filter: blur(6upx);
+	opacity: 0.6;
+}
+
+.cu-btn.button-hover {
+	transform: translate(1upx, 1upx);
+}
+
+.block {
+	display: block;
+}
+
+.cu-btn.block {
+	display: flex;
+}
+
+.cu-btn[disabled] {
+	opacity: 0.6;
+	color: #ffffff;
+}
+
+/* ==================
+          徽章
+ ==================== */
+
+.cu-tag {
+	font-size: 24upx;
+	vertical-align: middle;
+	position: relative;
+	display: inline-flex;
+	align-items: center;
+	justify-content: center;
+	box-sizing: border-box;
+	padding: 0upx 16upx;
+	height: 48upx;
+	font-family: Helvetica Neue, Helvetica, sans-serif;
+	white-space: nowrap;
+}
+
+.cu-tag:not([class*="bg"]):not([class*="line"]) {
+	background-color: #f1f1f1;
+}
+
+.cu-tag[class*="line-"]::after {
+	content: " ";
+	width: 200%;
+	height: 200%;
+	position: absolute;
+	top: 0;
+	left: 0;
+	border: 1upx solid currentColor;
+	transform: scale(0.5);
+	transform-origin: 0 0;
+	box-sizing: border-box;
+	border-radius: inherit;
+	z-index: 1;
+	pointer-events: none;
+}
+
+.cu-tag.radius[class*="line"]::after {
+	border-radius: 12upx;
+}
+
+.cu-tag.round[class*="line"]::after {
+	border-radius: 1000upx;
+}
+
+.cu-tag[class*="line-"]::after {
+	border-radius: 0;
+}
+
+.cu-tag+.cu-tag {
+	margin-left: 10upx;
+}
+
+.cu-tag.sm {
+	font-size: 20upx;
+	padding: 0upx 12upx;
+	height: 32upx;
+}
+
+.cu-capsule {
+	display: inline-flex;
+	vertical-align: middle;
+}
+
+.cu-capsule+.cu-capsule {
+	margin-left: 10upx;
+}
+
+.cu-capsule .cu-tag {
+	margin: 0;
+}
+
+.cu-capsule .cu-tag[class*="line-"]:last-child::after {
+	border-left: 0upx solid transparent;
+}
+
+.cu-capsule .cu-tag[class*="line-"]:first-child::after {
+	border-right: 0upx solid transparent;
+}
+
+.cu-capsule.radius .cu-tag:first-child {
+	border-top-left-radius: 6upx;
+	border-bottom-left-radius: 6upx;
+}
+
+.cu-capsule.radius .cu-tag:last-child::after,
+.cu-capsule.radius .cu-tag[class*="line-"] {
+	border-top-right-radius: 12upx;
+	border-bottom-right-radius: 12upx;
+}
+
+.cu-capsule.round .cu-tag:first-child {
+	border-top-left-radius: 200upx;
+	border-bottom-left-radius: 200upx;
+	text-indent: 4upx;
+}
+
+.cu-capsule.round .cu-tag:last-child::after,
+.cu-capsule.round .cu-tag:last-child {
+	border-top-right-radius: 200upx;
+	border-bottom-right-radius: 200upx;
+	text-indent: -4upx;
+}
+
+.cu-tag.badge {
+	border-radius: 200upx;
+	position: absolute;
+	top: -10upx;
+	right: -10upx;
+	font-size: 20upx;
+	padding: 0upx 10upx;
+	height: 28upx;
+	color: #ffffff;
+}
+
+.cu-tag.badge:not([class*="bg-"]) {
+	background-color: #dd514c;
+}
+
+.cu-tag:empty:not([class*="cuIcon-"]) {
+	padding: 0upx;
+	width: 16upx;
+	height: 16upx;
+	top: -4upx;
+	right: -4upx;
+}
+
+.cu-tag[class*="cuIcon-"] {
+	width: 32upx;
+	height: 32upx;
+	top: -4upx;
+	right: -4upx;
+}
+
+/* ==================
+          头像
+ ==================== */
+
+.cu-avatar {
+	font-variant: small-caps;
+	margin: 0;
+	padding: 0;
+	display: inline-flex;
+	text-align: center;
+	justify-content: center;
+	align-items: center;
+	background-color: #ccc;
+	color: #ffffff;
+	white-space: nowrap;
+	position: relative;
+	width: 64upx;
+	height: 64upx;
+	background-size: cover;
+	background-position: center;
+	vertical-align: middle;
+	font-size: 1.5em;
+}
+
+.cu-avatar.sm {
+	width: 48upx;
+	height: 48upx;
+	font-size: 1em;
+}
+
+.cu-avatar.lg {
+	width: 96upx;
+	height: 96upx;
+	font-size: 2em;
+}
+
+.cu-avatar.xl {
+	width: 128upx;
+	height: 128upx;
+	font-size: 2.5em;
+}
+
+.cu-avatar .avatar-text {
+	font-size: 0.4em;
+}
+
+.cu-avatar-group {
+	direction: rtl;
+	unicode-bidi: bidi-override;
+	padding: 0 10upx 0 40upx;
+	display: inline-block;
+}
+
+.cu-avatar-group .cu-avatar {
+	margin-left: -30upx;
+	border: 4upx solid #f1f1f1;
+	vertical-align: middle;
+}
+
+.cu-avatar-group .cu-avatar.sm {
+	margin-left: -20upx;
+	border: 1upx solid #f1f1f1;
+}
+
+/* ==================
+         进度条
+ ==================== */
+
+.cu-progress {
+	overflow: hidden;
+	height: 28upx;
+	background-color: #ebeef5;
+	display: inline-flex;
+	align-items: center;
+	width: 100%;
+}
+
+.cu-progress+view,
+.cu-progress+text {
+	line-height: 1;
+}
+
+.cu-progress.xs {
+	height: 10upx;
+}
+
+.cu-progress.sm {
+	height: 20upx;
+}
+
+.cu-progress view {
+	width: 0;
+	height: 100%;
+	align-items: center;
+	display: flex;
+	justify-items: flex-end;
+	justify-content: space-around;
+	font-size: 20upx;
+	color: #ffffff;
+	transition: width 0.6s ease;
+}
+
+.cu-progress text {
+	align-items: center;
+	display: flex;
+	font-size: 20upx;
+	color: #333333;
+	text-indent: 10upx;
+}
+
+.cu-progress.text-progress {
+	padding-right: 60upx;
+}
+
+.cu-progress.striped view {
+	background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+	background-size: 72upx 72upx;
+}
+
+.cu-progress.active view {
+	animation: progress-stripes 2s linear infinite;
+}
+
+@keyframes progress-stripes {
+	from {
+		background-position: 72upx 0;
+	}
+
+	to {
+		background-position: 0 0;
+	}
+}
+
+/* ==================
+          加载
+ ==================== */
+
+.cu-load {
+	display: block;
+	line-height: 3em;
+	text-align: center;
+}
+
+.cu-load::before {
+	font-family: "cuIcon";
+	display: inline-block;
+	margin-right: 6upx;
+}
+
+.cu-loda.loadmore::before {
+	content: "加载更多";
+}
+
+.cu-load.loading::before {
+	content: "\e67a";
+	animation: cuIcon-spin 2s infinite linear;
+}
+
+.cu-load.loading::after {
+	content: "加载中...";
+}
+
+.cu-load.nomore::before {
+	content: "\e64a";
+}
+
+.cu-load.nomore::after {
+	content: "没有更多了";
+}
+
+.cu-load.erro::before {
+	content: "\e658";
+}
+
+.cu-load.erro::after {
+	content: "加载失败";
+}
+
+.cu-load.load-cuIcon::before {
+	font-size: 32upx;
+}
+
+.cu-load.load-cuIcon::after {
+	display: none;
+}
+
+.cu-load.load-cuIcon.over {
+	display: none;
+}
+
+.cu-load.load-modal {
+	position: fixed;
+	top: 0;
+	right: 0;
+	bottom: 140upx;
+	left: 0;
+	margin: auto;
+	width: 260upx;
+	height: 260upx;
+	background-color: #ffffff;
+	border-radius: 10upx;
+	box-shadow: 0 0 0upx 2000upx rgba(0, 0, 0, 0.5);
+	display: flex;
+	align-items: center;
+	flex-direction: column;
+	justify-content: center;
+	font-size: 28upx;
+	z-index: 9999;
+	line-height: 2.4em;
+}
+
+.cu-load.load-modal [class*="cuIcon-"] {
+	font-size: 60upx;
+}
+
+.cu-load.load-modal image {
+	width: 70upx;
+	height: 70upx;
+}
+
+.cu-load.load-modal::after {
+	content: "";
+	position: absolute;
+	background-color: #ffffff;
+	border-radius: 50%;
+	width: 200upx;
+	height: 200upx;
+	font-size: 10px;
+	border-top: 6upx solid rgba(0, 0, 0, 0.05);
+	border-right: 6upx solid rgba(0, 0, 0, 0.05);
+	border-bottom: 6upx solid rgba(0, 0, 0, 0.05);
+	border-left: 6upx solid #f37b1d;
+	animation: cuIcon-spin 1s infinite linear;
+	z-index: -1;
+}
+
+.load-progress {
+	pointer-events: none;
+	top: 0;
+	position: fixed;
+	width: 100%;
+	left: 0;
+	z-index: 2000;
+}
+
+.load-progress.hide {
+	display: none;
+}
+
+.load-progress .load-progress-bar {
+	position: relative;
+	width: 100%;
+	height: 4upx;
+	overflow: hidden;
+	transition: all 200ms ease 0s;
+}
+
+.load-progress .load-progress-spinner {
+	position: absolute;
+	top: 10upx;
+	right: 10upx;
+	z-index: 2000;
+	display: block;
+}
+
+.load-progress .load-progress-spinner::after {
+	content: "";
+	display: block;
+	width: 24upx;
+	height: 24upx;
+	-webkit-box-sizing: border-box;
+	box-sizing: border-box;
+	border: solid 4upx transparent;
+	border-top-color: inherit;
+	border-left-color: inherit;
+	border-radius: 50%;
+	-webkit-animation: load-progress-spinner 0.4s linear infinite;
+	animation: load-progress-spinner 0.4s linear infinite;
+}
+
+@-webkit-keyframes load-progress-spinner {
+	0% {
+		-webkit-transform: rotate(0);
+		transform: rotate(0);
+	}
+
+	100% {
+		-webkit-transform: rotate(360deg);
+		transform: rotate(360deg);
+	}
+}
+
+@keyframes load-progress-spinner {
+	0% {
+		-webkit-transform: rotate(0);
+		transform: rotate(0);
+	}
+
+	100% {
+		-webkit-transform: rotate(360deg);
+		transform: rotate(360deg);
+	}
+}
+
+/* ==================
+          列表
+ ==================== */
+.grayscale {
+	filter: grayscale(1);
+}
+
+.cu-list+.cu-list {
+	margin-top: 30upx
+}
+
+.cu-list>.cu-item {
+	transition: all .6s ease-in-out 0s;
+	transform: translateX(0upx)
+}
+
+.cu-list>.cu-item.move-cur {
+	transform: translateX(-260upx)
+}
+
+.cu-list>.cu-item .move {
+	position: absolute;
+	right: 0;
+	display: flex;
+	width: 260upx;
+	height: 100%;
+	transform: translateX(100%)
+}
+
+.cu-list>.cu-item .move view {
+	display: flex;
+	flex: 1;
+	justify-content: center;
+	align-items: center
+}
+
+.cu-list.menu-avatar {
+	overflow: hidden;
+}
+
+.cu-list.menu-avatar>.cu-item {
+	position: relative;
+	display: flex;
+	padding-right: 10upx;
+	height: 140upx;
+	background-color: #ffffff;
+	justify-content: flex-end;
+	align-items: center
+}
+
+.cu-list.menu-avatar>.cu-item>.cu-avatar {
+	position: absolute;
+	left: 30upx
+}
+
+.cu-list.menu-avatar>.cu-item .flex .text-cut {
+	max-width: 510upx
+}
+
+.cu-list.menu-avatar>.cu-item .content {
+	position: absolute;
+	left: 146upx;
+	width: calc(100% - 96upx - 60upx - 120upx - 20upx);
+	line-height: 1.6em;
+}
+
+.cu-list.menu-avatar>.cu-item .content.flex-sub {
+	width: calc(100% - 96upx - 60upx - 20upx);
+}
+
+.cu-list.menu-avatar>.cu-item .content>view:first-child {
+	font-size: 30upx;
+	display: flex;
+	align-items: center
+}
+
+.cu-list.menu-avatar>.cu-item .content .cu-tag.sm {
+	display: inline-block;
+	margin-left: 10upx;
+	height: 28upx;
+	font-size: 16upx;
+	line-height: 32upx
+}
+
+.cu-list.menu-avatar>.cu-item .action {
+	width: 100upx;
+	text-align: center
+}
+
+.cu-list.menu-avatar>.cu-item .action view+view {
+	margin-top: 10upx
+}
+
+.cu-list.menu-avatar.comment>.cu-item .content {
+	position: relative;
+	left: 0;
+	width: auto;
+	flex: 1;
+}
+
+.cu-list.menu-avatar.comment>.cu-item {
+	padding: 30upx 30upx 30upx 120upx;
+	height: auto
+}
+
+.cu-list.menu-avatar.comment .cu-avatar {
+	align-self: flex-start
+}
+
+.cu-list.menu>.cu-item {
+	position: relative;
+	display: flex;
+	padding: 0 30upx;
+	min-height: 100upx;
+	background-color: #ffffff;
+	justify-content: space-between;
+	align-items: center
+}
+
+.cu-list.menu>.cu-item:last-child:after {
+	border: none
+}
+
+.cu-list.menu-avatar>.cu-item:after,
+.cu-list.menu>.cu-item:after {
+	position: absolute;
+	top: 0;
+	left: 0;
+	box-sizing: border-box;
+	width: 200%;
+	height: 200%;
+	border-bottom: 1upx solid #ddd;
+	border-radius: inherit;
+	content: " ";
+	transform: scale(.5);
+	transform-origin: 0 0;
+	pointer-events: none
+}
+
+.cu-list.menu>.cu-item.grayscale {
+	background-color: #f5f5f5
+}
+
+.cu-list.menu>.cu-item.cur {
+	background-color: #fcf7e9
+}
+
+.cu-list.menu>.cu-item.arrow {
+	padding-right: 90upx
+}
+
+.cu-list.menu>.cu-item.arrow:before {
+	position: absolute;
+	top: 0;
+	right: 30upx;
+	bottom: 0;
+	display: block;
+	margin: auto;
+	width: 30upx;
+	height: 30upx;
+	color: #8799a3;
+	content: "\e6a3";
+	text-align: center;
+	font-size: 34upx;
+	font-family: cuIcon;
+	line-height: 30upx
+}
+
+.cu-list.menu>.cu-item button.content {
+	padding: 0;
+	background-color: transparent;
+	justify-content: flex-start
+}
+
+.cu-list.menu>.cu-item button.content:after {
+	display: none
+}
+
+.cu-list.menu>.cu-item .cu-avatar-group .cu-avatar {
+	border-color: #ffffff
+}
+
+.cu-list.menu>.cu-item .content>view:first-child {
+	display: flex;
+	align-items: center
+}
+
+.cu-list.menu>.cu-item .content>text[class*=cuIcon] {
+	display: inline-block;
+	margin-right: 10upx;
+	width: 1.6em;
+	text-align: center
+}
+
+.cu-list.menu>.cu-item .content>image {
+	display: inline-block;
+	margin-right: 10upx;
+	width: 1.6em;
+	height: 1.6em;
+	vertical-align: middle
+}
+
+.cu-list.menu>.cu-item .content {
+	font-size: 30upx;
+	line-height: 1.6em;
+	flex: 1
+}
+
+.cu-list.menu>.cu-item .content .cu-tag.sm {
+	display: inline-block;
+	margin-left: 10upx;
+	height: 28upx;
+	font-size: 16upx;
+	line-height: 32upx
+}
+
+.cu-list.menu>.cu-item .action .cu-tag:empty {
+	right: 10upx
+}
+
+.cu-list.menu {
+	display: block;
+	overflow: hidden
+}
+
+.cu-list.menu.sm-border>.cu-item:after {
+	left: 30upx;
+	width: calc(200% - 120upx)
+}
+
+.cu-list.grid>.cu-item {
+	position: relative;
+	display: flex;
+	padding: 20upx 0 30upx;
+	transition-duration: 0s;
+	flex-direction: column
+}
+
+.cu-list.grid>.cu-item:after {
+	position: absolute;
+	top: 0;
+	left: 0;
+	box-sizing: border-box;
+	width: 200%;
+	height: 200%;
+	border-right: 1px solid rgba(0, 0, 0, .1);
+	border-bottom: 1px solid rgba(0, 0, 0, .1);
+	border-radius: inherit;
+	content: " ";
+	transform: scale(.5);
+	transform-origin: 0 0;
+	pointer-events: none
+}
+
+.cu-list.grid>.cu-item text {
+	display: block;
+	margin-top: 10upx;
+	color: #888;
+	font-size: 26upx;
+	line-height: 40upx
+}
+
+.cu-list.grid>.cu-item [class*=cuIcon] {
+	position: relative;
+	display: block;
+	margin-top: 20upx;
+	width: 100%;
+	font-size: 48upx
+}
+
+.cu-list.grid>.cu-item .cu-tag {
+	right: auto;
+	left: 50%;
+	margin-left: 20upx
+}
+
+.cu-list.grid {
+	background-color: #ffffff;
+	text-align: center
+}
+
+.cu-list.grid.no-border>.cu-item {
+	padding-top: 10upx;
+	padding-bottom: 20upx
+}
+
+.cu-list.grid.no-border>.cu-item:after {
+	border: none
+}
+
+.cu-list.grid.no-border {
+	padding: 20upx 10upx
+}
+
+.cu-list.grid.col-3>.cu-item:nth-child(3n):after,
+.cu-list.grid.col-4>.cu-item:nth-child(4n):after,
+.cu-list.grid.col-5>.cu-item:nth-child(5n):after {
+	border-right-width: 0
+}
+
+.cu-list.card-menu {
+	overflow: hidden;
+	margin-right: 30upx;
+	margin-left: 30upx;
+	border-radius: 20upx
+}
+
+
+/* ==================
+          操作条
+ ==================== */
+
+.cu-bar {
+	display: flex;
+	position: relative;
+	align-items: center;
+	min-height: 100upx;
+	justify-content: space-between;
+}
+
+.cu-bar .action {
+	display: flex;
+	align-items: center;
+	height: 100%;
+	justify-content: center;
+	max-width: 100%;
+}
+
+.cu-bar .action.border-title {
+	position: relative;
+	top: -10upx;
+}
+
+.cu-bar .action.border-title text[class*="bg-"]:last-child {
+	position: absolute;
+	bottom: -0.5rem;
+	min-width: 2rem;
+	height: 6upx;
+	left: 0;
+}
+
+.cu-bar .action.sub-title {
+	position: relative;
+	top: -0.2rem;
+}
+
+.cu-bar .action.sub-title text {
+	position: relative;
+	z-index: 1;
+}
+
+.cu-bar .action.sub-title text[class*="bg-"]:last-child {
+	position: absolute;
+	display: inline-block;
+	bottom: -0.2rem;
+	border-radius: 6upx;
+	width: 100%;
+	height: 0.6rem;
+	left: 0.6rem;
+	opacity: 0.3;
+	z-index: 0;
+}
+
+.cu-bar .action.sub-title text[class*="text-"]:last-child {
+	position: absolute;
+	display: inline-block;
+	bottom: -0.7rem;
+	left: 0.5rem;
+	opacity: 0.2;
+	z-index: 0;
+	text-align: right;
+	font-weight: 900;
+	font-size: 36upx;
+}
+
+.cu-bar.justify-center .action.border-title text:last-child,
+.cu-bar.justify-center .action.sub-title text:last-child {
+	left: 0;
+	right: 0;
+	margin: auto;
+	text-align: center;
+}
+
+.cu-bar .action:first-child {
+	margin-left: 30upx;
+	font-size: 30upx;
+}
+
+.cu-bar .action text.text-cut {
+	text-align: left;
+	width: 100%;
+}
+
+.cu-bar .cu-avatar:first-child {
+	margin-left: 20upx;
+}
+
+.cu-bar .action:first-child>text[class*="cuIcon-"] {
+	margin-left: -0.3em;
+	margin-right: 0.3em;
+}
+
+.cu-bar .action:last-child {
+	margin-right: 30upx;
+}
+
+.cu-bar .action>text[class*="cuIcon-"],
+.cu-bar .action>view[class*="cuIcon-"] {
+	font-size: 36upx;
+}
+
+.cu-bar .action>text[class*="cuIcon-"]+text[class*="cuIcon-"] {
+	margin-left: 0.5em;
+}
+
+.cu-bar .content {
+	position: absolute;
+	text-align: center;
+	width: calc(100% - 340upx);
+	left: 0;
+	right: 0;
+	bottom: 0;
+	top: 0;
+	margin: auto;
+	height: 60upx;
+	font-size: 32upx;
+	line-height: 60upx;
+	cursor: none;
+	pointer-events: none;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+	overflow: hidden;
+}
+
+.cu-bar.ios .content {
+	bottom: 7px;
+	height: 30px;
+	font-size: 32upx;
+	line-height: 30px;
+}
+
+.cu-bar.btn-group {
+	justify-content: space-around;
+}
+
+.cu-bar.btn-group button {
+	padding: 20upx 32upx;
+}
+
+.cu-bar.btn-group button {
+	flex: 1;
+	margin: 0 20upx;
+	max-width: 50%;
+}
+
+.cu-bar .search-form {
+	background-color: #f5f5f5;
+	line-height: 64upx;
+	height: 64upx;
+	font-size: 24upx;
+	color: #333333;
+	flex: 1;
+	display: flex;
+	align-items: center;
+	margin: 0 30upx;
+}
+
+.cu-bar .search-form+.action {
+	margin-right: 30upx;
+}
+
+.cu-bar .search-form input {
+	flex: 1;
+	padding-right: 30upx;
+	height: 64upx;
+	line-height: 64upx;
+	font-size: 26upx;
+	background-color: transparent;
+}
+
+.cu-bar .search-form [class*="cuIcon-"] {
+	margin: 0 0.5em 0 0.8em;
+}
+
+.cu-bar .search-form [class*="cuIcon-"]::before {
+	top: 0upx;
+}
+
+.cu-bar.fixed,
+.nav.fixed {
+	position: fixed;
+	width: 100%;
+	top: 0;
+	z-index: 1024;
+	box-shadow: 0 1upx 6upx rgba(0, 0, 0, 0.1);
+}
+
+.cu-bar.foot {
+	position: fixed;
+	width: 100%;
+	bottom: 0;
+	z-index: 1024;
+	box-shadow: 0 -1upx 6upx rgba(0, 0, 0, 0.1);
+}
+
+.cu-bar.tabbar {
+	padding: 0;
+	height: calc(100upx + env(safe-area-inset-bottom) / 2);
+	padding-bottom: calc(env(safe-area-inset-bottom) / 2);
+}
+
+.cu-tabbar-height {
+	min-height: 100upx;
+	height: calc(100upx + env(safe-area-inset-bottom) / 2);
+}
+
+.cu-bar.tabbar.shadow {
+	box-shadow: 0 -1upx 6upx rgba(0, 0, 0, 0.1);
+}
+
+.cu-bar.tabbar .action {
+	font-size: 22upx;
+	position: relative;
+	flex: 1;
+	text-align: center;
+	padding: 0;
+	display: block;
+	height: auto;
+	line-height: 1;
+	margin: 0;
+	background-color: inherit;
+	overflow: initial;
+}
+
+.cu-bar.tabbar.shop .action {
+	width: 140upx;
+	flex: initial;
+}
+
+.cu-bar.tabbar .action.add-action {
+	position: relative;
+	z-index: 2;
+	padding-top: 50upx;
+}
+
+.cu-bar.tabbar .action.add-action [class*="cuIcon-"] {
+	position: absolute;
+	width: 70upx;
+	z-index: 2;
+	height: 70upx;
+	border-radius: 50%;
+	line-height: 70upx;
+	font-size: 50upx;
+	top: -35upx;
+	left: 0;
+	right: 0;
+	margin: auto;
+	padding: 0;
+}
+
+.cu-bar.tabbar .action.add-action::after {
+	content: "";
+	position: absolute;
+	width: 100upx;
+	height: 100upx;
+	top: -50upx;
+	left: 0;
+	right: 0;
+	margin: auto;
+	box-shadow: 0 -3upx 8upx rgba(0, 0, 0, 0.08);
+	border-radius: 50upx;
+	background-color: inherit;
+	z-index: 0;
+}
+
+.cu-bar.tabbar .action.add-action::before {
+	content: "";
+	position: absolute;
+	width: 100upx;
+	height: 30upx;
+	bottom: 30upx;
+	left: 0;
+	right: 0;
+	margin: auto;
+	background-color: inherit;
+	z-index: 1;
+}
+
+.cu-bar.tabbar .btn-group {
+	flex: 1;
+	display: flex;
+	justify-content: space-around;
+	align-items: center;
+	padding: 0 10upx;
+}
+
+.cu-bar.tabbar button.action::after {
+	border: 0;
+}
+
+.cu-bar.tabbar .action [class*="cuIcon-"] {
+	width: 100upx;
+	position: relative;
+	display: block;
+	height: auto;
+	margin: 0 auto 10upx;
+	text-align: center;
+	font-size: 40upx;
+}
+
+.cu-bar.tabbar .action .cuIcon-cu-image {
+	margin: 0 auto;
+}
+
+.cu-bar.tabbar .action .cuIcon-cu-image image {
+	width: 50upx;
+	height: 50upx;
+	display: inline-block;
+}
+
+.cu-bar.tabbar .submit {
+	align-items: center;
+	display: flex;
+	justify-content: center;
+	text-align: center;
+	position: relative;
+	flex: 2;
+	align-self: stretch;
+}
+
+.cu-bar.tabbar .submit:last-child {
+	flex: 2.6;
+}
+
+.cu-bar.tabbar .submit+.submit {
+	flex: 2;
+}
+
+.cu-bar.tabbar.border .action::before {
+	content: " ";
+	width: 200%;
+	height: 200%;
+	position: absolute;
+	top: 0;
+	left: 0;
+	transform: scale(0.5);
+	transform-origin: 0 0;
+	border-right: 1upx solid rgba(0, 0, 0, 0.1);
+	z-index: 3;
+}
+
+.cu-bar.tabbar.border .action:last-child:before {
+	display: none;
+}
+
+.cu-bar.input {
+	padding-right: 20upx;
+	background-color: #ffffff;
+}
+
+.cu-bar.input input {
+	overflow: initial;
+	line-height: 64upx;
+	height: 64upx;
+	min-height: 64upx;
+	flex: 1;
+	font-size: 30upx;
+	margin: 0 20upx;
+}
+
+.cu-bar.input .action {
+	margin-left: 20upx;
+}
+
+.cu-bar.input .action [class*="cuIcon-"] {
+	font-size: 48upx;
+}
+
+.cu-bar.input input+.action {
+	margin-right: 20upx;
+	margin-left: 0upx;
+}
+
+.cu-bar.input .action:first-child [class*="cuIcon-"] {
+	margin-left: 0upx;
+}
+
+.cu-custom {
+	display: block;
+	position: relative;
+}
+
+.cu-custom .cu-bar .content {
+	width: calc(100% - 440upx);
+}
+
+/* #ifdef MP-ALIPAY */
+.cu-custom .cu-bar .action .cuIcon-back {
+	opacity: 0;
+}
+
+/* #endif */
+
+.cu-custom .cu-bar .content image {
+	height: 60upx;
+	width: 240upx;
+}
+
+.cu-custom .cu-bar {
+	min-height: 0px;
+	/* #ifdef MP-WEIXIN */
+	padding-right: 220upx;
+	/* #endif */
+	/* #ifdef MP-ALIPAY */
+	padding-right: 150upx;
+	/* #endif */
+	box-shadow: 0upx 0upx 0upx;
+	z-index: 9999;
+}
+
+.cu-custom .cu-bar .border-custom {
+	position: relative;
+	background: rgba(0, 0, 0, 0.15);
+	border-radius: 1000upx;
+	height: 30px;
+}
+
+.cu-custom .cu-bar .border-custom::after {
+	content: " ";
+	width: 200%;
+	height: 200%;
+	position: absolute;
+	top: 0;
+	left: 0;
+	border-radius: inherit;
+	transform: scale(0.5);
+	transform-origin: 0 0;
+	pointer-events: none;
+	box-sizing: border-box;
+	border: 1upx solid #ffffff;
+	opacity: 0.5;
+}
+
+.cu-custom .cu-bar .border-custom::before {
+	content: " ";
+	width: 1upx;
+	height: 110%;
+	position: absolute;
+	top: 22.5%;
+	left: 0;
+	right: 0;
+	margin: auto;
+	transform: scale(0.5);
+	transform-origin: 0 0;
+	pointer-events: none;
+	box-sizing: border-box;
+	opacity: 0.6;
+	background-color: #ffffff;
+}
+
+.cu-custom .cu-bar .border-custom text {
+	display: block;
+	flex: 1;
+	margin: auto !important;
+	text-align: center;
+	font-size: 34upx;
+}
+
+/* ==================
+         导航栏
+ ==================== */
+
+.nav {
+	white-space: nowrap;
+}
+
+::-webkit-scrollbar {
+	display: none;
+}
+
+.nav .cu-item {
+	height: 90upx;
+	display: inline-block;
+	line-height: 90upx;
+	margin: 0 10upx;
+	padding: 0 20upx;
+}
+
+.nav .cu-item.cur {
+	border-bottom: 4upx solid;
+}
+
+/* ==================
+         时间轴
+ ==================== */
+
+.cu-timeline {
+	display: block;
+	background-color: #ffffff;
+}
+
+.cu-timeline .cu-time {
+	width: 120upx;
+	text-align: center;
+	padding: 20upx 0;
+	font-size: 26upx;
+	color: #888;
+	display: block;
+}
+
+.cu-timeline>.cu-item {
+	padding: 30upx 30upx 30upx 120upx;
+	position: relative;
+	display: block;
+	z-index: 0;
+}
+
+.cu-timeline>.cu-item:not([class*="text-"]) {
+	color: #ccc;
+}
+
+.cu-timeline>.cu-item::after {
+	content: "";
+	display: block;
+	position: absolute;
+	width: 1upx;
+	background-color: #ddd;
+	left: 60upx;
+	height: 100%;
+	top: 0;
+	z-index: 8;
+}
+
+.cu-timeline>.cu-item::before {
+	font-family: "cuIcon";
+	display: block;
+	position: absolute;
+	top: 36upx;
+	z-index: 9;
+	background-color: #ffffff;
+	width: 50upx;
+	height: 50upx;
+	text-align: center;
+	border: none;
+	line-height: 50upx;
+	left: 36upx;
+}
+
+.cu-timeline>.cu-item:not([class*="cuIcon-"])::before {
+	content: "\e763";
+}
+
+.cu-timeline>.cu-item[class*="cuIcon-"]::before {
+	background-color: #ffffff;
+	width: 50upx;
+	height: 50upx;
+	text-align: center;
+	border: none;
+	line-height: 50upx;
+	left: 36upx;
+}
+
+.cu-timeline>.cu-item>.content {
+	padding: 30upx;
+	border-radius: 6upx;
+	display: block;
+	line-height: 1.6;
+}
+
+.cu-timeline>.cu-item>.content:not([class*="bg-"]) {
+	background-color: #f1f1f1;
+	color: #333333;
+}
+
+.cu-timeline>.cu-item>.content+.content {
+	margin-top: 20upx;
+}
+
+/* ==================
+         聊天
+ ==================== */
+
+.cu-chat {
+	display: flex;
+	flex-direction: column;
+}
+
+.cu-chat .cu-item {
+	display: flex;
+	padding: 30upx 30upx 70upx;
+	position: relative;
+}
+
+.cu-chat .cu-item>.cu-avatar {
+	width: 80upx;
+	height: 80upx;
+}
+
+.cu-chat .cu-item>.main {
+	max-width: calc(100% - 260upx);
+	margin: 0 40upx;
+	display: flex;
+	align-items: center;
+}
+
+.cu-chat .cu-item>image {
+	height: 320upx;
+}
+
+.cu-chat .cu-item>.main .content {
+	padding: 20upx;
+	border-radius: 6upx;
+	display: inline-flex;
+	max-width: 100%;
+	align-items: center;
+	font-size: 30upx;
+	position: relative;
+	min-height: 80upx;
+	line-height: 40upx;
+	text-align: left;
+}
+
+.cu-chat .cu-item>.main .content:not([class*="bg-"]) {
+	background-color: #ffffff;
+	color: #333333;
+}
+
+.cu-chat .cu-item .date {
+	position: absolute;
+	font-size: 24upx;
+	color: #8799a3;
+	width: calc(100% - 320upx);
+	bottom: 20upx;
+	left: 160upx;
+}
+
+.cu-chat .cu-item .action {
+	padding: 0 30upx;
+	display: flex;
+	align-items: center;
+}
+
+.cu-chat .cu-item>.main .content::after {
+	content: "";
+	top: 27upx;
+	transform: rotate(45deg);
+	position: absolute;
+	z-index: 100;
+	display: inline-block;
+	overflow: hidden;
+	width: 24upx;
+	height: 24upx;
+	left: -12upx;
+	right: initial;
+	background-color: inherit;
+}
+
+.cu-chat .cu-item.self>.main .content::after {
+	left: auto;
+	right: -12upx;
+}
+
+.cu-chat .cu-item>.main .content::before {
+	content: "";
+	top: 30upx;
+	transform: rotate(45deg);
+	position: absolute;
+	z-index: -1;
+	display: inline-block;
+	overflow: hidden;
+	width: 24upx;
+	height: 24upx;
+	left: -12upx;
+	right: initial;
+	background-color: inherit;
+	filter: blur(5upx);
+	opacity: 0.3;
+}
+
+.cu-chat .cu-item>.main .content:not([class*="bg-"])::before {
+	background-color: #333333;
+	opacity: 0.1;
+}
+
+.cu-chat .cu-item.self>.main .content::before {
+	left: auto;
+	right: -12upx;
+}
+
+.cu-chat .cu-item.self {
+	justify-content: flex-end;
+	text-align: right;
+}
+
+.cu-chat .cu-info {
+	display: inline-block;
+	margin: 20upx auto;
+	font-size: 24upx;
+	padding: 8upx 12upx;
+	background-color: rgba(0, 0, 0, 0.2);
+	border-radius: 6upx;
+	color: #ffffff;
+	max-width: 400upx;
+	line-height: 1.4;
+}
+
+/* ==================
+         卡片
+ ==================== */
+
+.cu-card {
+	display: block;
+	overflow: hidden;
+}
+
+.cu-card>.cu-item {
+	display: block;
+	background-color: #ffffff;
+	overflow: hidden;
+	border-radius: 10upx;
+	margin: 30upx;
+}
+
+.cu-card>.cu-item.shadow-blur {
+	overflow: initial;
+}
+
+.cu-card.no-card>.cu-item {
+	margin: 0upx;
+	border-radius: 0upx;
+}
+
+.cu-card .grid.grid-square {
+	margin-bottom: -20upx;
+}
+
+.cu-card.case .image {
+	position: relative;
+}
+
+.cu-card.case .image image {
+	width: 100%;
+}
+
+.cu-card.case .image .cu-tag {
+	position: absolute;
+	right: 0;
+	top: 0;
+}
+
+.cu-card.case .image .cu-bar {
+	position: absolute;
+	bottom: 0;
+	width: 100%;
+	background-color: transparent;
+	padding: 0upx 30upx;
+}
+
+.cu-card.case.no-card .image {
+	margin: 30upx 30upx 0;
+	overflow: hidden;
+	border-radius: 10upx;
+}
+
+.cu-card.dynamic {
+	display: block;
+}
+
+.cu-card.dynamic>.cu-item {
+	display: block;
+	background-color: #ffffff;
+	overflow: hidden;
+}
+
+.cu-card.dynamic>.cu-item>.text-content {
+	padding: 0 30upx 0;
+	max-height: 6.4em;
+	overflow: hidden;
+	font-size: 30upx;
+	margin-bottom: 20upx;
+}
+
+.cu-card.dynamic>.cu-item .square-img {
+	width: 100%;
+	height: 200upx;
+	border-radius: 6upx;
+}
+
+.cu-card.dynamic>.cu-item .only-img {
+	width: 100%;
+	height: 320upx;
+	border-radius: 6upx;
+}
+
+/* card.dynamic>.cu-item .comment {
+  padding: 20upx;
+  background-color: #f1f1f1;
+  margin: 0 30upx 30upx;
+  border-radius: 6upx;
+} */
+
+.cu-card.article {
+	display: block;
+}
+
+.cu-card.article>.cu-item {
+	padding-bottom: 30upx;
+}
+
+.cu-card.article>.cu-item .title {
+	font-size: 30upx;
+	font-weight: 900;
+	color: #333333;
+	line-height: 100upx;
+	padding: 0 30upx;
+}
+
+.cu-card.article>.cu-item .content {
+	display: flex;
+	padding: 0 30upx;
+}
+
+.cu-card.article>.cu-item .content>image {
+	width: 240upx;
+	height: 6.4em;
+	margin-right: 20upx;
+	border-radius: 6upx;
+}
+
+.cu-card.article>.cu-item .content .desc {
+	flex: 1;
+	display: flex;
+	flex-direction: column;
+	justify-content: space-between;
+}
+
+.cu-card.article>.cu-item .content .text-content {
+	font-size: 28upx;
+	color: #888;
+	height: 4.8em;
+	overflow: hidden;
+}
+
+/* ==================
+         表单
+ ==================== */
+
+.cu-form-group {
+	background-color: #ffffff;
+	padding: 1upx 30upx;
+	display: flex;
+	align-items: center;
+	min-height: 100upx;
+	justify-content: space-between;
+}
+
+.cu-form-group+.cu-form-group {
+	border-top: 1upx solid #eee;
+}
+
+.cu-form-group .title {
+	text-align: justify;
+	padding-right: 30upx;
+	font-size: 30upx;
+	position: relative;
+	height: 60upx;
+	line-height: 60upx;
+}
+
+.cu-form-group input {
+	flex: 1;
+	font-size: 30upx;
+	color: #555;
+	padding-right: 20upx;
+}
+
+.cu-form-group>text[class*="cuIcon-"] {
+	font-size: 36upx;
+	padding: 0;
+	box-sizing: border-box;
+}
+
+.cu-form-group textarea {
+	margin: 32upx 0 30upx;
+	height: 4.6em;
+	width: 100%;
+	line-height: 1.2em;
+	flex: 1;
+	font-size: 28upx;
+	padding: 0;
+}
+
+.cu-form-group.align-start .title {
+	height: 1em;
+	margin-top: 32upx;
+	line-height: 1em;
+}
+
+.cu-form-group picker {
+	flex: 1;
+	padding-right: 40upx;
+	overflow: hidden;
+	position: relative;
+}
+
+.cu-form-group picker .picker {
+	line-height: 100upx;
+	font-size: 28upx;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+	overflow: hidden;
+	width: 100%;
+	text-align: right;
+}
+
+.cu-form-group picker::after {
+	font-family: cuIcon;
+	display: block;
+	content: "\e6a3";
+	position: absolute;
+	font-size: 34upx;
+	color: #8799a3;
+	line-height: 100upx;
+	width: 60upx;
+	text-align: center;
+	top: 0;
+	bottom: 0;
+	right: -20upx;
+	margin: auto;
+}
+
+.cu-form-group textarea[disabled],
+.cu-form-group textarea[disabled] .placeholder {
+	color: transparent;
+}
+
+/* ==================
+         模态窗口
+ ==================== */
+
+.cu-modal {
+	position: fixed;
+	top: 0;
+	right: 0;
+	bottom: 0;
+	left: 0;
+	z-index: 1110;
+	opacity: 0;
+	outline: 0;
+	text-align: center;
+	-ms-transform: scale(1.185);
+	transform: scale(1.185);
+	backface-visibility: hidden;
+	perspective: 2000upx;
+	background: rgba(0, 0, 0, 0.6);
+	transition: all 0.3s ease-in-out 0s;
+	pointer-events: none;
+}
+
+.cu-modal::before {
+	content: "\200B";
+	display: inline-block;
+	height: 100%;
+	vertical-align: middle;
+}
+
+.cu-modal.show {
+	opacity: 1;
+	transition-duration: 0.3s;
+	-ms-transform: scale(1);
+	transform: scale(1);
+	overflow-x: hidden;
+	overflow-y: auto;
+	pointer-events: auto;
+}
+
+.cu-dialog {
+	position: relative;
+	display: inline-block;
+	vertical-align: middle;
+	margin-left: auto;
+	margin-right: auto;
+	width: 680upx;
+	max-width: 100%;
+	background-color: #f8f8f8;
+	border-radius: 10upx;
+	overflow: hidden;
+}
+
+.cu-modal.bottom-modal::before {
+	vertical-align: bottom;
+}
+
+.cu-modal.bottom-modal .cu-dialog {
+	width: 100%;
+	border-radius: 0;
+}
+
+.cu-modal.bottom-modal {
+	margin-bottom: -1000upx;
+}
+
+.cu-modal.bottom-modal.show {
+	margin-bottom: 0;
+}
+
+.cu-modal.drawer-modal {
+	transform: scale(1);
+	display: flex;
+}
+
+.cu-modal.drawer-modal .cu-dialog {
+	height: 100%;
+	min-width: 200upx;
+	border-radius: 0;
+	margin: initial;
+	transition-duration: 0.3s;
+}
+
+.cu-modal.drawer-modal.justify-start .cu-dialog {
+	transform: translateX(-100%);
+}
+
+.cu-modal.drawer-modal.justify-end .cu-dialog {
+	transform: translateX(100%);
+}
+
+.cu-modal.drawer-modal.show .cu-dialog {
+	transform: translateX(0%);
+}
+
+.cu-modal .cu-dialog>.cu-bar:first-child .action {
+	min-width: 100rpx;
+	margin-right: 0;
+	min-height: 100rpx;
+}
+
+/* ==================
+         轮播
+ ==================== */
+swiper .a-swiper-dot {
+	display: inline-block;
+	width: 16upx;
+	height: 16upx;
+	background: rgba(0, 0, 0, .3);
+	border-radius: 50%;
+	vertical-align: middle;
+}
+
+swiper[class*="-dot"] .wx-swiper-dots,
+swiper[class*="-dot"] .a-swiper-dots,
+swiper[class*="-dot"] .uni-swiper-dots {
+	display: flex;
+	align-items: center;
+	width: 100%;
+	justify-content: center;
+}
+
+swiper.square-dot .wx-swiper-dot,
+swiper.square-dot .a-swiper-dot,
+swiper.square-dot .uni-swiper-dot {
+	background-color: #ffffff;
+	opacity: 0.4;
+	width: 10upx;
+	height: 10upx;
+	border-radius: 20upx;
+	margin: 0 8upx !important;
+}
+
+swiper.square-dot .wx-swiper-dot.wx-swiper-dot-active,
+swiper.square-dot .a-swiper-dot.a-swiper-dot-active,
+swiper.square-dot .uni-swiper-dot.uni-swiper-dot-active {
+	opacity: 1;
+	width: 30upx;
+}
+
+swiper.round-dot .wx-swiper-dot,
+swiper.round-dot .a-swiper-dot,
+swiper.round-dot .uni-swiper-dot {
+	width: 10upx;
+	height: 10upx;
+	position: relative;
+	margin: 4upx 8upx !important;
+}
+
+swiper.round-dot .wx-swiper-dot.wx-swiper-dot-active::after,
+swiper.round-dot .a-swiper-dot.a-swiper-dot-active::after,
+swiper.round-dot .uni-swiper-dot.uni-swiper-dot-active::after {
+	content: "";
+	position: absolute;
+	width: 10upx;
+	height: 10upx;
+	top: 0upx;
+	left: 0upx;
+	right: 0;
+	bottom: 0;
+	margin: auto;
+	background-color: #ffffff;
+	border-radius: 20upx;
+}
+
+swiper.round-dot .wx-swiper-dot.wx-swiper-dot-active,
+swiper.round-dot .a-swiper-dot.a-swiper-dot-active,
+swiper.round-dot .uni-swiper-dot.uni-swiper-dot-active {
+	width: 18upx;
+	height: 18upx;
+}
+
+.screen-swiper {
+	min-height: 375upx;
+}
+
+.screen-swiper image,
+.screen-swiper video,
+.swiper-item image,
+.swiper-item video {
+	width: 100%;
+	display: block;
+	height: 100%;
+	margin: 0;
+	pointer-events: none;
+}
+
+.card-swiper {
+	height: 420upx !important;
+}
+
+.card-swiper swiper-item {
+	width: 610upx !important;
+	left: 70upx;
+	box-sizing: border-box;
+	padding: 40upx 0upx 70upx;
+	overflow: initial;
+}
+
+.card-swiper swiper-item .swiper-item {
+	width: 100%;
+	display: block;
+	height: 100%;
+	border-radius: 10upx;
+	transform: scale(0.9);
+	transition: all 0.2s ease-in 0s;
+	overflow: hidden;
+}
+
+.card-swiper swiper-item.cur .swiper-item {
+	transform: none;
+	transition: all 0.2s ease-in 0s;
+}
+
+
+.tower-swiper {
+	height: 420upx;
+	position: relative;
+	max-width: 750upx;
+	overflow: hidden;
+}
+
+.tower-swiper .tower-item {
+	position: absolute;
+	width: 300upx;
+	height: 380upx;
+	top: 0;
+	bottom: 0;
+	left: 50%;
+	margin: auto;
+	transition: all 0.2s ease-in 0s;
+	opacity: 1;
+}
+
+.tower-swiper .tower-item.none {
+	opacity: 0;
+}
+
+.tower-swiper .tower-item .swiper-item {
+	width: 100%;
+	height: 100%;
+	border-radius: 6upx;
+	overflow: hidden;
+}
+
+/* ==================
+          步骤条
+ ==================== */
+
+.cu-steps {
+	display: flex;
+}
+
+scroll-view.cu-steps {
+	display: block;
+	white-space: nowrap;
+}
+
+scroll-view.cu-steps .cu-item {
+	display: inline-block;
+}
+
+.cu-steps .cu-item {
+	flex: 1;
+	text-align: center;
+	position: relative;
+	min-width: 100upx;
+}
+
+.cu-steps .cu-item:not([class*="text-"]) {
+	color: #8799a3;
+}
+
+.cu-steps .cu-item [class*="cuIcon-"],
+.cu-steps .cu-item .num {
+	display: block;
+	font-size: 40upx;
+	line-height: 80upx;
+}
+
+.cu-steps .cu-item::before,
+.cu-steps .cu-item::after,
+.cu-steps.steps-arrow .cu-item::before,
+.cu-steps.steps-arrow .cu-item::after {
+	content: "";
+	display: block;
+	position: absolute;
+	height: 0px;
+	width: calc(100% - 80upx);
+	border-bottom: 1px solid #ccc;
+	left: calc(0px - (100% - 80upx) / 2);
+	top: 40upx;
+	z-index: 0;
+}
+
+.cu-steps.steps-arrow .cu-item::before,
+.cu-steps.steps-arrow .cu-item::after {
+	content: "\e6a3";
+	font-family: 'cuIcon';
+	height: 30upx;
+	border-bottom-width: 0px;
+	line-height: 30upx;
+	top: 0;
+	bottom: 0;
+	margin: auto;
+	color: #ccc;
+}
+
+.cu-steps.steps-bottom .cu-item::before,
+.cu-steps.steps-bottom .cu-item::after {
+	bottom: 40upx;
+	top: initial;
+}
+
+.cu-steps .cu-item::after {
+	border-bottom: 1px solid currentColor;
+	width: 0px;
+	transition: all 0.3s ease-in-out 0s;
+}
+
+.cu-steps .cu-item[class*="text-"]::after {
+	width: calc(100% - 80upx);
+	color: currentColor;
+}
+
+.cu-steps .cu-item:first-child::before,
+.cu-steps .cu-item:first-child::after {
+	display: none;
+}
+
+.cu-steps .cu-item .num {
+	width: 40upx;
+	height: 40upx;
+	border-radius: 50%;
+	line-height: 40upx;
+	margin: 20upx auto;
+	font-size: 24upx;
+	border: 1px solid currentColor;
+	position: relative;
+	overflow: hidden;
+}
+
+.cu-steps .cu-item[class*="text-"] .num {
+	background-color: currentColor;
+}
+
+.cu-steps .cu-item .num::before,
+.cu-steps .cu-item .num::after {
+	content: attr(data-index);
+	position: absolute;
+	left: 0;
+	right: 0;
+	top: 0;
+	bottom: 0;
+	margin: auto;
+	transition: all 0.3s ease-in-out 0s;
+	transform: translateY(0upx);
+}
+
+.cu-steps .cu-item[class*="text-"] .num::before {
+	transform: translateY(-40upx);
+	color: #ffffff;
+}
+
+.cu-steps .cu-item .num::after {
+	transform: translateY(40upx);
+	color: #ffffff;
+	transition: all 0.3s ease-in-out 0s;
+}
+
+.cu-steps .cu-item[class*="text-"] .num::after {
+	content: "\e645";
+	font-family: 'cuIcon';
+	color: #ffffff;
+	transform: translateY(0upx);
+}
+
+.cu-steps .cu-item[class*="text-"] .num.err::after {
+	content: "\e646";
+}
+
+/* ==================
+          布局
+ ==================== */
+
+/*  -- flex弹性布局 -- */
+
+.flex {
+	display: flex;
+}
+
+.basis-xs {
+	flex-basis: 20%;
+}
+
+.basis-sm {
+	flex-basis: 40%;
+}
+
+.basis-df {
+	flex-basis: 50%;
+}
+
+.basis-lg {
+	flex-basis: 60%;
+}
+
+.basis-xl {
+	flex-basis: 80%;
+}
+
+.flex-sub {
+	flex: 1;
+}
+
+.flex-twice {
+	flex: 2;
+}
+
+.flex-treble {
+	flex: 3;
+}
+
+.flex-direction {
+	flex-direction: column;
+}
+
+.flex-wrap {
+	flex-wrap: wrap;
+}
+
+.align-start {
+	align-items: flex-start;
+}
+
+.align-end {
+	align-items: flex-end;
+}
+
+.align-center {
+	align-items: center;
+}
+
+.align-stretch {
+	align-items: stretch;
+}
+
+.self-start {
+	align-self: flex-start;
+}
+
+.self-center {
+	align-self: flex-center;
+}
+
+.self-end {
+	align-self: flex-end;
+}
+
+.self-stretch {
+	align-self: stretch;
+}
+
+.align-stretch {
+	align-items: stretch;
+}
+
+.justify-start {
+	justify-content: flex-start;
+}
+
+.justify-end {
+	justify-content: flex-end;
+}
+
+.justify-center {
+	justify-content: center;
+}
+
+.justify-between {
+	justify-content: space-between;
+}
+
+.justify-around {
+	justify-content: space-around;
+}
+
+/* grid布局 */
+
+.grid {
+	display: flex;
+	flex-wrap: wrap;
+}
+
+.grid.grid-square {
+	overflow: hidden;
+}
+
+.grid.grid-square .cu-tag {
+	position: absolute;
+	right: 0;
+	top: 0;
+	border-bottom-left-radius: 6upx;
+	padding: 6upx 12upx;
+	height: auto;
+	background-color: rgba(0, 0, 0, 0.5);
+}
+
+.grid.grid-square>view>text[class*="cuIcon-"] {
+	font-size: 52upx;
+	position: absolute;
+	color: #8799a3;
+	margin: auto;
+	top: 0;
+	bottom: 0;
+	left: 0;
+	right: 0;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	flex-direction: column;
+}
+
+.grid.grid-square>view {
+	margin-right: 20upx;
+	margin-bottom: 20upx;
+	border-radius: 6upx;
+	position: relative;
+	overflow: hidden;
+}
+
+.grid.grid-square>view.bg-img image {
+	width: 100%;
+	height: 100%;
+	position: absolute;
+}
+
+.grid.col-1.grid-square>view {
+	padding-bottom: 100%;
+	height: 0;
+	margin-right: 0;
+}
+
+.grid.col-2.grid-square>view {
+	padding-bottom: calc((100% - 20upx)/2);
+	height: 0;
+	width: calc((100% - 20upx)/2);
+}
+
+.grid.col-3.grid-square>view {
+	padding-bottom: calc((100% - 40upx)/3);
+	height: 0;
+	width: calc((100% - 40upx)/3);
+}
+
+.grid.col-4.grid-square>view {
+	padding-bottom: calc((100% - 60upx)/4);
+	height: 0;
+	width: calc((100% - 60upx)/4);
+}
+
+.grid.col-5.grid-square>view {
+	padding-bottom: calc((100% - 80upx)/5);
+	height: 0;
+	width: calc((100% - 80upx)/5);
+}
+
+.grid.col-2.grid-square>view:nth-child(2n),
+.grid.col-3.grid-square>view:nth-child(3n),
+.grid.col-4.grid-square>view:nth-child(4n),
+.grid.col-5.grid-square>view:nth-child(5n) {
+	margin-right: 0;
+}
+
+.grid.col-1>view {
+	width: 100%;
+}
+
+.grid.col-2>view {
+	width: 50%;
+}
+
+.grid.col-3>view {
+	width: 33.33%;
+}
+
+.grid.col-4>view {
+	width: 25%;
+}
+
+.grid.col-5>view {
+	width: 20%;
+}
+
+/*  -- 内外边距 -- */
+
+.margin-0 {
+	margin: 0;
+}
+
+.margin-xs {
+	margin: 10upx;
+}
+
+.margin-sm {
+	margin: 20upx;
+}
+
+.margin {
+	margin: 30upx;
+}
+
+.margin-lg {
+	margin: 40upx;
+}
+
+.margin-xl {
+	margin: 50upx;
+}
+
+.margin-top-xs {
+	margin-top: 10upx;
+}
+
+.margin-top-sm {
+	margin-top: 20upx;
+}
+
+.margin-top {
+	margin-top: 30upx;
+}
+
+.margin-top-lg {
+	margin-top: 40upx;
+}
+
+.margin-top-xl {
+	margin-top: 50upx;
+}
+
+.margin-right-xs {
+	margin-right: 10upx;
+}
+
+.margin-right-sm {
+	margin-right: 20upx;
+}
+
+.margin-right {
+	margin-right: 30upx;
+}
+
+.margin-right-lg {
+	margin-right: 40upx;
+}
+
+.margin-right-xl {
+	margin-right: 50upx;
+}
+
+.margin-bottom-xs {
+	margin-bottom: 10upx;
+}
+
+.margin-bottom-sm {
+	margin-bottom: 20upx;
+}
+
+.margin-bottom {
+	margin-bottom: 30upx;
+}
+
+.margin-bottom-lg {
+	margin-bottom: 40upx;
+}
+
+.margin-bottom-xl {
+	margin-bottom: 50upx;
+}
+
+.margin-left-xs {
+	margin-left: 10upx;
+}
+
+.margin-left-sm {
+	margin-left: 20upx;
+}
+
+.margin-left {
+	margin-left: 30upx;
+}
+
+.margin-left-lg {
+	margin-left: 40upx;
+}
+
+.margin-left-xl {
+	margin-left: 50upx;
+}
+
+.margin-lr-xs {
+	margin-left: 10upx;
+	margin-right: 10upx;
+}
+
+.margin-lr-sm {
+	margin-left: 20upx;
+	margin-right: 20upx;
+}
+
+.margin-lr {
+	margin-left: 30upx;
+	margin-right: 30upx;
+}
+
+.margin-lr-lg {
+	margin-left: 40upx;
+	margin-right: 40upx;
+}
+
+.margin-lr-xl {
+	margin-left: 50upx;
+	margin-right: 50upx;
+}
+
+.margin-tb-xs {
+	margin-top: 10upx;
+	margin-bottom: 10upx;
+}
+
+.margin-tb-sm {
+	margin-top: 20upx;
+	margin-bottom: 20upx;
+}
+
+.margin-tb {
+	margin-top: 30upx;
+	margin-bottom: 30upx;
+}
+
+.margin-tb-lg {
+	margin-top: 40upx;
+	margin-bottom: 40upx;
+}
+
+.margin-tb-xl {
+	margin-top: 50upx;
+	margin-bottom: 50upx;
+}
+
+.padding-0 {
+	padding: 0;
+}
+
+.padding-xs {
+	padding: 10upx;
+}
+
+.padding-sm {
+	padding: 20upx;
+}
+
+.padding {
+	padding: 30upx;
+}
+
+.padding-lg {
+	padding: 40upx;
+}
+
+.padding-xl {
+	padding: 50upx;
+}
+
+.padding-top-xs {
+	padding-top: 10upx;
+}
+
+.padding-top-sm {
+	padding-top: 20upx;
+}
+
+.padding-top {
+	padding-top: 30upx;
+}
+
+.padding-top-lg {
+	padding-top: 40upx;
+}
+
+.padding-top-xl {
+	padding-top: 50upx;
+}
+
+.padding-right-xs {
+	padding-right: 10upx;
+}
+
+.padding-right-sm {
+	padding-right: 20upx;
+}
+
+.padding-right {
+	padding-right: 30upx;
+}
+
+.padding-right-lg {
+	padding-right: 40upx;
+}
+
+.padding-right-xl {
+	padding-right: 50upx;
+}
+
+.padding-bottom-xs {
+	padding-bottom: 10upx;
+}
+
+.padding-bottom-sm {
+	padding-bottom: 20upx;
+}
+
+.padding-bottom {
+	padding-bottom: 30upx;
+}
+
+.padding-bottom-lg {
+	padding-bottom: 40upx;
+}
+
+.padding-bottom-xl {
+	padding-bottom: 50upx;
+}
+
+.padding-left-xs {
+	padding-left: 10upx;
+}
+
+.padding-left-sm {
+	padding-left: 20upx;
+}
+
+.padding-left {
+	padding-left: 30upx;
+}
+
+.padding-left-lg {
+	padding-left: 40upx;
+}
+
+.padding-left-xl {
+	padding-left: 50upx;
+}
+
+.padding-lr-xs {
+	padding-left: 10upx;
+	padding-right: 10upx;
+}
+
+.padding-lr-sm {
+	padding-left: 20upx;
+	padding-right: 20upx;
+}
+
+.padding-lr {
+	padding-left: 30upx;
+	padding-right: 30upx;
+}
+
+.padding-lr-lg {
+	padding-left: 40upx;
+	padding-right: 40upx;
+}
+
+.padding-lr-xl {
+	padding-left: 50upx;
+	padding-right: 50upx;
+}
+
+.padding-tb-xs {
+	padding-top: 10upx;
+	padding-bottom: 10upx;
+}
+
+.padding-tb-sm {
+	padding-top: 20upx;
+	padding-bottom: 20upx;
+}
+
+.padding-tb {
+	padding-top: 30upx;
+	padding-bottom: 30upx;
+}
+
+.padding-tb-lg {
+	padding-top: 40upx;
+	padding-bottom: 40upx;
+}
+
+.padding-tb-xl {
+	padding-top: 50upx;
+	padding-bottom: 50upx;
+}
+
+/* -- 浮动 --  */
+
+.cf::after,
+.cf::before {
+	content: " ";
+	display: table;
+}
+
+.cf::after {
+	clear: both;
+}
+
+.fl {
+	float: left;
+}
+
+.fr {
+	float: right;
+}
+
+/* ==================
+          背景
+ ==================== */
+
+.line-red::after,
+.lines-red::after {
+	border-color: #FF0000;
+}
+
+.line-orange::after,
+.lines-orange::after {
+	border-color: #f37b1d;
+}
+
+.line-yellow::after,
+.lines-yellow::after {
+	border-color: #fbbd08;
+}
+
+.line-olive::after,
+.lines-olive::after {
+	border-color: #8dc63f;
+}
+
+.line-green::after,
+.lines-green::after {
+	border-color: #39b54a;
+}
+
+.line-cyan::after,
+.lines-cyan::after {
+	border-color: #1cbbb4;
+}
+
+.line-blue::after,
+.lines-blue::after {
+	border-color: #0081ff;
+}
+
+.line-purple::after,
+.lines-purple::after {
+	border-color: #6739b6;
+}
+
+.line-mauve::after,
+.lines-mauve::after {
+	border-color: #9c26b0;
+}
+
+.line-pink::after,
+.lines-pink::after {
+	border-color: #e03997;
+}
+
+.line-brown::after,
+.lines-brown::after {
+	border-color: #a5673f;
+}
+
+.line-grey::after,
+.lines-grey::after {
+	border-color: #8799a3;
+}
+
+.line-gray::after,
+.lines-gray::after {
+	border-color: #aaaaaa;
+}
+
+.line-black::after,
+.lines-black::after {
+	border-color: #333333;
+}
+
+.line-white::after,
+.lines-white::after {
+	border-color: #ffffff;
+}
+
+.bg-red {
+	background-color: #FF0000;
+	color: #ffffff;
+}
+
+.bg-orange {
+	background-color: #f37b1d;
+	color: #ffffff;
+}
+
+.bg-yellow {
+	background-color: #fbbd08;
+	color: #333333;
+}
+
+.bg-olive {
+	background-color: #8dc63f;
+	color: #ffffff;
+}
+
+.bg-green {
+	background-color: #39b54a;
+	color: #ffffff;
+}
+
+.bg-cyan {
+	background-color: #1cbbb4;
+	color: #ffffff;
+}
+
+.bg-blue {
+	background-color: #0081ff;
+	color: #ffffff;
+}
+
+.bg-purple {
+	background-color: #6739b6;
+	color: #ffffff;
+}
+
+.bg-mauve {
+	background-color: #9c26b0;
+	color: #ffffff;
+}
+
+.bg-pink {
+	background-color: #e03997;
+	color: #ffffff;
+}
+
+.bg-brown {
+	background-color: #a5673f;
+	color: #ffffff;
+}
+
+.bg-grey {
+	background-color: #8799a3;
+	color: #ffffff;
+}
+
+.bg-gray {
+	background-color: #f0f0f0;
+	color: #333333;
+}
+
+.bg-black {
+	background-color: #333333;
+	color: #ffffff;
+}
+
+.bg-white {
+	background-color: #ffffff;
+	color: #666666;
+}
+
+.bg-shadeTop {
+	background-image: linear-gradient(rgba(0, 0, 0, 1), rgba(0, 0, 0, 0.01));
+	color: #ffffff;
+}
+
+.bg-shadeBottom {
+	background-image: linear-gradient(rgba(0, 0, 0, 0.01), rgba(0, 0, 0, 1));
+	color: #ffffff;
+}
+
+.bg-red.light {
+	color: #FF0000;
+	background-color: #fadbd9;
+}
+
+.bg-orange.light {
+	color: #f37b1d;
+	background-color: #fde6d2;
+}
+
+.bg-yellow.light {
+	color: #fbbd08;
+	background-color: #fef2ced2;
+}
+
+.bg-olive.light {
+	color: #8dc63f;
+	background-color: #e8f4d9;
+}
+
+.bg-green.light {
+	color: #39b54a;
+	background-color: #d7f0dbff;
+}
+
+.bg-cyan.light {
+	color: #1cbbb4;
+	background-color: #d2f1f0;
+}
+
+.bg-blue.light {
+	color: #0081ff;
+	background-color: #cce6ff;
+}
+
+.bg-purple.light {
+	color: #6739b6;
+	background-color: #e1d7f0;
+}
+
+.bg-mauve.light {
+	color: #9c26b0;
+	background-color: #ebd4ef;
+}
+
+.bg-pink.light {
+	color: #e03997;
+	background-color: #f9d7ea;
+}
+
+.bg-brown.light {
+	color: #a5673f;
+	background-color: #ede1d9;
+}
+
+.bg-grey.light {
+	color: #8799a3;
+	background-color: #e7ebed;
+}
+
+.bg-gradual-red {
+	background-image: linear-gradient(45deg, #f43f3b, #ec008c);
+	color: #ffffff;
+}
+
+.bg-gradual-orange {
+	background-image: linear-gradient(45deg, #ff9700, #ed1c24);
+	color: #ffffff;
+}
+
+.bg-gradual-green {
+	background-image: linear-gradient(45deg, #39b54a, #8dc63f);
+	color: #ffffff;
+}
+
+.bg-gradual-purple {
+	background-image: linear-gradient(45deg, #9000ff, #5e00ff);
+	color: #ffffff;
+}
+
+.bg-gradual-pink {
+	background-image: linear-gradient(45deg, #ec008c, #6739b6);
+	color: #ffffff;
+}
+
+.bg-gradual-blue {
+	background-image: linear-gradient(45deg, #0081ff, #1cbbb4);
+	color: #ffffff;
+}
+
+.shadow[class*="-red"] {
+	box-shadow: 6upx 6upx 8upx rgba(204, 69, 59, 0.2);
+}
+
+.shadow[class*="-orange"] {
+	box-shadow: 6upx 6upx 8upx rgba(217, 109, 26, 0.2);
+}
+
+.shadow[class*="-yellow"] {
+	box-shadow: 6upx 6upx 8upx rgba(224, 170, 7, 0.2);
+}
+
+.shadow[class*="-olive"] {
+	box-shadow: 6upx 6upx 8upx rgba(124, 173, 55, 0.2);
+}
+
+.shadow[class*="-green"] {
+	box-shadow: 6upx 6upx 8upx rgba(48, 156, 63, 0.2);
+}
+
+.shadow[class*="-cyan"] {
+	box-shadow: 6upx 6upx 8upx rgba(28, 187, 180, 0.2);
+}
+
+.shadow[class*="-blue"] {
+	box-shadow: 6upx 6upx 8upx rgba(0, 102, 204, 0.2);
+}
+
+.shadow[class*="-purple"] {
+	box-shadow: 6upx 6upx 8upx rgba(88, 48, 156, 0.2);
+}
+
+.shadow[class*="-mauve"] {
+	box-shadow: 6upx 6upx 8upx rgba(133, 33, 150, 0.2);
+}
+
+.shadow[class*="-pink"] {
+	box-shadow: 6upx 6upx 8upx rgba(199, 50, 134, 0.2);
+}
+
+.shadow[class*="-brown"] {
+	box-shadow: 6upx 6upx 8upx rgba(140, 88, 53, 0.2);
+}
+
+.shadow[class*="-grey"] {
+	box-shadow: 6upx 6upx 8upx rgba(114, 130, 138, 0.2);
+}
+
+.shadow[class*="-gray"] {
+	box-shadow: 6upx 6upx 8upx rgba(114, 130, 138, 0.2);
+}
+
+.shadow[class*="-black"] {
+	box-shadow: 6upx 6upx 8upx rgba(26, 26, 26, 0.2);
+}
+
+.shadow[class*="-white"] {
+	box-shadow: 6upx 6upx 8upx rgba(26, 26, 26, 0.2);
+}
+
+.text-shadow[class*="-red"] {
+	text-shadow: 6upx 6upx 8upx rgba(204, 69, 59, 0.2);
+}
+
+.text-shadow[class*="-orange"] {
+	text-shadow: 6upx 6upx 8upx rgba(217, 109, 26, 0.2);
+}
+
+.text-shadow[class*="-yellow"] {
+	text-shadow: 6upx 6upx 8upx rgba(224, 170, 7, 0.2);
+}
+
+.text-shadow[class*="-olive"] {
+	text-shadow: 6upx 6upx 8upx rgba(124, 173, 55, 0.2);
+}
+
+.text-shadow[class*="-green"] {
+	text-shadow: 6upx 6upx 8upx rgba(48, 156, 63, 0.2);
+}
+
+.text-shadow[class*="-cyan"] {
+	text-shadow: 6upx 6upx 8upx rgba(28, 187, 180, 0.2);
+}
+
+.text-shadow[class*="-blue"] {
+	text-shadow: 6upx 6upx 8upx rgba(0, 102, 204, 0.2);
+}
+
+.text-shadow[class*="-purple"] {
+	text-shadow: 6upx 6upx 8upx rgba(88, 48, 156, 0.2);
+}
+
+.text-shadow[class*="-mauve"] {
+	text-shadow: 6upx 6upx 8upx rgba(133, 33, 150, 0.2);
+}
+
+.text-shadow[class*="-pink"] {
+	text-shadow: 6upx 6upx 8upx rgba(199, 50, 134, 0.2);
+}
+
+.text-shadow[class*="-brown"] {
+	text-shadow: 6upx 6upx 8upx rgba(140, 88, 53, 0.2);
+}
+
+.text-shadow[class*="-grey"] {
+	text-shadow: 6upx 6upx 8upx rgba(114, 130, 138, 0.2);
+}
+
+.text-shadow[class*="-gray"] {
+	text-shadow: 6upx 6upx 8upx rgba(114, 130, 138, 0.2);
+}
+
+.text-shadow[class*="-black"] {
+	text-shadow: 6upx 6upx 8upx rgba(26, 26, 26, 0.2);
+}
+
+.bg-img {
+	background-size: cover;
+	background-position: center;
+	background-repeat: no-repeat;
+}
+
+.bg-mask {
+	background-color: #333333;
+	position: relative;
+}
+
+.bg-mask::after {
+	content: "";
+	border-radius: inherit;
+	width: 100%;
+	height: 100%;
+	display: block;
+	background-color: rgba(0, 0, 0, 0.4);
+	position: absolute;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	top: 0;
+}
+
+.bg-mask view,
+.bg-mask cover-view {
+	z-index: 5;
+	position: relative;
+}
+
+.bg-video {
+	position: relative;
+}
+
+.bg-video video {
+	display: block;
+	height: 100%;
+	width: 100%;
+	-o-object-fit: cover;
+	object-fit: cover;
+	position: absolute;
+	top: 0;
+	z-index: 0;
+	pointer-events: none;
+}
+
+/* ==================
+          文本
+ ==================== */
+
+.text-xs {
+	font-size: 20upx;
+}
+
+.text-sm {
+	font-size: 24upx;
+}
+
+.text-df {
+	font-size: 28upx;
+}
+
+.text-lg {
+	font-size: 32upx;
+}
+
+.text-xl {
+	font-size: 36upx;
+}
+
+.text-xxl {
+	font-size: 44upx;
+}
+
+.text-sl {
+	font-size: 80upx;
+}
+
+.text-xsl {
+	font-size: 120upx;
+}
+
+.text-Abc {
+	text-transform: Capitalize;
+}
+
+.text-ABC {
+	text-transform: Uppercase;
+}
+
+.text-abc {
+	text-transform: Lowercase;
+}
+
+.text-price::before {
+	content: "¥";
+	font-size: 80%;
+	margin-right: 4upx;
+}
+
+.text-cut {
+	text-overflow: ellipsis;
+	white-space: nowrap;
+	overflow: hidden;
+}
+
+.text-bold {
+	font-weight: bold;
+}
+
+.text-center {
+	text-align: center;
+}
+
+.text-content {
+	line-height: 1.6;
+}
+
+.text-left {
+	text-align: left;
+}
+
+.text-right {
+	text-align: right;
+}
+
+.text-red,
+.line-red,
+.lines-red {
+	color: #FF0000;
+}
+
+.text-orange,
+.line-orange,
+.lines-orange {
+	color: #f37b1d;
+}
+
+.text-yellow,
+.line-yellow,
+.lines-yellow {
+	color: #fbbd08;
+}
+
+.text-olive,
+.line-olive,
+.lines-olive {
+	color: #8dc63f;
+}
+
+.text-green,
+.line-green,
+.lines-green {
+	color: #39b54a;
+}
+
+.text-cyan,
+.line-cyan,
+.lines-cyan {
+	color: #1cbbb4;
+}
+
+.text-blue,
+.line-blue,
+.lines-blue {
+	color: #0081ff;
+}
+
+.text-purple,
+.line-purple,
+.lines-purple {
+	color: #6739b6;
+}
+
+.text-mauve,
+.line-mauve,
+.lines-mauve {
+	color: #9c26b0;
+}
+
+.text-pink,
+.line-pink,
+.lines-pink {
+	color: #e03997;
+}
+
+.text-brown,
+.line-brown,
+.lines-brown {
+	color: #a5673f;
+}
+
+.text-grey,
+.line-grey,
+.lines-grey {
+	color: #8799a3;
+}
+
+.text-gray,
+.line-gray,
+.lines-gray {
+	color: #aaaaaa;
+}
+
+.text-black,
+.line-black,
+.lines-black {
+	color: #333333;
+}
+
+.text-white,
+.line-white,
+.lines-white {
+	color: #ffffff;
+}
diff --git a/static/style/index.scss b/static/style/index.scss
new file mode 100644
index 00000000..9976b402
--- /dev/null
+++ b/static/style/index.scss
@@ -0,0 +1,29 @@
+@import 'uview-ui/index.scss';
+@import 'static/style/colorui.css';
+@import 'static/font/shopro-icon.css';
+@import 'uview-ui/iconfont.css';
+
+/* 字体文件 */
+@font-face {
+	font-family: OPPOSANS;
+	src: url('~@/static/font/OPPOSANS-M-subfont.ttf');
+}
+.font-OPPOSANS {
+	font-family: OPPOSANS;
+}
+page {
+	-webkit-overflow-scrolling: touch; // ios滑动不流畅
+	height: 100%;
+	background: #f6f6f6;
+	width: 100%;
+	font-size: 30rpx;
+	font-family: OPPOSANS;
+	word-break: break-all; //英文文本不换行
+	color: $u-main-color;
+}
+::-webkit-scrollbar {
+	width: 0;
+	height: 0;
+	color: transparent;
+	display: none;
+}
\ No newline at end of file
diff --git a/template.h5.html b/template.h5.html
index 29932ccc..aa530410 100644
--- a/template.h5.html
+++ b/template.h5.html
@@ -4,25 +4,30 @@
 		<meta charset="utf-8">
 		<meta http-equiv="X-UA-Compatible" content="IE=edge">
 		<link rel="shortcut icon" type="image/x-icon" href="">
-		<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
+		<meta name="viewport"
+			content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
 		<title>
 			<%= htmlWebpackPlugin.options.title %>
 		</title>
 		<!-- 正式发布的时候使用，开发期间不启用。↓ -->
-        <script src="/static/common/js/touch-emulator.js"></script>
+		<script src="/static/common/js/touch-emulator.js"></script>
 		<script>
-            TouchEmulator();
+			TouchEmulator();
 		</script>
-        <style>
-            ::-webkit-scrollbar{
-                display: none;
-            }
-        </style>
-        <!-- 正式发布的时候使用，开发期间不启用。↑ -->
+		<style>
+			::-webkit-scrollbar {
+				display: none;
+			}
+		</style>
+		<!-- 正式发布的时候使用，开发期间不启用。↑ -->
 		<script>
 			document.addEventListener('DOMContentLoaded', function() {
 				document.documentElement.style.fontSize = document.documentElement.clientWidth / 20 + 'px'
 			})
+			let listenMove = document.body; //禁止手机h5下拉刷新带动整个页面。
+			let handle = function(e) {
+				e.preventDefault();
+			};
 		</script>
 		<link rel="stylesheet" href="<%= BASE_URL %>static/index.css" />
 	</head>
diff --git a/uview-ui/components/u-action-sheet/u-action-sheet.vue b/uview-ui/components/u-action-sheet/u-action-sheet.vue
deleted file mode 100644
index 722b668b..00000000
--- a/uview-ui/components/u-action-sheet/u-action-sheet.vue
+++ /dev/null
@@ -1,190 +0,0 @@
-<template>
-	<u-popup mode="bottom" :border-radius="borderRadius" :popup="false" v-model="value" :maskCloseAble="maskCloseAble"
-	    length="auto" :safeAreaInsetBottom="safeAreaInsetBottom" @close="popupClose" :z-index="uZIndex">
-		<view class="u-tips u-border-bottom" v-if="tips.text" :style="[tipsStyle]">
-			{{tips.text}}
-		</view>
-		<block v-for="(item, index) in list" :key="index">
-			<view 
-				@touchmove.stop.prevent 
-				@tap="itemClick(index)" 
-				:style="[itemStyle(index)]" 
-				class="u-action-sheet-item u-line-1" 
-				:class="[index < list.length - 1 ? 'u-border-bottom' : '']"
-				:hover-stay-time="150"
-			>
-				<text>{{item.text}}</text>
-				<text class="u-action-sheet-item__subtext u-line-1" v-if="item.subText">{{item.subText}}</text>
-			</view>
-		</block>
-		<view class="u-gab" v-if="cancelBtn">
-		</view>
-		<view @touchmove.stop.prevent class="u-actionsheet-cancel u-action-sheet-item" hover-class="u-hover-class"
-		    :hover-stay-time="150" v-if="cancelBtn" @tap="close">{{cancelText}}</view>
-	</u-popup>
-</template>
-
-<script>
-	/**
-	 * actionSheet 操作菜单
-	 * @description 本组件用于从底部弹出一个操作菜单，供用户选择并返回结果。本组件功能类似于uni的uni.showActionSheetAPI，配置更加灵活，所有平台都表现一致。
-	 * @tutorial https://www.uviewui.com/components/actionSheet.html
-	 * @property {Array<Object>} list 按钮的文字数组，见官方文档示例
-	 * @property {Object} tips 顶部的提示文字，见官方文档示例
-	 * @property {String} cancel-text 取消按钮的提示文字
-	 * @property {Boolean} cancel-btn 是否显示底部的取消按钮（默认true）
-	 * @property {Number String} border-radius 弹出部分顶部左右的圆角值，单位rpx（默认0）
-	 * @property {Boolean} mask-close-able 点击遮罩是否可以关闭（默认true）
-	 * @property {Boolean} safe-area-inset-bottom 是否开启底部安全区适配（默认false）
-	 * @property {Number String} z-index z-index值（默认1075）
-	 * @property {String} cancel-text 取消按钮的提示文字
-	 * @event {Function} click 点击ActionSheet列表项时触发
-	 * @event {Function} close 点击取消按钮时触发
-	 * @example <u-action-sheet :list="list" @click="click" v-model="show"></u-action-sheet>
-	 */
-	export default {
-		name: "u-action-sheet",
-		props: {
-			// 点击遮罩是否可以关闭actionsheet
-			maskCloseAble: {
-				type: Boolean,
-				default: true
-			},
-			// 按钮的文字数组，可以自定义颜色和字体大小，字体单位为rpx
-			list: {
-				type: Array,
-				default () {
-					// 如下
-					// return [{
-					// 	text: '确定',
-					// 	color: '',
-					// 	fontSize: ''
-					// }]
-					return [];
-				}
-			},
-			// 顶部的提示文字
-			tips: {
-				type: Object,
-				default () {
-					return {
-						text: '',
-						color: '',
-						fontSize: '26'
-					}
-				}
-			},
-			// 底部的取消按钮
-			cancelBtn: {
-				type: Boolean,
-				default: true
-			},
-			// 是否开启底部安全区适配，开启的话，会在iPhoneX机型底部添加一定的内边距
-			safeAreaInsetBottom: {
-				type: Boolean,
-				default: false
-			},
-			// 通过双向绑定控制组件的弹出与收起
-			value: {
-				type: Boolean,
-				default: false
-			},
-			// 弹出的顶部圆角值
-			borderRadius: {
-				type: [String, Number],
-				default: 0
-			},
-			// 弹出的z-index值
-			zIndex: {
-				type: [String, Number],
-				default: 0
-			},
-			// 取消按钮的文字提示
-			cancelText: {
-				type: String,
-				default: '取消'
-			}
-		},
-		computed: {
-			// 顶部提示的样式
-			tipsStyle() {
-				let style = {};
-				if (this.tips.color) style.color = this.tips.color;
-				if (this.tips.fontSize) style.fontSize = this.tips.fontSize + 'rpx';
-				return style;
-			},
-			// 操作项目的样式
-			itemStyle() {
-				return (index) => {
-					let style = {};
-					if (this.list[index].color) style.color = this.list[index].color;
-					if (this.list[index].fontSize) style.fontSize = this.list[index].fontSize + 'rpx';
-					// 选项被禁用的样式
-					if (this.list[index].disabled) style.color = '#c0c4cc';
-					return style;
-				}
-			},
-			uZIndex() {
-				// 如果用户有传递z-index值，优先使用
-				return this.zIndex ? this.zIndex : this.$u.zIndex.popup;
-			}
-		},
-		methods: {
-			// 点击取消按钮
-			close() {
-				// 发送input事件，并不会作用于父组件，而是要设置组件内部通过props传递的value参数
-				// 这是一个vue发送事件的特殊用法
-				this.popupClose();
-				this.$emit('close');
-			},
-			// 弹窗关闭
-			popupClose() {
-				this.$emit('input', false);
-			},
-			// 点击某一个item
-			itemClick(index) {
-				// disabled的项禁止点击
-				if(this.list[index].disabled) return;
-				this.$emit('click', index);
-				this.$emit('input', false);
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	@import "../../libs/css/style.components.scss";
-
-	.u-tips {
-		font-size: 26rpx;
-		text-align: center;
-		padding: 34rpx 0;
-		line-height: 1;
-		color: $u-tips-color;
-	}
-
-	.u-action-sheet-item {
-		@include vue-flex;;
-		line-height: 1;
-		justify-content: center;
-		align-items: center;
-		font-size: 32rpx;
-		padding: 34rpx 0;
-		flex-direction: column;
-	}
-	
-	.u-action-sheet-item__subtext {
-		font-size: 24rpx;
-		color: $u-tips-color;
-		margin-top: 20rpx;
-	}
-
-	.u-gab {
-		height: 12rpx;
-		background-color: rgb(234, 234, 236);
-	}
-
-	.u-actionsheet-cancel {
-		color: $u-main-color;
-	}
-</style>
diff --git a/uview-ui/components/u-alert-tips/u-alert-tips.vue b/uview-ui/components/u-alert-tips/u-alert-tips.vue
deleted file mode 100644
index e81fc379..00000000
--- a/uview-ui/components/u-alert-tips/u-alert-tips.vue
+++ /dev/null
@@ -1,256 +0,0 @@
-<template>
-	<view class="u-alert-tips" v-if="show" :class="[
-		!show ? 'u-close-alert-tips': '',
-		type ? 'u-alert-tips--bg--' + type + '-light' : '',
-		type ? 'u-alert-tips--border--' + type + '-disabled' : '',
-	]" :style="{
-		backgroundColor: bgColor,
-		borderColor: borderColor
-	}">
-		<view class="u-icon-wrap">
-			<u-icon v-if="showIcon" :name="uIcon" :size="description ? 40 : 32" class="u-icon" :color="uIconType" :custom-style="iconStyle"></u-icon>
-		</view>
-		<view class="u-alert-content" @tap.stop="click">
-			<view class="u-alert-title" :style="[uTitleStyle]">
-				{{title}}
-			</view>
-			<view v-if="description" class="u-alert-desc" :style="[descStyle]">
-				{{description}}
-			</view>
-		</view>
-		<view class="u-icon-wrap">
-			<u-icon @click="close" v-if="closeAble && !closeText" hoverClass="u-type-error-hover-color" name="close" color="#c0c4cc"
-			 :size="22" class="u-close-icon" :style="{
-				top: description ? '18rpx' : '24rpx'
-			}"></u-icon>
-		</view>
-		<text v-if="closeAble && closeText" class="u-close-text" :style="{
-			top: description ? '18rpx' : '24rpx'
-		}">{{closeText}}</text>
-	</view>
-</template>
-
-<script>
-	/**
-	 * alertTips 警告提示
-	 * @description 警告提示，展现需要关注的信息
-	 * @tutorial https://uviewui.com/components/alertTips.html
-	 * @property {String} title 显示的标题文字
-	 * @property {String} description 辅助性文字，颜色比title浅一点，字号也小一点，可选
-	 * @property {String} type 关闭按钮(默认为叉号icon图标)
-	 * @property {String} icon 图标名称
-	 * @property {Object} icon-style 图标的样式，对象形式
-	 * @property {Object} title-style 标题的样式，对象形式
-	 * @property {Object} desc-style 描述的样式，对象形式
-	 * @property {String} close-able 用文字替代关闭图标，close-able为true时有效
-	 * @property {Boolean} show-icon 是否显示左边的辅助图标
-	 * @property {Boolean} show 显示或隐藏组件
-	 * @event {Function} click 点击组件时触发
-	 * @event {Function} close 点击关闭按钮时触发
-	 */
-	export default {
-		name: 'u-alert-tips',
-		props: {
-			// 显示文字
-			title: {
-				type: String,
-				default: ''
-			},
-			// 主题，success/warning/info/error
-			type: {
-				type: String,
-				default: 'warning'
-			},
-			// 辅助性文字
-			description: {
-				type: String,
-				default: ''
-			},
-			// 是否可关闭
-			closeAble: {
-				type: Boolean,
-				default: false
-			},
-			// 关闭按钮自定义文本
-			closeText: {
-				type: String,
-				default: ''
-			},
-			// 是否显示图标
-			showIcon: {
-				type: Boolean,
-				default: false
-			},
-			// 文字颜色，如果定义了color值，icon会失效
-			color: {
-				type: String,
-				default: ''
-			},
-			// 背景颜色
-			bgColor: {
-				type: String,
-				default: ''
-			},
-			// 边框颜色
-			borderColor: {
-				type: String,
-				default: ''
-			},
-			// 是否显示
-			show: {
-				type: Boolean,
-				default: true
-			},
-			// 左边显示的icon
-			icon: {
-				type: String,
-				default: ''
-			},
-			// icon的样式
-			iconStyle: {
-				type: Object,
-				default() {
-					return {}
-				}
-			},
-			// 标题的样式
-			titleStyle: {
-				type: Object,
-				default() {
-					return {}
-				}
-			},
-			// 描述文字的样式
-			descStyle: {
-				type: Object,
-				default() {
-					return {}
-				}
-			},
-		},
-		data() {
-			return {
-			}
-		},
-		computed: {
-			uTitleStyle() {
-				let style = {};
-				// 如果有描述文字的话，标题进行加粗
-				style.fontWeight = this.description ? 500 : 'normal';
-				// 将用户传入样式对象和style合并，传入的优先级比style高，同属性会被覆盖
-				return this.$u.deepMerge(style, this.titleStyle);
-			},
-			uIcon() {
-				// 如果有设置icon名称就使用，否则根据type主题，推定一个默认的图标
-				return this.icon ? this.icon : this.$u.type2icon(this.type);
-			},
-			uIconType() {
-				// 如果有设置图标的样式，优先使用，没有的话，则用type的样式
-				return Object.keys(this.iconStyle).length ? '' : this.type;
-			}
-		},
-		methods: {
-			// 点击内容
-			click() {
-				this.$emit('click');
-			},
-			// 点击关闭按钮
-			close() {
-				this.$emit('close');
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	@import "../../libs/css/style.components.scss";
-	
-	.u-alert-tips {
-		@include vue-flex;
-		align-items: center;
-		padding: 16rpx 30rpx;
-		border-radius: 8rpx;
-		position: relative;
-		transition: all 0.3s linear;
-		border: 1px solid #fff;
-		
-		&--bg--primary-light {
-			background-color: $u-type-primary-light;
-		}
-		
-		&--bg--info-light {
-			background-color: $u-type-info-light;
-		}
-		
-		&--bg--success-light {
-			background-color: $u-type-success-light;
-		}
-		
-		&--bg--warning-light {
-			background-color: $u-type-warning-light;
-		}
-		
-		&--bg--error-light {
-			background-color: $u-type-error-light;
-		}
-		
-		&--border--primary-disabled {
-			border-color: $u-type-primary-disabled;
-		}
-		
-		&--border--success-disabled {
-			border-color: $u-type-success-disabled;
-		}
-		
-		&--border--error-disabled {
-			border-color: $u-type-error-disabled;
-		}
-		
-		&--border--warning-disabled {
-			border-color: $u-type-warning-disabled;
-		}
-		
-		&--border--info-disabled {
-			border-color: $u-type-info-disabled;
-		}
-	}
-
-	.u-close-alert-tips {
-		opacity: 0;
-		visibility: hidden;
-	}
-
-	.u-icon {
-		margin-right: 16rpx;
-	}
-
-	.u-alert-title {
-		font-size: 28rpx;
-		color: $u-main-color;
-	}
-
-	.u-alert-desc {
-		font-size: 26rpx;
-		text-align: left;
-		color: $u-content-color;
-	}
-
-	.u-close-icon {
-		position: absolute;
-		top: 20rpx;
-		right: 20rpx;
-	}
-
-	.u-close-hover {
-		color: red;
-	}
-	
-	.u-close-text {
-		font-size: 24rpx;
-		color: $u-tips-color;
-		position: absolute;
-		top: 20rpx;
-		right: 20rpx;
-		line-height: 1;
-	}
-</style>
diff --git a/uview-ui/components/u-avatar-cropper/u-avatar-cropper.vue b/uview-ui/components/u-avatar-cropper/u-avatar-cropper.vue
deleted file mode 100644
index a48dd546..00000000
--- a/uview-ui/components/u-avatar-cropper/u-avatar-cropper.vue
+++ /dev/null
@@ -1,290 +0,0 @@
-<template>
-	<view class="content">
-		<view class="cropper-wrapper" :style="{ height: cropperOpt.height + 'px' }">
-			<canvas
-				class="cropper"
-				:disable-scroll="true"
-				@touchstart="touchStart"
-				@touchmove="touchMove"
-				@touchend="touchEnd"
-				:style="{ width: cropperOpt.width, height: cropperOpt.height, backgroundColor: 'rgba(0, 0, 0, 0.8)' }"
-				canvas-id="cropper"
-				id="cropper"
-			></canvas>
-			<canvas
-				class="cropper"
-				:disable-scroll="true"
-				:style="{
-					position: 'fixed',
-					top: `-${cropperOpt.width * cropperOpt.pixelRatio}px`,
-					left: `-${cropperOpt.height * cropperOpt.pixelRatio}px`,
-					width: `${cropperOpt.width * cropperOpt.pixelRatio}px`,
-					height: `${cropperOpt.height * cropperOpt.pixelRatio}`
-				}"
-				canvas-id="targetId"
-				id="targetId"
-			></canvas>
-		</view>
-		<view class="cropper-buttons safe-area-padding" :style="{ height: bottomNavHeight + 'px' }">
-			<!-- #ifdef H5 -->
-			<view class="upload" @tap="uploadTap">选择图片</view>
-			<!-- #endif -->
-			<!-- #ifndef H5 -->
-			<view class="upload" @tap="uploadTap">重新选择</view>
-			<!-- #endif -->
-			<view class="getCropperImage" @tap="getCropperImage(false)">确定</view>
-		</view>
-	</view>
-</template>
-
-<script>
-import WeCropper from './weCropper.js';
-export default {
-	props: {
-		// 裁剪矩形框的样式，其中可包含的属性为lineWidth-边框宽度(单位rpx)，color: 边框颜色，
-		// mask-遮罩颜色，一般设置为一个rgba的透明度，如"rgba(0, 0, 0, 0.35)"
-		boundStyle: {
-			type: Object,
-			default() {
-				return {
-					lineWidth: 4,
-					borderColor: 'rgb(245, 245, 245)',
-					mask: 'rgba(0, 0, 0, 0.35)'
-				};
-			}
-		}
-		// // 裁剪框宽度，单位rpx
-		// rectWidth: {
-		// 	type: [String, Number],
-		// 	default: 400
-		// },
-		// // 裁剪框高度，单位rpx
-		// rectHeight: {
-		// 	type: [String, Number],
-		// 	default: 400
-		// },
-		// // 输出图片宽度，单位rpx
-		// destWidth: {
-		// 	type: [String, Number],
-		// 	default: 400
-		// },
-		// // 输出图片高度，单位rpx
-		// destHeight: {
-		// 	type: [String, Number],
-		// 	default: 400
-		// },
-		// // 输出的图片类型，如果发现裁剪的图片很大，可能是因为设置为了"png"，改成"jpg"即可
-		// fileType: {
-		// 	type: String,
-		// 	default: 'jpg',
-		// },
-		// // 生成的图片质量
-		// // H5上无效，目前不考虑使用此参数
-		// quality: {
-		// 	type: [Number, String],
-		// 	default: 1
-		// }
-	},
-	data() {
-		return {
-			// 底部导航的高度
-			bottomNavHeight: 50,
-			originWidth: 200,
-			width: 0,
-			height: 0,
-			cropperOpt: {
-				id: 'cropper',
-				targetId: 'targetCropper',
-				pixelRatio: 1,
-				width: 0,
-				height: 0,
-				scale: 2.5,
-				zoom: 8,
-				cut: {
-					x: (this.width - this.originWidth) / 2,
-					y: (this.height - this.originWidth) / 2,
-					width: this.originWidth,
-					height: this.originWidth
-				},
-				boundStyle: {
-					lineWidth: uni.upx2px(this.boundStyle.lineWidth),
-					mask: this.boundStyle.mask,
-					color: this.boundStyle.borderColor
-				}
-			},
-			// 裁剪框和输出图片的尺寸，高度默认等于宽度
-			// 输出图片宽度，单位px
-			destWidth: 200,
-			// 裁剪框宽度，单位px
-			rectWidth: 200,
-			// 输出的图片类型，如果'png'类型发现裁剪的图片太大，改成"jpg"即可
-			fileType: 'jpg',
-			src: '', // 选择的图片路径，用于在点击确定时，判断是否选择了图片
-		};
-	},
-	onLoad(option) {
-		let rectInfo = uni.getSystemInfoSync();
-		this.width = rectInfo.windowWidth;
-		this.height = rectInfo.windowHeight - this.bottomNavHeight;
-		this.cropperOpt.width = this.width;
-		this.cropperOpt.height = this.height;
-		this.cropperOpt.pixelRatio = rectInfo.pixelRatio;
-
-		if (option.destWidth) this.destWidth = option.destWidth;
-		if (option.rectWidth) {
-			let rectWidth = Number(option.rectWidth);
-			this.cropperOpt.cut = {
-				x: (this.width - rectWidth) / 2,
-				y: (this.height - rectWidth) / 2,
-				width: rectWidth,
-				height: rectWidth
-			};
-		}
-		this.rectWidth = option.rectWidth;
-		if (option.fileType) this.fileType = option.fileType;
-		// 初始化
-		this.cropper = new WeCropper(this.cropperOpt)
-			.on('ready', ctx => {
-				// wecropper is ready for work!
-			})
-			.on('beforeImageLoad', ctx => {
-				// before picture loaded, i can do something
-			})
-			.on('imageLoad', ctx => {
-				// picture loaded
-			})
-			.on('beforeDraw', (ctx, instance) => {
-				// before canvas draw,i can do something
-			});
-		// 设置导航栏样式，以免用户在page.json中没有设置为黑色背景
-		uni.setNavigationBarColor({
-			frontColor: '#ffffff',
-			backgroundColor: '#000000'
-		});
-		uni.chooseImage({
-			count: 1, // 默认9
-			sizeType: ['compressed'], // 可以指定是原图还是压缩图，默认二者都有
-			sourceType: ['album', 'camera'], // 可以指定来源是相册还是相机，默认二者都有
-			success: res => {
-				this.src = res.tempFilePaths[0];
-				//  获取裁剪图片资源后，给data添加src属性及其值
-				this.cropper.pushOrign(this.src);
-			}
-		});
-	},
-	methods: {
-		touchStart(e) {
-			this.cropper.touchStart(e);
-		},
-		touchMove(e) {
-			this.cropper.touchMove(e);
-		},
-		touchEnd(e) {
-			this.cropper.touchEnd(e);
-		},
-		getCropperImage(isPre = false) {
-			if(!this.src) return this.$u.toast('请先选择图片再裁剪');
-
-			let cropper_opt = {
-				destHeight: Number(this.destWidth), // uni.canvasToTempFilePath要求这些参数为数值
-				destWidth: Number(this.destWidth),
-				fileType: this.fileType
-			};
-			this.cropper.getCropperImage(cropper_opt, (path, err) => {
-				if (err) {
-					uni.showModal({
-						title: '温馨提示',
-						content: err.message
-					});
-				} else {
-					if (isPre) {
-						uni.previewImage({
-							current: '', // 当前显示图片的 http 链接
-							urls: [path] // 需要预览的图片 http 链接列表
-						});
-					} else {
-						uni.$emit('uAvatarCropper', path);
-						this.$u.route({
-							type: 'back'
-						});
-					}
-				}
-			});
-		},
-		uploadTap() {
-			const self = this;
-			uni.chooseImage({
-				count: 1, // 默认9
-				sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有
-				sourceType: ['album', 'camera'], // 可以指定来源是相册还是相机，默认二者都有
-				success: (res) => {
-					self.src = res.tempFilePaths[0];
-					//  获取裁剪图片资源后，给data添加src属性及其值
-
-					self.cropper.pushOrign(this.src);
-				}
-			});
-		}
-	}
-};
-</script>
-
-<style scoped lang="scss">
-@import '../../libs/css/style.components.scss';
-
-.content {
-	background: rgba(255, 255, 255, 1);
-}
-
-.cropper {
-	position: absolute;
-	top: 0;
-	left: 0;
-	width: 100%;
-	height: 100%;
-	z-index: 11;
-}
-
-.cropper-buttons {
-	background-color: #000000;
-	color: #eee;
-}
-
-.cropper-wrapper {
-	position: relative;
-	@include vue-flex;
-	flex-direction: row;
-	justify-content: space-between;
-	align-items: center;
-	width: 100%;
-	background-color: #000;
-}
-
-.cropper-buttons {
-	width: 100vw;
-	@include vue-flex;
-	flex-direction: row;
-	justify-content: space-between;
-	align-items: center;
-	position: fixed;
-	bottom: 0;
-	left: 0;
-	font-size: 28rpx;
-}
-
-.cropper-buttons .upload,
-.cropper-buttons .getCropperImage {
-	width: 50%;
-	text-align: center;
-}
-
-.cropper-buttons .upload {
-	text-align: left;
-	padding-left: 50rpx;
-}
-
-.cropper-buttons .getCropperImage {
-	text-align: right;
-	padding-right: 50rpx;
-}
-</style>
diff --git a/uview-ui/components/u-avatar-cropper/weCropper.js b/uview-ui/components/u-avatar-cropper/weCropper.js
deleted file mode 100644
index df024838..00000000
--- a/uview-ui/components/u-avatar-cropper/weCropper.js
+++ /dev/null
@@ -1,1265 +0,0 @@
-/**
- * we-cropper v1.3.9
- * (c) 2020 dlhandsome
- * @license MIT
- */
-(function(global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
-		typeof define === 'function' && define.amd ? define(factory) :
-		(global.WeCropper = factory());
-}(this, (function() {
-	'use strict';
-
-	var device = void 0;
-	var TOUCH_STATE = ['touchstarted', 'touchmoved', 'touchended'];
-
-	function firstLetterUpper(str) {
-		return str.charAt(0).toUpperCase() + str.slice(1)
-	}
-
-	function setTouchState(instance) {
-		var arg = [],
-			len = arguments.length - 1;
-		while (len-- > 0) arg[len] = arguments[len + 1];
-
-		TOUCH_STATE.forEach(function(key, i) {
-			if (arg[i] !== undefined) {
-				instance[key] = arg[i];
-			}
-		});
-	}
-
-	function validator(instance, o) {
-		Object.defineProperties(instance, o);
-	}
-
-	function getDevice() {
-		if (!device) {
-			device = uni.getSystemInfoSync();
-		}
-		return device
-	}
-
-	var tmp = {};
-
-	var ref = getDevice();
-	var pixelRatio = ref.pixelRatio;
-
-	var DEFAULT = {
-		id: {
-			default: 'cropper',
-			get: function get() {
-				return tmp.id
-			},
-			set: function set(value) {
-				if (typeof(value) !== 'string') {
-					console.error(("id：" + value + " is invalid"));
-				}
-				tmp.id = value;
-			}
-		},
-		width: {
-			default: 750,
-			get: function get() {
-				return tmp.width
-			},
-			set: function set(value) {
-				if (typeof(value) !== 'number') {
-					console.error(("width：" + value + " is invalid"));
-				}
-				tmp.width = value;
-			}
-		},
-		height: {
-			default: 750,
-			get: function get() {
-				return tmp.height
-			},
-			set: function set(value) {
-				if (typeof(value) !== 'number') {
-					console.error(("height：" + value + " is invalid"));
-				}
-				tmp.height = value;
-			}
-		},
-		pixelRatio: {
-			default: pixelRatio,
-			get: function get() {
-				return tmp.pixelRatio
-			},
-			set: function set(value) {
-				if (typeof(value) !== 'number') {
-					console.error(("pixelRatio：" + value + " is invalid"));
-				}
-				tmp.pixelRatio = value;
-			}
-		},
-		scale: {
-			default: 2.5,
-			get: function get() {
-				return tmp.scale
-			},
-			set: function set(value) {
-				if (typeof(value) !== 'number') {
-					console.error(("scale：" + value + " is invalid"));
-				}
-				tmp.scale = value;
-			}
-		},
-		zoom: {
-			default: 5,
-			get: function get() {
-				return tmp.zoom
-			},
-			set: function set(value) {
-				if (typeof(value) !== 'number') {
-					console.error(("zoom：" + value + " is invalid"));
-				} else if (value < 0 || value > 10) {
-					console.error("zoom should be ranged in 0 ~ 10");
-				}
-				tmp.zoom = value;
-			}
-		},
-		src: {
-			default: '',
-			get: function get() {
-				return tmp.src
-			},
-			set: function set(value) {
-				if (typeof(value) !== 'string') {
-					console.error(("src：" + value + " is invalid"));
-				}
-				tmp.src = value;
-			}
-		},
-		cut: {
-			default: {},
-			get: function get() {
-				return tmp.cut
-			},
-			set: function set(value) {
-				if (typeof(value) !== 'object') {
-					console.error(("cut：" + value + " is invalid"));
-				}
-				tmp.cut = value;
-			}
-		},
-		boundStyle: {
-			default: {},
-			get: function get() {
-				return tmp.boundStyle
-			},
-			set: function set(value) {
-				if (typeof(value) !== 'object') {
-					console.error(("boundStyle：" + value + " is invalid"));
-				}
-				tmp.boundStyle = value;
-			}
-		},
-		onReady: {
-			default: null,
-			get: function get() {
-				return tmp.ready
-			},
-			set: function set(value) {
-				tmp.ready = value;
-			}
-		},
-		onBeforeImageLoad: {
-			default: null,
-			get: function get() {
-				return tmp.beforeImageLoad
-			},
-			set: function set(value) {
-				tmp.beforeImageLoad = value;
-			}
-		},
-		onImageLoad: {
-			default: null,
-			get: function get() {
-				return tmp.imageLoad
-			},
-			set: function set(value) {
-				tmp.imageLoad = value;
-			}
-		},
-		onBeforeDraw: {
-			default: null,
-			get: function get() {
-				return tmp.beforeDraw
-			},
-			set: function set(value) {
-				tmp.beforeDraw = value;
-			}
-		}
-	};
-
-	var ref$1 = getDevice();
-	var windowWidth = ref$1.windowWidth;
-
-	function prepare() {
-		var self = this;
-
-		// v1.4.0 版本中将不再自动绑定we-cropper实例
-		self.attachPage = function() {
-			var pages = getCurrentPages();
-			// 获取到当前page上下文
-			var pageContext = pages[pages.length - 1];
-			// 把this依附在Page上下文的wecropper属性上，便于在page钩子函数中访问
-			Object.defineProperty(pageContext, 'wecropper', {
-				get: function get() {
-					console.warn(
-						'Instance will not be automatically bound to the page after v1.4.0\n\n' +
-						'Please use a custom instance name instead\n\n' +
-						'Example: \n' +
-						'this.mycropper = new WeCropper(options)\n\n' +
-						'// ...\n' +
-						'this.mycropper.getCropperImage()'
-					);
-					return self
-				},
-				configurable: true
-			});
-		};
-
-		self.createCtx = function() {
-			var id = self.id;
-			var targetId = self.targetId;
-
-			if (id) {
-				self.ctx = self.ctx || uni.createCanvasContext(id);
-				self.targetCtx = self.targetCtx || uni.createCanvasContext(targetId);
-			} else {
-				console.error("constructor: create canvas context failed, 'id' must be valuable");
-			}
-		};
-
-		self.deviceRadio = windowWidth / 750;
-	}
-
-	var commonjsGlobal = typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !==
-		'undefined' ? self : {};
-
-
-
-
-
-	function createCommonjsModule(fn, module) {
-		return module = {
-			exports: {}
-		}, fn(module, module.exports), module.exports;
-	}
-
-	var tools = createCommonjsModule(function(module, exports) {
-		/**
-		 * String type check
-		 */
-		exports.isStr = function(v) {
-			return typeof v === 'string';
-		};
-		/**
-		 * Number type check
-		 */
-		exports.isNum = function(v) {
-			return typeof v === 'number';
-		};
-		/**
-		 * Array type check
-		 */
-		exports.isArr = Array.isArray;
-		/**
-		 * undefined type check
-		 */
-		exports.isUndef = function(v) {
-			return v === undefined;
-		};
-
-		exports.isTrue = function(v) {
-			return v === true;
-		};
-
-		exports.isFalse = function(v) {
-			return v === false;
-		};
-		/**
-		 * Function type check
-		 */
-		exports.isFunc = function(v) {
-			return typeof v === 'function';
-		};
-		/**
-		 * Quick object check - this is primarily used to tell
-		 * Objects from primitive values when we know the value
-		 * is a JSON-compliant type.
-		 */
-		exports.isObj = exports.isObject = function(obj) {
-			return obj !== null && typeof obj === 'object'
-		};
-
-		/**
-		 * Strict object type check. Only returns true
-		 * for plain JavaScript objects.
-		 */
-		var _toString = Object.prototype.toString;
-		exports.isPlainObject = function(obj) {
-			return _toString.call(obj) === '[object Object]'
-		};
-
-		/**
-		 * Check whether the object has the property.
-		 */
-		var hasOwnProperty = Object.prototype.hasOwnProperty;
-		exports.hasOwn = function(obj, key) {
-			return hasOwnProperty.call(obj, key)
-		};
-
-		/**
-		 * Perform no operation.
-		 * Stubbing args to make Flow happy without leaving useless transpiled code
-		 * with ...rest (https://flow.org/blog/2017/05/07/Strict-Function-Call-Arity/)
-		 */
-		exports.noop = function(a, b, c) {};
-
-		/**
-		 * Check if val is a valid array index.
-		 */
-		exports.isValidArrayIndex = function(val) {
-			var n = parseFloat(String(val));
-			return n >= 0 && Math.floor(n) === n && isFinite(val)
-		};
-	});
-
-	var tools_7 = tools.isFunc;
-	var tools_10 = tools.isPlainObject;
-
-	var EVENT_TYPE = ['ready', 'beforeImageLoad', 'beforeDraw', 'imageLoad'];
-
-	function observer() {
-		var self = this;
-
-		self.on = function(event, fn) {
-			if (EVENT_TYPE.indexOf(event) > -1) {
-				if (tools_7(fn)) {
-					event === 'ready' ?
-						fn(self) :
-						self[("on" + (firstLetterUpper(event)))] = fn;
-				}
-			} else {
-				console.error(("event: " + event + " is invalid"));
-			}
-			return self
-		};
-	}
-
-	function wxPromise(fn) {
-		return function(obj) {
-			var args = [],
-				len = arguments.length - 1;
-			while (len-- > 0) args[len] = arguments[len + 1];
-
-			if (obj === void 0) obj = {};
-			return new Promise(function(resolve, reject) {
-				obj.success = function(res) {
-					resolve(res);
-				};
-				obj.fail = function(err) {
-					reject(err);
-				};
-				fn.apply(void 0, [obj].concat(args));
-			})
-		}
-	}
-
-	function draw(ctx, reserve) {
-		if (reserve === void 0) reserve = false;
-
-		return new Promise(function(resolve) {
-			ctx.draw(reserve, resolve);
-		})
-	}
-
-	var getImageInfo = wxPromise(uni.getImageInfo);
-
-	var canvasToTempFilePath = wxPromise(uni.canvasToTempFilePath);
-
-	var base64 = createCommonjsModule(function(module, exports) {
-		/*! http://mths.be/base64 v0.1.0 by @mathias | MIT license */
-		(function(root) {
-
-			// Detect free variables `exports`.
-			var freeExports = 'object' == 'object' && exports;
-
-			// Detect free variable `module`.
-			var freeModule = 'object' == 'object' && module &&
-				module.exports == freeExports && module;
-
-			// Detect free variable `global`, from Node.js or Browserified code, and use
-			// it as `root`.
-			var freeGlobal = typeof commonjsGlobal == 'object' && commonjsGlobal;
-			if (freeGlobal.global === freeGlobal || freeGlobal.window === freeGlobal) {
-				root = freeGlobal;
-			}
-
-			/*--------------------------------------------------------------------------*/
-
-			var InvalidCharacterError = function(message) {
-				this.message = message;
-			};
-			InvalidCharacterError.prototype = new Error;
-			InvalidCharacterError.prototype.name = 'InvalidCharacterError';
-
-			var error = function(message) {
-				// Note: the error messages used throughout this file match those used by
-				// the native `atob`/`btoa` implementation in Chromium.
-				throw new InvalidCharacterError(message);
-			};
-
-			var TABLE = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';
-			// http://whatwg.org/html/common-microsyntaxes.html#space-character
-			var REGEX_SPACE_CHARACTERS = /[\t\n\f\r ]/g;
-
-			// `decode` is designed to be fully compatible with `atob` as described in the
-			// HTML Standard. http://whatwg.org/html/webappapis.html#dom-windowbase64-atob
-			// The optimized base64-decoding algorithm used is based on @atk’s excellent
-			// implementation. https://gist.github.com/atk/1020396
-			var decode = function(input) {
-				input = String(input)
-					.replace(REGEX_SPACE_CHARACTERS, '');
-				var length = input.length;
-				if (length % 4 == 0) {
-					input = input.replace(/==?$/, '');
-					length = input.length;
-				}
-				if (
-					length % 4 == 1 ||
-					// http://whatwg.org/C#alphanumeric-ascii-characters
-					/[^+a-zA-Z0-9/]/.test(input)
-				) {
-					error(
-						'Invalid character: the string to be decoded is not correctly encoded.'
-					);
-				}
-				var bitCounter = 0;
-				var bitStorage;
-				var buffer;
-				var output = '';
-				var position = -1;
-				while (++position < length) {
-					buffer = TABLE.indexOf(input.charAt(position));
-					bitStorage = bitCounter % 4 ? bitStorage * 64 + buffer : buffer;
-					// Unless this is the first of a group of 4 characters…
-					if (bitCounter++ % 4) {
-						// …convert the first 8 bits to a single ASCII character.
-						output += String.fromCharCode(
-							0xFF & bitStorage >> (-2 * bitCounter & 6)
-						);
-					}
-				}
-				return output;
-			};
-
-			// `encode` is designed to be fully compatible with `btoa` as described in the
-			// HTML Standard: http://whatwg.org/html/webappapis.html#dom-windowbase64-btoa
-			var encode = function(input) {
-				input = String(input);
-				if (/[^\0-\xFF]/.test(input)) {
-					// Note: no need to special-case astral symbols here, as surrogates are
-					// matched, and the input is supposed to only contain ASCII anyway.
-					error(
-						'The string to be encoded contains characters outside of the ' +
-						'Latin1 range.'
-					);
-				}
-				var padding = input.length % 3;
-				var output = '';
-				var position = -1;
-				var a;
-				var b;
-				var c;
-				var buffer;
-				// Make sure any padding is handled outside of the loop.
-				var length = input.length - padding;
-
-				while (++position < length) {
-					// Read three bytes, i.e. 24 bits.
-					a = input.charCodeAt(position) << 16;
-					b = input.charCodeAt(++position) << 8;
-					c = input.charCodeAt(++position);
-					buffer = a + b + c;
-					// Turn the 24 bits into four chunks of 6 bits each, and append the
-					// matching character for each of them to the output.
-					output += (
-						TABLE.charAt(buffer >> 18 & 0x3F) +
-						TABLE.charAt(buffer >> 12 & 0x3F) +
-						TABLE.charAt(buffer >> 6 & 0x3F) +
-						TABLE.charAt(buffer & 0x3F)
-					);
-				}
-
-				if (padding == 2) {
-					a = input.charCodeAt(position) << 8;
-					b = input.charCodeAt(++position);
-					buffer = a + b;
-					output += (
-						TABLE.charAt(buffer >> 10) +
-						TABLE.charAt((buffer >> 4) & 0x3F) +
-						TABLE.charAt((buffer << 2) & 0x3F) +
-						'='
-					);
-				} else if (padding == 1) {
-					buffer = input.charCodeAt(position);
-					output += (
-						TABLE.charAt(buffer >> 2) +
-						TABLE.charAt((buffer << 4) & 0x3F) +
-						'=='
-					);
-				}
-
-				return output;
-			};
-
-			var base64 = {
-				'encode': encode,
-				'decode': decode,
-				'version': '0.1.0'
-			};
-
-			// Some AMD build optimizers, like r.js, check for specific condition patterns
-			// like the following:
-			if (
-				typeof undefined == 'function' &&
-				typeof undefined.amd == 'object' &&
-				undefined.amd
-			) {
-				undefined(function() {
-					return base64;
-				});
-			} else if (freeExports && !freeExports.nodeType) {
-				if (freeModule) { // in Node.js or RingoJS v0.8.0+
-					freeModule.exports = base64;
-				} else { // in Narwhal or RingoJS v0.7.0-
-					for (var key in base64) {
-						base64.hasOwnProperty(key) && (freeExports[key] = base64[key]);
-					}
-				}
-			} else { // in Rhino or a web browser
-				root.base64 = base64;
-			}
-
-		}(commonjsGlobal));
-	});
-
-	function makeURI(strData, type) {
-		return 'data:' + type + ';base64,' + strData
-	}
-
-	function fixType(type) {
-		type = type.toLowerCase().replace(/jpg/i, 'jpeg');
-		var r = type.match(/png|jpeg|bmp|gif/)[0];
-		return 'image/' + r
-	}
-
-	function encodeData(data) {
-		var str = '';
-		if (typeof data === 'string') {
-			str = data;
-		} else {
-			for (var i = 0; i < data.length; i++) {
-				str += String.fromCharCode(data[i]);
-			}
-		}
-		return base64.encode(str)
-	}
-
-	/**
-	 * 获取图像区域隐含的像素数据
-	 * @param canvasId canvas标识
-	 * @param x 将要被提取的图像数据矩形区域的左上角 x 坐标
-	 * @param y 将要被提取的图像数据矩形区域的左上角 y 坐标
-	 * @param width 将要被提取的图像数据矩形区域的宽度
-	 * @param height 将要被提取的图像数据矩形区域的高度
-	 * @param done 完成回调
-	 */
-	function getImageData(canvasId, x, y, width, height, done) {
-		uni.canvasGetImageData({
-			canvasId: canvasId,
-			x: x,
-			y: y,
-			width: width,
-			height: height,
-			success: function success(res) {
-				done(res, null);
-			},
-			fail: function fail(res) {
-				done(null, res);
-			}
-		});
-	}
-
-	/**
-	 * 生成bmp格式图片
-	 * 按照规则生成图片响应头和响应体
-	 * @param oData 用来描述 canvas 区域隐含的像素数据 { data, width, height } = oData
-	 * @returns {*} base64字符串
-	 */
-	function genBitmapImage(oData) {
-		//
-		// BITMAPFILEHEADER: http://msdn.microsoft.com/en-us/library/windows/desktop/dd183374(v=vs.85).aspx
-		// BITMAPINFOHEADER: http://msdn.microsoft.com/en-us/library/dd183376.aspx
-		//
-		var biWidth = oData.width;
-		var biHeight = oData.height;
-		var biSizeImage = biWidth * biHeight * 3;
-		var bfSize = biSizeImage + 54; // total header size = 54 bytes
-
-		//
-		//  typedef struct tagBITMAPFILEHEADER {
-		//  	WORD bfType;
-		//  	DWORD bfSize;
-		//  	WORD bfReserved1;
-		//  	WORD bfReserved2;
-		//  	DWORD bfOffBits;
-		//  } BITMAPFILEHEADER;
-		//
-		var BITMAPFILEHEADER = [
-			// WORD bfType -- The file type signature; must be "BM"
-			0x42, 0x4D,
-			// DWORD bfSize -- The size, in bytes, of the bitmap file
-			bfSize & 0xff, bfSize >> 8 & 0xff, bfSize >> 16 & 0xff, bfSize >> 24 & 0xff,
-			// WORD bfReserved1 -- Reserved; must be zero
-			0, 0,
-			// WORD bfReserved2 -- Reserved; must be zero
-			0, 0,
-			// DWORD bfOffBits -- The offset, in bytes, from the beginning of the BITMAPFILEHEADER structure to the bitmap bits.
-			54, 0, 0, 0
-		];
-
-		//
-		//  typedef struct tagBITMAPINFOHEADER {
-		//  	DWORD biSize;
-		//  	LONG  biWidth;
-		//  	LONG  biHeight;
-		//  	WORD  biPlanes;
-		//  	WORD  biBitCount;
-		//  	DWORD biCompression;
-		//  	DWORD biSizeImage;
-		//  	LONG  biXPelsPerMeter;
-		//  	LONG  biYPelsPerMeter;
-		//  	DWORD biClrUsed;
-		//  	DWORD biClrImportant;
-		//  } BITMAPINFOHEADER, *PBITMAPINFOHEADER;
-		//
-		var BITMAPINFOHEADER = [
-			// DWORD biSize -- The number of bytes required by the structure
-			40, 0, 0, 0,
-			// LONG biWidth -- The width of the bitmap, in pixels
-			biWidth & 0xff, biWidth >> 8 & 0xff, biWidth >> 16 & 0xff, biWidth >> 24 & 0xff,
-			// LONG biHeight -- The height of the bitmap, in pixels
-			biHeight & 0xff, biHeight >> 8 & 0xff, biHeight >> 16 & 0xff, biHeight >> 24 & 0xff,
-			// WORD biPlanes -- The number of planes for the target device. This value must be set to 1
-			1, 0,
-			// WORD biBitCount -- The number of bits-per-pixel, 24 bits-per-pixel -- the bitmap
-			// has a maximum of 2^24 colors (16777216, Truecolor)
-			24, 0,
-			// DWORD biCompression -- The type of compression, BI_RGB (code 0) -- uncompressed
-			0, 0, 0, 0,
-			// DWORD biSizeImage -- The size, in bytes, of the image. This may be set to zero for BI_RGB bitmaps
-			biSizeImage & 0xff, biSizeImage >> 8 & 0xff, biSizeImage >> 16 & 0xff, biSizeImage >> 24 & 0xff,
-			// LONG biXPelsPerMeter, unused
-			0, 0, 0, 0,
-			// LONG biYPelsPerMeter, unused
-			0, 0, 0, 0,
-			// DWORD biClrUsed, the number of color indexes of palette, unused
-			0, 0, 0, 0,
-			// DWORD biClrImportant, unused
-			0, 0, 0, 0
-		];
-
-		var iPadding = (4 - ((biWidth * 3) % 4)) % 4;
-
-		var aImgData = oData.data;
-
-		var strPixelData = '';
-		var biWidth4 = biWidth << 2;
-		var y = biHeight;
-		var fromCharCode = String.fromCharCode;
-
-		do {
-			var iOffsetY = biWidth4 * (y - 1);
-			var strPixelRow = '';
-			for (var x = 0; x < biWidth; x++) {
-				var iOffsetX = x << 2;
-				strPixelRow += fromCharCode(aImgData[iOffsetY + iOffsetX + 2]) +
-					fromCharCode(aImgData[iOffsetY + iOffsetX + 1]) +
-					fromCharCode(aImgData[iOffsetY + iOffsetX]);
-			}
-
-			for (var c = 0; c < iPadding; c++) {
-				strPixelRow += String.fromCharCode(0);
-			}
-
-			strPixelData += strPixelRow;
-		} while (--y)
-
-		var strEncoded = encodeData(BITMAPFILEHEADER.concat(BITMAPINFOHEADER)) + encodeData(strPixelData);
-
-		return strEncoded
-	}
-
-	/**
-	 * 转换为图片base64
-	 * @param canvasId canvas标识
-	 * @param x 将要被提取的图像数据矩形区域的左上角 x 坐标
-	 * @param y 将要被提取的图像数据矩形区域的左上角 y 坐标
-	 * @param width 将要被提取的图像数据矩形区域的宽度
-	 * @param height 将要被提取的图像数据矩形区域的高度
-	 * @param type 转换图片类型
-	 * @param done 完成回调
-	 */
-	function convertToImage(canvasId, x, y, width, height, type, done) {
-		if (done === void 0) done = function() {};
-
-		if (type === undefined) {
-			type = 'png';
-		}
-		type = fixType(type);
-		if (/bmp/.test(type)) {
-			getImageData(canvasId, x, y, width, height, function(data, err) {
-				var strData = genBitmapImage(data);
-				tools_7(done) && done(makeURI(strData, 'image/' + type), err);
-			});
-		} else {
-			console.error('暂不支持生成\'' + type + '\'类型的base64图片');
-		}
-	}
-
-	var CanvasToBase64 = {
-		convertToImage: convertToImage,
-		// convertToPNG: function (width, height, done) {
-		//   return convertToImage(width, height, 'png', done)
-		// },
-		// convertToJPEG: function (width, height, done) {
-		//   return convertToImage(width, height, 'jpeg', done)
-		// },
-		// convertToGIF: function (width, height, done) {
-		//   return convertToImage(width, height, 'gif', done)
-		// },
-		convertToBMP: function(ref, done) {
-			if (ref === void 0) ref = {};
-			var canvasId = ref.canvasId;
-			var x = ref.x;
-			var y = ref.y;
-			var width = ref.width;
-			var height = ref.height;
-			if (done === void 0) done = function() {};
-
-			return convertToImage(canvasId, x, y, width, height, 'bmp', done)
-		}
-	};
-
-	function methods() {
-		var self = this;
-
-		var boundWidth = self.width; // 裁剪框默认宽度，即整个画布宽度
-		var boundHeight = self.height; // 裁剪框默认高度，即整个画布高度
-
-		var id = self.id;
-		var targetId = self.targetId;
-		var pixelRatio = self.pixelRatio;
-
-		var ref = self.cut;
-		var x = ref.x;
-		if (x === void 0) x = 0;
-		var y = ref.y;
-		if (y === void 0) y = 0;
-		var width = ref.width;
-		if (width === void 0) width = boundWidth;
-		var height = ref.height;
-		if (height === void 0) height = boundHeight;
-
-		self.updateCanvas = function(done) {
-			if (self.croperTarget) {
-				//  画布绘制图片
-				self.ctx.drawImage(
-					self.croperTarget,
-					self.imgLeft,
-					self.imgTop,
-					self.scaleWidth,
-					self.scaleHeight
-				);
-			}
-			tools_7(self.onBeforeDraw) && self.onBeforeDraw(self.ctx, self);
-
-			self.setBoundStyle(self.boundStyle); //	设置边界样式
-
-			self.ctx.draw(false, done);
-			return self
-		};
-
-		self.pushOrigin = self.pushOrign = function(src) {
-			self.src = src;
-
-			tools_7(self.onBeforeImageLoad) && self.onBeforeImageLoad(self.ctx, self);
-
-			return getImageInfo({
-					src: src
-				})
-				.then(function(res) {
-					var innerAspectRadio = res.width / res.height;
-					var customAspectRadio = width / height;
-
-					self.croperTarget = res.path;
-
-					if (innerAspectRadio < customAspectRadio) {
-						self.rectX = x;
-						self.baseWidth = width;
-						self.baseHeight = width / innerAspectRadio;
-						self.rectY = y - Math.abs((height - self.baseHeight) / 2);
-					} else {
-						self.rectY = y;
-						self.baseWidth = height * innerAspectRadio;
-						self.baseHeight = height;
-						self.rectX = x - Math.abs((width - self.baseWidth) / 2);
-					}
-
-					self.imgLeft = self.rectX;
-					self.imgTop = self.rectY;
-					self.scaleWidth = self.baseWidth;
-					self.scaleHeight = self.baseHeight;
-
-					self.update();
-
-					return new Promise(function(resolve) {
-						self.updateCanvas(resolve);
-					})
-				})
-				.then(function() {
-					tools_7(self.onImageLoad) && self.onImageLoad(self.ctx, self);
-				})
-		};
-
-		self.removeImage = function() {
-			self.src = '';
-			self.croperTarget = '';
-			return draw(self.ctx)
-		};
-
-		self.getCropperBase64 = function(done) {
-			if (done === void 0) done = function() {};
-
-			CanvasToBase64.convertToBMP({
-				canvasId: id,
-				x: x,
-				y: y,
-				width: width,
-				height: height
-			}, done);
-		};
-
-		self.getCropperImage = function(opt, fn) {
-			var customOptions = opt;
-
-			var canvasOptions = {
-				canvasId: id,
-				x: x,
-				y: y,
-				width: width,
-				height: height
-			};
-
-			var task = function() {
-				return Promise.resolve();
-			};
-
-			if (
-				tools_10(customOptions) &&
-				customOptions.original
-			) {
-				// original mode
-				task = function() {
-					self.targetCtx.drawImage(
-						self.croperTarget,
-						self.imgLeft * pixelRatio,
-						self.imgTop * pixelRatio,
-						self.scaleWidth * pixelRatio,
-						self.scaleHeight * pixelRatio
-					);
-
-					canvasOptions = {
-						canvasId: targetId,
-						x: x * pixelRatio,
-						y: y * pixelRatio,
-						width: width * pixelRatio,
-						height: height * pixelRatio
-					};
-
-					return draw(self.targetCtx)
-				};
-			}
-
-			return task()
-				.then(function() {
-					if (tools_10(customOptions)) {
-						canvasOptions = Object.assign({}, canvasOptions, customOptions);
-					}
-
-					if (tools_7(customOptions)) {
-						fn = customOptions;
-					}
-
-					var arg = canvasOptions.componentContext ?
-						[canvasOptions, canvasOptions.componentContext] :
-						[canvasOptions];
-
-					return canvasToTempFilePath.apply(null, arg)
-				})
-				.then(function(res) {
-					var tempFilePath = res.tempFilePath;
-
-					return tools_7(fn) ?
-						fn.call(self, tempFilePath, null) :
-						tempFilePath
-				})
-				.catch(function(err) {
-					if (tools_7(fn)) {
-						fn.call(self, null, err);
-					} else {
-						throw err
-					}
-				})
-		};
-	}
-
-	/**
-	 * 获取最新缩放值
-	 * @param oldScale 上一次触摸结束后的缩放值
-	 * @param oldDistance 上一次触摸结束后的双指距离
-	 * @param zoom 缩放系数
-	 * @param touch0 第一指touch对象
-	 * @param touch1 第二指touch对象
-	 * @returns {*}
-	 */
-	var getNewScale = function(oldScale, oldDistance, zoom, touch0, touch1) {
-		var xMove, yMove, newDistance;
-		// 计算二指最新距离
-		xMove = Math.round(touch1.x - touch0.x);
-		yMove = Math.round(touch1.y - touch0.y);
-		newDistance = Math.round(Math.sqrt(xMove * xMove + yMove * yMove));
-
-		return oldScale + 0.001 * zoom * (newDistance - oldDistance)
-	};
-
-	function update() {
-		var self = this;
-
-		if (!self.src) {
-			return
-		}
-
-		self.__oneTouchStart = function(touch) {
-			self.touchX0 = Math.round(touch.x);
-			self.touchY0 = Math.round(touch.y);
-		};
-
-		self.__oneTouchMove = function(touch) {
-			var xMove, yMove;
-			// 计算单指移动的距离
-			if (self.touchended) {
-				return self.updateCanvas()
-			}
-			xMove = Math.round(touch.x - self.touchX0);
-			yMove = Math.round(touch.y - self.touchY0);
-
-			var imgLeft = Math.round(self.rectX + xMove);
-			var imgTop = Math.round(self.rectY + yMove);
-
-			self.outsideBound(imgLeft, imgTop);
-
-			self.updateCanvas();
-		};
-
-		self.__twoTouchStart = function(touch0, touch1) {
-			var xMove, yMove, oldDistance;
-
-			self.touchX1 = Math.round(self.rectX + self.scaleWidth / 2);
-			self.touchY1 = Math.round(self.rectY + self.scaleHeight / 2);
-
-			// 计算两指距离
-			xMove = Math.round(touch1.x - touch0.x);
-			yMove = Math.round(touch1.y - touch0.y);
-			oldDistance = Math.round(Math.sqrt(xMove * xMove + yMove * yMove));
-
-			self.oldDistance = oldDistance;
-		};
-
-		self.__twoTouchMove = function(touch0, touch1) {
-			var oldScale = self.oldScale;
-			var oldDistance = self.oldDistance;
-			var scale = self.scale;
-			var zoom = self.zoom;
-
-			self.newScale = getNewScale(oldScale, oldDistance, zoom, touch0, touch1);
-
-			//  设定缩放范围
-			self.newScale <= 1 && (self.newScale = 1);
-			self.newScale >= scale && (self.newScale = scale);
-
-			self.scaleWidth = Math.round(self.newScale * self.baseWidth);
-			self.scaleHeight = Math.round(self.newScale * self.baseHeight);
-			var imgLeft = Math.round(self.touchX1 - self.scaleWidth / 2);
-			var imgTop = Math.round(self.touchY1 - self.scaleHeight / 2);
-
-			self.outsideBound(imgLeft, imgTop);
-
-			self.updateCanvas();
-		};
-
-		self.__xtouchEnd = function() {
-			self.oldScale = self.newScale;
-			self.rectX = self.imgLeft;
-			self.rectY = self.imgTop;
-		};
-	}
-
-	var handle = {
-		//  图片手势初始监测
-		touchStart: function touchStart(e) {
-			var self = this;
-			var ref = e.touches;
-			var touch0 = ref[0];
-			var touch1 = ref[1];
-
-			if (!self.src) {
-				return
-			}
-
-			setTouchState(self, true, null, null);
-
-			// 计算第一个触摸点的位置，并参照改点进行缩放
-			self.__oneTouchStart(touch0);
-
-			// 两指手势触发
-			if (e.touches.length >= 2) {
-				self.__twoTouchStart(touch0, touch1);
-			}
-		},
-
-		//  图片手势动态缩放
-		touchMove: function touchMove(e) {
-			var self = this;
-			var ref = e.touches;
-			var touch0 = ref[0];
-			var touch1 = ref[1];
-
-			if (!self.src) {
-				return
-			}
-
-			setTouchState(self, null, true);
-
-			// 单指手势时触发
-			if (e.touches.length === 1) {
-				self.__oneTouchMove(touch0);
-			}
-			// 两指手势触发
-			if (e.touches.length >= 2) {
-				self.__twoTouchMove(touch0, touch1);
-			}
-		},
-
-		touchEnd: function touchEnd(e) {
-			var self = this;
-
-			if (!self.src) {
-				return
-			}
-
-			setTouchState(self, false, false, true);
-			self.__xtouchEnd();
-		}
-	};
-
-	function cut() {
-		var self = this;
-		var boundWidth = self.width; // 裁剪框默认宽度，即整个画布宽度
-		var boundHeight = self.height;
-		// 裁剪框默认高度，即整个画布高度
-		var ref = self.cut;
-		var x = ref.x;
-		if (x === void 0) x = 0;
-		var y = ref.y;
-		if (y === void 0) y = 0;
-		var width = ref.width;
-		if (width === void 0) width = boundWidth;
-		var height = ref.height;
-		if (height === void 0) height = boundHeight;
-
-		/**
-		 * 设置边界
-		 * @param imgLeft 图片左上角横坐标值
-		 * @param imgTop 图片左上角纵坐标值
-		 */
-		self.outsideBound = function(imgLeft, imgTop) {
-			self.imgLeft = imgLeft >= x ?
-				x :
-				self.scaleWidth + imgLeft - x <= width ?
-				x + width - self.scaleWidth :
-				imgLeft;
-
-			self.imgTop = imgTop >= y ?
-				y :
-				self.scaleHeight + imgTop - y <= height ?
-				y + height - self.scaleHeight :
-				imgTop;
-		};
-
-		/**
-		 * 设置边界样式
-		 * @param color	边界颜色
-		 */
-		self.setBoundStyle = function(ref) {
-			if (ref === void 0) ref = {};
-			var color = ref.color;
-			if (color === void 0) color = '#04b00f';
-			var mask = ref.mask;
-			if (mask === void 0) mask = 'rgba(0, 0, 0, 0.3)';
-			var lineWidth = ref.lineWidth;
-			if (lineWidth === void 0) lineWidth = 1;
-
-			var half = lineWidth / 2;
-			var boundOption = [{
-					start: {
-						x: x - half,
-						y: y + 10 - half
-					},
-					step1: {
-						x: x - half,
-						y: y - half
-					},
-					step2: {
-						x: x + 10 - half,
-						y: y - half
-					}
-				},
-				{
-					start: {
-						x: x - half,
-						y: y + height - 10 + half
-					},
-					step1: {
-						x: x - half,
-						y: y + height + half
-					},
-					step2: {
-						x: x + 10 - half,
-						y: y + height + half
-					}
-				},
-				{
-					start: {
-						x: x + width - 10 + half,
-						y: y - half
-					},
-					step1: {
-						x: x + width + half,
-						y: y - half
-					},
-					step2: {
-						x: x + width + half,
-						y: y + 10 - half
-					}
-				},
-				{
-					start: {
-						x: x + width + half,
-						y: y + height - 10 + half
-					},
-					step1: {
-						x: x + width + half,
-						y: y + height + half
-					},
-					step2: {
-						x: x + width - 10 + half,
-						y: y + height + half
-					}
-				}
-			];
-
-			// 绘制半透明层
-			self.ctx.beginPath();
-			self.ctx.setFillStyle(mask);
-			self.ctx.fillRect(0, 0, x, boundHeight);
-			self.ctx.fillRect(x, 0, width, y);
-			self.ctx.fillRect(x, y + height, width, boundHeight - y - height);
-			self.ctx.fillRect(x + width, 0, boundWidth - x - width, boundHeight);
-			self.ctx.fill();
-
-			boundOption.forEach(function(op) {
-				self.ctx.beginPath();
-				self.ctx.setStrokeStyle(color);
-				self.ctx.setLineWidth(lineWidth);
-				self.ctx.moveTo(op.start.x, op.start.y);
-				self.ctx.lineTo(op.step1.x, op.step1.y);
-				self.ctx.lineTo(op.step2.x, op.step2.y);
-				self.ctx.stroke();
-			});
-		};
-	}
-
-	var version = "1.3.9";
-
-	var WeCropper = function WeCropper(params) {
-		var self = this;
-		var _default = {};
-
-		validator(self, DEFAULT);
-
-		Object.keys(DEFAULT).forEach(function(key) {
-			_default[key] = DEFAULT[key].default;
-		});
-		Object.assign(self, _default, params);
-
-		self.prepare();
-		self.attachPage();
-		self.createCtx();
-		self.observer();
-		self.cutt();
-		self.methods();
-		self.init();
-		self.update();
-
-		return self
-	};
-
-	WeCropper.prototype.init = function init() {
-		var self = this;
-		var src = self.src;
-
-		self.version = version;
-
-		typeof self.onReady === 'function' && self.onReady(self.ctx, self);
-
-		if (src) {
-			self.pushOrign(src);
-		} else {
-			self.updateCanvas();
-		}
-		setTouchState(self, false, false, false);
-
-		self.oldScale = 1;
-		self.newScale = 1;
-
-		return self
-	};
-
-	Object.assign(WeCropper.prototype, handle);
-
-	WeCropper.prototype.prepare = prepare;
-	WeCropper.prototype.observer = observer;
-	WeCropper.prototype.methods = methods;
-	WeCropper.prototype.cutt = cut;
-	WeCropper.prototype.update = update;
-
-	return WeCropper;
-
-})));
diff --git a/uview-ui/components/u-avatar/u-avatar.vue b/uview-ui/components/u-avatar/u-avatar.vue
deleted file mode 100644
index 289b9b02..00000000
--- a/uview-ui/components/u-avatar/u-avatar.vue
+++ /dev/null
@@ -1,244 +0,0 @@
-<template>
-	<view class="u-avatar" :style="[wrapStyle]" @tap="click">
-		<image
-			@error="loadError"
-			:style="[imgStyle]"
-			class="u-avatar__img"
-			v-if="!uText && avatar"
-			:src="avatar" 
-			:mode="imgMode"
-		></image>
-		<text class="u-line-1" v-else-if="uText" :style="{
-			fontSize: '38rpx'
-		}">{{uText}}</text>
-		<slot v-else></slot>
-		<view class="u-avatar__sex" v-if="showSex" :class="['u-avatar__sex--' + sexIcon]" :style="[uSexStyle]">
-			<u-icon :name="sexIcon" size="20"></u-icon>
-		</view>
-		<view class="u-avatar__level" v-if="showLevel" :style="[uLevelStyle]">
-			<u-icon :name="levelIcon" size="20"></u-icon>
-		</view>
-	</view>
-</template>
-
-<script>
-	let base64Avatar = "data:image/jpg;base64,/9j/4QAYRXhpZgAASUkqAAgAAAAAAAAAAAAAAP/sABFEdWNreQABAAQAAAA8AAD/4QMraHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLwA8P3hwYWNrZXQgYmVnaW49Iu+7vyIgaWQ9Ilc1TTBNcENlaGlIenJlU3pOVGN6a2M5ZCI/PiA8eDp4bXBtZXRhIHhtbG5zOng9ImFkb2JlOm5zOm1ldGEvIiB4OnhtcHRrPSJBZG9iZSBYTVAgQ29yZSA1LjMtYzAxMSA2Ni4xNDU2NjEsIDIwMTIvMDIvMDYtMTQ6NTY6MjcgICAgICAgICI+IDxyZGY6UkRGIHhtbG5zOnJkZj0iaHR0cDovL3d3dy53My5vcmcvMTk5OS8wMi8yMi1yZGYtc3ludGF4LW5zIyI+IDxyZGY6RGVzY3JpcHRpb24gcmRmOmFib3V0PSIiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjREMEQwRkY0RjgwNDExRUE5OTY2RDgxODY3NkJFODMxIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjREMEQwRkY1RjgwNDExRUE5OTY2RDgxODY3NkJFODMxIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NEQwRDBGRjJGODA0MTFFQTk5NjZEODE4Njc2QkU4MzEiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NEQwRDBGRjNGODA0MTFFQTk5NjZEODE4Njc2QkU4MzEiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz7/7gAOQWRvYmUAZMAAAAAB/9sAhAAGBAQEBQQGBQUGCQYFBgkLCAYG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";
-	/**
-	 * avatar 头像
-	 * @description 本组件一般用于展示头像的地方，如个人中心，或者评论列表页的用户头像展示等场所。
-	 * @tutorial https://www.uviewui.com/components/avatar.html
-	 * @property {String} bg-color 背景颜色，一般显示文字时用（默认#ffffff）
-	 * @property {String} src 头像路径，如加载失败，将会显示默认头像
-	 * @property {String Number} size 头像尺寸，可以为指定字符串(large, default, mini)，或者数值，单位rpx（默认default）
-	 * @property {String} mode 显示类型，见上方说明（默认circle）
-	 * @property {String} sex-icon 性别图标，man-男，woman-女（默认man）
-	 * @property {String} level-icon 等级图标（默认level）
-	 * @property {String} sex-bg-color 性别图标背景颜色
-	 * @property {String} level-bg-color 等级图标背景颜色
-	 * @property {String} show-sex 是否显示性别图标（默认false）
-	 * @property {String} show-level 是否显示等级图标（默认false）
-	 * @property {String} img-mode 头像图片的裁剪类型，与uni的image组件的mode参数一致，如效果达不到需求，可尝试传widthFix值（默认aspectFill）
-	 * @property {String} index 用户传递的标识符值，如果是列表循环，可穿v-for的index值
-	 * @event {Function} click 头像被点击
-	 * @example <u-avatar :src="src"></u-avatar>
-	 */
-	export default {
-		name: 'u-avatar',
-		props: {
-			// 背景颜色
-			bgColor: {
-				type: String,
-				default: 'transparent'
-			},
-			// 头像路径
-			src: {
-				type: String,
-				default: ''
-			},
-			// 尺寸，large-大，default-中等，mini-小，如果为数值，则单位为rpx
-			// 宽度等于高度
-			size: {
-				type: [String, Number],
-				default: 'default'
-			},
-			// 头像模型，square-带圆角方形，circle-圆形
-			mode: {
-				type: String,
-				default: 'circle'
-			},
-			// 文字内容
-			text: {
-				type: String,
-				default: ''
-			},
-			// 图片的裁剪模型
-			imgMode: {
-				type: String,
-				default: 'aspectFill'
-			},
-			// 标识符
-			index: {
-				type: [String, Number],
-				default: ''
-			},
-			// 右上角性别角标，man-男，woman-女
-			sexIcon: {
-				type: String,
-				default: 'man'
-			},
-			// 右下角的等级图标
-			levelIcon: {
-				type: String,
-				default: 'level'
-			},
-			// 右下角等级图标背景颜色
-			levelBgColor: {
-				type: String,
-				default: ''
-			},
-			// 右上角性别图标的背景颜色
-			sexBgColor: {
-				type: String,
-				default: ''
-			},
-			// 是否显示性别图标
-			showSex: {
-				type: Boolean,
-				default: false
-			},
-			// 是否显示等级图标
-			showLevel: {
-				type: Boolean,
-				default: false
-			}
-		},
-		data() {
-			return {
-				error: false,
-				// 头像的地址，因为如果加载错误，需要赋值为默认图片，props值无法修改，所以需要一个中间值
-                avatar: this.src ? this.src : base64Avatar, 
-			}
-		},
-        watch: {
-            src(n) {
-                // 用户可能会在头像加载失败时，再次修改头像值，所以需要重新赋值
-                if(!n) {
-					// 如果传入null或者''，或者undefined，显示默认头像
-					this.avatar = base64Avatar;
-					this.error = true;
-				} else {
-					this.avatar = n;
-					this.error = false;
-				}
-            }
-        },
-		computed: {
-			wrapStyle() {
-				let style = {};  
-				style.height = this.size == 'large' ? '120rpx' : this.size == 'default' ?
-				'90rpx' : this.size == 'mini' ? '70rpx' : this.size + 'rpx';
-				style.width = style.height;
-				style.flex = `0 0 ${style.height}`;
-				style.backgroundColor = this.bgColor;
-				style.borderRadius = this.mode == 'circle' ? '500px' : '5px';
-				if(this.text) style.padding = `0 6rpx`;
-				return style;
-			},
-			imgStyle() {
-				let style = {};
-				style.borderRadius = this.mode == 'circle' ? '500px' : '5px';
-				return style;
-			},
-			// 取字符串的第一个字符
-			uText() {
-				return String(this.text)[0];
-			},
-			// 性别图标的自定义样式
-			uSexStyle() {
-				let style = {};
-				if(this.sexBgColor) style.backgroundColor = this.sexBgColor;
-				return style;
-			},
-			// 等级图标的自定义样式
-			uLevelStyle() {
-				let style = {};
-				if(this.levelBgColor) style.backgroundColor = this.levelBgColor;
-				return style;
-			}
-		},
-		methods: {
-			// 图片加载错误时，显示默认头像
-			loadError() {
-				this.error = true;
-                this.avatar = base64Avatar;
-			},
-			click() {
-				this.$emit('click', this.index);
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	@import "../../libs/css/style.components.scss";
-
-	.u-avatar {
-		/* #ifndef APP-NVUE */
-		display: inline-flex;		
-		/* #endif */
-		align-items: center;
-		justify-content: center;
-		font-size: 28rpx;
-		color: $u-content-color;
-		border-radius: 10px;
-		position: relative;
-		
-		&__img {
-			width: 100%;
-			height: 100%;
-		}
-		
-		&__sex {
-			position: absolute;
-			width: 32rpx;
-			color: #ffffff;
-			height: 32rpx;
-			@include vue-flex;
-			justify-content: center;
-			align-items: center;
-			border-radius: 100rpx;
-			top: 5%;
-			z-index: 1;
-			right: -7%;
-			border: 1px #ffffff solid;
-			
-			&--man {
-				background-color: $u-type-primary;
-			}
-			
-			&--woman {
-				background-color: $u-type-error;
-			}
-			
-			&--none {
-				background-color: $u-type-warning;
-			}
-		}
-		
-		&__level {
-			position: absolute;
-			width: 32rpx;
-			color: #ffffff;
-			height: 32rpx;
-			@include vue-flex;
-			justify-content: center;
-			align-items: center;
-			border-radius: 100rpx;
-			bottom: 5%; 
-			z-index: 1;
-			right: -7%;
-			border: 1px #ffffff solid;
-			background-color: $u-type-warning;
-		}
-	}
-</style>
diff --git a/uview-ui/components/u-back-top/u-back-top.vue b/uview-ui/components/u-back-top/u-back-top.vue
deleted file mode 100644
index 7970fc7a..00000000
--- a/uview-ui/components/u-back-top/u-back-top.vue
+++ /dev/null
@@ -1,153 +0,0 @@
-<template>
-	<view @tap="backToTop" class="u-back-top" :class="['u-back-top--mode--' + mode]" :style="[{
-		bottom: bottom + 'rpx',
-		right: right + 'rpx',
-		borderRadius: mode == 'circle' ? '10000rpx' : '8rpx',
-		zIndex: uZIndex,
-		opacity: opacity
-	}, customStyle]">
-		<view class="u-back-top__content" v-if="!$slots.default && !$slots.$default">
-			<u-icon @click="backToTop" :name="icon" :custom-style="iconStyle"></u-icon>
-			<view class="u-back-top__content__tips">
-				{{tips}}
-			</view>
-		</view>
-		<slot v-else />
-	</view>
-</template>
-
-<script>
-	export default {
-		name: 'u-back-top',
-		props: {
-			// 返回顶部的形状，circle-圆形，square-方形
-			mode: {
-				type: String,
-				default: 'circle'
-			},
-			// 自定义图标
-			icon: {
-				type: String,
-				default: 'arrow-upward'
-			},
-			// 提示文字
-			tips: {
-				type: String,
-				default: ''
-			},
-			// 返回顶部滚动时间
-			duration: {
-				type: [Number, String],
-				default: 100
-			},
-			// 滚动距离
-			scrollTop: {
-				type: [Number, String],
-				default: 0
-			},
-			// 距离顶部多少距离显示，单位rpx
-			top: {
-				type: [Number, String],
-				default: 400
-			},
-			// 返回顶部按钮到底部的距离，单位rpx
-			bottom: {
-				type: [Number, String],
-				default: 200
-			},
-			// 返回顶部按钮到右边的距离，单位rpx
-			right: {
-				type: [Number, String],
-				default: 40
-			},
-			// 层级
-			zIndex: {
-				type: [Number, String],
-				default: '9'
-			},
-			// 图标的样式，对象形式
-			iconStyle: {
-				type: Object,
-				default() {
-					return {
-						color: '#909399',
-						fontSize: '38rpx'
-					}
-				}
-			},
-			// 整个组件的样式
-			customStyle: {
-				type: Object,
-				default() {
-					return {}
-				}
-			}
-		},
-		watch: {
-			showBackTop(nVal, oVal) {
-				// 当组件的显示与隐藏状态发生跳变时，修改组件的层级和不透明度
-				// 让组件有显示和消失的动画效果，如果用v-if控制组件状态，将无设置动画效果
-				if(nVal) {
-					this.uZIndex = this.zIndex;
-					this.opacity = 1;
-				} else {
-					this.uZIndex = -1;
-					this.opacity = 0;
-				}
-			}
-		},
-		computed: {
-			showBackTop() {
-				// 由于scrollTop为页面的滚动距离，默认为px单位，这里将用于传入的top(rpx)值
-				// 转为px用于比较，如果滚动条到顶的距离大于设定的距离，就显示返回顶部的按钮
-				return this.scrollTop > uni.upx2px(this.top);
-			},
-		},
-		data() {
-			return {
-				// 不透明度，为了让组件有一个显示和隐藏的过渡动画
-				opacity: 0,
-				// 组件的z-index值，隐藏时设置为-1，就会看不到
-				uZIndex: -1
-			}
-		},
-		methods: {
-			backToTop() {
-				uni.pageScrollTo({
-					scrollTop: 0,
-					duration: this.duration
-				});
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	@import "../../libs/css/style.components.scss";
-	
-	.u-back-top {
-		width: 80rpx;
-		height: 80rpx;
-		position: fixed;
-		z-index: 9;
-		@include vue-flex;
-		flex-direction: column;
-		justify-content: center;
-		background-color: #E1E1E1;
-		color: $u-content-color;
-		align-items: center;
-		transition: opacity 0.4s;
-		
-		&__content {
-			@include vue-flex;
-			flex-direction: column;
-			align-items: center;
-			
-			&__tips {
-				font-size: 24rpx;
-				transform: scale(0.8);
-				line-height: 1;
-			}
-		}
-	}
-</style>
diff --git a/uview-ui/components/u-badge/u-badge.vue b/uview-ui/components/u-badge/u-badge.vue
deleted file mode 100644
index cd93d9cc..00000000
--- a/uview-ui/components/u-badge/u-badge.vue
+++ /dev/null
@@ -1,192 +0,0 @@
-<template>
-	<view v-if="show" class="u-badge" :class="[
-			isDot ? 'u-badge-dot' : '', 
-			size == 'mini' ? 'u-badge-mini' : '',
-			type ? 'u-badge--bg--' + type : ''
-		]" :style="[{
-			top: offset[0] + 'rpx',
-			right: offset[1] + 'rpx',
-			fontSize: fontSize + 'rpx',
-			position: absolute ? 'absolute' : 'static',
-			color: color,
-			backgroundColor: bgColor
-		}, boxStyle]"
-	>
-		{{showText}}
-	</view>
-</template>
-
-<script>
-	/**
-	 * badge 角标
-	 * @description 本组件一般用于展示头像的地方，如个人中心，或者评论列表页的用户头像展示等场所。
-	 * @tutorial https://www.uviewui.com/components/badge.html
-	 * @property {String Number} count 展示的数字，大于 overflowCount 时显示为 ${overflowCount}+，为0且show-zero为false时隐藏
-	 * @property {Boolean} is-dot 不展示数字，只有一个小点（默认false）
-	 * @property {Boolean} absolute 组件是否绝对定位，为true时，offset参数才有效（默认true）
-	 * @property {String Number} overflow-count 展示封顶的数字值（默认99）
-	 * @property {String} type 使用预设的背景颜色（默认error）
-	 * @property {Boolean} show-zero 当数值为 0 时，是否展示 Badge（默认false）
-	 * @property {String} size Badge的尺寸，设为mini会得到小一号的Badge（默认default）
-	 * @property {Array} offset 设置badge的位置偏移，格式为 [x, y]，也即设置的为top和right的值，单位rpx。absolute为true时有效（默认[20, 20]）
-	 * @property {String} color 字体颜色（默认#ffffff）
-	 * @property {String} bgColor 背景颜色，优先级比type高，如设置，type参数会失效
-	 * @property {Boolean} is-center 组件中心点是否和父组件右上角重合，优先级比offset高，如设置，offset参数会失效（默认false）
-	 * @example <u-badge type="error" count="7"></u-badge>
-	 */
-	export default {
-		name: 'u-badge',
-		props: {
-			// primary,warning,success,error,info
-			type: {
-				type: String,
-				default: 'error'
-			},
-			// default, mini
-			size: {
-				type: String,
-				default: 'default'
-			},
-			//是否是圆点
-			isDot: {
-				type: Boolean,
-				default: false
-			},
-			// 显示的数值内容
-			count: {
-				type: [Number, String],
-			},
-			// 展示封顶的数字值
-			overflowCount: {
-				type: Number,
-				default: 99
-			},
-			// 当数值为 0 时，是否展示 Badge
-			showZero: {
-				type: Boolean,
-				default: false
-			},
-			// 位置偏移
-			offset: {
-				type: Array,
-				default: () => {
-					return [20, 20]
-				}
-			},
-			// 是否开启绝对定位，开启了offset才会起作用
-			absolute: {
-				type: Boolean,
-				default: true
-			},
-			// 字体大小
-			fontSize: {
-				type: [String, Number],
-				default: '24'
-			},
-			// 字体演示
-			color: {
-				type: String,
-				default: '#ffffff'
-			},
-			// badge的背景颜色
-			bgColor: {
-				type: String,
-				default: ''
-			},
-			// 是否让badge组件的中心点和父组件右上角重合，配置的话，offset将会失效
-			isCenter: {
-				type: Boolean,
-				default: false
-			}
-		},
-		computed: {
-			// 是否将badge中心与父组件右上角重合
-			boxStyle() {
-				let style = {};
-				if(this.isCenter) {
-					style.top = 0;
-					style.right = 0;
-					// Y轴-50%，意味着badge向上移动了badge自身高度一半，X轴50%，意味着向右移动了自身宽度一半
-					style.transform = "translateY(-50%) translateX(50%)";
-				} else {
-					style.top = this.offset[0] + 'rpx';
-					style.right = this.offset[1] + 'rpx';
-					style.transform = "translateY(0) translateX(0)";
-				}
-				// 如果尺寸为mini，后接上scal()
-				if(this.size == 'mini') {
-					style.transform = style.transform + " scale(0.8)";
-				}
-				return style;
-			},
-			// isDot类型时，不显示文字
-			showText() {
-				if(this.isDot) return '';
-				else {
-					if(this.count > this.overflowCount) return `${this.overflowCount}+`;
-					else return this.count;
-				}
-			},
-			// 是否显示组件
-			show() {
-				// 如果count的值为0，并且showZero设置为false，不显示组件
-				if(this.count == 0 && this.showZero == false) return false;
-				else return true;
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	@import "../../libs/css/style.components.scss";
-	
-	.u-badge {
-		/* #ifndef APP-NVUE */
-		display: inline-flex;
-		/* #endif */
-		justify-content: center;
-		align-items: center;
-		line-height: 24rpx;
-		padding: 4rpx 8rpx;
-		border-radius: 100rpx;
-		z-index: 9;
-		
-		&--bg--primary {
-			background-color: $u-type-primary;
-		}
-		
-		&--bg--error {
-			background-color: $u-type-error;
-		}
-		
-		&--bg--success {
-			background-color: $u-type-success;
-		}
-		
-		&--bg--info {
-			background-color: $u-type-info;
-		}
-		
-		&--bg--warning {
-			background-color: $u-type-warning;
-		}
-	}
-	
-	.u-badge-dot {
-		height: 16rpx;
-		width: 16rpx;
-		border-radius: 100rpx;
-		line-height: 1;
-	}
-	
-	.u-badge-mini {
-		transform: scale(0.8);
-		transform-origin: center center;
-	}
-	
-	
-	.u-info {
-		background-color: $u-type-info;
-		color: #fff;
-	}
-</style>
\ No newline at end of file
diff --git a/uview-ui/components/u-button/u-button.vue b/uview-ui/components/u-button/u-button.vue
deleted file mode 100644
index d5d5cdd0..00000000
--- a/uview-ui/components/u-button/u-button.vue
+++ /dev/null
@@ -1,599 +0,0 @@
-<template>
-	<button
-		id="u-wave-btn"
-		class="u-btn u-line-1 u-fix-ios-appearance"
-		:class="[
-			'u-size-' + size,
-			plain ? 'u-btn--' + type + '--plain' : '',
-			loading ? 'u-loading' : '',
-			shape == 'circle' ? 'u-round-circle' : '',
-			hairLine ? showHairLineBorder : 'u-btn--bold-border',
-			'u-btn--' + type,
-			disabled ? `u-btn--${type}--disabled` : ''
-		]"
-		:hover-start-time="Number(hoverStartTime)"
-		:hover-stay-time="Number(hoverStayTime)"
-		:disabled="disabled"
-		:form-type="formType"
-		:open-type="openType"
-		:app-parameter="appParameter"
-		:hover-stop-propagation="hoverStopPropagation"
-		:send-message-title="sendMessageTitle"
-		send-message-path="sendMessagePath"
-		:lang="lang"
-		:data-name="dataName"
-		:session-from="sessionFrom"
-		:send-message-img="sendMessageImg"
-		:show-message-card="showMessageCard"
-		@getphonenumber="getphonenumber"
-		@getuserinfo="getuserinfo"
-		@error="error"
-		@opensetting="opensetting"
-		@launchapp="launchapp"
-		:style="[
-			customStyle,
-			{
-				overflow: ripple ? 'hidden' : 'visible'
-			}
-		]"
-		@tap.stop="click($event)"
-		:hover-class="getHoverClass"
-		:loading="loading"
-	>
-		<slot></slot>
-		<view
-			v-if="ripple"
-			class="u-wave-ripple"
-			:class="[waveActive ? 'u-wave-active' : '']"
-			:style="{
-				top: rippleTop + 'px',
-				left: rippleLeft + 'px',
-				width: fields.targetWidth + 'px',
-				height: fields.targetWidth + 'px',
-				'background-color': rippleBgColor || 'rgba(0, 0, 0, 0.15)'
-			}"
-		></view>
-	</button>
-</template>
-
-<script>
-/**
- * button 按钮
- * @description Button 按钮
- * @tutorial https://www.uviewui.com/components/button.html
- * @property {String} size 按钮的大小
- * @property {Boolean} ripple 是否开启点击水波纹效果
- * @property {String} ripple-bg-color 水波纹的背景色，ripple为true时有效
- * @property {String} type 按钮的样式类型
- * @property {Boolean} plain 按钮是否镂空，背景色透明
- * @property {Boolean} disabled 是否禁用
- * @property {Boolean} hair-line 是否显示按钮的细边框(默认true)
- * @property {Boolean} shape 按钮外观形状，见文档说明
- * @property {Boolean} loading 按钮名称前是否带 loading 图标(App-nvue 平台，在 ios 上为雪花，Android上为圆圈)
- * @property {String} form-type 用于 <form> 组件，点击分别会触发 <form> 组件的 submit/reset 事件
- * @property {String} open-type 开放能力
- * @property {String} data-name 额外传参参数，用于小程序的data-xxx属性，通过target.dataset.name获取
- * @property {String} hover-class 指定按钮按下去的样式类。当 hover-class="none" 时，没有点击态效果(App-nvue 平台暂不支持)
- * @property {Number} hover-start-time 按住后多久出现点击态，单位毫秒
- * @property {Number} hover-stay-time 手指松开后点击态保留时间，单位毫秒
- * @property {Object} custom-style 对按钮的自定义样式，对象形式，见文档说明
- * @event {Function} click 按钮点击
- * @event {Function} getphonenumber open-type="getPhoneNumber"时有效
- * @event {Function} getuserinfo 用户点击该按钮时，会返回获取到的用户信息，从返回参数的detail中获取到的值同uni.getUserInfo
- * @event {Function} error 当使用开放能力时，发生错误的回调
- * @event {Function} opensetting 在打开授权设置页并关闭后回调
- * @event {Function} launchapp 打开 APP 成功的回调
- * @example <u-button>月落</u-button>
- */
-export default {
-	name: 'u-button',
-	props: {
-		// 是否细边框
-		hairLine: {
-			type: Boolean,
-			default: true
-		},
-		// 按钮的预置样式，default，primary，error，warning，success
-		type: {
-			type: String,
-			default: 'default'
-		},
-		// 按钮尺寸，default，medium，mini
-		size: {
-			type: String,
-			default: 'default'
-		},
-		// 按钮形状，circle（两边为半圆），square（带圆角）
-		shape: {
-			type: String,
-			default: 'square'
-		},
-		// 按钮是否镂空
-		plain: {
-			type: Boolean,
-			default: false
-		},
-		// 是否禁止状态
-		disabled: {
-			type: Boolean,
-			default: false
-		},
-		// 是否加载中
-		loading: {
-			type: Boolean,
-			default: false
-		},
-		// 开放能力，具体请看uniapp稳定关于button组件部分说明
-		// https://uniapp.dcloud.io/component/button
-		openType: {
-			type: String,
-			default: ''
-		},
-		// 用于 <form> 组件，点击分别会触发 <form> 组件的 submit/reset 事件
-		// 取值为submit（提交表单），reset（重置表单）
-		formType: {
-			type: String,
-			default: ''
-		},
-		// 打开 APP 时，向 APP 传递的参数，open-type=launchApp时有效
-		// 只微信小程序、QQ小程序有效
-		appParameter: {
-			type: String,
-			default: ''
-		},
-		// 指定是否阻止本节点的祖先节点出现点击态，微信小程序有效
-		hoverStopPropagation: {
-			type: Boolean,
-			default: false
-		},
-		// 指定返回用户信息的语言，zh_CN 简体中文，zh_TW 繁体中文，en 英文。只微信小程序有效
-		lang: {
-			type: String,
-			default: 'en'
-		},
-		// 会话来源，open-type="contact"时有效。只微信小程序有效
-		sessionFrom: {
-			type: String,
-			default: ''
-		},
-		// 会话内消息卡片标题，open-type="contact"时有效
-		// 默认当前标题，只微信小程序有效
-		sendMessageTitle: {
-			type: String,
-			default: ''
-		},
-		// 会话内消息卡片点击跳转小程序路径，open-type="contact"时有效
-		// 默认当前分享路径，只微信小程序有效
-		sendMessagePath: {
-			type: String,
-			default: ''
-		},
-		// 会话内消息卡片图片，open-type="contact"时有效
-		// 默认当前页面截图，只微信小程序有效
-		sendMessageImg: {
-			type: String,
-			default: ''
-		},
-		// 是否显示会话内消息卡片，设置此参数为 true，用户进入客服会话会在右下角显示"可能要发送的小程序"提示，
-		// 用户点击后可以快速发送小程序消息，open-type="contact"时有效
-		showMessageCard: {
-			type: Boolean,
-			default: false
-		},
-		// 手指按（触摸）按钮时按钮时的背景颜色
-		hoverBgColor: {
-			type: String,
-			default: ''
-		},
-		// 水波纹的背景颜色
-		rippleBgColor: {
-			type: String,
-			default: ''
-		},
-		// 是否开启水波纹效果
-		ripple: {
-			type: Boolean,
-			default: false
-		},
-		// 按下的类名
-		hoverClass: {
-			type: String,
-			default: ''
-		},
-		// 自定义样式，对象形式
-		customStyle: {
-			type: Object,
-			default() {
-				return {};
-			}
-		},
-		// 额外传参参数，用于小程序的data-xxx属性，通过target.dataset.name获取
-		dataName: {
-			type: String,
-			default: ''
-		},
-		// 节流，一定时间内只能触发一次
-		throttleTime: {
-			type: [String, Number],
-			default: 500
-		},
-		// 按住后多久出现点击态，单位毫秒
-		hoverStartTime: {
-			type: [String, Number],
-			default: 20
-		},
-		// 手指松开后点击态保留时间，单位毫秒
-		hoverStayTime: {
-			type: [String, Number],
-			default: 150
-		}
-	},
-	computed: {
-		// 当没有传bgColor变量时，按钮按下去的颜色类名
-		getHoverClass() {
-			// 如果开启水波纹效果，则不启用hover-class效果
-			if (this.loading || this.disabled || this.ripple || this.hoverClass) return '';
-			let hoverClass = '';
-			hoverClass = this.plain ? 'u-' + this.type + '-plain-hover' : 'u-' + this.type + '-hover';
-			return hoverClass;
-		},
-		// 在'primary', 'success', 'error', 'warning'类型下，不显示边框，否则会造成四角有毛刺现象
-		showHairLineBorder() {
-			if (['primary', 'success', 'error', 'warning'].indexOf(this.type) >= 0 && !this.plain) {
-				return '';
-			} else {
-				return 'u-hairline-border';
-			}
-		}
-	},
-	data() {
-		return {
-			rippleTop: 0, // 水波纹的起点Y坐标到按钮上边界的距离
-			rippleLeft: 0, // 水波纹起点X坐标到按钮左边界的距离
-			fields: {}, // 波纹按钮节点信息
-			waveActive: false // 激活水波纹
-		};
-	},
-	methods: {
-		// 按钮点击
-		click(e) {
-			// 进行节流控制，每this.throttle毫秒内，只在开始处执行
-			this.$u.throttle(() => {
-				// 如果按钮时disabled和loading状态，不触发水波纹效果
-				if (this.loading === true || this.disabled === true) return;
-				// 是否开启水波纹效果
-				if (this.ripple) {
-					// 每次点击时，移除上一次的类，再次添加，才能触发动画效果
-					this.waveActive = false;
-					this.$nextTick(function() {
-						this.getWaveQuery(e);
-					});
-				}
-				this.$emit('click', e);
-			}, this.throttleTime);
-		},
-		// 查询按钮的节点信息
-		getWaveQuery(e) {
-			this.getElQuery().then(res => {
-				// 查询返回的是一个数组节点
-				let data = res[0];
-				// 查询不到节点信息，不操作
-				if (!data.width || !data.width) return;
-				// 水波纹的最终形态是一个正方形(通过border-radius让其变为一个圆形)，这里要保证正方形的边长等于按钮的最长边
-				// 最终的方形（变换后的圆形）才能覆盖整个按钮
-				data.targetWidth = data.height > data.width ? data.height : data.width;
-				if (!data.targetWidth) return;
-				this.fields = data;
-				let touchesX = '',
-					touchesY = '';
-				// #ifdef MP-BAIDU
-				touchesX = e.changedTouches[0].clientX;
-				touchesY = e.changedTouches[0].clientY;
-				// #endif
-				// #ifdef MP-ALIPAY
-				touchesX = e.detail.clientX;
-				touchesY = e.detail.clientY;
-				// #endif
-				// #ifndef MP-BAIDU || MP-ALIPAY
-				touchesX = e.touches[0].clientX;
-				touchesY = e.touches[0].clientY;
-				// #endif
-				// 获取触摸点相对于按钮上边和左边的x和y坐标，原理是通过屏幕的触摸点（touchesY），减去按钮的上边界data.top
-				// 但是由于`transform-origin`默认是center，所以这里再减去半径才是水波纹view应该的位置
-				// 总的来说，就是把水波纹的矩形（变换后的圆形）的中心点，移动到我们的触摸点位置
-				this.rippleTop = touchesY - data.top - data.targetWidth / 2;
-				this.rippleLeft = touchesX - data.left - data.targetWidth / 2;
-				this.$nextTick(() => {
-					this.waveActive = true;
-				});
-			});
-		},
-		// 获取节点信息
-		getElQuery() {
-			return new Promise(resolve => {
-				let queryInfo = '';
-				// 获取元素节点信息，请查看uniapp相关文档
-				// https://uniapp.dcloud.io/api/ui/nodes-info?id=nodesrefboundingclientrect
-				queryInfo = uni.createSelectorQuery().in(this);
-				//#ifdef MP-ALIPAY
-				queryInfo = uni.createSelectorQuery();
-				//#endif
-				queryInfo.select('.u-btn').boundingClientRect();
-				queryInfo.exec(data => {
-					resolve(data);
-				});
-			});
-		},
-		// 下面为对接uniapp官方按钮开放能力事件回调的对接
-		getphonenumber(res) {
-			this.$emit('getphonenumber', res);
-		},
-		getuserinfo(res) {
-			this.$emit('getuserinfo', res);
-		},
-		error(res) {
-			this.$emit('error', res);
-		},
-		opensetting(res) {
-			this.$emit('opensetting', res);
-		},
-		launchapp(res) {
-			this.$emit('launchapp', res);
-		}
-	}
-};
-</script>
-
-<style scoped lang="scss">
-@import '../../libs/css/style.components.scss';
-.u-btn::after {
-	border: none;
-}
-
-.u-btn {
-	position: relative;
-	border: 0;
-	//border-radius: 10rpx;
-	/* #ifndef APP-NVUE */
-	display: inline-flex;
-	/* #endif */
-	// 避免边框某些场景可能被“裁剪”，不能设置为hidden
-	overflow: visible;
-	line-height: 1;
-	@include vue-flex;
-	align-items: center;
-	justify-content: center;
-	cursor: pointer;
-	padding: 0 40rpx;
-	z-index: 1;
-	box-sizing: border-box;
-	transition: all 0.15s;
-
-	&--bold-border {
-		border: 1px solid #ffffff;
-	}
-
-	&--default {
-		color: $u-content-color;
-		border-color: #c0c4cc;
-		background-color: #ffffff;
-	}
-
-	&--primary {
-		color: #ffffff;
-		border-color: $u-type-primary;
-		background-color: $u-type-primary;
-	}
-
-	&--success {
-		color: #ffffff;
-		border-color: $u-type-success;
-		background-color: $u-type-success;
-	}
-
-	&--error {
-		color: #ffffff;
-		border-color: $u-type-error;
-		background-color: $u-type-error;
-	}
-
-	&--warning {
-		color: #ffffff;
-		border-color: $u-type-warning;
-		background-color: $u-type-warning;
-	}
-
-	&--default--disabled {
-		color: #ffffff;
-		border-color: #e4e7ed;
-		background-color: #ffffff;
-	}
-
-	&--primary--disabled {
-		color: #ffffff !important;
-		border-color: $u-type-primary-disabled !important;
-		background-color: $u-type-primary-disabled !important;
-	}
-
-	&--success--disabled {
-		color: #ffffff !important;
-		border-color: $u-type-success-disabled !important;
-		background-color: $u-type-success-disabled !important;
-	}
-
-	&--error--disabled {
-		color: #ffffff !important;
-		border-color: $u-type-error-disabled !important;
-		background-color: $u-type-error-disabled !important;
-	}
-
-	&--warning--disabled {
-		color: #ffffff !important;
-		border-color: $u-type-warning-disabled !important;
-		background-color: $u-type-warning-disabled !important;
-	}
-
-	&--primary--plain {
-		color: $u-type-primary !important;
-		border-color: $u-type-primary-disabled !important;
-		background-color: $u-type-primary-light !important;
-	}
-
-	&--success--plain {
-		color: $u-type-success !important;
-		border-color: $u-type-success-disabled !important;
-		background-color: $u-type-success-light !important;
-	}
-
-	&--error--plain {
-		color: $u-type-error !important;
-		border-color: $u-type-error-disabled !important;
-		background-color: $u-type-error-light !important;
-	}
-
-	&--warning--plain {
-		color: $u-type-warning !important;
-		border-color: $u-type-warning-disabled !important;
-		background-color: $u-type-warning-light !important;
-	}
-}
-
-.u-hairline-border:after {
-	content: ' ';
-	position: absolute;
-	pointer-events: none;
-	// 设置为border-box，意味着下面的scale缩小为0.5，实际上缩小的是伪元素的内容（border-box意味着内容不含border）
-	box-sizing: border-box;
-	// 中心点作为变形(scale())的原点
-	-webkit-transform-origin: 0 0;
-	transform-origin: 0 0;
-	left: 0;
-	top: 0;
-	width: 199.8%;
-	height: 199.7%;
-	-webkit-transform: scale(0.5, 0.5);
-	transform: scale(0.5, 0.5);
-	border: 1px solid currentColor;
-	z-index: 1;
-}
-
-.u-wave-ripple {
-	z-index: 0;
-	position: absolute;
-	border-radius: 100%;
-	background-clip: padding-box;
-	pointer-events: none;
-	user-select: none;
-	transform: scale(0);
-	opacity: 1;
-	transform-origin: center;
-}
-
-.u-wave-ripple.u-wave-active {
-	opacity: 0;
-	transform: scale(2);
-	transition: opacity 1s linear, transform 0.4s linear;
-}
-
-.u-round-circle {
-	border-radius: 100rpx;
-}
-
-.u-round-circle::after {
-	border-radius: 100rpx;
-}
-
-.u-loading::after {
-	background-color: hsla(0, 0%, 100%, 0.35);
-}
-
-.u-size-default {
-	font-size: 30rpx;
-	height: 80rpx;
-	line-height: 80rpx;
-}
-
-.u-size-medium {
-	/* #ifndef APP-NVUE */
-	display: inline-flex;
-	/* #endif */
-	width: auto;
-	font-size: 26rpx;
-	height: 70rpx;
-	line-height: 70rpx;
-	padding: 0 80rpx;
-}
-
-.u-size-mini {
-	/* #ifndef APP-NVUE */
-	display: inline-flex;
-	/* #endif */
-	width: auto;
-	font-size: 22rpx;
-	padding-top: 1px;
-	height: 50rpx;
-	line-height: 50rpx;
-	padding: 0 20rpx;
-}
-
-.u-primary-plain-hover {
-	color: #ffffff !important;
-	background: $u-type-primary-dark !important;
-}
-
-.u-default-plain-hover {
-	color: $u-type-primary-dark !important;
-	background: $u-type-primary-light !important;
-}
-
-.u-success-plain-hover {
-	color: #ffffff !important;
-	background: $u-type-success-dark !important;
-}
-
-.u-warning-plain-hover {
-	color: #ffffff !important;
-	background: $u-type-warning-dark !important;
-}
-
-.u-error-plain-hover {
-	color: #ffffff !important;
-	background: $u-type-error-dark !important;
-}
-
-.u-info-plain-hover {
-	color: #ffffff !important;
-	background: $u-type-info-dark !important;
-}
-
-.u-default-hover {
-	color: $u-type-primary-dark !important;
-	border-color: $u-type-primary-dark !important;
-	background-color: $u-type-primary-light !important;
-}
-
-.u-primary-hover {
-	background: $u-type-primary-dark !important;
-	color: #fff;
-}
-
-.u-success-hover {
-	background: $u-type-success-dark !important;
-	color: #fff;
-}
-
-.u-info-hover {
-	background: $u-type-info-dark !important;
-	color: #fff;
-}
-
-.u-warning-hover {
-	background: $u-type-warning-dark !important;
-	color: #fff;
-}
-
-.u-error-hover {
-	background: $u-type-error-dark !important;
-	color: #fff;
-}
-</style>
diff --git a/uview-ui/components/u-calendar/u-calendar.vue b/uview-ui/components/u-calendar/u-calendar.vue
index 38e98d0d..77870e5a 100644
--- a/uview-ui/components/u-calendar/u-calendar.vue
+++ b/uview-ui/components/u-calendar/u-calendar.vue
@@ -64,10 +64,7 @@
 					<text v-if="endDate">至{{ endDate }}</text>
 				</view>
 				<view class="u-calendar__bottom__btn">
-					<button v-if="Object.keys(customStyle).length" class="u-reset-button submit-btn" :style="{ background: customStyle.background }" @tap="btnFix(false)">
-						确定
-					</button>
-					<u-button v-else :type="btnType" shape="circle" size="default" @click="btnFix(false)">确定</u-button>
+					<button class="u-reset-button submit-btn" :style="{ background: customStyle.background }" @tap="btnFix(false)">确定</button>
 				</view>
 			</view>
 		</view>
@@ -662,6 +659,7 @@ export default {
 			background: #fff;
 			border-radius: 100rpx;
 			color: #fff;
+			background: #2979ff;
 			font-size: 28rpx;
 		}
 	}
diff --git a/uview-ui/components/u-car-keyboard/u-car-keyboard.vue b/uview-ui/components/u-car-keyboard/u-car-keyboard.vue
deleted file mode 100644
index 84b14678..00000000
--- a/uview-ui/components/u-car-keyboard/u-car-keyboard.vue
+++ /dev/null
@@ -1,257 +0,0 @@
-<template>
-	<view class="u-keyboard" @touchmove.stop.prevent="() => {}">
-		<view class="u-keyboard-grids">
-			<block>
-				<view class="u-keyboard-grids-item" v-for="(group, i) in abc ? EngKeyBoardList : areaList" :key="i">
-					<view :hover-stay-time="100" @tap="carInputClick(i, j)" hover-class="u-carinput-hover" class="u-keyboard-grids-btn"
-					 v-for="(item, j) in group" :key="j">
-						{{ item }}
-					</view>
-				</view>
-				<view @touchstart="backspaceClick" @touchend="clearTimer" :hover-stay-time="100" class="u-keyboard-back"
-				 hover-class="u-hover-class">
-					<u-icon :size="38" name="backspace" :bold="true"></u-icon>
-				</view>
-				<view :hover-stay-time="100" class="u-keyboard-change" hover-class="u-carinput-hover" @tap="changeCarInputMode">
-					<text class="zh" :class="[!abc ? 'active' : 'inactive']">中</text>
-					/
-					<text class="en" :class="[abc ? 'active' : 'inactive']">英</text>
-				</view>
-			</block>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		name: "u-keyboard",
-		props: {
-			// 是否打乱键盘按键的顺序
-			random: {
-				type: Boolean,
-				default: false
-			}
-		},
-		data() {
-			return {
-				// 车牌输入时，abc=true为输入车牌号码，bac=false为输入省份中文简称
-				abc: false
-			};
-		},
-		computed: {
-			areaList() {
-				let data = [
-					'京',
-					'沪',
-					'粤',
-					'津',
-					'冀',
-					'豫',
-					'云',
-					'辽',
-					'黑',
-					'湘',
-					'皖',
-					'鲁',
-					'苏',
-					'浙',
-					'赣',
-					'鄂',
-					'桂',
-					'甘',
-					'晋',
-					'陕',
-					'蒙',
-					'吉',
-					'闽',
-					'贵',
-					'渝',
-					'川',
-					'青',
-					'琼',
-					'宁',
-					'挂',
-					'藏',
-					'港',
-					'澳',
-					'新',
-					'使',
-					'学'
-				];
-				let tmp = [];
-				// 打乱顺序
-				if (this.random) data = this.$u.randomArray(data);
-				// 切割成二维数组
-				tmp[0] = data.slice(0, 10);
-				tmp[1] = data.slice(10, 20);
-				tmp[2] = data.slice(20, 30);
-				tmp[3] = data.slice(30, 36);
-				return tmp;
-			},
-			EngKeyBoardList() {
-				let data = [
-					1,
-					2,
-					3,
-					4,
-					5,
-					6,
-					7,
-					8,
-					9,
-					0,
-					'Q',
-					'W',
-					'E',
-					'R',
-					'T',
-					'Y',
-					'U',
-					'I',
-					'O',
-					'P',
-					'A',
-					'S',
-					'D',
-					'F',
-					'G',
-					'H',
-					'J',
-					'K',
-					'L',
-					'Z',
-					'X',
-					'C',
-					'V',
-					'B',
-					'N',
-					'M'
-				];
-				let tmp = [];
-				if (this.random) data = this.$u.randomArray(data);
-				tmp[0] = data.slice(0, 10);
-				tmp[1] = data.slice(10, 20);
-				tmp[2] = data.slice(20, 30);
-				tmp[3] = data.slice(30, 36);
-				return tmp;
-			}
-		},
-		methods: {
-			// 点击键盘按钮
-			carInputClick(i, j) {
-				let value = '';
-				// 不同模式，获取不同数组的值
-				if (this.abc) value = this.EngKeyBoardList[i][j];
-				else value = this.areaList[i][j];
-				this.$emit('change', value);
-			},
-			// 修改汽车牌键盘的输入模式，中文|英文
-			changeCarInputMode() {
-				this.abc = !this.abc;
-			},
-			// 点击退格键
-			backspaceClick() {
-				this.$emit('backspace');
-				clearInterval(this.timer); //再次清空定时器，防止重复注册定时器
-				this.timer = null;
-				this.timer = setInterval(() => {
-					this.$emit('backspace');
-				}, 250);
-			},
-			clearTimer() {
-				clearInterval(this.timer);
-				this.timer = null;
-			},
-		}
-	};
-</script>
-
-<style lang="scss" scoped>
-	@import "../../libs/css/style.components.scss";
-
-	.u-keyboard-grids {
-		background: rgb(215, 215, 217);
-		padding: 24rpx 0;
-		position: relative;
-	}
-
-	.u-keyboard-grids-item {
-		@include vue-flex;
-		align-items: center;
-		justify-content: center;
-	}
-
-	.u-keyboard-grids-btn {
-		text-decoration: none;
-		width: 62rpx;
-		flex: 0 0 64rpx;
-		height: 80rpx;
-		/* #ifndef APP-NVUE */
-		display: inline-flex;		
-		/* #endif */
-		font-size: 36rpx;
-		text-align: center;
-		line-height: 80rpx;
-		background-color: #fff;
-		margin: 8rpx 5rpx;
-		border-radius: 8rpx;
-		box-shadow: 0 2rpx 0rpx #888992;
-		font-weight: 500;
-		justify-content: center;
-	}
-
-	.u-carinput-hover {
-		background-color: rgb(185, 188, 195) !important;
-	}
-
-	.u-keyboard-back {
-		position: absolute;
-		width: 96rpx;
-		right: 22rpx;
-		bottom: 32rpx;
-		height: 80rpx;
-		background-color: rgb(185, 188, 195);
-		@include vue-flex;
-		align-items: center;
-		border-radius: 8rpx;
-		justify-content: center;
-		box-shadow: 0 2rpx 0rpx #888992;
-	}
-
-	.u-keyboard-change {
-		font-size: 24rpx;
-		box-shadow: 0 2rpx 0rpx #888992;
-		position: absolute;
-		width: 96rpx;
-		left: 22rpx;
-		line-height: 1;
-		bottom: 32rpx;
-		height: 80rpx;
-		background-color: #ffffff;
-		@include vue-flex;
-		align-items: center;
-		border-radius: 8rpx;
-		justify-content: center;
-	}
-
-	.u-keyboard-change .inactive.zh {
-		transform: scale(0.85) translateY(-10rpx);
-	}
-
-	.u-keyboard-change .inactive.en {
-		transform: scale(0.85) translateY(10rpx);
-	}
-
-	.u-keyboard-change .active {
-		color: rgb(237, 112, 64);
-		font-size: 30rpx;
-	}
-
-	.u-keyboard-change .zh {
-		transform: translateY(-10rpx);
-	}
-
-	.u-keyboard-change .en {
-		transform: translateY(10rpx);
-	}
-</style>
diff --git a/uview-ui/components/u-card/u-card.vue b/uview-ui/components/u-card/u-card.vue
deleted file mode 100644
index a3cb2aa9..00000000
--- a/uview-ui/components/u-card/u-card.vue
+++ /dev/null
@@ -1,299 +0,0 @@
-<template>
-	<view
-		class="u-card"
-		@tap.stop="click"
-		:class="{ 'u-border': border, 'u-card-full': full, 'u-card--border': borderRadius > 0 }"
-		:style="{
-			borderRadius: borderRadius + 'rpx',
-			margin: margin,
-			boxShadow: boxShadow
-		}"
-	>
-		<view
-			v-if="showHead"
-			class="u-card__head"
-			:style="[{padding: padding + 'rpx'}, headStyle]"
-			:class="{
-				'u-border-bottom': headBorderBottom
-			}"
-			@tap="headClick"
-		>
-			<view v-if="!$slots.head" class="u-flex u-row-between">
-				<view class="u-card__head--left u-flex u-line-1" v-if="title">
-					<image
-						:src="thumb"
-						class="u-card__head--left__thumb"
-						mode="aspectfull"
-						v-if="thumb"
-						:style="{ 
-							height: thumbWidth + 'rpx', 
-							width: thumbWidth + 'rpx', 
-							borderRadius: thumbCircle ? '100rpx' : '6rpx' 
-						}"
-					></image>
-					<text
-						class="u-card__head--left__title u-line-1"
-						:style="{
-							fontSize: titleSize + 'rpx',
-							color: titleColor
-						}"
-					>
-						{{ title }}
-					</text>
-				</view>
-				<view class="u-card__head--right u-line-1" v-if="subTitle">
-					<text
-						class="u-card__head__title__text"
-						:style="{
-							fontSize: subTitleSize + 'rpx',
-							color: subTitleColor
-						}"
-					>
-						{{ subTitle }}
-					</text>
-				</view>
-			</view>
-			<slot name="head" v-else />
-		</view>
-		<view @tap="bodyClick" class="u-card__body" :style="[{padding: padding + 'rpx'}, bodyStyle]"><slot name="body" /></view>
-		<view
-			v-if="showFoot"
-			class="u-card__foot"
-			 @tap="footClick"
-			:style="[{padding: $slots.foot ? padding + 'rpx' : 0}, footStyle]"
-			:class="{
-				'u-border-top': footBorderTop
-			}"
-		>
-			<slot name="foot" />
-		</view>
-	</view>
-</template>
-
-<script>
-/**
- * card 卡片
- * @description 卡片组件一般用于多个列表条目，且风格统一的场景
- * @tutorial https://www.uviewui.com/components/card.html
- * @property {Boolean} full 卡片与屏幕两侧是否留空隙（默认false）
- * @property {String} title 头部左边的标题
- * @property {String} title-color 标题颜色（默认#303133）
- * @property {String | Number} title-size 标题字体大小，单位rpx（默认30）
- * @property {String} sub-title 头部右边的副标题
- * @property {String} sub-title-color 副标题颜色（默认#909399）
- * @property {String | Number} sub-title-size 副标题字体大小（默认26）
- * @property {Boolean} border 是否显示边框（默认true）
- * @property {String | Number} index 用于标识点击了第几个卡片
- * @property {String} box-shadow 卡片外围阴影，字符串形式（默认none）
- * @property {String} margin 卡片与屏幕两边和上下元素的间距，需带单位，如"30rpx 20rpx"（默认30rpx）
- * @property {String | Number} border-radius 卡片整体的圆角值，单位rpx（默认16）
- * @property {Object} head-style 头部自定义样式，对象形式
- * @property {Object} body-style 中部自定义样式，对象形式
- * @property {Object} foot-style 底部自定义样式，对象形式
- * @property {Boolean} head-border-bottom 是否显示头部的下边框（默认true）
- * @property {Boolean} foot-border-top 是否显示底部的上边框（默认true）
- * @property {Boolean} show-head 是否显示头部（默认true）
- * @property {Boolean} show-head 是否显示尾部（默认true）
- * @property {String} thumb 缩略图路径，如设置将显示在标题的左边，不建议使用相对路径
- * @property {String | Number} thumb-width 缩略图的宽度，高等于宽，单位rpx（默认60）
- * @property {Boolean} thumb-circle 缩略图是否为圆形（默认false）
- * @event {Function} click 整个卡片任意位置被点击时触发
- * @event {Function} head-click 卡片头部被点击时触发
- * @event {Function} body-click 卡片主体部分被点击时触发
- * @event {Function} foot-click 卡片底部部分被点击时触发
- * @example <u-card padding="30" title="card"></u-card>
- */
-export default {
-	name: 'u-card',
-	props: {
-		// 与屏幕两侧是否留空隙
-		full: {
-			type: Boolean,
-			default: false
-		},
-		// 标题
-		title: {
-			type: String,
-			default: ''
-		},
-		// 标题颜色
-		titleColor: {
-			type: String,
-			default: '#303133'
-		},
-		// 标题字体大小，单位rpx
-		titleSize: {
-			type: [Number, String],
-			default: '30'
-		},
-		// 副标题
-		subTitle: {
-			type: String,
-			default: ''
-		},
-		// 副标题颜色
-		subTitleColor: {
-			type: String,
-			default: '#909399'
-		},
-		// 副标题字体大小，单位rpx
-		subTitleSize: {
-			type: [Number, String],
-			default: '26'
-		},
-		// 是否显示外部边框，只对full=false时有效(卡片与边框有空隙时)
-		border: {
-			type: Boolean,
-			default: true
-		},
-		// 用于标识点击了第几个
-		index: {
-			type: [Number, String, Object],
-			default: ''
-		},
-		// 用于隔开上下左右的边距，带单位的写法，如："30rpx 30rpx"，"20rpx 20rpx 30rpx 30rpx"
-		margin: {
-			type: String,
-			default: '30rpx'
-		},
-		// card卡片的圆角
-		borderRadius: {
-			type: [Number, String],
-			default: '16'
-		},
-		// 头部自定义样式，对象形式
-		headStyle: {
-			type: Object,
-			default() {
-				return {};
-			}
-		},
-		// 主体自定义样式，对象形式
-		bodyStyle: {
-			type: Object,
-			default() {
-				return {};
-			}
-		},
-		// 底部自定义样式，对象形式
-		footStyle: {
-			type: Object,
-			default() {
-				return {};
-			}
-		},
-		// 头部是否下边框
-		headBorderBottom: {
-			type: Boolean,
-			default: true
-		},
-		// 底部是否有上边框
-		footBorderTop: {
-			type: Boolean,
-			default: true
-		},
-		// 标题左边的缩略图
-		thumb: {
-			type: String,
-			default: ''
-		},
-		// 缩略图宽高，单位rpx
-		thumbWidth: {
-			type: [String, Number],
-			default: '60'
-		},
-		// 缩略图是否为圆形
-		thumbCircle: {
-			type: Boolean,
-			default: false
-		},
-		// 给head，body，foot的内边距
-		padding: {
-			type: [String, Number],
-			default: '30'
-		},
-		// 是否显示头部
-		showHead: {
-			type: Boolean,
-			default: true
-		},
-		// 是否显示尾部
-		showFoot: {
-			type: Boolean,
-			default: true
-		},
-		// 卡片外围阴影，字符串形式
-		boxShadow: {
-			type: String,
-			default: 'none'
-		}
-	},
-	data() {
-		return {};
-	},
-	methods: {
-		click() {
-			this.$emit('click', this.index);
-		},
-		headClick() {
-			this.$emit('head-click', this.index);
-		},
-		bodyClick() {
-			this.$emit('body-click', this.index);
-		},
-		footClick() {
-			this.$emit('foot-click', this.index);
-		}
-	}
-};
-</script>
-
-<style lang="scss" scoped>
-@import "../../libs/css/style.components.scss";
-	
-.u-card {
-	position: relative;
-	overflow: hidden;
-	font-size: 28rpx;
-	background-color: #ffffff;
-	box-sizing: border-box;
-	
-	&-full {
-		// 如果是与屏幕之间不留空隙，应该设置左右边距为0
-		margin-left: 0 !important;
-		margin-right: 0 !important;
-		width: 100%;
-	}
-	
-	&--border:after {
-		border-radius: 16rpx;
-	}
-
-	&__head {
-		&--left {
-			color: $u-main-color;
-			
-			&__thumb {
-				margin-right: 16rpx;
-			}
-			
-			&__title {
-				max-width: 400rpx;
-			}
-		}
-
-		&--right {
-			color: $u-tips-color;
-			margin-left: 6rpx;
-		}
-	}
-
-	&__body {
-		color: $u-content-color;
-	}
-
-	&__foot {
-		color: $u-tips-color;
-	}
-}
-</style>
diff --git a/uview-ui/components/u-cell-group/u-cell-group.vue b/uview-ui/components/u-cell-group/u-cell-group.vue
deleted file mode 100644
index 3fbca725..00000000
--- a/uview-ui/components/u-cell-group/u-cell-group.vue
+++ /dev/null
@@ -1,70 +0,0 @@
-<template>
-	<view class="u-cell-box">
-		<view class="u-cell-title" v-if="title" :style="[titleStyle]">
-			{{title}}
-		</view>
-		<view class="u-cell-item-box" :class="{'u-border-bottom u-border-top': border}">
-			<slot />
-		</view>
-	</view>
-</template>
-
-<script>
-	/**
-	 * cellGroup 单元格父组件Group
-	 * @description cell单元格一般用于一组列表的情况，比如个人中心页，设置页等。搭配u-cell-item
-	 * @tutorial https://www.uviewui.com/components/cell.html
-	 * @property {String} title 分组标题
-	 * @property {Boolean} border 是否显示外边框（默认true）
-	 * @property {Object} title-style 分组标题的的样式，对象形式，如{'font-size': '24rpx'} 或 {'fontSize': '24rpx'}
-	 * @example <u-cell-group title="设置喜好">
-	 */
-	export default {
-		name: "u-cell-group",
-		props: {
-			// 分组标题
-			title: {
-				type: String,
-				default: ''
-			},
-			// 是否显示分组list上下边框
-			border: {
-				type: Boolean,
-				default: true
-			},
-			// 分组标题的样式，对象形式，注意驼峰属性写法
-			// 类似 {'font-size': '24rpx'} 和 {'fontSize': '24rpx'}
-			titleStyle: {
-				type: Object,
-				default () {
-					return {};
-				}
-			}
-		},
-		data() {
-			return {
-				index: 0,
-			}
-		},
-	}
-</script>
-
-<style lang="scss" scoped>
-	@import "../../libs/css/style.components.scss";
-	
-	.u-cell-box {
-		width: 100%;
-	}
-
-	.u-cell-title {
-		padding: 30rpx 32rpx 10rpx 32rpx;
-		font-size: 30rpx;
-		text-align: left;
-		color: $u-tips-color;
-	}
-
-	.u-cell-item-box {
-		background-color: #FFFFFF;
-		flex-direction: row;
-	}
-</style>
diff --git a/uview-ui/components/u-cell-item/u-cell-item.vue b/uview-ui/components/u-cell-item/u-cell-item.vue
deleted file mode 100644
index 055af3a6..00000000
--- a/uview-ui/components/u-cell-item/u-cell-item.vue
+++ /dev/null
@@ -1,316 +0,0 @@
-<template>
-	<view
-		@tap="click"
-		class="u-cell"
-		:class="{ 'u-border-bottom': borderBottom, 'u-border-top': borderTop, 'u-col-center': center, 'u-cell--required': required }"
-		hover-stay-time="150"
-		:hover-class="hoverClass"
-		:style="{
-			backgroundColor: bgColor
-		}"
-	>
-		<u-icon :size="iconSize" :name="icon" v-if="icon" :custom-style="iconStyle" class="u-cell__left-icon-wrap"></u-icon>
-		<view class="u-flex" v-else>
-			<slot name="icon"></slot>
-		</view>
-		<view
-			class="u-cell_title"
-			:style="[
-				{
-					width: titleWidth ? titleWidth + 'rpx' : 'auto'
-				},
-				titleStyle
-			]"
-		>
-			<block v-if="title !== ''">{{ title }}</block>
-			<slot name="title" v-else></slot>
-
-			<view class="u-cell__label" v-if="label || $slots.label" :style="[labelStyle]">
-				<block v-if="label !== ''">{{ label }}</block>
-				<slot name="label" v-else></slot>
-			</view>
-		</view>
-
-		<view class="u-cell__value" :style="[valueStyle]">
-			<block class="u-cell__value" v-if="value !== ''">{{ value }}</block>
-			<slot v-else></slot>
-		</view>
-		<view class="u-flex u-cell_right" v-if="$slots['right-icon']">
-			<slot name="right-icon"></slot>
-		</view>
-		<u-icon v-if="arrow" name="arrow-right" :style="[arrowStyle]" class="u-icon-wrap u-cell__right-icon-wrap"></u-icon>
-	</view>
-</template>
-
-<script>
-/**
- * cellItem 单元格Item
- * @description cell单元格一般用于一组列表的情况，比如个人中心页，设置页等。搭配u-cell-group使用
- * @tutorial https://www.uviewui.com/components/cell.html
- * @property {String} title 左侧标题
- * @property {String} icon 左侧图标名，只支持uView内置图标，见Icon 图标
- * @property {Object} icon-style 左边图标的样式，对象形式
- * @property {String} value 右侧内容
- * @property {String} label 标题下方的描述信息
- * @property {Boolean} border-bottom 是否显示cell的下边框（默认true）
- * @property {Boolean} border-top 是否显示cell的上边框（默认false）
- * @property {Boolean} center 是否使内容垂直居中（默认false）
- * @property {String} hover-class 是否开启点击反馈，none为无效果（默认true）
- * // @property {Boolean} border-gap border-bottom为true时，Cell列表中间的条目的下边框是否与左边有一个间隔（默认true）
- * @property {Boolean} arrow 是否显示右侧箭头（默认true）
- * @property {Boolean} required 箭头方向，可选值（默认right）
- * @property {Boolean} arrow-direction 是否显示左边表示必填的星号（默认false）
- * @property {Object} title-style 标题样式，对象形式
- * @property {Object} value-style 右侧内容样式，对象形式
- * @property {Object} label-style 标题下方描述信息的样式，对象形式
- * @property {String} bg-color 背景颜色（默认transparent）
- * @property {String Number} index 用于在click事件回调中返回，标识当前是第几个Item
- * @property {String Number} title-width 标题的宽度，单位rpx
- * @example <u-cell-item icon="integral-fill" title="会员等级" value="新版本"></u-cell-item>
- */
-export default {
-	name: 'u-cell-item',
-	props: {
-		// 左侧图标名称(只能uView内置图标)，或者图标src
-		icon: {
-			type: String,
-			default: ''
-		},
-		// 左侧标题
-		title: {
-			type: [String, Number],
-			default: ''
-		},
-		// 右侧内容
-		value: {
-			type: [String, Number],
-			default: ''
-		},
-		// 标题下方的描述信息
-		label: {
-			type: [String, Number],
-			default: ''
-		},
-		// 是否显示下边框
-		borderBottom: {
-			type: Boolean,
-			default: true
-		},
-		// 是否显示上边框
-		borderTop: {
-			type: Boolean,
-			default: false
-		},
-		// 多个cell中，中间的cell显示下划线时，下划线是否给一个到左边的距离
-		// 1.4.0版本废除此参数，默认边框由border-top和border-bottom提供，此参数会造成干扰
-		// borderGap: {
-		// 	type: Boolean,
-		// 	default: true
-		// },
-		// 是否开启点击反馈，即点击时cell背景为灰色，none为无效果
-		hoverClass: {
-			type: String,
-			default: 'u-cell-hover'
-		},
-		// 是否显示右侧箭头
-		arrow: {
-			type: Boolean,
-			default: true
-		},
-		// 内容是否垂直居中
-		center: {
-			type: Boolean,
-			default: false
-		},
-		// 是否显示左边表示必填的星号
-		required: {
-			type: Boolean,
-			default: false
-		},
-		// 标题的宽度，单位rpx
-		titleWidth: {
-			type: [Number, String],
-			default: ''
-		},
-		// 右侧箭头方向，可选值：right|up|down，默认为right
-		arrowDirection: {
-			type: String,
-			default: 'right'
-		},
-		// 控制标题的样式
-		titleStyle: {
-			type: Object,
-			default() {
-				return {};
-			}
-		},
-		// 右侧显示内容的样式
-		valueStyle: {
-			type: Object,
-			default() {
-				return {};
-			}
-		},
-		// 描述信息的样式
-		labelStyle: {
-			type: Object,
-			default() {
-				return {};
-			}
-		},
-		// 背景颜色
-		bgColor: {
-			type: String,
-			default: 'transparent'
-		},
-		// 用于识别被点击的是第几个cell
-		index: {
-			type: [String, Number],
-			default: ''
-		},
-		// 是否使用lable插槽
-		useLabelSlot: {
-			type: Boolean,
-			default: false
-		},
-		// 左边图标的大小，单位rpx，只对传入icon字段时有效
-		iconSize: {
-			type: [Number, String],
-			default: 34
-		},
-		// 左边图标的样式，对象形式
-		iconStyle: {
-			type: Object,
-			default() {
-				return {}
-			}
-		},
-	},
-	data() {
-		return {
-
-		};
-	},
-	computed: {
-		arrowStyle() {
-			let style = {};
-			if (this.arrowDirection == 'up') style.transform = 'rotate(-90deg)';
-			else if (this.arrowDirection == 'down') style.transform = 'rotate(90deg)';
-			else style.transform = 'rotate(0deg)';
-			return style;
-		}
-	},
-	methods: {
-		click() {
-			this.$emit('click', this.index);
-		}
-	}
-};
-</script>
-
-<style lang="scss" scoped>
-@import "../../libs/css/style.components.scss";
-.u-cell {
-	@include vue-flex;
-	align-items: center;
-	position: relative;
-	/* #ifndef APP-NVUE */
-	box-sizing: border-box;
-	/* #endif */
-	width: 100%;
-	padding: 26rpx 32rpx;
-	font-size: 28rpx;
-	line-height: 54rpx;
-	color: $u-content-color;
-	background-color: #fff;
-	text-align: left;
-}
-
-.u-cell_title {
-	font-size: 28rpx;
-}
-
-.u-cell__left-icon-wrap {
-	margin-right: 10rpx;
-	font-size: 32rpx;
-}
-
-.u-cell__right-icon-wrap {
-	margin-left: 10rpx;
-	color: #969799;
-	font-size: 28rpx;
-}
-
-.u-cell__left-icon-wrap,
-.u-cell__right-icon-wrap {
-	@include vue-flex;
-	align-items: center;
-	height: 48rpx;
-}
-
-.u-cell-border:after {
-	position: absolute; 
-	/* #ifndef APP-NVUE */
-	box-sizing: border-box;
-	content: ' ';
-	pointer-events: none;
-	border-bottom: 1px solid $u-border-color;
-	/* #endif */
-	right: 0;
-	left: 0;
-	top: 0;
-	transform: scaleY(0.5);
-}
-
-.u-cell-border {
-	position: relative;
-}
-
-.u-cell__label {
-	margin-top: 6rpx;
-	font-size: 26rpx;
-	line-height: 36rpx;
-	color: $u-tips-color;
-	/* #ifndef APP-NVUE */
-	word-wrap: break-word;
-	/* #endif */
-}
-
-.u-cell__value {
-	overflow: hidden;
-	text-align: right;
-	/* #ifndef APP-NVUE */
-	vertical-align: middle;
-	/* #endif */
-	color: $u-tips-color;
-	font-size: 26rpx;
-}
-
-.u-cell__title,
-.u-cell__value {
-	flex: 1;
-}
-
-.u-cell--required {
-	/* #ifndef APP-NVUE */
-	overflow: visible;
-	/* #endif */
-	@include vue-flex;
-	align-items: center;
-}
-
-.u-cell--required:before {
-	position: absolute;
-	/* #ifndef APP-NVUE */
-	content: '*';
-	/* #endif */
-	left: 8px;
-	margin-top: 4rpx;
-	font-size: 14px;
-	color: $u-type-error;
-}
-
-.u-cell_right {
-	line-height: 1;
-}
-</style>
diff --git a/uview-ui/components/u-circle-progress/u-circle-progress.vue b/uview-ui/components/u-circle-progress/u-circle-progress.vue
deleted file mode 100644
index 46e7c181..00000000
--- a/uview-ui/components/u-circle-progress/u-circle-progress.vue
+++ /dev/null
@@ -1,220 +0,0 @@
-<template>
-	<view
-		class="u-circle-progress"
-		:style="{
-			width: widthPx + 'px',
-			height: widthPx + 'px',
-			backgroundColor: bgColor
-		}"
-	>
-		<!-- 支付宝小程序不支持canvas-id属性，必须用id属性 -->
-		<canvas
-			class="u-canvas-bg"
-			:canvas-id="elBgId"
-			:id="elBgId"
-			:style="{
-				width: widthPx + 'px',
-				height: widthPx + 'px'
-			}"
-		></canvas>
-		<canvas
-			class="u-canvas"
-			:canvas-id="elId"
-			:id="elId"
-			:style="{
-				width: widthPx + 'px',
-				height: widthPx + 'px'
-			}"
-		></canvas>
-		<slot></slot>
-	</view>
-</template>
-
-<script>
-/**
- * circleProgress 环形进度条
- * @description 展示操作或任务的当前进度，比如上传文件，是一个圆形的进度条。注意：此组件的percent值只能动态增加，不能动态减少。
- * @tutorial https://www.uviewui.com/components/circleProgress.html
- * @property {String Number} percent 圆环进度百分比值，为数值类型，0-100
- * @property {String} inactive-color 圆环的底色，默认为灰色(该值无法动态变更)（默认#ececec）
- * @property {String} active-color 圆环激活部分的颜色(该值无法动态变更)（默认#19be6b）
- * @property {String Number} width 整个圆环组件的宽度，高度默认等于宽度值，单位rpx（默认200）
- * @property {String Number} border-width 圆环的边框宽度，单位rpx（默认14）
- * @property {String Number} duration 整个圆环执行一圈的时间，单位ms（默认呢1500）
- * @property {String} type 如设置，active-color值将会失效
- * @property {String} bg-color 整个组件背景颜色，默认为白色
- * @example <u-circle-progress active-color="#2979ff" :percent="80"></u-circle-progress>
- */
-export default {
-	name: 'u-circle-progress',
-	props: {
-		// 圆环进度百分比值
-		percent: {
-			type: Number,
-			default: 0,
-			// 限制值在0到100之间
-			validator: val => {
-				return val >= 0 && val <= 100;
-			}
-		},
-		// 底部圆环的颜色（灰色的圆环）
-		inactiveColor: {
-			type: String,
-			default: '#ececec'
-		},
-		// 圆环激活部分的颜色
-		activeColor: {
-			type: String,
-			default: '#19be6b'
-		},
-		// 圆环线条的宽度，单位rpx
-		borderWidth: {
-			type: [Number, String],
-			default: 14
-		},
-		// 整个圆形的宽度，单位rpx
-		width: {
-			type: [Number, String],
-			default: 200
-		},
-		// 整个圆环执行一圈的时间，单位ms
-		duration: {
-			type: [Number, String],
-			default: 1500
-		},
-		// 主题类型
-		type: {
-			type: String,
-			default: ''
-		},
-		// 整个圆环进度区域的背景色
-		bgColor: {
-			type: String,
-			default: '#ffffff'
-		}
-	},
-	data() {
-		return {
-			// #ifdef MP-WEIXIN
-			elBgId: 'uCircleProgressBgId', // 微信小程序中不能使用this.$u.guid()形式动态生成id值，否则会报错
-			elId: 'uCircleProgressElId',
-			// #endif
-			// #ifndef MP-WEIXIN
-			elBgId: this.$u.guid(), // 非微信端的时候，需用动态的id，否则一个页面多个圆形进度条组件数据会混乱
-			elId: this.$u.guid(),
-			// #endif
-			widthPx: uni.upx2px(this.width), // 转成px后的整个组件的背景宽度
-			borderWidthPx: uni.upx2px(this.borderWidth), // 转成px后的圆环的宽度
-			startAngle: -Math.PI / 2, // canvas画圆的起始角度，默认为3点钟方向，定位到12点钟方向
-			progressContext: null, // 活动圆的canvas上下文
-			newPercent: 0, // 当动态修改进度值的时候，保存进度值的变化前后值，用于比较用
-			oldPercent: 0 // 当动态修改进度值的时候，保存进度值的变化前后值，用于比较用
-		};
-	},
-	watch: {
-		percent(nVal, oVal = 0) {
-			if (nVal > 100) nVal = 100;
-			if (nVal < 0) oVal = 0;
-			// 此值其实等于this.percent，命名一个新
-			this.newPercent = nVal;
-			this.oldPercent = oVal;
-			setTimeout(() => {
-				// 无论是百分比值增加还是减少，需要操作还是原来的旧的百分比值
-				// 将此值减少或者新增到新的百分比值
-				this.drawCircleByProgress(oVal);
-			}, 50);
-		}
-	},
-	created() {
-		// 赋值，用于加载后第一个画圆使用
-		this.newPercent = this.percent;
-		this.oldPercent = 0;
-	},
-	computed: {
-		// 有type主题时，优先起作用
-		circleColor() {
-			if (['success', 'error', 'info', 'primary', 'warning'].indexOf(this.type) >= 0) return this.$u.color[this.type];
-			else return this.activeColor;
-		}
-	},
-	mounted() {
-		// 在h5端，必须要做一点延时才起作用，this.$nextTick()无效(HX2.4.7)
-		setTimeout(() => {
-			this.drawProgressBg();
-			this.drawCircleByProgress(this.oldPercent);
-		}, 50);
-	},
-	methods: {
-		drawProgressBg() {
-			let ctx = uni.createCanvasContext(this.elBgId, this);
-			ctx.setLineWidth(this.borderWidthPx); // 设置圆环宽度
-			ctx.setStrokeStyle(this.inactiveColor); // 线条颜色
-			ctx.beginPath(); // 开始描绘路径
-			// 设置一个原点(110,110)，半径为100的圆的路径到当前路径
-			let radius = this.widthPx / 2;
-			ctx.arc(radius, radius, radius - this.borderWidthPx, 0, 2 * Math.PI, false);
-			ctx.stroke(); // 对路径进行描绘
-			ctx.draw();
-		},
-		drawCircleByProgress(progress) {
-			// 第一次操作进度环时将上下文保存到了this.data中，直接使用即可
-			let ctx = this.progressContext;
-			if (!ctx) {
-				ctx = uni.createCanvasContext(this.elId, this);
-				this.progressContext = ctx;
-			}
-			// 表示进度的两端为圆形
-			ctx.setLineCap('round');
-			// 设置线条的宽度和颜色
-			ctx.setLineWidth(this.borderWidthPx);
-			ctx.setStrokeStyle(this.circleColor);
-			// 将总过渡时间除以100，得出每修改百分之一进度所需的时间
-			let time = Math.floor(this.duration / 100);
-			// 结束角的计算依据为：将2π分为100份，乘以当前的进度值，得出终止点的弧度值，加起始角，为整个圆从默认的
-			// 3点钟方向开始画图，转为更好理解的12点钟方向开始作图，这需要起始角和终止角同时加上this.startAngle值
-			let endAngle = ((2 * Math.PI) / 100) * progress + this.startAngle;
-			ctx.beginPath();
-			// 半径为整个canvas宽度的一半
-			let radius = this.widthPx / 2;
-			ctx.arc(radius, radius, radius - this.borderWidthPx, this.startAngle, endAngle, false);
-			ctx.stroke();
-			ctx.draw();
-			// 如果变更后新值大于旧值，意味着增大了百分比
-			if (this.newPercent > this.oldPercent) {
-				// 每次递增百分之一
-				progress++;
-				// 如果新增后的值，大于需要设置的值百分比值，停止继续增加
-				if (progress > this.newPercent) return;
-			} else {
-				// 同理于上面
-				progress--;
-				if (progress < this.newPercent) return;
-			}
-			setTimeout(() => {
-				// 定时器，每次操作间隔为time值，为了让进度条有动画效果
-				this.drawCircleByProgress(progress);
-			}, time);
-		}
-	}
-};
-</script>
-
-<style lang="scss" scoped>
-@import "../../libs/css/style.components.scss";
-.u-circle-progress {
-	position: relative;
-	/* #ifndef APP-NVUE */
-	display: inline-flex;		
-	/* #endif */
-	align-items: center;
-	justify-content: center;
-}
-
-.u-canvas-bg {
-	position: absolute;
-}
-
-.u-canvas {
-	position: absolute;
-}
-</style>
diff --git a/uview-ui/components/u-col/u-col.vue b/uview-ui/components/u-col/u-col.vue
deleted file mode 100644
index 3b6cc64e..00000000
--- a/uview-ui/components/u-col/u-col.vue
+++ /dev/null
@@ -1,156 +0,0 @@
-<template>
-	<view class="u-col" :class="[
-		'u-col-' + span
-	]" :style="{
-		padding: `0 ${Number(gutter)/2 + 'rpx'}`,
-		marginLeft: 100 / 12 * offset + '%',
-		flex: `0 0 ${100 / 12 * span}%`,
-		alignItems: uAlignItem,
-		justifyContent: uJustify,
-		textAlign: textAlign
-	}"
-	 @tap="click">
-		<slot></slot>
-	</view>
-</template>
-
-<script>
-	/**
-	 * col 布局单元格
-	 * @description 通过基础的 12 分栏，迅速简便地创建布局（搭配<u-row>使用）
-	 * @tutorial https://www.uviewui.com/components/layout.html
-	 * @property {String Number} span 栅格占据的列数，总12等分（默认0）
-	 * @property {String} text-align 文字水平对齐方式（默认left）
-	 * @property {String Number} offset 分栏左边偏移，计算方式与span相同（默认0）
-	 * @example <u-col span="3"><view class="demo-layout bg-purple"></view></u-col>
-	 */
-	export default {
-		name: "u-col",
-		props: {
-			// 占父容器宽度的多少等分，总分为12份
-			span: {
-				type: [Number, String],
-				default: 12
-			},
-			// 指定栅格左侧的间隔数(总12栏)
-			offset: {
-				type: [Number, String],
-				default: 0
-			},
-			// 水平排列方式，可选值为`start`(或`flex-start`)、`end`(或`flex-end`)、`center`、`around`(或`space-around`)、`between`(或`space-between`)
-			justify: {
-				type: String,
-				default: 'start'
-			},
-			// 垂直对齐方式，可选值为top、center、bottom
-			align: {
-				type: String,
-				default: 'center'
-			},
-			// 文字对齐方式
-			textAlign: {
-				type: String,
-				default: 'left'
-			},
-			// 是否阻止事件传播
-			stop: {
-				type: Boolean,
-				default: true
-			}
-		},
-		data() {
-			return {
-				gutter: 20, // 给col添加间距，左右边距各占一半，从父组件u-row获取
-			}
-		},
-		created() {
-			this.parent = false;
-		},
-		mounted() {
-			// 获取父组件实例，并赋值给对应的参数
-			this.parent = this.$u.$parent.call(this, 'u-row');
-			if (this.parent) {
-				this.gutter = this.parent.gutter;
-			}
-		},
-		computed: {
-			uJustify() {
-				if (this.justify == 'end' || this.justify == 'start') return 'flex-' + this.justify;
-				else if (this.justify == 'around' || this.justify == 'between') return 'space-' + this.justify;
-				else return this.justify;
-			},
-			uAlignItem() {
-				if (this.align == 'top') return 'flex-start';
-				if (this.align == 'bottom') return 'flex-end';
-				else return this.align;
-			}
-		},
-		methods: {
-			click(e) {
-				this.$emit('click');
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	@import "../../libs/css/style.components.scss";
-
-	.u-col {
-		/* #ifdef MP-WEIXIN || MP-QQ || MP-TOUTIAO */
-		float: left;
-		/* #endif */
-	}
-
-	.u-col-0 {
-		width: 0;
-	}
-
-	.u-col-1 {
-		width: calc(100%/12);
-	}
-
-	.u-col-2 {
-		width: calc(100%/12 * 2);
-	}
-
-	.u-col-3 {
-		width: calc(100%/12 * 3);
-	}
-
-	.u-col-4 {
-		width: calc(100%/12 * 4);
-	}
-
-	.u-col-5 {
-		width: calc(100%/12 * 5);
-	}
-
-	.u-col-6 {
-		width: calc(100%/12 * 6);
-	}
-
-	.u-col-7 {
-		width: calc(100%/12 * 7);
-	}
-
-	.u-col-8 {
-		width: calc(100%/12 * 8);
-	}
-
-	.u-col-9 {
-		width: calc(100%/12 * 9);
-	}
-
-	.u-col-10 {
-		width: calc(100%/12 * 10);
-	}
-
-	.u-col-11 {
-		width: calc(100%/12 * 11);
-	}
-
-	.u-col-12 {
-		width: calc(100%/12 * 12);
-	}
-</style>
diff --git a/uview-ui/components/u-count-to/u-count-to.vue b/uview-ui/components/u-count-to/u-count-to.vue
deleted file mode 100644
index 053dc5ff..00000000
--- a/uview-ui/components/u-count-to/u-count-to.vue
+++ /dev/null
@@ -1,241 +0,0 @@
-<template>
-	<view
-		class="u-count-num"
-		:style="{
-			fontSize: fontSize + 'rpx',
-			fontWeight: bold ? 'bold' : 'normal',
-			color: color
-		}"
-	>
-		{{ displayValue }}
-	</view>
-</template>
-
-<script>
-/**
- * countTo 数字滚动
- * @description 该组件一般用于需要滚动数字到某一个值的场景，目标要求是一个递增的值。
- * @tutorial https://www.uviewui.com/components/countTo.html
- * @property {String Number} start-val 开始值
- * @property {String Number} end-val 结束值
- * @property {String Number} duration 滚动过程所需的时间，单位ms（默认2000）
- * @property {Boolean} autoplay 是否自动开始滚动（默认true）
- * @property {String Number} decimals 要显示的小数位数，见官网说明（默认0）
- * @property {Boolean} use-easing 滚动结束时，是否缓动结尾，见官网说明（默认true）
- * @property {String} separator 千位分隔符，见官网说明
- * @property {String} color 字体颜色（默认#303133）
- * @property {String Number} font-size 字体大小，单位rpx（默认50）
- * @property {Boolean} bold 字体是否加粗（默认false）
- * @event {Function} end 数值滚动到目标值时触发
- * @example <u-count-to ref="uCountTo" :end-val="endVal" :autoplay="autoplay"></u-count-to>
- */
-export default {
-	name: 'u-count-to',
-	props: {
-		// 开始的数值，默认从0增长到某一个数
-		startVal: {
-			type: [Number, String],
-			default: 0
-		},
-		// 要滚动的目标数值，必须
-		endVal: {
-			type: [Number, String],
-			default: 0,
-			required: true
-		},
-		// 滚动到目标数值的动画持续时间，单位为毫秒（ms）
-		duration: {
-			type: [Number, String],
-			default: 2000
-		},
-		// 设置数值后是否自动开始滚动
-		autoplay: {
-			type: Boolean,
-			default: true
-		},
-		// 要显示的小数位数
-		decimals: {
-			type: [Number, String],
-			default: 0
-		},
-		// 是否在即将到达目标数值的时候，使用缓慢滚动的效果
-		useEasing: {
-			type: Boolean,
-			default: true
-		},
-		// 十进制分割
-		decimal: {
-			type: [Number, String],
-			default: '.'
-		},
-		// 字体颜色
-		color: {
-			type: String,
-			default: '#303133'
-		},
-		// 字体大小
-		fontSize: {
-			type: [Number, String],
-			default: 50
-		},
-		// 是否加粗字体
-		bold: {
-			type: Boolean,
-			default: false
-		},
-		// 千位分隔符，类似金额的分割(￥23,321.05中的",")
-		separator: {
-			type: String,
-			default: ''
-		}
-	},
-	data() {
-		return {
-			localStartVal: this.startVal,
-			displayValue: this.formatNumber(this.startVal),
-			printVal: null,
-			paused: false, // 是否暂停
-			localDuration: Number(this.duration),
-			startTime: null, // 开始的时间
-			timestamp: null, // 时间戳
-			remaining: null, // 停留的时间
-			rAF: null,
-			lastTime: 0 // 上一次的时间
-		};
-	},
-	computed: {
-		countDown() {
-			return this.startVal > this.endVal;
-		}
-	},
-	watch: {
-		startVal() {
-			this.autoplay && this.start();
-		},
-		endVal() {
-			this.autoplay && this.start();
-		}
-	},
-	mounted() {
-		this.autoplay && this.start();
-	},
-	methods: {
-		easingFn(t, b, c, d) {
-			return (c * (-Math.pow(2, (-10 * t) / d) + 1) * 1024) / 1023 + b;
-		},
-		requestAnimationFrame(callback) {
-			const currTime = new Date().getTime();
-			// 为了使setTimteout的尽可能的接近每秒60帧的效果
-			const timeToCall = Math.max(0, 16 - (currTime - this.lastTime));
-			const id = setTimeout(() => {
-				callback(currTime + timeToCall);
-			}, timeToCall);
-			this.lastTime = currTime + timeToCall;
-			return id;
-		},
-
-		cancelAnimationFrame(id) {
-			clearTimeout(id);
-		},
-		// 开始滚动数字
-		start() {
-			this.localStartVal = this.startVal;
-			this.startTime = null;
-			this.localDuration = this.duration;
-			this.paused = false;
-			this.rAF = this.requestAnimationFrame(this.count);
-		},
-		// 暂定状态，重新再开始滚动；或者滚动状态下，暂停
-		reStart() {
-			if (this.paused) {
-				this.resume();
-				this.paused = false;
-			} else {
-				this.stop();
-				this.paused = true;
-			}
-		},
-		// 暂停
-		stop() {
-			this.cancelAnimationFrame(this.rAF);
-		},
-		// 重新开始(暂停的情况下)
-		resume() {
-			this.startTime = null;
-			this.localDuration = this.remaining;
-			this.localStartVal = this.printVal;
-			this.requestAnimationFrame(this.count);
-		},
-		// 重置
-		reset() {
-			this.startTime = null;
-			this.cancelAnimationFrame(this.rAF);
-			this.displayValue = this.formatNumber(this.startVal);
-		},
-		count(timestamp) {
-			if (!this.startTime) this.startTime = timestamp;
-			this.timestamp = timestamp;
-			const progress = timestamp - this.startTime;
-			this.remaining = this.localDuration - progress;
-			if (this.useEasing) {
-				if (this.countDown) {
-					this.printVal = this.localStartVal - this.easingFn(progress, 0, this.localStartVal - this.endVal, this.localDuration);
-				} else {
-					this.printVal = this.easingFn(progress, this.localStartVal, this.endVal - this.localStartVal, this.localDuration);
-				}
-			} else {
-				if (this.countDown) {
-					this.printVal = this.localStartVal - (this.localStartVal - this.endVal) * (progress / this.localDuration);
-				} else {
-					this.printVal = this.localStartVal + (this.endVal - this.localStartVal) * (progress / this.localDuration);
-				}
-			}
-			if (this.countDown) {
-				this.printVal = this.printVal < this.endVal ? this.endVal : this.printVal;
-			} else {
-				this.printVal = this.printVal > this.endVal ? this.endVal : this.printVal;
-			}
-			this.displayValue = this.formatNumber(this.printVal);
-			if (progress < this.localDuration) {
-				this.rAF = this.requestAnimationFrame(this.count);
-			} else {
-				this.$emit('end');
-			}
-		},
-		// 判断是否数字
-		isNumber(val) {
-			return !isNaN(parseFloat(val));
-		},
-		formatNumber(num) {
-			// 将num转为Number类型，因为其值可能为字符串数值，调用toFixed会报错
-			num = Number(num);
-			num = num.toFixed(Number(this.decimals));
-			num += '';
-			const x = num.split('.');
-			let x1 = x[0];
-			const x2 = x.length > 1 ? this.decimal + x[1] : '';
-			const rgx = /(\d+)(\d{3})/;
-			if (this.separator && !this.isNumber(this.separator)) {
-				while (rgx.test(x1)) {
-					x1 = x1.replace(rgx, '$1' + this.separator + '$2');
-				}
-			}
-			return x1 + x2;
-		},
-		destroyed() {
-			this.cancelAnimationFrame(this.rAF);
-		}
-	}
-};
-</script>
-
-<style lang="scss" scoped>
-@import "../../libs/css/style.components.scss";
-
-.u-count-num {
-	/* #ifndef APP-NVUE */
-	display: inline-flex;		
-	/* #endif */
-	text-align: center;
-}
-</style>
diff --git a/uview-ui/components/u-divider/u-divider.vue b/uview-ui/components/u-divider/u-divider.vue
deleted file mode 100644
index 6f8d7e69..00000000
--- a/uview-ui/components/u-divider/u-divider.vue
+++ /dev/null
@@ -1,153 +0,0 @@
-<template>
-	<view class="u-divider" :style="{
-		height: height == 'auto' ? 'auto' : height + 'rpx',
-		backgroundColor: bgColor,
-		marginBottom: marginBottom + 'rpx',
-		marginTop: marginTop + 'rpx'
-	}" @tap="click">
-		<view class="u-divider-line" :class="[type ? 'u-divider-line--bordercolor--' + type : '']" :style="[lineStyle]"></view>
-		<view v-if="useSlot" class="u-divider-text" :style="{
-			color: color,
-			fontSize: fontSize + 'rpx'
-		}"><slot /></view>
-		<view class="u-divider-line" :class="[type ? 'u-divider-line--bordercolor--' + type : '']" :style="[lineStyle]"></view>
-	</view>
-</template>
-
-<script>
-/**
- * divider 分割线
- * @description 区隔内容的分割线，一般用于页面底部"没有更多"的提示。
- * @tutorial https://www.uviewui.com/components/divider.html
- * @property {String Number} half-width 文字左或右边线条宽度，数值或百分比，数值时单位为rpx
- * @property {String} border-color 线条颜色，优先级高于type（默认#dcdfe6）
- * @property {String} color 文字颜色（默认#909399）
- * @property {String Number} fontSize 字体大小，单位rpx（默认26）
- * @property {String} bg-color 整个divider的背景颜色（默认呢#ffffff）
- * @property {String Number} height 整个divider的高度，单位rpx（默认40）
- * @property {String} type 将线条设置主题色（默认primary）
- * @property {Boolean} useSlot 是否使用slot传入内容，如果不传入，中间不会有空隙（默认true）
- * @property {String Number} margin-top 与前一个组件的距离，单位rpx（默认0）
- * @property {String Number} margin-bottom 与后一个组件的距离，单位rpx（0）
- * @event {Function} click divider组件被点击时触发
- * @example <u-divider color="#fa3534">长河落日圆</u-divider>
- */
-export default {
-	name: 'u-divider',
-	props: {
-		// 单一边divider横线的宽度(数值)，单位rpx。或者百分比
-		halfWidth: {
-			type: [Number, String],
-			default: 150
-		},
-		// divider横线的颜色，如设置，
-		borderColor: {
-			type: String,
-			default: '#dcdfe6'
-		},
-		// 主题色，可以是primary|info|success|warning|error之一值
-		type: {
-			type: String,
-			default: 'primary'
-		},
-		// 文字颜色
-		color: {
-			type: String,
-			default: '#909399'
-		},
-		// 文字大小，单位rpx
-		fontSize: {
-			type: [Number, String],
-			default: 26
-		},
-		// 整个divider的背景颜色
-		bgColor: {
-			type: String,
-			default: '#ffffff'
-		},
-		// 整个divider的高度单位rpx
-		height: {
-			type: [Number, String],
-			default: 'auto'
-		},
-		// 上边距
-		marginTop: {
-			type: [String, Number],
-			default: 0
-		},
-		// 下边距
-		marginBottom: {
-			type: [String, Number],
-			default: 0
-		},
-		// 是否使用slot传入内容，如果不用slot传入内容，先的中间就不会有空隙
-		useSlot: {
-			type: Boolean,
-			default: true
-		}
-	},
-	computed: {
-		lineStyle() {
-			let style = {};
-			if(String(this.halfWidth).indexOf('%') != -1) style.width = this.halfWidth;
-			else style.width = this.halfWidth + 'rpx';
-			// borderColor优先级高于type值
-			if(this.borderColor) style.borderColor = this.borderColor;
-			return style;
-		}
-	},
-	methods: {
-		click() {
-			this.$emit('click');
-		}
-	}
-};
-</script>
-
-<style lang="scss" scoped>
-@import "../../libs/css/style.components.scss";
-.u-divider {
-	width: 100%;
-	position: relative;
-	text-align: center;
-	@include vue-flex;
-	justify-content: center;
-	align-items: center;
-	overflow: hidden;
-	flex-direction: row;
-}
-
-.u-divider-line {
-	border-bottom: 1px solid $u-border-color;
-	transform: scale(1, 0.5);
-	transform-origin: center;
-	
-	&--bordercolor--primary {
-		border-color: $u-type-primary;
-	}
-	
-	&--bordercolor--success {
-		border-color: $u-type-success;
-	}
-	
-	&--bordercolor--error {
-		border-color: $u-type-primary;
-	}
-	
-	&--bordercolor--info {
-		border-color: $u-type-info;
-	}
-	
-	&--bordercolor--warning {
-		border-color: $u-type-warning;
-	}
-}
-
-.u-divider-text {
-	white-space: nowrap;
-	padding: 0 16rpx;
-	/* #ifndef APP-NVUE */
-	display: inline-flex;		
-	/* #endif */
-}
-</style>
diff --git a/uview-ui/components/u-dropdown-item/u-dropdown-item.vue b/uview-ui/components/u-dropdown-item/u-dropdown-item.vue
index ba60d8f7..25ba00c6 100644
--- a/uview-ui/components/u-dropdown-item/u-dropdown-item.vue
+++ b/uview-ui/components/u-dropdown-item/u-dropdown-item.vue
@@ -1,18 +1,27 @@
 <template>
 	<view class="u-dropdown-item" v-if="active" @touchmove.stop.prevent="() => {}" @tap.stop.prevent="() => {}">
 		<block v-if="!$slots.default && !$slots.$default">
-			<scroll-view scroll-y="true" :style="{
-				height: $u.addUnit(height)
-			}">
+			<scroll-view
+				scroll-y="true"
+				:style="{
+					height: $u.addUnit(height)
+				}"
+			>
 				<view class="u-dropdown-item__options">
-					<u-cell-group>
-						<u-cell-item @click="cellClick(item.value)" :arrow="false" :title="item.label" v-for="(item, index) in options"
-						 :key="index" :title-style="{
+					<view
+						class="cell-item u-flex u-col-center u-row-between u-p-x-30 u-p-y-20"
+						@tap="cellClick(item.value)"
+						v-for="(item, index) in options"
+						:key="index"
+						:style="{
 							color: value == item.value ? activeColor : inactiveColor
-						}">
-							<u-icon v-if="value == item.value" name="checkbox-mark" :color="activeColor" size="32"></u-icon>
-						</u-cell-item>
-					</u-cell-group>
+						}"
+					>
+						<view class="cell-title">{{ item.label }}</view>
+						<view class="cell-right u-flex u-col-center">
+							<text v-if="value == item.value" class="cuIcon-check u-m-l-10" style="color: #999" :style="{ color: activeColor }"></text>
+						</view>
+					</view>
 				</view>
 			</scroll-view>
 		</block>
@@ -21,112 +30,123 @@
 </template>
 
 <script>
-	/**
-	 * dropdown-item 下拉菜单
-	 * @description 该组件一般用于向下展开菜单，同时可切换多个选项卡的场景
-	 * @tutorial http://uviewui.com/components/dropdown.html
-	 * @property {String | Number} v-model 双向绑定选项卡选择值
-	 * @property {String} title 菜单项标题
-	 * @property {Array[Object]} options 选项数据，如果传入了默认slot，此参数无效
-	 * @property {Boolean} disabled 是否禁用此选项卡（默认false）
-	 * @property {String | Number} duration 选项卡展开和收起的过渡时间，单位ms（默认300）
-	 * @property {String | Number} height 弹窗下拉内容的高度(内容超出将会滚动)（默认auto）
-	 * @example <u-dropdown-item title="标题"></u-dropdown-item>
-	 */
-	export default {
-		name: 'u-dropdown-item',
-		props: {
-			// 当前选中项的value值
-			value: {
-				type: [Number, String, Array],
-				default: ''
-			},
-			// 菜单项标题
-			title: {
-				type: [String, Number],
-				default: ''
-			},
-			// 选项数据，如果传入了默认slot，此参数无效
-			options: {
-				type: Array,
-				default () {
-					return []
-				}
-			},
-			// 是否禁用此菜单项
-			disabled: {
-				type: Boolean,
-				default: false
-			},
-			// 下拉弹窗的高度
-			height: {
-				type: [Number, String],
-				default: 'auto'
-			},
+/**
+ * dropdown-item 下拉菜单
+ * @description 该组件一般用于向下展开菜单，同时可切换多个选项卡的场景
+ * @tutorial http://uviewui.com/components/dropdown.html
+ * @property {String | Number} v-model 双向绑定选项卡选择值
+ * @property {String} title 菜单项标题
+ * @property {Array[Object]} options 选项数据，如果传入了默认slot，此参数无效
+ * @property {Boolean} disabled 是否禁用此选项卡（默认false）
+ * @property {String | Number} duration 选项卡展开和收起的过渡时间，单位ms（默认300）
+ * @property {String | Number} height 弹窗下拉内容的高度(内容超出将会滚动)（默认auto）
+ * @example <u-dropdown-item title="标题"></u-dropdown-item>
+ */
+export default {
+	name: 'u-dropdown-item',
+	props: {
+		// 当前选中项的value值
+		value: {
+			type: [Number, String, Array],
+			default: ''
 		},
-		data() {
-			return {
-				active: false, // 当前项是否处于展开状态
-				activeColor: '#2979ff', // 激活时左边文字和右边对勾图标的颜色
-				inactiveColor: '#606266', // 未激活时左边文字和右边对勾图标的颜色
-			}
-		},
-		computed: {
-			// 监听props是否发生了变化，有些值需要传递给父组件u-dropdown，无法双向绑定
-			propsChange() {
-				return `${this.title}-${this.disabled}`;
-			}
+		// 菜单项标题
+		title: {
+			type: [String, Number],
+			default: ''
 		},
-		watch: {
-			propsChange(n) {
-				// 当值变化时，通知父组件重新初始化，让父组件执行每个子组件的init()方法
-				// 将所有子组件数据重新整理一遍
-				if (this.parent) this.parent.init();
+		// 选项数据，如果传入了默认slot，此参数无效
+		options: {
+			type: Array,
+			default() {
+				return [];
 			}
 		},
-		created() {
-			// 父组件的实例
-			this.parent = false;
+		// 是否禁用此菜单项
+		disabled: {
+			type: Boolean,
+			default: false
 		},
-		methods: {
-			init() {
-				// 获取父组件u-dropdown
-				let parent = this.$u.$parent.call(this, 'u-dropdown');
-				if (parent) {
-					this.parent = parent;
-					// 将子组件的激活颜色配置为父组件设置的激活和未激活时的颜色
-					this.activeColor = parent.activeColor;
-					this.inactiveColor = parent.inactiveColor;
-					// 将本组件的this，放入到父组件的children数组中，让父组件可以操作本(子)组件的方法和属性
-					// push进去前，显判断是否已经存在了本实例，因为在子组件内部数据变化时，会通过父组件重新初始化子组件
-					let exist = parent.children.find(val => {
-						return this === val;
-					})
-					if (!exist) parent.children.push(this);
-					if (parent.children.length == 1) this.active = true;
-					// 父组件无法监听children的变化，故将子组件的title，传入父组件的menuList数组中
-					parent.menuList.push({
-						title: this.title,
-						disabled: this.disabled
-					});
-				}
-			},
-			// cell被点击
-			cellClick(value) {
-				// 修改通过v-model绑定的值
-				this.$emit('input', value);
-				// 通知父组件(u-dropdown)收起菜单
-				this.parent.close();
-				// 发出事件，抛出当前勾选项的value
-				this.$emit('change', value);
+		// 下拉弹窗的高度
+		height: {
+			type: [Number, String],
+			default: 'auto'
+		}
+	},
+	data() {
+		return {
+			active: false, // 当前项是否处于展开状态
+			activeColor: '#2979ff', // 激活时左边文字和右边对勾图标的颜色
+			inactiveColor: '#606266' // 未激活时左边文字和右边对勾图标的颜色
+		};
+	},
+	computed: {
+		// 监听props是否发生了变化，有些值需要传递给父组件u-dropdown，无法双向绑定
+		propsChange() {
+			return `${this.title}-${this.disabled}`;
+		}
+	},
+	watch: {
+		propsChange(n) {
+			// 当值变化时，通知父组件重新初始化，让父组件执行每个子组件的init()方法
+			// 将所有子组件数据重新整理一遍
+			if (this.parent) this.parent.init();
+		}
+	},
+	created() {
+		// 父组件的实例
+		this.parent = false;
+	},
+	methods: {
+		init() {
+			// 获取父组件u-dropdown
+			let parent = this.$u.$parent.call(this, 'u-dropdown');
+			if (parent) {
+				this.parent = parent;
+				// 将子组件的激活颜色配置为父组件设置的激活和未激活时的颜色
+				this.activeColor = parent.activeColor;
+				this.inactiveColor = parent.inactiveColor;
+				// 将本组件的this，放入到父组件的children数组中，让父组件可以操作本(子)组件的方法和属性
+				// push进去前，显判断是否已经存在了本实例，因为在子组件内部数据变化时，会通过父组件重新初始化子组件
+				let exist = parent.children.find(val => {
+					return this === val;
+				});
+				if (!exist) parent.children.push(this);
+				if (parent.children.length == 1) this.active = true;
+				// 父组件无法监听children的变化，故将子组件的title，传入父组件的menuList数组中
+				parent.menuList.push({
+					title: this.title,
+					disabled: this.disabled
+				});
 			}
 		},
-		mounted() {
-			this.init();
+		// cell被点击
+		cellClick(value) {
+			// 修改通过v-model绑定的值
+			this.$emit('input', value);
+			// 通知父组件(u-dropdown)收起菜单
+			this.parent.close();
+			// 发出事件，抛出当前勾选项的value
+			this.$emit('change', value);
 		}
+	},
+	mounted() {
+		this.init();
 	}
+};
 </script>
 
 <style scoped lang="scss">
-	@import "../../libs/css/style.components.scss";
+@import '../../libs/css/style.components.scss';
+.cell-item {
+	border-bottom: 1px solid #f5f5f5;
+	background-color: #fff;
+	.cell-title {
+		font-size: 28rpx;
+		color: #333;
+	}
+	.cell-content {
+		color: #999;
+	}
+}
 </style>
diff --git a/uview-ui/components/u-field/u-field.vue b/uview-ui/components/u-field/u-field.vue
deleted file mode 100644
index b562798a..00000000
--- a/uview-ui/components/u-field/u-field.vue
+++ /dev/null
@@ -1,384 +0,0 @@
-<template>
-	<view class="u-field" :class="{'u-border-top': borderTop, 'u-border-bottom': borderBottom }">
-		<view class="u-field-inner" :class="[type == 'textarea' ? 'u-textarea-inner' : '', 'u-label-postion-' + labelPosition]">
-			<view class="u-label" :class="[required ? 'u-required' : '']" :style="{
-				justifyContent: justifyContent, 
-				flex: labelPosition == 'left' ? `0 0 ${labelWidth}rpx` : '1'
-			}">
-				<view class="u-icon-wrap" v-if="icon">
-					<u-icon size="32" :custom-style="iconStyle" :name="icon" :color="iconColor" class="u-icon"></u-icon>
-				</view>
-				<slot name="icon"></slot>
-				<text class="u-label-text" :class="[this.$slots.icon || icon ? 'u-label-left-gap' : '']">{{ label }}</text>
-			</view>
-			<view class="fild-body">
-				<view class="u-flex-1 u-flex" :style="[inputWrapStyle]">
-					<textarea v-if="type == 'textarea'" class="u-flex-1 u-textarea-class" :style="[fieldStyle]" :value="value"
-					 :placeholder="placeholder" :placeholderStyle="placeholderStyle" :disabled="disabled" :maxlength="inputMaxlength"
-					 :focus="focus" :autoHeight="autoHeight" :fixed="fixed" @input="onInput" @blur="onBlur" @focus="onFocus" @confirm="onConfirm"
-					 @tap="fieldClick" />
-					<input
-						v-else
-						:style="[fieldStyle]"
-						:type="type"
-						class="u-flex-1 u-field__input-wrap"
-						:value="value"
-						:password="password || this.type === 'password'"
-						:placeholder="placeholder"
-						:placeholderStyle="placeholderStyle"
-						:disabled="disabled"
-						:maxlength="inputMaxlength"
-						:focus="focus"
-						:confirmType="confirmType"
-						@focus="onFocus"
-						@blur="onBlur"
-						@input="onInput"
-						@confirm="onConfirm"
-						@tap="fieldClick"
-					/>
-				</view>
-				<u-icon :size="clearSize" v-if="clearable && value != '' && focused" name="close-circle-fill" color="#c0c4cc" class="u-clear-icon" @click="onClear"/>
-				<view class="u-button-wrap"><slot name="right" /></view>
-				<u-icon v-if="rightIcon" @click="rightIconClick" :name="rightIcon" color="#c0c4cc" :style="[rightIconStyle]" size="26" class="u-arror-right" />
-			</view>
-		</view>
-		<view v-if="errorMessage !== false && errorMessage != ''" class="u-error-message" :style="{
-			paddingLeft: labelWidth + 'rpx'
-		}">{{ errorMessage }}</view>
-	</view>
-</template>
-
-<script>
-/**
- * field 输入框
- * @description 借助此组件，可以实现表单的输入， 有"text"和"textarea"类型的，此外，借助uView的picker和actionSheet组件可以快速实现上拉菜单，时间，地区选择等， 为表单解决方案的利器。
- * @tutorial https://www.uviewui.com/components/field.html
- * @property {String} type 输入框的类型（默认text）
- * @property {String} icon label左边的图标，限uView的图标名称
- * @property {Object} icon-style 左边图标的样式，对象形式
- * @property {Boolean} right-icon 输入框右边的图标名称，限uView的图标名称（默认false）
- * @property {Boolean} required 是否必填，左边您显示红色"*"号（默认false）
- * @property {String} label 输入框左边的文字提示
- * @property {Boolean} password 是否密码输入方式(用点替换文字)，type为text时有效（默认false）
- * @property {Boolean} clearable 是否显示右侧清空内容的图标控件(输入框有内容，且获得焦点时才显示)，点击可清空输入框内容（默认true）
- * @property {Number String} label-width label的宽度，单位rpx（默认130）
- * @property {String} label-align label的文字对齐方式（默认left）
- * @property {Object} field-style 自定义输入框的样式，对象形式
- * @property {Number | String} clear-size 清除图标的大小，单位rpx（默认30）
- * @property {String} input-align 输入框内容对齐方式（默认left）
- * @property {Boolean} border-bottom 是否显示field的下边框（默认true）
- * @property {Boolean} border-top 是否显示field的上边框（默认false）
- * @property {String} icon-color 左边通过icon配置的图标的颜色（默认#606266）
- * @property {Boolean} auto-height 是否自动增高输入区域，type为textarea时有效（默认true）
- * @property {String Boolean} error-message 显示的错误提示内容，如果为空字符串或者false，则不显示错误信息
- * @property {String} placeholder 输入框的提示文字
- * @property {String} placeholder-style placeholder的样式(内联样式，字符串)，如"color: #ddd"
- * @property {Boolean} focus 是否自动获得焦点（默认false）
- * @property {Boolean} fixed 如果type为textarea，且在一个"position:fixed"的区域，需要指明为true（默认false）
- * @property {Boolean} disabled 是否不可输入（默认false）
- * @property {Number String} maxlength 最大输入长度，设置为 -1 的时候不限制最大长度（默认140）
- * @property {String} confirm-type 设置键盘右下角按钮的文字，仅在type="text"时生效（默认done）
- * @event {Function} input 输入框内容发生变化时触发
- * @event {Function} focus 输入框获得焦点时触发
- * @event {Function} blur 输入框失去焦点时触发
- * @event {Function} confirm 点击完成按钮时触发
- * @event {Function} right-icon-click 通过right-icon生成的图标被点击时触发
- * @event {Function} click 输入框被点击或者通过right-icon生成的图标被点击时触发，这样设计是考虑到传递右边的图标，一般都为需要弹出"picker"等操作时的场景，点击倒三角图标，理应发出此事件，见上方说明
- * @example <u-field v-model="mobile" label="手机号" required :error-message="errorMessage"></u-field>
- */
-export default {
-	name:"u-field",
-	props: {
-		icon: String,
-		rightIcon: String,
-		// arrowDirection: {
-		// 	type: String,
-		// 	default: 'right'
-		// },
-		required: Boolean,
-		label: String,
-		password: Boolean,
-		clearable: {
-			type: Boolean,
-			default: true
-		},
-		// 左边标题的宽度单位rpx
-		labelWidth: {
-			type: [Number, String],
-			default: 130
-		},
-		// 对齐方式，left|center|right
-		labelAlign: {
-			type: String,
-			default: 'left'
-		},
-		inputAlign: {
-			type: String,
-			default: 'left'
-		},
-		iconColor: {
-			type: String,
-			default: '#606266'
-		},
-		autoHeight: {
-			type: Boolean,
-			default: true
-		},
-		errorMessage: {
-			type: [String, Boolean],
-			default: ''
-		},
-		placeholder: String,
-		placeholderStyle: String,
-		focus: Boolean,
-		fixed: Boolean,
-		value: [Number, String],
-		type: {
-			type: String,
-			default: 'text'
-		},
-		disabled: {
-			type: Boolean,
-			default: false
-		},
-		maxlength: {
-			type: [Number, String],
-			default: 140
-		},
-		confirmType: {
-			type: String,
-			default: 'done'
-		},
-		// lable的位置，可选为 left-左边，top-上边
-		labelPosition: {
-			type: String,
-			default: 'left'
-		},
-		// 输入框的自定义样式
-		fieldStyle: {
-			type: Object,
-			default() {
-				return {}
-			}
-		},
-		// 清除按钮的大小
-		clearSize: {
-			type: [Number, String],
-			default: 30
-		},
-		// lable左边的图标样式，对象形式
-		iconStyle: {
-			type: Object,
-			default() {
-				return {}
-			}
-		},
-		// 是否显示上边框
-		borderTop: {
-			type: Boolean,
-			default: false
-		},
-		// 是否显示下边框
-		borderBottom: {
-			type: Boolean,
-			default: true
-		},
-		// 是否自动去除两端的空格
-		trim: {
-			type: Boolean,
-			default: true
-		}
-	},
-	data() {
-		return {
-			focused: false,
-			itemIndex: 0,
-		};
-	},
-	computed: {
-		inputWrapStyle() {
-			let style = {};
-			style.textAlign = this.inputAlign;
-			// 判断lable的位置，如果是left的话，让input左边两边有间隙
-			if(this.labelPosition == 'left') {
-				style.margin = `0 8rpx`;
-			} else {
-				// 如果lable是top的，input的左边就没必要有间隙了
-				style.marginRight = `8rpx`;
-			}
-			return style;
-		},
-		rightIconStyle() {
-			let style = {};
-			if (this.arrowDirection == 'top') style.transform = 'roate(-90deg)';
-			if (this.arrowDirection == 'bottom') style.transform = 'roate(90deg)';
-			else style.transform = 'roate(0deg)';
-			return style;
-		},
-		labelStyle() {
-			let style = {};
-			if(this.labelAlign == 'left') style.justifyContent = 'flext-start';
-			if(this.labelAlign == 'center') style.justifyContent = 'center';
-			if(this.labelAlign == 'right') style.justifyContent = 'flext-end';
-			return style;
-		},
-		// uni不支持在computed中写style.justifyContent = 'center'的形式，故用此方法
-		justifyContent() {
-			if(this.labelAlign == 'left') return 'flex-start';
-			if(this.labelAlign == 'center') return 'center';
-			if(this.labelAlign == 'right') return 'flex-end';
-		},
-		// 因为uniapp的input组件的maxlength组件必须要数值，这里转为数值，给用户可以传入字符串数值
-		inputMaxlength() {
-			return Number(this.maxlength)
-		},
-		// label的位置
-		fieldInnerStyle() {
-			let style = {};
-			if(this.labelPosition == 'left') {
-				style.flexDirection = 'row';
-			} else {
-				style.flexDirection = 'column';
-			}
-			
-			return style;
-		}
-	},
-	methods: {
-		onInput(event) {
-			let value = event.detail.value;
-			// 判断是否去除空格
-			if(this.trim) value = this.$u.trim(value);
-			this.$emit('input', value);
-		},
-		onFocus(event) {
-			this.focused = true;
-			this.$emit('focus', event);
-		},
-		onBlur(event) {
-			// 最开始使用的是监听图标@touchstart事件，自从hx2.8.4后，此方法在微信小程序出错
-			// 这里改为监听点击事件，手点击清除图标时，同时也发生了@blur事件，导致图标消失而无法点击，这里做一个延时
-			setTimeout(() => {
-				this.focused = false;
-			}, 100)
-			this.$emit('blur', event);
-		},
-		onConfirm(e) {
-			this.$emit('confirm', e.detail.value);
-		},
-		onClear(event) {
-			this.$emit('input', '');
-		},
-		rightIconClick() {
-			this.$emit('right-icon-click');
-			this.$emit('click');
-		},
-		fieldClick() {
-			this.$emit('click');
-		}
-	}
-};
-</script>
-
-<style lang="scss" scoped>
-@import "../../libs/css/style.components.scss";
-	
-.u-field {
-	font-size: 28rpx;
-	padding: 20rpx 28rpx;
-	text-align: left;
-	position: relative;
-	color: $u-main-color;
-}
-
-.u-field-inner {
-	@include vue-flex;
-	align-items: center;
-}
-
-.u-textarea-inner {
-	align-items: flex-start;
-}
-
-.u-textarea-class {
-	min-height: 96rpx;
-	width: auto;
-	font-size: 28rpx;
-}
-
-.fild-body {
-	@include vue-flex;
-	flex: 1;
-	align-items: center;
-}
-
-.u-arror-right {
-	margin-left: 8rpx;
-}
-
-.u-label-text {
-	/* #ifndef APP-NVUE */
-	display: inline-flex;		
-	/* #endif */
-}
-
-.u-label-left-gap {
-	margin-left: 6rpx;
-}
-
-.u-label-postion-top {
-	flex-direction: column;
-	align-items: flex-start;
-}
-
-.u-label {
-	width: 130rpx;
-	flex: 1 1 130rpx;
-	text-align: left;
-	position: relative;
-	@include vue-flex;
-	align-items: center;
-}
-
-.u-required::before {
-	content: '*';
-	position: absolute;
-	left: -16rpx;
-	font-size: 14px;
-	color: $u-type-error;
-	height: 9px;
-	line-height: 1;
-}
-
-.u-field__input-wrap {
-	position: relative;
-	overflow: hidden;
-	font-size: 28rpx;
-	height: 48rpx;
-	flex: 1;
-	width: auto;
-}
-
-.u-clear-icon {
-	@include vue-flex;
-	align-items: center;
-}
-
-.u-error-message {
-	color: $u-type-error;
-	font-size: 26rpx;
-	text-align: left;
-}
-
-.placeholder-style {
-	color: rgb(150, 151, 153);
-}
-
-.u-input-class {
-	font-size: 28rpx;
-}
-
-.u-button-wrap {
-	margin-left: 8rpx;
-}
-</style>
diff --git a/uview-ui/components/u-full-screen/u-full-screen.vue b/uview-ui/components/u-full-screen/u-full-screen.vue
deleted file mode 100644
index 4f7e7d95..00000000
--- a/uview-ui/components/u-full-screen/u-full-screen.vue
+++ /dev/null
@@ -1,52 +0,0 @@
-<template>
-	<u-modal v-model="show" :show-cancel-button="true" confirm-text="升级" title="发现新版本" @cancel="cancel" @confirm="confirm">
-		<view class="u-update-content">
-			<rich-text :nodes="content"></rich-text>
-		</view>
-	</u-modal>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				show: false,
-				content: `
-					1. 修复badge组件的size参数无效问题<br>
-					2. 新增Modal模态框组件<br>
-					3. 新增压窗屏组件，可以在APP上以弹窗的形式遮盖导航栏和底部tabbar<br>
-					4. 修复键盘组件在微信小程序上遮罩无效的问题
-				`,
-			}
-		},
-		onReady() {
-			this.show = true;
-		},
-		methods: {
-			cancel() {
-				this.closeModal();
-			},
-			confirm() {
-				this.closeModal();
-			},
-			closeModal() {
-				uni.navigateBack();
-			}
-		}
-	}
-</script>
-
-<style scoped lang="scss">
-	@import "../../libs/css/style.components.scss";
-	
-	.u-full-content {
-		background-color: #00C777;
-	}
-	
-	.u-update-content {
-		font-size: 26rpx;
-		color: $u-content-color;
-		line-height: 1.7;
-		padding: 30rpx;
-	}
-</style>
diff --git a/uview-ui/components/u-gap/u-gap.vue b/uview-ui/components/u-gap/u-gap.vue
deleted file mode 100644
index 6c01f943..00000000
--- a/uview-ui/components/u-gap/u-gap.vue
+++ /dev/null
@@ -1,54 +0,0 @@
-<template>
-	<view class="u-gap" :style="[gapStyle]"></view>
-</template>
-
-<script>
-/**
- * gap 间隔槽
- * @description 该组件一般用于内容块之间的用一个灰色块隔开的场景，方便用户风格统一，减少工作量
- * @tutorial https://www.uviewui.com/components/gap.html
- * @property {String} bg-color 背景颜色（默认#f3f4f6）
- * @property {String Number} height 分割槽高度，单位rpx（默认30）
- * @property {String Number} margin-top 与前一个组件的距离，单位rpx（默认0）
- * @property {String Number} margin-bottom 与后一个组件的距离，单位rpx（0）
- * @example <u-gap height="80" bg-color="#bbb"></u-gap>
- */
-export default {
-	name: "u-gap",
-	props: {
-		bgColor: {
-			type: String,
-			default: 'transparent ' // 背景透明
-		},
-		// 高度
-		height: {
-			type: [String, Number],
-			default: 30
-		},
-		// 与上一个组件的距离
-		marginTop: {
-			type: [String, Number],
-			default: 0
-		},
-		// 与下一个组件的距离
-		marginBottom: {
-			type: [String, Number],
-			default: 0
-		},
-	},
-	computed: {
-		gapStyle() {
-			return {
-				backgroundColor: this.bgColor,
-				height: this.height + 'rpx',
-				marginTop: this.marginTop + 'rpx',
-				marginBottom: this.marginBottom + 'rpx'
-			};
-		}
-	}
-};
-</script>
-
-<style lang="scss" scoped>
-	@import "../../libs/css/style.components.scss";
-</style>
diff --git a/uview-ui/components/u-grid-item/u-grid-item.vue b/uview-ui/components/u-grid-item/u-grid-item.vue
deleted file mode 100644
index 0773307c..00000000
--- a/uview-ui/components/u-grid-item/u-grid-item.vue
+++ /dev/null
@@ -1,126 +0,0 @@
-<template>
-	<view class="u-grid-item" :hover-class="parentData.hoverClass"
-	 :hover-stay-time="200" @tap="click" :style="{
-			background: bgColor,
-			width: width,
-		}">
-		<view class="u-grid-item-box" :style="[customStyle]" :class="[parentData.border ? 'u-border-right u-border-bottom' : '']">
-			<slot />
-		</view>
-	</view>
-</template>
-
-<script>
-	/**
-	 * gridItem 提示
-	 * @description 宫格组件一般用于同时展示多个同类项目的场景，可以给宫格的项目设置徽标组件(badge)，或者图标等，也可以扩展为左右滑动的轮播形式。搭配u-grid使用
-	 * @tutorial https://www.uviewui.com/components/grid.html
-	 * @property {String} bg-color 宫格的背景颜色（默认#ffffff）
-	 * @property {String Number} index 点击宫格时，返回的值
-	 * @property {Object} custom-style 自定义样式，对象形式
-	 * @event {Function} click 点击宫格触发
-	 * @example <u-grid-item></u-grid-item>
-	 */
-	export default {
-		name: "u-grid-item",
-		props: {
-			// 背景颜色
-			bgColor: {
-				type: String,
-				default: '#ffffff'
-			},
-			// 点击时返回的index
-			index: {
-				type: [Number, String],
-				default: ''
-			},
-			// 自定义样式，对象形式
-			customStyle: {
-				type: Object,
-				default() {
-					return {
-						padding: '30rpx 0'
-					}
-				}
-			}
-		},
-		data() {
-			return {
-				parentData: {
-					hoverClass: '', // 按下去的时候，是否显示背景灰色
-					col: 3, // 父组件划分的宫格数
-					border: true, // 是否显示边框，根据父组件决定
-				}
-			};
-		},
-		created() {
-			// 父组件的实例
-			this.updateParentData();
-			// this.parent在updateParentData()中定义
-			this.parent.children.push(this);
-		},
-		computed: {
-			// 每个grid-item的宽度
-			width() {
-				return 100 / Number(this.parentData.col) + '%';
-			},
-		},
-		methods: {
-			// 获取父组件的参数
-			updateParentData() {
-				// 此方法写在mixin中
-				this.getParentData('u-grid');
-			},
-			click() {
-				this.$emit('click', this.index);
-				this.parent && this.parent.click(this.index);
-			}
-		}
-	};
-</script>
-
-<style scoped lang="scss">
-	@import "../../libs/css/style.components.scss";
-	
-	.u-grid-item {
-		box-sizing: border-box;
-		background: #fff;
-		@include vue-flex;
-		align-items: center;
-		justify-content: center;
-		position: relative;
-		flex-direction: column;
-		
-		/* #ifdef MP */
-		position: relative;
-		float: left;
-		/* #endif */
-	}
-
-	.u-grid-item-hover {
-		background: #f7f7f7 !important;
-	}
-
-	.u-grid-marker-box {
-		position: absolute;
-		/* #ifndef APP-NVUE */
-		display: inline-flex;		
-		/* #endif */
-		line-height: 0;
-	}
-
-	.u-grid-marker-wrap {
-		position: absolute;
-	}
-
-	.u-grid-item-box {
-		padding: 30rpx 0;
-		@include vue-flex;
-		align-items: center;
-		justify-content: center;
-		flex-direction: column;
-		flex: 1;
-		width: 100%;
-		height: 100%;
-	}
-</style>
diff --git a/uview-ui/components/u-grid/u-grid.vue b/uview-ui/components/u-grid/u-grid.vue
deleted file mode 100644
index 6588c06f..00000000
--- a/uview-ui/components/u-grid/u-grid.vue
+++ /dev/null
@@ -1,108 +0,0 @@
-<template>
-	<view class="u-grid" :class="{'u-border-top u-border-left': border}" :style="[gridStyle]"><slot /></view>
-</template>
-
-<script>
-/**
- * grid 宫格布局
- * @description 宫格组件一般用于同时展示多个同类项目的场景，可以给宫格的项目设置徽标组件(badge)，或者图标等，也可以扩展为左右滑动的轮播形式。
- * @tutorial https://www.uviewui.com/components/grid.html
- * @property {String Number} col 宫格的列数（默认3）
- * @property {Boolean} border 是否显示宫格的边框（默认true）
- * @property {Boolean} hover-class 点击宫格的时候，是否显示按下的灰色背景（默认false）
- * @event {Function} click 点击宫格触发
- * @example <u-grid :col="3" @click="click"></u-grid>
- */
-export default {
-	name: 'u-grid',
-	props: {
-		// 分成几列
-		col: {
-			type: [Number, String],
-			default: 3
-		},
-		// 是否显示边框
-		border: {
-			type: Boolean,
-			default: true
-		},
-		// 宫格对齐方式，表现为数量少的时候，靠左，居中，还是靠右
-		align: {
-			type: String,
-			default: 'left'
-		},
-		// 宫格按压时的样式类，"none"为无效果
-		hoverClass: {
-			type: String,
-			default: 'u-hover-class'
-		}
-	},
-	data() {
-		return {
-			index: 0,
-		}
-	},
-	watch: {
-		// 当父组件需要子组件需要共享的参数发生了变化，手动通知子组件
-		parentData() {
-			if(this.children.length) {
-				this.children.map(child => {
-					// 判断子组件(u-radio)如果有updateParentData方法的话，就就执行(执行的结果是子组件重新从父组件拉取了最新的值)
-					typeof(child.updateParentData) == 'function' && child.updateParentData();
-				})
-			}
-		},
-	},
-	created() {
-		// 如果将children定义在data中，在微信小程序会造成循环引用而报错
-		this.children = [];
-	},
-	computed: {
-		// 计算父组件的值是否发生变化
-		parentData() {
-			return [this.hoverClass, this.col, this.size, this.border];
-		},
-		// 宫格对齐方式
-		gridStyle() {
-			let style = {};
-			switch(this.align) {
-				case 'left':
-					style.justifyContent = 'flex-start';
-					break;
-				case 'center':
-					style.justifyContent = 'center';
-					break;
-				case 'right':
-					style.justifyContent = 'flex-end';
-					break;
-				default: style.justifyContent = 'flex-start';
-			};
-			return style;
-		}
-	},
-	methods: {
-		click(index) {
-			this.$emit('click', index);
-		}
-	}
-};
-</script>
-
-<style scoped lang="scss">
-@import "../../libs/css/style.components.scss";
-
-.u-grid {
-	width: 100%;
-	/* #ifdef MP */
-	position: relative;
-	box-sizing: border-box;
-	overflow: hidden;
-	/* #endif */
-	
-	/* #ifndef MP */
-	@include vue-flex;
-	flex-wrap: wrap;
-	align-items: center;
-	/* #endif */
-}
-</style>
diff --git a/uview-ui/components/u-image/u-image.vue b/uview-ui/components/u-image/u-image.vue
deleted file mode 100644
index 9af036f6..00000000
--- a/uview-ui/components/u-image/u-image.vue
+++ /dev/null
@@ -1,266 +0,0 @@
-<template>
-	<view class="u-image" @tap="onClick" :style="[wrapStyle, backgroundStyle]">
-		<image
-			v-if="!isError"
-			:src="src"
-			:mode="mode"
-			@error="onErrorHandler"
-			@load="onLoadHandler"
-			:lazy-load="lazyLoad"
-			class="u-image__image"
-			:style="{
-				borderRadius: shape == 'circle' ? '50%' : $u.addUnit(borderRadius)
-			}"
-		></image>
-		<view
-			v-if="showLoading && loading"
-			class="u-image__loading"
-			:style="{
-				borderRadius: shape == 'circle' ? '50%' : $u.addUnit(borderRadius),
-				backgroundColor: this.bgColor
-			}"
-		>
-			<slot v-if="$slots.loading" name="loading" />
-			<u-icon v-else :name="loadingIcon" :width="width" :height="height"></u-icon>
-		</view>
-		<view
-			v-if="showError && isError && !loading"
-			class="u-image__error"
-			:style="{
-				borderRadius: shape == 'circle' ? '50%' : $u.addUnit(borderRadius)
-			}"
-		>
-			<slot v-if="$slots.error" name="error" />
-			<u-icon v-else :name="errorIcon" :width="width" :height="height"></u-icon>
-		</view>
-	</view>
-</template>
-
-<script>
-/**
- * Image 图片
- * @description 此组件为uni-app的image组件的加强版，在继承了原有功能外，还支持淡入动画、加载中、加载失败提示、圆角值和形状等。
- * @tutorial https://uviewui.com/components/image.html
- * @property {String} src 图片地址
- * @property {String} mode 裁剪模式，见官网说明
- * @property {String | Number} width 宽度，单位任意，如果为数值，则为rpx单位（默认100%）
- * @property {String | Number} height 高度，单位任意，如果为数值，则为rpx单位（默认 auto）
- * @property {String} shape 图片形状，circle-圆形，square-方形（默认square）
- * @property {String | Number} border-radius 圆角值，单位任意，如果为数值，则为rpx单位（默认 0）
- * @property {Boolean} lazy-load 是否懒加载，仅微信小程序、App、百度小程序、字节跳动小程序有效（默认 true）
- * @property {Boolean} show-menu-by-longpress 是否开启长按图片显示识别小程序码菜单，仅微信小程序有效（默认 false）
- * @property {String} loading-icon 加载中的图标，或者小图片（默认 photo）
- * @property {String} error-icon 加载失败的图标，或者小图片（默认 error-circle）
- * @property {Boolean} show-loading 是否显示加载中的图标或者自定义的slot（默认 true）
- * @property {Boolean} show-error 是否显示加载错误的图标或者自定义的slot（默认 true）
- * @property {Boolean} fade 是否需要淡入效果（默认 true）
- * @property {String Number} width 传入图片路径时图片的宽度
- * @property {String Number} height 传入图片路径时图片的高度
- * @property {Boolean} webp 只支持网络资源，只对微信小程序有效（默认 false）
- * @property {String | Number} duration 搭配fade参数的过渡时间，单位ms（默认 500）
- * @event {Function} click 点击图片时触发
- * @event {Function} error 图片加载失败时触发
- * @event {Function} load 图片加载成功时触发
- * @example <u-image width="100%" height="300rpx" :src="src"></u-image>
- */
-export default {
-	name: 'u-image',
-	props: {
-		// 图片地址
-		src: {
-			type: String,
-			default: ''
-		},
-		// 裁剪模式
-		mode: {
-			type: String,
-			default: 'aspectFill'
-		},
-		// 宽度，单位任意
-		width: {
-			type: [String, Number],
-			default: '100%'
-		},
-		// 高度，单位任意
-		height: {
-			type: [String, Number],
-			default: 'auto'
-		},
-		// 图片形状，circle-圆形，square-方形
-		shape: {
-			type: String,
-			default: 'square'
-		},
-		// 圆角，单位任意
-		borderRadius: {
-			type: [String, Number],
-			default: 0
-		},
-		// 是否懒加载，微信小程序、App、百度小程序、字节跳动小程序
-		lazyLoad: {
-			type: Boolean,
-			default: true
-		},
-		// 开启长按图片显示识别微信小程序码菜单
-		showMenuByLongpress: {
-			type: Boolean,
-			default: true
-		},
-		// 加载中的图标，或者小图片
-		loadingIcon: {
-			type: String,
-			default: 'photo'
-		},
-		// 加载失败的图标，或者小图片
-		errorIcon: {
-			type: String,
-			default: 'error-circle'
-		},
-		// 是否显示加载中的图标或者自定义的slot
-		showLoading: {
-			type: Boolean,
-			default: true
-		},
-		// 是否显示加载错误的图标或者自定义的slot
-		showError: {
-			type: Boolean,
-			default: true
-		},
-		// 是否需要淡入效果
-		fade: {
-			type: Boolean,
-			default: true
-		},
-		// 只支持网络资源，只对微信小程序有效
-		webp: {
-			type: Boolean,
-			default: false
-		},
-		// 过渡时间，单位ms
-		duration: {
-			type: [String, Number],
-			default: 500
-		},
-		// 背景颜色，用于深色页面加载图片时，为了和背景色融合
-		bgColor: {
-			type: String,
-			default: '#f3f4f6'
-		}
-	},
-	data() {
-		return {
-			// 图片是否加载错误，如果是，则显示错误占位图
-			isError: false,
-			// 初始化组件时，默认为加载中状态
-			loading: true,
-			// 不透明度，为了实现淡入淡出的效果
-			opacity: 1,
-			// 过渡时间，因为props的值无法修改，故需要一个中间值
-			durationTime: this.duration,
-			// 图片加载完成时，去掉背景颜色，因为如果是png图片，就会显示灰色的背景
-			backgroundStyle: {}
-		};
-	},
-	watch: {
-		src: {
-			immediate: true,
-			handler (n) {
-				if(!n) {
-					// 如果传入null或者''，或者false，或者undefined，标记为错误状态
-					this.isError = true;
-					this.loading = false;
-				} else {
-					this.isError = false;
-				}
-			}
-		}
-	},
-	computed: {
-		wrapStyle() {
-			let style = {};
-			// 通过调用addUnit()方法，如果有单位，如百分比，px单位等，直接返回，如果是纯粹的数值，则加上rpx单位
-			style.width = this.$u.addUnit(this.width);
-			style.height = this.$u.addUnit(this.height);
-			// 如果是配置了圆形，设置50%的圆角，否则按照默认的配置值
-			style.borderRadius = this.shape == 'circle' ? '50%' : this.$u.addUnit(this.borderRadius);
-			// 如果设置圆角，必须要有hidden，否则可能圆角无效
-			style.overflow = this.borderRadius > 0 ? 'hidden' : 'visible';
-			if (this.fade) {
-				style.opacity = this.opacity;
-				style.transition = `opacity ${Number(this.durationTime) / 1000}s ease-in-out`;
-			}
-			return style;
-		}
-	},
-	methods: {
-		// 点击图片
-		onClick() {
-			this.$emit('click');
-		},
-		// 图片加载失败
-		onErrorHandler(err) {
-			this.loading = false;
-			this.isError = true;
-			this.$emit('error', err);
-		},
-		// 图片加载完成，标记loading结束
-		onLoadHandler() {
-			this.loading = false;
-			this.isError = false;
-			this.$emit('load');
-			// 如果不需要动画效果，就不执行下方代码，同时移除加载时的背景颜色
-			// 否则无需fade效果时，png图片依然能看到下方的背景色
-			if (!this.fade) return this.removeBgColor();
-			// 原来opacity为1(不透明，是为了显示占位图)，改成0(透明，意味着该元素显示的是背景颜色，默认的灰色)，再改成1，是为了获得过渡效果
-			this.opacity = 0;
-			// 这里设置为0，是为了图片展示到背景全透明这个过程时间为0，延时之后延时之后重新设置为duration，是为了获得背景透明(灰色)
-			// 到图片展示的过程中的淡入效果
-			this.durationTime = 0;
-			// 延时50ms，否则在浏览器H5，过渡效果无效
-			setTimeout(() => {
-				this.durationTime = this.duration;
-				this.opacity = 1;
-				setTimeout(() => {
-					this.removeBgColor();
-				}, this.durationTime);
-			}, 50);
-		},
-		// 移除图片的背景色
-		removeBgColor() {
-			// 淡入动画过渡完成后，将背景设置为透明色，否则png图片会看到灰色的背景
-			this.backgroundStyle = {
-				backgroundColor: 'transparent'
-			};
-		}
-	}
-};
-</script>
-
-<style scoped lang="scss">
-@import '../../libs/css/style.components.scss';
-
-.u-image {
-	position: relative;
-	transition: opacity 0.5s ease-in-out;
-
-	&__image {
-		width: 100%;
-		height: 100%;
-	}
-
-	&__loading,
-	&__error {
-		position: absolute;
-		top: 0;
-		left: 0;
-		width: 100%;
-		height: 100%;
-		@include vue-flex;
-		align-items: center;
-		justify-content: center;
-		background-color: $u-bg-color;
-		color: $u-tips-color;
-		font-size: 46rpx;
-	}
-}
-</style>
diff --git a/uview-ui/components/u-index-anchor/u-index-anchor.vue b/uview-ui/components/u-index-anchor/u-index-anchor.vue
deleted file mode 100644
index 5038827b..00000000
--- a/uview-ui/components/u-index-anchor/u-index-anchor.vue
+++ /dev/null
@@ -1,89 +0,0 @@
-<template>
-	<!-- 支付宝小程序使用$u.getRect()获取组件的根元素尺寸，所以在外面套一个"壳" -->
-	<view>
-		<view class="u-index-anchor-wrapper" :id="$u.guid()" :style="[wrapperStyle]">
-			<view class="u-index-anchor " :class="[active ? 'u-index-anchor--active' : '']" :style="[customAnchorStyle]">
-				<slot v-if="useSlot" />
-				<block v-else>
-					<text>{{ index }}</text>
-				</block>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	/**
-	 * indexAnchor 索引列表锚点
-	 * @description 通过折叠面板收纳内容区域,搭配<u-index-anchor>使用
-	 * @tutorial https://www.uviewui.com/components/indexList.html#indexanchor-props
-	 * @property {Boolean} use-slot 是否使用自定义内容的插槽（默认false）
-	 * @property {String Number} index 索引字符，如果定义了use-slot，此参数自动失效
-	 * @property {Object} custStyle 自定义样式，对象形式，如"{color: 'red'}"
-	 * @event {Function} default 锚点位置显示内容，默认为索引字符
-	 * @example <u-index-anchor :index="item" />
-	 */
-	export default {
-		name: "u-index-anchor",
-		props: {
-			useSlot: {
-				type: Boolean,
-				default: false
-			},
-			index: {
-				type: String,
-				default: ''
-			},
-			customStyle: {
-				type: Object,
-				default () {
-					return {}
-				}
-			}
-		},
-		data() {
-			return {
-				active: false,
-				wrapperStyle: {},
-				anchorStyle: {}
-			}
-		},
-		created() {
-			this.parent = false;
-		},
-		mounted() {
-			this.parent = this.$u.$parent.call(this, 'u-index-list');
-			if(this.parent) {
-				this.parent.children.push(this);
-				this.parent.updateData();
-			}
-		},
-		computed: {
-			customAnchorStyle() {
-				return Object.assign(this.anchorStyle, this.customStyle);
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	@import "../../libs/css/style.components.scss";
-	
-	.u-index-anchor {
-		box-sizing: border-box;
-		padding: 14rpx 24rpx;
-		color: #606266;
-		width: 100%;
-		font-weight: 500;
-		font-size: 28rpx;
-		line-height: 1.2;
-		background-color: rgb(245, 245, 245);
-	}
-
-	.u-index-anchor--active {
-		right: 0;
-		left: 0;
-		color: #2979ff;
-		background-color: #fff;
-	}
-</style>
diff --git a/uview-ui/components/u-index-list/u-index-list.vue b/uview-ui/components/u-index-list/u-index-list.vue
deleted file mode 100644
index 30fcda09..00000000
--- a/uview-ui/components/u-index-list/u-index-list.vue
+++ /dev/null
@@ -1,315 +0,0 @@
-<template>
-	<!-- 支付宝小程序使用$u.getRect()获取组件的根元素尺寸，所以在外面套一个"壳" -->
-	<view>
-		<view class="u-index-bar">
-			<slot />
-			<view v-if="showSidebar" class="u-index-bar__sidebar" @touchstart.stop.prevent="onTouchMove" @touchmove.stop.prevent="onTouchMove"
-			 @touchend.stop.prevent="onTouchStop" @touchcancel.stop.prevent="onTouchStop">
-				<view v-for="(item, index) in indexList" :key="index" class="u-index-bar__index" :style="{zIndex: zIndex + 1, color: activeAnchorIndex === index ? activeColor : ''}"
-				 :data-index="index">
-					{{ item }}
-				</view>
-			</view>
-			<view class="u-indexed-list-alert" v-if="touchmove && indexList[touchmoveIndex]" :style="{
-				zIndex: alertZIndex
-			}">
-				<text>{{indexList[touchmoveIndex]}}</text>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	var indexList = function() {
-		var indexList = [];
-		var charCodeOfA = 'A'.charCodeAt(0);
-		for (var i = 0; i < 26; i++) {
-			indexList.push(String.fromCharCode(charCodeOfA + i));
-		}
-		return indexList;
-	};
-
-	/**
-	 * indexList 索引列表
-	 * @description 通过折叠面板收纳内容区域,搭配<u-index-anchor>使用
-	 * @tutorial https://www.uviewui.com/components/indexList.html#indexanchor-props
-	 * @property {Number String} scroll-top 当前滚动高度，自定义组件无法获得滚动条事件，所以依赖接入方传入
-	 * @property {Array} index-list 索引字符列表，数组（默认A-Z）
-	 * @property {Number String} z-index 锚点吸顶时的层级（默认965）
-	 * @property {Boolean} sticky 是否开启锚点自动吸顶（默认true）
-	 * @property {Number String} offset-top 锚点自动吸顶时与顶部的距离（默认0）
-	 * @property {String} highlight-color 锚点和右边索引字符高亮颜色（默认#2979ff）
-	 * @event {Function} select 选中右边索引字符时触发
-	 * @example <u-index-list :scrollTop="scrollTop"></u-index-list>
-	 */
-	export default {
-		name: "u-index-list",
-		props: {
-			sticky: {
-				type: Boolean,
-				default: true
-			},
-			zIndex: {
-				type: [Number, String],
-				default: ''
-			},
-			scrollTop: {
-				type: [Number, String],
-				default: 0,
-			},
-			offsetTop: {
-				type: [Number, String],
-				default: 0
-			},
-			indexList: {
-				type: Array,
-				default () {
-					return indexList()
-				}
-			},
-			activeColor: {
-				type: String,
-				default: '#2979ff'
-			}
-		},
-		created() {
-			// #ifdef H5
-			this.stickyOffsetTop = this.offsetTop ? uni.upx2px(this.offsetTop) : 44;
-			// #endif
-			// #ifndef H5
-			this.stickyOffsetTop = this.offsetTop ? uni.upx2px(this.offsetTop) : 0;
-			// #endif
-			// 只能在created生命周期定义children，如果在data定义，会因为循环引用而报错
-			this.children = [];
-		},
-		data() {
-			return {
-				activeAnchorIndex: 0,
-				showSidebar: true,
-				// children: [],
-				touchmove: false,
-				touchmoveIndex: 0,
-			}
-		},
-		watch: {
-			scrollTop() {
-				this.updateData()
-			}
-		},
-		computed: {
-			// 弹出toast的z-index值
-			alertZIndex() {
-				return this.$u.zIndex.toast;
-			}
-		},
-		methods: {
-			updateData() {
-				this.timer && clearTimeout(this.timer);
-				this.timer = setTimeout(() => {
-					this.showSidebar = !!this.children.length;
-					this.setRect().then(() => {
-						this.onScroll();
-					});
-				}, 0);
-			},
-			setRect() {
-				return Promise.all([
-					this.setAnchorsRect(),
-					this.setListRect(),
-					this.setSiderbarRect()
-				]);
-			},
-			setAnchorsRect() {
-				return Promise.all(this.children.map((anchor, index) => anchor
-					.$uGetRect('.u-index-anchor-wrapper')
-					.then((rect) => {
-						Object.assign(anchor, {
-							height: rect.height,
-							top: rect.top
-						});
-					})));
-			},
-			setListRect() {
-				return this.$uGetRect('.u-index-bar').then((rect) => {
-					Object.assign(this, {
-						height: rect.height,
-						top: rect.top + this.scrollTop
-					});
-				});
-			},
-			setSiderbarRect() {
-				return this.$uGetRect('.u-index-bar__sidebar').then(rect => {
-					this.sidebar = {
-						height: rect.height,
-						top: rect.top
-					};
-				});
-			},
-			getActiveAnchorIndex() {
-				const {
-					children
-				} = this;
-				const {
-					sticky
-				} = this;
-				for (let i = this.children.length - 1; i >= 0; i--) {
-					const preAnchorHeight = i > 0 ? children[i - 1].height : 0;
-					const reachTop = sticky ? preAnchorHeight : 0;
-					if (reachTop >= children[i].top) {
-						return i;
-					}
-				}
-				return -1;
-			},
-			onScroll() {
-				const {
-					children = []
-				} = this;
-				if (!children.length) {
-					return;
-				}
-				const {
-					sticky,
-					stickyOffsetTop,
-					zIndex,
-					scrollTop,
-					activeColor
-				} = this;
-				const active = this.getActiveAnchorIndex();
-				this.activeAnchorIndex = active;
-				if (sticky) {
-					let isActiveAnchorSticky = false;
-					if (active !== -1) {
-						isActiveAnchorSticky =
-							children[active].top <= 0;
-					}
-					children.forEach((item, index) => {
-						if (index === active) {
-							let wrapperStyle = '';
-							let anchorStyle = {
-								color: `${activeColor}`
-							};
-							if (isActiveAnchorSticky) {
-								wrapperStyle = {
-									height: `${children[index].height}px`
-								};
-								anchorStyle = {
-									position: 'fixed',
-									top: `${stickyOffsetTop}px`,
-									zIndex: `${zIndex ? zIndex : this.$u.zIndex.indexListSticky}`,
-									color: `${activeColor}`
-								};
-							}
-							item.active = active;
-							item.wrapperStyle = wrapperStyle;
-							item.anchorStyle = anchorStyle;
-						} else if (index === active - 1) {
-							const currentAnchor = children[index];
-							const currentOffsetTop = currentAnchor.top;
-							const targetOffsetTop = index === children.length - 1 ?
-								this.top :
-								children[index + 1].top;
-							const parentOffsetHeight = targetOffsetTop - currentOffsetTop;
-							const translateY = parentOffsetHeight - currentAnchor.height;
-							const anchorStyle = {
-								position: 'relative',
-								transform: `translate3d(0, ${translateY}px, 0)`,
-								zIndex: `${zIndex ? zIndex : this.$u.zIndex.indexListSticky}`,
-								color: `${activeColor}`
-							};
-							item.active = active;
-							item.anchorStyle = anchorStyle;
-						} else {
-							item.active = false;
-							item.anchorStyle = '';
-							item.wrapperStyle = '';
-						}
-					});
-				}
-			},
-			onTouchMove(event) {
-				this.touchmove = true;
-				const sidebarLength = this.children.length;
-				const touch = event.touches[0];
-				const itemHeight = this.sidebar.height / sidebarLength;
-				let clientY = 0;
-				clientY = touch.clientY;
-				let index = Math.floor((clientY - this.sidebar.top) / itemHeight);
-				if (index < 0) {
-					index = 0;
-				} else if (index > sidebarLength - 1) {
-					index = sidebarLength - 1;
-				}
-				this.touchmoveIndex = index;
-				this.scrollToAnchor(index);
-			},
-			onTouchStop() {
-				this.touchmove = false;
-				this.scrollToAnchorIndex = null;
-			},
-			scrollToAnchor(index) {
-				if (this.scrollToAnchorIndex === index) {
-					return;
-				}
-				this.scrollToAnchorIndex = index;
-				const anchor = this.children.find((item) => item.index === this.indexList[index]);
-				if (anchor) {
-					this.$emit('select', anchor.index);
-					uni.pageScrollTo({
-						duration: 0,
-						scrollTop: anchor.top + this.scrollTop
-					});
-				}
-			}
-		}
-	};
-</script>
-
-<style lang="scss" scoped>
-	@import "../../libs/css/style.components.scss";
-	
-	.u-index-bar {
-		position: relative
-	}
-
-	.u-index-bar__sidebar {
-		position: fixed;
-		top: 50%;
-		right: 0;
-		@include vue-flex;
-		flex-direction: column;
-		text-align: center;
-		transform: translateY(-50%);
-		user-select: none;
-		z-index: 99;
-	}
-
-	.u-index-bar__index {
-		font-weight: 500;
-		padding: 8rpx 18rpx;
-		font-size: 22rpx;
-		line-height: 1
-	}
-
-	.u-indexed-list-alert {
-		position: fixed;
-		width: 120rpx;
-		height: 120rpx;
-		right: 90rpx;
-		top: 50%;
-		margin-top: -60rpx;
-		border-radius: 24rpx;
-		font-size: 50rpx;
-		color: #fff;
-		background-color: rgba(0, 0, 0, 0.65);
-		@include vue-flex;
-		justify-content: center;
-		align-items: center;
-		padding: 0;
-		z-index: 9999999;
-	}
-
-	.u-indexed-list-alert text {
-		line-height: 50rpx;
-	}
-</style>
diff --git a/uview-ui/components/u-keyboard/u-keyboard.vue b/uview-ui/components/u-keyboard/u-keyboard.vue
deleted file mode 100644
index 1904a2ba..00000000
--- a/uview-ui/components/u-keyboard/u-keyboard.vue
+++ /dev/null
@@ -1,217 +0,0 @@
-<template>
-	<u-popup class="" :mask="mask" :maskCloseAble="maskCloseAble" mode="bottom" :popup="false" v-model="value" length="auto"
-	 :safeAreaInsetBottom="safeAreaInsetBottom" @close="popupClose" :zIndex="uZIndex">
-		<slot />
-		<view class="u-tooltip" v-if="tooltip">
-			<view class="u-tooltip-item u-tooltip-cancel" hover-class="u-tooltip-cancel-hover" @tap="onCancel">
-				{{cancelBtn ? cancelText : ''}}
-			</view>
-			<view v-if="showTips" class="u-tooltip-item u-tooltip-tips">
-				{{tips ? tips : mode == 'number' ? '数字键盘' : mode == 'card' ? '身份证键盘' : '车牌号键盘'}}
-			</view>
-			<view v-if="confirmBtn" @tap="onConfirm" class="u-tooltip-item u-tooltips-submit" hover-class="u-tooltips-submit-hover">
-				{{confirmBtn ? confirmText : ''}}
-			</view>
-		</view>
-		<block v-if="mode == 'number' || mode == 'card'">
-			<u-number-keyboard :random="random" @backspace="backspace" @change="change" :mode="mode" :dotEnabled="dotEnabled"></u-number-keyboard>
-		</block>
-		<block v-else>
-			<u-car-keyboard :random="random" @backspace="backspace" @change="change"></u-car-keyboard>
-		</block>
-	</u-popup>
-</template>
-
-<script>
-	/**
-	 * keyboard 键盘
-	 * @description 此为uViw自定义的键盘面板，内含了数字键盘，车牌号键，身份证号键盘3中模式，都有可以打乱按键顺序的选项。
-	 * @tutorial https://www.uviewui.com/components/keyboard.html
-	 * @property {String} mode 键盘类型，见官网基本使用的说明（默认number）
-	 * @property {Boolean} dot-enabled 是否显示"."按键，只在mode=number时有效（默认true）
-	 * @property {Boolean} tooltip 是否显示键盘顶部工具条（默认true）
-	 * @property {String} tips 工具条中间的提示文字，见上方基本使用的说明，如不需要，请传""空字符
-	 * @property {Boolean} cancel-btn 是否显示工具条左边的"取消"按钮（默认true）
-	 * @property {Boolean} confirm-btn 是否显示工具条右边的"完成"按钮（默认true）
-	 * @property {Boolean} mask 是否显示遮罩（默认true）
-	 * @property {String} confirm-text 确认按钮的文字
-	 * @property {String} cancel-text 取消按钮的文字
-	 * @property {Number String} z-index 弹出键盘的z-index值（默认1075）
-	 * @property {Boolean} random 是否打乱键盘按键的顺序（默认false）
-	 * @property {Boolean} safe-area-inset-bottom 是否开启底部安全区适配（默认false）
-	 * @property {Boolean} mask-close-able 是否允许点击遮罩收起键盘（默认true）
-	 * @event {Function} change 按键被点击(不包含退格键被点击)
-	 * @event {Function} cancel 键盘顶部工具条左边的"取消"按钮被点击
-	 * @event {Function} confirm 键盘顶部工具条右边的"完成"按钮被点击
-	 * @event {Function} backspace 键盘退格键被点击
-	 * @example <u-keyboard mode="number" v-model="show"></u-keyboard> 
-	 */
-	export default {
-		name: "u-keyboard",
-		props: {
-			// 键盘的类型，number-数字键盘，card-身份证键盘，car-车牌号键盘
-			mode: {
-				type: String,
-				default: 'number'
-			},
-			// 是否显示键盘的"."符号
-			dotEnabled: {
-				type: Boolean,
-				default: true
-			},
-			// 是否显示顶部工具条
-			tooltip: {
-				type: Boolean,
-				default: true
-			},
-			// 是否显示工具条中间的提示
-			showTips: {
-				type: Boolean,
-				default: true
-			},
-			// 工具条中间的提示文字
-			tips: {
-				type: String,
-				default: ''
-			},
-			// 是否显示工具条左边的"取消"按钮
-			cancelBtn: {
-				type: Boolean,
-				default: true
-			},
-			// 是否显示工具条右边的"完成"按钮
-			confirmBtn: {
-				type: Boolean,
-				default: true
-			},
-			// 是否打乱键盘按键的顺序
-			random: {
-				type: Boolean,
-				default: false
-			},
-			// 是否开启底部安全区适配，开启的话，会在iPhoneX机型底部添加一定的内边距
-			safeAreaInsetBottom: {
-				type: Boolean,
-				default: false
-			},
-			// 是否允许通过点击遮罩关闭键盘
-			maskCloseAble: {
-				type: Boolean,
-				default: true
-			},
-			// 通过双向绑定控制键盘的弹出与收起
-			value: {
-				type: Boolean,
-				default: false
-			},
-			// 是否显示遮罩，某些时候数字键盘时，用户希望看到自己的数值，所以可能不想要遮罩
-			mask: {
-				type: Boolean,
-				default: true
-			},
-			// z-index值
-			zIndex: {
-				type: [Number, String],
-				default: ''
-			},
-			// 取消按钮的文字
-			cancelText: {
-				type: String,
-				default: '取消'
-			},
-			// 确认按钮的文字
-			confirmText: {
-				type: String,
-				default: '确认'
-			}
-		},
-		data() {
-			return {
-				//show: false
-			}
-		},
-		computed: {
-			uZIndex() {
-				return this.zIndex ? this.zIndex : this.$u.zIndex.popup;
-			}
-		},
-		methods: {
-			change(e) {
-				this.$emit('change', e);
-			},
-			// 键盘关闭
-			popupClose() {
-				// 通过发送input这个特殊的事件名，可以修改父组件传给props的value的变量，也即双向绑定
-				this.$emit('input', false);
-			},
-			// 输入完成
-			onConfirm() {
-				this.popupClose();
-				this.$emit('confirm');
-			},
-			// 取消输入
-			onCancel() {
-				this.popupClose();
-				this.$emit('cancel');
-			},
-			// 退格键
-			backspace() {
-				this.$emit('backspace');
-			},
-			// 关闭键盘
-			// close() {
-			// 	this.show = false;
-			// },
-			// // 打开键盘
-			// open() {
-			// 	this.show = true;
-			// }
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	@import "../../libs/css/style.components.scss";
-	
-	.u-keyboard {
-		position: relative;
-		z-index: 1003;
-	}
-
-	.u-tooltip {
-		@include vue-flex;
-		justify-content: space-between;
-	}
-
-	.u-tooltip-item {
-		color: #333333;
-		flex: 0 0 33.333333%;
-		text-align: center;
-		padding: 20rpx 10rpx;
-		font-size: 28rpx;
-	}
-
-	.u-tooltips-submit {
-		text-align: right;
-		flex-grow: 1;
-		flex-wrap: 0;
-		padding-right: 40rpx;
-		color: $u-type-primary;
-	}
-
-	.u-tooltip-cancel {
-		text-align: left;
-		flex-grow: 1;
-		flex-wrap: 0;
-		padding-left: 40rpx;
-		color: #888888;
-	}
-
-	.u-tooltips-submit-hover {
-		color: $u-type-success;
-	}
-
-	.u-tooltip-cancel-hover {
-		color: #333333;
-	}
-</style>
diff --git a/uview-ui/components/u-lazy-load/u-lazy-load.vue b/uview-ui/components/u-lazy-load/u-lazy-load.vue
deleted file mode 100644
index 429a680c..00000000
--- a/uview-ui/components/u-lazy-load/u-lazy-load.vue
+++ /dev/null
@@ -1,244 +0,0 @@
-<template>
-	<view class="u-wrap" :style="{
-			  opacity: Number(opacity),
-			  borderRadius: borderRadius + 'rpx',
-			  // 因为time值需要改变,所以不直接用duration值(不能改变父组件prop传过来的值)
-			  transition: `opacity ${time / 1000}s ease-in-out`
-		   }"
-	 :class="'u-lazy-item-' + elIndex">
-		<view :class="'u-lazy-item-' + elIndex">
-			<image :style="{borderRadius: borderRadius + 'rpx', height: imgHeight}" v-if="!isError" class="u-lazy-item"
-			 :src="isShow ? image : loadingImg" :mode="imgMode" @load="imgLoaded" @error="loadError" @tap="clickImg"></image>
-			<image :style="{borderRadius: borderRadius + 'rpx', height: imgHeight}" class="u-lazy-item error" v-else :src="errorImg"
-			 :mode="imgMode" @load="errorImgLoaded" @tap="clickImg"></image>
-		</view>
-	</view>
-</template>
-
-<script>
-	/**
-	 * lazyLoad 懒加载
-	 * @description 懒加载使用的场景为：页面有很多图片时，APP会同时加载所有的图片，导致页面卡顿，各个位置的图片出现前后不一致等.
-	 * @tutorial https://www.uviewui.com/components/lazyLoad.html
-	 * @property {String Number} index 用户自定义值，在事件触发时回调，用以区分是哪个图片
-	 * @property {String} image 图片路径
-	 * @property {String} loading-img 预加载时的占位图
-	 * @property {String} error-img 图片加载出错时的占位图
-	 * @property {String} threshold 触发加载时的位置，见上方说明，单位 rpx（默认300）
-	 * @property {String Number} duration 图片加载成功时，淡入淡出时间，单位ms（默认）
-	 * @property {String} effect 图片加载成功时，淡入淡出的css动画效果（默认ease-in-out）
-	 * @property {Boolean} is-effect 图片加载成功时，是否启用淡入淡出效果（默认true）
-	 * @property {String Number} border-radius 图片圆角值，单位rpx（默认0）
-	 * @property {String Number} height 图片高度，注意：实际高度可能受img-mode参数影响（默认450）
-	 * @property {String Number} mg-mode 图片的裁剪模式，详见image组件裁剪模式（默认widthFix）
-	 * @event {Function} click 点击图片时触发
-	 * @event {Function} load 图片加载成功时触发
-	 * @event {Function} error 图片加载失败时触发
-	 * @example <u-lazy-load :image="image" :loading-img="loadingImg" :error-img="errorImg"></u-lazy-load>
-	 */
-	export default {
-		name: 'u-lazy-load',
-		props: {
-			index: {
-				type: [Number, String]
-			},
-			// 要显示的图片
-			image: {
-				type: String,
-				default: ''
-			},
-			// 图片裁剪模式
-			imgMode: {
-				type: String,
-				default: 'widthFix'
-			},
-			// 占位图片路径
-			loadingImg: {
-				type: String,
-				default: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAZAAAAGQCAMAAAC3Ycb+AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoV2luZG93cykiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6OUM0QjNBQjkyQUQ2MTFFQTlCNUQ4RTIzNDE5RUIxNjciIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6OUM0QjNBQkEyQUQ2MTFFQTlCNUQ4RTIzNDE5RUIxNjciPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDo5QzRCM0FCNzJBRDYxMUVBOUI1RDhFMjM0MTlFQjE2NyIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDo5QzRCM0FCODJBRDYxMUVBOUI1RDhFMjM0MTlFQjE2NyIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PtRHfPcAAAAzUExURZWVldfX18PDw62trZubm9zc3Li4uKGhoebm5tLS0uHh4c3Nzaenp729vcjIyLKysuvr6141L40AAAcXSURBVHja7NzZlqpGAEBR5lG0//9rIw7IJKJi4or7PGTdtN10wr5SVAEGf/qqArsAiIAAERAgAgJEQIAIiIAAERAgAgJEQIAIiIAAERAgAgJEQIAIiIAAERAgAgJEQIAIiIAAERAgAgJEQIAIiIAAERAgAgJEQIAIiIAAERAgAgJEQIAIiIAAERAgAgJEQIAIiIAAERAgAgJEQIAIiIAAERAgAgJEQIAICBABERAgAgJEQIAICBABERAgAgJEQIAICBABERAgAgJEQIAICBABERAgAgJEQIAICBABERAgAgJEQIAICBABERAgAgJEQIAICBABERAgAgJEQIAICBABERAgAgJEQIAICBABERAg+nmQFMi5Jis+sIniED23jSzIgLTtg2D//iYme/8QBM/9lQ+CAEhbNLM3N9hEHAThX7GPCiBfAxK1b51kD+R7QMLjXg7iCsgWIPUh7pfVozG791oeBPngm48G583uW5GkBvI+SBaM2xXDn1oqum423bX/mgF5FySc2cv93Voug9TdZotsggnkBZB2NzbhrSY5HnoG07jei8dvzsJB/c3W60SALILE46+WCztsbhPR7R2VJq0ukEcT49nyy8QhaKcRa3fYHZD4+ufqOJAcgDz8/59vtw1I3QP5K6JsOG0vm3hce4I8LQp/BaRZGJC3AAn7IKOKXbC+7EdA5vdmmVwOLksgRThqOqiH4XEGsht+peoPUE8U/jJIO5OLH4GEwUslV5G0PTBG5Uiw/Y2jyigO3l9HAHKv9PYb82LloH74dZBoBUgar+l48NsNvtD0fkez9iwrAvIYZDRCl+Xs149Hm/KZmQ+QjUCiO1ei4ru7EsgnQYrkznlQb7thCuRfAzlOAPN72427P4VA/i2Q/DKT/Ls/VR8fvIBsDZIuz7TPF6TCbnk4GJkB2RokejTjuE7/unlgCuSTIO0Cy+Plp6vDfnQlBchy8QtjSHVd3EgmK1bHLm+H6+nXYbz2DuQRSPnqoL7vvq0u70on4zvxgCyWD3b9UyDVdW24PaWaiGTnFZJwPIQAebDpIKheBIm7n124ZthMJipAlkqHO+IZkP1tbfzOJark/A7MgKyvvl60fRqkvXfhuow+t9+q00+0/yyBrK8ZngOtBzldhw2X9tvpNGty0gvkmbPeJ0Cy/r09s/stbmfo0yMWkEdjevgKyOn2t2pxv7UXoibTdCDLje9/Ww1ymqzn87dbp92242ZmMRjI8hASvwKSLq4udqN6ksw8nxXN3tszD9L8Gkg+2mFrQYql5az4tvFj5xOx4VwnSdeBtGdyPwUytxK77pBVlNHdO7OK3rh/eTPUvdutT3fO52tuHMqD4N7llv8pyOQQ//w19YVDfX27+Sfuby9/6nau4pdA8vEdOZuChEH/quHt0Jg+IRJ/5+PrHwKZXfjbDiS73Zo7mu5UkzX7uTsXe0e/7nC3ePf1O69+BUg2XDfZCqSqOu7rGVf8cHBe8zhC2b61dtUHXv0OkGo6ZL4JkpbRYXdUaFevivx2M/1GIOctNh949TtAoumQ+TpIHMX54CJu+8BDd8FkE5BqcZh/59XvAClmTvKfB0nDqIlHo3T70SftyW1eX9dXtgQJqs1f/Q6QaOa/7wmQKtxH8eiGoCRuovODIO3VxOMmruZbHrLyD7z6DSDtGyT7ew1kf9hNn07c986JTovzzem0Id9wUG+Vk/IDr34DSNR7huZJkMFT6vEhqrPx/j5cnlZML8N6/PAzh9Y99Flm5Yde/c9BquDOkvkKkMP58dA4qi9vivE8JOvGz/j8FokfPpr288+pH2ZPOZrLmeGD+7KOh6dqYWJ48ki7yUg0tz0go/fv/LLddfV3sgOLJyaGPY/zrSlh1a36Arkzoue9CyG35ze6E6/dzO2Ga0EGHqdRJIkfn9/8OEjTW8Vq91ZWh39FeehWA7Nu9ft8CpUEk1WWOyDF0OPyEU2Pnzf/bZC0P6IPzmAvu7KauQBVrgKpJ0tG2arHzX8e5Pb3PezNs/PrX+3JMyCLn9XXf37tPFHvt09WfCDDjx+yyn1/p1V11j7GnB/q3leLuVva79S/tzed+db08YpF4uOZtmz/9oXWMq6BCAgQAQEiIEAERECACAgQAQEiIEAERECACAgQAQEiIEAERECACAgQAQEiIEAERECACAgQAQEiIEAERECACAgQAQEiIEAERECACAgQAQEiIEAERECACAgQAQEiIEAERECACAgQAQEiIEAERECACAgQAQEiIEAEBIiACAgQAQEiIEAEBIiACAgQAQEiIEAEBIiACAgQAQEiIEAEBIiACAgQAQEiIEAEBIiACAgQAQEiIEAEBIiACAgQAQEiIEAEBIiACAgQAQEiIEAEBIiACAgQAQEiIEAEBIiACAgQAQEiIEAEBIiAALELvqt/BBgACqVeUBXxcCkAAAAASUVORK5CYII='
-			},
-			// 加载失败的错误占位图
-			errorImg: {
-				type: String,
-				default: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAZAAAAGQCAMAAAC3Ycb+AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoV2luZG93cykiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6ODdDMjhENDYyQUQ2MTFFQTlDQ0VBODgxQjFFOEEyMEMiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6ODdDMjhENDcyQUQ2MTFFQTlDQ0VBODgxQjFFOEEyMEMiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDo4N0MyOEQ0NDJBRDYxMUVBOUNDRUE4ODFCMUU4QTIwQyIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDo4N0MyOEQ0NTJBRDYxMUVBOUNDRUE4ODFCMUU4QTIwQyIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PhLwhikAAAAzUExURZWVldfX162t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'
-			},
-			// 图片进入可见区域前多少像素时，单位rpx，开始加载图片
-			// 负数为图片超出屏幕底部多少距离后触发懒加载，正数为图片顶部距离屏幕底部多少距离时触发(图片还没出现在屏幕上)
-			threshold: {
-				type: [Number, String],
-				default: 100
-			},
-			// 淡入淡出动画的过渡时间
-			duration: {
-				type: [Number, String],
-				default: 500
-			},
-			// 渡效果的速度曲线，各个之间差别不大，因为这是淡入淡出，且时间很短，不是那些变形或者移动的情况，会明显
-			// linear|ease|ease-in|ease-out|ease-in-out|cubic-bezier(n,n,n,n);
-			effect: {
-				type: String,
-				default: 'ease-in-out'
-			},
-			// 是否使用过渡效果
-			isEffect: {
-				type: Boolean,
-				default: true
-			},
-			// 圆角值
-			borderRadius: {
-				type: [Number, String],
-				default: 0
-			},
-			// 图片高度，单位rpx
-			height: {
-				type: [Number, String],
-				default: '450'
-			}
-		},
-		data() {
-			return {
-				isShow: false,
-				opacity: 1,
-				time: this.duration,
-				loadStatus: '', // 默认是懒加载中的状态
-				isError: false, // 图片加载失败
-				elIndex: this.$u.guid()
-			}
-		},
-		computed: {
-			// 将threshold从rpx转为px
-			getThreshold() {
-				// 先取绝对值，因为threshold可能是负数，最后根据this.threshold是正数或者负数，重新还原
-				let thresholdPx = uni.upx2px(Math.abs(this.threshold));
-				return this.threshold < 0 ? -thresholdPx : thresholdPx;
-			},
-			// 计算图片的高度，可能为auto，带%，或者直接数值
-			imgHeight() {
-				return this.$u.addUnit(this.height);
-			}
-		},
-		created() {
-			// 由于一些特殊原因，不能将此变量放到data中定义
-			this.observer = {};
-		},
-		watch: {
-			isShow(nVal) {
-				// 如果是不开启过渡效果，直接返回
-				if (!this.isEffect) return;
-				this.time = 0;
-				// 原来opacity为1(不透明，是为了显示占位图)，改成0(透明，意味着该元素显示的是背景颜色，默认的白色)，再改成1，是为了获得过渡效果
-				this.opacity = 0;
-				// 延时30ms，否则在浏览器H5，过渡效果无效
-				setTimeout(() => {
-					this.time = this.duration;
-					this.opacity = 1;
-				}, 30)
-			},
-			// 图片路径发生变化时，需要重新标记一些变量，否则会一直卡在某一个状态，比如isError
-			image(n) {
-				if(!n) {
-					// 如果传入null或者''，或者undefined，标记为错误状态
-					this.isError = true;
-				} else {
-					this.init();
-					this.isError = false;
-				}
-			}
-		},
-		methods: {
-			// 用于重新初始化
-			init() {
-				this.isError = false;
-				this.loadStatus = '';
-			},
-			// 点击图片触发的事件,loadlazy-还是懒加载中状态，loading-图片正在加载，loaded-图片加加载完成
-			clickImg() {
-				let whichImg = '';
-				// 如果isShow为false，意味着图片还没开始加载，点击的只能是最开始的占位图
-				if (this.isShow == false) whichImg = 'lazyImg';
-				// 如果isError为true，意味着图片加载失败，这是只剩下错误的占位图，所以点击的只能是错误占位图
-				// 当然，也可以给错误的占位图元素绑定点击事件，看你喜欢~
-				else if (this.isError == true) whichImg = 'errorImg';
-				// 总共三张图片，除了两个占位图，剩下的只能是正常的那张图片了
-				else whichImg = 'realImg';
-				// 只通知当前图片的index
-				this.$emit('click', this.index);
-			},
-			// 图片加载完成事件，可能是加载占位图时触发，也可能是加载真正的图片完成时触发，通过isShow区分
-			imgLoaded() {
-				// 占位图加载完成
-				if (this.loadStatus == '') {
-					this.loadStatus = 'lazyed';
-				}
-				// 真正的图片加载完成 
-				else if (this.loadStatus == 'lazyed') {
-					this.loadStatus = 'loaded';
-					this.$emit('load', this.index);
-				}
-			},
-			// 错误的图片加载完成
-			errorImgLoaded() {
-				this.$emit('error', this.index);
-			},
-			// 图片加载失败
-			loadError() {
-				this.isError = true;
-			},
-			disconnectObserver(observerName) {
-				const observer = this[observerName];
-				observer && observer.disconnect();
-			},
-		},
-		beforeDestroy() {
-			// 销毁页面时，可能还没触发某张很底部的懒加载图片，所以把这个事件给去掉
-			//observer.disconnect();
-		},
-		mounted() {
-			// 此uOnReachBottom事件由mixin.js发出，目的是让页面到底时，保证所有图片都进行加载，做到绝对稳定且可靠
-			this.$nextTick(() => {
-				uni.$once('uOnReachBottom', () => {
-					if (!this.isShow) this.isShow = true;
-				});
-			})
-			// mounted的时候，不一定挂载了这个元素，延时30ms，否则会报错或者不报错，但是也没有效果
-			setTimeout(() => {
-				// 这里是组件内获取布局状态，不能用uni.createIntersectionObserver，而必须用this.createIntersectionObserver
-				this.disconnectObserver('contentObserver');
-				const contentObserver = uni.createIntersectionObserver(this);
-				// 要理解这里怎么计算的，请看这个：
-				// https://blog.csdn.net/qq_25324335/article/details/83687695
-				contentObserver.relativeToViewport({
-					bottom: this.getThreshold,
-				}).observe('.u-lazy-item-' + this.elIndex, (res) => {
-					if (res.intersectionRatio > 0) {
-						// 懒加载状态改变
-						this.isShow = true;
-						// 如果图片已经加载，去掉监听，减少性能的消耗
-						this.disconnectObserver('contentObserver');
-					}
-				})
-				this.contentObserver = contentObserver;
-			}, 30)
-		}
-	}
-</script>
-
-<style scoped lang="scss">
-	@import "../../libs/css/style.components.scss";
-	
-	.u-wrap {
-		background-color: #eee;
-		overflow: hidden;
-	}
-
-	.u-lazy-item {
-		width: 100%;
-		// 骗系统开启硬件加速
-		transform: transition3d(0, 0, 0);
-		// 防止图片加载“闪一下”
-		will-change: transform;
-		/* #ifndef APP-NVUE */
-		display: block;
-		/* #endif */
-	}
-</style>
diff --git a/uview-ui/components/u-link/u-link.vue b/uview-ui/components/u-link/u-link.vue
deleted file mode 100644
index 2dd2a735..00000000
--- a/uview-ui/components/u-link/u-link.vue
+++ /dev/null
@@ -1,89 +0,0 @@
-<template>
-	<text class="u-link" @tap.stop="openLink" :style="{
-		color: color,
-		fontSize: fontSize + 'rpx',
-		borderBottom: underLine ? `1px solid ${lineColor ? lineColor : color}` : 'none',
-		paddingBottom: underLine ? '0rpx' : '0'
-	}">
-		<slot></slot>
-	</text>
-</template>
-
-<script>
-	/**
-	 * link 超链接
-	 * @description 该组件为超链接组件，在不同平台有不同表现形式：在APP平台会通过plus环境打开内置浏览器，在小程序中把链接复制到粘贴板，同时提示信息，在H5中通过window.open打开链接。
-	 * @tutorial https://www.uviewui.com/components/link.html
-	 * @property {String} color 文字颜色（默认#606266）
-	 * @property {String Number} font-size 字体大小，单位rpx（默认28）
-	 * @property {Boolean} under-line 是否显示下划线（默认false）
-	 * @property {String} href 跳转的链接，要带上http(s)
-	 * @property {String} line-color 下划线颜色，默认同color参数颜色 
-	 * @property {String} mp-tips 各个小程序平台把链接复制到粘贴板后的提示语（默认“链接已复制，请在浏览器打开”）
-	 * @example <u-link href="http://www.uviewui.com">蜀道难，难于上青天</u-link>
-	 */
-	export default {
-		name: "u-link",
-		props: {
-			// 文字颜色
-			color: {
-				type: String,
-				default: '#2979ff'
-			},
-			// 字体大小，单位rpx
-			fontSize: {
-				type: [String, Number],
-				default: 28
-			},
-			// 是否显示下划线
-			underLine: {
-				type: Boolean,
-				default: false
-			},
-			// 要跳转的链接
-			href: {
-				type: String,
-				default: ''
-			},
-			// 小程序中复制到粘贴板的提示语
-			mpTips: {
-				type: String,
-				default: '链接已复制，请在浏览器打开'
-			},
-			// 下划线颜色
-			lineColor: {
-				type: String,
-				default: ''
-			}
-		},
-		methods: {
-			openLink() {
-				// #ifdef APP-PLUS
-				plus.runtime.openURL(this.href)
-				// #endif
-				// #ifdef H5
-				window.open(this.href)
-				// #endif
-				// #ifdef MP
-				uni.setClipboardData({
-					data: this.href,
-					success: () => {
-						uni.hideToast();
-						this.$nextTick(() => {
-							this.$u.toast(this.mpTips);
-						})
-					}
-				});
-				// #endif
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	@import "../../libs/css/style.components.scss";
-	
-	.u-link {
-		line-height: 1;
-	}
-</style>
diff --git a/uview-ui/components/u-loading-page/u-loading-page.vue b/uview-ui/components/u-loading-page/u-loading-page.vue
deleted file mode 100644
index 7e044013..00000000
--- a/uview-ui/components/u-loading-page/u-loading-page.vue
+++ /dev/null
@@ -1,25 +0,0 @@
-<template>
-	<view class="u-loading-page">
-		
-	</view>
-</template>
-
-<script>
-	export default {
-		props: {
-			
-		},
-		data() {
-			return {
-				
-			}
-		},
-		methods: {
-			
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	
-</style>
diff --git a/uview-ui/components/u-loading/u-loading.vue b/uview-ui/components/u-loading/u-loading.vue
deleted file mode 100644
index c747f643..00000000
--- a/uview-ui/components/u-loading/u-loading.vue
+++ /dev/null
@@ -1,103 +0,0 @@
-<template>
-	<view v-if="show" class="u-loading" :class="mode == 'circle' ? 'u-loading-circle' : 'u-loading-flower'" :style="[cricleStyle]">
-	</view>
-</template>
-
-<script>
-	/**
-	 * loading 加载动画
-	 * @description 警此组件为一个小动画，目前用在uView的loadmore加载更多和switch开关等组件的正在加载状态场景。
-	 * @tutorial https://www.uviewui.com/components/loading.html
-	 * @property {String} mode 模式选择，见官网说明（默认circle）
-	 * @property {String} color 动画活动区域的颜色，只对 mode = flower 模式有效（默认#c7c7c7）
-	 * @property {String Number} size 加载图标的大小，单位rpx（默认34）
-	 * @property {Boolean} show 是否显示动画（默认true）
-	 * @example <u-loading mode="circle"></u-loading>
-	 */
-	export default {
-		name: "u-loading",
-		props: {
-			// 动画的类型
-			mode: {
-				type: String,
-				default: 'circle'
-			},
-			// 动画的颜色
-			color: {
-				type: String,
-				default: '#c7c7c7'
-			},
-			// 加载图标的大小，单位rpx
-			size: {
-				type: [String, Number],
-				default: '34'
-			},
-			// 是否显示动画
-			show: {
-				type: Boolean,
-				default: true
-			}
-		},
-		computed: {
-			// 加载中圆圈动画的样式
-			cricleStyle() {
-				let style = {};
-				style.width = this.size + 'rpx';
-				style.height = this.size + 'rpx';
-				if (this.mode == 'circle') style.borderColor = `#e4e4e4 #e4e4e4 #e4e4e4 ${this.color ? this.color : '#c7c7c7'}`;
-				return style;
-			},
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	@import "../../libs/css/style.components.scss";
-	
-	.u-loading-circle {
-		/* #ifndef APP-NVUE */
-		display: inline-flex;
-		/* #endif */
-		vertical-align: middle;
-		width: 28rpx;
-		height: 28rpx;
-		background: 0 0;
-		border-radius: 50%;
-		border: 2px solid;
-		border-color: #e5e5e5 #e5e5e5 #e5e5e5 #8f8d8e;
-		animation: u-circle 1s linear infinite;
-	}
-
-	.u-loading-flower {
-		width: 20px;
-		height: 20px;
-		display: inline-block;
-		vertical-align: middle;
-		-webkit-animation: a 1s steps(12) infinite;
-		animation: u-flower 1s steps(12) infinite;
-		background: transparent url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMjAiIGhlaWdodD0iMTIwIiB2aWV3Qm94PSIwIDAgMTAwIDEwMCI+PHBhdGggZmlsbD0ibm9uZSIgZD0iTTAgMGgxMDB2MTAwSDB6Ii8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjRTlFOUU5IiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDAgLTMwKSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iIzk4OTY5NyIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgzMCAxMDUuOTggNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjOUI5OTlBIiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKDYwIDc1Ljk4IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0EzQTFBMiIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSg5MCA2NSA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNBQkE5QUEiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoMTIwIDU4LjY2IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0IyQjJCMiIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgxNTAgNTQuMDIgNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjQkFCOEI5IiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKDE4MCA1MCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNDMkMwQzEiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTE1MCA0NS45OCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNDQkNCQ0IiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTEyMCA0MS4zNCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNEMkQyRDIiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTkwIDM1IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0RBREFEQSIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgtNjAgMjQuMDIgNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjRTJFMkUyIiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKC0zMCAtNS45OCA2NSkiLz48L3N2Zz4=) no-repeat;
-		background-size: 100%;
-	}
-
-	@keyframes u-flower {
-		0% {
-			-webkit-transform: rotate(0deg);
-			transform: rotate(0deg);
-		}
-
-		to {
-			-webkit-transform: rotate(1turn);
-			transform: rotate(1turn);
-		}
-	}
-
-	@-webkit-keyframes u-circle {
-		0% {
-			transform: rotate(0);
-		}
-
-		100% {
-			transform: rotate(360deg);
-		}
-	}
-</style>
diff --git a/uview-ui/components/u-loadmore/u-loadmore.vue b/uview-ui/components/u-loadmore/u-loadmore.vue
index ec312b3c..8d094423 100644
--- a/uview-ui/components/u-loadmore/u-loadmore.vue
+++ b/uview-ui/components/u-loadmore/u-loadmore.vue
@@ -158,13 +158,6 @@ export default {
 <style scoped lang="scss">
 @import '../../libs/css/style.components.scss';
 
-/* #ifdef MP */
-// 在mp.scss中，赋予了u-line为flex: 1，这里需要一个明确的长度，所以重置掉它
-// 在组件内部，把组件名(u-line)当做选择器，在微信开发工具会提示不合法，但不影响使用
-u-line {
-	flex: none;
-}
-/* #endif */
 
 .u-line {
 	vertical-align: middle;
diff --git a/uview-ui/components/u-message-input/u-message-input.vue b/uview-ui/components/u-message-input/u-message-input.vue
deleted file mode 100644
index 41e07193..00000000
--- a/uview-ui/components/u-message-input/u-message-input.vue
+++ /dev/null
@@ -1,311 +0,0 @@
-<template>
-	<view class="u-char-box">
-		<view class="u-char-flex">
-			<input :disabled="disabledKeyboard" :value="valueModel" type="number" :focus="focus" :maxlength="maxlength" class="u-input" @input="getVal"/>
-			<view v-for="(item, index) in loopCharArr" :key="index">
-				<view :class="[breathe && charArrLength == index ? 'u-breathe' : '', 'u-char-item',
-				charArrLength === index && mode == 'box' ? 'u-box-active' : '',
-				mode === 'box' ? 'u-box' : '']" :style="{
-					fontWeight: bold ? 'bold' : 'normal',
-					fontSize: fontSize + 'rpx',
-					width: width + 'rpx',
-					height: width + 'rpx',
-					color: inactiveColor,
-					borderColor: charArrLength === index && mode == 'box' ? activeColor : inactiveColor
-				}">
-					<view class="u-placeholder-line" :style="{
-							display: charArrLength === index ? 'block' : 'none',
-							height: width * 0.5 +'rpx'
-						}"
-						v-if="mode !== 'middleLine'"
-					></view>
-					<view v-if="mode === 'middleLine' && charArrLength <= index" :class="[breathe && charArrLength == index ? 'u-breathe' : '', charArrLength === index ? 'u-middle-line-active' : '']"
-					 class="u-middle-line" :style="{height: bold ? '4px' : '2px', background: charArrLength === index ? activeColor : inactiveColor}"></view>
-					<view v-if="mode === 'bottomLine'" :class="[breathe && charArrLength == index ? 'u-breathe' : '', charArrLength === index ? 'u-buttom-line-active' : '']"
-					 class="u-bottom-line" :style="{height: bold ? '4px' : '2px', background: charArrLength === index ? activeColor : inactiveColor}"></view>
-					<block v-if="!dotFill"> {{ charArr[index] ? charArr[index] : ''}}</block>
-					<block v-else>
-						<text class="u-dot">{{ charArr[index] ? '●' : ''}}</text>
-					</block>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	/**
-	 * messageInput 验证码输入框
-	 * @description 该组件一般用于验证用户短信验证码的场景，也可以结合uView的键盘组件使用
-	 * @tutorial https://www.uviewui.com/components/messageInput.html
-	 * @property {String Number} maxlength 输入字符个数（默认4）
-	 * @property {Boolean} dot-fill 是否用圆点填充（默认false）
-	 * @property {String} mode 模式选择，见上方"基本使用"说明（默认box）
-	 * @property {String Number} value 预置值
-	 * @property {Boolean} breathe 是否开启呼吸效果，见上方说明（默认true）
-	 * @property {Boolean} focus 是否自动获取焦点（默认false）
-	 * @property {Boolean} bold 字体和输入横线是否加粗（默认true）
-	 * @property {String Number} font-size 字体大小，单位rpx（默认60）
-	 * @property {String} active-color 当前激活输入框的样式（默认#2979ff）
-	 * @property {String} inactive-color 非激活输入框的样式，文字颜色同此值（默认#606266）
-	 * @property {String | Number} width 输入框宽度，单位rpx，高等于宽（默认80）
-	 * @property {Boolean} disabled-keyboard 禁止点击输入框唤起系统键盘（默认false）
-	 * @event {Function} change 输入内容发生改变时触发，具体见官网说明
-	 * @event {Function} finish 输入字符个数达maxlength值时触发，见官网说明
-	 * @example <u-message-input mode="bottomLine"></u-message-input>
-	 */
-	export default {
-		name: "u-message-input",
-		props: {
-			// 最大输入长度
-			maxlength: {
-				type: [Number, String],
-				default: 4
-			},
-			// 是否用圆点填充
-			dotFill: {
-				type: Boolean,
-				default: false
-			},
-			// 显示模式，box-盒子模式，bottomLine-横线在底部模式，middleLine-横线在中部模式
-			mode: {
-				type: String,
-				default: "box"
-			},
-			// 预置值
-			value: {
-				type: [String, Number],
-				default: ''
-			},
-			// 当前激活输入item，是否带有呼吸效果
-			breathe: {
-				type: Boolean,
-				default: true
-			},
-			// 是否自动获取焦点
-			focus: {
-				type: Boolean,
-				default: false
-			},
-			// 字体是否加粗
-			bold: {
-				type: Boolean,
-				default: false
-			},
-			// 字体大小
-			fontSize: {
-				type: [String, Number],
-				default: 60
-			},
-			// 激活样式
-			activeColor: {
-				type: String,
-				default: '#2979ff'
-			},
-			// 未激活的样式
-			inactiveColor: {
-				type: String,
-				default: '#606266'
-			},
-			// 输入框的大小，单位rpx，宽等于高
-			width: {
-				type: [Number, String],
-				default: '80'
-			},
-			// 是否隐藏原生键盘，如果想用自定义键盘的话，需设置此参数为true
-			disabledKeyboard: {
-				type: Boolean,
-				default: false
-			}
-		},
-		watch: {
-			// maxlength: {
-			// 	// 此值设置为true，会在组件加载后无需maxlength变化就会执行一次本监听函数，无需再created生命周期中处理
-			// 	immediate: true,
-			// 	handler(val) {
-			// 		this.maxlength = Number(val);
-			// 	}
-			// }, 
-			value: {
-				immediate: true,
-				handler(val) {
-					// 转为字符串
-					val = String(val);
-					// 超出部分截掉
-					this.valueModel = val.substring(0, this.maxlength);
-				}
-			},
-		},
-		data() {
-			return {
-				valueModel: ""
-			}
-		},
-		computed: {
-			// 是否显示呼吸灯效果
-			animationClass() {
-				return (index) => {
-					if (this.breathe && this.charArr.length == index) return 'u-breathe';
-					else return '';
-				}
-			},
-			// 用于显示字符
-			charArr() {
-				return this.valueModel.split('');
-			},
-			charArrLength() {
-				return this.charArr.length;
-			},
-			// 根据长度，循环输入框的个数，因为头条小程序数值不能用于v-for
-			loopCharArr() {
-				return new Array(this.maxlength);
-			}
-		},
-		methods: {
-			getVal(e) {
-				let {
-					value
-				} = e.detail
-				this.valueModel = value;
-				// 判断长度是否超出了maxlength值，理论上不会发生，因为input组件设置了maxlength属性值
-				if (String(value).length > this.maxlength) return;
-				// 未达到maxlength之前，发送change事件，达到后发送finish事件
-				this.$emit('change', value);
-				if (String(value).length == this.maxlength) {
-					this.$emit('finish', value);
-				}
-			}
-		}
-	}
-</script>
-
-<style scoped lang="scss">
-	@import "../../libs/css/style.components.scss";
-
-	@keyframes breathe {
-		0% {
-			opacity: 0.3;
-		}
-
-		50% {
-			opacity: 1;
-		}
-
-		100% {
-			opacity: 0.3;
-		}
-	}
-
-	.u-char-box {
-		text-align: center;
-	}
-
-	.u-char-flex {
-		@include vue-flex;
-		justify-content: center;
-		flex-wrap: wrap;
-		position: relative;
-	}
-
-	.u-input {
-		position: absolute;
-		top: 0;
-		left: -100%;
-		width: 200%;
-		height: 100%;
-		text-align: left;
-		z-index: 9;
-		opacity: 0;
-		background: none;
-	}
-
-	.u-char-item {
-		position: relative;
-		width: 90rpx;
-		height: 90rpx;
-		margin: 10rpx 10rpx;
-		font-size: 60rpx;
-		font-weight: bold;
-		color: $u-main-color;
-		line-height: 90rpx;
-		@include vue-flex;
-		justify-content: center;
-		align-items: center;
-	}
-
-	.u-middle-line {
-		border: none;
-	}
-
-	.u-box {
-		box-sizing: border-box;
-		border: 2rpx solid #cccccc;
-		border-radius: 6rpx;
-	}
-
-	.u-box-active {
-		overflow: hidden;
-		animation-timing-function: ease-in-out;
-		animation-duration: 1500ms;
-		animation-iteration-count: infinite;
-		animation-direction: alternate;
-		border: 2rpx solid $u-type-primary;
-	}
-
-	.u-middle-line-active {
-		background: $u-type-primary;
-	}
-
-	.u-breathe {
-		animation: breathe 2s infinite ease;
-	}
-
-	.u-placeholder-line {
-		/* #ifndef APP-NVUE */
-		display: none;
-		/* #endif */
-		position: absolute;
-		left: 50%;
-		top: 50%;
-		transform: translate(-50%, -50%);
-		width: 2rpx;
-		height: 40rpx;
-		background: #333333;
-		animation: twinkling 1.5s infinite ease;
-	}
-
-	.u-animation-breathe {
-		animation-name: breathe;
-	}
-
-	.u-dot {
-		font-size: 34rpx;
-		line-height: 34rpx;
-	}
-
-	.u-middle-line {
-		height: 4px;
-		background: #000000;
-		width: 80%;
-		position: absolute;
-		border-radius: 2px;
-		top: 50%;
-		left: 50%;
-		transform: translate(-50%, -50%);
-	}
-
-	.u-buttom-line-active {
-		background: $u-type-primary;
-	}
-
-	.u-bottom-line {
-		height: 4px;
-		background: #000000;
-		width: 80%;
-		position: absolute;
-		border-radius: 2px;
-		bottom: 0;
-		left: 50%;
-		transform: translate(-50%);
-	}
-</style>
diff --git a/uview-ui/components/u-modal/u-modal.vue b/uview-ui/components/u-modal/u-modal.vue
index ce581133..df618524 100644
--- a/uview-ui/components/u-modal/u-modal.vue
+++ b/uview-ui/components/u-modal/u-modal.vue
@@ -1,29 +1,37 @@
 <template>
 	<view>
-		<u-popup :zoom="zoom" mode="center" :popup="false" :z-index="uZIndex" v-model="value" :length="width"
-		 :mask-close-able="maskCloseAble" :border-radius="borderRadius" @close="popupClose" :negative-top="negativeTop">
+		<u-popup
+			:zoom="zoom"
+			mode="center"
+			:popup="false"
+			:z-index="uZIndex"
+			v-model="value"
+			:length="width"
+			:mask-close-able="maskCloseAble"
+			:border-radius="borderRadius"
+			@close="popupClose"
+			:negative-top="negativeTop"
+		>
 			<view class="u-model">
 				<view v-if="showTitle" class="u-model__title u-line-1" :style="[titleStyle]">{{ title }}</view>
 				<view class="u-model__content">
-					<view :style="[contentStyle]" v-if="$slots.default  || $slots.$default">
-						<slot />
-					</view>
+					<view :style="[contentStyle]" v-if="$slots.default || $slots.$default"><slot /></view>
 					<view v-else class="u-model__content__message" :style="[contentStyle]">{{ content }}</view>
 				</view>
 				<view class="u-model__footer u-border-top" v-if="showCancelButton || showConfirmButton">
-					<view v-if="showCancelButton" :hover-stay-time="100" hover-class="u-model__btn--hover" class="u-model__footer__button"
-					 :style="[cancelBtnStyle]" @tap="cancel">
-						{{cancelText}}
+					<view v-if="showCancelButton" :hover-stay-time="100" hover-class="u-model__btn--hover" class="u-model__footer__button" :style="[cancelBtnStyle]" @tap="cancel">
+						{{ cancelText }}
 					</view>
-					<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">
+					<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"
+					>
 						<slot v-if="$slots['confirm-button']" name="confirm-button"></slot>
-						<block v-else>
-							<u-loading mode="circle" :color="confirmColor" v-if="loading"></u-loading>
-							<block v-else>
-								{{confirmText}}
-							</block>
-						</block>
+						<block v-else>{{ confirmText }}</block>
 					</view>
 				</view>
 			</view>
@@ -32,252 +40,258 @@
 </template>
 
 <script>
-	/**
-	 * modal 模态框
-	 * @description 弹出模态框，常用于消息提示、消息确认、在当前页面内完成特定的交互操作
-	 * @tutorial https://www.uviewui.com/components/modal.html
-	 * @property {Boolean} value 是否显示模态框
-	 * @property {String | Number} z-index 层级
-	 * @property {String} title 模态框标题（默认"提示"）
-	 * @property {String | Number} width 模态框宽度（默认600）
-	 * @property {String} content 模态框内容（默认"内容"）
-	 * @property {Boolean} show-title 是否显示标题（默认true）
-	 * @property {Boolean} async-close 是否异步关闭，只对确定按钮有效（默认false）
-	 * @property {Boolean} show-confirm-button 是否显示确认按钮（默认true）
-	 * @property {Stringr | Number} negative-top modal往上偏移的值
-	 * @property {Boolean} show-cancel-button 是否显示取消按钮（默认false）
-	 * @property {Boolean} mask-close-able 是否允许点击遮罩关闭modal（默认false）
-	 * @property {String} confirm-text 确认按钮的文字内容（默认"确认"）
-	 * @property {String} cancel-text 取消按钮的文字内容（默认"取消"）
-	 * @property {String} cancel-color 取消按钮的颜色（默认"#606266"）
-	 * @property {String} confirm-color 确认按钮的文字内容（默认"#2979ff"）
-	 * @property {String | Number} border-radius 模态框圆角值，单位rpx（默认16）
-	 * @property {Object} title-style 自定义标题样式，对象形式
-	 * @property {Object} content-style 自定义内容样式，对象形式
-	 * @property {Object} cancel-style 自定义取消按钮样式，对象形式
-	 * @property {Object} confirm-style 自定义确认按钮样式，对象形式
-	 * @property {Boolean} zoom 是否开启缩放模式（默认true）
-	 * @event {Function} confirm 确认按钮被点击
-	 * @event {Function} cancel 取消按钮被点击
-	 * @example <u-modal :src="title" :content="content"></u-modal>
-	 */
-	export default {
-		name: 'u-modal',
-		props: {
-			// 是否显示Modal
-			value: {
-				type: Boolean,
-				default: false
-			},
-			// 层级z-index
-			zIndex: {
-				type: [Number, String],
-				default: ''
-			},
-			// 标题
-			title: {
-				type: [String],
-				default: '提示'
-			},
-			// 弹窗宽度，可以是数值(rpx)，百分比，auto等
-			width: {
-				type: [Number, String],
-				default: 600
-			},
-			// 弹窗内容
-			content: {
-				type: String,
-				default: '内容'
-			},
-			// 是否显示标题
-			showTitle: {
-				type: Boolean,
-				default: true
-			},
-			// 是否显示确认按钮
-			showConfirmButton: {
-				type: Boolean,
-				default: true
-			},
-			// 是否显示取消按钮
-			showCancelButton: {
-				type: Boolean,
-				default: false
-			},
-			// 确认文案
-			confirmText: {
-				type: String,
-				default: '确认'
-			},
-			// 取消文案
-			cancelText: {
-				type: String,
-				default: '取消'
-			},
-			// 确认按钮颜色
-			confirmColor: {
-				type: String,
-				default: '#2979ff'
-			},
-			// 取消文字颜色
-			cancelColor: {
-				type: String,
-				default: '#606266'
-			},
-			// 圆角值
-			borderRadius: {
-				type: [Number, String],
-				default: 16
-			},
-			// 标题的样式
-			titleStyle: {
-				type: Object,
-				default () {
-					return {}
-				}
-			},
-			// 内容的样式
-			contentStyle: {
-				type: Object,
-				default () {
-					return {}
-				}
-			},
-			// 取消按钮的样式
-			cancelStyle: {
-				type: Object,
-				default () {
-					return {}
-				}
-			},
-			// 确定按钮的样式
-			confirmStyle: {
-				type: Object,
-				default () {
-					return {}
-				}
-			},
-			// 是否开启缩放效果
-			zoom: {
-				type: Boolean,
-				default: true
-			},
-			// 是否异步关闭，只对确定按钮有效
-			asyncClose: {
-				type: Boolean,
-				default: false
-			},
-			// 是否允许点击遮罩关闭modal
-			maskCloseAble: {
-				type: Boolean,
-				default: false
-			},
-			// 给一个负的margin-top，往上偏移，避免和键盘重合的情况
-			negativeTop: {
-				type: [String, Number],
-				default: 0
+/**
+ * modal 模态框
+ * @description 弹出模态框，常用于消息提示、消息确认、在当前页面内完成特定的交互操作
+ * @tutorial https://www.uviewui.com/components/modal.html
+ * @property {Boolean} value 是否显示模态框
+ * @property {String | Number} z-index 层级
+ * @property {String} title 模态框标题（默认"提示"）
+ * @property {String | Number} width 模态框宽度（默认600）
+ * @property {String} content 模态框内容（默认"内容"）
+ * @property {Boolean} show-title 是否显示标题（默认true）
+ * @property {Boolean} async-close 是否异步关闭，只对确定按钮有效（默认false）
+ * @property {Boolean} show-confirm-button 是否显示确认按钮（默认true）
+ * @property {Stringr | Number} negative-top modal往上偏移的值
+ * @property {Boolean} show-cancel-button 是否显示取消按钮（默认false）
+ * @property {Boolean} mask-close-able 是否允许点击遮罩关闭modal（默认false）
+ * @property {String} confirm-text 确认按钮的文字内容（默认"确认"）
+ * @property {String} cancel-text 取消按钮的文字内容（默认"取消"）
+ * @property {String} cancel-color 取消按钮的颜色（默认"#606266"）
+ * @property {String} confirm-color 确认按钮的文字内容（默认"#2979ff"）
+ * @property {String | Number} border-radius 模态框圆角值，单位rpx（默认16）
+ * @property {Object} title-style 自定义标题样式，对象形式
+ * @property {Object} content-style 自定义内容样式，对象形式
+ * @property {Object} cancel-style 自定义取消按钮样式，对象形式
+ * @property {Object} confirm-style 自定义确认按钮样式，对象形式
+ * @property {Boolean} zoom 是否开启缩放模式（默认true）
+ * @event {Function} confirm 确认按钮被点击
+ * @event {Function} cancel 取消按钮被点击
+ * @example <u-modal :src="title" :content="content"></u-modal>
+ */
+export default {
+	name: 'u-modal',
+	props: {
+		// 是否显示Modal
+		value: {
+			type: Boolean,
+			default: false
+		},
+		// 层级z-index
+		zIndex: {
+			type: [Number, String],
+			default: ''
+		},
+		// 标题
+		title: {
+			type: [String],
+			default: '提示'
+		},
+		// 弹窗宽度，可以是数值(rpx)，百分比，auto等
+		width: {
+			type: [Number, String],
+			default: 600
+		},
+		// 弹窗内容
+		content: {
+			type: String,
+			default: '内容'
+		},
+		// 是否显示标题
+		showTitle: {
+			type: Boolean,
+			default: true
+		},
+		// 是否显示确认按钮
+		showConfirmButton: {
+			type: Boolean,
+			default: true
+		},
+		// 是否显示取消按钮
+		showCancelButton: {
+			type: Boolean,
+			default: false
+		},
+		// 确认文案
+		confirmText: {
+			type: String,
+			default: '确认'
+		},
+		// 取消文案
+		cancelText: {
+			type: String,
+			default: '取消'
+		},
+		// 确认按钮颜色
+		confirmColor: {
+			type: String,
+			default: '#2979ff'
+		},
+		// 取消文字颜色
+		cancelColor: {
+			type: String,
+			default: '#606266'
+		},
+		// 圆角值
+		borderRadius: {
+			type: [Number, String],
+			default: 16
+		},
+		// 标题的样式
+		titleStyle: {
+			type: Object,
+			default() {
+				return {};
 			}
 		},
-		data() {
-			return {
-				loading: false, // 确认按钮是否正在加载中
+		// 内容的样式
+		contentStyle: {
+			type: Object,
+			default() {
+				return {};
 			}
 		},
-		computed: {
-			cancelBtnStyle() {
-				return Object.assign({
-					color: this.cancelColor
-				}, this.cancelStyle);
-			},
-			confirmBtnStyle() {
-				return Object.assign({
-					color: this.confirmColor
-				}, this.confirmStyle);
-			},
-			uZIndex() {
-				return this.zIndex ? this.zIndex : this.$u.zIndex.popup;
+		// 取消按钮的样式
+		cancelStyle: {
+			type: Object,
+			default() {
+				return {};
 			}
 		},
-		watch: {
-			// 如果是异步关闭时，外部修改v-model的值为false时，重置内部的loading状态
-			// 避免下次打开的时候，状态混乱
-			value(n) {
-				if (n === true) this.loading = false;
+		// 确定按钮的样式
+		confirmStyle: {
+			type: Object,
+			default() {
+				return {};
 			}
 		},
-		methods: {
-			confirm() {
-				// 异步关闭
-				if (this.asyncClose) {
-					this.loading = true;
-				} else {
-					this.$emit('input', false);
-				}
-				this.$emit('confirm');
-			},
-			cancel() {
-				this.$emit('cancel');
-				this.$emit('input', false);
-				// 目前popup弹窗关闭有一个延时操作，此处做一个延时
-				// 避免确认按钮文字变成了"确定"字样，modal还没消失，造成视觉不好的效果
-				setTimeout(() => {
-					this.loading = false;
-				}, 300);
-			},
-			// 点击遮罩关闭modal，设置v-model的值为false，否则无法第二次弹起modal
-			popupClose() {
+		// 是否开启缩放效果
+		zoom: {
+			type: Boolean,
+			default: true
+		},
+		// 是否异步关闭，只对确定按钮有效
+		asyncClose: {
+			type: Boolean,
+			default: false
+		},
+		// 是否允许点击遮罩关闭modal
+		maskCloseAble: {
+			type: Boolean,
+			default: false
+		},
+		// 给一个负的margin-top，往上偏移，避免和键盘重合的情况
+		negativeTop: {
+			type: [String, Number],
+			default: 0
+		}
+	},
+	data() {
+		return {
+			loading: false // 确认按钮是否正在加载中
+		};
+	},
+	computed: {
+		cancelBtnStyle() {
+			return Object.assign(
+				{
+					color: this.cancelColor
+				},
+				this.cancelStyle
+			);
+		},
+		confirmBtnStyle() {
+			return Object.assign(
+				{
+					color: this.confirmColor
+				},
+				this.confirmStyle
+			);
+		},
+		uZIndex() {
+			return this.zIndex ? this.zIndex : this.$u.zIndex.popup;
+		}
+	},
+	watch: {
+		// 如果是异步关闭时，外部修改v-model的值为false时，重置内部的loading状态
+		// 避免下次打开的时候，状态混乱
+		value(n) {
+			if (n === true) this.loading = false;
+		}
+	},
+	methods: {
+		confirm() {
+			// 异步关闭
+			if (this.asyncClose) {
+				this.loading = true;
+			} else {
 				this.$emit('input', false);
-			},
-			// 清除加载中的状态
-			clearLoading() {
-				this.loading = false;
 			}
+			this.$emit('confirm');
+		},
+		cancel() {
+			this.$emit('cancel');
+			this.$emit('input', false);
+			// 目前popup弹窗关闭有一个延时操作，此处做一个延时
+			// 避免确认按钮文字变成了"确定"字样，modal还没消失，造成视觉不好的效果
+			setTimeout(() => {
+				this.loading = false;
+			}, 300);
+		},
+		// 点击遮罩关闭modal，设置v-model的值为false，否则无法第二次弹起modal
+		popupClose() {
+			this.$emit('input', false);
+		},
+		// 清除加载中的状态
+		clearLoading() {
+			this.loading = false;
 		}
-	};
+	}
+};
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/style.components.scss";
+@import '../../libs/css/style.components.scss';
 
-	.u-model {
-		height: auto;
-		overflow: hidden;
-		font-size: 32rpx;
-		background-color: #fff;
+.u-model {
+	height: auto;
+	overflow: hidden;
+	font-size: 32rpx;
+	background-color: #fff;
 
-		&__btn--hover {
-			background-color: rgb(230, 230, 230);
-		}
+	&__btn--hover {
+		background-color: rgb(230, 230, 230);
+	}
 
-		&__title {
-			padding-top: 48rpx;
-			font-weight: 500;
-			text-align: center;
-			color: $u-main-color;
-		}
+	&__title {
+		padding-top: 48rpx;
+		font-weight: 500;
+		text-align: center;
+		color: $u-main-color;
+	}
 
-		&__content {
-			&__message {
-				padding: 48rpx;
-				font-size: 30rpx;
-				text-align: center;
-				color: $u-content-color;
-			}
+	&__content {
+		&__message {
+			padding: 48rpx;
+			font-size: 30rpx;
+			text-align: center;
+			color: $u-content-color;
 		}
+	}
 
-		&__footer {
-			@include vue-flex;
+	&__footer {
+		@include vue-flex;
 
-			&__button {
-				flex: 1;
-				height: 100rpx;
-				line-height: 100rpx;
-				font-size: 32rpx;
-				box-sizing: border-box;
-				cursor: pointer;
-				text-align: center;
-				border-radius: 4rpx;
-			}
+		&__button {
+			flex: 1;
+			height: 100rpx;
+			line-height: 100rpx;
+			font-size: 32rpx;
+			box-sizing: border-box;
+			cursor: pointer;
+			text-align: center;
+			border-radius: 4rpx;
 		}
 	}
+}
 </style>
diff --git a/uview-ui/components/u-navbar/u-navbar.vue b/uview-ui/components/u-navbar/u-navbar.vue
deleted file mode 100644
index 17812f80..00000000
--- a/uview-ui/components/u-navbar/u-navbar.vue
+++ /dev/null
@@ -1,309 +0,0 @@
-<template>
-	<view class="">
-		<view class="u-navbar" :style="[navbarStyle]" :class="{ 'u-navbar-fixed': isFixed, 'u-border-bottom': borderBottom }">
-			<view class="u-status-bar" :style="{ height: statusBarHeight + 'px' }"></view>
-			<view class="u-navbar-inner" :style="[navbarInnerStyle]">
-				<view class="u-back-wrap" v-if="isBack" @tap="goBack">
-					<view class="u-icon-wrap"><u-icon :name="backIconName" :color="backIconColor" :size="backIconSize"></u-icon></view>
-					<view class="u-icon-wrap u-back-text u-line-1" v-if="backText" :style="[backTextStyle]">{{ backText || '' }}</view>
-				</view>
-				<view class="u-navbar-content-title" v-if="title" :style="[titleStyle]">
-					<view
-						class="u-title u-line-1"
-						:style="{
-							color: titleColor,
-							fontSize: titleSize + 'rpx',
-							fontWeight: titleBold ? 'bold' : 'normal'
-						}"
-					>
-						{{ title }}
-					</view>
-				</view>
-				<view class="u-slot-content"><slot></slot></view>
-				<view class="u-slot-right"><slot name="right"></slot></view>
-			</view>
-		</view>
-		<!-- 解决fixed定位后导航栏塌陷的问题 -->
-		<view class="u-navbar-placeholder" v-if="isFixed && !immersive" :style="{ width: '100%', height: Number(navbarHeight) + statusBarHeight + 'px' }"></view>
-	</view>
-</template>
-
-<script>
-// 获取系统状态栏的高度
-let systemInfo = uni.getSystemInfoSync();
-let menuButtonInfo = {};
-// 如果是小程序，获取右上角胶囊的尺寸信息，避免导航栏右侧内容与胶囊重叠(支付宝小程序非本API，尚未兼容)
-// #ifdef MP-WEIXIN || MP-BAIDU || MP-TOUTIAO || MP-QQ
-menuButtonInfo = uni.getMenuButtonBoundingClientRect();
-// #endif
-/**
- * navbar 自定义导航栏
- * @description 此组件一般用于在特殊情况下，需要自定义导航栏的时候用到，一般建议使用uniapp自带的导航栏。
- * @tutorial https://www.uviewui.com/components/navbar.html
- * @property {String Number} height 导航栏高度(不包括状态栏高度在内，内部自动加上)，注意这里的单位是px（默认44）
- * @property {String} back-icon-color 左边返回图标的颜色（默认#606266）
- * @property {String} back-icon-name 左边返回图标的名称，只能为uView自带的图标（默认arrow-left）
- * @property {String Number} back-icon-size 左边返回图标的大小，单位rpx（默认30）
- * @property {String} back-text 返回图标右边的辅助提示文字
- * @property {Object} back-text-style 返回图标右边的辅助提示文字的样式，对象形式（默认{ color: '#606266' }）
- * @property {String} title 导航栏标题，如设置为空字符，将会隐藏标题占位区域
- * @property {String Number} title-width 导航栏标题的最大宽度，内容超出会以省略号隐藏，单位rpx（默认250）
- * @property {String} title-color 标题的颜色（默认#606266）
- * @property {String Number} title-size 导航栏标题字体大小，单位rpx（默认32）
- * @property {Function} custom-back 自定义返回逻辑方法
- * @property {String Number} z-index 固定在顶部时的z-index值（默认980）
- * @property {Boolean} is-back 是否显示导航栏左边返回图标和辅助文字（默认true）
- * @property {Object} background 导航栏背景设置，见官网说明（默认{ background: '#ffffff' }）
- * @property {Boolean} is-fixed 导航栏是否固定在顶部（默认true）
- * @property {Boolean} immersive 沉浸式，允许fixed定位后导航栏塌陷，仅fixed定位下生效（默认false）
- * @property {Boolean} border-bottom 导航栏底部是否显示下边框，如定义了较深的背景颜色，可取消此值（默认true）
- * @example <u-navbar back-text="返回" title="剑未配妥，出门已是江湖"></u-navbar>
- */
-export default {
-	name: 'u-navbar',
-	props: {
-		// 导航栏高度，单位px，非rpx
-		height: {
-			type: [String, Number],
-			default: ''
-		},
-		// 返回箭头的颜色
-		backIconColor: {
-			type: String,
-			default: '#606266'
-		},
-		// 左边返回的图标
-		backIconName: {
-			type: String,
-			default: 'nav-back'
-		},
-		// 左边返回图标的大小，rpx
-		backIconSize: {
-			type: [String, Number],
-			default: '44'
-		},
-		// 返回的文字提示
-		backText: {
-			type: String,
-			default: ''
-		},
-		// 返回的文字的 样式
-		backTextStyle: {
-			type: Object,
-			default() {
-				return {
-					color: '#606266'
-				};
-			}
-		},
-		// 导航栏标题
-		title: {
-			type: String,
-			default: ''
-		},
-		// 标题的宽度，如果需要自定义右侧内容，且右侧内容很多时，可能需要减少这个宽度，单位rpx
-		titleWidth: {
-			type: [String, Number],
-			default: '250'
-		},
-		// 标题的颜色
-		titleColor: {
-			type: String,
-			default: '#606266'
-		},
-		// 标题字体是否加粗
-		titleBold: {
-			type: Boolean,
-			default: false
-		},
-		// 标题的字体大小
-		titleSize: {
-			type: [String, Number],
-			default: 32
-		},
-		isBack: {
-			type: [Boolean, String],
-			default: true
-		},
-		// 对象形式，因为用户可能定义一个纯色，或者线性渐变的颜色
-		background: {
-			type: Object,
-			default() {
-				return {
-					background: '#ffffff'
-				};
-			}
-		},
-		// 导航栏是否固定在顶部
-		isFixed: {
-			type: Boolean,
-			default: true
-		},
-		// 是否沉浸式，允许fixed定位后导航栏塌陷，仅fixed定位下生效
-		immersive: {
-			type: Boolean,
-			default: false
-		},
-		// 是否显示导航栏的下边框
-		borderBottom: {
-			type: Boolean,
-			default: true
-		},
-		zIndex: {
-			type: [String, Number],
-			default: ''
-		},
-		// 自定义返回逻辑
-		customBack: {
-			type: Function,
-			default: null
-		}
-	},
-	data() {
-		return {
-			menuButtonInfo: menuButtonInfo,
-			statusBarHeight: systemInfo.statusBarHeight
-		};
-	},
-	computed: {
-		// 导航栏内部盒子的样式
-		navbarInnerStyle() {
-			let style = {};
-			// 导航栏宽度，如果在小程序下，导航栏宽度为胶囊的左边到屏幕左边的距离
-			style.height = this.navbarHeight + 'px';
-			// // 如果是各家小程序，导航栏内部的宽度需要减少右边胶囊的宽度
-			// #ifdef MP
-			let rightButtonWidth = systemInfo.windowWidth - menuButtonInfo.left;
-			style.marginRight = rightButtonWidth + 'px';
-			// #endif
-			return style;
-		},
-		// 整个导航栏的样式
-		navbarStyle() {
-			let style = {};
-			style.zIndex = this.zIndex ? this.zIndex : this.$u.zIndex.navbar;
-			// 合并用户传递的背景色对象
-			Object.assign(style, this.background);
-			return style;
-		},
-		// 导航中间的标题的样式
-		titleStyle() {
-			let style = {};
-			// #ifndef MP
-			style.left = (systemInfo.windowWidth - uni.upx2px(this.titleWidth)) / 2 + 'px';
-			style.right = (systemInfo.windowWidth - uni.upx2px(this.titleWidth)) / 2 + 'px';
-			// #endif
-			// #ifdef MP
-			// 此处是为了让标题显示区域即使在小程序有右侧胶囊的情况下也能处于屏幕的中间，是通过绝对定位实现的
-			let rightButtonWidth = systemInfo.windowWidth - menuButtonInfo.left;
-			style.left = (systemInfo.windowWidth - uni.upx2px(this.titleWidth)) / 2 + 'px';
-			style.right = rightButtonWidth - (systemInfo.windowWidth - uni.upx2px(this.titleWidth)) / 2 + rightButtonWidth + 'px';
-			// #endif
-			style.width = uni.upx2px(this.titleWidth) + 'px';
-			return style;
-		},
-		// 转换字符数值为真正的数值
-		navbarHeight() {
-			// #ifdef APP-PLUS || H5
-			return this.height ? this.height : 44;
-			// #endif
-			// #ifdef MP
-			// 小程序特别处理，让导航栏高度 = 胶囊高度 + 两倍胶囊顶部与状态栏底部的距离之差(相当于同时获得了导航栏底部与胶囊底部的距离)
-			// 此方法有缺陷，暂不用(会导致少了几个px)，采用直接固定值的方式
-			// return menuButtonInfo.height + (menuButtonInfo.top - this.statusBarHeight) * 2;//导航高度
-			let height = systemInfo.platform == 'ios' ? 44 : 48;
-			return this.height ? this.height : height;
-			// #endif
-		}
-	},
-	created() {},
-	methods: {
-		goBack() {
-			// 如果自定义了点击返回按钮的函数，则执行，否则执行返回逻辑
-			if (typeof this.customBack === 'function') {
-				// 在微信，支付宝等环境(H5正常)，会导致父组件定义的customBack()函数体中的this变成子组件的this
-				// 通过bind()方法，绑定父组件的this，让this.customBack()的this为父组件的上下文
-				this.customBack.bind(this.$u.$parent.call(this))();
-			} else {
-				uni.navigateBack();
-			}
-		}
-	}
-};
-</script>
-
-<style scoped lang="scss">
-@import '../../libs/css/style.components.scss';
-
-.u-navbar {
-	width: 100%;
-}
-
-.u-navbar-fixed {
-	position: fixed;
-	left: 0;
-	right: 0;
-	top: 0;
-	z-index: 991;
-}
-
-.u-status-bar {
-	width: 100%;
-}
-
-.u-navbar-inner {
-	@include vue-flex;
-	justify-content: space-between;
-	position: relative;
-	align-items: center;
-}
-
-.u-back-wrap {
-	@include vue-flex;
-	align-items: center;
-	flex: 1;
-	flex-grow: 0;
-	padding: 14rpx 14rpx 14rpx 24rpx;
-}
-
-.u-back-text {
-	padding-left: 4rpx;
-	font-size: 30rpx;
-}
-
-.u-navbar-content-title {
-	@include vue-flex;
-	align-items: center;
-	justify-content: center;
-	flex: 1;
-	position: absolute;
-	left: 0;
-	right: 0;
-	height: 60rpx;
-	text-align: center;
-	flex-shrink: 0;
-}
-
-.u-navbar-centent-slot {
-	flex: 1;
-}
-
-.u-title {
-	line-height: 60rpx;
-	font-size: 32rpx;
-	flex: 1;
-}
-
-.u-navbar-right {
-	flex: 1;
-	@include vue-flex;
-	align-items: center;
-	justify-content: flex-end;
-}
-
-.u-slot-content {
-	flex: 1;
-	@include vue-flex;
-	align-items: center;
-}
-</style>
diff --git a/uview-ui/components/u-number-box/u-number-box.vue b/uview-ui/components/u-number-box/u-number-box.vue
index 3cebe727..ec66d4b5 100644
--- a/uview-ui/components/u-number-box/u-number-box.vue
+++ b/uview-ui/components/u-number-box/u-number-box.vue
@@ -35,9 +35,9 @@
 			@touchend.stop.prevent="clearTimer"
 			:class="{ 'u-icon-disabled': disabled || inputVal >= max }"
 			:style="{
-				background: '#e9b564',
+				background: bgColor,
 				height: inputHeight + 'rpx',
-				color: '#fff'
+				color: color
 			}"
 		>
 			<u-icon name="plus" :size="size"></u-icon>
@@ -274,7 +274,7 @@ export default {
 			uni.hideKeyboard();
 			if (this.disabled) return;
 			let value = 0;
-			
+
 			// 减
 			if (type === 'minus') {
 				if (this.calcMinus(this.inputVal, this.step) == 0) {
@@ -286,7 +286,7 @@ export default {
 				value = this.calcPlus(this.inputVal, this.step);
 			}
 			// 判断是否小于最小值和大于最大值
-			if (value < this.min || value > this.max ) {
+			if (value < this.min || value > this.max) {
 				return;
 			}
 			this.inputVal = value;
diff --git a/uview-ui/components/u-number-keyboard/u-number-keyboard.vue b/uview-ui/components/u-number-keyboard/u-number-keyboard.vue
deleted file mode 100644
index 6425a1f8..00000000
--- a/uview-ui/components/u-number-keyboard/u-number-keyboard.vue
+++ /dev/null
@@ -1,158 +0,0 @@
-<template>
-	<view class="u-keyboard" @touchmove.stop.prevent="() => {}">
-		<view class="u-keyboard-grids">
-			<view
-			    class="u-keyboard-grids-item"
-			    :class="[btnBgGray(index) ? 'u-bg-gray' : '', index <= 2 ? 'u-border-top' : '', index < 9 ? 'u-border-bottom' : '', (index + 1) % 3 != 0 ? 'u-border-right' : '']"
-			    :style="[itemStyle(index)]"
-			    v-for="(item, index) in numList"
-			    :key="index"
-			    :hover-class="hoverClass(index)"
-			    :hover-stay-time="100"
-			    @tap="keyboardClick(item)">
-				<view class="u-keyboard-grids-btn">{{ item }}</view>
-			</view>
-			<view class="u-keyboard-grids-item u-bg-gray" hover-class="u-hover-class" :hover-stay-time="100" @touchstart.stop="backspaceClick"
-			    @touchend="clearTimer">
-				<view class="u-keyboard-back u-keyboard-grids-btn">
-					<u-icon name="backspace" :size="38" :bold="true"></u-icon>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		props: {
-			// 键盘的类型，number-数字键盘，card-身份证键盘
-			mode: {
-				type: String,
-				default: 'number'
-			},
-			// 是否显示键盘的"."符号
-			dotEnabled: {
-				type: Boolean,
-				default: true
-			},
-			// 是否打乱键盘按键的顺序
-			random: {
-				type: Boolean,
-				default: false
-			}
-		},
-		data() {
-			return {
-				backspace: 'backspace', // 退格键内容
-				dot: '.', // 点
-				timer: null, // 长按多次删除的事件监听
-				cardX: 'X' // 身份证的X符号
-			};
-		},
-		computed: {
-			// 键盘需要显示的内容
-			numList() {
-				let tmp = [];
-				if (!this.dotEnabled && this.mode == 'number') {
-					if (!this.random) {
-						return [1, 2, 3, 4, 5, 6, 7, 8, 9, 0];
-					} else {
-						return this.$u.randomArray([1, 2, 3, 4, 5, 6, 7, 8, 9, 0]);
-					}
-				} else if (this.dotEnabled && this.mode == 'number') {
-					if (!this.random) {
-						return [1, 2, 3, 4, 5, 6, 7, 8, 9, this.dot, 0];
-					} else {
-						return this.$u.randomArray([1, 2, 3, 4, 5, 6, 7, 8, 9, this.dot, 0]);
-					}
-				} else if (this.mode == 'card') {
-					if (!this.random) {
-						return [1, 2, 3, 4, 5, 6, 7, 8, 9, this.cardX, 0];
-					} else {
-						return this.$u.randomArray([1, 2, 3, 4, 5, 6, 7, 8, 9, this.cardX, 0]);
-					}
-				}
-			},
-			// 按键的样式，在非乱序&&数字键盘&&不显示点按钮时，index为9时，按键占位两个空间
-			itemStyle() {
-				return index => {
-					let style = {};
-					if (this.mode == 'number' && !this.dotEnabled && index == 9) style.flex = '0 0 66.6666666666%';
-					return style;
-				};
-			},
-			// 是否让按键显示灰色，只在非乱序&&数字键盘&&且允许点按键的时候
-			btnBgGray() {
-				return index => {
-					if (!this.random && index == 9 && (this.mode != 'number' || (this.mode == 'number' && this.dotEnabled))) return true;
-					else return false;
-				};
-			},
-			hoverClass() {
-				return index => {
-					if (!this.random && index == 9 && (this.mode == 'number' && this.dotEnabled || this.mode == 'card')) return 'u-hover-class';
-					else return 'u-keyboard-hover';
-				}
-			}
-		},
-		methods: {
-			// 点击退格键
-			backspaceClick() {
-				this.$emit('backspace');
-				clearInterval(this.timer); //再次清空定时器，防止重复注册定时器
-				this.timer = null;
-				this.timer = setInterval(() => {
-					this.$emit('backspace');
-				}, 250);
-			},
-			clearTimer() {
-				clearInterval(this.timer);
-				this.timer = null;
-			},
-			// 获取键盘显示的内容
-			keyboardClick(val) {
-				// 允许键盘显示点模式和触发非点按键时，将内容转为数字类型
-				if (this.dotEnabled && val != this.dot && val != this.cardX) val = Number(val);
-				this.$emit('change', val);
-			}
-		}
-	};
-</script>
-
-<style lang="scss" scoped>
-	@import "../../libs/css/style.components.scss";
-
-	.u-keyboard {
-		position: relative;
-		z-index: 1003;
-	}
-
-	.u-keyboard-grids {
-		@include vue-flex;
-		flex-wrap: wrap;
-	}
-
-	.u-keyboard-grids-item {
-		flex: 0 0 33.3333333333%;
-		text-align: center;
-		font-size: 50rpx;
-		color: #333;
-		@include vue-flex;
-		align-items: center;
-		justify-content: center;
-		height: 110rpx;
-		font-weight: 500;
-	}
-
-	.u-bg-gray {
-		background-color: $u-border-color;
-	}
-
-	.u-keyboard-back {
-		font-size: 36rpx;
-	}
-
-	.u-keyboard-hover {
-		background-color: #e7e6eb;
-	}
-</style>
diff --git a/uview-ui/components/u-parse/u-parse.vue b/uview-ui/components/u-parse/u-parse.vue
index ca33bca8..36e6ff4f 100644
--- a/uview-ui/components/u-parse/u-parse.vue
+++ b/uview-ui/components/u-parse/u-parse.vue
@@ -252,7 +252,7 @@ export default {
 				this.rtf = div;
 			} else {
 				if (!this.rtf) this.rtf = div;
-				else this.rtf.appendChild(div);
+				else if (this.rtf.appendChild) this.rtf.appendChild(div);
 			}
 			div.innerHTML = this._handleHtml(html, append);
 			for (var styles = this.rtf.getElementsByTagName('style'), i = 0, style; (style = styles[i++]); ) {
@@ -392,7 +392,7 @@ export default {
 					div.appendChild(table);
 				}
 			}
-			if (!append) this.document.appendChild(this.rtf);
+			if (!append &&  this.document ) this.document.appendChild(this.rtf);
 			this.$nextTick(() => {
 				this.nodes = [1];
 				this.$emit('load');
diff --git a/uview-ui/components/u-picker/u-picker.vue b/uview-ui/components/u-picker/u-picker.vue
index 68212a48..49943901 100644
--- a/uview-ui/components/u-picker/u-picker.vue
+++ b/uview-ui/components/u-picker/u-picker.vue
@@ -96,9 +96,9 @@
 </template>
 
 <script>
-import provinces from '../../libs/util/province.js';
-import citys from '../../libs/util/city.js';
-import areas from '../../libs/util/area.js';
+// import provinces from '../../libs/util/province.js';
+// import citys from '../../libs/util/city.js';
+// import areas from '../../libs/util/area.js';
 
 /**
  * picker picker弹出选择器
@@ -268,9 +268,9 @@ export default {
 			startDate: '',
 			endDate: '',
 			valueArr: [],
-			provinces: provinces,
-			citys: citys[0],
-			areas: areas[0][0],
+			// provinces: provinces,
+			// citys: citys[0],
+			// areas: areas[0][0],
 			province: 0,
 			city: 0,
 			area: 0,
diff --git a/uview-ui/components/u-read-more/u-read-more.vue b/uview-ui/components/u-read-more/u-read-more.vue
deleted file mode 100644
index a77a44f7..00000000
--- a/uview-ui/components/u-read-more/u-read-more.vue
+++ /dev/null
@@ -1,179 +0,0 @@
-<template>
-	<view class="">
-		<view class="u-content" :class="[elId]" :style="{ 
-			height: isLongContent && !showMore ? showHeight + 'rpx' : 'auto',
-			textIndent: textIndent
-		}">
-			<slot></slot>
-		</view>
-		<view @tap="toggleReadMore" v-if="isLongContent" class="u-content__showmore-wrap"
-		    :class="{ 'u-content__show-more': showMore }"
-		    :style="[innerShadowStyle]">
-			<text class="u-content__showmore-wrap__readmore-btn" :style="{
-				fontSize: fontSize + 'rpx',
-				color: color
-			}">
-				{{ showMore ? openText : closeText }}
-			</text>
-			<view class="u-content__showmore-wrap__readmore-btn__icon u-flex">
-				<u-icon :color="color" :size="fontSize" :name="showMore ? 'arrow-up' : 'arrow-down'"></u-icon>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	/**
-	 * readMore 阅读更多
-	 * @description 该组件一般用于内容较长，预先收起一部分，点击展开全部内容的场景。
-	 * @tutorial https://www.uviewui.com/components/readMore.html
-	 * @property {String Number} show-height 内容超出此高度才会显示展开全文按钮，单位rpx（默认400）
-	 * @property {Boolean} toggle 展开后是否显示收起按钮（默认false）
-	 * @property {String} close-text 关闭时的提示文字（默认“展开阅读全文”）
-	 * @property {String Number} font-size 提示文字的大小，单位rpx（默认28）
-	 * @property {String} text-indent 段落首行缩进的字符个数（默认2em）
-	 * @property {String} open-text 展开时的提示文字（默认“收起”）
-	 * @property {String} color 提示文字的颜色（默认#2979ff）
-	 * @example <u-read-more><rich-text :nodes="content"></rich-text></u-read-more>
-	 */
-	export default {
-		name: "u-read-more",
-		props: {
-			// 默认的显示占位高度，单位为rpx
-			showHeight: {
-				type: [Number, String],
-				default: 400
-			},
-			// 展开后是否显示"收起"按钮
-			toggle: {
-				type: Boolean,
-				default: false
-			},
-			// 关闭时的提示文字
-			closeText: {
-				type: String,
-				default: '展开阅读全文'
-			},
-			// 展开时的提示文字
-			openText: {
-				type: String,
-				default: '收起'
-			},
-			// 提示的文字颜色
-			color: {
-				type: String,
-				default: '#2979ff'
-			},
-			// 提示文字的大小
-			fontSize: {
-				type: [String, Number],
-				default: 28
-			},
-			// 是否显示阴影
-			shadowStyle: {
-				type: Object,
-				default () {
-					return {
-						backgroundImage: "linear-gradient(-180deg, rgba(255, 255, 255, 0) 0%, #fff 80%)",
-						paddingTop: "300rpx",
-						marginTop: "-300rpx"
-					}
-				}
-			},
-			// 段落首行缩进的字符个数
-			textIndent: {
-				type: String,
-				default: '2em'
-			},
-			// open和close事件时，将此参数返回在回调参数中
-			index: {
-				type: [Number, String],
-				default: ''
-			}
-		},
-		watch: {
-			paramsChange(val) {
-				this.init();
-			}
-		},
-		computed: {
-			paramsChange() {
-				return `${this.toggle}-${this.showHeight}`;
-			},
-			// 展开后无需阴影，收起时才需要阴影样式
-			innerShadowStyle() {
-				if (this.showMore) return {};
-				else return this.shadowStyle
-			}
-		},
-		data() {
-			return {
-				isLongContent: false, // 是否需要隐藏一部分内容
-				showMore: false, // 当前隐藏与显示的状态，true-显示，false-收起
-				elId: this.$u.guid(), // 生成唯一class
-			};
-		},
-		mounted() {
-			this.$nextTick(() => {
-				this.init();
-			})
-		},
-		methods: {
-			init() {
-				this.$uGetRect('.' + this.elId).then(res => {
-					// 判断高度，如果真实内容高度大于占位高度，则显示收起与展开的控制按钮
-					if (res.height > uni.upx2px(this.showHeight)) {
-						this.isLongContent = true;
-						this.showMore = false;
-					}
-				})
-			},
-			// 展开或者收起
-			toggleReadMore() {
-				this.showMore = !this.showMore;
-				// 如果toggle为false，隐藏"收起"部分的内容
-				if (this.toggle == false) this.isLongContent = false;
-				// 发出打开或者收齐的事件
-				this.$emit(this.showMore ? 'open' : 'close', this.index);
-			}
-		}
-	};
-</script>
-
-<style lang="scss" scoped>
-	@import "../../libs/css/style.components.scss";
-
-	.u-content {
-		font-size: 30rpx;
-		color: $u-content-color;
-		line-height: 1.8;
-		text-align: left;
-		overflow: hidden;
-
-		&__show-more {
-			padding-top: 0;
-			background: none;
-			margin-top: 20rpx;
-		}
-
-		&__showmore-wrap {
-			position: relative;
-			width: 100%;
-			padding-bottom: 26rpx;
-			@include vue-flex;
-			align-items: center;
-			justify-content: center;
-
-			&__readmore-btn {
-				@include vue-flex;
-				align-items: center;
-				justify-content: center;
-				line-height: 1;
-
-				&__icon {
-					margin-left: 14rpx;
-				}
-			}
-		}
-	}
-</style>
diff --git a/uview-ui/components/u-row/u-row.vue b/uview-ui/components/u-row/u-row.vue
deleted file mode 100644
index 915dfa69..00000000
--- a/uview-ui/components/u-row/u-row.vue
+++ /dev/null
@@ -1,84 +0,0 @@
-<template>
-	<view class="u-row" :style="{
-			alignItems: uAlignItem,
-			justifyContent: uJustify
-		}"
-		@tap="click"
-	>
-		<slot />
-	</view>
-</template>
-
-<script>
-	/**
-	 * row 行布局
-	 * @description 通过基础的 12 分栏，迅速简便地创建布局。
-	 * @tutorial https://www.uviewui.com/components/layout.html#row-props
-	 * @property {String Number} gutter 栅格间隔，左右各为此值的一半，单位rpx（默认0）
-	 * @property {String} justify 水平排列方式(微信小程序暂不支持)默认（start(或flex-start)）
-	 * @property {String} align 垂直排列方式（默认center）
-	 * @example <u-row gutter="16"></u-row>
-	 */
-	export default {
-		name: "u-row",
-		props: {
-			// 给col添加间距，左右边距各占一半
-			gutter: {
-				type: [String, Number],
-				default: 20
-			},
-			// 水平排列方式，可选值为`start`(或`flex-start`)、`end`(或`flex-end`)、`center`、`around`(或`space-around`)、`between`(或`space-between`)
-			justify: {
-				type: String,
-				default: 'start'
-			},
-			// 垂直对齐方式，可选值为top、center、bottom
-			align: {
-				type: String,
-				default: 'center'
-			},
-			// 是否阻止事件传播
-			stop: {
-				type: Boolean,
-				default: true
-			}
-		},
-		computed: {
-			uJustify() {
-				if (this.justify == 'end' || this.justify == 'start') return 'flex-' + this.justify;
-				else if (this.justify == 'around' || this.justify == 'between') return 'space-' + this.justify;
-				else return this.justify;
-			},
-			uAlignItem() {
-				if (this.align == 'top') return 'flex-start';
-				if (this.align == 'bottom') return 'flex-end';
-				else return this.align;
-			}
-		},
-		methods: {
-			click(e) {
-				this.$emit('click');
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	@import "../../libs/css/style.components.scss";
-
-	.u-row {
-		// 由于微信小程序编译后奇怪的页面结构，只能使用float布局实现，flex无法实现
-		/* #ifndef MP-WEIXIN || MP-QQ || MP-TOUTIAO */
-		@include vue-flex;
-		/* #endif */
-		flex-wrap: wrap;
-	}
-
-	.u-row:after {
-		/* #ifdef MP-WEIXIN || MP-QQ || MP-TOUTIAO */
-		display: table;
-		clear: both;
-		content: "";
-		/* #endif */
-	}
-</style>
diff --git a/uview-ui/components/u-section/u-section.vue b/uview-ui/components/u-section/u-section.vue
deleted file mode 100644
index 02293ce3..00000000
--- a/uview-ui/components/u-section/u-section.vue
+++ /dev/null
@@ -1,154 +0,0 @@
-<template>
-	<view class="u-section">
-		<view class="u-section__title" :style="{
-			fontWeight: bold ? 'bold' : 'normal',
-			color: color,
-			fontSize: fontSize + 'rpx',
-			paddingLeft: showLine ? (fontSize * 0.7) + 'rpx' : 0
-		}" :class="{
-			'u-section--line': showLine
-		}">
-			<view class="u-section__title__icon-wrap u-flex" :style="[lineStyle]" v-if="showLine">
-				<u-icon top="0" name="column-line" :size="fontSize * 1.25" bold :color="lineColor ? lineColor : color"></u-icon>
-			</view>
-			<text class="u-flex u-section__title__text">{{title}}</text>
-		</view>
-		<view class="u-section__right-info" v-if="right || $slots.right" :style="{
-			color: subColor
-		}" @tap="rightClick"> 
-			<slot name="right" v-if="$slots.right" />
-			<block v-else>
-				{{subTitle}}
-				<view class="u-section__right-info__icon-arrow u-flex" v-if="arrow">
-					<u-icon name="arrow-right" size="24" :color="subColor"></u-icon>
-				</view>
-			</block>
-		</view>
-	</view>
-</template>
-
-<script>
-	/**
-	 * section 查看更多
-	 * @description 该组件一般用于分类信息有很多，但是限于篇幅只能列出一部分，让用户通过"查看更多"获得更多信息的场景，实际效果见演示。
-	 * @tutorial https://www.uviewui.com/components/section.html
-	 * @property {String} title 左边主标题
-	 * @property {String} sub-title 右边副标题（默认更多）
-	 * @property {Boolean} right 是否显示右边的内容（默认true）
-	 * @property {Boolean} showLine 是否显示左边的竖条（默认true）
-	 * @property {Boolean} arrow 是否显示右边箭头（默认true）
-	 * @property {String Number} font-size 主标题的字体大小（默认28）
-	 * @property {Boolean} bold 主标题是否加粗（默认true）
-	 * @property {String} color 主标题颜色（默认#303133）
-	 * @event {Function} click 组件右侧的内容被点击时触发，用于跳转"更多"
-	 * @example <u-section title="今日热门" :right="false"></u-section>
-	 */
-	export default {
-		name: "u-section",
-		props: {
-			// 标题信息
-			title: {
-				type: String,
-				default: ''
-			},
-			// 右边副标题内容
-			subTitle: {
-				type: String,
-				default: '更多'
-			},
-			// 是否显示右边的内容
-			right: {
-				type: Boolean,
-				default: true
-			},
-			fontSize: {
-				type: [Number, String],
-				default: 28
-			},
-			// 主标题是否加粗
-			bold: {
-				type: Boolean,
-				default: true
-			},
-			// 主标题的颜色
-			color: {
-				type: String,
-				default: '#303133'
-			},
-			// 右边副标题的颜色
-			subColor: {
-				type: String,
-				default: '#909399'
-			},
-			// 是否显示左边的竖条
-			showLine: {
-				type: Boolean,
-				default: true
-			},
-			// 左边竖线的颜色
-			lineColor: {
-				type: String,
-				default: ''
-			},
-			// 是否显示右边箭头
-			arrow: {
-				type: Boolean,
-				default: true
-			},
-		},
-		computed: {
-			// 左边竖条的样式
-			lineStyle() {
-				// 由于安卓和iOS的，需要稍微调整绝对定位的top值，才能让左边的竖线和右边的文字垂直居中
-				return {
-					// 由于竖线为字体图标，具有比实际线宽更宽的宽度，所以也需要根据字体打下动态调整
-					left: -(Number(this.fontSize) * 0.9) + 'rpx',
-					top: -(Number(this.fontSize) * (this.$u.os() == 'ios' ? 0.14 : 0.15)) + 'rpx',
-				}
-			}
-		},
-		methods: {
-			rightClick() {
-				this.$emit('click');
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	@import "../../libs/css/style.components.scss";
-	
-	.u-section {
-		@include vue-flex;
-		justify-content: space-between;
-		align-items: center;
-		width: 100%;
-		
-		&__title {
-			position: relative;
-			font-size: 28rpx;
-			padding-left: 20rpx;
-			@include vue-flex;
-			align-items: center;
-			
-			&__icon-wrap {
-				position: absolute;
-			}
-			
-			&__text {
-				line-height: 1;
-			}
-		}
-		
-		&__right-info {
-			color: $u-tips-color;
-			font-size: 26rpx;
-			@include vue-flex;
-			align-items: center;
-			
-			&__icon-arrow {
-				margin-left: 6rpx;
-			}
-		}
-	}
-</style>
diff --git a/uview-ui/components/u-skeleton/u-skeleton.vue b/uview-ui/components/u-skeleton/u-skeleton.vue
deleted file mode 100644
index c8cb19eb..00000000
--- a/uview-ui/components/u-skeleton/u-skeleton.vue
+++ /dev/null
@@ -1,199 +0,0 @@
-<template>
-	<view v-if="loading" :style="{
-		width: windowWinth + 'px', 
-		height: windowHeight + 'px', 
-		backgroundColor: bgColor, 
-		position: 'absolute', 
-		left: left + 'px', 
-		top: top + 'px', 
-		zIndex: 9998, 
-		overflow: 'hidden'
-	}"
-	 @touchmove.stop.prevent>
-		<view v-for="(item, index) in RectNodes" :key="$u.guid()" :class="[animation ? 'skeleton-fade' : '']" :style="{
-			width: item.width + 'px', 
-			height: item.height + 'px', 
-			backgroundColor: elColor, 
-			position: 'absolute', 
-			left: (item.left - left) + 'px', 
-			top: (item.top - top) + 'px'
-		}"></view>
-		<view v-for="(item, index) in circleNodes" :key="$u.guid()" :class="animation ? 'skeleton-fade' : ''" :style="{
-			width: item.width + 'px', 
-			height: item.height + 'px', 
-			backgroundColor: elColor, 
-			borderRadius: item.width/2 + 'px', 
-			position: 'absolute', 
-			left: (item.left - left) + 'px',
-			top: (item.top - top) + 'px'
-		}"></view>
-		<view v-for="(item, index) in filletNodes" :key="$u.guid()" :class="animation ? 'skeleton-fade' : ''" :style="{
-			width: item.width + 'px', 
-			height: item.height + 'px', 
-			backgroundColor: elColor, 
-			borderRadius: borderRadius + 'rpx', 
-			position: 'absolute', 
-			left: (item.left - left) + 'px',
-			top: (item.top - top) + 'px'
-		}"></view>
-	</view>
-</template>
-
-<script>
-	/**
-	 * skeleton 骨架屏
-	 * @description 骨架屏一般用于页面在请求远程数据尚未完成时，页面用灰色块预显示本来的页面结构，给用户更好的体验。
-	 * @tutorial https://www.uviewui.com/components/skeleton.html
-	 * @property {String} el-color 骨架块状元素的背景颜色（默认#e5e5e5）
-	 * @property {String} bg-color 骨架组件背景颜色（默认#ffffff）
-	 * @property {Boolean} animation 骨架块是否显示动画效果（默认false）
-	 * @property {String Number} border-radius u-skeleton-fillet类名元素，对应的骨架块的圆角大小，单位rpx（默认10）
-	 * @property {Boolean} loading 是否显示骨架组件，请求完成后，将此值设置为false（默认true）
-	 * @example <u-skeleton :loading="true" :animation="true"></u-skeleton>
-	 */
-	export default {
-		name: "u-skeleton",
-		props: {
-			// 需要渲染的元素背景颜色，十六进制或者rgb等都可以
-			elColor: {
-				type: String,
-				default: '#e5e5e5'
-			},
-			// 整个骨架屏页面的背景颜色
-			bgColor: {
-				type: String,
-				default: '#ffffff'
-			},
-			// 是否显示加载动画
-			animation: {
-				type: Boolean,
-				default: false
-			},
-			// 圆角值，只对类名为u-skeleton-fillet的元素生效，为数值，不带单位
-			borderRadius: {
-				type: [String, Number],
-				default: "10"
-			},
-			// 是否显示骨架，true-显示，false-隐藏
-			loading: {
-				type: Boolean,
-				default: true
-			}
-		},
-		data() {
-			return {
-				windowWinth: 750, // 骨架屏宽度
-				windowHeight: 1500, // 骨架屏高度
-				filletNodes: [], // 圆角元素
-				circleNodes: [], // 圆形元素
-				RectNodes: [], // 矩形元素
-				top: 0,
-				left: 0,
-			}
-		},
-		methods: {
-			// 查询各节点的信息
-			selecterQueryInfo() {
-				// 获取整个父组件容器的高度，当做骨架屏的高度 
-				// 在微信小程序中，如果把骨架屏放入组件中使用的话，需要调in(this)上下文为父组件才有效
-				let query = '';
-				// #ifdef MP-WEIXIN
-				query = uni.createSelectorQuery().in(this.$parent);
-				// #endif
-				// #ifndef MP-WEIXIN
-				query = uni.createSelectorQuery()
-				// #endif
-				query.selectAll('.u-skeleton').boundingClientRect().exec((res) => {
-					this.windowHeight = res[0][0].height;
-					this.windowWinth = res[0][0].width;
-					this.top = res[0][0].bottom - res[0][0].height;
-					this.left = res[0][0].left;
-				});
-				// 矩形骨架元素
-				this.getRectEls();
-				// 圆形骨架元素
-				this.getCircleEls();
-				// 圆角骨架元素
-				this.getFilletEls();
-			},
-			// 矩形元素列表
-			getRectEls() {
-				let query = '';
-				// 在微信小程序中，如果把骨架屏放入组件中使用的话，需要调in(this)上下文为父组件才有效
-				// #ifdef MP-WEIXIN
-				query = uni.createSelectorQuery().in(this.$parent);
-				// #endif
-				// #ifndef MP-WEIXIN
-				query = uni.createSelectorQuery()
-				// #endif
-				query.selectAll('.u-skeleton-rect').boundingClientRect().exec((res) => {
-					this.RectNodes = res[0];
-				});
-			},
-			// 圆角元素列表
-			getFilletEls() {
-				let query = '';
-				// 在微信小程序中，如果把骨架屏放入组件中使用的话，需要调in(this)上下文为父组件才有效
-				// #ifdef MP-WEIXIN
-				query = uni.createSelectorQuery().in(this.$parent);
-				// #endif
-				// #ifndef MP-WEIXIN
-				query = uni.createSelectorQuery()
-				// #endif
-				query.selectAll('.u-skeleton-fillet').boundingClientRect().exec((res) => {
-					this.filletNodes = res[0];
-				});
-			},
-			// 圆形元素列表
-			getCircleEls() {
-				let query = '';
-				// 在微信小程序中，如果把骨架屏放入组件中使用的话，需要调in(this)上下文为父组件才有效
-				// #ifdef MP-WEIXIN
-				query = uni.createSelectorQuery().in(this.$parent);
-				// #endif
-				// #ifndef MP-WEIXIN
-				query = uni.createSelectorQuery()
-				// #endif
-				query.selectAll('.u-skeleton-circle').boundingClientRect().exec((res) => {
-					this.circleNodes = res[0];
-				});
-			}
-		},
-		// 组件被挂载
-		mounted() {
-			// 获取系统信息
-			let systemInfo = uni.getSystemInfoSync();
-			this.windowHeight = systemInfo.windowHeight;
-			this.windowWinth = systemInfo.windowWidth;
-			this.selecterQueryInfo();
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	@import "../../libs/css/style.components.scss";
-	
-	.skeleton-fade {
-		width: 100%;
-		height: 100%;
-		background: rgb(194, 207, 214);
-		animation-duration: 1.5s;
-		animation-name: blink;
-		animation-timing-function: ease-in-out;
-		animation-iteration-count: infinite;
-	}
-
-	@keyframes blink {
-		0% {
-			opacity: 1;
-		}
-
-		50% {
-			opacity: 0.4;
-		}
-
-		100% {
-			opacity: 1;
-		}
-	}
-</style>
diff --git a/uview-ui/components/u-slider/u-slider.vue b/uview-ui/components/u-slider/u-slider.vue
deleted file mode 100644
index 6d21b929..00000000
--- a/uview-ui/components/u-slider/u-slider.vue
+++ /dev/null
@@ -1,257 +0,0 @@
-<template>
-	<view class="u-slider" @tap="onClick" :class="[disabled ? 'u-slider--disabled' : '']" :style="{
-		backgroundColor: inactiveColor
-	}">
-		<view
-			class="u-slider__gap"
-			:style="[
-				barStyle,
-				{
-					height: height + 'rpx',
-					backgroundColor: activeColor
-				}
-			]"
-		>
-			<view class="u-slider__button-wrap" @touchstart="onTouchStart" 
-				@touchmove="onTouchMove" @touchend="onTouchEnd" 
-				@touchcancel="onTouchEnd">
-				<slot v-if="$slots.default  || $slots.$default"/>
-				<view v-else class="u-slider__button" :style="[blockStyle, {
-					height: blockWidth + 'rpx',
-					width: blockWidth + 'rpx',
-					backgroundColor: blockColor
-				}]"></view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-/**
- * slider 滑块选择器
- * @tutorial https://uviewui.com/components/slider.html
- * @property {Number | String} value 滑块默认值（默认0）
- * @property {Number | String} min 最小值（默认0）
- * @property {Number | String} max 最大值（默认100）
- * @property {Number | String} step 步长（默认1）
- * @property {Number | String} blockWidth 滑块宽度，高等于宽（30）
- * @property {Number | String} height 滑块条高度，单位rpx（默认6）
- * @property {String} inactiveColor 底部条背景颜色（默认#c0c4cc）
- * @property {String} activeColor 底部选择部分的背景颜色（默认#2979ff）
- * @property {String} blockColor 滑块颜色（默认#ffffff）
- * @property {Object} blockStyle 给滑块自定义样式，对象形式
- * @property {Boolean} disabled 是否禁用滑块(默认为false)
- * @event {Function} start 滑动触发
- * @event {Function} moving 正在滑动中
- * @event {Function} end 滑动结束
- * @example <u-slider v-model="value" />
- */
-export default {
-	name: 'u-slider',
-	props: {
-		// 当前进度百分比值，范围0-100
-		value: {
-			type: [Number, String],
-			default: 0
-		},
-		// 是否禁用滑块
-		disabled: {
-			type: Boolean,
-			default: false
-		},
-		// 滑块宽度，高等于宽，单位rpx
-		blockWidth: {
-			type: [Number, String],
-			default: 30
-		},
-		// 最小值
-		min: {
-			type: [Number, String],
-			default: 0
-		},
-		// 最大值
-		max: {
-			type: [Number, String],
-			default: 100
-		},
-		// 步进值
-		step: {
-			type: [Number, String],
-			default: 1
-		},
-		// 滑块条高度，单位rpx
-		height: {
-			type: [Number, String],
-			default: 6
-		},
-		// 进度条的激活部分颜色
-		activeColor: {
-			type: String,
-			default: '#2979ff'
-		},
-		// 进度条的背景颜色
-		inactiveColor: {
-			type: String,
-			default: '#c0c4cc'
-		},
-		// 滑块的背景颜色
-		blockColor: {
-			type: String,
-			default: '#ffffff'
-		},
-		// 用户对滑块的自定义颜色
-		blockStyle: {
-			type: Object,
-			default() {
-				return {};
-			}
-		},
-	},
-	data() {
-		return {
-			startX: 0,
-			status: 'end',
-			newValue: 0,
-			distanceX: 0,
-			startValue: 0,
-			barStyle: {},
-			sliderRect: {
-				left: 0,
-				width: 0
-			}
-		};
-	},
-	watch: {
-		value(n) {
-			// 只有在非滑动状态时，才可以通过value更新滑块值，这里监听，是为了让用户触发
-			if(this.status == 'end') this.updateValue(this.value, false);
-		}
-	},
-	created() {
-		this.updateValue(this.value, false);
-	},
-	mounted() {
-		// 获取滑块条的尺寸信息
-		this.$uGetRect('.u-slider').then(rect => {
-			this.sliderRect = rect;
-		});
-	},
-	methods: {
-		onTouchStart(event) {
-			if (this.disabled) return;
-			this.startX = 0;
-			// 触摸点集
-			let touches = event.touches[0];
-			// 触摸点到屏幕左边的距离
-			this.startX = touches.clientX;
-			// 此处的this.value虽为props值，但是通过$emit('input')进行了修改
-			this.startValue = this.format(this.value);
-			// 标示当前的状态为开始触摸滑动
-			this.status = 'start';
-		},
-		onTouchMove(event) {
-			if (this.disabled) return;
-			// 连续触摸的过程会一直触发本方法，但只有手指触发且移动了才被认为是拖动了，才发出事件
-			// 触摸后第一次移动已经将status设置为moving状态，故触摸第二次移动不会触发本事件
-			if (this.status == 'start') this.$emit('start');
-			let touches = event.touches[0];
-			// 滑块的左边不一定跟屏幕左边接壤，所以需要减去最外层父元素的左边值
-			this.distanceX = touches.clientX - this.sliderRect.left;
-			// 获得移动距离对整个滑块的百分比值，此为带有多位小数的值，不能用此更新视图
-			// 否则造成通信阻塞，需要每改变一个step值时修改一次视图
-			this.newValue = (this.distanceX / this.sliderRect.width) * 100;
-			this.status = 'moving';
-			// 发出moving事件
-			this.$emit('moving');
-			this.updateValue(this.newValue, true);
-		},
-		onTouchEnd() {
-			if (this.disabled) return;
-			if (this.status === 'moving') {
-				this.updateValue(this.newValue, false);
-				this.$emit('end');
-			}
-			this.status = 'end';
-		},
-		updateValue(value, drag) {
-			// 去掉小数部分，同时也是对step步进的处理
-			const width = this.format(value);
-			// 不允许滑动的值超过max最大值，百分比也不能超过100
-			if(width > this.max || width > 100) return;
-			// 设置移动的百分比值
-			let barStyle = {
-				width: width + '%'
-			};
-			// 移动期间无需过渡动画
-			if (drag == true) {
-				barStyle.transition = 'none';
-			} else {
-				// 非移动期间，删掉对过渡为空的声明，让css中的声明起效
-				delete barStyle.transition;
-			}
-			// 修改value值
-			this.$emit('input', width);
-			this.barStyle = barStyle;
-		},
-		format(value) {
-			// 将小数变成整数，为了减少对视图的更新，造成视图层与逻辑层的阻塞
-			return Math.round(Math.max(this.min, Math.min(value, this.max)) / this.step) * this.step;
-		},
-		onClick(event) {
-			if (this.disabled) return;
-			// 直接点击滑块的情况，计算方式与onTouchMove方法相同
-			const value = ((event.detail.x - this.sliderRect.left) / this.sliderRect.width) * 100;
-			this.updateValue(value, false);
-		}
-	}
-};
-</script>
-
-<style lang="scss" scoped>
-@import "../../libs/css/style.components.scss";
-
-.u-slider {
-	position: relative;
-	border-radius: 999px;
-	border-radius: 999px;
-	background-color: #ebedf0;
-}
-
-.u-slider:before {
-	position: absolute;
-	right: 0;
-	left: 0;
-	content: '';
-	top: -8px;
-	bottom: -8px;
-	z-index: -1;
-}
-
-.u-slider__gap {
-	position: relative;
-	border-radius: inherit;
-	transition: width 0.2s;
-	transition: width 0.2s;
-	background-color: #1989fa;
-}
-
-.u-slider__button {
-	width: 24px;
-	height: 24px;
-	border-radius: 50%;
-	box-shadow: 0 1px 2px rgba(0, 0, 0, 0.5);
-	background-color: #fff;
-	cursor: pointer;
-}
-
-.u-slider__button-wrap {
-	position: absolute;
-	top: 50%;
-	right: 0;
-	transform: translate3d(50%, -50%, 0);
-}
-
-.u-slider--disabled {
-	opacity: 0.5;
-}
-</style>
diff --git a/uview-ui/components/u-subsection/u-subsection.vue b/uview-ui/components/u-subsection/u-subsection.vue
deleted file mode 100644
index b8fbd794..00000000
--- a/uview-ui/components/u-subsection/u-subsection.vue
+++ /dev/null
@@ -1,355 +0,0 @@
-<template>
-	<view class="u-subsection" :style="[subsectionStyle]">
-		<view class="u-item u-line-1" :style="[itemStyle(index)]" @tap="click(index)" :class="[noBorderRight(index), 'u-item-' + index]"
-		 v-for="(item, index) in listInfo" :key="index">
-			<view :style="[textStyle(index)]" class="u-item-text u-line-1">{{ item.name }}</view>
-		</view>
-		<view class="u-item-bg" :style="[itemBarStyle]"></view>
-	</view>
-</template>
-
-<script>
-	/**
-	 * subsection 分段器
-	 * @description 该分段器一般用于用户从几个选项中选择某一个的场景
-	 * @tutorial https://www.uviewui.com/components/subsection.html
-	 * @property {Array} list 选项的数组，形式见上方"基本使用"
-	 * @property {String Number} current 初始化时默认选中的选项索引值（默认0）
-	 * @property {String} active-color 激活时的颜色，mode为subsection时固定为白色（默认#303133）
-	 * @property {String} inactive-color 未激活时字体的颜色，mode为subsection时无效（默认#606266）
-	 * @property {String} mode 模式选择，见官网"模式选择"说明（默认button）
-	 * @property {String Number} font-size 字体大小，单位rpx（默认28）
-	 * @property {String Number} height 组件高度，单位rpx（默认70）
-	 * @property {Boolean} animation 是否开启动画效果，见上方说明（默认true）
-	 * @property {Boolean} bold 激活选项的字体是否加粗（默认true）
-	 * @property {String} bg-color 组件背景颜色，mode为button时有效（默认#eeeeef）
-	 * @property {String} button-color 按钮背景颜色，mode为button时有效（默认#ffffff）
-	 * @event {Function} change 分段器选项发生改变时触发
-	 * @example <u-subsection active-color="#ff9900"></u-subsection>
-	 */
-	export default {
-		name: "u-subsection",
-		props: {
-			// tab的数据
-			list: {
-				type: Array,
-				default () {
-					return [];
-				}
-			},
-			// 当前活动的tab的index
-			current: {
-				type: [Number, String],
-				default: 0
-			},
-			// 激活的颜色
-			activeColor: {
-				type: String,
-				default: '#303133'
-			},
-			// 未激活的颜色
-			inactiveColor: {
-				type: String,
-				default: '#606266'
-			},
-			// 模式选择，mode=button为按钮形式，mode=subsection时为分段模式
-			mode: {
-				type: String,
-				default: 'button'
-			},
-			// 字体大小，单位rpx
-			fontSize: {
-				type: [Number, String],
-				default: 28
-			},
-			// 是否开启动画效果
-			animation: {
-				type: Boolean,
-				default: true
-			},
-			// 组件的高度，单位rpx
-			height: {
-				type: [Number, String],
-				default: 70
-			},
-			// 激活tab的字体是否加粗
-			bold: {
-				type: Boolean,
-				default: true
-			},
-			// mode=button时，组件背景颜色
-			bgColor: {
-				type: String,
-				default: '#eeeeef'
-			},
-			// mode = button时，滑块背景颜色
-			buttonColor: {
-				type: String,
-				default: '#ffffff'
-			},
-			// 在切换分段器的时候，是否让设备震一下
-			vibrateShort: {
-				type: Boolean,
-				default: false
-			}
-		},
-		data() {
-			return {
-				listInfo: [],
-				itemBgStyle: {
-					width: 0,
-					left: 0,
-					backgroundColor: '#ffffff',
-					height: '100%',
-					transition: ''
-				},
-				currentIndex: this.current,
-				buttonPadding: 3, // mode = button 时，组件的内边距
-				borderRadius: 5, // 圆角值
-				firstTimeVibrateShort: true // 组件初始化时，会触发current变化，此时不应震动
-			};
-		},
-		watch: {
-			current: {
-				immediate: true,
-				handler(nVal) {
-					this.currentIndex = nVal;
-					this.changeSectionStatus(nVal);
-				}
-			}
-		},
-		created() {
-			// 将list的数据，传入listInfo数组，因为不能修改props传递的list值
-			// 可以接受直接数组形式，或者数组元素为对象的形式，如：['简介', '评论'],或者[{name: '简介'}, {name: '评论'}]
-			this.listInfo = this.list.map((val, index) => {
-				if (typeof val != 'object') {
-					let obj = {
-						width: 0,
-						name: val
-					};
-					return obj;
-				} else {
-					val.width = 0;
-					return val;
-				}
-			});
-		},
-		computed: {
-			// 设置mode=subsection时，滑块特有的样式
-			noBorderRight() {
-				return index => {
-					if (this.mode != 'subsection') return;
-					let classs = '';
-					// 不显示右边的边框
-					if (index < this.list.length - 1) classs += ' u-none-border-right';
-					// 显示整个组件的左右边圆角
-					if (index == 0) classs += ' u-item-first';
-					if (index == this.list.length - 1) classs += ' u-item-last';
-					return classs;
-				};
-			},
-			// 文字的样式
-			textStyle() {
-				return index => {
-					let style = {};
-					// 设置字体颜色
-					if (this.mode == 'subsection') {
-						if (index == this.currentIndex) {
-							style.color = '#ffffff';
-						} else {
-							style.color = this.activeColor;
-						}
-					} else {
-						if (index == this.currentIndex) {
-							style.color = this.activeColor;
-						} else {
-							style.color = this.inactiveColor;
-						}
-					}
-					// 字体加粗
-					if (index == this.currentIndex && this.bold) style.fontWeight = 'bold';
-					// 文字大小
-					style.fontSize = this.fontSize + 'rpx';
-					return style;
-				};
-			},
-			// 每个分段器item的样式
-			itemStyle() {
-				return index => {
-					let style = {};
-					if (this.mode == 'subsection') {
-						// 设置border的样式
-						style.borderColor = this.activeColor;
-						style.borderWidth = '1px';
-						style.borderStyle = 'solid';
-					}
-					return style;
-				};
-			},
-			// mode=button时，外层view的样式
-			subsectionStyle() {
-				let style = {};
-				style.height = uni.upx2px(this.height) + 'px';
-				if (this.mode == 'button') {
-					style.backgroundColor = this.bgColor;
-					style.padding = `${this.buttonPadding}px`;
-					style.borderRadius = `${this.borderRadius}px`;
-				}
-				return style;
-			},
-			// 滑块的样式
-			itemBarStyle() {
-				let style = {};
-				style.backgroundColor = this.activeColor;
-				style.zIndex = 1;
-				if (this.mode == 'button') {
-					style.backgroundColor = this.buttonColor;
-					style.borderRadius = `${this.borderRadius}px`;
-					style.bottom = `${this.buttonPadding}px`;
-					style.height = uni.upx2px(this.height) - this.buttonPadding * 2 + 'px';
-					style.zIndex = 0;
-				}
-				return Object.assign(this.itemBgStyle, style);
-			}
-		},
-		mounted() {
-			setTimeout(() => {
-				this.getTabsInfo();
-			}, 10);
-		},
-		methods: {
-			// 改变滑块的样式
-			changeSectionStatus(nVal) {
-				if (this.mode == 'subsection') {
-					// 根据滑块在最左边和最右边时，显示左边和右边的圆角
-					if (nVal == this.list.length - 1) {
-						this.itemBgStyle.borderRadius = `0 ${this.buttonPadding}px ${this.buttonPadding}px 0`;
-					}
-					if (nVal == 0) {
-						this.itemBgStyle.borderRadius = `${this.buttonPadding}px 0 0 ${this.buttonPadding}px`;
-					}
-					if (nVal > 0 && nVal < this.list.length - 1) {
-						this.itemBgStyle.borderRadius = '0';
-					}
-				}
-				// 更新滑块的位置
-				setTimeout(() => {
-					this.itemBgLeft();
-				}, 10);
-				if (this.vibrateShort && !this.firstTimeVibrateShort) {
-					// 使手机产生短促震动，微信小程序有效，APP(HX 2.6.8)和H5无效
-					// #ifndef H5
-					uni.vibrateShort();
-					// #endif
-				}
-				// 第一次过后，设置firstTimeVibrateShort为false，让其下一次可以震动(如果允许震动的话)
-				this.firstTimeVibrateShort = false;
-			},
-			click(index) {
-				// 不允许点击当前激活选项
-				if (index == this.currentIndex) return;
-				this.currentIndex = index;
-				this.changeSectionStatus(index);
-				this.$emit('change', Number(index));
-			},
-			// 获取各个tab的节点信息
-			getTabsInfo() {
-				let view = uni.createSelectorQuery().in(this);
-				for (let i = 0; i < this.list.length; i++) {
-					view.select('.u-item-' + i).boundingClientRect();
-				}
-				view.exec(res => {
-					if (!res.length) {
-						setTimeout(() => {
-							this.getTabsInfo();
-							return;
-						}, 10);
-					}
-					// 将分段器每个item的宽度，放入listInfo数组
-					res.map((val, index) => {
-						this.listInfo[index].width = val.width;
-					});
-					// 初始化滑块的宽度
-					if (this.mode == 'subsection') {
-						this.itemBgStyle.width = this.listInfo[0].width + 'px';
-					} else if (this.mode == 'button') {
-						this.itemBgStyle.width = this.listInfo[0].width + 'px';
-					}
-					// 初始化滑块的位置
-					this.itemBgLeft();
-				});
-			},
-			itemBgLeft() {
-				// 根据是否开启动画效果，
-				if (this.animation) {
-					this.itemBgStyle.transition = 'all 0.35s';
-				} else {
-					this.itemBgStyle.transition = 'all 0s';
-				}
-				let left = 0;
-				// 计算当前活跃item到组件左边的距离
-				this.listInfo.map((val, index) => {
-					if (index < this.currentIndex) left += val.width;
-				});
-				// 根据mode不同模式，计算滑块需要移动的距离
-				if (this.mode == 'subsection') {
-					this.itemBgStyle.left = left + 'px';
-				} else if (this.mode == 'button') {
-					this.itemBgStyle.left = left + this.buttonPadding + 'px';
-				}
-			}
-		}
-	};
-</script>
-
-<style lang="scss" scoped>
-	@import "../../libs/css/style.components.scss";
-	
-	.u-subsection {
-		@include vue-flex;
-		align-items: center;
-		overflow: hidden;
-		position: relative;
-	}
-
-	.u-item {
-		flex: 1;
-		text-align: center;
-		font-size: 26rpx;
-		height: 100%;
-		@include vue-flex;
-		align-items: center;
-		justify-content: center;
-		color: $u-main-color;
-		padding: 0 6rpx;
-	}
-
-	.u-item-bg {
-		background-color: $u-type-primary;
-		position: absolute;
-		z-index: -1;
-	}
-
-	.u-none-border-right {
-		border-right: none !important;
-	}
-
-	.u-item-first {
-		border-top-left-radius: 8rpx;
-		border-bottom-left-radius: 8rpx;
-	}
-
-	.u-item-last {
-		border-top-right-radius: 8rpx;
-		border-bottom-right-radius: 8rpx;
-	}
-
-	.u-item-text {
-		transition: all 0.35s;
-		color: $u-main-color;
-		@include vue-flex;
-		align-items: center;
-		position: relative;
-		z-index: 3;
-	}
-</style>
diff --git a/uview-ui/components/u-swipe-action/u-swipe-action.vue b/uview-ui/components/u-swipe-action/u-swipe-action.vue
deleted file mode 100644
index 13fb33c2..00000000
--- a/uview-ui/components/u-swipe-action/u-swipe-action.vue
+++ /dev/null
@@ -1,255 +0,0 @@
-<template>
-	<view class="">
-		<movable-area class="u-swipe-action" :style="{ backgroundColor: bgColor }">
-			<movable-view
-				class="u-swipe-view"
-				@change="change"
-				@touchend="touchend"
-				@touchstart="touchstart"
-				direction="horizontal"
-				:disabled="disabled"
-				:x="moveX"
-				:style="{
-					width: movableViewWidth ? movableViewWidth : '100%'
-				}"
-			>
-				<view
-					class="u-swipe-content"
-					@tap.stop="contentClick"
-				>
-					<slot></slot>
-				</view>
-				<view class="u-swipe-del" v-if="showBtn" @tap.stop="btnClick(index)" :style="[btnStyle(item.style)]" v-for="(item, index) in options" :key="index">
-					<view class="u-btn-text">{{ item.text }}</view>
-				</view>
-			</movable-view>
-		</movable-area>
-	</view>
-</template>
-
-<script>
-/**
- * swipeAction 左滑单元格
- * @description 该组件一般用于左滑唤出操作菜单的场景，用的最多的是左滑删除操作。
- * @tutorial https://www.uviewui.com/components/swipeAction.html
- * @property {String} bg-color 整个组件背景颜色（默认#ffffff）
- * @property {Array} options 数组形式，可以配置背景颜色和文字
- * @property {String Number} index 标识符，点击时候用于区分点击了哪一个，用v-for循环时的index即可
- * @property {String Number} btn-width 按钮宽度，单位rpx（默认180）
- * @property {Boolean} disabled 是否禁止某个swipeAction滑动（默认false）
- * @property {Boolean} show 打开或者关闭某个组件（默认false）
- * @event {Function} click 点击组件时触发
- * @event {Function} close 组件触发关闭状态时
- * @event {Function} content-click 点击内容时触发
- * @event {Function} open 组件触发打开状态时
- * @example <u-swipe-action btn-text="收藏">...</u-swipe-action>
- */
-export default {
-	name: 'u-swipe-action',
-	props: {
-		// index值，用于得知点击删除的是哪个按钮
-		index: {
-			type: [Number, String],
-			default: ''
-		},
-		// 滑动按钮的宽度，单位为rpx
-		btnWidth: {
-			type: [String, Number],
-			default: 180
-		},
-		// 是否禁止某个action滑动
-		disabled: {
-			type: Boolean,
-			default: false
-		},
-		// 打开或者关闭组件
-		show: {
-			type: Boolean,
-			default: false
-		},
-		// 组件背景颜色
-		bgColor: {
-			type: String,
-			default: '#ffffff'
-		},
-		// 是否使手机发生短促震动，目前只在iOS的微信小程序有效(2020-05-06)
-		vibrateShort: {
-			type: Boolean,
-			default: false
-		},
-		// 按钮操作参数
-		options: {
-			type: Array,
-			default() {
-				return [];
-			}
-		}
-	},
-	watch: {
-		show: {
-			immediate: true,
-			handler(nVal, oVal) {
-				if (nVal) {
-					this.open();
-				} else {
-					this.close();
-				}
-			}
-		}
-	},
-	data() {
-		return {
-			moveX: 0, // movable-view元素在x轴上需要移动的目标移动距离，用于展开或收起滑动的按钮
-			scrollX: 0, // movable-view移动过程中产生的change事件中的x轴移动值
-			status: false, // 滑动的状态，表示当前是展开还是关闭按钮的状态
-			movableAreaWidth: 0, // 滑动区域
-			elId: this.$u.guid(), // id，用于通知另外组件关闭时的识别
-			showBtn: false, // 刚开始渲染视图时不显示右边的按钮，避免视图闪动
-		};
-	},
-	computed: {
-		movableViewWidth() {
-			return this.movableAreaWidth + this.allBtnWidth + 'px';
-		},
-		innerBtnWidth() {
-			return uni.upx2px(this.btnWidth);
-		},
-		allBtnWidth() {
-			return uni.upx2px(this.btnWidth) * this.options.length;
-		},
-		btnStyle() {
-			return style => {
-				let css = {};
-				style.width = this.btnWidth + 'rpx';
-				return style;
-			};
-		}
-	},
-	mounted() {
-		this.getActionRect();
-	},
-	methods: {
-		// 点击按钮
-		btnClick(index) {
-			this.status = false;
-			// this.index为点击的几个组件，index为点击某个组件的第几个按钮(options数组的索引)
-			this.$emit('click', this.index, index);
-		},
-		// movable-view元素移动事件
-		change(e) {
-			this.scrollX = e.detail.x;
-		},
-		// 关闭按钮状态
-		close() {
-			this.moveX = 0;
-			this.status = false;
-		},
-		// 打开按钮的状态
-		open() {
-			if (this.disabled) return;
-			this.moveX = -this.allBtnWidth;
-			this.status = true;
-		},
-		// 用户手指离开movable-view元素，停止触摸
-		touchend() {
-			this.moveX = this.scrollX;
-			// 停止触摸时候，判断当前是展开还是关闭状态
-			// 关闭状态
-			// 这一步很重要，需要先给this.moveX一个变化的随机值，否则因为前后设置的为同一个值
-			// props单向数据流的原因，导致movable-view元素不会发生变化，切记，详见文档：
-			// https://uniapp.dcloud.io/use?id=%e5%b8%b8%e8%a7%81%e9%97%ae%e9%a2%98
-			this.$nextTick(function() {
-				if (this.status == false) {
-					// 关闭状态左滑，产生的x轴位移为负值，也就是说滑动的距离大于按钮的四分之一宽度，自动展开按钮
-					if (this.scrollX <= -this.allBtnWidth / 4) {
-						this.moveX = -this.allBtnWidth; // 按钮宽度的负值，即为展开状态movable-view元素左滑的距离
-						this.status = true; // 标志当前为展开状态
-						this.emitOpenEvent();
-						// 产生震动效果
-						if (this.vibrateShort) uni.vibrateShort();
-					} else {
-						this.moveX = 0; // 如果距离没有按钮宽度的四分之一，自动收起
-						this.status = false;
-						this.emitCloseEvent();
-					}
-				} else {
-					// 如果在打开的状态下，右滑动的距离X轴偏移超过按钮的四分之一(负值反过来的四分之三)，自动收起按钮
-					if (this.scrollX > (-this.allBtnWidth * 3) / 4) {
-						this.moveX = 0;
-						this.$nextTick(() => {
-							this.moveX = 101;
-						});
-						this.status = false;
-						this.emitCloseEvent();
-					} else {
-						this.moveX = -this.allBtnWidth;
-						this.status = true;
-						this.emitOpenEvent();
-					}
-				}
-			});
-		},
-		emitOpenEvent() {
-			this.$emit('open', this.index);
-		},
-		emitCloseEvent() {
-			this.$emit('close', this.index);
-		},
-		// 开始触摸
-		touchstart() {},
-		getActionRect() {
-			this.$uGetRect('.u-swipe-action').then(res => {
-				this.movableAreaWidth = res.width;
-				// 等视图更新完后，再显示右边的可滑动按钮，防止这些按钮会"闪一下"
-				this.$nextTick(() => {
-					this.showBtn = true;
-				})
-			});
-		},
-		// 点击内容触发事件
-		contentClick() {
-			// 点击内容时，如果当前为打开状态，收起组件
-			if (this.status == true) {
-				this.status = 'close';
-				this.moveX = 0;
-			}
-			this.$emit('content-click', this.index);
-		}
-	}
-};
-</script>
-
-<style scoped lang="scss">
-@import "../../libs/css/style.components.scss";
-	
-.u-swipe-action {
-	width: auto;
-	height: initial;
-	position: relative;
-	overflow: hidden;
-}
-
-.u-swipe-view {
-	@include vue-flex;
-	height: initial;
-	position: relative;
-	/* 这一句很关键，覆盖默认的绝对定位 */
-}
-
-.u-swipe-content {
-	flex: 1;
-}
-
-.u-swipe-del {
-	position: relative;
-	font-size: 30rpx;
-	color: #ffffff;
-}
-
-.u-btn-text {
-	position: absolute;
-	top: 50%;
-	left: 50%;
-	transform: translate(-50%, -50%);
-}
-</style>
diff --git a/uview-ui/components/u-switch/u-switch.vue b/uview-ui/components/u-switch/u-switch.vue
index dd8e4bb1..09c54109 100644
--- a/uview-ui/components/u-switch/u-switch.vue
+++ b/uview-ui/components/u-switch/u-switch.vue
@@ -1,163 +1,161 @@
 <template>
-	<view class="u-switch" :class="[value == true ? 'u-switch--on' : '', disabled ? 'u-switch--disabled' : '']" @tap="onClick"
-	 :style="[switchStyle]">
-		<view class="u-switch__node node-class" :style="{
-			width: $u.addUnit(this.size),
-			height: $u.addUnit(this.size)
-		}">
-			<u-loading :show="loading" class="u-switch__loading" :size="size * 0.6" :color="loadingColor" />
-		</view>
+	<view class="u-switch" :class="[value == true ? 'u-switch--on' : '', disabled ? 'u-switch--disabled' : '']" @tap="onClick" :style="[switchStyle]">
+		<view
+			class="u-switch__node node-class"
+			:style="{
+				width: $u.addUnit(this.size),
+				height: $u.addUnit(this.size)
+			}"
+		></view>
 	</view>
 </template>
 
 <script>
-	/**
-	 * switch 开关选择器
-	 * @description 选择开关一般用于只有两个选择，且只能选其一的场景。
-	 * @tutorial https://www.uviewui.com/components/switch.html
-	 * @property {Boolean} loading 是否处于加载中（默认false）
-	 * @property {Boolean} disabled 是否禁用（默认false）
-	 * @property {String Number} size 开关尺寸，单位rpx（默认50）
-	 * @property {String} active-color 打开时的背景色（默认#2979ff）
-	 * @property {Boolean} inactive-color 关闭时的背景色（默认#ffffff）
-	 * @property {Boolean | Number | String} active-value 打开选择器时通过change事件发出的值（默认true）
-	 * @property {Boolean | Number | String} inactive-value 关闭选择器时通过change事件发出的值（默认false）
-	 * @event {Function} change 在switch打开或关闭时触发
-	 * @example <u-switch v-model="checked" active-color="red" inactive-color="#eee"></u-switch>
-	 */
-	export default {
-		name: "u-switch",
-		props: {
-			// 是否为加载中状态
-			loading: {
-				type: Boolean,
-				default: false
-			},
-			// 是否为禁用装填
-			disabled: {
-				type: Boolean,
-				default: false
-			},
-			// 开关尺寸，单位rpx
-			size: {
-				type: [Number, String],
-				default: 50
-			},
-			// 打开时的背景颜色
-			activeColor: {
-				type: String,
-				default: '#2979ff'
-			},
-			// 关闭时的背景颜色
-			inactiveColor: {
-				type: String,
-				default: '#ffffff'
-			},
-			// 通过v-model双向绑定的值
-			value: {
-				type: Boolean,
-				default: false
-			},
-			// 是否使手机发生短促震动，目前只在iOS的微信小程序有效(2020-05-06)
-			vibrateShort: {
-				type: Boolean,
-				default: false
-			},
-			// 打开选择器时的值
-			activeValue: {
-				type: [Number, String, Boolean],
-				default: true
-			},
-			// 关闭选择器时的值
-			inactiveValue: {
-				type: [Number, String, Boolean],
-				default: false
-			},
+/**
+ * switch 开关选择器
+ * @description 选择开关一般用于只有两个选择，且只能选其一的场景。
+ * @tutorial https://www.uviewui.com/components/switch.html
+ * @property {Boolean} loading 是否处于加载中（默认false）
+ * @property {Boolean} disabled 是否禁用（默认false）
+ * @property {String Number} size 开关尺寸，单位rpx（默认50）
+ * @property {String} active-color 打开时的背景色（默认#2979ff）
+ * @property {Boolean} inactive-color 关闭时的背景色（默认#ffffff）
+ * @property {Boolean | Number | String} active-value 打开选择器时通过change事件发出的值（默认true）
+ * @property {Boolean | Number | String} inactive-value 关闭选择器时通过change事件发出的值（默认false）
+ * @event {Function} change 在switch打开或关闭时触发
+ * @example <u-switch v-model="checked" active-color="red" inactive-color="#eee"></u-switch>
+ */
+export default {
+	name: 'u-switch',
+	props: {
+		// 是否为加载中状态
+		loading: {
+			type: Boolean,
+			default: false
 		},
-		data() {
-			return {
-
-			}
+		// 是否为禁用装填
+		disabled: {
+			type: Boolean,
+			default: false
 		},
-		computed: {
-			switchStyle() {
-				let style = {};
-				style.fontSize = this.size + 'rpx';
-				style.backgroundColor = this.value ? this.activeColor : this.inactiveColor;
-				return style;
-			},
-			loadingColor() {
-				return this.value ? this.activeColor : null;
-			}
+		// 开关尺寸，单位rpx
+		size: {
+			type: [Number, String],
+			default: 50
+		},
+		// 打开时的背景颜色
+		activeColor: {
+			type: String,
+			default: '#2979ff'
+		},
+		// 关闭时的背景颜色
+		inactiveColor: {
+			type: String,
+			default: '#ffffff'
+		},
+		// 通过v-model双向绑定的值
+		value: {
+			type: Boolean,
+			default: false
+		},
+		// 是否使手机发生短促震动，目前只在iOS的微信小程序有效(2020-05-06)
+		vibrateShort: {
+			type: Boolean,
+			default: false
+		},
+		// 打开选择器时的值
+		activeValue: {
+			type: [Number, String, Boolean],
+			default: true
+		},
+		// 关闭选择器时的值
+		inactiveValue: {
+			type: [Number, String, Boolean],
+			default: false
+		}
+	},
+	data() {
+		return {};
+	},
+	computed: {
+		switchStyle() {
+			let style = {};
+			style.fontSize = this.size + 'rpx';
+			style.backgroundColor = this.value ? this.activeColor : this.inactiveColor;
+			return style;
 		},
-		methods: {
-			onClick() {
-				if (!this.disabled && !this.loading) {
-					// 使手机产生短促震动，微信小程序有效，APP(HX 2.6.8)和H5无效
-					if(this.vibrateShort) uni.vibrateShort();
-					this.$emit('input', !this.value);
-					// 放到下一个生命周期，因为双向绑定的value修改父组件状态需要时间，且是异步的
-					this.$nextTick(() => {
-						this.$emit('change', this.value ? this.activeValue : this.inactiveValue);
-					})
-				}
+		loadingColor() {
+			return this.value ? this.activeColor : null;
+		}
+	},
+	methods: {
+		onClick() {
+			if (!this.disabled && !this.loading) {
+				// 使手机产生短促震动，微信小程序有效，APP(HX 2.6.8)和H5无效
+				if (this.vibrateShort) uni.vibrateShort();
+				this.$emit('input', !this.value);
+				// 放到下一个生命周期，因为双向绑定的value修改父组件状态需要时间，且是异步的
+				this.$nextTick(() => {
+					this.$emit('change', this.value ? this.activeValue : this.inactiveValue);
+				});
 			}
 		}
-	};
+	}
+};
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/style.components.scss";
-	
-	.u-switch {
-		position: relative;
-		/* #ifndef APP-NVUE */
-		display: inline-block;
-		/* #endif */
-		box-sizing: initial;
-		width: 2em;
-		height: 1em;
-		background-color: #fff;
-		border: 1px solid rgba(0, 0, 0, 0.1);
-		border-radius: 1em;
-		transition: background-color 0.3s;
-		font-size: 50rpx;
-	}
+@import '../../libs/css/style.components.scss';
 
-	.u-switch__node {
-		@include vue-flex;
-		align-items: center;
-		justify-content: center;
-		position: absolute;
-		top: 0;
-		left: 0;
-		border-radius: 100%;
-		z-index: 1;
-		background-color: #fff;
-		background-color: #fff;
-		box-shadow: 0 3px 1px 0 rgba(0, 0, 0, 0.05), 0 2px 2px 0 rgba(0, 0, 0, 0.1), 0 3px 3px 0 rgba(0, 0, 0, 0.05);
-		box-shadow: 0 3px 1px 0 rgba(0, 0, 0, 0.05), 0 2px 2px 0 rgba(0, 0, 0, 0.1), 0 3px 3px 0 rgba(0, 0, 0, 0.05);
-		transition: transform 0.3s cubic-bezier(0.3, 1.05, 0.4, 1.05);
-		transition: transform 0.3s cubic-bezier(0.3, 1.05, 0.4, 1.05), -webkit-transform 0.3s cubic-bezier(0.3, 1.05, 0.4, 1.05);
-		transition: transform cubic-bezier(0.3, 1.05, 0.4, 1.05);
-		transition: transform 0.3s cubic-bezier(0.3, 1.05, 0.4, 1.05)
-	}
+.u-switch {
+	position: relative;
+	/* #ifndef APP-NVUE */
+	display: inline-block;
+	/* #endif */
+	box-sizing: initial;
+	width: 2em;
+	height: 1em;
+	background-color: #fff;
+	border: 1px solid rgba(0, 0, 0, 0.1);
+	border-radius: 1em;
+	transition: background-color 0.3s;
+	font-size: 50rpx;
+}
 
-	.u-switch__loading {
-		@include vue-flex;
-		align-items: center;
-		justify-content: center;
-	}
+.u-switch__node {
+	@include vue-flex;
+	align-items: center;
+	justify-content: center;
+	position: absolute;
+	top: 0;
+	left: 0;
+	border-radius: 100%;
+	z-index: 1;
+	background-color: #fff;
+	background-color: #fff;
+	box-shadow: 0 3px 1px 0 rgba(0, 0, 0, 0.05), 0 2px 2px 0 rgba(0, 0, 0, 0.1), 0 3px 3px 0 rgba(0, 0, 0, 0.05);
+	box-shadow: 0 3px 1px 0 rgba(0, 0, 0, 0.05), 0 2px 2px 0 rgba(0, 0, 0, 0.1), 0 3px 3px 0 rgba(0, 0, 0, 0.05);
+	transition: transform 0.3s cubic-bezier(0.3, 1.05, 0.4, 1.05);
+	transition: transform 0.3s cubic-bezier(0.3, 1.05, 0.4, 1.05), -webkit-transform 0.3s cubic-bezier(0.3, 1.05, 0.4, 1.05);
+	transition: transform cubic-bezier(0.3, 1.05, 0.4, 1.05);
+	transition: transform 0.3s cubic-bezier(0.3, 1.05, 0.4, 1.05);
+}
 
-	.u-switch--on {
-		background-color: #1989fa;
-	}
+.u-switch__loading {
+	@include vue-flex;
+	align-items: center;
+	justify-content: center;
+}
 
-	.u-switch--on .u-switch__node {
-		transform: translateX(100%);
-	}
+.u-switch--on {
+	background-color: #1989fa;
+}
 
-	.u-switch--disabled {
-		opacity: 0.4;
-	}
+.u-switch--on .u-switch__node {
+	transform: translateX(100%);
+}
+
+.u-switch--disabled {
+	opacity: 0.4;
+}
 </style>
diff --git a/uview-ui/components/u-tabbar/u-tabbar.vue b/uview-ui/components/u-tabbar/u-tabbar.vue
deleted file mode 100644
index a13f823e..00000000
--- a/uview-ui/components/u-tabbar/u-tabbar.vue
+++ /dev/null
@@ -1,345 +0,0 @@
-<template>
-	<view v-if="show" class="u-tabbar" @touchmove.stop.prevent="() => {}">
-		<view
-			class="u-tabbar__content safe-area-inset-bottom"
-			:style="{
-				height: $u.addUnit(height),
-				backgroundColor: bgColor
-			}"
-			:class="{
-				'u-border-top': borderTop
-			}"
-		>
-			<view
-				class="u-tabbar__content__item"
-				v-for="(item, index) in list"
-				:key="index"
-				:class="{
-					'u-tabbar__content__circle': midButton && item.midButton
-				}"
-				@tap.stop="clickHandler(index)"
-				:style="{
-					backgroundColor: bgColor
-				}"
-			>
-				<view :class="[midButton && item.midButton ? 'u-tabbar__content__circle__button' : 'u-tabbar__content__item__button']">
-					<u-icon
-						:size="midButton && item.midButton ? midButtonSize : iconSize"
-						:name="elIconPath(index)"
-						img-mode="scaleToFill"
-						:color="elColor(index)"
-						:custom-prefix="item.customIcon ? 'custom-icon' : 'uicon'"
-					></u-icon>
-					<u-badge :count="item.count" :is-dot="item.isDot" v-if="item.count" :offset="[-2, getOffsetRight(item.count, item.isDot)]"></u-badge>
-				</view>
-				<view
-					class="u-tabbar__content__item__text"
-					:style="{
-						color: elColor(index)
-					}"
-				>
-					<text class="u-line-1">{{ item.text }}</text>
-				</view>
-			</view>
-			<view
-				v-if="midButton"
-				class="u-tabbar__content__circle__border"
-				:class="{
-					'u-border': borderTop
-				}"
-				:style="{
-					backgroundColor: bgColor,
-					left: midButtonLeft
-				}"
-			></view>
-		</view>
-		<!-- 这里加上一个48rpx的高度,是为了增高有凸起按钮时的防塌陷高度(也即按钮凸出来部分的高度) -->
-		<view
-			class="u-fixed-placeholder safe-area-inset-bottom"
-			:style="{
-				height: `calc(${$u.addUnit(height)} + ${midButton ? 48 : 0}rpx)`
-			}"
-		></view>
-	</view>
-</template>
-
-<script>
-export default {
-	props: {
-		// 显示与否
-		show: {
-			type: Boolean,
-			default: true
-		},
-		// 通过v-model绑定current值
-		value: {
-			type: [String, Number],
-			default: 0
-		},
-		// 整个tabbar的背景颜色
-		bgColor: {
-			type: String,
-			default: '#ffffff'
-		},
-		// tabbar的高度，默认50px，单位任意，如果为数值，则为rpx单位
-		height: {
-			type: [String, Number],
-			default: '50px'
-		},
-		// 非凸起图标的大小，单位任意，数值默认rpx
-		iconSize: {
-			type: [String, Number],
-			default: 40
-		},
-		// 凸起的图标的大小，单位任意，数值默认rpx
-		midButtonSize: {
-			type: [String, Number],
-			default: 90
-		},
-		// 激活时的演示，包括字体图标，提示文字等的演示
-		activeColor: {
-			type: String,
-			default: '#303133'
-		},
-		// 未激活时的颜色
-		inactiveColor: {
-			type: String,
-			default: '#606266'
-		},
-		// 是否显示中部的凸起按钮
-		midButton: {
-			type: Boolean,
-			default: false
-		},
-		// 配置参数
-		list: {
-			type: Array,
-			default() {
-				return [];
-			}
-		},
-		// 切换前的回调
-		beforeSwitch: {
-			type: Function,
-			default: null
-		},
-		// 是否显示顶部的横线
-		borderTop: {
-			type: Boolean,
-			default: true
-		},
-		// 是否隐藏原生tabbar
-		hideTabBar: {
-			type: Boolean,
-			default: true
-		}
-	},
-	data() {
-		return {
-			// 由于安卓太菜了，通过css居中凸起按钮的外层元素有误差，故通过js计算将其居中
-			midButtonLeft: '50%',
-			pageUrl: '' // 当前页面URL
-		};
-	},
-	created() {
-		// 是否隐藏原生tabbar
-		if (this.hideTabBar) uni.hideTabBar();
-		// 获取引入了u-tabbar页面的路由地址，该地址没有路径前面的"/"
-		let pages = getCurrentPages();
-		// 页面栈中的最后一个即为项为当前页面，route属性为页面路径
-		this.pageUrl = pages[pages.length - 1].route;
-	},
-	computed: {
-		elIconPath() {
-			return index => {
-				// 历遍u-tabbar的每一项item时，判断是否传入了pagePath参数，如果传入了
-				// 和data中的pageUrl参数对比，如果相等，即可判断当前的item对应当前的tabbar页面，设置高亮图标
-				// 采用这个方法，可以无需使用v-model绑定的value值
-				let pagePath = this.list[index].pagePath;
-				// 如果定义了pagePath属性，意味着使用系统自带tabbar方案，否则使用一个页面用几个组件模拟tabbar页面的方案
-				// 这两个方案对处理tabbar item的激活与否方式不一样
-				if (pagePath) {
-					if (pagePath == this.pageUrl || pagePath == '/' + this.pageUrl) {
-						return this.list[index].selectedIconPath;
-					} else {
-						return this.list[index].iconPath;
-					}
-				} else {
-					// 普通方案中，索引等于v-model值时，即为激活项
-					return index == this.value ? this.list[index].selectedIconPath : this.list[index].iconPath;
-				}
-			};
-		},
-		elColor() {
-			return index => {
-				// 判断方法同理于elIconPath
-				let pagePath = this.list[index].pagePath;
-				if (pagePath) {
-					if (pagePath == this.pageUrl || pagePath == '/' + this.pageUrl) return this.activeColor;
-					else return this.inactiveColor;
-				} else {
-					return index == this.value ? this.activeColor : this.inactiveColor;
-				}
-			};
-		}
-	},
-	mounted() {
-		this.midButton && this.getMidButtonLeft();
-	},
-	methods: {
-		async clickHandler(index) {
-			if (this.beforeSwitch && typeof this.beforeSwitch === 'function') {
-				// 执行回调，同时传入索引当作参数
-				// 在微信，支付宝等环境(H5正常)，会导致父组件定义的customBack()函数体中的this变成子组件的this
-				// 通过bind()方法，绑定父组件的this，让this.customBack()的this为父组件的上下文
-				let beforeSwitch = this.beforeSwitch.bind(this.$u.$parent.call(this))(index);
-				// 判断是否返回了promise
-				if (!!beforeSwitch && typeof beforeSwitch.then === 'function') {
-					await beforeSwitch
-						.then(res => {
-							// promise返回成功，
-							this.switchTab(index);
-						})
-						.catch(err => {});
-				} else if (beforeSwitch === true) {
-					// 如果返回true
-					this.switchTab(index);
-				}
-			} else {
-				this.switchTab(index);
-			}
-		},
-		// 切换tab
-		switchTab(index) {
-			// 发出事件和修改v-model绑定的值
-			this.$emit('change', index);
-			// 如果有配置pagePath属性，使用uni.switchTab进行跳转
-			if (this.list[index].pagePath) {
-				uni.switchTab({
-					url: this.list[index].pagePath
-				});
-			} else {
-				// 如果配置了papgePath属性，将不会双向绑定v-model传入的value值
-				// 因为这个模式下，不再需要v-model绑定的value值了，而是通过getCurrentPages()适配
-				this.$emit('input', index);
-			}
-		},
-		// 计算角标的right值
-		getOffsetRight(count, isDot) {
-			// 点类型，count大于9(两位数)，分别设置不同的right值，避免位置太挤
-			if (isDot) {
-				return -20;
-			} else if (count > 9) {
-				return -40;
-			} else {
-				return -30;
-			}
-		},
-		// 获取凸起按钮外层元素的left值，让其水平居中
-		getMidButtonLeft() {
-			let windowWidth = this.$u.sys().windowWidth;
-			// 由于安卓中css计算left: 50%的结果不准确，故用js计算
-			this.midButtonLeft = windowWidth / 2 + 'px';
-		}
-	}
-};
-</script>
-
-<style scoped lang="scss">
-@import '../../libs/css/style.components.scss';
-.u-fixed-placeholder {
-	/* #ifndef APP-NVUE */
-	box-sizing: content-box;
-	/* #endif */
-}
-
-.u-tabbar {
-	&__content {
-		@include vue-flex;
-		align-items: center;
-		position: relative;
-		position: fixed;
-		bottom: 0;
-		left: 0;
-		width: 100%;
-		z-index: 998;
-		/* #ifndef APP-NVUE */
-		box-sizing: content-box;
-		/* #endif */
-
-		&__circle__border {
-			border-radius: 100%;
-			width: 110rpx;
-			height: 110rpx;
-			top: -48rpx;
-			position: absolute;
-			z-index: 4;
-			background-color: #ffffff;
-			// 由于安卓的无能，导致只有3个tabbar item时，此css计算方式有误差
-			// 故使用js计算的形式来定位，此处不注释，是因为js计算有延后，避免出现位置闪动
-			left: 50%;
-			transform: translateX(-50%);
-
-			&:after {
-				border-radius: 100px;
-			}
-		}
-
-		&__item {
-			flex: 1;
-			justify-content: center;
-			height: 100%;
-			padding: 12rpx 0;
-			@include vue-flex;
-			flex-direction: column;
-			align-items: center;
-			position: relative;
-
-			&__button {
-				position: absolute;
-				top: 14rpx;
-				left: 50%;
-				transform: translateX(-50%);
-			}
-
-			&__text {
-				color: $u-content-color;
-				font-size: 26rpx;
-				line-height: 28rpx;
-				position: absolute;
-				bottom: 14rpx;
-				left: 50%;
-				transform: translateX(-50%);
-				width: 100%;
-				text-align: center;
-			}
-		}
-
-		&__circle {
-			position: relative;
-			@include vue-flex;
-			flex-direction: column;
-			justify-content: space-between;
-			z-index: 10;
-			/* #ifndef APP-NVUE */
-			height: calc(100% - 1px);
-			/* #endif */
-
-			&__button {
-				width: 90rpx;
-				height: 90rpx;
-				border-radius: 100%;
-				@include vue-flex;
-				justify-content: center;
-				align-items: center;
-				position: absolute;
-				background-color: #ffffff;
-				top: -40rpx;
-				left: 50%;
-				z-index: 6;
-				transform: translateX(-50%);
-			}
-		}
-	}
-}
-</style>
diff --git a/uview-ui/components/u-table/u-table.vue b/uview-ui/components/u-table/u-table.vue
deleted file mode 100644
index 79df16f3..00000000
--- a/uview-ui/components/u-table/u-table.vue
+++ /dev/null
@@ -1,84 +0,0 @@
-<template>
-	<view class="u-table" :style="[tableStyle]">
-		<slot />
-	</view>
-</template>
-
-<script>
-	/**
-	 * table 表格
-	 * @description 表格组件一般用于展示大量结构化数据的场景
-	 * @tutorial https://www.uviewui.com/components/table.html
-	 * @property {String} border-color 表格边框的颜色（默认#e4e7ed）
-	 * @property {String} bg-color 表格的背景颜色（默认#ffffff）
-	 * @property {String} align 单元格的内容对齐方式，作用类似css的text-align（默认center）
-	 * @property {String} padding 单元格的内边距，同css的padding写法（默认10rpx 0）
-	 * @property {String Number} font-size 单元格字体大小，单位rpx（默认28）
-	 * @property {String} color 单元格字体颜色（默认#606266）
-	 * @property {Object} th-style th单元格的样式，对象形式(将th所需参数放在table组件，是为了避免每一个th组件要写一遍）
-	 * @event {Function} click 点击组件时触发
-	 * @event {Function} close 点击关闭按钮时触发
-	 * @example <u-table></u-table>
-	 */
-	export default {
-		name: "u-table",
-		props: {
-			borderColor: {
-				type: String,
-				default: '#e4e7ed'
-			},
-			align: {
-				type: String,
-				default: 'center'
-			},
-			// td的内边距
-			padding: {
-				type: String,
-				default: '10rpx 6rpx'
-			},
-			// 字体大小
-			fontSize: {
-				type: [String, Number],
-				default: 28
-			},
-			// 字体颜色
-			color: {
-				type: String,
-				default: '#606266'
-			},
-			// th的自定义样式
-			thStyle: {
-				type: Object,
-				default () {
-					return {}
-				}
-			},
-			// table的背景颜色
-			bgColor: {
-				type: String,
-				default: '#ffffff'
-			}
-		},
-		data() {
-			return {}
-		},
-		computed: {
-			tableStyle() {
-				let style = {};
-				style.borderLeft = `solid 1px ${this.borderColor}`;
-				style.borderTop = `solid 1px ${this.borderColor}`;
-				style.backgroundColor = this.bgColor;;
-				return style;
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	@import "../../libs/css/style.components.scss";
-	
-	.u-table {
-		width: 100%;
-		box-sizing: border-box;
-	}
-</style>
diff --git a/uview-ui/components/u-tabs-swiper/u-tabs-swiper.vue b/uview-ui/components/u-tabs-swiper/u-tabs-swiper.vue
deleted file mode 100644
index a53e2618..00000000
--- a/uview-ui/components/u-tabs-swiper/u-tabs-swiper.vue
+++ /dev/null
@@ -1,488 +0,0 @@
-<template>
-	<view class="u-tabs" :style="{
-			zIndex: zIndex,
-			background: bgColor
-		}">
-		<scroll-view scroll-x class="u-scroll-view" :scroll-left="scrollLeft" scroll-with-animation :style="{ zIndex: zIndex + 1 }">
-			<view class="u-tabs-scroll-box" :class="{'u-tabs-scorll-flex': !isScroll}">
-				<view class="u-tabs-item" :style="[tabItemStyle(index)]"
-				 v-for="(item, index) in getTabs" :key="index" :class="[preId + index]" @tap="emit(index)">
-					<u-badge :count="item[count] || item['count'] || 0" :offset="offset" size="mini"></u-badge>
-					{{ item[name] || item['name']}}
-				</view>
-				<view v-if="showBar" class="u-scroll-bar" :style="[tabBarStyle]"></view>
-			</view>
-		</scroll-view>
-	</view>
-</template>
-
-<script>
-	import colorGradient from '../../libs/function/colorGradient';
-	let color = colorGradient;
-	const { windowWidth } = uni.getSystemInfoSync();
-	const preId = 'UEl_';
-
-	/**
-	 * tabsSwiper 全屏选项卡
-	 * @description 该组件内部实现主要依托于uniapp的scroll-view和swiper组件，主要特色是切换过程中，tabsSwiper文字的颜色可以渐变，底部滑块可以 跟随式滑动，活动tab滚动居中等。应用场景可以用于需要左右切换页面，比如商城的订单中心(待收货-待付款-待评价-已退货)等应用场景。
-	 * @tutorial https://www.uviewui.com/components/tabsSwiper.html
-	 * @property {Boolean} is-scroll tabs是否可以左右拖动（默认true）
-	 * @property {Array} list 标签数组，元素为对象，如[{name: '推荐'}]
-	 * @property {String Number} current 指定哪个tab为激活状态（默认0）
-	 * @property {String Number} height 导航栏的高度，单位rpx（默认80）
-	 * @property {String Number} font-size tab文字大小，单位rpx（默认30）
-	 * @property {String Number} swiper-width tabs组件外部swiper的宽度，默认为屏幕宽度，单位rpx（默认750）
-	 * @property {String} active-color 滑块和激活tab文字的颜色（默认#2979ff）
-	 * @property {String} inactive-color tabs文字颜色（默认#303133）
-	 * @property {String Number} bar-width 滑块宽度，单位rpx（默认40）
-	 * @property {String Number} bar-height 滑块高度，单位rpx（默认6）
-	 * @property {Object} bar-style 底部滑块的样式，对象形式
-	 * @property {Object} active-item-style 活动tabs item的样式，对象形式
-	 * @property {Boolean} show-bar 是否显示底部的滑块（默认true）
-	 * @property {String Number} gutter 单个tab标签的左右内边距之和，单位rpx（默认40）
-	 * @property {String} bg-color tabs导航栏的背景颜色（默认#ffffff）
-	 * @property {String} name 组件内部读取的list参数中的属性名，见官网说明（默认name）
-	 * @property {String} count 组件内部读取的list参数中的属性名（badge徽标数），同name属性的使用，见官网说明（默认count）
-	 * @property {Array} offset 设置badge徽标数的位置偏移，格式为 [x, y]，也即设置的为top和right的值，单位rpx（默认[5, 20]）
-	 * @property {Boolean} bold 激活选项的字体是否加粗（默认true）
-	 * @event {Function} change 点击标签时触发
-	 * @example <u-tabs-swiper ref="tabs" :list="list" :is-scroll="false"></u-tabs-swiper>
-	 */
-	export default {
-		name: "u-tabs-swiper",
-		props: {
-			// 导航菜单是否需要滚动，如只有2或者3个的时候，就不需要滚动了，此时使用flex平分tab的宽度
-			isScroll: {
-				type: Boolean,
-				default: true
-			},
-			//需循环的标签列表
-			list: {
-				type: Array,
-				default () {
-					return [];
-				}
-			},
-			// 当前活动tab的索引
-			current: {
-				type: [Number, String],
-				default: 0
-			},
-			// 导航栏的高度和行高，单位rpx
-			height: {
-				type: [Number, String],
-				default: 80
-			},
-			// 字体大小，单位rpx
-			fontSize: {
-				type: [Number, String],
-				default: 30
-			},
-			// 过渡动画时长, 单位s
-			// duration: {
-			// 	type: [Number, String],
-			// 	default: 0.5
-			// },
-			swiperWidth: {
-				//line3生效, 外部swiper的宽度, 单位rpx
-				type: [String, Number],
-				default: 750
-			},
-			// 选中项的主题颜色
-			activeColor: {
-				type: String,
-				default: '#2979ff'
-			},
-			// 未选中项的颜色
-			inactiveColor: {
-				type: String,
-				default: '#303133'
-			},
-			// 菜单底部移动的bar的宽度，单位rpx
-			barWidth: {
-				type: [Number, String],
-				default: 40
-			},
-			// 移动bar的高度
-			barHeight: {
-				type: [Number, String],
-				default: 6
-			},
-			// 单个tab的左或右内边距（各占一半），单位rpx
-			gutter: {
-				type: [Number, String],
-				default: 40
-			},
-			// 如果是绝对定位，添加z-index值
-			zIndex: {
-				type: [Number, String],
-				default: 1
-			},
-			// 导航栏的背景颜色
-			bgColor: {
-				type: String,
-				default: '#ffffff'
-			},
-			//滚动至中心目标类型
-			autoCenterMode: {
-				type: String,
-				default: 'window'
-			},
-			// 读取传入的数组对象的属性(tab名称)
-			name: {
-				type: String,
-				default: 'name'
-			},
-			// 读取传入的数组对象的属性(徽标数)
-			count: {
-				type: String,
-				default: 'count'
-			},
-			// 徽标数位置偏移
-			offset: {
-				type: Array,
-				default: () => {
-					return [5, 20]
-				}
-			},
-			// 活动tab字体是否加粗
-			bold: {
-				type: Boolean,
-				default: true
-			},
-			// 当前活动tab item的样式
-			activeItemStyle: {
-				type: Object,
-				default() {
-					return {}
-				}
-			},
-			// 是否显示底部的滑块
-			showBar: {
-				type: Boolean,
-				default: true
-			},
-			// 底部滑块的自定义样式
-			barStyle: {
-				type: Object,
-				default() {
-					return {}
-				}
-			}
-		},
-		data() {
-			return {
-				scrollLeft: 0, // 滚动scroll-view的左边滚动距离
-				tabQueryInfo: [], // 存放对tab菜单查询后的节点信息
-				windowWidth: 0, // 屏幕宽度，单位为px
-				//scrollBarLeft: 0, // 移动bar需要通过translateX()移动的距离
-				animationFinishCurrent: this.current,
-				componentsWidth: 0,
-				line3AddDx: 0,
-				line3Dx: 0,
-				preId,
-				sW: 0,
-				tabsInfo: [],
-				colorGradientArr: [],
-				colorStep: 100 // 两个颜色之间的渐变等分
-			};
-		},
-		computed: {
-			// 获取当前活跃的current值
-			getCurrent() {
-				const current = Number(this.current);
-				// 判断是否超出边界
-				if (current > this.getTabs.length - 1) {
-					return this.getTabs.length - 1;
-				}
-				if (current < 0) return 0;
-				return current;
-			},
-			getTabs() {
-				return this.list;
-			},
-			// 滑块需要移动的距离
-			scrollBarLeft() {
-				return Number(this.line3Dx) + Number(this.line3AddDx);
-			},
-			// 滑块的宽度转为px单位
-			barWidthPx() {
-				return uni.upx2px(this.barWidth);
-			},
-			// tab的样式
-			tabItemStyle() {
-				return (index) => {
-					let style = {
-						height: this.height + 'rpx',
-						lineHeight: this.height + 'rpx',
-						padding: `0 ${this.gutter / 2}rpx`,
-						color: this.tabsInfo.length > 0 ? (this.tabsInfo[index] ? this.tabsInfo[index].color : this.activeColor) : this.inactiveColor,
-						fontSize: this.fontSize + 'rpx',
-						zIndex: this.zIndex + 2,
-						fontWeight: (index == this.getCurrent && this.bold) ? 'bold' : 'normal'
-					};
-					if(index == this.getCurrent) {
-						// 给选中的tab item添加外部自定义的样式
-						style = Object.assign(style, this.activeItemStyle);
-					}
-					return style;
-				}
-			},
-			// 底部滑块的样式
-			tabBarStyle() {
-				let style = {
-					width: this.barWidthPx + 'px',
-					height: this.barHeight + 'rpx',
-					borderRadius: '100px',
-					backgroundColor: this.activeColor,
-					left: this.scrollBarLeft + 'px'
-				};
-				return Object.assign(style, this.barStyle);
-			}
-		},
-		watch: {
-			current(n, o) {
-				this.change(n);
-				this.setFinishCurrent(n);
-			},
-			list() {
-				this.$nextTick(() => {
-					this.init();
-				})
-			}
-		},
-		mounted() {
-			this.init();
-		},
-		methods: {
-			async init() {
-				this.countPx();
-				await this.getTabsInfo();
-				this.countLine3Dx();
-				this.getQuery(() => {
-					this.setScrollViewToCenter();
-				});
-				// 颜色渐变过程数组
-				this.colorGradientArr = color.colorGradient(this.inactiveColor, this.activeColor, this.colorStep);
-			},
-			// 获取各个tab的节点信息
-			getTabsInfo() {
-				return new Promise((resolve, reject) => {
-					let view = uni.createSelectorQuery().in(this);
-					for (let i = 0; i < this.list.length; i++) {
-						view.select('.' + preId + i).boundingClientRect();
-					}
-					view.exec(res => {
-						const arr = [];
-						for (let i = 0; i < res.length; i++) {
-							// 给每个tab添加其文字颜色属性
-							res[i].color = this.inactiveColor;
-							// 当前tab直接赋予activeColor
-							if (i == this.getCurrent) res[i].color = this.activeColor;
-							arr.push(res[i]);
-						}
-						this.tabsInfo = arr;
-						resolve();
-					});
-				})
-			},
-			// 当swiper滑动结束，计算滑块最终要停留的位置
-			countLine3Dx() {
-				const tab = this.tabsInfo[this.animationFinishCurrent];
-				// 让滑块中心点和当前tab中心重合
-				if (tab) this.line3Dx = tab.left + tab.width / 2 - this.barWidthPx / 2 - this.tabsInfo[0].left;
-			},
-			countPx() {
-				// swiper宽度由rpx转为px单位，因为dx等，都是px单位
-				this.sW = uni.upx2px(Number(this.swiperWidth));
-			},
-			emit(index) {
-				this.$emit('change', index);
-			},
-			change() {
-				this.setScrollViewToCenter();
-			},
-			getQuery(cb) {
-				try {
-					let view = uni.createSelectorQuery().in(this).select('.u-tabs');
-					view.fields({
-							size: true
-						},
-						data => {
-							if (data) {
-								this.componentsWidth = data.width;
-								if (cb && typeof cb === 'function') cb(data);
-							} else {
-								this.getQuery(cb);
-							}
-						}
-					).exec();
-				} catch (e) {
-					this.componentsWidth = windowWidth;
-				}
-			},
-			// 把活动tab移动到屏幕中心点
-			setScrollViewToCenter() {
-				let tab;
-				tab = this.tabsInfo[this.animationFinishCurrent];
-				if (tab) {
-					let tabCenter = tab.left + tab.width / 2;
-					let fatherWidth;
-					// 活动tab移动到中心时，以屏幕还是tab组件为宽度为基准
-					if (this.autoCenterMode === 'window') {
-						fatherWidth = windowWidth;
-					} else {
-						fatherWidth = this.componentsWidth;
-					}
-					this.scrollLeft = tabCenter - fatherWidth / 2;
-				}
-			},
-			setDx(dx) {
-				let nextTabIndex = dx > 0 ? this.animationFinishCurrent + 1 : this.animationFinishCurrent - 1;
-				// 判断索引是否超出边界
-				nextTabIndex = nextTabIndex <= 0 ? 0 : nextTabIndex;
-				nextTabIndex = nextTabIndex >= this.list.length ? this.list.length - 1 : nextTabIndex;
-				const tab = this.tabsInfo[nextTabIndex];
-				// 当前tab中心点x轴坐标
-				let nowTab = this.tabsInfo[this.animationFinishCurrent];
-				let nowTabX = nowTab.left + nowTab.width / 2;
-				// 下一个tab
-				let nextTab = this.tabsInfo[nextTabIndex];
-				let nextTabX = nextTab.left + nextTab.width / 2;
-				// 两个tab之间的距离，因为下一个tab可能在当前tab的左边或者右边，取绝对值即可
-				let distanceX = Math.abs(nextTabX - nowTabX);
-				this.line3AddDx = (dx / this.sW) * distanceX;
-				this.setTabColor(this.animationFinishCurrent, nextTabIndex, dx);
-			},
-			// 设置tab的颜色
-			setTabColor(nowTabIndex, nextTabIndex, dx) {
-				let colorIndex = Math.abs(Math.ceil((dx / this.sW) * 100));
-				let colorLength = this.colorGradientArr.length;
-				// 处理超出索引边界的情况
-				colorIndex = colorIndex >= colorLength ? colorLength - 1 : colorIndex <= 0 ? 0 : colorIndex;
-				// 设置下一个tab的颜色
-				this.tabsInfo[nextTabIndex].color = this.colorGradientArr[colorIndex];
-				// 设置当前tab的颜色
-				this.tabsInfo[nowTabIndex].color = this.colorGradientArr[colorLength - 1 - colorIndex];
-			},
-			// swiper结束滑动
-			setFinishCurrent(current) {
-				// 如果滑动的索引不一致，修改tab颜色变化，因为可能会有直接点击tab的情况
-				this.tabsInfo.map((val, index) => {
-					if (current == index) val.color = this.activeColor;
-					else val.color = this.inactiveColor;
-					return val;
-				});
-				this.line3AddDx = 0;
-				this.animationFinishCurrent = current;
-				this.countLine3Dx();
-			}
-		}
-	};
-</script>
-
-<style scoped lang="scss">
-	@import "../../libs/css/style.components.scss";
-
-	view,
-	scroll-view {
-		box-sizing: border-box;
-	}
-
-	.u-tabs {
-		width: 100%;
-		transition-property: background-color, color;
-	}
-
-	/* #ifndef APP-NVUE */
-	::-webkit-scrollbar,
-	::-webkit-scrollbar,
-	::-webkit-scrollbar {
-		display: none;
-		width: 0 !important;
-		height: 0 !important;
-		-webkit-appearance: none;
-		background: transparent;
-	}
-	/* #endif */
-
-	/* #ifdef H5 */
-	// 通过样式穿透，隐藏H5下，scroll-view下的滚动条
-	scroll-view ::v-deep ::-webkit-scrollbar {
-		display: none;
-		width: 0 !important;
-		height: 0 !important;
-		-webkit-appearance: none;
-		background: transparent;
-	}
-
-	/* #endif */
-
-	.u-scroll-view {
-		width: 100%;
-		white-space: nowrap;
-		position: relative;
-	}
-
-	.u-tabs-scroll-box {
-		position: relative;
-	}
-
-	.u-tabs-scorll-flex {
-		@include vue-flex;
-		justify-content: space-between;
-	}
-
-	.u-tabs-scorll-flex .u-tabs-item {
-		flex: 1;
-	}
-
-	.u-tabs-item {
-		position: relative;
-		display: inline-block;
-		text-align: center;
-		transition-property: background-color, color, font-weight;
-	}
-
-	.content {
-		overflow: hidden;
-		white-space: nowrap;
-		text-overflow: ellipsis;
-	}
-
-	.boxStyle {
-		pointer-events: none;
-		position: absolute;
-		transition-property: all;
-	}
-
-	.boxStyle2 {
-		pointer-events: none;
-		position: absolute;
-		bottom: 0;
-		transition-property: all;
-		transform: translateY(-100%);
-	}
-
-	.itemBackgroundBox {
-		pointer-events: none;
-		position: absolute;
-		top: 0;
-		transition-property: left, background-color;
-		@include vue-flex;
-		flex-direction: row;
-		justify-content: center;
-		align-items: center;
-	}
-
-	.itemBackground {
-		height: 100%;
-		width: 100%;
-		transition-property: all;
-	}
-
-	.u-scroll-bar {
-		position: absolute;
-		bottom: 4rpx;
-	}
-</style>
diff --git a/uview-ui/components/u-tabs/u-tabs.vue b/uview-ui/components/u-tabs/u-tabs.vue
deleted file mode 100644
index bcce7e02..00000000
--- a/uview-ui/components/u-tabs/u-tabs.vue
+++ /dev/null
@@ -1,415 +0,0 @@
-<template>
-	<view
-		class="u-tabs"
-		:style="{
-			background: bgColor
-		}"
-	>
-		<!-- $u.getRect()对组件根节点无效，因为写了.in(this)，故这里获取内层接点尺寸 -->
-		<view :id="id">
-			<scroll-view scroll-x class="u-scroll-view" :scroll-left="scrollLeft" scroll-with-animation>
-				<view class="u-scroll-box u-flex u-col-center" :class="{ 'u-tabs-scorll-flex': !isScroll }">
-					<view class="u-tab-item" :id="'u-tab-item-' + index" v-for="(item, index) in list" :key="index" @tap="clickTab(index)" :style="[tabItemStyle(index)]">
-						<u-badge :count="item[count] || item['count'] || 0" :offset="offset" size="mini"></u-badge>
-						{{ item[name] || item['name'] }}
-						<view v-show="showTextBar" class="u-tabtext-bar" :style="[tabBarTextStyle(index)]">{{ item.description }}</view>
-					</view>
-					<view v-if="showBar" class="u-tab-bar" :style="[tabBarStyle]"></view>
-				</view>
-			</scroll-view>
-		</view>
-	</view>
-</template>
-
-<script>
-/**
- * tabs 标签
- * @description 该组件，是一个tabs标签组件，在标签多的时候，可以配置为左右滑动，标签少的时候，可以禁止滑动。 该组件的一个特点是配置为滚动模式时，激活的tab会自动移动到组件的中间位置。
- * @tutorial https://www.uviewui.com/components/tabs.html
- * @property {Boolean} is-scroll tabs是否可以左右拖动（默认true）
- * @property {Array} list 标签数组，元素为对象，如[{name: '推荐'}]
- * @property {String Number} current 指定哪个tab为激活状态（默认0）
- * @property {String Number} height 导航栏的高度，单位rpx（默认80）
- * @property {String Number} font-size tab文字大小，单位rpx（默认30）
- * @property {String Number} duration 滑块移动一次所需的时间，单位秒（默认0.5）
- * @property {String} active-color 滑块和激活tab文字的颜色（默认#2979ff）
- * @property {String} inactive-color tabs文字颜色（默认#303133）
- * @property {String Number} bar-width 滑块宽度，单位rpx（默认40）
- * @property {Object} active-item-style 活动tabs item的样式，对象形式
- * @property {Object} bar-style 底部滑块的样式，对象形式
- * @property {Boolean} show-bar 是否显示底部的滑块（默认true）
- * @property {String Number} bar-height 滑块高度，单位rpx（默认6）
- * @property {String Number} item-width 标签的宽度（默认auto）
- * @property {String Number} gutter 单个tab标签的左右内边距之和，单位rpx（默认40）
- * @property {String} bg-color tabs导航栏的背景颜色（默认#ffffff）
- * @property {String} name 组件内部读取的list参数中的属性名（tab名称），见官网说明（默认name）
- * @property {String} count 组件内部读取的list参数中的属性名（badge徽标数），同name属性的使用，见官网说明（默认count）
- * @property {Array} offset 设置badge徽标数的位置偏移，格式为 [x, y]，也即设置的为top和right的值，单位rpx（默认[5, 20]）
- * @property {Boolean} bold 激活选项的字体是否加粗（默认true）
- * @event {Function} change 点击标签时触发
- * @example <u-tabs ref="tabs" :list="list" :is-scroll="false"></u-tabs>
- */
-export default {
-	name: 'u-tabs',
-	props: {
-		// 导航菜单是否需要滚动，如只有2或者3个的时候，就不需要滚动了，此时使用flex平分tab的宽度
-		isScroll: {
-			type: Boolean,
-			default: true
-		},
-		//需循环的标签列表
-		list: {
-			type: Array,
-			default() {
-				return [];
-			}
-		},
-		// 当前活动tab的索引
-		current: {
-			type: [Number, String],
-			default: 0
-		},
-		// 导航栏的高度和行高
-		height: {
-			type: [String, Number],
-			default: 80
-		},
-		// 字体大小
-		fontSize: {
-			type: [String, Number],
-			default: 30
-		},
-		// 过渡动画时长, 单位ms
-		duration: {
-			type: [String, Number],
-			default: 0.5
-		},
-		// 选中项的主题颜色
-		activeColor: {
-			type: String,
-			default: '#2979ff'
-		},
-		// 未选中项的颜色
-		inactiveColor: {
-			type: String,
-			default: '#303133'
-		},
-		// 菜单底部移动的bar的宽度，单位rpx
-		barWidth: {
-			type: [String, Number],
-			default: 40
-		},
-		// 移动bar的高度
-		barHeight: {
-			type: [String, Number],
-			default: 6
-		},
-		// 单个tab的左或有内边距（左右相同）
-		gutter: {
-			type: [String, Number],
-			default: 30
-		},
-		// 导航栏的背景颜色
-		bgColor: {
-			type: String,
-			default: '#ffffff'
-		},
-		// 读取传入的数组对象的属性(tab名称)
-		name: {
-			type: String,
-			default: 'name'
-		},
-		// 读取传入的数组对象的属性(徽标数)
-		count: {
-			type: String,
-			default: 'count'
-		},
-		// 徽标数位置偏移
-		offset: {
-			type: Array,
-			default: () => {
-				return [5, 20];
-			}
-		},
-		// 活动tab字体是否加粗
-		bold: {
-			type: Boolean,
-			default: true
-		},
-		// 当前活动tab item的样式
-		activeItemStyle: {
-			type: Object,
-			default() {
-				return {};
-			}
-		},
-		// 是否显示底部的滑块
-		showBar: {
-			type: Boolean,
-			default: true
-		},
-		showTextBar: {
-			type: Boolean,
-			default: false
-		},
-		// 底部滑块的自定义样式
-		barStyle: {
-			type: Object,
-			default() {
-				return {};
-			}
-		},
-		barTextColor: {
-			type: String,
-			default: '#999'
-		},
-		activeTabBarStyle: {
-			type: Object,
-			default: () => {
-				return {
-					color: '#fff',
-					background: 'linear-gradient(90deg, #E9B461, #EECC89)'
-				};
-			}
-		},
-		// 标签的宽度
-		itemWidth: {
-			type: [Number, String],
-			default: 'auto'
-		}
-	},
-	data() {
-		return {
-			scrollLeft: 0, // 滚动scroll-view的左边滚动距离
-			tabQueryInfo: [], // 存放对tab菜单查询后的节点信息
-			componentWidth: 0, // 屏幕宽度，单位为px
-			scrollBarLeft: 0, // 移动bar需要通过translateX()移动的距离
-			parentLeft: 0, // 父元素(tabs组件)到屏幕左边的距离
-			id: this.$u.guid(), // id值
-			currentIndex: this.current,
-			barFirstTimeMove: true // 滑块第一次移动时(页面刚生成时)，无需动画，否则给人怪异的感觉
-		};
-	},
-	watch: {
-		// 监听tab的变化，重新计算tab菜单的布局信息，因为实际使用中菜单可能是通过
-		// 后台获取的（如新闻app顶部的菜单），获取返回需要一定时间，所以list变化时，重新获取布局信息
-		list(n, o) {
-			// list变动时，重制内部索引，否则可能导致超出数组边界的情况
-			if (n.length !== o.length) this.currentIndex = 0;
-			// 用$nextTick等待视图更新完毕后再计算tab的局部信息，否则可能因为tab还没生成就获取，就会有问题
-			this.$nextTick(() => {
-				this.init();
-			});
-		},
-		current: {
-			immediate: true,
-			handler(nVal, oVal) {
-				// 视图更新后再执行移动操作
-				this.$nextTick(() => {
-					this.currentIndex = nVal;
-					this.scrollByIndex();
-				});
-			}
-		}
-	},
-	computed: {
-		// 移动bar的样式
-		tabBarStyle() {
-			let style = {
-				width: this.barWidth + 'rpx',
-				transform: `translate(${this.scrollBarLeft}px, -100%)`,
-				// 滑块在页面渲染后第一次滑动时，无需动画效果
-				'transition-duration': `${this.barFirstTimeMove ? 0 : this.duration}s`,
-				'background-color': this.activeColor,
-				height: this.barHeight + 'rpx',
-				// 设置一个很大的值，它会自动取能用的最大值，不用高度的一半，是因为高度可能是单数，会有小数出现
-				'border-radius': `${this.barHeight / 2}px`
-			};
-			Object.assign(style, this.barStyle);
-			return style;
-		},
-		// 副标题滑动样式
-		tabBarTextStyle() {
-			return index => {
-				let style = {
-					color: this.barTextColor,
-					background: ''
-				};
-				if (index == this.currentIndex) {
-					style = { ...style, ...this.activeTabBarStyle };
-				}
-				return style;
-			};
-		},
-		// tab的样式
-		tabItemStyle() {
-			return index => {
-				let style = {
-					minHeight: this.height + 'rpx',
-					'line-height': this.height + 'rpx',
-					'font-size': this.fontSize + 'rpx',
-					'transition-duration': `${this.duration}s`,
-					padding: this.isScroll ? `0 ${this.gutter}rpx` : '',
-					flex: this.isScroll ? 'auto' : '1',
-					width: this.$u.addUnit(this.itemWidth)
-				};
-				// 字体加粗
-				if (index == this.currentIndex && this.bold) style.fontWeight = 'bold';
-				if (index == this.currentIndex) {
-					style.color = this.activeColor;
-					// 给选中的tab item添加外部自定义的样式
-					style = Object.assign(style, this.activeItemStyle);
-				} else {
-					style.color = this.inactiveColor;
-				}
-				return style;
-			};
-		}
-	},
-	methods: {
-		// 设置一个init方法，方便多处调用
-		async init() {
-			// 获取tabs组件的尺寸信息
-			let tabRect = await this.$uGetRect('#' + this.id);
-			// tabs组件距离屏幕左边的宽度
-			this.parentLeft = tabRect.left;
-			// tabs组件的宽度
-			this.componentWidth = tabRect.width;
-			this.getTabRect();
-		},
-		// 点击某一个tab菜单
-		clickTab(index) {
-			// 点击当前活动tab，不触发事件
-			if (index == this.currentIndex) return;
-			this.currentIndex = index;
-			this.getTabRect();
-			// 发送事件给父组件
-			this.$emit('change', index);
-		},
-		// 查询tab的布局信息
-		getTabRect() {
-			// 创建节点查询
-			let query = uni.createSelectorQuery().in(this);
-			// 历遍所有tab，这里是执行了查询，最终使用exec()会一次性返回查询的数组结果
-			for (let i = 0; i < this.list.length; i++) {
-				// 只要size和rect两个参数
-				query.select(`#u-tab-item-${i}`).fields({
-					size: true,
-					rect: true
-				});
-			}
-			// 执行查询，一次性获取多个结果
-			query.exec(
-				function(res) {
-					this.tabQueryInfo = res;
-					// 初始化滚动条和移动bar的位置
-					this.scrollByIndex();
-				}.bind(this)
-			);
-		},
-		// 滚动scroll-view，让活动的tab处于屏幕的中间位置
-		scrollByIndex() {
-			// 当前活动tab的布局信息，有tab菜单的width和left(为元素左边界到父元素左边界的距离)等信息
-			let tabInfo = this.tabQueryInfo[this.currentIndex];
-			if (!tabInfo) return;
-			// 活动tab的宽度
-			let tabWidth = tabInfo.width;
-			// 活动item的左边到tabs组件左边的距离，用item的left减去tabs的left
-			let offsetLeft = tabInfo.left - this.parentLeft;
-			// 将活动的tabs-item移动到屏幕正中间，实际上是对scroll-view的移动
-			let scrollLeft = offsetLeft - (this.componentWidth - tabWidth) / 2;
-			this.scrollLeft = scrollLeft < 0 ? 0 : scrollLeft;
-			// 当前活动item的中点点到左边的距离减去滑块宽度的一半，即可得到滑块所需的移动距离
-			let left = tabInfo.left + tabInfo.width / 2 - this.parentLeft;
-			// 计算当前活跃item到组件左边的距离
-			this.scrollBarLeft = left - uni.upx2px(this.barWidth) / 2;
-			// 第一次移动滑块的时候，barFirstTimeMove为true，放到延时中将其设置false
-			// 延时是因为scrollBarLeft作用于computed计算时，需要一个过程需，否则导致出错
-			if (this.barFirstTimeMove == true) {
-				setTimeout(() => {
-					this.barFirstTimeMove = false;
-				}, 100);
-			}
-		}
-	},
-	mounted() {
-		this.init();
-	}
-};
-</script>
-
-<style lang="scss" scoped>
-@mixin vue-flex($direction: row) {
-	/* #ifndef APP-NVUE */
-	display: flex;
-	flex-direction: $direction;
-	/* #endif */
-}
-view,
-scroll-view {
-	box-sizing: border-box;
-}
-
-/* #ifndef APP-NVUE */
-::-webkit-scrollbar,
-::-webkit-scrollbar,
-::-webkit-scrollbar {
-	display: none;
-	width: 0 !important;
-	height: 0 !important;
-	-webkit-appearance: none;
-	background: transparent;
-}
-/* #endif */
-
-.u-scroll-box {
-	position: relative;
-	/* #ifdef MP-TOUTIAO */
-	white-space: nowrap;
-	/* #endif */
-}
-
-/* #ifdef H5 */
-// 通过样式穿透，隐藏H5下，scroll-view下的滚动条
-scroll-view ::v-deep ::-webkit-scrollbar {
-	display: none;
-	width: 0 !important;
-	height: 0 !important;
-	-webkit-appearance: none;
-	background: transparent;
-}
-/* #endif */
-
-.u-scroll-view {
-	width: 100%;
-	white-space: nowrap;
-	position: relative;
-}
-
-.u-tab-item {
-	position: relative;
-	/* #ifndef APP-NVUE */
-	display: inline-block;
-	/* #endif */
-	text-align: center;
-	transition-property: background-color, color;
-}
-
-.u-tab-bar {
-	position: absolute;
-	bottom: 0;
-}
-.u-tabtext-bar {
-	color: #fff;
-	border-radius: 15rpx;
-	line-height: 34rpx;
-	height: 34rpx;
-	font-size: 22rpx;
-	font-weight: 500;
-}
-
-.u-tabs-scorll-flex {
-	@include vue-flex;
-	justify-content: space-between;
-}
-</style>
diff --git a/uview-ui/components/u-tag/u-tag.vue b/uview-ui/components/u-tag/u-tag.vue
deleted file mode 100644
index 90ec3f41..00000000
--- a/uview-ui/components/u-tag/u-tag.vue
+++ /dev/null
@@ -1,294 +0,0 @@
-<template>
-	<view v-if="show" :class="[
-		disabled ? 'u-disabled' : '',
-		'u-size-' + size,
-		'u-shape-' + shape,
-		'u-mode-' + mode + '-' + type
-	]"
-	 class="u-tag" :style="[customStyle]" @tap="clickTag">
-		{{text}}
-		<view class="u-icon-wrap" @tap.stop>
-			<u-icon @click="close" size="22" v-if="closeable" :color="closeIconColor" 
-			name="close" class="u-close-icon" :style="[iconStyle]"></u-icon>
-		</view>
-	</view>
-</template>
-
-<script>
-	/**
-	 * tag 提示
-	 * @description 该组件一般用于标记和选择
-	 * @tutorial https://www.uviewui.com/components/tag.html
-	 * @property {String} type 主题类型（默认primary）
-	 * @property {String} size 标签大小（默认default）
-	 * @property {String} shape 标签形状（默认square）
-	 * @property {String} text 标签的文字内容
-	 * @property {String} bg-color 自定义标签的背景颜色
-	 * @property {String} border-color 标签的边框颜色
-	 * @property {String} close-color 关闭按钮的颜色
-	 * @property {String Number} index 点击标签时，会通过click事件返回该值
-	 * @property {String} mode 模式选择，见官网说明（默认light）
-	 * @property {Boolean} closeable 是否可关闭，设置为true，文字右边会出现一个关闭图标（默认false）
-	 * @property {Boolean} show 标签显示与否（默认true）
-	 * @event {Function} click 点击标签触发
-	 * @event {Function} close closeable为true时，点击标签关闭按钮触发
-	 * @example <u-tag text="雪月夜" type="success" />
-	 */
-	export default {
-		name: 'u-tag',
-		// 是否禁用这个标签，禁用的话，会屏蔽点击事件
-		props: {
-			// 标签类型info、primary、success、warning、error
-			type: {
-				type: String,
-				default: 'primary'
-			},
-			disabled: {
-				type: [Boolean, String],
-				default: false
-			},
-			// 标签的大小，分为default（默认），mini（较小）
-			size: {
-				type: String,
-				default: 'default'
-			},
-			// tag的形状，circle（两边半圆形）, square（方形，带圆角），circleLeft（左边是半圆），circleRight（右边是半圆）
-			shape: {
-				type: String,
-				default: 'square'
-			},
-			// 标签文字
-			text: {
-				type: [String, Number],
-				default: ''
-			},
-			// 背景颜色，默认为空字符串，即不处理
-			bgColor: {
-				type: String,
-				default: ''
-			},
-			// 标签字体颜色，默认为空字符串，即不处理
-			color: {
-				type: String,
-				default: ''
-			},
-			// 镂空形式标签的边框颜色
-			borderColor: {
-				type: String,
-				default: ''
-			},
-			// 关闭按钮图标的颜色
-			closeColor: {
-				type: String,
-				default: ''
-			},
-			// 点击时返回的索引值，用于区分例遍的数组哪个元素被点击了
-			index: {
-				type: [Number, String],
-				default: ''
-			},
-			// 模式选择，dark|light|plain
-			mode: {
-				type: String,
-				default: 'light'
-			},
-			// 是否可关闭
-			closeable: {
-				type: Boolean,
-				default: false
-			},
-			// 是否显示
-			show: {
-				type: Boolean,
-				default: true
-			}
-		},
-		data() {
-			return {
-				
-			}
-		},
-		computed: {
-			customStyle() {
-				let style = {};
-				// 文字颜色（如果有此值，会覆盖type值的颜色）
-				if(this.color) style.color = this.color;
-				// tag的背景颜色（如果有此值，会覆盖type值的颜色）
-				if(this.bgColor) style.backgroundColor = this.bgColor;
-				// 如果是镂空型tag，没有传递边框颜色（borderColor）的话，使用文字的颜色（color属性）
-				if(this.mode == 'plain' && this.color && !this.borderColor) style.borderColor = this.color;
-				else style.borderColor = this.borderColor;
-				return style;
-			},
-			iconStyle() {
-				if(!this.closeable) return ;
-				let style = {};
-				if(this.size == 'mini') style.fontSize = '20rpx';
-				else style.fontSize = '22rpx';
-				if(this.mode == 'plain' || this.mode == 'light') style.color = this.type;
-				else if(this.mode == 'dark')  style.color = "#ffffff";
-				if(this.closeColor) style.color = this.closeColor;
-				return style;
-			},
-			// 关闭图标的颜色
-			closeIconColor() {
-				// 如果定义了关闭图标的颜色，就用此值，否则用字体颜色的值
-				// 如果上面的二者都没有，如果是dark深色模式，图标就为白色
-				// 最后如果上面的三者都不合适，就返回type值给图标获取颜色
-				let color = '';
-				if(this.closeColor) return this.closeColor;
-				else if(this.color) return this.color;
-				else if(this.mode == 'dark') return '#ffffff';
-				else return this.type;
-			}
-		},
-		methods: {
-			// 标签被点击
-			clickTag() {
-				// 如果是disabled状态，不发送点击事件
-				if(this.disabled) return ;
-				this.$emit('click', this.index);
-			},
-			// 点击标签关闭按钮
-			close() {
-				this.$emit('close', this.index);
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	@import "../../libs/css/style.components.scss";
-	
-	.u-tag {
-		box-sizing: border-box;
-		align-items: center;
-		border-radius: 6rpx;
-		/* #ifndef APP-NVUE */
-		display: inline-block;
-		/* #endif */
-		line-height: 1;
-	}
-	
-	.u-size-default {
-		font-size: 22rpx;
-		padding: 12rpx 22rpx;
-	}
-	
-	.u-size-mini {
-		font-size: 20rpx;
-		padding: 6rpx 12rpx;
-	}
-
-	.u-mode-light-primary {
-		background-color: $u-type-primary-light;
-		color: $u-type-primary;
-		border: 1px solid $u-type-primary-disabled;
-	}
-	
-	.u-mode-light-success {
-		background-color: $u-type-success-light;
-		color: $u-type-success;
-		border: 1px solid $u-type-success-disabled;
-	}
-	
-	.u-mode-light-error {
-		background-color: $u-type-error-light;
-		color: $u-type-error;
-		border: 1px solid $u-type-error-disabled;
-	}
-	
-	.u-mode-light-warning {
-		background-color: $u-type-warning-light;
-		color: $u-type-warning;
-		border: 1px solid $u-type-warning-disabled;
-	}
-	
-	.u-mode-light-info {
-		background-color: $u-type-info-light;
-		color: $u-type-info;
-		border: 1px solid $u-type-info-disabled;
-	}
-	
-	.u-mode-dark-primary {
-		background-color: $u-type-primary;
-		color: #FFFFFF;
-	}
-	
-	.u-mode-dark-success {
-		background-color: $u-type-success;
-		color: #FFFFFF;
-	}
-	
-	.u-mode-dark-error {
-		background-color: $u-type-error;
-		color: #FFFFFF;
-	}
-	
-	.u-mode-dark-warning {
-		background-color: $u-type-warning;
-		color: #FFFFFF;
-	}
-	
-	.u-mode-dark-info {
-		background-color: $u-type-info;
-		color: #FFFFFF;
-	}
-	
-	.u-mode-plain-primary {
-		background-color: #FFFFFF;
-		color: $u-type-primary;
-		border: 1px solid $u-type-primary;
-	}
-	
-	.u-mode-plain-success {
-		background-color: #FFFFFF;
-		color: $u-type-success;
-		border: 1px solid $u-type-success;
-	}
-	
-	.u-mode-plain-error {
-		background-color: #FFFFFF;
-		color: $u-type-error;
-		border: 1px solid $u-type-error;
-	}
-	
-	.u-mode-plain-warning {
-		background-color: #FFFFFF;
-		color: $u-type-warning;
-		border: 1px solid $u-type-warning;
-	}
-	
-	.u-mode-plain-info {
-		background-color: #FFFFFF;
-		color: $u-type-info;
-		border: 1px solid $u-type-info;
-	}
-	
-	.u-disabled {
-		opacity: 0.55;
-	}
-
-	.u-shape-circle {
-		border-radius: 100rpx;
-	}
-	
-	.u-shape-circleRight {
-		border-radius:  0 100rpx 100rpx 0;
-	}
-
-	.u-shape-circleLeft {
-		border-radius: 100rpx 0 0 100rpx;
-	}
-	
-	.u-close-icon {
-		margin-left: 14rpx;
-		font-size: 22rpx;
-		color: $u-type-success;
-	}
-	
-	.u-icon-wrap {
-		display: inline-flex;
-		transform: scale(0.86);
-	}
-</style>
diff --git a/uview-ui/components/u-td/u-td.vue b/uview-ui/components/u-td/u-td.vue
deleted file mode 100644
index b00ad8b5..00000000
--- a/uview-ui/components/u-td/u-td.vue
+++ /dev/null
@@ -1,66 +0,0 @@
-<template>
-	<view class="u-td" :style="[tdStyle]">
-		<slot></slot>
-	</view>
-</template>
-
-<script>
-	/**
-	 * td td单元格
-	 * @description 表格组件一般用于展示大量结构化数据的场景（搭配u-table使用）
-	 * @tutorial https://www.uviewui.com/components/table.html#td-props
-	 * @property {String Number} width 单元格宽度百分比或者具体带单位的值，如30%， 200rpx等，一般使用百分比，单元格宽度默认为均分tr的长度（默认auto）
-	 * @example <u-td>二年级</u-td>
-	 */
-	export default {
-		name: "u-td",
-		props: {
-			// 宽度，百分比或者具体带单位的值，如30%， 200rpx等，一般使用百分比
-			width: {
-				type: [Number, String],
-				default: 'auto'
-			}
-		},
-		data() {
-			return {
-				tdStyle: {
-					
-				}
-			}
-		},
-		created() {
-			this.parent = false;
-		},
-		mounted() {
-			this.parent = this.$u.$parent.call(this, 'u-table');
-			if (this.parent) {
-				// 将父组件的相关参数，合并到本组件
-				let style = {};
-				if (this.width != "auto") style.flex = `0 0 ${this.width}`;
-				style.textAlign = this.parent.align;
-				style.fontSize = this.parent.fontSize + 'rpx';
-				style.padding = this.parent.padding;
-				style.borderBottom = `solid 1px ${this.parent.borderColor}`;
-				style.borderRight = `solid 1px ${this.parent.borderColor}`;
-				style.color = this.parent.color;
-				this.tdStyle = style;
-			}
-		}
-	};
-</script>
-
-<style lang="scss" scoped>
-	@import "../../libs/css/style.components.scss";
-
-	.u-td {
-		@include vue-flex;
-		flex-direction: column;
-		flex: 1;
-		justify-content: center;
-		font-size: 28rpx;
-		color: $u-content-color;
-		align-self: stretch;
-		box-sizing: border-box;
-		height: 100%;
-	}
-</style>
diff --git a/uview-ui/components/u-th/u-th.vue b/uview-ui/components/u-th/u-th.vue
deleted file mode 100644
index 9fe5a164..00000000
--- a/uview-ui/components/u-th/u-th.vue
+++ /dev/null
@@ -1,62 +0,0 @@
-<template>
-	<view class="u-th" :style="[thStyle]">
-		<slot></slot>
-	</view>
-</template>
-
-<script>
-	/**
-	 * th th单元格
-	 * @description 表格组件一般用于展示大量结构化数据的场景（搭配u-table使用）
-	 * @tutorial https://www.uviewui.com/components/table.html#td-props
-	 * @property {String Number} width 标题单元格宽度百分比或者具体带单位的值，如30%，200rpx等，一般使用百分比，单元格宽度默认为均分tr的长度
-	 * @example 暂无示例
-	 */
-	export default {
-		name: "u-th",
-		props: {
-			// 宽度，百分比或者具体带单位的值，如30%， 200rpx等，一般使用百分比
-			width: {
-				type: [Number, String],
-				default: ''
-			}
-		},
-		data() {
-			return {
-				thStyle: {}
-			}
-		},
-		created() {
-			this.parent = false;
-		},
-		mounted() {
-			this.parent = this.$u.$parent.call(this, 'u-table');
-			if (this.parent) {
-				// 将父组件的相关参数，合并到本组件
-				let style = {};
-				if (this.width) style.flex = `0 0 ${this.width}`;
-				style.textAlign = this.parent.align;
-				style.padding = this.parent.padding;
-				style.borderBottom = `solid 1px ${this.parent.borderColor}`;
-				style.borderRight = `solid 1px ${this.parent.borderColor}`;
-				Object.assign(style, this.parent.style);
-				this.thStyle = style;
-			}
-		}
-	};
-</script>
-
-<style lang="scss" scoped>
-	@import "../../libs/css/style.components.scss";
-
-	.u-th {
-		@include vue-flex;
-		flex-direction: column;
-		flex: 1;
-		justify-content: center;
-		font-size: 28rpx;
-		color: $u-main-color;
-		font-weight: bold;
-		background-color: rgb(245, 246, 248);
-	}
-</style>
diff --git a/uview-ui/components/u-toast/u-toast.vue b/uview-ui/components/u-toast/u-toast.vue
deleted file mode 100644
index a2209a51..00000000
--- a/uview-ui/components/u-toast/u-toast.vue
+++ /dev/null
@@ -1,220 +0,0 @@
-<template>
-	<view class="u-toast" :class="[isShow ? 'u-show' : '', 'u-type-' + tmpConfig.type, 'u-position-' + tmpConfig.position]" :style="{
-		zIndex: uZIndex
-	}">
-		<view class="u-icon-wrap">
-			<u-icon v-if="tmpConfig.icon" class="u-icon" :name="iconName" :size="30" :color="tmpConfig.type"></u-icon>
-		</view>
-		<text class="u-text">{{tmpConfig.title}}</text>
-	</view>
-</template>
-
-<script>
-	/**
-	 * toast 消息提示
-	 * @description 此组件表现形式类似uni的uni.showToastAPI，但也有不同的地方。
-	 * @tutorial https://www.uviewui.com/components/toast.html
-	 * @property {String} z-index toast展示时的z-index值
-	 * @event {Function} show 显示toast，如需一进入页面就显示toast，请在onReady生命周期调用
-	 * @example <u-toast ref="uToast" />
-	 */
-	export default {
-		name: "u-toast",
-		props: {
-			// z-index值
-			zIndex: {
-				type: [Number, String],
-				default: ''
-			},
-		},
-		data() {
-			return {
-				isShow: false,
-				timer: null, // 定时器
-				config: {
-					params: {}, // URL跳转的参数，对象
-					title: '', // 显示文本
-					type: '', // 主题类型，primary，success，error，warning，black
-					duration: 2000, // 显示的时间，毫秒
-					isTab: false, // 是否跳转tab页面
-					url: '', // toast消失后是否跳转页面，有则跳转，优先级高于back参数
-					icon: true, // 显示的图标
-					position: 'center', // toast出现的位置
-					callback: null, // 执行完后的回调函数
-					back: false, // 结束toast是否自动返回上一页
-				},
-				tmpConfig: {}, // 将用户配置和内置配置合并后的临时配置变量
-			};
-		},
-		computed: {
-			iconName() {
-				// 只有不为none，并且type为error|warning|succes|info时候，才显示图标
-				if (['error', 'warning', 'success', 'info'].indexOf(this.tmpConfig.type) >= 0 && this.tmpConfig.icon) {
-					let icon = this.$u.type2icon(this.tmpConfig.type);
-					return icon;
-				}
-			},
-			uZIndex() {
-				// 显示toast时候，如果用户有传递z-index值，有限使用
-				return this.isShow ? (this.zIndex ? this.zIndex : this.$u.zIndex.toast) : '999999';
-			}
-		},
-		methods: {
-			// 显示toast组件，由父组件通过this.$refs.xxx.show(options)形式调用
-			show(options) {
-				// 不降结果合并到this.config变量，避免多次条用u-toast，前后的配置造成混论
-				this.tmpConfig = this.$u.deepMerge(this.config, options);
-				if (this.timer) {
-					// 清除定时器
-					clearTimeout(this.timer);
-					this.timer = null;
-				}
-				this.isShow = true;
-				this.timer = setTimeout(() => {
-					// 倒计时结束，清除定时器，隐藏toast组件
-					this.isShow = false;
-					clearTimeout(this.timer);
-					this.timer = null;
-					// 判断是否存在callback方法，如果存在就执行
-					typeof(this.tmpConfig.callback) === 'function' && this.tmpConfig.callback();
-					this.timeEnd();
-				}, this.tmpConfig.duration);
-			},
-			// 隐藏toast组件，由父组件通过this.$refs.xxx.hide()形式调用
-			hide() {
-				this.isShow = false;
-				if (this.timer) {
-					// 清除定时器
-					clearTimeout(this.timer);
-					this.timer = null;
-				}
-			},
-			// 倒计时结束之后，进行的一些操作
-			timeEnd() {
-				// 如果带有url值，根据isTab为true或者false进行跳转
-				if (this.tmpConfig.url) {
-					// 如果url没有"/"开头，添加上，因为uni的路由跳转需要"/"开头
-					if (this.tmpConfig.url[0] != '/') this.tmpConfig.url = '/' + this.tmpConfig.url;
-					// 判断是否有传递显式的参数
-					if (Object.keys(this.tmpConfig.params).length) {
-						// 判断用户传递的url中，是否带有参数
-						// 使用正则匹配，主要依据是判断是否有"/","?","="等，如“/page/index/index?name=mary"
-						// 如果有params参数，转换后无需带上"?"
-						let query = '';
-						if (/.*\/.*\?.*=.*/.test(this.tmpConfig.url)) {
-							// object对象转为get类型的参数
-							query = this.$u.queryParams(this.tmpConfig.params, false);
-							this.tmpConfig.url = this.tmpConfig.url + "&" + query;
-						} else {
-							query = this.$u.queryParams(this.tmpConfig.params);
-							this.tmpConfig.url += query;
-						}
-					}
-					// 如果是跳转tab页面，就使用uni.switchTab
-					if (this.tmpConfig.isTab) {
-						uni.switchTab({
-							url: this.tmpConfig.url
-						});
-					} else {
-						uni.navigateTo({
-							url: this.tmpConfig.url
-						});
-					}
-				} else if(this.tmpConfig.back) {
-					// 回退到上一页
-					this.$u.route({
-						type: 'back'
-					})
-				}
-			}
-		}
-	};
-</script>
-
-<style lang="scss" scoped>
-	@import "../../libs/css/style.components.scss";
-	
-	.u-toast {
-		position: fixed;
-		z-index: -1;
-		transition: opacity 0.3s;
-		text-align: center;
-		color: #fff;
-		border-radius: 8rpx;
-		background: #585858;
-		@include vue-flex;
-		align-items: center;
-		justify-content: center;
-		font-size: 28rpx;
-		opacity: 0;
-		pointer-events: none;
-		padding: 18rpx 40rpx;
-	}
-
-	.u-toast.u-show {
-		opacity: 1;
-	}
-
-	.u-icon {
-		margin-right: 10rpx;
-		@include vue-flex;
-		align-items: center;
-		line-height: normal;
-	}
-
-	.u-position-center {
-		left: 50%;
-		top: 50%;
-		transform: translate(-50%,-50%);
-		/* #ifndef APP-NVUE */
-		max-width: 70%;
-		/* #endif */
-	}
-
-	.u-position-top {
-		left: 50%;
-		top: 20%;
-		transform: translate(-50%,-50%);
-	}
-
-	.u-position-bottom {
-		left: 50%;
-		bottom: 20%;
-		transform: translate(-50%,-50%);
-	}
-
-	.u-type-primary {
-		color: $u-type-primary;
-		background-color: $u-type-primary-light;
-		border: 1px solid rgb(215, 234, 254);
-	}
-
-	.u-type-success {
-		color: $u-type-success;
-		background-color: $u-type-success-light;
-		border: 1px solid #BEF5C8;
-	}
-
-	.u-type-error {
-		color: $u-type-error;
-		background-color: $u-type-error-light;
-		border: 1px solid #fde2e2;
-	}
-
-	.u-type-warning {
-		color: $u-type-warning;
-		background-color: $u-type-warning-light;
-		border: 1px solid #faecd8;
-	}
-
-	.u-type-info {
-		color: $u-type-info;
-		background-color: $u-type-info-light;
-		border: 1px solid #ebeef5;
-	}
-
-	.u-type-default {
-		color: #fff;
-		background-color: #585858;
-	}
-</style>
diff --git a/uview-ui/components/u-top-tips/u-top-tips.vue b/uview-ui/components/u-top-tips/u-top-tips.vue
deleted file mode 100644
index 98d58df3..00000000
--- a/uview-ui/components/u-top-tips/u-top-tips.vue
+++ /dev/null
@@ -1,121 +0,0 @@
-<template>
-	<view class="u-tips" :class="['u-' + type, isShow ? 'u-tip-show' : '']" :style="{
-		top: navbarHeight + 'px',
-		zIndex: uZIndex
-	}">{{ title }}</view>
-</template>
-
-<script>
-	/**
-	 * topTips 顶部提示
-	 * @description 该组件一般用于页面顶部向下滑出一个提示，尔后自动收起的场景。
-	 * @tutorial https://www.uviewui.com/components/topTips.html
-	 * @property {String Number} navbar-height 导航栏高度(包含状态栏高度在内)，单位PX
-	 * @property {String Number} z-index z-index值（默认975）
-	 * @example <u-top-tips ref="uTips"></u-top-tips>
-	 */
-	export default {
-		name: "u-top-tips",
-		props: {
-			// 导航栏高度，用于提示的初始化
-			navbarHeight: {
-				type: [Number, String],
-				// #ifndef H5
-				default: 0,
-				// #endif
-				// #ifdef H5
-				default: 44,
-				// #endif
-			},
-			// z-index值
-			zIndex: {
-				type: [Number, String],
-				default: ''
-			}
-		},
-		data() {
-			return {
-				timer: null, // 定时器
-				isShow: false, // 是否显示消息组件
-				title: '', // 组件中显示的消息内容
-				type: 'primary', // 消息的类型（颜色不同），primary，success，error，warning，info
-				duration: 2000, // 组件显示的时间，单位为毫秒
-			};
-		},
-		computed: {
-			uZIndex() {
-				return this.zIndex ? this.zIndex : this.$u.zIndex.topTips;
-			}
-		},
-		methods: {
-			show(config = {}) {
-				// 先清除定时器（可能是上一次定义的，需要清除了再开始新的）
-				clearTimeout(this.timer);
-				// 时间，内容，类型主题(type)等参数
-				if (config.duration) this.duration = config.duration;
-				if (config.type) this.type = config.type;
-				this.title = config.title;
-				this.isShow = true;
-				// 倒计时
-				this.timer = setTimeout(() => {
-					this.isShow = false;
-					clearTimeout(this.timer);
-					this.timer = null;
-				}, this.duration);
-			}
-		}
-	};
-</script>
-
-<style lang="scss" scoped>
-	@import "../../libs/css/style.components.scss";
-	
-	view {
-		box-sizing: border-box;
-	}
-
-	// 顶部弹出类型样式
-	.u-tips {
-		width: 100%;
-		position: fixed;
-		z-index: 1;
-		padding: 20rpx 30rpx;
-		color: #FFFFFF;
-		font-size: 28rpx;
-		left: 0;
-		right: 0;
-		@include vue-flex;
-		align-items: center;
-		justify-content: center;
-		opacity: 0;
-		// 此处为最核心点，translateY(-100%)意味着将其从Y轴隐藏（隐藏到顶部(h5)或者说导航栏(app)下面）
-		transform: translateY(-100%);
-		transition: all 0.35s linear;
-	}
-
-	.u-tip-show {
-		transform: translateY(0);
-		opacity: 1;
-		z-index: 99;
-	}
-
-	.u-primary {
-		background: $u-type-primary;
-	}
-
-	.u-success {
-		background: $u-type-success;
-	}
-
-	.u-warning {
-		background: $u-type-warning;
-	}
-
-	.u-error {
-		background: $u-type-error;
-	}
-
-	.u-info {
-		background: $u-type-info;
-	}
-</style>
diff --git a/uview-ui/components/u-tr/u-tr.vue b/uview-ui/components/u-tr/u-tr.vue
deleted file mode 100644
index 06aed4a5..00000000
--- a/uview-ui/components/u-tr/u-tr.vue
+++ /dev/null
@@ -1,25 +0,0 @@
-<template>
-	<view class="u-tr">
-		<slot></slot>
-	</view>
-</template>
-
-<script>
-	/**
-	 * tr 表格行标签
-	 * @description 表格组件一般用于展示大量结构化数据的场景（搭配<u-table>使用）
-	 * @tutorial https://www.uviewui.com/components/table.html
-	 * @example <u-tr></u-tr>
-	 */
-	export default {
-		name: "u-tr",
-	}
-</script>
-
-<style lang="scss" scoped>
-	@import "../../libs/css/style.components.scss";
-	
-	.u-tr {
-		@include vue-flex;
-	}
-</style>
diff --git a/uview-ui/components/u-verification-code/u-verification-code.vue b/uview-ui/components/u-verification-code/u-verification-code.vue
deleted file mode 100644
index 719331ae..00000000
--- a/uview-ui/components/u-verification-code/u-verification-code.vue
+++ /dev/null
@@ -1,162 +0,0 @@
-<template>
-	<view class="u-code-wrap"><!-- 此组件功能由js完成，无需写html逻辑 --></view>
-</template>
-
-<script>
-/**
- * verificationCode 验证码输入框
- * @description 考虑到用户实际发送验证码的场景，可能是一个按钮，也可能是一段文字，提示语各有不同，所以本组件 不提供界面显示，只提供提示语，由用户将提示语嵌入到具体的场景
- * @tutorial https://www.uviewui.com/components/verificationCode.html
- * @property {Number String} seconds 倒计时所需的秒数（默认60）
- * @property {String} start-text 开始前的提示语，见官网说明（默认获取验证码）
- * @property {String} change-text 倒计时期间的提示语，必须带有字母"x"，见官网说明（默认X秒重新获取）
- * @property {String} end-text 倒计结束的提示语，见官网说明（默认重新获取）
- * @property {Boolean} keep-running 是否在H5刷新或各端返回再进入时继续倒计时（默认false）
- * @event {Function} change 倒计时期间，每秒触发一次
- * @event {Function} start 开始倒计时触发
- * @event {Function} end 结束倒计时触发
- * @example <u-verification-code :seconds="seconds" @end="end" @start="start" ref="uCode"
- */
-export default {
-	name: 'u-verification-code',
-	props: {
-		// 倒计时总秒数
-		seconds: {
-			type: [String, Number],
-			default: 60
-		},
-		// 尚未开始时提示
-		startText: {
-			type: String,
-			default: '获取验证码'
-		},
-		// 正在倒计时中的提示
-		changeText: {
-			type: String,
-			default: 'X秒重新获取'
-		},
-		// 倒计时结束时的提示
-		endText: {
-			type: String,
-			default: '重新获取'
-		},
-		// 是否在H5刷新或各端返回再进入时继续倒计时
-		keepRunning: {
-			type: Boolean,
-			default: false
-		},
-		// 为了区分多个页面，或者一个页面多个倒计时组件本地存储的继续倒计时变了
-		uniqueKey: {
-			type: String,
-			default: ''
-		}
-	},
-	data() {
-		return {
-			secNum: this.seconds,
-			timer: null,
-			canGetCode: true // 是否可以执行验证码操作
-		};
-	},
-	mounted() {
-		this.checkKeepRunning();
-	},
-	watch: {
-		seconds: {
-			immediate: true,
-			handler(n) {
-				this.secNum = n;
-			}
-		}
-	},
-	methods: {
-		checkKeepRunning() {
-			// 获取上一次退出页面(H5还包括刷新)时的时间戳，如果没有上次的保存，此值可能为空
-			let lastTimestamp = Number(uni.getStorageSync(this.uniqueKey + '_$uCountDownTimestamp'));
-			if (!lastTimestamp) return this.changeEvent(this.startText);
-			// 当前秒的时间戳
-			let nowTimestamp = Math.floor(+new Date() / 1000);
-			// 判断当前的时间戳，是否小于上一次的本该按设定结束，却提前结束的时间戳
-			if (this.keepRunning && lastTimestamp && lastTimestamp > nowTimestamp) {
-				// 剩余尚未执行完的倒计秒数
-				this.secNum = lastTimestamp - nowTimestamp;
-				// 清除本地保存的变量
-				uni.removeStorageSync(this.uniqueKey + '_$uCountDownTimestamp');
-				// 开始倒计时
-				this.start();
-			} else {
-				// 如果不存在需要继续上一次的倒计时，执行正常的逻辑
-				this.changeEvent(this.startText);
-			}
-		},
-		// 开始倒计时
-		start() {
-			// 防止快速点击获取验证码的按钮而导致内部产生多个定时器导致混乱
-			if (this.timer) {
-				clearInterval(this.timer);
-				this.timer = null;
-			}
-			this.$emit('start');
-			this.canGetCode = false;
-			// 这里放这句，是为了一开始时就提示，否则要等setInterval的1秒后才会有提示
-			this.changeEvent(this.changeText.replace(/x|X/, this.secNum));
-			this.setTimeToStorage();
-			this.timer = setInterval(() => {
-				if (--this.secNum) {
-					// 用当前倒计时的秒数替换提示字符串中的"x"字母
-					this.changeEvent(this.changeText.replace(/x|X/, this.secNum));
-				} else {
-					clearInterval(this.timer);
-					this.timer = null;
-					this.changeEvent(this.endText);
-					this.secNum = this.seconds;
-					this.$emit('end');
-					this.canGetCode = true;
-				}
-			}, 1000);
-		},
-		// 重置，可以让用户再次获取验证码
-		reset() {
-			this.canGetCode = true;
-			clearInterval(this.timer);
-			this.secNum = this.seconds;
-			this.changeEvent(this.endText);
-		},
-		changeEvent(text) {
-			this.$emit('change', text);
-		},
-		// 保存时间戳，为了防止倒计时尚未结束，H5刷新或者各端的右上角返回上一页再进来
-		setTimeToStorage() {
-			if (!this.keepRunning || !this.timer) return;
-			// 记录当前的时间戳，为了下次进入页面，如果还在倒计时内的话，继续倒计时
-			// 倒计时尚未结束，结果大于0；倒计时已经开始，就会小于初始值，如果等于初始值，说明没有开始倒计时，无需处理
-			if (this.secNum > 0 && this.secNum <= this.seconds) {
-				// 获取当前时间戳(+ new Date()为特殊写法)，除以1000变成秒，再去除小数部分
-				let nowTimestamp = Math.floor(+new Date() / 1000);
-				// 将本该结束时候的时间戳保存起来 => 当前时间戳 + 剩余的秒数
-				uni.setStorage({
-					key: this.uniqueKey + '_$uCountDownTimestamp',
-					data: nowTimestamp + Number(this.secNum)
-				});
-			}
-		}
-	},
-	// 组件销毁的时候，清除定时器，否则定时器会继续存在，系统不会自动清除
-	beforeDestroy() {
-		this.setTimeToStorage();
-		clearTimeout(this.timer);
-		this.timer = null;
-	}
-};
-</script>
-
-<style lang="scss" scoped>
-@import '../../libs/css/style.components.scss';
-
-.u-code-wrap {
-	width: 0;
-	height: 0;
-	position: fixed;
-	z-index: -1;
-}
-</style>
diff --git a/uview-ui/components/u-waterfall/u-waterfall.vue b/uview-ui/components/u-waterfall/u-waterfall.vue
deleted file mode 100644
index 1b57f7b1..00000000
--- a/uview-ui/components/u-waterfall/u-waterfall.vue
+++ /dev/null
@@ -1,176 +0,0 @@
-<template>
-	<view class="u-waterfall">
-		<view id="u-left-column" class="u-column"><slot name="left" :leftList="leftList"></slot></view>
-		<view id="u-right-column" class="u-column"><slot name="right" :rightList="rightList"></slot></view>
-	</view>
-</template>
-
-<script>
-/**
- * waterfall 瀑布流
- * @description 这是一个瀑布流形式的组件，内容分为左右两列，结合uView的懒加载组件效果更佳。相较于某些只是奇偶数左右分别，或者没有利用vue作用域插槽的做法，uView的瀑布流实现了真正的 组件化，搭配LazyLoad 懒加载和loadMore 加载更多组件，让您开箱即用，眼前一亮。
- * @tutorial https://www.uviewui.com/components/waterfall.html
- * @property {Array} flow-list 用于渲染的数据
- * @property {String Number} add-time 单条数据添加到队列的时间间隔，单位ms，见上方注意事项说明（默认200）
- * @example <u-waterfall :flowList="flowList"></u-waterfall>
- */
-export default {
-	name: 'u-waterfall',
-	props: {
-		value: {
-			// 瀑布流数据
-			type: Array,
-			required: true,
-			default: function() {
-				return [];
-			}
-		},
-		// 每次向结构插入数据的时间间隔，间隔越长，越能保证两列高度相近，但是对用户体验越不好
-		// 单位ms
-		addTime: {
-			type: [Number, String],
-			default: 200
-		},
-		// id值，用于清除某一条数据时，根据此idKey名称找到并移除，如数据为{idx: 22, name: 'lisa'}
-		// 那么该把idKey设置为idx
-		idKey: {
-			type: String,
-			default: 'id'
-		}
-	},
-	data() {
-		return {
-			leftList: [],
-			rightList: [],
-			tempList: [],
-			children: []
-		};
-	},
-	watch: {
-		copyFlowList(nVal, oVal) {
-			// 取差值，即这一次数组变化新增的部分
-			let startIndex = Array.isArray(oVal) && oVal.length > 0 ? oVal.length : 0;
-			// 拼接上原有数据
-			this.tempList = this.tempList.concat(this.cloneData(nVal.slice(startIndex)));
-			this.splitData();
-		}
-	},
-	mounted() {
-		this.tempList = this.cloneData(this.copyFlowList);
-		this.splitData();
-	},
-	computed: {
-		// 破坏flowList变量的引用，否则watch的结果新旧值是一样的
-		copyFlowList() {
-			return this.cloneData(this.value);
-		}
-	},
-	methods: {
-		async splitData() {
-			if (!this.tempList.length) return;
-			let leftRect = await this.$uGetRect('#u-left-column');
-			let rightRect = await this.$uGetRect('#u-right-column');
-			// 如果左边小于或等于右边，就添加到左边，否则添加到右边
-			let item = this.tempList[0];
-			// 解决多次快速上拉后，可能数据会乱的问题，因为经过上面的两个await节点查询阻塞一定时间，加上后面的定时器干扰
-			// 数组可能变成[]，导致此item值可能为undefined
-			if (!item) return;
-			if (leftRect.height < rightRect.height) {
-				this.leftList.push(item);
-			} else if (leftRect.height > rightRect.height) {
-				this.rightList.push(item);
-			} else {
-				// 这里是为了保证第一和第二张添加时，左右都能有内容
-				// 因为添加第一张，实际队列的高度可能还是0，这时需要根据队列元素长度判断下一个该放哪边
-				if (this.leftList.length < this.rightList.length) {
-					this.leftList.push(item);
-				} else {
-					this.rightList.push(item);
-				}
-			}
-			// 移除临时列表的第一项
-			this.tempList.splice(0, 1);
-			// 如果临时数组还有数据，继续循环
-			if (this.tempList.length) {
-				setTimeout(() => {
-					this.splitData();
-				}, this.addTime);
-			}
-		},
-		// 复制而不是引用对象和数组
-		cloneData(data) {
-			return JSON.parse(JSON.stringify(data));
-		},
-		// 清空数据列表
-		clear() {
-			this.leftList = [];
-			this.rightList = [];
-			// 同时清除父组件列表中的数据
-			this.$emit('input', []);
-			this.tempList = [];
-		},
-		// 清除某一条指定的数据，根据id实现
-		remove(id) {
-			// 如果findIndex找不到合适的条件，就会返回-1
-			let index = -1;
-			index = this.leftList.findIndex(val => val[this.idKey] == id);
-			if (index != -1) {
-				// 如果index不等于-1，说明已经找到了要找的id，根据index索引删除这一条数据
-				this.leftList.splice(index, 1);
-			} else {
-				// 同理于上方面的方法
-				index = this.rightList.findIndex(val => val[this.idKey] == id);
-				if (index != -1) this.rightList.splice(index, 1);
-			}
-			// 同时清除父组件的数据中的对应id的条目
-			index = this.value.findIndex(val => val[this.idKey] == id);
-			if (index != -1) this.$emit('input', this.value.splice(index, 1));
-		},
-		// 修改某条数据的某个属性
-		modify(id, key, value) {
-			// 如果findIndex找不到合适的条件，就会返回-1
-			let index = -1;
-			index = this.leftList.findIndex(val => val[this.idKey] == id);
-			if (index != -1) {
-				// 如果index不等于-1，说明已经找到了要找的id，修改对应key的值
-				this.leftList[index][key] = value;
-			} else {
-				// 同理于上方面的方法
-				index = this.rightList.findIndex(val => val[this.idKey] == id);
-				if (index != -1) this.rightList[index][key] = value;
-			}
-			// 修改父组件的数据中的对应id的条目
-			index = this.value.findIndex(val => val[this.idKey] == id);
-			if (index != -1) {
-				// 首先复制一份value的数据
-				let data = this.cloneData(this.value);
-				// 修改对应索引的key属性的值为value
-				data[index][key] = value;
-				// 修改父组件通过v-model绑定的变量的值
-				this.$emit('input', data);
-			}
-		}
-	}
-};
-</script>
-
-<style lang="scss" scoped>
-@import '../../libs/css/style.components.scss';
-
-.u-waterfall {
-	@include vue-flex;
-	flex-direction: row;
-	align-items: flex-start;
-}
-
-.u-column {
-	@include vue-flex;
-	flex: 1;
-	flex-direction: column;
-	height: auto;
-}
-
-.u-image {
-	width: 100%;
-}
-</style>
diff --git a/uview-ui/iconfont.css b/uview-ui/iconfont.css
index 836c7180..9c184cd7 100644
--- a/uview-ui/iconfont.css
+++ b/uview-ui/iconfont.css
@@ -1,4 +1,3 @@
-/* #ifdef APP-PLUS */
 @font-face {
 	font-family: "uicon-iconfont";
 	font-weight: normal;
@@ -7,39 +6,22 @@
 	src: url('data:application/x-font-woff2;charset=utf-8;base64,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') format('woff2');
 }
 
-/* #endif */
-
-/* 支付宝，百度，头条小程序目前读取大的本地字体文件，导致无法显示图标，故用在线加载的方式-2020-05-12 */
-/* #ifndef APP-PLUS */
-@font-face {
-	font-family: "uicon-iconfont";
-	src: url('//at.alicdn.com/t/font_1529455_k4s6di1d1.eot?t=1596960292384');
-	/* IE9 */
-	src: url('//at.alicdn.com/t/font_1529455_k4s6di1d1.eot?t=1596960292384#iefix') format('embedded-opentype'),
-		/* IE6-IE8 */
-		url('data:application/x-font-woff2;charset=utf-8;base64,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') format('woff2'),
-		url('//at.alicdn.com/t/font_1529455_k4s6di1d1.woff?t=1596960292384') format('woff'),
-		url('//at.alicdn.com/t/font_1529455_k4s6di1d1.ttf?t=1596960292384') format('truetype'),
-		/* chrome, firefox, opera, Safari, Android, iOS 4.2+ */
-		url('//at.alicdn.com/t/font_1529455_k4s6di1d1.svg?t=1596960292384#iconfont') format('svg');
-}
-
-/* #endif */
 
 .u-iconfont {
 	position: relative;
 	display: flex;
-	font: normal normal normal 14px/1 "uicon-iconfont";
-	font-size: inherit;
 	text-rendering: auto;
+	font-family: "uicon-iconfont" !important;
+	font-size: 16px;
+	font-style: normal;
 	-webkit-font-smoothing: antialiased;
 	-moz-osx-font-smoothing: grayscale;
 }
 
-.u-iconfont::before {
+/* .u-iconfont::before {
 	display: flex;
 	align-items: center;
-}
+} */
 
 .uicon-en:before {
 	content: "\e70a";
diff --git a/uview-ui/index.js b/uview-ui/index.js
index 37f6017d..5daa47e1 100644
--- a/uview-ui/index.js
+++ b/uview-ui/index.js
@@ -1,51 +1,28 @@
+/**
+ * uview 工具入口
+ * @description 精简掉了部分用不到的，如有需要，根据项目情况添加，或者直接覆盖
+ */
+
 // 引入全局mixin
 import mixin from './libs/mixin/mixin.js'
-
-function wranning(str) {
-	// 开发环境进行信息输出,主要是一些报错信息
-	// 这个环境的来由是在程序编写时候,点击hx编辑器运行调试代码的时候,详见:
-	// 	https://uniapp.dcloud.io/frame?id=%e5%bc%80%e5%8f%91%e7%8e%af%e5%a2%83%e5%92%8c%e7%94%9f%e4%ba%a7%e7%8e%af%e5%a2%83
-	if (process.env.NODE_ENV === 'development') {
-		console.warn(str)
-	}
-}
-
-
-// post类型对象参数转为get类型url参数
-import queryParams from './libs/function/queryParams.js'
 // 时间格式化
 import timeFormat from './libs/function/timeFormat.js'
 // 时间戳格式化,返回多久之前
 import timeFrom from './libs/function/timeFrom.js'
-// 颜色渐变相关,colorGradient-颜色渐变,hexToRgb-十六进制颜色转rgb颜色,rgbToHex-rgb转十六进制
-import colorGradient from './libs/function/colorGradient.js'
 // 生成全局唯一guid字符串
 import guid from './libs/function/guid.js'
-// 主题相关颜色,info|success|warning|primary|default|error,此颜色已在uview.scss中定义,但是为js中也能使用,故也定义一份
-import color from './libs/function/color.js'
-// 根据type获取图标名称
-import type2icon from './libs/function/type2icon.js'
-// 打乱数组的顺序
-import randomArray from './libs/function/randomArray.js'
 // 对象和数组的深度克隆
 import deepClone from './libs/function/deepClone.js'
-// 对象深度拷贝
-import deepMerge from './libs/function/deepMerge.js'
 // 添加单位
 import addUnit from './libs/function/addUnit.js'
-
 // 规则检验
 import test from './libs/function/test.js'
-// 随机数
-import random from './libs/function/random.js'
+// 获取整个父组件
+import $parent from './libs/function/$parent.js'
 // 去除空格
 import trim from './libs/function/trim.js'
 // toast提示，对uni.showToast的封装
 import toast from './libs/function/toast.js'
-// 获取父组件参数
-import getParent from './libs/function/getParent.js'
-// 获取整个父组件
-import $parent from './libs/function/$parent.js'
 // 获取sys()和os()工具方法
 // 获取设备信息，挂载到$u的sys()(system的缩写)属性中，
 // 同时把安卓和ios平台的名称"ios"和"android"挂到$u.os()中，方便取用
@@ -57,38 +34,22 @@ import {
 import debounce from './libs/function/debounce.js'
 // 节流方法
 import throttle from './libs/function/throttle.js'
-
-
 // 配置信息
 import config from './libs/config/config.js'
 // 各个需要fixed的地方的z-index配置文件
 import zIndex from './libs/config/zIndex.js'
 
 const $u = {
-	queryParams: queryParams,
-	timeFormat: timeFormat,
-	date: timeFormat, // 另名date
+	timeFormat,
 	timeFrom,
-	colorGradient: colorGradient.colorGradient,
-	colorToRgba: colorGradient.colorToRgba,
 	guid,
-	color,
 	sys,
 	os,
-	type2icon,
-	randomArray,
-	wranning,
-	hexToRgb: colorGradient.hexToRgb,
-	rgbToHex: colorGradient.rgbToHex,
 	test,
-	random,
 	deepClone,
-	deepMerge,
-	getParent,
 	$parent,
 	addUnit,
 	trim,
-	type: ['primary', 'success', 'error', 'warning', 'info'],
 	toast,
 	config, // uView配置信息相关，比如版本号
 	zIndex,
@@ -101,13 +62,10 @@ uni.$u = $u
 
 const install = Vue => {
 	Vue.mixin(mixin)
-	// 时间格式化，同时两个名称，date和timeFormat
+	// 时间格式化，timeFormat
 	Vue.filter('timeFormat', (timestamp, format) => {
 		return timeFormat(timestamp, format)
 	})
-	Vue.filter('date', (timestamp, format) => {
-		return timeFormat(timestamp, format)
-	})
 	// 将多久以前的方法，注入到全局过滤器
 	Vue.filter('timeFrom', (timestamp, format) => {
 		return timeFrom(timestamp, format)
diff --git a/uview-ui/index.scss b/uview-ui/index.scss
index 84daa729..402356fc 100644
--- a/uview-ui/index.scss
+++ b/uview-ui/index.scss
@@ -1,23 +1,23 @@
 // 引入公共基础类
-@import "./libs/css/common.scss";
-@import "./libs/css/color.scss";
+@import './libs/css/common.scss';
+@import './libs/css/color.scss';
 
 // 非nvue的样式
 /* #ifndef APP-NVUE */
-@import "./libs/css/style.vue.scss";
+@import './libs/css/style.vue.scss';
 /* #endif */
 
 // nvue的特有样式
 /* #ifdef APP-NVUE */
-@import "./libs/css/style.nvue.scss";
+@import './libs/css/style.nvue.scss';
 /* #endif */
 
 // 小程序特有的样式
 /* #ifdef MP */
-@import "./libs/css/style.mp.scss";
+@import './libs/css/style.mp.scss';
 /* #endif */
 
 // H5特有的样式
 /* #ifdef H5 */
-@import "./libs/css/style.h5.scss";
-/* #endif */
\ No newline at end of file
+@import './libs/css/style.h5.scss';
+/* #endif */
diff --git a/uview-ui/libs/function/bem.js b/uview-ui/libs/function/bem.js
deleted file mode 100644
index 05d1a365..00000000
--- a/uview-ui/libs/function/bem.js
+++ /dev/null
@@ -1,5 +0,0 @@
-function bem(name, conf) {
-  
-}
-
-module.exports.bem = bem;
diff --git a/uview-ui/libs/function/color.js b/uview-ui/libs/function/color.js
deleted file mode 100644
index dafb8c1c..00000000
--- a/uview-ui/libs/function/color.js
+++ /dev/null
@@ -1,37 +0,0 @@
-// 为了让用户能够自定义主题，会逐步弃用此文件，各颜色通过css提供
-// 为了给某些特殊场景使用和向后兼容，无需删除此文件(2020-06-20)
-let color = {
-	primary: "#2979ff",
-	primaryDark: "#2b85e4",
-	primaryDisabled: "#a0cfff",
-	primaryLight: "#ecf5ff",
-	bgColor: "#f3f4f6",
-	
-	info: "#909399",
-	infoDark: "#82848a",
-	infoDisabled: "#c8c9cc",
-	infoLight: "#f4f4f5",
-	
-	warning: "#ff9900",
-	warningDark: "#f29100",
-	warningDisabled: "#fcbd71",
-	warningLight: "#fdf6ec",
-	
-	error: "#fa3534",
-	errorDark: "#dd6161",
-	errorDisabled: "#fab6b6",
-	errorLight: "#fef0f0",
-	
-	success: "#19be6b",
-	successDark: "#18b566",
-	successDisabled: "#71d5a1",
-	successLight: "#dbf1e1",
-	
-	mainColor: "#303133",
-	contentColor: "#606266",
-	tipsColor: "#909399",
-	lightColor: "#c0c4cc",
-	borderColor: "#e4e7ed"
-}
-
-export default color;
\ No newline at end of file
diff --git a/uview-ui/libs/function/colorGradient.js b/uview-ui/libs/function/colorGradient.js
deleted file mode 100644
index eca30a27..00000000
--- a/uview-ui/libs/function/colorGradient.js
+++ /dev/null
@@ -1,134 +0,0 @@
-/**
- * 求两个颜色之间的渐变值
- * @param {string} startColor 开始的颜色
- * @param {string} endColor 结束的颜色
- * @param {number} step 颜色等分的份额
- * */
-function colorGradient(startColor = 'rgb(0, 0, 0)', endColor = 'rgb(255, 255, 255)', step = 10) {
-	let startRGB = hexToRgb(startColor, false); //转换为rgb数组模式
-	let startR = startRGB[0];
-	let startG = startRGB[1];
-	let startB = startRGB[2];
-
-	let endRGB = hexToRgb(endColor, false);
-	let endR = endRGB[0];
-	let endG = endRGB[1];
-	let endB = endRGB[2];
-
-	let sR = (endR - startR) / step; //总差值
-	let sG = (endG - startG) / step;
-	let sB = (endB - startB) / step;
-	let colorArr = [];
-	for (let i = 0; i < step; i++) {
-		//计算每一步的hex值 
-		let hex = rgbToHex('rgb(' + Math.round((sR * i + startR)) + ',' + Math.round((sG * i + startG)) + ',' + Math.round((sB *
-			i + startB)) + ')');
-		colorArr.push(hex);
-	}
-	return colorArr;
-}
-
-// 将hex表示方式转换为rgb表示方式(这里返回rgb数组模式)
-function hexToRgb(sColor, str = true) {
-	let reg = /^#([0-9a-fA-f]{3}|[0-9a-fA-f]{6})$/;
-	sColor = sColor.toLowerCase();
-	if (sColor && reg.test(sColor)) {
-		if (sColor.length === 4) {
-			let sColorNew = "#";
-			for (let i = 1; i < 4; i += 1) {
-				sColorNew += sColor.slice(i, i + 1).concat(sColor.slice(i, i + 1));
-			}
-			sColor = sColorNew;
-		}
-		//处理六位的颜色值
-		let sColorChange = [];
-		for (let i = 1; i < 7; i += 2) {
-			sColorChange.push(parseInt("0x" + sColor.slice(i, i + 2)));
-		}
-		if(!str) {
-			return sColorChange;
-		} else {
-			return `rgb(${sColorChange[0]},${sColorChange[1]},${sColorChange[2]})`;
-		}
-	} else if (/^(rgb|RGB)/.test(sColor)) {
-		let arr = sColor.replace(/(?:\(|\)|rgb|RGB)*/g, "").split(",")
-		return arr.map(val => Number(val));
-	} else {
-		return sColor;
-	}
-};
-
-// 将rgb表示方式转换为hex表示方式
-function rgbToHex(rgb) {
-	let _this = rgb;
-	let reg = /^#([0-9a-fA-f]{3}|[0-9a-fA-f]{6})$/;
-	if (/^(rgb|RGB)/.test(_this)) {
-		let aColor = _this.replace(/(?:\(|\)|rgb|RGB)*/g, "").split(",");
-		let strHex = "#";
-		for (let i = 0; i < aColor.length; i++) {
-			let hex = Number(aColor[i]).toString(16);
-			hex = String(hex).length == 1 ? 0 + '' + hex : hex; // 保证每个rgb的值为2位
-			if (hex === "0") {
-				hex += hex;
-			}
-			strHex += hex;
-		}
-		if (strHex.length !== 7) {
-			strHex = _this;
-		}
-		return strHex;
-	} else if (reg.test(_this)) {
-		let aNum = _this.replace(/#/, "").split("");
-		if (aNum.length === 6) {
-			return _this;
-		} else if (aNum.length === 3) {
-			let numHex = "#";
-			for (let i = 0; i < aNum.length; i += 1) {
-				numHex += (aNum[i] + aNum[i]);
-			}
-			return numHex;
-		}
-	} else {
-		return _this;
-	}
-}
-
-
-/**
-* JS颜色十六进制转换为rgb或rgba,返回的格式为 rgba（255，255，255，0.5）字符串
-* sHex为传入的十六进制的色值
-* alpha为rgba的透明度
-*/
-function colorToRgba(color, alpha = 0.3) {
-	color = rgbToHex(color)
-	// 十六进制颜色值的正则表达式
-	var reg = /^#([0-9a-fA-f]{3}|[0-9a-fA-f]{6})$/
-	/* 16进制颜色转为RGB格式 */
-	let sColor = color.toLowerCase()
-	if (sColor && reg.test(sColor)) {
-		if (sColor.length === 4) {
-			var sColorNew = '#'
-			for (let i = 1; i < 4; i += 1) {
-				sColorNew += sColor.slice(i, i + 1).concat(sColor.slice(i, i + 1))
-			}
-			sColor = sColorNew
-		}
-		// 处理六位的颜色值
-		var sColorChange = []
-		for (let i = 1; i < 7; i += 2) {
-			sColorChange.push(parseInt('0x' + sColor.slice(i, i + 2)))
-		}
-		// return sColorChange.join(',')
-		return 'rgba(' + sColorChange.join(',') + ',' + alpha + ')'
-	} 
-	else {
-		return sColor
-	}
-}
-
-export default {
-	colorGradient,
-	hexToRgb,
-	rgbToHex,
-	colorToRgba
-}
\ No newline at end of file
diff --git a/uview-ui/libs/function/deepMerge.js b/uview-ui/libs/function/deepMerge.js
deleted file mode 100644
index 81d2d18f..00000000
--- a/uview-ui/libs/function/deepMerge.js
+++ /dev/null
@@ -1,30 +0,0 @@
-import deepClone from "./deepClone";
-
-// JS对象深度合并
-function deepMerge(target = {}, source = {}) {
-	target = deepClone(target);
-	if (typeof target !== 'object' || typeof source !== 'object') return false;
-	for (var prop in source) {
-		if (!source.hasOwnProperty(prop)) continue;
-		if (prop in target) {
-			if (typeof target[prop] !== 'object') {
-				target[prop] = source[prop];
-			} else {
-				if (typeof source[prop] !== 'object') {
-					target[prop] = source[prop];
-				} else {
-					if (target[prop].concat && source[prop].concat) {
-						target[prop] = target[prop].concat(source[prop]);
-					} else {
-						target[prop] = deepMerge(target[prop], source[prop]);
-					}
-				}
-			}
-		} else {
-			target[prop] = source[prop];
-		}
-	}
-	return target;
-}
-
-export default deepMerge;
\ No newline at end of file
diff --git a/uview-ui/libs/function/getParent.js b/uview-ui/libs/function/getParent.js
deleted file mode 100644
index 9cb45c40..00000000
--- a/uview-ui/libs/function/getParent.js
+++ /dev/null
@@ -1,47 +0,0 @@
-// 获取父组件的参数，因为支付宝小程序不支持provide/inject的写法
-// this.$parent在非H5中，可以准确获取到父组件，但是在H5中，需要多次this.$parent.$parent.xxx
-export default function getParent(name, keys) {
-	let parent = this.$parent;
-	// 通过while历遍，这里主要是为了H5需要多层解析的问题
-	while (parent) {
-		// 父组件
-		if (parent.$options.name !== name) {
-			// 如果组件的name不相等，继续上一级寻找
-			parent = parent.$parent;
-		} else {
-			let data = {};
-			// 判断keys是否数组，如果传过来的是一个数组，那么直接使用数组元素值当做键值去父组件寻找
-			if(Array.isArray(keys)) {
-				keys.map(val => {
-					data[val] = parent[val] ? parent[val] : '';
-				})
-			} else {
-				// 历遍传过来的对象参数
-				for(let i in keys) {
-					// 如果子组件有此值则用，无此值则用父组件的值
-					// 判断是否空数组，如果是，则用父组件的值，否则用子组件的值
-					if(Array.isArray(keys[i])) {
-						if(keys[i].length) {
-							data[i] = keys[i];
-						} else {
-							data[i] = parent[i];
-						}
-					} else if(keys[i].constructor === Object) {
-						// 判断是否对象，如果是对象，且有属性，那么使用子组件的值，否则使用父组件的值
-						if(Object.keys(keys[i]).length) {
-							data[i] = keys[i];
-						} else {
-							data[i] = parent[i];
-						}
-					} else {
-						// 只要子组件有传值，即使是false值，也是“传值”了，也需要覆盖父组件的同名参数
-						data[i] = (keys[i] || keys[i] === false) ? keys[i] : parent[i];
-					}
-				}
-			}
-			return data;
-		}
-	}
-
-	return {};
-}
\ No newline at end of file
diff --git a/uview-ui/libs/function/md5.js b/uview-ui/libs/function/md5.js
deleted file mode 100644
index 8d541a10..00000000
--- a/uview-ui/libs/function/md5.js
+++ /dev/null
@@ -1,385 +0,0 @@
-/*
- * A JavaScript implementation of the RSA Data Security, Inc. MD5 Message
- * Digest Algorithm, as defined in RFC 1321.
- * Version 2.2 Copyright (C) Paul Johnston 1999 - 2009
- * Other contributors: Greg Holt, Andrew Kepert, Ydnar, Lostinet
- * Distributed under the BSD License
- * See http://pajhome.org.uk/crypt/md5 for more info.
- */
-
-/*
- * Configurable variables. You may need to tweak these to be compatible with
- * the server-side, but the defaults work in most cases.
- */
-var hexcase = 0;   /* hex output format. 0 - lowercase; 1 - uppercase        */
-var b64pad  = "";  /* base-64 pad character. "=" for strict RFC compliance   */
-
-/*
- * These are the functions you'll usually want to call
- * They take string arguments and return either hex or base-64 encoded strings
- */
-function hex_md5(s)    { return rstr2hex(rstr_md5(str2rstr_utf8(s))); }
-function b64_md5(s)    { return rstr2b64(rstr_md5(str2rstr_utf8(s))); }
-function any_md5(s, e) { return rstr2any(rstr_md5(str2rstr_utf8(s)), e); }
-function hex_hmac_md5(k, d)
-  { return rstr2hex(rstr_hmac_md5(str2rstr_utf8(k), str2rstr_utf8(d))); }
-function b64_hmac_md5(k, d)
-  { return rstr2b64(rstr_hmac_md5(str2rstr_utf8(k), str2rstr_utf8(d))); }
-function any_hmac_md5(k, d, e)
-  { return rstr2any(rstr_hmac_md5(str2rstr_utf8(k), str2rstr_utf8(d)), e); }
-
-/*
- * Perform a simple self-test to see if the VM is working
- */
-function md5_vm_test()
-{
-  return hex_md5("abc").toLowerCase() == "900150983cd24fb0d6963f7d28e17f72";
-}
-
-/*
- * Calculate the MD5 of a raw string
- */
-function rstr_md5(s)
-{
-  return binl2rstr(binl_md5(rstr2binl(s), s.length * 8));
-}
-
-/*
- * Calculate the HMAC-MD5, of a key and some data (raw strings)
- */
-function rstr_hmac_md5(key, data)
-{
-  var bkey = rstr2binl(key);
-  if(bkey.length > 16) bkey = binl_md5(bkey, key.length * 8);
-
-  var ipad = Array(16), opad = Array(16);
-  for(var i = 0; i < 16; i++)
-  {
-    ipad[i] = bkey[i] ^ 0x36363636;
-    opad[i] = bkey[i] ^ 0x5C5C5C5C;
-  }
-
-  var hash = binl_md5(ipad.concat(rstr2binl(data)), 512 + data.length * 8);
-  return binl2rstr(binl_md5(opad.concat(hash), 512 + 128));
-}
-
-/*
- * Convert a raw string to a hex string
- */
-function rstr2hex(input)
-{
-  try { hexcase } catch(e) { hexcase=0; }
-  var hex_tab = hexcase ? "0123456789ABCDEF" : "0123456789abcdef";
-  var output = "";
-  var x;
-  for(var i = 0; i < input.length; i++)
-  {
-    x = input.charCodeAt(i);
-    output += hex_tab.charAt((x >>> 4) & 0x0F)
-           +  hex_tab.charAt( x        & 0x0F);
-  }
-  return output;
-}
-
-/*
- * Convert a raw string to a base-64 string
- */
-function rstr2b64(input)
-{
-  try { b64pad } catch(e) { b64pad=''; }
-  var tab = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-  var output = "";
-  var len = input.length;
-  for(var i = 0; i < len; i += 3)
-  {
-    var triplet = (input.charCodeAt(i) << 16)
-                | (i + 1 < len ? input.charCodeAt(i+1) << 8 : 0)
-                | (i + 2 < len ? input.charCodeAt(i+2)      : 0);
-    for(var j = 0; j < 4; j++)
-    {
-      if(i * 8 + j * 6 > input.length * 8) output += b64pad;
-      else output += tab.charAt((triplet >>> 6*(3-j)) & 0x3F);
-    }
-  }
-  return output;
-}
-
-/*
- * Convert a raw string to an arbitrary string encoding
- */
-function rstr2any(input, encoding)
-{
-  var divisor = encoding.length;
-  var i, j, q, x, quotient;
-
-  /* Convert to an array of 16-bit big-endian values, forming the dividend */
-  var dividend = Array(Math.ceil(input.length / 2));
-  for(i = 0; i < dividend.length; i++)
-  {
-    dividend[i] = (input.charCodeAt(i * 2) << 8) | input.charCodeAt(i * 2 + 1);
-  }
-
-  /*
-   * Repeatedly perform a long division. The binary array forms the dividend,
-   * the length of the encoding is the divisor. Once computed, the quotient
-   * forms the dividend for the next step. All remainders are stored for later
-   * use.
-   */
-  var full_length = Math.ceil(input.length * 8 /
-                                    (Math.log(encoding.length) / Math.log(2)));
-  var remainders = Array(full_length);
-  for(j = 0; j < full_length; j++)
-  {
-    quotient = Array();
-    x = 0;
-    for(i = 0; i < dividend.length; i++)
-    {
-      x = (x << 16) + dividend[i];
-      q = Math.floor(x / divisor);
-      x -= q * divisor;
-      if(quotient.length > 0 || q > 0)
-        quotient[quotient.length] = q;
-    }
-    remainders[j] = x;
-    dividend = quotient;
-  }
-
-  /* Convert the remainders to the output string */
-  var output = "";
-  for(i = remainders.length - 1; i >= 0; i--)
-    output += encoding.charAt(remainders[i]);
-
-  return output;
-}
-
-/*
- * Encode a string as utf-8.
- * For efficiency, this assumes the input is valid utf-16.
- */
-function str2rstr_utf8(input)
-{
-  var output = "";
-  var i = -1;
-  var x, y;
-
-  while(++i < input.length)
-  {
-    /* Decode utf-16 surrogate pairs */
-    x = input.charCodeAt(i);
-    y = i + 1 < input.length ? input.charCodeAt(i + 1) : 0;
-    if(0xD800 <= x && x <= 0xDBFF && 0xDC00 <= y && y <= 0xDFFF)
-    {
-      x = 0x10000 + ((x & 0x03FF) << 10) + (y & 0x03FF);
-      i++;
-    }
-
-    /* Encode output as utf-8 */
-    if(x <= 0x7F)
-      output += String.fromCharCode(x);
-    else if(x <= 0x7FF)
-      output += String.fromCharCode(0xC0 | ((x >>> 6 ) & 0x1F),
-                                    0x80 | ( x         & 0x3F));
-    else if(x <= 0xFFFF)
-      output += String.fromCharCode(0xE0 | ((x >>> 12) & 0x0F),
-                                    0x80 | ((x >>> 6 ) & 0x3F),
-                                    0x80 | ( x         & 0x3F));
-    else if(x <= 0x1FFFFF)
-      output += String.fromCharCode(0xF0 | ((x >>> 18) & 0x07),
-                                    0x80 | ((x >>> 12) & 0x3F),
-                                    0x80 | ((x >>> 6 ) & 0x3F),
-                                    0x80 | ( x         & 0x3F));
-  }
-  return output;
-}
-
-/*
- * Encode a string as utf-16
- */
-function str2rstr_utf16le(input)
-{
-  var output = "";
-  for(var i = 0; i < input.length; i++)
-    output += String.fromCharCode( input.charCodeAt(i)        & 0xFF,
-                                  (input.charCodeAt(i) >>> 8) & 0xFF);
-  return output;
-}
-
-function str2rstr_utf16be(input)
-{
-  var output = "";
-  for(var i = 0; i < input.length; i++)
-    output += String.fromCharCode((input.charCodeAt(i) >>> 8) & 0xFF,
-                                   input.charCodeAt(i)        & 0xFF);
-  return output;
-}
-
-/*
- * Convert a raw string to an array of little-endian words
- * Characters >255 have their high-byte silently ignored.
- */
-function rstr2binl(input)
-{
-  var output = Array(input.length >> 2);
-  for(var i = 0; i < output.length; i++)
-    output[i] = 0;
-  for(var i = 0; i < input.length * 8; i += 8)
-    output[i>>5] |= (input.charCodeAt(i / 8) & 0xFF) << (i%32);
-  return output;
-}
-
-/*
- * Convert an array of little-endian words to a string
- */
-function binl2rstr(input)
-{
-  var output = "";
-  for(var i = 0; i < input.length * 32; i += 8)
-    output += String.fromCharCode((input[i>>5] >>> (i % 32)) & 0xFF);
-  return output;
-}
-
-/*
- * Calculate the MD5 of an array of little-endian words, and a bit length.
- */
-function binl_md5(x, len)
-{
-  /* append padding */
-  x[len >> 5] |= 0x80 << ((len) % 32);
-  x[(((len + 64) >>> 9) << 4) + 14] = len;
-
-  var a =  1732584193;
-  var b = -271733879;
-  var c = -1732584194;
-  var d =  271733878;
-
-  for(var i = 0; i < x.length; i += 16)
-  {
-    var olda = a;
-    var oldb = b;
-    var oldc = c;
-    var oldd = d;
-
-    a = md5_ff(a, b, c, d, x[i+ 0], 7 , -680876936);
-    d = md5_ff(d, a, b, c, x[i+ 1], 12, -389564586);
-    c = md5_ff(c, d, a, b, x[i+ 2], 17,  606105819);
-    b = md5_ff(b, c, d, a, x[i+ 3], 22, -1044525330);
-    a = md5_ff(a, b, c, d, x[i+ 4], 7 , -176418897);
-    d = md5_ff(d, a, b, c, x[i+ 5], 12,  1200080426);
-    c = md5_ff(c, d, a, b, x[i+ 6], 17, -1473231341);
-    b = md5_ff(b, c, d, a, x[i+ 7], 22, -45705983);
-    a = md5_ff(a, b, c, d, x[i+ 8], 7 ,  1770035416);
-    d = md5_ff(d, a, b, c, x[i+ 9], 12, -1958414417);
-    c = md5_ff(c, d, a, b, x[i+10], 17, -42063);
-    b = md5_ff(b, c, d, a, x[i+11], 22, -1990404162);
-    a = md5_ff(a, b, c, d, x[i+12], 7 ,  1804603682);
-    d = md5_ff(d, a, b, c, x[i+13], 12, -40341101);
-    c = md5_ff(c, d, a, b, x[i+14], 17, -1502002290);
-    b = md5_ff(b, c, d, a, x[i+15], 22,  1236535329);
-
-    a = md5_gg(a, b, c, d, x[i+ 1], 5 , -165796510);
-    d = md5_gg(d, a, b, c, x[i+ 6], 9 , -1069501632);
-    c = md5_gg(c, d, a, b, x[i+11], 14,  643717713);
-    b = md5_gg(b, c, d, a, x[i+ 0], 20, -373897302);
-    a = md5_gg(a, b, c, d, x[i+ 5], 5 , -701558691);
-    d = md5_gg(d, a, b, c, x[i+10], 9 ,  38016083);
-    c = md5_gg(c, d, a, b, x[i+15], 14, -660478335);
-    b = md5_gg(b, c, d, a, x[i+ 4], 20, -405537848);
-    a = md5_gg(a, b, c, d, x[i+ 9], 5 ,  568446438);
-    d = md5_gg(d, a, b, c, x[i+14], 9 , -1019803690);
-    c = md5_gg(c, d, a, b, x[i+ 3], 14, -187363961);
-    b = md5_gg(b, c, d, a, x[i+ 8], 20,  1163531501);
-    a = md5_gg(a, b, c, d, x[i+13], 5 , -1444681467);
-    d = md5_gg(d, a, b, c, x[i+ 2], 9 , -51403784);
-    c = md5_gg(c, d, a, b, x[i+ 7], 14,  1735328473);
-    b = md5_gg(b, c, d, a, x[i+12], 20, -1926607734);
-
-    a = md5_hh(a, b, c, d, x[i+ 5], 4 , -378558);
-    d = md5_hh(d, a, b, c, x[i+ 8], 11, -2022574463);
-    c = md5_hh(c, d, a, b, x[i+11], 16,  1839030562);
-    b = md5_hh(b, c, d, a, x[i+14], 23, -35309556);
-    a = md5_hh(a, b, c, d, x[i+ 1], 4 , -1530992060);
-    d = md5_hh(d, a, b, c, x[i+ 4], 11,  1272893353);
-    c = md5_hh(c, d, a, b, x[i+ 7], 16, -155497632);
-    b = md5_hh(b, c, d, a, x[i+10], 23, -1094730640);
-    a = md5_hh(a, b, c, d, x[i+13], 4 ,  681279174);
-    d = md5_hh(d, a, b, c, x[i+ 0], 11, -358537222);
-    c = md5_hh(c, d, a, b, x[i+ 3], 16, -722521979);
-    b = md5_hh(b, c, d, a, x[i+ 6], 23,  76029189);
-    a = md5_hh(a, b, c, d, x[i+ 9], 4 , -640364487);
-    d = md5_hh(d, a, b, c, x[i+12], 11, -421815835);
-    c = md5_hh(c, d, a, b, x[i+15], 16,  530742520);
-    b = md5_hh(b, c, d, a, x[i+ 2], 23, -995338651);
-
-    a = md5_ii(a, b, c, d, x[i+ 0], 6 , -198630844);
-    d = md5_ii(d, a, b, c, x[i+ 7], 10,  1126891415);
-    c = md5_ii(c, d, a, b, x[i+14], 15, -1416354905);
-    b = md5_ii(b, c, d, a, x[i+ 5], 21, -57434055);
-    a = md5_ii(a, b, c, d, x[i+12], 6 ,  1700485571);
-    d = md5_ii(d, a, b, c, x[i+ 3], 10, -1894986606);
-    c = md5_ii(c, d, a, b, x[i+10], 15, -1051523);
-    b = md5_ii(b, c, d, a, x[i+ 1], 21, -2054922799);
-    a = md5_ii(a, b, c, d, x[i+ 8], 6 ,  1873313359);
-    d = md5_ii(d, a, b, c, x[i+15], 10, -30611744);
-    c = md5_ii(c, d, a, b, x[i+ 6], 15, -1560198380);
-    b = md5_ii(b, c, d, a, x[i+13], 21,  1309151649);
-    a = md5_ii(a, b, c, d, x[i+ 4], 6 , -145523070);
-    d = md5_ii(d, a, b, c, x[i+11], 10, -1120210379);
-    c = md5_ii(c, d, a, b, x[i+ 2], 15,  718787259);
-    b = md5_ii(b, c, d, a, x[i+ 9], 21, -343485551);
-
-    a = safe_add(a, olda);
-    b = safe_add(b, oldb);
-    c = safe_add(c, oldc);
-    d = safe_add(d, oldd);
-  }
-  return Array(a, b, c, d);
-}
-
-/*
- * These functions implement the four basic operations the algorithm uses.
- */
-function md5_cmn(q, a, b, x, s, t)
-{
-  return safe_add(bit_rol(safe_add(safe_add(a, q), safe_add(x, t)), s),b);
-}
-function md5_ff(a, b, c, d, x, s, t)
-{
-  return md5_cmn((b & c) | ((~b) & d), a, b, x, s, t);
-}
-function md5_gg(a, b, c, d, x, s, t)
-{
-  return md5_cmn((b & d) | (c & (~d)), a, b, x, s, t);
-}
-function md5_hh(a, b, c, d, x, s, t)
-{
-  return md5_cmn(b ^ c ^ d, a, b, x, s, t);
-}
-function md5_ii(a, b, c, d, x, s, t)
-{
-  return md5_cmn(c ^ (b | (~d)), a, b, x, s, t);
-}
-
-/*
- * Add integers, wrapping at 2^32. This uses 16-bit operations internally
- * to work around bugs in some JS interpreters.
- */
-function safe_add(x, y)
-{
-  var lsw = (x & 0xFFFF) + (y & 0xFFFF);
-  var msw = (x >> 16) + (y >> 16) + (lsw >> 16);
-  return (msw << 16) | (lsw & 0xFFFF);
-}
-
-/*
- * Bitwise rotate a 32-bit number to the left.
- */
-function bit_rol(num, cnt)
-{
-  return (num << cnt) | (num >>> (32 - cnt));
-}
-
-module.exports = {
-	md5 : function(str){
-		return hex_md5(str);
-	}
-}
\ No newline at end of file
diff --git a/uview-ui/libs/function/queryParams.js b/uview-ui/libs/function/queryParams.js
deleted file mode 100644
index 81c7e5e0..00000000
--- a/uview-ui/libs/function/queryParams.js
+++ /dev/null
@@ -1,58 +0,0 @@
-/**
- * 对象转url参数
- * @param {*} data,对象
- * @param {*} isPrefix,是否自动加上"?"
- */
-function queryParams(data = {}, isPrefix = true, arrayFormat = 'brackets') {
-	let prefix = isPrefix ? '?' : ''
-	let _result = []
-	if (['indices', 'brackets', 'repeat', 'comma'].indexOf(arrayFormat) == -1) arrayFormat = 'brackets';
-	for (let key in data) {
-		let value = data[key]
-		// 去掉为空的参数
-		if (['', undefined, null].indexOf(value) >= 0) {
-			continue;
-		}
-		// 如果值为数组，另行处理
-		if (value.constructor === Array) {
-			// e.g. {ids: [1, 2, 3]}
-			switch (arrayFormat) {
-				case 'indices':
-					// 结果: ids[0]=1&ids[1]=2&ids[2]=3
-					for (let i = 0; i < value.length; i++) {
-						_result.push(key + '[' + i + ']=' + value[i])
-					}
-					break;
-				case 'brackets':
-					// 结果: ids[]=1&ids[]=2&ids[]=3
-					value.forEach(_value => {
-						_result.push(key + '[]=' + _value)
-					})
-					break;
-				case 'repeat':
-					// 结果: ids=1&ids=2&ids=3
-					value.forEach(_value => {
-						_result.push(key + '=' + _value)
-					})
-					break;
-				case 'comma':
-					// 结果: ids=1,2,3
-					let commaStr = "";
-					value.forEach(_value => {
-						commaStr += (commaStr ? "," : "") + _value;
-					})
-					_result.push(key + '=' + commaStr)
-					break;
-				default:
-					value.forEach(_value => {
-						_result.push(key + '[]=' + _value)
-					})
-			}
-		} else {
-			_result.push(key + '=' + value)
-		}
-	}
-	return _result.length ? prefix + _result.join('&') : ''
-}
-
-export default queryParams;
diff --git a/uview-ui/libs/function/random.js b/uview-ui/libs/function/random.js
deleted file mode 100644
index e155279a..00000000
--- a/uview-ui/libs/function/random.js
+++ /dev/null
@@ -1,10 +0,0 @@
-function random(min, max) {
-	if (min >= 0 && max > 0 && max >= min) {
-		let gab = max - min + 1;
-		return Math.floor(Math.random() * gab + min);
-	} else {
-		return 0;
-	}
-}
-
-export default random;
diff --git a/uview-ui/libs/function/randomArray.js b/uview-ui/libs/function/randomArray.js
deleted file mode 100644
index 590a0480..00000000
--- a/uview-ui/libs/function/randomArray.js
+++ /dev/null
@@ -1,7 +0,0 @@
-// 打乱数组
-function randomArray(array = []) {
-	// 原理是sort排序,Math.random()产生0<= x < 1之间的数,会导致x-0.05大于或者小于0
-	return array.sort(() => Math.random() - 0.5);
-}
-
-export default randomArray
diff --git a/uview-ui/libs/function/type2icon.js b/uview-ui/libs/function/type2icon.js
deleted file mode 100644
index 23cb40e9..00000000
--- a/uview-ui/libs/function/type2icon.js
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- * 根据主题type值,获取对应的图标
- * @param String type 主题名称,primary|info|error|warning|success
- * @param String fill 是否使用fill填充实体的图标  
- */
-function type2icon(type = 'success', fill = false) {
-	// 如果非预置值,默认为success
-	if (['primary', 'info', 'error', 'warning', 'success'].indexOf(type) == -1) type = 'success';
-	let iconName = '';
-	// 目前(2019-12-12),info和primary使用同一个图标
-	switch (type) {
-		case 'primary':
-			iconName = 'info-circle';
-			break;
-		case 'info':
-			iconName = 'info-circle';
-			break;
-		case 'error':
-			iconName = 'close-circle';
-			break;
-		case 'warning':
-			iconName = 'error-circle';
-			break;
-		case 'success':
-			iconName = 'checkmark-circle';
-			break;
-		default:
-			iconName = 'checkmark-circle';
-	}
-	// 是否是实体类型,加上-fill,在icon组件库中,实体的类名是后面加-fill的
-	if (fill) iconName += '-fill';
-	return iconName;
-}
-
-export default type2icon
diff --git a/uview-ui/libs/mixin/mixin.js b/uview-ui/libs/mixin/mixin.js
index c1d7b639..6898e497 100644
--- a/uview-ui/libs/mixin/mixin.js
+++ b/uview-ui/libs/mixin/mixin.js
@@ -6,14 +6,17 @@ import {
 module.exports = {
 	data() {
 		return {
-			$IMG_URL: IMG_URL, //解决小程序端template中无法使用vue挂载变量
-			$API_URL: API_URL, //解决小程序端template中无法使用vue挂载变量
-			$Router: this.$Router, //解决小程序端template中无法使用vue挂载变量
-			$tools: this.$tools, //解决小程序端template中无法使用vue挂载变量
+			//解决小程序端template中无法使用vue挂载变量
+			$IMG_URL: IMG_URL, //图片地址
+			$API_URL: API_URL, //api地址
+			$tools: this.$tools, // 工具函数
 		}
 	},
 	mounted() {
-		this.$u.getRect = this.$uGetRect // getRect挂载到$u上，因为这方法需要使用in(this)，所以无法把它独立成一个单独的文件导出
+		// getRect挂载到$u上，因为这方法需要使用in(this)，所以无法把它独立成一个单独的文件导出
+		this.$nextTick(() => {
+			this.$u.getRect = this.$uGetRect
+		})
 	},
 	methods: {
 		// 查询节点信息
diff --git a/uview-ui/libs/mixin/mpShare.js b/uview-ui/libs/mixin/mpShare.js
deleted file mode 100644
index 057d369e..00000000
--- a/uview-ui/libs/mixin/mpShare.js
+++ /dev/null
@@ -1,18 +0,0 @@
-module.exports = {
-	onLoad() {
-		// 设置默认的转发参数
-		this.$u.mpShare = {
-			title: '', // 默认为小程序名称
-			path: '', // 默认为当前页面路径
-			imageUrl: '' // 默认为当前页面的截图
-		}
-	},
-	onShareAppMessage() {
-		return this.$u.mpShare
-	},
-	// #ifdef MP-WEIXIN
-	onShareTimeline() {
-		return this.$u.mpShare
-	}
-	// #endif
-}
diff --git a/uview-ui/libs/util/area.js b/uview-ui/libs/util/area.js
deleted file mode 100644
index 0d602e91..00000000
--- a/uview-ui/libs/util/area.js
+++ /dev/null
@@ -1 +0,0 @@
-var areaData=[[[{"label":"东城区","value":"110101"},{"label":"西城区","value":"110102"},{"label":"朝阳区","value":"110105"},{"label":"丰台区","value":"110106"},{"label":"石景山区","value":"110107"},{"label":"海淀区","value":"110108"},{"label":"门头沟区","value":"110109"},{"label":"房山区","value":"110111"},{"label":"通州区","value":"110112"},{"label":"顺义区","value":"110113"},{"label":"昌平区","value":"110114"},{"label":"大兴区","value":"110115"},{"label":"怀柔区","value":"110116"},{"label":"平谷区","value":"110117"},{"label":"密云区","value":"110118"},{"label":"延庆区","value":"110119"}]],[[{"label":"和平区","value":"120101"},{"label":"河东区","value":"120102"},{"label":"河西区","value":"120103"},{"label":"南开区","value":"120104"},{"label":"河北区","value":"120105"},{"label":"红桥区","value":"120106"},{"label":"东丽区","value":"120110"},{"label":"西青区","value":"120111"},{"label":"津南区","value":"120112"},{"label":"北辰区","value":"120113"},{"label":"武清区","value":"120114"},{"label":"宝坻区","value":"120115"},{"label":"滨海新区","value":"120116"},{"label":"宁河区","value":"120117"},{"label":"静海区","value":"120118"},{"label":"蓟州区","value":"120119"}]],[[{"label":"长安区","value":"130102"},{"label":"桥西区","value":"130104"},{"label":"新华区","value":"130105"},{"label":"井陉矿区","value":"130107"},{"label":"裕华区","value":"130108"},{"label":"藁城区","value":"130109"},{"label":"鹿泉区","value":"130110"},{"label":"栾城区","value":"130111"},{"label":"井陉县","value":"130121"},{"label":"正定县","value":"130123"},{"label":"行唐县","value":"130125"},{"label":"灵寿县","value":"130126"},{"label":"高邑县","value":"130127"},{"label":"深泽县","value":"130128"},{"label":"赞皇县","value":"130129"},{"label":"无极县","value":"130130"},{"label":"平山县","value":"130131"},{"label":"元氏县","value":"130132"},{"label":"赵县","value":"130133"},{"label":"石家庄高新技术产业开发区","value":"130171"},{"label":"石家庄循环化工园区","value":"130172"},{"label":"辛集市","value":"130181"},{"label":"晋州市","value":"130183"},{"label":"新乐市","value":"130184"}],[{"label":"路南区","value":"130202"},{"label":"路北区","value":"130203"},{"label":"古冶区","value":"130204"},{"label":"开平区","value":"130205"},{"label":"丰南区","value":"130207"},{"label":"丰润区","value":"130208"},{"label":"曹妃甸区","value":"130209"},{"label":"滦县","value":"130223"},{"label":"滦南县","value":"130224"},{"label":"乐亭县","value":"130225"},{"label":"迁西县","value":"130227"},{"label":"玉田县","value":"130229"},{"label":"唐山市芦台经济技术开发区","value":"130271"},{"label":"唐山市汉沽管理区","value":"130272"},{"label":"唐山高新技术产业开发区","value":"130273"},{"label":"河北唐山海港经济开发区","value":"130274"},{"label":"遵化市","value":"130281"},{"label":"迁安市","value":"130283"}],[{"label":"海港区","value":"130302"},{"label":"山海关区","value":"130303"},{"label":"北戴河区","value":"130304"},{"label":"抚宁区","value":"130306"},{"label":"青龙满族自治县","value":"130321"},{"label":"昌黎县","value":"130322"},{"label":"卢龙县","value":"130324"},{"label":"秦皇岛市经济技术开发区","value":"130371"},{"label":"北戴河新区","value":"130372"}],[{"label":"邯山区","value":"130402"},{"label":"丛台区","value":"130403"},{"label":"复兴区","value":"130404"},{"label":"峰峰矿区","value":"130406"},{"label":"肥乡区","value":"130407"},{"label":"永年区","value":"130408"},{"label":"临漳县","value":"130423"},{"label":"成安县","value":"130424"},{"label":"大名县","value":"130425"},{"label":"涉县","value":"130426"},{"label":"磁县","value":"130427"},{"label":"邱县","value":"130430"},{"label":"鸡泽县","value":"130431"},{"label":"广平县","value":"130432"},{"label":"馆陶县","value":"130433"},{"label":"魏县","value":"130434"},{"label":"曲周县","value":"130435"},{"label":"邯郸经济技术开发区","value":"130471"},{"label":"邯郸冀南新区","value":"130473"},{"label":"武安市","value":"130481"}],[{"label":"桥东区","value":"130502"},{"label":"桥西区","value":"130503"},{"label":"邢台县","value":"130521"},{"label":"临城县","value":"130522"},{"label":"内丘县","value":"130523"},{"label":"柏乡县","value":"130524"},{"label":"隆尧县","value":"130525"},{"label":"任县","value":"130526"},{"label":"南和县","value":"130527"},{"label":"宁晋县","value":"130528"},{"label":"巨鹿县","value":"130529"},{"label":"新河县","value":"130530"},{"label":"广宗县","value":"130531"},{"label":"平乡县","value":"130532"},{"label":"威县","value":"130533"},{"label":"清河县","value":"130534"},{"label":"临西县","value":"130535"},{"label":"河北邢台经济开发区","value":"130571"},{"label":"南宫市","value":"130581"},{"label":"沙河市","value":"130582"}],[{"label":"竞秀区","value":"130602"},{"label":"莲池区","value":"130606"},{"label":"满城区","value":"130607"},{"label":"清苑区","value":"130608"},{"label":"徐水区","value":"130609"},{"label":"涞水县","value":"130623"},{"label":"阜平县","value":"130624"},{"label":"定兴县","value":"130626"},{"label":"唐县","value":"130627"},{"label":"高阳县","value":"130628"},{"label":"容城县","value":"130629"},{"label":"涞源县","value":"130630"},{"label":"望都县","value":"130631"},{"label":"安新县","value":"130632"},{"label":"易县","value":"130633"},{"label":"曲阳县","value":"130634"},{"label":"蠡县","value":"130635"},{"label":"顺平县","value":"130636"},{"label":"博野县","value":"130637"},{"label":"雄县","value":"130638"},{"label":"保定高新技术产业开发区","value":"130671"},{"label":"保定白沟新城","value":"130672"},{"label":"涿州市","value":"130681"},{"label":"定州市","value":"130682"},{"label":"安国市","value":"130683"},{"label":"高碑店市","value":"130684"}],[{"label":"桥东区","value":"130702"},{"label":"桥西区","value":"130703"},{"label":"宣化区","value":"130705"},{"label":"下花园区","value":"130706"},{"label":"万全区","value":"130708"},{"label":"崇礼区","value":"130709"},{"label":"张北县","value":"130722"},{"label":"康保县","value":"130723"},{"label":"沽源县","value":"130724"},{"label":"尚义县","value":"130725"},{"label":"蔚县","value":"130726"},{"label":"阳原县","value":"130727"},{"label":"怀安县","value":"130728"},{"label":"怀来县","value":"130730"},{"label":"涿鹿县","value":"130731"},{"label":"赤城县","value":"130732"},{"label":"张家口市高新技术产业开发区","value":"130771"},{"label":"张家口市察北管理区","value":"130772"},{"label":"张家口市塞北管理区","value":"130773"}],[{"label":"双桥区","value":"130802"},{"label":"双滦区","value":"130803"},{"label":"鹰手营子矿区","value":"130804"},{"label":"承德县","value":"130821"},{"label":"兴隆县","value":"130822"},{"label":"滦平县","value":"130824"},{"label":"隆化县","value":"130825"},{"label":"丰宁满族自治县","value":"130826"},{"label":"宽城满族自治县","value":"130827"},{"label":"围场满族蒙古族自治县","value":"130828"},{"label":"承德高新技术产业开发区","value":"130871"},{"label":"平泉市","value":"130881"}],[{"label":"新华区","value":"130902"},{"label":"运河区","value":"130903"},{"label":"沧县","value":"130921"},{"label":"青县","value":"130922"},{"label":"东光县","value":"130923"},{"label":"海兴县","value":"130924"},{"label":"盐山县","value":"130925"},{"label":"肃宁县","value":"130926"},{"label":"南皮县","value":"130927"},{"label":"吴桥县","value":"130928"},{"label":"献县","value":"130929"},{"label":"孟村回族自治县","value":"130930"},{"label":"河北沧州经济开发区","value":"130971"},{"label":"沧州高新技术产业开发区","value":"130972"},{"label":"沧州渤海新区","value":"130973"},{"label":"泊头市","value":"130981"},{"label":"任丘市","value":"130982"},{"label":"黄骅市","value":"130983"},{"label":"河间市","value":"130984"}],[{"label":"安次区","value":"131002"},{"label":"广阳区","value":"131003"},{"label":"固安县","value":"131022"},{"label":"永清县","value":"131023"},{"label":"香河县","value":"131024"},{"label":"大城县","value":"131025"},{"label":"文安县","value":"131026"},{"label":"大厂回族自治县","value":"131028"},{"label":"廊坊经济技术开发区","value":"131071"},{"label":"霸州市","value":"131081"},{"label":"三河市","value":"131082"}],[{"label":"桃城区","value":"131102"},{"label":"冀州区","value":"131103"},{"label":"枣强县","value":"131121"},{"label":"武邑县","value":"131122"},{"label":"武强县","value":"131123"},{"label":"饶阳县","value":"131124"},{"label":"安平县","value":"131125"},{"label":"故城县","value":"131126"},{"label":"景县","value":"131127"},{"label":"阜城县","value":"131128"},{"label":"河北衡水经济开发区","value":"131171"},{"label":"衡水滨湖新区","value":"131172"},{"label":"深州市","value":"131182"}]],[[{"label":"小店区","value":"140105"},{"label":"迎泽区","value":"140106"},{"label":"杏花岭区","value":"140107"},{"label":"尖草坪区","value":"140108"},{"label":"万柏林区","value":"140109"},{"label":"晋源区","value":"140110"},{"label":"清徐县","value":"140121"},{"label":"阳曲县","value":"140122"},{"label":"娄烦县","value":"140123"},{"label":"山西转型综合改革示范区","value":"140171"},{"label":"古交市","value":"140181"}],[{"label":"城区","value":"140202"},{"label":"矿区","value":"140203"},{"label":"南郊区","value":"140211"},{"label":"新荣区","value":"140212"},{"label":"阳高县","value":"140221"},{"label":"天镇县","value":"140222"},{"label":"广灵县","value":"140223"},{"label":"灵丘县","value":"140224"},{"label":"浑源县","value":"140225"},{"label":"左云县","value":"140226"},{"label":"大同县","value":"140227"},{"label":"山西大同经济开发区","value":"140271"}],[{"label":"城区","value":"140302"},{"label":"矿区","value":"140303"},{"label":"郊区","value":"140311"},{"label":"平定县","value":"140321"},{"label":"盂县","value":"140322"},{"label":"山西阳泉经济开发区","value":"140371"}],[{"label":"城区","value":"140402"},{"label":"郊区","value":"140411"},{"label":"长治县","value":"140421"},{"label":"襄垣县","value":"140423"},{"label":"屯留县","value":"140424"},{"label":"平顺县","value":"140425"},{"label":"黎城县","value":"140426"},{"label":"壶关县","value":"140427"},{"label":"长子县","value":"140428"},{"label":"武乡县","value":"140429"},{"label":"沁县","value":"140430"},{"label":"沁源县","value":"140431"},{"label":"山西长治高新技术产业园区","value":"140471"},{"label":"潞城市","value":"140481"}],[{"label":"城区","value":"140502"},{"label":"沁水县","value":"140521"},{"label":"阳城县","value":"140522"},{"label":"陵川县","value":"140524"},{"label":"泽州县","value":"140525"},{"label":"高平市","value":"140581"}],[{"label":"朔城区","value":"140602"},{"label":"平鲁区","value":"140603"},{"label":"山阴县","value":"140621"},{"label":"应县","value":"140622"},{"label":"右玉县","value":"140623"},{"label":"怀仁县","value":"140624"},{"label":"山西朔州经济开发区","value":"140671"}],[{"label":"榆次区","value":"140702"},{"label":"榆社县","value":"140721"},{"label":"左权县","value":"140722"},{"label":"和顺县","value":"140723"},{"label":"昔阳县","value":"140724"},{"label":"寿阳县","value":"140725"},{"label":"太谷县","value":"140726"},{"label":"祁县","value":"140727"},{"label":"平遥县","value":"140728"},{"label":"灵石县","value":"140729"},{"label":"介休市","value":"140781"}],[{"label":"盐湖区","value":"140802"},{"label":"临猗县","value":"140821"},{"label":"万荣县","value":"140822"},{"label":"闻喜县","value":"140823"},{"label":"稷山县","value":"140824"},{"label":"新绛县","value":"140825"},{"label":"绛县","value":"140826"},{"label":"垣曲县","value":"140827"},{"label":"夏县","value":"140828"},{"label":"平陆县","value":"140829"},{"label":"芮城县","value":"140830"},{"label":"永济市","value":"140881"},{"label":"河津市","value":"140882"}],[{"label":"忻府区","value":"140902"},{"label":"定襄县","value":"140921"},{"label":"五台县","value":"140922"},{"label":"代县","value":"140923"},{"label":"繁峙县","value":"140924"},{"label":"宁武县","value":"140925"},{"label":"静乐县","value":"140926"},{"label":"神池县","value":"140927"},{"label":"五寨县","value":"140928"},{"label":"岢岚县","value":"140929"},{"label":"河曲县","value":"140930"},{"label":"保德县","value":"140931"},{"label":"偏关县","value":"140932"},{"label":"五台山风景名胜区","value":"140971"},{"label":"原平市","value":"140981"}],[{"label":"尧都区","value":"141002"},{"label":"曲沃县","value":"141021"},{"label":"翼城县","value":"141022"},{"label":"襄汾县","value":"141023"},{"label":"洪洞县","value":"141024"},{"label":"古县","value":"141025"},{"label":"安泽县","value":"141026"},{"label":"浮山县","value":"141027"},{"label":"吉县","value":"141028"},{"label":"乡宁县","value":"141029"},{"label":"大宁县","value":"141030"},{"label":"隰县","value":"141031"},{"label":"永和县","value":"141032"},{"label":"蒲县","value":"141033"},{"label":"汾西县","value":"141034"},{"label":"侯马市","value":"141081"},{"label":"霍州市","value":"141082"}],[{"label":"离石区","value":"141102"},{"label":"文水县","value":"141121"},{"label":"交城县","value":"141122"},{"label":"兴县","value":"141123"},{"label":"临县","value":"141124"},{"label":"柳林县","value":"141125"},{"label":"石楼县","value":"141126"},{"label":"岚县","value":"141127"},{"label":"方山县","value":"141128"},{"label":"中阳县","value":"141129"},{"label":"交口县","value":"141130"},{"label":"孝义市","value":"141181"},{"label":"汾阳市","value":"141182"}]],[[{"label":"新城区","value":"150102"},{"label":"回民区","value":"150103"},{"label":"玉泉区","value":"150104"},{"label":"赛罕区","value":"150105"},{"label":"土默特左旗","value":"150121"},{"label":"托克托县","value":"150122"},{"label":"和林格尔县","value":"150123"},{"label":"清水河县","value":"150124"},{"label":"武川县","value":"150125"},{"label":"呼和浩特金海工业园区","value":"150171"},{"label":"呼和浩特经济技术开发区","value":"150172"}],[{"label":"东河区","value":"150202"},{"label":"昆都仑区","value":"150203"},{"label":"青山区","value":"150204"},{"label":"石拐区","value":"150205"},{"label":"白云鄂博矿区","value":"150206"},{"label":"九原区","value":"150207"},{"label":"土默特右旗","value":"150221"},{"label":"固阳县","value":"150222"},{"label":"达尔罕茂明安联合旗","value":"150223"},{"label":"包头稀土高新技术产业开发区","value":"150271"}],[{"label":"海勃湾区","value":"150302"},{"label":"海南区","value":"150303"},{"label":"乌达区","value":"150304"}],[{"label":"红山区","value":"150402"},{"label":"元宝山区","value":"150403"},{"label":"松山区","value":"150404"},{"label":"阿鲁科尔沁旗","value":"150421"},{"label":"巴林左旗","value":"150422"},{"label":"巴林右旗","value":"150423"},{"label":"林西县","value":"150424"},{"label":"克什克腾旗","value":"150425"},{"label":"翁牛特旗","value":"150426"},{"label":"喀喇沁旗","value":"150428"},{"label":"宁城县","value":"150429"},{"label":"敖汉旗","value":"150430"}],[{"label":"科尔沁区","value":"150502"},{"label":"科尔沁左翼中旗","value":"150521"},{"label":"科尔沁左翼后旗","value":"150522"},{"label":"开鲁县","value":"150523"},{"label":"库伦旗","value":"150524"},{"label":"奈曼旗","value":"150525"},{"label":"扎鲁特旗","value":"150526"},{"label":"通辽经济技术开发区","value":"150571"},{"label":"霍林郭勒市","value":"150581"}],[{"label":"东胜区","value":"150602"},{"label":"康巴什区","value":"150603"},{"label":"达拉特旗","value":"150621"},{"label":"准格尔旗","value":"150622"},{"label":"鄂托克前旗","value":"150623"},{"label":"鄂托克旗","value":"150624"},{"label":"杭锦旗","value":"150625"},{"label":"乌审旗","value":"150626"},{"label":"伊金霍洛旗","value":"150627"}],[{"label":"海拉尔区","value":"150702"},{"label":"扎赉诺尔区","value":"150703"},{"label":"阿荣旗","value":"150721"},{"label":"莫力达瓦达斡尔族自治旗","value":"150722"},{"label":"鄂伦春自治旗","value":"150723"},{"label":"鄂温克族自治旗","value":"150724"},{"label":"陈巴尔虎旗","value":"150725"},{"label":"新巴尔虎左旗","value":"150726"},{"label":"新巴尔虎右旗","value":"150727"},{"label":"满洲里市","value":"150781"},{"label":"牙克石市","value":"150782"},{"label":"扎兰屯市","value":"150783"},{"label":"额尔古纳市","value":"150784"},{"label":"根河市","value":"150785"}],[{"label":"临河区","value":"150802"},{"label":"五原县","value":"150821"},{"label":"磴口县","value":"150822"},{"label":"乌拉特前旗","value":"150823"},{"label":"乌拉特中旗","value":"150824"},{"label":"乌拉特后旗","value":"150825"},{"label":"杭锦后旗","value":"150826"}],[{"label":"集宁区","value":"150902"},{"label":"卓资县","value":"150921"},{"label":"化德县","value":"150922"},{"label":"商都县","value":"150923"},{"label":"兴和县","value":"150924"},{"label":"凉城县","value":"150925"},{"label":"察哈尔右翼前旗","value":"150926"},{"label":"察哈尔右翼中旗","value":"150927"},{"label":"察哈尔右翼后旗","value":"150928"},{"label":"四子王旗","value":"150929"},{"label":"丰镇市","value":"150981"}],[{"label":"乌兰浩特市","value":"152201"},{"label":"阿尔山市","value":"152202"},{"label":"科尔沁右翼前旗","value":"152221"},{"label":"科尔沁右翼中旗","value":"152222"},{"label":"扎赉特旗","value":"152223"},{"label":"突泉县","value":"152224"}],[{"label":"二连浩特市","value":"152501"},{"label":"锡林浩特市","value":"152502"},{"label":"阿巴嘎旗","value":"152522"},{"label":"苏尼特左旗","value":"152523"},{"label":"苏尼特右旗","value":"152524"},{"label":"东乌珠穆沁旗","value":"152525"},{"label":"西乌珠穆沁旗","value":"152526"},{"label":"太仆寺旗","value":"152527"},{"label":"镶黄旗","value":"152528"},{"label":"正镶白旗","value":"152529"},{"label":"正蓝旗","value":"152530"},{"label":"多伦县","value":"152531"},{"label":"乌拉盖管委会","value":"152571"}],[{"label":"阿拉善左旗","value":"152921"},{"label":"阿拉善右旗","value":"152922"},{"label":"额济纳旗","value":"152923"},{"label":"内蒙古阿拉善经济开发区","value":"152971"}]],[[{"label":"和平区","value":"210102"},{"label":"沈河区","value":"210103"},{"label":"大东区","value":"210104"},{"label":"皇姑区","value":"210105"},{"label":"铁西区","value":"210106"},{"label":"苏家屯区","value":"210111"},{"label":"浑南区","value":"210112"},{"label":"沈北新区","value":"210113"},{"label":"于洪区","value":"210114"},{"label":"辽中区","value":"210115"},{"label":"康平县","value":"210123"},{"label":"法库县","value":"210124"},{"label":"新民市","value":"210181"}],[{"label":"中山区","value":"210202"},{"label":"西岗区","value":"210203"},{"label":"沙河口区","value":"210204"},{"label":"甘井子区","value":"210211"},{"label":"旅顺口区","value":"210212"},{"label":"金州区","value":"210213"},{"label":"普兰店区","value":"210214"},{"label":"长海县","value":"210224"},{"label":"瓦房店市","value":"210281"},{"label":"庄河市","value":"210283"}],[{"label":"铁东区","value":"210302"},{"label":"铁西区","value":"210303"},{"label":"立山区","value":"210304"},{"label":"千山区","value":"210311"},{"label":"台安县","value":"210321"},{"label":"岫岩满族自治县","value":"210323"},{"label":"海城市","value":"210381"}],[{"label":"新抚区","value":"210402"},{"label":"东洲区","value":"210403"},{"label":"望花区","value":"210404"},{"label":"顺城区","value":"210411"},{"label":"抚顺县","value":"210421"},{"label":"新宾满族自治县","value":"210422"},{"label":"清原满族自治县","value":"210423"}],[{"label":"平山区","value":"210502"},{"label":"溪湖区","value":"210503"},{"label":"明山区","value":"210504"},{"label":"南芬区","value":"210505"},{"label":"本溪满族自治县","value":"210521"},{"label":"桓仁满族自治县","value":"210522"}],[{"label":"元宝区","value":"210602"},{"label":"振兴区","value":"210603"},{"label":"振安区","value":"210604"},{"label":"宽甸满族自治县","value":"210624"},{"label":"东港市","value":"210681"},{"label":"凤城市","value":"210682"}],[{"label":"古塔区","value":"210702"},{"label":"凌河区","value":"210703"},{"label":"太和区","value":"210711"},{"label":"黑山县","value":"210726"},{"label":"义县","value":"210727"},{"label":"凌海市","value":"210781"},{"label":"北镇市","value":"210782"}],[{"label":"站前区","value":"210802"},{"label":"西市区","value":"210803"},{"label":"鲅鱼圈区","value":"210804"},{"label":"老边区","value":"210811"},{"label":"盖州市","value":"210881"},{"label":"大石桥市","value":"210882"}],[{"label":"海州区","value":"210902"},{"label":"新邱区","value":"210903"},{"label":"太平区","value":"210904"},{"label":"清河门区","value":"210905"},{"label":"细河区","value":"210911"},{"label":"阜新蒙古族自治县","value":"210921"},{"label":"彰武县","value":"210922"}],[{"label":"白塔区","value":"211002"},{"label":"文圣区","value":"211003"},{"label":"宏伟区","value":"211004"},{"label":"弓长岭区","value":"211005"},{"label":"太子河区","value":"211011"},{"label":"辽阳县","value":"211021"},{"label":"灯塔市","value":"211081"}],[{"label":"双台子区","value":"211102"},{"label":"兴隆台区","value":"211103"},{"label":"大洼区","value":"211104"},{"label":"盘山县","value":"211122"}],[{"label":"银州区","value":"211202"},{"label":"清河区","value":"211204"},{"label":"铁岭县","value":"211221"},{"label":"西丰县","value":"211223"},{"label":"昌图县","value":"211224"},{"label":"调兵山市","value":"211281"},{"label":"开原市","value":"211282"}],[{"label":"双塔区","value":"211302"},{"label":"龙城区","value":"211303"},{"label":"朝阳县","value":"211321"},{"label":"建平县","value":"211322"},{"label":"喀喇沁左翼蒙古族自治县","value":"211324"},{"label":"北票市","value":"211381"},{"label":"凌源市","value":"211382"}],[{"label":"连山区","value":"211402"},{"label":"龙港区","value":"211403"},{"label":"南票区","value":"211404"},{"label":"绥中县","value":"211421"},{"label":"建昌县","value":"211422"},{"label":"兴城市","value":"211481"}]],[[{"label":"南关区","value":"220102"},{"label":"宽城区","value":"220103"},{"label":"朝阳区","value":"220104"},{"label":"二道区","value":"220105"},{"label":"绿园区","value":"220106"},{"label":"双阳区","value":"220112"},{"label":"九台区","value":"220113"},{"label":"农安县","value":"220122"},{"label":"长春经济技术开发区","value":"220171"},{"label":"长春净月高新技术产业开发区","value":"220172"},{"label":"长春高新技术产业开发区","value":"220173"},{"label":"长春汽车经济技术开发区","value":"220174"},{"label":"榆树市","value":"220182"},{"label":"德惠市","value":"220183"}],[{"label":"昌邑区","value":"220202"},{"label":"龙潭区","value":"220203"},{"label":"船营区","value":"220204"},{"label":"丰满区","value":"220211"},{"label":"永吉县","value":"220221"},{"label":"吉林经济开发区","value":"220271"},{"label":"吉林高新技术产业开发区","value":"220272"},{"label":"吉林中国新加坡食品区","value":"220273"},{"label":"蛟河市","value":"220281"},{"label":"桦甸市","value":"220282"},{"label":"舒兰市","value":"220283"},{"label":"磐石市","value":"220284"}],[{"label":"铁西区","value":"220302"},{"label":"铁东区","value":"220303"},{"label":"梨树县","value":"220322"},{"label":"伊通满族自治县","value":"220323"},{"label":"公主岭市","value":"220381"},{"label":"双辽市","value":"220382"}],[{"label":"龙山区","value":"220402"},{"label":"西安区","value":"220403"},{"label":"东丰县","value":"220421"},{"label":"东辽县","value":"220422"}],[{"label":"东昌区","value":"220502"},{"label":"二道江区","value":"220503"},{"label":"通化县","value":"220521"},{"label":"辉南县","value":"220523"},{"label":"柳河县","value":"220524"},{"label":"梅河口市","value":"220581"},{"label":"集安市","value":"220582"}],[{"label":"浑江区","value":"220602"},{"label":"江源区","value":"220605"},{"label":"抚松县","value":"220621"},{"label":"靖宇县","value":"220622"},{"label":"长白朝鲜族自治县","value":"220623"},{"label":"临江市","value":"220681"}],[{"label":"宁江区","value":"220702"},{"label":"前郭尔罗斯蒙古族自治县","value":"220721"},{"label":"长岭县","value":"220722"},{"label":"乾安县","value":"220723"},{"label":"吉林松原经济开发区","value":"220771"},{"label":"扶余市","value":"220781"}],[{"label":"洮北区","value":"220802"},{"label":"镇赉县","value":"220821"},{"label":"通榆县","value":"220822"},{"label":"吉林白城经济开发区","value":"220871"},{"label":"洮南市","value":"220881"},{"label":"大安市","value":"220882"}],[{"label":"延吉市","value":"222401"},{"label":"图们市","value":"222402"},{"label":"敦化市","value":"222403"},{"label":"珲春市","value":"222404"},{"label":"龙井市","value":"222405"},{"label":"和龙市","value":"222406"},{"label":"汪清县","value":"222424"},{"label":"安图县","value":"222426"}]],[[{"label":"道里区","value":"230102"},{"label":"南岗区","value":"230103"},{"label":"道外区","value":"230104"},{"label":"平房区","value":"230108"},{"label":"松北区","value":"230109"},{"label":"香坊区","value":"230110"},{"label":"呼兰区","value":"230111"},{"label":"阿城区","value":"230112"},{"label":"双城区","value":"230113"},{"label":"依兰县","value":"230123"},{"label":"方正县","value":"230124"},{"label":"宾县","value":"230125"},{"label":"巴彦县","value":"230126"},{"label":"木兰县","value":"230127"},{"label":"通河县","value":"230128"},{"label":"延寿县","value":"230129"},{"label":"尚志市","value":"230183"},{"label":"五常市","value":"230184"}],[{"label":"龙沙区","value":"230202"},{"label":"建华区","value":"230203"},{"label":"铁锋区","value":"230204"},{"label":"昂昂溪区","value":"230205"},{"label":"富拉尔基区","value":"230206"},{"label":"碾子山区","value":"230207"},{"label":"梅里斯达斡尔族区","value":"230208"},{"label":"龙江县","value":"230221"},{"label":"依安县","value":"230223"},{"label":"泰来县","value":"230224"},{"label":"甘南县","value":"230225"},{"label":"富裕县","value":"230227"},{"label":"克山县","value":"230229"},{"label":"克东县","value":"230230"},{"label":"拜泉县","value":"230231"},{"label":"讷河市","value":"230281"}],[{"label":"鸡冠区","value":"230302"},{"label":"恒山区","value":"230303"},{"label":"滴道区","value":"230304"},{"label":"梨树区","value":"230305"},{"label":"城子河区","value":"230306"},{"label":"麻山区","value":"230307"},{"label":"鸡东县","value":"230321"},{"label":"虎林市","value":"230381"},{"label":"密山市","value":"230382"}],[{"label":"向阳区","value":"230402"},{"label":"工农区","value":"230403"},{"label":"南山区","value":"230404"},{"label":"兴安区","value":"230405"},{"label":"东山区","value":"230406"},{"label":"兴山区","value":"230407"},{"label":"萝北县","value":"230421"},{"label":"绥滨县","value":"230422"}],[{"label":"尖山区","value":"230502"},{"label":"岭东区","value":"230503"},{"label":"四方台区","value":"230505"},{"label":"宝山区","value":"230506"},{"label":"集贤县","value":"230521"},{"label":"友谊县","value":"230522"},{"label":"宝清县","value":"230523"},{"label":"饶河县","value":"230524"}],[{"label":"萨尔图区","value":"230602"},{"label":"龙凤区","value":"230603"},{"label":"让胡路区","value":"230604"},{"label":"红岗区","value":"230605"},{"label":"大同区","value":"230606"},{"label":"肇州县","value":"230621"},{"label":"肇源县","value":"230622"},{"label":"林甸县","value":"230623"},{"label":"杜尔伯特蒙古族自治县","value":"230624"},{"label":"大庆高新技术产业开发区","value":"230671"}],[{"label":"伊春区","value":"230702"},{"label":"南岔区","value":"230703"},{"label":"友好区","value":"230704"},{"label":"西林区","value":"230705"},{"label":"翠峦区","value":"230706"},{"label":"新青区","value":"230707"},{"label":"美溪区","value":"230708"},{"label":"金山屯区","value":"230709"},{"label":"五营区","value":"230710"},{"label":"乌马河区","value":"230711"},{"label":"汤旺河区","value":"230712"},{"label":"带岭区","value":"230713"},{"label":"乌伊岭区","value":"230714"},{"label":"红星区","value":"230715"},{"label":"上甘岭区","value":"230716"},{"label":"嘉荫县","value":"230722"},{"label":"铁力市","value":"230781"}],[{"label":"向阳区","value":"230803"},{"label":"前进区","value":"230804"},{"label":"东风区","value":"230805"},{"label":"郊区","value":"230811"},{"label":"桦南县","value":"230822"},{"label":"桦川县","value":"230826"},{"label":"汤原县","value":"230828"},{"label":"同江市","value":"230881"},{"label":"富锦市","value":"230882"},{"label":"抚远市","value":"230883"}],[{"label":"新兴区","value":"230902"},{"label":"桃山区","value":"230903"},{"label":"茄子河区","value":"230904"},{"label":"勃利县","value":"230921"}],[{"label":"东安区","value":"231002"},{"label":"阳明区","value":"231003"},{"label":"爱民区","value":"231004"},{"label":"西安区","value":"231005"},{"label":"林口县","value":"231025"},{"label":"牡丹江经济技术开发区","value":"231071"},{"label":"绥芬河市","value":"231081"},{"label":"海林市","value":"231083"},{"label":"宁安市","value":"231084"},{"label":"穆棱市","value":"231085"},{"label":"东宁市","value":"231086"}],[{"label":"爱辉区","value":"231102"},{"label":"嫩江县","value":"231121"},{"label":"逊克县","value":"231123"},{"label":"孙吴县","value":"231124"},{"label":"北安市","value":"231181"},{"label":"五大连池市","value":"231182"}],[{"label":"北林区","value":"231202"},{"label":"望奎县","value":"231221"},{"label":"兰西县","value":"231222"},{"label":"青冈县","value":"231223"},{"label":"庆安县","value":"231224"},{"label":"明水县","value":"231225"},{"label":"绥棱县","value":"231226"},{"label":"安达市","value":"231281"},{"label":"肇东市","value":"231282"},{"label":"海伦市","value":"231283"}],[{"label":"加格达奇区","value":"232701"},{"label":"松岭区","value":"232702"},{"label":"新林区","value":"232703"},{"label":"呼中区","value":"232704"},{"label":"呼玛县","value":"232721"},{"label":"塔河县","value":"232722"},{"label":"漠河县","value":"232723"}]],[[{"label":"黄浦区","value":"310101"},{"label":"徐汇区","value":"310104"},{"label":"长宁区","value":"310105"},{"label":"静安区","value":"310106"},{"label":"普陀区","value":"310107"},{"label":"虹口区","value":"310109"},{"label":"杨浦区","value":"310110"},{"label":"闵行区","value":"310112"},{"label":"宝山区","value":"310113"},{"label":"嘉定区","value":"310114"},{"label":"浦东新区","value":"310115"},{"label":"金山区","value":"310116"},{"label":"松江区","value":"310117"},{"label":"青浦区","value":"310118"},{"label":"奉贤区","value":"310120"},{"label":"崇明区","value":"310151"}]],[[{"label":"玄武区","value":"320102"},{"label":"秦淮区","value":"320104"},{"label":"建邺区","value":"320105"},{"label":"鼓楼区","value":"320106"},{"label":"浦口区","value":"320111"},{"label":"栖霞区","value":"320113"},{"label":"雨花台区","value":"320114"},{"label":"江宁区","value":"320115"},{"label":"六合区","value":"320116"},{"label":"溧水区","value":"320117"},{"label":"高淳区","value":"320118"}],[{"label":"锡山区","value":"320205"},{"label":"惠山区","value":"320206"},{"label":"滨湖区","value":"320211"},{"label":"梁溪区","value":"320213"},{"label":"新吴区","value":"320214"},{"label":"江阴市","value":"320281"},{"label":"宜兴市","value":"320282"}],[{"label":"鼓楼区","value":"320302"},{"label":"云龙区","value":"320303"},{"label":"贾汪区","value":"320305"},{"label":"泉山区","value":"320311"},{"label":"铜山区","value":"320312"},{"label":"丰县","value":"320321"},{"label":"沛县","value":"320322"},{"label":"睢宁县","value":"320324"},{"label":"徐州经济技术开发区","value":"320371"},{"label":"新沂市","value":"320381"},{"label":"邳州市","value":"320382"}],[{"label":"天宁区","value":"320402"},{"label":"钟楼区","value":"320404"},{"label":"新北区","value":"320411"},{"label":"武进区","value":"320412"},{"label":"金坛区","value":"320413"},{"label":"溧阳市","value":"320481"}],[{"label":"虎丘区","value":"320505"},{"label":"吴中区","value":"320506"},{"label":"相城区","value":"320507"},{"label":"姑苏区","value":"320508"},{"label":"吴江区","value":"320509"},{"label":"苏州工业园区","value":"320571"},{"label":"常熟市","value":"320581"},{"label":"张家港市","value":"320582"},{"label":"昆山市","value":"320583"},{"label":"太仓市","value":"320585"}],[{"label":"崇川区","value":"320602"},{"label":"港闸区","value":"320611"},{"label":"通州区","value":"320612"},{"label":"海安县","value":"320621"},{"label":"如东县","value":"320623"},{"label":"南通经济技术开发区","value":"320671"},{"label":"启东市","value":"320681"},{"label":"如皋市","value":"320682"},{"label":"海门市","value":"320684"}],[{"label":"连云区","value":"320703"},{"label":"海州区","value":"320706"},{"label":"赣榆区","value":"320707"},{"label":"东海县","value":"320722"},{"label":"灌云县","value":"320723"},{"label":"灌南县","value":"320724"},{"label":"连云港经济技术开发区","value":"320771"},{"label":"连云港高新技术产业开发区","value":"320772"}],[{"label":"淮安区","value":"320803"},{"label":"淮阴区","value":"320804"},{"label":"清江浦区","value":"320812"},{"label":"洪泽区","value":"320813"},{"label":"涟水县","value":"320826"},{"label":"盱眙县","value":"320830"},{"label":"金湖县","value":"320831"},{"label":"淮安经济技术开发区","value":"320871"}],[{"label":"亭湖区","value":"320902"},{"label":"盐都区","value":"320903"},{"label":"大丰区","value":"320904"},{"label":"响水县","value":"320921"},{"label":"滨海县","value":"320922"},{"label":"阜宁县","value":"320923"},{"label":"射阳县","value":"320924"},{"label":"建湖县","value":"320925"},{"label":"盐城经济技术开发区","value":"320971"},{"label":"东台市","value":"320981"}],[{"label":"广陵区","value":"321002"},{"label":"邗江区","value":"321003"},{"label":"江都区","value":"321012"},{"label":"宝应县","value":"321023"},{"label":"扬州经济技术开发区","value":"321071"},{"label":"仪征市","value":"321081"},{"label":"高邮市","value":"321084"}],[{"label":"京口区","value":"321102"},{"label":"润州区","value":"321111"},{"label":"丹徒区","value":"321112"},{"label":"镇江新区","value":"321171"},{"label":"丹阳市","value":"321181"},{"label":"扬中市","value":"321182"},{"label":"句容市","value":"321183"}],[{"label":"海陵区","value":"321202"},{"label":"高港区","value":"321203"},{"label":"姜堰区","value":"321204"},{"label":"泰州医药高新技术产业开发区","value":"321271"},{"label":"兴化市","value":"321281"},{"label":"靖江市","value":"321282"},{"label":"泰兴市","value":"321283"}],[{"label":"宿城区","value":"321302"},{"label":"宿豫区","value":"321311"},{"label":"沭阳县","value":"321322"},{"label":"泗阳县","value":"321323"},{"label":"泗洪县","value":"321324"},{"label":"宿迁经济技术开发区","value":"321371"}]],[[{"label":"上城区","value":"330102"},{"label":"下城区","value":"330103"},{"label":"江干区","value":"330104"},{"label":"拱墅区","value":"330105"},{"label":"西湖区","value":"330106"},{"label":"滨江区","value":"330108"},{"label":"萧山区","value":"330109"},{"label":"余杭区","value":"330110"},{"label":"富阳区","value":"330111"},{"label":"临安区","value":"330112"},{"label":"桐庐县","value":"330122"},{"label":"淳安县","value":"330127"},{"label":"建德市","value":"330182"}],[{"label":"海曙区","value":"330203"},{"label":"江北区","value":"330205"},{"label":"北仑区","value":"330206"},{"label":"镇海区","value":"330211"},{"label":"鄞州区","value":"330212"},{"label":"奉化区","value":"330213"},{"label":"象山县","value":"330225"},{"label":"宁海县","value":"330226"},{"label":"余姚市","value":"330281"},{"label":"慈溪市","value":"330282"}],[{"label":"鹿城区","value":"330302"},{"label":"龙湾区","value":"330303"},{"label":"瓯海区","value":"330304"},{"label":"洞头区","value":"330305"},{"label":"永嘉县","value":"330324"},{"label":"平阳县","value":"330326"},{"label":"苍南县","value":"330327"},{"label":"文成县","value":"330328"},{"label":"泰顺县","value":"330329"},{"label":"温州经济技术开发区","value":"330371"},{"label":"瑞安市","value":"330381"},{"label":"乐清市","value":"330382"}],[{"label":"南湖区","value":"330402"},{"label":"秀洲区","value":"330411"},{"label":"嘉善县","value":"330421"},{"label":"海盐县","value":"330424"},{"label":"海宁市","value":"330481"},{"label":"平湖市","value":"330482"},{"label":"桐乡市","value":"330483"}],[{"label":"吴兴区","value":"330502"},{"label":"南浔区","value":"330503"},{"label":"德清县","value":"330521"},{"label":"长兴县","value":"330522"},{"label":"安吉县","value":"330523"}],[{"label":"越城区","value":"330602"},{"label":"柯桥区","value":"330603"},{"label":"上虞区","value":"330604"},{"label":"新昌县","value":"330624"},{"label":"诸暨市","value":"330681"},{"label":"嵊州市","value":"330683"}],[{"label":"婺城区","value":"330702"},{"label":"金东区","value":"330703"},{"label":"武义县","value":"330723"},{"label":"浦江县","value":"330726"},{"label":"磐安县","value":"330727"},{"label":"兰溪市","value":"330781"},{"label":"义乌市","value":"330782"},{"label":"东阳市","value":"330783"},{"label":"永康市","value":"330784"}],[{"label":"柯城区","value":"330802"},{"label":"衢江区","value":"330803"},{"label":"常山县","value":"330822"},{"label":"开化县","value":"330824"},{"label":"龙游县","value":"330825"},{"label":"江山市","value":"330881"}],[{"label":"定海区","value":"330902"},{"label":"普陀区","value":"330903"},{"label":"岱山县","value":"330921"},{"label":"嵊泗县","value":"330922"}],[{"label":"椒江区","value":"331002"},{"label":"黄岩区","value":"331003"},{"label":"路桥区","value":"331004"},{"label":"三门县","value":"331022"},{"label":"天台县","value":"331023"},{"label":"仙居县","value":"331024"},{"label":"温岭市","value":"331081"},{"label":"临海市","value":"331082"},{"label":"玉环市","value":"331083"}],[{"label":"莲都区","value":"331102"},{"label":"青田县","value":"331121"},{"label":"缙云县","value":"331122"},{"label":"遂昌县","value":"331123"},{"label":"松阳县","value":"331124"},{"label":"云和县","value":"331125"},{"label":"庆元县","value":"331126"},{"label":"景宁畲族自治县","value":"331127"},{"label":"龙泉市","value":"331181"}]],[[{"label":"瑶海区","value":"340102"},{"label":"庐阳区","value":"340103"},{"label":"蜀山区","value":"340104"},{"label":"包河区","value":"340111"},{"label":"长丰县","value":"340121"},{"label":"肥东县","value":"340122"},{"label":"肥西县","value":"340123"},{"label":"庐江县","value":"340124"},{"label":"合肥高新技术产业开发区","value":"340171"},{"label":"合肥经济技术开发区","value":"340172"},{"label":"合肥新站高新技术产业开发区","value":"340173"},{"label":"巢湖市","value":"340181"}],[{"label":"镜湖区","value":"340202"},{"label":"弋江区","value":"340203"},{"label":"鸠江区","value":"340207"},{"label":"三山区","value":"340208"},{"label":"芜湖县","value":"340221"},{"label":"繁昌县","value":"340222"},{"label":"南陵县","value":"340223"},{"label":"无为县","value":"340225"},{"label":"芜湖经济技术开发区","value":"340271"},{"label":"安徽芜湖长江大桥经济开发区","value":"340272"}],[{"label":"龙子湖区","value":"340302"},{"label":"蚌山区","value":"340303"},{"label":"禹会区","value":"340304"},{"label":"淮上区","value":"340311"},{"label":"怀远县","value":"340321"},{"label":"五河县","value":"340322"},{"label":"固镇县","value":"340323"},{"label":"蚌埠市高新技术开发区","value":"340371"},{"label":"蚌埠市经济开发区","value":"340372"}],[{"label":"大通区","value":"340402"},{"label":"田家庵区","value":"340403"},{"label":"谢家集区","value":"340404"},{"label":"八公山区","value":"340405"},{"label":"潘集区","value":"340406"},{"label":"凤台县","value":"340421"},{"label":"寿县","value":"340422"}],[{"label":"花山区","value":"340503"},{"label":"雨山区","value":"340504"},{"label":"博望区","value":"340506"},{"label":"当涂县","value":"340521"},{"label":"含山县","value":"340522"},{"label":"和县","value":"340523"}],[{"label":"杜集区","value":"340602"},{"label":"相山区","value":"340603"},{"label":"烈山区","value":"340604"},{"label":"濉溪县","value":"340621"}],[{"label":"铜官区","value":"340705"},{"label":"义安区","value":"340706"},{"label":"郊区","value":"340711"},{"label":"枞阳县","value":"340722"}],[{"label":"迎江区","value":"340802"},{"label":"大观区","value":"340803"},{"label":"宜秀区","value":"340811"},{"label":"怀宁县","value":"340822"},{"label":"潜山县","value":"340824"},{"label":"太湖县","value":"340825"},{"label":"宿松县","value":"340826"},{"label":"望江县","value":"340827"},{"label":"岳西县","value":"340828"},{"label":"安徽安庆经济开发区","value":"340871"},{"label":"桐城市","value":"340881"}],[{"label":"屯溪区","value":"341002"},{"label":"黄山区","value":"341003"},{"label":"徽州区","value":"341004"},{"label":"歙县","value":"341021"},{"label":"休宁县","value":"341022"},{"label":"黟县","value":"341023"},{"label":"祁门县","value":"341024"}],[{"label":"琅琊区","value":"341102"},{"label":"南谯区","value":"341103"},{"label":"来安县","value":"341122"},{"label":"全椒县","value":"341124"},{"label":"定远县","value":"341125"},{"label":"凤阳县","value":"341126"},{"label":"苏滁现代产业园","value":"341171"},{"label":"滁州经济技术开发区","value":"341172"},{"label":"天长市","value":"341181"},{"label":"明光市","value":"341182"}],[{"label":"颍州区","value":"341202"},{"label":"颍东区","value":"341203"},{"label":"颍泉区","value":"341204"},{"label":"临泉县","value":"341221"},{"label":"太和县","value":"341222"},{"label":"阜南县","value":"341225"},{"label":"颍上县","value":"341226"},{"label":"阜阳合肥现代产业园区","value":"341271"},{"label":"阜阳经济技术开发区","value":"341272"},{"label":"界首市","value":"341282"}],[{"label":"埇桥区","value":"341302"},{"label":"砀山县","value":"341321"},{"label":"萧县","value":"341322"},{"label":"灵璧县","value":"341323"},{"label":"泗县","value":"341324"},{"label":"宿州马鞍山现代产业园区","value":"341371"},{"label":"宿州经济技术开发区","value":"341372"}],[{"label":"金安区","value":"341502"},{"label":"裕安区","value":"341503"},{"label":"叶集区","value":"341504"},{"label":"霍邱县","value":"341522"},{"label":"舒城县","value":"341523"},{"label":"金寨县","value":"341524"},{"label":"霍山县","value":"341525"}],[{"label":"谯城区","value":"341602"},{"label":"涡阳县","value":"341621"},{"label":"蒙城县","value":"341622"},{"label":"利辛县","value":"341623"}],[{"label":"贵池区","value":"341702"},{"label":"东至县","value":"341721"},{"label":"石台县","value":"341722"},{"label":"青阳县","value":"341723"}],[{"label":"宣州区","value":"341802"},{"label":"郎溪县","value":"341821"},{"label":"广德县","value":"341822"},{"label":"泾县","value":"341823"},{"label":"绩溪县","value":"341824"},{"label":"旌德县","value":"341825"},{"label":"宣城市经济开发区","value":"341871"},{"label":"宁国市","value":"341881"}]],[[{"label":"鼓楼区","value":"350102"},{"label":"台江区","value":"350103"},{"label":"仓山区","value":"350104"},{"label":"马尾区","value":"350105"},{"label":"晋安区","value":"350111"},{"label":"闽侯县","value":"350121"},{"label":"连江县","value":"350122"},{"label":"罗源县","value":"350123"},{"label":"闽清县","value":"350124"},{"label":"永泰县","value":"350125"},{"label":"平潭县","value":"350128"},{"label":"福清市","value":"350181"},{"label":"长乐市","value":"350182"}],[{"label":"思明区","value":"350203"},{"label":"海沧区","value":"350205"},{"label":"湖里区","value":"350206"},{"label":"集美区","value":"350211"},{"label":"同安区","value":"350212"},{"label":"翔安区","value":"350213"}],[{"label":"城厢区","value":"350302"},{"label":"涵江区","value":"350303"},{"label":"荔城区","value":"350304"},{"label":"秀屿区","value":"350305"},{"label":"仙游县","value":"350322"}],[{"label":"梅列区","value":"350402"},{"label":"三元区","value":"350403"},{"label":"明溪县","value":"350421"},{"label":"清流县","value":"350423"},{"label":"宁化县","value":"350424"},{"label":"大田县","value":"350425"},{"label":"尤溪县","value":"350426"},{"label":"沙县","value":"350427"},{"label":"将乐县","value":"350428"},{"label":"泰宁县","value":"350429"},{"label":"建宁县","value":"350430"},{"label":"永安市","value":"350481"}],[{"label":"鲤城区","value":"350502"},{"label":"丰泽区","value":"350503"},{"label":"洛江区","value":"350504"},{"label":"泉港区","value":"350505"},{"label":"惠安县","value":"350521"},{"label":"安溪县","value":"350524"},{"label":"永春县","value":"350525"},{"label":"德化县","value":"350526"},{"label":"金门县","value":"350527"},{"label":"石狮市","value":"350581"},{"label":"晋江市","value":"350582"},{"label":"南安市","value":"350583"}],[{"label":"芗城区","value":"350602"},{"label":"龙文区","value":"350603"},{"label":"云霄县","value":"350622"},{"label":"漳浦县","value":"350623"},{"label":"诏安县","value":"350624"},{"label":"长泰县","value":"350625"},{"label":"东山县","value":"350626"},{"label":"南靖县","value":"350627"},{"label":"平和县","value":"350628"},{"label":"华安县","value":"350629"},{"label":"龙海市","value":"350681"}],[{"label":"延平区","value":"350702"},{"label":"建阳区","value":"350703"},{"label":"顺昌县","value":"350721"},{"label":"浦城县","value":"350722"},{"label":"光泽县","value":"350723"},{"label":"松溪县","value":"350724"},{"label":"政和县","value":"350725"},{"label":"邵武市","value":"350781"},{"label":"武夷山市","value":"350782"},{"label":"建瓯市","value":"350783"}],[{"label":"新罗区","value":"350802"},{"label":"永定区","value":"350803"},{"label":"长汀县","value":"350821"},{"label":"上杭县","value":"350823"},{"label":"武平县","value":"350824"},{"label":"连城县","value":"350825"},{"label":"漳平市","value":"350881"}],[{"label":"蕉城区","value":"350902"},{"label":"霞浦县","value":"350921"},{"label":"古田县","value":"350922"},{"label":"屏南县","value":"350923"},{"label":"寿宁县","value":"350924"},{"label":"周宁县","value":"350925"},{"label":"柘荣县","value":"350926"},{"label":"福安市","value":"350981"},{"label":"福鼎市","value":"350982"}]],[[{"label":"东湖区","value":"360102"},{"label":"西湖区","value":"360103"},{"label":"青云谱区","value":"360104"},{"label":"湾里区","value":"360105"},{"label":"青山湖区","value":"360111"},{"label":"新建区","value":"360112"},{"label":"南昌县","value":"360121"},{"label":"安义县","value":"360123"},{"label":"进贤县","value":"360124"}],[{"label":"昌江区","value":"360202"},{"label":"珠山区","value":"360203"},{"label":"浮梁县","value":"360222"},{"label":"乐平市","value":"360281"}],[{"label":"安源区","value":"360302"},{"label":"湘东区","value":"360313"},{"label":"莲花县","value":"360321"},{"label":"上栗县","value":"360322"},{"label":"芦溪县","value":"360323"}],[{"label":"濂溪区","value":"360402"},{"label":"浔阳区","value":"360403"},{"label":"柴桑区","value":"360404"},{"label":"武宁县","value":"360423"},{"label":"修水县","value":"360424"},{"label":"永修县","value":"360425"},{"label":"德安县","value":"360426"},{"label":"都昌县","value":"360428"},{"label":"湖口县","value":"360429"},{"label":"彭泽县","value":"360430"},{"label":"瑞昌市","value":"360481"},{"label":"共青城市","value":"360482"},{"label":"庐山市","value":"360483"}],[{"label":"渝水区","value":"360502"},{"label":"分宜县","value":"360521"}],[{"label":"月湖区","value":"360602"},{"label":"余江县","value":"360622"},{"label":"贵溪市","value":"360681"}],[{"label":"章贡区","value":"360702"},{"label":"南康区","value":"360703"},{"label":"赣县区","value":"360704"},{"label":"信丰县","value":"360722"},{"label":"大余县","value":"360723"},{"label":"上犹县","value":"360724"},{"label":"崇义县","value":"360725"},{"label":"安远县","value":"360726"},{"label":"龙南县","value":"360727"},{"label":"定南县","value":"360728"},{"label":"全南县","value":"360729"},{"label":"宁都县","value":"360730"},{"label":"于都县","value":"360731"},{"label":"兴国县","value":"360732"},{"label":"会昌县","value":"360733"},{"label":"寻乌县","value":"360734"},{"label":"石城县","value":"360735"},{"label":"瑞金市","value":"360781"}],[{"label":"吉州区","value":"360802"},{"label":"青原区","value":"360803"},{"label":"吉安县","value":"360821"},{"label":"吉水县","value":"360822"},{"label":"峡江县","value":"360823"},{"label":"新干县","value":"360824"},{"label":"永丰县","value":"360825"},{"label":"泰和县","value":"360826"},{"label":"遂川县","value":"360827"},{"label":"万安县","value":"360828"},{"label":"安福县","value":"360829"},{"label":"永新县","value":"360830"},{"label":"井冈山市","value":"360881"}],[{"label":"袁州区","value":"360902"},{"label":"奉新县","value":"360921"},{"label":"万载县","value":"360922"},{"label":"上高县","value":"360923"},{"label":"宜丰县","value":"360924"},{"label":"靖安县","value":"360925"},{"label":"铜鼓县","value":"360926"},{"label":"丰城市","value":"360981"},{"label":"樟树市","value":"360982"},{"label":"高安市","value":"360983"}],[{"label":"临川区","value":"361002"},{"label":"东乡区","value":"361003"},{"label":"南城县","value":"361021"},{"label":"黎川县","value":"361022"},{"label":"南丰县","value":"361023"},{"label":"崇仁县","value":"361024"},{"label":"乐安县","value":"361025"},{"label":"宜黄县","value":"361026"},{"label":"金溪县","value":"361027"},{"label":"资溪县","value":"361028"},{"label":"广昌县","value":"361030"}],[{"label":"信州区","value":"361102"},{"label":"广丰区","value":"361103"},{"label":"上饶县","value":"361121"},{"label":"玉山县","value":"361123"},{"label":"铅山县","value":"361124"},{"label":"横峰县","value":"361125"},{"label":"弋阳县","value":"361126"},{"label":"余干县","value":"361127"},{"label":"鄱阳县","value":"361128"},{"label":"万年县","value":"361129"},{"label":"婺源县","value":"361130"},{"label":"德兴市","value":"361181"}]],[[{"label":"历下区","value":"370102"},{"label":"市中区","value":"370103"},{"label":"槐荫区","value":"370104"},{"label":"天桥区","value":"370105"},{"label":"历城区","value":"370112"},{"label":"长清区","value":"370113"},{"label":"章丘区","value":"370114"},{"label":"平阴县","value":"370124"},{"label":"济阳县","value":"370125"},{"label":"商河县","value":"370126"},{"label":"济南高新技术产业开发区","value":"370171"}],[{"label":"市南区","value":"370202"},{"label":"市北区","value":"370203"},{"label":"黄岛区","value":"370211"},{"label":"崂山区","value":"370212"},{"label":"李沧区","value":"370213"},{"label":"城阳区","value":"370214"},{"label":"即墨区","value":"370215"},{"label":"青岛高新技术产业开发区","value":"370271"},{"label":"胶州市","value":"370281"},{"label":"平度市","value":"370283"},{"label":"莱西市","value":"370285"}],[{"label":"淄川区","value":"370302"},{"label":"张店区","value":"370303"},{"label":"博山区","value":"370304"},{"label":"临淄区","value":"370305"},{"label":"周村区","value":"370306"},{"label":"桓台县","value":"370321"},{"label":"高青县","value":"370322"},{"label":"沂源县","value":"370323"}],[{"label":"市中区","value":"370402"},{"label":"薛城区","value":"370403"},{"label":"峄城区","value":"370404"},{"label":"台儿庄区","value":"370405"},{"label":"山亭区","value":"370406"},{"label":"滕州市","value":"370481"}],[{"label":"东营区","value":"370502"},{"label":"河口区","value":"370503"},{"label":"垦利区","value":"370505"},{"label":"利津县","value":"370522"},{"label":"广饶县","value":"370523"},{"label":"东营经济技术开发区","value":"370571"},{"label":"东营港经济开发区","value":"370572"}],[{"label":"芝罘区","value":"370602"},{"label":"福山区","value":"370611"},{"label":"牟平区","value":"370612"},{"label":"莱山区","value":"370613"},{"label":"长岛县","value":"370634"},{"label":"烟台高新技术产业开发区","value":"370671"},{"label":"烟台经济技术开发区","value":"370672"},{"label":"龙口市","value":"370681"},{"label":"莱阳市","value":"370682"},{"label":"莱州市","value":"370683"},{"label":"蓬莱市","value":"370684"},{"label":"招远市","value":"370685"},{"label":"栖霞市","value":"370686"},{"label":"海阳市","value":"370687"}],[{"label":"潍城区","value":"370702"},{"label":"寒亭区","value":"370703"},{"label":"坊子区","value":"370704"},{"label":"奎文区","value":"370705"},{"label":"临朐县","value":"370724"},{"label":"昌乐县","value":"370725"},{"label":"潍坊滨海经济技术开发区","value":"370772"},{"label":"青州市","value":"370781"},{"label":"诸城市","value":"370782"},{"label":"寿光市","value":"370783"},{"label":"安丘市","value":"370784"},{"label":"高密市","value":"370785"},{"label":"昌邑市","value":"370786"}],[{"label":"任城区","value":"370811"},{"label":"兖州区","value":"370812"},{"label":"微山县","value":"370826"},{"label":"鱼台县","value":"370827"},{"label":"金乡县","value":"370828"},{"label":"嘉祥县","value":"370829"},{"label":"汶上县","value":"370830"},{"label":"泗水县","value":"370831"},{"label":"梁山县","value":"370832"},{"label":"济宁高新技术产业开发区","value":"370871"},{"label":"曲阜市","value":"370881"},{"label":"邹城市","value":"370883"}],[{"label":"泰山区","value":"370902"},{"label":"岱岳区","value":"370911"},{"label":"宁阳县","value":"370921"},{"label":"东平县","value":"370923"},{"label":"新泰市","value":"370982"},{"label":"肥城市","value":"370983"}],[{"label":"环翠区","value":"371002"},{"label":"文登区","value":"371003"},{"label":"威海火炬高技术产业开发区","value":"371071"},{"label":"威海经济技术开发区","value":"371072"},{"label":"威海临港经济技术开发区","value":"371073"},{"label":"荣成市","value":"371082"},{"label":"乳山市","value":"371083"}],[{"label":"东港区","value":"371102"},{"label":"岚山区","value":"371103"},{"label":"五莲县","value":"371121"},{"label":"莒县","value":"371122"},{"label":"日照经济技术开发区","value":"371171"},{"label":"日照国际海洋城","value":"371172"}],[{"label":"莱城区","value":"371202"},{"label":"钢城区","value":"371203"}],[{"label":"兰山区","value":"371302"},{"label":"罗庄区","value":"371311"},{"label":"河东区","value":"371312"},{"label":"沂南县","value":"371321"},{"label":"郯城县","value":"371322"},{"label":"沂水县","value":"371323"},{"label":"兰陵县","value":"371324"},{"label":"费县","value":"371325"},{"label":"平邑县","value":"371326"},{"label":"莒南县","value":"371327"},{"label":"蒙阴县","value":"371328"},{"label":"临沭县","value":"371329"},{"label":"临沂高新技术产业开发区","value":"371371"},{"label":"临沂经济技术开发区","value":"371372"},{"label":"临沂临港经济开发区","value":"371373"}],[{"label":"德城区","value":"371402"},{"label":"陵城区","value":"371403"},{"label":"宁津县","value":"371422"},{"label":"庆云县","value":"371423"},{"label":"临邑县","value":"371424"},{"label":"齐河县","value":"371425"},{"label":"平原县","value":"371426"},{"label":"夏津县","value":"371427"},{"label":"武城县","value":"371428"},{"label":"德州经济技术开发区","value":"371471"},{"label":"德州运河经济开发区","value":"371472"},{"label":"乐陵市","value":"371481"},{"label":"禹城市","value":"371482"}],[{"label":"东昌府区","value":"371502"},{"label":"阳谷县","value":"371521"},{"label":"莘县","value":"371522"},{"label":"茌平县","value":"371523"},{"label":"东阿县","value":"371524"},{"label":"冠县","value":"371525"},{"label":"高唐县","value":"371526"},{"label":"临清市","value":"371581"}],[{"label":"滨城区","value":"371602"},{"label":"沾化区","value":"371603"},{"label":"惠民县","value":"371621"},{"label":"阳信县","value":"371622"},{"label":"无棣县","value":"371623"},{"label":"博兴县","value":"371625"},{"label":"邹平县","value":"371626"}],[{"label":"牡丹区","value":"371702"},{"label":"定陶区","value":"371703"},{"label":"曹县","value":"371721"},{"label":"单县","value":"371722"},{"label":"成武县","value":"371723"},{"label":"巨野县","value":"371724"},{"label":"郓城县","value":"371725"},{"label":"鄄城县","value":"371726"},{"label":"东明县","value":"371728"},{"label":"菏泽经济技术开发区","value":"371771"},{"label":"菏泽高新技术开发区","value":"371772"}]],[[{"label":"中原区","value":"410102"},{"label":"二七区","value":"410103"},{"label":"管城回族区","value":"410104"},{"label":"金水区","value":"410105"},{"label":"上街区","value":"410106"},{"label":"惠济区","value":"410108"},{"label":"中牟县","value":"410122"},{"label":"郑州经济技术开发区","value":"410171"},{"label":"郑州高新技术产业开发区","value":"410172"},{"label":"郑州航空港经济综合实验区","value":"410173"},{"label":"巩义市","value":"410181"},{"label":"荥阳市","value":"410182"},{"label":"新密市","value":"410183"},{"label":"新郑市","value":"410184"},{"label":"登封市","value":"410185"}],[{"label":"龙亭区","value":"410202"},{"label":"顺河回族区","value":"410203"},{"label":"鼓楼区","value":"410204"},{"label":"禹王台区","value":"410205"},{"label":"祥符区","value":"410212"},{"label":"杞县","value":"410221"},{"label":"通许县","value":"410222"},{"label":"尉氏县","value":"410223"},{"label":"兰考县","value":"410225"}],[{"label":"老城区","value":"410302"},{"label":"西工区","value":"410303"},{"label":"瀍河回族区","value":"410304"},{"label":"涧西区","value":"410305"},{"label":"吉利区","value":"410306"},{"label":"洛龙区","value":"410311"},{"label":"孟津县","value":"410322"},{"label":"新安县","value":"410323"},{"label":"栾川县","value":"410324"},{"label":"嵩县","value":"410325"},{"label":"汝阳县","value":"410326"},{"label":"宜阳县","value":"410327"},{"label":"洛宁县","value":"410328"},{"label":"伊川县","value":"410329"},{"label":"洛阳高新技术产业开发区","value":"410371"},{"label":"偃师市","value":"410381"}],[{"label":"新华区","value":"410402"},{"label":"卫东区","value":"410403"},{"label":"石龙区","value":"410404"},{"label":"湛河区","value":"410411"},{"label":"宝丰县","value":"410421"},{"label":"叶县","value":"410422"},{"label":"鲁山县","value":"410423"},{"label":"郏县","value":"410425"},{"label":"平顶山高新技术产业开发区","value":"410471"},{"label":"平顶山市新城区","value":"410472"},{"label":"舞钢市","value":"410481"},{"label":"汝州市","value":"410482"}],[{"label":"文峰区","value":"410502"},{"label":"北关区","value":"410503"},{"label":"殷都区","value":"410505"},{"label":"龙安区","value":"410506"},{"label":"安阳县","value":"410522"},{"label":"汤阴县","value":"410523"},{"label":"滑县","value":"410526"},{"label":"内黄县","value":"410527"},{"label":"安阳高新技术产业开发区","value":"410571"},{"label":"林州市","value":"410581"}],[{"label":"鹤山区","value":"410602"},{"label":"山城区","value":"410603"},{"label":"淇滨区","value":"410611"},{"label":"浚县","value":"410621"},{"label":"淇县","value":"410622"},{"label":"鹤壁经济技术开发区","value":"410671"}],[{"label":"红旗区","value":"410702"},{"label":"卫滨区","value":"410703"},{"label":"凤泉区","value":"410704"},{"label":"牧野区","value":"410711"},{"label":"新乡县","value":"410721"},{"label":"获嘉县","value":"410724"},{"label":"原阳县","value":"410725"},{"label":"延津县","value":"410726"},{"label":"封丘县","value":"410727"},{"label":"长垣县","value":"410728"},{"label":"新乡高新技术产业开发区","value":"410771"},{"label":"新乡经济技术开发区","value":"410772"},{"label":"新乡市平原城乡一体化示范区","value":"410773"},{"label":"卫辉市","value":"410781"},{"label":"辉县市","value":"410782"}],[{"label":"解放区","value":"410802"},{"label":"中站区","value":"410803"},{"label":"马村区","value":"410804"},{"label":"山阳区","value":"410811"},{"label":"修武县","value":"410821"},{"label":"博爱县","value":"410822"},{"label":"武陟县","value":"410823"},{"label":"温县","value":"410825"},{"label":"焦作城乡一体化示范区","value":"410871"},{"label":"沁阳市","value":"410882"},{"label":"孟州市","value":"410883"}],[{"label":"华龙区","value":"410902"},{"label":"清丰县","value":"410922"},{"label":"南乐县","value":"410923"},{"label":"范县","value":"410926"},{"label":"台前县","value":"410927"},{"label":"濮阳县","value":"410928"},{"label":"河南濮阳工业园区","value":"410971"},{"label":"濮阳经济技术开发区","value":"410972"}],[{"label":"魏都区","value":"411002"},{"label":"建安区","value":"411003"},{"label":"鄢陵县","value":"411024"},{"label":"襄城县","value":"411025"},{"label":"许昌经济技术开发区","value":"411071"},{"label":"禹州市","value":"411081"},{"label":"长葛市","value":"411082"}],[{"label":"源汇区","value":"411102"},{"label":"郾城区","value":"411103"},{"label":"召陵区","value":"411104"},{"label":"舞阳县","value":"411121"},{"label":"临颍县","value":"411122"},{"label":"漯河经济技术开发区","value":"411171"}],[{"label":"湖滨区","value":"411202"},{"label":"陕州区","value":"411203"},{"label":"渑池县","value":"411221"},{"label":"卢氏县","value":"411224"},{"label":"河南三门峡经济开发区","value":"411271"},{"label":"义马市","value":"411281"},{"label":"灵宝市","value":"411282"}],[{"label":"宛城区","value":"411302"},{"label":"卧龙区","value":"411303"},{"label":"南召县","value":"411321"},{"label":"方城县","value":"411322"},{"label":"西峡县","value":"411323"},{"label":"镇平县","value":"411324"},{"label":"内乡县","value":"411325"},{"label":"淅川县","value":"411326"},{"label":"社旗县","value":"411327"},{"label":"唐河县","value":"411328"},{"label":"新野县","value":"411329"},{"label":"桐柏县","value":"411330"},{"label":"南阳高新技术产业开发区","value":"411371"},{"label":"南阳市城乡一体化示范区","value":"411372"},{"label":"邓州市","value":"411381"}],[{"label":"梁园区","value":"411402"},{"label":"睢阳区","value":"411403"},{"label":"民权县","value":"411421"},{"label":"睢县","value":"411422"},{"label":"宁陵县","value":"411423"},{"label":"柘城县","value":"411424"},{"label":"虞城县","value":"411425"},{"label":"夏邑县","value":"411426"},{"label":"豫东综合物流产业聚集区","value":"411471"},{"label":"河南商丘经济开发区","value":"411472"},{"label":"永城市","value":"411481"}],[{"label":"浉河区","value":"411502"},{"label":"平桥区","value":"411503"},{"label":"罗山县","value":"411521"},{"label":"光山县","value":"411522"},{"label":"新县","value":"411523"},{"label":"商城县","value":"411524"},{"label":"固始县","value":"411525"},{"label":"潢川县","value":"411526"},{"label":"淮滨县","value":"411527"},{"label":"息县","value":"411528"},{"label":"信阳高新技术产业开发区","value":"411571"}],[{"label":"川汇区","value":"411602"},{"label":"扶沟县","value":"411621"},{"label":"西华县","value":"411622"},{"label":"商水县","value":"411623"},{"label":"沈丘县","value":"411624"},{"label":"郸城县","value":"411625"},{"label":"淮阳县","value":"411626"},{"label":"太康县","value":"411627"},{"label":"鹿邑县","value":"411628"},{"label":"河南周口经济开发区","value":"411671"},{"label":"项城市","value":"411681"}],[{"label":"驿城区","value":"411702"},{"label":"西平县","value":"411721"},{"label":"上蔡县","value":"411722"},{"label":"平舆县","value":"411723"},{"label":"正阳县","value":"411724"},{"label":"确山县","value":"411725"},{"label":"泌阳县","value":"411726"},{"label":"汝南县","value":"411727"},{"label":"遂平县","value":"411728"},{"label":"新蔡县","value":"411729"},{"label":"河南驻马店经济开发区","value":"411771"}],[{"label":"济源市","value":"419001"}]],[[{"label":"江岸区","value":"420102"},{"label":"江汉区","value":"420103"},{"label":"硚口区","value":"420104"},{"label":"汉阳区","value":"420105"},{"label":"武昌区","value":"420106"},{"label":"青山区","value":"420107"},{"label":"洪山区","value":"420111"},{"label":"东西湖区","value":"420112"},{"label":"汉南区","value":"420113"},{"label":"蔡甸区","value":"420114"},{"label":"江夏区","value":"420115"},{"label":"黄陂区","value":"420116"},{"label":"新洲区","value":"420117"}],[{"label":"黄石港区","value":"420202"},{"label":"西塞山区","value":"420203"},{"label":"下陆区","value":"420204"},{"label":"铁山区","value":"420205"},{"label":"阳新县","value":"420222"},{"label":"大冶市","value":"420281"}],[{"label":"茅箭区","value":"420302"},{"label":"张湾区","value":"420303"},{"label":"郧阳区","value":"420304"},{"label":"郧西县","value":"420322"},{"label":"竹山县","value":"420323"},{"label":"竹溪县","value":"420324"},{"label":"房县","value":"420325"},{"label":"丹江口市","value":"420381"}],[{"label":"西陵区","value":"420502"},{"label":"伍家岗区","value":"420503"},{"label":"点军区","value":"420504"},{"label":"猇亭区","value":"420505"},{"label":"夷陵区","value":"420506"},{"label":"远安县","value":"420525"},{"label":"兴山县","value":"420526"},{"label":"秭归县","value":"420527"},{"label":"长阳土家族自治县","value":"420528"},{"label":"五峰土家族自治县","value":"420529"},{"label":"宜都市","value":"420581"},{"label":"当阳市","value":"420582"},{"label":"枝江市","value":"420583"}],[{"label":"襄城区","value":"420602"},{"label":"樊城区","value":"420606"},{"label":"襄州区","value":"420607"},{"label":"南漳县","value":"420624"},{"label":"谷城县","value":"420625"},{"label":"保康县","value":"420626"},{"label":"老河口市","value":"420682"},{"label":"枣阳市","value":"420683"},{"label":"宜城市","value":"420684"}],[{"label":"梁子湖区","value":"420702"},{"label":"华容区","value":"420703"},{"label":"鄂城区","value":"420704"}],[{"label":"东宝区","value":"420802"},{"label":"掇刀区","value":"420804"},{"label":"京山县","value":"420821"},{"label":"沙洋县","value":"420822"},{"label":"钟祥市","value":"420881"}],[{"label":"孝南区","value":"420902"},{"label":"孝昌县","value":"420921"},{"label":"大悟县","value":"420922"},{"label":"云梦县","value":"420923"},{"label":"应城市","value":"420981"},{"label":"安陆市","value":"420982"},{"label":"汉川市","value":"420984"}],[{"label":"沙市区","value":"421002"},{"label":"荆州区","value":"421003"},{"label":"公安县","value":"421022"},{"label":"监利县","value":"421023"},{"label":"江陵县","value":"421024"},{"label":"荆州经济技术开发区","value":"421071"},{"label":"石首市","value":"421081"},{"label":"洪湖市","value":"421083"},{"label":"松滋市","value":"421087"}],[{"label":"黄州区","value":"421102"},{"label":"团风县","value":"421121"},{"label":"红安县","value":"421122"},{"label":"罗田县","value":"421123"},{"label":"英山县","value":"421124"},{"label":"浠水县","value":"421125"},{"label":"蕲春县","value":"421126"},{"label":"黄梅县","value":"421127"},{"label":"龙感湖管理区","value":"421171"},{"label":"麻城市","value":"421181"},{"label":"武穴市","value":"421182"}],[{"label":"咸安区","value":"421202"},{"label":"嘉鱼县","value":"421221"},{"label":"通城县","value":"421222"},{"label":"崇阳县","value":"421223"},{"label":"通山县","value":"421224"},{"label":"赤壁市","value":"421281"}],[{"label":"曾都区","value":"421303"},{"label":"随县","value":"421321"},{"label":"广水市","value":"421381"}],[{"label":"恩施市","value":"422801"},{"label":"利川市","value":"422802"},{"label":"建始县","value":"422822"},{"label":"巴东县","value":"422823"},{"label":"宣恩县","value":"422825"},{"label":"咸丰县","value":"422826"},{"label":"来凤县","value":"422827"},{"label":"鹤峰县","value":"422828"}],[{"label":"仙桃市","value":"429004"},{"label":"潜江市","value":"429005"},{"label":"天门市","value":"429006"},{"label":"神农架林区","value":"429021"}]],[[{"label":"芙蓉区","value":"430102"},{"label":"天心区","value":"430103"},{"label":"岳麓区","value":"430104"},{"label":"开福区","value":"430105"},{"label":"雨花区","value":"430111"},{"label":"望城区","value":"430112"},{"label":"长沙县","value":"430121"},{"label":"浏阳市","value":"430181"},{"label":"宁乡市","value":"430182"}],[{"label":"荷塘区","value":"430202"},{"label":"芦淞区","value":"430203"},{"label":"石峰区","value":"430204"},{"label":"天元区","value":"430211"},{"label":"株洲县","value":"430221"},{"label":"攸县","value":"430223"},{"label":"茶陵县","value":"430224"},{"label":"炎陵县","value":"430225"},{"label":"云龙示范区","value":"430271"},{"label":"醴陵市","value":"430281"}],[{"label":"雨湖区","value":"430302"},{"label":"岳塘区","value":"430304"},{"label":"湘潭县","value":"430321"},{"label":"湖南湘潭高新技术产业园区","value":"430371"},{"label":"湘潭昭山示范区","value":"430372"},{"label":"湘潭九华示范区","value":"430373"},{"label":"湘乡市","value":"430381"},{"label":"韶山市","value":"430382"}],[{"label":"珠晖区","value":"430405"},{"label":"雁峰区","value":"430406"},{"label":"石鼓区","value":"430407"},{"label":"蒸湘区","value":"430408"},{"label":"南岳区","value":"430412"},{"label":"衡阳县","value":"430421"},{"label":"衡南县","value":"430422"},{"label":"衡山县","value":"430423"},{"label":"衡东县","value":"430424"},{"label":"祁东县","value":"430426"},{"label":"衡阳综合保税区","value":"430471"},{"label":"湖南衡阳高新技术产业园区","value":"430472"},{"label":"湖南衡阳松木经济开发区","value":"430473"},{"label":"耒阳市","value":"430481"},{"label":"常宁市","value":"430482"}],[{"label":"双清区","value":"430502"},{"label":"大祥区","value":"430503"},{"label":"北塔区","value":"430511"},{"label":"邵东县","value":"430521"},{"label":"新邵县","value":"430522"},{"label":"邵阳县","value":"430523"},{"label":"隆回县","value":"430524"},{"label":"洞口县","value":"430525"},{"label":"绥宁县","value":"430527"},{"label":"新宁县","value":"430528"},{"label":"城步苗族自治县","value":"430529"},{"label":"武冈市","value":"430581"}],[{"label":"岳阳楼区","value":"430602"},{"label":"云溪区","value":"430603"},{"label":"君山区","value":"430611"},{"label":"岳阳县","value":"430621"},{"label":"华容县","value":"430623"},{"label":"湘阴县","value":"430624"},{"label":"平江县","value":"430626"},{"label":"岳阳市屈原管理区","value":"430671"},{"label":"汨罗市","value":"430681"},{"label":"临湘市","value":"430682"}],[{"label":"武陵区","value":"430702"},{"label":"鼎城区","value":"430703"},{"label":"安乡县","value":"430721"},{"label":"汉寿县","value":"430722"},{"label":"澧县","value":"430723"},{"label":"临澧县","value":"430724"},{"label":"桃源县","value":"430725"},{"label":"石门县","value":"430726"},{"label":"常德市西洞庭管理区","value":"430771"},{"label":"津市市","value":"430781"}],[{"label":"永定区","value":"430802"},{"label":"武陵源区","value":"430811"},{"label":"慈利县","value":"430821"},{"label":"桑植县","value":"430822"}],[{"label":"资阳区","value":"430902"},{"label":"赫山区","value":"430903"},{"label":"南县","value":"430921"},{"label":"桃江县","value":"430922"},{"label":"安化县","value":"430923"},{"label":"益阳市大通湖管理区","value":"430971"},{"label":"湖南益阳高新技术产业园区","value":"430972"},{"label":"沅江市","value":"430981"}],[{"label":"北湖区","value":"431002"},{"label":"苏仙区","value":"431003"},{"label":"桂阳县","value":"431021"},{"label":"宜章县","value":"431022"},{"label":"永兴县","value":"431023"},{"label":"嘉禾县","value":"431024"},{"label":"临武县","value":"431025"},{"label":"汝城县","value":"431026"},{"label":"桂东县","value":"431027"},{"label":"安仁县","value":"431028"},{"label":"资兴市","value":"431081"}],[{"label":"零陵区","value":"431102"},{"label":"冷水滩区","value":"431103"},{"label":"祁阳县","value":"431121"},{"label":"东安县","value":"431122"},{"label":"双牌县","value":"431123"},{"label":"道县","value":"431124"},{"label":"江永县","value":"431125"},{"label":"宁远县","value":"431126"},{"label":"蓝山县","value":"431127"},{"label":"新田县","value":"431128"},{"label":"江华瑶族自治县","value":"431129"},{"label":"永州经济技术开发区","value":"431171"},{"label":"永州市金洞管理区","value":"431172"},{"label":"永州市回龙圩管理区","value":"431173"}],[{"label":"鹤城区","value":"431202"},{"label":"中方县","value":"431221"},{"label":"沅陵县","value":"431222"},{"label":"辰溪县","value":"431223"},{"label":"溆浦县","value":"431224"},{"label":"会同县","value":"431225"},{"label":"麻阳苗族自治县","value":"431226"},{"label":"新晃侗族自治县","value":"431227"},{"label":"芷江侗族自治县","value":"431228"},{"label":"靖州苗族侗族自治县","value":"431229"},{"label":"通道侗族自治县","value":"431230"},{"label":"怀化市洪江管理区","value":"431271"},{"label":"洪江市","value":"431281"}],[{"label":"娄星区","value":"431302"},{"label":"双峰县","value":"431321"},{"label":"新化县","value":"431322"},{"label":"冷水江市","value":"431381"},{"label":"涟源市","value":"431382"}],[{"label":"吉首市","value":"433101"},{"label":"泸溪县","value":"433122"},{"label":"凤凰县","value":"433123"},{"label":"花垣县","value":"433124"},{"label":"保靖县","value":"433125"},{"label":"古丈县","value":"433126"},{"label":"永顺县","value":"433127"},{"label":"龙山县","value":"433130"},{"label":"湖南吉首经济开发区","value":"433172"},{"label":"湖南永顺经济开发区","value":"433173"}]],[[{"label":"荔湾区","value":"440103"},{"label":"越秀区","value":"440104"},{"label":"海珠区","value":"440105"},{"label":"天河区","value":"440106"},{"label":"白云区","value":"440111"},{"label":"黄埔区","value":"440112"},{"label":"番禺区","value":"440113"},{"label":"花都区","value":"440114"},{"label":"南沙区","value":"440115"},{"label":"从化区","value":"440117"},{"label":"增城区","value":"440118"}],[{"label":"武江区","value":"440203"},{"label":"浈江区","value":"440204"},{"label":"曲江区","value":"440205"},{"label":"始兴县","value":"440222"},{"label":"仁化县","value":"440224"},{"label":"翁源县","value":"440229"},{"label":"乳源瑶族自治县","value":"440232"},{"label":"新丰县","value":"440233"},{"label":"乐昌市","value":"440281"},{"label":"南雄市","value":"440282"}],[{"label":"罗湖区","value":"440303"},{"label":"福田区","value":"440304"},{"label":"南山区","value":"440305"},{"label":"宝安区","value":"440306"},{"label":"龙岗区","value":"440307"},{"label":"盐田区","value":"440308"},{"label":"龙华区","value":"440309"},{"label":"坪山区","value":"440310"}],[{"label":"香洲区","value":"440402"},{"label":"斗门区","value":"440403"},{"label":"金湾区","value":"440404"}],[{"label":"龙湖区","value":"440507"},{"label":"金平区","value":"440511"},{"label":"濠江区","value":"440512"},{"label":"潮阳区","value":"440513"},{"label":"潮南区","value":"440514"},{"label":"澄海区","value":"440515"},{"label":"南澳县","value":"440523"}],[{"label":"禅城区","value":"440604"},{"label":"南海区","value":"440605"},{"label":"顺德区","value":"440606"},{"label":"三水区","value":"440607"},{"label":"高明区","value":"440608"}],[{"label":"蓬江区","value":"440703"},{"label":"江海区","value":"440704"},{"label":"新会区","value":"440705"},{"label":"台山市","value":"440781"},{"label":"开平市","value":"440783"},{"label":"鹤山市","value":"440784"},{"label":"恩平市","value":"440785"}],[{"label":"赤坎区","value":"440802"},{"label":"霞山区","value":"440803"},{"label":"坡头区","value":"440804"},{"label":"麻章区","value":"440811"},{"label":"遂溪县","value":"440823"},{"label":"徐闻县","value":"440825"},{"label":"廉江市","value":"440881"},{"label":"雷州市","value":"440882"},{"label":"吴川市","value":"440883"}],[{"label":"茂南区","value":"440902"},{"label":"电白区","value":"440904"},{"label":"高州市","value":"440981"},{"label":"化州市","value":"440982"},{"label":"信宜市","value":"440983"}],[{"label":"端州区","value":"441202"},{"label":"鼎湖区","value":"441203"},{"label":"高要区","value":"441204"},{"label":"广宁县","value":"441223"},{"label":"怀集县","value":"441224"},{"label":"封开县","value":"441225"},{"label":"德庆县","value":"441226"},{"label":"四会市","value":"441284"}],[{"label":"惠城区","value":"441302"},{"label":"惠阳区","value":"441303"},{"label":"博罗县","value":"441322"},{"label":"惠东县","value":"441323"},{"label":"龙门县","value":"441324"}],[{"label":"梅江区","value":"441402"},{"label":"梅县区","value":"441403"},{"label":"大埔县","value":"441422"},{"label":"丰顺县","value":"441423"},{"label":"五华县","value":"441424"},{"label":"平远县","value":"441426"},{"label":"蕉岭县","value":"441427"},{"label":"兴宁市","value":"441481"}],[{"label":"城区","value":"441502"},{"label":"海丰县","value":"441521"},{"label":"陆河县","value":"441523"},{"label":"陆丰市","value":"441581"}],[{"label":"源城区","value":"441602"},{"label":"紫金县","value":"441621"},{"label":"龙川县","value":"441622"},{"label":"连平县","value":"441623"},{"label":"和平县","value":"441624"},{"label":"东源县","value":"441625"}],[{"label":"江城区","value":"441702"},{"label":"阳东区","value":"441704"},{"label":"阳西县","value":"441721"},{"label":"阳春市","value":"441781"}],[{"label":"清城区","value":"441802"},{"label":"清新区","value":"441803"},{"label":"佛冈县","value":"441821"},{"label":"阳山县","value":"441823"},{"label":"连山壮族瑶族自治县","value":"441825"},{"label":"连南瑶族自治县","value":"441826"},{"label":"英德市","value":"441881"},{"label":"连州市","value":"441882"}],[{"label":"东莞市","value":"441900"}],[{"label":"中山市","value":"442000"}],[{"label":"湘桥区","value":"445102"},{"label":"潮安区","value":"445103"},{"label":"饶平县","value":"445122"}],[{"label":"榕城区","value":"445202"},{"label":"揭东区","value":"445203"},{"label":"揭西县","value":"445222"},{"label":"惠来县","value":"445224"},{"label":"普宁市","value":"445281"}],[{"label":"云城区","value":"445302"},{"label":"云安区","value":"445303"},{"label":"新兴县","value":"445321"},{"label":"郁南县","value":"445322"},{"label":"罗定市","value":"445381"}]],[[{"label":"兴宁区","value":"450102"},{"label":"青秀区","value":"450103"},{"label":"江南区","value":"450105"},{"label":"西乡塘区","value":"450107"},{"label":"良庆区","value":"450108"},{"label":"邕宁区","value":"450109"},{"label":"武鸣区","value":"450110"},{"label":"隆安县","value":"450123"},{"label":"马山县","value":"450124"},{"label":"上林县","value":"450125"},{"label":"宾阳县","value":"450126"},{"label":"横县","value":"450127"}],[{"label":"城中区","value":"450202"},{"label":"鱼峰区","value":"450203"},{"label":"柳南区","value":"450204"},{"label":"柳北区","value":"450205"},{"label":"柳江区","value":"450206"},{"label":"柳城县","value":"450222"},{"label":"鹿寨县","value":"450223"},{"label":"融安县","value":"450224"},{"label":"融水苗族自治县","value":"450225"},{"label":"三江侗族自治县","value":"450226"}],[{"label":"秀峰区","value":"450302"},{"label":"叠彩区","value":"450303"},{"label":"象山区","value":"450304"},{"label":"七星区","value":"450305"},{"label":"雁山区","value":"450311"},{"label":"临桂区","value":"450312"},{"label":"阳朔县","value":"450321"},{"label":"灵川县","value":"450323"},{"label":"全州县","value":"450324"},{"label":"兴安县","value":"450325"},{"label":"永福县","value":"450326"},{"label":"灌阳县","value":"450327"},{"label":"龙胜各族自治县","value":"450328"},{"label":"资源县","value":"450329"},{"label":"平乐县","value":"450330"},{"label":"荔浦县","value":"450331"},{"label":"恭城瑶族自治县","value":"450332"}],[{"label":"万秀区","value":"450403"},{"label":"长洲区","value":"450405"},{"label":"龙圩区","value":"450406"},{"label":"苍梧县","value":"450421"},{"label":"藤县","value":"450422"},{"label":"蒙山县","value":"450423"},{"label":"岑溪市","value":"450481"}],[{"label":"海城区","value":"450502"},{"label":"银海区","value":"450503"},{"label":"铁山港区","value":"450512"},{"label":"合浦县","value":"450521"}],[{"label":"港口区","value":"450602"},{"label":"防城区","value":"450603"},{"label":"上思县","value":"450621"},{"label":"东兴市","value":"450681"}],[{"label":"钦南区","value":"450702"},{"label":"钦北区","value":"450703"},{"label":"灵山县","value":"450721"},{"label":"浦北县","value":"450722"}],[{"label":"港北区","value":"450802"},{"label":"港南区","value":"450803"},{"label":"覃塘区","value":"450804"},{"label":"平南县","value":"450821"},{"label":"桂平市","value":"450881"}],[{"label":"玉州区","value":"450902"},{"label":"福绵区","value":"450903"},{"label":"容县","value":"450921"},{"label":"陆川县","value":"450922"},{"label":"博白县","value":"450923"},{"label":"兴业县","value":"450924"},{"label":"北流市","value":"450981"}],[{"label":"右江区","value":"451002"},{"label":"田阳县","value":"451021"},{"label":"田东县","value":"451022"},{"label":"平果县","value":"451023"},{"label":"德保县","value":"451024"},{"label":"那坡县","value":"451026"},{"label":"凌云县","value":"451027"},{"label":"乐业县","value":"451028"},{"label":"田林县","value":"451029"},{"label":"西林县","value":"451030"},{"label":"隆林各族自治县","value":"451031"},{"label":"靖西市","value":"451081"}],[{"label":"八步区","value":"451102"},{"label":"平桂区","value":"451103"},{"label":"昭平县","value":"451121"},{"label":"钟山县","value":"451122"},{"label":"富川瑶族自治县","value":"451123"}],[{"label":"金城江区","value":"451202"},{"label":"宜州区","value":"451203"},{"label":"南丹县","value":"451221"},{"label":"天峨县","value":"451222"},{"label":"凤山县","value":"451223"},{"label":"东兰县","value":"451224"},{"label":"罗城仫佬族自治县","value":"451225"},{"label":"环江毛南族自治县","value":"451226"},{"label":"巴马瑶族自治县","value":"451227"},{"label":"都安瑶族自治县","value":"451228"},{"label":"大化瑶族自治县","value":"451229"}],[{"label":"兴宾区","value":"451302"},{"label":"忻城县","value":"451321"},{"label":"象州县","value":"451322"},{"label":"武宣县","value":"451323"},{"label":"金秀瑶族自治县","value":"451324"},{"label":"合山市","value":"451381"}],[{"label":"江州区","value":"451402"},{"label":"扶绥县","value":"451421"},{"label":"宁明县","value":"451422"},{"label":"龙州县","value":"451423"},{"label":"大新县","value":"451424"},{"label":"天等县","value":"451425"},{"label":"凭祥市","value":"451481"}]],[[{"label":"秀英区","value":"460105"},{"label":"龙华区","value":"460106"},{"label":"琼山区","value":"460107"},{"label":"美兰区","value":"460108"}],[{"label":"海棠区","value":"460202"},{"label":"吉阳区","value":"460203"},{"label":"天涯区","value":"460204"},{"label":"崖州区","value":"460205"}],[{"label":"西沙群岛","value":"460321"},{"label":"南沙群岛","value":"460322"},{"label":"中沙群岛的岛礁及其海域","value":"460323"}],[{"label":"儋州市","value":"460400"}],[{"label":"五指山市","value":"469001"},{"label":"琼海市","value":"469002"},{"label":"文昌市","value":"469005"},{"label":"万宁市","value":"469006"},{"label":"东方市","value":"469007"},{"label":"定安县","value":"469021"},{"label":"屯昌县","value":"469022"},{"label":"澄迈县","value":"469023"},{"label":"临高县","value":"469024"},{"label":"白沙黎族自治县","value":"469025"},{"label":"昌江黎族自治县","value":"469026"},{"label":"乐东黎族自治县","value":"469027"},{"label":"陵水黎族自治县","value":"469028"},{"label":"保亭黎族苗族自治县","value":"469029"},{"label":"琼中黎族苗族自治县","value":"469030"}]],[[{"label":"万州区","value":"500101"},{"label":"涪陵区","value":"500102"},{"label":"渝中区","value":"500103"},{"label":"大渡口区","value":"500104"},{"label":"江北区","value":"500105"},{"label":"沙坪坝区","value":"500106"},{"label":"九龙坡区","value":"500107"},{"label":"南岸区","value":"500108"},{"label":"北碚区","value":"500109"},{"label":"綦江区","value":"500110"},{"label":"大足区","value":"500111"},{"label":"渝北区","value":"500112"},{"label":"巴南区","value":"500113"},{"label":"黔江区","value":"500114"},{"label":"长寿区","value":"500115"},{"label":"江津区","value":"500116"},{"label":"合川区","value":"500117"},{"label":"永川区","value":"500118"},{"label":"南川区","value":"500119"},{"label":"璧山区","value":"500120"},{"label":"铜梁区","value":"500151"},{"label":"潼南区","value":"500152"},{"label":"荣昌区","value":"500153"},{"label":"开州区","value":"500154"},{"label":"梁平区","value":"500155"},{"label":"武隆区","value":"500156"}],[{"label":"城口县","value":"500229"},{"label":"丰都县","value":"500230"},{"label":"垫江县","value":"500231"},{"label":"忠县","value":"500233"},{"label":"云阳县","value":"500235"},{"label":"奉节县","value":"500236"},{"label":"巫山县","value":"500237"},{"label":"巫溪县","value":"500238"},{"label":"石柱土家族自治县","value":"500240"},{"label":"秀山土家族苗族自治县","value":"500241"},{"label":"酉阳土家族苗族自治县","value":"500242"},{"label":"彭水苗族土家族自治县","value":"500243"}]],[[{"label":"锦江区","value":"510104"},{"label":"青羊区","value":"510105"},{"label":"金牛区","value":"510106"},{"label":"武侯区","value":"510107"},{"label":"成华区","value":"510108"},{"label":"龙泉驿区","value":"510112"},{"label":"青白江区","value":"510113"},{"label":"新都区","value":"510114"},{"label":"温江区","value":"510115"},{"label":"双流区","value":"510116"},{"label":"郫都区","value":"510117"},{"label":"金堂县","value":"510121"},{"label":"大邑县","value":"510129"},{"label":"蒲江县","value":"510131"},{"label":"新津县","value":"510132"},{"label":"都江堰市","value":"510181"},{"label":"彭州市","value":"510182"},{"label":"邛崃市","value":"510183"},{"label":"崇州市","value":"510184"},{"label":"简阳市","value":"510185"}],[{"label":"自流井区","value":"510302"},{"label":"贡井区","value":"510303"},{"label":"大安区","value":"510304"},{"label":"沿滩区","value":"510311"},{"label":"荣县","value":"510321"},{"label":"富顺县","value":"510322"}],[{"label":"东区","value":"510402"},{"label":"西区","value":"510403"},{"label":"仁和区","value":"510411"},{"label":"米易县","value":"510421"},{"label":"盐边县","value":"510422"}],[{"label":"江阳区","value":"510502"},{"label":"纳溪区","value":"510503"},{"label":"龙马潭区","value":"510504"},{"label":"泸县","value":"510521"},{"label":"合江县","value":"510522"},{"label":"叙永县","value":"510524"},{"label":"古蔺县","value":"510525"}],[{"label":"旌阳区","value":"510603"},{"label":"罗江区","value":"510604"},{"label":"中江县","value":"510623"},{"label":"广汉市","value":"510681"},{"label":"什邡市","value":"510682"},{"label":"绵竹市","value":"510683"}],[{"label":"涪城区","value":"510703"},{"label":"游仙区","value":"510704"},{"label":"安州区","value":"510705"},{"label":"三台县","value":"510722"},{"label":"盐亭县","value":"510723"},{"label":"梓潼县","value":"510725"},{"label":"北川羌族自治县","value":"510726"},{"label":"平武县","value":"510727"},{"label":"江油市","value":"510781"}],[{"label":"利州区","value":"510802"},{"label":"昭化区","value":"510811"},{"label":"朝天区","value":"510812"},{"label":"旺苍县","value":"510821"},{"label":"青川县","value":"510822"},{"label":"剑阁县","value":"510823"},{"label":"苍溪县","value":"510824"}],[{"label":"船山区","value":"510903"},{"label":"安居区","value":"510904"},{"label":"蓬溪县","value":"510921"},{"label":"射洪县","value":"510922"},{"label":"大英县","value":"510923"}],[{"label":"市中区","value":"511002"},{"label":"东兴区","value":"511011"},{"label":"威远县","value":"511024"},{"label":"资中县","value":"511025"},{"label":"内江经济开发区","value":"511071"},{"label":"隆昌市","value":"511083"}],[{"label":"市中区","value":"511102"},{"label":"沙湾区","value":"511111"},{"label":"五通桥区","value":"511112"},{"label":"金口河区","value":"511113"},{"label":"犍为县","value":"511123"},{"label":"井研县","value":"511124"},{"label":"夹江县","value":"511126"},{"label":"沐川县","value":"511129"},{"label":"峨边彝族自治县","value":"511132"},{"label":"马边彝族自治县","value":"511133"},{"label":"峨眉山市","value":"511181"}],[{"label":"顺庆区","value":"511302"},{"label":"高坪区","value":"511303"},{"label":"嘉陵区","value":"511304"},{"label":"南部县","value":"511321"},{"label":"营山县","value":"511322"},{"label":"蓬安县","value":"511323"},{"label":"仪陇县","value":"511324"},{"label":"西充县","value":"511325"},{"label":"阆中市","value":"511381"}],[{"label":"东坡区","value":"511402"},{"label":"彭山区","value":"511403"},{"label":"仁寿县","value":"511421"},{"label":"洪雅县","value":"511423"},{"label":"丹棱县","value":"511424"},{"label":"青神县","value":"511425"}],[{"label":"翠屏区","value":"511502"},{"label":"南溪区","value":"511503"},{"label":"宜宾县","value":"511521"},{"label":"江安县","value":"511523"},{"label":"长宁县","value":"511524"},{"label":"高县","value":"511525"},{"label":"珙县","value":"511526"},{"label":"筠连县","value":"511527"},{"label":"兴文县","value":"511528"},{"label":"屏山县","value":"511529"}],[{"label":"广安区","value":"511602"},{"label":"前锋区","value":"511603"},{"label":"岳池县","value":"511621"},{"label":"武胜县","value":"511622"},{"label":"邻水县","value":"511623"},{"label":"华蓥市","value":"511681"}],[{"label":"通川区","value":"511702"},{"label":"达川区","value":"511703"},{"label":"宣汉县","value":"511722"},{"label":"开江县","value":"511723"},{"label":"大竹县","value":"511724"},{"label":"渠县","value":"511725"},{"label":"达州经济开发区","value":"511771"},{"label":"万源市","value":"511781"}],[{"label":"雨城区","value":"511802"},{"label":"名山区","value":"511803"},{"label":"荥经县","value":"511822"},{"label":"汉源县","value":"511823"},{"label":"石棉县","value":"511824"},{"label":"天全县","value":"511825"},{"label":"芦山县","value":"511826"},{"label":"宝兴县","value":"511827"}],[{"label":"巴州区","value":"511902"},{"label":"恩阳区","value":"511903"},{"label":"通江县","value":"511921"},{"label":"南江县","value":"511922"},{"label":"平昌县","value":"511923"},{"label":"巴中经济开发区","value":"511971"}],[{"label":"雁江区","value":"512002"},{"label":"安岳县","value":"512021"},{"label":"乐至县","value":"512022"}],[{"label":"马尔康市","value":"513201"},{"label":"汶川县","value":"513221"},{"label":"理县","value":"513222"},{"label":"茂县","value":"513223"},{"label":"松潘县","value":"513224"},{"label":"九寨沟县","value":"513225"},{"label":"金川县","value":"513226"},{"label":"小金县","value":"513227"},{"label":"黑水县","value":"513228"},{"label":"壤塘县","value":"513230"},{"label":"阿坝县","value":"513231"},{"label":"若尔盖县","value":"513232"},{"label":"红原县","value":"513233"}],[{"label":"康定市","value":"513301"},{"label":"泸定县","value":"513322"},{"label":"丹巴县","value":"513323"},{"label":"九龙县","value":"513324"},{"label":"雅江县","value":"513325"},{"label":"道孚县","value":"513326"},{"label":"炉霍县","value":"513327"},{"label":"甘孜县","value":"513328"},{"label":"新龙县","value":"513329"},{"label":"德格县","value":"513330"},{"label":"白玉县","value":"513331"},{"label":"石渠县","value":"513332"},{"label":"色达县","value":"513333"},{"label":"理塘县","value":"513334"},{"label":"巴塘县","value":"513335"},{"label":"乡城县","value":"513336"},{"label":"稻城县","value":"513337"},{"label":"得荣县","value":"513338"}],[{"label":"西昌市","value":"513401"},{"label":"木里藏族自治县","value":"513422"},{"label":"盐源县","value":"513423"},{"label":"德昌县","value":"513424"},{"label":"会理县","value":"513425"},{"label":"会东县","value":"513426"},{"label":"宁南县","value":"513427"},{"label":"普格县","value":"513428"},{"label":"布拖县","value":"513429"},{"label":"金阳县","value":"513430"},{"label":"昭觉县","value":"513431"},{"label":"喜德县","value":"513432"},{"label":"冕宁县","value":"513433"},{"label":"越西县","value":"513434"},{"label":"甘洛县","value":"513435"},{"label":"美姑县","value":"513436"},{"label":"雷波县","value":"513437"}]],[[{"label":"南明区","value":"520102"},{"label":"云岩区","value":"520103"},{"label":"花溪区","value":"520111"},{"label":"乌当区","value":"520112"},{"label":"白云区","value":"520113"},{"label":"观山湖区","value":"520115"},{"label":"开阳县","value":"520121"},{"label":"息烽县","value":"520122"},{"label":"修文县","value":"520123"},{"label":"清镇市","value":"520181"}],[{"label":"钟山区","value":"520201"},{"label":"六枝特区","value":"520203"},{"label":"水城县","value":"520221"},{"label":"盘州市","value":"520281"}],[{"label":"红花岗区","value":"520302"},{"label":"汇川区","value":"520303"},{"label":"播州区","value":"520304"},{"label":"桐梓县","value":"520322"},{"label":"绥阳县","value":"520323"},{"label":"正安县","value":"520324"},{"label":"道真仡佬族苗族自治县","value":"520325"},{"label":"务川仡佬族苗族自治县","value":"520326"},{"label":"凤冈县","value":"520327"},{"label":"湄潭县","value":"520328"},{"label":"余庆县","value":"520329"},{"label":"习水县","value":"520330"},{"label":"赤水市","value":"520381"},{"label":"仁怀市","value":"520382"}],[{"label":"西秀区","value":"520402"},{"label":"平坝区","value":"520403"},{"label":"普定县","value":"520422"},{"label":"镇宁布依族苗族自治县","value":"520423"},{"label":"关岭布依族苗族自治县","value":"520424"},{"label":"紫云苗族布依族自治县","value":"520425"}],[{"label":"七星关区","value":"520502"},{"label":"大方县","value":"520521"},{"label":"黔西县","value":"520522"},{"label":"金沙县","value":"520523"},{"label":"织金县","value":"520524"},{"label":"纳雍县","value":"520525"},{"label":"威宁彝族回族苗族自治县","value":"520526"},{"label":"赫章县","value":"520527"}],[{"label":"碧江区","value":"520602"},{"label":"万山区","value":"520603"},{"label":"江口县","value":"520621"},{"label":"玉屏侗族自治县","value":"520622"},{"label":"石阡县","value":"520623"},{"label":"思南县","value":"520624"},{"label":"印江土家族苗族自治县","value":"520625"},{"label":"德江县","value":"520626"},{"label":"沿河土家族自治县","value":"520627"},{"label":"松桃苗族自治县","value":"520628"}],[{"label":"兴义市","value":"522301"},{"label":"兴仁县","value":"522322"},{"label":"普安县","value":"522323"},{"label":"晴隆县","value":"522324"},{"label":"贞丰县","value":"522325"},{"label":"望谟县","value":"522326"},{"label":"册亨县","value":"522327"},{"label":"安龙县","value":"522328"}],[{"label":"凯里市","value":"522601"},{"label":"黄平县","value":"522622"},{"label":"施秉县","value":"522623"},{"label":"三穗县","value":"522624"},{"label":"镇远县","value":"522625"},{"label":"岑巩县","value":"522626"},{"label":"天柱县","value":"522627"},{"label":"锦屏县","value":"522628"},{"label":"剑河县","value":"522629"},{"label":"台江县","value":"522630"},{"label":"黎平县","value":"522631"},{"label":"榕江县","value":"522632"},{"label":"从江县","value":"522633"},{"label":"雷山县","value":"522634"},{"label":"麻江县","value":"522635"},{"label":"丹寨县","value":"522636"}],[{"label":"都匀市","value":"522701"},{"label":"福泉市","value":"522702"},{"label":"荔波县","value":"522722"},{"label":"贵定县","value":"522723"},{"label":"瓮安县","value":"522725"},{"label":"独山县","value":"522726"},{"label":"平塘县","value":"522727"},{"label":"罗甸县","value":"522728"},{"label":"长顺县","value":"522729"},{"label":"龙里县","value":"522730"},{"label":"惠水县","value":"522731"},{"label":"三都水族自治县","value":"522732"}]],[[{"label":"五华区","value":"530102"},{"label":"盘龙区","value":"530103"},{"label":"官渡区","value":"530111"},{"label":"西山区","value":"530112"},{"label":"东川区","value":"530113"},{"label":"呈贡区","value":"530114"},{"label":"晋宁区","value":"530115"},{"label":"富民县","value":"530124"},{"label":"宜良县","value":"530125"},{"label":"石林彝族自治县","value":"530126"},{"label":"嵩明县","value":"530127"},{"label":"禄劝彝族苗族自治县","value":"530128"},{"label":"寻甸回族彝族自治县","value":"530129"},{"label":"安宁市","value":"530181"}],[{"label":"麒麟区","value":"530302"},{"label":"沾益区","value":"530303"},{"label":"马龙县","value":"530321"},{"label":"陆良县","value":"530322"},{"label":"师宗县","value":"530323"},{"label":"罗平县","value":"530324"},{"label":"富源县","value":"530325"},{"label":"会泽县","value":"530326"},{"label":"宣威市","value":"530381"}],[{"label":"红塔区","value":"530402"},{"label":"江川区","value":"530403"},{"label":"澄江县","value":"530422"},{"label":"通海县","value":"530423"},{"label":"华宁县","value":"530424"},{"label":"易门县","value":"530425"},{"label":"峨山彝族自治县","value":"530426"},{"label":"新平彝族傣族自治县","value":"530427"},{"label":"元江哈尼族彝族傣族自治县","value":"530428"}],[{"label":"隆阳区","value":"530502"},{"label":"施甸县","value":"530521"},{"label":"龙陵县","value":"530523"},{"label":"昌宁县","value":"530524"},{"label":"腾冲市","value":"530581"}],[{"label":"昭阳区","value":"530602"},{"label":"鲁甸县","value":"530621"},{"label":"巧家县","value":"530622"},{"label":"盐津县","value":"530623"},{"label":"大关县","value":"530624"},{"label":"永善县","value":"530625"},{"label":"绥江县","value":"530626"},{"label":"镇雄县","value":"530627"},{"label":"彝良县","value":"530628"},{"label":"威信县","value":"530629"},{"label":"水富县","value":"530630"}],[{"label":"古城区","value":"530702"},{"label":"玉龙纳西族自治县","value":"530721"},{"label":"永胜县","value":"530722"},{"label":"华坪县","value":"530723"},{"label":"宁蒗彝族自治县","value":"530724"}],[{"label":"思茅区","value":"530802"},{"label":"宁洱哈尼族彝族自治县","value":"530821"},{"label":"墨江哈尼族自治县","value":"530822"},{"label":"景东彝族自治县","value":"530823"},{"label":"景谷傣族彝族自治县","value":"530824"},{"label":"镇沅彝族哈尼族拉祜族自治县","value":"530825"},{"label":"江城哈尼族彝族自治县","value":"530826"},{"label":"孟连傣族拉祜族佤族自治县","value":"530827"},{"label":"澜沧拉祜族自治县","value":"530828"},{"label":"西盟佤族自治县","value":"530829"}],[{"label":"临翔区","value":"530902"},{"label":"凤庆县","value":"530921"},{"label":"云县","value":"530922"},{"label":"永德县","value":"530923"},{"label":"镇康县","value":"530924"},{"label":"双江拉祜族佤族布朗族傣族自治县","value":"530925"},{"label":"耿马傣族佤族自治县","value":"530926"},{"label":"沧源佤族自治县","value":"530927"}],[{"label":"楚雄市","value":"532301"},{"label":"双柏县","value":"532322"},{"label":"牟定县","value":"532323"},{"label":"南华县","value":"532324"},{"label":"姚安县","value":"532325"},{"label":"大姚县","value":"532326"},{"label":"永仁县","value":"532327"},{"label":"元谋县","value":"532328"},{"label":"武定县","value":"532329"},{"label":"禄丰县","value":"532331"}],[{"label":"个旧市","value":"532501"},{"label":"开远市","value":"532502"},{"label":"蒙自市","value":"532503"},{"label":"弥勒市","value":"532504"},{"label":"屏边苗族自治县","value":"532523"},{"label":"建水县","value":"532524"},{"label":"石屏县","value":"532525"},{"label":"泸西县","value":"532527"},{"label":"元阳县","value":"532528"},{"label":"红河县","value":"532529"},{"label":"金平苗族瑶族傣族自治县","value":"532530"},{"label":"绿春县","value":"532531"},{"label":"河口瑶族自治县","value":"532532"}],[{"label":"文山市","value":"532601"},{"label":"砚山县","value":"532622"},{"label":"西畴县","value":"532623"},{"label":"麻栗坡县","value":"532624"},{"label":"马关县","value":"532625"},{"label":"丘北县","value":"532626"},{"label":"广南县","value":"532627"},{"label":"富宁县","value":"532628"}],[{"label":"景洪市","value":"532801"},{"label":"勐海县","value":"532822"},{"label":"勐腊县","value":"532823"}],[{"label":"大理市","value":"532901"},{"label":"漾濞彝族自治县","value":"532922"},{"label":"祥云县","value":"532923"},{"label":"宾川县","value":"532924"},{"label":"弥渡县","value":"532925"},{"label":"南涧彝族自治县","value":"532926"},{"label":"巍山彝族回族自治县","value":"532927"},{"label":"永平县","value":"532928"},{"label":"云龙县","value":"532929"},{"label":"洱源县","value":"532930"},{"label":"剑川县","value":"532931"},{"label":"鹤庆县","value":"532932"}],[{"label":"瑞丽市","value":"533102"},{"label":"芒市","value":"533103"},{"label":"梁河县","value":"533122"},{"label":"盈江县","value":"533123"},{"label":"陇川县","value":"533124"}],[{"label":"泸水市","value":"533301"},{"label":"福贡县","value":"533323"},{"label":"贡山独龙族怒族自治县","value":"533324"},{"label":"兰坪白族普米族自治县","value":"533325"}],[{"label":"香格里拉市","value":"533401"},{"label":"德钦县","value":"533422"},{"label":"维西傈僳族自治县","value":"533423"}]],[[{"label":"城关区","value":"540102"},{"label":"堆龙德庆区","value":"540103"},{"label":"林周县","value":"540121"},{"label":"当雄县","value":"540122"},{"label":"尼木县","value":"540123"},{"label":"曲水县","value":"540124"},{"label":"达孜县","value":"540126"},{"label":"墨竹工卡县","value":"540127"},{"label":"格尔木藏青工业园区","value":"540171"},{"label":"拉萨经济技术开发区","value":"540172"},{"label":"西藏文化旅游创意园区","value":"540173"},{"label":"达孜工业园区","value":"540174"}],[{"label":"桑珠孜区","value":"540202"},{"label":"南木林县","value":"540221"},{"label":"江孜县","value":"540222"},{"label":"定日县","value":"540223"},{"label":"萨迦县","value":"540224"},{"label":"拉孜县","value":"540225"},{"label":"昂仁县","value":"540226"},{"label":"谢通门县","value":"540227"},{"label":"白朗县","value":"540228"},{"label":"仁布县","value":"540229"},{"label":"康马县","value":"540230"},{"label":"定结县","value":"540231"},{"label":"仲巴县","value":"540232"},{"label":"亚东县","value":"540233"},{"label":"吉隆县","value":"540234"},{"label":"聂拉木县","value":"540235"},{"label":"萨嘎县","value":"540236"},{"label":"岗巴县","value":"540237"}],[{"label":"卡若区","value":"540302"},{"label":"江达县","value":"540321"},{"label":"贡觉县","value":"540322"},{"label":"类乌齐县","value":"540323"},{"label":"丁青县","value":"540324"},{"label":"察雅县","value":"540325"},{"label":"八宿县","value":"540326"},{"label":"左贡县","value":"540327"},{"label":"芒康县","value":"540328"},{"label":"洛隆县","value":"540329"},{"label":"边坝县","value":"540330"}],[{"label":"巴宜区","value":"540402"},{"label":"工布江达县","value":"540421"},{"label":"米林县","value":"540422"},{"label":"墨脱县","value":"540423"},{"label":"波密县","value":"540424"},{"label":"察隅县","value":"540425"},{"label":"朗县","value":"540426"}],[{"label":"乃东区","value":"540502"},{"label":"扎囊县","value":"540521"},{"label":"贡嘎县","value":"540522"},{"label":"桑日县","value":"540523"},{"label":"琼结县","value":"540524"},{"label":"曲松县","value":"540525"},{"label":"措美县","value":"540526"},{"label":"洛扎县","value":"540527"},{"label":"加查县","value":"540528"},{"label":"隆子县","value":"540529"},{"label":"错那县","value":"540530"},{"label":"浪卡子县","value":"540531"}],[{"label":"那曲县","value":"542421"},{"label":"嘉黎县","value":"542422"},{"label":"比如县","value":"542423"},{"label":"聂荣县","value":"542424"},{"label":"安多县","value":"542425"},{"label":"申扎县","value":"542426"},{"label":"索县","value":"542427"},{"label":"班戈县","value":"542428"},{"label":"巴青县","value":"542429"},{"label":"尼玛县","value":"542430"},{"label":"双湖县","value":"542431"}],[{"label":"普兰县","value":"542521"},{"label":"札达县","value":"542522"},{"label":"噶尔县","value":"542523"},{"label":"日土县","value":"542524"},{"label":"革吉县","value":"542525"},{"label":"改则县","value":"542526"},{"label":"措勤县","value":"542527"}]],[[{"label":"新城区","value":"610102"},{"label":"碑林区","value":"610103"},{"label":"莲湖区","value":"610104"},{"label":"灞桥区","value":"610111"},{"label":"未央区","value":"610112"},{"label":"雁塔区","value":"610113"},{"label":"阎良区","value":"610114"},{"label":"临潼区","value":"610115"},{"label":"长安区","value":"610116"},{"label":"高陵区","value":"610117"},{"label":"鄠邑区","value":"610118"},{"label":"蓝田县","value":"610122"},{"label":"周至县","value":"610124"}],[{"label":"王益区","value":"610202"},{"label":"印台区","value":"610203"},{"label":"耀州区","value":"610204"},{"label":"宜君县","value":"610222"}],[{"label":"渭滨区","value":"610302"},{"label":"金台区","value":"610303"},{"label":"陈仓区","value":"610304"},{"label":"凤翔县","value":"610322"},{"label":"岐山县","value":"610323"},{"label":"扶风县","value":"610324"},{"label":"眉县","value":"610326"},{"label":"陇县","value":"610327"},{"label":"千阳县","value":"610328"},{"label":"麟游县","value":"610329"},{"label":"凤县","value":"610330"},{"label":"太白县","value":"610331"}],[{"label":"秦都区","value":"610402"},{"label":"杨陵区","value":"610403"},{"label":"渭城区","value":"610404"},{"label":"三原县","value":"610422"},{"label":"泾阳县","value":"610423"},{"label":"乾县","value":"610424"},{"label":"礼泉县","value":"610425"},{"label":"永寿县","value":"610426"},{"label":"彬县","value":"610427"},{"label":"长武县","value":"610428"},{"label":"旬邑县","value":"610429"},{"label":"淳化县","value":"610430"},{"label":"武功县","value":"610431"},{"label":"兴平市","value":"610481"}],[{"label":"临渭区","value":"610502"},{"label":"华州区","value":"610503"},{"label":"潼关县","value":"610522"},{"label":"大荔县","value":"610523"},{"label":"合阳县","value":"610524"},{"label":"澄城县","value":"610525"},{"label":"蒲城县","value":"610526"},{"label":"白水县","value":"610527"},{"label":"富平县","value":"610528"},{"label":"韩城市","value":"610581"},{"label":"华阴市","value":"610582"}],[{"label":"宝塔区","value":"610602"},{"label":"安塞区","value":"610603"},{"label":"延长县","value":"610621"},{"label":"延川县","value":"610622"},{"label":"子长县","value":"610623"},{"label":"志丹县","value":"610625"},{"label":"吴起县","value":"610626"},{"label":"甘泉县","value":"610627"},{"label":"富县","value":"610628"},{"label":"洛川县","value":"610629"},{"label":"宜川县","value":"610630"},{"label":"黄龙县","value":"610631"},{"label":"黄陵县","value":"610632"}],[{"label":"汉台区","value":"610702"},{"label":"南郑区","value":"610703"},{"label":"城固县","value":"610722"},{"label":"洋县","value":"610723"},{"label":"西乡县","value":"610724"},{"label":"勉县","value":"610725"},{"label":"宁强县","value":"610726"},{"label":"略阳县","value":"610727"},{"label":"镇巴县","value":"610728"},{"label":"留坝县","value":"610729"},{"label":"佛坪县","value":"610730"}],[{"label":"榆阳区","value":"610802"},{"label":"横山区","value":"610803"},{"label":"府谷县","value":"610822"},{"label":"靖边县","value":"610824"},{"label":"定边县","value":"610825"},{"label":"绥德县","value":"610826"},{"label":"米脂县","value":"610827"},{"label":"佳县","value":"610828"},{"label":"吴堡县","value":"610829"},{"label":"清涧县","value":"610830"},{"label":"子洲县","value":"610831"},{"label":"神木市","value":"610881"}],[{"label":"汉滨区","value":"610902"},{"label":"汉阴县","value":"610921"},{"label":"石泉县","value":"610922"},{"label":"宁陕县","value":"610923"},{"label":"紫阳县","value":"610924"},{"label":"岚皋县","value":"610925"},{"label":"平利县","value":"610926"},{"label":"镇坪县","value":"610927"},{"label":"旬阳县","value":"610928"},{"label":"白河县","value":"610929"}],[{"label":"商州区","value":"611002"},{"label":"洛南县","value":"611021"},{"label":"丹凤县","value":"611022"},{"label":"商南县","value":"611023"},{"label":"山阳县","value":"611024"},{"label":"镇安县","value":"611025"},{"label":"柞水县","value":"611026"}]],[[{"label":"城关区","value":"620102"},{"label":"七里河区","value":"620103"},{"label":"西固区","value":"620104"},{"label":"安宁区","value":"620105"},{"label":"红古区","value":"620111"},{"label":"永登县","value":"620121"},{"label":"皋兰县","value":"620122"},{"label":"榆中县","value":"620123"},{"label":"兰州新区","value":"620171"}],[{"label":"嘉峪关市","value":"620201"}],[{"label":"金川区","value":"620302"},{"label":"永昌县","value":"620321"}],[{"label":"白银区","value":"620402"},{"label":"平川区","value":"620403"},{"label":"靖远县","value":"620421"},{"label":"会宁县","value":"620422"},{"label":"景泰县","value":"620423"}],[{"label":"秦州区","value":"620502"},{"label":"麦积区","value":"620503"},{"label":"清水县","value":"620521"},{"label":"秦安县","value":"620522"},{"label":"甘谷县","value":"620523"},{"label":"武山县","value":"620524"},{"label":"张家川回族自治县","value":"620525"}],[{"label":"凉州区","value":"620602"},{"label":"民勤县","value":"620621"},{"label":"古浪县","value":"620622"},{"label":"天祝藏族自治县","value":"620623"}],[{"label":"甘州区","value":"620702"},{"label":"肃南裕固族自治县","value":"620721"},{"label":"民乐县","value":"620722"},{"label":"临泽县","value":"620723"},{"label":"高台县","value":"620724"},{"label":"山丹县","value":"620725"}],[{"label":"崆峒区","value":"620802"},{"label":"泾川县","value":"620821"},{"label":"灵台县","value":"620822"},{"label":"崇信县","value":"620823"},{"label":"华亭县","value":"620824"},{"label":"庄浪县","value":"620825"},{"label":"静宁县","value":"620826"},{"label":"平凉工业园区","value":"620871"}],[{"label":"肃州区","value":"620902"},{"label":"金塔县","value":"620921"},{"label":"瓜州县","value":"620922"},{"label":"肃北蒙古族自治县","value":"620923"},{"label":"阿克塞哈萨克族自治县","value":"620924"},{"label":"玉门市","value":"620981"},{"label":"敦煌市","value":"620982"}],[{"label":"西峰区","value":"621002"},{"label":"庆城县","value":"621021"},{"label":"环县","value":"621022"},{"label":"华池县","value":"621023"},{"label":"合水县","value":"621024"},{"label":"正宁县","value":"621025"},{"label":"宁县","value":"621026"},{"label":"镇原县","value":"621027"}],[{"label":"安定区","value":"621102"},{"label":"通渭县","value":"621121"},{"label":"陇西县","value":"621122"},{"label":"渭源县","value":"621123"},{"label":"临洮县","value":"621124"},{"label":"漳县","value":"621125"},{"label":"岷县","value":"621126"}],[{"label":"武都区","value":"621202"},{"label":"成县","value":"621221"},{"label":"文县","value":"621222"},{"label":"宕昌县","value":"621223"},{"label":"康县","value":"621224"},{"label":"西和县","value":"621225"},{"label":"礼县","value":"621226"},{"label":"徽县","value":"621227"},{"label":"两当县","value":"621228"}],[{"label":"临夏市","value":"622901"},{"label":"临夏县","value":"622921"},{"label":"康乐县","value":"622922"},{"label":"永靖县","value":"622923"},{"label":"广河县","value":"622924"},{"label":"和政县","value":"622925"},{"label":"东乡族自治县","value":"622926"},{"label":"积石山保安族东乡族撒拉族自治县","value":"622927"}],[{"label":"合作市","value":"623001"},{"label":"临潭县","value":"623021"},{"label":"卓尼县","value":"623022"},{"label":"舟曲县","value":"623023"},{"label":"迭部县","value":"623024"},{"label":"玛曲县","value":"623025"},{"label":"碌曲县","value":"623026"},{"label":"夏河县","value":"623027"}]],[[{"label":"城东区","value":"630102"},{"label":"城中区","value":"630103"},{"label":"城西区","value":"630104"},{"label":"城北区","value":"630105"},{"label":"大通回族土族自治县","value":"630121"},{"label":"湟中县","value":"630122"},{"label":"湟源县","value":"630123"}],[{"label":"乐都区","value":"630202"},{"label":"平安区","value":"630203"},{"label":"民和回族土族自治县","value":"630222"},{"label":"互助土族自治县","value":"630223"},{"label":"化隆回族自治县","value":"630224"},{"label":"循化撒拉族自治县","value":"630225"}],[{"label":"门源回族自治县","value":"632221"},{"label":"祁连县","value":"632222"},{"label":"海晏县","value":"632223"},{"label":"刚察县","value":"632224"}],[{"label":"同仁县","value":"632321"},{"label":"尖扎县","value":"632322"},{"label":"泽库县","value":"632323"},{"label":"河南蒙古族自治县","value":"632324"}],[{"label":"共和县","value":"632521"},{"label":"同德县","value":"632522"},{"label":"贵德县","value":"632523"},{"label":"兴海县","value":"632524"},{"label":"贵南县","value":"632525"}],[{"label":"玛沁县","value":"632621"},{"label":"班玛县","value":"632622"},{"label":"甘德县","value":"632623"},{"label":"达日县","value":"632624"},{"label":"久治县","value":"632625"},{"label":"玛多县","value":"632626"}],[{"label":"玉树市","value":"632701"},{"label":"杂多县","value":"632722"},{"label":"称多县","value":"632723"},{"label":"治多县","value":"632724"},{"label":"囊谦县","value":"632725"},{"label":"曲麻莱县","value":"632726"}],[{"label":"格尔木市","value":"632801"},{"label":"德令哈市","value":"632802"},{"label":"乌兰县","value":"632821"},{"label":"都兰县","value":"632822"},{"label":"天峻县","value":"632823"},{"label":"大柴旦行政委员会","value":"632857"},{"label":"冷湖行政委员会","value":"632858"},{"label":"茫崖行政委员会","value":"632859"}]],[[{"label":"兴庆区","value":"640104"},{"label":"西夏区","value":"640105"},{"label":"金凤区","value":"640106"},{"label":"永宁县","value":"640121"},{"label":"贺兰县","value":"640122"},{"label":"灵武市","value":"640181"}],[{"label":"大武口区","value":"640202"},{"label":"惠农区","value":"640205"},{"label":"平罗县","value":"640221"}],[{"label":"利通区","value":"640302"},{"label":"红寺堡区","value":"640303"},{"label":"盐池县","value":"640323"},{"label":"同心县","value":"640324"},{"label":"青铜峡市","value":"640381"}],[{"label":"原州区","value":"640402"},{"label":"西吉县","value":"640422"},{"label":"隆德县","value":"640423"},{"label":"泾源县","value":"640424"},{"label":"彭阳县","value":"640425"}],[{"label":"沙坡头区","value":"640502"},{"label":"中宁县","value":"640521"},{"label":"海原县","value":"640522"}]],[[{"label":"天山区","value":"650102"},{"label":"沙依巴克区","value":"650103"},{"label":"新市区","value":"650104"},{"label":"水磨沟区","value":"650105"},{"label":"头屯河区","value":"650106"},{"label":"达坂城区","value":"650107"},{"label":"米东区","value":"650109"},{"label":"乌鲁木齐县","value":"650121"},{"label":"乌鲁木齐经济技术开发区","value":"650171"},{"label":"乌鲁木齐高新技术产业开发区","value":"650172"}],[{"label":"独山子区","value":"650202"},{"label":"克拉玛依区","value":"650203"},{"label":"白碱滩区","value":"650204"},{"label":"乌尔禾区","value":"650205"}],[{"label":"高昌区","value":"650402"},{"label":"鄯善县","value":"650421"},{"label":"托克逊县","value":"650422"}],[{"label":"伊州区","value":"650502"},{"label":"巴里坤哈萨克自治县","value":"650521"},{"label":"伊吾县","value":"650522"}],[{"label":"昌吉市","value":"652301"},{"label":"阜康市","value":"652302"},{"label":"呼图壁县","value":"652323"},{"label":"玛纳斯县","value":"652324"},{"label":"奇台县","value":"652325"},{"label":"吉木萨尔县","value":"652327"},{"label":"木垒哈萨克自治县","value":"652328"}],[{"label":"博乐市","value":"652701"},{"label":"阿拉山口市","value":"652702"},{"label":"精河县","value":"652722"},{"label":"温泉县","value":"652723"}],[{"label":"库尔勒市","value":"652801"},{"label":"轮台县","value":"652822"},{"label":"尉犁县","value":"652823"},{"label":"若羌县","value":"652824"},{"label":"且末县","value":"652825"},{"label":"焉耆回族自治县","value":"652826"},{"label":"和静县","value":"652827"},{"label":"和硕县","value":"652828"},{"label":"博湖县","value":"652829"},{"label":"库尔勒经济技术开发区","value":"652871"}],[{"label":"阿克苏市","value":"652901"},{"label":"温宿县","value":"652922"},{"label":"库车县","value":"652923"},{"label":"沙雅县","value":"652924"},{"label":"新和县","value":"652925"},{"label":"拜城县","value":"652926"},{"label":"乌什县","value":"652927"},{"label":"阿瓦提县","value":"652928"},{"label":"柯坪县","value":"652929"}],[{"label":"阿图什市","value":"653001"},{"label":"阿克陶县","value":"653022"},{"label":"阿合奇县","value":"653023"},{"label":"乌恰县","value":"653024"}],[{"label":"喀什市","value":"653101"},{"label":"疏附县","value":"653121"},{"label":"疏勒县","value":"653122"},{"label":"英吉沙县","value":"653123"},{"label":"泽普县","value":"653124"},{"label":"莎车县","value":"653125"},{"label":"叶城县","value":"653126"},{"label":"麦盖提县","value":"653127"},{"label":"岳普湖县","value":"653128"},{"label":"伽师县","value":"653129"},{"label":"巴楚县","value":"653130"},{"label":"塔什库尔干塔吉克自治县","value":"653131"}],[{"label":"和田市","value":"653201"},{"label":"和田县","value":"653221"},{"label":"墨玉县","value":"653222"},{"label":"皮山县","value":"653223"},{"label":"洛浦县","value":"653224"},{"label":"策勒县","value":"653225"},{"label":"于田县","value":"653226"},{"label":"民丰县","value":"653227"}],[{"label":"伊宁市","value":"654002"},{"label":"奎屯市","value":"654003"},{"label":"霍尔果斯市","value":"654004"},{"label":"伊宁县","value":"654021"},{"label":"察布查尔锡伯自治县","value":"654022"},{"label":"霍城县","value":"654023"},{"label":"巩留县","value":"654024"},{"label":"新源县","value":"654025"},{"label":"昭苏县","value":"654026"},{"label":"特克斯县","value":"654027"},{"label":"尼勒克县","value":"654028"}],[{"label":"塔城市","value":"654201"},{"label":"乌苏市","value":"654202"},{"label":"额敏县","value":"654221"},{"label":"沙湾县","value":"654223"},{"label":"托里县","value":"654224"},{"label":"裕民县","value":"654225"},{"label":"和布克赛尔蒙古自治县","value":"654226"}],[{"label":"阿勒泰市","value":"654301"},{"label":"布尔津县","value":"654321"},{"label":"富蕴县","value":"654322"},{"label":"福海县","value":"654323"},{"label":"哈巴河县","value":"654324"},{"label":"青河县","value":"654325"},{"label":"吉木乃县","value":"654326"}],[{"label":"石河子市","value":"659001"},{"label":"阿拉尔市","value":"659002"},{"label":"图木舒克市","value":"659003"},{"label":"五家渠市","value":"659004"},{"label":"铁门关市","value":"659006"}]],[[{"label":"台北","value":"660101"}],[{"label":"高雄","value":"660201"}],[{"label":"基隆","value":"660301"}],[{"label":"台中","value":"660401"}],[{"label":"台南","value":"660501"}],[{"label":"新竹","value":"660601"}],[{"label":"嘉义","value":"660701"}],[{"label":"宜兰","value":"660801"}],[{"label":"桃园","value":"660901"}],[{"label":"苗栗","value":"661001"}],[{"label":"彰化","value":"661101"}],[{"label":"南投","value":"661201"}],[{"label":"云林","value":"661301"}],[{"label":"屏东","value":"661401"}],[{"label":"台东","value":"661501"}],[{"label":"花莲","value":"661601"}],[{"label":"澎湖","value":"661701"}]],[[{"label":"香港岛","value":"670101"}],[{"label":"九龙","value":"670201"}],[{"label":"新界","value":"670301"}]],[[{"label":"澳门半岛","value":"680101"}],[{"label":"氹仔岛","value":"680201"}],[{"label":"路环岛","value":"680301"}],[{"label":"路氹城","value":"680401"}]]];export default areaData;
\ No newline at end of file
diff --git a/uview-ui/libs/util/city.js b/uview-ui/libs/util/city.js
deleted file mode 100644
index 94169eb8..00000000
--- a/uview-ui/libs/util/city.js
+++ /dev/null
@@ -1 +0,0 @@
-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
diff --git a/uview-ui/libs/util/province.js b/uview-ui/libs/util/province.js
deleted file mode 100644
index 436b1904..00000000
--- a/uview-ui/libs/util/province.js
+++ /dev/null
@@ -1 +0,0 @@
-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