From d54a7e9f1362ffec72229de8210e6a1d5741bc25 Mon Sep 17 00:00:00 2001
From: ZF sun <34314687@qq.com>
Date: Tue, 23 Dec 2025 17:56:20 +0800
Subject: [PATCH] =?UTF-8?q?fix(code):=20=E4=BF=AE=E6=AD=A3=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E9=94=99=E8=AF=AF=E5=8F=8A=E4=B8=8D=E4=B8=A5=E8=B0=A8?=
 =?UTF-8?q?=E7=9A=84=E5=9C=B0=E6=96=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/common-payment/common-payment.vue  |    2 +-
 components/diy-components/diy-article.vue     |    2 +-
 components/diy-components/diy-audio.vue       |    2 +-
 components/diy-components/diy-bargain.vue     |    4 +-
 components/diy-components/diy-category.vue    |    6 +-
 components/diy-components/diy-comp-extend.vue |    2 +-
 components/diy-components/diy-coupon.vue      |   16 +-
 .../diy-components/diy-fenxiao-goods-list.vue |    2 +-
 .../diy-follow-official-account.vue           |    2 +-
 components/diy-components/diy-goods-brand.vue |    2 +-
 components/diy-components/diy-graphic-nav.vue |    2 +-
 components/diy-components/diy-horz-blank.vue  |    2 +-
 components/diy-components/diy-horz-line.vue   |    2 +-
 components/diy-components/diy-live.vue        |    2 +-
 components/diy-components/diy-member-info.vue |    2 +-
 components/diy-components/diy-merch-list.vue  |    2 +-
 components/diy-components/diy-notes.vue       |    2 +-
 components/diy-components/diy-quick-nav.vue   |    2 +-
 components/diy-components/diy-seckill.vue     |    8 +-
 components/diy-components/diy-store-label.vue |    2 +-
 components/diy-components/diy-video.vue       |    2 +-
 .../goods-detail-view/goods-detail-view.vue   |    2 +-
 .../mescroll/components/mescroll-down.vue     |    2 +-
 .../mescroll/components/mescroll-empty.vue    |    2 +-
 .../mescroll/components/mescroll-top.vue      |    2 +-
 .../mescroll/components/mescroll-up.vue       |    2 +-
 components/mescroll/mescroll-body.vue         |    2 +-
 components/mescroll/mescroll-uni.vue          |    2 +-
 .../ns-birthday-gift/ns-birthday-gift.vue     |    2 +-
 .../ns-goods-action/ns-goods-action.vue       |    2 +-
 components/ns-login/ns-login.vue              |    2 +-
 components/ns-new-gift/ns-new-gift.vue        |    2 +-
 components/ns-switch/ns-switch.vue            |    2 +-
 components/pick-regions/pick-regions.vue      |  608 ++---
 .../register-reward/register-reward.vue       |    2 +-
 components/toTop/toTop.vue                    |    2 +-
 components/uni-badge/uni-badge.vue            |    2 +-
 components/uni-drawer/uni-drawer.vue          |    2 +-
 components/uni-grid-item/uni-grid-item.vue    |    2 +-
 components/uni-grid/uni-grid.vue              |    2 +-
 components/uni-popup/uni-popup-sku-new.vue    |    2 +-
 components/uni-popup/uni-popup-sku.vue        |    2 +-
 components/uni-popup/uni-popup.vue            |    2 +-
 components/uni-tag/uni-tag.vue                |    2 +-
 components/uv-count-to/uv-count-to.vue        |    2 +-
 components/wx-privacy-popup/privacy-popup.vue |  462 ++--
 pages/contact/contact.vue                     |    2 +-
 pages/goods/detail.vue                        |    2 +-
 pages/goods/list.vue                          |    2 +-
 pages/index/index.vue                         |    2 +-
 pages/member/index.vue                        |    2 +-
 pages/order/detail.vue                        |    2 +-
 pages/order/detail_point.vue                  |    2 +-
 pages/order/list.vue                          |    2 +-
 pages_promotion/components/l-time/l-time.vue  |    2 +-
 .../components/yuyue-date/yuyue-date.vue      |  826 +++----
 pages_promotion/fenxiao/apply.vue             |    2 +-
 pages_promotion/fenxiao/goods_list.vue        |    2 +-
 pages_promotion/merch/detail.vue              |    2 +-
 pages_promotion/merch/merchcategory.vue       |    4 +-
 pages_promotion/point/detail.vue              |    2 +-
 pages_promotion/point/goods_list.vue          |    2 +-
 pages_promotion/point/list.vue                |    2 +-
 pages_promotion/point/order_list.vue          | 1150 +++++-----
 pages_promotion/point/payment.vue             |    2 +-
 pages_tool/cases/index.vue                    |    4 +-
 .../components/img-cropping/cropping.vue      |    2 +-
 pages_tool/components/myp-one/myp-one.vue     |    2 +-
 pages_tool/components/sx-rate/index.vue       |    2 +-
 .../uni-calendar/uni-calendar-item.vue        |  372 ++--
 .../components/uni-calendar/uni-calendar.vue  |  952 ++++----
 .../components/uni-nav-bar/uni-nav-bar.vue    |  440 ++--
 pages_tool/files/list.vue                     |    2 +-
 pages_tool/help/list.vue                      |    4 +-
 pages_tool/index/diy.vue                      |    2 +-
 pages_tool/login/login.vue                    |    2 +-
 pages_tool/member/account.vue                 |    4 +-
 pages_tool/member/address.vue                 |    2 +-
 pages_tool/member/balance_detail.vue          |    2 +-
 pages_tool/member/card.vue                    |    2 +-
 pages_tool/member/collection.vue              |    2 +-
 pages_tool/member/invite_friends.vue          |    2 +-
 pages_tool/member/point_detail.vue            |    2 +-
 pages_tool/member/withdrawal.vue              |    2 +-
 pages_tool/notice/list.vue                    |    2 +-
 pages_tool/order/refund.vue                   |    2 +-
 pages_tool/order/refund_batch.vue             |    2 +-
 pages_tool/order/refund_type_select.vue       |    2 +-
 pages_tool/pay/cashier.vue                    |  758 +++----
 pages_tool/pay/result.vue                     |    2 +-
 pages_tool/seal/medium/detail.vue             |    2 +-
 pages_tool/seal/medium/search.vue             |    2 +-
 pages_tool/seal/structure.vue                 |    2 +-
 pages_tool/weapp/order_shipping.vue           |    2 +-
 .../mp-html/components/mp-html/mp-html.vue    |  996 ++++-----
 .../mp-html/components/mp-html/node/node.vue  | 1172 +++++-----
 .../uni-datetime-picker/time-picker.vue       | 1854 ++++++++--------
 .../uni-datetime-picker.vue                   | 1962 ++++++++---------
 98 files changed, 5879 insertions(+), 5879 deletions(-)

diff --git a/components/common-payment/common-payment.vue b/components/common-payment/common-payment.vue
index 6ef5854..9c844e4 100644
--- a/components/common-payment/common-payment.vue
+++ b/components/common-payment/common-payment.vue
@@ -603,7 +603,7 @@
 							<text class="iconfont icon-close" @click="$refs.memberGoodsCardPopup.close()"></text>
 						</view>
 						<scroll-view scroll-y="true" class="popup-body" :class="{ 'safe-area': isIphoneX }">
-							<view v-for="(item, index) in selectGoodsCard.cardList" :key="item.item_id || index" class="card-item" @click="selectGoodsCard.click(item.item_id)">
+							<view v-for="(item, index) in selectGoodsCard.cardList" :key="index" class="card-item" @click="selectGoodsCard.click(item.item_id)">
 								<view class="content">
 									<view class="title">{{ item.goods_name }}</view>
 									<view class="info">
diff --git a/components/diy-components/diy-article.vue b/components/diy-components/diy-article.vue
index 609f2ba..2f8bee2 100644
--- a/components/diy-components/diy-article.vue
+++ b/components/diy-components/diy-article.vue
@@ -11,7 +11,7 @@
 					:interval="swiperConfig.interval || 3000"
 					:duration="swiperConfig.duration || 500"
 					:display-multiple-items="swiperConfig.displayMultipleItems || 3">
-					<swiper-item v-for="(item, index) in list" :key="item.article_id || index" @click="toDetail(item)">
+					<swiper-item v-for="(item, index) in list" :key="index" @click="toDetail(item)">
 						<view class="swiper-item-content">
 							<view :class="['item', value.ornament.type]" :style="itemCss">
 								<view class="article-img">
diff --git a/components/diy-components/diy-audio.vue b/components/diy-components/diy-audio.vue
index 9801c9e..28b11c6 100644
--- a/components/diy-components/diy-audio.vue
+++ b/components/diy-components/diy-audio.vue
@@ -206,7 +206,7 @@
 	};
 </script>
 
-<style lang="scss" scoped>
+<style scoped>
 	
 	.fui-audio {
 	    width: 100%;
diff --git a/components/diy-components/diy-bargain.vue b/components/diy-components/diy-bargain.vue
index 55e5873..f43ab9f 100644
--- a/components/diy-components/diy-bargain.vue
+++ b/components/diy-components/diy-bargain.vue
@@ -17,7 +17,7 @@
 
 			<!-- 商品列表 -->
 			<template v-if="value.template == 'row1-of1'">
-				<view class="item" v-for="(item, index) in list" :key="item.bargain_id || index" @click="toDetail(item)" :class="[value.ornament.type]" :style="goodsItemCss">
+				<view class="item" v-for="(item, index) in list" :key="index" @click="toDetail(item)" :class="[value.ornament.type]" :style="goodsItemCss">
 					<view class="img-wrap" :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }">
 						<image :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }" :src="$util.img(item.goods_image, { size: 'mid' })" mode="widthFix" @error="imageError(index)"/>
 					</view>
@@ -67,7 +67,7 @@
 
 			<template v-if="value.template == 'horizontal-slide'">
 				<scroll-view v-if="value.slideMode == 'scroll'" class="scroll" :scroll-x="true" :show-scrollbar="false">
-					<view class="item" v-for="(item, index) in list" :key="item.bargain_id || index" @click="toDetail(item)" :class="[value.ornament.type]" :style="goodsItemCss">
+					<view class="item" v-for="(item, index) in list" :key="index" @click="toDetail(item)" :class="[value.ornament.type]" :style="goodsItemCss">
 						<view class="img-wrap" :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }">
 							<image :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }" :src="$util.img(item.goods_image, { size: 'mid' })" mode="widthFix" @error="imageError(index)" :lazy-load="true"/>
 							<image class="bg" v-if="value.saleStyle.control && value.template == 'horizontal-slide' && value.style != 'style-2'" :src="$util.img('public/uniapp/bargain/bg.png')" mode="widthFix"/>
diff --git a/components/diy-components/diy-category.vue b/components/diy-components/diy-category.vue
index 55a7ae8..9d1aae0 100644
--- a/components/diy-components/diy-category.vue
+++ b/components/diy-components/diy-category.vue
@@ -68,7 +68,7 @@
 			<block v-if="categoryTree.length">
 				<scroll-view scroll-y="true" class="tree-wrap">
 					<view class="category-item-wrap">
-						<view class="category-item" v-for="(item, index) in categoryTree" :key="item.category_id || index" :class="[
+						<view class="category-item" v-for="(item, index) in categoryTree" :key="index" :class="[
 								{ select: select == index },
 								{ 'border-bottom': value.template == 4 && select + 1 === index },
 								{ 'border-top': value.template == 4 && select - 1 === index }
@@ -84,7 +84,7 @@
 						@scroll="listenScroll" @touchstart="touchStart" :refresher-enabled="true"
 						refresher-default-style="none" :refresher-triggered="triggered" @refresherrefresh="onRefresh"
 						@refresherrestore="onRestore">
-						<view class="child-category" v-for="(item, index) in categoryTree" :key="item.category_id || index" :id="'category-' + index">
+						<view class="child-category" v-for="(item, index) in categoryTree" :key="index" :id="'category-' + index">
 							<diy-category-item :category="item" :value="value" ref="categoryItem" :index="index"
 								:select="select" :oneCategorySelect="oneCategorySelect" :isList="isList" @tologin="toLogin"
 								@selectsku="selectSku($event, index)" @addCart="addCartPoint"
@@ -95,7 +95,7 @@
 
 					<view class="content-wrap"
 						v-if="(value.template == 2 || value.template == 3 || value.template == 4) && loadType == 'part'">
-						<view class="child-category-wrap" v-for="(item, index) in categoryTree" :key="item.category_id || index"
+						<view class="child-category-wrap" v-for="(item, index) in categoryTree" :key="index"
 							:id="'category-' + index" :style="{ display: select == index ? 'block' : 'none' }">
 							<diy-category-item :category="item" :value="value" ref="categoryItem" :index="index"
 								:last="index == categoryTree.length - 1 ? true : false" :select="select"
diff --git a/components/diy-components/diy-comp-extend.vue b/components/diy-components/diy-comp-extend.vue
index 11707cc..50e0ac3 100644
--- a/components/diy-components/diy-comp-extend.vue
+++ b/components/diy-components/diy-comp-extend.vue
@@ -20,4 +20,4 @@ export default {
 };
 </script>
 
-<style lang="scss"></style>
+<style></style>
diff --git a/components/diy-components/diy-coupon.vue b/components/diy-components/diy-coupon.vue
index 46bc4ff..af4e221 100644
--- a/components/diy-components/diy-coupon.vue
+++ b/components/diy-components/diy-coupon.vue
@@ -9,7 +9,7 @@
 				<swiper class="coupon-style-one" circular>
 					<swiper-item v-for="(numItem, numIndex) in Math.ceil(computedCouponList.length / 3)" :key="numIndex" class="coupon-item-box">
 
-						<view v-for="(item, index) in computedCouponList" class="coupon-item" :key="item.coupon_id || index"
+						<view v-for="(item, index) in computedCouponList" class="coupon-item" :key="index"
 							v-if="index >= [numIndex * 3] && index < [(numIndex + 1) * 3]" :style="{
 							color: value.moneyColor,
 							backgroundImage: 'url(' + $util.img('public/uniapp/coupon/style1-bg.png') + ')',
@@ -43,7 +43,7 @@
 			<template v-if="value.style == '2'">
 				<swiper class="coupon-style-two" circular>
 					<swiper-item v-for="(numItem, numIndex) in Math.ceil(computedCouponList.length / 3)" :key="numIndex" class="coupon-item-box">
-						<view class="coupon-item" v-for="(item, index) in computedCouponList" :key="item.coupon_id || index"
+						<view class="coupon-item" v-for="(item, index) in computedCouponList" :key="index"
 							v-if="index >= [numIndex * 3] && index < [(numIndex + 1) * 3]" :style="{
 							color: value.moneyColor,
 							backgroundImage: 'url(' + $util.img('public/uniapp/coupon/coupon_bg1.png') + ')',
@@ -76,7 +76,7 @@
 			<template v-if="value.style == '3'">
 				<swiper class="coupon-style-three" circular>
 					<swiper-item v-for="(numItem, numIndex) in Math.ceil(computedCouponList.length / 3)" :key="numIndex" class="coupon-item-box">
-						<view class="coupon-item" v-for="(item, index) in computedCouponList" :key="item.coupon_id || index"
+						<view class="coupon-item" v-for="(item, index) in computedCouponList" :key="index"
 							v-if="index >= [numIndex * 3] && index < [(numIndex + 1) * 3]" :style="{
 							color: value.moneyColor,
 							backgroundImage: 'url(' + $util.img('public/uniapp/coupon/coupon_shu.png') + ')',
@@ -110,7 +110,7 @@
 			<template v-if="value.style == '4'">
 				<swiper class="coupon-style-four" circular>
 					<swiper-item v-for="(numItem, numIndex) in Math.ceil(computedCouponList.length / 3)" :key="numIndex" class="coupon-item-box">
-						<view class="coupon-item" v-for="(item, index) in computedCouponList" :key="item.coupon_id || index"
+						<view class="coupon-item" v-for="(item, index) in computedCouponList" :key="index"
 							v-if="index >= [numIndex * 3] && index < [(numIndex + 1) * 3]" :style="{
 							color: value.moneyColor,
 							backgroundImage: 'url(' + $util.img('public/uniapp/coupon/style4_bg.png') + ')',
@@ -143,7 +143,7 @@
 				<view class="coupon-style-five">
 					<view class="coupon-all">
 						<view class="coupon-box">
-							<view class="coupon-list" v-for="(item, index) in computedCouponList" :key="item.coupon_id || index" @click="couponAction(item, index)">
+							<view class="coupon-list" v-for="(item, index) in computedCouponList" :key="index" @click="couponAction(item, index)">
 								<image :src="$util.img('public/uniapp/coupon/style5_bg.png')"></image>
 								<view class="coupon">
 									<view class="coupon-info">
@@ -176,7 +176,7 @@
 			<template v-if="value.style == '6'">
 				<swiper class="coupon-style-six" circular>
 					<swiper-item class="style-six-wrap" v-for="(numItem, numIndex) in Math.ceil(computedCouponList.length / 3)" :key="numIndex">
-						<view class="coupon" v-for="(item, index) in computedCouponList" :key="item.coupon_id || index"
+						<view class="coupon" v-for="(item, index) in computedCouponList" :key="index"
 							v-if="index >= [numIndex * 3] && index < [(numIndex + 1) * 3]" :style="{
 							color: value.moneyColor,
 							backgroundImage: 'url(' + $util.img('public/uniapp/coupon/style6-bg-1.png') + ')',
@@ -230,7 +230,7 @@
 			<template v-if="value.style == '7'">
 				<scroll-view class="coupon-style-seven" scroll-x="true">
 					<view class="wrap">
-						<view class="coupon-list" v-for="(item, index) in computedCouponList" :key="item.coupon_id || index" @click="couponAction(item, index)">
+						<view class="coupon-list" v-for="(item, index) in computedCouponList" :key="index" @click="couponAction(item, index)">
 							<image :src="$util.img('public/uniapp/coupon/style7_bg.png')"></image>
 							<view class="coupon">
 								<view class="coupon-info">
@@ -1067,7 +1067,7 @@
 		background: transparent;
 	}
 </style>
-<style lang="scss" scoped>
+<style scoped>
 	.coupon-all>>>.uni-scroll-view::-webkit-scrollbar {
 		display: none;
 	}
diff --git a/components/diy-components/diy-fenxiao-goods-list.vue b/components/diy-components/diy-fenxiao-goods-list.vue
index 9fec461..1bfcb67 100644
--- a/components/diy-components/diy-fenxiao-goods-list.vue
+++ b/components/diy-components/diy-fenxiao-goods-list.vue
@@ -1,6 +1,6 @@
 <template>
 	<view data-component-name="diy-fenxiao-goods-list" class="diy-fenxiao" v-if="list.length" :class="['goods-list', value.template, value.style]" :style="goodsListWarpCss">
-		<view class="goods-item" v-for="(item, index) in list" :key="item.goods_id || index" @click="toDetail(item)" :class="[value.ornament.type]" :style="goodsItemCss">
+		<view class="goods-item" v-for="(item, index) in list" :key="index" @click="toDetail(item)" :class="[value.ornament.type]" :style="goodsItemCss">
 			<view class="goods-img" :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }">
 				<image :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }" :src="$util.img(item.goods_image, { size: 'mid' })" mode="widthFix" @error="imgError(index)"/>
 			</view>
diff --git a/components/diy-components/diy-follow-official-account.vue b/components/diy-components/diy-follow-official-account.vue
index 84fb7ff..6aa4514 100644
--- a/components/diy-components/diy-follow-official-account.vue
+++ b/components/diy-components/diy-follow-official-account.vue
@@ -26,4 +26,4 @@
 	};
 </script>
 
-<style lang="scss"></style>
\ No newline at end of file
+<style></style>
\ No newline at end of file
diff --git a/components/diy-components/diy-goods-brand.vue b/components/diy-components/diy-goods-brand.vue
index 2ee3e7e..ba55960 100644
--- a/components/diy-components/diy-goods-brand.vue
+++ b/components/diy-components/diy-goods-brand.vue
@@ -5,7 +5,7 @@
 				<view class="title-wrap" v-show="value.title" :style="{ color: value.textColor, fontWeight: value.fontWeight ? 'bold' : '' }">{{ value.title }}
 				</view>
 				<view class="ul-wrap">
-					<view class="li-item" v-for="(item, index) in list" :key="item.brand_id || index">
+					<view class="li-item" v-for="(item, index) in list" :key="index">
 						<image class="brand-pic" :src="$util.img(item.image_url)" mode="aspectFit" @click="handlerClick(item)" @tap="handlerClick(item)" @error="imgError(index)" :style="itemCss"/>
 					</view>
 				</view>
diff --git a/components/diy-components/diy-graphic-nav.vue b/components/diy-components/diy-graphic-nav.vue
index 08a47eb..d730d9a 100644
--- a/components/diy-components/diy-graphic-nav.vue
+++ b/components/diy-components/diy-graphic-nav.vue
@@ -164,7 +164,7 @@
         }
     };
 </script>
-<style lang="scss">
+<style>
     /* 固定显示 */
     .graphic-nav.fixed-layout>>>.uni-scroll-view-content {
         display: flex;
diff --git a/components/diy-components/diy-horz-blank.vue b/components/diy-components/diy-horz-blank.vue
index ae9ce37..b91d44a 100644
--- a/components/diy-components/diy-horz-blank.vue
+++ b/components/diy-components/diy-horz-blank.vue
@@ -37,4 +37,4 @@ export default {
 };
 </script>
 
-<style lang="scss"></style>
+<style></style>
diff --git a/components/diy-components/diy-horz-line.vue b/components/diy-components/diy-horz-line.vue
index 54ad38b..ce588be 100644
--- a/components/diy-components/diy-horz-line.vue
+++ b/components/diy-components/diy-horz-line.vue
@@ -22,4 +22,4 @@ export default {
 };
 </script>
 
-<style lang="scss"></style>
+<style></style>
diff --git a/components/diy-components/diy-live.vue b/components/diy-components/diy-live.vue
index d6247b3..97387d0 100644
--- a/components/diy-components/diy-live.vue
+++ b/components/diy-components/diy-live.vue
@@ -242,7 +242,7 @@
 		}
 	}
 </style>
-<style lang="scss" scoped>
+<style scoped>
 	.coupon-all>>>.uni-scroll-view::-webkit-scrollbar {
 		display: none;
 	}
diff --git a/components/diy-components/diy-member-info.vue b/components/diy-components/diy-member-info.vue
index 3482734..e044310 100644
--- a/components/diy-components/diy-member-info.vue
+++ b/components/diy-components/diy-member-info.vue
@@ -1457,7 +1457,7 @@
 		}
 	}
 </style>
-<style lang="scss" scoped>
+<style scoped>
 	.member-complete-info-popup /deep/ .uni-popup__wrapper.bottom,
 	.member-complete-info-popup /deep/ .uni-popup__wrapper.bottom .uni-popup__wrapper-box {
 		border-top-left-radius: 30rpx !important;
diff --git a/components/diy-components/diy-merch-list.vue b/components/diy-components/diy-merch-list.vue
index 497ad93..b25192d 100644
--- a/components/diy-components/diy-merch-list.vue
+++ b/components/diy-components/diy-merch-list.vue
@@ -179,7 +179,7 @@
 		}
 	};
 </script>
-<style lang="scss">
+<style>
 	/* 单行滑动 */
 	.merch-nav.singleSlide>>>.uni-scroll-view-content {
 	    display: flex;
diff --git a/components/diy-components/diy-notes.vue b/components/diy-components/diy-notes.vue
index 8942521..a371b44 100644
--- a/components/diy-components/diy-notes.vue
+++ b/components/diy-components/diy-notes.vue
@@ -7,7 +7,7 @@
 			</view>
 
 			<scroll-view class="diy-notes-box" scroll-x="true" show-scrollbar="true">
-				<view class="notes-box-item" v-for="(item, i) in dataList" :key="item.note_id || i" @click="handlerClick(item)" @tap="handlerClick(item)"
+				<view class="notes-box-item" v-for="(item, i) in dataList" :key="i" @click="handlerClick(item)" @tap="handlerClick(item)"
 					:style="notesItemStyle">
 					<view class="notes-item" v-if="item.status == 1">
 						<view class="notes-item-con">
diff --git a/components/diy-components/diy-quick-nav.vue b/components/diy-components/diy-quick-nav.vue
index c34e5ec..7d6b458 100644
--- a/components/diy-components/diy-quick-nav.vue
+++ b/components/diy-components/diy-quick-nav.vue
@@ -79,7 +79,7 @@
 		}
 	};
 </script>
-<style lang="scss">
+<style>
 .quick-nav >>> .uni-scroll-view-content {
 	display: flex;
 }
diff --git a/components/diy-components/diy-seckill.vue b/components/diy-components/diy-seckill.vue
index 258bbb3..22da80c 100644
--- a/components/diy-components/diy-seckill.vue
+++ b/components/diy-components/diy-seckill.vue
@@ -27,7 +27,7 @@
 
 			<view class="content-wrap">
 				<template v-if="value.template == 'row1-of1'">
-					<view class="item" v-for="(item, index) in dataList" :key="item.goods_id || index" @click="toDetail(item.id)" :class="[value.ornament.type]" :style="goodsItemCss">
+					<view class="item" v-for="(item, index) in dataList" :key="index" @click="toDetail(item.id)" :class="[value.ornament.type]" :style="goodsItemCss">
 						<view class="img-wrap" :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }">
 							<image :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }" :src="$util.img(item.goods_image, { size: 'mid' })" mode="widthFix" @error="imageError(index)"/>
 						</view>
@@ -82,7 +82,7 @@
 				</template>
 
 				<template v-if="value.template == 'row1-of2'">
-					<view class="item" v-for="(item, index) in dataList" :key="item.goods_id || index" @click="toDetail(item.id)" :class="[value.ornament.type]" :style="goodsItemCss">
+					<view class="item" v-for="(item, index) in dataList" :key="index" @click="toDetail(item.id)" :class="[value.ornament.type]" :style="goodsItemCss">
 						<view class="img-wrap" :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }">
 							<image :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }" :src="$util.img(item.goods_image, { size: 'mid' })" mode="widthFix" @error="imageError(index)"/>
 						</view>
@@ -119,7 +119,7 @@
 
 				<template v-if="value.template == 'horizontal-slide'">
 					<scroll-view v-if="value.slideMode == 'scroll'" class="scroll" :scroll-x="true" :show-scrollbar="false">
-						<view class="item" v-for="(item, index) in dataList" :key="item.goods_id || index" @click="toDetail(item.id)" :class="[value.ornament.type]" :style="goodsItemCss">
+						<view class="item" v-for="(item, index) in dataList" :key="index" @click="toDetail(item.id)" :class="[value.ornament.type]" :style="goodsItemCss">
 							<view class="img-wrap" :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }">
 								<image :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }" :src="$util.img(item.goods_image, { size: 'mid' })" mode="widthFix" @error="imageError(index)"/>
 							</view>
@@ -147,7 +147,7 @@
 					</scroll-view>
 					<swiper v-if="value.slideMode == 'slide'" :autoplay="false" class="swiper" :style="{ height: swiperHeight }">
 						<swiper-item v-for="(pageItem, pageIndex) in page" :key="pageIndex" :class="['swiper-item', dataList[pageIndex] && [dataList[pageIndex].length / 3].length >= 1 && 'flex-between']">
-							<view class="item" v-for="(item, dataIndex) in dataList[pageIndex]" :key="item.goods_id || dataIndex" @click="toDetail(item.id)" :class="[value.ornament.type]" :style="goodsItemCss">
+							<view class="item" v-for="(item, dataIndex) in dataList[pageIndex]" :key="dataIndex" @click="toDetail(item.id)" :class="[value.ornament.type]" :style="goodsItemCss">
 								<view class="img-wrap" :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }">
 									<image :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }" :src="$util.img(item.goods_image, { size: 'mid' })" mode="widthFix" @error="imageError(dataIndex, pageIndex)"/>
 								</view>
diff --git a/components/diy-components/diy-store-label.vue b/components/diy-components/diy-store-label.vue
index 567e0f2..a9b8f47 100644
--- a/components/diy-components/diy-store-label.vue
+++ b/components/diy-components/diy-store-label.vue
@@ -3,7 +3,7 @@
 		<view class="diy-store-label">
 			<block v-if="businessConfig.store_business == 'store'">
 				<scroll-view scroll-x="true" :class="[value.contentStyle, { between: list.length == 3 }]" :style="storeLabelWrapCss" :enable-flex="true">
-					<view v-for="(item, index) in storeLabel" :key="item.label_id || index" :class="['item']">
+					<view v-for="(item, index) in storeLabel" :key="index" :class="['item']">
 						<diy-icon v-if="value.icon" class="icon-box" :icon="value.icon" :value="value.style ? value.style : 'null'"></diy-icon>
 						<text class="label-name" :style="{ color: value.textColor, fontSize: value.fontSize * 2 + 'rpx', fontWeight: value.fontWeight }">{{ item }}</text>
 					</view>
diff --git a/components/diy-components/diy-video.vue b/components/diy-components/diy-video.vue
index 985d1df..634044c 100644
--- a/components/diy-components/diy-video.vue
+++ b/components/diy-components/diy-video.vue
@@ -43,7 +43,7 @@
 	};
 </script>
 
-<style lang="scss" scoped>
+<style scoped>
 	video {
 		width: 100%;
 	}
diff --git a/components/goods-detail-view/goods-detail-view.vue b/components/goods-detail-view/goods-detail-view.vue
index 75b61b6..7590573 100644
--- a/components/goods-detail-view/goods-detail-view.vue
+++ b/components/goods-detail-view/goods-detail-view.vue
@@ -452,4 +452,4 @@
 <style lang="scss">
     @import '@/common/css/goods_detail.scss';
 </style>
-<style lang="scss" scoped></style>
\ No newline at end of file
+<style scoped></style>
\ No newline at end of file
diff --git a/components/mescroll/components/mescroll-down.vue b/components/mescroll/components/mescroll-down.vue
index 28e02be..ebb05ea 100644
--- a/components/mescroll/components/mescroll-down.vue
+++ b/components/mescroll/components/mescroll-down.vue
@@ -47,6 +47,6 @@ export default {
 };
 </script>
 
-<style lang="scss">
+<style>
 @import './mescroll-down.css';
 </style>
diff --git a/components/mescroll/components/mescroll-empty.vue b/components/mescroll/components/mescroll-empty.vue
index 55d187d..626a52c 100644
--- a/components/mescroll/components/mescroll-empty.vue
+++ b/components/mescroll/components/mescroll-empty.vue
@@ -46,7 +46,7 @@ export default {
 };
 </script>
 
-<style lang="scss">
+<style>
 /* 无任何数据的空布局 */
 .mescroll-empty {
 	box-sizing: border-box;
diff --git a/components/mescroll/components/mescroll-top.vue b/components/mescroll/components/mescroll-top.vue
index 681d543..70b9597 100644
--- a/components/mescroll/components/mescroll-top.vue
+++ b/components/mescroll/components/mescroll-top.vue
@@ -47,7 +47,7 @@ export default {
 };
 </script>
 
-<style lang="scss">
+<style>
 /* 回到顶部的按钮 */
 .mescroll-totop {
 	z-index: 99;
diff --git a/components/mescroll/components/mescroll-up.vue b/components/mescroll/components/mescroll-up.vue
index ff95fa1..73f78bf 100644
--- a/components/mescroll/components/mescroll-up.vue
+++ b/components/mescroll/components/mescroll-up.vue
@@ -34,6 +34,6 @@ export default {
 };
 </script>
 
-<style lang="scss">
+<style>
 @import './mescroll-up.css';
 </style>
diff --git a/components/mescroll/mescroll-body.vue b/components/mescroll/mescroll-body.vue
index 4f981ce..a570979 100644
--- a/components/mescroll/mescroll-body.vue
+++ b/components/mescroll/mescroll-body.vue
@@ -291,7 +291,7 @@ export default {
 };
 </script>
 
-<style lang="scss">
+<style>
 @import './mescroll-body.css';
 @import './components/mescroll-down.css';
 @import './components/mescroll-up.css';
diff --git a/components/mescroll/mescroll-uni.vue b/components/mescroll/mescroll-uni.vue
index 22a40b2..ccc425a 100644
--- a/components/mescroll/mescroll-uni.vue
+++ b/components/mescroll/mescroll-uni.vue
@@ -422,7 +422,7 @@
 	};
 </script>
 
-<style lang="scss">
+<style>
 	@import './mescroll-uni.css';
 	@import './components/mescroll-down.css';
 	@import './components/mescroll-up.css';
diff --git a/components/ns-birthday-gift/ns-birthday-gift.vue b/components/ns-birthday-gift/ns-birthday-gift.vue
index 3b595cf..e34abb7 100644
--- a/components/ns-birthday-gift/ns-birthday-gift.vue
+++ b/components/ns-birthday-gift/ns-birthday-gift.vue
@@ -164,7 +164,7 @@
 		}
 	};
 </script>
-<style lang="scss" scoped>
+<style scoped>
 	.register-box /deep/ .uni-scroll-view {
 		background: unset !important;
 	}
diff --git a/components/ns-goods-action/ns-goods-action.vue b/components/ns-goods-action/ns-goods-action.vue
index 51e3191..4e9e0f5 100644
--- a/components/ns-goods-action/ns-goods-action.vue
+++ b/components/ns-goods-action/ns-goods-action.vue
@@ -14,7 +14,7 @@ export default {
 };
 </script>
 
-<style lang="scss">
+<style>
 .ns-goods-action {
 	position: fixed;
 	right: 0;
diff --git a/components/ns-login/ns-login.vue b/components/ns-login/ns-login.vue
index 7fa49b2..3d431b6 100644
--- a/components/ns-login/ns-login.vue
+++ b/components/ns-login/ns-login.vue
@@ -768,7 +768,7 @@
 		}
 	}
 </style>
-<style lang="scss" scoped>
+<style scoped>
 	/deep/ .reward-popup .uni-popup__wrapper-box {
 		background: none !important;
 		max-width: unset !important;
diff --git a/components/ns-new-gift/ns-new-gift.vue b/components/ns-new-gift/ns-new-gift.vue
index fd740e9..a6553c9 100644
--- a/components/ns-new-gift/ns-new-gift.vue
+++ b/components/ns-new-gift/ns-new-gift.vue
@@ -171,7 +171,7 @@
 	};
 </script>
 
-<style lang="scss" scoped>
+<style scoped>
 	/deep/ .newgift-content uni-image {
 		width: 113rpx !important;
 		height: 24rpx !important;
diff --git a/components/ns-switch/ns-switch.vue b/components/ns-switch/ns-switch.vue
index ca330f4..1f87074 100644
--- a/components/ns-switch/ns-switch.vue
+++ b/components/ns-switch/ns-switch.vue
@@ -22,7 +22,7 @@ export default {
 	}
 };
 </script>
-<style lang="scss">
+<style>
 .weui-switch {
 	display: block;
 	position: relative;
diff --git a/components/pick-regions/pick-regions.vue b/components/pick-regions/pick-regions.vue
index e47d1fa..4260088 100644
--- a/components/pick-regions/pick-regions.vue
+++ b/components/pick-regions/pick-regions.vue
@@ -1,305 +1,305 @@
-<template>
-    <view class="pick-regions">
-        <!-- #ifndef MP-ALIPAY -->
-        <picker mode="multiSelector" :value="multiIndex" :range="multiArray" @change="handleValueChange" @columnchange="handleColumnChange">
-            <slot></slot>
-        </picker>
-        <!-- #endif -->
-
-        <!-- #ifdef MP-ALIPAY -->
-        <view @click="$refs.regionsRef.open()">
-            <slot></slot>
-        </view>
-
-        <uni-popup type="bottom" ref="regionsRef">
-            <view class="regions-picker-container">
-                <view class="picker-header">
-                    <view class="picker-action cancel" @click="$refs.regionsRef.close()">取消</view>
-                    <view class="picker-action confirm" @click="confirmRegions">完成</view>
-                </view>
-                <picker-view :value="multiIndex" @change="pickerViewColumnChange" class="picker-view">
-                    <picker-view-column v-if="multiArray[0]">
-                        <view class="item" v-for="(item,index) in multiArray[0]" :key="index">{{item}}</view>
-                    </picker-view-column>
-                    <picker-view-column v-if="multiArray[1]">
-                        <view class="item" v-for="(item,index) in multiArray[1]" :key="index">{{item}}</view>
-                    </picker-view-column>
-                    <picker-view-column v-if="multiArray[2]">
-                        <view class="item" v-for="(item,index) in multiArray[2]" :key="index">{{item}}</view>
-                    </picker-view-column>
-                </picker-view>
-            </view>
-        </uni-popup>
-        <!-- #endif -->
-    </view>
-</template>
-
-<script>
-    export default {
-        props: {
-            defaultRegions: {
-                type: Array
-            },
-            selectArr: {
-                type: String
-            }
-        },
-        data() {
-            return {
-                pickerValueArray: [],
-                cityArr: [],
-                districtArr: [],
-                multiIndex: [0, 0, 0],
-                isInitMultiArray: false,
-                // 是否加载完默认地区
-                isLoadDefaultAreas: false
-            };
-        },
-        watch: {
-            defaultRegions: {
-                handler(arr, oldArr = []) {
-                    // 避免传的是字面量的时候重复触发
-                    if (arr.length != this.selectArr || arr.join('') === oldArr.join('')) return;
-                    this.isInitMultiArray = false;
-                    this.handleDefaultRegions();
-                },
-                immediate: true
-            }
-        },
-        computed: {
-            multiArray() {
-                if (!this.isLoadDefaultAreas) return;
-                var arr = this.pickedArr.map(arr => arr.map(item => item.label));
-                return arr;
-            },
-            pickedArr() {
-                // 进行初始化
-                if (this.isInitMultiArray) {
-                    if (this.selectArr == '2') {
-                        return [this.pickerValueArray[0], this.pickerValueArray[1]];
-                    } else {
-                        return [this.pickerValueArray[0], this.pickerValueArray[1], this.pickerValueArray[2]];
-                    }
-                }
-
-                if (this.selectArr == '2') {
-                    return [this.pickerValueArray[0], this.cityArr];
-                } else {
-                    return [this.pickerValueArray[0], this.cityArr, this.districtArr];
-                }
-            }
-        },
-        created() {
-            this.getDefaultAreas(0, { level: 0 });
-        },
-        methods: {
-            async pickerViewColumnChange(e) {
-                var value = e.detail.value;
-                if (value[0] != this.multiIndex[0]) {
-                    await this.handleColumnChange({ detail: { column: 0, value: value[0] } })
-                    this.multiIndex[1] = e.detail.value[1] || 0;
-                    await this.handleColumnChange({ detail: { column: 1, value: value[1] } })
-                    this.multiIndex[2] = e.detail.value[2] || 0;
-                } else if (value[1] != this.multiIndex[1]) {
-                    await this.handleColumnChange({ detail: { column: 1, value: value[1] } })
-                    this.multiIndex[2] = e.detail.value[2] || 0;
-                } else {
-                    this.multiIndex = value
-                }
-            },
-            confirmRegions() {
-                this.handleValueChange({ detail: { value: this.multiIndex } })
-                this.$refs.regionsRef.close()
-            },
-            async handleColumnChange(e) {
-                this.isInitMultiArray = false;
-                let col = e.detail.column;
-                let row = e.detail.value;
-                this.multiIndex[col] = row;
-                switch (col) {
-                    case 0:
-                        //选择省，加载市、区县
-                        this.cityArr = await this.getAreasAsync(this.pickerValueArray[0][this.multiIndex[col]].value);
-                        this.districtArr = await this.getAreasAsync(this.cityArr[0].value);
-                        break;
-                    case 1:
-                        //选择市，加载区县
-                        this.districtArr = await this.getAreasAsync(this.cityArr[this.multiIndex[col]].value);
-                        break;
-                    case 2:
-                        if (!this.cityArr.length) this.cityArr = await this.getAreasAsync(this.pickerValueArray[0][0].value)
-                        if (!this.districtArr.length) this.districtArr = await this.getAreasAsync(this.cityArr[0].value);
-                        break;
-                }
-            },
-            handleValueChange(e) {
-                // 结构赋值
-                let [index0, index1, index2] = e.detail.value;
-                let [arr0, arr1, arr2] = this.pickedArr;
-                let address = '';
-                if (this.selectArr == '2') {
-                    address = [arr0[index0], arr1[index1]];
-                } else {
-                    address = [arr0[index0], arr1[index1], arr2[index2]];
-                }
-                this.$emit('getRegions', address);
-            },
-            handleDefaultRegions() {
-                var time = setInterval(() => {
-                    // if (!this.isLoadDefaultAreas) return;
-					// console.log('this.pickerValueArray',this.pickerValueArray)
-                    for (let i = 0; i < this.defaultRegions.length; i++) {
-						if(this.pickerValueArray[i] == null) continue;
-                        for (let j = 0; j < this.pickerValueArray[i].length; j++) {
-                            // 匹配省
-                            if ((this.defaultRegions[i] == this.pickerValueArray[i][j].value || this.defaultRegions[i] == this.pickerValueArray[i][j].label) && this.pickerValueArray[i][j].level == 1) {
-                                // 设置选中省
-                                this.$set(this.multiIndex, i, j);
-
-                                // 查询市
-                                this.getAreas(this.pickerValueArray[i][j].value, data => {
-                                    this.cityArr = data;
-                                    this.$set(this.pickerValueArray, 1, data)
-                                    for (let k = 0; k < this.cityArr.length; k++) {
-                                        if (this.defaultRegions[1] == this.cityArr[k].value || this.defaultRegions[1] == this.cityArr[k].label) {
-                                            // 设置选中市
-                                            this.$set(this.multiIndex, 1, k);
-
-                                            // 查询区县
-                                            this.getAreas(this.cityArr[k].value, data => {
-                                                this.districtArr = data;
-                                                this.$set(this.pickerValueArray, 2, data)
-                                                 
-                                                // 设置选中区县
-                                                for (let u = 0; u < this.districtArr
-                                                    .length; u++) {
-                                                    if (this.defaultRegions[2] == this.districtArr[u].value || this.defaultRegions[2] == this.districtArr[u].label) {
-                                                        this.$set(this.multiIndex, 2, u);
-                                                        this.handleValueChange({
-                                                            detail: {
-                                                                value: [j, k, u]
-                                                            }
-                                                        });
-                                                        break;
-                                                    }
-                                                }
-                                            });
-
-                                            break;
-                                        }
-                                    }
-                                });
-                            }
-                        }
-                    }
-                    if (this.isLoadDefaultAreas) clearInterval(time);
-                }, 100);
-            },
-            getDefaultAreas(pid, obj) {
-                this.$api.sendRequest({
-                    url: '/api/address/lists',
-                    data: { pid: pid },
-                    success: res => {
-                        if (res.code == 0) {
-                            var data = [];
-                            var selected = undefined;
-                            res.data.forEach((item, index) => {
-                                if (obj != undefined) {
-                                    if (obj.level == 0 && obj.province_id != undefined) {
-                                        selected = obj.province_id;
-                                    } else if (obj.level == 1 && obj.city_id != undefined) {
-                                        selected = obj.city_id;
-                                    } else if (obj.level == 2 && obj.district_id != undefined) {
-                                        selected = obj.district_id;
-                                    }
-                                }
-
-                                if (selected == undefined && index == 0) {
-                                    selected = item.id;
-                                }
-                                data.push({
-                                    value: item.id,
-                                    label: item.name,
-                                    level: item.level
-                                });
-                            });
-
-                            this.pickerValueArray[obj.level] = data;
-                            if (obj.level + 1 < 3) {
-                                obj.level++;
-                                this.getDefaultAreas(selected, obj);
-                            } else {
-                                this.isInitMultiArray = true;
-                                this.isLoadDefaultAreas = true;
-                                this.handleDefaultRegions()
-                            }
-                        }
-                    }
-                });
-            },
-            // 同步获取地区
-            async getAreasAsync(pid) {
-                let res = await this.$api.sendRequest({
-                    url: '/api/address/lists',
-                    data: { pid: pid },
-                    async: false
-                });
-                if (res.code == 0) {
-                    var data = [];
-                    res.data.forEach((item, index) => {
-                        data.push({
-                            value: item.id,
-                            label: item.name,
-                            level: item.level
-                        });
-                    });
-                    return data;
-                }
-            },
-            // 异步获取地区
-            getAreas(pid, callback) {
-                this.$api.sendRequest({
-                    url: '/api/address/lists',
-                    data: { pid: pid },
-                    success: res => {
-                        if (res.code == 0) {
-                            var data = [];
-                            res.data.forEach((item, index) => {
-                                data.push({
-                                    value: item.id,
-                                    label: item.name,
-                                    level: item.level
-                                });
-                            });
-                            if (callback) callback(data);
-                        }
-                    }
-                });
-            }
-        }
-    };
-</script>
-
-<style lang="scss" scoped>
-    .regions-picker-container {
-        padding-bottom: constant(safe-area-inset-bottom);
-        padding-bottom: env(safe-area-inset-bottom);
-
-        .picker-header {
-            display: flex;
-            height: 45px;
-            align-items: center;
-            border-bottom: 2rpx solid #f5f5f5;
-            justify-content: space-between;
-
-            .picker-action {
-                padding: 0 28rpx;
-                font-size: 34rpx;
-            }
-
-            .confirm {
-                color: #007aff;
-            }
-        }
-    }
+<template>
+    <view class="pick-regions">
+        <!-- #ifndef MP-ALIPAY -->
+        <picker mode="multiSelector" :value="multiIndex" :range="multiArray" @change="handleValueChange" @columnchange="handleColumnChange">
+            <slot></slot>
+        </picker>
+        <!-- #endif -->
+
+        <!-- #ifdef MP-ALIPAY -->
+        <view @click="$refs.regionsRef.open()">
+            <slot></slot>
+        </view>
+
+        <uni-popup type="bottom" ref="regionsRef">
+            <view class="regions-picker-container">
+                <view class="picker-header">
+                    <view class="picker-action cancel" @click="$refs.regionsRef.close()">取消</view>
+                    <view class="picker-action confirm" @click="confirmRegions">完成</view>
+                </view>
+                <picker-view :value="multiIndex" @change="pickerViewColumnChange" class="picker-view">
+                    <picker-view-column v-if="multiArray[0]">
+                        <view class="item" v-for="(item,index) in multiArray[0]" :key="index">{{item}}</view>
+                    </picker-view-column>
+                    <picker-view-column v-if="multiArray[1]">
+                        <view class="item" v-for="(item,index) in multiArray[1]" :key="index">{{item}}</view>
+                    </picker-view-column>
+                    <picker-view-column v-if="multiArray[2]">
+                        <view class="item" v-for="(item,index) in multiArray[2]" :key="index">{{item}}</view>
+                    </picker-view-column>
+                </picker-view>
+            </view>
+        </uni-popup>
+        <!-- #endif -->
+    </view>
+</template>
+
+<script>
+    export default {
+        props: {
+            defaultRegions: {
+                type: Array
+            },
+            selectArr: {
+                type: String
+            }
+        },
+        data() {
+            return {
+                pickerValueArray: [],
+                cityArr: [],
+                districtArr: [],
+                multiIndex: [0, 0, 0],
+                isInitMultiArray: false,
+                // 是否加载完默认地区
+                isLoadDefaultAreas: false
+            };
+        },
+        watch: {
+            defaultRegions: {
+                handler(arr, oldArr = []) {
+                    // 避免传的是字面量的时候重复触发
+                    if (arr.length != this.selectArr || arr.join('') === oldArr.join('')) return;
+                    this.isInitMultiArray = false;
+                    this.handleDefaultRegions();
+                },
+                immediate: true
+            }
+        },
+        computed: {
+            multiArray() {
+                if (!this.isLoadDefaultAreas) return;
+                var arr = this.pickedArr.map(arr => arr.map(item => item.label));
+                return arr;
+            },
+            pickedArr() {
+                // 进行初始化
+                if (this.isInitMultiArray) {
+                    if (this.selectArr == '2') {
+                        return [this.pickerValueArray[0], this.pickerValueArray[1]];
+                    } else {
+                        return [this.pickerValueArray[0], this.pickerValueArray[1], this.pickerValueArray[2]];
+                    }
+                }
+
+                if (this.selectArr == '2') {
+                    return [this.pickerValueArray[0], this.cityArr];
+                } else {
+                    return [this.pickerValueArray[0], this.cityArr, this.districtArr];
+                }
+            }
+        },
+        created() {
+            this.getDefaultAreas(0, { level: 0 });
+        },
+        methods: {
+            async pickerViewColumnChange(e) {
+                var value = e.detail.value;
+                if (value[0] != this.multiIndex[0]) {
+                    await this.handleColumnChange({ detail: { column: 0, value: value[0] } })
+                    this.multiIndex[1] = e.detail.value[1] || 0;
+                    await this.handleColumnChange({ detail: { column: 1, value: value[1] } })
+                    this.multiIndex[2] = e.detail.value[2] || 0;
+                } else if (value[1] != this.multiIndex[1]) {
+                    await this.handleColumnChange({ detail: { column: 1, value: value[1] } })
+                    this.multiIndex[2] = e.detail.value[2] || 0;
+                } else {
+                    this.multiIndex = value
+                }
+            },
+            confirmRegions() {
+                this.handleValueChange({ detail: { value: this.multiIndex } })
+                this.$refs.regionsRef.close()
+            },
+            async handleColumnChange(e) {
+                this.isInitMultiArray = false;
+                let col = e.detail.column;
+                let row = e.detail.value;
+                this.multiIndex[col] = row;
+                switch (col) {
+                    case 0:
+                        //选择省，加载市、区县
+                        this.cityArr = await this.getAreasAsync(this.pickerValueArray[0][this.multiIndex[col]].value);
+                        this.districtArr = await this.getAreasAsync(this.cityArr[0].value);
+                        break;
+                    case 1:
+                        //选择市，加载区县
+                        this.districtArr = await this.getAreasAsync(this.cityArr[this.multiIndex[col]].value);
+                        break;
+                    case 2:
+                        if (!this.cityArr.length) this.cityArr = await this.getAreasAsync(this.pickerValueArray[0][0].value)
+                        if (!this.districtArr.length) this.districtArr = await this.getAreasAsync(this.cityArr[0].value);
+                        break;
+                }
+            },
+            handleValueChange(e) {
+                // 结构赋值
+                let [index0, index1, index2] = e.detail.value;
+                let [arr0, arr1, arr2] = this.pickedArr;
+                let address = '';
+                if (this.selectArr == '2') {
+                    address = [arr0[index0], arr1[index1]];
+                } else {
+                    address = [arr0[index0], arr1[index1], arr2[index2]];
+                }
+                this.$emit('getRegions', address);
+            },
+            handleDefaultRegions() {
+                var time = setInterval(() => {
+                    // if (!this.isLoadDefaultAreas) return;
+					// console.log('this.pickerValueArray',this.pickerValueArray)
+                    for (let i = 0; i < this.defaultRegions.length; i++) {
+						if(this.pickerValueArray[i] == null) continue;
+                        for (let j = 0; j < this.pickerValueArray[i].length; j++) {
+                            // 匹配省
+                            if ((this.defaultRegions[i] == this.pickerValueArray[i][j].value || this.defaultRegions[i] == this.pickerValueArray[i][j].label) && this.pickerValueArray[i][j].level == 1) {
+                                // 设置选中省
+                                this.$set(this.multiIndex, i, j);
+
+                                // 查询市
+                                this.getAreas(this.pickerValueArray[i][j].value, data => {
+                                    this.cityArr = data;
+                                    this.$set(this.pickerValueArray, 1, data)
+                                    for (let k = 0; k < this.cityArr.length; k++) {
+                                        if (this.defaultRegions[1] == this.cityArr[k].value || this.defaultRegions[1] == this.cityArr[k].label) {
+                                            // 设置选中市
+                                            this.$set(this.multiIndex, 1, k);
+
+                                            // 查询区县
+                                            this.getAreas(this.cityArr[k].value, data => {
+                                                this.districtArr = data;
+                                                this.$set(this.pickerValueArray, 2, data)
+                                                 
+                                                // 设置选中区县
+                                                for (let u = 0; u < this.districtArr
+                                                    .length; u++) {
+                                                    if (this.defaultRegions[2] == this.districtArr[u].value || this.defaultRegions[2] == this.districtArr[u].label) {
+                                                        this.$set(this.multiIndex, 2, u);
+                                                        this.handleValueChange({
+                                                            detail: {
+                                                                value: [j, k, u]
+                                                            }
+                                                        });
+                                                        break;
+                                                    }
+                                                }
+                                            });
+
+                                            break;
+                                        }
+                                    }
+                                });
+                            }
+                        }
+                    }
+                    if (this.isLoadDefaultAreas) clearInterval(time);
+                }, 100);
+            },
+            getDefaultAreas(pid, obj) {
+                this.$api.sendRequest({
+                    url: '/api/address/lists',
+                    data: { pid: pid },
+                    success: res => {
+                        if (res.code == 0) {
+                            var data = [];
+                            var selected = undefined;
+                            res.data.forEach((item, index) => {
+                                if (obj != undefined) {
+                                    if (obj.level == 0 && obj.province_id != undefined) {
+                                        selected = obj.province_id;
+                                    } else if (obj.level == 1 && obj.city_id != undefined) {
+                                        selected = obj.city_id;
+                                    } else if (obj.level == 2 && obj.district_id != undefined) {
+                                        selected = obj.district_id;
+                                    }
+                                }
+
+                                if (selected == undefined && index == 0) {
+                                    selected = item.id;
+                                }
+                                data.push({
+                                    value: item.id,
+                                    label: item.name,
+                                    level: item.level
+                                });
+                            });
+
+                            this.pickerValueArray[obj.level] = data;
+                            if (obj.level + 1 < 3) {
+                                obj.level++;
+                                this.getDefaultAreas(selected, obj);
+                            } else {
+                                this.isInitMultiArray = true;
+                                this.isLoadDefaultAreas = true;
+                                this.handleDefaultRegions()
+                            }
+                        }
+                    }
+                });
+            },
+            // 同步获取地区
+            async getAreasAsync(pid) {
+                let res = await this.$api.sendRequest({
+                    url: '/api/address/lists',
+                    data: { pid: pid },
+                    async: false
+                });
+                if (res.code == 0) {
+                    var data = [];
+                    res.data.forEach((item, index) => {
+                        data.push({
+                            value: item.id,
+                            label: item.name,
+                            level: item.level
+                        });
+                    });
+                    return data;
+                }
+            },
+            // 异步获取地区
+            getAreas(pid, callback) {
+                this.$api.sendRequest({
+                    url: '/api/address/lists',
+                    data: { pid: pid },
+                    success: res => {
+                        if (res.code == 0) {
+                            var data = [];
+                            res.data.forEach((item, index) => {
+                                data.push({
+                                    value: item.id,
+                                    label: item.name,
+                                    level: item.level
+                                });
+                            });
+                            if (callback) callback(data);
+                        }
+                    }
+                });
+            }
+        }
+    };
+</script>
+
+<style lang="scss" scoped>
+    .regions-picker-container {
+        padding-bottom: constant(safe-area-inset-bottom);
+        padding-bottom: env(safe-area-inset-bottom);
+
+        .picker-header {
+            display: flex;
+            height: 45px;
+            align-items: center;
+            border-bottom: 2rpx solid #f5f5f5;
+            justify-content: space-between;
+
+            .picker-action {
+                padding: 0 28rpx;
+                font-size: 34rpx;
+            }
+
+            .confirm {
+                color: #007aff;
+            }
+        }
+    }
 </style>
\ No newline at end of file
diff --git a/components/register-reward/register-reward.vue b/components/register-reward/register-reward.vue
index 41fe8ea..b567b1f 100644
--- a/components/register-reward/register-reward.vue
+++ b/components/register-reward/register-reward.vue
@@ -150,7 +150,7 @@
 		}
 	};
 </script>
-<style lang="scss" scoped>
+<style scoped>
 	.register-box /deep/ .uni-scroll-view {
 		background: unset !important;
 	}
diff --git a/components/toTop/toTop.vue b/components/toTop/toTop.vue
index 58a9293..4d53471 100644
--- a/components/toTop/toTop.vue
+++ b/components/toTop/toTop.vue
@@ -24,7 +24,7 @@ export default {
 };
 </script>
 
-<style lang="scss">
+<style>
 /* 回到顶部的按钮 */
 .mescroll-totop {
 	z-index: 99;
diff --git a/components/uni-badge/uni-badge.vue b/components/uni-badge/uni-badge.vue
index 26958d4..b0a7521 100644
--- a/components/uni-badge/uni-badge.vue
+++ b/components/uni-badge/uni-badge.vue
@@ -39,7 +39,7 @@ export default {
 };
 </script>
 
-<style lang="scss">
+<style>
 .uni-badge {
 	font-family: 'Helvetica Neue', Helvetica, sans-serif;
 	box-sizing: border-box;
diff --git a/components/uni-drawer/uni-drawer.vue b/components/uni-drawer/uni-drawer.vue
index 42b586a..0595410 100644
--- a/components/uni-drawer/uni-drawer.vue
+++ b/components/uni-drawer/uni-drawer.vue
@@ -80,7 +80,7 @@ export default {
 };
 </script>
 
-<style lang="scss">
+<style>
 
 .uni-drawer {
 	display: block;
diff --git a/components/uni-grid-item/uni-grid-item.vue b/components/uni-grid-item/uni-grid-item.vue
index 57a5371..e7fb018 100644
--- a/components/uni-grid-item/uni-grid-item.vue
+++ b/components/uni-grid-item/uni-grid-item.vue
@@ -123,7 +123,7 @@ export default {
 };
 </script>
 
-<style lang="scss">
+<style>
 .uni-grid-item {
 	box-sizing: border-box;
 }
diff --git a/components/uni-grid/uni-grid.vue b/components/uni-grid/uni-grid.vue
index e8b8297..979e814 100644
--- a/components/uni-grid/uni-grid.vue
+++ b/components/uni-grid/uni-grid.vue
@@ -84,7 +84,7 @@ export default {
 };
 </script>
 
-<style lang="scss">
+<style>
 
 .uni-grid {
 	display: flex;
diff --git a/components/uni-popup/uni-popup-sku-new.vue b/components/uni-popup/uni-popup-sku-new.vue
index b1ddecb..cb9aad5 100644
--- a/components/uni-popup/uni-popup-sku-new.vue
+++ b/components/uni-popup/uni-popup-sku-new.vue
@@ -93,7 +93,7 @@ export default {
 	}
 };
 </script>
-<style lang="scss">
+<style>
 
 .uni-popup {
 	position: fixed;
diff --git a/components/uni-popup/uni-popup-sku.vue b/components/uni-popup/uni-popup-sku.vue
index 41f028e..9c80338 100644
--- a/components/uni-popup/uni-popup-sku.vue
+++ b/components/uni-popup/uni-popup-sku.vue
@@ -94,7 +94,7 @@ export default {
 	}
 };
 </script>
-<style lang="scss">
+<style>
 
 .uni-popup {
 	position: fixed;
diff --git a/components/uni-popup/uni-popup.vue b/components/uni-popup/uni-popup.vue
index 55bd159..f4fa592 100644
--- a/components/uni-popup/uni-popup.vue
+++ b/components/uni-popup/uni-popup.vue
@@ -105,7 +105,7 @@
         }
     };
 </script>
-<style lang="scss">
+<style>
     .uni-popup {
         position: fixed;
         top: 0;
diff --git a/components/uni-tag/uni-tag.vue b/components/uni-tag/uni-tag.vue
index ea30d2c..8702b41 100644
--- a/components/uni-tag/uni-tag.vue
+++ b/components/uni-tag/uni-tag.vue
@@ -67,7 +67,7 @@ export default {
 };
 </script>
 
-<style lang="scss">
+<style>
 
 .uni-tag {
 	box-sizing: border-box;
diff --git a/components/uv-count-to/uv-count-to.vue b/components/uv-count-to/uv-count-to.vue
index dca437f..c069ecf 100644
--- a/components/uv-count-to/uv-count-to.vue
+++ b/components/uv-count-to/uv-count-to.vue
@@ -210,7 +210,7 @@ export default {
 }
 </script>
 
-<style lang="scss" scoped>
+<style scoped>
 .uv-count-num {
   display: inline-flex;
   text-align: center;
diff --git a/components/wx-privacy-popup/privacy-popup.vue b/components/wx-privacy-popup/privacy-popup.vue
index 916e360..394fa8e 100644
--- a/components/wx-privacy-popup/privacy-popup.vue
+++ b/components/wx-privacy-popup/privacy-popup.vue
@@ -1,232 +1,232 @@
-<template>
-	<view v-if="showPop">
-		<view class="privacy-mask">
-			<view class="privacy-wrap">
-				<view class="privacy-title">用户隐私保护提示</view>
-				<view class="privacy-desc">
-					感谢您使用本小程序，在使用前您应当阅读并同意
-					<text class="privacy-link" @tap="openPrivacyContract">{{privacyContractName}}</text>，
-					当点击同意并继续时，即表示您已理解并同意该条款内容，该条款将对您产生法律约束力；如您不同意，将无法继续使用小程序相关功能。
-				</view>
-				<view class="privacy-button-flex">
-					<button class="privacy-button-btn bg-disagree" @tap="handleDisagree">不同意</button>
-					<button id="agree-btn" class="privacy-button-btn bg-agree" open-type="agreePrivacyAuthorization" @agreeprivacyauthorization="handleAgree">同意并继续</button>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				agree: false,
-				showPop: false,
-				privacyAuthorization: null,
-				privacyResolves: new Set(),
-				closeOtherPagePopUpHooks: new Set(),
-				privacyContractName: '用户隐私保护指引'
-			}
-		},
-		mounted() {
-			this.init()
-			this.curPageShow()
-		},
-		created() {
-			let that = this
-			//查询微信侧记录的用户是否有待同意的隐私政策信息
-			try {
-				wx.getPrivacySetting({
-					success(res) {
-						// console.log('隐私政策信息', res);
-						// console.log(res.privacyContractName);
-						that.privacyContractName = res.privacyContractName
-					}
-				});
-			} catch (e) {
-				// console.log("=========低版本基础库==========")
-			}
-		},
-		methods: {
-			// 监听何时需要提示用户阅读隐私政策
-			init() {
-				let that = this;
-				if (wx.onNeedPrivacyAuthorization) {
-					wx.onNeedPrivacyAuthorization((resolve) => {
-						if (typeof that.privacyAuthorization === 'function') {
-							that.privacyAuthorization(resolve)
-						}
-					})
-				}
-			},
-			proactive() {
-				let that = this
-				if (wx.getPrivacySetting) {
-					wx.getPrivacySetting({
-						success: (res) => {
-							// console.log(res)
-							if (res.needAuthorization) {
-								that.popUp()
-								// 额外逻辑：当前页面的隐私弹窗弹起的时候，关掉其他页面的隐私弹窗
-								this.closeOtherPagePopUp(this.disPopUp)
-							} else {
-								this.$emit('agree')
-							}
-						},
-					});
-				} else {
-					this.$emit('agree')
-				}
-			},
-			//初始化监听程序
-			curPageShow() {
-				this.privacyAuthorization = resolve => {
-					this.privacyResolves.add(resolve)
-					//打开弹窗
-					this.popUp()
-					// 额外逻辑：当前页面的隐私弹窗弹起的时候，关掉其他页面的隐私弹窗
-					this.closeOtherPagePopUp(this.disPopUp)
-				}
-				this.closeOtherPagePopUpHooks.add(this.disPopUp)
-			},
-			// 额外逻辑：当前页面的隐私弹窗弹起的时候，关掉其他页面的隐私弹窗
-			closeOtherPagePopUp(closePopUp) {
-				this.closeOtherPagePopUpHooks.forEach(hook => {
-					if (closePopUp !== hook) {
-						hook()
-					}
-				})
-			},
-			//打开隐私协议
-			openPrivacyContract() {
-				wx.openPrivacyContract({
-					success(res) {
-						// console.log('打开隐私协议', res);
-					},
-					fail(err) {
-						// console.error('打开隐私协议失败', err)
-					}
-				});
-			},
-			// 不同意
-			handleDisagree() {
-				this.privacyResolves.forEach(resolve => {
-					resolve({
-						event: 'disagree',
-					})
-				})
-				this.privacyResolves.clear()
-				//关闭弹窗
-				this.disPopUp()
-				//退出小程序
-				uni.showModal({
-					content: '未同意隐私协议，无法使用相关功能',
-					success: () => {
-						this.$emit('disagree')
-					}
-				})
-			},
-			// 同意并继续
-			handleAgree() {
-				this.privacyResolves.forEach(resolve => {
-					resolve({
-						event: 'agree',
-						buttonId: 'agree-btn'
-					})
-				})
-				this.privacyResolves.clear()
-				//关闭弹窗
-				this.disPopUp()
-				this.$emit('agree')
-			},
-			//打开弹窗
-			popUp() {
-				if (this.showPop === false) {
-					this.showPop = true
-				}
-			},
-			//关闭弹窗
-			disPopUp() {
-				if (this.showPop === true) {
-					this.showPop = false
-				}
-			},
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.privacy-mask {
-		position: fixed;
-		z-index: 5000;
-		top: 0;
-		right: 0;
-		left: 0;
-		bottom: 0;
-		background: rgba(0, 0, 0, 0.2);
-		display: flex;
-		align-items: center;
-		justify-content: center;
-	}
-
-	.privacy-wrap {
-		width: 632rpx;
-		padding: 48rpx 30rpx;
-		box-sizing: border-box;
-		background: #fff;
-		border-radius: 16rpx;
-	}
-
-	.privacy-title {
-		padding: 0rpx 30rpx 40rpx 30rpx;
-		font-weight: 700;
-		font-size: 36rpx;
-		text-align: center;
-	}
-
-	.privacy-desc {
-		font-size: 30rpx;
-		color: #555;
-		line-height: 2;
-		text-align: left;
-		padding: 0 40rpx;
-	}
-
-	.privacy-link {
-		color: #2f80ed;
-	}
-
-	.privacy-button-flex {
-		display: flex;
-		padding: 20rpx 40rpx;
-	}
-
-	.privacy-button-btn {
-		color: #FFF;
-		font-size: 30rpx;
-		font-weight: 500;
-		line-height: 100rpx;
-		text-align: center;
-		height: 100rpx;
-		border-radius: 20rpx;
-		border: none;
-		background: #07c160;
-		flex: 1;
-		margin-right: 30rpx;
-		justify-content: center;
-	}
-
-	.privacy-button-btn::after {
-		border: none;
-	}
-
-	.bg-disagree {
-		color: #07c160;
-		background: #f2f2f2;
-	}
-
-	.bg-agree {
-		margin-right: 0rpx;
-	}
+<template>
+	<view v-if="showPop">
+		<view class="privacy-mask">
+			<view class="privacy-wrap">
+				<view class="privacy-title">用户隐私保护提示</view>
+				<view class="privacy-desc">
+					感谢您使用本小程序，在使用前您应当阅读并同意
+					<text class="privacy-link" @tap="openPrivacyContract">{{privacyContractName}}</text>，
+					当点击同意并继续时，即表示您已理解并同意该条款内容，该条款将对您产生法律约束力；如您不同意，将无法继续使用小程序相关功能。
+				</view>
+				<view class="privacy-button-flex">
+					<button class="privacy-button-btn bg-disagree" @tap="handleDisagree">不同意</button>
+					<button id="agree-btn" class="privacy-button-btn bg-agree" open-type="agreePrivacyAuthorization" @agreeprivacyauthorization="handleAgree">同意并继续</button>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				agree: false,
+				showPop: false,
+				privacyAuthorization: null,
+				privacyResolves: new Set(),
+				closeOtherPagePopUpHooks: new Set(),
+				privacyContractName: '用户隐私保护指引'
+			}
+		},
+		mounted() {
+			this.init()
+			this.curPageShow()
+		},
+		created() {
+			let that = this
+			//查询微信侧记录的用户是否有待同意的隐私政策信息
+			try {
+				wx.getPrivacySetting({
+					success(res) {
+						// console.log('隐私政策信息', res);
+						// console.log(res.privacyContractName);
+						that.privacyContractName = res.privacyContractName
+					}
+				});
+			} catch (e) {
+				// console.log("=========低版本基础库==========")
+			}
+		},
+		methods: {
+			// 监听何时需要提示用户阅读隐私政策
+			init() {
+				let that = this;
+				if (wx.onNeedPrivacyAuthorization) {
+					wx.onNeedPrivacyAuthorization((resolve) => {
+						if (typeof that.privacyAuthorization === 'function') {
+							that.privacyAuthorization(resolve)
+						}
+					})
+				}
+			},
+			proactive() {
+				let that = this
+				if (wx.getPrivacySetting) {
+					wx.getPrivacySetting({
+						success: (res) => {
+							// console.log(res)
+							if (res.needAuthorization) {
+								that.popUp()
+								// 额外逻辑：当前页面的隐私弹窗弹起的时候，关掉其他页面的隐私弹窗
+								this.closeOtherPagePopUp(this.disPopUp)
+							} else {
+								this.$emit('agree')
+							}
+						},
+					});
+				} else {
+					this.$emit('agree')
+				}
+			},
+			//初始化监听程序
+			curPageShow() {
+				this.privacyAuthorization = resolve => {
+					this.privacyResolves.add(resolve)
+					//打开弹窗
+					this.popUp()
+					// 额外逻辑：当前页面的隐私弹窗弹起的时候，关掉其他页面的隐私弹窗
+					this.closeOtherPagePopUp(this.disPopUp)
+				}
+				this.closeOtherPagePopUpHooks.add(this.disPopUp)
+			},
+			// 额外逻辑：当前页面的隐私弹窗弹起的时候，关掉其他页面的隐私弹窗
+			closeOtherPagePopUp(closePopUp) {
+				this.closeOtherPagePopUpHooks.forEach(hook => {
+					if (closePopUp !== hook) {
+						hook()
+					}
+				})
+			},
+			//打开隐私协议
+			openPrivacyContract() {
+				wx.openPrivacyContract({
+					success(res) {
+						// console.log('打开隐私协议', res);
+					},
+					fail(err) {
+						// console.error('打开隐私协议失败', err)
+					}
+				});
+			},
+			// 不同意
+			handleDisagree() {
+				this.privacyResolves.forEach(resolve => {
+					resolve({
+						event: 'disagree',
+					})
+				})
+				this.privacyResolves.clear()
+				//关闭弹窗
+				this.disPopUp()
+				//退出小程序
+				uni.showModal({
+					content: '未同意隐私协议，无法使用相关功能',
+					success: () => {
+						this.$emit('disagree')
+					}
+				})
+			},
+			// 同意并继续
+			handleAgree() {
+				this.privacyResolves.forEach(resolve => {
+					resolve({
+						event: 'agree',
+						buttonId: 'agree-btn'
+					})
+				})
+				this.privacyResolves.clear()
+				//关闭弹窗
+				this.disPopUp()
+				this.$emit('agree')
+			},
+			//打开弹窗
+			popUp() {
+				if (this.showPop === false) {
+					this.showPop = true
+				}
+			},
+			//关闭弹窗
+			disPopUp() {
+				if (this.showPop === true) {
+					this.showPop = false
+				}
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.privacy-mask {
+		position: fixed;
+		z-index: 5000;
+		top: 0;
+		right: 0;
+		left: 0;
+		bottom: 0;
+		background: rgba(0, 0, 0, 0.2);
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.privacy-wrap {
+		width: 632rpx;
+		padding: 48rpx 30rpx;
+		box-sizing: border-box;
+		background: #fff;
+		border-radius: 16rpx;
+	}
+
+	.privacy-title {
+		padding: 0rpx 30rpx 40rpx 30rpx;
+		font-weight: 700;
+		font-size: 36rpx;
+		text-align: center;
+	}
+
+	.privacy-desc {
+		font-size: 30rpx;
+		color: #555;
+		line-height: 2;
+		text-align: left;
+		padding: 0 40rpx;
+	}
+
+	.privacy-link {
+		color: #2f80ed;
+	}
+
+	.privacy-button-flex {
+		display: flex;
+		padding: 20rpx 40rpx;
+	}
+
+	.privacy-button-btn {
+		color: #FFF;
+		font-size: 30rpx;
+		font-weight: 500;
+		line-height: 100rpx;
+		text-align: center;
+		height: 100rpx;
+		border-radius: 20rpx;
+		border: none;
+		background: #07c160;
+		flex: 1;
+		margin-right: 30rpx;
+		justify-content: center;
+	}
+
+	.privacy-button-btn::after {
+		border: none;
+	}
+
+	.bg-disagree {
+		color: #07c160;
+		background: #f2f2f2;
+	}
+
+	.bg-agree {
+		margin-right: 0rpx;
+	}
 </style>
\ No newline at end of file
diff --git a/pages/contact/contact.vue b/pages/contact/contact.vue
index 8686191..57c43e1 100644
--- a/pages/contact/contact.vue
+++ b/pages/contact/contact.vue
@@ -35,7 +35,7 @@
 					</view>
 					<!-- #endif -->
 
-					<view class="view_ul_100" v-for="(item, index) in dataList" :key="item.personnel_id || index" style="margin-bottom: 20rpx;">
+					<view class="view_ul_100" v-for="(item, index) in dataList" :key="index" style="margin-bottom: 20rpx;">
 
 						<view class="bl clearfix bor bg-white"
 							:style="{ backgroundImage: ' url(' + $util.img(personnel_bg) + ')', backgroundSize: '100% 100%' }">
diff --git a/pages/goods/detail.vue b/pages/goods/detail.vue
index 3161e6c..f970686 100644
--- a/pages/goods/detail.vue
+++ b/pages/goods/detail.vue
@@ -562,7 +562,7 @@ export default {
 }
 
 </style>
-<style lang="scss" scoped>
+<style scoped>
 /deep/ .action-icon-wrap .iconfont.icon-shouye1 {
 	font-size: 40rpx;
 }
diff --git a/pages/goods/list.vue b/pages/goods/list.vue
index 8e48c64..4ab611b 100644
--- a/pages/goods/list.vue
+++ b/pages/goods/list.vue
@@ -306,7 +306,7 @@
 <style lang="scss">
 	@import './public/css/list.scss';
 </style>
-<style lang="scss" scoped>
+<style scoped>
 	>>>.uni-tag--primary.uni-tag--inverted {
 		background-color: #f5f5f5 !important;
 	}
diff --git a/pages/index/index.vue b/pages/index/index.vue
index e992b2c..77df958 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -194,7 +194,7 @@
 	}
 
 </style>
-<style lang="scss" scoped>
+<style scoped>
 	.swiper /deep/ .uni-swiper-dots-horizontal {
 		left: 40%;
 		bottom:40px
diff --git a/pages/member/index.vue b/pages/member/index.vue
index 1e4fc28..9a1531c 100644
--- a/pages/member/index.vue
+++ b/pages/member/index.vue
@@ -93,7 +93,7 @@
 	}
 </style>
 
-<style lang="scss" scoped>
+<style scoped>
 	.wap-floating>>>.uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
 		background: none !important;
 	}
diff --git a/pages/order/detail.vue b/pages/order/detail.vue
index a81d41e..ec9f273 100644
--- a/pages/order/detail.vue
+++ b/pages/order/detail.vue
@@ -814,7 +814,7 @@
 <style lang="scss">
 	@import './public/css/detail.scss';
 </style>
-<style lang="scss" scoped>
+<style scoped>
 	.pickup-code-info .code img:nth-child(1) {
 		margin-bottom: 30rpx;
 	}
diff --git a/pages/order/detail_point.vue b/pages/order/detail_point.vue
index 0091a6c..75b21f1 100644
--- a/pages/order/detail_point.vue
+++ b/pages/order/detail_point.vue
@@ -297,7 +297,7 @@
 <style lang="scss">
 	@import './public/css/detail.scss';
 </style>
-<style lang="scss" scoped>
+<style scoped>
 	/deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
 		max-height: unset !important;
 	}
diff --git a/pages/order/list.vue b/pages/order/list.vue
index d63f6a2..db0ca2f 100644
--- a/pages/order/list.vue
+++ b/pages/order/list.vue
@@ -442,7 +442,7 @@
 <style lang="scss">
 	@import './public/css/list.scss';
 </style>
-<style lang="scss" scoped>
+<style scoped>
 	/deep/ .uni-page {
 		overflow: hidden;
 	}
diff --git a/pages_promotion/components/l-time/l-time.vue b/pages_promotion/components/l-time/l-time.vue
index cff8d8a..a2e78fc 100644
--- a/pages_promotion/components/l-time/l-time.vue
+++ b/pages_promotion/components/l-time/l-time.vue
@@ -53,4 +53,4 @@ export default {
 };
 </script>
 
-<style lang="scss"></style>
+<style></style>
diff --git a/pages_promotion/components/yuyue-date/yuyue-date.vue b/pages_promotion/components/yuyue-date/yuyue-date.vue
index 7bc855e..a43125e 100644
--- a/pages_promotion/components/yuyue-date/yuyue-date.vue
+++ b/pages_promotion/components/yuyue-date/yuyue-date.vue
@@ -1,414 +1,414 @@
-<template>
-	<view>
-		<!-- <uni-popup ref="timePopup" type="bottom"> -->
-		<view class="content">
-			<!-- <view class="head">
-					<text class="title">选择时间</text>
-					<text class="iconfont iconclose" @click="close()"></text>
-				</view> -->
-			<view class="container">
-				<view class="date-list-wrap">
-					<!-- 日期列表 -->
-					<scroll-view scroll-x>
-						<block v-for="(item, index) in dateArr" :key="index">
-							<div class="flex-box" @click="selectDateEvent(index, item)">
-								<view class="date-box" :style="{ color: index == dateActive ? selectedTabColor : '#909399' }">
-									<text>{{ item.week }} {{ item.date }}</text>
-								</view>
-							</div>
-						</block>
-					</scroll-view>
-					<div class="appointed-day">
-						<uni-datetime-picker type="date" :start="pickerStartDay" :end="pickerEndDay" @change="change">
-							<text class="day-box">指定日期</text>
-							<text class="iconfont iconyoujiantou"></text>
-						</uni-datetime-picker>
-					</div>
-				</view>
-
-				<!-- 时间选项 -->
-				<view class="time-box" v-if="!isSection">
-					<block v-for="(item, _index) in timeArr" :key="_index">
-						<view class="item">
-							<view class="item-box diy" :class="{ disable: item.disable, active: isMultiple ? item.isActive : _index == timeActive }" @click="selectTimeEvent(_index, item)">
-								<!-- :style="{ color: isMultiple ? (item.isActive ? selectedItemColor : '#333') : _index == timeActive ? selectedItemColor : '#333' }" -->
-								<text>{{ item.time }}</text>
-								<!-- <text class="all">{{ item.disable ? disableText : undisableText }}</text> -->
-							</view>
-						</view>
-					</block>
-				</view>
-
-				<!-- 预约时间段 -->
-				<view class="time-box" v-else>
-					<block v-for="(item, _index) in timeArr" :key="_index">
-						<view class="item">
-							<view class="item-box" :class="{ disable: item.disable || item.isInclude, active: item.time == timeQuanBegin || item.time == timeQuanEnd }" @click="handleSelectQuantum(_index, item)">
-								<!-- :style="{ color: item.time == timeQuanBegin || item.time == timeQuanEnd ? selectedItemColor : '#333' }" -->
-								<text>{{ item.time }}</text>
-								<text class="all">{{ item.disable ? disableText : undisableText }}</text>
-							</view>
-						</view>
-					</block>
-				</view>
-			</view>
-			<!-- <view class="bottom">
-					<view class="show-time" v-if="!isMultiple && !isSection">
-						<text>预约时间：</text>
-						<text class="color-base-text">{{ orderDateTime }}</text>
-					</view>
-					<button form-type="submit" type="primary" size="mini" class="submit-btn" @click="handleSubmit">确认预约</button>
-				</view> -->
-		</view>
-		<!-- <view class="yuyue-date-desc">如不想线上预约，可致电商家电话预约</view> -->
-		<!-- </uni-popup> -->
-	</view>
-</template>
-
-<script>
-	// 插件地址：https://ext.dcloud.net.cn/plugin?id=3593
-	import {
-		initData,
-		initTime,
-		timeStamp,
-		currentTime,
-		strFormat,
-		weekDate
-	} from './yuyue-date.js';
-	export default {
-		name: 'times',
-		model: {
-			prop: 'showPop',
-			event: 'change'
-		},
-		props: {
-			isMultiple: {
-				//是否多选
-				type: Boolean,
-				default: false
-			},
-			isSection: {
-				//预约时间段
-				type: Boolean,
-				default: false
-			},
-			advanceTime: {
-				//提前预约时间
-				type: [String, Number],
-				default: "0"
-			},
-			disableText: {
-				//禁用显示的文本
-				type: String,
-				default: '已约满'
-			},
-			undisableText: {
-				//未禁用显示的文本
-				type: String,
-				default: '可预约'
-			},
-			timeInterval: {
-				// 时间间隔，小时为单位
-				type: String,
-				default: "1"
-			},
-			selectedTabColor: {
-				// 日期栏选中的颜色
-				type: String,
-				default: '#303133'
-			},
-			selectedItemColor: {
-				// 时间选中的颜色
-				type: String,
-				default: '#D50AEF'
-			},
-			beginTime: {
-				type: String,
-				default: '09:00'
-			},
-			endTime: {
-				type: String,
-				default: '19:00'
-			},
-			appointTime: {
-				// 预约的时间
-				type: Array,
-				default () {
-					return [];
-				}
-			},
-			disableTimeSlot: {
-				// 预约开始和结束时间，来禁用时间段
-				type: Object,
-				default () {
-					return {};
-				}
-			},
-			disableWeek: {
-				// 限制周几不可以预约
-				type: Array,
-				default () {
-					return [];
-				}
-			}
-		},
-		watch: {
-			appointTime: {
-				handler(val) {
-					if (val && val.length) {
-						this.initOnload();
-					}
-				}
-			},
-			beginTime: function(nVal, oVal) {
-				this.initOnload();
-				this.handleSubmit();
-			},
-			endTime: function(nVal, oVal) {
-				this.initOnload();
-				this.handleSubmit();
-			},
-		},
-		data() {
-			return {
-				pickerStartDay: '', // 指定开始日期
-				pickerEndDay: '', // 指定结束日期
-				orderDateTime: '暂无选择', // 选中时间
-				orderTimeArr: {}, //多选的时间
-				dateArr: [], //日期数据
-				timeArr: [], //时间数据
-				nowDate: '', // 当前日期
-				dateActive: 0, //选中的日期索引
-				timeActive: 0, //选中的时间索引
-				timeQuanBeginIndex: 0, //时间段开始的下标
-				selectDate: '', //选择的日期
-				selectTime: '', //选择的时间
-				timeQuanBegin: '', //时间段开始时间
-				timeQuanEnd: '' //时间段结束时间
-			};
-		},
-		created(props) {
-			this.selectDate = this.nowDate = currentTime().date;
-			this.pickerStartDay = currentTime().year + '-' + currentTime().date;
-			const now = new Date(this.pickerStartDay).getTime(); //获取当前日期的时间戳
-			let timeStr = 3600 * 24 * 1000; //一天的时间戳
-			let day = 90; // 未来3个月
-			this.pickerEndDay = timeStamp(now + timeStr * day).allDate;
-			this.initOnload();
-			this.dateArr = initData(); // 日期栏初始化
-		},
-		methods: {
-			open() {
-				this.$refs.timePopup.open();
-			},
-			close() {
-				this.$refs.timePopup.close();
-			},
-			// 指定时间
-			change(e) {
-				let date = e.split("-");
-				date = date[1] + "-" + date[2];
-				if (this.disableWeek.length && date >= weekDate()[0] && date <= weekDate()[1]) {
-					let weekBox = ['周日', '周一', '周二', '周三', '周四', '周五', '周六'];
-					let index = new Date(e).getDay();
-					if (this.disableWeek.indexOf(weekBox[index]) != -1) {
-						uni.showToast({
-							title: weekBox[index] + '不可以预约',
-							icon: 'none'
-						})
-						return false;
-					}
-				}
-				this.initOnload(e);
-				this.dateArr = initData(e); // 日期栏初始化
-				this.selectDateEvent(0, this.dateArr[0]);
-			},
-			initOnload(appointedDay) {
-				this.timeArr = initTime(this.beginTime, this.endTime, parseFloat(this.timeInterval)); //时间选项初始化
-				this.timeQuanBegin = this.timeQuanEnd = '';
-				let isFullTime = true;
-				this.timeArr.forEach((item, index) => {
-					// 判断默认是不能选择的周，则都禁止选中
-					if (this.disableWeek.length && this.selectDate >= weekDate()[0] && this.selectDate <=
-						weekDate()[1]) {
-						let weekBox = ['周日', '周一', '周二', '周三', '周四', '周五', '周六'];
-						let date = currentTime().year + '-' + this.selectDate;
-						let index = new Date(date).getDay();
-						if (this.disableWeek.indexOf(weekBox[index]) != -1) {
-							item.disable = true;
-						}
-					}
-
-					//判断是当前这一天，选中时间小于当前时间则禁用
-					if (this.selectDate == this.nowDate && currentTime().time > item.time) {
-						item.disable = true;
-					}
-
-					// 将提前预约的时间禁用 advanceTime
-					var advTime = new Date(new Date().setMinutes(new Date().getMinutes() + parseInt(this.advanceTime) * 60));
-					var advTimeStr = strFormat(advTime.getHours()) + ":" + strFormat(advTime.getMinutes()) + ":" + strFormat(advTime.getSeconds());
-					var advTimeStr1 = strFormat(advTime.getMonth() + 1) + "-" + strFormat(advTime.getDate());
-					if (this.selectDate == advTimeStr1 && advTimeStr > item.time || advTimeStr1 > this.selectDate) {
-						item.disable = true;
-					}
-
-					// 将预约的时间禁用
-					this.appointTime.forEach(t => {
-						let [date, time] = t.split(' ');
-						time = time.slice(0, -3);
-
-						if (date == currentTime().year + '-' + this.selectDate && item.time == time ||
-							date == currentTime().year + '-' + advTimeStr1 && item.time == time) {
-							item.disable = true;
-						}
-					});
-
-					// 禁用时间段
-					const cur_time = `${this.selectDate} ${item.time}`;
-					const {
-						begin_time,
-						end_time
-					} = this.disableTimeSlot;
-					if (begin_time && end_time && (begin_time <= cur_time && cur_time <= end_time)) {
-						item.disable = true;
-					}
-
-					// 判断是否当前日期时间都被预约
-					if (!item.disable) {
-						isFullTime = false;
-					}
-					this.isSection && (item.isInclude = false);
-				});
-
-				this.orderDateTime = isFullTime ? '暂无选择' : this.selectDate;
-				this.timeActive = -1;
-				for (let i = 0, len = this.timeArr.length; i < len; i++) {
-					if (!this.timeArr[i].disable) {
-						this.orderDateTime = {
-							data: `${this.selectDate}`,
-							time: `${this.timeArr[i].time}`
-						};
-						this.timeActive = i;
-						return;
-					}
-				}
-			},
-
-			// 日期选择事件
-			selectDateEvent(index, item) {
-				if (this.disableWeek.length && item.date >= weekDate()[0] && item.date <= weekDate()[1]) {
-					let weekBox = ['周日', '周一', '周二', '周三', '周四', '周五', '周六'];
-					let index = new Date(item.timeStamp).getDay();
-					if (this.disableWeek.indexOf(weekBox[index]) != -1) {
-						uni.showToast({
-							title: weekBox[index] + '不可以预约',
-							icon: 'none'
-						})
-						return false;
-					}
-				}
-
-				this.dateActive = index;
-				this.selectDate = item.date;
-				this.initOnload();
-				this.handleSubmit();
-			},
-
-			// 时间选择事件
-			selectTimeEvent(index, item) {
-				if (item.disable) return;
-				if (this.isMultiple) {
-					item.isActive = !item.isActive;
-					this.timeArr = this.timeArr.slice();
-					this.orderTimeArr[this.selectDate] = this.timeArr.reduce((prev, cur) => {
-						cur.isActive && prev.push(cur.time);
-						return prev;
-					}, []);
-				} else {
-					this.timeActive = index;
-					this.selectTime = item.time;
-					this.orderDateTime = {
-						data: `${this.selectDate}`,
-						time: `${item.time}`
-					};
-				}
-				this.handleSubmit();
-			},
-
-			// 选择时间段
-			handleSelectQuantum(index, item) {
-				if (item.disable) return;
-
-				function clearTime() {
-					this.timeQuanBeginIndex = index;
-					this.timeQuanBegin = item.time;
-					this.timeQuanEnd = '';
-				}
-
-				if (!this.timeQuanBegin) {
-					clearTime.call(this);
-					return;
-				}
-				if (!this.timeQuanEnd && this.timeQuanBegin) {
-					let isDisble = false;
-					let start = this.timeQuanBeginIndex;
-					let end = index;
-					start > end && ([start, end] = [end, start]);
-					for (let i = start + 1; i < end; i++) {
-						if (this.timeArr[i].disable) {
-							isDisble = true;
-							clearTime.call(this);
-							return;
-						}
-					}
-					if (!isDisble) {
-						for (let i = start + 1; i < end; i++) {
-							this.timeArr[i].isInclude = true;
-						}
-					}
-					this.timeQuanEnd = item.time;
-					return;
-				}
-
-				if (this.timeQuanBegin && this.timeQuanEnd) {
-					this.timeArr.forEach(t => {
-						t.isInclude = false;
-					});
-					clearTime.call(this);
-				}
-			},
-			handleChange() {
-				this.timeQuanBegin > this.timeQuanEnd && ([this.timeQuanBegin, this.timeQuanEnd] = [this.timeQuanEnd, this.timeQuanBegin]);
-			},
-			handleSubmit() {
-				if (this.isSection) {
-					this.handleChange();
-					this.$emit('change', {
-						beginTime: `${this.selectDate} ${this.timeQuanBegin}`,
-						endTime: `${this.selectDate} ${this.timeQuanEnd}`
-					});
-					return;
-				}
-
-				if (this.isMultiple) {
-					let time = [];
-					for (let date in this.orderTimeArr) {
-						this.orderTimeArr[date].forEach(item => {
-							time.push(`${date} ${item}`);
-						});
-					}
-					this.$emit('change', time);
-				} else {
-					// this.$emit('change', currentTime().year + '-' + this.orderDateTime);
-					this.$emit('change', {
-						date: currentTime().year + '-' + this.orderDateTime.data,
-						time: this.orderDateTime.time
-					});
-				}
-			}
-		}
-	};
-</script>
-<style lang="scss" scoped>
-	@import './yuyue-date.scss';
+<template>
+	<view>
+		<!-- <uni-popup ref="timePopup" type="bottom"> -->
+		<view class="content">
+			<!-- <view class="head">
+					<text class="title">选择时间</text>
+					<text class="iconfont iconclose" @click="close()"></text>
+				</view> -->
+			<view class="container">
+				<view class="date-list-wrap">
+					<!-- 日期列表 -->
+					<scroll-view scroll-x>
+						<block v-for="(item, index) in dateArr" :key="index">
+							<div class="flex-box" @click="selectDateEvent(index, item)">
+								<view class="date-box" :style="{ color: index == dateActive ? selectedTabColor : '#909399' }">
+									<text>{{ item.week }} {{ item.date }}</text>
+								</view>
+							</div>
+						</block>
+					</scroll-view>
+					<div class="appointed-day">
+						<uni-datetime-picker type="date" :start="pickerStartDay" :end="pickerEndDay" @change="change">
+							<text class="day-box">指定日期</text>
+							<text class="iconfont iconyoujiantou"></text>
+						</uni-datetime-picker>
+					</div>
+				</view>
+
+				<!-- 时间选项 -->
+				<view class="time-box" v-if="!isSection">
+					<block v-for="(item, _index) in timeArr" :key="_index">
+						<view class="item">
+							<view class="item-box diy" :class="{ disable: item.disable, active: isMultiple ? item.isActive : _index == timeActive }" @click="selectTimeEvent(_index, item)">
+								<!-- :style="{ color: isMultiple ? (item.isActive ? selectedItemColor : '#333') : _index == timeActive ? selectedItemColor : '#333' }" -->
+								<text>{{ item.time }}</text>
+								<!-- <text class="all">{{ item.disable ? disableText : undisableText }}</text> -->
+							</view>
+						</view>
+					</block>
+				</view>
+
+				<!-- 预约时间段 -->
+				<view class="time-box" v-else>
+					<block v-for="(item, _index) in timeArr" :key="_index">
+						<view class="item">
+							<view class="item-box" :class="{ disable: item.disable || item.isInclude, active: item.time == timeQuanBegin || item.time == timeQuanEnd }" @click="handleSelectQuantum(_index, item)">
+								<!-- :style="{ color: item.time == timeQuanBegin || item.time == timeQuanEnd ? selectedItemColor : '#333' }" -->
+								<text>{{ item.time }}</text>
+								<text class="all">{{ item.disable ? disableText : undisableText }}</text>
+							</view>
+						</view>
+					</block>
+				</view>
+			</view>
+			<!-- <view class="bottom">
+					<view class="show-time" v-if="!isMultiple && !isSection">
+						<text>预约时间：</text>
+						<text class="color-base-text">{{ orderDateTime }}</text>
+					</view>
+					<button form-type="submit" type="primary" size="mini" class="submit-btn" @click="handleSubmit">确认预约</button>
+				</view> -->
+		</view>
+		<!-- <view class="yuyue-date-desc">如不想线上预约，可致电商家电话预约</view> -->
+		<!-- </uni-popup> -->
+	</view>
+</template>
+
+<script>
+	// 插件地址：https://ext.dcloud.net.cn/plugin?id=3593
+	import {
+		initData,
+		initTime,
+		timeStamp,
+		currentTime,
+		strFormat,
+		weekDate
+	} from './yuyue-date.js';
+	export default {
+		name: 'times',
+		model: {
+			prop: 'showPop',
+			event: 'change'
+		},
+		props: {
+			isMultiple: {
+				//是否多选
+				type: Boolean,
+				default: false
+			},
+			isSection: {
+				//预约时间段
+				type: Boolean,
+				default: false
+			},
+			advanceTime: {
+				//提前预约时间
+				type: [String, Number],
+				default: "0"
+			},
+			disableText: {
+				//禁用显示的文本
+				type: String,
+				default: '已约满'
+			},
+			undisableText: {
+				//未禁用显示的文本
+				type: String,
+				default: '可预约'
+			},
+			timeInterval: {
+				// 时间间隔，小时为单位
+				type: String,
+				default: "1"
+			},
+			selectedTabColor: {
+				// 日期栏选中的颜色
+				type: String,
+				default: '#303133'
+			},
+			selectedItemColor: {
+				// 时间选中的颜色
+				type: String,
+				default: '#D50AEF'
+			},
+			beginTime: {
+				type: String,
+				default: '09:00'
+			},
+			endTime: {
+				type: String,
+				default: '19:00'
+			},
+			appointTime: {
+				// 预约的时间
+				type: Array,
+				default () {
+					return [];
+				}
+			},
+			disableTimeSlot: {
+				// 预约开始和结束时间，来禁用时间段
+				type: Object,
+				default () {
+					return {};
+				}
+			},
+			disableWeek: {
+				// 限制周几不可以预约
+				type: Array,
+				default () {
+					return [];
+				}
+			}
+		},
+		watch: {
+			appointTime: {
+				handler(val) {
+					if (val && val.length) {
+						this.initOnload();
+					}
+				}
+			},
+			beginTime: function(nVal, oVal) {
+				this.initOnload();
+				this.handleSubmit();
+			},
+			endTime: function(nVal, oVal) {
+				this.initOnload();
+				this.handleSubmit();
+			},
+		},
+		data() {
+			return {
+				pickerStartDay: '', // 指定开始日期
+				pickerEndDay: '', // 指定结束日期
+				orderDateTime: '暂无选择', // 选中时间
+				orderTimeArr: {}, //多选的时间
+				dateArr: [], //日期数据
+				timeArr: [], //时间数据
+				nowDate: '', // 当前日期
+				dateActive: 0, //选中的日期索引
+				timeActive: 0, //选中的时间索引
+				timeQuanBeginIndex: 0, //时间段开始的下标
+				selectDate: '', //选择的日期
+				selectTime: '', //选择的时间
+				timeQuanBegin: '', //时间段开始时间
+				timeQuanEnd: '' //时间段结束时间
+			};
+		},
+		created(props) {
+			this.selectDate = this.nowDate = currentTime().date;
+			this.pickerStartDay = currentTime().year + '-' + currentTime().date;
+			const now = new Date(this.pickerStartDay).getTime(); //获取当前日期的时间戳
+			let timeStr = 3600 * 24 * 1000; //一天的时间戳
+			let day = 90; // 未来3个月
+			this.pickerEndDay = timeStamp(now + timeStr * day).allDate;
+			this.initOnload();
+			this.dateArr = initData(); // 日期栏初始化
+		},
+		methods: {
+			open() {
+				this.$refs.timePopup.open();
+			},
+			close() {
+				this.$refs.timePopup.close();
+			},
+			// 指定时间
+			change(e) {
+				let date = e.split("-");
+				date = date[1] + "-" + date[2];
+				if (this.disableWeek.length && date >= weekDate()[0] && date <= weekDate()[1]) {
+					let weekBox = ['周日', '周一', '周二', '周三', '周四', '周五', '周六'];
+					let index = new Date(e).getDay();
+					if (this.disableWeek.indexOf(weekBox[index]) != -1) {
+						uni.showToast({
+							title: weekBox[index] + '不可以预约',
+							icon: 'none'
+						})
+						return false;
+					}
+				}
+				this.initOnload(e);
+				this.dateArr = initData(e); // 日期栏初始化
+				this.selectDateEvent(0, this.dateArr[0]);
+			},
+			initOnload(appointedDay) {
+				this.timeArr = initTime(this.beginTime, this.endTime, parseFloat(this.timeInterval)); //时间选项初始化
+				this.timeQuanBegin = this.timeQuanEnd = '';
+				let isFullTime = true;
+				this.timeArr.forEach((item, index) => {
+					// 判断默认是不能选择的周，则都禁止选中
+					if (this.disableWeek.length && this.selectDate >= weekDate()[0] && this.selectDate <=
+						weekDate()[1]) {
+						let weekBox = ['周日', '周一', '周二', '周三', '周四', '周五', '周六'];
+						let date = currentTime().year + '-' + this.selectDate;
+						let index = new Date(date).getDay();
+						if (this.disableWeek.indexOf(weekBox[index]) != -1) {
+							item.disable = true;
+						}
+					}
+
+					//判断是当前这一天，选中时间小于当前时间则禁用
+					if (this.selectDate == this.nowDate && currentTime().time > item.time) {
+						item.disable = true;
+					}
+
+					// 将提前预约的时间禁用 advanceTime
+					var advTime = new Date(new Date().setMinutes(new Date().getMinutes() + parseInt(this.advanceTime) * 60));
+					var advTimeStr = strFormat(advTime.getHours()) + ":" + strFormat(advTime.getMinutes()) + ":" + strFormat(advTime.getSeconds());
+					var advTimeStr1 = strFormat(advTime.getMonth() + 1) + "-" + strFormat(advTime.getDate());
+					if (this.selectDate == advTimeStr1 && advTimeStr > item.time || advTimeStr1 > this.selectDate) {
+						item.disable = true;
+					}
+
+					// 将预约的时间禁用
+					this.appointTime.forEach(t => {
+						let [date, time] = t.split(' ');
+						time = time.slice(0, -3);
+
+						if (date == currentTime().year + '-' + this.selectDate && item.time == time ||
+							date == currentTime().year + '-' + advTimeStr1 && item.time == time) {
+							item.disable = true;
+						}
+					});
+
+					// 禁用时间段
+					const cur_time = `${this.selectDate} ${item.time}`;
+					const {
+						begin_time,
+						end_time
+					} = this.disableTimeSlot;
+					if (begin_time && end_time && (begin_time <= cur_time && cur_time <= end_time)) {
+						item.disable = true;
+					}
+
+					// 判断是否当前日期时间都被预约
+					if (!item.disable) {
+						isFullTime = false;
+					}
+					this.isSection && (item.isInclude = false);
+				});
+
+				this.orderDateTime = isFullTime ? '暂无选择' : this.selectDate;
+				this.timeActive = -1;
+				for (let i = 0, len = this.timeArr.length; i < len; i++) {
+					if (!this.timeArr[i].disable) {
+						this.orderDateTime = {
+							data: `${this.selectDate}`,
+							time: `${this.timeArr[i].time}`
+						};
+						this.timeActive = i;
+						return;
+					}
+				}
+			},
+
+			// 日期选择事件
+			selectDateEvent(index, item) {
+				if (this.disableWeek.length && item.date >= weekDate()[0] && item.date <= weekDate()[1]) {
+					let weekBox = ['周日', '周一', '周二', '周三', '周四', '周五', '周六'];
+					let index = new Date(item.timeStamp).getDay();
+					if (this.disableWeek.indexOf(weekBox[index]) != -1) {
+						uni.showToast({
+							title: weekBox[index] + '不可以预约',
+							icon: 'none'
+						})
+						return false;
+					}
+				}
+
+				this.dateActive = index;
+				this.selectDate = item.date;
+				this.initOnload();
+				this.handleSubmit();
+			},
+
+			// 时间选择事件
+			selectTimeEvent(index, item) {
+				if (item.disable) return;
+				if (this.isMultiple) {
+					item.isActive = !item.isActive;
+					this.timeArr = this.timeArr.slice();
+					this.orderTimeArr[this.selectDate] = this.timeArr.reduce((prev, cur) => {
+						cur.isActive && prev.push(cur.time);
+						return prev;
+					}, []);
+				} else {
+					this.timeActive = index;
+					this.selectTime = item.time;
+					this.orderDateTime = {
+						data: `${this.selectDate}`,
+						time: `${item.time}`
+					};
+				}
+				this.handleSubmit();
+			},
+
+			// 选择时间段
+			handleSelectQuantum(index, item) {
+				if (item.disable) return;
+
+				function clearTime() {
+					this.timeQuanBeginIndex = index;
+					this.timeQuanBegin = item.time;
+					this.timeQuanEnd = '';
+				}
+
+				if (!this.timeQuanBegin) {
+					clearTime.call(this);
+					return;
+				}
+				if (!this.timeQuanEnd && this.timeQuanBegin) {
+					let isDisble = false;
+					let start = this.timeQuanBeginIndex;
+					let end = index;
+					start > end && ([start, end] = [end, start]);
+					for (let i = start + 1; i < end; i++) {
+						if (this.timeArr[i].disable) {
+							isDisble = true;
+							clearTime.call(this);
+							return;
+						}
+					}
+					if (!isDisble) {
+						for (let i = start + 1; i < end; i++) {
+							this.timeArr[i].isInclude = true;
+						}
+					}
+					this.timeQuanEnd = item.time;
+					return;
+				}
+
+				if (this.timeQuanBegin && this.timeQuanEnd) {
+					this.timeArr.forEach(t => {
+						t.isInclude = false;
+					});
+					clearTime.call(this);
+				}
+			},
+			handleChange() {
+				this.timeQuanBegin > this.timeQuanEnd && ([this.timeQuanBegin, this.timeQuanEnd] = [this.timeQuanEnd, this.timeQuanBegin]);
+			},
+			handleSubmit() {
+				if (this.isSection) {
+					this.handleChange();
+					this.$emit('change', {
+						beginTime: `${this.selectDate} ${this.timeQuanBegin}`,
+						endTime: `${this.selectDate} ${this.timeQuanEnd}`
+					});
+					return;
+				}
+
+				if (this.isMultiple) {
+					let time = [];
+					for (let date in this.orderTimeArr) {
+						this.orderTimeArr[date].forEach(item => {
+							time.push(`${date} ${item}`);
+						});
+					}
+					this.$emit('change', time);
+				} else {
+					// this.$emit('change', currentTime().year + '-' + this.orderDateTime);
+					this.$emit('change', {
+						date: currentTime().year + '-' + this.orderDateTime.data,
+						time: this.orderDateTime.time
+					});
+				}
+			}
+		}
+	};
+</script>
+<style lang="scss" scoped>
+	@import './yuyue-date.scss';
 </style>
\ No newline at end of file
diff --git a/pages_promotion/fenxiao/apply.vue b/pages_promotion/fenxiao/apply.vue
index dbde07b..f7dc267 100644
--- a/pages_promotion/fenxiao/apply.vue
+++ b/pages_promotion/fenxiao/apply.vue
@@ -806,7 +806,7 @@
 	}
 </style>
 
-<style lang="scss">
+<style lang="scss" scoped>
 	/deep/ .uni-popup__wrapper-box {
 		border-radius: 20rpx;
 	}
diff --git a/pages_promotion/fenxiao/goods_list.vue b/pages_promotion/fenxiao/goods_list.vue
index 3543336..85fdee1 100644
--- a/pages_promotion/fenxiao/goods_list.vue
+++ b/pages_promotion/fenxiao/goods_list.vue
@@ -141,7 +141,7 @@ export default {
 };
 </script>
 
-<style lang="scss">
+<style>
 .quick-nav >>> .uni-scroll-view-content {
 	display: flex;
 }
diff --git a/pages_promotion/merch/detail.vue b/pages_promotion/merch/detail.vue
index f3d89ea..ac3ba0c 100644
--- a/pages_promotion/merch/detail.vue
+++ b/pages_promotion/merch/detail.vue
@@ -312,7 +312,7 @@
 <style lang="scss">
 	@import './public/css/list.scss';
 </style>
-<style lang="scss" scoped>
+<style scoped>
 	>>>.uni-tag--primary.uni-tag--inverted {
 		background-color: #f5f5f5 !important;
 	}
diff --git a/pages_promotion/merch/merchcategory.vue b/pages_promotion/merch/merchcategory.vue
index 5954e3b..6e6e91d 100644
--- a/pages_promotion/merch/merchcategory.vue
+++ b/pages_promotion/merch/merchcategory.vue
@@ -13,7 +13,7 @@
 				<block v-if="categoryTree.length">
 					<scroll-view scroll-y="true" class="tree-wrap">
 						<view class="category-item-wrap">
-							<view class="category-item" v-for="(item, index) in categoryTree" :key="item.category_id || index" :class="[
+							<view class="category-item" v-for="(item, index) in categoryTree" :key="index" :class="[
 									{ select: select == index },
 								]" @click="switchOneCategory(index)">
 								<view class="">{{ item.category_name }}</view>
@@ -26,7 +26,7 @@
 						@scroll="listenScroll" @touchstart="touchStart" :refresher-enabled="true"
 						refresher-default-style="none" :refresher-triggered="triggered" @refresherrefresh="onRefresh"
 						@refresherrestore="onRestore">
-							<view class="child-category"  v-for="(item, index) in categoryTree" :key="item.category_id || index" :id="'category-' + index" v-if="item.child_list.length > 0">
+							<view class="child-category"  v-for="(item, index) in categoryTree" :key="index" :id="'category-' + index" v-if="item.child_list.length > 0">
 								<!---->
 								<view class="item-wrap category">
 									<view class="category-title">{{ item.category_name }}</view>
diff --git a/pages_promotion/point/detail.vue b/pages_promotion/point/detail.vue
index a7621da..a418a7f 100644
--- a/pages_promotion/point/detail.vue
+++ b/pages_promotion/point/detail.vue
@@ -499,7 +499,7 @@ export default {
 	}
 }
 </style>
-<style lang="scss" scoped>
+<style scoped>
 /deep/ .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
 	max-height: unset !important;
 }
diff --git a/pages_promotion/point/goods_list.vue b/pages_promotion/point/goods_list.vue
index 9f82399..725c3b6 100644
--- a/pages_promotion/point/goods_list.vue
+++ b/pages_promotion/point/goods_list.vue
@@ -887,7 +887,7 @@
 		}
 	}
 </style>
-<style lang="scss" scoped>
+<style scoped>
 	>>>.uni-tag--primary.uni-tag--inverted {
 		background-color: #f5f5f5 !important;
 	}
diff --git a/pages_promotion/point/list.vue b/pages_promotion/point/list.vue
index 27055da..9c033d2 100644
--- a/pages_promotion/point/list.vue
+++ b/pages_promotion/point/list.vue
@@ -586,7 +586,7 @@
 <style lang="scss">
 	@import './public/css/list.scss';
 </style>
-<style lang="scss">
+<style>
 	.ns-adv>>>image {
 		width: 100%;
 		border-radius: 0;
diff --git a/pages_promotion/point/order_list.vue b/pages_promotion/point/order_list.vue
index 02ddac7..82402e9 100644
--- a/pages_promotion/point/order_list.vue
+++ b/pages_promotion/point/order_list.vue
@@ -1,575 +1,575 @@
-<template>
-	<page-meta :page-style="themeColor"></page-meta>
-	<view class="order-container">
-		<view class="order-nav" v-if="storeToken">
-			<view v-for="(statusItem, statusIndex) in statusList" :key="statusIndex" class="uni-tab-item" :id="statusItem.id" :data-current="statusIndex" @click="ontabtap">
-				<text class="uni-tab-item-title" :class="statusItem.status == orderStatus ? 'uni-tab-item-title-active color-base-text' : ''">
-					{{ statusItem.name }}
-				</text>
-			</view>
-		</view>
-		
-		<mescroll-uni ref="mescroll" @getData="getListData" top="80rpx" >
-			<block slot="list">
-				<block v-if="orderList.length">
-					<view class="order-item" v-for="(orderItem, orderIndex) in orderList" :key="orderIndex" @click="detail(orderItem)">
-						<view class="order-header">
-							<text class="order-no">订单号：{{ orderItem.order_no }}</text>
-							<text class="status-name">
-								{{ orderItem.order_status == 0 ? '待支付' : orderItem.order_status == 1 ? '已完成' : orderItem.order_status == -1 ? '已关闭' : '' }}
-							</text>
-						</view>
-						<view class="order-body">
-							<view class="goods-wrap">
-								<view class="goods-img">
-									<block v-if="orderItem.type == 2">
-										<image :src="$util.img(orderItem.exchange_image) ? $util.img(orderItem.exchange_image) : $util.img('public/uniapp/point/coupon.png')"
-										 @error="imageError(orderIndex)" mode="aspectFill" :lazy-load="true"></image>
-									</block>
-									<block v-else-if="orderItem.type == 3">
-										<image :src="$util.img(orderItem.exchange_image) ? $util.img(orderItem.exchange_image) : $util.img('public/uniapp/point/hongbao.png')"
-										 @error="imageError(orderIndex)" mode="aspectFill" :lazy-load="true"></image>
-									</block>
-									<block v-else>
-										<image :src="$util.img(orderItem.exchange_image)" @error="imageError(orderIndex)" mode="aspectFill" :lazy-load="true"></image>
-									</block>
-								</view>
-								<view class="goods-info">
-									<view class="pro-info">
-										<view class="goods-name">{{ orderItem.exchange_name }}</view>
-										<view class="goods-sub-section">
-											<text class="goods-price">
-												<text class="price-style large">{{ orderItem.point }}</text>
-												<text class="unit price-style small">积分</text>
-												<block v-if="orderItem.price > 0">
-													+
-													<text class="unit price-style small">{{ $lang('common.currencySymbol') }}</text>
-													<text class="price-style large">{{ parseFloat(orderItem.price).toFixed(2).split(".")[0] }}</text>
-													<text class="unit price-style small">.{{ parseFloat(orderItem.price).toFixed(2).split(".")[1] }}</text>
-												</block>
-											</text>
-											<text class="goods-num">
-												<text class="iconfont icon-close"></text>
-												{{ orderItem.num }}
-											</text>
-										</view>
-									</view>
-								</view>
-							</view>
-						</view>
-						<view class="order-footer">
-							<view class="order-action" v-if="orderItem.order_status == 0 && orderItem.type == 1">
-								<view class="order-box-btn font-size-tag" @click.stop="orderClose(orderItem.order_id, orderIndex)">关闭</view>
-								<view class="order-box-btn color-base-bg color-base-border"  @click.stop="openChoosePayment(orderItem.out_trade_no, orderItem.price)">支付</view>
-							</view>
-							<view class="order-action" v-else>
-								<view class="order-box-btn font-size-tag">查看详情</view>
-							</view>
-						</view>
-					</view>
-				</block>
-				<block v-if="showEmpty && !orderList.length">
-					<view class="cart-empty">
-						<ns-empty :isIndex="true" :emptyBtn ="{url: '/pages_promotion/point/list',text: '去逛逛'}" text="暂无积分兑换订单"></ns-empty>
-					</view>
-				</block>
-			</block>
-		</mescroll-uni>
-
-		<!-- 选择支付方式弹窗 -->
-		<ns-payment ref="choosePaymentPopup" :payMoney="payMoney" @confirm="orderPay"></ns-payment>
-		<loading-cover ref="loadingCover"></loading-cover>
-		<ns-login ref="login"></ns-login>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				orderList: [],
-				showEmpty: false,
-				outTradeNo: '',
-				payMoney: 0,
-				statusList: [
-					{status: 'all', id: 'all', name: '全部'},
-					{status: 0, id: 'pay', name: '待支付'},
-					{status: 1, id: 'complete', name: '已完成'},
-				],
-				orderStatus: 'all',
-			};
-		},
-		onLoad() {
-			setTimeout( () => {
-				if (!this.addonIsExist.pointexchange) {
-					this.$util.showToast({
-						title: '商家未开启积分商城',
-						mask: true,
-						duration: 2000
-					});
-					setTimeout(() => {
-						this.$util.redirectTo('/pages/index/index', {}, 'redirectTo');
-					}, 2000);
-				}
-			},1000);
-
-			if (!this.storeToken) {
-				this.$nextTick(() => {
-					this.$refs.login.open('/pages_promotion/point/order_list');
-				});
-			}
-		},
-		onShow() {
-			if (this.$refs.mescroll) this.$refs.mescroll.refresh();
-		},
-		watch: {
-			storeToken: function(nVal, oVal) {
-				if (nVal) {
-					this.$refs.mescroll.refresh();
-				}
-			}
-		},
-		methods: {
-			ontabtap(e) {
-				let index = e.target.dataset.current || e.currentTarget.dataset.current;
-				this.orderStatus = this.statusList[index].status;
-				this.$refs.loadingCover.show();
-				this.$refs.mescroll.refresh();
-			},
-			getListData(mescroll) {
-				this.showEmpty = false;
-				this.$api.sendRequest({
-					url: '/pointexchange/api/order/page',
-					data: {
-						page: mescroll.num,
-						page_size: mescroll.size,
-						order_status: this.orderStatus
-					},
-					success: res => {
-						this.showEmpty = true;
-						let newArr = [];
-						let msg = res.message;
-						if (res.code == 0 && res.data) {
-							newArr = res.data.list;
-						} else {
-							this.$util.showToast({
-								title: msg
-							});
-						}
-						mescroll.endSuccess(newArr.length);
-						//设置列表数据
-						if (mescroll.num == 1) this.orderList = []; //如果是第一页需手动制空列表
-						this.orderList = this.orderList.concat(newArr); //追加新数据
-						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-					},
-					fail: res => {
-						mescroll.endErr();
-						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-					}
-				});
-			},
-			orderClose(order_id, index) {
-				uni.showModal({
-					title: '提示',
-					content: '确定关闭此次兑换？',
-					success: res => {
-						if (res.confirm) {
-							this.$api.sendRequest({
-								url: '/pointexchange/api/order/close',
-								data: {
-									order_id: order_id
-								},
-								success: res => {
-									if (res.code >= 0) {
-										this.orderList[index].order_status = -1;
-										this.$util.showToast({
-											title: '关闭成功'
-										});
-										this.$forceUpdate();
-									}
-								}
-							});
-						}
-					}
-				});
-			},
-			// 显示选择支付方式弹框
-			openChoosePayment(out_trade_no, price) {
-				this.outTradeNo = out_trade_no;
-				this.payMoney = parseFloat(price);
-				this.$refs.choosePaymentPopup.open();
-			},
-			orderPay() {
-				this.$refs.choosePaymentPopup.getPayInfo(this.outTradeNo);
-			},
-			detail(item) {
-				if (item.type == 1 && item.relate_order_id) {
-					switch (item.delivery_type) {
-						case 'store':
-							this.$util.redirectTo('/pages/order/detail_pickup', {
-								order_id: item.relate_order_id
-							});
-							break;
-						case 'local':
-							this.$util.redirectTo('/pages/order/detail_local_delivery', {
-								order_id: item.relate_order_id
-							});
-							break;
-						case 'express':
-							this.$util.redirectTo('/pages/order/detail', {
-								order_id: item.relate_order_id
-							});
-							break;
-						default:
-							this.$util.redirectTo('/pages_tool/order/detail_virtual', {
-								order_id: item.relate_order_id
-							});
-					}
-				} else {
-					this.$util.redirectTo('/pages/order/detail_point', {
-						order_id: item.order_id
-					});
-				}
-			},
-			imageError(index) {
-				this.orderList[index].exchange_image = this.$util.getDefaultImage().goods;
-				this.$forceUpdate();
-			}
-		}
-	};
-</script>
-
-<style lang="scss" scoped>
-	/deep/ .fixed {
-		position: relative;
-		top: 0;
-	}
-
-	/deep/ .empty {
-		padding-top: 0 !important;
-	}
-
-	.order-container {
-		width: 100vw;
-		height: 100vh;
-	}
-
-	.align-right {
-		text-align: right;
-	}
-
-	.order-item {
-		margin: $margin-updown 24rpx;
-		border-radius: 12rpx;
-		background: #fff;
-		position: relative;
-	
-		.order-header {
-			display: flex;
-			align-items: center;
-			position: relative;
-			padding: $padding 24rpx 26rpx 24rpx;
-	
-			&.waitpay {
-				padding-left: 70rpx;
-	
-				.iconyuan_checked,
-				.iconyuan_checkbox {
-					font-size: $font-size-toolbar;
-					position: absolute;
-					top: 48%;
-					left: 20rpx;
-					transform: translateY(-50%);
-				}
-				.iconyuan_checkbox {
-					color: $color-tip;
-				}
-			}
-	
-			.icondianpu {
-				display: inline-block;
-				line-height: 1;
-				margin-right: 12rpx;
-				font-size: $font-size-base;
-			}
-			
-			.order-no {
-				font-size: 26rpx;
-			}
-	
-			.status-name {
-				flex: 1;
-				text-align: right;
-				font-size: 26rpx;
-				font-weight: 600;
-			}
-		}
-	
-		.order-body {
-			.goods-wrap {
-				display: flex;
-				position: relative;
-				padding: 0 24rpx 30rpx 24rpx;
-	
-				&:last-of-type {
-					margin-bottom: 0;
-				}
-	
-				.goods-img {
-					width: 160rpx;
-					height: 160rpx;
-					margin-right: 20rpx;
-	
-					image {
-						width: 100%;
-						height: 100%;
-						border-radius: $border-radius;
-					}
-				}
-	
-				.goods-info {
-					flex: 1;
-					position: relative;
-					max-width: calc(100% - 180rpx);
-					display: flex;
-					flex-direction: column;
-	
-					.pro-info {
-						flex: 1;
-					}
-	
-					.goods-name {
-						display: -webkit-box;
-						-webkit-box-orient: vertical;
-						-webkit-line-clamp: 2;
-						overflow: hidden;
-						line-height: 1.5;
-						font-size: $font-size-base;
-						color: $color-title;
-					}
-	
-					.goods-sub-section {
-						width: 100%;
-						line-height: 1.3;
-						display: flex;
-						margin-top: 14rpx;
-	
-						.goods-price {
-							font-size: $font-size-tag;
-							color: var(--price-color);
-							flex: 1;
-							font-weight: bold;
-						}
-						.goods-num {
-							font-size: $font-size-tag;
-							color: $color-tip;
-							flex: 1;
-							text-align: right;
-							line-height: 1;
-	
-							.iconfont {
-								font-size: $font-size-tag;
-							}
-						}
-						.goods-type {
-							font-size: $font-size-tag;
-						}
-	
-						.unit {
-							font-size: $font-size-tag;
-							margin-right: 2rpx;
-						}
-	
-						view {
-							flex: 1;
-							line-height: 1.3;
-							display: flex;
-							flex-direction: column;
-	
-							&:last-of-type {
-								text-align: right;
-	
-								.iconfont {
-									line-height: 1;
-									font-size: $font-size-tag;
-								}
-							}
-						}
-					}
-	
-					.goods-action {
-						text-align: right;
-	
-						.action-btn {
-							line-height: 1;
-							padding: 14rpx 20rpx;
-							color: $color-title;
-							display: inline-block;
-							border-radius: $border-radius;
-							background: #fff;
-							border: 2rpx solid #999;
-							font-size: $font-size-tag;
-							margin-left: 10rpx;
-						}
-					}
-				}
-			}
-			
-			.multi-order-goods {
-				width: calc(100vw - 96rpx);
-				white-space: nowrap;
-				margin: 0 24rpx 30rpx 24rpx!important;
-				position: relative;
-				
-				.scroll-view {
-					width: 100%;
-				}
-				
-				.goods-wrap {
-					padding: 0;
-				}
-				
-				.goods-img {
-					min-width: 160rpx;
-				}
-				
-				.shade {
-					position: absolute;
-					z-index: 5;
-					height: 100%;
-					width: 44rpx;
-					right: 0;
-					top: 0;
-					
-					image {
-						width: 100%;
-						height: 100%;
-					}
-				}
-			}
-		}
-	
-		.order-footer {
-			.order-base-info {
-				.total {
-					padding: $padding;
-					font-size: $font-size-tag;
-					background: rgba(248, 248, 248, 0.5);
-					display: flex;
-					margin: 0 24rpx;
-	
-					& > text {
-						flex: 1;
-						line-height: 1;
-						margin-left: 10rpx;
-					}
-				}
-	
-				.order-type {
-					padding-top: 20rpx;
-					flex: 0.5;
-	
-					& > text {
-						line-height: 1;
-					}
-				}
-			}
-	
-			.order-action {
-				text-align: right;
-				padding: 30rpx 24rpx;
-				position: relative;
-				
-				.order-time {
-					position: absolute;
-					top: 35rpx;
-					left: 30rpx;
-					display: flex;
-					align-items: center;
-					font-size: 10px;
-					color:#b5b6b9;
-					
-					image {
-						width: 26rpx;
-						height: 26rpx;
-						margin-right: 6rpx;
-					}
-				}
-	
-				.action-btn {
-					line-height: 1;
-					padding: 20rpx 26rpx;
-					color: #333;
-					display: inline-block;
-					border-radius: $border-radius;
-					background: #fff;
-					border: 2rpx solid #999;
-					font-size: $font-size-tag;
-					margin-left: 10rpx;
-				}
-			}
-		}
-	}
-
-	.empty {
-		padding-top: 200rpx;
-		text-align: center;
-
-		.empty-image {
-			width: 180rpx;
-			height: 180rpx;
-		}
-	}
-	
-	.order-nav {
-		width: 100vw;
-		height: 80rpx;
-		flex-direction: row;
-		/* #ifndef APP-PLUS */
-		white-space: nowrap;
-		/* #endif */
-		background: #fff;
-		display: flex;
-		position: fixed;
-		left: 0;
-		z-index: 998;
-		justify-content: space-around;
-		border-radius: 0px 0px 24rpx 24rpx;
-	
-		.uni-tab-item {
-			width: 120rpx;
-			text-align: center;
-		}
-	
-		.uni-tab-item-title {
-			display: inline-block;
-			height: 80rpx;
-			line-height: 80rpx;
-			border-bottom: 1px solid #fff;
-			flex-wrap: nowrap;
-			/* #ifndef APP-PLUS */
-			white-space: nowrap;
-			/* #endif */
-			text-align: center;
-			font-size: 30rpx;
-			position: relative;
-		}
-	
-		.uni-tab-item-title-active::after {
-			content: " ";
-			display: block;
-			position: absolute;
-			left: 0;
-			bottom: 0;
-			width: 100%;
-			height: 6rpx;
-			background: linear-gradient(270deg, var(--base-color-light-9) 0%, var(--base-color) 100%);
-		}
-	
-		::-webkit-scrollbar {
-			width: 0;
-			height: 0;
-			color: transparent;
-		}
-	}
-</style>
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view class="order-container">
+		<view class="order-nav" v-if="storeToken">
+			<view v-for="(statusItem, statusIndex) in statusList" :key="statusIndex" class="uni-tab-item" :id="statusItem.id" :data-current="statusIndex" @click="ontabtap">
+				<text class="uni-tab-item-title" :class="statusItem.status == orderStatus ? 'uni-tab-item-title-active color-base-text' : ''">
+					{{ statusItem.name }}
+				</text>
+			</view>
+		</view>
+		
+		<mescroll-uni ref="mescroll" @getData="getListData" top="80rpx" >
+			<block slot="list">
+				<block v-if="orderList.length">
+					<view class="order-item" v-for="(orderItem, orderIndex) in orderList" :key="orderIndex" @click="detail(orderItem)">
+						<view class="order-header">
+							<text class="order-no">订单号：{{ orderItem.order_no }}</text>
+							<text class="status-name">
+								{{ orderItem.order_status == 0 ? '待支付' : orderItem.order_status == 1 ? '已完成' : orderItem.order_status == -1 ? '已关闭' : '' }}
+							</text>
+						</view>
+						<view class="order-body">
+							<view class="goods-wrap">
+								<view class="goods-img">
+									<block v-if="orderItem.type == 2">
+										<image :src="$util.img(orderItem.exchange_image) ? $util.img(orderItem.exchange_image) : $util.img('public/uniapp/point/coupon.png')"
+										 @error="imageError(orderIndex)" mode="aspectFill" :lazy-load="true"></image>
+									</block>
+									<block v-else-if="orderItem.type == 3">
+										<image :src="$util.img(orderItem.exchange_image) ? $util.img(orderItem.exchange_image) : $util.img('public/uniapp/point/hongbao.png')"
+										 @error="imageError(orderIndex)" mode="aspectFill" :lazy-load="true"></image>
+									</block>
+									<block v-else>
+										<image :src="$util.img(orderItem.exchange_image)" @error="imageError(orderIndex)" mode="aspectFill" :lazy-load="true"></image>
+									</block>
+								</view>
+								<view class="goods-info">
+									<view class="pro-info">
+										<view class="goods-name">{{ orderItem.exchange_name }}</view>
+										<view class="goods-sub-section">
+											<text class="goods-price">
+												<text class="price-style large">{{ orderItem.point }}</text>
+												<text class="unit price-style small">积分</text>
+												<block v-if="orderItem.price > 0">
+													+
+													<text class="unit price-style small">{{ $lang('common.currencySymbol') }}</text>
+													<text class="price-style large">{{ parseFloat(orderItem.price).toFixed(2).split(".")[0] }}</text>
+													<text class="unit price-style small">.{{ parseFloat(orderItem.price).toFixed(2).split(".")[1] }}</text>
+												</block>
+											</text>
+											<text class="goods-num">
+												<text class="iconfont icon-close"></text>
+												{{ orderItem.num }}
+											</text>
+										</view>
+									</view>
+								</view>
+							</view>
+						</view>
+						<view class="order-footer">
+							<view class="order-action" v-if="orderItem.order_status == 0 && orderItem.type == 1">
+								<view class="order-box-btn font-size-tag" @click.stop="orderClose(orderItem.order_id, orderIndex)">关闭</view>
+								<view class="order-box-btn color-base-bg color-base-border"  @click.stop="openChoosePayment(orderItem.out_trade_no, orderItem.price)">支付</view>
+							</view>
+							<view class="order-action" v-else>
+								<view class="order-box-btn font-size-tag">查看详情</view>
+							</view>
+						</view>
+					</view>
+				</block>
+				<block v-if="showEmpty && !orderList.length">
+					<view class="cart-empty">
+						<ns-empty :isIndex="true" :emptyBtn ="{url: '/pages_promotion/point/list',text: '去逛逛'}" text="暂无积分兑换订单"></ns-empty>
+					</view>
+				</block>
+			</block>
+		</mescroll-uni>
+
+		<!-- 选择支付方式弹窗 -->
+		<ns-payment ref="choosePaymentPopup" :payMoney="payMoney" @confirm="orderPay"></ns-payment>
+		<loading-cover ref="loadingCover"></loading-cover>
+		<ns-login ref="login"></ns-login>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				orderList: [],
+				showEmpty: false,
+				outTradeNo: '',
+				payMoney: 0,
+				statusList: [
+					{status: 'all', id: 'all', name: '全部'},
+					{status: 0, id: 'pay', name: '待支付'},
+					{status: 1, id: 'complete', name: '已完成'},
+				],
+				orderStatus: 'all',
+			};
+		},
+		onLoad() {
+			setTimeout( () => {
+				if (!this.addonIsExist.pointexchange) {
+					this.$util.showToast({
+						title: '商家未开启积分商城',
+						mask: true,
+						duration: 2000
+					});
+					setTimeout(() => {
+						this.$util.redirectTo('/pages/index/index', {}, 'redirectTo');
+					}, 2000);
+				}
+			},1000);
+
+			if (!this.storeToken) {
+				this.$nextTick(() => {
+					this.$refs.login.open('/pages_promotion/point/order_list');
+				});
+			}
+		},
+		onShow() {
+			if (this.$refs.mescroll) this.$refs.mescroll.refresh();
+		},
+		watch: {
+			storeToken: function(nVal, oVal) {
+				if (nVal) {
+					this.$refs.mescroll.refresh();
+				}
+			}
+		},
+		methods: {
+			ontabtap(e) {
+				let index = e.target.dataset.current || e.currentTarget.dataset.current;
+				this.orderStatus = this.statusList[index].status;
+				this.$refs.loadingCover.show();
+				this.$refs.mescroll.refresh();
+			},
+			getListData(mescroll) {
+				this.showEmpty = false;
+				this.$api.sendRequest({
+					url: '/pointexchange/api/order/page',
+					data: {
+						page: mescroll.num,
+						page_size: mescroll.size,
+						order_status: this.orderStatus
+					},
+					success: res => {
+						this.showEmpty = true;
+						let newArr = [];
+						let msg = res.message;
+						if (res.code == 0 && res.data) {
+							newArr = res.data.list;
+						} else {
+							this.$util.showToast({
+								title: msg
+							});
+						}
+						mescroll.endSuccess(newArr.length);
+						//设置列表数据
+						if (mescroll.num == 1) this.orderList = []; //如果是第一页需手动制空列表
+						this.orderList = this.orderList.concat(newArr); //追加新数据
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					},
+					fail: res => {
+						mescroll.endErr();
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					}
+				});
+			},
+			orderClose(order_id, index) {
+				uni.showModal({
+					title: '提示',
+					content: '确定关闭此次兑换？',
+					success: res => {
+						if (res.confirm) {
+							this.$api.sendRequest({
+								url: '/pointexchange/api/order/close',
+								data: {
+									order_id: order_id
+								},
+								success: res => {
+									if (res.code >= 0) {
+										this.orderList[index].order_status = -1;
+										this.$util.showToast({
+											title: '关闭成功'
+										});
+										this.$forceUpdate();
+									}
+								}
+							});
+						}
+					}
+				});
+			},
+			// 显示选择支付方式弹框
+			openChoosePayment(out_trade_no, price) {
+				this.outTradeNo = out_trade_no;
+				this.payMoney = parseFloat(price);
+				this.$refs.choosePaymentPopup.open();
+			},
+			orderPay() {
+				this.$refs.choosePaymentPopup.getPayInfo(this.outTradeNo);
+			},
+			detail(item) {
+				if (item.type == 1 && item.relate_order_id) {
+					switch (item.delivery_type) {
+						case 'store':
+							this.$util.redirectTo('/pages/order/detail_pickup', {
+								order_id: item.relate_order_id
+							});
+							break;
+						case 'local':
+							this.$util.redirectTo('/pages/order/detail_local_delivery', {
+								order_id: item.relate_order_id
+							});
+							break;
+						case 'express':
+							this.$util.redirectTo('/pages/order/detail', {
+								order_id: item.relate_order_id
+							});
+							break;
+						default:
+							this.$util.redirectTo('/pages_tool/order/detail_virtual', {
+								order_id: item.relate_order_id
+							});
+					}
+				} else {
+					this.$util.redirectTo('/pages/order/detail_point', {
+						order_id: item.order_id
+					});
+				}
+			},
+			imageError(index) {
+				this.orderList[index].exchange_image = this.$util.getDefaultImage().goods;
+				this.$forceUpdate();
+			}
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	/deep/ .fixed {
+		position: relative;
+		top: 0;
+	}
+
+	/deep/ .empty {
+		padding-top: 0 !important;
+	}
+
+	.order-container {
+		width: 100vw;
+		height: 100vh;
+	}
+
+	.align-right {
+		text-align: right;
+	}
+
+	.order-item {
+		margin: $margin-updown 24rpx;
+		border-radius: 12rpx;
+		background: #fff;
+		position: relative;
+	
+		.order-header {
+			display: flex;
+			align-items: center;
+			position: relative;
+			padding: $padding 24rpx 26rpx 24rpx;
+	
+			&.waitpay {
+				padding-left: 70rpx;
+	
+				.iconyuan_checked,
+				.iconyuan_checkbox {
+					font-size: $font-size-toolbar;
+					position: absolute;
+					top: 48%;
+					left: 20rpx;
+					transform: translateY(-50%);
+				}
+				.iconyuan_checkbox {
+					color: $color-tip;
+				}
+			}
+	
+			.icondianpu {
+				display: inline-block;
+				line-height: 1;
+				margin-right: 12rpx;
+				font-size: $font-size-base;
+			}
+			
+			.order-no {
+				font-size: 26rpx;
+			}
+	
+			.status-name {
+				flex: 1;
+				text-align: right;
+				font-size: 26rpx;
+				font-weight: 600;
+			}
+		}
+	
+		.order-body {
+			.goods-wrap {
+				display: flex;
+				position: relative;
+				padding: 0 24rpx 30rpx 24rpx;
+	
+				&:last-of-type {
+					margin-bottom: 0;
+				}
+	
+				.goods-img {
+					width: 160rpx;
+					height: 160rpx;
+					margin-right: 20rpx;
+	
+					image {
+						width: 100%;
+						height: 100%;
+						border-radius: $border-radius;
+					}
+				}
+	
+				.goods-info {
+					flex: 1;
+					position: relative;
+					max-width: calc(100% - 180rpx);
+					display: flex;
+					flex-direction: column;
+	
+					.pro-info {
+						flex: 1;
+					}
+	
+					.goods-name {
+						display: -webkit-box;
+						-webkit-box-orient: vertical;
+						-webkit-line-clamp: 2;
+						overflow: hidden;
+						line-height: 1.5;
+						font-size: $font-size-base;
+						color: $color-title;
+					}
+	
+					.goods-sub-section {
+						width: 100%;
+						line-height: 1.3;
+						display: flex;
+						margin-top: 14rpx;
+	
+						.goods-price {
+							font-size: $font-size-tag;
+							color: var(--price-color);
+							flex: 1;
+							font-weight: bold;
+						}
+						.goods-num {
+							font-size: $font-size-tag;
+							color: $color-tip;
+							flex: 1;
+							text-align: right;
+							line-height: 1;
+	
+							.iconfont {
+								font-size: $font-size-tag;
+							}
+						}
+						.goods-type {
+							font-size: $font-size-tag;
+						}
+	
+						.unit {
+							font-size: $font-size-tag;
+							margin-right: 2rpx;
+						}
+	
+						view {
+							flex: 1;
+							line-height: 1.3;
+							display: flex;
+							flex-direction: column;
+	
+							&:last-of-type {
+								text-align: right;
+	
+								.iconfont {
+									line-height: 1;
+									font-size: $font-size-tag;
+								}
+							}
+						}
+					}
+	
+					.goods-action {
+						text-align: right;
+	
+						.action-btn {
+							line-height: 1;
+							padding: 14rpx 20rpx;
+							color: $color-title;
+							display: inline-block;
+							border-radius: $border-radius;
+							background: #fff;
+							border: 2rpx solid #999;
+							font-size: $font-size-tag;
+							margin-left: 10rpx;
+						}
+					}
+				}
+			}
+			
+			.multi-order-goods {
+				width: calc(100vw - 96rpx);
+				white-space: nowrap;
+				margin: 0 24rpx 30rpx 24rpx!important;
+				position: relative;
+				
+				.scroll-view {
+					width: 100%;
+				}
+				
+				.goods-wrap {
+					padding: 0;
+				}
+				
+				.goods-img {
+					min-width: 160rpx;
+				}
+				
+				.shade {
+					position: absolute;
+					z-index: 5;
+					height: 100%;
+					width: 44rpx;
+					right: 0;
+					top: 0;
+					
+					image {
+						width: 100%;
+						height: 100%;
+					}
+				}
+			}
+		}
+	
+		.order-footer {
+			.order-base-info {
+				.total {
+					padding: $padding;
+					font-size: $font-size-tag;
+					background: rgba(248, 248, 248, 0.5);
+					display: flex;
+					margin: 0 24rpx;
+	
+					& > text {
+						flex: 1;
+						line-height: 1;
+						margin-left: 10rpx;
+					}
+				}
+	
+				.order-type {
+					padding-top: 20rpx;
+					flex: 0.5;
+	
+					& > text {
+						line-height: 1;
+					}
+				}
+			}
+	
+			.order-action {
+				text-align: right;
+				padding: 30rpx 24rpx;
+				position: relative;
+				
+				.order-time {
+					position: absolute;
+					top: 35rpx;
+					left: 30rpx;
+					display: flex;
+					align-items: center;
+					font-size: 10px;
+					color:#b5b6b9;
+					
+					image {
+						width: 26rpx;
+						height: 26rpx;
+						margin-right: 6rpx;
+					}
+				}
+	
+				.action-btn {
+					line-height: 1;
+					padding: 20rpx 26rpx;
+					color: #333;
+					display: inline-block;
+					border-radius: $border-radius;
+					background: #fff;
+					border: 2rpx solid #999;
+					font-size: $font-size-tag;
+					margin-left: 10rpx;
+				}
+			}
+		}
+	}
+
+	.empty {
+		padding-top: 200rpx;
+		text-align: center;
+
+		.empty-image {
+			width: 180rpx;
+			height: 180rpx;
+		}
+	}
+	
+	.order-nav {
+		width: 100vw;
+		height: 80rpx;
+		flex-direction: row;
+		/* #ifndef APP-PLUS */
+		white-space: nowrap;
+		/* #endif */
+		background: #fff;
+		display: flex;
+		position: fixed;
+		left: 0;
+		z-index: 998;
+		justify-content: space-around;
+		border-radius: 0px 0px 24rpx 24rpx;
+	
+		.uni-tab-item {
+			width: 120rpx;
+			text-align: center;
+		}
+	
+		.uni-tab-item-title {
+			display: inline-block;
+			height: 80rpx;
+			line-height: 80rpx;
+			border-bottom: 1px solid #fff;
+			flex-wrap: nowrap;
+			/* #ifndef APP-PLUS */
+			white-space: nowrap;
+			/* #endif */
+			text-align: center;
+			font-size: 30rpx;
+			position: relative;
+		}
+	
+		.uni-tab-item-title-active::after {
+			content: " ";
+			display: block;
+			position: absolute;
+			left: 0;
+			bottom: 0;
+			width: 100%;
+			height: 6rpx;
+			background: linear-gradient(270deg, var(--base-color-light-9) 0%, var(--base-color) 100%);
+		}
+	
+		::-webkit-scrollbar {
+			width: 0;
+			height: 0;
+			color: transparent;
+		}
+	}
+</style>
diff --git a/pages_promotion/point/payment.vue b/pages_promotion/point/payment.vue
index d0f7b5a..58f5746 100644
--- a/pages_promotion/point/payment.vue
+++ b/pages_promotion/point/payment.vue
@@ -292,7 +292,7 @@
 <style lang="scss">
 	@import "@/common/css/order_parment.scss";
 </style>
-<style lang="scss" scoped>
+<style scoped>
 	/deep/ .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
 		background: none;
 		max-height: unset !important;
diff --git a/pages_tool/cases/index.vue b/pages_tool/cases/index.vue
index 9c2f9cd..50303ad 100644
--- a/pages_tool/cases/index.vue
+++ b/pages_tool/cases/index.vue
@@ -3,7 +3,7 @@
     <view class="about w100">
       <view class="list_cotact padding-top">
         <view class="container">
-          <block v-for="(item, index) in dataList" :key="item.case_id || index">
+          <block v-for="(item, index) in dataList" :key="index">
             <view class="view_ul_100" style="margin-bottom:30rpx;">
               <view class="bl clearfix bor bg-white">
                 <block v-if="item.$orig.case_type === 0">
@@ -312,7 +312,7 @@ export default {
 };
 </script>
 
-<style lang="scss" scoped>
+<style scoped>
 .item {
   display: flex;
   padding: 30rpx 0;
diff --git a/pages_tool/components/img-cropping/cropping.vue b/pages_tool/components/img-cropping/cropping.vue
index 08f00b1..bc32eec 100644
--- a/pages_tool/components/img-cropping/cropping.vue
+++ b/pages_tool/components/img-cropping/cropping.vue
@@ -1360,7 +1360,7 @@ export default {
 };
 </script>
 
-<style lang="scss">
+<style>
 .my-canvas {
 	display: flex;
 	position: fixed !important;
diff --git a/pages_tool/components/myp-one/myp-one.vue b/pages_tool/components/myp-one/myp-one.vue
index 47be939..4b97fc6 100644
--- a/pages_tool/components/myp-one/myp-one.vue
+++ b/pages_tool/components/myp-one/myp-one.vue
@@ -108,7 +108,7 @@ export default {
 };
 </script>
 
-<style lang="scss" scoped>
+<style scoped>
 @keyframes twinkling {
 	0% {
 		opacity: 0.2;
diff --git a/pages_tool/components/sx-rate/index.vue b/pages_tool/components/sx-rate/index.vue
index 1584f8a..bae7734 100644
--- a/pages_tool/components/sx-rate/index.vue
+++ b/pages_tool/components/sx-rate/index.vue
@@ -187,7 +187,7 @@ export default {
 };
 </script>
 
-<style lang="scss" scoped>
+<style scoped>
 @import './sx-rate/iconfont.css';
 </style>
 
diff --git a/pages_tool/components/uni-calendar/uni-calendar-item.vue b/pages_tool/components/uni-calendar/uni-calendar-item.vue
index b776366..2ae446f 100644
--- a/pages_tool/components/uni-calendar/uni-calendar-item.vue
+++ b/pages_tool/components/uni-calendar/uni-calendar-item.vue
@@ -1,186 +1,186 @@
-<template>
-	<view
-		class="uni-calendar-item__weeks-box"
-		:class="{
-			'uni-calendar-item--disable': weeks.disable,
-			'uni-calendar-item--isDay': calendar.fullDate === weeks.fullDate && weeks.isDay,
-			'uni-calendar-item--checked': calendar.fullDate === weeks.fullDate && !weeks.isDay,
-			'uni-calendar-item--before-checked': weeks.beforeMultiple,
-			'uni-calendar-item--multiple': weeks.multiple,
-			'uni-calendar-item--after-checked': weeks.afterMultiple
-		}"
-		@click="choiceDate(weeks)"
-	>
-		<view class="uni-calendar-item__weeks-box-item">
-			<text v-if="selected && weeks.extraInfo" class="uni-calendar-item__weeks-box-circle"></text>
-			<text class="uni-calendar-item__weeks-box-text"
-				:class="{
-					'uni-calendar-item--isDay-text': weeks.isDay,
-					'uni-calendar-item--isDay': calendar.fullDate === weeks.fullDate && weeks.isDay,
-					'uni-calendar-item--checked': calendar.fullDate === weeks.fullDate && !weeks.isDay,
-					'uni-calendar-item--before-checked': weeks.beforeMultiple,
-					'uni-calendar-item--multiple': weeks.multiple,
-					'uni-calendar-item--after-checked': weeks.afterMultiple,
-					'uni-calendar-item--disable': weeks.disable
-				}"
-			>
-				{{ weeks.date }}
-			</text>
-			<text v-if="!lunar && !weeks.extraInfo && weeks.isDay" class="uni-calendar-item__weeks-lunar-text"
-				:class="{
-					'uni-calendar-item--isDay-text': weeks.isDay,
-					'uni-calendar-item--isDay': calendar.fullDate === weeks.fullDate && weeks.isDay,
-					'uni-calendar-item--checked': calendar.fullDate === weeks.fullDate && !weeks.isDay,
-					'uni-calendar-item--before-checked': weeks.beforeMultiple,
-					'uni-calendar-item--multiple': weeks.multiple,
-					'uni-calendar-item--after-checked': weeks.afterMultiple
-				}"
-			></text>
-			<text v-if="lunar && !weeks.extraInfo" class="uni-calendar-item__weeks-lunar-text"
-				:class="{
-					'uni-calendar-item--isDay-text': weeks.isDay,
-					'uni-calendar-item--isDay': calendar.fullDate === weeks.fullDate && weeks.isDay,
-					'uni-calendar-item--checked': calendar.fullDate === weeks.fullDate && !weeks.isDay,
-					'uni-calendar-item--before-checked': weeks.beforeMultiple,
-					'uni-calendar-item--multiple': weeks.multiple,
-					'uni-calendar-item--after-checked': weeks.afterMultiple,
-					'uni-calendar-item--disable': weeks.disable
-				}"
-			>
-				{{ weeks.isDay ? '今天' : weeks.lunar.IDayCn === '初一' ? weeks.lunar.IMonthCn : weeks.lunar.IDayCn }}
-			</text>
-			<text v-if="weeks.extraInfo && weeks.extraInfo.info" class="uni-calendar-item__weeks-lunar-text"
-				:class="{
-					'uni-calendar-item--extra': weeks.extraInfo.info,
-					'uni-calendar-item--isDay-text': weeks.isDay,
-					'uni-calendar-item--isDay': calendar.fullDate === weeks.fullDate && weeks.isDay,
-					'uni-calendar-item--checked': calendar.fullDate === weeks.fullDate && !weeks.isDay,
-					'uni-calendar-item--before-checked': weeks.beforeMultiple,
-					'uni-calendar-item--multiple': weeks.multiple,
-					'uni-calendar-item--after-checked': weeks.afterMultiple,
-					'uni-calendar-item--disable': weeks.disable
-				}"
-			>
-				{{ weeks.extraInfo.info }}
-			</text>
-		</view>
-	</view>
-</template>
-
-<script>
-export default {
-	props: {
-		weeks: {
-			type: Object,
-			default() {
-				return {};
-			}
-		},
-		calendar: {
-			type: Object,
-			default: () => {
-				return {};
-			}
-		},
-		selected: {
-			type: Array,
-			default: () => {
-				return [];
-			}
-		},
-		lunar: {
-			type: Boolean,
-			default: false
-		}
-	},
-	methods: {
-		choiceDate(weeks) {
-			this.$emit('change', weeks);
-		}
-	}
-};
-</script>
-
-<style lang="scss" scoped>
-.uni-calendar-item__weeks-box {
-	flex: 1;
-	/* #ifndef APP-NVUE */
-	display: flex;
-	/* #endif */
-	flex-direction: column;
-	justify-content: center;
-	align-items: center;
-}
-
-.uni-calendar-item__weeks-box-text {
-	font-size: 24rpx;
-	color: #fff;
-}
-
-.uni-calendar-item__weeks-lunar-text {
-	font-size: $uni-font-size-base;
-	color: $uni-text-color;
-}
-
-.uni-calendar-item__weeks-box-item {
-	position: relative;
-	/* #ifndef APP-NVUE */
-	display: flex;
-	/* #endif */
-	flex-direction: column;
-	justify-content: center;
-	align-items: center;
-	width: 100rpx;
-	height: 100rpx;
-	border-radius: 50%;
-}
-
-.uni-calendar-item__weeks-box-circle {
-	position: absolute;
-	top: 10rpx;
-	right: 10rpx;
-	width: 16rpx;
-	height: 16rpx;
-	border-radius: 16rpx;
-	background-color: $uni-color-error;
-}
-
-.uni-calendar-item--disable {
-	color: #feaa93;
-}
-
-.uni-calendar-item--isDay-text {
-	color: #fff;
-}
-
-.uni-calendar-item--isDay {
-	color: #000;
-	background-color: #fff;
-	border-radius: 50%;
-}
-
-.uni-calendar-item--extra {
-	// color: $uni-color-error;
-	// opacity: 0.8;
-}
-
-.uni-calendar-item--checked {
-	color: #fff;
-	background: rgba(255, 255, 255, 0.2);
-	border-radius: 50%;
-}
-
-.uni-calendar-item--multiple {
-	background-color: $uni-color-primary;
-	color: #fff;
-	opacity: 0.8;
-}
-.uni-calendar-item--before-checked {
-	background-color: #ff5a5f;
-	color: #fff;
-}
-.uni-calendar-item--after-checked {
-	background-color: #ff5a5f;
-	color: #fff;
-}
-</style>
+<template>
+	<view
+		class="uni-calendar-item__weeks-box"
+		:class="{
+			'uni-calendar-item--disable': weeks.disable,
+			'uni-calendar-item--isDay': calendar.fullDate === weeks.fullDate && weeks.isDay,
+			'uni-calendar-item--checked': calendar.fullDate === weeks.fullDate && !weeks.isDay,
+			'uni-calendar-item--before-checked': weeks.beforeMultiple,
+			'uni-calendar-item--multiple': weeks.multiple,
+			'uni-calendar-item--after-checked': weeks.afterMultiple
+		}"
+		@click="choiceDate(weeks)"
+	>
+		<view class="uni-calendar-item__weeks-box-item">
+			<text v-if="selected && weeks.extraInfo" class="uni-calendar-item__weeks-box-circle"></text>
+			<text class="uni-calendar-item__weeks-box-text"
+				:class="{
+					'uni-calendar-item--isDay-text': weeks.isDay,
+					'uni-calendar-item--isDay': calendar.fullDate === weeks.fullDate && weeks.isDay,
+					'uni-calendar-item--checked': calendar.fullDate === weeks.fullDate && !weeks.isDay,
+					'uni-calendar-item--before-checked': weeks.beforeMultiple,
+					'uni-calendar-item--multiple': weeks.multiple,
+					'uni-calendar-item--after-checked': weeks.afterMultiple,
+					'uni-calendar-item--disable': weeks.disable
+				}"
+			>
+				{{ weeks.date }}
+			</text>
+			<text v-if="!lunar && !weeks.extraInfo && weeks.isDay" class="uni-calendar-item__weeks-lunar-text"
+				:class="{
+					'uni-calendar-item--isDay-text': weeks.isDay,
+					'uni-calendar-item--isDay': calendar.fullDate === weeks.fullDate && weeks.isDay,
+					'uni-calendar-item--checked': calendar.fullDate === weeks.fullDate && !weeks.isDay,
+					'uni-calendar-item--before-checked': weeks.beforeMultiple,
+					'uni-calendar-item--multiple': weeks.multiple,
+					'uni-calendar-item--after-checked': weeks.afterMultiple
+				}"
+			></text>
+			<text v-if="lunar && !weeks.extraInfo" class="uni-calendar-item__weeks-lunar-text"
+				:class="{
+					'uni-calendar-item--isDay-text': weeks.isDay,
+					'uni-calendar-item--isDay': calendar.fullDate === weeks.fullDate && weeks.isDay,
+					'uni-calendar-item--checked': calendar.fullDate === weeks.fullDate && !weeks.isDay,
+					'uni-calendar-item--before-checked': weeks.beforeMultiple,
+					'uni-calendar-item--multiple': weeks.multiple,
+					'uni-calendar-item--after-checked': weeks.afterMultiple,
+					'uni-calendar-item--disable': weeks.disable
+				}"
+			>
+				{{ weeks.isDay ? '今天' : weeks.lunar.IDayCn === '初一' ? weeks.lunar.IMonthCn : weeks.lunar.IDayCn }}
+			</text>
+			<text v-if="weeks.extraInfo && weeks.extraInfo.info" class="uni-calendar-item__weeks-lunar-text"
+				:class="{
+					'uni-calendar-item--extra': weeks.extraInfo.info,
+					'uni-calendar-item--isDay-text': weeks.isDay,
+					'uni-calendar-item--isDay': calendar.fullDate === weeks.fullDate && weeks.isDay,
+					'uni-calendar-item--checked': calendar.fullDate === weeks.fullDate && !weeks.isDay,
+					'uni-calendar-item--before-checked': weeks.beforeMultiple,
+					'uni-calendar-item--multiple': weeks.multiple,
+					'uni-calendar-item--after-checked': weeks.afterMultiple,
+					'uni-calendar-item--disable': weeks.disable
+				}"
+			>
+				{{ weeks.extraInfo.info }}
+			</text>
+		</view>
+	</view>
+</template>
+
+<script>
+export default {
+	props: {
+		weeks: {
+			type: Object,
+			default() {
+				return {};
+			}
+		},
+		calendar: {
+			type: Object,
+			default: () => {
+				return {};
+			}
+		},
+		selected: {
+			type: Array,
+			default: () => {
+				return [];
+			}
+		},
+		lunar: {
+			type: Boolean,
+			default: false
+		}
+	},
+	methods: {
+		choiceDate(weeks) {
+			this.$emit('change', weeks);
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+.uni-calendar-item__weeks-box {
+	flex: 1;
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	flex-direction: column;
+	justify-content: center;
+	align-items: center;
+}
+
+.uni-calendar-item__weeks-box-text {
+	font-size: 24rpx;
+	color: #fff;
+}
+
+.uni-calendar-item__weeks-lunar-text {
+	font-size: $uni-font-size-base;
+	color: $uni-text-color;
+}
+
+.uni-calendar-item__weeks-box-item {
+	position: relative;
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	flex-direction: column;
+	justify-content: center;
+	align-items: center;
+	width: 100rpx;
+	height: 100rpx;
+	border-radius: 50%;
+}
+
+.uni-calendar-item__weeks-box-circle {
+	position: absolute;
+	top: 10rpx;
+	right: 10rpx;
+	width: 16rpx;
+	height: 16rpx;
+	border-radius: 16rpx;
+	background-color: $uni-color-error;
+}
+
+.uni-calendar-item--disable {
+	color: #feaa93;
+}
+
+.uni-calendar-item--isDay-text {
+	color: #fff;
+}
+
+.uni-calendar-item--isDay {
+	color: #000;
+	background-color: #fff;
+	border-radius: 50%;
+}
+
+.uni-calendar-item--extra {
+	// color: $uni-color-error;
+	// opacity: 0.8;
+}
+
+.uni-calendar-item--checked {
+	color: #fff;
+	background: rgba(255, 255, 255, 0.2);
+	border-radius: 50%;
+}
+
+.uni-calendar-item--multiple {
+	background-color: $uni-color-primary;
+	color: #fff;
+	opacity: 0.8;
+}
+.uni-calendar-item--before-checked {
+	background-color: #ff5a5f;
+	color: #fff;
+}
+.uni-calendar-item--after-checked {
+	background-color: #ff5a5f;
+	color: #fff;
+}
+</style>
diff --git a/pages_tool/components/uni-calendar/uni-calendar.vue b/pages_tool/components/uni-calendar/uni-calendar.vue
index 6234826..604f6d4 100644
--- a/pages_tool/components/uni-calendar/uni-calendar.vue
+++ b/pages_tool/components/uni-calendar/uni-calendar.vue
@@ -1,476 +1,476 @@
-<template>
-	<view class="uni-calendar">
-		<view v-if="!insert && show" class="uni-calendar__mask" :class="{ 'uni-calendar--mask-show': aniMaskShow }" @click="clean"></view>
-		<view v-if="insert || show" class="uni-calendar__content" :class="{ 'uni-calendar--fixed': !insert, 'uni-calendar--ani-show': aniMaskShow }">
-			<view v-if="!insert" class="uni-calendar__header uni-calendar--fixed-top">
-				<view class="uni-calendar__header-btn-box" @click="close"><text class="uni-calendar__header-text uni-calendar--fixed-width">取消</text></view>
-				<view class="uni-calendar__header-btn-box" @click="confirm"><text class="uni-calendar__header-text uni-calendar--fixed-width">确定</text></view>
-			</view>
-			<view class="uni-calendar__header">
-				<view class="uni-calendar__header-btn-box" @click.stop="pre">
-					<!-- <view class="uni-calendar__header-btn uni-calendar--left"></view> -->
-					<text class="iconfont icon-back_light"></text>
-				</view>
-				<picker mode="date" :value="date" fields="month" @change="bindDateChange">
-					<text class="uni-calendar__header-text">{{ (nowDate.year || '') + '年' + (nowDate.month || '') + '月' }}</text>
-				</picker>
-				<view class="uni-calendar__header-btn-box" @click.stop="next">
-					<!-- <view class="uni-calendar__header-btn uni-calendar--right"></view> -->
-					<text class="iconfont icon-right"></text>
-				</view>
-			</view>
-			<view class="uni-calendar__box">
-				<view v-if="showMonth" class="uni-calendar__box-bg">
-					<text class="uni-calendar__box-bg-text">{{ nowDate.month }}</text>
-				</view>
-				<view class="uni-calendar__weeks">
-					<view class="uni-calendar__weeks-day"><text class="uni-calendar__weeks-day-text">日</text></view>
-					<view class="uni-calendar__weeks-day"><text class="uni-calendar__weeks-day-text">一</text></view>
-					<view class="uni-calendar__weeks-day"><text class="uni-calendar__weeks-day-text">二</text></view>
-					<view class="uni-calendar__weeks-day"><text class="uni-calendar__weeks-day-text">三</text></view>
-					<view class="uni-calendar__weeks-day"><text class="uni-calendar__weeks-day-text">四</text></view>
-					<view class="uni-calendar__weeks-day"><text class="uni-calendar__weeks-day-text">五</text></view>
-					<view class="uni-calendar__weeks-day"><text class="uni-calendar__weeks-day-text">六</text></view>
-				</view>
-				<view class="uni-calendar__weeks" v-for="(item, weekIndex) in weeks" :key="weekIndex">
-					<view class="uni-calendar__weeks-item" v-for="(weeks, weeksIndex) in item" :key="weeksIndex">
-						<uni-calendar-item :weeks="weeks" :calendar="calendar" :selected="selected" :lunar="lunar" @change="choiceDate"></uni-calendar-item>
-					</view>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-import Calendar from './util.js';
-import uniCalendarItem from './uni-calendar-item.vue';
-/**
- * Calendar 日历
- * @description 日历组件可以查看日期，选择任意范围内的日期，打点操作。常用场景如：酒店日期预订、火车机票选择购买日期、上下班打卡等
- * @tutorial https://ext.dcloud.net.cn/plugin?id=56
- * @property {String} date 自定义当前时间，默认为今天
- * @property {Boolean} lunar 显示农历
- * @property {String} startDate 日期选择范围-开始日期
- * @property {String} endDate 日期选择范围-结束日期
- * @property {Boolean} range 范围选择
- * @property {Boolean} insert = [true|false] 插入模式,默认为false
- * 	@value true 弹窗模式
- * 	@value false 插入模式
- * @property {Boolean} clearDate = [true|false] 弹窗模式是否清空上次选择内容
- * @property {Array} selected 打点，期待格式[{date: '2019-06-27', info: '签到', data: { custom: '自定义信息', name: '自定义消息头',xxx:xxx... }}]
- * @property {Boolean} showMonth 是否选择月份为背景
- * @event {Function} change 日期改变，`insert :ture` 时生效
- * @event {Function} confirm 确认选择`insert :false` 时生效
- * @event {Function} monthSwitch 切换月份时触发
- * @example <uni-calendar :insert="true":lunar="true" :start-date="'2019-3-2'":end-date="'2019-5-20'"@change="change" />
- */
-export default {
-	components: {
-		uniCalendarItem
-	},
-	props: {
-		date: {
-			type: String,
-			default: ''
-		},
-		selected: {
-			type: Array,
-			default() {
-				return [];
-			}
-		},
-		lunar: {
-			type: Boolean,
-			default: false
-		},
-		startDate: {
-			type: String,
-			default: ''
-		},
-		endDate: {
-			type: String,
-			default: ''
-		},
-		range: {
-			type: Boolean,
-			default: false
-		},
-		insert: {
-			type: Boolean,
-			default: true
-		},
-		showMonth: {
-			type: Boolean,
-			default: true
-		},
-		clearDate: {
-			type: Boolean,
-			default: true
-		}
-	},
-	data() {
-		return {
-			show: false,
-			weeks: [],
-			calendar: {},
-			nowDate: '',
-			aniMaskShow: false
-		};
-	},
-	watch: {
-		date(newVal) {
-			this.cale.setDate(newVal);
-			this.init(this.cale.selectDate.fullDate);
-		},
-		startDate(val) {
-			this.cale.resetSatrtDate(val);
-		},
-		endDate(val) {
-			this.cale.resetEndDate(val);
-		},
-		selected(newVal) {
-			this.cale.setSelectInfo(this.nowDate.fullDate, newVal);
-			this.weeks = this.cale.weeks;
-		}
-	},
-	created() {
-		// 获取日历方法实例
-		this.cale = new Calendar({
-			// date: new Date(),
-			selected: this.selected,
-			startDate: this.startDate,
-			endDate: this.endDate,
-			range: this.range
-		});
-		// 选中某一天
-		this.cale.setDate(this.date);
-		this.init(this.cale.selectDate.fullDate);
-		// this.setDay
-	},
-	methods: {
-		// 取消穿透
-		clean() {},
-		bindDateChange(e) {
-			const value = e.detail.value + '-1';
-			this.cale.setDate(value);
-			this.init(value);
-		},
-		/**
-		 * 初始化日期显示
-		 * @param {Object} date
-		 */
-		init(date) {
-			this.weeks = this.cale.weeks;
-			this.nowDate = this.calendar = this.cale.getInfo(date);
-		},
-		/**
-		 * 打开日历弹窗
-		 */
-		open() {
-			// 弹窗模式并且清理数据
-			if (this.clearDate && !this.insert) {
-				this.cale.cleanMultipleStatus();
-				this.cale.setDate(this.date);
-				this.init(this.cale.selectDate.fullDate);
-			}
-			this.show = true;
-			this.$nextTick(() => {
-				setTimeout(() => {
-					this.aniMaskShow = true;
-				}, 50);
-			});
-		},
-		/**
-		 * 关闭日历弹窗
-		 */
-		close() {
-			this.aniMaskShow = false;
-			this.$nextTick(() => {
-				setTimeout(() => {
-					this.show = false;
-					this.$emit('close');
-				}, 300);
-			});
-		},
-		/**
-		 * 确认按钮
-		 */
-		confirm() {
-			this.setEmit('confirm');
-			this.close();
-		},
-		/**
-		 * 变化触发
-		 */
-		change() {
-			if (!this.insert) return;
-			this.setEmit('change');
-		},
-		/**
-		 * 选择月份触发
-		 */
-		monthSwitch() {
-			let { year, month } = this.nowDate;
-			this.$emit('monthSwitch', {
-				year,
-				month: Number(month)
-			});
-		},
-		/**
-		 * 派发事件
-		 * @param {Object} name
-		 */
-		setEmit(name) {
-			let { year, month, date, fullDate, lunar, extraInfo } = this.calendar;
-			this.$emit(name, {
-				range: this.cale.multipleStatus,
-				year,
-				month,
-				date,
-				fulldate: fullDate,
-				lunar,
-				extraInfo: extraInfo || {}
-			});
-		},
-		/**
-		 * 选择天触发
-		 * @param {Object} weeks
-		 */
-		choiceDate(weeks) {
-			if (weeks.disable) return;
-			this.calendar = weeks;
-			// 设置多选
-			this.cale.setMultiple(this.calendar.fullDate);
-			this.weeks = this.cale.weeks;
-			this.change();
-		},
-		/**
-		 * 回到今天
-		 */
-		backtoday() {
-			let date = this.cale.getDate(new Date()).fullDate;
-			this.cale.setDate(date);
-			this.init(date);
-			this.change();
-		},
-		/**
-		 * 上个月
-		 */
-		pre() {
-			const preDate = this.cale.getDate(this.nowDate.fullDate, -1, 'month').fullDate;
-			this.setDate(preDate);
-			this.monthSwitch();
-		},
-		/**
-		 * 下个月
-		 */
-		next() {
-			const nextDate = this.cale.getDate(this.nowDate.fullDate, +1, 'month').fullDate;
-			this.setDate(nextDate);
-			this.monthSwitch();
-		},
-		/**
-		 * 设置日期
-		 * @param {Object} date
-		 */
-		setDate(date) {
-			this.cale.setDate(date);
-			this.weeks = this.cale.weeks;
-			this.nowDate = this.cale.getInfo(date);
-		}
-	}
-};
-</script>
-
-<style lang="scss" scoped>
-.uni-calendar {
-	/* #ifndef APP-NVUE */
-	display: flex;
-	/* #endif */
-	flex-direction: column;
-}
-
-.uni-calendar__mask {
-	position: fixed;
-	bottom: 0;
-	top: 0;
-	left: 0;
-	right: 0;
-	background-color: $uni-bg-color-mask;
-	transition-property: opacity;
-	transition-duration: 0.3s;
-	opacity: 0;
-	/* #ifndef APP-NVUE */
-	z-index: 99;
-	/* #endif */
-}
-
-.uni-calendar--mask-show {
-	opacity: 1;
-}
-
-.uni-calendar--fixed {
-	position: fixed;
-	bottom: 0;
-	left: 0;
-	right: 0;
-	transition-property: transform;
-	transition-duration: 0.3s;
-	transform: translateY(460px);
-	/* #ifndef APP-NVUE */
-	z-index: 99;
-	/* #endif */
-}
-
-.uni-calendar--ani-show {
-	transform: translateY(0);
-}
-
-.uni-calendar__content {
-	background: linear-gradient(180deg, rgba(247, 0, 66, 1), rgba(254, 147, 76, 1));
-	border-bottom-left-radius: 24rpx;
-	border-bottom-right-radius: 24rpx;
-}
-
-.uni-calendar__header {
-	position: relative;
-	/* #ifndef APP-NVUE */
-	display: flex;
-	/* #endif */
-	flex-direction: row;
-	justify-content: space-between;
-	align-items: center;
-	height: 56rpx;
-	width: 657rpx;
-	margin: 0 auto;
-	background-color: #fa556a;
-	border-radius: 28px;
-}
-
-.uni-calendar--fixed-top {
-	/* #ifndef APP-NVUE */
-	display: flex;
-	/* #endif */
-	flex-direction: row;
-	justify-content: space-between;
-	border-top-color: $uni-border-color;
-	border-top-style: solid;
-	border-top-width: 1px;
-}
-
-.uni-calendar--fixed-width {
-	width: 50px;
-	// padding: 0 15px;
-}
-
-.uni-calendar__backtoday {
-	position: absolute;
-	right: 0;
-	top: 25rpx;
-	padding: 0 5px;
-	padding-left: 10px;
-	height: 25px;
-	line-height: 25px;
-	font-size: 12px;
-	border-top-left-radius: 25px;
-	border-bottom-left-radius: 25px;
-	color: $uni-text-color;
-	background-color: $uni-bg-color-hover;
-}
-
-.uni-calendar__header-text {
-	text-align: center;
-	width: 100px;
-	font-size: 26rpx;
-	color: #fff;
-}
-
-.uni-calendar__header-btn-box {
-	/* #ifndef APP-NVUE */
-	display: flex;
-	/* #endif */
-	flex-direction: row;
-	align-items: center;
-	justify-content: center;
-	width: 50px;
-	height: 50px;
-	color: #fff !important;
-}
-
-.uni-calendar__header-btn {
-	width: 10px;
-	height: 10px;
-	border-left-color: $uni-text-color-placeholder;
-	border-left-style: solid;
-	border-left-width: 2px;
-	border-top-color: $uni-color-subtitle;
-	border-top-style: solid;
-	border-top-width: 2px;
-}
-
-.uni-calendar--left {
-	transform: rotate(-45deg);
-}
-
-.uni-calendar--right {
-	transform: rotate(135deg);
-}
-
-.uni-calendar__weeks {
-	position: relative;
-	/* #ifndef APP-NVUE */
-	display: flex;
-	/* #endif */
-	flex-direction: row;
-}
-
-.uni-calendar__weeks-item {
-	flex: 1;
-}
-
-.uni-calendar__weeks-day {
-	flex: 1;
-	/* #ifndef APP-NVUE */
-	display: flex;
-	/* #endif */
-	flex-direction: column;
-	justify-content: center;
-	align-items: center;
-	height: 45px;
-	color: #fff;
-	font-size: 24rpx;
-}
-
-.uni-calendar__weeks-day-text {
-	font-size: 14px;
-}
-
-.uni-calendar__box {
-	position: relative;
-}
-
-.uni-calendar__box-bg {
-	/* #ifndef APP-NVUE */
-	display: flex;
-	/* #endif */
-	justify-content: center;
-	align-items: center;
-	position: absolute;
-	top: 0;
-	left: 0;
-	right: 0;
-	bottom: 0;
-}
-
-.uni-calendar__box-bg-text {
-	font-size: 200px;
-	font-weight: bold;
-	color: $uni-text-color-grey;
-	opacity: 0.1;
-	text-align: center;
-	/* #ifndef APP-NVUE */
-	line-height: 1;
-	/* #endif */
-}
-</style>
+<template>
+	<view class="uni-calendar">
+		<view v-if="!insert && show" class="uni-calendar__mask" :class="{ 'uni-calendar--mask-show': aniMaskShow }" @click="clean"></view>
+		<view v-if="insert || show" class="uni-calendar__content" :class="{ 'uni-calendar--fixed': !insert, 'uni-calendar--ani-show': aniMaskShow }">
+			<view v-if="!insert" class="uni-calendar__header uni-calendar--fixed-top">
+				<view class="uni-calendar__header-btn-box" @click="close"><text class="uni-calendar__header-text uni-calendar--fixed-width">取消</text></view>
+				<view class="uni-calendar__header-btn-box" @click="confirm"><text class="uni-calendar__header-text uni-calendar--fixed-width">确定</text></view>
+			</view>
+			<view class="uni-calendar__header">
+				<view class="uni-calendar__header-btn-box" @click.stop="pre">
+					<!-- <view class="uni-calendar__header-btn uni-calendar--left"></view> -->
+					<text class="iconfont icon-back_light"></text>
+				</view>
+				<picker mode="date" :value="date" fields="month" @change="bindDateChange">
+					<text class="uni-calendar__header-text">{{ (nowDate.year || '') + '年' + (nowDate.month || '') + '月' }}</text>
+				</picker>
+				<view class="uni-calendar__header-btn-box" @click.stop="next">
+					<!-- <view class="uni-calendar__header-btn uni-calendar--right"></view> -->
+					<text class="iconfont icon-right"></text>
+				</view>
+			</view>
+			<view class="uni-calendar__box">
+				<view v-if="showMonth" class="uni-calendar__box-bg">
+					<text class="uni-calendar__box-bg-text">{{ nowDate.month }}</text>
+				</view>
+				<view class="uni-calendar__weeks">
+					<view class="uni-calendar__weeks-day"><text class="uni-calendar__weeks-day-text">日</text></view>
+					<view class="uni-calendar__weeks-day"><text class="uni-calendar__weeks-day-text">一</text></view>
+					<view class="uni-calendar__weeks-day"><text class="uni-calendar__weeks-day-text">二</text></view>
+					<view class="uni-calendar__weeks-day"><text class="uni-calendar__weeks-day-text">三</text></view>
+					<view class="uni-calendar__weeks-day"><text class="uni-calendar__weeks-day-text">四</text></view>
+					<view class="uni-calendar__weeks-day"><text class="uni-calendar__weeks-day-text">五</text></view>
+					<view class="uni-calendar__weeks-day"><text class="uni-calendar__weeks-day-text">六</text></view>
+				</view>
+				<view class="uni-calendar__weeks" v-for="(item, weekIndex) in weeks" :key="weekIndex">
+					<view class="uni-calendar__weeks-item" v-for="(weeks, weeksIndex) in item" :key="weeksIndex">
+						<uni-calendar-item :weeks="weeks" :calendar="calendar" :selected="selected" :lunar="lunar" @change="choiceDate"></uni-calendar-item>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+import Calendar from './util.js';
+import uniCalendarItem from './uni-calendar-item.vue';
+/**
+ * Calendar 日历
+ * @description 日历组件可以查看日期，选择任意范围内的日期，打点操作。常用场景如：酒店日期预订、火车机票选择购买日期、上下班打卡等
+ * @tutorial https://ext.dcloud.net.cn/plugin?id=56
+ * @property {String} date 自定义当前时间，默认为今天
+ * @property {Boolean} lunar 显示农历
+ * @property {String} startDate 日期选择范围-开始日期
+ * @property {String} endDate 日期选择范围-结束日期
+ * @property {Boolean} range 范围选择
+ * @property {Boolean} insert = [true|false] 插入模式,默认为false
+ * 	@value true 弹窗模式
+ * 	@value false 插入模式
+ * @property {Boolean} clearDate = [true|false] 弹窗模式是否清空上次选择内容
+ * @property {Array} selected 打点，期待格式[{date: '2019-06-27', info: '签到', data: { custom: '自定义信息', name: '自定义消息头',xxx:xxx... }}]
+ * @property {Boolean} showMonth 是否选择月份为背景
+ * @event {Function} change 日期改变，`insert :ture` 时生效
+ * @event {Function} confirm 确认选择`insert :false` 时生效
+ * @event {Function} monthSwitch 切换月份时触发
+ * @example <uni-calendar :insert="true":lunar="true" :start-date="'2019-3-2'":end-date="'2019-5-20'"@change="change" />
+ */
+export default {
+	components: {
+		uniCalendarItem
+	},
+	props: {
+		date: {
+			type: String,
+			default: ''
+		},
+		selected: {
+			type: Array,
+			default() {
+				return [];
+			}
+		},
+		lunar: {
+			type: Boolean,
+			default: false
+		},
+		startDate: {
+			type: String,
+			default: ''
+		},
+		endDate: {
+			type: String,
+			default: ''
+		},
+		range: {
+			type: Boolean,
+			default: false
+		},
+		insert: {
+			type: Boolean,
+			default: true
+		},
+		showMonth: {
+			type: Boolean,
+			default: true
+		},
+		clearDate: {
+			type: Boolean,
+			default: true
+		}
+	},
+	data() {
+		return {
+			show: false,
+			weeks: [],
+			calendar: {},
+			nowDate: '',
+			aniMaskShow: false
+		};
+	},
+	watch: {
+		date(newVal) {
+			this.cale.setDate(newVal);
+			this.init(this.cale.selectDate.fullDate);
+		},
+		startDate(val) {
+			this.cale.resetSatrtDate(val);
+		},
+		endDate(val) {
+			this.cale.resetEndDate(val);
+		},
+		selected(newVal) {
+			this.cale.setSelectInfo(this.nowDate.fullDate, newVal);
+			this.weeks = this.cale.weeks;
+		}
+	},
+	created() {
+		// 获取日历方法实例
+		this.cale = new Calendar({
+			// date: new Date(),
+			selected: this.selected,
+			startDate: this.startDate,
+			endDate: this.endDate,
+			range: this.range
+		});
+		// 选中某一天
+		this.cale.setDate(this.date);
+		this.init(this.cale.selectDate.fullDate);
+		// this.setDay
+	},
+	methods: {
+		// 取消穿透
+		clean() {},
+		bindDateChange(e) {
+			const value = e.detail.value + '-1';
+			this.cale.setDate(value);
+			this.init(value);
+		},
+		/**
+		 * 初始化日期显示
+		 * @param {Object} date
+		 */
+		init(date) {
+			this.weeks = this.cale.weeks;
+			this.nowDate = this.calendar = this.cale.getInfo(date);
+		},
+		/**
+		 * 打开日历弹窗
+		 */
+		open() {
+			// 弹窗模式并且清理数据
+			if (this.clearDate && !this.insert) {
+				this.cale.cleanMultipleStatus();
+				this.cale.setDate(this.date);
+				this.init(this.cale.selectDate.fullDate);
+			}
+			this.show = true;
+			this.$nextTick(() => {
+				setTimeout(() => {
+					this.aniMaskShow = true;
+				}, 50);
+			});
+		},
+		/**
+		 * 关闭日历弹窗
+		 */
+		close() {
+			this.aniMaskShow = false;
+			this.$nextTick(() => {
+				setTimeout(() => {
+					this.show = false;
+					this.$emit('close');
+				}, 300);
+			});
+		},
+		/**
+		 * 确认按钮
+		 */
+		confirm() {
+			this.setEmit('confirm');
+			this.close();
+		},
+		/**
+		 * 变化触发
+		 */
+		change() {
+			if (!this.insert) return;
+			this.setEmit('change');
+		},
+		/**
+		 * 选择月份触发
+		 */
+		monthSwitch() {
+			let { year, month } = this.nowDate;
+			this.$emit('monthSwitch', {
+				year,
+				month: Number(month)
+			});
+		},
+		/**
+		 * 派发事件
+		 * @param {Object} name
+		 */
+		setEmit(name) {
+			let { year, month, date, fullDate, lunar, extraInfo } = this.calendar;
+			this.$emit(name, {
+				range: this.cale.multipleStatus,
+				year,
+				month,
+				date,
+				fulldate: fullDate,
+				lunar,
+				extraInfo: extraInfo || {}
+			});
+		},
+		/**
+		 * 选择天触发
+		 * @param {Object} weeks
+		 */
+		choiceDate(weeks) {
+			if (weeks.disable) return;
+			this.calendar = weeks;
+			// 设置多选
+			this.cale.setMultiple(this.calendar.fullDate);
+			this.weeks = this.cale.weeks;
+			this.change();
+		},
+		/**
+		 * 回到今天
+		 */
+		backtoday() {
+			let date = this.cale.getDate(new Date()).fullDate;
+			this.cale.setDate(date);
+			this.init(date);
+			this.change();
+		},
+		/**
+		 * 上个月
+		 */
+		pre() {
+			const preDate = this.cale.getDate(this.nowDate.fullDate, -1, 'month').fullDate;
+			this.setDate(preDate);
+			this.monthSwitch();
+		},
+		/**
+		 * 下个月
+		 */
+		next() {
+			const nextDate = this.cale.getDate(this.nowDate.fullDate, +1, 'month').fullDate;
+			this.setDate(nextDate);
+			this.monthSwitch();
+		},
+		/**
+		 * 设置日期
+		 * @param {Object} date
+		 */
+		setDate(date) {
+			this.cale.setDate(date);
+			this.weeks = this.cale.weeks;
+			this.nowDate = this.cale.getInfo(date);
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+.uni-calendar {
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	flex-direction: column;
+}
+
+.uni-calendar__mask {
+	position: fixed;
+	bottom: 0;
+	top: 0;
+	left: 0;
+	right: 0;
+	background-color: $uni-bg-color-mask;
+	transition-property: opacity;
+	transition-duration: 0.3s;
+	opacity: 0;
+	/* #ifndef APP-NVUE */
+	z-index: 99;
+	/* #endif */
+}
+
+.uni-calendar--mask-show {
+	opacity: 1;
+}
+
+.uni-calendar--fixed {
+	position: fixed;
+	bottom: 0;
+	left: 0;
+	right: 0;
+	transition-property: transform;
+	transition-duration: 0.3s;
+	transform: translateY(460px);
+	/* #ifndef APP-NVUE */
+	z-index: 99;
+	/* #endif */
+}
+
+.uni-calendar--ani-show {
+	transform: translateY(0);
+}
+
+.uni-calendar__content {
+	background: linear-gradient(180deg, rgba(247, 0, 66, 1), rgba(254, 147, 76, 1));
+	border-bottom-left-radius: 24rpx;
+	border-bottom-right-radius: 24rpx;
+}
+
+.uni-calendar__header {
+	position: relative;
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	flex-direction: row;
+	justify-content: space-between;
+	align-items: center;
+	height: 56rpx;
+	width: 657rpx;
+	margin: 0 auto;
+	background-color: #fa556a;
+	border-radius: 28px;
+}
+
+.uni-calendar--fixed-top {
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	flex-direction: row;
+	justify-content: space-between;
+	border-top-color: $uni-border-color;
+	border-top-style: solid;
+	border-top-width: 1px;
+}
+
+.uni-calendar--fixed-width {
+	width: 50px;
+	// padding: 0 15px;
+}
+
+.uni-calendar__backtoday {
+	position: absolute;
+	right: 0;
+	top: 25rpx;
+	padding: 0 5px;
+	padding-left: 10px;
+	height: 25px;
+	line-height: 25px;
+	font-size: 12px;
+	border-top-left-radius: 25px;
+	border-bottom-left-radius: 25px;
+	color: $uni-text-color;
+	background-color: $uni-bg-color-hover;
+}
+
+.uni-calendar__header-text {
+	text-align: center;
+	width: 100px;
+	font-size: 26rpx;
+	color: #fff;
+}
+
+.uni-calendar__header-btn-box {
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	flex-direction: row;
+	align-items: center;
+	justify-content: center;
+	width: 50px;
+	height: 50px;
+	color: #fff !important;
+}
+
+.uni-calendar__header-btn {
+	width: 10px;
+	height: 10px;
+	border-left-color: $uni-text-color-placeholder;
+	border-left-style: solid;
+	border-left-width: 2px;
+	border-top-color: $uni-color-subtitle;
+	border-top-style: solid;
+	border-top-width: 2px;
+}
+
+.uni-calendar--left {
+	transform: rotate(-45deg);
+}
+
+.uni-calendar--right {
+	transform: rotate(135deg);
+}
+
+.uni-calendar__weeks {
+	position: relative;
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	flex-direction: row;
+}
+
+.uni-calendar__weeks-item {
+	flex: 1;
+}
+
+.uni-calendar__weeks-day {
+	flex: 1;
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	flex-direction: column;
+	justify-content: center;
+	align-items: center;
+	height: 45px;
+	color: #fff;
+	font-size: 24rpx;
+}
+
+.uni-calendar__weeks-day-text {
+	font-size: 14px;
+}
+
+.uni-calendar__box {
+	position: relative;
+}
+
+.uni-calendar__box-bg {
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	justify-content: center;
+	align-items: center;
+	position: absolute;
+	top: 0;
+	left: 0;
+	right: 0;
+	bottom: 0;
+}
+
+.uni-calendar__box-bg-text {
+	font-size: 200px;
+	font-weight: bold;
+	color: $uni-text-color-grey;
+	opacity: 0.1;
+	text-align: center;
+	/* #ifndef APP-NVUE */
+	line-height: 1;
+	/* #endif */
+}
+</style>
diff --git a/pages_tool/components/uni-nav-bar/uni-nav-bar.vue b/pages_tool/components/uni-nav-bar/uni-nav-bar.vue
index 5747c52..9475ea5 100644
--- a/pages_tool/components/uni-nav-bar/uni-nav-bar.vue
+++ b/pages_tool/components/uni-nav-bar/uni-nav-bar.vue
@@ -1,220 +1,220 @@
-<template>
-	<view class="uni-navbar">
-		<view
-			:class="{ 'uni-navbar--fixed': fixed, 'uni-navbar--shadow': shadow, 'uni-navbar--border': border }"
-			:style="{ 'background-color': backgroundColor }"
-			class="uni-navbar__content">
-			<uni-status-bar v-if="statusBar" />
-			<view :style="{ color: color, backgroundColor: backgroundColor }" class="uni-navbar__header uni-navbar__content_view">
-				<view @tap="onClickLeft" class="uni-navbar__header-btns uni-navbar__header-btns-left uni-navbar__content_view">
-					<view class="uni-navbar__content_view" v-if="leftIcon.length"><uni-icons :color="color" :type="leftIcon" size="24" /></view>
-					<view :class="{ 'uni-navbar-btn-icon-left': !leftIcon.length }" class="uni-navbar-btn-text uni-navbar__content_view" v-if="leftText.length">
-						<text :style="{ color: color, fontSize: '14px' }">{{ leftText }}</text>
-					</view>
-					<slot name="left" />
-				</view>
-				<view class="uni-navbar__header-container uni-navbar__content_view">
-					<view class="uni-navbar__header-container-inner uni-navbar__content_view" v-if="title.length">
-						<text class="uni-nav-bar-text" :style="{ color: color }">{{ title }}</text>
-					</view>
-					<!-- 标题插槽 -->
-					<slot />
-				</view>
-				<view :class="title.length ? 'uni-navbar__header-btns-right' : ''" @tap="onClickRight" class="uni-navbar__header-btns uni-navbar__content_view">
-					<view class="uni-navbar__content_view" v-if="rightIcon.length"><uni-icons :color="color" :type="rightIcon" size="24" /></view>
-					<!-- 优先显示图标 -->
-					<view class="uni-navbar-btn-text uni-navbar__content_view" v-if="rightText.length && !rightIcon.length">
-						<text class="uni-nav-bar-right-text">{{ rightText }}</text>
-					</view>
-					<slot name="right" />
-				</view>
-			</view>
-		</view>
-		<view class="uni-navbar__placeholder" v-if="fixed">
-			<uni-status-bar v-if="statusBar" />
-			<view class="uni-navbar__placeholder-view" />
-		</view>
-	</view>
-</template>
-
-<script>
-import uniStatusBar from '@/pages_tool/components/uni-status-bar/uni-status-bar.vue';
-import uniIcons from '@/components/uni-icons/uni-icons.vue';
-
-export default {
-	name: 'UniNavBar',
-	components: {
-		uniStatusBar,
-		uniIcons
-	},
-	props: {
-		title: {
-			type: String,
-			default: ''
-		},
-		leftText: {
-			type: String,
-			default: ''
-		},
-		rightText: {
-			type: String,
-			default: ''
-		},
-		leftIcon: {
-			type: String,
-			default: ''
-		},
-		rightIcon: {
-			type: String,
-			default: ''
-		},
-		fixed: {
-			type: [Boolean, String],
-			default: false
-		},
-		color: {
-			type: String,
-			default: '#000000'
-		},
-		backgroundColor: {
-			type: String,
-			default: '#FFFFFF'
-		},
-		statusBar: {
-			type: [Boolean, String],
-			default: false
-		},
-		shadow: {
-			type: [String, Boolean],
-			default: false
-		},
-		border: {
-			type: [String, Boolean],
-			default: true
-		}
-	},
-	mounted() {
-		if (uni.report && this.title !== '') {
-			uni.report('title', this.title);
-		}
-	},
-	methods: {
-		onClickLeft() {
-			this.$emit('clickLeft');
-		},
-		onClickRight() {
-			this.$emit('clickRight');
-		}
-	}
-};
-</script>
-
-<style lang="scss" scoped>
-$nav-height: 44px;
-.uni-nav-bar-text {
-	/* #ifdef APP-PLUS */
-	font-size: 34rpx;
-	/* #endif */
-	/* #ifndef APP-PLUS */
-	font-size: $uni-font-size-lg;
-	/* #endif */
-}
-.uni-nav-bar-right-text {
-	font-size: $uni-font-size-base;
-}
-
-.uni-navbar {
-	width: 750rpx;
-}
-
-.uni-navbar__content {
-	position: relative;
-	width: 750rpx;
-	background-color: $uni-bg-color;
-	overflow: hidden;
-}
-
-.uni-navbar__content_view {
-	/* #ifndef APP-NVUE */
-	display: flex;
-	/* #endif */
-	align-items: center;
-	flex-direction: row;
-	// background-color: #FFFFFF;
-}
-
-.uni-navbar__header {
-	/* #ifndef APP-NVUE */
-	display: flex;
-	/* #endif */
-	flex-direction: row;
-	width: 750rpx;
-	height: $nav-height;
-	line-height: $nav-height;
-	font-size: 16px;
-	// background-color: #ffffff;
-}
-
-.uni-navbar__header-btns {
-	/* #ifndef APP-NVUE */
-	display: flex;
-	/* #endif */
-	flex-wrap: nowrap;
-	width: 120rpx;
-	padding: 0 6px;
-	justify-content: center;
-	align-items: center;
-}
-
-.uni-navbar__header-btns-left {
-	/* #ifndef APP-NVUE */
-	display: flex;
-	/* #endif */
-	width: 150rpx;
-	justify-content: flex-start;
-}
-
-.uni-navbar__header-btns-right {
-	/* #ifndef APP-NVUE */
-	display: flex;
-	/* #endif */
-	width: 150rpx;
-	padding-right: 30rpx;
-	justify-content: flex-end;
-}
-
-.uni-navbar__header-container {
-	flex: 1;
-}
-
-.uni-navbar__header-container-inner {
-	/* #ifndef APP-NVUE */
-	display: flex;
-	/* #endif */
-	flex: 1;
-	align-items: center;
-	justify-content: center;
-	font-size: $uni-font-size-base;
-}
-
-.uni-navbar__placeholder-view {
-	height: $nav-height;
-}
-
-.uni-navbar--fixed {
-	position: fixed;
-	z-index: 998;
-}
-
-.uni-navbar--shadow {
-	/* #ifndef APP-NVUE */
-	box-shadow: 0 1px 6px #ccc;
-	/* #endif */
-}
-
-.uni-navbar--border {
-	border-bottom-width: 1rpx;
-	border-bottom-style: solid;
-	border-bottom-color: $uni-border-color;
-}
-</style>
+<template>
+	<view class="uni-navbar">
+		<view
+			:class="{ 'uni-navbar--fixed': fixed, 'uni-navbar--shadow': shadow, 'uni-navbar--border': border }"
+			:style="{ 'background-color': backgroundColor }"
+			class="uni-navbar__content">
+			<uni-status-bar v-if="statusBar" />
+			<view :style="{ color: color, backgroundColor: backgroundColor }" class="uni-navbar__header uni-navbar__content_view">
+				<view @tap="onClickLeft" class="uni-navbar__header-btns uni-navbar__header-btns-left uni-navbar__content_view">
+					<view class="uni-navbar__content_view" v-if="leftIcon.length"><uni-icons :color="color" :type="leftIcon" size="24" /></view>
+					<view :class="{ 'uni-navbar-btn-icon-left': !leftIcon.length }" class="uni-navbar-btn-text uni-navbar__content_view" v-if="leftText.length">
+						<text :style="{ color: color, fontSize: '14px' }">{{ leftText }}</text>
+					</view>
+					<slot name="left" />
+				</view>
+				<view class="uni-navbar__header-container uni-navbar__content_view">
+					<view class="uni-navbar__header-container-inner uni-navbar__content_view" v-if="title.length">
+						<text class="uni-nav-bar-text" :style="{ color: color }">{{ title }}</text>
+					</view>
+					<!-- 标题插槽 -->
+					<slot />
+				</view>
+				<view :class="title.length ? 'uni-navbar__header-btns-right' : ''" @tap="onClickRight" class="uni-navbar__header-btns uni-navbar__content_view">
+					<view class="uni-navbar__content_view" v-if="rightIcon.length"><uni-icons :color="color" :type="rightIcon" size="24" /></view>
+					<!-- 优先显示图标 -->
+					<view class="uni-navbar-btn-text uni-navbar__content_view" v-if="rightText.length && !rightIcon.length">
+						<text class="uni-nav-bar-right-text">{{ rightText }}</text>
+					</view>
+					<slot name="right" />
+				</view>
+			</view>
+		</view>
+		<view class="uni-navbar__placeholder" v-if="fixed">
+			<uni-status-bar v-if="statusBar" />
+			<view class="uni-navbar__placeholder-view" />
+		</view>
+	</view>
+</template>
+
+<script>
+import uniStatusBar from '@/pages_tool/components/uni-status-bar/uni-status-bar.vue';
+import uniIcons from '@/components/uni-icons/uni-icons.vue';
+
+export default {
+	name: 'UniNavBar',
+	components: {
+		uniStatusBar,
+		uniIcons
+	},
+	props: {
+		title: {
+			type: String,
+			default: ''
+		},
+		leftText: {
+			type: String,
+			default: ''
+		},
+		rightText: {
+			type: String,
+			default: ''
+		},
+		leftIcon: {
+			type: String,
+			default: ''
+		},
+		rightIcon: {
+			type: String,
+			default: ''
+		},
+		fixed: {
+			type: [Boolean, String],
+			default: false
+		},
+		color: {
+			type: String,
+			default: '#000000'
+		},
+		backgroundColor: {
+			type: String,
+			default: '#FFFFFF'
+		},
+		statusBar: {
+			type: [Boolean, String],
+			default: false
+		},
+		shadow: {
+			type: [String, Boolean],
+			default: false
+		},
+		border: {
+			type: [String, Boolean],
+			default: true
+		}
+	},
+	mounted() {
+		if (uni.report && this.title !== '') {
+			uni.report('title', this.title);
+		}
+	},
+	methods: {
+		onClickLeft() {
+			this.$emit('clickLeft');
+		},
+		onClickRight() {
+			this.$emit('clickRight');
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+$nav-height: 44px;
+.uni-nav-bar-text {
+	/* #ifdef APP-PLUS */
+	font-size: 34rpx;
+	/* #endif */
+	/* #ifndef APP-PLUS */
+	font-size: $uni-font-size-lg;
+	/* #endif */
+}
+.uni-nav-bar-right-text {
+	font-size: $uni-font-size-base;
+}
+
+.uni-navbar {
+	width: 750rpx;
+}
+
+.uni-navbar__content {
+	position: relative;
+	width: 750rpx;
+	background-color: $uni-bg-color;
+	overflow: hidden;
+}
+
+.uni-navbar__content_view {
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	align-items: center;
+	flex-direction: row;
+	// background-color: #FFFFFF;
+}
+
+.uni-navbar__header {
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	flex-direction: row;
+	width: 750rpx;
+	height: $nav-height;
+	line-height: $nav-height;
+	font-size: 16px;
+	// background-color: #ffffff;
+}
+
+.uni-navbar__header-btns {
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	flex-wrap: nowrap;
+	width: 120rpx;
+	padding: 0 6px;
+	justify-content: center;
+	align-items: center;
+}
+
+.uni-navbar__header-btns-left {
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	width: 150rpx;
+	justify-content: flex-start;
+}
+
+.uni-navbar__header-btns-right {
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	width: 150rpx;
+	padding-right: 30rpx;
+	justify-content: flex-end;
+}
+
+.uni-navbar__header-container {
+	flex: 1;
+}
+
+.uni-navbar__header-container-inner {
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	flex: 1;
+	align-items: center;
+	justify-content: center;
+	font-size: $uni-font-size-base;
+}
+
+.uni-navbar__placeholder-view {
+	height: $nav-height;
+}
+
+.uni-navbar--fixed {
+	position: fixed;
+	z-index: 998;
+}
+
+.uni-navbar--shadow {
+	/* #ifndef APP-NVUE */
+	box-shadow: 0 1px 6px #ccc;
+	/* #endif */
+}
+
+.uni-navbar--border {
+	border-bottom-width: 1rpx;
+	border-bottom-style: solid;
+	border-bottom-color: $uni-border-color;
+}
+</style>
diff --git a/pages_tool/files/list.vue b/pages_tool/files/list.vue
index 91101b8..d850b08 100644
--- a/pages_tool/files/list.vue
+++ b/pages_tool/files/list.vue
@@ -183,7 +183,7 @@
   }
 </script>
 
-<style lang="scss" scoped>
+<style scoped>
   .search-wrap {
     flex: 0.5;
     padding: 30rpx 30rpx 0;
diff --git a/pages_tool/help/list.vue b/pages_tool/help/list.vue
index ea10cd6..77efc6c 100644
--- a/pages_tool/help/list.vue
+++ b/pages_tool/help/list.vue
@@ -2,9 +2,9 @@
 	<page-meta :page-style="themeColor"></page-meta>
 	<view class="help">
 		<block v-if="dataList.length">
-			<view class="help-item" v-for="(item, index) in dataList" :key="item.class_id || index">
+			<view class="help-item" v-for="(item, index) in dataList" :key="index">
 				<view :class="['item-title', item.child_list.length == 0 ? 'empty' : '']">{{ item.class_name }}</view>
-				<view class="item-content" v-for="(s_item, s_index) in item.child_list" :key="s_item.id || s_index" @click="helpDetail(s_item)">{{ s_item.title }}</view>
+				<view class="item-content" v-for="(s_item, s_index) in item.child_list" :key="s_index" @click="helpDetail(s_item)">{{ s_item.title }}</view>
 			</view>
 		</block>
 		<block v-else><ns-empty text="暂无帮助信息" :isIndex="false"></ns-empty></block>
diff --git a/pages_tool/index/diy.vue b/pages_tool/index/diy.vue
index 0056867..e2b0461 100644
--- a/pages_tool/index/diy.vue
+++ b/pages_tool/index/diy.vue
@@ -65,7 +65,7 @@
 	@import '@/common/css/diy.scss';
 </style>
 
-<style lang="scss" scoped>
+<style scoped>
 	.wap-floating>>>.uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
 		background: none !important;
 	}
diff --git a/pages_tool/login/login.vue b/pages_tool/login/login.vue
index 6a5b160..175c51e 100644
--- a/pages_tool/login/login.vue
+++ b/pages_tool/login/login.vue
@@ -470,7 +470,7 @@
 	}
 </style>
 
-<style lang="scss" scoped>
+<style scoped>
 	/deep/ .reward-popup .uni-popup__wrapper-box {
 		background: none !important;
 		max-width: unset !important;
diff --git a/pages_tool/member/account.vue b/pages_tool/member/account.vue
index a555ef8..c103248 100644
--- a/pages_tool/member/account.vue
+++ b/pages_tool/member/account.vue
@@ -12,7 +12,7 @@
 						</view>
 					</view>
 					<block v-if="dataList.length > 0">
-						<view class="list-item" v-for="(item, index) in dataList" :key="item.withdraw_type_id || index">
+						<view class="list-item" v-for="(item, index) in dataList" :key="index">
 							<view class="item-top">
 								<view class="item-left">
 									<view class="title-text">{{ item.withdraw_type_name }}</view>
@@ -430,7 +430,7 @@
 		padding-bottom: 150rpx;
 	}
 </style>
-<style lang="scss">
+<style>
 	.item-bottom>>>.uni-switch-wrapper .uni-switch-input {
 		height: 48rpx !important;
 		width: 88rpx !important;
diff --git a/pages_tool/member/address.vue b/pages_tool/member/address.vue
index 5e43478..d3cfae4 100644
--- a/pages_tool/member/address.vue
+++ b/pages_tool/member/address.vue
@@ -580,7 +580,7 @@
 		height: calc(100vh - 260rpx);
 	}
 </style>
-<style lang="scss">
+<style>
 	.address-item>>>.uni-switch-wrapper .uni-switch-input {
 		height: 48rpx !important;
 		width: 88rpx !important;
diff --git a/pages_tool/member/balance_detail.vue b/pages_tool/member/balance_detail.vue
index bc4e047..674e0f7 100644
--- a/pages_tool/member/balance_detail.vue
+++ b/pages_tool/member/balance_detail.vue
@@ -27,7 +27,7 @@
 				<!-- 明细列表 -->
 				<block v-if="dataList.length > 0">
 					<view class="detailed-wrap">
-						<view class="balances" v-for="(item, index) in dataList" :key="item.balance_id || index">
+						<view class="balances" v-for="(item, index) in dataList" :key="index">
 							<image :src="$util.img('public/uniapp/balance/recharge.png')" class="balances-img" v-if="item.account_data > 0"></image>
 							<image v-else :src="$util.img('public/uniapp/balance/shopping.png')" mode="widthFix"></image>
 							<view class="balances-info" @click="toFromDetail(item)">
diff --git a/pages_tool/member/card.vue b/pages_tool/member/card.vue
index 23cfb30..a168fa9 100644
--- a/pages_tool/member/card.vue
+++ b/pages_tool/member/card.vue
@@ -222,7 +222,7 @@
 	}
 </style>
 
-<style lang="scss" scoped>
+<style scoped>
 	/deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
 		max-height: unset !important;
 	}
diff --git a/pages_tool/member/collection.vue b/pages_tool/member/collection.vue
index c4910e0..7371d4d 100644
--- a/pages_tool/member/collection.vue
+++ b/pages_tool/member/collection.vue
@@ -79,7 +79,7 @@
 	@import './public/css/collection.scss';
 </style>
 
-<style lang="scss" scoped>
+<style  lang="scss" scoped>
 	/deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
 		max-height: unset !important;
 	}
diff --git a/pages_tool/member/invite_friends.vue b/pages_tool/member/invite_friends.vue
index 7b78904..bea73b6 100644
--- a/pages_tool/member/invite_friends.vue
+++ b/pages_tool/member/invite_friends.vue
@@ -22,7 +22,7 @@
 				<block v-if="inviteList.length > 0">
 					<view class="invitelist_block">
 						<view class="invitelist">
-							<view class="list-item" v-for="(item, index) in inviteList" :key="item.invite_id || index">
+							<view class="list-item" v-for="(item, index) in inviteList" :key="index">
 								<view class="img color-base-border">
 									<image mode="aspectFit" :src="item.headimg == '' ? $util.img($util.getDefaultImage().head) : $util.img(item.headimg)"/>
 								</view>
diff --git a/pages_tool/member/point_detail.vue b/pages_tool/member/point_detail.vue
index 2aea0ae..fd52a39 100644
--- a/pages_tool/member/point_detail.vue
+++ b/pages_tool/member/point_detail.vue
@@ -23,7 +23,7 @@
 				<block v-if="dataList.length">
 					<view class="detailed-wrap">
 						<view class="cont">
-							<view class="detailed-item" v-for="(item, index) in dataList" :key="item.point_id || index">
+							<view class="detailed-item" v-for="(item, index) in dataList" :key="index">
 								<view class="info" @click="toFromDetail(item)">
 									<view class="event">{{ item.type_name }}</view>
 									<view class="time-box">
diff --git a/pages_tool/member/withdrawal.vue b/pages_tool/member/withdrawal.vue
index d020c9f..db6a049 100644
--- a/pages_tool/member/withdrawal.vue
+++ b/pages_tool/member/withdrawal.vue
@@ -6,7 +6,7 @@
 				<block v-if="dataList.length">
 					<view class="detailed-wrap">
 						<view class="cont">
-							<view class="detailed-item" v-for="(item, index) in dataList" :key="item.withdraw_type_id || index" @click="toDetail(item.id)">
+							<view class="detailed-item" v-for="(item, index) in dataList" :key="index" @click="toDetail(item.id)">
 								<view class="info">
 									<view class="event">{{ item.transfer_type_name }}</view>
 									<view>
diff --git a/pages_tool/notice/list.vue b/pages_tool/notice/list.vue
index e192555..76aea2c 100644
--- a/pages_tool/notice/list.vue
+++ b/pages_tool/notice/list.vue
@@ -4,7 +4,7 @@
 		<mescroll-uni @getData="getData" ref="mescroll">
 			<block slot="list">
 				<view class="notice-list" v-if="dataList.length">
-					<view class="notice-item" @click="jumpDetail(item.id)" v-for="(item, index) in dataList" :key="item.notice_id || index">
+					<view class="notice-item" @click="jumpDetail(item.id)" v-for="(item, index) in dataList" :key="index">
 						<view class="title-info">
 							<view class="title">
 								<text v-if="item.is_top == 1" class="color-base-bg tag">置顶</text>
diff --git a/pages_tool/order/refund.vue b/pages_tool/order/refund.vue
index d713205..7cfd496 100644
--- a/pages_tool/order/refund.vue
+++ b/pages_tool/order/refund.vue
@@ -291,7 +291,7 @@ export default {
 <style lang="scss">
 @import './public/css/refund.scss';
 </style>
-<style lang="scss" scoped>
+<style scoped>
 /deep/ .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
 	background: none;
 	max-height: unset !important;
diff --git a/pages_tool/order/refund_batch.vue b/pages_tool/order/refund_batch.vue
index 3f02a6c..a9e3084 100644
--- a/pages_tool/order/refund_batch.vue
+++ b/pages_tool/order/refund_batch.vue
@@ -293,7 +293,7 @@ export default {
 <style lang="scss">
 @import './public/css/refund.scss';
 </style>
-<style lang="scss" scoped>
+<style scoped>
 /deep/ .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
 	background: none;
 	max-height: unset !important;
diff --git a/pages_tool/order/refund_type_select.vue b/pages_tool/order/refund_type_select.vue
index 95f2ae8..1356ef1 100644
--- a/pages_tool/order/refund_type_select.vue
+++ b/pages_tool/order/refund_type_select.vue
@@ -99,7 +99,7 @@
 <style lang="scss">
 	@import './public/css/refund.scss';
 </style>
-<style lang="scss" scoped>
+<style scoped>
 	/deep/ .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
 		background: none;
 		max-height: unset !important;
diff --git a/pages_tool/pay/cashier.vue b/pages_tool/pay/cashier.vue
index b620d4a..b434d42 100644
--- a/pages_tool/pay/cashier.vue
+++ b/pages_tool/pay/cashier.vue
@@ -1,379 +1,379 @@
-<template>
-	<page-meta :page-style="themeColor"></page-meta>
-	<view class="cashier">
-		<block v-if="payInfo">
-			<block v-if="payInfo.pay_status == 0">
-				<text class="content">{{ payInfo.pay_body }}</text>
-				<view class="money-wrap">
-					<text class="unit price-font">￥</text>
-					<text class="money price-font">{{ payInfo.pay_money | moneyFormat }}</text>
-				</view>
-				
-				<block v-if="payTypeList.length > 0">
-					<view class="pay-type">
-						<view class="payment-item" v-for="(item, index) in payTypeList" :key="index" @click="payIndex = index">
-							<view>
-								<text class="iconfont" :class="item.icon"></text>
-								<text class="name">{{ item.name }}</text>
-							</view>
-							<text class="iconfont" :class="payIndex == index ? 'icon-yuan_checked color-base-text' : 'icon-checkboxblank'"></text>
-						</view>
-					</view>
-					<button type="primary" @click="confirm">确认支付</button>
-				</block>
-				<view v-else class="empty">店铺尚未配置支付方式！</view>
-			</block>
-			<ns-empty text="该支付单据已支付" :is-index="true" v-else></ns-empty>
-		</block>
-		<ns-empty text="未获取到支付信息" :is-index="true" v-else></ns-empty>
-		<ns-login ref="login"></ns-login>
-	</view>
-</template>
-
-<script>
-import { Weixin } from 'common/js/wx-jssdk.js';
-
-export default {
-	data() {
-		return {
-			payIndex: 0,
-			// #ifdef H5
-			payTypeList: [
-				{
-					name: '支付宝支付',
-					icon: 'icon-zhifubaozhifu-',
-					type: 'alipay'
-				},
-				{
-					name: '微信支付',
-					icon: 'icon-weixin1',
-					type: 'wechatpay'
-				}
-			],
-			timer: null,
-			// #endif
-			// #ifdef MP-WEIXIN
-			payTypeList: [{
-				name: '微信支付',
-				provider: 'wxpay',
-				icon: 'icon-weixin1',
-				type: 'wechatpay'
-			}],
-			// #endif
-			payInfo: null,
-			outTradeNo: ''
-		};
-	},
-	onLoad(option) {
-		this.getPayType();
-		this.outTradeNo = option.out_trade_no || '';
-		this.getPayInfo();
-	},
-	methods: {
-		getPayInfo() {
-			this.$api.sendRequest({
-				url: '/api/pay/info',
-				data: {
-					out_trade_no: this.outTradeNo
-				},
-				success: res => {
-					if (res.code >= 0 && res.data) {
-						this.payInfo = res.data;
-						if (this.payInfo.pay_status == 0) {
-							setTimeout(() => {
-								this.autoPay();
-							}, 500)
-						}
-					} 
-				}
-			});
-		},
-		getPayType() {
-			this.$api.sendRequest({
-				url: '/api/pay/type',
-				success: res => {
-					if (res.data.pay_type == '') {
-						this.payTypeList = [];
-					} else {
-						this.payTypeList.forEach((val, key) => {
-							if (res.data.pay_type.indexOf(val.type) == -1) {
-								this.payTypeList.splice(key, 1);
-							}
-						});
-					}
-				}
-			});
-		},
-		autoPay(){
-			if (!this.payTypeList.length) return;
-			if (this.$util.isWeiXin()) {
-			 	this.payTypeList.forEach((item, index) => {
-					if (item.type == 'wechatpay') {
-						this.payIndex = index;
-						this.confirm();
-					}
-				})
-			} else if (/AlipayClient/.test(window.navigator.userAgent)) {
-				this.payTypeList.forEach((item, index) => {
-					if (item.type == 'alipay') {
-						this.payIndex = index;
-						this.confirm();
-					}
-				})
-			}
-		},
-		confirm() {
-			if (!this.storeToken) {
-				this.$nextTick(() => {
-					this.$refs.login.open('/pages_tool/pay/cashier?out_trade_no=' + this.outTradeNo);
-				});
-				return;
-			}
-			if (this.payTypeList.length == 0 && this.payInfo.pay_money > 0) {
-				this.$util.showToast({
-					title: '请选择支付方式！'
-				});
-				return;
-			}
-			uni.showLoading({
-				title: '支付中...',
-				mask: true
-			});
-			this.pay();
-		},
-		// #ifdef H5
-		pay() {
-			var payType = this.payTypeList[this.payIndex];
-			if (!payType) return;
-
-			let returnUrl = encodeURIComponent(this.$config.h5Domain + '/pages_tool/pay/result?code=' + this.payInfo.out_trade_no);
-
-			this.$api.sendRequest({
-				url: '/api/pay/pay',
-				data: {
-					out_trade_no: this.payInfo.out_trade_no,
-					pay_type: payType.type,
-					return_url: returnUrl
-				},
-				success: res => {
-					uni.hideLoading();
-					if (res.code >= 0) {
-						switch (payType.type) {
-							case 'alipay':
-								if (this.$util.isWeiXin()) {
-									var wx_alipay = encodeURIComponent(res.data.data);
-									this.$util.redirectTo('/pages/pay/wx_pay/wx_pay', { wx_alipay: wx_alipay, out_trade_no: this.payInfo.out_trade_no }, 'redirectTo');
-								} else {
-									location.href = res.data.data;
-									this.checkPayStatus();
-								}
-								break;
-							case 'wechatpay':
-								if (this.$util.isWeiXin()) {
-									if (uni.getSystemInfoSync().platform == 'ios') {
-										var url = uni.getStorageSync('initUrl');
-									} else {
-										var url = location.href;
-									}
-									// 获取jssdk配置
-									this.$api.sendRequest({
-										url: '/wechat/api/wechat/jssdkconfig',
-										data: { url: url },
-										success: jssdkRes => {
-											var wxJS = new Weixin(),
-												payData = res.data.data;
-											wxJS.init(jssdkRes.data);
-											wxJS.pay(
-												{
-													timestamp: payData.timestamp,
-													nonceStr: payData.nonceStr,
-													package: payData.package,
-													signType: payData.signType,
-													paySign: payData.paySign
-												},
-												res => {
-													if (res.errMsg == 'chooseWXPay:ok') {
-														if (!this.back) this.$util.redirectTo('/pages_tool/pay/result', { code: this.payInfo.out_trade_no }, 'redirectTo');
-														else location.replace(this.back + '/pages_tool/pay/result?code=' + this.payInfo.out_trade_no);
-													} else {
-														this.$util.showToast({ title: res.errMsg });
-													}
-												}
-											);
-										}
-									});
-								} else {
-									location.href = res.data.url;
-									this.checkPayStatus();
-								}
-								break;
-						}
-					} else {
-						this.$util.showToast({ title: res.message });
-					}
-				},
-				fail: res => {
-					uni.hideLoading();
-					this.$util.showToast({ title: 'request:fail' });
-				}
-			});
-		},
-		checkPayStatus() {
-			this.timer = setInterval(() => {
-				this.$api.sendRequest({
-					url: '/api/pay/status',
-					data: { out_trade_no: this.payInfo.out_trade_no },
-					success: res => {
-						if (res.code == 0) {
-							if (res.data.pay_status == 2) {
-								clearInterval(this.timer);
-								this.$util.redirectTo('/pages_tool/pay/result', { code: this.payInfo.out_trade_no }, 'redirectTo');
-							}
-						} else {
-							clearInterval(this.timer);
-						}
-					}
-				});
-			}, 1000);
-		},
-		// #endif
-		// #ifdef MP-WEIXIN
-		pay() {
-			var payType = this.payTypeList[this.payIndex];
-			if (!payType) return;
-
-			this.$api.sendRequest({
-				url: '/api/pay/pay',
-				data: {
-					out_trade_no: this.payInfo.out_trade_no,
-					pay_type: payType.type
-				},
-				success: res => {
-					uni.hideLoading();
-					if (res.code >= 0) {
-						var payData = res.data.data;
-						uni.requestPayment({
-							provider: payType.provider,
-							timeStamp: payData.timeStamp,
-							nonceStr: payData.nonceStr,
-							package: payData.package,
-							signType: payData.signType,
-							paySign: payData.paySign,
-							success: res => {
-								this.$util.redirectTo('/pages_tool/pay/result', { code: this.payInfo.out_trade_no }, 'redirectTo');
-							},
-							fail: res => {
-								this.flag = false;
-								if (res.errMsg == 'requestPayment:fail cancel') {
-									this.$util.showToast({ title: '您已取消支付' });
-								} else {
-									uni.showModal({ content: '支付失败,失败原因: ' + res.errMsg, showCancel: false });
-								}
-							}
-						});
-					} else {
-						this.$util.showToast({ title: res.message });
-					}
-				},
-				fail: res => {
-					uni.hideLoading();
-					this.$util.showToast({ title: 'request:fail' });
-				}
-			});
-		}
-		// #endif
-	},
-	watch: {
-		storeToken: function(nVal, oVal) {
-			if (nVal) {
-				this.getPayInfo();
-			}
-		}
-	},
-	filters: {
-		/**
-		 * 金额格式化输出
-		 * @param {Object} money
-		 */
-		moneyFormat(money) {
-			return parseFloat(money).toFixed(2);
-		}
-	}
-};
-</script>
-
-<style lang="scss" scoped>
-.cashier {
-	display: flex;
-	align-items: center;
-	flex-direction: column;
-	padding: 80rpx 26rpx;
-	.content {
-		white-space: nowrap;
-		overflow: hidden;
-		text-overflow: ellipsis;
-		width: 100%;
-		padding: 0 60rpx;
-		text-align: center;
-	}
-	.money-wrap {
-		font-weight: bold;
-		margin: 40rpx 0;
-		.unit {
-			font-size: 40rpx;
-			margin-right: 6rpx;
-		}
-		.money {
-			font-size: 70rpx;
-		}
-	}
-
-	.pay-type {
-		width: 100%;
-		background: #fff;
-		border-radius: 20rpx;
-		.payment-item {
-			display: flex;
-			align-items: center;
-			justify-content: space-between;
-			height: 90rpx;
-			border-bottom: 2rpx solid $color-line;
-			padding: 20rpx 30rpx;
-			&:last-of-type {
-				border-bottom: none;
-			}
-			> view {
-				display: flex;
-				align-items: center;
-				.name {
-					margin-left: 20rpx;
-				}
-			}
-			.iconfont {
-				font-size: 64rpx;
-			}
-			.icon-weixin1 {
-				color: #24af41;
-			}
-			.icon-zhifubaozhifu- {
-				color: #00a0e9;
-			}
-			.icon-yuan_checked {
-				font-size: 40rpx;
-				color: $base-color;
-			}
-			.icon-checkboxblank {
-				font-size: 40rpx;
-			}
-		}
-	}
-	button {
-		width: 100%;
-		margin-top: 80rpx !important;
-		background: $base-color;
-		height: 90rpx;
-		line-height: 90rpx;
-		border-radius: 90rpx;
-	}
-}
-</style>
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view class="cashier">
+		<block v-if="payInfo">
+			<block v-if="payInfo.pay_status == 0">
+				<text class="content">{{ payInfo.pay_body }}</text>
+				<view class="money-wrap">
+					<text class="unit price-font">￥</text>
+					<text class="money price-font">{{ payInfo.pay_money | moneyFormat }}</text>
+				</view>
+				
+				<block v-if="payTypeList.length > 0">
+					<view class="pay-type">
+						<view class="payment-item" v-for="(item, index) in payTypeList" :key="index" @click="payIndex = index">
+							<view>
+								<text class="iconfont" :class="item.icon"></text>
+								<text class="name">{{ item.name }}</text>
+							</view>
+							<text class="iconfont" :class="payIndex == index ? 'icon-yuan_checked color-base-text' : 'icon-checkboxblank'"></text>
+						</view>
+					</view>
+					<button type="primary" @click="confirm">确认支付</button>
+				</block>
+				<view v-else class="empty">店铺尚未配置支付方式！</view>
+			</block>
+			<ns-empty text="该支付单据已支付" :is-index="true" v-else></ns-empty>
+		</block>
+		<ns-empty text="未获取到支付信息" :is-index="true" v-else></ns-empty>
+		<ns-login ref="login"></ns-login>
+	</view>
+</template>
+
+<script>
+import { Weixin } from 'common/js/wx-jssdk.js';
+
+export default {
+	data() {
+		return {
+			payIndex: 0,
+			// #ifdef H5
+			payTypeList: [
+				{
+					name: '支付宝支付',
+					icon: 'icon-zhifubaozhifu-',
+					type: 'alipay'
+				},
+				{
+					name: '微信支付',
+					icon: 'icon-weixin1',
+					type: 'wechatpay'
+				}
+			],
+			timer: null,
+			// #endif
+			// #ifdef MP-WEIXIN
+			payTypeList: [{
+				name: '微信支付',
+				provider: 'wxpay',
+				icon: 'icon-weixin1',
+				type: 'wechatpay'
+			}],
+			// #endif
+			payInfo: null,
+			outTradeNo: ''
+		};
+	},
+	onLoad(option) {
+		this.getPayType();
+		this.outTradeNo = option.out_trade_no || '';
+		this.getPayInfo();
+	},
+	methods: {
+		getPayInfo() {
+			this.$api.sendRequest({
+				url: '/api/pay/info',
+				data: {
+					out_trade_no: this.outTradeNo
+				},
+				success: res => {
+					if (res.code >= 0 && res.data) {
+						this.payInfo = res.data;
+						if (this.payInfo.pay_status == 0) {
+							setTimeout(() => {
+								this.autoPay();
+							}, 500)
+						}
+					} 
+				}
+			});
+		},
+		getPayType() {
+			this.$api.sendRequest({
+				url: '/api/pay/type',
+				success: res => {
+					if (res.data.pay_type == '') {
+						this.payTypeList = [];
+					} else {
+						this.payTypeList.forEach((val, key) => {
+							if (res.data.pay_type.indexOf(val.type) == -1) {
+								this.payTypeList.splice(key, 1);
+							}
+						});
+					}
+				}
+			});
+		},
+		autoPay(){
+			if (!this.payTypeList.length) return;
+			if (this.$util.isWeiXin()) {
+			 	this.payTypeList.forEach((item, index) => {
+					if (item.type == 'wechatpay') {
+						this.payIndex = index;
+						this.confirm();
+					}
+				})
+			} else if (/AlipayClient/.test(window.navigator.userAgent)) {
+				this.payTypeList.forEach((item, index) => {
+					if (item.type == 'alipay') {
+						this.payIndex = index;
+						this.confirm();
+					}
+				})
+			}
+		},
+		confirm() {
+			if (!this.storeToken) {
+				this.$nextTick(() => {
+					this.$refs.login.open('/pages_tool/pay/cashier?out_trade_no=' + this.outTradeNo);
+				});
+				return;
+			}
+			if (this.payTypeList.length == 0 && this.payInfo.pay_money > 0) {
+				this.$util.showToast({
+					title: '请选择支付方式！'
+				});
+				return;
+			}
+			uni.showLoading({
+				title: '支付中...',
+				mask: true
+			});
+			this.pay();
+		},
+		// #ifdef H5
+		pay() {
+			var payType = this.payTypeList[this.payIndex];
+			if (!payType) return;
+
+			let returnUrl = encodeURIComponent(this.$config.h5Domain + '/pages_tool/pay/result?code=' + this.payInfo.out_trade_no);
+
+			this.$api.sendRequest({
+				url: '/api/pay/pay',
+				data: {
+					out_trade_no: this.payInfo.out_trade_no,
+					pay_type: payType.type,
+					return_url: returnUrl
+				},
+				success: res => {
+					uni.hideLoading();
+					if (res.code >= 0) {
+						switch (payType.type) {
+							case 'alipay':
+								if (this.$util.isWeiXin()) {
+									var wx_alipay = encodeURIComponent(res.data.data);
+									this.$util.redirectTo('/pages/pay/wx_pay/wx_pay', { wx_alipay: wx_alipay, out_trade_no: this.payInfo.out_trade_no }, 'redirectTo');
+								} else {
+									location.href = res.data.data;
+									this.checkPayStatus();
+								}
+								break;
+							case 'wechatpay':
+								if (this.$util.isWeiXin()) {
+									if (uni.getSystemInfoSync().platform == 'ios') {
+										var url = uni.getStorageSync('initUrl');
+									} else {
+										var url = location.href;
+									}
+									// 获取jssdk配置
+									this.$api.sendRequest({
+										url: '/wechat/api/wechat/jssdkconfig',
+										data: { url: url },
+										success: jssdkRes => {
+											var wxJS = new Weixin(),
+												payData = res.data.data;
+											wxJS.init(jssdkRes.data);
+											wxJS.pay(
+												{
+													timestamp: payData.timestamp,
+													nonceStr: payData.nonceStr,
+													package: payData.package,
+													signType: payData.signType,
+													paySign: payData.paySign
+												},
+												res => {
+													if (res.errMsg == 'chooseWXPay:ok') {
+														if (!this.back) this.$util.redirectTo('/pages_tool/pay/result', { code: this.payInfo.out_trade_no }, 'redirectTo');
+														else location.replace(this.back + '/pages_tool/pay/result?code=' + this.payInfo.out_trade_no);
+													} else {
+														this.$util.showToast({ title: res.errMsg });
+													}
+												}
+											);
+										}
+									});
+								} else {
+									location.href = res.data.url;
+									this.checkPayStatus();
+								}
+								break;
+						}
+					} else {
+						this.$util.showToast({ title: res.message });
+					}
+				},
+				fail: res => {
+					uni.hideLoading();
+					this.$util.showToast({ title: 'request:fail' });
+				}
+			});
+		},
+		checkPayStatus() {
+			this.timer = setInterval(() => {
+				this.$api.sendRequest({
+					url: '/api/pay/status',
+					data: { out_trade_no: this.payInfo.out_trade_no },
+					success: res => {
+						if (res.code == 0) {
+							if (res.data.pay_status == 2) {
+								clearInterval(this.timer);
+								this.$util.redirectTo('/pages_tool/pay/result', { code: this.payInfo.out_trade_no }, 'redirectTo');
+							}
+						} else {
+							clearInterval(this.timer);
+						}
+					}
+				});
+			}, 1000);
+		},
+		// #endif
+		// #ifdef MP-WEIXIN
+		pay() {
+			var payType = this.payTypeList[this.payIndex];
+			if (!payType) return;
+
+			this.$api.sendRequest({
+				url: '/api/pay/pay',
+				data: {
+					out_trade_no: this.payInfo.out_trade_no,
+					pay_type: payType.type
+				},
+				success: res => {
+					uni.hideLoading();
+					if (res.code >= 0) {
+						var payData = res.data.data;
+						uni.requestPayment({
+							provider: payType.provider,
+							timeStamp: payData.timeStamp,
+							nonceStr: payData.nonceStr,
+							package: payData.package,
+							signType: payData.signType,
+							paySign: payData.paySign,
+							success: res => {
+								this.$util.redirectTo('/pages_tool/pay/result', { code: this.payInfo.out_trade_no }, 'redirectTo');
+							},
+							fail: res => {
+								this.flag = false;
+								if (res.errMsg == 'requestPayment:fail cancel') {
+									this.$util.showToast({ title: '您已取消支付' });
+								} else {
+									uni.showModal({ content: '支付失败,失败原因: ' + res.errMsg, showCancel: false });
+								}
+							}
+						});
+					} else {
+						this.$util.showToast({ title: res.message });
+					}
+				},
+				fail: res => {
+					uni.hideLoading();
+					this.$util.showToast({ title: 'request:fail' });
+				}
+			});
+		}
+		// #endif
+	},
+	watch: {
+		storeToken: function(nVal, oVal) {
+			if (nVal) {
+				this.getPayInfo();
+			}
+		}
+	},
+	filters: {
+		/**
+		 * 金额格式化输出
+		 * @param {Object} money
+		 */
+		moneyFormat(money) {
+			return parseFloat(money).toFixed(2);
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+.cashier {
+	display: flex;
+	align-items: center;
+	flex-direction: column;
+	padding: 80rpx 26rpx;
+	.content {
+		white-space: nowrap;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		width: 100%;
+		padding: 0 60rpx;
+		text-align: center;
+	}
+	.money-wrap {
+		font-weight: bold;
+		margin: 40rpx 0;
+		.unit {
+			font-size: 40rpx;
+			margin-right: 6rpx;
+		}
+		.money {
+			font-size: 70rpx;
+		}
+	}
+
+	.pay-type {
+		width: 100%;
+		background: #fff;
+		border-radius: 20rpx;
+		.payment-item {
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			height: 90rpx;
+			border-bottom: 2rpx solid $color-line;
+			padding: 20rpx 30rpx;
+			&:last-of-type {
+				border-bottom: none;
+			}
+			> view {
+				display: flex;
+				align-items: center;
+				.name {
+					margin-left: 20rpx;
+				}
+			}
+			.iconfont {
+				font-size: 64rpx;
+			}
+			.icon-weixin1 {
+				color: #24af41;
+			}
+			.icon-zhifubaozhifu- {
+				color: #00a0e9;
+			}
+			.icon-yuan_checked {
+				font-size: 40rpx;
+				color: $base-color;
+			}
+			.icon-checkboxblank {
+				font-size: 40rpx;
+			}
+		}
+	}
+	button {
+		width: 100%;
+		margin-top: 80rpx !important;
+		background: $base-color;
+		height: 90rpx;
+		line-height: 90rpx;
+		border-radius: 90rpx;
+	}
+}
+</style>
diff --git a/pages_tool/pay/result.vue b/pages_tool/pay/result.vue
index dd2d5ab..818ece9 100644
--- a/pages_tool/pay/result.vue
+++ b/pages_tool/pay/result.vue
@@ -337,7 +337,7 @@
 	}
 </style>
 
-<style lang="scss" scoped>
+<style scoped>
 	/deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
 		max-height: unset !important;
 	}
diff --git a/pages_tool/seal/medium/detail.vue b/pages_tool/seal/medium/detail.vue
index fe76e1b..5010303 100644
--- a/pages_tool/seal/medium/detail.vue
+++ b/pages_tool/seal/medium/detail.vue
@@ -125,7 +125,7 @@ export default {
 };
 </script>
 
-<style lang="scss" scoped>
+<style scoped>
 .content {
   padding: 20rpx;
 }
diff --git a/pages_tool/seal/medium/search.vue b/pages_tool/seal/medium/search.vue
index 17e7292..38f66e9 100644
--- a/pages_tool/seal/medium/search.vue
+++ b/pages_tool/seal/medium/search.vue
@@ -162,7 +162,7 @@ export default {
 };
 </script>
 
-<style lang="scss" scoped>
+<style scoped>
 .content {
   padding: 20rpx;
   background-color: #f8f8f8;
diff --git a/pages_tool/seal/structure.vue b/pages_tool/seal/structure.vue
index cd6cbb4..c8b9c03 100644
--- a/pages_tool/seal/structure.vue
+++ b/pages_tool/seal/structure.vue
@@ -76,7 +76,7 @@ export default {
 };
 </script>
 
-<style lang="scss" scoped>
+<style scoped>
 .picker-container {
   padding: 20rpx;
   display: flex;
diff --git a/pages_tool/weapp/order_shipping.vue b/pages_tool/weapp/order_shipping.vue
index b9a1996..f63a3ad 100644
--- a/pages_tool/weapp/order_shipping.vue
+++ b/pages_tool/weapp/order_shipping.vue
@@ -40,7 +40,7 @@
 	}
 </script>
 
-<style lang="scss">
+<style>
 	.error-msg{
 		text-align: center;
 		padding-top: 10vh;
diff --git a/uni_modules/mp-html/components/mp-html/mp-html.vue b/uni_modules/mp-html/components/mp-html/mp-html.vue
index f41c237..5d1d36d 100644
--- a/uni_modules/mp-html/components/mp-html/mp-html.vue
+++ b/uni_modules/mp-html/components/mp-html/mp-html.vue
@@ -1,498 +1,498 @@
-<template>
-  <view id="_root" :class="(selectable?'_select ':'')+'_root'" :style="containerStyle">
-    <slot v-if="!nodes[0]" />
-    <!-- #ifndef APP-PLUS-NVUE -->
-    <node v-else :childs="nodes" :opts="[lazyLoad,loadingImg,errorImg,showImgMenu,selectable]" name="span" />
-    <!-- #endif -->
-    <!-- #ifdef APP-PLUS-NVUE -->
-    <web-view ref="web" src="/uni_modules/mp-html/static/app-plus/mp-html/local.html" :style="'margin-top:-2px;height:' + height + 'px'" @onPostMessage="_onMessage" />
-    <!-- #endif -->
-  </view>
-</template>
-
-<script>
-/**
- * mp-html v2.5.0
- * @description 富文本组件
- * @tutorial https://github.com/jin-yufeng/mp-html
- * @property {String} container-style 容器的样式
- * @property {String} content 用于渲染的 html 字符串
- * @property {Boolean} copy-link 是否允许外部链接被点击时自动复制
- * @property {String} domain 主域名，用于拼接链接
- * @property {String} error-img 图片出错时的占位图链接
- * @property {Boolean} lazy-load 是否开启图片懒加载
- * @property {string} loading-img 图片加载过程中的占位图链接
- * @property {Boolean} pause-video 是否在播放一个视频时自动暂停其他视频
- * @property {Boolean} preview-img 是否允许图片被点击时自动预览
- * @property {Boolean} scroll-table 是否给每个表格添加一个滚动层使其能单独横向滚动
- * @property {Boolean | String} selectable 是否开启长按复制
- * @property {Boolean} set-title 是否将 title 标签的内容设置到页面标题
- * @property {Boolean} show-img-menu 是否允许图片被长按时显示菜单
- * @property {Object} tag-style 标签的默认样式
- * @property {Boolean | Number} use-anchor 是否使用锚点链接
- * @event {Function} load dom 结构加载完毕时触发
- * @event {Function} ready 所有图片加载完毕时触发
- * @event {Function} imgtap 图片被点击时触发
- * @event {Function} linktap 链接被点击时触发
- * @event {Function} play 音视频播放时触发
- * @event {Function} error 媒体加载出错时触发
- */
-// #ifndef APP-PLUS-NVUE
-import node from './node/node'
-// #endif
-import Parser from './parser'
-const plugins=[]
-// #ifdef APP-PLUS-NVUE
-const dom = weex.requireModule('dom')
-// #endif
-export default {
-  name: 'mp-html',
-  data () {
-    return {
-      nodes: [],
-      // #ifdef APP-PLUS-NVUE
-      height: 3
-      // #endif
-    }
-  },
-  props: {
-    containerStyle: {
-      type: String,
-      default: ''
-    },
-    content: {
-      type: String,
-      default: ''
-    },
-    copyLink: {
-      type: [Boolean, String],
-      default: true
-    },
-    domain: String,
-    errorImg: {
-      type: String,
-      default: ''
-    },
-    lazyLoad: {
-      type: [Boolean, String],
-      default: false
-    },
-    loadingImg: {
-      type: String,
-      default: ''
-    },
-    pauseVideo: {
-      type: [Boolean, String],
-      default: true
-    },
-    previewImg: {
-      type: [Boolean, String],
-      default: true
-    },
-    scrollTable: [Boolean, String],
-    selectable: [Boolean, String],
-    setTitle: {
-      type: [Boolean, String],
-      default: true
-    },
-    showImgMenu: {
-      type: [Boolean, String],
-      default: true
-    },
-    tagStyle: Object,
-    useAnchor: [Boolean, Number]
-  },
-  // #ifdef VUE3
-  emits: ['load', 'ready', 'imgtap', 'linktap', 'play', 'error'],
-  // #endif
-  // #ifndef APP-PLUS-NVUE
-  components: {
-    node
-  },
-  // #endif
-  watch: {
-    content (content) {
-      this.setContent(content)
-    }
-  },
-  created () {
-    this.plugins = []
-    for (let i = plugins.length; i--;) {
-      this.plugins.push(new plugins[i](this))
-    }
-  },
-  mounted () {
-    if (this.content && !this.nodes.length) {
-      this.setContent(this.content)
-    }
-  },
-  beforeDestroy () {
-    this._hook('onDetached')
-  },
-  methods: {
-    /**
-     * @description 将锚点跳转的范围限定在一个 scroll-view 内
-     * @param {Object} page scroll-view 所在页面的示例
-     * @param {String} selector scroll-view 的选择器
-     * @param {String} scrollTop scroll-view scroll-top 属性绑定的变量名
-     */
-    in (page, selector, scrollTop) {
-      // #ifndef APP-PLUS-NVUE
-      if (page && selector && scrollTop) {
-        this._in = {
-          page,
-          selector,
-          scrollTop
-        }
-      }
-      // #endif
-    },
-
-    /**
-     * @description 锚点跳转
-     * @param {String} id 要跳转的锚点 id
-     * @param {Number} offset 跳转位置的偏移量
-     * @returns {Promise}
-     */
-    navigateTo (id, offset) {
-      return new Promise((resolve, reject) => {
-        if (!this.useAnchor) {
-          reject(Error('Anchor is disabled'))
-          return
-        }
-        offset = offset || parseInt(this.useAnchor) || 0
-        // #ifdef APP-PLUS-NVUE
-        if (!id) {
-          dom.scrollToElement(this.$refs.web, {
-            offset
-          })
-          resolve()
-        } else {
-          this._navigateTo = {
-            resolve,
-            reject,
-            offset
-          }
-          this.$refs.web.evalJs('uni.postMessage({data:{action:"getOffset",offset:(document.getElementById(' + id + ')||{}).offsetTop}})')
-        }
-        // #endif
-        // #ifndef APP-PLUS-NVUE
-        let deep = ' '
-        // #ifdef MP-WEIXIN || MP-QQ || MP-TOUTIAO
-        deep = '>>>'
-        // #endif
-        const selector = uni.createSelectorQuery()
-          // #ifndef MP-ALIPAY
-          .in(this._in ? this._in.page : this)
-          // #endif
-          .select((this._in ? this._in.selector : '._root') + (id ? `${deep}#${id}` : '')).boundingClientRect()
-        if (this._in) {
-          selector.select(this._in.selector).scrollOffset()
-            .select(this._in.selector).boundingClientRect()
-        } else {
-          // 获取 scroll-view 的位置和滚动距离
-          selector.selectViewport().scrollOffset() // 获取窗口的滚动距离
-        }
-        selector.exec(res => {
-          if (!res[0]) {
-            reject(Error('Label not found'))
-            return
-          }
-          const scrollTop = res[1].scrollTop + res[0].top - (res[2] ? res[2].top : 0) + offset
-          if (this._in) {
-            // scroll-view 跳转
-            this._in.page[this._in.scrollTop] = scrollTop
-          } else {
-            // 页面跳转
-            uni.pageScrollTo({
-              scrollTop,
-              duration: 300
-            })
-          }
-          resolve()
-        })
-        // #endif
-      })
-    },
-
-    /**
-     * @description 获取文本内容
-     * @return {String}
-     */
-    getText (nodes) {
-      let text = '';
-      (function traversal (nodes) {
-        for (let i = 0; i < nodes.length; i++) {
-          const node = nodes[i]
-          if (node.type === 'text') {
-            text += node.text.replace(/&amp;/g, '&')
-          } else if (node.name === 'br') {
-            text += '\n'
-          } else {
-            // 块级标签前后加换行
-            const isBlock = node.name === 'p' || node.name === 'div' || node.name === 'tr' || node.name === 'li' || (node.name[0] === 'h' && node.name[1] > '0' && node.name[1] < '7')
-            if (isBlock && text && text[text.length - 1] !== '\n') {
-              text += '\n'
-            }
-            // 递归获取子节点的文本
-            if (node.children) {
-              traversal(node.children)
-            }
-            if (isBlock && text[text.length - 1] !== '\n') {
-              text += '\n'
-            } else if (node.name === 'td' || node.name === 'th') {
-              text += '\t'
-            }
-          }
-        }
-      })(nodes || this.nodes)
-      return text
-    },
-
-    /**
-     * @description 获取内容大小和位置
-     * @return {Promise}
-     */
-    getRect () {
-      return new Promise((resolve, reject) => {
-        uni.createSelectorQuery()
-          // #ifndef MP-ALIPAY
-          .in(this)
-          // #endif
-          .select('#_root').boundingClientRect().exec(res => res[0] ? resolve(res[0]) : reject(Error('Root label not found')))
-      })
-    },
-
-    /**
-     * @description 暂停播放媒体
-     */
-    pauseMedia () {
-      for (let i = (this._videos || []).length; i--;) {
-        this._videos[i].pause()
-      }
-      // #ifdef APP-PLUS
-      const command = 'for(var e=document.getElementsByTagName("video"),i=e.length;i--;)e[i].pause()'
-      // #ifndef APP-PLUS-NVUE
-      let page = this.$parent
-      while (!page.$scope) page = page.$parent
-      page.$scope.$getAppWebview().evalJS(command)
-      // #endif
-      // #ifdef APP-PLUS-NVUE
-      this.$refs.web.evalJs(command)
-      // #endif
-      // #endif
-    },
-
-    /**
-     * @description 设置媒体播放速率
-     * @param {Number} rate 播放速率
-     */
-    setPlaybackRate (rate) {
-      this.playbackRate = rate
-      for (let i = (this._videos || []).length; i--;) {
-        this._videos[i].playbackRate(rate)
-      }
-      // #ifdef APP-PLUS
-      const command = 'for(var e=document.getElementsByTagName("video"),i=e.length;i--;)e[i].playbackRate=' + rate
-      // #ifndef APP-PLUS-NVUE
-      let page = this.$parent
-      while (!page.$scope) page = page.$parent
-      page.$scope.$getAppWebview().evalJS(command)
-      // #endif
-      // #ifdef APP-PLUS-NVUE
-      this.$refs.web.evalJs(command)
-      // #endif
-      // #endif
-    },
-
-    /**
-     * @description 设置内容
-     * @param {String} content html 内容
-     * @param {Boolean} append 是否在尾部追加
-     */
-    setContent (content, append) {
-      if (!append || !this.imgList) {
-        this.imgList = []
-      }
-      const nodes = new Parser(this).parse(content)
-      // #ifdef APP-PLUS-NVUE
-      if (this._ready) {
-        this._set(nodes, append)
-      }
-      // #endif
-      this.$set(this, 'nodes', append ? (this.nodes || []).concat(nodes) : nodes)
-
-      // #ifndef APP-PLUS-NVUE
-      this._videos = []
-      this.$nextTick(() => {
-        this._hook('onLoad')
-        this.$emit('load')
-      })
-
-      if (this.lazyLoad || this.imgList._unloadimgs < this.imgList.length / 2) {
-        // 设置懒加载，每 350ms 获取高度，不变则认为加载完毕
-        let height = 0
-        const callback = rect => {
-          if (!rect || !rect.height) rect = {}
-          // 350ms 总高度无变化就触发 ready 事件
-          if (rect.height === height) {
-            this.$emit('ready', rect)
-          } else {
-            height = rect.height
-            setTimeout(() => {
-              this.getRect().then(callback).catch(callback)
-            }, 350)
-          }
-        }
-        this.getRect().then(callback).catch(callback)
-      } else {
-        // 未设置懒加载，等待所有图片加载完毕
-        if (!this.imgList._unloadimgs) {
-          this.getRect().then(rect => {
-            this.$emit('ready', rect)
-          }).catch(() => {
-            this.$emit('ready', {})
-          })
-        }
-      }
-      // #endif
-    },
-
-    /**
-     * @description 调用插件钩子函数
-     */
-    _hook (name) {
-      for (let i = plugins.length; i--;) {
-        if (this.plugins[i][name]) {
-          this.plugins[i][name]()
-        }
-      }
-    },
-
-    // #ifdef APP-PLUS-NVUE
-    /**
-     * @description 设置内容
-     */
-    _set (nodes, append) {
-      this.$refs.web.evalJs('setContent(' + JSON.stringify(nodes).replace(/%22/g, '') + ',' + JSON.stringify([this.containerStyle.replace(/(?:margin|padding)[^;]+/g, ''), this.errorImg, this.loadingImg, this.pauseVideo, this.scrollTable, this.selectable]) + ',' + append + ')')
-    },
-
-    /**
-     * @description 接收到 web-view 消息
-     */
-    _onMessage (e) {
-      const message = e.detail.data[0]
-      switch (message.action) {
-        // web-view 初始化完毕
-        case 'onJSBridgeReady':
-          this._ready = true
-          if (this.nodes) {
-            this._set(this.nodes)
-          }
-          break
-        // 内容 dom 加载完毕
-        case 'onLoad':
-          this.height = message.height
-          this._hook('onLoad')
-          this.$emit('load')
-          break
-        // 所有图片加载完毕
-        case 'onReady':
-          this.getRect().then(res => {
-            this.$emit('ready', res)
-          }).catch(() => {
-            this.$emit('ready', {})
-          })
-          break
-        // 总高度发生变化
-        case 'onHeightChange':
-          this.height = message.height
-          break
-        // 图片点击
-        case 'onImgTap':
-          this.$emit('imgtap', message.attrs)
-          if (this.previewImg) {
-            uni.previewImage({
-              current: parseInt(message.attrs.i),
-              urls: this.imgList
-            })
-          }
-          break
-        // 链接点击
-        case 'onLinkTap': {
-          const href = message.attrs.href
-          this.$emit('linktap', message.attrs)
-          if (href) {
-            // 锚点跳转
-            if (href[0] === '#') {
-              if (this.useAnchor) {
-                dom.scrollToElement(this.$refs.web, {
-                  offset: message.offset
-                })
-              }
-            } else if (href.includes('://')) {
-              // 打开外链
-              if (this.copyLink) {
-                plus.runtime.openWeb(href)
-              }
-            } else {
-              uni.navigateTo({
-                url: href,
-                fail () {
-                  uni.switchTab({
-                    url: href
-                  })
-                }
-              })
-            }
-          }
-          break
-        }
-        case 'onPlay':
-          this.$emit('play')
-          break
-        // 获取到锚点的偏移量
-        case 'getOffset':
-          if (typeof message.offset === 'number') {
-            dom.scrollToElement(this.$refs.web, {
-              offset: message.offset + this._navigateTo.offset
-            })
-            this._navigateTo.resolve()
-          } else {
-            this._navigateTo.reject(Error('Label not found'))
-          }
-          break
-        // 点击
-        case 'onClick':
-          this.$emit('tap')
-          this.$emit('click')
-          break
-        // 出错
-        case 'onError':
-          this.$emit('error', {
-            source: message.source,
-            attrs: message.attrs
-          })
-      }
-    }
-    // #endif
-  }
-}
-</script>
-
-<style lang="scss">
-/* #ifndef APP-PLUS-NVUE */
-/* 根节点样式 */
-._root {
-  padding: 1px 0;
-  overflow-x: auto;
-  overflow-y: hidden;
-  -webkit-overflow-scrolling: touch;
-}
-
-/* 长按复制 */
-._select {
-  user-select: text;
-}
-/* #endif */
-</style>
+<template>
+  <view id="_root" :class="(selectable?'_select ':'')+'_root'" :style="containerStyle">
+    <slot v-if="!nodes[0]" />
+    <!-- #ifndef APP-PLUS-NVUE -->
+    <node v-else :childs="nodes" :opts="[lazyLoad,loadingImg,errorImg,showImgMenu,selectable]" name="span" />
+    <!-- #endif -->
+    <!-- #ifdef APP-PLUS-NVUE -->
+    <web-view ref="web" src="/uni_modules/mp-html/static/app-plus/mp-html/local.html" :style="'margin-top:-2px;height:' + height + 'px'" @onPostMessage="_onMessage" />
+    <!-- #endif -->
+  </view>
+</template>
+
+<script>
+/**
+ * mp-html v2.5.0
+ * @description 富文本组件
+ * @tutorial https://github.com/jin-yufeng/mp-html
+ * @property {String} container-style 容器的样式
+ * @property {String} content 用于渲染的 html 字符串
+ * @property {Boolean} copy-link 是否允许外部链接被点击时自动复制
+ * @property {String} domain 主域名，用于拼接链接
+ * @property {String} error-img 图片出错时的占位图链接
+ * @property {Boolean} lazy-load 是否开启图片懒加载
+ * @property {string} loading-img 图片加载过程中的占位图链接
+ * @property {Boolean} pause-video 是否在播放一个视频时自动暂停其他视频
+ * @property {Boolean} preview-img 是否允许图片被点击时自动预览
+ * @property {Boolean} scroll-table 是否给每个表格添加一个滚动层使其能单独横向滚动
+ * @property {Boolean | String} selectable 是否开启长按复制
+ * @property {Boolean} set-title 是否将 title 标签的内容设置到页面标题
+ * @property {Boolean} show-img-menu 是否允许图片被长按时显示菜单
+ * @property {Object} tag-style 标签的默认样式
+ * @property {Boolean | Number} use-anchor 是否使用锚点链接
+ * @event {Function} load dom 结构加载完毕时触发
+ * @event {Function} ready 所有图片加载完毕时触发
+ * @event {Function} imgtap 图片被点击时触发
+ * @event {Function} linktap 链接被点击时触发
+ * @event {Function} play 音视频播放时触发
+ * @event {Function} error 媒体加载出错时触发
+ */
+// #ifndef APP-PLUS-NVUE
+import node from './node/node'
+// #endif
+import Parser from './parser'
+const plugins=[]
+// #ifdef APP-PLUS-NVUE
+const dom = weex.requireModule('dom')
+// #endif
+export default {
+  name: 'mp-html',
+  data () {
+    return {
+      nodes: [],
+      // #ifdef APP-PLUS-NVUE
+      height: 3
+      // #endif
+    }
+  },
+  props: {
+    containerStyle: {
+      type: String,
+      default: ''
+    },
+    content: {
+      type: String,
+      default: ''
+    },
+    copyLink: {
+      type: [Boolean, String],
+      default: true
+    },
+    domain: String,
+    errorImg: {
+      type: String,
+      default: ''
+    },
+    lazyLoad: {
+      type: [Boolean, String],
+      default: false
+    },
+    loadingImg: {
+      type: String,
+      default: ''
+    },
+    pauseVideo: {
+      type: [Boolean, String],
+      default: true
+    },
+    previewImg: {
+      type: [Boolean, String],
+      default: true
+    },
+    scrollTable: [Boolean, String],
+    selectable: [Boolean, String],
+    setTitle: {
+      type: [Boolean, String],
+      default: true
+    },
+    showImgMenu: {
+      type: [Boolean, String],
+      default: true
+    },
+    tagStyle: Object,
+    useAnchor: [Boolean, Number]
+  },
+  // #ifdef VUE3
+  emits: ['load', 'ready', 'imgtap', 'linktap', 'play', 'error'],
+  // #endif
+  // #ifndef APP-PLUS-NVUE
+  components: {
+    node
+  },
+  // #endif
+  watch: {
+    content (content) {
+      this.setContent(content)
+    }
+  },
+  created () {
+    this.plugins = []
+    for (let i = plugins.length; i--;) {
+      this.plugins.push(new plugins[i](this))
+    }
+  },
+  mounted () {
+    if (this.content && !this.nodes.length) {
+      this.setContent(this.content)
+    }
+  },
+  beforeDestroy () {
+    this._hook('onDetached')
+  },
+  methods: {
+    /**
+     * @description 将锚点跳转的范围限定在一个 scroll-view 内
+     * @param {Object} page scroll-view 所在页面的示例
+     * @param {String} selector scroll-view 的选择器
+     * @param {String} scrollTop scroll-view scroll-top 属性绑定的变量名
+     */
+    in (page, selector, scrollTop) {
+      // #ifndef APP-PLUS-NVUE
+      if (page && selector && scrollTop) {
+        this._in = {
+          page,
+          selector,
+          scrollTop
+        }
+      }
+      // #endif
+    },
+
+    /**
+     * @description 锚点跳转
+     * @param {String} id 要跳转的锚点 id
+     * @param {Number} offset 跳转位置的偏移量
+     * @returns {Promise}
+     */
+    navigateTo (id, offset) {
+      return new Promise((resolve, reject) => {
+        if (!this.useAnchor) {
+          reject(Error('Anchor is disabled'))
+          return
+        }
+        offset = offset || parseInt(this.useAnchor) || 0
+        // #ifdef APP-PLUS-NVUE
+        if (!id) {
+          dom.scrollToElement(this.$refs.web, {
+            offset
+          })
+          resolve()
+        } else {
+          this._navigateTo = {
+            resolve,
+            reject,
+            offset
+          }
+          this.$refs.web.evalJs('uni.postMessage({data:{action:"getOffset",offset:(document.getElementById(' + id + ')||{}).offsetTop}})')
+        }
+        // #endif
+        // #ifndef APP-PLUS-NVUE
+        let deep = ' '
+        // #ifdef MP-WEIXIN || MP-QQ || MP-TOUTIAO
+        deep = '>>>'
+        // #endif
+        const selector = uni.createSelectorQuery()
+          // #ifndef MP-ALIPAY
+          .in(this._in ? this._in.page : this)
+          // #endif
+          .select((this._in ? this._in.selector : '._root') + (id ? `${deep}#${id}` : '')).boundingClientRect()
+        if (this._in) {
+          selector.select(this._in.selector).scrollOffset()
+            .select(this._in.selector).boundingClientRect()
+        } else {
+          // 获取 scroll-view 的位置和滚动距离
+          selector.selectViewport().scrollOffset() // 获取窗口的滚动距离
+        }
+        selector.exec(res => {
+          if (!res[0]) {
+            reject(Error('Label not found'))
+            return
+          }
+          const scrollTop = res[1].scrollTop + res[0].top - (res[2] ? res[2].top : 0) + offset
+          if (this._in) {
+            // scroll-view 跳转
+            this._in.page[this._in.scrollTop] = scrollTop
+          } else {
+            // 页面跳转
+            uni.pageScrollTo({
+              scrollTop,
+              duration: 300
+            })
+          }
+          resolve()
+        })
+        // #endif
+      })
+    },
+
+    /**
+     * @description 获取文本内容
+     * @return {String}
+     */
+    getText (nodes) {
+      let text = '';
+      (function traversal (nodes) {
+        for (let i = 0; i < nodes.length; i++) {
+          const node = nodes[i]
+          if (node.type === 'text') {
+            text += node.text.replace(/&amp;/g, '&')
+          } else if (node.name === 'br') {
+            text += '\n'
+          } else {
+            // 块级标签前后加换行
+            const isBlock = node.name === 'p' || node.name === 'div' || node.name === 'tr' || node.name === 'li' || (node.name[0] === 'h' && node.name[1] > '0' && node.name[1] < '7')
+            if (isBlock && text && text[text.length - 1] !== '\n') {
+              text += '\n'
+            }
+            // 递归获取子节点的文本
+            if (node.children) {
+              traversal(node.children)
+            }
+            if (isBlock && text[text.length - 1] !== '\n') {
+              text += '\n'
+            } else if (node.name === 'td' || node.name === 'th') {
+              text += '\t'
+            }
+          }
+        }
+      })(nodes || this.nodes)
+      return text
+    },
+
+    /**
+     * @description 获取内容大小和位置
+     * @return {Promise}
+     */
+    getRect () {
+      return new Promise((resolve, reject) => {
+        uni.createSelectorQuery()
+          // #ifndef MP-ALIPAY
+          .in(this)
+          // #endif
+          .select('#_root').boundingClientRect().exec(res => res[0] ? resolve(res[0]) : reject(Error('Root label not found')))
+      })
+    },
+
+    /**
+     * @description 暂停播放媒体
+     */
+    pauseMedia () {
+      for (let i = (this._videos || []).length; i--;) {
+        this._videos[i].pause()
+      }
+      // #ifdef APP-PLUS
+      const command = 'for(var e=document.getElementsByTagName("video"),i=e.length;i--;)e[i].pause()'
+      // #ifndef APP-PLUS-NVUE
+      let page = this.$parent
+      while (!page.$scope) page = page.$parent
+      page.$scope.$getAppWebview().evalJS(command)
+      // #endif
+      // #ifdef APP-PLUS-NVUE
+      this.$refs.web.evalJs(command)
+      // #endif
+      // #endif
+    },
+
+    /**
+     * @description 设置媒体播放速率
+     * @param {Number} rate 播放速率
+     */
+    setPlaybackRate (rate) {
+      this.playbackRate = rate
+      for (let i = (this._videos || []).length; i--;) {
+        this._videos[i].playbackRate(rate)
+      }
+      // #ifdef APP-PLUS
+      const command = 'for(var e=document.getElementsByTagName("video"),i=e.length;i--;)e[i].playbackRate=' + rate
+      // #ifndef APP-PLUS-NVUE
+      let page = this.$parent
+      while (!page.$scope) page = page.$parent
+      page.$scope.$getAppWebview().evalJS(command)
+      // #endif
+      // #ifdef APP-PLUS-NVUE
+      this.$refs.web.evalJs(command)
+      // #endif
+      // #endif
+    },
+
+    /**
+     * @description 设置内容
+     * @param {String} content html 内容
+     * @param {Boolean} append 是否在尾部追加
+     */
+    setContent (content, append) {
+      if (!append || !this.imgList) {
+        this.imgList = []
+      }
+      const nodes = new Parser(this).parse(content)
+      // #ifdef APP-PLUS-NVUE
+      if (this._ready) {
+        this._set(nodes, append)
+      }
+      // #endif
+      this.$set(this, 'nodes', append ? (this.nodes || []).concat(nodes) : nodes)
+
+      // #ifndef APP-PLUS-NVUE
+      this._videos = []
+      this.$nextTick(() => {
+        this._hook('onLoad')
+        this.$emit('load')
+      })
+
+      if (this.lazyLoad || this.imgList._unloadimgs < this.imgList.length / 2) {
+        // 设置懒加载，每 350ms 获取高度，不变则认为加载完毕
+        let height = 0
+        const callback = rect => {
+          if (!rect || !rect.height) rect = {}
+          // 350ms 总高度无变化就触发 ready 事件
+          if (rect.height === height) {
+            this.$emit('ready', rect)
+          } else {
+            height = rect.height
+            setTimeout(() => {
+              this.getRect().then(callback).catch(callback)
+            }, 350)
+          }
+        }
+        this.getRect().then(callback).catch(callback)
+      } else {
+        // 未设置懒加载，等待所有图片加载完毕
+        if (!this.imgList._unloadimgs) {
+          this.getRect().then(rect => {
+            this.$emit('ready', rect)
+          }).catch(() => {
+            this.$emit('ready', {})
+          })
+        }
+      }
+      // #endif
+    },
+
+    /**
+     * @description 调用插件钩子函数
+     */
+    _hook (name) {
+      for (let i = plugins.length; i--;) {
+        if (this.plugins[i][name]) {
+          this.plugins[i][name]()
+        }
+      }
+    },
+
+    // #ifdef APP-PLUS-NVUE
+    /**
+     * @description 设置内容
+     */
+    _set (nodes, append) {
+      this.$refs.web.evalJs('setContent(' + JSON.stringify(nodes).replace(/%22/g, '') + ',' + JSON.stringify([this.containerStyle.replace(/(?:margin|padding)[^;]+/g, ''), this.errorImg, this.loadingImg, this.pauseVideo, this.scrollTable, this.selectable]) + ',' + append + ')')
+    },
+
+    /**
+     * @description 接收到 web-view 消息
+     */
+    _onMessage (e) {
+      const message = e.detail.data[0]
+      switch (message.action) {
+        // web-view 初始化完毕
+        case 'onJSBridgeReady':
+          this._ready = true
+          if (this.nodes) {
+            this._set(this.nodes)
+          }
+          break
+        // 内容 dom 加载完毕
+        case 'onLoad':
+          this.height = message.height
+          this._hook('onLoad')
+          this.$emit('load')
+          break
+        // 所有图片加载完毕
+        case 'onReady':
+          this.getRect().then(res => {
+            this.$emit('ready', res)
+          }).catch(() => {
+            this.$emit('ready', {})
+          })
+          break
+        // 总高度发生变化
+        case 'onHeightChange':
+          this.height = message.height
+          break
+        // 图片点击
+        case 'onImgTap':
+          this.$emit('imgtap', message.attrs)
+          if (this.previewImg) {
+            uni.previewImage({
+              current: parseInt(message.attrs.i),
+              urls: this.imgList
+            })
+          }
+          break
+        // 链接点击
+        case 'onLinkTap': {
+          const href = message.attrs.href
+          this.$emit('linktap', message.attrs)
+          if (href) {
+            // 锚点跳转
+            if (href[0] === '#') {
+              if (this.useAnchor) {
+                dom.scrollToElement(this.$refs.web, {
+                  offset: message.offset
+                })
+              }
+            } else if (href.includes('://')) {
+              // 打开外链
+              if (this.copyLink) {
+                plus.runtime.openWeb(href)
+              }
+            } else {
+              uni.navigateTo({
+                url: href,
+                fail () {
+                  uni.switchTab({
+                    url: href
+                  })
+                }
+              })
+            }
+          }
+          break
+        }
+        case 'onPlay':
+          this.$emit('play')
+          break
+        // 获取到锚点的偏移量
+        case 'getOffset':
+          if (typeof message.offset === 'number') {
+            dom.scrollToElement(this.$refs.web, {
+              offset: message.offset + this._navigateTo.offset
+            })
+            this._navigateTo.resolve()
+          } else {
+            this._navigateTo.reject(Error('Label not found'))
+          }
+          break
+        // 点击
+        case 'onClick':
+          this.$emit('tap')
+          this.$emit('click')
+          break
+        // 出错
+        case 'onError':
+          this.$emit('error', {
+            source: message.source,
+            attrs: message.attrs
+          })
+      }
+    }
+    // #endif
+  }
+}
+</script>
+
+<style>
+/* #ifndef APP-PLUS-NVUE */
+/* 根节点样式 */
+._root {
+  padding: 1px 0;
+  overflow-x: auto;
+  overflow-y: hidden;
+  -webkit-overflow-scrolling: touch;
+}
+
+/* 长按复制 */
+._select {
+  user-select: text;
+}
+/* #endif */
+</style>
diff --git a/uni_modules/mp-html/components/mp-html/node/node.vue b/uni_modules/mp-html/components/mp-html/node/node.vue
index 5ad68e9..09252fd 100644
--- a/uni_modules/mp-html/components/mp-html/node/node.vue
+++ b/uni_modules/mp-html/components/mp-html/node/node.vue
@@ -1,587 +1,587 @@
-<template>
-  <view :id="attrs.id" :class="'_block _'+name+' '+attrs.class" :style="attrs.style">
-    <block v-for="(n, i) in childs" v-bind:key="i">
-      <!-- 图片 -->
-      <!-- 占位图 -->
-      <image v-if="n.name==='img'&&!n.t&&((opts[1]&&!ctrl[i])||ctrl[i]<0)" class="_img" :style="n.attrs.style" :src="ctrl[i]<0?opts[2]:opts[1]" mode="widthFix" />
-      <!-- 显示图片 -->
-      <!-- #ifdef H5 || (APP-PLUS && VUE2) -->
-      <img v-if="n.name==='img'" :id="n.attrs.id" :class="'_img '+n.attrs.class" :style="(ctrl[i]===-1?'display:none;':'')+n.attrs.style" :src="n.attrs.src||(ctrl.load?n.attrs['data-src']:'')" :data-i="i" @load="imgLoad" @error="mediaError" @tap.stop="imgTap" @longpress="imgLongTap" />
-      <!-- #endif -->
-      <!-- #ifndef H5 || (APP-PLUS && VUE2) -->
-      <!-- 表格中的图片，使用 rich-text 防止大小不正确 -->
-      <rich-text v-if="n.name==='img'&&n.t" :style="'display:'+n.t" :nodes="[{attrs:{style:n.attrs.style||'',src:n.attrs.src},name:'img'}]" :data-i="i" @tap.stop="imgTap" />
-      <!-- #endif -->
-      <!-- #ifndef H5 || APP-PLUS || MP-KUAISHOU -->
-      <image v-else-if="n.name==='img'" :id="n.attrs.id" :class="'_img '+n.attrs.class" :style="(ctrl[i]===-1?'display:none;':'')+'width:'+(ctrl[i]||1)+'px;height:1px;'+n.attrs.style" :src="n.attrs.src" :mode="!n.h?'widthFix':(!n.w?'heightFix':(n.m||'scaleToFill'))" :lazy-load="opts[0]" :webp="n.webp" :show-menu-by-longpress="opts[3]&&!n.attrs.ignore" :image-menu-prevent="!opts[3]||n.attrs.ignore" :data-i="i" @load="imgLoad" @error="mediaError" @tap.stop="imgTap" @longpress="imgLongTap" />
-      <!-- #endif -->
-      <!-- #ifdef MP-KUAISHOU -->
-      <image v-else-if="n.name==='img'" :id="n.attrs.id" :class="'_img '+n.attrs.class" :style="(ctrl[i]===-1?'display:none;':'')+n.attrs.style" :src="n.attrs.src" :lazy-load="opts[0]" :data-i="i" @load="imgLoad" @error="mediaError" @tap.stop="imgTap"></image>
-      <!-- #endif -->
-      <!-- #ifdef APP-PLUS && VUE3 -->
-      <image v-else-if="n.name==='img'" :id="n.attrs.id" :class="'_img '+n.attrs.class" :style="(ctrl[i]===-1?'display:none;':'')+'width:'+(ctrl[i]||1)+'px;'+n.attrs.style" :src="n.attrs.src||(ctrl.load?n.attrs['data-src']:'')" :mode="!n.h?'widthFix':(!n.w?'heightFix':(n.m||''))" :data-i="i" @load="imgLoad" @error="mediaError" @tap.stop="imgTap" @longpress="imgLongTap" />
-      <!-- #endif -->
-      <!-- 文本 -->
-      <!-- #ifdef MP-WEIXIN -->
-      <text v-else-if="n.text" :user-select="opts[4]=='force'&&isiOS" decode>{{n.text}}</text>
-      <!-- #endif -->
-      <!-- #ifndef MP-WEIXIN || MP-BAIDU || MP-ALIPAY || MP-TOUTIAO -->
-      <text v-else-if="n.text" decode>{{n.text}}</text>
-      <!-- #endif -->
-      <text v-else-if="n.name==='br'">\n</text>
-      <!-- 链接 -->
-      <view v-else-if="n.name==='a'" :id="n.attrs.id" :class="(n.attrs.href?'_a ':'')+n.attrs.class" hover-class="_hover" :style="'display:inline;'+n.attrs.style" :data-i="i" @tap.stop="linkTap">
-        <node name="span" :childs="n.children" :opts="opts" style="display:inherit" />
-      </view>
-      <!-- 视频 -->
-      <!-- #ifdef APP-PLUS -->
-      <view v-else-if="n.html" :id="n.attrs.id" :class="'_video '+n.attrs.class" :style="n.attrs.style" v-html="n.html" @vplay.stop="play" />
-      <!-- #endif -->
-      <!-- #ifndef APP-PLUS -->
-      <video v-else-if="n.name==='video'" :id="n.attrs.id" :class="n.attrs.class" :style="n.attrs.style" :autoplay="n.attrs.autoplay" :controls="n.attrs.controls" :loop="n.attrs.loop" :muted="n.attrs.muted" :object-fit="n.attrs['object-fit']" :poster="n.attrs.poster" :src="n.src[ctrl[i]||0]" :data-i="i" @play="play" @error="mediaError" />
-      <!-- #endif -->
-      <!-- #ifdef H5 || APP-PLUS -->
-      <iframe v-else-if="n.name==='iframe'" :style="n.attrs.style" :allowfullscreen="n.attrs.allowfullscreen" :frameborder="n.attrs.frameborder" :src="n.attrs.src" />
-      <embed v-else-if="n.name==='embed'" :style="n.attrs.style" :src="n.attrs.src" />
-      <!-- #endif -->
-      <!-- #ifndef MP-TOUTIAO || ((H5 || APP-PLUS) && VUE3) -->
-      <!-- 音频 -->
-      <audio v-else-if="n.name==='audio'" :id="n.attrs.id" :class="n.attrs.class" :style="n.attrs.style" :author="n.attrs.author" :controls="n.attrs.controls" :loop="n.attrs.loop" :name="n.attrs.name" :poster="n.attrs.poster" :src="n.src[ctrl[i]||0]" :data-i="i" @play="play" @error="mediaError" />
-      <!-- #endif -->
-      <view v-else-if="(n.name==='table'&&n.c)||n.name==='li'" :id="n.attrs.id" :class="'_'+n.name+' '+n.attrs.class" :style="n.attrs.style">
-        <node v-if="n.name==='li'" :childs="n.children" :opts="opts" />
-        <view v-else v-for="(tbody, x) in n.children" v-bind:key="x" :class="'_'+tbody.name+' '+tbody.attrs.class" :style="tbody.attrs.style">
-          <node v-if="tbody.name==='td'||tbody.name==='th'" :childs="tbody.children" :opts="opts" />
-          <block v-else v-for="(tr, y) in tbody.children" v-bind:key="y">
-            <view v-if="tr.name==='td'||tr.name==='th'" :class="'_'+tr.name+' '+tr.attrs.class" :style="tr.attrs.style">
-              <node :childs="tr.children" :opts="opts" />
-            </view>
-            <view v-else :class="'_'+tr.name+' '+tr.attrs.class" :style="tr.attrs.style">
-              <view v-for="(td, z) in tr.children" v-bind:key="z" :class="'_'+td.name+' '+td.attrs.class" :style="td.attrs.style">
-                <node :childs="td.children" :opts="opts" />
-              </view>
-            </view>
-          </block>
-        </view>
-      </view>
-      
-      <!-- 富文本 -->
-      <!-- #ifdef H5 || ((MP-WEIXIN || MP-QQ || APP-PLUS || MP-360) && VUE2) -->
-      <rich-text v-else-if="!n.c&&!handler.isInline(n.name, n.attrs.style)" :id="n.attrs.id" :style="n.f" :user-select="opts[4]" :nodes="[n]" />
-      <!-- #endif -->
-      <!-- #ifndef H5 || ((MP-WEIXIN || MP-QQ || APP-PLUS || MP-360) && VUE2) -->
-      <rich-text v-else-if="!n.c" :id="n.attrs.id" :style="'display:inline;'+n.f" :preview="false" :selectable="opts[4]" :user-select="opts[4]" :nodes="[n]" />
-      <!-- #endif -->
-      <!-- 继续递归 -->
-      <view v-else-if="n.c===2" :id="n.attrs.id" :class="'_block _'+n.name+' '+n.attrs.class" :style="n.f+';'+n.attrs.style">
-        <node v-for="(n2, j) in n.children" v-bind:key="j" :style="n2.f" :name="n2.name" :attrs="n2.attrs" :childs="n2.children" :opts="opts" />
-      </view>
-      <node v-else :style="n.f" :name="n.name" :attrs="n.attrs" :childs="n.children" :opts="opts" />
-    </block>
-  </view>
-</template>
-<script module="handler" lang="wxs">
-// 行内标签列表
-var inlineTags = {
-  abbr: true,
-  b: true,
-  big: true,
-  code: true,
-  del: true,
-  em: true,
-  i: true,
-  ins: true,
-  label: true,
-  q: true,
-  small: true,
-  span: true,
-  strong: true,
-  sub: true,
-  sup: true
-}
-/**
- * @description 判断是否为行内标签
- */
-module.exports = {
-  isInline: function (tagName, style) {
-    return inlineTags[tagName] || (style || '').indexOf('display:inline') !== -1
-  }
-}
-</script>
-<script>
-
-import node from './node'
-export default {
-  name: 'node',
-  options: {
-    // #ifdef MP-WEIXIN
-    virtualHost: true,
-    // #endif
-    // #ifdef MP-TOUTIAO
-    addGlobalClass: false
-    // #endif
-  },
-  data () {
-    return {
-      ctrl: {},
-      // #ifdef MP-WEIXIN
-      isiOS: uni.getSystemInfoSync().system.includes('iOS')
-      // #endif
-    }
-  },
-  props: {
-    name: String,
-    attrs: {
-      type: Object,
-      default () {
-        return {}
-      }
-    },
-    childs: Array,
-    opts: Array
-  },
-  components: {
-
-    // #ifndef (H5 || APP-PLUS) && VUE3
-    node
-    // #endif
-  },
-  mounted () {
-    this.$nextTick(() => {
-      for (this.root = this.$parent; this.root.$options.name !== 'mp-html'; this.root = this.root.$parent);
-    })
-    // #ifdef H5 || APP-PLUS
-    if (this.opts[0]) {
-      let i
-      for (i = this.childs.length; i--;) {
-        if (this.childs[i].name === 'img') break
-      }
-      if (i !== -1) {
-        this.observer = uni.createIntersectionObserver(this).relativeToViewport({
-          top: 500,
-          bottom: 500
-        })
-        this.observer.observe('._img', res => {
-          if (res.intersectionRatio) {
-            this.$set(this.ctrl, 'load', 1)
-            this.observer.disconnect()
-          }
-        })
-      }
-    }
-    // #endif
-  },
-  beforeDestroy () {
-    // #ifdef H5 || APP-PLUS
-    if (this.observer) {
-      this.observer.disconnect()
-    }
-    // #endif
-  },
-  methods:{
-    // #ifdef MP-WEIXIN
-    toJSON () { return this },
-    // #endif
-    /**
-     * @description 播放视频事件
-     * @param {Event} e
-     */
-    play (e) {
-      const i = e.currentTarget.dataset.i
-      const node = this.childs[i]
-      this.root.$emit('play', {
-        source: node.name,
-        attrs: {
-          ...node.attrs,
-          src: node.src[this.ctrl[i] || 0]
-        }
-      })
-      // #ifndef APP-PLUS
-      if (this.root.pauseVideo) {
-        let flag = false
-        const id = e.target.id
-        for (let i = this.root._videos.length; i--;) {
-          if (this.root._videos[i].id === id) {
-            flag = true
-          } else {
-            this.root._videos[i].pause() // 自动暂停其他视频
-          }
-        }
-        // 将自己加入列表
-        if (!flag) {
-          const ctx = uni.createVideoContext(id
-            // #ifndef MP-BAIDU
-            , this
-            // #endif
-          )
-          ctx.id = id
-          if (this.root.playbackRate) {
-            ctx.playbackRate(this.root.playbackRate)
-          }
-          this.root._videos.push(ctx)
-        }
-      }
-      // #endif
-    },
-
-    /**
-     * @description 图片点击事件
-     * @param {Event} e
-     */
-    imgTap (e) {
-      const node = this.childs[e.currentTarget.dataset.i]
-      if (node.a) {
-        this.linkTap(node.a)
-        return
-      }
-      if (node.attrs.ignore) return
-      // #ifdef H5 || APP-PLUS
-      node.attrs.src = node.attrs.src || node.attrs['data-src']
-      // #endif
-      this.root.$emit('imgtap', node.attrs)
-      // 自动预览图片
-      if (this.root.previewImg) {
-        uni.previewImage({
-          // #ifdef MP-WEIXIN
-          showmenu: this.root.showImgMenu,
-          // #endif
-          // #ifdef MP-ALIPAY
-          enablesavephoto: this.root.showImgMenu,
-          enableShowPhotoDownload: this.root.showImgMenu,
-          // #endif
-          current: parseInt(node.attrs.i),
-          urls: this.root.imgList
-        })
-      }
-    },
-
-    /**
-     * @description 图片长按
-     */
-    imgLongTap (e) {
-      // #ifdef APP-PLUS
-      const attrs = this.childs[e.currentTarget.dataset.i].attrs
-      if (this.opts[3] && !attrs.ignore) {
-        uni.showActionSheet({
-          itemList: ['保存图片'],
-          success: () => {
-            const save = path => {
-              uni.saveImageToPhotosAlbum({
-                filePath: path,
-                success () {
-                  uni.showToast({
-                    title: '保存成功'
-                  })
-                }
-              })
-            }
-            if (this.root.imgList[attrs.i].startsWith('http')) {
-              uni.downloadFile({
-                url: this.root.imgList[attrs.i],
-                success: res => save(res.tempFilePath)
-              })
-            } else {
-              save(this.root.imgList[attrs.i])
-            }
-          }
-        })
-      }
-      // #endif
-    },
-
-    /**
-     * @description 图片加载完成事件
-     * @param {Event} e
-     */
-    imgLoad (e) {
-      const i = e.currentTarget.dataset.i
-      /* #ifndef H5 || (APP-PLUS && VUE2) */
-      if (!this.childs[i].w) {
-        // 设置原宽度
-        this.$set(this.ctrl, i, e.detail.width)
-      } else /* #endif */ if ((this.opts[1] && !this.ctrl[i]) || this.ctrl[i] === -1) {
-        // 加载完毕，取消加载中占位图
-        this.$set(this.ctrl, i, 1)
-      }
-      this.checkReady()
-    },
-
-    /**
-     * @description 检查是否所有图片加载完毕
-     */
-    checkReady () {
-      if (this.root && !this.root.lazyLoad) {
-        this.root._unloadimgs -= 1
-        if (!this.root._unloadimgs) {
-          setTimeout(() => {
-            this.root.getRect().then(rect => {
-              this.root.$emit('ready', rect)
-            }).catch(() => {
-              this.root.$emit('ready', {})
-            })
-          }, 350)
-        }
-      }
-    },
-
-    /**
-     * @description 链接点击事件
-     * @param {Event} e
-     */
-    linkTap (e) {
-      const node = e.currentTarget ? this.childs[e.currentTarget.dataset.i] : {}
-      const attrs = node.attrs || e
-      const href = attrs.href
-      this.root.$emit('linktap', Object.assign({
-        innerText: this.root.getText(node.children || []) // 链接内的文本内容
-      }, attrs))
-      if (href) {
-        if (href[0] === '#') {
-          // 跳转锚点
-          this.root.navigateTo(href.substring(1)).catch(() => { })
-        } else if (href.split('?')[0].includes('://')) {
-          // 复制外部链接
-          if (this.root.copyLink) {
-            // #ifdef H5
-            window.open(href)
-            // #endif
-            // #ifdef MP
-            uni.setClipboardData({
-              data: href,
-              success: () =>
-                uni.showToast({
-                  title: '链接已复制'
-                })
-            })
-            // #endif
-            // #ifdef APP-PLUS
-            plus.runtime.openWeb(href)
-            // #endif
-          }
-        } else {
-          // 跳转页面
-          uni.navigateTo({
-            url: href,
-            fail () {
-              uni.switchTab({
-                url: href,
-                fail () { }
-              })
-            }
-          })
-        }
-      }
-    },
-
-    /**
-     * @description 错误事件
-     * @param {Event} e
-     */
-    mediaError (e) {
-      const i = e.currentTarget.dataset.i
-      const node = this.childs[i]
-      // 加载其他源
-      if (node.name === 'video' || node.name === 'audio') {
-        let index = (this.ctrl[i] || 0) + 1
-        if (index > node.src.length) {
-          index = 0
-        }
-        if (index < node.src.length) {
-          this.$set(this.ctrl, i, index)
-          return
-        }
-      } else if (node.name === 'img') {
-        // #ifdef H5 && VUE3
-        if (this.opts[0] && !this.ctrl.load) return
-        // #endif
-        // 显示错误占位图
-        if (this.opts[2]) {
-          this.$set(this.ctrl, i, -1)
-        }
-        this.checkReady()
-      }
-      if (this.root) {
-        this.root.$emit('error', {
-          source: node.name,
-          attrs: node.attrs,
-          // #ifndef H5 && VUE3
-          errMsg: e.detail.errMsg
-          // #endif
-        })
-      }
-    }
-  }
-}
-</script>
-<style lang="scss">
-/* a 标签默认效果 */
-._a {
-  padding: 1.5px 0 1.5px 0;
-  color: #366092;
-  word-break: break-all;
-}
-
-/* a 标签点击态效果 */
-._hover {
-  text-decoration: underline;
-  opacity: 0.7;
-}
-
-/* 图片默认效果 */
-._img {
-  max-width: 100%;
-  -webkit-touch-callout: none;
-}
-
-/* 内部样式 */
-
-._block {
-  display: block;
-}
-
-._b,
-._strong {
-  font-weight: bold;
-}
-
-._code {
-  font-family: monospace;
-}
-
-._del {
-  text-decoration: line-through;
-}
-
-._em,
-._i {
-  font-style: italic;
-}
-
-._h1 {
-  font-size: 2em;
-}
-
-._h2 {
-  font-size: 1.5em;
-}
-
-._h3 {
-  font-size: 1.17em;
-}
-
-._h5 {
-  font-size: 0.83em;
-}
-
-._h6 {
-  font-size: 0.67em;
-}
-
-._h1,
-._h2,
-._h3,
-._h4,
-._h5,
-._h6 {
-  display: block;
-  font-weight: bold;
-}
-
-._image {
-  height: 1px;
-}
-
-._ins {
-  text-decoration: underline;
-}
-
-._li {
-  display: list-item;
-}
-
-._ol {
-  list-style-type: decimal;
-}
-
-._ol,
-._ul {
-  display: block;
-  padding-left: 40px;
-  margin: 1em 0;
-}
-
-._q::before {
-  content: '"';
-}
-
-._q::after {
-  content: '"';
-}
-
-._sub {
-  font-size: smaller;
-  vertical-align: sub;
-}
-
-._sup {
-  font-size: smaller;
-  vertical-align: super;
-}
-
-._thead,
-._tbody,
-._tfoot {
-  display: table-row-group;
-}
-
-._tr {
-  display: table-row;
-}
-
-._td,
-._th {
-  display: table-cell;
-  vertical-align: middle;
-}
-
-._th {
-  font-weight: bold;
-  text-align: center;
-}
-
-._ul {
-  list-style-type: disc;
-}
-
-._ul ._ul {
-  margin: 0;
-  list-style-type: circle;
-}
-
-._ul ._ul ._ul {
-  list-style-type: square;
-}
-
-._abbr,
-._b,
-._code,
-._del,
-._em,
-._i,
-._ins,
-._label,
-._q,
-._span,
-._strong,
-._sub,
-._sup {
-  display: inline;
-}
-
-/* #ifdef APP-PLUS */
-._video {
-  width: 300px;
-  height: 225px;
-}
-/* #endif */
+<template>
+  <view :id="attrs.id" :class="'_block _'+name+' '+attrs.class" :style="attrs.style">
+    <block v-for="(n, i) in childs" v-bind:key="i">
+      <!-- 图片 -->
+      <!-- 占位图 -->
+      <image v-if="n.name==='img'&&!n.t&&((opts[1]&&!ctrl[i])||ctrl[i]<0)" class="_img" :style="n.attrs.style" :src="ctrl[i]<0?opts[2]:opts[1]" mode="widthFix" />
+      <!-- 显示图片 -->
+      <!-- #ifdef H5 || (APP-PLUS && VUE2) -->
+      <img v-if="n.name==='img'" :id="n.attrs.id" :class="'_img '+n.attrs.class" :style="(ctrl[i]===-1?'display:none;':'')+n.attrs.style" :src="n.attrs.src||(ctrl.load?n.attrs['data-src']:'')" :data-i="i" @load="imgLoad" @error="mediaError" @tap.stop="imgTap" @longpress="imgLongTap" />
+      <!-- #endif -->
+      <!-- #ifndef H5 || (APP-PLUS && VUE2) -->
+      <!-- 表格中的图片，使用 rich-text 防止大小不正确 -->
+      <rich-text v-if="n.name==='img'&&n.t" :style="'display:'+n.t" :nodes="[{attrs:{style:n.attrs.style||'',src:n.attrs.src},name:'img'}]" :data-i="i" @tap.stop="imgTap" />
+      <!-- #endif -->
+      <!-- #ifndef H5 || APP-PLUS || MP-KUAISHOU -->
+      <image v-else-if="n.name==='img'" :id="n.attrs.id" :class="'_img '+n.attrs.class" :style="(ctrl[i]===-1?'display:none;':'')+'width:'+(ctrl[i]||1)+'px;height:1px;'+n.attrs.style" :src="n.attrs.src" :mode="!n.h?'widthFix':(!n.w?'heightFix':(n.m||'scaleToFill'))" :lazy-load="opts[0]" :webp="n.webp" :show-menu-by-longpress="opts[3]&&!n.attrs.ignore" :image-menu-prevent="!opts[3]||n.attrs.ignore" :data-i="i" @load="imgLoad" @error="mediaError" @tap.stop="imgTap" @longpress="imgLongTap" />
+      <!-- #endif -->
+      <!-- #ifdef MP-KUAISHOU -->
+      <image v-else-if="n.name==='img'" :id="n.attrs.id" :class="'_img '+n.attrs.class" :style="(ctrl[i]===-1?'display:none;':'')+n.attrs.style" :src="n.attrs.src" :lazy-load="opts[0]" :data-i="i" @load="imgLoad" @error="mediaError" @tap.stop="imgTap"></image>
+      <!-- #endif -->
+      <!-- #ifdef APP-PLUS && VUE3 -->
+      <image v-else-if="n.name==='img'" :id="n.attrs.id" :class="'_img '+n.attrs.class" :style="(ctrl[i]===-1?'display:none;':'')+'width:'+(ctrl[i]||1)+'px;'+n.attrs.style" :src="n.attrs.src||(ctrl.load?n.attrs['data-src']:'')" :mode="!n.h?'widthFix':(!n.w?'heightFix':(n.m||''))" :data-i="i" @load="imgLoad" @error="mediaError" @tap.stop="imgTap" @longpress="imgLongTap" />
+      <!-- #endif -->
+      <!-- 文本 -->
+      <!-- #ifdef MP-WEIXIN -->
+      <text v-else-if="n.text" :user-select="opts[4]=='force'&&isiOS" decode>{{n.text}}</text>
+      <!-- #endif -->
+      <!-- #ifndef MP-WEIXIN || MP-BAIDU || MP-ALIPAY || MP-TOUTIAO -->
+      <text v-else-if="n.text" decode>{{n.text}}</text>
+      <!-- #endif -->
+      <text v-else-if="n.name==='br'">\n</text>
+      <!-- 链接 -->
+      <view v-else-if="n.name==='a'" :id="n.attrs.id" :class="(n.attrs.href?'_a ':'')+n.attrs.class" hover-class="_hover" :style="'display:inline;'+n.attrs.style" :data-i="i" @tap.stop="linkTap">
+        <node name="span" :childs="n.children" :opts="opts" style="display:inherit" />
+      </view>
+      <!-- 视频 -->
+      <!-- #ifdef APP-PLUS -->
+      <view v-else-if="n.html" :id="n.attrs.id" :class="'_video '+n.attrs.class" :style="n.attrs.style" v-html="n.html" @vplay.stop="play" />
+      <!-- #endif -->
+      <!-- #ifndef APP-PLUS -->
+      <video v-else-if="n.name==='video'" :id="n.attrs.id" :class="n.attrs.class" :style="n.attrs.style" :autoplay="n.attrs.autoplay" :controls="n.attrs.controls" :loop="n.attrs.loop" :muted="n.attrs.muted" :object-fit="n.attrs['object-fit']" :poster="n.attrs.poster" :src="n.src[ctrl[i]||0]" :data-i="i" @play="play" @error="mediaError" />
+      <!-- #endif -->
+      <!-- #ifdef H5 || APP-PLUS -->
+      <iframe v-else-if="n.name==='iframe'" :style="n.attrs.style" :allowfullscreen="n.attrs.allowfullscreen" :frameborder="n.attrs.frameborder" :src="n.attrs.src" />
+      <embed v-else-if="n.name==='embed'" :style="n.attrs.style" :src="n.attrs.src" />
+      <!-- #endif -->
+      <!-- #ifndef MP-TOUTIAO || ((H5 || APP-PLUS) && VUE3) -->
+      <!-- 音频 -->
+      <audio v-else-if="n.name==='audio'" :id="n.attrs.id" :class="n.attrs.class" :style="n.attrs.style" :author="n.attrs.author" :controls="n.attrs.controls" :loop="n.attrs.loop" :name="n.attrs.name" :poster="n.attrs.poster" :src="n.src[ctrl[i]||0]" :data-i="i" @play="play" @error="mediaError" />
+      <!-- #endif -->
+      <view v-else-if="(n.name==='table'&&n.c)||n.name==='li'" :id="n.attrs.id" :class="'_'+n.name+' '+n.attrs.class" :style="n.attrs.style">
+        <node v-if="n.name==='li'" :childs="n.children" :opts="opts" />
+        <view v-else v-for="(tbody, x) in n.children" v-bind:key="x" :class="'_'+tbody.name+' '+tbody.attrs.class" :style="tbody.attrs.style">
+          <node v-if="tbody.name==='td'||tbody.name==='th'" :childs="tbody.children" :opts="opts" />
+          <block v-else v-for="(tr, y) in tbody.children" v-bind:key="y">
+            <view v-if="tr.name==='td'||tr.name==='th'" :class="'_'+tr.name+' '+tr.attrs.class" :style="tr.attrs.style">
+              <node :childs="tr.children" :opts="opts" />
+            </view>
+            <view v-else :class="'_'+tr.name+' '+tr.attrs.class" :style="tr.attrs.style">
+              <view v-for="(td, z) in tr.children" v-bind:key="z" :class="'_'+td.name+' '+td.attrs.class" :style="td.attrs.style">
+                <node :childs="td.children" :opts="opts" />
+              </view>
+            </view>
+          </block>
+        </view>
+      </view>
+      
+      <!-- 富文本 -->
+      <!-- #ifdef H5 || ((MP-WEIXIN || MP-QQ || APP-PLUS || MP-360) && VUE2) -->
+      <rich-text v-else-if="!n.c&&!handler.isInline(n.name, n.attrs.style)" :id="n.attrs.id" :style="n.f" :user-select="opts[4]" :nodes="[n]" />
+      <!-- #endif -->
+      <!-- #ifndef H5 || ((MP-WEIXIN || MP-QQ || APP-PLUS || MP-360) && VUE2) -->
+      <rich-text v-else-if="!n.c" :id="n.attrs.id" :style="'display:inline;'+n.f" :preview="false" :selectable="opts[4]" :user-select="opts[4]" :nodes="[n]" />
+      <!-- #endif -->
+      <!-- 继续递归 -->
+      <view v-else-if="n.c===2" :id="n.attrs.id" :class="'_block _'+n.name+' '+n.attrs.class" :style="n.f+';'+n.attrs.style">
+        <node v-for="(n2, j) in n.children" v-bind:key="j" :style="n2.f" :name="n2.name" :attrs="n2.attrs" :childs="n2.children" :opts="opts" />
+      </view>
+      <node v-else :style="n.f" :name="n.name" :attrs="n.attrs" :childs="n.children" :opts="opts" />
+    </block>
+  </view>
+</template>
+<script module="handler" lang="wxs">
+// 行内标签列表
+var inlineTags = {
+  abbr: true,
+  b: true,
+  big: true,
+  code: true,
+  del: true,
+  em: true,
+  i: true,
+  ins: true,
+  label: true,
+  q: true,
+  small: true,
+  span: true,
+  strong: true,
+  sub: true,
+  sup: true
+}
+/**
+ * @description 判断是否为行内标签
+ */
+module.exports = {
+  isInline: function (tagName, style) {
+    return inlineTags[tagName] || (style || '').indexOf('display:inline') !== -1
+  }
+}
+</script>
+<script>
+
+import node from './node'
+export default {
+  name: 'node',
+  options: {
+    // #ifdef MP-WEIXIN
+    virtualHost: true,
+    // #endif
+    // #ifdef MP-TOUTIAO
+    addGlobalClass: false
+    // #endif
+  },
+  data () {
+    return {
+      ctrl: {},
+      // #ifdef MP-WEIXIN
+      isiOS: uni.getSystemInfoSync().system.includes('iOS')
+      // #endif
+    }
+  },
+  props: {
+    name: String,
+    attrs: {
+      type: Object,
+      default () {
+        return {}
+      }
+    },
+    childs: Array,
+    opts: Array
+  },
+  components: {
+
+    // #ifndef (H5 || APP-PLUS) && VUE3
+    node
+    // #endif
+  },
+  mounted () {
+    this.$nextTick(() => {
+      for (this.root = this.$parent; this.root.$options.name !== 'mp-html'; this.root = this.root.$parent);
+    })
+    // #ifdef H5 || APP-PLUS
+    if (this.opts[0]) {
+      let i
+      for (i = this.childs.length; i--;) {
+        if (this.childs[i].name === 'img') break
+      }
+      if (i !== -1) {
+        this.observer = uni.createIntersectionObserver(this).relativeToViewport({
+          top: 500,
+          bottom: 500
+        })
+        this.observer.observe('._img', res => {
+          if (res.intersectionRatio) {
+            this.$set(this.ctrl, 'load', 1)
+            this.observer.disconnect()
+          }
+        })
+      }
+    }
+    // #endif
+  },
+  beforeDestroy () {
+    // #ifdef H5 || APP-PLUS
+    if (this.observer) {
+      this.observer.disconnect()
+    }
+    // #endif
+  },
+  methods:{
+    // #ifdef MP-WEIXIN
+    toJSON () { return this },
+    // #endif
+    /**
+     * @description 播放视频事件
+     * @param {Event} e
+     */
+    play (e) {
+      const i = e.currentTarget.dataset.i
+      const node = this.childs[i]
+      this.root.$emit('play', {
+        source: node.name,
+        attrs: {
+          ...node.attrs,
+          src: node.src[this.ctrl[i] || 0]
+        }
+      })
+      // #ifndef APP-PLUS
+      if (this.root.pauseVideo) {
+        let flag = false
+        const id = e.target.id
+        for (let i = this.root._videos.length; i--;) {
+          if (this.root._videos[i].id === id) {
+            flag = true
+          } else {
+            this.root._videos[i].pause() // 自动暂停其他视频
+          }
+        }
+        // 将自己加入列表
+        if (!flag) {
+          const ctx = uni.createVideoContext(id
+            // #ifndef MP-BAIDU
+            , this
+            // #endif
+          )
+          ctx.id = id
+          if (this.root.playbackRate) {
+            ctx.playbackRate(this.root.playbackRate)
+          }
+          this.root._videos.push(ctx)
+        }
+      }
+      // #endif
+    },
+
+    /**
+     * @description 图片点击事件
+     * @param {Event} e
+     */
+    imgTap (e) {
+      const node = this.childs[e.currentTarget.dataset.i]
+      if (node.a) {
+        this.linkTap(node.a)
+        return
+      }
+      if (node.attrs.ignore) return
+      // #ifdef H5 || APP-PLUS
+      node.attrs.src = node.attrs.src || node.attrs['data-src']
+      // #endif
+      this.root.$emit('imgtap', node.attrs)
+      // 自动预览图片
+      if (this.root.previewImg) {
+        uni.previewImage({
+          // #ifdef MP-WEIXIN
+          showmenu: this.root.showImgMenu,
+          // #endif
+          // #ifdef MP-ALIPAY
+          enablesavephoto: this.root.showImgMenu,
+          enableShowPhotoDownload: this.root.showImgMenu,
+          // #endif
+          current: parseInt(node.attrs.i),
+          urls: this.root.imgList
+        })
+      }
+    },
+
+    /**
+     * @description 图片长按
+     */
+    imgLongTap (e) {
+      // #ifdef APP-PLUS
+      const attrs = this.childs[e.currentTarget.dataset.i].attrs
+      if (this.opts[3] && !attrs.ignore) {
+        uni.showActionSheet({
+          itemList: ['保存图片'],
+          success: () => {
+            const save = path => {
+              uni.saveImageToPhotosAlbum({
+                filePath: path,
+                success () {
+                  uni.showToast({
+                    title: '保存成功'
+                  })
+                }
+              })
+            }
+            if (this.root.imgList[attrs.i].startsWith('http')) {
+              uni.downloadFile({
+                url: this.root.imgList[attrs.i],
+                success: res => save(res.tempFilePath)
+              })
+            } else {
+              save(this.root.imgList[attrs.i])
+            }
+          }
+        })
+      }
+      // #endif
+    },
+
+    /**
+     * @description 图片加载完成事件
+     * @param {Event} e
+     */
+    imgLoad (e) {
+      const i = e.currentTarget.dataset.i
+      /* #ifndef H5 || (APP-PLUS && VUE2) */
+      if (!this.childs[i].w) {
+        // 设置原宽度
+        this.$set(this.ctrl, i, e.detail.width)
+      } else /* #endif */ if ((this.opts[1] && !this.ctrl[i]) || this.ctrl[i] === -1) {
+        // 加载完毕，取消加载中占位图
+        this.$set(this.ctrl, i, 1)
+      }
+      this.checkReady()
+    },
+
+    /**
+     * @description 检查是否所有图片加载完毕
+     */
+    checkReady () {
+      if (this.root && !this.root.lazyLoad) {
+        this.root._unloadimgs -= 1
+        if (!this.root._unloadimgs) {
+          setTimeout(() => {
+            this.root.getRect().then(rect => {
+              this.root.$emit('ready', rect)
+            }).catch(() => {
+              this.root.$emit('ready', {})
+            })
+          }, 350)
+        }
+      }
+    },
+
+    /**
+     * @description 链接点击事件
+     * @param {Event} e
+     */
+    linkTap (e) {
+      const node = e.currentTarget ? this.childs[e.currentTarget.dataset.i] : {}
+      const attrs = node.attrs || e
+      const href = attrs.href
+      this.root.$emit('linktap', Object.assign({
+        innerText: this.root.getText(node.children || []) // 链接内的文本内容
+      }, attrs))
+      if (href) {
+        if (href[0] === '#') {
+          // 跳转锚点
+          this.root.navigateTo(href.substring(1)).catch(() => { })
+        } else if (href.split('?')[0].includes('://')) {
+          // 复制外部链接
+          if (this.root.copyLink) {
+            // #ifdef H5
+            window.open(href)
+            // #endif
+            // #ifdef MP
+            uni.setClipboardData({
+              data: href,
+              success: () =>
+                uni.showToast({
+                  title: '链接已复制'
+                })
+            })
+            // #endif
+            // #ifdef APP-PLUS
+            plus.runtime.openWeb(href)
+            // #endif
+          }
+        } else {
+          // 跳转页面
+          uni.navigateTo({
+            url: href,
+            fail () {
+              uni.switchTab({
+                url: href,
+                fail () { }
+              })
+            }
+          })
+        }
+      }
+    },
+
+    /**
+     * @description 错误事件
+     * @param {Event} e
+     */
+    mediaError (e) {
+      const i = e.currentTarget.dataset.i
+      const node = this.childs[i]
+      // 加载其他源
+      if (node.name === 'video' || node.name === 'audio') {
+        let index = (this.ctrl[i] || 0) + 1
+        if (index > node.src.length) {
+          index = 0
+        }
+        if (index < node.src.length) {
+          this.$set(this.ctrl, i, index)
+          return
+        }
+      } else if (node.name === 'img') {
+        // #ifdef H5 && VUE3
+        if (this.opts[0] && !this.ctrl.load) return
+        // #endif
+        // 显示错误占位图
+        if (this.opts[2]) {
+          this.$set(this.ctrl, i, -1)
+        }
+        this.checkReady()
+      }
+      if (this.root) {
+        this.root.$emit('error', {
+          source: node.name,
+          attrs: node.attrs,
+          // #ifndef H5 && VUE3
+          errMsg: e.detail.errMsg
+          // #endif
+        })
+      }
+    }
+  }
+}
+</script>
+<style>
+/* a 标签默认效果 */
+._a {
+  padding: 1.5px 0 1.5px 0;
+  color: #366092;
+  word-break: break-all;
+}
+
+/* a 标签点击态效果 */
+._hover {
+  text-decoration: underline;
+  opacity: 0.7;
+}
+
+/* 图片默认效果 */
+._img {
+  max-width: 100%;
+  -webkit-touch-callout: none;
+}
+
+/* 内部样式 */
+
+._block {
+  display: block;
+}
+
+._b,
+._strong {
+  font-weight: bold;
+}
+
+._code {
+  font-family: monospace;
+}
+
+._del {
+  text-decoration: line-through;
+}
+
+._em,
+._i {
+  font-style: italic;
+}
+
+._h1 {
+  font-size: 2em;
+}
+
+._h2 {
+  font-size: 1.5em;
+}
+
+._h3 {
+  font-size: 1.17em;
+}
+
+._h5 {
+  font-size: 0.83em;
+}
+
+._h6 {
+  font-size: 0.67em;
+}
+
+._h1,
+._h2,
+._h3,
+._h4,
+._h5,
+._h6 {
+  display: block;
+  font-weight: bold;
+}
+
+._image {
+  height: 1px;
+}
+
+._ins {
+  text-decoration: underline;
+}
+
+._li {
+  display: list-item;
+}
+
+._ol {
+  list-style-type: decimal;
+}
+
+._ol,
+._ul {
+  display: block;
+  padding-left: 40px;
+  margin: 1em 0;
+}
+
+._q::before {
+  content: '"';
+}
+
+._q::after {
+  content: '"';
+}
+
+._sub {
+  font-size: smaller;
+  vertical-align: sub;
+}
+
+._sup {
+  font-size: smaller;
+  vertical-align: super;
+}
+
+._thead,
+._tbody,
+._tfoot {
+  display: table-row-group;
+}
+
+._tr {
+  display: table-row;
+}
+
+._td,
+._th {
+  display: table-cell;
+  vertical-align: middle;
+}
+
+._th {
+  font-weight: bold;
+  text-align: center;
+}
+
+._ul {
+  list-style-type: disc;
+}
+
+._ul ._ul {
+  margin: 0;
+  list-style-type: circle;
+}
+
+._ul ._ul ._ul {
+  list-style-type: square;
+}
+
+._abbr,
+._b,
+._code,
+._del,
+._em,
+._i,
+._ins,
+._label,
+._q,
+._span,
+._strong,
+._sub,
+._sup {
+  display: inline;
+}
+
+/* #ifdef APP-PLUS */
+._video {
+  width: 300px;
+  height: 225px;
+}
+/* #endif */
 </style>
\ No newline at end of file
diff --git a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/time-picker.vue b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/time-picker.vue
index a0ecb6a..699aa63 100644
--- a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/time-picker.vue
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/time-picker.vue
@@ -1,927 +1,927 @@
-<template>
-	<view class="uni-datetime-picker">
-		<view @click="initTimePicker">
-			<slot>
-				<view class="uni-datetime-picker-timebox-pointer"
-					:class="{'uni-datetime-picker-disabled': disabled, 'uni-datetime-picker-timebox': border}">
-					<text class="uni-datetime-picker-text">{{time}}</text>
-					<view v-if="!time" class="uni-datetime-picker-time">
-						<text class="uni-datetime-picker-text">{{selectTimeText}}</text>
-					</view>
-				</view>
-			</slot>
-		</view>
-		<view v-if="visible" id="mask" class="uni-datetime-picker-mask" @click="tiggerTimePicker"></view>
-		<view v-if="visible" class="uni-datetime-picker-popup" :class="[dateShow && timeShow ? '' : 'fix-nvue-height']"
-			:style="fixNvueBug">
-			<view class="uni-title">
-				<text class="uni-datetime-picker-text">{{selectTimeText}}</text>
-			</view>
-			<view v-if="dateShow" class="uni-datetime-picker__container-box">
-				<picker-view class="uni-datetime-picker-view" :indicator-style="indicatorStyle" :value="ymd"
-					@change="bindDateChange">
-					<picker-view-column>
-						<view class="uni-datetime-picker-item" v-for="(item,index) in years" :key="index">
-							<text class="uni-datetime-picker-item">{{lessThanTen(item)}}</text>
-						</view>
-					</picker-view-column>
-					<picker-view-column>
-						<view class="uni-datetime-picker-item" v-for="(item,index) in months" :key="index">
-							<text class="uni-datetime-picker-item">{{lessThanTen(item)}}</text>
-						</view>
-					</picker-view-column>
-					<picker-view-column>
-						<view class="uni-datetime-picker-item" v-for="(item,index) in days" :key="index">
-							<text class="uni-datetime-picker-item">{{lessThanTen(item)}}</text>
-						</view>
-					</picker-view-column>
-				</picker-view>
-				<!-- 兼容 nvue 不支持伪类 -->
-				<text class="uni-datetime-picker-sign sign-left">-</text>
-				<text class="uni-datetime-picker-sign sign-right">-</text>
-			</view>
-			<view v-if="timeShow" class="uni-datetime-picker__container-box">
-				<picker-view class="uni-datetime-picker-view" :class="[hideSecond ? 'time-hide-second' : '']"
-					:indicator-style="indicatorStyle" :value="hms" @change="bindTimeChange">
-					<picker-view-column>
-						<view class="uni-datetime-picker-item" v-for="(item,index) in hours" :key="index">
-							<text class="uni-datetime-picker-item">{{lessThanTen(item)}}</text>
-						</view>
-					</picker-view-column>
-					<picker-view-column>
-						<view class="uni-datetime-picker-item" v-for="(item,index) in minutes" :key="index">
-							<text class="uni-datetime-picker-item">{{lessThanTen(item)}}</text>
-						</view>
-					</picker-view-column>
-					<picker-view-column v-if="!hideSecond">
-						<view class="uni-datetime-picker-item" v-for="(item,index) in seconds" :key="index">
-							<text class="uni-datetime-picker-item">{{lessThanTen(item)}}</text>
-						</view>
-					</picker-view-column>
-				</picker-view>
-				<!-- 兼容 nvue 不支持伪类 -->
-				<text class="uni-datetime-picker-sign" :class="[hideSecond ? 'sign-center' : 'sign-left']">:</text>
-				<text v-if="!hideSecond" class="uni-datetime-picker-sign sign-right">:</text>
-			</view>
-			<view class="uni-datetime-picker-btn">
-				<view @click="clearTime">
-					<text class="uni-datetime-picker-btn-text">{{clearText}}</text>
-				</view>
-				<view class="uni-datetime-picker-btn-group">
-					<view class="uni-datetime-picker-cancel" @click="tiggerTimePicker">
-						<text class="uni-datetime-picker-btn-text">{{cancelText}}</text>
-					</view>
-					<view @click="setTime">
-						<text class="uni-datetime-picker-btn-text">{{okText}}</text>
-					</view>
-				</view>
-			</view>
-		</view>
-		<!-- #ifdef H5 -->
-		<!-- <keypress v-if="visible" @esc="tiggerTimePicker" @enter="setTime" /> -->
-		<!-- #endif -->
-	</view>
-</template>
-
-<script>
-	// #ifdef H5
-	import keypress from './keypress'
-	// #endif
-	import {
-		initVueI18n
-	} from '@dcloudio/uni-i18n'
-	import messages from './i18n/index.js'
-	const {	t	} = initVueI18n(messages)
-
-	/**
-	 * DatetimePicker 时间选择器
-	 * @description 可以同时选择日期和时间的选择器
-	 * @tutorial https://ext.dcloud.net.cn/plugin?id=xxx
-	 * @property {String} type = [datetime | date | time] 显示模式
-	 * @property {Boolean} multiple = [true|false] 是否多选
-	 * @property {String|Number} value 默认值
-	 * @property {String|Number} start 起始日期或时间
-	 * @property {String|Number} end 起始日期或时间
-	 * @property {String} return-type = [timestamp | string]
-	 * @event {Function} change  选中发生变化触发
-	 */
-
-	export default {
-		name: 'UniDatetimePicker',
-		components: {
-			// #ifdef H5
-			keypress
-			// #endif
-		},
-		data() {
-			return {
-				indicatorStyle: `height: 50px;`,
-				visible: false,
-				fixNvueBug: {},
-				dateShow: true,
-				timeShow: true,
-				title: '日期和时间',
-				// 输入框当前时间
-				time: '',
-				// 当前的年月日时分秒
-				year: 1920,
-				month: 0,
-				day: 0,
-				hour: 0,
-				minute: 0,
-				second: 0,
-				// 起始时间
-				startYear: 1920,
-				startMonth: 1,
-				startDay: 1,
-				startHour: 0,
-				startMinute: 0,
-				startSecond: 0,
-				// 结束时间
-				endYear: 2120,
-				endMonth: 12,
-				endDay: 31,
-				endHour: 23,
-				endMinute: 59,
-				endSecond: 59,
-			}
-		},
-		props: {
-			type: {
-				type: String,
-				default: 'datetime'
-			},
-			value: {
-				type: [String, Number],
-				default: ''
-			},
-			modelValue: {
-				type: [String, Number],
-				default: ''
-			},
-			start: {
-				type: [Number, String],
-				default: ''
-			},
-			end: {
-				type: [Number, String],
-				default: ''
-			},
-			returnType: {
-				type: String,
-				default: 'string'
-			},
-			disabled: {
-				type: [Boolean, String],
-				default: false
-			},
-			border: {
-				type: [Boolean, String],
-				default: true
-			},
-			hideSecond: {
-				type: [Boolean, String],
-				default: false
-			}
-		},
-		watch: {
-			value: {
-				handler(newVal, oldVal) {
-					if (newVal) {
-						this.parseValue(this.fixIosDateFormat(newVal)) //兼容 iOS、safari 日期格式
-						this.initTime(false)
-					} else {
-						this.time = ''
-						this.parseValue(Date.now())
-					}
-				},
-				immediate: true
-			},
-			type: {
-				handler(newValue) {
-					if (newValue === 'date') {
-						this.dateShow = true
-						this.timeShow = false
-						this.title = '日期'
-					} else if (newValue === 'time') {
-						this.dateShow = false
-						this.timeShow = true
-						this.title = '时间'
-					} else {
-						this.dateShow = true
-						this.timeShow = true
-						this.title = '日期和时间'
-					}
-				},
-				immediate: true
-			},
-			start: {
-				handler(newVal) {
-					this.parseDatetimeRange(this.fixIosDateFormat(newVal), 'start') //兼容 iOS、safari 日期格式
-				},
-				immediate: true
-			},
-			end: {
-				handler(newVal) {
-					this.parseDatetimeRange(this.fixIosDateFormat(newVal), 'end') //兼容 iOS、safari 日期格式
-				},
-				immediate: true
-			},
-
-			// 月、日、时、分、秒可选范围变化后，检查当前值是否在范围内，不在则当前值重置为可选范围第一项
-			months(newVal) {
-				this.checkValue('month', this.month, newVal)
-			},
-			days(newVal) {
-				this.checkValue('day', this.day, newVal)
-			},
-			hours(newVal) {
-				this.checkValue('hour', this.hour, newVal)
-			},
-			minutes(newVal) {
-				this.checkValue('minute', this.minute, newVal)
-			},
-			seconds(newVal) {
-				this.checkValue('second', this.second, newVal)
-			}
-		},
-		computed: {
-			// 当前年、月、日、时、分、秒选择范围
-			years() {
-				return this.getCurrentRange('year')
-			},
-
-			months() {
-				return this.getCurrentRange('month')
-			},
-
-			days() {
-				return this.getCurrentRange('day')
-			},
-
-			hours() {
-				return this.getCurrentRange('hour')
-			},
-
-			minutes() {
-				return this.getCurrentRange('minute')
-			},
-
-			seconds() {
-				return this.getCurrentRange('second')
-			},
-
-			// picker 当前值数组
-			ymd() {
-				return [this.year - this.minYear, this.month - this.minMonth, this.day - this.minDay]
-			},
-			hms() {
-				return [this.hour - this.minHour, this.minute - this.minMinute, this.second - this.minSecond]
-			},
-
-			// 当前 date 是 start
-			currentDateIsStart() {
-				return this.year === this.startYear && this.month === this.startMonth && this.day === this.startDay
-			},
-
-			// 当前 date 是 end
-			currentDateIsEnd() {
-				return this.year === this.endYear && this.month === this.endMonth && this.day === this.endDay
-			},
-
-			// 当前年、月、日、时、分、秒的最小值和最大值
-			minYear() {
-				return this.startYear
-			},
-			maxYear() {
-				return this.endYear
-			},
-			minMonth() {
-				if (this.year === this.startYear) {
-					return this.startMonth
-				} else {
-					return 1
-				}
-			},
-			maxMonth() {
-				if (this.year === this.endYear) {
-					return this.endMonth
-				} else {
-					return 12
-				}
-			},
-			minDay() {
-				if (this.year === this.startYear && this.month === this.startMonth) {
-					return this.startDay
-				} else {
-					return 1
-				}
-			},
-			maxDay() {
-				if (this.year === this.endYear && this.month === this.endMonth) {
-					return this.endDay
-				} else {
-					return this.daysInMonth(this.year, this.month)
-				}
-			},
-			minHour() {
-				if (this.type === 'datetime') {
-					if (this.currentDateIsStart) {
-						return this.startHour
-					} else {
-						return 0
-					}
-				}
-				if (this.type === 'time') {
-					return this.startHour
-				}
-			},
-			maxHour() {
-				if (this.type === 'datetime') {
-					if (this.currentDateIsEnd) {
-						return this.endHour
-					} else {
-						return 23
-					}
-				}
-				if (this.type === 'time') {
-					return this.endHour
-				}
-			},
-			minMinute() {
-				if (this.type === 'datetime') {
-					if (this.currentDateIsStart && this.hour === this.startHour) {
-						return this.startMinute
-					} else {
-						return 0
-					}
-				}
-				if (this.type === 'time') {
-					if (this.hour === this.startHour) {
-						return this.startMinute
-					} else {
-						return 0
-					}
-				}
-			},
-			maxMinute() {
-				if (this.type === 'datetime') {
-					if (this.currentDateIsEnd && this.hour === this.endHour) {
-						return this.endMinute
-					} else {
-						return 59
-					}
-				}
-				if (this.type === 'time') {
-					if (this.hour === this.endHour) {
-						return this.endMinute
-					} else {
-						return 59
-					}
-				}
-			},
-			minSecond() {
-				if (this.type === 'datetime') {
-					if (this.currentDateIsStart && this.hour === this.startHour && this.minute === this.startMinute) {
-						return this.startSecond
-					} else {
-						return 0
-					}
-				}
-				if (this.type === 'time') {
-					if (this.hour === this.startHour && this.minute === this.startMinute) {
-						return this.startSecond
-					} else {
-						return 0
-					}
-				}
-			},
-			maxSecond() {
-				if (this.type === 'datetime') {
-					if (this.currentDateIsEnd && this.hour === this.endHour && this.minute === this.endMinute) {
-						return this.endSecond
-					} else {
-						return 59
-					}
-				}
-				if (this.type === 'time') {
-					if (this.hour === this.endHour && this.minute === this.endMinute) {
-						return this.endSecond
-					} else {
-						return 59
-					}
-				}
-			},
-
-			/**
-			 * for i18n
-			 */
-			selectTimeText() {
-				return t("uni-datetime-picker.selectTime")
-			},
-			okText() {
-				return t("uni-datetime-picker.ok")
-			},
-			clearText() {
-				return t("uni-datetime-picker.clear")
-			},
-			cancelText() {
-				return t("uni-datetime-picker.cancel")
-			}
-		},
-
-		mounted() {
-			// #ifdef APP-NVUE
-			const res = uni.getSystemInfoSync();
-			this.fixNvueBug = {
-				top: res.windowHeight / 2,
-				left: res.windowWidth / 2
-			}
-			// #endif
-		},
-
-		methods: {
-			/**
-			 * @param {Object} item
-			 * 小于 10 在前面加个 0
-			 */
-
-			lessThanTen(item) {
-				return item < 10 ? '0' + item : item
-			},
-
-			/**
-			 * 解析时分秒字符串，例如：00:00:00
-			 * @param {String} timeString
-			 */
-			parseTimeType(timeString) {
-				if (timeString) {
-					let timeArr = timeString.split(':')
-					this.hour = Number(timeArr[0])
-					this.minute = Number(timeArr[1])
-					this.second = Number(timeArr[2])
-				}
-			},
-
-			/**
-			 * 解析选择器初始值，类型可以是字符串、时间戳，例如：2000-10-02、'08:30:00'、 1610695109000
-			 * @param {String | Number} datetime
-			 */
-			initPickerValue(datetime) {
-				let defaultValue = null
-				if (datetime) {
-					defaultValue = this.compareValueWithStartAndEnd(datetime, this.start, this.end)
-				} else {
-					defaultValue = Date.now()
-					defaultValue = this.compareValueWithStartAndEnd(defaultValue, this.start, this.end)
-				}
-				this.parseValue(defaultValue)
-			},
-
-			/**
-			 * 初始值规则：
-			 * - 用户设置初始值 value
-			 * 	- 设置了起始时间 start、终止时间 end，并 start < value < end，初始值为 value， 否则初始值为 start
-			 * 	- 只设置了起始时间 start，并 start < value，初始值为 value，否则初始值为 start
-			 * 	- 只设置了终止时间 end，并 value < end，初始值为 value，否则初始值为 end
-			 * 	- 无起始终止时间，则初始值为 value
-			 * - 无初始值 value，则初始值为当前本地时间 Date.now()
-			 * @param {Object} value
-			 * @param {Object} dateBase
-			 */
-			compareValueWithStartAndEnd(value, start, end) {
-				let winner = null
-				value = this.superTimeStamp(value)
-				start = this.superTimeStamp(start)
-				end = this.superTimeStamp(end)
-
-				if (start && end) {
-					if (value < start) {
-						winner = new Date(start)
-					} else if (value > end) {
-						winner = new Date(end)
-					} else {
-						winner = new Date(value)
-					}
-				} else if (start && !end) {
-					winner = start <= value ? new Date(value) : new Date(start)
-				} else if (!start && end) {
-					winner = value <= end ? new Date(value) : new Date(end)
-				} else {
-					winner = new Date(value)
-				}
-
-				return winner
-			},
-
-			/**
-			 * 转换为可比较的时间戳，接受日期、时分秒、时间戳
-			 * @param {Object} value
-			 */
-			superTimeStamp(value) {
-				let dateBase = ''
-				if (this.type === 'time' && value && typeof value === 'string') {
-					const now = new Date()
-					const year = now.getFullYear()
-					const month = now.getMonth() + 1
-					const day = now.getDate()
-					dateBase = year + '/' + month + '/' + day + ' '
-				}
-				if (Number(value) && typeof value !== NaN) {
-					value = parseInt(value)
-					dateBase = 0
-				}
-				return this.createTimeStamp(dateBase + value)
-			},
-
-			/**
-			 * 解析默认值 value，字符串、时间戳
-			 * @param {Object} defaultTime
-			 */
-			parseValue(value) {
-				if (!value) {
-					return
-				}
-				if (this.type === 'time' && typeof value === "string") {
-					this.parseTimeType(value)
-				} else {
-					let defaultDate = null
-					defaultDate = new Date(value)
-					if (this.type !== 'time') {
-						this.year = defaultDate.getFullYear()
-						this.month = defaultDate.getMonth() + 1
-						this.day = defaultDate.getDate()
-					}
-					if (this.type !== 'date') {
-						this.hour = defaultDate.getHours()
-						this.minute = defaultDate.getMinutes()
-						this.second = defaultDate.getSeconds()
-					}
-				}
-				if (this.hideSecond) {
-					this.second = 0
-				}
-			},
-
-			/**
-			 * 解析可选择时间范围 start、end，年月日字符串、时间戳
-			 * @param {Object} defaultTime
-			 */
-			parseDatetimeRange(point, pointType) {
-				// 时间为空，则重置为初始值
-				if (!point) {
-					if (pointType === 'start') {
-						this.startYear = 1920
-						this.startMonth = 1
-						this.startDay = 1
-						this.startHour = 0
-						this.startMinute = 0
-						this.startSecond = 0
-					}
-					if (pointType === 'end') {
-						this.endYear = 2120
-						this.endMonth = 12
-						this.endDay = 31
-						this.endHour = 23
-						this.endMinute = 59
-						this.endSecond = 59
-					}
-					return
-				}
-				if (this.type === 'time') {
-					const pointArr = point.split(':')
-					this[pointType + 'Hour'] = Number(pointArr[0])
-					this[pointType + 'Minute'] = Number(pointArr[1])
-					this[pointType + 'Second'] = Number(pointArr[2])
-				} else {
-					if (!point) {
-						pointType === 'start' ? this.startYear = this.year - 60 : this.endYear = this.year + 60
-						return
-					}
-					if (Number(point) && Number(point) !== NaN) {
-						point = parseInt(point)
-					}
-					// datetime 的 end 没有时分秒, 则不限制
-					const hasTime = /[0-9]:[0-9]/
-					if (this.type === 'datetime' && pointType === 'end' && typeof point === 'string' && !hasTime.test(
-							point)) {
-						point = point + ' 23:59:59'
-					}
-					const pointDate = new Date(point)
-					this[pointType + 'Year'] = pointDate.getFullYear()
-					this[pointType + 'Month'] = pointDate.getMonth() + 1
-					this[pointType + 'Day'] = pointDate.getDate()
-					if (this.type === 'datetime') {
-						this[pointType + 'Hour'] = pointDate.getHours()
-						this[pointType + 'Minute'] = pointDate.getMinutes()
-						this[pointType + 'Second'] = pointDate.getSeconds()
-					}
-				}
-			},
-
-			// 获取 年、月、日、时、分、秒 当前可选范围
-			getCurrentRange(value) {
-				const range = []
-				for (let i = this['min' + this.capitalize(value)]; i <= this['max' + this.capitalize(value)]; i++) {
-					range.push(i)
-				}
-				return range
-			},
-
-			// 字符串首字母大写
-			capitalize(str) {
-				return str.charAt(0).toUpperCase() + str.slice(1)
-			},
-
-			// 检查当前值是否在范围内，不在则当前值重置为可选范围第一项
-			checkValue(name, value, values) {
-				if (values.indexOf(value) === -1) {
-					this[name] = values[0]
-				}
-			},
-
-			// 每个月的实际天数
-			daysInMonth(year, month) { // Use 1 for January, 2 for February, etc.
-				return new Date(year, month, 0).getDate();
-			},
-
-			//兼容 iOS、safari 日期格式
-			fixIosDateFormat(value) {
-				if (typeof value === 'string') {
-					value = value.replace(/-/g, '/')
-				}
-				return value
-			},
-
-			/**
-			 * 生成时间戳
-			 * @param {Object} time
-			 */
-			createTimeStamp(time) {
-				if (!time) return
-				if (typeof time === "number") {
-					return time
-				} else {
-					time = time.replace(/-/g, '/')
-					if (this.type === 'date') {
-						time = time + ' ' + '00:00:00'
-					}
-					return Date.parse(time)
-				}
-			},
-
-			/**
-			 * 生成日期或时间的字符串
-			 */
-			createDomSting() {
-				const yymmdd = this.year +
-					'-' +
-					this.lessThanTen(this.month) +
-					'-' +
-					this.lessThanTen(this.day)
-
-				let hhmmss = this.lessThanTen(this.hour) +
-					':' +
-					this.lessThanTen(this.minute)
-
-				if (!this.hideSecond) {
-					hhmmss = hhmmss + ':' + this.lessThanTen(this.second)
-				}
-
-				if (this.type === 'date') {
-					return yymmdd
-				} else if (this.type === 'time') {
-					return hhmmss
-				} else {
-					return yymmdd + ' ' + hhmmss
-				}
-			},
-
-			/**
-			 * 初始化返回值，并抛出 change 事件
-			 */
-			initTime(emit = true) {
-				this.time = this.createDomSting()
-				if (!emit) return
-				if (this.returnType === 'timestamp' && this.type !== 'time') {
-					this.$emit('change', this.createTimeStamp(this.time))
-					this.$emit('input', this.createTimeStamp(this.time))
-					this.$emit('update:modelValue', this.createTimeStamp(this.time))
-				} else {
-					this.$emit('change', this.time)
-					this.$emit('input', this.time)
-					this.$emit('update:modelValue', this.time)
-				}
-			},
-
-			/**
-			 * 用户选择日期或时间更新 data
-			 * @param {Object} e
-			 */
-			bindDateChange(e) {
-				const val = e.detail.value
-				this.year = this.years[val[0]]
-				this.month = this.months[val[1]]
-				this.day = this.days[val[2]]
-			},
-			bindTimeChange(e) {
-				const val = e.detail.value
-				this.hour = this.hours[val[0]]
-				this.minute = this.minutes[val[1]]
-				this.second = this.seconds[val[2]]
-			},
-
-			/**
-			 * 初始化弹出层
-			 */
-			initTimePicker() {
-				if (this.disabled) return
-				const value = this.fixIosDateFormat(this.value)
-				this.initPickerValue(value)
-				this.visible = !this.visible
-			},
-
-			/**
-			 * 触发或关闭弹框
-			 */
-			tiggerTimePicker(e) {
-				this.visible = !this.visible
-			},
-
-			/**
-			 * 用户点击“清空”按钮，清空当前值
-			 */
-			clearTime() {
-				this.time = ''
-				this.$emit('change', this.time)
-				this.$emit('input', this.time)
-				this.$emit('update:modelValue', this.time)
-				this.tiggerTimePicker()
-			},
-
-			/**
-			 * 用户点击“确定”按钮
-			 */
-			setTime() {
-				this.initTime()
-				this.tiggerTimePicker()
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	.uni-datetime-picker {
-		/* #ifndef APP-NVUE */
-		/* width: 100%; */
-		/* #endif */
-	}
-
-	.uni-datetime-picker-view {
-		height: 130px;
-		width: 270px;
-		/* #ifndef APP-NVUE */
-		cursor: pointer;
-		/* #endif */
-	}
-
-	.uni-datetime-picker-item {
-		height: 50px;
-		line-height: 50px;
-		text-align: center;
-		font-size: 14px;
-	}
-
-	.uni-datetime-picker-btn {
-		margin-top: 60px;
-		/* #ifndef APP-NVUE */
-		display: flex;
-		cursor: pointer;
-		/* #endif */
-		flex-direction: row;
-		justify-content: space-between;
-	}
-
-	.uni-datetime-picker-btn-text {
-		font-size: 14px;
-		color: #007AFF;
-	}
-
-	.uni-datetime-picker-btn-group {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex-direction: row;
-	}
-
-	.uni-datetime-picker-cancel {
-		margin-right: 30px;
-	}
-
-	.uni-datetime-picker-mask {
-		position: fixed;
-		bottom: 0px;
-		top: 0px;
-		left: 0px;
-		right: 0px;
-		background-color: rgba(0, 0, 0, 0.4);
-		transition-duration: 0.3s;
-		z-index: 998;
-	}
-
-	.uni-datetime-picker-popup {
-		border-radius: 8px;
-		padding: 30px;
-		width: 270px;
-		/* #ifdef APP-NVUE */
-		height: 500px;
-		/* #endif */
-		/* #ifdef APP-NVUE */
-		width: 330px;
-		/* #endif */
-		background-color: #fff;
-		position: fixed;
-		top: 50%;
-		left: 50%;
-		transform: translate(-50%, -50%);
-		transition-duration: 0.3s;
-		z-index: 999;
-	}
-
-	.fix-nvue-height {
-		/* #ifdef APP-NVUE */
-		height: 330px;
-		/* #endif */
-	}
-
-	.uni-datetime-picker-time {
-		color: grey;
-	}
-
-	.uni-datetime-picker-column {
-		height: 50px;
-	}
-
-	.uni-datetime-picker-timebox {
-
-		border: 1px solid #E5E5E5;
-		border-radius: 5px;
-		padding: 7px 10px;
-		/* #ifndef APP-NVUE */
-		box-sizing: border-box;
-		cursor: pointer;
-		/* #endif */
-	}
-
-	.uni-datetime-picker-timebox-pointer {
-		/* #ifndef APP-NVUE */
-		cursor: pointer;
-		/* #endif */
-	}
-
-
-	.uni-datetime-picker-disabled {
-		opacity: 0.4;
-		/* #ifdef H5 */
-		cursor: not-allowed !important;
-		/* #endif */
-	}
-
-	.uni-datetime-picker-text {
-		font-size: 14px;
-	}
-
-	.uni-datetime-picker-sign {
-		position: absolute;
-		top: 53px;
-		/* 减掉 10px 的元素高度，兼容nvue */
-		color: #999;
-		/* #ifdef APP-NVUE */
-		font-size: 16px;
-		/* #endif */
-	}
-
-	.sign-left {
-		left: 86px;
-	}
-
-	.sign-right {
-		right: 86px;
-	}
-
-	.sign-center {
-		left: 135px;
-	}
-
-	.uni-datetime-picker__container-box {
-		position: relative;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		margin-top: 40px;
-	}
-
-	.time-hide-second {
-		width: 180px;
-	}
-</style>
+<template>
+	<view class="uni-datetime-picker">
+		<view @click="initTimePicker">
+			<slot>
+				<view class="uni-datetime-picker-timebox-pointer"
+					:class="{'uni-datetime-picker-disabled': disabled, 'uni-datetime-picker-timebox': border}">
+					<text class="uni-datetime-picker-text">{{time}}</text>
+					<view v-if="!time" class="uni-datetime-picker-time">
+						<text class="uni-datetime-picker-text">{{selectTimeText}}</text>
+					</view>
+				</view>
+			</slot>
+		</view>
+		<view v-if="visible" id="mask" class="uni-datetime-picker-mask" @click="tiggerTimePicker"></view>
+		<view v-if="visible" class="uni-datetime-picker-popup" :class="[dateShow && timeShow ? '' : 'fix-nvue-height']"
+			:style="fixNvueBug">
+			<view class="uni-title">
+				<text class="uni-datetime-picker-text">{{selectTimeText}}</text>
+			</view>
+			<view v-if="dateShow" class="uni-datetime-picker__container-box">
+				<picker-view class="uni-datetime-picker-view" :indicator-style="indicatorStyle" :value="ymd"
+					@change="bindDateChange">
+					<picker-view-column>
+						<view class="uni-datetime-picker-item" v-for="(item,index) in years" :key="index">
+							<text class="uni-datetime-picker-item">{{lessThanTen(item)}}</text>
+						</view>
+					</picker-view-column>
+					<picker-view-column>
+						<view class="uni-datetime-picker-item" v-for="(item,index) in months" :key="index">
+							<text class="uni-datetime-picker-item">{{lessThanTen(item)}}</text>
+						</view>
+					</picker-view-column>
+					<picker-view-column>
+						<view class="uni-datetime-picker-item" v-for="(item,index) in days" :key="index">
+							<text class="uni-datetime-picker-item">{{lessThanTen(item)}}</text>
+						</view>
+					</picker-view-column>
+				</picker-view>
+				<!-- 兼容 nvue 不支持伪类 -->
+				<text class="uni-datetime-picker-sign sign-left">-</text>
+				<text class="uni-datetime-picker-sign sign-right">-</text>
+			</view>
+			<view v-if="timeShow" class="uni-datetime-picker__container-box">
+				<picker-view class="uni-datetime-picker-view" :class="[hideSecond ? 'time-hide-second' : '']"
+					:indicator-style="indicatorStyle" :value="hms" @change="bindTimeChange">
+					<picker-view-column>
+						<view class="uni-datetime-picker-item" v-for="(item,index) in hours" :key="index">
+							<text class="uni-datetime-picker-item">{{lessThanTen(item)}}</text>
+						</view>
+					</picker-view-column>
+					<picker-view-column>
+						<view class="uni-datetime-picker-item" v-for="(item,index) in minutes" :key="index">
+							<text class="uni-datetime-picker-item">{{lessThanTen(item)}}</text>
+						</view>
+					</picker-view-column>
+					<picker-view-column v-if="!hideSecond">
+						<view class="uni-datetime-picker-item" v-for="(item,index) in seconds" :key="index">
+							<text class="uni-datetime-picker-item">{{lessThanTen(item)}}</text>
+						</view>
+					</picker-view-column>
+				</picker-view>
+				<!-- 兼容 nvue 不支持伪类 -->
+				<text class="uni-datetime-picker-sign" :class="[hideSecond ? 'sign-center' : 'sign-left']">:</text>
+				<text v-if="!hideSecond" class="uni-datetime-picker-sign sign-right">:</text>
+			</view>
+			<view class="uni-datetime-picker-btn">
+				<view @click="clearTime">
+					<text class="uni-datetime-picker-btn-text">{{clearText}}</text>
+				</view>
+				<view class="uni-datetime-picker-btn-group">
+					<view class="uni-datetime-picker-cancel" @click="tiggerTimePicker">
+						<text class="uni-datetime-picker-btn-text">{{cancelText}}</text>
+					</view>
+					<view @click="setTime">
+						<text class="uni-datetime-picker-btn-text">{{okText}}</text>
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- #ifdef H5 -->
+		<!-- <keypress v-if="visible" @esc="tiggerTimePicker" @enter="setTime" /> -->
+		<!-- #endif -->
+	</view>
+</template>
+
+<script>
+	// #ifdef H5
+	import keypress from './keypress'
+	// #endif
+	import {
+		initVueI18n
+	} from '@dcloudio/uni-i18n'
+	import messages from './i18n/index.js'
+	const {	t	} = initVueI18n(messages)
+
+	/**
+	 * DatetimePicker 时间选择器
+	 * @description 可以同时选择日期和时间的选择器
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=xxx
+	 * @property {String} type = [datetime | date | time] 显示模式
+	 * @property {Boolean} multiple = [true|false] 是否多选
+	 * @property {String|Number} value 默认值
+	 * @property {String|Number} start 起始日期或时间
+	 * @property {String|Number} end 起始日期或时间
+	 * @property {String} return-type = [timestamp | string]
+	 * @event {Function} change  选中发生变化触发
+	 */
+
+	export default {
+		name: 'UniDatetimePicker',
+		components: {
+			// #ifdef H5
+			keypress
+			// #endif
+		},
+		data() {
+			return {
+				indicatorStyle: `height: 50px;`,
+				visible: false,
+				fixNvueBug: {},
+				dateShow: true,
+				timeShow: true,
+				title: '日期和时间',
+				// 输入框当前时间
+				time: '',
+				// 当前的年月日时分秒
+				year: 1920,
+				month: 0,
+				day: 0,
+				hour: 0,
+				minute: 0,
+				second: 0,
+				// 起始时间
+				startYear: 1920,
+				startMonth: 1,
+				startDay: 1,
+				startHour: 0,
+				startMinute: 0,
+				startSecond: 0,
+				// 结束时间
+				endYear: 2120,
+				endMonth: 12,
+				endDay: 31,
+				endHour: 23,
+				endMinute: 59,
+				endSecond: 59,
+			}
+		},
+		props: {
+			type: {
+				type: String,
+				default: 'datetime'
+			},
+			value: {
+				type: [String, Number],
+				default: ''
+			},
+			modelValue: {
+				type: [String, Number],
+				default: ''
+			},
+			start: {
+				type: [Number, String],
+				default: ''
+			},
+			end: {
+				type: [Number, String],
+				default: ''
+			},
+			returnType: {
+				type: String,
+				default: 'string'
+			},
+			disabled: {
+				type: [Boolean, String],
+				default: false
+			},
+			border: {
+				type: [Boolean, String],
+				default: true
+			},
+			hideSecond: {
+				type: [Boolean, String],
+				default: false
+			}
+		},
+		watch: {
+			value: {
+				handler(newVal, oldVal) {
+					if (newVal) {
+						this.parseValue(this.fixIosDateFormat(newVal)) //兼容 iOS、safari 日期格式
+						this.initTime(false)
+					} else {
+						this.time = ''
+						this.parseValue(Date.now())
+					}
+				},
+				immediate: true
+			},
+			type: {
+				handler(newValue) {
+					if (newValue === 'date') {
+						this.dateShow = true
+						this.timeShow = false
+						this.title = '日期'
+					} else if (newValue === 'time') {
+						this.dateShow = false
+						this.timeShow = true
+						this.title = '时间'
+					} else {
+						this.dateShow = true
+						this.timeShow = true
+						this.title = '日期和时间'
+					}
+				},
+				immediate: true
+			},
+			start: {
+				handler(newVal) {
+					this.parseDatetimeRange(this.fixIosDateFormat(newVal), 'start') //兼容 iOS、safari 日期格式
+				},
+				immediate: true
+			},
+			end: {
+				handler(newVal) {
+					this.parseDatetimeRange(this.fixIosDateFormat(newVal), 'end') //兼容 iOS、safari 日期格式
+				},
+				immediate: true
+			},
+
+			// 月、日、时、分、秒可选范围变化后，检查当前值是否在范围内，不在则当前值重置为可选范围第一项
+			months(newVal) {
+				this.checkValue('month', this.month, newVal)
+			},
+			days(newVal) {
+				this.checkValue('day', this.day, newVal)
+			},
+			hours(newVal) {
+				this.checkValue('hour', this.hour, newVal)
+			},
+			minutes(newVal) {
+				this.checkValue('minute', this.minute, newVal)
+			},
+			seconds(newVal) {
+				this.checkValue('second', this.second, newVal)
+			}
+		},
+		computed: {
+			// 当前年、月、日、时、分、秒选择范围
+			years() {
+				return this.getCurrentRange('year')
+			},
+
+			months() {
+				return this.getCurrentRange('month')
+			},
+
+			days() {
+				return this.getCurrentRange('day')
+			},
+
+			hours() {
+				return this.getCurrentRange('hour')
+			},
+
+			minutes() {
+				return this.getCurrentRange('minute')
+			},
+
+			seconds() {
+				return this.getCurrentRange('second')
+			},
+
+			// picker 当前值数组
+			ymd() {
+				return [this.year - this.minYear, this.month - this.minMonth, this.day - this.minDay]
+			},
+			hms() {
+				return [this.hour - this.minHour, this.minute - this.minMinute, this.second - this.minSecond]
+			},
+
+			// 当前 date 是 start
+			currentDateIsStart() {
+				return this.year === this.startYear && this.month === this.startMonth && this.day === this.startDay
+			},
+
+			// 当前 date 是 end
+			currentDateIsEnd() {
+				return this.year === this.endYear && this.month === this.endMonth && this.day === this.endDay
+			},
+
+			// 当前年、月、日、时、分、秒的最小值和最大值
+			minYear() {
+				return this.startYear
+			},
+			maxYear() {
+				return this.endYear
+			},
+			minMonth() {
+				if (this.year === this.startYear) {
+					return this.startMonth
+				} else {
+					return 1
+				}
+			},
+			maxMonth() {
+				if (this.year === this.endYear) {
+					return this.endMonth
+				} else {
+					return 12
+				}
+			},
+			minDay() {
+				if (this.year === this.startYear && this.month === this.startMonth) {
+					return this.startDay
+				} else {
+					return 1
+				}
+			},
+			maxDay() {
+				if (this.year === this.endYear && this.month === this.endMonth) {
+					return this.endDay
+				} else {
+					return this.daysInMonth(this.year, this.month)
+				}
+			},
+			minHour() {
+				if (this.type === 'datetime') {
+					if (this.currentDateIsStart) {
+						return this.startHour
+					} else {
+						return 0
+					}
+				}
+				if (this.type === 'time') {
+					return this.startHour
+				}
+			},
+			maxHour() {
+				if (this.type === 'datetime') {
+					if (this.currentDateIsEnd) {
+						return this.endHour
+					} else {
+						return 23
+					}
+				}
+				if (this.type === 'time') {
+					return this.endHour
+				}
+			},
+			minMinute() {
+				if (this.type === 'datetime') {
+					if (this.currentDateIsStart && this.hour === this.startHour) {
+						return this.startMinute
+					} else {
+						return 0
+					}
+				}
+				if (this.type === 'time') {
+					if (this.hour === this.startHour) {
+						return this.startMinute
+					} else {
+						return 0
+					}
+				}
+			},
+			maxMinute() {
+				if (this.type === 'datetime') {
+					if (this.currentDateIsEnd && this.hour === this.endHour) {
+						return this.endMinute
+					} else {
+						return 59
+					}
+				}
+				if (this.type === 'time') {
+					if (this.hour === this.endHour) {
+						return this.endMinute
+					} else {
+						return 59
+					}
+				}
+			},
+			minSecond() {
+				if (this.type === 'datetime') {
+					if (this.currentDateIsStart && this.hour === this.startHour && this.minute === this.startMinute) {
+						return this.startSecond
+					} else {
+						return 0
+					}
+				}
+				if (this.type === 'time') {
+					if (this.hour === this.startHour && this.minute === this.startMinute) {
+						return this.startSecond
+					} else {
+						return 0
+					}
+				}
+			},
+			maxSecond() {
+				if (this.type === 'datetime') {
+					if (this.currentDateIsEnd && this.hour === this.endHour && this.minute === this.endMinute) {
+						return this.endSecond
+					} else {
+						return 59
+					}
+				}
+				if (this.type === 'time') {
+					if (this.hour === this.endHour && this.minute === this.endMinute) {
+						return this.endSecond
+					} else {
+						return 59
+					}
+				}
+			},
+
+			/**
+			 * for i18n
+			 */
+			selectTimeText() {
+				return t("uni-datetime-picker.selectTime")
+			},
+			okText() {
+				return t("uni-datetime-picker.ok")
+			},
+			clearText() {
+				return t("uni-datetime-picker.clear")
+			},
+			cancelText() {
+				return t("uni-datetime-picker.cancel")
+			}
+		},
+
+		mounted() {
+			// #ifdef APP-NVUE
+			const res = uni.getSystemInfoSync();
+			this.fixNvueBug = {
+				top: res.windowHeight / 2,
+				left: res.windowWidth / 2
+			}
+			// #endif
+		},
+
+		methods: {
+			/**
+			 * @param {Object} item
+			 * 小于 10 在前面加个 0
+			 */
+
+			lessThanTen(item) {
+				return item < 10 ? '0' + item : item
+			},
+
+			/**
+			 * 解析时分秒字符串，例如：00:00:00
+			 * @param {String} timeString
+			 */
+			parseTimeType(timeString) {
+				if (timeString) {
+					let timeArr = timeString.split(':')
+					this.hour = Number(timeArr[0])
+					this.minute = Number(timeArr[1])
+					this.second = Number(timeArr[2])
+				}
+			},
+
+			/**
+			 * 解析选择器初始值，类型可以是字符串、时间戳，例如：2000-10-02、'08:30:00'、 1610695109000
+			 * @param {String | Number} datetime
+			 */
+			initPickerValue(datetime) {
+				let defaultValue = null
+				if (datetime) {
+					defaultValue = this.compareValueWithStartAndEnd(datetime, this.start, this.end)
+				} else {
+					defaultValue = Date.now()
+					defaultValue = this.compareValueWithStartAndEnd(defaultValue, this.start, this.end)
+				}
+				this.parseValue(defaultValue)
+			},
+
+			/**
+			 * 初始值规则：
+			 * - 用户设置初始值 value
+			 * 	- 设置了起始时间 start、终止时间 end，并 start < value < end，初始值为 value， 否则初始值为 start
+			 * 	- 只设置了起始时间 start，并 start < value，初始值为 value，否则初始值为 start
+			 * 	- 只设置了终止时间 end，并 value < end，初始值为 value，否则初始值为 end
+			 * 	- 无起始终止时间，则初始值为 value
+			 * - 无初始值 value，则初始值为当前本地时间 Date.now()
+			 * @param {Object} value
+			 * @param {Object} dateBase
+			 */
+			compareValueWithStartAndEnd(value, start, end) {
+				let winner = null
+				value = this.superTimeStamp(value)
+				start = this.superTimeStamp(start)
+				end = this.superTimeStamp(end)
+
+				if (start && end) {
+					if (value < start) {
+						winner = new Date(start)
+					} else if (value > end) {
+						winner = new Date(end)
+					} else {
+						winner = new Date(value)
+					}
+				} else if (start && !end) {
+					winner = start <= value ? new Date(value) : new Date(start)
+				} else if (!start && end) {
+					winner = value <= end ? new Date(value) : new Date(end)
+				} else {
+					winner = new Date(value)
+				}
+
+				return winner
+			},
+
+			/**
+			 * 转换为可比较的时间戳，接受日期、时分秒、时间戳
+			 * @param {Object} value
+			 */
+			superTimeStamp(value) {
+				let dateBase = ''
+				if (this.type === 'time' && value && typeof value === 'string') {
+					const now = new Date()
+					const year = now.getFullYear()
+					const month = now.getMonth() + 1
+					const day = now.getDate()
+					dateBase = year + '/' + month + '/' + day + ' '
+				}
+				if (Number(value) && typeof value !== NaN) {
+					value = parseInt(value)
+					dateBase = 0
+				}
+				return this.createTimeStamp(dateBase + value)
+			},
+
+			/**
+			 * 解析默认值 value，字符串、时间戳
+			 * @param {Object} defaultTime
+			 */
+			parseValue(value) {
+				if (!value) {
+					return
+				}
+				if (this.type === 'time' && typeof value === "string") {
+					this.parseTimeType(value)
+				} else {
+					let defaultDate = null
+					defaultDate = new Date(value)
+					if (this.type !== 'time') {
+						this.year = defaultDate.getFullYear()
+						this.month = defaultDate.getMonth() + 1
+						this.day = defaultDate.getDate()
+					}
+					if (this.type !== 'date') {
+						this.hour = defaultDate.getHours()
+						this.minute = defaultDate.getMinutes()
+						this.second = defaultDate.getSeconds()
+					}
+				}
+				if (this.hideSecond) {
+					this.second = 0
+				}
+			},
+
+			/**
+			 * 解析可选择时间范围 start、end，年月日字符串、时间戳
+			 * @param {Object} defaultTime
+			 */
+			parseDatetimeRange(point, pointType) {
+				// 时间为空，则重置为初始值
+				if (!point) {
+					if (pointType === 'start') {
+						this.startYear = 1920
+						this.startMonth = 1
+						this.startDay = 1
+						this.startHour = 0
+						this.startMinute = 0
+						this.startSecond = 0
+					}
+					if (pointType === 'end') {
+						this.endYear = 2120
+						this.endMonth = 12
+						this.endDay = 31
+						this.endHour = 23
+						this.endMinute = 59
+						this.endSecond = 59
+					}
+					return
+				}
+				if (this.type === 'time') {
+					const pointArr = point.split(':')
+					this[pointType + 'Hour'] = Number(pointArr[0])
+					this[pointType + 'Minute'] = Number(pointArr[1])
+					this[pointType + 'Second'] = Number(pointArr[2])
+				} else {
+					if (!point) {
+						pointType === 'start' ? this.startYear = this.year - 60 : this.endYear = this.year + 60
+						return
+					}
+					if (Number(point) && Number(point) !== NaN) {
+						point = parseInt(point)
+					}
+					// datetime 的 end 没有时分秒, 则不限制
+					const hasTime = /[0-9]:[0-9]/
+					if (this.type === 'datetime' && pointType === 'end' && typeof point === 'string' && !hasTime.test(
+							point)) {
+						point = point + ' 23:59:59'
+					}
+					const pointDate = new Date(point)
+					this[pointType + 'Year'] = pointDate.getFullYear()
+					this[pointType + 'Month'] = pointDate.getMonth() + 1
+					this[pointType + 'Day'] = pointDate.getDate()
+					if (this.type === 'datetime') {
+						this[pointType + 'Hour'] = pointDate.getHours()
+						this[pointType + 'Minute'] = pointDate.getMinutes()
+						this[pointType + 'Second'] = pointDate.getSeconds()
+					}
+				}
+			},
+
+			// 获取 年、月、日、时、分、秒 当前可选范围
+			getCurrentRange(value) {
+				const range = []
+				for (let i = this['min' + this.capitalize(value)]; i <= this['max' + this.capitalize(value)]; i++) {
+					range.push(i)
+				}
+				return range
+			},
+
+			// 字符串首字母大写
+			capitalize(str) {
+				return str.charAt(0).toUpperCase() + str.slice(1)
+			},
+
+			// 检查当前值是否在范围内，不在则当前值重置为可选范围第一项
+			checkValue(name, value, values) {
+				if (values.indexOf(value) === -1) {
+					this[name] = values[0]
+				}
+			},
+
+			// 每个月的实际天数
+			daysInMonth(year, month) { // Use 1 for January, 2 for February, etc.
+				return new Date(year, month, 0).getDate();
+			},
+
+			//兼容 iOS、safari 日期格式
+			fixIosDateFormat(value) {
+				if (typeof value === 'string') {
+					value = value.replace(/-/g, '/')
+				}
+				return value
+			},
+
+			/**
+			 * 生成时间戳
+			 * @param {Object} time
+			 */
+			createTimeStamp(time) {
+				if (!time) return
+				if (typeof time === "number") {
+					return time
+				} else {
+					time = time.replace(/-/g, '/')
+					if (this.type === 'date') {
+						time = time + ' ' + '00:00:00'
+					}
+					return Date.parse(time)
+				}
+			},
+
+			/**
+			 * 生成日期或时间的字符串
+			 */
+			createDomSting() {
+				const yymmdd = this.year +
+					'-' +
+					this.lessThanTen(this.month) +
+					'-' +
+					this.lessThanTen(this.day)
+
+				let hhmmss = this.lessThanTen(this.hour) +
+					':' +
+					this.lessThanTen(this.minute)
+
+				if (!this.hideSecond) {
+					hhmmss = hhmmss + ':' + this.lessThanTen(this.second)
+				}
+
+				if (this.type === 'date') {
+					return yymmdd
+				} else if (this.type === 'time') {
+					return hhmmss
+				} else {
+					return yymmdd + ' ' + hhmmss
+				}
+			},
+
+			/**
+			 * 初始化返回值，并抛出 change 事件
+			 */
+			initTime(emit = true) {
+				this.time = this.createDomSting()
+				if (!emit) return
+				if (this.returnType === 'timestamp' && this.type !== 'time') {
+					this.$emit('change', this.createTimeStamp(this.time))
+					this.$emit('input', this.createTimeStamp(this.time))
+					this.$emit('update:modelValue', this.createTimeStamp(this.time))
+				} else {
+					this.$emit('change', this.time)
+					this.$emit('input', this.time)
+					this.$emit('update:modelValue', this.time)
+				}
+			},
+
+			/**
+			 * 用户选择日期或时间更新 data
+			 * @param {Object} e
+			 */
+			bindDateChange(e) {
+				const val = e.detail.value
+				this.year = this.years[val[0]]
+				this.month = this.months[val[1]]
+				this.day = this.days[val[2]]
+			},
+			bindTimeChange(e) {
+				const val = e.detail.value
+				this.hour = this.hours[val[0]]
+				this.minute = this.minutes[val[1]]
+				this.second = this.seconds[val[2]]
+			},
+
+			/**
+			 * 初始化弹出层
+			 */
+			initTimePicker() {
+				if (this.disabled) return
+				const value = this.fixIosDateFormat(this.value)
+				this.initPickerValue(value)
+				this.visible = !this.visible
+			},
+
+			/**
+			 * 触发或关闭弹框
+			 */
+			tiggerTimePicker(e) {
+				this.visible = !this.visible
+			},
+
+			/**
+			 * 用户点击“清空”按钮，清空当前值
+			 */
+			clearTime() {
+				this.time = ''
+				this.$emit('change', this.time)
+				this.$emit('input', this.time)
+				this.$emit('update:modelValue', this.time)
+				this.tiggerTimePicker()
+			},
+
+			/**
+			 * 用户点击“确定”按钮
+			 */
+			setTime() {
+				this.initTime()
+				this.tiggerTimePicker()
+			}
+		}
+	}
+</script>
+
+<style>
+	.uni-datetime-picker {
+		/* #ifndef APP-NVUE */
+		/* width: 100%; */
+		/* #endif */
+	}
+
+	.uni-datetime-picker-view {
+		height: 130px;
+		width: 270px;
+		/* #ifndef APP-NVUE */
+		cursor: pointer;
+		/* #endif */
+	}
+
+	.uni-datetime-picker-item {
+		height: 50px;
+		line-height: 50px;
+		text-align: center;
+		font-size: 14px;
+	}
+
+	.uni-datetime-picker-btn {
+		margin-top: 60px;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		cursor: pointer;
+		/* #endif */
+		flex-direction: row;
+		justify-content: space-between;
+	}
+
+	.uni-datetime-picker-btn-text {
+		font-size: 14px;
+		color: #007AFF;
+	}
+
+	.uni-datetime-picker-btn-group {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+	}
+
+	.uni-datetime-picker-cancel {
+		margin-right: 30px;
+	}
+
+	.uni-datetime-picker-mask {
+		position: fixed;
+		bottom: 0px;
+		top: 0px;
+		left: 0px;
+		right: 0px;
+		background-color: rgba(0, 0, 0, 0.4);
+		transition-duration: 0.3s;
+		z-index: 998;
+	}
+
+	.uni-datetime-picker-popup {
+		border-radius: 8px;
+		padding: 30px;
+		width: 270px;
+		/* #ifdef APP-NVUE */
+		height: 500px;
+		/* #endif */
+		/* #ifdef APP-NVUE */
+		width: 330px;
+		/* #endif */
+		background-color: #fff;
+		position: fixed;
+		top: 50%;
+		left: 50%;
+		transform: translate(-50%, -50%);
+		transition-duration: 0.3s;
+		z-index: 999;
+	}
+
+	.fix-nvue-height {
+		/* #ifdef APP-NVUE */
+		height: 330px;
+		/* #endif */
+	}
+
+	.uni-datetime-picker-time {
+		color: grey;
+	}
+
+	.uni-datetime-picker-column {
+		height: 50px;
+	}
+
+	.uni-datetime-picker-timebox {
+
+		border: 1px solid #E5E5E5;
+		border-radius: 5px;
+		padding: 7px 10px;
+		/* #ifndef APP-NVUE */
+		box-sizing: border-box;
+		cursor: pointer;
+		/* #endif */
+	}
+
+	.uni-datetime-picker-timebox-pointer {
+		/* #ifndef APP-NVUE */
+		cursor: pointer;
+		/* #endif */
+	}
+
+
+	.uni-datetime-picker-disabled {
+		opacity: 0.4;
+		/* #ifdef H5 */
+		cursor: not-allowed !important;
+		/* #endif */
+	}
+
+	.uni-datetime-picker-text {
+		font-size: 14px;
+	}
+
+	.uni-datetime-picker-sign {
+		position: absolute;
+		top: 53px;
+		/* 减掉 10px 的元素高度，兼容nvue */
+		color: #999;
+		/* #ifdef APP-NVUE */
+		font-size: 16px;
+		/* #endif */
+	}
+
+	.sign-left {
+		left: 86px;
+	}
+
+	.sign-right {
+		right: 86px;
+	}
+
+	.sign-center {
+		left: 135px;
+	}
+
+	.uni-datetime-picker__container-box {
+		position: relative;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		margin-top: 40px;
+	}
+
+	.time-hide-second {
+		width: 180px;
+	}
+</style>
diff --git a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue
index bc22617..e844331 100644
--- a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue
@@ -1,981 +1,981 @@
-<template>
-	<view class="uni-date">
-		<view class="uni-date-editor" @click="show">
-			<slot>
-				<view class="uni-date-editor--x" :class="{'uni-date-editor--x__disabled': disabled,
-		'uni-date-x--border': border}">
-					<view v-if="!isRange" class="uni-date-x uni-date-single">
-						<uni-icons type="calendar" color="#e1e1e1" size="22"></uni-icons>
-						<input class="uni-date__x-input" type="text" v-model="singleVal"
-							:placeholder="singlePlaceholderText" :disabled="true" />
-					</view>
-					<view v-else class="uni-date-x uni-date-range">
-						<uni-icons type="calendar" color="#e1e1e1" size="22"></uni-icons>
-						<input class="uni-date__x-input t-c" type="text" v-model="range.startDate"
-							:placeholder="startPlaceholderText" :disabled="true" />
-						<slot>
-							<view class="">{{rangeSeparator}}</view>
-						</slot>
-						<input class="uni-date__x-input t-c" type="text" v-model="range.endDate"
-							:placeholder="endPlaceholderText" :disabled="true" />
-					</view>
-					<view v-if="showClearIcon" class="uni-date__icon-clear" @click.stop="clear">
-						<uni-icons type="clear" color="#e1e1e1" size="18"></uni-icons>
-					</view>
-				</view>
-			</slot>
-		</view>
-
-		<view v-show="popup" class="uni-date-mask" @click="close"></view>
-		<view v-if="!isPhone" ref="datePicker" v-show="popup" class="uni-date-picker__container">
-			<view v-if="!isRange" class="uni-date-single--x" :style="popover">
-				<view class="uni-popper__arrow"></view>
-				<view v-if="hasTime" class="uni-date-changed popup-x-header">
-					<input class="uni-date__input t-c" type="text" v-model="tempSingleDate"
-						:placeholder="selectDateText" />
-					<time-picker type="time" v-model="time" :border="false" :disabled="!tempSingleDate"
-						:start="reactStartTime" :end="reactEndTime" :hideSecond="hideSecond" style="width: 100%;">
-						<input class="uni-date__input t-c" type="text" v-model="time" :placeholder="selectTimeText"
-							:disabled="!tempSingleDate" />
-					</time-picker>
-				</view>
-				<calendar ref="pcSingle" :showMonth="false"
-					:start-date="caleRange.startDate" :end-date="caleRange.endDate" :date="defSingleDate"
-					@change="singleChange" style="padding: 0 8px;" />
-				<view v-if="hasTime" class="popup-x-footer">
-					<!-- <text class="">此刻</text> -->
-					<text class="confirm" @click="confirmSingleChange">{{okText}}</text>
-				</view>
-				<view class="uni-date-popper__arrow"></view>
-			</view>
-
-			<view v-else class="uni-date-range--x" :style="popover">
-				<view class="uni-popper__arrow"></view>
-				<view v-if="hasTime" class="popup-x-header uni-date-changed">
-					<view class="popup-x-header--datetime">
-						<input class="uni-date__input uni-date-range__input" type="text" v-model="tempRange.startDate"
-							:placeholder="startDateText" />
-						<time-picker type="time" v-model="tempRange.startTime" :start="reactStartTime" :border="false"
-							:disabled="!tempRange.startDate" :hideSecond="hideSecond">
-							<input class="uni-date__input uni-date-range__input" type="text"
-								v-model="tempRange.startTime" :placeholder="startTimeText"
-								:disabled="!tempRange.startDate" />
-						</time-picker>
-					</view>
-					<uni-icons type="arrowthinright" color="#999" style="line-height: 40px;"></uni-icons>
-					<view class="popup-x-header--datetime">
-						<input class="uni-date__input uni-date-range__input" type="text" v-model="tempRange.endDate"
-							:placeholder="endDateText" />
-						<time-picker type="time" v-model="tempRange.endTime" :end="reactEndTime" :border="false"
-							:disabled="!tempRange.endDate" :hideSecond="hideSecond">
-							<input class="uni-date__input uni-date-range__input" type="text" v-model="tempRange.endTime"
-								:placeholder="endTimeText" :disabled="!tempRange.endDate" />
-						</time-picker>
-					</view>
-				</view>
-				<view class="popup-x-body">
-					<calendar ref="left" :showMonth="false"
-						:start-date="caleRange.startDate" :end-date="caleRange.endDate" :range="true"
-						@change="leftChange" :pleStatus="endMultipleStatus" @firstEnterCale="updateRightCale"
-						@monthSwitch="leftMonthSwitch" style="padding: 0 8px;" />
-					<calendar ref="right" :showMonth="false"
-						:start-date="caleRange.startDate" :end-date="caleRange.endDate" :range="true"
-						@change="rightChange" :pleStatus="startMultipleStatus" @firstEnterCale="updateLeftCale"
-						@monthSwitch="rightMonthSwitch" style="padding: 0 8px;border-left: 1px solid #F1F1F1;" />
-				</view>
-				<view v-if="hasTime" class="popup-x-footer">
-					<text class="" @click="clear">{{clearText}}</text>
-					<text class="confirm" @click="confirmRangeChange">{{okText}}</text>
-				</view>
-			</view>
-		</view>
-		<calendar v-show="isPhone" ref="mobile" :clearDate="false" :date="defSingleDate" :defTime="reactMobDefTime"
-			:start-date="caleRange.startDate" :end-date="caleRange.endDate" :selectableTimes="mobSelectableTime"
-			:pleStatus="endMultipleStatus" :showMonth="false" :range="isRange" :typeHasTime="hasTime" :insert="false"
-			:hideSecond="hideSecond" @confirm="mobileChange" />
-	</view>
-</template>
-<script>
-	/**
-	 * DatetimePicker 时间选择器
-	 * @description 同时支持 PC 和移动端使用日历选择日期和日期范围
-	 * @tutorial https://ext.dcloud.net.cn/plugin?id=3962
-	 * @property {String} type 选择器类型
-	 * @property {String|Number|Array|Date} value 绑定值
-	 * @property {String} placeholder 单选择时的占位内容
-	 * @property {String} start 起始时间
-	 * @property {String} end 终止时间
-	 * @property {String} start-placeholder 范围选择时开始日期的占位内容
-	 * @property {String} end-placeholder 范围选择时结束日期的占位内容
-	 * @property {String} range-separator 选择范围时的分隔符
-	 * @property {Boolean} border = [true|false] 是否有边框
-	 * @property {Boolean} disabled = [true|false] 是否禁用
-	 * @property {Boolean} clearIcon = [true|false] 是否显示清除按钮（仅PC端适用）
-	 * @event {Function} change 确定日期时触发的事件
-	 * @event {Function} show 打开弹出层
-	 * @event {Function} close 关闭弹出层
-	 * @event {Function} clear 清除上次选中的状态和值
-	 **/
-	import calendar from './calendar.vue'
-	import timePicker from './time-picker.vue'
-	import {
-		initVueI18n
-	} from '@dcloudio/uni-i18n'
-	import messages from './i18n/index.js'
-	const {
-		t
-	} = initVueI18n(messages)
-
-	export default {
-		name: 'UniDatetimePicker',
-		components: {
-			calendar,
-			timePicker
-		},
-		data() {
-			return {
-				isRange: false,
-				hasTime: false,
-				mobileRange: false,
-				// 单选
-				singleVal: '',
-				tempSingleDate: '',
-				defSingleDate: '',
-				time: '',
-				// 范围选
-				caleRange: {
-					startDate: '',
-					startTime: '',
-					endDate: '',
-					endTime: ''
-				},
-				range: {
-					startDate: '',
-					// startTime: '',
-					endDate: '',
-					// endTime: ''
-				},
-				tempRange: {
-					startDate: '',
-					startTime: '',
-					endDate: '',
-					endTime: ''
-				},
-				// 左右日历同步数据
-				startMultipleStatus: {
-					before: '',
-					after: '',
-					data: [],
-					fulldate: ''
-				},
-				endMultipleStatus: {
-					before: '',
-					after: '',
-					data: [],
-					fulldate: ''
-				},
-				visible: false,
-				popup: false,
-				popover: null,
-				isEmitValue: false,
-				isPhone: false,
-				isFirstShow: true,
-			}
-		},
-		props: {
-			type: {
-				type: String,
-				default: 'datetime'
-			},
-			value: {
-				type: [String, Number, Array, Date],
-				default: ''
-			},
-			modelValue: {
-				type: [String, Number, Array, Date],
-				default: ''
-			},
-			start: {
-				type: [Number, String],
-				default: ''
-			},
-			end: {
-				type: [Number, String],
-				default: ''
-			},
-			returnType: {
-				type: String,
-				default: 'string'
-			},
-			placeholder: {
-				type: String,
-				default: ''
-			},
-			startPlaceholder: {
-				type: String,
-				default: ''
-			},
-			endPlaceholder: {
-				type: String,
-				default: ''
-			},
-			rangeSeparator: {
-				type: String,
-				default: '-'
-			},
-			border: {
-				type: [Boolean],
-				default: true
-			},
-			disabled: {
-				type: [Boolean],
-				default: false
-			},
-			clearIcon: {
-				type: [Boolean],
-				default: true
-			},
-			hideSecond: {
-				type: [Boolean],
-				default: false
-			}
-		},
-		watch: {
-			type: {
-				immediate: true,
-				handler(newVal, oldVal) {
-					if (newVal.indexOf('time') !== -1) {
-						this.hasTime = true
-					} else {
-						this.hasTime = false
-					}
-					if (newVal.indexOf('range') !== -1) {
-						this.isRange = true
-					} else {
-						this.isRange = false
-					}
-				}
-			},
-			value: {
-				immediate: true,
-				handler(newVal, oldVal) {
-					if (this.isEmitValue) {
-						this.isEmitValue = false
-						return
-					}
-					this.initPicker(newVal)
-				}
-			},
-
-			start: {
-				immediate: true,
-				handler(newVal, oldVal) {
-					if (!newVal) return
-					const {
-						defDate,
-						defTime
-					} = this.parseDate(newVal)
-					this.caleRange.startDate = defDate
-					if (this.hasTime) {
-						this.caleRange.startTime = defTime
-					}
-				}
-			},
-
-			end: {
-				immediate: true,
-				handler(newVal, oldVal) {
-					if (!newVal) return
-					const {
-						defDate,
-						defTime
-					} = this.parseDate(newVal)
-					this.caleRange.endDate = defDate
-					if (this.hasTime) {
-						this.caleRange.endTime = defTime
-					}
-				}
-			},
-		},
-		computed: {
-			reactStartTime() {
-				const activeDate = this.isRange ? this.tempRange.startDate : this.tempSingleDate
-				const res = activeDate === this.caleRange.startDate ? this.caleRange.startTime : ''
-				return res
-			},
-			reactEndTime() {
-				const activeDate = this.isRange ? this.tempRange.endDate : this.tempSingleDate
-				const res = activeDate === this.caleRange.endDate ? this.caleRange.endTime : ''
-				return res
-			},
-			reactMobDefTime() {
-				const times = {
-					start: this.tempRange.startTime,
-					end: this.tempRange.endTime
-				}
-				return this.isRange ? times : this.time
-			},
-			mobSelectableTime() {
-				return {
-					start: this.caleRange.startTime,
-					end: this.caleRange.endTime
-				}
-			},
-			datePopupWidth() {
-				// todo
-				return this.isRange ? 653 : 301
-			},
-
-			/**
-			 * for i18n
-			 */
-			singlePlaceholderText() {
-				return this.placeholder || (this.type === 'date' ? this.selectDateText : t(
-					"uni-datetime-picker.selectDateTime"))
-			},
-			startPlaceholderText() {
-				return this.startPlaceholder || this.startDateText
-			},
-			endPlaceholderText() {
-				return this.endPlaceholder || this.endDateText
-			},
-			selectDateText() {
-				return t("uni-datetime-picker.selectDate")
-			},
-			selectTimeText() {
-				return t("uni-datetime-picker.selectTime")
-			},
-			startDateText() {
-				return this.startPlaceholder || t("uni-datetime-picker.startDate")
-			},
-			startTimeText() {
-				return t("uni-datetime-picker.startTime")
-			},
-			endDateText() {
-				return this.endPlaceholder || t("uni-datetime-picker.endDate")
-			},
-			endTimeText() {
-				return t("uni-datetime-picker.endTime")
-			},
-			okText() {
-				return t("uni-datetime-picker.ok")
-			},
-			clearText() {
-				return t("uni-datetime-picker.clear")
-			},
-			showClearIcon() {
-				const { clearIcon, disabled, singleVal, range } = this
-				const bool = clearIcon && !disabled && (singleVal || (range.startDate && range.endDate))
-				return bool
-			}
-		},
-		created() {
-			this.form = this.getForm('uniForms')
-			this.formItem = this.getForm('uniFormsItem')
-
-			// if (this.formItem) {
-			// 	if (this.formItem.name) {
-			// 		this.rename = this.formItem.name
-			// 		this.form.inputChildrens.push(this)
-			// 	}
-			// }
-		},
-		mounted() {
-			this.platform()
-		},
-		methods: {
-			/**
-			 * 获取父元素实例
-			 */
-			getForm(name = 'uniForms') {
-				let parent = this.$parent;
-				let parentName = parent.$options.name;
-				while (parentName !== name) {
-					parent = parent.$parent;
-					if (!parent) return false
-					parentName = parent.$options.name;
-				}
-				return parent;
-			},
-			initPicker(newVal) {
-				if (!newVal || Array.isArray(newVal) && !newVal.length) {
-					this.$nextTick(() => {
-						this.clear(false)
-					})
-					return
-				}
-				if (!Array.isArray(newVal) && !this.isRange) {
-					const {
-						defDate,
-						defTime
-					} = this.parseDate(newVal)
-					this.singleVal = defDate
-					this.tempSingleDate = defDate
-					this.defSingleDate = defDate
-					if (this.hasTime) {
-						this.singleVal = defDate + ' ' + defTime
-						this.time = defTime
-					}
-				} else {
-					const [before, after] = newVal
-					if (!before && !after) return
-					const defBefore = this.parseDate(before)
-					const defAfter = this.parseDate(after)
-					const startDate = defBefore.defDate
-					const endDate = defAfter.defDate
-					this.range.startDate = this.tempRange.startDate = startDate
-					this.range.endDate = this.tempRange.endDate = endDate
-
-					if (this.hasTime) {
-						this.range.startDate = defBefore.defDate + ' ' + defBefore.defTime
-						this.range.endDate = defAfter.defDate + ' ' + defAfter.defTime
-						this.tempRange.startTime = defBefore.defTime
-						this.tempRange.endTime = defAfter.defTime
-					}
-					const defaultRange = {
-						before: defBefore.defDate,
-						after: defAfter.defDate
-					}
-					this.startMultipleStatus = Object.assign({}, this.startMultipleStatus, defaultRange, {
-						which: 'right'
-					})
-					this.endMultipleStatus = Object.assign({}, this.endMultipleStatus, defaultRange, {
-						which: 'left'
-					})
-				}
-			},
-			updateLeftCale(e) {
-				const left = this.$refs.left
-				// 设置范围选
-				left.cale.setHoverMultiple(e.after)
-				left.setDate(this.$refs.left.nowDate.fullDate)
-			},
-			updateRightCale(e) {
-				const right = this.$refs.right
-				// 设置范围选
-				right.cale.setHoverMultiple(e.after)
-				right.setDate(this.$refs.right.nowDate.fullDate)
-			},
-			platform() {
-				const systemInfo = uni.getSystemInfoSync()
-				this.isPhone = systemInfo.windowWidth <= 500
-				this.windowWidth = systemInfo.windowWidth
-			},
-			show(event) {
-				if (this.disabled) {
-					return
-				}
-				this.platform()
-				if (this.isPhone) {
-					this.$refs.mobile.open()
-					return
-				}
-				this.popover = {
-					top: '10px'
-				}
-				const dateEditor = uni.createSelectorQuery().in(this).select(".uni-date-editor")
-				dateEditor.boundingClientRect(rect => {
-					if (this.windowWidth - rect.left < this.datePopupWidth) {
-						this.popover.right = 0
-					}
-				}).exec()
-				setTimeout(() => {
-					this.popup = !this.popup
-					if (!this.isPhone && this.isRange && this.isFirstShow) {
-						this.isFirstShow = false
-						const {
-							startDate,
-							endDate
-						} = this.range
-						if (startDate && endDate) {
-							if (this.diffDate(startDate, endDate) < 30) {
-								this.$refs.right.next()
-							}
-						} else {
-							this.$refs.right.next()
-							this.$refs.right.cale.lastHover = false
-						}
-					}
-
-				}, 50)
-			},
-
-			close() {
-				setTimeout(() => {
-					this.popup = false
-					this.$emit('maskClick', this.value)
-				}, 20)
-			},
-			setEmit(value) {
-				if (this.returnType === "timestamp" || this.returnType === "date") {
-					if (!Array.isArray(value)) {
-						if (!this.hasTime) {
-							value = value + ' ' + '00:00:00'
-						}
-						value = this.createTimestamp(value)
-						if (this.returnType === "date") {
-							value = new Date(value)
-						}
-					} else {
-						if (!this.hasTime) {
-							value[0] = value[0] + ' ' + '00:00:00'
-							value[1] = value[1] + ' ' + '00:00:00'
-						}
-						value[0] = this.createTimestamp(value[0])
-						value[1] = this.createTimestamp(value[1])
-						if (this.returnType === "date") {
-							value[0] = new Date(value[0])
-							value[1] = new Date(value[1])
-						}
-					}
-				}
-				this.formItem && this.formItem.setValue(value)
-				this.$emit('change', value)
-				this.$emit('input', value)
-				this.$emit('update:modelValue', value)
-				this.isEmitValue = true
-			},
-			createTimestamp(date) {
-				date = this.fixIosDateFormat(date)
-				return Date.parse(new Date(date))
-			},
-			singleChange(e) {
-				this.tempSingleDate = e.fulldate
-				if (this.hasTime) return
-				this.confirmSingleChange()
-			},
-
-			confirmSingleChange() {
-				if (!this.tempSingleDate) {
-					this.popup = false
-					return
-				}
-				if (this.hasTime) {
-					this.singleVal = this.tempSingleDate + ' ' + (this.time ? this.time : '00:00:00')
-				} else {
-					this.singleVal = this.tempSingleDate
-				}
-				this.setEmit(this.singleVal)
-				this.popup = false
-			},
-
-			leftChange(e) {
-				const {
-					before,
-					after
-				} = e.range
-				this.rangeChange(before, after)
-				const obj = {
-					before: e.range.before,
-					after: e.range.after,
-					data: e.range.data,
-					fulldate: e.fulldate
-				}
-				this.startMultipleStatus = Object.assign({}, this.startMultipleStatus, obj)
-			},
-
-			rightChange(e) {
-				const {
-					before,
-					after
-				} = e.range
-				this.rangeChange(before, after)
-				const obj = {
-					before: e.range.before,
-					after: e.range.after,
-					data: e.range.data,
-					fulldate: e.fulldate
-				}
-				this.endMultipleStatus = Object.assign({}, this.endMultipleStatus, obj)
-			},
-
-			mobileChange(e) {
-				if (this.isRange) {
-					const {
-						before,
-						after
-					} = e.range
-					this.handleStartAndEnd(before, after, true)
-					if (this.hasTime) {
-						const {
-							startTime,
-							endTime
-						} = e.timeRange
-						this.tempRange.startTime = startTime
-						this.tempRange.endTime = endTime
-					}
-					this.confirmRangeChange()
-
-				} else {
-					if (this.hasTime) {
-						this.singleVal = e.fulldate + ' ' + e.time
-					} else {
-						this.singleVal = e.fulldate
-					}
-					this.setEmit(this.singleVal)
-				}
-				this.$refs.mobile.close()
-			},
-
-			rangeChange(before, after) {
-				if (!(before && after)) return
-				this.handleStartAndEnd(before, after, true)
-				if (this.hasTime) return
-				this.confirmRangeChange()
-			},
-
-			confirmRangeChange() {
-				if (!this.tempRange.startDate && !this.tempRange.endDate) {
-					this.popup = false
-					return
-				}
-				let start, end
-				if (!this.hasTime) {
-					start = this.range.startDate = this.tempRange.startDate
-					end = this.range.endDate = this.tempRange.endDate
-				} else {
-					start = this.range.startDate = this.tempRange.startDate + ' ' +
-						(this.tempRange.startTime ? this.tempRange.startTime : '00:00:00')
-					end = this.range.endDate = this.tempRange.endDate + ' ' +
-						(this.tempRange.endTime ? this.tempRange.endTime : '00:00:00')
-				}
-				const displayRange = [start, end]
-				this.setEmit(displayRange)
-				this.popup = false
-			},
-
-			handleStartAndEnd(before, after, temp = false) {
-				if (!(before && after)) return
-				const type = temp ? 'tempRange' : 'range'
-				if (this.dateCompare(before, after)) {
-					this[type].startDate = before
-					this[type].endDate = after
-				} else {
-					this[type].startDate = after
-					this[type].endDate = before
-				}
-			},
-
-			/**
-			 * 比较时间大小
-			 */
-			dateCompare(startDate, endDate) {
-				// 计算截止时间
-				startDate = new Date(startDate.replace('-', '/').replace('-', '/'))
-				// 计算详细项的截止时间
-				endDate = new Date(endDate.replace('-', '/').replace('-', '/'))
-				if (startDate <= endDate) {
-					return true
-				} else {
-					return false
-				}
-			},
-
-			/**
-			 * 比较时间差
-			 */
-			diffDate(startDate, endDate) {
-				// 计算截止时间
-				startDate = new Date(startDate.replace('-', '/').replace('-', '/'))
-				// 计算详细项的截止时间
-				endDate = new Date(endDate.replace('-', '/').replace('-', '/'))
-				const diff = (endDate - startDate) / (24 * 60 * 60 * 1000)
-				return Math.abs(diff)
-			},
-
-			clear(needEmit = true) {
-				if (!this.isRange) {
-					this.singleVal = ''
-					this.tempSingleDate = ''
-					this.time = ''
-					if (this.isPhone) {
-						this.$refs.mobile && this.$refs.mobile.clearCalender()
-					} else {
-						this.$refs.pcSingle && this.$refs.pcSingle.clearCalender()
-					}
-					if (needEmit) {
-						this.formItem && this.formItem.setValue('')
-						this.$emit('change', '')
-						this.$emit('input', '')
-						this.$emit('update:modelValue', '')
-					}
-				} else {
-					this.range.startDate = ''
-					this.range.endDate = ''
-					this.tempRange.startDate = ''
-					this.tempRange.startTime = ''
-					this.tempRange.endDate = ''
-					this.tempRange.endTime = ''
-					if (this.isPhone) {
-						this.$refs.mobile && this.$refs.mobile.clearCalender()
-					} else {
-						this.$refs.left && this.$refs.left.clearCalender()
-						this.$refs.right && this.$refs.right.clearCalender()
-						this.$refs.right && this.$refs.right.next()
-					}
-					if (needEmit) {
-						this.formItem && this.formItem.setValue([])
-						this.$emit('change', [])
-						this.$emit('input', [])
-						this.$emit('update:modelValue', [])
-					}
-				}
-			},
-
-			parseDate(date) {
-				date = this.fixIosDateFormat(date)
-				const defVal = new Date(date)
-				const year = defVal.getFullYear()
-				const month = defVal.getMonth() + 1
-				const day = defVal.getDate()
-				const hour = defVal.getHours()
-				const minute = defVal.getMinutes()
-				const second = defVal.getSeconds()
-				const defDate = year + '-' + this.lessTen(month) + '-' + this.lessTen(day)
-				const defTime = this.lessTen(hour) + ':' + this.lessTen(minute) + (this.hideSecond ? '' : (':' + this
-					.lessTen(second)))
-				return {
-					defDate,
-					defTime
-				}
-			},
-
-			lessTen(item) {
-				return item < 10 ? '0' + item : item
-			},
-
-			//兼容 iOS、safari 日期格式
-			fixIosDateFormat(value) {
-				if (typeof value === 'string') {
-					value = value.replace(/-/g, '/')
-				}
-				return value
-			},
-
-			leftMonthSwitch(e) {
-				// console.log('leftMonthSwitch 返回:', e)
-			},
-			rightMonthSwitch(e) {
-				// console.log('rightMonthSwitch 返回:', e)
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	.uni-date-x {
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-		justify-content: center;
-		padding: 0 10px;
-		border-radius: 4px;
-		background-color: #fff;
-		color: #666;
-		font-size: 14px;
-	}
-
-	.uni-date-x--border {
-		box-sizing: border-box;
-		border-radius: 4px;
-		border: 1px solid #dcdfe6;
-	}
-
-	.uni-date-editor--x {
-		position: relative;
-	}
-
-	.uni-date-editor--x .uni-date__icon-clear {
-		position: absolute;
-		top: 0;
-		right: 0;
-		display: inline-block;
-		box-sizing: border-box;
-		border: 9px solid transparent;
-		/* #ifdef H5 */
-		cursor: pointer;
-		/* #endif */
-	}
-
-	.uni-date__x-input {
-		padding: 0 8px;
-		height: 40px;
-		width: 100%;
-		line-height: 40px;
-		font-size: 14px;
-	}
-
-	.t-c {
-		text-align: center;
-	}
-
-	.uni-date__input {
-		height: 40px;
-		width: 100%;
-		line-height: 40px;
-		font-size: 14px;
-	}
-
-	.uni-date-range__input {
-		text-align: center;
-		max-width: 142px;
-	}
-
-	.uni-date-picker__container {
-		position: relative;
-		/* 		position: fixed;
-		left: 0;
-		right: 0;
-		top: 0;
-		bottom: 0;
-		box-sizing: border-box;
-		z-index: 996;
-		font-size: 14px; */
-	}
-
-	.uni-date-mask {
-		position: fixed;
-		bottom: 0px;
-		top: 0px;
-		left: 0px;
-		right: 0px;
-		background-color: rgba(0, 0, 0, 0);
-		transition-duration: 0.3s;
-		z-index: 996;
-	}
-
-	.uni-date-single--x {
-		/* padding: 0 8px; */
-		background-color: #fff;
-		position: absolute;
-		top: 0;
-		z-index: 999;
-		border: 1px solid #EBEEF5;
-		box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
-		border-radius: 4px;
-	}
-
-	.uni-date-range--x {
-		/* padding: 0 8px; */
-		background-color: #fff;
-		position: absolute;
-		top: 0;
-		z-index: 999;
-		border: 1px solid #EBEEF5;
-		box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
-		border-radius: 4px;
-	}
-
-	.uni-date-editor--x__disabled {
-		opacity: 0.4;
-		cursor: default;
-	}
-
-	.uni-date-editor--logo {
-		width: 16px;
-		height: 16px;
-		vertical-align: middle;
-	}
-
-	/* 添加时间 */
-	.popup-x-header {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex-direction: row;
-		/* justify-content: space-between; */
-	}
-
-	.popup-x-header--datetime {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex-direction: row;
-		flex: 1;
-	}
-
-	.popup-x-body {
-		display: flex;
-	}
-
-	.popup-x-footer {
-		padding: 0 15px;
-		border-top-color: #F1F1F1;
-		border-top-style: solid;
-		border-top-width: 1px;
-		/* background-color: #fff; */
-		line-height: 40px;
-		text-align: right;
-		color: #666;
-	}
-
-	.popup-x-footer text:hover {
-		color: #007aff;
-		cursor: pointer;
-		opacity: 0.8;
-	}
-
-	.popup-x-footer .confirm {
-		margin-left: 20px;
-		color: #007aff;
-	}
-
-	.uni-date-changed {
-		/* background-color: #fff; */
-		text-align: center;
-		color: #333;
-		border-bottom-color: #F1F1F1;
-		border-bottom-style: solid;
-		border-bottom-width: 1px;
-		/* padding: 0 50px; */
-	}
-
-	.uni-date-changed--time text {
-		/* padding: 0 20px; */
-		height: 50px;
-		line-height: 50px;
-	}
-
-	.uni-date-changed .uni-date-changed--time {
-		/* display: flex; */
-		flex: 1;
-	}
-
-	.uni-date-changed--time-date {
-		color: #333;
-		opacity: 0.6;
-	}
-
-	.mr-50 {
-		margin-right: 50px;
-	}
-
-	/* picker 弹出层通用的指示小三角, todo：扩展至上下左右方向定位 */
-	.uni-popper__arrow,
-	.uni-popper__arrow::after {
-		position: absolute;
-		display: block;
-		width: 0;
-		height: 0;
-		border-color: transparent;
-		border-style: solid;
-		border-width: 6px;
-	}
-
-	.uni-popper__arrow {
-		filter: drop-shadow(0 2px 12px rgba(0, 0, 0, 0.03));
-		top: -6px;
-		left: 10%;
-		margin-right: 3px;
-		border-top-width: 0;
-		border-bottom-color: #EBEEF5;
-	}
-
-	.uni-popper__arrow::after {
-		content: " ";
-		top: 1px;
-		margin-left: -6px;
-		border-top-width: 0;
-		border-bottom-color: #fff;
-	}
-</style>
+<template>
+	<view class="uni-date">
+		<view class="uni-date-editor" @click="show">
+			<slot>
+				<view class="uni-date-editor--x" :class="{'uni-date-editor--x__disabled': disabled,
+		'uni-date-x--border': border}">
+					<view v-if="!isRange" class="uni-date-x uni-date-single">
+						<uni-icons type="calendar" color="#e1e1e1" size="22"></uni-icons>
+						<input class="uni-date__x-input" type="text" v-model="singleVal"
+							:placeholder="singlePlaceholderText" :disabled="true" />
+					</view>
+					<view v-else class="uni-date-x uni-date-range">
+						<uni-icons type="calendar" color="#e1e1e1" size="22"></uni-icons>
+						<input class="uni-date__x-input t-c" type="text" v-model="range.startDate"
+							:placeholder="startPlaceholderText" :disabled="true" />
+						<slot>
+							<view class="">{{rangeSeparator}}</view>
+						</slot>
+						<input class="uni-date__x-input t-c" type="text" v-model="range.endDate"
+							:placeholder="endPlaceholderText" :disabled="true" />
+					</view>
+					<view v-if="showClearIcon" class="uni-date__icon-clear" @click.stop="clear">
+						<uni-icons type="clear" color="#e1e1e1" size="18"></uni-icons>
+					</view>
+				</view>
+			</slot>
+		</view>
+
+		<view v-show="popup" class="uni-date-mask" @click="close"></view>
+		<view v-if="!isPhone" ref="datePicker" v-show="popup" class="uni-date-picker__container">
+			<view v-if="!isRange" class="uni-date-single--x" :style="popover">
+				<view class="uni-popper__arrow"></view>
+				<view v-if="hasTime" class="uni-date-changed popup-x-header">
+					<input class="uni-date__input t-c" type="text" v-model="tempSingleDate"
+						:placeholder="selectDateText" />
+					<time-picker type="time" v-model="time" :border="false" :disabled="!tempSingleDate"
+						:start="reactStartTime" :end="reactEndTime" :hideSecond="hideSecond" style="width: 100%;">
+						<input class="uni-date__input t-c" type="text" v-model="time" :placeholder="selectTimeText"
+							:disabled="!tempSingleDate" />
+					</time-picker>
+				</view>
+				<calendar ref="pcSingle" :showMonth="false"
+					:start-date="caleRange.startDate" :end-date="caleRange.endDate" :date="defSingleDate"
+					@change="singleChange" style="padding: 0 8px;" />
+				<view v-if="hasTime" class="popup-x-footer">
+					<!-- <text class="">此刻</text> -->
+					<text class="confirm" @click="confirmSingleChange">{{okText}}</text>
+				</view>
+				<view class="uni-date-popper__arrow"></view>
+			</view>
+
+			<view v-else class="uni-date-range--x" :style="popover">
+				<view class="uni-popper__arrow"></view>
+				<view v-if="hasTime" class="popup-x-header uni-date-changed">
+					<view class="popup-x-header--datetime">
+						<input class="uni-date__input uni-date-range__input" type="text" v-model="tempRange.startDate"
+							:placeholder="startDateText" />
+						<time-picker type="time" v-model="tempRange.startTime" :start="reactStartTime" :border="false"
+							:disabled="!tempRange.startDate" :hideSecond="hideSecond">
+							<input class="uni-date__input uni-date-range__input" type="text"
+								v-model="tempRange.startTime" :placeholder="startTimeText"
+								:disabled="!tempRange.startDate" />
+						</time-picker>
+					</view>
+					<uni-icons type="arrowthinright" color="#999" style="line-height: 40px;"></uni-icons>
+					<view class="popup-x-header--datetime">
+						<input class="uni-date__input uni-date-range__input" type="text" v-model="tempRange.endDate"
+							:placeholder="endDateText" />
+						<time-picker type="time" v-model="tempRange.endTime" :end="reactEndTime" :border="false"
+							:disabled="!tempRange.endDate" :hideSecond="hideSecond">
+							<input class="uni-date__input uni-date-range__input" type="text" v-model="tempRange.endTime"
+								:placeholder="endTimeText" :disabled="!tempRange.endDate" />
+						</time-picker>
+					</view>
+				</view>
+				<view class="popup-x-body">
+					<calendar ref="left" :showMonth="false"
+						:start-date="caleRange.startDate" :end-date="caleRange.endDate" :range="true"
+						@change="leftChange" :pleStatus="endMultipleStatus" @firstEnterCale="updateRightCale"
+						@monthSwitch="leftMonthSwitch" style="padding: 0 8px;" />
+					<calendar ref="right" :showMonth="false"
+						:start-date="caleRange.startDate" :end-date="caleRange.endDate" :range="true"
+						@change="rightChange" :pleStatus="startMultipleStatus" @firstEnterCale="updateLeftCale"
+						@monthSwitch="rightMonthSwitch" style="padding: 0 8px;border-left: 1px solid #F1F1F1;" />
+				</view>
+				<view v-if="hasTime" class="popup-x-footer">
+					<text class="" @click="clear">{{clearText}}</text>
+					<text class="confirm" @click="confirmRangeChange">{{okText}}</text>
+				</view>
+			</view>
+		</view>
+		<calendar v-show="isPhone" ref="mobile" :clearDate="false" :date="defSingleDate" :defTime="reactMobDefTime"
+			:start-date="caleRange.startDate" :end-date="caleRange.endDate" :selectableTimes="mobSelectableTime"
+			:pleStatus="endMultipleStatus" :showMonth="false" :range="isRange" :typeHasTime="hasTime" :insert="false"
+			:hideSecond="hideSecond" @confirm="mobileChange" />
+	</view>
+</template>
+<script>
+	/**
+	 * DatetimePicker 时间选择器
+	 * @description 同时支持 PC 和移动端使用日历选择日期和日期范围
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=3962
+	 * @property {String} type 选择器类型
+	 * @property {String|Number|Array|Date} value 绑定值
+	 * @property {String} placeholder 单选择时的占位内容
+	 * @property {String} start 起始时间
+	 * @property {String} end 终止时间
+	 * @property {String} start-placeholder 范围选择时开始日期的占位内容
+	 * @property {String} end-placeholder 范围选择时结束日期的占位内容
+	 * @property {String} range-separator 选择范围时的分隔符
+	 * @property {Boolean} border = [true|false] 是否有边框
+	 * @property {Boolean} disabled = [true|false] 是否禁用
+	 * @property {Boolean} clearIcon = [true|false] 是否显示清除按钮（仅PC端适用）
+	 * @event {Function} change 确定日期时触发的事件
+	 * @event {Function} show 打开弹出层
+	 * @event {Function} close 关闭弹出层
+	 * @event {Function} clear 清除上次选中的状态和值
+	 **/
+	import calendar from './calendar.vue'
+	import timePicker from './time-picker.vue'
+	import {
+		initVueI18n
+	} from '@dcloudio/uni-i18n'
+	import messages from './i18n/index.js'
+	const {
+		t
+	} = initVueI18n(messages)
+
+	export default {
+		name: 'UniDatetimePicker',
+		components: {
+			calendar,
+			timePicker
+		},
+		data() {
+			return {
+				isRange: false,
+				hasTime: false,
+				mobileRange: false,
+				// 单选
+				singleVal: '',
+				tempSingleDate: '',
+				defSingleDate: '',
+				time: '',
+				// 范围选
+				caleRange: {
+					startDate: '',
+					startTime: '',
+					endDate: '',
+					endTime: ''
+				},
+				range: {
+					startDate: '',
+					// startTime: '',
+					endDate: '',
+					// endTime: ''
+				},
+				tempRange: {
+					startDate: '',
+					startTime: '',
+					endDate: '',
+					endTime: ''
+				},
+				// 左右日历同步数据
+				startMultipleStatus: {
+					before: '',
+					after: '',
+					data: [],
+					fulldate: ''
+				},
+				endMultipleStatus: {
+					before: '',
+					after: '',
+					data: [],
+					fulldate: ''
+				},
+				visible: false,
+				popup: false,
+				popover: null,
+				isEmitValue: false,
+				isPhone: false,
+				isFirstShow: true,
+			}
+		},
+		props: {
+			type: {
+				type: String,
+				default: 'datetime'
+			},
+			value: {
+				type: [String, Number, Array, Date],
+				default: ''
+			},
+			modelValue: {
+				type: [String, Number, Array, Date],
+				default: ''
+			},
+			start: {
+				type: [Number, String],
+				default: ''
+			},
+			end: {
+				type: [Number, String],
+				default: ''
+			},
+			returnType: {
+				type: String,
+				default: 'string'
+			},
+			placeholder: {
+				type: String,
+				default: ''
+			},
+			startPlaceholder: {
+				type: String,
+				default: ''
+			},
+			endPlaceholder: {
+				type: String,
+				default: ''
+			},
+			rangeSeparator: {
+				type: String,
+				default: '-'
+			},
+			border: {
+				type: [Boolean],
+				default: true
+			},
+			disabled: {
+				type: [Boolean],
+				default: false
+			},
+			clearIcon: {
+				type: [Boolean],
+				default: true
+			},
+			hideSecond: {
+				type: [Boolean],
+				default: false
+			}
+		},
+		watch: {
+			type: {
+				immediate: true,
+				handler(newVal, oldVal) {
+					if (newVal.indexOf('time') !== -1) {
+						this.hasTime = true
+					} else {
+						this.hasTime = false
+					}
+					if (newVal.indexOf('range') !== -1) {
+						this.isRange = true
+					} else {
+						this.isRange = false
+					}
+				}
+			},
+			value: {
+				immediate: true,
+				handler(newVal, oldVal) {
+					if (this.isEmitValue) {
+						this.isEmitValue = false
+						return
+					}
+					this.initPicker(newVal)
+				}
+			},
+
+			start: {
+				immediate: true,
+				handler(newVal, oldVal) {
+					if (!newVal) return
+					const {
+						defDate,
+						defTime
+					} = this.parseDate(newVal)
+					this.caleRange.startDate = defDate
+					if (this.hasTime) {
+						this.caleRange.startTime = defTime
+					}
+				}
+			},
+
+			end: {
+				immediate: true,
+				handler(newVal, oldVal) {
+					if (!newVal) return
+					const {
+						defDate,
+						defTime
+					} = this.parseDate(newVal)
+					this.caleRange.endDate = defDate
+					if (this.hasTime) {
+						this.caleRange.endTime = defTime
+					}
+				}
+			},
+		},
+		computed: {
+			reactStartTime() {
+				const activeDate = this.isRange ? this.tempRange.startDate : this.tempSingleDate
+				const res = activeDate === this.caleRange.startDate ? this.caleRange.startTime : ''
+				return res
+			},
+			reactEndTime() {
+				const activeDate = this.isRange ? this.tempRange.endDate : this.tempSingleDate
+				const res = activeDate === this.caleRange.endDate ? this.caleRange.endTime : ''
+				return res
+			},
+			reactMobDefTime() {
+				const times = {
+					start: this.tempRange.startTime,
+					end: this.tempRange.endTime
+				}
+				return this.isRange ? times : this.time
+			},
+			mobSelectableTime() {
+				return {
+					start: this.caleRange.startTime,
+					end: this.caleRange.endTime
+				}
+			},
+			datePopupWidth() {
+				// todo
+				return this.isRange ? 653 : 301
+			},
+
+			/**
+			 * for i18n
+			 */
+			singlePlaceholderText() {
+				return this.placeholder || (this.type === 'date' ? this.selectDateText : t(
+					"uni-datetime-picker.selectDateTime"))
+			},
+			startPlaceholderText() {
+				return this.startPlaceholder || this.startDateText
+			},
+			endPlaceholderText() {
+				return this.endPlaceholder || this.endDateText
+			},
+			selectDateText() {
+				return t("uni-datetime-picker.selectDate")
+			},
+			selectTimeText() {
+				return t("uni-datetime-picker.selectTime")
+			},
+			startDateText() {
+				return this.startPlaceholder || t("uni-datetime-picker.startDate")
+			},
+			startTimeText() {
+				return t("uni-datetime-picker.startTime")
+			},
+			endDateText() {
+				return this.endPlaceholder || t("uni-datetime-picker.endDate")
+			},
+			endTimeText() {
+				return t("uni-datetime-picker.endTime")
+			},
+			okText() {
+				return t("uni-datetime-picker.ok")
+			},
+			clearText() {
+				return t("uni-datetime-picker.clear")
+			},
+			showClearIcon() {
+				const { clearIcon, disabled, singleVal, range } = this
+				const bool = clearIcon && !disabled && (singleVal || (range.startDate && range.endDate))
+				return bool
+			}
+		},
+		created() {
+			this.form = this.getForm('uniForms')
+			this.formItem = this.getForm('uniFormsItem')
+
+			// if (this.formItem) {
+			// 	if (this.formItem.name) {
+			// 		this.rename = this.formItem.name
+			// 		this.form.inputChildrens.push(this)
+			// 	}
+			// }
+		},
+		mounted() {
+			this.platform()
+		},
+		methods: {
+			/**
+			 * 获取父元素实例
+			 */
+			getForm(name = 'uniForms') {
+				let parent = this.$parent;
+				let parentName = parent.$options.name;
+				while (parentName !== name) {
+					parent = parent.$parent;
+					if (!parent) return false
+					parentName = parent.$options.name;
+				}
+				return parent;
+			},
+			initPicker(newVal) {
+				if (!newVal || Array.isArray(newVal) && !newVal.length) {
+					this.$nextTick(() => {
+						this.clear(false)
+					})
+					return
+				}
+				if (!Array.isArray(newVal) && !this.isRange) {
+					const {
+						defDate,
+						defTime
+					} = this.parseDate(newVal)
+					this.singleVal = defDate
+					this.tempSingleDate = defDate
+					this.defSingleDate = defDate
+					if (this.hasTime) {
+						this.singleVal = defDate + ' ' + defTime
+						this.time = defTime
+					}
+				} else {
+					const [before, after] = newVal
+					if (!before && !after) return
+					const defBefore = this.parseDate(before)
+					const defAfter = this.parseDate(after)
+					const startDate = defBefore.defDate
+					const endDate = defAfter.defDate
+					this.range.startDate = this.tempRange.startDate = startDate
+					this.range.endDate = this.tempRange.endDate = endDate
+
+					if (this.hasTime) {
+						this.range.startDate = defBefore.defDate + ' ' + defBefore.defTime
+						this.range.endDate = defAfter.defDate + ' ' + defAfter.defTime
+						this.tempRange.startTime = defBefore.defTime
+						this.tempRange.endTime = defAfter.defTime
+					}
+					const defaultRange = {
+						before: defBefore.defDate,
+						after: defAfter.defDate
+					}
+					this.startMultipleStatus = Object.assign({}, this.startMultipleStatus, defaultRange, {
+						which: 'right'
+					})
+					this.endMultipleStatus = Object.assign({}, this.endMultipleStatus, defaultRange, {
+						which: 'left'
+					})
+				}
+			},
+			updateLeftCale(e) {
+				const left = this.$refs.left
+				// 设置范围选
+				left.cale.setHoverMultiple(e.after)
+				left.setDate(this.$refs.left.nowDate.fullDate)
+			},
+			updateRightCale(e) {
+				const right = this.$refs.right
+				// 设置范围选
+				right.cale.setHoverMultiple(e.after)
+				right.setDate(this.$refs.right.nowDate.fullDate)
+			},
+			platform() {
+				const systemInfo = uni.getSystemInfoSync()
+				this.isPhone = systemInfo.windowWidth <= 500
+				this.windowWidth = systemInfo.windowWidth
+			},
+			show(event) {
+				if (this.disabled) {
+					return
+				}
+				this.platform()
+				if (this.isPhone) {
+					this.$refs.mobile.open()
+					return
+				}
+				this.popover = {
+					top: '10px'
+				}
+				const dateEditor = uni.createSelectorQuery().in(this).select(".uni-date-editor")
+				dateEditor.boundingClientRect(rect => {
+					if (this.windowWidth - rect.left < this.datePopupWidth) {
+						this.popover.right = 0
+					}
+				}).exec()
+				setTimeout(() => {
+					this.popup = !this.popup
+					if (!this.isPhone && this.isRange && this.isFirstShow) {
+						this.isFirstShow = false
+						const {
+							startDate,
+							endDate
+						} = this.range
+						if (startDate && endDate) {
+							if (this.diffDate(startDate, endDate) < 30) {
+								this.$refs.right.next()
+							}
+						} else {
+							this.$refs.right.next()
+							this.$refs.right.cale.lastHover = false
+						}
+					}
+
+				}, 50)
+			},
+
+			close() {
+				setTimeout(() => {
+					this.popup = false
+					this.$emit('maskClick', this.value)
+				}, 20)
+			},
+			setEmit(value) {
+				if (this.returnType === "timestamp" || this.returnType === "date") {
+					if (!Array.isArray(value)) {
+						if (!this.hasTime) {
+							value = value + ' ' + '00:00:00'
+						}
+						value = this.createTimestamp(value)
+						if (this.returnType === "date") {
+							value = new Date(value)
+						}
+					} else {
+						if (!this.hasTime) {
+							value[0] = value[0] + ' ' + '00:00:00'
+							value[1] = value[1] + ' ' + '00:00:00'
+						}
+						value[0] = this.createTimestamp(value[0])
+						value[1] = this.createTimestamp(value[1])
+						if (this.returnType === "date") {
+							value[0] = new Date(value[0])
+							value[1] = new Date(value[1])
+						}
+					}
+				}
+				this.formItem && this.formItem.setValue(value)
+				this.$emit('change', value)
+				this.$emit('input', value)
+				this.$emit('update:modelValue', value)
+				this.isEmitValue = true
+			},
+			createTimestamp(date) {
+				date = this.fixIosDateFormat(date)
+				return Date.parse(new Date(date))
+			},
+			singleChange(e) {
+				this.tempSingleDate = e.fulldate
+				if (this.hasTime) return
+				this.confirmSingleChange()
+			},
+
+			confirmSingleChange() {
+				if (!this.tempSingleDate) {
+					this.popup = false
+					return
+				}
+				if (this.hasTime) {
+					this.singleVal = this.tempSingleDate + ' ' + (this.time ? this.time : '00:00:00')
+				} else {
+					this.singleVal = this.tempSingleDate
+				}
+				this.setEmit(this.singleVal)
+				this.popup = false
+			},
+
+			leftChange(e) {
+				const {
+					before,
+					after
+				} = e.range
+				this.rangeChange(before, after)
+				const obj = {
+					before: e.range.before,
+					after: e.range.after,
+					data: e.range.data,
+					fulldate: e.fulldate
+				}
+				this.startMultipleStatus = Object.assign({}, this.startMultipleStatus, obj)
+			},
+
+			rightChange(e) {
+				const {
+					before,
+					after
+				} = e.range
+				this.rangeChange(before, after)
+				const obj = {
+					before: e.range.before,
+					after: e.range.after,
+					data: e.range.data,
+					fulldate: e.fulldate
+				}
+				this.endMultipleStatus = Object.assign({}, this.endMultipleStatus, obj)
+			},
+
+			mobileChange(e) {
+				if (this.isRange) {
+					const {
+						before,
+						after
+					} = e.range
+					this.handleStartAndEnd(before, after, true)
+					if (this.hasTime) {
+						const {
+							startTime,
+							endTime
+						} = e.timeRange
+						this.tempRange.startTime = startTime
+						this.tempRange.endTime = endTime
+					}
+					this.confirmRangeChange()
+
+				} else {
+					if (this.hasTime) {
+						this.singleVal = e.fulldate + ' ' + e.time
+					} else {
+						this.singleVal = e.fulldate
+					}
+					this.setEmit(this.singleVal)
+				}
+				this.$refs.mobile.close()
+			},
+
+			rangeChange(before, after) {
+				if (!(before && after)) return
+				this.handleStartAndEnd(before, after, true)
+				if (this.hasTime) return
+				this.confirmRangeChange()
+			},
+
+			confirmRangeChange() {
+				if (!this.tempRange.startDate && !this.tempRange.endDate) {
+					this.popup = false
+					return
+				}
+				let start, end
+				if (!this.hasTime) {
+					start = this.range.startDate = this.tempRange.startDate
+					end = this.range.endDate = this.tempRange.endDate
+				} else {
+					start = this.range.startDate = this.tempRange.startDate + ' ' +
+						(this.tempRange.startTime ? this.tempRange.startTime : '00:00:00')
+					end = this.range.endDate = this.tempRange.endDate + ' ' +
+						(this.tempRange.endTime ? this.tempRange.endTime : '00:00:00')
+				}
+				const displayRange = [start, end]
+				this.setEmit(displayRange)
+				this.popup = false
+			},
+
+			handleStartAndEnd(before, after, temp = false) {
+				if (!(before && after)) return
+				const type = temp ? 'tempRange' : 'range'
+				if (this.dateCompare(before, after)) {
+					this[type].startDate = before
+					this[type].endDate = after
+				} else {
+					this[type].startDate = after
+					this[type].endDate = before
+				}
+			},
+
+			/**
+			 * 比较时间大小
+			 */
+			dateCompare(startDate, endDate) {
+				// 计算截止时间
+				startDate = new Date(startDate.replace('-', '/').replace('-', '/'))
+				// 计算详细项的截止时间
+				endDate = new Date(endDate.replace('-', '/').replace('-', '/'))
+				if (startDate <= endDate) {
+					return true
+				} else {
+					return false
+				}
+			},
+
+			/**
+			 * 比较时间差
+			 */
+			diffDate(startDate, endDate) {
+				// 计算截止时间
+				startDate = new Date(startDate.replace('-', '/').replace('-', '/'))
+				// 计算详细项的截止时间
+				endDate = new Date(endDate.replace('-', '/').replace('-', '/'))
+				const diff = (endDate - startDate) / (24 * 60 * 60 * 1000)
+				return Math.abs(diff)
+			},
+
+			clear(needEmit = true) {
+				if (!this.isRange) {
+					this.singleVal = ''
+					this.tempSingleDate = ''
+					this.time = ''
+					if (this.isPhone) {
+						this.$refs.mobile && this.$refs.mobile.clearCalender()
+					} else {
+						this.$refs.pcSingle && this.$refs.pcSingle.clearCalender()
+					}
+					if (needEmit) {
+						this.formItem && this.formItem.setValue('')
+						this.$emit('change', '')
+						this.$emit('input', '')
+						this.$emit('update:modelValue', '')
+					}
+				} else {
+					this.range.startDate = ''
+					this.range.endDate = ''
+					this.tempRange.startDate = ''
+					this.tempRange.startTime = ''
+					this.tempRange.endDate = ''
+					this.tempRange.endTime = ''
+					if (this.isPhone) {
+						this.$refs.mobile && this.$refs.mobile.clearCalender()
+					} else {
+						this.$refs.left && this.$refs.left.clearCalender()
+						this.$refs.right && this.$refs.right.clearCalender()
+						this.$refs.right && this.$refs.right.next()
+					}
+					if (needEmit) {
+						this.formItem && this.formItem.setValue([])
+						this.$emit('change', [])
+						this.$emit('input', [])
+						this.$emit('update:modelValue', [])
+					}
+				}
+			},
+
+			parseDate(date) {
+				date = this.fixIosDateFormat(date)
+				const defVal = new Date(date)
+				const year = defVal.getFullYear()
+				const month = defVal.getMonth() + 1
+				const day = defVal.getDate()
+				const hour = defVal.getHours()
+				const minute = defVal.getMinutes()
+				const second = defVal.getSeconds()
+				const defDate = year + '-' + this.lessTen(month) + '-' + this.lessTen(day)
+				const defTime = this.lessTen(hour) + ':' + this.lessTen(minute) + (this.hideSecond ? '' : (':' + this
+					.lessTen(second)))
+				return {
+					defDate,
+					defTime
+				}
+			},
+
+			lessTen(item) {
+				return item < 10 ? '0' + item : item
+			},
+
+			//兼容 iOS、safari 日期格式
+			fixIosDateFormat(value) {
+				if (typeof value === 'string') {
+					value = value.replace(/-/g, '/')
+				}
+				return value
+			},
+
+			leftMonthSwitch(e) {
+				// console.log('leftMonthSwitch 返回:', e)
+			},
+			rightMonthSwitch(e) {
+				// console.log('rightMonthSwitch 返回:', e)
+			}
+		}
+	}
+</script>
+
+<style>
+	.uni-date-x {
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
+		padding: 0 10px;
+		border-radius: 4px;
+		background-color: #fff;
+		color: #666;
+		font-size: 14px;
+	}
+
+	.uni-date-x--border {
+		box-sizing: border-box;
+		border-radius: 4px;
+		border: 1px solid #dcdfe6;
+	}
+
+	.uni-date-editor--x {
+		position: relative;
+	}
+
+	.uni-date-editor--x .uni-date__icon-clear {
+		position: absolute;
+		top: 0;
+		right: 0;
+		display: inline-block;
+		box-sizing: border-box;
+		border: 9px solid transparent;
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
+	}
+
+	.uni-date__x-input {
+		padding: 0 8px;
+		height: 40px;
+		width: 100%;
+		line-height: 40px;
+		font-size: 14px;
+	}
+
+	.t-c {
+		text-align: center;
+	}
+
+	.uni-date__input {
+		height: 40px;
+		width: 100%;
+		line-height: 40px;
+		font-size: 14px;
+	}
+
+	.uni-date-range__input {
+		text-align: center;
+		max-width: 142px;
+	}
+
+	.uni-date-picker__container {
+		position: relative;
+		/* 		position: fixed;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+		box-sizing: border-box;
+		z-index: 996;
+		font-size: 14px; */
+	}
+
+	.uni-date-mask {
+		position: fixed;
+		bottom: 0px;
+		top: 0px;
+		left: 0px;
+		right: 0px;
+		background-color: rgba(0, 0, 0, 0);
+		transition-duration: 0.3s;
+		z-index: 996;
+	}
+
+	.uni-date-single--x {
+		/* padding: 0 8px; */
+		background-color: #fff;
+		position: absolute;
+		top: 0;
+		z-index: 999;
+		border: 1px solid #EBEEF5;
+		box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+		border-radius: 4px;
+	}
+
+	.uni-date-range--x {
+		/* padding: 0 8px; */
+		background-color: #fff;
+		position: absolute;
+		top: 0;
+		z-index: 999;
+		border: 1px solid #EBEEF5;
+		box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+		border-radius: 4px;
+	}
+
+	.uni-date-editor--x__disabled {
+		opacity: 0.4;
+		cursor: default;
+	}
+
+	.uni-date-editor--logo {
+		width: 16px;
+		height: 16px;
+		vertical-align: middle;
+	}
+
+	/* 添加时间 */
+	.popup-x-header {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		/* justify-content: space-between; */
+	}
+
+	.popup-x-header--datetime {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		flex: 1;
+	}
+
+	.popup-x-body {
+		display: flex;
+	}
+
+	.popup-x-footer {
+		padding: 0 15px;
+		border-top-color: #F1F1F1;
+		border-top-style: solid;
+		border-top-width: 1px;
+		/* background-color: #fff; */
+		line-height: 40px;
+		text-align: right;
+		color: #666;
+	}
+
+	.popup-x-footer text:hover {
+		color: #007aff;
+		cursor: pointer;
+		opacity: 0.8;
+	}
+
+	.popup-x-footer .confirm {
+		margin-left: 20px;
+		color: #007aff;
+	}
+
+	.uni-date-changed {
+		/* background-color: #fff; */
+		text-align: center;
+		color: #333;
+		border-bottom-color: #F1F1F1;
+		border-bottom-style: solid;
+		border-bottom-width: 1px;
+		/* padding: 0 50px; */
+	}
+
+	.uni-date-changed--time text {
+		/* padding: 0 20px; */
+		height: 50px;
+		line-height: 50px;
+	}
+
+	.uni-date-changed .uni-date-changed--time {
+		/* display: flex; */
+		flex: 1;
+	}
+
+	.uni-date-changed--time-date {
+		color: #333;
+		opacity: 0.6;
+	}
+
+	.mr-50 {
+		margin-right: 50px;
+	}
+
+	/* picker 弹出层通用的指示小三角, todo：扩展至上下左右方向定位 */
+	.uni-popper__arrow,
+	.uni-popper__arrow::after {
+		position: absolute;
+		display: block;
+		width: 0;
+		height: 0;
+		border-color: transparent;
+		border-style: solid;
+		border-width: 6px;
+	}
+
+	.uni-popper__arrow {
+		filter: drop-shadow(0 2px 12px rgba(0, 0, 0, 0.03));
+		top: -6px;
+		left: 10%;
+		margin-right: 3px;
+		border-top-width: 0;
+		border-bottom-color: #EBEEF5;
+	}
+
+	.uni-popper__arrow::after {
+		content: " ";
+		top: 1px;
+		margin-left: -6px;
+		border-top-width: 0;
+		border-bottom-color: #fff;
+	}
+</style>