diff --git a/App.vue b/App.vue
index ddc469e..88d0189 100644
--- a/App.vue
+++ b/App.vue
@@ -40,7 +40,7 @@
 			// #endif
 
 			// #ifdef H5
-			if (uni.getSystemInfoSync().platform == 'ios') {
+			if (uni.getDeviceInfo().platform == 'ios') {
 				uni.setStorageSync('initUrl', location.href);
 			}
 			// #endif
@@ -151,7 +151,6 @@
 		onShow: function(options) {
 			// #ifdef MP
 			// 自动授权登录
-			this.getAuthInfo();
 			if (this.$store.state.token) {
 				this.$api.sendRequest({
 					url: '/api/member/info',
@@ -161,6 +160,8 @@
 						}
 					}
 				});
+			}else{
+				this.getAuthInfo();
 			}
 			// #endif
 
@@ -177,8 +178,7 @@
 				// #ifdef H5
 				if (this.$util.isWeiXin()) {
 					this.$util.getUrlCode(urlParams => {
-						if (urlParams.source_member) uni.setStorageSync('source_member', urlParams
-							.source_member);
+						if (urlParams.source_member) uni.setStorageSync('source_member', urlParams.source_member);
 
 						if (urlParams.code == undefined) {
 							this.$api.sendRequest({
@@ -204,8 +204,7 @@
 										let data = {};
 										if (res.data.openid) data.wx_openid = res.data.openid;
 										if (res.data.unionid) data.wx_unionid = res.data.unionid;
-										if (res.data.userinfo) Object.assign(data, res.data
-											.userinfo);
+										if (res.data.userinfo) Object.assign(data, res.data.userinfo);
 										this.authLogin(data);
 									}
 								}
@@ -301,7 +300,7 @@
 						this.shareConfig();
 					}
 				},
-				// 代表在wacth里声明了firstName这个方法之后立即先去执行handler方法
+				// 代表在watch里声明了firstName这个方法之后立即先去执行handler方法
 				immediate: true
 			}
 		}
diff --git a/common/css/diy.scss b/common/css/diy.scss
index e83aaee..fa7152b 100644
--- a/common/css/diy.scss
+++ b/common/css/diy.scss
@@ -1,234 +1,305 @@
-.collectPopupWindow {
-	position: relative;
-	height: 113rpx;
-	width: 510rpx;
-	margin-left: calc(100% - 530rpx);
-
-	image {
-		width: 100%;
-		height: 100%;
-	}
-
-	text {
-		color: #ff4544 !important;
-		font-size: 24rpx !important;
-		position: absolute;
-		top: 48rpx;
-		right: 25rpx;
-	}
-}
-.zhezhao {
-	width: 100vw;
-	height: 100vh;
-	background-color: transparent;
-}
-image {
-	max-width: 100% !important;
-	max-height: 100% !important;
-}
-.diy-wrap {
-	/* #ifdef H5 */
-	height: calc(100vh - 88rpx);
-	/* #endif */
-	/* #ifdef MP-WEIXIN */
-	height: 100vh;
-	/* #endif */
-}
-
-.page-img {
-	background-size: contain !important;
-	background-repeat: no-repeat !important;
-}
-
-.page-header {
-	background-size: 100% !important;
-	background-repeat: no-repeat !important;
-	background-position: top center;
-	background-attachment: fixed;
-}
-
-.bg-index {
-	width: 100%;
-	height: 100%;
-	box-sizing: border-box;
-	background-size: 100% !important;
-	background-repeat: no-repeat !important;
-}
-
-.wap-floating {
-	text {
-		display: block;
-		font-size: 60rpx;
-		color: #ffffff;
-		text-align: center;
-	}
-}
-
-.wap-floating-collect .uni-popup__mask {
-	background: transparent;
-}
-
-::-webkit-scrollbar {
-	width: 0;
-	height: 0;
-	color: transparent;
-}
-
-.popup-box {
-	width: 450rpx;
-	background: #ffffff;
-	border-radius: $border-radius;
-	overflow: hidden;
-
-	.close_title {
-		width: 100%;
-		text-align: center;
-		height: 70rpx;
-		line-height: 70rpx;
-		font-size: $font-size-base;
-	}
-
-	.close_content {
-		width: 100%;
-		max-height: 500rpx;
-		padding: $padding;
-		box-sizing: border-box;
-	}
-
-	.close_content_box {
-		width: 100%;
-		max-height: 460rpx;
-		line-height: 1.3;
-	}
-}
-
-.noStore-text {
-	color: #000000 !important;
-}
-
-.isStore-top {
-	margin-bottom: 10rpx;
-}
-.keep-on-record {
-	text-align: center;
-	padding-bottom: 20rpx;
-	image {
-		width: 150rpx;
-		height: 60rpx;
-	}
-}
-
-.padding-bottom {
-	padding-bottom: 40rpx !important;
-}
-
-.choose-store {
-    /deep/ .uni-popup__wrapper{
-        background: none!important;
-    }
-}
-
-.choose-store-popup {
-	padding: 30rpx;
-	background-color: #fff;
-	.head-wrap {
-		font-weight: bold;
-		font-size: $font-size-toolbar;
-		text-align: center;
-		margin-bottom: 20rpx;
-		color: #202021;
-	}
-	.position-wrap {
-		display: flex;
-		color: #202021;
-		align-items: center;
-		margin-bottom: 20rpx;
-		.icon-dizhi {
-			font-weight: bold;
-			font-size: $font-size-tag;
-			margin-right: 10rpx;
-		}
-		.address {
-			font-weight: bold;
-			font-size: $font-size-tag;
-			margin-right: 10rpx;
-			flex: 1;
-			overflow: hidden;
-			white-space: nowrap;
-			text-overflow: ellipsis;
-			-o-text-overflow: ellipsis;
-		}
-		.reposition {
-			display: flex;
-			align-items: center;
-			.iconfont {
-				font-size: $font-size-base;
-				margin-right: 6rpx;
-			}
-			text {
-				font-size: $font-size-tag;
-				color: #fd463e;
-			}
-		}
-	}
-	.store-wrap {
-		border: 1px solid $base-color;
-		border-radius: 16rpx;
-		padding: 20rpx 30rpx;
-		margin-bottom: 30rpx;
-		.tag {
-			background-color: #fee9ea;
-			color: #fd463e;
-			font-size: $font-size-activity-tag;
-			display: inline-block;
-			border-radius: 6rpx;
-			padding: 4rpx 12rpx;
-			// #ifdef H5
-			transform: scale(0.8);
-			margin-left: -10rpx;
-			// #endif
-		}
-		.store-name {
-			margin: 10rpx 0;
-			font-weight: bold;
-			color: #202021;
-			font-size: $font-size-toolbar;
-		}
-		.address {
-			color: #5f6067;
-			font-size: $font-size-tag;
-			margin-bottom: 10rpx;
-		}
-		.distance {
-			display: flex;
-			align-items: center;
-			color: #5f6067;
-			font-size: $font-size-tag;
-			.iconfont {
-				font-size: $font-size-base;
-				margin-right: 10rpx;
-			}
-		}
-	}
-
-	button {
-		border-radius: 40rpx;
-	}
-
-	.other-store {
-		display: flex;
-		align-items: center;
-		color: #5e6066;
-		font-weight: bold;
-		justify-content: center;
-		margin-top: 20rpx;
-		margin-bottom: 20rpx;
-		.iconfont {
-			margin-left: 10rpx;
-			font-size: $font-size-tag;
-		}
-	}
-}
-.page-bottom {
-	margin-top: 20rpx;
-}
+.collectPopupWindow {
+	position: relative;
+	height: 113rpx;
+	width: 510rpx;
+	margin-left: calc(100% - 530rpx);
+
+	image {
+		width: 100%;
+		height: 100%;
+	}
+
+	text {
+		color: #ff4544 !important;
+		font-size: 24rpx !important;
+		position: absolute;
+		top: 48rpx;
+		right: 25rpx;
+	}
+}
+.zhezhao {
+	width: 100vw;
+	height: 100vh;
+	background-color: transparent;
+}
+image {
+	max-width: 100% !important;
+	max-height: 100% !important;
+}
+.diy-wrap {
+	/* #ifdef H5 */
+	height: calc(100vh - 88rpx);
+	/* #endif */
+	/* #ifdef MP-WEIXIN */
+	height: 100vh;
+	/* #endif */
+}
+
+.page-img {
+	background-size: contain !important;
+	background-repeat: no-repeat !important;
+}
+
+.page-header {
+	background-size: 100% !important;
+	background-repeat: no-repeat !important;
+	background-position: top center;
+	background-attachment: fixed;
+}
+
+.bg-index {
+	width: 100%;
+	height: 100%;
+	box-sizing: border-box;
+	background-size: 100% !important;
+	background-repeat: no-repeat !important;
+}
+
+.wap-floating {
+	text {
+		display: block;
+		font-size: 60rpx;
+		color: #ffffff;
+		text-align: center;
+	}
+}
+
+.wap-floating-collect .uni-popup__mask {
+	background: transparent;
+}
+
+::-webkit-scrollbar {
+	width: 0;
+	height: 0;
+	color: transparent;
+}
+
+.popup-box {
+	width: 450rpx;
+	background: #ffffff;
+	border-radius: $border-radius;
+	overflow: hidden;
+
+	.close_title {
+		width: 100%;
+		text-align: center;
+		height: 70rpx;
+		line-height: 70rpx;
+		font-size: $font-size-base;
+	}
+
+	.close_content {
+		width: 100%;
+		max-height: 500rpx;
+		padding: $padding;
+		box-sizing: border-box;
+	}
+
+	.close_content_box {
+		width: 100%;
+		max-height: 460rpx;
+		line-height: 1.3;
+	}
+}
+
+.noStore-text {
+	color: #000000 !important;
+}
+
+.isStore-top {
+	margin-bottom: 10rpx;
+}
+.keep-on-record {
+	text-align: center;
+	padding-bottom: 20rpx;
+	image {
+		width: 150rpx;
+		height: 60rpx;
+	}
+}
+
+.padding-bottom {
+	padding-bottom: 40rpx !important;
+}
+
+.choose-store {
+    /deep/ .uni-popup__wrapper{
+        background: none!important;
+    }
+}
+
+.choose-store-popup {
+	padding: 30rpx;
+	background-color: #fff;
+	.head-wrap {
+		font-weight: bold;
+		font-size: $font-size-toolbar;
+		text-align: center;
+		margin-bottom: 20rpx;
+		color: #202021;
+	}
+	.position-wrap {
+		display: flex;
+		color: #202021;
+		align-items: center;
+		margin-bottom: 20rpx;
+		.icon-dizhi {
+			font-weight: bold;
+			font-size: $font-size-tag;
+			margin-right: 10rpx;
+		}
+		.address {
+			font-weight: bold;
+			font-size: $font-size-tag;
+			margin-right: 10rpx;
+			flex: 1;
+			overflow: hidden;
+			white-space: nowrap;
+			text-overflow: ellipsis;
+			-o-text-overflow: ellipsis;
+		}
+		.reposition {
+			display: flex;
+			align-items: center;
+			.iconfont {
+				font-size: $font-size-base;
+				margin-right: 6rpx;
+			}
+			text {
+				font-size: $font-size-tag;
+				color: #fd463e;
+			}
+		}
+	}
+	.store-wrap {
+		border: 1px solid $base-color;
+		border-radius: 16rpx;
+		padding: 20rpx 30rpx;
+		margin-bottom: 30rpx;
+		.tag {
+			background-color: #fee9ea;
+			color: #fd463e;
+			font-size: $font-size-activity-tag;
+			display: inline-block;
+			border-radius: 6rpx;
+			padding: 4rpx 12rpx;
+			// #ifdef H5
+			transform: scale(0.8);
+			margin-left: -10rpx;
+			// #endif
+		}
+		.store-name {
+			margin: 10rpx 0;
+			font-weight: bold;
+			color: #202021;
+			font-size: $font-size-toolbar;
+		}
+		.store-close-desc{
+			color: red;
+			font-size: $font-size-tag;
+			margin-bottom: 10rpx;
+		}
+		.address {
+			color: #5f6067;
+			font-size: $font-size-tag;
+			margin-bottom: 10rpx;
+		}
+		.distance {
+			display: flex;
+			align-items: center;
+			color: #5f6067;
+			font-size: $font-size-tag;
+			.iconfont {
+				font-size: $font-size-base;
+				margin-right: 10rpx;
+			}
+		}
+	}
+
+	button {
+		border-radius: 40rpx;
+	}
+
+	.other-store {
+		display: flex;
+		align-items: center;
+		color: #5e6066;
+		font-weight: bold;
+		justify-content: center;
+		margin-top: 20rpx;
+		margin-bottom: 20rpx;
+		.iconfont {
+			margin-left: 10rpx;
+			font-size: $font-size-tag;
+		}
+	}
+}
+.page-bottom {
+	margin-top: 20rpx;
+}
+.chain-stores{
+	.chain-store-popup{
+		background-color: #fff;
+		border-top-left-radius: 24rpx;
+		border-top-right-radius: 24rpx;
+		overflow: hidden;
+		.title{
+			font-size: 36rpx;
+			line-height: 104rpx;
+			text-align: center;
+			color: #000;
+			font-weight: bold;
+		}
+		.body{
+			padding: 20rpx 30rpx;
+			background-color: #F4F4F4;
+			padding-bottom: calc(20rpx  + constant(safe-area-inset-bottom)) !important;
+			padding-bottom: calc(20rpx  + env(safe-area-inset-bottom)) !important;
+			.center{
+				background-color: #fff;
+				box-shadow: 4rpx 4rpx 12rpx 4rpx rgba(0,0,0,0.02);
+				border-radius: 24rpx;
+				padding-top: 60rpx;
+				padding-bottom: 23rpx;
+				.image{
+					display: flex;
+					justify-content: center;
+				}
+				.text-top{
+					margin-top: 44rpx;
+					font-size: 30rpx;
+					font-weight: bold;
+					color: #000;
+					line-height: 42rpx;
+					text-align: center;
+				}
+				.text-bottom{
+					margin-top: 20rpx;
+					padding: 0 57rpx;
+					font-size: 24rpx;
+					line-height: 34rpx;
+					color: #999;
+					text-align: center;
+				}
+				.footer{
+					display: flex;
+					margin-top: 20rpx;
+					padding: 0 24rpx;
+					button{
+						margin: 0 !important;
+						box-sizing: border-box;
+						height: 84rpx;
+						line-height: 84rpx;
+						border-radius: 62rpx;
+						font-size: 30rpx;
+						flex:1;
+					}
+					button.btn-right{
+						margin-left: 20rpx !important;
+					}
+				}
+			}
+		}
+	}
+}
+
diff --git a/common/css/goods_detail.scss b/common/css/goods_detail.scss
index c1a25e1..6595bd9 100644
--- a/common/css/goods_detail.scss
+++ b/common/css/goods_detail.scss
@@ -1,1562 +1,1580 @@
-.goods-detail {
-	height: 100%;
-	padding-bottom: 100rpx;
-	&.active {
-		padding-bottom: 170rpx;
-	}
-}
-
-.goods-gression {
-	position: relative;
-	z-index: 2;
-	// margin-top: -60rpx;
-	margin-top: 24rpx;
-}
-
-// 商品媒体信息
-.goods-media {
-	width: 100%;
-	position: relative;
-	overflow: hidden;
-	// &::before{
-	// 	content: "";
-	// 	position: absolute;
-	// 	left: 0;
-	// 	right: 0;
-	// 	bottom: 0;
-	// 	height: 70rpx;
-	// 	background-color: transparent;
-	// 	background-image: linear-gradient(transparent 35%, #f6f6f6);
-	// 	z-index: 2;
-	// }
-	.share {
-		z-index: 97;
-		position: absolute;
-		top: 30rpx;
-		width: calc(100% - 60rpx);
-		padding: 10rpx 30rpx;
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		text {
-			display: inline-block;
-			width: 60rpx;
-			height: 60rpx;
-			color: #fff;
-			background: rgba(0, 0, 0, 0.42);
-			border-radius: 50%;
-			text-align: center;
-			font-size: $font-size-base;
-			line-height: 60rpx;
-		}
-		.share_right {
-			text {
-				margin-left: 30rpx;
-			}
-		}
-	}
-	&:after {
-		padding-top: 100%;
-		display: block;
-		content: '';
-	}
-
-	.goods-img,
-	.goods-video {
-		position: absolute;
-		width: 100%;
-		height: 100%;
-		left: 0;
-		top: 0;
-		transition-property: transform;
-		transition-timing-function: cubic-bezier(0, 0, 0.25, 1);
-		transition-duration: 350ms;
-		transform: translate3d(0, 0, 0);
-	}
-
-	.goods-img {
-		transform: translateX(100%);
-	}
-
-	.goods-video {
-		transform: translateX(-100%);
-	}
-
-	.goods-img.show,
-	.goods-video.show {
-		transform: translateX(0);
-	}
-
-	.goods-img .swiper {
-		width: 100%;
-		height: 100%;
-
-		.item {
-			width: 100%;
-			height: 100%;
-		}
-
-		image {
-			width: 100%;
-			height: 100%;
-		}
-	}
-
-	.goods-img .img-indicator-dots {
-		position: absolute;
-		z-index: 5;
-		bottom: 30rpx;
-		right: 40rpx;
-		background: rgba(100, 100, 100, 0.4);
-		color: #fff;
-		font-size: $font-size-tag;
-		line-height: 40rpx;
-		border-radius: 20rpx;
-		padding: 0 20rpx;
-	}
-
-	.goods-video video {
-		width: 100%;
-		height: 100%;
-	}
-
-	.goods-video .uni-video-cover {
-		background: none;
-	}
-
-	.media-mode {
-		position: absolute;
-		width: 100%;
-		z-index: 5;
-		bottom: 40rpx;
-		//#ifdef MP
-		bottom: 80rpx;
-		//#endif
-		text-align: center;
-		line-height: 50rpx;
-
-		text {
-			background: rgba(100, 100, 100, 0.4);
-			color: #fff;
-			font-size: $font-size-tag;
-			line-height: 50rpx;
-			border-radius: 20rpx;
-			padding: 0 30rpx;
-			display: inline-block;
-
-			&:last-child {
-				margin-left: 40rpx;
-			}
-		}
-	}
-}
-
-// 营销活动
-.goods-promotion {
-	position: relative;
-	height: 108rpx;
-	overflow: hidden;
-	background-repeat: no-repeat;
-	background-size: 100% 100%;
-	padding: 0 30rpx;
-	margin: 0 24rpx 20rpx;
-	border-radius: 16rpx;
-	.price-info {
-		margin-right: 280rpx;
-		color: #fff;
-		height: inherit;
-		display: flex;
-		flex-direction: column;
-		justify-content: center;
-		.img-wrap {
-			width: 200rpx;
-			height: 60rpx;
-			display: inline-block;
-			vertical-align: text-top;
-			image {
-				width: 100%;
-				height: 100%;
-			}
-		}
-		.sale-num {
-			line-height: 1;
-			font-size: $font-size-tag;
-			white-space: nowrap;
-			overflow: hidden;
-			color: #fff;
-			text-overflow: ellipsis;
-		}
-	}
-	.countdown {
-		position: absolute;
-		right: 0;
-		top: 0;
-		width: 280rpx;
-		text-align: center;
-		height: 100%;
-		background-repeat: no-repeat;
-		background-size: 100% 100%;
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		justify-content: center;
-		.txt {
-			height: 32rpx;
-			text-align: center;
-			line-height: 32rpx;
-			font-size: $font-size-tag;
-			margin-top: 0;
-			color: #ff4644;
-		}
-		.clockrun {
-			margin-top: 6rpx;
-			height: 40rpx;
-			line-height: 40rpx;
-			text-align: center;
-			font-size: $font-size-tag;
-			color: #fff;
-		}
-	}
-}
-
-.goods-tag-list {
-	margin-top: 10rpx;
-	display: flex;
-	flex-wrap: wrap;
-	align-items: center;
-	.tag-item {
-		margin-right: 10rpx;
-		padding: 6rpx 8rpx;
-		color: var(--goods-price);
-		border: 2rpx solid var(--goods-price);
-		border-radius: 4rpx;
-		line-height: 1;
-		font-size: $uni-font-size-sm;
-	}
-}
-
-.group-wrap {
-	padding: 0 30rpx;
-	box-sizing: border-box;
-	background: #ffffff;
-	margin: 0 24rpx 20rpx;
-	border-radius: 16rpx;
-
-	.goods-module-wrap {
-		position: relative;
-		padding-right: 110rpx;
-
-		&.info {
-			padding: 20rpx 0 20rpx;
-		}
-		.price-symbol {
-			font-size: $font-size-toolbar;
-			position: relative;
-			top: 6rpx;
-			font-weight: bold;
-			margin-right: 4rpx;
-			color: var(--goods-price);
-		}
-
-		.price {
-			font-size: 48rpx;
-			position: relative;
-			align-self: flex-end;
-			line-height: 1;
-			font-weight: bold;
-			vertical-align: sub;
-			color: var(--goods-price);
-		}
-		.member-vip-wrap {
-			width: 80rpx;
-			height: 30rpx;
-			font-size: $font-size-goods-tag;
-			display: inline-block;
-			margin-right: 10rpx;
-			position: relative;
-			top: 10rpx;
-			image {
-				width: 100%;
-				height: 100%;
-			}
-		}
-		.member-price-wrap {
-			display: inline-block;
-			font-weight: bold;
-			margin-left: 10rpx;
-			vertical-align: text-top;
-			> text {
-				color: #666;
-			}
-			.unit {
-				font-size: $font-size-tag;
-				margin-right: 4rpx;
-			}
-			.money {
-				font-size: $font-size-base;
-			}
-			.img-wrap {
-				width: 83rpx;
-				height: 34rpx;
-				font-size: $font-size-goods-tag;
-				border-radius: 6rpx;
-				display: inline-block;
-				vertical-align: text-top;
-				margin-right: 10rpx;
-				image {
-					width: 100%;
-					height: 100%;
-				}
-			}
-		}
-		.sku-name-wrap,
-		.introduction {
-			overflow: hidden;
-			text-overflow: ellipsis;
-			display: -webkit-box;
-			// -webkit-line-clamp: 2;
-			-webkit-box-orient: vertical;
-		}
-		.sku-name-wrap {
-			font-weight: bold;
-			font-size: $font-size-toolbar;
-			line-height: 1.6;
-		}
-		.introduction {
-			margin: $margin-updown 0;
-			font-size: $font-size-base;
-		}
-
-		.logistics-wrap {
-			display: flex;
-			margin-top: 10rpx;
-			text {
-				flex: 1;
-				font-size: $font-size-tag;
-				color: $color-tip;
-				text-align: center;
-				&:last-of-type {
-					text-align: right;
-				}
-				&:first-of-type {
-					text-align: left;
-				}
-			}
-		}
-	}
-
-	.market-price-wrap {
-		margin-left: 20rpx;
-		color: $color-tip;
-		text-decoration: line-through;
-		display: inline-block;
-		vertical-align: sub;
-		line-height: initial;
-		.unit {
-			margin-right: 4rpx;
-			font-size: $font-size-tag;
-		}
-		.money {
-			font-size: $font-size-base;
-		}
-	}
-}
-
-.follow-and-share {
-	position: absolute;
-	right: 0;
-	top: 50%;
-	transform: translateY(-50%);
-	.iconfont {
-		font-weight: bold;
-		margin-right: 30rpx;
-		font-size: $font-size-toolbar;
-		vertical-align: middle;
-		line-height: 1;
-		&:first-child {
-			font-size: 36rpx;
-			// color: #28C445;
-			// font-weight: normal;
-		}
-		&:last-child {
-			margin-right: 0;
-		}
-	}
-	.fenxiao {
-		display: block;
-		position: absolute;
-		font-size: $font-size-tag;
-		font-weight: bold;
-		width: 140%;
-		white-space: nowrap;
-		overflow: hidden;
-		text-overflow: ellipsis;
-		left: -80rpx;
-		text-align: right;
-	}
-}
-
-.goods-cell {
-	display: flex;
-	padding: 20rpx 0;
-	align-items: center;
-	background: #fff;
-	line-height: 40rpx;
-	justify-content: space-between;
-
-	.tit {
-		color: $color-tip;
-		font-size: $font-size-base;
-		margin-right: 20rpx;
-		width: 70rpx;
-	}
-
-	.box {
-		width: 90%;
-		font-size: $font-size-base;
-		line-height: inherit;
-		overflow: hidden;
-		text-overflow: ellipsis;
-		white-space: nowrap;
-	}
-}
-
-.goods-evaluate {
-	padding: 20rpx 0;
-	background: #fff;
-
-	.tit {
-		display: flex;
-		align-items: center;
-		font-size: $font-size-tag;
-		&.active {
-			padding-bottom: 20rpx;
-			border-bottom: 1rpx solid $color-line;
-		}
-
-		view {
-			flex: 1;
-			line-height: 40rpx;
-			text-align: left;
-		}
-	}
-
-	.evaluate-item {
-		padding: 30rpx 0 0;
-		.evaluator {
-			display: flex;
-			align-items: center;
-			justify-content: space-between;
-			.evaluator-info {
-				display: flex;
-				align-items: center;
-			}
-			.evaluator-face {
-				width: 80rpx;
-				height: 80rpx;
-				border-radius: 50%;
-				overflow: hidden;
-
-				image {
-					width: 100%;
-					height: 100%;
-					border-radius: 50%;
-				}
-			}
-			.evaluator-name-wrap {
-				margin-left: 20rpx;
-				line-height: 1;
-			}
-			.evaluator-name {
-				display: block;
-				width: 230rpx;
-				font-size: $font-size-base;
-				white-space: nowrap;
-			}
-			.time {
-				font-size: $font-size-goods-tag;
-			}
-		}
-
-		.cont {
-			text-align: justify;
-			display: -webkit-box;
-			-webkit-line-clamp: 2;
-			-webkit-box-orient: vertical;
-			-webkit-box-pack: center;
-			overflow: hidden;
-			word-break: break-all;
-			font-size: $font-size-tag;
-		}
-
-		.evaluate-img {
-			display: inline-flex;
-			margin-top: 20rpx;
-
-			.img-box {
-				width: 100rpx;
-				height: 100rpx;
-				overflow: hidden;
-				margin: 0 20rpx 20rpx 0;
-				border-radius: $border-radius;
-
-				image {
-					width: 100%;
-					height: 100%;
-				}
-			}
-		}
-	}
-	.evaluate-item-empty {
-		float: right;
-		color: $color-tip;
-		text:first-child {
-			margin-right: 30rpx;
-		}
-		.iconfont {
-			margin-top: 2rpx;
-		}
-	}
-}
-
-.goods-action-button {
-	flex: 1;
-	margin-left: 20rpx;
-}
-.goods-action-button:last-child {
-	margin-right: 20rpx;
-}
-
-// 商家服务
-.goods-merchants-service-popup-layer {
-	height: 660rpx;
-	scroll-view {
-		position: absolute;
-		left: 0;
-		right: 0;
-		height: 65%;
-		.item {
-			padding: 0 30rpx;
-			border-bottom: 2rpx solid $color-line;
-			display: flex;
-			align-items: center;
-			&:last-child {
-				border-bottom: none;
-			}
-			.item-icon {
-				height: 100%;
-				display: flex;
-				align-items: flex-start;
-				padding-top: 4rpx;
-				box-sizing: border-box;
-				width: 60rpx;
-				&.empty-desc {
-					padding-top: 0;
-					align-items: center;
-					.icon-img {
-						margin-top: 0 !important;
-					}
-					.icon-box {
-						margin-top: 0 !important;
-					}
-				}
-			}
-			.iconfont {
-				display: inline-block;
-				margin-right: 20rpx;
-				font-size: 40rpx;
-				vertical-align: top;
-				height: 50rpx;
-				line-height: 50rpx;
-			}
-			.icon-img {
-				width: 35rpx;
-				height: 35rpx;
-				margin-right: 20rpx;
-				margin-top: 12rpx;
-			}
-			.icon-box {
-				width: 48rpx;
-				height: 48rpx;
-				text-align: center;
-				display: flex;
-				margin-right: 20rpx;
-				line-height: 1;
-				margin-top: 0;
-				font-size: 36rpx;
-				padding: 2rpx;
-			}
-			.info-wrap {
-				display: inline-block;
-				vertical-align: middle;
-				width: 90%;
-
-				.title {
-					display: block;
-					font-size: $font-size-base;
-				}
-				.describe {
-					font-size: $font-size-tag;
-					color: $color-tip;
-					display: block;
-					padding-bottom: 10rpx;
-					line-height: 1.5;
-				}
-			}
-			&.empty-desc {
-				height: 100rpx;
-				.iconfont {
-					vertical-align: middle;
-				}
-			}
-		}
-	}
-}
-
-// 门店列表
-.store-list-wrap {
-	scroll-view {
-		position: absolute;
-		left: 0;
-		right: 0;
-		height: 80%;
-	}
-	.store-list-content {
-		width: 100%;
-		background: #ffffff;
-		border-radius: 20rpx;
-		box-sizing: border-box;
-		overflow: hidden;
-
-		.list-item {
-			width: 100%;
-			padding: 35rpx 24rpx;
-			box-sizing: border-box;
-
-			.item-box {
-				width: 100%;
-				height: 100%;
-				display: flex;
-				background: #ffffff;
-				align-items: center;
-
-				.item-image {
-					width: 88rpx;
-					height: 88rpx;
-					border-radius: 50%;
-					align-self: start;
-
-					image {
-						width: 88rpx;
-						height: 88rpx;
-						border-radius: 50%;
-					}
-				}
-
-				.item-info {
-					width: 520rpx;
-					height: 100%;
-					padding-left: 20rpx;
-					box-sizing: border-box;
-					display: flex;
-					flex-direction: column;
-					margin-right: 24rpx;
-					font-size: $font-size-tag;
-
-					.item-title {
-						display: flex;
-						justify-content: space-between;
-						align-items: center;
-						margin-bottom: 10rpx;
-
-						.title {
-							max-width: 240rpx;
-							overflow: hidden;
-							text-overflow: ellipsis;
-							white-space: nowrap;
-							font-size: $font-size-base;
-							color: $color-title;
-						}
-
-						.distance {
-							font-size: $font-size-activity-tag;
-						}
-					}
-
-					.item-time {
-						font-size: $font-size-activity-tag;
-						color: $color-tip;
-						margin-bottom: 10rpx;
-					}
-
-					.item-address {
-						font-size: $font-size-tag;
-						color: $color-title;
-						line-height: 42rpx;
-
-						display: -webkit-box;
-						-webkit-box-orient: vertical;
-						-webkit-line-clamp: 2;
-						overflow: hidden;
-					}
-				}
-
-				.item-right {
-					flex-grow: 1;
-					height: 100%;
-					display: flex;
-					justify-content: center;
-					align-items: center;
-
-					.iconfont {
-						color: #acacac;
-					}
-				}
-			}
-		}
-	}
-}
-
-// 商品属性
-.goods-attribute-popup-layer {
-	height: 660rpx;
-
-	.goods-attribute-body {
-		position: absolute;
-		left: 0;
-		right: 0;
-		height: 60%;
-		.item {
-			padding: $padding 0;
-			margin: 0 30rpx;
-			border-bottom: 2rpx solid $color-line;
-			.attr-name {
-				color: $color-tip;
-				display: inline-block;
-				width: 150rpx;
-				overflow: hidden;
-				vertical-align: text-top;
-			}
-			.value-name {
-				margin-left: 20rpx;
-				vertical-align: text-top;
-			}
-			&:last-child {
-				border-bottom: none;
-			}
-		}
-	}
-}
-
-.goods-attr {
-	margin: 0 24rpx 20rpx;
-	background-color: #fff;
-	border-radius: 16rpx;
-	overflow: hidden;
-
-	.title {
-		height: 70rpx;
-		color: $color-sub;
-		line-height: 70rpx;
-		box-sizing: border-box;
-		font-size: 32rpx;
-		margin: 0 20rpx;
-	}
-
-	.attr-action {
-		text-align: center;
-		line-height: 70rpx;
-		font-size: 24rpx;
-	}
-
-	.attr-wrap {
-		margin: 20rpx;
-		border: 2rpx solid #f1f1f1;
-		border-radius: 16rpx;
-		overflow: hidden;
-
-		.item {
-			display: flex;
-			border-bottom: 2rpx solid #f1f1f1;
-
-			&:last-child {
-				border-bottom: 0;
-			}
-
-			.attr-name {
-				width: 180rpx;
-				padding: 16rpx 20rpx;
-				background-color: #fbfafa;
-				white-space: pre-wrap;
-				border-right: 2rpx solid #f1f1f1;
-				line-height: 1.3;
-				font-size: 26rpx;
-			}
-
-			.value-name {
-				padding: 10rpx 20rpx;
-				white-space: pre-wrap;
-				line-height: 1.5;
-				font-size: 26rpx;
-				flex: 1;
-				width: 0;
-			}
-		}
-	}
-}
-
-// 详情
-.goods-detail-tab {
-	margin: 0 24rpx 20rpx;
-	background-color: #fff;
-	border-radius: 16rpx;
-	overflow: hidden;
-	.detail-tab {
-		display: flex;
-		align-items: center;
-		margin-top: 10rpx;
-		// width: 100%;
-		// display: flex;
-		// justify-content: center;
-		// align-items: center;
-		.tab-item {
-			height: 70rpx;
-			color: $color-sub;
-			line-height: 70rpx;
-			box-sizing: border-box;
-			font-size: 32rpx;
-			margin: 0 20rpx;
-		}
-		.tab-item.active {
-			// position: relative;
-		}
-		.tab-item.active::after {
-			// content: '';
-			// display: inline-block;
-			// width: 100%;
-			// height: 4rpx;
-			// position: absolute;
-			// left: 0;
-			// bottom: 0;
-			// border-radius: 3rpx;
-		}
-		.tab-item:nth-child(1) {
-			// margin-right: 25%;
-		}
-	}
-	.detail-content {
-		border-radius: 30rpx;
-		width: 100%;
-		overflow: hidden;
-		margin-bottom: 100rpx;
-	}
-	.goods-details {
-		padding: 10rpx $padding $padding;
-		overflow: hidden;
-		* {
-			max-width: 100% !important;
-		}
-	}
-	.goods-details.active {
-		min-height: 150rpx;
-		width: 100%;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		color: $color-tip;
-	}
-}
-
-// 海报
-// .uni-popup__wrapper-box
-.poster-layer {
-    /deep/ .uni-popup__wrapper.center {
-        width: 100vw!important;
-        height: 100vh!important;
-        background: none!important;
-    }
-    
-    /deep/ .uni-popup__wrapper.uni-custom.center .uni-popup__wrapper-box {
-        max-width: 100vw!important;
-        max-height: 100vh!important;
-        background: none!important;
-        width: 100vw;
-        height: 100vh;
-    }
-    
-    .poster-wrap {
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        width: 100vw;
-        height: 100vh;
-        flex-direction: column;
-    }
-    
-	.generate-poster {
-		padding: 40rpx 0;
-		.iconfont {
-			font-size: 80rpx;
-			color: #07c160;
-			line-height: initial;
-		}
-		> view {
-			text-align: center;
-			&:last-child {
-				margin-top: 20rpx;
-			}
-		}
-	}
-    
-	.image-wrap {
-		width: 80%;
-        position: relative;
-		
-        image {
-            width: 100%;
-            line-height: 1;
-            border-radius: 10rpx;
-            overflow: hidden;
-        }
-	}
-	.msg {
-		padding: 40rpx;
-	}
-	.save-btn {
-		text-align: center;
-		height: 80rpx;
-		line-height: 80rpx;
-        background-color: $base-color;
-        border-radius: 10rpx;
-        width: 80%;
-        color: #fff;
-        margin-top: 30rpx;
-	}
-    .save-text {
-        color: #fff;
-        margin-top: 10rpx;
-    }
-	.close {
-		position: absolute;
-		top: 0;
-		right: 20rpx;
-		width: 40rpx;
-		height: 80rpx;
-		font-size: 50rpx;
-        color: #999;
-	}
-}
-
-.share-popup,
-.uni-popup__wrapper-box {
-	.share-title {
-		line-height: 60rpx;
-		font-size: $font-size-toolbar;
-		padding: 15rpx 0;
-		text-align: center;
-	}
-
-	.share-content {
-		display: flex;
-		display: -webkit-flex;
-		-webkit-flex-wrap: wrap;
-		-moz-flex-wrap: wrap;
-		-ms-flex-wrap: wrap;
-		-o-flex-wrap: wrap;
-		flex-wrap: wrap;
-		padding: 80rpx 15rpx;
-
-		.share-box {
-			flex: 1;
-			text-align: center;
-
-			.share-btn {
-				margin: 0;
-				padding: 0;
-				border: none;
-				line-height: 1;
-				height: auto;
-                background: none;
-                
-				text {
-					margin-top: 20rpx;
-					font-size: $font-size-tag;
-					display: block;
-					color: $color-title;
-				}
-			}
-
-			.iconfont {
-				font-size: 80rpx;
-				line-height: initial;
-			}
-			.icon-fuzhilianjie,
-			.icon-pengyouquan,
-			.icon-haowuquan,
-			.icon-share-friend {
-				color: #07c160;
-			}
-		}
-	}
-
-	.share-footer {
-		height: 90rpx;
-		line-height: 90rpx;
-		border-top: 2rpx solid $color-line;
-		text-align: center;
-	}
-}
-
-.newdetail {
-	padding: 0 30rpx;
-	background: #ffffff;
-	margin: 0 24rpx;
-	border-radius: 16rpx;
-	.item {
-		height: 74rpx;
-		display: flex;
-		align-items: center;
-		// border-bottom: 1rpx solid $color-line;
-		.label {
-			width: 70rpx;
-			color: $color-tip;
-			font-size: $font-size-base;
-			margin-right: 20rpx;
-		}
-		&:last-child {
-			border-bottom: none;
-		}
-		&.free {
-			.free-tip {
-				border: 0 solid;
-				padding: 2rpx 14rpx;
-				border-radius: $border-radius;
-				margin-right: 10rpx;
-				font-size: $font-size-tag;
-				font-weight: bold;
-				color: var(--main-color);
-				background-color: var(--main-color-shallow);
-			}
-			.value {
-				display: inline-block;
-				width: 70%;
-				overflow: hidden;
-				text-overflow: ellipsis;
-				white-space: nowrap;
-			}
-		}
-		&.service {
-			.list-wrap {
-				margin-right: 20rpx;
-				overflow: hidden;
-				text-overflow: ellipsis;
-				white-space: nowrap;
-				flex: 1;
-				display: flex;
-				.item-wrap {
-					display: inline;
-					font-size: $font-size-base;
-					margin-right: 20rpx;
-					&:last-child {
-						margin-right: 0;
-					}
-					.item-wrap-box {
-						display: flex;
-						align-items: center;
-						font-size: 26rpx;
-						.item-wrap-icon {
-							display: flex;
-							align-items: center;
-							font-size: 34rpx;
-							padding: 2rpx;
-						}
-						.icon-dui {
-							font-size: $font-size-base;
-							margin-right: 6rpx;
-							line-height: 30rpx;
-							color: $base-color;
-						}
-						.icon-img {
-							width: 28rpx;
-							height: 28rpx;
-							margin-right: 6rpx;
-						}
-						.icon-box {
-							width: 32rpx;
-							height: 32rpx;
-							text-align: center;
-							display: flex;
-							margin-right: 6rpx;
-							line-height: 1;
-							padding: 2rpx;
-						}
-                        text {
-                            white-space: nowrap;
-                        }
-					}
-				}
-			}
-		}
-
-		&.selected-sku-spec {
-			.box {
-				flex: 1;
-				margin-right: 60rpx;
-				width: 80%;
-				overflow: hidden;
-				text-overflow: ellipsis;
-				white-space: nowrap;
-				text {
-					margin-right: 10rpx;
-					&:last-child {
-						margin-right: 0;
-					}
-				}
-			}
-		}
-
-		&.delivery-type {
-			.box {
-				overflow: hidden;
-				text-overflow: ellipsis;
-				white-space: nowrap;
-
-				text {
-					padding-right: 30rpx;
-					position: relative;
-
-					&:after {
-						content: ' ';
-						width: 6rpx;
-						height: 6rpx;
-						border-radius: 50%;
-						background: #000;
-						position: absolute;
-						top: 50%;
-						right: 0;
-						transform: translate(-12rpx, -50%);
-					}
-
-					&:last-child:after {
-						content: '';
-						display: none;
-					}
-				}
-			}
-		}
-
-		&.goods-attribute {
-			.box {
-				flex: 1;
-				margin-right: 60rpx;
-				width: 80%;
-				overflow: hidden;
-				text-overflow: ellipsis;
-				white-space: nowrap;
-				text {
-					margin-right: 20rpx;
-					&:last-child {
-						margin-right: 0;
-					}
-				}
-			}
-		}
-
-		&.store-wrap {
-			height: auto;
-			.list-wrap {
-				padding: 10rpx 0 16rpx;
-				width: 80%;
-				overflow: hidden;
-				text-overflow: ellipsis;
-				white-space: nowrap;
-			}
-			.name-wrap {
-				display: flex;
-				align-items: center;
-				line-height: 1;
-				.icondiy {
-					font-weight: bold;
-					font-size: $font-size-base;
-				}
-				.name {
-					margin-left: 10rpx;
-					font-size: $font-size-tag;
-					text-overflow: ellipsis;
-					white-space: nowrap;
-					overflow: hidden;
-				}
-			}
-			.other-wrap {
-				display: flex;
-				align-items: center;
-				font-size: $font-size-tag;
-				line-height: 1;
-				margin-top: 12rpx;
-				.decorate {
-					position: relative;
-					top: -8rpx;
-					margin: 0 10rpx;
-				}
-				.address {
-					text-overflow: ellipsis;
-					white-space: nowrap;
-					overflow: hidden;
-					max-width: 400rpx;
-					line-height: 1;
-					font-size: $font-size-tag;
-				}
-			}
-		}
-
-		.img-wrap {
-			width: 38rpx;
-			height: 38rpx;
-			position: absolute;
-			right: 30rpx;
-			image {
-				width: 100%;
-				height: 100%;
-			}
-		}
-	}
-}
-
-.popup-layer {
-	background: #fff;
-	.head-wrap {
-		font-size: $font-size-toolbar;
-		line-height: 100rpx;
-		height: 100rpx;
-		display: block;
-		text-align: center;
-		.iconfont {
-			position: absolute;
-			float: right;
-			right: 44rpx;
-			font-size: $font-size-toolbar;
-		}
-	}
-	.button-box {
-		width: 100%;
-		position: absolute;
-		bottom: 0;
-		z-index: 1;
-		margin-bottom: 30rpx;
-		button {
-			height: 80rpx;
-			background-color: var(--goods-btn-color);
-		}
-	}
-}
-
-.deliverytype-popup-layer {
-	.type-body {
-		padding: 30rpx;
-		box-sizing: border-box;
-	}
-
-	.type-item {
-		display: flex;
-		margin-bottom: 40rpx;
-
-		.iconfont {
-			margin-right: 30rpx;
-			color: $base-color;
-		}
-
-		.title {
-			font-weight: bold;
-			margin-bottom: 20rpx;
-		}
-		.desc {
-			font-size: 24rpx;
-		}
-
-		&.not-support {
-			.title,
-			.desc,
-			.iconfont {
-				color: #aaa;
-			}
-		}
-	}
-}
-
-.icon-right {
-	color: $color-tip;
-	font-size: $font-size-base;
-	position: absolute;
-	right: 30rpx;
-}
-
-.promotion-tag {
-	color: #fff;
-	font-size: $font-size-activity-tag;
-	border-top-left-radius: 30rpx;
-	border-bottom-left-radius: 30rpx;
-	padding: 4rpx 10rpx;
-	margin-right: 10rpx;
-	vertical-align: middle;
-	background-color: var(--promotion-tag);
-	display: none;
-}
-
-//社群
-.detail-community {
-	background: #fff;
-	padding: 30rpx;
-	margin-bottom: 20rpx;
-	display: flex;
-	align-items: center;
-	justify-content: space-between;
-
-	.community-box {
-		display: flex;
-		align-items: center;
-
-		image {
-			width: 70rpx;
-			height: 70rpx;
-			border-radius: 10rpx;
-			margin-right: 20rpx;
-		}
-		.community-title {
-			font-family: PingFang-SC-Medium;
-			font-size: 28rpx;
-			// line-height: 36rpx;
-			color: #303133;
-		}
-		.community-txt {
-			font-family: PingFang-SC-Medium;
-			font-size: 24rpx;
-			color: #909399;
-			width: 450rpx;
-			overflow: hidden;
-			text-overflow: ellipsis;
-			white-space: nowrap;
-		}
-	}
-	.community-btn {
-		width: 100rpx;
-		height: 50rpx;
-		line-height: 50rpx;
-		background-color: #03bd04;
-		border-radius: 10rpx;
-		text-align: center;
-		font-family: PingFang-SC-Medium;
-		font-size: 24rpx;
-		color: #ffffff;
-	}
-}
-
-.community-model {
-	position: fixed;
-	top: 0;
-	left: 0;
-	width: 100%;
-	height: 100vh;
-	background: rgba(0, 0, 0, 0.4);
-	z-index: 9999;
-
-	.community-model-content {
-		width: 500rpx;
-		height: 600rpx;
-		background-color: #ffffff;
-		border-radius: 10rpx;
-		margin: 35% auto 0;
-		position: relative;
-		overflow: hidden;
-
-		.community-model-content-radius {
-			width: 600rpx;
-			height: 240rpx;
-			border-radius: 100%;
-			background: $base-color;
-			position: absolute;
-			left: -50rpx;
-			top: -60rpx;
-
-			view {
-				margin-top: 120rpx;
-				text-align: center;
-				font-family: PingFang-SC-Bold;
-				font-size: 30rpx;
-				color: #ffffff;
-			}
-		}
-
-		.community-model-content-draw {
-			width: 260rpx;
-			height: 260rpx;
-			margin: 214rpx auto 0;
-
-			image {
-				width: 100%;
-				height: 100%;
-			}
-		}
-		.community-model-content-text {
-			font-family: PingFang-SC-Medium;
-			font-size: 24rpx;
-			color: #909399;
-			text-align: center;
-			margin-top: 20rpx;
-		}
-	}
-	.community-model-close {
-		width: 56rpx;
-		height: 56rpx;
-		border: 2rpx solid #fff;
-		border-radius: 50%;
-		margin: 50rpx auto 0;
-		text-align: center;
-		color: #fff;
-	}
-}
-.to-top {
-	position: fixed;
-	right: 50rpx;
-	bottom: 200rpx;
-	background-color: rgba(0, 0, 0, 0.5);
-	border-radius: 50%;
-	display: flex;
-	width: 80rpx;
-	height: 80rpx;
-	align-items: center;
-	justify-content: center;
-	z-index: 90;
-	color: #fff;
-}
-
-// 活动步骤
-.diy-process-step {
-	padding: 30rpx 30rpx;
-	background-color: #fff;
-	margin-top: 20rpx;
-	border-radius: 16rpx;
-	margin: 0 24rpx 20rpx;
-	.goods-img-content {
-		font-size: 32rpx;
-		font-weight: 800;
-		color: $color-title;
-		line-height: 36rpx;
-		margin-right: 14rpx;
-		text-align: left;
-		margin-top: 20rpx;
-	}
-	.process-step-box {
-		display: flex;
-		flex-direction: column;
-		margin-top: 30rpx;
-		.process-step-item {
-			display: flex;
-			align-items: center;
-			.process-step-icon {
-				background-color: $base-color;
-				color: #fff;
-				width: 90rpx;
-				height: 90rpx;
-				border-radius: 50%;
-				display: flex;
-				align-items: center;
-				justify-content: center;
-				margin-right: 20rpx;
-				line-height: 1;
-				.iconfont {
-					font-size: 48rpx;
-				}
-			}
-			.process-step-content {
-				view {
-					font-size: 30rpx;
-					&:last-child {
-						color: #999;
-						font-size: 24rpx;
-						margin-top: 10rpx;
-					}
-				}
-			}
-		}
-		.process-step-line {
-			width: 100%;
-			height: 60rpx;
-			display: flex;
-			align-items: center;
-			view {
-				width: 60rpx;
-				height: 50rpx;
-				border-left: 4rpx dotted $base-color;
-				margin-left: 45rpx;
-				border-left-image-width: 4rpx;
-			}
-		}
-	}
-}
-
-// 卡项套餐
-.card-info {
-	padding-bottom: 30rpx;
-	.card-title {
-		padding: 20rpx 0 10rpx;
-		text-align: center;
-		font-weight: bold;
-	}
-	.card-desc {
-		padding-left: 10rpx;
-		margin-bottom: 20rpx;
-		font-size: $font-size-tag;
-		color: $color-sub;
-	}
-	.card-content {
-		overflow: hidden;
-	}
-	.card-item {
-		margin-bottom: 28rpx;
-		display: flex;
-		padding: 20rpx;
-		background-color: #fbf9fc;
-		border-radius: 12rpx;
-		&:last-of-type {
-			margin-bottom: 0;
-		}
-		image {
-			overflow: hidden;
-			margin-right: 24rpx;
-			width: 160rpx;
-			height: 160rpx;
-			border-radius: 10rpx;
-		}
-		.content {
-			position: relative;
-			flex: 1;
-			.name {
-				padding-right: 30rpx;
-			}
-			.price {
-				font-size: $font-size-tag;
-				color: $color-sub;
-			}
-			.num {
-				position: absolute;
-				top: 10rpx;
-				right: 4rpx;
-				font-size: $font-size-tag;
-			}
-		}
-	}
-	.card-off {
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		margin-top: 20rpx;
-		line-height: 1;
-		text {
-			font-size: $font-size-tag;
-			&:last-of-type {
-				margin-left: 6rpx;
-				font-size: $font-size-tag;
-			}
-		}
-	}
-}
+.goods-detail {
+	height: 100%;
+	padding-bottom: 100rpx;
+	&.active {
+		padding-bottom: 170rpx;
+	}
+}
+
+.goods-gression {
+	position: relative;
+	z-index: 2;
+	// margin-top: -60rpx;
+	margin-top: 24rpx;
+}
+
+// 商品媒体信息
+.goods-media {
+	width: 100%;
+	position: relative;
+	overflow: hidden;
+	// &::before{
+	// 	content: "";
+	// 	position: absolute;
+	// 	left: 0;
+	// 	right: 0;
+	// 	bottom: 0;
+	// 	height: 70rpx;
+	// 	background-color: transparent;
+	// 	background-image: linear-gradient(transparent 35%, #f6f6f6);
+	// 	z-index: 2;
+	// }
+	.share {
+		z-index: 97;
+		position: absolute;
+		top: 30rpx;
+		width: calc(100% - 60rpx);
+		padding: 10rpx 30rpx;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		text {
+			display: inline-block;
+			width: 60rpx;
+			height: 60rpx;
+			color: #fff;
+			background: rgba(0, 0, 0, 0.42);
+			border-radius: 50%;
+			text-align: center;
+			font-size: $font-size-base;
+			line-height: 60rpx;
+		}
+		.share_right {
+			text {
+				margin-left: 30rpx;
+			}
+		}
+	}
+	&:after {
+		padding-top: 100%;
+		display: block;
+		content: '';
+	}
+
+	.goods-img,
+	.goods-video {
+		position: absolute;
+		width: 100%;
+		height: 100%;
+		left: 0;
+		top: 0;
+		transition-property: transform;
+		transition-timing-function: cubic-bezier(0, 0, 0.25, 1);
+		transition-duration: 350ms;
+		transform: translate3d(0, 0, 0);
+	}
+
+	.goods-img {
+		transform: translateX(100%);
+	}
+
+	.goods-video {
+		transform: translateX(-100%);
+	}
+
+	.goods-img.show,
+	.goods-video.show {
+		transform: translateX(0);
+	}
+
+	.goods-img .swiper {
+		width: 100%;
+		height: 100%;
+
+		.item {
+			width: 100%;
+			height: 100%;
+		}
+
+		image {
+			width: 100%;
+			height: 100%;
+		}
+	}
+
+	.goods-img .img-indicator-dots {
+		position: absolute;
+		z-index: 5;
+		bottom: 30rpx;
+		right: 40rpx;
+		background: rgba(100, 100, 100, 0.4);
+		color: #fff;
+		font-size: $font-size-tag;
+		line-height: 40rpx;
+		border-radius: 20rpx;
+		padding: 0 20rpx;
+	}
+
+	.goods-video video {
+		width: 100%;
+		height: 100%;
+	}
+
+	.goods-video .uni-video-cover {
+		background: none;
+	}
+
+	.media-mode {
+		position: absolute;
+		width: 100%;
+		z-index: 5;
+		bottom: 40rpx;
+		//#ifdef MP
+		bottom: 80rpx;
+		//#endif
+		text-align: center;
+		line-height: 50rpx;
+
+		text {
+			background: rgba(100, 100, 100, 0.4);
+			color: #fff;
+			font-size: $font-size-tag;
+			line-height: 50rpx;
+			border-radius: 20rpx;
+			padding: 0 30rpx;
+			display: inline-block;
+
+			&:last-child {
+				margin-left: 40rpx;
+			}
+		}
+	}
+}
+
+// 营销活动
+.goods-promotion {
+	position: relative;
+	height: 108rpx;
+	overflow: hidden;
+	background-repeat: no-repeat;
+	background-size: 100% 100%;
+	padding: 0 30rpx;
+	margin: 0 24rpx 20rpx;
+	border-radius: 16rpx;
+	.price-info {
+		margin-right: 280rpx;
+		color: #fff;
+		height: inherit;
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		.img-wrap {
+			width: 200rpx;
+			height: 60rpx;
+			display: inline-block;
+			vertical-align: text-top;
+			image {
+				width: 100%;
+				height: 100%;
+			}
+		}
+		.sale-num {
+			line-height: 1;
+			font-size: $font-size-tag;
+			white-space: nowrap;
+			overflow: hidden;
+			color: #fff;
+			text-overflow: ellipsis;
+		}
+	}
+	.countdown {
+		position: absolute;
+		right: 0;
+		top: 0;
+		width: 280rpx;
+		text-align: center;
+		height: 100%;
+		background-repeat: no-repeat;
+		background-size: 100% 100%;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		.txt {
+			height: 32rpx;
+			text-align: center;
+			line-height: 32rpx;
+			font-size: $font-size-tag;
+			margin-top: 0;
+			color: #ff4644;
+		}
+		.clockrun {
+			margin-top: 6rpx;
+			height: 40rpx;
+			line-height: 40rpx;
+			text-align: center;
+			font-size: $font-size-tag;
+			color: #fff;
+		}
+	}
+}
+
+.goods-tag-list {
+	margin-top: 10rpx;
+	display: flex;
+	flex-wrap: wrap;
+	align-items: center;
+	.tag-item {
+		margin-right: 10rpx;
+		padding: 6rpx 8rpx;
+		color: var(--goods-price);
+		border: 2rpx solid var(--goods-price);
+		border-radius: 4rpx;
+		line-height: 1;
+		font-size: $uni-font-size-sm;
+	}
+}
+
+.group-wrap {
+	padding: 0 30rpx;
+	box-sizing: border-box;
+	background: #ffffff;
+	margin: 0 24rpx 20rpx;
+	border-radius: 16rpx;
+
+	.goods-module-wrap {
+		position: relative;
+		padding-right: 110rpx;
+
+		&.info {
+			padding: 20rpx 0 20rpx;
+		}
+		.price-symbol {
+			font-size: $font-size-toolbar;
+			position: relative;
+			top: 6rpx;
+			font-weight: bold;
+			margin-right: 4rpx;
+			color: var(--goods-price);
+		}
+
+		.price {
+			font-size: 48rpx;
+			position: relative;
+			align-self: flex-end;
+			line-height: 1;
+			font-weight: bold;
+			vertical-align: sub;
+			color: var(--goods-price);
+		}
+		.member-vip-wrap {
+			width: 80rpx;
+			height: 30rpx;
+			font-size: $font-size-goods-tag;
+			display: inline-block;
+			margin-right: 10rpx;
+			position: relative;
+			top: 10rpx;
+			image {
+				width: 100%;
+				height: 100%;
+			}
+		}
+		.member-price-wrap {
+			display: inline-block;
+			font-weight: bold;
+			margin-left: 10rpx;
+			vertical-align: text-top;
+			> text {
+				color: #666;
+			}
+			.unit {
+				font-size: $font-size-tag;
+				margin-right: 4rpx;
+			}
+			.money {
+				font-size: $font-size-base;
+			}
+			.img-wrap {
+				width: 83rpx;
+				height: 34rpx;
+				font-size: $font-size-goods-tag;
+				border-radius: 6rpx;
+				display: inline-block;
+				vertical-align: text-top;
+				margin-right: 10rpx;
+				image {
+					width: 100%;
+					height: 100%;
+				}
+			}
+		}
+		.sku-name-wrap,
+		.introduction {
+			overflow: hidden;
+			text-overflow: ellipsis;
+			display: -webkit-box;
+			// -webkit-line-clamp: 2;
+			-webkit-box-orient: vertical;
+		}
+		.sku-name-wrap {
+			font-weight: bold;
+			font-size: $font-size-toolbar;
+			line-height: 1.6;
+		}
+		.introduction {
+			margin: $margin-updown 0;
+			font-size: $font-size-base;
+		}
+
+		.logistics-wrap {
+			display: flex;
+			margin-top: 10rpx;
+			text {
+				flex: 1;
+				font-size: $font-size-tag;
+				color: $color-tip;
+				text-align: center;
+				&:last-of-type {
+					text-align: right;
+				}
+				&:first-of-type {
+					text-align: left;
+				}
+			}
+		}
+	}
+
+	.market-price-wrap {
+		margin-left: 20rpx;
+		color: $color-tip;
+		text-decoration: line-through;
+		display: inline-block;
+		vertical-align: sub;
+		line-height: initial;
+		.unit {
+			margin-right: 4rpx;
+			font-size: $font-size-tag;
+		}
+		.money {
+			font-size: $font-size-base;
+		}
+	}
+}
+
+.follow-and-share {
+	position: absolute;
+	right: 0;
+	top: 50%;
+	transform: translateY(-50%);
+	.iconfont {
+		font-weight: bold;
+		margin-right: 30rpx;
+		font-size: $font-size-toolbar;
+		vertical-align: middle;
+		line-height: 1;
+		&:first-child {
+			font-size: 36rpx;
+			// color: #28C445;
+			// font-weight: normal;
+		}
+		&:last-child {
+			margin-right: 0;
+		}
+	}
+	.fenxiao {
+		display: block;
+		position: absolute;
+		font-size: $font-size-tag;
+		font-weight: bold;
+		width: 140%;
+		white-space: nowrap;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		left: -80rpx;
+		text-align: right;
+	}
+}
+
+.goods-cell {
+	display: flex;
+	padding: 20rpx 0;
+	align-items: center;
+	background: #fff;
+	line-height: 40rpx;
+	justify-content: space-between;
+
+	.tit {
+		color: $color-tip;
+		font-size: $font-size-base;
+		margin-right: 20rpx;
+		width: 70rpx;
+	}
+
+	.box {
+		width: 90%;
+		font-size: $font-size-base;
+		line-height: inherit;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+	}
+}
+
+.goods-evaluate {
+	padding: 20rpx 0;
+	background: #fff;
+
+	.tit {
+		display: flex;
+		align-items: center;
+		font-size: $font-size-tag;
+		&.active {
+			padding-bottom: 20rpx;
+			border-bottom: 1rpx solid $color-line;
+		}
+
+		view {
+			flex: 1;
+			line-height: 40rpx;
+			text-align: left;
+		}
+	}
+
+	.evaluate-item {
+		padding: 30rpx 0 0;
+		.evaluator {
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			.evaluator-info {
+				display: flex;
+				align-items: center;
+			}
+			.evaluator-face {
+				width: 80rpx;
+				height: 80rpx;
+				border-radius: 50%;
+				overflow: hidden;
+
+				image {
+					width: 100%;
+					height: 100%;
+					border-radius: 50%;
+				}
+			}
+			.evaluator-name-wrap {
+				margin-left: 20rpx;
+				line-height: 1;
+			}
+			.evaluator-name {
+				display: block;
+				width: 230rpx;
+				font-size: $font-size-base;
+				white-space: nowrap;
+			}
+			.time {
+				font-size: $font-size-goods-tag;
+			}
+		}
+
+		.cont {
+			text-align: justify;
+			display: -webkit-box;
+			-webkit-line-clamp: 2;
+			-webkit-box-orient: vertical;
+			-webkit-box-pack: center;
+			overflow: hidden;
+			word-break: break-all;
+			font-size: $font-size-tag;
+		}
+
+		.evaluate-img {
+			display: inline-flex;
+			margin-top: 20rpx;
+
+			.img-box {
+				width: 100rpx;
+				height: 100rpx;
+				overflow: hidden;
+				margin: 0 20rpx 20rpx 0;
+				border-radius: $border-radius;
+
+				image {
+					width: 100%;
+					height: 100%;
+				}
+			}
+		}
+	}
+	.evaluate-item-empty {
+		float: right;
+		color: $color-tip;
+		text:first-child {
+			margin-right: 30rpx;
+		}
+		.iconfont {
+			margin-top: 2rpx;
+		}
+	}
+}
+
+.goods-action-button {
+	flex: 1;
+	margin-left: 20rpx;
+}
+.goods-action-button:last-child {
+	margin-right: 20rpx;
+}
+
+// 商家服务
+.goods-merchants-service-popup-layer {
+	height: 660rpx;
+	scroll-view {
+		position: absolute;
+		left: 0;
+		right: 0;
+		height: 65%;
+		.item {
+			padding: 0 30rpx;
+			border-bottom: 2rpx solid $color-line;
+			display: flex;
+			align-items: center;
+			&:last-child {
+				border-bottom: none;
+			}
+			.item-icon {
+				height: 100%;
+				display: flex;
+				align-items: flex-start;
+				padding-top: 4rpx;
+				box-sizing: border-box;
+				width: 60rpx;
+				&.empty-desc {
+					padding-top: 0;
+					align-items: center;
+					.icon-img {
+						margin-top: 0 !important;
+					}
+					.icon-box {
+						margin-top: 0 !important;
+					}
+				}
+			}
+			.iconfont {
+				display: inline-block;
+				margin-right: 20rpx;
+				font-size: 40rpx;
+				vertical-align: top;
+				height: 50rpx;
+				line-height: 50rpx;
+			}
+			.icon-img {
+				width: 35rpx;
+				height: 35rpx;
+				margin-right: 20rpx;
+				margin-top: 12rpx;
+			}
+			.icon-box {
+				width: 48rpx;
+				height: 48rpx;
+				text-align: center;
+				display: flex;
+				margin-right: 20rpx;
+				line-height: 1;
+				margin-top: 0;
+				font-size: 36rpx;
+				padding: 2rpx;
+			}
+			.info-wrap {
+				display: inline-block;
+				vertical-align: middle;
+				width: 90%;
+
+				.title {
+					display: block;
+					font-size: $font-size-base;
+				}
+				.describe {
+					font-size: $font-size-tag;
+					color: $color-tip;
+					display: block;
+					padding-bottom: 10rpx;
+					line-height: 1.5;
+				}
+			}
+			&.empty-desc {
+				height: 100rpx;
+				.iconfont {
+					vertical-align: middle;
+				}
+			}
+		}
+	}
+}
+
+// 门店列表
+.store-list-wrap {
+	scroll-view {
+		position: absolute;
+		left: 0;
+		right: 0;
+		height: 80%;
+	}
+	.store-list-content {
+		width: 100%;
+		background: #ffffff;
+		border-radius: 20rpx;
+		box-sizing: border-box;
+		overflow: hidden;
+
+		.list-item {
+			width: 100%;
+			padding: 35rpx 24rpx;
+			box-sizing: border-box;
+
+			.item-box {
+				width: 100%;
+				height: 100%;
+				display: flex;
+				background: #ffffff;
+				align-items: center;
+
+				.item-image {
+					width: 88rpx;
+					height: 88rpx;
+					border-radius: 50%;
+					align-self: start;
+
+					image {
+						width: 88rpx;
+						height: 88rpx;
+						border-radius: 50%;
+					}
+				}
+
+				.item-info {
+					width: 520rpx;
+					height: 100%;
+					padding-left: 20rpx;
+					box-sizing: border-box;
+					display: flex;
+					flex-direction: column;
+					margin-right: 24rpx;
+					font-size: $font-size-tag;
+
+					.item-title {
+						display: flex;
+						justify-content: space-between;
+						align-items: center;
+						margin-bottom: 10rpx;
+
+						.title {
+							max-width: 240rpx;
+							overflow: hidden;
+							text-overflow: ellipsis;
+							white-space: nowrap;
+							font-size: $font-size-base;
+							color: $color-title;
+						}
+
+						.distance {
+							font-size: $font-size-activity-tag;
+						}
+					}
+					
+					.item-close-desc{
+						font-size: $font-size-tag;
+						color: red;
+						margin-bottom: 10rpx;
+					}
+
+					.item-time {
+						font-size: $font-size-activity-tag;
+						color: $color-tip;
+						margin-bottom: 10rpx;
+					}
+
+					.item-address {
+						font-size: $font-size-tag;
+						color: $color-title;
+						line-height: 42rpx;
+
+						display: -webkit-box;
+						-webkit-box-orient: vertical;
+						-webkit-line-clamp: 2;
+						overflow: hidden;
+					}
+				}
+
+				.item-right {
+					flex-grow: 1;
+					height: 100%;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+
+					.iconfont {
+						color: #acacac;
+					}
+				}
+			}
+		}
+	}
+}
+
+// 商品属性
+.goods-attribute-popup-layer {
+	height: 660rpx;
+
+	.goods-attribute-body {
+		position: absolute;
+		left: 0;
+		right: 0;
+		height: 60%;
+		.item {
+			padding: $padding 0;
+			margin: 0 30rpx;
+			border-bottom: 2rpx solid $color-line;
+			.attr-name {
+				color: $color-tip;
+				display: inline-block;
+				width: 150rpx;
+				overflow: hidden;
+				vertical-align: text-top;
+			}
+			.value-name {
+				margin-left: 20rpx;
+				vertical-align: text-top;
+			}
+			&:last-child {
+				border-bottom: none;
+			}
+		}
+	}
+}
+
+.goods-attr {
+	margin: 0 24rpx 20rpx;
+	background-color: #fff;
+	border-radius: 16rpx;
+	overflow: hidden;
+
+	.title {
+		height: 70rpx;
+		color: $color-sub;
+		line-height: 70rpx;
+		box-sizing: border-box;
+		font-size: 32rpx;
+		margin: 0 20rpx;
+	}
+
+	.attr-action {
+		text-align: center;
+		line-height: 70rpx;
+		font-size: 24rpx;
+	}
+
+	.attr-wrap {
+		margin: 20rpx;
+		border: 2rpx solid #f1f1f1;
+		border-radius: 16rpx;
+		overflow: hidden;
+
+		.item {
+			display: flex;
+			border-bottom: 2rpx solid #f1f1f1;
+
+			&:last-child {
+				border-bottom: 0;
+			}
+
+			.attr-name {
+				width: 180rpx;
+				padding: 16rpx 20rpx;
+				background-color: #fbfafa;
+				white-space: pre-wrap;
+				border-right: 2rpx solid #f1f1f1;
+				line-height: 1.3;
+				font-size: 26rpx;
+			}
+
+			.value-name {
+				padding: 10rpx 20rpx;
+				white-space: pre-wrap;
+				line-height: 1.5;
+				font-size: 26rpx;
+				flex: 1;
+				width: 0;
+			}
+		}
+	}
+}
+
+// 详情
+.goods-detail-tab {
+	margin: 0 24rpx 20rpx;
+	background-color: #fff;
+	border-radius: 16rpx;
+	overflow: hidden;
+	.detail-tab {
+		display: flex;
+		align-items: center;
+		margin-top: 10rpx;
+		// width: 100%;
+		// display: flex;
+		// justify-content: center;
+		// align-items: center;
+		.tab-item {
+			height: 70rpx;
+			color: $color-sub;
+			line-height: 70rpx;
+			box-sizing: border-box;
+			font-size: 32rpx;
+			margin: 0 20rpx;
+		}
+		.tab-item.active {
+			// position: relative;
+		}
+		.tab-item.active::after {
+			// content: '';
+			// display: inline-block;
+			// width: 100%;
+			// height: 4rpx;
+			// position: absolute;
+			// left: 0;
+			// bottom: 0;
+			// border-radius: 3rpx;
+		}
+		.tab-item:nth-child(1) {
+			// margin-right: 25%;
+		}
+	}
+	.detail-content {
+		border-radius: 30rpx;
+		width: 100%;
+		overflow: hidden;
+		margin-bottom: 100rpx;
+	}
+	.goods-details {
+		padding: 10rpx $padding $padding;
+		overflow: hidden;
+		* {
+			max-width: 100% !important;
+		}
+		img,image{
+			display: block;
+		}
+	}
+	.goods-details.active {
+		min-height: 150rpx;
+		width: 100%;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		color: $color-tip;
+	}
+}
+
+// 海报
+// .uni-popup__wrapper-box
+.poster-layer {
+    /deep/ .uni-popup__wrapper.center {
+        width: 100vw!important;
+        height: 100vh!important;
+        background: none!important;
+    }
+    
+    /deep/ .uni-popup__wrapper.uni-custom.center .uni-popup__wrapper-box {
+        max-width: 100vw!important;
+        max-height: 100vh!important;
+        background: none!important;
+        width: 100vw;
+        height: 100vh;
+    }
+    
+    .poster-wrap {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        width: 100vw;
+        height: 100vh;
+        flex-direction: column;
+    }
+    
+	.generate-poster {
+		padding: 40rpx 0;
+		.iconfont {
+			font-size: 80rpx;
+			color: #07c160;
+			line-height: initial;
+		}
+		> view {
+			text-align: center;
+			&:last-child {
+				margin-top: 20rpx;
+			}
+		}
+	}
+    
+	.image-wrap {
+		width: 80%;
+        position: relative;
+		
+        image {
+            width: 100%;
+            line-height: 1;
+            border-radius: 10rpx;
+            overflow: hidden;
+        }
+	}
+	.msg {
+		padding: 40rpx;
+	}
+	.save-btn {
+		text-align: center;
+		height: 80rpx;
+		line-height: 80rpx;
+        background-color: $base-color;
+        border-radius: 10rpx;
+        width: 80%;
+        color: #fff;
+        margin-top: 30rpx;
+	}
+    .save-text {
+        color: #fff;
+        margin-top: 10rpx;
+    }
+	.close {
+		position: absolute;
+		top: 0;
+		right: 20rpx;
+		width: 40rpx;
+		height: 80rpx;
+		font-size: 50rpx;
+        color: #999;
+	}
+}
+
+.share-popup,
+.uni-popup__wrapper-box {
+	.share-title {
+		line-height: 60rpx;
+		font-size: $font-size-toolbar;
+		padding: 15rpx 0;
+		text-align: center;
+	}
+
+	.share-content {
+		display: flex;
+		display: -webkit-flex;
+		-webkit-flex-wrap: wrap;
+		-moz-flex-wrap: wrap;
+		-ms-flex-wrap: wrap;
+		-o-flex-wrap: wrap;
+		flex-wrap: wrap;
+		padding: 80rpx 15rpx;
+
+		.share-box {
+			flex: 1;
+			text-align: center;
+
+			.share-btn {
+				margin: 0;
+				padding: 0;
+				border: none;
+				line-height: 1;
+				height: auto;
+                background: none;
+                
+				text {
+					margin-top: 20rpx;
+					font-size: $font-size-tag;
+					display: block;
+					color: $color-title;
+				}
+			}
+
+			.iconfont {
+				font-size: 80rpx;
+				line-height: initial;
+			}
+			.icon-fuzhilianjie,
+			.icon-pengyouquan,
+			.icon-haowuquan,
+			.icon-share-friend {
+				color: #07c160;
+			}
+		}
+	}
+
+	.share-footer {
+		height: 90rpx;
+		line-height: 90rpx;
+		border-top: 2rpx solid $color-line;
+		text-align: center;
+	}
+}
+
+.newdetail {
+	padding: 0 30rpx;
+	background: #ffffff;
+	margin: 0 24rpx;
+	border-radius: 16rpx;
+	.item {
+		height: 74rpx;
+		display: flex;
+		align-items: center;
+		// border-bottom: 1rpx solid $color-line;
+		.label {
+			width: 70rpx;
+			color: $color-tip;
+			font-size: $font-size-base;
+			margin-right: 20rpx;
+		}
+		&:last-child {
+			border-bottom: none;
+		}
+		&.free {
+			.free-tip {
+				border: 0 solid;
+				padding: 2rpx 14rpx;
+				border-radius: $border-radius;
+				margin-right: 10rpx;
+				font-size: $font-size-tag;
+				font-weight: bold;
+				color: var(--main-color);
+				background-color: var(--main-color-shallow);
+			}
+			.value {
+				display: inline-block;
+				width: 70%;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				white-space: nowrap;
+			}
+		}
+		&.service {
+			.list-wrap {
+				margin-right: 20rpx;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				white-space: nowrap;
+				flex: 1;
+				display: flex;
+				.item-wrap {
+					display: inline;
+					font-size: $font-size-base;
+					margin-right: 20rpx;
+					&:last-child {
+						margin-right: 0;
+					}
+					.item-wrap-box {
+						display: flex;
+						align-items: center;
+						font-size: 26rpx;
+						.item-wrap-icon {
+							display: flex;
+							align-items: center;
+							font-size: 34rpx;
+							padding: 2rpx;
+						}
+						.icon-dui {
+							font-size: $font-size-base;
+							margin-right: 6rpx;
+							line-height: 30rpx;
+							color: $base-color;
+						}
+						.icon-img {
+							width: 28rpx;
+							height: 28rpx;
+							margin-right: 6rpx;
+						}
+						.icon-box {
+							width: 32rpx;
+							height: 32rpx;
+							text-align: center;
+							display: flex;
+							margin-right: 6rpx;
+							line-height: 1;
+							padding: 2rpx;
+						}
+                        text {
+                            white-space: nowrap;
+                        }
+					}
+				}
+			}
+		}
+
+		&.selected-sku-spec {
+			.box {
+				flex: 1;
+				margin-right: 60rpx;
+				width: 80%;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				white-space: nowrap;
+				text {
+					margin-right: 10rpx;
+					&:last-child {
+						margin-right: 0;
+					}
+				}
+			}
+		}
+
+		&.delivery-type {
+			.box {
+				overflow: hidden;
+				text-overflow: ellipsis;
+				white-space: nowrap;
+
+				text {
+					padding-right: 30rpx;
+					position: relative;
+
+					&:after {
+						content: ' ';
+						width: 6rpx;
+						height: 6rpx;
+						border-radius: 50%;
+						background: #000;
+						position: absolute;
+						top: 50%;
+						right: 0;
+						transform: translate(-12rpx, -50%);
+					}
+
+					&:last-child:after {
+						content: '';
+						display: none;
+					}
+				}
+			}
+		}
+
+		&.goods-attribute {
+			.box {
+				flex: 1;
+				margin-right: 60rpx;
+				width: 80%;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				white-space: nowrap;
+				text {
+					margin-right: 20rpx;
+					&:last-child {
+						margin-right: 0;
+					}
+				}
+			}
+		}
+
+		&.store-wrap {
+			height: auto;
+			.label{
+				line-height: 34rpx;
+			}
+			.list-wrap {
+				padding: 10rpx 0 16rpx;
+				width: 80%;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				white-space: nowrap;
+			}
+			.name-wrap {
+				display: flex;
+				align-items: center;
+				line-height: 1;
+				.icondiy {
+					font-weight: bold;
+					font-size: $font-size-base;
+				}
+				.name {
+					margin-left: 10rpx;
+					font-size: $font-size-tag;
+					text-overflow: ellipsis;
+					white-space: nowrap;
+					overflow: hidden;
+				}
+				
+			}
+			.close-desc{
+				color:red;
+				font-size: $font-size-tag;
+				margin-top: 4rpx;
+			}
+			.other-wrap {
+				display: flex;
+				align-items: center;
+				font-size: $font-size-tag;
+				line-height: 1;
+				margin-top: 12rpx;
+				.decorate {
+					position: relative;
+					top: -8rpx;
+					margin: 0 10rpx;
+				}
+				.address {
+					text-overflow: ellipsis;
+					white-space: nowrap;
+					overflow: hidden;
+					max-width: 400rpx;
+					line-height: 1;
+					font-size: $font-size-tag;
+				}
+			}
+		}
+
+		.img-wrap {
+			width: 38rpx;
+			height: 38rpx;
+			position: absolute;
+			right: 30rpx;
+			image {
+				width: 100%;
+				height: 100%;
+			}
+		}
+	}
+}
+
+.popup-layer {
+	background: #fff;
+	.head-wrap {
+		font-size: $font-size-toolbar;
+		line-height: 100rpx;
+		height: 100rpx;
+		display: block;
+		text-align: center;
+		.iconfont {
+			position: absolute;
+			float: right;
+			right: 44rpx;
+			font-size: $font-size-toolbar;
+		}
+	}
+	.button-box {
+		width: 100%;
+		position: absolute;
+		bottom: 0;
+		z-index: 1;
+		margin-bottom: 30rpx;
+		button {
+			height: 80rpx;
+			background-color: var(--goods-btn-color);
+		}
+	}
+}
+
+.deliverytype-popup-layer {
+	.type-body {
+		padding: 30rpx;
+		box-sizing: border-box;
+	}
+
+	.type-item {
+		display: flex;
+		margin-bottom: 40rpx;
+
+		.iconfont {
+			margin-right: 30rpx;
+			color: $base-color;
+		}
+
+		.title {
+			font-weight: bold;
+			margin-bottom: 20rpx;
+		}
+		.desc {
+			font-size: 24rpx;
+		}
+
+		&.not-support {
+			.title,
+			.desc,
+			.iconfont {
+				color: #aaa;
+			}
+		}
+	}
+}
+
+.icon-right {
+	color: $color-tip;
+	font-size: $font-size-base;
+	position: absolute;
+	right: 30rpx;
+}
+
+.promotion-tag {
+	color: #fff;
+	font-size: $font-size-activity-tag;
+	border-top-left-radius: 30rpx;
+	border-bottom-left-radius: 30rpx;
+	padding: 4rpx 10rpx;
+	margin-right: 10rpx;
+	vertical-align: middle;
+	background-color: var(--promotion-tag);
+	display: none;
+}
+
+//社群
+.detail-community {
+	background: #fff;
+	padding: 30rpx;
+	margin-bottom: 20rpx;
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+
+	.community-box {
+		display: flex;
+		align-items: center;
+
+		image {
+			width: 70rpx;
+			height: 70rpx;
+			border-radius: 10rpx;
+			margin-right: 20rpx;
+		}
+		.community-title {
+			font-family: PingFang-SC-Medium;
+			font-size: 28rpx;
+			// line-height: 36rpx;
+			color: #303133;
+		}
+		.community-txt {
+			font-family: PingFang-SC-Medium;
+			font-size: 24rpx;
+			color: #909399;
+			width: 450rpx;
+			overflow: hidden;
+			text-overflow: ellipsis;
+			white-space: nowrap;
+		}
+	}
+	.community-btn {
+		width: 100rpx;
+		height: 50rpx;
+		line-height: 50rpx;
+		background-color: #03bd04;
+		border-radius: 10rpx;
+		text-align: center;
+		font-family: PingFang-SC-Medium;
+		font-size: 24rpx;
+		color: #ffffff;
+	}
+}
+
+.community-model {
+	position: fixed;
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 100vh;
+	background: rgba(0, 0, 0, 0.4);
+	z-index: 9999;
+
+	.community-model-content {
+		width: 500rpx;
+		height: 600rpx;
+		background-color: #ffffff;
+		border-radius: 10rpx;
+		margin: 35% auto 0;
+		position: relative;
+		overflow: hidden;
+
+		.community-model-content-radius {
+			width: 600rpx;
+			height: 240rpx;
+			border-radius: 100%;
+			background: $base-color;
+			position: absolute;
+			left: -50rpx;
+			top: -60rpx;
+
+			view {
+				margin-top: 120rpx;
+				text-align: center;
+				font-family: PingFang-SC-Bold;
+				font-size: 30rpx;
+				color: #ffffff;
+			}
+		}
+
+		.community-model-content-draw {
+			width: 260rpx;
+			height: 260rpx;
+			margin: 214rpx auto 0;
+
+			image {
+				width: 100%;
+				height: 100%;
+			}
+		}
+		.community-model-content-text {
+			font-family: PingFang-SC-Medium;
+			font-size: 24rpx;
+			color: #909399;
+			text-align: center;
+			margin-top: 20rpx;
+		}
+	}
+	.community-model-close {
+		width: 56rpx;
+		height: 56rpx;
+		border: 2rpx solid #fff;
+		border-radius: 50%;
+		margin: 50rpx auto 0;
+		text-align: center;
+		color: #fff;
+	}
+}
+.to-top {
+	position: fixed;
+	right: 50rpx;
+	bottom: 200rpx;
+	background-color: rgba(0, 0, 0, 0.5);
+	border-radius: 50%;
+	display: flex;
+	width: 80rpx;
+	height: 80rpx;
+	align-items: center;
+	justify-content: center;
+	z-index: 90;
+	color: #fff;
+}
+
+// 活动步骤
+.diy-process-step {
+	padding: 30rpx 30rpx;
+	background-color: #fff;
+	margin-top: 20rpx;
+	border-radius: 16rpx;
+	margin: 0 24rpx 20rpx;
+	.goods-img-content {
+		font-size: 32rpx;
+		font-weight: 800;
+		color: $color-title;
+		line-height: 36rpx;
+		margin-right: 14rpx;
+		text-align: left;
+		margin-top: 20rpx;
+	}
+	.process-step-box {
+		display: flex;
+		flex-direction: column;
+		margin-top: 30rpx;
+		.process-step-item {
+			display: flex;
+			align-items: center;
+			.process-step-icon {
+				background-color: $base-color;
+				color: #fff;
+				width: 90rpx;
+				height: 90rpx;
+				border-radius: 50%;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				margin-right: 20rpx;
+				line-height: 1;
+				.iconfont {
+					font-size: 48rpx;
+				}
+			}
+			.process-step-content {
+				view {
+					font-size: 30rpx;
+					&:last-child {
+						color: #999;
+						font-size: 24rpx;
+						margin-top: 10rpx;
+					}
+				}
+			}
+		}
+		.process-step-line {
+			width: 100%;
+			height: 60rpx;
+			display: flex;
+			align-items: center;
+			view {
+				width: 60rpx;
+				height: 50rpx;
+				border-left: 4rpx dotted $base-color;
+				margin-left: 45rpx;
+				border-left-image-width: 4rpx;
+			}
+		}
+	}
+}
+
+// 卡项套餐
+.card-info {
+	padding-bottom: 30rpx;
+	.card-title {
+		padding: 20rpx 0 10rpx;
+		text-align: center;
+		font-weight: bold;
+	}
+	.card-desc {
+		padding-left: 10rpx;
+		margin-bottom: 20rpx;
+		font-size: $font-size-tag;
+		color: $color-sub;
+	}
+	.card-content {
+		overflow: hidden;
+	}
+	.card-item {
+		margin-bottom: 28rpx;
+		display: flex;
+		padding: 20rpx;
+		background-color: #fbf9fc;
+		border-radius: 12rpx;
+		&:last-of-type {
+			margin-bottom: 0;
+		}
+		image {
+			overflow: hidden;
+			margin-right: 24rpx;
+			width: 160rpx;
+			height: 160rpx;
+			border-radius: 10rpx;
+		}
+		.content {
+			position: relative;
+			flex: 1;
+			.name {
+				padding-right: 30rpx;
+			}
+			.price {
+				font-size: $font-size-tag;
+				color: $color-sub;
+			}
+			.num {
+				position: absolute;
+				top: 10rpx;
+				right: 4rpx;
+				font-size: $font-size-tag;
+			}
+		}
+	}
+	.card-off {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		margin-top: 20rpx;
+		line-height: 1;
+		text {
+			font-size: $font-size-tag;
+			&:last-of-type {
+				margin-left: 6rpx;
+				font-size: $font-size-tag;
+			}
+		}
+	}
+}
diff --git a/common/css/iconfont.css b/common/css/iconfont.css
index 67d57ff..33938b6 100644
--- a/common/css/iconfont.css
+++ b/common/css/iconfont.css
@@ -1,463 +1,466 @@
-/* ttf字体文件转换base64：https://transfonter.org */
-
-@font-face {
-  font-family: "iconfont";
-  /* #ifdef MP */
-  	src: url('data:font/ttf;charset=utf-8;base64,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ZQByAHMAaQBvAG4AIAAxAC4AMAAAVmVyc2lvbiAxLjAAAGkAYwBvAG4AZgBvAG4AdAAAaWNvbmZvbnQAAEcAZQBuAGUAcgBhAHQAZQBkACAAYgB5ACAAcwB2AGcAMgB0AHQAZgAgAGYAcgBvAG0AIABGAG8AbgB0AGUAbABsAG8AIABwAHIAbwBqAGUAYwB0AC4AAEdlbmVyYXRlZCBieSBzdmcydHRmIGZyb20gRm9udGVsbG8gcHJvamVjdC4AAGgAdAB0AHAAOgAvAC8AZgBvAG4AdABlAGwAbABvAC4AYwBvAG0AAGh0dHA6Ly9mb250ZWxsby5jb20AAAIAAAAAAAAACgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAlQAAAAEAAgBbAQIBAwEEAQUBBgEHAQgBCQEKAQsBDAENAQ4BDwEQAREBEgETARQBFQEWARcBGAEZARoBGwEcAR0BHgEfASABIQEiASMBJAElASYBJwEoASkBKgErASwBLQEuAS8BMAExATIBMwE0ATUAqwE2ATcBOAE5AToBOwE8AT0BPgE/AUABQQFCAUMBRAFFAUYBRwFIAUkBSgFLAUwBTQFOAU8BUAFRAVIBUwFUAVUBVgFXAVgBWQFaAVsBXAFdAV4BXwFgAWEBYgFjAWQBZQFmAWcBaAFpAWoBawFsAW0BbgFvAXABcQFyAXMBdAF1AXYBdwF4AXkBegF7AXwBfQF+AX8BgAGBAYIBgwGEAYUBhgGHAYgBiQGKAYsBjAGNAY4BjwGQAZEFZnV0b3UJY2hlbmdnb25nCGRpbmdkYW40DGZ1eHVhbmt1YW5nMQlnYW50YW5oYW8MZnV4dWFua3VhbmcyBGtlZnUGa2FuamlhD2thbmppYWNoZW5nZ29uZwZxcmNvZGUHZ29uZ2dhbwhwaW50dWFuMghzaGFuZ3BpbgZyaWdodDEHc291c3VvMwh0dXRlY2hhbgd0dWFuZ291EnhpYW5nc2hhbmd6aGFuaGFuZw15YW9xaW5naGFveW91D2JpYW9xaW5nX25hbmd1bwlmZW54aWFuZzQEZm9sZApnYW50YW5oYW8xBGljb24HaHVpeXVhbgRqaWFuDHBpbnR1YW5mYW5saQNqaWEHc2Vja2lsbAx3b2RlLXR1YW5nb3UHc2h1YXhpbgp3b2RleXVzaG91C3lvdWh1aXF1YW4xDnpodWFudGlodW9kb25nB3ppeXVhbjEHeW9uZ2h1MwZjYWlkYW4HZXJ3ZWltYRFkYW54dWFuLXh1YW56aG9uZwhkaW5nZGFuMgdzYW5qaWFvCXNoYW5ncGluLQdzaG91eWUxEXNoYW5nc2Fuamlhby1jb3B5FXRlZGlhbnF1YW5jaGFuZ2Jhb3lvdQZ3ZW5oYW8Hd2VpeGluMQN5dWUGemhla291DWZhbmdrdWFpLWZpbGwLemhpYm9qaWVzaHUJZ291d3VjaGUyB2d1YW56aHUGamlmZW4tCGRpYW5odWEyB2hvbmdiYW8IcWlhbmRhbzEGamlmZW4yBmppZmVuMwxmdXpoaWxpYW5qaWUIamlhaGFvMDEEbGlrZQhsaWtlZmlsbARsaXN0BXJpZ2h0C3JvdW5kLWNsb3NlCnNoYW5nY2h1YW4GdHVwaWFuCXh1YW56aHVhbgRhZGQxBndlaXpoaQxjbG9zZS1ndWFuYmkEYXBwcwhiaWFvcWluZwZiaWFuamkHY2FydC1vbgVjbG9zZQ1jaGVja2JveGJsYW5rB2RpYW56YW4IZGluZ3dlaTENaWNvbmFuZ2xlZG93bgVkaXpoaQZzaG91amkFaWNvbjcSaWNvbmFuZ2xlZG93bi1jb3B5CnlvdWh1aXF1YW4Geml5dWFuC3poYW94aWFuZ2ppDXl1YW5fY2hlY2tib3gKYmFja19saWdodAx5dWFuX2NoZWNrZWQHYmFuZ3podQZkZWxldGUIZGlhbnphbjEGZGlhbnB1B21lbmRpYW4Ic2hhaXh1YW4Hc2hpamlhbghzaGlqaWFuMQZzb3VzdW8Gc2hlemhpB2RpYW5odWEDZHVpB3lhb3FpbmcMemhvbmdjaGFwaW5nCGZlbnhpYW5nBWZ1emhpBmhleGlhbwVzaGFyZQhoYW9waW5nMQhnb3V3dWNoZQxzaGFyZS1mcmllbmQKamlhbmctY29weQhsb2NhdGlvbghqaWFuc2hhbwZndWFuYmkCZ3oJaGFvd3VxdWFuBnNlYXJjaARqaWx1C3Blbmd5b3VxdWFuBXNhb21hB3Nob3VqaTEOc2h1cnV0aWFueGllYmkRdGlhb3hpbmdtYXNhb21pYW8Fc2h1cnUGdW5mb2xkCGRpYW5odWExBndlaXhpbgZ5b25naHUIYmFuZ3podTEOemhpZnViYW96aGlmdS0IYWRkLWZpbGwKemhpYm96aG9uZwR3YXJuB3N1b2RpbmcLYmFpeGluZ2JlbmcHZmVueGlhbw1odW9kb25ndHVpeWFuB2Rpbmd3ZWkIZnVrdWFubWEHc2FvbWFmdQV6aGlmdQdzaHVxaW5nAAAAAAH//wACAAEAAAAMAAAAFgAAAAIAAQADAJQAAQAEAAAAAgAAAAAAAAABAAAAAN4GKm4AAAAA4cFGQQAAAADhwUZB') format('truetype');
-  /* #endif */
-  /* #ifndef MP */
-  src: url('https://cdn2.codesign.qq.com/icons/1Yyg5Zpxm6Z2lKv/latest/iconfont.eot?t=d9b1a524c10b9f31f44c697cd856e6aa'); /* IE9 */
-  src: url('https://cdn2.codesign.qq.com/icons/1Yyg5Zpxm6Z2lKv/latest/iconfont.eot?t=d9b1a524c10b9f31f44c697cd856e6aa#iefix') format('embedded-opentype'), /* IE6-IE8 */
-  url('https://cdn2.codesign.qq.com/icons/1Yyg5Zpxm6Z2lKv/latest/iconfont.woff?t=d9b1a524c10b9f31f44c697cd856e6aa') format('woff2'),
-  url('https://cdn2.codesign.qq.com/icons/1Yyg5Zpxm6Z2lKv/latest/iconfont.woff?t=d9b1a524c10b9f31f44c697cd856e6aa') format('woff'), /* chrome、firefox */
-  url('https://cdn2.codesign.qq.com/icons/1Yyg5Zpxm6Z2lKv/latest/iconfont.ttf?t=d9b1a524c10b9f31f44c697cd856e6aa') format('truetype'), /* chrome、firefox、opera、Safari, Android, iOS 4.2+*/
-  url('https://cdn2.codesign.qq.com/icons/1Yyg5Zpxm6Z2lKv/latest/iconfont.svg?t=d9b1a524c10b9f31f44c697cd856e6aa#iconfont') format('svg'); /* iOS 4.1- */
-   /* #endif */
-}
-
-.iconfont {
-  font-family: "iconfont" !important;
-  font-size: 16px;
-  font-style: normal;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
-
-.icon-futou:before {
-  content: "\e003";
-}
-.icon-chenggong:before {
-  content: "\e004";
-}
-.icon-dingdan4:before {
-  content: "\e005";
-}
-.icon-fuxuankuang1:before {
-  content: "\e006";
-}
-.icon-gantanhao:before {
-  content: "\e007";
-}
-.icon-fuxuankuang2:before {
-  content: "\e008";
-}
-.icon-kefu:before {
-  content: "\e009";
-}
-.icon-kanjia:before {
-  content: "\e00a";
-}
-.icon-kanjiachenggong:before {
-  content: "\e00b";
-}
-.icon-qrcode:before {
-  content: "\e00c";
-}
-.icon-gonggao:before {
-  content: "\e00d";
-}
-.icon-pintuan2:before {
-  content: "\e00e";
-}
-.icon-shangpin:before {
-  content: "\e00f";
-}
-.icon-right1:before {
-  content: "\e010";
-}
-.icon-sousuo3:before {
-  content: "\e011";
-}
-.icon-tutechan:before {
-  content: "\e012";
-}
-.icon-tuangou:before {
-  content: "\e013";
-}
-.icon-xiangshangzhanhang:before {
-  content: "\e014";
-}
-.icon-yaoqinghaoyou:before {
-  content: "\e015";
-}
-.icon-biaoqing_nanguo:before {
-  content: "\e016";
-}
-.icon-fenxiang4:before {
-  content: "\e017";
-}
-.icon-fold:before {
-  content: "\e018";
-}
-.icon-gantanhao1:before {
-  content: "\e019";
-}
-.icon-icon:before {
-  content: "\e01a";
-}
-.icon-huiyuan:before {
-  content: "\e01b";
-}
-.icon-jian:before {
-  content: "\e01c";
-}
-.icon-pintuanfanli:before {
-  content: "\e01d";
-}
-.icon-jia:before {
-  content: "\e01e";
-}
-.icon-seckill:before {
-  content: "\e01f";
-}
-.icon-wode-tuangou:before {
-  content: "\e020";
-}
-.icon-shuaxin:before {
-  content: "\e021";
-}
-.icon-wodeyushou:before {
-  content: "\e022";
-}
-.icon-youhuiquan1:before {
-  content: "\e023";
-}
-.icon-zhuantihuodong:before {
-  content: "\e024";
-}
-.icon-ziyuan1:before {
-  content: "\e025";
-}
-.icon-yonghu3:before {
-  content: "\e026";
-}
-.icon-caidan:before {
-  content: "\e027";
-}
-.icon-erweima:before {
-  content: "\e028";
-}
-.icon-danxuan-xuanzhong:before {
-  content: "\e029";
-}
-.icon-dingdan2:before {
-  content: "\e02a";
-}
-.icon-sanjiao:before {
-  content: "\e02b";
-}
-.icon-shangpin-:before {
-  content: "\e02c";
-}
-.icon-shouye1:before {
-  content: "\e02d";
-}
-.icon-shangsanjiao-copy:before {
-  content: "\e02e";
-}
-.icon-tedianquanchangbaoyou:before {
-  content: "\e02f";
-}
-.icon-wenhao:before {
-  content: "\e030";
-}
-.icon-weixin1:before {
-  content: "\e031";
-}
-.icon-yue:before {
-  content: "\e032";
-}
-.icon-zhekou:before {
-  content: "\e033";
-}
-.icon-fangkuai-fill:before {
-  content: "\e034";
-}
-.icon-zhibojieshu:before {
-  content: "\e035";
-}
-.icon-gouwuche2:before {
-  content: "\e036";
-}
-.icon-ellipsis:before {
-  content: "\e037";
-}
-.icon-guanzhu:before {
-  content: "\e038";
-}
-.icon-jifen-:before {
-  content: "\e039";
-}
-.icon-dianhua2:before {
-  content: "\e03a";
-}
-.icon-hongbao:before {
-  content: "\e03b";
-}
-.icon-qiandao1:before {
-  content: "\e03c";
-}
-.icon-jifen2:before {
-  content: "\e03d";
-}
-.icon-jifen3:before {
-  content: "\e03e";
-}
-.icon-fuzhilianjie:before {
-  content: "\e03f";
-}
-.icon-jiahao01:before {
-  content: "\e040";
-}
-.icon-like:before {
-  content: "\e041";
-}
-.icon-likefill:before {
-  content: "\e042";
-}
-.icon-list:before {
-  content: "\e043";
-}
-.icon-right:before {
-  content: "\e044";
-}
-.icon-round-close:before {
-  content: "\e045";
-}
-.icon-shangchuan:before {
-  content: "\e046";
-}
-.icon-tupian:before {
-  content: "\e047";
-}
-.icon-xuanzhuan:before {
-  content: "\e048";
-}
-.icon-add1:before {
-  content: "\e049";
-}
-.icon-weizhi:before {
-  content: "\e04a";
-}
-.icon-close-guanbi:before {
-  content: "\e04b";
-}
-.icon-apps:before {
-  content: "\e04c";
-}
-.icon-biaoqing:before {
-  content: "\e04d";
-}
-.icon-bianji:before {
-  content: "\e04e";
-}
-.icon-cart-on:before {
-  content: "\e04f";
-}
-.icon-close:before {
-  content: "\e050";
-}
-.icon-checkboxblank:before {
-  content: "\e051";
-}
-.icon-dianzan:before {
-  content: "\e052";
-}
-.icon-dingwei1:before {
-  content: "\e053";
-}
-.icon-iconangledown:before {
-  content: "\e055";
-}
-.icon-dizhi:before {
-  content: "\e056";
-}
-.icon-shouji:before {
-  content: "\e058";
-}
-.icon-icon7:before {
-  content: "\e059";
-}
-.icon-iconangledown-copy:before {
-  content: "\e05a";
-}
-.icon-youhuiquan:before {
-  content: "\e05c";
-}
-.icon-ziyuan:before {
-  content: "\e05d";
-}
-.icon-zhaoxiangji:before {
-  content: "\e05e";
-}
-.icon-yuan_checkbox:before {
-  content: "\e05f";
-}
-.icon-back_light:before {
-  content: "\e060";
-}
-.icon-yuan_checked:before {
-  content: "\e061";
-}
-.icon-bangzhu:before {
-  content: "\e062";
-}
-.icon-delete:before {
-  content: "\e064";
-}
-.icon-dianzan1:before {
-  content: "\e065";
-}
-.icon-dianpu:before {
-  content: "\e066";
-}
-.icon-mendian:before {
-  content: "\e067";
-}
-.icon-shaixuan:before {
-  content: "\e069";
-}
-.icon-shijian:before {
-  content: "\e06a";
-}
-.icon-shijian1:before {
-  content: "\e06b";
-}
-.icon-sousuo:before {
-  content: "\e06c";
-}
-.icon-shezhi:before {
-  content: "\e06d";
-}
-.icon-dianhua:before {
-  content: "\e06e";
-}
-.icon-dui:before {
-  content: "\e06f";
-}
-.icon-yaoqing:before {
-  content: "\e070";
-}
-.icon-zhongchaping:before {
-  content: "\e071";
-}
-.icon-fenxiang:before {
-  content: "\e072";
-}
-.icon-fuzhi:before {
-  content: "\e073";
-}
-.icon-hexiao:before {
-  content: "\e074";
-}
-.icon-share:before {
-  content: "\e075";
-}
-.icon-haoping1:before {
-  content: "\e076";
-}
-.icon-gouwuche:before {
-  content: "\e077";
-}
-.icon-share-friend:before {
-  content: "\e078";
-}
-.icon-jiang-copy:before {
-  content: "\e079";
-}
-.icon-location:before {
-  content: "\e07a";
-}
-.icon-jianshao:before {
-  content: "\e07b";
-}
-.icon-guanbi:before {
-  content: "\e07c";
-}
-.icon-gz:before {
-  content: "\e07d";
-}
-.icon-haowuquan:before {
-  content: "\e07e";
-}
-.icon-search:before {
-  content: "\e07f";
-}
-.icon-jilu:before {
-  content: "\e080";
-}
-.icon-pengyouquan:before {
-  content: "\e081";
-}
-.icon-saoma:before {
-  content: "\e083";
-}
-.icon-shouji1:before {
-  content: "\e084";
-}
-.icon-shurutianxiebi:before {
-  content: "\e085";
-}
-.icon-tiaoxingmasaomiao:before {
-  content: "\e087";
-}
-.icon-shuru:before {
-  content: "\e088";
-}
-.icon-unfold:before {
-  content: "\e089";
-}
-.icon-dianhua1:before {
-  content: "\e08a";
-}
-.icon-weixin:before {
-  content: "\e08b";
-}
-.icon-yonghu:before {
-  content: "\e08c";
-}
-.icon-bangzhu1:before {
-  content: "\e08d";
-}
-.icon-zhifubaozhifu-:before {
-  content: "\e08e";
-}
-.icon-add-fill:before {
-  content: "\e08f";
-}
-.icon-zhibozhong:before {
-  content: "\e090";
-}
-.icon-warn:before {
-  content: "\e091";
-}
-.icon-suoding:before {
-  content: "\e092";
-}
-.icon-wenxiao:before {
-  content: "\e093";
-}
-.icon-baixingbeng:before {
-  content: "\e094";
-}
-.icon-fenxiao:before {
-  content: "\e095";
-}
-.icon-huodongtuiyan:before {
-  content: "\e096";
-}
-.icon-dingwei:before {
-  content: "\e097";
-}
-.icon-fukuanma:before {
-  content: "\e098";
-}
-.icon-saomafu:before {
-  content: "\e099";
-}
-.icon-zhifu:before {
-  content: "\e09a";
-}
-.icon-shuqing:before {
-  content: "\e09b";
+/* ttf字体文件转换base64：https://transfonter.org */
+
+@font-face {
+  font-family: "iconfont";
+  /* #ifdef MP */
+  	src: url('data:font/ttf;charset=utf-8;base64,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dGFuaGFvDGZ1eHVhbmt1YW5nMgRrZWZ1BmthbmppYQ9rYW5qaWFjaGVuZ2dvbmcGcXJjb2RlB2dvbmdnYW8IcGludHVhbjIIc2hhbmdwaW4GcmlnaHQxB3NvdXN1bzMIdHV0ZWNoYW4HdHVhbmdvdRJ4aWFuZ3NoYW5nemhhbmhhbmcNeWFvcWluZ2hhb3lvdQ9iaWFvcWluZ19uYW5ndW8JZmVueGlhbmc0BGZvbGQKZ2FudGFuaGFvMQRpY29uB2h1aXl1YW4EamlhbgxwaW50dWFuZmFubGkDamlhB3NlY2tpbGwMd29kZS10dWFuZ291B3NodWF4aW4Kd29kZXl1c2hvdQt5b3VodWlxdWFuMQ56aHVhbnRpaHVvZG9uZwd6aXl1YW4xB3lvbmdodTMGY2FpZGFuB2Vyd2VpbWERZGFueHVhbi14dWFuemhvbmcIZGluZ2RhbjIHc2FuamlhbwlzaGFuZ3Bpbi0Hc2hvdXllMRFzaGFuZ3NhbmppYW8tY29weRV0ZWRpYW5xdWFuY2hhbmdiYW95b3UGd2VuaGFvB3dlaXhpbjEDeXVlBnpoZWtvdQ1mYW5na3VhaS1maWxsC3poaWJvamllc2h1CWdvdXd1Y2hlMgdndWFuemh1BmppZmVuLQhkaWFuaHVhMgdob25nYmFvCHFpYW5kYW8xBmppZmVuMgZqaWZlbjMMZnV6aGlsaWFuamllCGppYWhhbzAxBGxpa2UIbGlrZWZpbGwEbGlzdAVyaWdodAtyb3VuZC1jbG9zZQpzaGFuZ2NodWFuBnR1cGlhbgl4dWFuemh1YW4EYWRkMQZ3ZWl6aGkMY2xvc2UtZ3VhbmJpBGFwcHMIYmlhb3FpbmcGYmlhbmppB2NhcnQtb24FY2xvc2UNY2hlY2tib3hibGFuawdkaWFuemFuCGRpbmd3ZWkxDWljb25hbmdsZWRvd24FZGl6aGkGc2hvdWppBWljb243Emljb25hbmdsZWRvd24tY29weQp5b3VodWlxdWFuBnppeXVhbgt6aGFveGlhbmdqaQ15dWFuX2NoZWNrYm94CmJhY2tfbGlnaHQMeXVhbl9jaGVja2VkB2Jhbmd6aHUGZGVsZXRlCGRpYW56YW4xBmRpYW5wdQdtZW5kaWFuCHNoYWl4dWFuB3NoaWppYW4Ic2hpamlhbjEGc291c3VvBnNoZXpoaQdkaWFuaHVhA2R1aQd5YW9xaW5nDHpob25nY2hhcGluZwhmZW54aWFuZwVmdXpoaQZoZXhpYW8Fc2hhcmUIaGFvcGluZzEIZ291d3VjaGUMc2hhcmUtZnJpZW5kCmppYW5nLWNvcHkIbG9jYXRpb24IamlhbnNoYW8GZ3VhbmJpAmd6CWhhb3d1cXVhbgZzZWFyY2gEamlsdQtwZW5neW91cXVhbgVzYW9tYQdzaG91amkxDnNodXJ1dGlhbnhpZWJpEXRpYW94aW5nbWFzYW9taWFvBXNodXJ1BnVuZm9sZAhkaWFuaHVhMQZ3ZWl4aW4GeW9uZ2h1CGJhbmd6aHUxDnpoaWZ1YmFvemhpZnUtCGFkZC1maWxsCnpoaWJvemhvbmcEd2FybgdzdW9kaW5nC2JhaXhpbmdiZW5nB2ZlbnhpYW8NaHVvZG9uZ3R1aXlhbgdkaW5nd2VpCGZ1a3Vhbm1hB3Nhb21hZnUFemhpZnUHc2h1cWluZwh5dWV6aGlmdQAAAAAAAf//AAIAAQAAAAwAAAAWAAAAAgABAAMAlQABAAQAAAACAAAAAAAAAAEAAAAA4p8rRgAAAADirAAYAAAAAOKsABg=') format('truetype');
+  /* #endif */
+  /* #ifndef MP */
+  src: url('https://cdn2.codesign.qq.com/icons/1Yyg5Zpxm6Z2lKv/latest/iconfont.eot?t=26c94ae9159a11d50eb07b7c0e6823c6'); /* IE9 */
+  src: url('https://cdn2.codesign.qq.com/icons/1Yyg5Zpxm6Z2lKv/latest/iconfont.eot?t=26c94ae9159a11d50eb07b7c0e6823c6#iefix') format('embedded-opentype'), /* IE6-IE8 */
+  url('https://cdn2.codesign.qq.com/icons/1Yyg5Zpxm6Z2lKv/latest/iconfont.woff?t=26c94ae9159a11d50eb07b7c0e6823c6') format('woff2'),
+  url('https://cdn2.codesign.qq.com/icons/1Yyg5Zpxm6Z2lKv/latest/iconfont.woff?t=26c94ae9159a11d50eb07b7c0e6823c6') format('woff'), /* chrome、firefox */
+  url('https://cdn2.codesign.qq.com/icons/1Yyg5Zpxm6Z2lKv/latest/iconfont.ttf?t=26c94ae9159a11d50eb07b7c0e6823c6') format('truetype'), /* chrome、firefox、opera、Safari, Android, iOS 4.2+*/
+  url('https://cdn2.codesign.qq.com/icons/1Yyg5Zpxm6Z2lKv/latest/iconfont.svg?t=26c94ae9159a11d50eb07b7c0e6823c6#iconfont') format('svg'); /* iOS 4.1- */
+  /* #endif */
+}
+
+.iconfont {
+  font-family: "iconfont" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.icon-futou:before {
+  content: "\e003";
+}
+.icon-chenggong:before {
+  content: "\e004";
+}
+.icon-dingdan4:before {
+  content: "\e005";
+}
+.icon-fuxuankuang1:before {
+  content: "\e006";
+}
+.icon-gantanhao:before {
+  content: "\e007";
+}
+.icon-fuxuankuang2:before {
+  content: "\e008";
+}
+.icon-kefu:before {
+  content: "\e009";
+}
+.icon-kanjia:before {
+  content: "\e00a";
+}
+.icon-kanjiachenggong:before {
+  content: "\e00b";
+}
+.icon-qrcode:before {
+  content: "\e00c";
+}
+.icon-gonggao:before {
+  content: "\e00d";
+}
+.icon-pintuan2:before {
+  content: "\e00e";
+}
+.icon-shangpin:before {
+  content: "\e00f";
+}
+.icon-right1:before {
+  content: "\e010";
+}
+.icon-sousuo3:before {
+  content: "\e011";
+}
+.icon-tutechan:before {
+  content: "\e012";
+}
+.icon-tuangou:before {
+  content: "\e013";
+}
+.icon-xiangshangzhanhang:before {
+  content: "\e014";
+}
+.icon-yaoqinghaoyou:before {
+  content: "\e015";
+}
+.icon-biaoqing_nanguo:before {
+  content: "\e016";
+}
+.icon-fenxiang4:before {
+  content: "\e017";
+}
+.icon-fold:before {
+  content: "\e018";
+}
+.icon-gantanhao1:before {
+  content: "\e019";
+}
+.icon-icon:before {
+  content: "\e01a";
+}
+.icon-huiyuan:before {
+  content: "\e01b";
+}
+.icon-jian:before {
+  content: "\e01c";
+}
+.icon-pintuanfanli:before {
+  content: "\e01d";
+}
+.icon-jia:before {
+  content: "\e01e";
+}
+.icon-seckill:before {
+  content: "\e01f";
+}
+.icon-wode-tuangou:before {
+  content: "\e020";
+}
+.icon-shuaxin:before {
+  content: "\e021";
+}
+.icon-wodeyushou:before {
+  content: "\e022";
+}
+.icon-youhuiquan1:before {
+  content: "\e023";
+}
+.icon-zhuantihuodong:before {
+  content: "\e024";
+}
+.icon-ziyuan1:before {
+  content: "\e025";
+}
+.icon-yonghu3:before {
+  content: "\e026";
+}
+.icon-caidan:before {
+  content: "\e027";
+}
+.icon-erweima:before {
+  content: "\e028";
+}
+.icon-danxuan-xuanzhong:before {
+  content: "\e029";
+}
+.icon-dingdan2:before {
+  content: "\e02a";
+}
+.icon-sanjiao:before {
+  content: "\e02b";
+}
+.icon-shangpin-:before {
+  content: "\e02c";
+}
+.icon-shouye1:before {
+  content: "\e02d";
+}
+.icon-shangsanjiao-copy:before {
+  content: "\e02e";
+}
+.icon-tedianquanchangbaoyou:before {
+  content: "\e02f";
+}
+.icon-wenhao:before {
+  content: "\e030";
+}
+.icon-weixin1:before {
+  content: "\e031";
+}
+.icon-yue:before {
+  content: "\e032";
+}
+.icon-zhekou:before {
+  content: "\e033";
+}
+.icon-fangkuai-fill:before {
+  content: "\e034";
+}
+.icon-zhibojieshu:before {
+  content: "\e035";
+}
+.icon-gouwuche2:before {
+  content: "\e036";
+}
+.icon-ellipsis:before {
+  content: "\e037";
+}
+.icon-guanzhu:before {
+  content: "\e038";
+}
+.icon-jifen-:before {
+  content: "\e039";
+}
+.icon-dianhua2:before {
+  content: "\e03a";
+}
+.icon-hongbao:before {
+  content: "\e03b";
+}
+.icon-qiandao1:before {
+  content: "\e03c";
+}
+.icon-jifen2:before {
+  content: "\e03d";
+}
+.icon-jifen3:before {
+  content: "\e03e";
+}
+.icon-fuzhilianjie:before {
+  content: "\e03f";
+}
+.icon-jiahao01:before {
+  content: "\e040";
+}
+.icon-like:before {
+  content: "\e041";
+}
+.icon-likefill:before {
+  content: "\e042";
+}
+.icon-list:before {
+  content: "\e043";
+}
+.icon-right:before {
+  content: "\e044";
+}
+.icon-round-close:before {
+  content: "\e045";
+}
+.icon-shangchuan:before {
+  content: "\e046";
+}
+.icon-tupian:before {
+  content: "\e047";
+}
+.icon-xuanzhuan:before {
+  content: "\e048";
+}
+.icon-add1:before {
+  content: "\e049";
+}
+.icon-weizhi:before {
+  content: "\e04a";
+}
+.icon-close-guanbi:before {
+  content: "\e04b";
+}
+.icon-apps:before {
+  content: "\e04c";
+}
+.icon-biaoqing:before {
+  content: "\e04d";
+}
+.icon-bianji:before {
+  content: "\e04e";
+}
+.icon-cart-on:before {
+  content: "\e04f";
+}
+.icon-close:before {
+  content: "\e050";
+}
+.icon-checkboxblank:before {
+  content: "\e051";
+}
+.icon-dianzan:before {
+  content: "\e052";
+}
+.icon-dingwei1:before {
+  content: "\e053";
+}
+.icon-iconangledown:before {
+  content: "\e055";
+}
+.icon-dizhi:before {
+  content: "\e056";
+}
+.icon-shouji:before {
+  content: "\e058";
+}
+.icon-icon7:before {
+  content: "\e059";
+}
+.icon-iconangledown-copy:before {
+  content: "\e05a";
+}
+.icon-youhuiquan:before {
+  content: "\e05c";
+}
+.icon-ziyuan:before {
+  content: "\e05d";
+}
+.icon-zhaoxiangji:before {
+  content: "\e05e";
+}
+.icon-yuan_checkbox:before {
+  content: "\e05f";
+}
+.icon-back_light:before {
+  content: "\e060";
+}
+.icon-yuan_checked:before {
+  content: "\e061";
+}
+.icon-bangzhu:before {
+  content: "\e062";
+}
+.icon-delete:before {
+  content: "\e064";
+}
+.icon-dianzan1:before {
+  content: "\e065";
+}
+.icon-dianpu:before {
+  content: "\e066";
+}
+.icon-mendian:before {
+  content: "\e067";
+}
+.icon-shaixuan:before {
+  content: "\e069";
+}
+.icon-shijian:before {
+  content: "\e06a";
+}
+.icon-shijian1:before {
+  content: "\e06b";
+}
+.icon-sousuo:before {
+  content: "\e06c";
+}
+.icon-shezhi:before {
+  content: "\e06d";
+}
+.icon-dianhua:before {
+  content: "\e06e";
+}
+.icon-dui:before {
+  content: "\e06f";
+}
+.icon-yaoqing:before {
+  content: "\e070";
+}
+.icon-zhongchaping:before {
+  content: "\e071";
+}
+.icon-fenxiang:before {
+  content: "\e072";
+}
+.icon-fuzhi:before {
+  content: "\e073";
+}
+.icon-hexiao:before {
+  content: "\e074";
+}
+.icon-share:before {
+  content: "\e075";
+}
+.icon-haoping1:before {
+  content: "\e076";
+}
+.icon-gouwuche:before {
+  content: "\e077";
+}
+.icon-share-friend:before {
+  content: "\e078";
+}
+.icon-jiang-copy:before {
+  content: "\e079";
+}
+.icon-location:before {
+  content: "\e07a";
+}
+.icon-jianshao:before {
+  content: "\e07b";
+}
+.icon-guanbi:before {
+  content: "\e07c";
+}
+.icon-gz:before {
+  content: "\e07d";
+}
+.icon-haowuquan:before {
+  content: "\e07e";
+}
+.icon-search:before {
+  content: "\e07f";
+}
+.icon-jilu:before {
+  content: "\e080";
+}
+.icon-pengyouquan:before {
+  content: "\e081";
+}
+.icon-saoma:before {
+  content: "\e083";
+}
+.icon-shouji1:before {
+  content: "\e084";
+}
+.icon-shurutianxiebi:before {
+  content: "\e085";
+}
+.icon-tiaoxingmasaomiao:before {
+  content: "\e087";
+}
+.icon-shuru:before {
+  content: "\e088";
+}
+.icon-unfold:before {
+  content: "\e089";
+}
+.icon-dianhua1:before {
+  content: "\e08a";
+}
+.icon-weixin:before {
+  content: "\e08b";
+}
+.icon-yonghu:before {
+  content: "\e08c";
+}
+.icon-bangzhu1:before {
+  content: "\e08d";
+}
+.icon-zhifubaozhifu-:before {
+  content: "\e08e";
+}
+.icon-add-fill:before {
+  content: "\e08f";
+}
+.icon-zhibozhong:before {
+  content: "\e090";
+}
+.icon-warn:before {
+  content: "\e091";
+}
+.icon-suoding:before {
+  content: "\e092";
+}
+.icon-wenxiao:before {
+  content: "\e093";
+}
+.icon-baixingbeng:before {
+  content: "\e094";
+}
+.icon-fenxiao:before {
+  content: "\e095";
+}
+.icon-huodongtuiyan:before {
+  content: "\e096";
+}
+.icon-dingwei:before {
+  content: "\e097";
+}
+.icon-fukuanma:before {
+  content: "\e098";
+}
+.icon-saomafu:before {
+  content: "\e099";
+}
+.icon-zhifu:before {
+  content: "\e09a";
+}
+.icon-shuqing:before {
+  content: "\e09b";
+}
+.icon-yuezhifu:before {
+  content: "\e09c";
 }
\ No newline at end of file
diff --git a/common/css/order_parment.scss b/common/css/order_parment.scss
index 0f1bc27..a6db8a2 100644
--- a/common/css/order_parment.scss
+++ b/common/css/order_parment.scss
@@ -1,1452 +1,1462 @@
-@mixin wrap {
-	margin: 20rpx 24rpx 0;
-	background: #fff;
-	padding: 30rpx 24rpx;
-	border-radius: 16rpx;
-}
-
-$margin-both: 24rpx;
-
-input,
-view {
-	font-size: $font-size-tag;
-}
-
-.font-bold {
-	font-weight: bold;
-}
-
-.order-container {
-	width: 100vw;
-	height: 100vh;
-	display: flex;
-	flex-direction: column;
-	background: linear-gradient(180deg, $base-color 10%, $color-bg 100%);
-	background-size: 100% 260rpx;
-	background-repeat: no-repeat;
-
-	// #ifdef MP-WEIXIN
-	background-size: 100% 380rpx;
-	// #endif
-
-	.order-scroll-container {
-		width: 100%;
-		height: 0;
-		flex: 1;
-	}
-
-	// #ifdef H5
-	.payment-navbar-block {
-		height: 60rpx;
-	}
-	// #endif
-}
-
-.payment-navbar {
-	width: 100vw;
-	padding-bottom: 20rpx;
-	position: fixed;
-	left: 0;
-	top: 0;
-	z-index: 100;
-	background: linear-gradient(180deg, $base-color 10%, $color-bg 100%);
-	background-size: 100% 260rpx;
-
-	// #ifdef MP-WEIXIN
-	background-size: 100% 380rpx;
-	// #endif
-
-	.nav-wrap {
-		width: 100%;
-		height: 100%;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		box-sizing: border-box;
-		position: relative;
-	}
-
-	.navbar-title {
-		color: #fff;
-		font-size: 32rpx;
-	}
-
-	.icon-back_light {
-		color: #fff;
-		position: absolute;
-		left: 24rpx;
-		font-size: 40rpx;
-	}
-}
-
-.payment-navbar-block {
-	padding-bottom: 20rpx;
-}
-
-.mobile-wrap {
-	@include wrap;
-	.tips {
-		font-size: $font-size-goods-tag;
-		margin-bottom: 30rpx;
-		background: var(--main-color-shallow);
-		border-radius: $border-radius;
-		padding: 20rpx 30rpx;
-		line-height: 1;
-		display: flex;
-		align-items: center;
-		.iconfont{
-			margin-right: 5rpx;
-		}
-	}
-	&.local-mobile{
-		border-bottom: 2rpx solid #F4F4F6;
-		margin: 0;
-	}
-	&.store-mobile{
-		border-top: 2rpx solid #F4F4F6;
-		margin: 20rpx 0 0 0;
-		padding: 20rpx 0;
-		border-radius: 0;
-	}
-	.form-group {
-		display: flex;
-		align-items: center;
-		width: 100%;
-		.iconfont {
-			margin-right: 26rpx;
-			font-size: $font-size-toolbar;
-		}
-		.text {
-			display: inline-block;
-			line-height: 50rpx;
-			padding-right: 10rpx;
-			font-size: $font-size-base;
-			font-weight: bold;
-		}
-
-		.placeholder {
-			line-height: 50rpx;
-		}
-
-		.input {
-			flex: 1;
-			height: 50rpx;
-			line-height: 50rpx;
-			text-align: right;
-			font-size: $font-size-base;
-		}
-	}
-}
-
-.order-cell {
-	display: flex;
-	margin: 0 0 30rpx 0;
-	align-items: center;
-	background: #fff;
-	line-height: 40rpx;
-	position: relative;
-
-	&.clear-flex {
-		display: block;
-	}
-	&.textarea-box{
-		display: flex;
-		align-items: baseline;
-		font-size: 28rpx;
-
-	}
-	text {
-		font-size: 28rpx;
-	}
-	.tit {
-		text-align: left;
-		font-size: $font-size-base;
-		min-width: 160rpx;
-		color: #000;
-		font-weight: bold;
-		text {
-			font-size: $font-size-base;
-		}
-		.tit-content{
-			max-width: 540rpx;
-			font-size: 24rpx;
-			line-height: 35rpx;
-			margin-bottom: 10rpx;
-		}
-	}
-
-	.box {
-		flex: 1;
-		padding: 0 10rpx;
-		line-height: inherit;
-		text-align: right;
-		&.text-overflow {
-			overflow: hidden;
-			text-overflow: ellipsis;
-			white-space: nowrap;
-			.money {
-				overflow: hidden;
-				max-width: 40%;
-				display: inline-block;
-				text-overflow: ellipsis;
-				vertical-align: top;
-
-			}
-		}
-
-		.icon-right{
-			color: #303133;
-			margin-left: 20rpx;
-		}
-		.operator {
-			font-size: $font-size-tag;
-			margin-right: 6rpx;
-			font-weight: bold;
-			color: var(--price-color);
-		}
-		textarea{
-			width: auto;
-			height: 88rpx;
-			font-size: 28rpx;
-		}
-	}
-
-	.iconfont {
-		color: $color-tip;
-		line-height: initial;
-		font-size: $font-size-tag;
-	}
-
-	.unit {
-		margin-right: 4rpx;
-		font-weight: bold;
-		font-size: 28rpx !important;
-		margin-left: 4rpx;
-		color: var(--price-color);
-	}
-	.money {
-		font-size: 28rpx !important;
-		font-weight: bold;
-		color: var(--price-color);
-	}
-}
-
-.site-wrap {
-	@include wrap;
-	padding: 40rpx 0;
-	.site-header {
-		margin: 0 $margin-both $margin-updown;
-		display: flex;
-		align-items: center;
-	
-		.icon-dianpu {
-			display: inline-block;
-			line-height: 1;
-			margin-right: 12rpx;
-			font-size: 30rpx;
-		}
-	}
-	&.order-goods{
-		padding: 20rpx 0 0 0;
-	}
-	.site-body {
-		margin: 0 $margin-both;
-		.goods-item {
-			border-bottom: 2rpx solid #F4F4F6;
-			&:last-child {
-				border-bottom: 0;
-			}
-
-			.error-tips {
-				color: #ff443f;
-				padding: 10rpx 20rpx;
-				display: inline-flex;
-				align-items: center;
-				line-height: 1;
-				background: #ffecec;
-				margin-top: 20rpx;
-				border-radius: 12rpx;
-				width: auto;
-
-				.iconfont {
-					margin-right: 10rpx;
-				}
-			}
-		}
-		.goods-wrap {
-			display: flex;
-			position: relative;
-			padding: 0rpx 0 10rpx 0;
-
-			.goods-img {
-				width: 180rpx;
-				height: 180rpx;
-				margin-right: 20rpx;
-				border-radius: $border-radius;
-				overflow: hidden;
-				image {
-					width: 100%;
-					height: 100%;
-					border-radius: $border-radius;
-				}
-			}
-
-			.goods-info {
-				flex: 1;
-				position: relative;
-				width: 0;
-				margin-top: -4rpx;
-				display: flex;
-				flex-direction: column;
-				justify-content: space-between;
-
-				.goods-name {
-					display: -webkit-box;
-					-webkit-box-orient: vertical;
-					-webkit-line-clamp: 2;
-					overflow: hidden;
-					line-height: 1.5;
-					font-size: $font-size-base;
-					font-weight: bold;
-				}
-
-				.sku {
-					display: flex;
-					line-height: 1;
-					margin-top: 8rpx;
-
-					.goods-spec {
-						color: $color-tip;
-						font-size: $font-size-goods-tag;
-						overflow: hidden;
-						text-overflow: ellipsis;
-						white-space: nowrap;
-						flex: 1;
-						display: flex;
-						view{
-							background-color: #F4F4F4;
-							color: #666666;
-							padding: 6rpx 10rpx;
-							margin-right: 12rpx;
-							line-height: 1;
-						}
-					}
-				}
-
-				.goods-sub-section {
-					.unit {
-						font-size: $font-size-tag;
-						margin-right: 4rpx;
-						font-weight: bold;
-						color: var(--price-color);
-					}
-
-					.goods-price {
-						font-weight: bold;
-						font-size: $font-size-toolbar;
-						color: var(--price-color);
-					}
-
-					view {
-						&:first-of-type {
-							width: 80%;
-							overflow: hidden;
-							text-overflow: ellipsis;
-						}
-
-						&:last-of-type {
-							text-align: right;
-							position: absolute;
-							right: 0;
-							bottom: 0;
-							font-weight: bold;
-						}
-					}
-				}
-			}
-		}
-	}
-
-	.site-footer {
-		margin: 0 $margin-both 0;
-		.order-cell {
-			&:last-of-type {
-				margin-bottom: 0;
-			}
-		}
-	}
-}
-
-/deep/ .goods-form {
-	display: flex;
-	align-items: center;
-	position: relative;
-
-	ns-form {
-		display: flex;
-		width: 100%;
-	}
-
-	.shade {
-		position: absolute;
-		left: 0;
-		top: 0;
-		width: 100%;
-		height: 100%;
-		z-index: 5;
-	}
-
-	.cell-more {
-	    margin-left: 50rpx;
-	    float: right;
-	    color: #909399;
-	    font-size: 24rpx;
-	}
-
-	.form-wrap {
-		flex: 1;
-		width: 0;
-
-		.icon-right {
-			display: none;
-		}
-	}
-	.form-wrap > view, .form-wrap > picker {
-		display: none;
-	}
-	.form-wrap > view:first-child, .form-wrap > picker:first-child {
-		display: block;
-		border-bottom: none;
-
-		.required {
-			display: none;
-		}
-	}
-	.order-cell .name {
-		width: auto;
-	}
-	.order-cell .tit {
-		font-weight: bold;
-	}
-	.order-cell .tit:after {
-		content: "：";
-	}
-}
-
-.member-goods-card {
-	margin-bottom: 0;
-	padding-bottom: 30rpx;
-
-	.text {
-		margin-right: 10rpx;
-		color: #999;
-	}
-
-	.price-font {
-		color: var(--price-color);
-	}
-}
-
-.order-money {
-	@include wrap;
-	.order-cell:last-child {
-		margin-bottom: 0;
-	}
-}
-.error-message{
-	position: fixed;
-	z-index: 5;
-	left: 0;
-	bottom: 100rpx;
-	width: 100vw;
-	background: #f6f6cb;
-	text-align: left;
-	padding: 10rpx 20rpx;
-	color: #FF0000;
-}
-.order-submit {
-	position: fixed;
-	z-index: 5;
-	left: 0;
-	bottom: 0;
-	width: 100vw;
-	height: 100rpx;
-	background: #fff;
-	text-align: right;
-	display: flex;
-	align-items: center;
-	padding-bottom: constant(safe-area-inset-bottom);
-	padding-bottom: env(safe-area-inset-bottom);
-
-	.order-settlement-info {
-		flex: 1;
-		height: 100rpx;
-		line-height: 100rpx;
-		display: flex;
-		padding-left: 30rpx;
-		align-items: baseline;
-		.unit {
-			font-weight: bold;
-			font-size: $font-size-tag;
-			margin-right: 4rpx;
-			color: var(--price-color);
-		}
-		.money {
-			font-weight: bold;
-			font-size: $font-size-toolbar;
-			color: var(--price-color);
-		}
-	}
-
-	.submit-btn {
-		height: 80rpx;
-		margin: 0 30rpx;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		button {
-			line-height: 70rpx;
-			width: 180rpx;
-			height: 70rpx;
-			padding: 0;
-			font-size: $font-size-base;
-			font-weight: bold;
-		}
-		.no-submit{
-			width: unset;
-			background-color: rgb(204, 204, 204);
-			color: #FFFFFF;
-			padding: 0 20rpx;
-			font-size: $font-size-base;
-		}
-	}
-}
-.order-submit-block {
-	height: 120rpx;
-	padding-bottom: constant(safe-area-inset-bottom);
-	padding-bottom: env(safe-area-inset-bottom);
-}
-
-.popup {
-	width: 100vw;
-	background: #fff;
-	border-top-left-radius: 24rpx;
-	border-top-right-radius: 24rpx;
-
-	.popup-header {
-		display: flex;
-		border-bottom: 2rpx solid $color-line;
-		position: relative;
-		padding: 40rpx;
-
-		.tit {
-			flex: 1;
-			font-size: $font-size-toolbar;
-			line-height: 1;
-			text-align: center;
-		}
-		.iconfont {
-			line-height: 1;
-			position: absolute;
-			right: 30rpx;
-			top: 50%;
-			transform: translate(0, -50%);
-			color: $color-tip;
-			font-size: $font-size-toolbar;
-		}
-	}
-
-	.popup-body {
-		height: calc(100% - 250rpx);
-		&.store-popup {
-			height: calc(100% - 120rpx);
-		}
-		&.safe-area {
-			height: calc(100% - 270rpx);
-		}
-		&.store-popup.safe-area {
-			height: calc(100% - 140rpx);
-		}
-	}
-
-	.popup-footer {
-		height: 120rpx;
-
-		.confirm-btn {
-			height: 80rpx;
-			line-height: 80rpx;
-			color: #fff;
-			text-align: center;
-			margin: 20rpx 32rpx 40rpx;
-			border-radius: $border-radius;
-			font-size: $font-size-base;
-			&.color-base-bg{
-				color: var(--btn-text-color);
-			}
-		}
-
-		&.bottom-safe-area {
-			padding-bottom: constant(safe-area-inset-bottom);
-			padding-bottom: env(safe-area-inset-bottom);
-		}
-	}
-}
-
-.invoice-popup {
-	height: 83vh;
-	padding: 18rpx 0;
-	box-sizing: border-box;
-	position: relative;
-
-	.invoice-close {
-		position: absolute;
-		line-height: 1;
-		top: 48rpx;
-		right: 48rpx;
-		font-size: $font-size-toolbar;
-		z-index: 9;
-	}
-	.popup-body {
-		.invoice-cell {
-			padding: 30rpx 0;
-			border-top: 2rpx solid $color-line;
-			margin: 0 48rpx;
-
-			&:first-of-type {
-				border-top: none;
-			}
-
-			.tit {
-				font-size: $font-size-base;
-			}
-
-			.option-grpup {
-				padding-top: 20rpx;
-
-				.option-item {
-					height: 54rpx;
-					line-height: 54rpx;
-					display: inline-block;
-					font-size: $font-size-goods-tag;
-					padding: 0 36rpx;
-					background: $color-bg;
-					border: 2rpx solid $color-line;
-					border-radius: $border-radius;
-					margin-right: 30rpx;
-
-					&.active {
-						color: var(--btn-text-color);
-					}
-					&.content {
-						margin-bottom: 20rpx;
-						&:last-child {
-							margin-bottom: 0;
-						}
-					}
-				}
-			}
-
-			.invoice-form-group {
-				input {
-					background: $color-bg;
-					border-radius: 10rpx;
-					height: 66rpx;
-					margin-top: 22rpx;
-					padding: 0 32rpx;
-					font-size: $font-size-tag;
-				}
-			}
-		}
-		.invoice-tops {
-			font-size: $font-size-activity-tag;
-			margin: 0 48rpx;
-			color: $color-tip;
-		}
-	}
-}
-
-
-.buyermessag-popup {
-	box-sizing: border-box;
-	position: relative;
-
-	.buyermessag-close {
-		position: absolute;
-		line-height: 1;
-		top: 48rpx;
-		right: 48rpx;
-		font-size: $font-size-toolbar;
-		z-index: 9;
-	}
-	.popup-body {
-		.buyermessag-cell {
-			padding: 30rpx 0;
-			border-top: 2rpx solid $color-line;
-			margin: 0 32rpx;
-
-			&:first-of-type {
-				border-top: none;
-			}
-			.buyermessag-form-group{
-				textarea{
-					display: flex;
-					align-items: baseline;
-					font-size: 28rpx;
-					width: 100%;
-					background-color: $color-bg;
-					padding: 20rpx;
-					box-sizing: border-box;
-					border-radius: 10rpx;
-				}
-			}
-
-		}
-
-	}
-}
-
-.coupon-popup {
-	height: 65vh;
-
-	.popup-body {
-		background: #fff;
-	}
-	.coupon-empty{
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		height: 100%;
-		color: #909399 !important;
-	}
-	.coupon-item {
-		@include wrap;
-		margin: $margin-updown 32rpx 0;
-		padding: 0;
-		position: relative;
-		background-color: #fff2f0;
-		&:before,
-		&:after {
-			position: absolute;
-			content: '';
-			background-color: #fff;
-			top: 50%;
-			width: 30rpx;
-			height: 30rpx;
-			border-radius: 50%;
-			z-index: 5;
-		}
-		&:before {
-			left: 0;
-			transform: translate(-50%, -50%);
-		}
-		&:after {
-			right: 0;
-			transform: translate(50%, -50%);
-		}
-
-		.coupon-info {
-			height: 190rpx;
-			display: flex;
-			width: 100%;
-			position: relative;
-
-			.info-wrap {
-				width: 220rpx;
-				height: 190rpx;
-				display: flex;
-				justify-content: center;
-				align-items: center;
-				margin-right: 20rpx;
-				background-repeat: no-repeat;
-				background-size: 100% 100%;
-				position: relative;
-				background: linear-gradient(to left, var(--bg-color), var(--bg-color-shallow));
-				.coupon-line{
-					position: absolute;
-					right: 0;
-					top: 0;
-					height: 100%;
-				}
-				.coupon-money {
-					color: #fff;
-					text-align: center;
-					line-height: 1;
-					.unit {
-						font-size: 30rpx;
-					}
-					.money {
-						font-size: 60rpx;
-					}
-				}
-				.at-least {
-					font-size: $font-size-tag;
-					color: #fff;
-					text-align: center;
-					margin-top: 20rpx;
-				}
-			}
-
-			.desc-wrap {
-				flex: 1;
-				max-width: calc(100% - 360rpx);
-
-				view {
-					white-space: nowrap;
-					overflow: hidden;
-					text-overflow: ellipsis;
-				}
-
-				.coupon-name {
-					margin-top: 10rpx;
-					margin-bottom: 4rpx;
-					font-size: $font-size-base;
-				}
-				.limit {
-					font-size: $font-size-activity-tag;
-				}
-				.time {
-					border-top: 2rpx dashed $color-disabled;
-					position: absolute;
-					bottom: 30rpx;
-					color: $color-tip;
-					padding-top: 10rpx;
-					line-height: 1.5;
-					font-size: $font-size-activity-tag;
-				}
-			}
-
-			.iconfont {
-				font-size: 44rpx;
-				position: absolute;
-				top: 50%;
-				right: 20rpx;
-				transform: translate(-50%, -50%);
-			}
-			.icon-yuan_checkbox {
-				color: $color-tip;
-			}
-		}
-	}
-}
-
-.promotion-popup {
-	height: 40vh;
-
-	.order-cell {
-		margin: 30rpx 30rpx;
-
-		.tit {
-			width: auto;
-			min-width: unset;
-		}
-
-		.promotion-mark {
-			padding: 4rpx 10rpx;
-			line-height: 1;
-			border-radius: $border-radius;
-			font-size: $font-size-tag;
-			margin-right: 10rpx;
-			color: var(--main-color);
-			background-color: var(--main-color-shallow);
-		}
-	}
-}
-
-.delivery-popup {
-	height: 80vh;
-	box-sizing: border-box;
-
-	.delivery-content {
-		height: 100%;
-		overflow-y: scroll;
-		padding: 30rpx 0;
-		box-sizing: border-box;
-
-		.item-wrap {
-			padding: 20rpx 0;
-			box-sizing: border-box;
-			border-top: 2rpx solid $color-line;
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-			margin: 0 48rpx;
-			.detail {
-				width: 90%;
-				.name {
-					display: flex;
-					text {
-						font-size: $font-size-base;
-					}
-				}
-				.info {
-					line-height: 1.2;
-					view {
-						font-size: $font-size-tag;
-					}
-				}
-			}
-
-			.icon {
-				flex: 1;
-				text-align: right;
-				max-height: 50rpx;
-				.iconfont {
-					line-height: 1;
-					font-size: 44rpx;
-				}
-			}
-
-			&:first-of-type {
-				padding-top: 0;
-				border-top: none;
-			}
-		}
-		.empty {
-			text-align: center;
-			font-size: $font-size-tag;
-		}
-	}
-}
-
-.balance-switch {
-	transform: scale(0.8);
-}
-
-// 收货地址
-.address-box {
-	margin: 0 24rpx 0;
-	background-color: #fff;
-	position: relative;
-	overflow: hidden;
-	border-bottom-left-radius: 16rpx;
-	border-bottom-right-radius: 16rpx;
-	padding: 30rpx 24rpx;
-
-	&.not-delivery-type {
-		border-radius: 16rpx;
-	}
-
-	.address-line{
-		position: absolute;
-		bottom: 0rpx;
-		left: 0;
-		width: 100%;
-		height: 6rpx;
-	}
-	.info-wrap {
-		display: flex;
-		align-items: center;
-
-		&.local {
-			padding-bottom: 20rpx;
-		}
-		.content {
-			flex: 1;
-			.name {
-				margin-right: 10rpx;
-				font-weight: bold;
-				font-size: 28rpx;
-			}
-			.mobile {
-				font-weight: bold;
-				font-size: 28rpx;
-			}
-		}
-		.desc-wrap {
-			word-break: break-word;
-			font-size: 26rpx;
-			color: #666;
-		}
-	}
-	.icon-wrap {
-		width: 24rpx;
-		height: 42rpx;
-		position: relative;
-		margin-right: 26rpx;
-		align-self: flex-start;
-		padding-top: 6rpx;
-		&.empty{
-			padding-top: 0;
-		}
-		.iconfont {
-			font-size: $font-size-toolbar;
-			display: inline-block;
-			vertical-align: middle;
-		}
-	}
-	.empty-wrap {
-		height: 80rpx;
-		line-height: 80rpx;
-		display: flex;
-		align-items: center;
-
-		.info {
-			flex: 1;
-			font-size: $font-size-base;
-		}
-	}
-	.cell-more {
-		margin-left: 50rpx;
-		float: right;
-		color: $color-tip;
-		font-size: $font-size-tag;
-		.iconfont{
-			color: $color-tip;
-		}
-	}
-	.local-delivery-store {
-		display: flex;
-		align-items: center;
-		padding-bottom: 20rpx;
-		margin-bottom: 20rpx;
-		border-bottom: 2rpx solid #eeeeee;
-
-		.info {
-			flex: 1;
-			width: 0;
-			font-size: 28rpx;
-		}
-		.store-name {
-			color: $base-color;
-			margin: 0 10rpx;
-		}
-		.cell-more {
-			font-size: 28rpx;
-			display: flex;
-			align-items: center;
-		}
-		.icon-right {
-			float: right;
-			color: #909399;
-			font-size: 24rpx
-		}
-	}
-}
-
-// 外卖配送
-.local-box {
-	border-top: 2rpx solid $color-line;
-	.order-cell {
-		padding-top: 30rpx;
-		margin-bottom: 0;
-
-		.box {
-			padding: 0;
-		}
-	}
-	.pick-block {
-		padding-top: 20rpx;
-		display: flex;
-		align-items: center;
-
-		> view {
-			flex: 1;
-		}
-		.title {
-			font-weight: bold;
-		}
-
-		.time-picker {
-			display: flex;
-			align-items: center;
-			justify-content: flex-end;
-			.cell-more {
-				float: right;
-				margin-left: 10rpx;
-				color: $color-tip;
-				font-size: $font-size-tag;
-				.iconfont{
-					color: $color-tip;
-				}
-			}
-			text {
-				white-space: nowrap;
-			}
-		}
-	}
-}
-
-// 配送方式
-.delivery-mode {
-	margin: 0 24rpx;
-	overflow: hidden;
-	border-top-left-radius: 16rpx;
-	border-top-right-radius: 16rpx;
-	background-color: $base-color;
-
-	.action {
-		display: flex;
-		background: var(--base-color-light-7);
-
-		> view {
-			flex: 1;
-			text-align: center;
-			height: 76rpx;
-			line-height: 76rpx;
-			font-size: 30rpx;
-			color: #000;
-			position: relative;
-
-			&:nth-child(2), &:nth-child(3) {
-				&.active {
-					border-top-left-radius: 16rpx;
-				}
-			}
-
-			.out-radio:after,.out-radio:before {
-				position: absolute;
-				content: "";
-				width: 20rpx;
-				height: 20rpx;
-				background-color: #fff;
-				bottom: 0px;
-				display: none;
-			}
-
-			.out-radio:after {
-				transform: translateX(100%);
-				right: 0;
-			}
-			.out-radio:before {
-				left: 0;
-				transform: translateX(-100%);
-			}
-		}
-
-		.active {
-			background: #fff;
-			color: $base-color;
-			border-top-right-radius: 16rpx;
-
-			&:after, &:before {
-				position: absolute;
-				content: "";
-				width: 40rpx;
-				height: 40rpx;
-				background-color: var(--base-color-light-7);
-				bottom: 0px;
-				transform: translateX(100%);
-				border-radius: 50%;
-				z-index: 5;
-			}
-			&:after{
-				transform: translateX(100%);
-				right: 0;
-			}
-			&:before {
-				left: 0;
-				transform: translateX(-100%);
-			}
-			.out-radio:after,.out-radio:before {
-				display: block;
-			}
-		}
-	}
-}
-
-// 门店自提
-.store-box {
-	position: relative;
-	padding: 30rpx 24rpx;
-	margin: 0 24rpx 0;
-	background-color: #fff;
-	border-bottom-left-radius: 16rpx;
-	border-bottom-right-radius: 16rpx;
-	overflow: hidden;
-
-	&.not-delivery-type {
-		border-radius: 16rpx;
-	}
-
-	.address-line{
-	    position: absolute;
-	    bottom: 0px;
-	    left: 0;
-	    width: 100%;
-	    height: 6rpx;
-	}
-	.store-info {
-		display: flex;
-		align-items: baseline;
-		.icon {
-			position: relative;
-			margin-right: 12rpx;
-			align-self: flex-start;
-			margin-top: -2rpx;
-			&.img {
-				background-color: unset;
-				margin-right: 8rpx;
-				width: 46rpx;
-				height: 46rpx;
-				border-radius: 50%;
-				margin-top: 12rpx;
-				image {
-					width: 100%;
-					height: 100%;
-				}
-			}
-			.iconfont {
-				font-size: $font-size-toolbar;
-			}
-		}
-		.store-address-info{
-			width: 100%;
-			display: flex;
-			align-items: center;
-			.info-wrap {
-				flex: 1;
-				width: 0;
-				.title {
-					margin-bottom: 10rpx;
-					font-size: $font-size-base;
-					font-weight: bold;
-					.cell-more {
-						float: right;
-						margin-left: 50rpx;
-						color: $color-tip;
-						font-size: 24rpx;
-						font-weight: 500;
-					}
-				}
-				.store-detail view {
-					word-break: break-word;
-					font-size: 26rpx;
-				}
-				.store-detail{
-					.address{
-						color: $color-sub;
-						width: 100%;
-						overflow:hidden;
-						white-space: nowrap;
-						text-overflow: ellipsis;
-						-o-text-overflow:ellipsis;
-					}
-				}
-			}
-			.cell-more{
-				color: $color-tip;
-			}
-		}
-
-	}
-
-	.empty {
-		text-align: center;
-	}
-	.store-time{
-		border-top:2rpx solid #F4F4F6;
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		padding: 20rpx 0 0;
-		box-sizing: border-box;
-		view{
-			font-size: 28rpx;
-		}
-		.left {
-			font-weight: bold;
-		}
-		.right{
-			display: flex;
-			align-items: center;
-			line-height: 1;
-			font-size: 24rpx;
-			.iconfont{
-				font-size: 24rpx;
-				margin-left: 14rpx;
-				color: #909399;
-			}
-		}
-	}
-}
-
-.buyer-message {
-	padding: 30rpx 24rpx;
-
-	.order-cell {
-		margin-bottom: 0;
-	}
-}
-
-.member-card-wrap {
-	background-color: #FFFBF4;
-	padding: 0 30rpx!important;
-
-	.head {
-		display: flex;
-		align-items: center;
-		height: 80rpx;
-	}
-
-	.icon-yuan_checked,.icon-yuan_checkbox {
-		font-size: 32rpx;
-	}
-
-	.icon-huiyuan {
-		margin-right: 10rpx;
-		line-height: 1;
-		font-size: 36rpx;
-		background-image:linear-gradient(156deg, #814635 0%, #3A221B 100%);
-		-webkit-background-clip:text;
-		-webkit-text-fill-color:transparent;
-	}
-
-	.info{
-		text-align: left;
-		flex: 1;
-		color: #e5ce75;
-		font-size: $font-size-tag;
-		color: #333;
-	}
-
-	.body {
-		display: flex;
-		overflow-x: scroll;
-		padding: 10rpx 0 20rpx 0;
-
-		.item {
-			padding: 20rpx 0 30rpx 0;
-			width: calc((100% - 60rpx) / 4);
-			text-align: center;
-			background: #fff;
-			margin-right: 20rpx;
-			border: 4rpx solid #fff;
-			border-radius: 10rpx;
-			position: relative;
-			overflow: hidden;
-
-			.icon-icon {
-				position: absolute;
-				right: 0;
-				bottom: 0;
-				font-size: 32rpx;
-				display: none;
-				line-height: 1;
-			}
-			&:last-child{
-				margin-right: 0;
-			}
-
-			.title {
-				margin-top: 20rpx;
-				font-weight: bold;
-			}
-
-			.price {
-				margin-top: 10rpx;
-			}
-		}
-
-		.active .icon-icon {
-			display: block;
-		}
-	}
-}
-
-.system-form-wrap {
-	@include wrap;
-	padding: 0;
-	overflow: hidden;
-
-	.order-cell {
-		padding: 30rpx 24rpx;
-		margin-bottom: 0;
-		border-bottom: 2rpx solid #F4F4F6;
-	}
-
-	/deep/ .form-wrap {
-		margin: 0 24rpx;
-
-		.icon-right {
-			color: #909399;
-			font-size: 24rpx;
-		}
-	}
-}
-
-.agreement {
-	margin: 20rpx $margin-both 0;
-
-	text {
-		color: $base-color;
-	}
-}
-
-.agreement-conten-box {
-	background: #fff;
-	padding:30rpx 30rpx;
-
-	.title {
-		text-align: center;
-		margin-bottom: 20rpx;
-		font-weight: bolder;
-	}
-	.close {
-		position: absolute;
-		right: 30rpx;
-		top: 10rpx;
-	}
-	.con {
-		height: 60vh;
-	}
-}
-.icon{
-	line-height: 1;
-	margin-right: 14rpx;
-	max-height: 50rpx;
-}
-.icon image{
-	width: 38rpx;
-	margin: -6rpx auto;
-	max-height: 50rpx;
-}
-
-.form-popup {
-	height: 60vh!important;
-	.popup-body {
-		padding: 20rpx 30rpx;
-		box-sizing: border-box;
-	}
-}
-
-.member-card-popup {
-  height: 60vh;
-
-  .popup-body {
-    .card-item {
-      display: flex;
-      padding: 30rpx;
-      background: var(--base-color-light-9);
-      margin: 24rpx 20rpx;
-      border-radius: 18rpx;
-
-      .content {
-        flex: 1;
-        width: 0;
-        margin-right: 30rpx;
-
-        .title {
-          line-height: 40rpx;
-          font-size: 28rpx;
-          font-weight: 600;
-        }
-
-        .info text {
-          line-height: 1;
-          font-size: 24rpx;
-          color: #666666;
-          margin-top: 20rpx;
-          margin-right: 8rpx;
-          display: inline-block;
-        }
-      }
-
-      .iconfont {
-        font-size: 44rpx;
-      }
-      .icon-yuan_checkbox {
-        color: $color-tip;
-      }
-    }
-  }
+@mixin wrap {
+	margin: 20rpx 24rpx 0;
+	background: #fff;
+	padding: 30rpx 24rpx;
+	border-radius: 16rpx;
+}
+
+$margin-both: 24rpx;
+
+/deep/ input,
+/deep/ view {
+	font-size: $font-size-tag;
+}
+
+.font-bold {
+	font-weight: bold;
+}
+
+.order-container {
+	width: 100vw;
+	height: 100vh;
+	display: flex;
+	flex-direction: column;
+	background: linear-gradient(180deg, $base-color 10%, $color-bg 100%);
+	background-size: 100% 260rpx;
+	background-repeat: no-repeat;
+
+	// #ifdef MP-WEIXIN
+	background-size: 100% 380rpx;
+	// #endif
+
+	.order-scroll-container {
+		width: 100%;
+		height: 0;
+		flex: 1;
+	}
+
+	// #ifdef H5
+	.payment-navbar-block {
+		height: 60rpx;
+	}
+	// #endif
+}
+
+.payment-navbar {
+	width: 100vw;
+	padding-bottom: 20rpx;
+	position: fixed;
+	left: 0;
+	top: 0;
+	z-index: 100;
+	background: linear-gradient(180deg, $base-color 10%, $color-bg 100%);
+	background-size: 100% 260rpx;
+
+	// #ifdef MP-WEIXIN
+	background-size: 100% 380rpx;
+	// #endif
+
+	.nav-wrap {
+		width: 100%;
+		height: 100%;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		box-sizing: border-box;
+		position: relative;
+	}
+
+	.navbar-title {
+		color: #fff;
+		font-size: 32rpx;
+	}
+
+	.icon-back_light {
+		color: #fff;
+		position: absolute;
+		left: 24rpx;
+		font-size: 40rpx;
+	}
+}
+
+.payment-navbar-block {
+	padding-bottom: 20rpx;
+}
+
+.mobile-wrap {
+	@include wrap;
+	.tips {
+		font-size: $font-size-goods-tag;
+		margin-bottom: 30rpx;
+		background: var(--main-color-shallow);
+		border-radius: $border-radius;
+		padding: 20rpx 30rpx;
+		line-height: 1;
+		display: flex;
+		align-items: center;
+		.iconfont{
+			margin-right: 5rpx;
+		}
+	}
+	&.local-mobile{
+		border-bottom: 2rpx solid #F4F4F6;
+		margin: 0;
+	}
+	&.store-mobile{
+		border-top: 2rpx solid #F4F4F6;
+		margin: 20rpx 0 0 0;
+		padding: 20rpx 0;
+		border-radius: 0;
+	}
+	.form-group {
+		display: flex;
+		align-items: center;
+		width: 100%;
+		.iconfont {
+			margin-right: 26rpx;
+			font-size: $font-size-toolbar;
+		}
+		.text {
+			display: inline-block;
+			line-height: 50rpx;
+			padding-right: 10rpx;
+			font-size: $font-size-base;
+			font-weight: bold;
+		}
+
+		.placeholder {
+			line-height: 50rpx;
+		}
+
+		.input {
+			flex: 1;
+			height: 50rpx;
+			line-height: 50rpx;
+			text-align: right;
+			font-size: $font-size-base;
+		}
+	}
+}
+
+.order-cell {
+	display: flex;
+	margin: 0 0 30rpx 0;
+	align-items: center;
+	background: #fff;
+	line-height: 40rpx;
+	position: relative;
+
+	&.clear-flex {
+		display: block;
+	}
+	&.textarea-box{
+		display: flex;
+		align-items: baseline;
+		font-size: 28rpx;
+
+	}
+	text {
+		font-size: 28rpx;
+	}
+	.tit {
+		text-align: left;
+		font-size: $font-size-base;
+		min-width: 160rpx;
+		color: #000;
+		font-weight: bold;
+		text {
+			font-size: $font-size-base;
+		}
+		.tit-content{
+			max-width: 540rpx;
+			font-size: 24rpx;
+			line-height: 35rpx;
+			margin-bottom: 10rpx;
+		}
+	}
+
+	.box {
+		flex: 1;
+		padding: 0 10rpx;
+		line-height: inherit;
+		text-align: right;
+		&.text-overflow {
+			overflow: hidden;
+			text-overflow: ellipsis;
+			white-space: nowrap;
+			.money {
+				overflow: hidden;
+				max-width: 40%;
+				display: inline-block;
+				text-overflow: ellipsis;
+				vertical-align: top;
+
+			}
+		}
+
+		.icon-right{
+			color: #303133;
+			margin-left: 20rpx;
+		}
+		.operator {
+			font-size: $font-size-tag;
+			margin-right: 6rpx;
+			font-weight: bold;
+			color: var(--price-color);
+		}
+		textarea{
+			width: auto;
+			height: 88rpx;
+			font-size: 28rpx;
+		}
+	}
+
+	.iconfont {
+		color: $color-tip;
+		line-height: initial;
+		font-size: $font-size-tag;
+	}
+
+	.unit {
+		margin-right: 4rpx;
+		font-weight: bold;
+		font-size: 28rpx !important;
+		margin-left: 4rpx;
+		color: var(--price-color);
+	}
+	.money {
+		font-size: 28rpx !important;
+		font-weight: bold;
+		color: var(--price-color);
+	}
+}
+
+.site-wrap {
+	@include wrap;
+	padding: 40rpx 0;
+	.site-header {
+		margin: 0 $margin-both $margin-updown;
+		display: flex;
+		align-items: center;
+	
+		.icon-dianpu {
+			display: inline-block;
+			line-height: 1;
+			margin-right: 12rpx;
+			font-size: 30rpx;
+		}
+	}
+	&.order-goods{
+		padding: 20rpx 0 0 0;
+	}
+	.site-body {
+		margin: 0 $margin-both;
+		.goods-item {
+			border-bottom: 2rpx solid #F4F4F6;
+			&:last-child {
+				border-bottom: 0;
+			}
+
+			.error-tips {
+				color: #ff443f;
+				padding: 10rpx 20rpx;
+				display: inline-flex;
+				align-items: center;
+				line-height: 1;
+				background: #ffecec;
+				margin-top: 20rpx;
+				border-radius: 12rpx;
+				width: auto;
+
+				.iconfont {
+					margin-right: 10rpx;
+				}
+			}
+		}
+		.goods-wrap {
+			display: flex;
+			position: relative;
+			padding: 30rpx 0;
+
+			.goods-img {
+				width: 180rpx;
+				height: 180rpx;
+				margin-right: 20rpx;
+				border-radius: $border-radius;
+				overflow: hidden;
+				image {
+					width: 100%;
+					height: 100%;
+					border-radius: $border-radius;
+				}
+			}
+
+			.goods-info {
+				flex: 1;
+				position: relative;
+				width: 0;
+				margin-top: -4rpx;
+				display: flex;
+				flex-direction: column;
+				justify-content: space-between;
+
+				.goods-name {
+					display: -webkit-box;
+					-webkit-box-orient: vertical;
+					-webkit-line-clamp: 2;
+					overflow: hidden;
+					line-height: 1.5;
+					font-size: $font-size-base;
+					font-weight: bold;
+				}
+
+				.sku {
+					display: flex;
+					line-height: 1;
+					margin-top: 8rpx;
+
+					.goods-spec {
+						color: $color-tip;
+						font-size: $font-size-goods-tag;
+						overflow: hidden;
+						text-overflow: ellipsis;
+						white-space: nowrap;
+						flex: 1;
+						display: flex;
+						view{
+							background-color: #F4F4F4;
+							color: #666666;
+							padding: 6rpx 10rpx;
+							margin-right: 12rpx;
+							line-height: 1;
+						}
+					}
+				}
+
+				.goods-sub-section {
+					.unit {
+						font-size: $font-size-tag;
+						margin-right: 4rpx;
+						font-weight: bold;
+						color: var(--price-color);
+					}
+
+					.goods-price {
+						font-weight: bold;
+						font-size: $font-size-toolbar;
+						color: var(--price-color);
+					}
+
+					view {
+						&:first-of-type {
+							width: 80%;
+							overflow: hidden;
+							text-overflow: ellipsis;
+						}
+
+						&:last-of-type {
+							text-align: right;
+							position: absolute;
+							right: 0;
+							bottom: 0;
+							font-weight: bold;
+						}
+					}
+				}
+			}
+		}
+	}
+
+	.site-footer {
+		margin: 0 $margin-both 0;
+		.order-cell {
+			&:last-of-type {
+				margin-bottom: 0;
+			}
+		}
+	}
+}
+
+/deep/ .goods-form {
+	display: flex;
+	align-items: center;
+	position: relative;
+
+	ns-form {
+		display: flex;
+		width: 100%;
+	}
+
+	.shade {
+		position: absolute;
+		left: 0;
+		top: 0;
+		width: 100%;
+		height: 100%;
+		z-index: 5;
+	}
+
+	.cell-more {
+	    margin-left: 50rpx;
+	    float: right;
+	    color: #909399;
+	    font-size: 24rpx;
+	}
+
+	.form-wrap {
+		flex: 1;
+		width: 0;
+
+		.icon-right {
+			display: none;
+		}
+	}
+	.form-wrap > view, .form-wrap > picker {
+		display: none;
+	}
+	.form-wrap > view:first-child, .form-wrap > picker:first-child {
+		display: block;
+		border-bottom: none;
+
+		.required {
+			display: none;
+		}
+	}
+	.order-cell .name {
+		width: auto;
+	}
+	.order-cell .tit {
+		font-weight: bold;
+	}
+	.order-cell .tit:after {
+		content: "：";
+	}
+}
+
+.member-goods-card {
+	margin-bottom: 0;
+	padding-bottom: 30rpx;
+
+	.text {
+		margin-right: 10rpx;
+		color: #999;
+	}
+
+	.price-font {
+		color: var(--price-color);
+	}
+}
+
+.order-money {
+	@include wrap;
+	.order-cell:last-child {
+		margin-bottom: 0;
+	}
+}
+.error-message{
+	position: fixed;
+	z-index: 5;
+	left: 0;
+	bottom: 100rpx;
+	width: 100vw;
+	background: #f6f6cb;
+	text-align: left;
+	padding: 10rpx 20rpx;
+	color: #FF0000;
+}
+.order-submit {
+	position: fixed;
+	z-index: 5;
+	left: 0;
+	bottom: 0;
+	width: 100vw;
+	height: 100rpx;
+	background: #fff;
+	text-align: right;
+	display: flex;
+	align-items: center;
+	padding-bottom: constant(safe-area-inset-bottom);
+	padding-bottom: env(safe-area-inset-bottom);
+
+	.order-settlement-info {
+		flex: 1;
+		height: 100rpx;
+		line-height: 100rpx;
+		display: flex;
+		padding-left: 30rpx;
+		align-items: baseline;
+		.unit {
+			font-weight: bold;
+			font-size: $font-size-tag;
+			margin-right: 4rpx;
+			color: var(--price-color);
+		}
+		.money {
+			font-weight: bold;
+			font-size: $font-size-toolbar;
+			color: var(--price-color);
+		}
+	}
+
+	.submit-btn {
+		height: 80rpx;
+		margin: 0 30rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		button {
+			line-height: 70rpx;
+			width: 180rpx;
+			height: 70rpx;
+			padding: 0;
+			font-size: $font-size-base;
+			font-weight: bold;
+		}
+		.no-submit{
+			width: unset;
+			background-color: rgb(204, 204, 204);
+			color: #FFFFFF;
+			padding: 0 20rpx;
+			font-size: $font-size-base;
+		}
+	}
+}
+.order-submit-block {
+	height: 120rpx;
+	padding-bottom: constant(safe-area-inset-bottom);
+	padding-bottom: env(safe-area-inset-bottom);
+}
+
+.popup {
+	width: 100vw;
+	background: #fff;
+	border-top-left-radius: 24rpx;
+	border-top-right-radius: 24rpx;
+
+	.popup-header {
+		display: flex;
+		border-bottom: 2rpx solid $color-line;
+		position: relative;
+		padding: 40rpx;
+
+		.tit {
+			flex: 1;
+			font-size: $font-size-toolbar;
+			line-height: 1;
+			text-align: center;
+		}
+		.iconfont {
+			line-height: 1;
+			position: absolute;
+			right: 30rpx;
+			top: 50%;
+			transform: translate(0, -50%);
+			color: $color-tip;
+			font-size: $font-size-toolbar;
+		}
+	}
+
+	.popup-body {
+		height: calc(100% - 250rpx);
+		&.store-popup {
+			height: calc(100% - 120rpx);
+		}
+		&.safe-area {
+			height: calc(100% - 270rpx);
+		}
+		&.store-popup.safe-area {
+			height: calc(100% - 140rpx);
+		}
+	}
+
+	.popup-footer {
+		height: 120rpx;
+
+		.confirm-btn {
+			height: 80rpx;
+			line-height: 80rpx;
+			color: #fff;
+			text-align: center;
+			margin: 20rpx 32rpx 40rpx;
+			border-radius: $border-radius;
+			font-size: $font-size-base;
+			&.color-base-bg{
+				color: var(--btn-text-color);
+			}
+		}
+
+		&.bottom-safe-area {
+			padding-bottom: constant(safe-area-inset-bottom);
+			padding-bottom: env(safe-area-inset-bottom);
+		}
+	}
+}
+
+.invoice-popup {
+	height: 83vh;
+	padding: 18rpx 0;
+	box-sizing: border-box;
+	position: relative;
+
+	.invoice-close {
+		position: absolute;
+		line-height: 1;
+		top: 48rpx;
+		right: 48rpx;
+		font-size: $font-size-toolbar;
+		z-index: 9;
+	}
+	.popup-body {
+		.invoice-cell {
+			padding: 30rpx 0;
+			border-top: 2rpx solid $color-line;
+			margin: 0 48rpx;
+
+			&:first-of-type {
+				border-top: none;
+			}
+
+			.tit {
+				font-size: $font-size-base;
+			}
+
+			.option-grpup {
+				padding-top: 20rpx;
+
+				.option-item {
+					height: 54rpx;
+					line-height: 54rpx;
+					display: inline-block;
+					font-size: $font-size-goods-tag;
+					padding: 0 36rpx;
+					background: $color-bg;
+					border: 2rpx solid $color-line;
+					border-radius: $border-radius;
+					margin-right: 30rpx;
+
+					&.active {
+						color: var(--btn-text-color);
+					}
+					&.content {
+						margin-bottom: 20rpx;
+						&:last-child {
+							margin-bottom: 0;
+						}
+					}
+				}
+			}
+
+			.invoice-form-group {
+				input {
+					background: $color-bg;
+					border-radius: 10rpx;
+					height: 66rpx;
+					margin-top: 22rpx;
+					padding: 0 32rpx;
+					font-size: $font-size-tag;
+				}
+			}
+		}
+		.invoice-tops {
+			font-size: $font-size-activity-tag;
+			margin: 0 48rpx;
+			color: $color-tip;
+		}
+	}
+}
+
+
+.buyermessag-popup {
+	box-sizing: border-box;
+	position: relative;
+
+	.buyermessag-close {
+		position: absolute;
+		line-height: 1;
+		top: 48rpx;
+		right: 48rpx;
+		font-size: $font-size-toolbar;
+		z-index: 9;
+	}
+	.popup-body {
+		.buyermessag-cell {
+			padding: 30rpx 0;
+			border-top: 2rpx solid $color-line;
+			margin: 0 32rpx;
+
+			&:first-of-type {
+				border-top: none;
+			}
+			.buyermessag-form-group{
+				textarea{
+					display: flex;
+					align-items: baseline;
+					font-size: 28rpx;
+					width: 100%;
+					background-color: $color-bg;
+					padding: 20rpx;
+					box-sizing: border-box;
+					border-radius: 10rpx;
+				}
+			}
+
+		}
+
+	}
+}
+
+.coupon-popup {
+	height: 65vh;
+
+	.popup-body {
+		background: #fff;
+	}
+	.coupon-empty{
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		height: 100%;
+		color: #909399 !important;
+	}
+	.coupon-item {
+		@include wrap;
+		margin: $margin-updown 32rpx 0;
+		padding: 0;
+		position: relative;
+		background-color: #fff2f0;
+		&:before,
+		&:after {
+			position: absolute;
+			content: '';
+			background-color: #fff;
+			top: 50%;
+			width: 30rpx;
+			height: 30rpx;
+			border-radius: 50%;
+			z-index: 5;
+		}
+		&:before {
+			left: 0;
+			transform: translate(-50%, -50%);
+		}
+		&:after {
+			right: 0;
+			transform: translate(50%, -50%);
+		}
+
+		.coupon-info {
+			height: 190rpx;
+			display: flex;
+			width: 100%;
+			position: relative;
+
+			.info-wrap {
+				width: 220rpx;
+				height: 190rpx;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				margin-right: 20rpx;
+				background-repeat: no-repeat;
+				background-size: 100% 100%;
+				position: relative;
+				background: linear-gradient(to left, var(--bg-color), var(--bg-color-shallow));
+				.coupon-line{
+					position: absolute;
+					right: 0;
+					top: 0;
+					height: 100%;
+				}
+				.coupon-money {
+					color: #fff;
+					text-align: center;
+					line-height: 1;
+					.unit {
+						font-size: 30rpx;
+					}
+					.money {
+						font-size: 60rpx;
+					}
+				}
+				.at-least {
+					font-size: $font-size-tag;
+					color: #fff;
+					text-align: center;
+					margin-top: 20rpx;
+				}
+			}
+
+			.desc-wrap {
+				flex: 1;
+				max-width: calc(100% - 360rpx);
+
+				view {
+					white-space: nowrap;
+					overflow: hidden;
+					text-overflow: ellipsis;
+				}
+
+				.coupon-name {
+					margin-top: 10rpx;
+					margin-bottom: 4rpx;
+					font-size: $font-size-base;
+				}
+				.limit {
+					font-size: $font-size-activity-tag;
+				}
+				.time {
+					border-top: 2rpx dashed $color-disabled;
+					position: absolute;
+					bottom: 30rpx;
+					color: $color-tip;
+					padding-top: 10rpx;
+					line-height: 1.5;
+					font-size: $font-size-activity-tag;
+				}
+			}
+
+			.iconfont {
+				font-size: 44rpx;
+				position: absolute;
+				top: 50%;
+				right: 20rpx;
+				transform: translate(-50%, -50%);
+			}
+			.icon-yuan_checkbox {
+				color: $color-tip;
+			}
+		}
+	}
+}
+
+.promotion-popup {
+	height: 40vh;
+
+	.order-cell {
+		margin: 30rpx 30rpx;
+
+		.tit {
+			width: auto;
+			min-width: unset;
+		}
+
+		.promotion-mark {
+			padding: 4rpx 10rpx;
+			line-height: 1;
+			border-radius: $border-radius;
+			font-size: $font-size-tag;
+			margin-right: 10rpx;
+			color: var(--main-color);
+			background-color: var(--main-color-shallow);
+		}
+	}
+}
+
+.delivery-popup {
+	height: 80vh;
+	box-sizing: border-box;
+
+	.delivery-content {
+		height: 100%;
+		overflow-y: scroll;
+		padding: 30rpx 0;
+		box-sizing: border-box;
+
+		.item-wrap {
+			padding: 20rpx 0;
+			box-sizing: border-box;
+			border-top: 2rpx solid $color-line;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			margin: 0 48rpx;
+			.detail {
+				width: 90%;
+				.name {
+					display: flex;
+					text {
+						font-size: $font-size-base;
+					}
+				}
+				.info {
+					line-height: 1.2;
+					view {
+						font-size: $font-size-tag;
+					}
+					.close-desc{
+						color:red;
+					}
+				}
+			}
+
+			.icon {
+				flex: 1;
+				text-align: right;
+				max-height: 50rpx;
+				.iconfont {
+					line-height: 1;
+					font-size: 44rpx;
+				}
+			}
+
+			&:first-of-type {
+				padding-top: 0;
+				border-top: none;
+			}
+		}
+		.empty {
+			text-align: center;
+			font-size: $font-size-tag;
+		}
+	}
+}
+
+.balance-switch {
+	transform: scale(0.8);
+}
+
+// 收货地址
+.address-box {
+	margin: 0 24rpx 0;
+	background-color: #fff;
+	position: relative;
+	overflow: hidden;
+	border-bottom-left-radius: 16rpx;
+	border-bottom-right-radius: 16rpx;
+	padding: 30rpx 24rpx;
+
+	&.not-delivery-type {
+		border-radius: 16rpx;
+	}
+
+	.address-line{
+		position: absolute;
+		bottom: 0rpx;
+		left: 0;
+		width: 100%;
+		height: 6rpx;
+	}
+	.info-wrap {
+		display: flex;
+		align-items: center;
+
+		&.local {
+			padding-bottom: 20rpx;
+		}
+		.content {
+			flex: 1;
+			.name {
+				margin-right: 10rpx;
+				font-weight: bold;
+				font-size: 28rpx;
+			}
+			.mobile {
+				font-weight: bold;
+				font-size: 28rpx;
+			}
+		}
+		.desc-wrap {
+			word-break: break-word;
+			font-size: 26rpx;
+			color: #666;
+		}
+	}
+	.icon-wrap {
+		width: 24rpx;
+		height: 42rpx;
+		position: relative;
+		margin-right: 26rpx;
+		align-self: flex-start;
+		padding-top: 6rpx;
+		&.empty{
+			padding-top: 0;
+		}
+		.iconfont {
+			font-size: $font-size-toolbar;
+			display: inline-block;
+			vertical-align: middle;
+		}
+	}
+	.empty-wrap {
+		height: 80rpx;
+		line-height: 80rpx;
+		display: flex;
+		align-items: center;
+
+		.info {
+			flex: 1;
+			font-size: $font-size-base;
+		}
+	}
+	.cell-more {
+		margin-left: 50rpx;
+		float: right;
+		color: $color-tip;
+		font-size: $font-size-tag;
+		.iconfont{
+			color: $color-tip;
+		}
+	}
+	.local-delivery-store {
+		display: flex;
+		align-items: center;
+		padding-bottom: 20rpx;
+		margin-bottom: 20rpx;
+		border-bottom: 2rpx solid #eeeeee;
+
+		.info {
+			flex: 1;
+			width: 0;
+			font-size: 28rpx;
+		}
+		.store-name {
+			color: $base-color;
+			margin: 0 10rpx;
+		}
+		.cell-more {
+			font-size: 28rpx;
+			display: flex;
+			align-items: center;
+		}
+		.icon-right {
+			float: right;
+			color: #909399;
+			font-size: 24rpx
+		}
+	}
+}
+
+// 外卖配送
+.local-box {
+	border-top: 2rpx solid $color-line;
+	.order-cell {
+		padding-top: 30rpx;
+		margin-bottom: 0;
+
+		.box {
+			padding: 0;
+		}
+	}
+	.pick-block {
+		padding-top: 20rpx;
+		display: flex;
+		align-items: center;
+
+		> view {
+			flex: 1;
+		}
+		.title {
+			font-weight: bold;
+		}
+
+		.time-picker {
+			display: flex;
+			align-items: center;
+			justify-content: flex-end;
+			.cell-more {
+				float: right;
+				margin-left: 10rpx;
+				color: $color-tip;
+				font-size: $font-size-tag;
+				.iconfont{
+					color: $color-tip;
+				}
+			}
+			text {
+				white-space: nowrap;
+			}
+		}
+	}
+}
+
+.empty-local{
+	color: #ff443f;
+}
+
+// 配送方式
+.delivery-mode {
+	margin: 0 24rpx;
+	overflow: hidden;
+	border-top-left-radius: 16rpx;
+	border-top-right-radius: 16rpx;
+	background-color: $base-color;
+
+	.action {
+		display: flex;
+		background: var(--base-color-light-7);
+
+		> view {
+			flex: 1;
+			text-align: center;
+			height: 76rpx;
+			line-height: 76rpx;
+			font-size: 30rpx;
+			color: #000;
+			position: relative;
+
+			&:nth-child(2), &:nth-child(3) {
+				&.active {
+					border-top-left-radius: 16rpx;
+				}
+			}
+
+			.out-radio:after,.out-radio:before {
+				position: absolute;
+				content: "";
+				width: 20rpx;
+				height: 20rpx;
+				background-color: #fff;
+				bottom: 0px;
+				display: none;
+			}
+
+			.out-radio:after {
+				transform: translateX(100%);
+				right: 0;
+			}
+			.out-radio:before {
+				left: 0;
+				transform: translateX(-100%);
+			}
+		}
+
+		.active {
+			background: #fff;
+			color: $base-color;
+			border-top-right-radius: 16rpx;
+
+			&:after, &:before {
+				position: absolute;
+				content: "";
+				width: 40rpx;
+				height: 40rpx;
+				background-color: var(--base-color-light-7);
+				bottom: 0px;
+				transform: translateX(100%);
+				border-radius: 50%;
+				z-index: 5;
+			}
+			&:after{
+				transform: translateX(100%);
+				right: 0;
+			}
+			&:before {
+				left: 0;
+				transform: translateX(-100%);
+			}
+			.out-radio:after,.out-radio:before {
+				display: block;
+			}
+		}
+	}
+}
+
+// 门店自提
+.store-box {
+	position: relative;
+	padding: 30rpx 24rpx;
+	margin: 0 24rpx 0;
+	background-color: #fff;
+	border-bottom-left-radius: 16rpx;
+	border-bottom-right-radius: 16rpx;
+	overflow: hidden;
+
+	&.not-delivery-type {
+		border-radius: 16rpx;
+	}
+
+	.address-line{
+	    position: absolute;
+	    bottom: 0px;
+	    left: 0;
+	    width: 100%;
+	    height: 6rpx;
+	}
+	.store-info {
+		display: flex;
+		align-items: baseline;
+		.icon {
+			position: relative;
+			margin-right: 12rpx;
+			align-self: flex-start;
+			margin-top: -2rpx;
+			&.img {
+				background-color: unset;
+				margin-right: 8rpx;
+				width: 46rpx;
+				height: 46rpx;
+				border-radius: 50%;
+				margin-top: 12rpx;
+				image {
+					width: 100%;
+					height: 100%;
+				}
+			}
+			.iconfont {
+				font-size: $font-size-toolbar;
+			}
+		}
+		.store-address-info{
+			width: 100%;
+			display: flex;
+			align-items: center;
+			.info-wrap {
+				flex: 1;
+				width: 0;
+				.title {
+					margin-bottom: 10rpx;
+					font-size: $font-size-base;
+					font-weight: bold;
+					.cell-more {
+						float: right;
+						margin-left: 50rpx;
+						color: $color-tip;
+						font-size: 24rpx;
+						font-weight: 500;
+					}
+				}
+				.store-detail view {
+					word-break: break-word;
+					font-size: 26rpx;
+				}
+				.store-detail{
+					.close-desc{
+						color:red;
+					}
+					.address{
+						color: $color-sub;
+						width: 100%;
+						overflow:hidden;
+						white-space: nowrap;
+						text-overflow: ellipsis;
+						-o-text-overflow:ellipsis;
+					}
+				}
+			}
+			.cell-more{
+				color: $color-tip;
+			}
+		}
+
+	}
+
+	.empty {
+		text-align: center;
+	}
+	.store-time{
+		border-top:2rpx solid #F4F4F6;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding: 20rpx 0 0;
+		box-sizing: border-box;
+		view{
+			font-size: 28rpx;
+		}
+		.left {
+			font-weight: bold;
+		}
+		.right{
+			display: flex;
+			align-items: center;
+			line-height: 1;
+			font-size: 24rpx;
+			.iconfont{
+				font-size: 24rpx;
+				margin-left: 14rpx;
+				color: #909399;
+			}
+		}
+	}
+}
+
+.buyer-message {
+	padding: 30rpx 24rpx;
+
+	.order-cell {
+		margin-bottom: 0;
+	}
+}
+
+.member-card-wrap {
+	background-color: #FFFBF4;
+	padding: 0 30rpx!important;
+
+	.head {
+		display: flex;
+		align-items: center;
+		height: 80rpx;
+	}
+
+	.icon-yuan_checked,.icon-yuan_checkbox {
+		font-size: 32rpx;
+	}
+
+	.icon-huiyuan {
+		margin-right: 10rpx;
+		line-height: 1;
+		font-size: 36rpx;
+		background-image:linear-gradient(156deg, #814635 0%, #3A221B 100%);
+		-webkit-background-clip:text;
+		-webkit-text-fill-color:transparent;
+	}
+
+	.info{
+		text-align: left;
+		flex: 1;
+		color: #e5ce75;
+		font-size: $font-size-tag;
+		color: #333;
+	}
+
+	.body {
+		display: flex;
+		overflow-x: scroll;
+		padding: 10rpx 0 20rpx 0;
+
+		.item {
+			padding: 20rpx 0 30rpx 0;
+			width: calc((100% - 60rpx) / 4);
+			text-align: center;
+			background: #fff;
+			margin-right: 20rpx;
+			border: 4rpx solid #fff;
+			border-radius: 10rpx;
+			position: relative;
+			overflow: hidden;
+
+			.icon-icon {
+				position: absolute;
+				right: 0;
+				bottom: 0;
+				font-size: 32rpx;
+				display: none;
+				line-height: 1;
+			}
+			&:last-child{
+				margin-right: 0;
+			}
+
+			.title {
+				margin-top: 20rpx;
+				font-weight: bold;
+			}
+
+			.price {
+				margin-top: 10rpx;
+			}
+		}
+
+		.active .icon-icon {
+			display: block;
+		}
+	}
+}
+
+.system-form-wrap {
+	@include wrap;
+	padding: 0;
+	overflow: hidden;
+
+	.order-cell {
+		padding: 30rpx 24rpx;
+		margin-bottom: 0;
+		border-bottom: 2rpx solid #F4F4F6;
+	}
+
+	/deep/ .form-wrap {
+		margin: 0 24rpx;
+
+		.icon-right {
+			color: #909399;
+			font-size: 24rpx;
+		}
+	}
+}
+
+.agreement {
+	margin: 20rpx $margin-both 0;
+
+	text {
+		color: $base-color;
+	}
+}
+
+.agreement-conten-box {
+	background: #fff;
+	padding:30rpx 30rpx;
+
+	.title {
+		text-align: center;
+		margin-bottom: 20rpx;
+		font-weight: bolder;
+	}
+	.close {
+		position: absolute;
+		right: 30rpx;
+		top: 10rpx;
+	}
+	.con {
+		height: 60vh;
+	}
+}
+.icon{
+	line-height: 1;
+	margin-right: 14rpx;
+	max-height: 50rpx;
+}
+.icon image{
+	width: 38rpx;
+	margin: -6rpx auto;
+	max-height: 50rpx;
+}
+
+.form-popup {
+	height: 60vh!important;
+	.popup-body {
+		padding: 20rpx 30rpx;
+		box-sizing: border-box;
+	}
+}
+
+.member-card-popup {
+  height: 60vh;
+
+  .popup-body {
+    .card-item {
+      display: flex;
+      padding: 30rpx;
+      background: var(--base-color-light-9);
+      margin: 24rpx 20rpx;
+      border-radius: 18rpx;
+
+      .content {
+        flex: 1;
+        width: 0;
+        margin-right: 30rpx;
+
+        .title {
+          line-height: 40rpx;
+          font-size: 28rpx;
+          font-weight: 600;
+        }
+
+        .info text {
+          line-height: 1;
+          font-size: 24rpx;
+          color: #666666;
+          margin-top: 20rpx;
+          margin-right: 8rpx;
+          display: inline-block;
+        }
+      }
+
+      .iconfont {
+        font-size: 44rpx;
+      }
+      .icon-yuan_checkbox {
+        color: $color-tip;
+      }
+    }
+  }
 }
\ No newline at end of file
diff --git a/common/js/auth.js b/common/js/auth.js
index b73f8d6..8beaf56 100644
--- a/common/js/auth.js
+++ b/common/js/auth.js
@@ -1,103 +1,100 @@
-export default {
-	data() {
-		return {
-			authInfo: {}
-		}
-	},
-	methods: {
-		/**
-		 * 获取用户登录凭证code
-		 */
-		getCode(callback) {
-			// 微信小程序
-			// #ifdef MP-WEIXIN
-			uni.login({
-				provider: 'weixin',
-				timeout: 3000,
-				success: res => {
-					if (res.code) {
-						this.$api.sendRequest({
-							url: '/weapp/api/weapp/authcodetoopenid',
-							data: {
-								code: res.code
-							},
-							success: res => {
-								if (res.code >= 0) {
-									if (res.data.openid) this.authInfo.weapp_openid = res.data
-										.openid;
-									if (res.data.unionid) this.authInfo.wx_unionid = res.data
-										.unionid;
-									typeof callback == 'function' && callback(this.authInfo);
-								} else {
-									this.$util.showToast({
-										title: res.message ? res.message : '小程序配置错误'
-									});
-								}
-							}
-						})
-					}
-				},
-				fail: (res) => {
-					// #ifdef MP-WEIXIN
-					let scene = wx.getLaunchOptionsSync().scene;
-					if ([1154, 1155].indexOf(scene) == -1) {
-						this.$util.showToast({
-							title: res.errMsg
-						});
-					}
-					// #endif
-				}
-			})
-			// #endif
-
-			// #ifdef MP-ALIPAY
-			uni.login({
-				timeout: 3000,
-				success: res => {
-					if (res.code) {
-						this.$api.sendRequest({
-							url: '/aliapp/api/aliapp/authcodetouserid',
-							data: {
-								code: res.code
-							},
-							success: res => {
-								if (res.code >= 0) {
-									if (res.data.user_id) this.authInfo.ali_openid = res.data
-										.user_id;
-									typeof callback == 'function' && callback(this.authInfo);
-								} else {
-									this.$util.showToast({
-										title: res.message ? res.message : '小程序配置错误'
-									});
-								}
-							}
-						})
-					}
-				},
-				fail: (err) => {
-					this.$util.showToast({
-						title: res.errMsg
-					});
-				}
-			})
-			// #endif
-
-			// #ifdef H5
-			if (this.$util.isWeiXin()) {
-				this.$api.sendRequest({
-					url: '/wechat/api/wechat/authcode',
-					data: {
-						redirect_url: location.href,
-						scopes: 'snsapi_userinfo'
-					},
-					success: res => {
-						if (res.code >= 0) {
-							location.href = res.data;
-						}
-					}
-				});
-			}
-			// #endif
-		}
-	}
+export default {
+	data() {
+		return {
+			authInfo: {}
+		}
+	},
+	methods: {
+		/**
+		 * 获取用户登录凭证code
+		 */
+		getCode(callback) {
+			// 微信小程序
+			// #ifdef MP-WEIXIN
+			uni.login({
+				provider: 'weixin',
+				timeout: 3000,
+				success: res => {
+					if (res.code) {
+						this.$api.sendRequest({
+							url: '/weapp/api/weapp/authcodetoopenid',
+							data: {
+								code: res.code
+							},
+							success: res => {
+								if (res.code >= 0) {
+									if (res.data.openid) this.authInfo.weapp_openid = res.data.openid;
+									if (res.data.unionid) this.authInfo.wx_unionid = res.data.unionid;
+									typeof callback == 'function' && callback(this.authInfo);
+								} else {
+									this.$util.showToast({
+										title: res.message ? res.message : '小程序配置错误'
+									});
+								}
+							}
+						})
+					}
+				},
+				fail: (res) => {
+					// #ifdef MP-WEIXIN
+					let scene = wx.getLaunchOptionsSync().scene;
+					if ([1154, 1155].indexOf(scene) == -1) {
+						this.$util.showToast({
+							title: res.errMsg
+						});
+					}
+					// #endif
+				}
+			})
+			// #endif
+
+			// #ifdef MP-ALIPAY
+			uni.login({
+				timeout: 3000,
+				success: res => {
+					if (res.code) {
+						this.$api.sendRequest({
+							url: '/aliapp/api/aliapp/authcodetouserid',
+							data: {
+								code: res.code
+							},
+							success: res => {
+								if (res.code >= 0) {
+									if (res.data.user_id) this.authInfo.ali_openid = res.data.user_id;
+									typeof callback == 'function' && callback(this.authInfo);
+								} else {
+									this.$util.showToast({
+										title: res.message ? res.message : '小程序配置错误'
+									});
+								}
+							}
+						})
+					}
+				},
+				fail: (res) => {
+					this.$util.showToast({
+						title: res.errMsg
+					});
+				}
+			})
+			// #endif
+
+			// #ifdef H5
+			if (this.$util.isWeiXin()) {
+				this.$api.sendRequest({
+					url: '/wechat/api/wechat/authcode',
+					data: {
+						redirect_url: location.href,
+						scopes: 'snsapi_userinfo'
+					},
+					success: res => {
+						if (res.code >= 0) {
+							location.href = res.data;
+						}
+					}
+				});
+			}
+			// #endif
+		}
+	}
 }
\ No newline at end of file
diff --git a/common/js/diy.js b/common/js/diy.js
index ab4a29f..0358e09 100644
--- a/common/js/diy.js
+++ b/common/js/diy.js
@@ -1,7 +1,14 @@
-import WxMap from 'common/js/map-wx-jssdk.js';
+import { QQMapWX } from 'common/js/map-wx-jssdk.js';
 import Config from '@/common/js/config.js';
 
-let systemInfo = uni.getSystemInfoSync();
+let systemInfo = {};
+try {
+	// 合并设备信息和窗口信息
+	systemInfo = {...uni.getDeviceInfo(), ...uni.getWindowInfo()};
+} catch (e) {
+	// 兼容旧版本
+	systemInfo = uni.getSystemInfoSync();
+}
 export default {
 	data() {
 		return {
@@ -35,6 +42,7 @@ export default {
 			latitude: null, // 纬度
 			longitude: null, // 经度
 			currentPosition: '', // 当前位置
+			currentStore: null,//当前门店
 			nearestStore: null, // 离自己最近的门店
 
 			storeTimeOut: null, // 没有获取到定位，则获取默认门店
@@ -43,19 +51,26 @@ export default {
 			diyRoute: '', // 页面路由
 			openBottomNav: false,
 			isShowCopyRight: false,
-			
+			option: null,
+			firstDiy: true,
+
 			//启动广告
-			adv:{},
-			
+			adv: {},
+
 		};
 	},
 	onLoad(option) {
+		this.option = option;
 		uni.hideTabBar();
+		// 支付宝小程序传参处理
+		// #ifdef MP-ALIPAY
+		let aliapp_option = my.getLaunchOptionsSync();
+		aliapp_option.query && Object.assign(option, aliapp_option.query);
+		// #endif
 
-		if (option.source_member) uni.setStorageSync('source_member', option.source_member);
-
-		// 小程序扫码进入
-		if (option.scene) {
+		// 处理分享人数据
+		if (option.source_member) uni.setStorageSync('source_member', option.source_member);// 分享链接进入
+		if (option.scene) {// 小程序扫码进入
 			var sceneParams = decodeURIComponent(option.scene);
 			sceneParams = sceneParams.split('&');
 			if (sceneParams.length) {
@@ -65,64 +80,36 @@ export default {
 			}
 		}
 
+		// H5地图选择位置回调
 		// #ifdef H5
 		// H5地图选择位置回调数据
 		if (option.module && option.module == 'locationPicker') {
-			option.name = ''; // 清空地址
+			option.name = ''; // 自定义页面传参id和name，防止获取地址时变量混淆
 			this.locationModule = option.module;
 			this.latitude = option.latng.split(',')[0];
 			this.longitude = option.latng.split(',')[1];
 		}
 		// #endif
 
+		//自定义页面的id和名称
 		this.id = option.id || 0;
 		this.name = option.name || '';
 
-		uni.removeStorageSync('manual_store_info'); // 清除手动切换门店缓存
-		uni.removeStorageSync('manual_change_store'); // 清楚手动切换门店标识
-
-		// H5才会执行
-		if (this.locationModule == 'locationPicker') {
-
-			// H5地图选址后的回调
-			this.getNearestStore();
-			this.getCurrentLocation();
-
-		} else if (this.mapConfig.wap_is_open == 1) {
-
-			// 每次都要定位，获取当前位置
-			/*this.$util.getLocation({
-				fail: (res) => {
-					// 拒绝定位，进入默认总店
-					this.enterDefaultStore();
-				}
-			});*/
-
-			// 如果3秒没有获取到定位，则获取默认门店，H5使用
-			// #ifdef H5
-			this.storeTimeOut = setTimeout(() => {
-				this.enterDefaultStore();
-			}, 1000 * 3);
-			// #endif
-
-		} else {
-			// 关闭定位
-			this.enterDefaultStore();
+		//获取当前门店信息 必须是首页且不是手动切换操作
+		let current_route = this.$util.getCurrentRoute();
+		let manualChangeStore = uni.getStorageSync('manual_change_store'); // 手动切换门店
+		if (current_route.path.indexOf('/pages/index/index') > -1 && !manualChangeStore) {
+			this.getCurrentStore(option);
 		}
-		
 	},
-	onShow() {
-		
-		this.init();
+	async onShow() {
+		if (this.firstDiy) {
+			this.firstDiy = false;
+			await this.getDiyMethod();
+		}
+		await this.onShowMethod();
 	},
 	onHide() {
-		if (this.storeTimeOut) {
-			clearTimeout(this.storeTimeOut);
-		}
-
-		// 跳转页面要关闭门店弹出框
-		this.closeChooseStorePopup();
-
 		// 清除限时秒杀定时器
 		this.$store.commit('setDiySeckillInterval', 0);
 	},
@@ -149,7 +136,7 @@ export default {
 			return str;
 		},
 		backgroundUrl() {
-			var str = this.diyData.global.bgUrl && this.diyData.global.bgUrl != 'transparent' ? 'url(' + this.$util.img(this.diyData.global.bgUrl) + ') ' : '';
+			var str = this.diyData.global?.bgUrl && this.diyData.global?.bgUrl != 'transparent' ? 'url(' + this.$util.img(this.diyData.global?.bgUrl) + ') ' : '';
 			return str;
 		},
 		textNavColor() {
@@ -187,30 +174,34 @@ export default {
 		}
 	},
 	watch: {
-		location: function (nVal) {
-			if (nVal) {
+		/* location: function (nVal) {
+			if (nVal && !this.latitude && !this.longitude) {
 				this.latitude = nVal.latitude;
 				this.longitude = nVal.longitude;
-				this.getNearestStore();
-				this.getCurrentLocation();
+				this.getStoreInfoByLocation();
 			}
+		}, */
+		initStatus: function (val) {
+			if (!this.option.store_id) this.getLocation();
 		}
 	},
 	methods: {
-		play(){
-			console.log(123)
+		async getDiyMethod() {
+			await this.getDiyInfo();
+
+			this.$store.commit('setDiySeckillInterval', 1);
+			this.$store.commit('setComponentRefresh');
 		},
-		async init() {
+		async onShowMethod() {
 
 			// 定位信息过期后，重新获取定位
-			if(this.mapConfig.wap_is_open == 1 && this.locationStorage && this.locationStorage.is_expired) {
-				this.$util.getLocation({
-					fail: (res) => {
-						// 拒绝定位，进入默认总店
-						this.enterDefaultStore();
-					}
-				});
-			}
+			// if (this.mapConfig.wap_is_open == 1 && this.locationStorage && this.locationStorage.is_expired) {
+			// 	this.$util.getLocation({
+			// 		fail: (res) => {
+			// 			// 失败了不需要做任何处理，保持之前的门店选择即可
+			// 		}
+			// 	});
+			// }
 
 			if (this.storeToken) {
 				//记录分享关系
@@ -225,17 +216,15 @@ export default {
 
 			this.$store.commit('setDiySeckillInterval', 1);
 
-			//小程序分享
-			// #ifdef MP-WEIXIN
-			this.$util.getMpShare().then(res => {
-				this.mpShareData = res;
-			});
-			// #endif
-
 			let manualChangeStore = uni.getStorageSync('manual_change_store'); // 手动切换门店
 			if (manualChangeStore) {
 				uni.removeStorageSync('manual_change_store');
-
+				let manualStoreInfo = uni.getStorageSync('manual_store_info'); // 手动选择门店
+				uni.removeStorageSync('manual_store_info');
+				if (manualStoreInfo) {
+					this.currentStore = manualStoreInfo;
+				}
+				this.closeGetLocationFailPopup();
 				// 滚动至顶部
 				uni.pageScrollTo({
 					duration: 200,
@@ -267,8 +256,14 @@ export default {
 					query.select('.page-header').boundingClientRect(data => {
 						if (data && data.height) {
 							// 从状态栏高度开始算
-							this.paddingTop = data.height + 'px';
-							this.marginTop = -data.height + 'px';
+							if (!this.diyData.global.topNavBg) {
+								this.paddingTop = 0;
+								this.marginTop = 0;
+							} else {
+								this.paddingTop = data.height + 'px';
+								this.marginTop = -data.height + 'px';
+							}
+
 							clearInterval(time);
 						}
 					}).exec();
@@ -276,7 +271,7 @@ export default {
 			}, 50);
 			// #endif
 		},
-		async getDiyAdv(){
+		async getDiyAdv() {
 			//启动广告
 			let res = await this.$api.sendRequest({
 				url: '/api/diyview/getstartadv',
@@ -285,13 +280,13 @@ export default {
 			});
 			this.adv = res.value
 			// 弹框形式，首次弹出 1，每次弹出 0
-			if(this.adv.advshow == 1){
+			if (this.adv.advshow == 1) {
 				setTimeout(() => {
 					if (res.value.advtype == 1) {
 						var popwindow_count = uni.getStorageSync(this.id + this.name + '_popwindow_count');
 						if ((this.$refs.uniPopupWindow && popwindow_count == '') || (
 							this.$refs.uniPopupWindow && popwindow_count == 1)) {
-								
+
 							this.$refs.uniPopupWindow.open();
 							uni.setStorageSync(this.id + this.name + '_popwindow_count', 1);
 						}
@@ -301,7 +296,7 @@ export default {
 					}
 				}, 500);
 			}
-			
+
 		},
 		async getDiyInfo() {
 			let res = await this.$api.sendRequest({
@@ -309,7 +304,7 @@ export default {
 				data: {
 					id: this.id,
 					name: this.name,
-					en_type:uni.getStorageSync("lang"),//获取语言底部
+					en_type: uni.getStorageSync("lang"),//获取语言底部
 				},
 				async: false
 			});
@@ -337,7 +332,7 @@ export default {
 				this.$langConfig.title(this.diyData.global.title);
 				this.mpCollect = this.diyData.global.mpCollect;
 				this.setPublicShare();
-			/*	if (this.diyData.global.popWindow && this.diyData.global.popWindow.imageUrl) {
+				if (this.diyData.global.popWindow && this.diyData.global.popWindow.imageUrl) {
 					// 弹框形式，首次弹出 1，每次弹出 0
 					setTimeout(() => {
 						if (this.diyData.global.popWindow.count == 1) {
@@ -352,7 +347,7 @@ export default {
 							uni.setStorageSync(this.id + this.name + '_popwindow_count', 0);
 						}
 					}, 500);
-				}*/
+				}
 
 				// 修改diy数据结构排序
 				let searchIndex = -1;
@@ -375,14 +370,15 @@ export default {
 						this.diyData.value.splice(topCategoryIndex, 1);
 						this.diyData.value.splice(0, 0, ...topCategoryData);
 						this.diyData.value.splice(1, 0, ...searchData);
-					} else
+					} else {
 						this.diyData.value.splice(0, 0, ...searchData);
+					}
 				} else if (searchIndex != -1 && topCategoryIndex == -1) {
 					let searchData = this.diyData.value.slice(searchIndex, searchIndex + 1);
 					this.diyData.value.splice(searchIndex, 1);
 					this.diyData.value.splice(0, 0, ...searchData);
 				}
-
+				this.topIndexValue = null;
 				for (var i = 0; i < this.diyData.value.length; i++) {
 					// 分类导航组件
 					if (this.diyData.value[i].componentName == 'TopCategory') {
@@ -402,7 +398,6 @@ export default {
 					}
 
 				}
-
 				// #ifdef MP
 				//小程序收藏
 				if (!uni.getStorageSync('isCollect') && this.diyData.global.mpCollect) {
@@ -416,6 +411,45 @@ export default {
 					this.openBottomNav = this.diyData.global.openBottomNav;
 				}
 				this.isShowCopyRight = true;
+
+				//小程序分享
+				// #ifdef MP-WEIXIN
+				let path = this.$util.getCurrentRoute().path;
+				if (path == '/pages/member/index') {
+					this.mpShareData = {};
+					return;
+				}
+				let share_path = path;
+				if (this.$store.state.memberInfo && this.$store.state.memberInfo.member_id) {
+					share_path = this.$util.getCurrentShareRoute(this.$store.state.memberInfo.member_id).path
+				}
+				let appMessageData = {
+					title: this.diyData.global.weappShareTitle,
+					path: share_path,
+					imageUrl: this.$util.img(this.diyData.global.weappShareImage),
+					success: res => { },
+					fail: res => { }
+				}
+				let timeLineData = {
+					title: this.diyData.global.weappShareTitle,
+					query: share_path,
+					imageUrl: this.$util.img(this.diyData.global.weappShareImage),
+				}
+
+				this.mpShareData = {
+					appMessage: appMessageData,
+					timeLine: timeLineData
+				};
+				//console.log(this.mpShareData, 'this.mpShareData');
+
+				var store_info = this.$store.state.globalStoreInfo;
+				if (store_info) {
+					this.mpShareData.appMessage.path += (this.mpShareData.appMessage.path.indexOf('?') > -1 ? '&' : '?') + 'store_id=' + store_info.store_id;
+					this.mpShareData.timeLine.query += (this.mpShareData.timeLine.query.indexOf('?') > -1 ? '&' : '?') + 'store_id=' + store_info.store_id;
+				}
+				//朋友圈不需要页面路径，只要要后面的参数就行
+				this.mpShareData.timeLine.query = this.mpShareData.timeLine.query.split('?')[1] || '';
+				// #endif
 			}
 		},
 		closePopupWindow() {
@@ -430,44 +464,131 @@ export default {
 			this.$util.diyRedirectTo(this.diyData.global.popWindow.link);
 			this.closePopupWindow();
 		},
-		openChooseStorePopup() {
-			if (this.globalStoreConfig && this.globalStoreConfig.confirm_popup_control == 1) {
-				let storeInfo = this.globalStoreInfo;
-
-				// 首次进入门店，没有门店信息 || 当前位置的门店和缓存门店不一致要弹框
-				if (!storeInfo || storeInfo && this.nearestStore && storeInfo.store_id != this.nearestStore.store_id) {
-					if (this.$refs.chooseStorePopup) this.$refs.chooseStorePopup.open();
+		/******************************************** 获取门店相关 START ***************************************************/
+		/**
+		 * 1、分享携带门店id
+		 * 	  门店id正确 进入门店
+		 * 	  门店id错误 通过定位获取门店
+		 * 2、通过定位获取门店
+		 *    开启获取定位
+		 *        同意获取定位 获取最近门店 进入门店
+		 *        拒绝获取定位 
+		 * 		      平台运营模式 进入默认门店
+		 * 		      连锁门店模式 提示获取定位失败，手动选择门店或引导去开启定位
+		 *    关闭获取定位
+		 *        平台运营模式 进入默认门店
+		 *        连锁门店模式 提示获取定位失败，手动选择门店
+		 */
+		getCurrentStore(option) {
+			if (option.store_id && !isNaN(parseInt(option.store_id))) {
+				this.getStoreInfoByShare(option.store_id);
+			} else {
+				this.getLocation();
+			}
+		},
+		getStoreInfoByShare(store_id) {
+			this.$api.sendRequest({
+				url: '/api/store/info',
+				data: { store_id },
+				success: res => {
+					if (res.code >= 0 && res.data) {
+						this.changeCurrentStore(res.data);
+					} else {
+						this.getLocation();
+					}
+				},
+				fail: res => {
+					this.getLocation();
+				}
+			});
+		},
+		getLocation() {
+			if (!this.latitude && !this.longitude && this.initStatus) {
+				if (this.mapConfig.wap_is_open == 1) {
+					this.$util.getLocation({
+						complete: (res) => {
+							if (res.latitude && res.longitude) {
+								this.closeGetLocationFailPopup();
+								this.latitude = res.latitude;
+								this.longitude = res.longitude;
+								this.getStoreInfoByLocation();
+							} else {
+								let is_h5 = false;
+								// #ifdef H5
+								is_h5 = true;
+								// #endif
+								if (is_h5) {
+									//H5同意了也会进入失败，所以直接进入默认门店
+									this.enterDefaultStore();
+								} else {
+									this.getLocationFail();
+								}
+							}
+						}
+					});
+					// #ifdef H5
+					//H5有的机型可能根本不会触发getLocation的任何执行，包括success，fail，completele
+					//所以这里如果等待一定时间后还是没有获取到当前门店则进入默认门店
+					setTimeout(() => {
+						let current_route = this.$util.getCurrentRoute();
+						if (this.mapConfig.wap_is_open == 1 && !this.currentStore && current_route.path == '/pages/index/index') {
+							this.enterDefaultStore();
+						}
+					}, 5000);
+					// #endif
+				} else {
+					this.getLocationFail();
 				}
 			}
-
-			let manualStoreInfo = uni.getStorageSync('manual_store_info'); // 手动选择门店
-			if (manualStoreInfo) {
-				this.nearestStore = manualStoreInfo;
+		},
+		getStoreInfoByLocation() {
+			if (this.latitude && this.longitude) {
+				this.getNearestStore();
+				this.getCurrentLocation();
+			}
+		},
+		changeCurrentStore(store_info) {
+			this.currentStore = store_info;
+			this.changeStore(store_info);
+			this.openChooseStorePopup();
+		},
+		getLocationFail() {
+			if (this.globalStoreConfig.store_business == 'shop') {
+				this.enterDefaultStore();
+			} else {
+				this.openGetLocationFailPopup();
+			}
+		},
+		openGetLocationFailPopup() {
+			if (this.$refs.getLocationFailRef) this.$refs.getLocationFailRef.open();
+		},
+		closeGetLocationFailPopup() {
+			if (this.$refs.getLocationFailRef) this.$refs.getLocationFailRef.close();
+		},
+		openChooseStorePopup() {
+			let globalStoreInfo = this.globalStoreInfo;
+			if (this.globalStoreConfig && this.globalStoreConfig.confirm_popup_control == 1) {
+				this.currentStore.show_address = this.currentStore.full_address.replace(/,/g, ' ') + ' ' + this.currentStore.address;
+				if (this.$refs.chooseStorePopup) this.$refs.chooseStorePopup.open();
 			}
-			this.changeStore(this.nearestStore); // 切换门店数据
 		},
 		closeChooseStorePopup() {
 			if (this.$refs.chooseStorePopup) this.$refs.chooseStorePopup.close();
 		},
-		// 确认进入门店
-		enterStore() {
-			this.closeChooseStorePopup();
-		},
 		// 选择其他门店
 		chooseOtherStore() {
 			this.$util.redirectTo('/pages_tool/store/list');
 			this.closeChooseStorePopup();
 		},
 		// 打开地图重新选择位置
-		reposition() {
+		reGetLocation() {
 			// #ifdef MP
-			/*uni.chooseLocation({
+			uni.chooseLocation({
 				success: res => {
 					this.latitude = res.latitude;
 					this.longitude = res.longitude;
 					this.currentPosition = res.name;
-					this.getNearestStore();
-					this.getCurrentLocation();
+					this.getStoreInfoByLocation();
 				},
 				fail(res) {
 					uni.getSetting({
@@ -492,8 +613,7 @@ export default {
 																	this.latitude = res.latitude;
 																	this.longitude = res.longitude;
 																	this.currentPosition = res.name;
-																	this.getNearestStore();
-																	this.getCurrentLocation();
+																	this.getStoreInfoByLocation();
 																}
 															});
 														}, 1000);
@@ -511,7 +631,7 @@ export default {
 						}
 					});
 				}
-			});*/
+			});
 			// #endif
 
 			// #ifdef H5
@@ -532,9 +652,7 @@ export default {
 				data: data,
 				success: res => {
 					if (res.code == 0 && res.data) {
-						this.nearestStore = res.data;
-						this.nearestStore.show_address = this.nearestStore.full_address.replace(/,/g, ' ') + ' ' + this.nearestStore.address;
-						this.openChooseStorePopup();
+						this.changeCurrentStore(res.data);
 					}
 				}
 			});
@@ -547,7 +665,6 @@ export default {
 				data.latitude = this.latitude;
 				data.longitude = this.longitude;
 			}
-
 			this.$api.sendRequest({
 				url: '/api/store/getLocation',
 				data: data,
@@ -563,26 +680,42 @@ export default {
 		// 定位失败，进入默认门店
 		enterDefaultStore() {
 			if (this.defaultStoreInfo) {
-				if (!this.nearestStore) {
-					this.nearestStore = this.defaultStoreInfo;
-					this.nearestStore.show_address = this.nearestStore.full_address.replace(/,/g, ' ') + ' ' + this.nearestStore.address;
-				}
-				if (this.currentPosition == '') this.currentPosition = '未获取到定位';
-				this.openChooseStorePopup();
+				this.changeCurrentStore(this.defaultStoreInfo);
 			}
 		},
+		//连锁门店未定位选择门店
+		chooseStore() {
+			this.$util.redirectTo('/pages_tool/store/list');
+		},
+		//打开手机设置重新定位
+		openSetting() {
+			uni.openSetting({
+				success: res => {
+					this.getLocation();
+				}
+			})
+		},
+		/******************************************** 获取门店相关 END ***************************************************/
 		// 设置公众号分享
 		setPublicShare() {
 			let shareUrl = this.$config.h5Domain + this.diyRoute;
-			if (this.id) shareUrl += '?id=' + this.id;
-			else if (this.name) shareUrl += '?name=' + this.name;
+			var store_info = this.$store.state.globalStoreInfo;
+			//if (store_info) shareUrl += '?store_id=' + store_info.store_id;
+			if (shareUrl.indexOf('?') > 0) {
+				shareUrl += '&';
+			} else {
+				shareUrl += '?';
+			}
+			if (this.id) shareUrl += 'id=' + this.id;
+			else if (this.name) shareUrl += 'name=' + this.name;
+			// alert('diydiydiy')
 			this.$util.setPublicShare({
-				title: this.diyData.global.title,
-				desc: '',
+				title: this.diyData.global.wechatShareTitle || this.diyData.global.title,
+				desc: this.diyData.global.wechatShareDesc,
 				link: shareUrl,
-				imgUrl: this.siteInfo ? this.$util.img(this.siteInfo.logo_square) : ''
+				imgUrl: this.diyData.global.wechatShareImage ? this.$util.img(this.diyData.global.wechatShareImage) : this.$util.img(this.siteInfo.logo_square)
 			});
-		}
+		},
 	},
 	onPageScroll(e) {
 		this.scrollTop = e.scrollTop;
@@ -597,6 +730,7 @@ export default {
 	// 下拉刷新
 	onPullDownRefresh() {
 		this.$store.commit('setComponentRefresh');
+		this.getDiyMethod();
 		setTimeout(() => {
 			uni.stopPullDownRefresh();
 		}, 50);
diff --git a/common/js/goods_detail_base.js b/common/js/goods_detail_base.js
index 53ef66e..f57eed3 100644
--- a/common/js/goods_detail_base.js
+++ b/common/js/goods_detail_base.js
@@ -1,371 +1,382 @@
-// 商品详情业务
-import htmlParser from '@/common/js/html-parser';
-
-export default {
-	data() {
-		return {
-			skuId: 0,
-			goodsId: 0,
-			// 商品详情
-			goodsSkuDetail: {
-				goods_id: 0,
-				goods_service: []
-			},
-			preview: 0, //是否开启预览，0：不开启，1：开启
-			//评价
-			contactData: {
-				title: '',
-				path: '',
-				img: ''
-			},
-
-			shareQuery: '', // 分享参数
-			shareUrl: '', // 分享链接
-
-			source_member: 0, //分享人的id
-			chatRoomParams: {}, // 联系客服参数
-			isIphoneX: false, //判断手机是否是iphoneX以上
-			whetherCollection: 0,
-			posterParams: {}, //海报所需参数
-			shareImg: '',
-			navbarData: {
-				title: '',
-				topNavColor: "#ffffff",
-				topNavBg: false,
-				navBarSwitch: true, // 导航栏是否显示
-				textNavColor: "#333333",
-				moreLink: {
-					name: ""
-				},
-				navStyle: 1,
-				bgUrl: '',
-				textImgPosLink: 'left'
-			},
-		}
-	},
-	onLoad(data) {
-		//刷新多语言
-		this.$langConfig.refresh();
-		// #ifdef MP-ALIPAY
-		let options = my.getLaunchOptionsSync();
-		options.query && Object.assign(data, options.query);
-		// #endif
-
-		this.preview = data.preview || 0;
-		this.isIphoneX = this.$util.uniappIsIPhoneX();
-
-		if (data.source_member) {
-			uni.setStorageSync('source_member', data.source_member);
-			this.source_member = data.source_member;
-		}
-		//记录分享关系
-		if (this.storeToken && uni.getStorageSync('source_member')) {
-			this.$util.onSourceMember(uni.getStorageSync('source_member'));
-		}
-
-		// 小程序扫码进入
-		if (data.scene) {
-			var sceneParams = decodeURIComponent(data.scene);
-			sceneParams = sceneParams.split('&');
-			if (sceneParams.length) {
-				sceneParams.forEach(item => {
-					if (item.indexOf('m') != -1) uni.setStorageSync('source_member', item.split('-')[1]);
-					if (item.indexOf('is_test') != -1) uni.setStorageSync('is_test', 1);
-				});
-			}
-		}
-	},
-	onShow() {
-	},
-	methods: {
-		// 处理商品详情数据
-		handleGoodsSkuData() {
-			// this.navbarData.title = this.goodsSkuDetail.goods_name.length > 9 ? this.goodsSkuDetail.goods_name.substr(0, 9) + "..." : this.goodsSkuDetail.goods_name;
-			//设置标题
-			// this.$langConfig.title(this.navbarData.title);
-			if (this.goodsSkuDetail.config) {
-				this.navbarData.navBarSwitch = this.goodsSkuDetail.config.nav_bar_switch;
-			}
-
-			this.whetherCollection = this.goodsSkuDetail.is_collect; // 用户关注商品状态
-
-			this.modifyGoodsInfo();
-
-			// 初始化商品详情视图数据
-			if (this.$refs.goodsDetailView) this.$refs.goodsDetailView.init({
-				sku_id: this.skuId,
-				goods_id: this.goodsSkuDetail.goods_id,
-				preview: this.preview,
-				source_member: this.source_member,
-				posterParams: this.posterParams,
-				posterApi: this.posterApi,
-				shareUrl: this.shareUrl,
-				goodsRoute: this.goodsRoute,
-				isVirtual: this.goodsSkuDetail.is_virtual,
-				deliveryType: this.goodsSkuDetail.express_type,
-				whetherCollection: this.goodsSkuDetail.is_collect,
-				evaluateConfig: this.goodsSkuDetail.evaluate_config,
-				evaluateList: this.goodsSkuDetail.evaluate_list,
-				evaluateCount: this.goodsSkuDetail.evaluate_count
-			});
-
-			//媒体
-			if (this.goodsSkuDetail.video_url) this.switchMedia = "video";
-
-			if (!Array.isArray(this.goodsSkuDetail.sku_images)) {
-				if (this.goodsSkuDetail.sku_images) this.goodsSkuDetail.sku_images = this.goodsSkuDetail.sku_images.split(",");
-				else this.goodsSkuDetail.sku_images = [];
-			}
-
-			// 多规格时合并主图
-			if (this.goodsSkuDetail.goods_spec_format && this.goodsSkuDetail.goods_image) {
-
-				if (!Array.isArray(this.goodsSkuDetail.goods_image)) this.goodsSkuDetail.goods_image = this.goodsSkuDetail.goods_image.split(",");
-
-				this.goodsSkuDetail.sku_images = this.goodsSkuDetail.goods_image.concat(this.goodsSkuDetail.sku_images);
-			}
-
-			let maxHeight = '';
-			let systemInfo = uni.getSystemInfoSync();
-			this.goodsSkuDetail.goods_image_list.forEach((item, index) => {
-				if (typeof item.pic_spec == "string")
-					item.pic_spec = item.pic_spec.split('*');
-
-				let ratio = item.pic_spec[0] / systemInfo.windowWidth;
-				item.pic_spec[0] = item.pic_spec[0] / ratio;
-				item.pic_spec[1] = item.pic_spec[1] / ratio;
-
-				if (!maxHeight || maxHeight > item.pic_spec[1]) {
-					maxHeight = item.pic_spec[1];
-				}
-			});
-			this.goodsSkuDetail.swiperHeight = maxHeight + 'px';
-
-			this.goodsSkuDetail.unit = this.goodsSkuDetail.unit || "件";
-
-			// 当前商品SKU规格
-			if (this.goodsSkuDetail.sku_spec_format) this.goodsSkuDetail.sku_spec_format = JSON.parse(this.goodsSkuDetail.sku_spec_format);
-
-			// 商品属性
-			if (this.goodsSkuDetail.goods_attr_format) {
-				let goods_attr_format = JSON.parse(this.goodsSkuDetail.goods_attr_format);
-				this.goodsSkuDetail.goods_attr_format = this.$util.unique(goods_attr_format, "attr_id");
-				for (var i = 0; i < this.goodsSkuDetail.goods_attr_format.length; i++) {
-					for (var j = 0; j < goods_attr_format.length; j++) {
-						if (this.goodsSkuDetail.goods_attr_format[i].attr_id == goods_attr_format[j].attr_id && this.goodsSkuDetail.goods_attr_format[i].attr_value_id != goods_attr_format[j].attr_value_id) {
-							this.goodsSkuDetail.goods_attr_format[i].attr_value_name += "、" + goods_attr_format[j].attr_value_name;
-						}
-					}
-				}
-			}
-
-			// 商品SKU格式
-			if (this.goodsSkuDetail.goods_spec_format) this.goodsSkuDetail.goods_spec_format = JSON.parse(this.goodsSkuDetail.goods_spec_format);
-
-			// 商品详情
-			if (this.goodsSkuDetail.goods_content) this.goodsSkuDetail.goods_content = (this.goodsSkuDetail.goods_content);
-			console.log(this.goodsSkuDetail.goods_content)
-			//	if (this.goodsSkuDetail.goods_content) this.goodsSkuDetail.goods_content = htmlParser(this.goodsSkuDetail.goods_content);
-
-			//商品服务
-			if (this.goodsSkuDetail.goods_service) {
-				for (let i in this.goodsSkuDetail.goods_service) {
-					this.goodsSkuDetail.goods_service[i]['icon'] = this.goodsSkuDetail.goods_service[i]['icon'] ? JSON.parse(this.goodsSkuDetail.goods_service[i]['icon']) : '';
-				}
-			}
-
-			this.contactData = {
-				title: this.goodsSkuDetail.sku_name,
-				path: this.shareUrl,
-				img: this.$util.img(this.goodsSkuDetail.sku_image, {
-					size: 'big'
-				})
-			};
-			if (this.$refs.goodsPromotion) this.$refs.goodsPromotion.refresh(this.goodsSkuDetail.goods_promotion);
-
-			if (this.goodsRoute != '/pages/goods/detail') this.setPublicShare();
-
-			// this.getBarrageData();
-			if (this.addonIsExist.form) {
-				this.getGoodsForm();
-			}
-		},
-		/**
-		 * 刷新商品详情数据
-		 * @param {Object} data
-		 */
-		refreshGoodsSkuDetail(data) {
-			this.goodsSkuDetail = Object.assign({}, this.goodsSkuDetail, data);
-			if (this.$refs.goodsPromotion) this.$refs.goodsPromotion.refresh(this.goodsSkuDetail.goods_promotion);
-			if (this.$refs.goodsDetailView) {
-
-				// 初始化商品详情视图数据
-				this.goodsSkuDetail.unit = this.goodsSkuDetail.unit || "件";
-
-				// 解决轮播图数量不一致时，切换到第一个
-				if (this.swiperCurrent > this.goodsSkuDetail.sku_images.length) {
-					this.swiperAutoplay = true;
-					this.swiperCurrent = 1;
-					setTimeout(() => {
-						this.swiperAutoplay = false;
-					}, 40);
-				}
-
-			}
-			this.navbarData.title = this.goodsSkuDetail.goods_name.length > 9 ? this.goodsSkuDetail.goods_name.substr(0, 9) + "..." : this.goodsSkuDetail.goods_name;
-			this.$langConfig.title(this.navbarData.title);
-
-			if (this.goodsSkuDetail.membercard) {
-				this.membercard = this.goodsSkuDetail.membercard;
-			}
-		},
-		goodsDetailViewInit() {
-			// 初始化商品详情视图数据
-			if (this.$refs.goodsDetailView) this.$refs.goodsDetailView.init({
-				sku_id: this.skuId,
-				goods_id: this.goodsSkuDetail.goods_id,
-				preview: this.preview,
-				source_member: this.source_member,
-				posterParams: this.posterParams,
-				posterApi: this.posterApi,
-				shareUrl: this.shareUrl,
-				goodsRoute: this.goodsRoute,
-				isVirtual: this.goodsSkuDetail.is_virtual,
-				deliveryType: this.goodsSkuDetail.express_type,
-				whetherCollection: this.goodsSkuDetail.is_collect,
-				evaluateConfig: this.goodsSkuDetail.evaluate_config,
-				evaluateList: this.goodsSkuDetail.evaluate_list,
-				evaluateCount: this.goodsSkuDetail.evaluate_count
-			});
-		},
-		goHome() {
-			if (this.preview) return; // 开启预览，禁止任何操作和跳转
-			this.$util.redirectTo('/pages/index/index');
-		},
-		goCart() {
-			if (this.preview) return; // 开启预览，禁止任何操作和跳转
-			this.$util.redirectTo('/pages/goods/cart');
-		},
-		//-------------------------------------关注-------------------------------------
-		//更新商品信息
-		modifyGoodsInfo() {
-			if (this.preview) return; // 开启预览，禁止任何操作和跳转
-			//更新商品点击量
-			this.$api.sendRequest({
-				url: "/api/goods/modifyclicks",
-				data: {
-					sku_id: this.skuId
-				},
-				success: res => {
-				}
-			});
-
-			//添加足迹
-			this.$api.sendRequest({
-				url: "/api/goodsbrowse/add",
-				data: {
-					goods_id: this.goodsSkuDetail.goods_id,
-					sku_id: this.skuId
-				},
-				success: res => {
-				}
-			});
-		},
-		//-------------------------------------关注-------------------------------------
-		async editCollection() {
-			if (this.$refs.goodsDetailView) {
-				this.whetherCollection = await this.$refs.goodsDetailView.collection();
-			}
-		},
-		openSharePopup() {
-			if (this.$refs.goodsDetailView) {
-				this.$refs.goodsDetailView.openSharePopup();
-			}
-		},
-		//弹幕
-		getBarrageData() {
-			this.$api.sendRequest({
-				url: '/api/goods/goodsbarrage',
-				data: {
-					goods_id: this.goodsSkuDetail.goods_id
-				},
-				success: res => {
-					if (res.code == 0 && res.data) {
-						let barrageData = [];
-						for (let i in res.data.list) {
-							if (res.data.list[i]['title']) {
-								let title = res.data.list[i]['title'].substr(0, 1) + '*' + res.data.list[i]['title'].substr(res.data.list[i]['title'].length - 1, 1)
-								barrageData.push({
-									img: res.data.list[i]['img'] ? res.data.list[i]['img'] : this.$util.getDefaultImage().head,
-									title: title + '已下单'
-								});
-							}
-						}
-						this.goodsSkuDetail.barrageData = barrageData;
-					}
-				}
-			});
-		},
-		/**
-		 * 设置公众号分享
-		 */
-		setPublicShare() {
-			let shareUrl = this.$config.h5Domain + this.shareUrl;
-			if (this.memberInfo && this.memberInfo.member_id) shareUrl += '&source_member=' + this.memberInfo.member_id;
-
-			this.$util.setPublicShare({
-				title: this.goodsSkuDetail.goods_name,
-				desc: '',
-				link: shareUrl,
-				imgUrl: typeof this.goodsSkuDetail.goods_image == 'object' ? this.goodsSkuDetail.goods_image[0] : this.goodsSkuDetail.goods_image.split(',')[0]
-			})
-		},
-		/**
-		 * 获取商品表单
-		 */
-		getGoodsForm() {
-			this.$api.sendRequest({
-				url: "/form/api/form/goodsform",
-				data: {
-					goods_id: this.goodsSkuDetail.goods_id
-				},
-				success: res => {
-					if (res.code == 0 && res.data) this.$set(this.goodsSkuDetail, 'goods_form', res.data);
-				}
-			});
-		}
-	},
-	/**
-	 * 自定义分享内容
-	 * @param {Object} res
-	 */
-	onShareAppMessage(res) {
-		var path = this.shareUrl;
-		if (this.memberInfo && this.memberInfo.member_id) path += '&source_member=' + this.memberInfo.member_id;
-		return {
-			title: this.goodsSkuDetail.sku_name,
-			imageUrl: this.shareImg ? this.$util.img(this.shareImg) : this.$util.img(this.goodsSkuDetail.sku_image, {
-				size: 'big'
-			}),
-			path: path,
-			success: res => {
-			},
-			fail: res => {
-			}
-		};
-	},
-	// 分享到微信朋友圈
-	// #ifdef MP-WEIXIN
-	onShareTimeline() {
-		let query = this.shareQuery;
-		if (this.memberInfo && this.memberInfo.member_id) query += '&source_member=' + this.memberInfo.member_id;
-		return {
-			title: this.goodsSkuDetail.sku_name,
-			query: query,
-			imageUrl: this.$util.img(this.goodsSkuDetail.sku_image, {
-				size: 'big'
-			})
-		};
-	}
-	// #endif
+// 商品详情业务
+import htmlParser from '@/common/js/html-parser';
+
+export default {
+	data() {
+		return {
+			skuId: 0,
+			goodsId: 0,
+			// 商品详情
+			goodsSkuDetail: {
+				goods_id: 0,
+				goods_service: []
+			},
+			preview: 0, //是否开启预览，0：不开启，1：开启
+			//评价
+			contactData: {
+				title: '',
+				path: '',
+				img: ''
+			},
+
+			shareQuery: '', // 分享参数
+			shareUrl: '', // 分享链接
+
+			source_member: 0, //分享人的id
+			chatRoomParams: {}, // 联系客服参数
+			isIphoneX: false, //判断手机是否是iphoneX以上
+			whetherCollection: 0,
+			posterParams: {}, //海报所需参数
+			shareImg: '',
+			navbarData: {
+				title: '',
+				topNavColor: "#ffffff",
+				topNavBg: false,
+				navBarSwitch: true, // 导航栏是否显示
+				textNavColor: "#333333",
+				moreLink: {
+					name: ""
+				},
+				navStyle: 1,
+				bgUrl: '',
+				textImgPosLink: 'left'
+			},
+			goodsFormVal: []
+		}
+	},
+	onLoad(data) {
+		//刷新多语言
+		this.$langConfig.refresh();
+		// #ifdef MP-ALIPAY
+		let options = my.getLaunchOptionsSync();
+		options.query && Object.assign(data, options.query);
+		// #endif
+
+		this.preview = data.preview || 0;
+		this.isIphoneX = this.$util.uniappIsIPhoneX();
+
+		if (data.source_member) {
+			uni.setStorageSync('source_member', data.source_member);
+			this.source_member = data.source_member;
+		}
+		//记录分享关系
+		if (this.storeToken && uni.getStorageSync('source_member')) {
+			this.$util.onSourceMember(uni.getStorageSync('source_member'));
+		}
+
+		// 小程序扫码进入
+		if (data.scene) {
+			var sceneParams = decodeURIComponent(data.scene);
+			sceneParams = sceneParams.split('&');
+			if (sceneParams.length) {
+				sceneParams.forEach(item => {
+					if (item.indexOf('m') != -1) uni.setStorageSync('source_member', item.split('-')[1]);
+					if (item.indexOf('is_test') != -1) uni.setStorageSync('is_test', 1);
+				});
+			}
+		}
+	},
+	onShow() {
+	},
+	methods: {
+		detailChangeVal(data) {
+			this.goodsFormVal = data;
+		},
+		// 处理商品详情数据
+		handleGoodsSkuData() {
+			this.navbarData.title = this.goodsSkuDetail.goods_name.length > 9 ? this.goodsSkuDetail.goods_name.substr(0, 9) + "..." : this.goodsSkuDetail.goods_name;
+			this.$langConfig.title(this.navbarData.title);
+			if (this.goodsSkuDetail.config) {
+				this.navbarData.navBarSwitch = this.goodsSkuDetail.config.nav_bar_switch;
+			}
+
+			this.whetherCollection = this.goodsSkuDetail.is_collect; // 用户关注商品状态
+
+			this.modifyGoodsInfo();
+
+			// 初始化商品详情视图数据
+			if (this.$refs.goodsDetailView) this.$refs.goodsDetailView.init({
+				sku_id: this.skuId,
+				goods_id: this.goodsSkuDetail.goods_id,
+				preview: this.preview,
+				source_member: this.source_member,
+				posterParams: this.posterParams,
+				posterApi: this.posterApi,
+				shareUrl: this.shareUrl,
+				goodsRoute: this.goodsRoute,
+				isVirtual: this.goodsSkuDetail.is_virtual,
+				deliveryType: this.goodsSkuDetail.express_type,
+				whetherCollection: this.goodsSkuDetail.is_collect,
+				evaluateConfig: this.goodsSkuDetail.evaluate_config,
+				evaluateList: this.goodsSkuDetail.evaluate_list,
+				evaluateCount: this.goodsSkuDetail.evaluate_count,
+				goods_class : this.goodsSkuDetail.goods_class,
+				sale_store: this.goodsSkuDetail.sale_store
+			});
+
+			//媒体
+			if (this.goodsSkuDetail.video_url) this.switchMedia = "video";
+
+			if (!Array.isArray(this.goodsSkuDetail.sku_images)) {
+				if (this.goodsSkuDetail.sku_images) this.goodsSkuDetail.sku_images = this.goodsSkuDetail.sku_images.split(",");
+				else this.goodsSkuDetail.sku_images = [];
+			}
+
+			// 多规格时合并主图
+			if (this.goodsSkuDetail.goods_spec_format && this.goodsSkuDetail.goods_image) {
+
+				if (!Array.isArray(this.goodsSkuDetail.goods_image)) this.goodsSkuDetail.goods_image = this.goodsSkuDetail.goods_image.split(",");
+
+				this.goodsSkuDetail.sku_images = this.goodsSkuDetail.goods_image.concat(this.goodsSkuDetail.sku_images);
+			}
+
+			let maxHeight = '';
+			let systemInfo = uni.getSystemInfoSync();
+			this.goodsSkuDetail.goods_image_list.forEach((item, index) => {
+				if (typeof item.pic_spec == "string")
+					item.pic_spec = item.pic_spec.split('*');
+
+				let ratio = item.pic_spec[0] / systemInfo.windowWidth;
+				item.pic_spec[0] = item.pic_spec[0] / ratio;
+				item.pic_spec[1] = item.pic_spec[1] / ratio;
+
+				if (!maxHeight || maxHeight > item.pic_spec[1]) {
+					maxHeight = item.pic_spec[1];
+				}
+			});
+			this.goodsSkuDetail.swiperHeight = maxHeight + 'px';
+
+			this.goodsSkuDetail.unit = this.goodsSkuDetail.unit || "件";
+
+			// 当前商品SKU规格
+			if (this.goodsSkuDetail.sku_spec_format) this.goodsSkuDetail.sku_spec_format = JSON.parse(this.goodsSkuDetail.sku_spec_format);
+
+			// 商品属性
+			if (this.goodsSkuDetail.goods_attr_format) {
+				let goods_attr_format = JSON.parse(this.goodsSkuDetail.goods_attr_format);
+				this.goodsSkuDetail.goods_attr_format = this.$util.unique(goods_attr_format, "attr_id");
+				for (var i = 0; i < this.goodsSkuDetail.goods_attr_format.length; i++) {
+					for (var j = 0; j < goods_attr_format.length; j++) {
+						if (this.goodsSkuDetail.goods_attr_format[i].attr_id == goods_attr_format[j].attr_id && this.goodsSkuDetail.goods_attr_format[i].attr_value_id != goods_attr_format[j].attr_value_id) {
+							this.goodsSkuDetail.goods_attr_format[i].attr_value_name += "、" + goods_attr_format[j].attr_value_name;
+						}
+					}
+				}
+			}
+
+			// 商品SKU格式
+			if (this.goodsSkuDetail.goods_spec_format) this.goodsSkuDetail.goods_spec_format = JSON.parse(this.goodsSkuDetail.goods_spec_format);
+
+			// 商品详情
+			if (this.goodsSkuDetail.goods_content) this.goodsSkuDetail.goods_content = (this.goodsSkuDetail.goods_content);
+			console.log(this.goodsSkuDetail.goods_content)
+			//	if (this.goodsSkuDetail.goods_content) this.goodsSkuDetail.goods_content = htmlParser(this.goodsSkuDetail.goods_content);
+
+			//商品服务
+			if (this.goodsSkuDetail.goods_service) {
+				for (let i in this.goodsSkuDetail.goods_service) {
+					this.goodsSkuDetail.goods_service[i]['icon'] = this.goodsSkuDetail.goods_service[i]['icon'] ? JSON.parse(this.goodsSkuDetail.goods_service[i]['icon']) : '';
+				}
+			}
+
+			this.contactData = {
+				title: this.goodsSkuDetail.sku_name,
+				path: this.shareUrl,
+				img: this.$util.img(this.goodsSkuDetail.sku_image, {
+					size: 'big'
+				})
+			};
+			if (this.$refs.goodsPromotion) this.$refs.goodsPromotion.refresh(this.goodsSkuDetail.goods_promotion);
+
+			this.setPublicShare();
+			// if (this.goodsRoute != '/pages/goods/detail') this.setPublicShare();
+
+			this.getBarrageData();
+			if (this.addonIsExist.form) {
+				this.getGoodsForm();
+			}
+		},
+		/**
+		 * 刷新商品详情数据
+		 * @param {Object} data
+		 */
+		refreshGoodsSkuDetail(data) {
+			this.goodsSkuDetail = Object.assign({}, this.goodsSkuDetail, data);
+			if (this.$refs.goodsPromotion) this.$refs.goodsPromotion.refresh(this.goodsSkuDetail.goods_promotion);
+			if (this.$refs.goodsDetailView) {
+
+				// 初始化商品详情视图数据
+				this.goodsSkuDetail.unit = this.goodsSkuDetail.unit || "件";
+
+				// 解决轮播图数量不一致时，切换到第一个
+				if (this.swiperCurrent > this.goodsSkuDetail.sku_images.length) {
+					this.swiperAutoplay = true;
+					this.swiperCurrent = 1;
+					setTimeout(() => {
+						this.swiperAutoplay = false;
+					}, 40);
+				}
+
+			}
+			this.navbarData.title = this.goodsSkuDetail.goods_name.length > 9 ? this.goodsSkuDetail.goods_name.substr(0, 9) + "..." : this.goodsSkuDetail.goods_name;
+			this.$langConfig.title(this.navbarData.title);
+
+			if (this.goodsSkuDetail.membercard) {
+				this.membercard = this.goodsSkuDetail.membercard;
+			}
+		},
+		goodsDetailViewInit() {
+			// 初始化商品详情视图数据
+			if (this.$refs.goodsDetailView) this.$refs.goodsDetailView.init({
+				sku_id: this.skuId,
+				goods_id: this.goodsSkuDetail.goods_id,
+				preview: this.preview,
+				source_member: this.source_member,
+				posterParams: this.posterParams,
+				posterApi: this.posterApi,
+				shareUrl: this.shareUrl,
+				goodsRoute: this.goodsRoute,
+				isVirtual: this.goodsSkuDetail.is_virtual,
+				deliveryType: this.goodsSkuDetail.express_type,
+				whetherCollection: this.goodsSkuDetail.is_collect,
+				evaluateConfig: this.goodsSkuDetail.evaluate_config,
+				evaluateList: this.goodsSkuDetail.evaluate_list,
+				evaluateCount: this.goodsSkuDetail.evaluate_count
+			});
+		},
+		goHome() {
+			if (this.preview) return; // 开启预览，禁止任何操作和跳转
+			this.$util.redirectTo('/pages/index/index');
+		},
+		goCart() {
+			if (this.preview) return; // 开启预览，禁止任何操作和跳转
+			this.$util.redirectTo('/pages/goods/cart');
+		},
+		//-------------------------------------关注-------------------------------------
+		//更新商品信息
+		modifyGoodsInfo() {
+			if (this.preview) return; // 开启预览，禁止任何操作和跳转
+			//更新商品点击量
+			this.$api.sendRequest({
+				url: "/api/goods/modifyclicks",
+				data: {
+					sku_id: this.skuId
+				},
+				success: res => {
+				}
+			});
+
+			//添加足迹
+			this.$api.sendRequest({
+				url: "/api/goodsbrowse/add",
+				data: {
+					goods_id: this.goodsSkuDetail.goods_id,
+					sku_id: this.skuId
+				},
+				success: res => {
+				}
+			});
+		},
+		//-------------------------------------关注-------------------------------------
+		async editCollection() {
+			if (this.$refs.goodsDetailView) {
+				this.whetherCollection = await this.$refs.goodsDetailView.collection();
+			}
+		},
+		openSharePopup() {
+			if (this.$refs.goodsDetailView) {
+				this.$refs.goodsDetailView.openSharePopup();
+			}
+		},
+		//弹幕
+		getBarrageData() {
+			this.$api.sendRequest({
+				url: '/api/goods/goodsbarrage',
+				data: {
+					goods_id: this.goodsSkuDetail.goods_id
+				},
+				success: res => {
+					if (res.code == 0 && res.data) {
+						let barrageData = [];
+						for (let i in res.data.list) {
+							if (res.data.list[i]['title']) {
+								let title = res.data.list[i]['title'].substr(0, 1) + '*' + res.data.list[i]['title'].substr(res.data.list[i]['title'].length - 1, 1)
+								barrageData.push({
+									img: res.data.list[i]['img'] ? res.data.list[i]['img'] : this.$util.getDefaultImage().head,
+									title: title + '已下单'
+								});
+							}
+						}
+						this.goodsSkuDetail.barrageData = barrageData;
+					}
+				}
+			});
+		},
+		/**
+		 * 设置公众号分享
+		 */
+		setPublicShare() {
+			let shareUrl = this.$config.h5Domain + this.shareUrl;
+			if (this.memberInfo && this.memberInfo.member_id) shareUrl += '&source_member=' + this.memberInfo.member_id;
+			var store_info = this.$store.state.globalStoreInfo;
+			if (store_info) shareUrl+= '&store_id=' + store_info.store_id;
+			this.$util.setPublicShare({
+				title: this.goodsSkuDetail.goods_name,
+				desc: '',
+				link: shareUrl,
+				imgUrl: typeof this.goodsSkuDetail.goods_image == 'object' ? this.goodsSkuDetail.goods_image[0] : this.goodsSkuDetail.goods_image.split(',')[0]
+			})
+		},
+		/**
+		 * 获取商品表单
+		 */
+		getGoodsForm() {
+			this.$api.sendRequest({
+				url: "/form/api/form/goodsform",
+				data: {
+					goods_id: this.goodsSkuDetail.goods_id
+				},
+				success: res => {
+					if (res.code == 0 && res.data) this.$set(this.goodsSkuDetail, 'goods_form', res.data);
+				}
+			});
+		}
+	},
+	/**
+	 * 自定义分享内容
+	 * @param {Object} res
+	 */
+	onShareAppMessage(res) {
+		var path = this.shareUrl;
+		var store_info = this.$store.state.globalStoreInfo;
+		if (store_info) path+= '&store_id=' + store_info.store_id;
+		if (this.memberInfo && this.memberInfo.member_id) path += '&source_member=' + this.memberInfo.member_id;
+		return {
+			title: this.goodsSkuDetail.sku_name,
+			imageUrl: this.shareImg ? this.$util.img(this.shareImg) : this.$util.img(this.goodsSkuDetail.sku_image, {
+				size: 'big'
+			}),
+			path: path,
+			success: res => {
+			},
+			fail: res => {
+			}
+		};
+	},
+	// 分享到微信朋友圈
+	// #ifdef MP-WEIXIN
+	onShareTimeline() {
+		let query = this.shareQuery;
+		var store_info = this.$store.state.globalStoreInfo;
+		if (store_info) query+= '&store_id=' + store_info.store_id;
+		if (this.memberInfo && this.memberInfo.member_id) query += '&source_member=' + this.memberInfo.member_id;
+		return {
+			title: this.goodsSkuDetail.sku_name,
+			query: query,
+			imageUrl: this.$util.img(this.goodsSkuDetail.sku_image, {
+				size: 'big'
+			})
+		};
+	}
+	// #endif
 }
\ No newline at end of file
diff --git a/common/js/html-parser.js b/common/js/html-parser.js
index 5360f81..5832efa 100644
--- a/common/js/html-parser.js
+++ b/common/js/html-parser.js
@@ -1,440 +1,440 @@
-import util from './util.js'
-/*
- * HTML5 Parser By Sam Blowes
- *
- * Designed for HTML5 documents
- *
- * Original code by John Resig (ejohn.org)
- * http://ejohn.org/blog/pure-javascript-html-parser/
- * Original code by Erik Arvidsson, Mozilla Public License
- * http://erik.eae.net/simplehtmlparser/simplehtmlparser.js
- *
- * ----------------------------------------------------------------------------
- * License
- * ----------------------------------------------------------------------------
- *
- * This code is triple licensed using Apache Software License 2.0,
- * Mozilla Public License or GNU Public License
- *
- * ////////////////////////////////////////////////////////////////////////////
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License.  You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * ////////////////////////////////////////////////////////////////////////////
- *
- * The contents of this file are subject to the Mozilla Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
- * License for the specific language governing rights and limitations
- * under the License.
- *
- * The Original Code is Simple HTML Parser.
- *
- * The Initial Developer of the Original Code is Erik Arvidsson.
- * Portions created by Erik Arvidssson are Copyright (C) 2004. All Rights
- * Reserved.
- *
- * ////////////////////////////////////////////////////////////////////////////
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- * ----------------------------------------------------------------------------
- * Usage
- * ----------------------------------------------------------------------------
- *
- * // Use like so:
- * HTMLParser(htmlString, {
- *     start: function(tag, attrs, unary) {},
- *     end: function(tag) {},
- *     chars: function(text) {},
- *     comment: function(text) {}
- * });
- *
- * // or to get an XML string:
- * HTMLtoXML(htmlString);
- *
- * // or to get an XML DOM Document
- * HTMLtoDOM(htmlString);
- *
- * // or to inject into an existing document/DOM node
- * HTMLtoDOM(htmlString, document);
- * HTMLtoDOM(htmlString, document.body);
- *
- */
-// Regular Expressions for parsing tags and attributes
-var startTag =
-    /^<([-A-Za-z0-9_]+)((?:\s+[a-zA-Z_:][-a-zA-Z0-9_:.]*(?:\s*=\s*(?:(?:"[^"]*")|(?:'[^']*')|[^>\s]+))?)*)\s*(\/?)>/;
-var endTag = /^<\/([-A-Za-z0-9_]+)[^>]*>/;
-var attr =
-/([a-zA-Z_:][-a-zA-Z0-9_:.]*)(?:\s*=\s*(?:(?:"((?:\\.|[^"])*)")|(?:'((?:\\.|[^'])*)')|([^>\s]+)))?/g; // Empty Elements - HTML 5
-
-var empty = makeMap(
-    'area,base,basefont,br,col,frame,hr,img,input,link,meta,param,embed,command,keygen,source,track,wbr'
-    ); // Block Elements - HTML 5
-// fixed by xxx 将 ins 标签从块级名单中移除
-
-var block = makeMap(
-    'a,address,article,applet,aside,audio,blockquote,button,canvas,center,dd,del,dir,div,dl,dt,fieldset,figcaption,figure,footer,form,frameset,h1,h2,h3,h4,h5,h6,header,hgroup,hr,iframe,isindex,li,map,menu,noframes,noscript,object,ol,output,p,pre,section,script,table,tbody,td,tfoot,th,thead,tr,ul,video'
-); // Inline Elements - HTML 5
-
-var inline = makeMap(
-    'abbr,acronym,applet,b,basefont,bdo,big,br,button,cite,code,del,dfn,em,font,i,iframe,img,input,ins,kbd,label,map,object,q,s,samp,script,select,small,span,strike,strong,sub,sup,textarea,tt,u,var'
-); // Elements that you can, intentionally, leave open
-// (and which close themselves)
-
-var closeSelf = makeMap(
-'colgroup,dd,dt,li,options,p,td,tfoot,th,thead,tr'); // Attributes that have their values filled in disabled="disabled"
-
-var fillAttrs = makeMap(
-    'checked,compact,declare,defer,disabled,ismap,multiple,nohref,noresize,noshade,nowrap,readonly,selected'
-    ); // Special Elements (can contain anything)
-
-var special = makeMap('script,style');
-
-function HTMLParser(html, handler) {
-    var index;
-    var chars;
-    var match;
-    var stack = [];
-    var last = html;
-
-    stack.last = function() {
-        return this[this.length - 1];
-    };
-
-    while (html) {
-        chars = true; // Make sure we're not in a script or style element
-        if (!stack.last() || !special[stack.last()]) {
-            // Comment
-            if (html.indexOf('<!--') == 0) {
-                index = html.indexOf('-->');
-
-                if (index >= 0) {
-                    if (handler.comment) {
-                        handler.comment(html.substring(4, index));
-                    }
-
-                    html = html.substring(index + 3);
-                    chars = false;
-                } // end tag
-
-            } else if (html.indexOf('</') == 0) {
-                match = html.match(endTag);
-
-                if (match) {
-                    html = html.substring(match[0].length);
-                    match[0].replace(endTag, parseEndTag);
-                    chars = false;
-                } // start tag
-
-            } else if (html.indexOf('<') == 0) {
-                match = html.match(startTag);
-
-                if (match) {
-                    html = html.substring(match[0].length);
-                    match[0].replace(startTag, parseStartTag);
-                    chars = false;
-                }
-            }
-
-            if (chars) {
-                index = html.indexOf('<');
-                var text = index < 0 ? html : html.substring(0, index);
-                html = index < 0 ? '' : html.substring(index);
-
-                if (handler.chars) {
-                    handler.chars(text);
-                }
-            }
-        } else {
-            html = html.replace(new RegExp('([\\s\\S]*?)<\/' + stack.last() + '[^>]*>'), function(all, text) {
-                text = text.replace(/<!--([\s\S]*?)-->|<!\[CDATA\[([\s\S]*?)]]>/g, '$1$2');
-
-                if (handler.chars) {
-                    handler.chars(text);
-                }
-
-                return '';
-            });
-            parseEndTag('', stack.last());
-        }
-
-
-        if (html == last) {
-            throw 'Parse Error: ' + html;
-        }
-
-        last = html;
-    } // Clean up any remaining tags
-
-
-    parseEndTag();
-
-    function parseStartTag(tag, tagName, rest, unary) {
-        tagName = tagName.toLowerCase();
-
-        if (block[tagName]) {
-            while (stack.last() && inline[stack.last()]) {
-                parseEndTag('', stack.last());
-            }
-        }
-
-        if (closeSelf[tagName] && stack.last() == tagName) {
-            parseEndTag('', tagName);
-        }
-
-        unary = empty[tagName] || !!unary;
-
-        if (!unary) {
-            stack.push(tagName);
-        }
-
-        if (handler.start) {
-            var attrs = [];
-            rest.replace(attr, function(match, name) {
-                var value = arguments[2] ? arguments[2] : arguments[3] ? arguments[3] : arguments[4] ?
-                    arguments[4] : fillAttrs[
-                        name] ? name : '';
-                attrs.push({
-                    name: name,
-                    value: value,
-                    escaped: value.replace(/(^|[^\\])"/g, '$1\\\"') // "
-
-                });
-            });
-
-            if (handler.start) {
-                handler.start(tagName, attrs, unary);
-            }
-        }
-    }
-
-    function parseEndTag(tag, tagName) {
-        // If no tag name is provided, clean shop
-        if (!tagName) {
-            var pos = 0;
-        } // Find the closest opened tag of the same type
-        else {
-            for (var pos = stack.length - 1; pos >= 0; pos--) {
-                if (stack[pos] == tagName) {
-                    break;
-                }
-            }
-        }
-
-        if (pos >= 0) {
-            // Close all the open elements, up the stack
-            for (var i = stack.length - 1; i >= pos; i--) {
-                if (handler.end) {
-                    handler.end(stack[i]);
-                }
-            } // Remove the open elements from the stack
-
-
-            stack.length = pos;
-        }
-    }
-}
-
-function makeMap(str) {
-    var obj = {};
-    var items = str.split(',');
-
-    for (var i = 0; i < items.length; i++) {
-        obj[items[i]] = true;
-    }
-
-    return obj;
-}
-
-function removeDOCTYPE(html) {
-    return html.replace(/<\?xml.*\?>\n/, '').replace(/<!doctype.*>\n/, '').replace(/<!DOCTYPE.*>\n/, '');
-}
-
-/**
- * 忽略注释
- * @param {Object} html
- */
-function replaceAnnotation(html) {
-    var html = html.replace(/<!--[\s\S]*-->/gi, '');
-    return html;
-}
-
-/**
- * 替换图片
- * @param {Object} html
- */
-function replaceImage(html) {
-
-    // #ifdef MP
-    let info = uni.getSystemInfoSync();
-    var screenWidth = info.windowWidth;
-    screenWidth -= 20;
-    screenWidth += 'px';
-    // #endif
-
-    // #ifdef H5
-    var screenWidth = '100%';
-    // #endif
-
-    let rep = `<img style="width:100% !important;display:block;max-width: ${screenWidth} !important;"`;
-    var html = html.replace(/\\/g, '').replace(/<img/g, rep);
-    html = html.replace(/<img [^>]*src=['"]([^'"]+)[^>]*>/gi, (match, capture) => {
-        return rep + ' src="' + util.img(capture) + '"/>';
-    });
-    return html;
-}
-function replaceVideo(html){
-	// #ifdef MP
-	let info = uni.getSystemInfoSync();
-	var screenWidth = info.windowWidth;
-	screenWidth -= 20;
-	screenWidth += 'px';
-	// #endif
-	
-	// #ifdef H5
-	var screenWidth = '100%';
-	// #endif
-	
-	let rep = `<video style="width:100% !important;display:block;max-width: ${screenWidth} !important;"`;
-	var html = html.replace(/\\/g, '').replace(/<video/g, rep);
-	console.log(html)
-	html = html.replace(/<video [^>]*src=['"]([^'"]+)[^>]*>/gi, (match, capture) => {
-	    return rep + ' src="' + util.img(capture) + '"/>';
-	});
-	// console.log(html)
-	return html;
-}
-
-/**
- * 将style属性中的双引号改为单引号
- * @param {Object} html
- */
-function replaceStyleQuotes(html) {
-    var html = html.replace(/style\s*=\s*["][^>]*;[^"]?/gi, (match, capture) => {
-        match = match.replace(/[:](\s?)[\s\S]*/gi, (a, b) => {
-            return a.replace(/"/g, "'");
-        });
-        return match;
-    });
-    return html;
-}
-
-function parseAttrs(attrs) {
-    return attrs.reduce(function(pre, attr) {
-        var value = attr.value;
-        var name = attr.name;
-
-        if (pre[name]) {
-            pre[name] = pre[name] + " " + value;
-        } else {
-            pre[name] = value;
-        }
-
-        return pre;
-    }, {});
-}
-
-function parseHtml(html) {
-    html = removeDOCTYPE(html);
-    html = replaceAnnotation(html); //忽略注释
-    html = replaceImage(html); //替换图片
-    html = replaceStyleQuotes(html); //将style属性中的双引号改为单引号
-	
-   html = replaceVideo(html); //替换视频链接
-    var stacks = [];
-    var results = {
-        node: 'root',
-        children: []
-    };
-    HTMLParser(html, {
-        start: function start(tag, attrs, unary) {
-            var node = {
-                name: tag
-            };
-
-            if (attrs.length !== 0) {
-                node.attrs = parseAttrs(attrs);
-            }
-
-            if (unary) {
-                var parent = stacks[0] || results;
-
-                if (!parent.children) {
-                    parent.children = [];
-                }
-
-                parent.children.push(node);
-            } else {
-                stacks.unshift(node);
-            }
-        },
-        end: function end(tag) {
-            var node = stacks.shift();
-            if (node.name !== tag) console.error('invalid state: mismatch end tag');
-            if (stacks.length === 0) {
-                results.children.push(node);
-            } else {
-                var parent = stacks[0];
-
-                if (!parent.children) {
-                    parent.children = [];
-                }
-
-                parent.children.push(node);
-            }
-        },
-        chars: function chars(text) {
-            var node = {
-                type: 'text',
-                text: text
-            };
-
-            if (stacks.length === 0) {
-                results.children.push(node);
-            } else {
-                var parent = stacks[0];
-
-                if (!parent.children) {
-                    parent.children = [];
-                }
-
-                parent.children.push(node);
-            }
-        },
-        comment: function comment(text) {
-            var node = {
-                node: 'comment',
-                text: text
-            };
-            var parent = stacks[0];
-
-            if (!parent.children) {
-                parent.children = [];
-            }
-
-            parent.children.push(node);
-        }
-    });
-    return results.children;
-}
-
+import util from './util.js'
+/*
+ * HTML5 Parser By Sam Blowes
+ *
+ * Designed for HTML5 documents
+ *
+ * Original code by John Resig (ejohn.org)
+ * http://ejohn.org/blog/pure-javascript-html-parser/
+ * Original code by Erik Arvidsson, Mozilla Public License
+ * http://erik.eae.net/simplehtmlparser/simplehtmlparser.js
+ *
+ * ----------------------------------------------------------------------------
+ * License
+ * ----------------------------------------------------------------------------
+ *
+ * This code is triple licensed using Apache Software License 2.0,
+ * Mozilla Public License or GNU Public License
+ *
+ * ////////////////////////////////////////////////////////////////////////////
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License.  You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * ////////////////////////////////////////////////////////////////////////////
+ *
+ * The contents of this file are subject to the Mozilla Public License
+ * Version 1.1 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ *
+ * The Original Code is Simple HTML Parser.
+ *
+ * The Initial Developer of the Original Code is Erik Arvidsson.
+ * Portions created by Erik Arvidssson are Copyright (C) 2004. All Rights
+ * Reserved.
+ *
+ * ////////////////////////////////////////////////////////////////////////////
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * ----------------------------------------------------------------------------
+ * Usage
+ * ----------------------------------------------------------------------------
+ *
+ * // Use like so:
+ * HTMLParser(htmlString, {
+ *     start: function(tag, attrs, unary) {},
+ *     end: function(tag) {},
+ *     chars: function(text) {},
+ *     comment: function(text) {}
+ * });
+ *
+ * // or to get an XML string:
+ * HTMLtoXML(htmlString);
+ *
+ * // or to get an XML DOM Document
+ * HTMLtoDOM(htmlString);
+ *
+ * // or to inject into an existing document/DOM node
+ * HTMLtoDOM(htmlString, document);
+ * HTMLtoDOM(htmlString, document.body);
+ *
+ */
+// Regular Expressions for parsing tags and attributes
+var startTag =
+    /^<([-A-Za-z0-9_]+)((?:\s+[a-zA-Z_:][-a-zA-Z0-9_:.]*(?:\s*=\s*(?:(?:"[^"]*")|(?:'[^']*')|[^>\s]+))?)*)\s*(\/?)>/;
+var endTag = /^<\/([-A-Za-z0-9_]+)[^>]*>/;
+var attr =
+/([a-zA-Z_:][-a-zA-Z0-9_:.]*)(?:\s*=\s*(?:(?:"((?:\\.|[^"])*)")|(?:'((?:\\.|[^'])*)')|([^>\s]+)))?/g; // Empty Elements - HTML 5
+
+var empty = makeMap(
+    'area,base,basefont,br,col,frame,hr,img,input,link,meta,param,embed,command,keygen,source,track,wbr'
+    ); // Block Elements - HTML 5
+// fixed by xxx 将 ins 标签从块级名单中移除
+
+var block = makeMap(
+    'a,address,article,applet,aside,audio,blockquote,button,canvas,center,dd,del,dir,div,dl,dt,fieldset,figcaption,figure,footer,form,frameset,h1,h2,h3,h4,h5,h6,header,hgroup,hr,iframe,isindex,li,map,menu,noframes,noscript,object,ol,output,p,pre,section,script,table,tbody,td,tfoot,th,thead,tr,ul,video'
+); // Inline Elements - HTML 5
+
+var inline = makeMap(
+    'abbr,acronym,applet,b,basefont,bdo,big,br,button,cite,code,del,dfn,em,font,i,iframe,img,input,ins,kbd,label,map,object,q,s,samp,script,select,small,span,strike,strong,sub,sup,textarea,tt,u,var'
+); // Elements that you can, intentionally, leave open
+// (and which close themselves)
+
+var closeSelf = makeMap(
+'colgroup,dd,dt,li,options,p,td,tfoot,th,thead,tr'); // Attributes that have their values filled in disabled="disabled"
+
+var fillAttrs = makeMap(
+    'checked,compact,declare,defer,disabled,ismap,multiple,nohref,noresize,noshade,nowrap,readonly,selected'
+    ); // Special Elements (can contain anything)
+
+var special = makeMap('script,style');
+
+function HTMLParser(html, handler) {
+    var index;
+    var chars;
+    var match;
+    var stack = [];
+    var last = html;
+
+    stack.last = function() {
+        return this[this.length - 1];
+    };
+
+    while (html) {
+        chars = true; // Make sure we're not in a script or style element
+        if (!stack.last() || !special[stack.last()]) {
+            // Comment
+            if (html.indexOf('<!--') == 0) {
+                index = html.indexOf('-->');
+
+                if (index >= 0) {
+                    if (handler.comment) {
+                        handler.comment(html.substring(4, index));
+                    }
+
+                    html = html.substring(index + 3);
+                    chars = false;
+                } // end tag
+
+            } else if (html.indexOf('</') == 0) {
+                match = html.match(endTag);
+
+                if (match) {
+                    html = html.substring(match[0].length);
+                    match[0].replace(endTag, parseEndTag);
+                    chars = false;
+                } // start tag
+
+            } else if (html.indexOf('<') == 0) {
+                match = html.match(startTag);
+
+                if (match) {
+                    html = html.substring(match[0].length);
+                    match[0].replace(startTag, parseStartTag);
+                    chars = false;
+                }
+            }
+
+            if (chars) {
+                index = html.indexOf('<');
+                var text = index < 0 ? html : html.substring(0, index);
+                html = index < 0 ? '' : html.substring(index);
+
+                if (handler.chars) {
+                    handler.chars(text);
+                }
+            }
+        } else {
+            html = html.replace(new RegExp('([\\s\\S]*?)<\/' + stack.last() + '[^>]*>'), function(all, text) {
+                text = text.replace(/<!--([\s\S]*?)-->|<!\[CDATA\[([\s\S]*?)]]>/g, '$1$2');
+
+                if (handler.chars) {
+                    handler.chars(text);
+                }
+
+                return '';
+            });
+            parseEndTag('', stack.last());
+        }
+
+
+        if (html == last) {
+            throw 'Parse Error: ' + html;
+        }
+
+        last = html;
+    } // Clean up any remaining tags
+
+
+    parseEndTag();
+
+    function parseStartTag(tag, tagName, rest, unary) {
+        tagName = tagName.toLowerCase();
+
+        if (block[tagName]) {
+            while (stack.last() && inline[stack.last()]) {
+                parseEndTag('', stack.last());
+            }
+        }
+
+        if (closeSelf[tagName] && stack.last() == tagName) {
+            parseEndTag('', tagName);
+        }
+
+        unary = empty[tagName] || !!unary;
+
+        if (!unary) {
+            stack.push(tagName);
+        }
+
+        if (handler.start) {
+            var attrs = [];
+            rest.replace(attr, function(match, name) {
+                var value = arguments[2] ? arguments[2] : arguments[3] ? arguments[3] : arguments[4] ?
+                    arguments[4] : fillAttrs[
+                        name] ? name : '';
+                attrs.push({
+                    name: name,
+                    value: value,
+                    escaped: value.replace(/(^|[^\\])"/g, '$1\\\"') // "
+
+                });
+            });
+
+            if (handler.start) {
+                handler.start(tagName, attrs, unary);
+            }
+        }
+    }
+
+    function parseEndTag(tag, tagName) {
+        // If no tag name is provided, clean shop
+        if (!tagName) {
+            var pos = 0;
+        } // Find the closest opened tag of the same type
+        else {
+            for (var pos = stack.length - 1; pos >= 0; pos--) {
+                if (stack[pos] == tagName) {
+                    break;
+                }
+            }
+        }
+
+        if (pos >= 0) {
+            // Close all the open elements, up the stack
+            for (var i = stack.length - 1; i >= pos; i--) {
+                if (handler.end) {
+                    handler.end(stack[i]);
+                }
+            } // Remove the open elements from the stack
+
+
+            stack.length = pos;
+        }
+    }
+}
+
+function makeMap(str) {
+    var obj = {};
+    var items = str.split(',');
+
+    for (var i = 0; i < items.length; i++) {
+        obj[items[i]] = true;
+    }
+
+    return obj;
+}
+
+function removeDOCTYPE(html) {
+    return html.replace(/<\?xml.*\?>\n/, '').replace(/<!doctype.*>\n/, '').replace(/<!DOCTYPE.*>\n/, '');
+}
+
+/**
+ * 忽略注释
+ * @param {Object} html
+ */
+function replaceAnnotation(html) {
+    var html = html.replace(/<!--[\s\S]*-->/gi, '');
+    return html;
+}
+
+/**
+ * 替换图片
+ * @param {Object} html
+ */
+function replaceImage(html) {
+
+    // #ifdef MP
+    let info = uni.getWindowInfo();
+    var screenWidth = info.windowWidth;
+    screenWidth -= 20;
+    screenWidth += 'px';
+    // #endif
+
+    // #ifdef H5
+    var screenWidth = '100%';
+    // #endif
+
+    let rep = `<img style="width:100% !important;display:block;max-width: ${screenWidth} !important;"`;
+    var html = html.replace(/\\/g, '').replace(/<img/g, rep);
+    html = html.replace(/<img [^>]*src=['"]([^'"]+)[^>]*>/gi, (match, capture) => {
+        return rep + ' src="' + util.img(capture) + '"/>';
+    });
+    return html;
+}
+function replaceVideo(html){
+	// #ifdef MP
+	let info = uni.getWindowInfo();
+	var screenWidth = info.windowWidth;
+	screenWidth -= 20;
+	screenWidth += 'px';
+	// #endif
+	
+	// #ifdef H5
+	var screenWidth = '100%';
+	// #endif
+	
+	let rep = `<video style="width:100% !important;display:block;max-width: ${screenWidth} !important;"`;
+	var html = html.replace(/\\/g, '').replace(/<video/g, rep);
+	console.log(html)
+	html = html.replace(/<video [^>]*src=['"]([^'"]+)[^>]*>/gi, (match, capture) => {
+	    return rep + ' src="' + util.img(capture) + '"/>';
+	});
+	// console.log(html)
+	return html;
+}
+
+/**
+ * 将style属性中的双引号改为单引号
+ * @param {Object} html
+ */
+function replaceStyleQuotes(html) {
+    var html = html.replace(/style\s*=\s*["][^>]*;[^"]?/gi, (match, capture) => {
+        match = match.replace(/[:](\s?)[\s\S]*/gi, (a, b) => {
+            return a.replace(/"/g, "'");
+        });
+        return match;
+    });
+    return html;
+}
+
+function parseAttrs(attrs) {
+    return attrs.reduce(function(pre, attr) {
+        var value = attr.value;
+        var name = attr.name;
+
+        if (pre[name]) {
+            pre[name] = pre[name] + " " + value;
+        } else {
+            pre[name] = value;
+        }
+
+        return pre;
+    }, {});
+}
+
+function parseHtml(html) {
+    html = removeDOCTYPE(html);
+    html = replaceAnnotation(html); //忽略注释
+    html = replaceImage(html); //替换图片
+    html = replaceStyleQuotes(html); //将style属性中的双引号改为单引号
+	
+   html = replaceVideo(html); //替换视频链接
+    var stacks = [];
+    var results = {
+        node: 'root',
+        children: []
+    };
+    HTMLParser(html, {
+        start: function start(tag, attrs, unary) {
+            var node = {
+                name: tag
+            };
+
+            if (attrs.length !== 0) {
+                node.attrs = parseAttrs(attrs);
+            }
+
+            if (unary) {
+                var parent = stacks[0] || results;
+
+                if (!parent.children) {
+                    parent.children = [];
+                }
+
+                parent.children.push(node);
+            } else {
+                stacks.unshift(node);
+            }
+        },
+        end: function end(tag) {
+            var node = stacks.shift();
+            if (node.name !== tag) console.error('invalid state: mismatch end tag');
+            if (stacks.length === 0) {
+                results.children.push(node);
+            } else {
+                var parent = stacks[0];
+
+                if (!parent.children) {
+                    parent.children = [];
+                }
+
+                parent.children.push(node);
+            }
+        },
+        chars: function chars(text) {
+            var node = {
+                type: 'text',
+                text: text
+            };
+
+            if (stacks.length === 0) {
+                results.children.push(node);
+            } else {
+                var parent = stacks[0];
+
+                if (!parent.children) {
+                    parent.children = [];
+                }
+
+                parent.children.push(node);
+            }
+        },
+        comment: function comment(text) {
+            var node = {
+                node: 'comment',
+                text: text
+            };
+            var parent = stacks[0];
+
+            if (!parent.children) {
+                parent.children = [];
+            }
+
+            parent.children.push(node);
+        }
+    });
+    return results.children;
+}
+
 export default parseHtml;
\ No newline at end of file
diff --git a/common/js/http.js b/common/js/http.js
index 9ee01c6..2e6167c 100644
--- a/common/js/http.js
+++ b/common/js/http.js
@@ -1,255 +1,289 @@
-import Config from './config.js'
-import Util from './util.js'
-import store from '@/store/index.js'
-
-// #ifdef H5
-const app_type = Util.isWeiXin() ? 'wechat' : 'h5';
-const app_type_name = Util.isWeiXin() ? '微信公众号' : 'H5';
-// #endif
-
-// #ifdef MP-WEIXIN
-const app_type = 'weapp';
-const app_type_name = '微信小程序';
-// #endif
-
-// #ifdef MP-ALIPAY
-const app_type = 'aliapp';
-const app_type_name = '支付宝小程序';
-// #endif
-
-// #ifdef MP-BAIDU
-const app_type = 'baiduapp';
-const app_type_name = '百度小程序';
-// #endif
-
-// #ifdef MP-TOUTIAO
-const app_type = 'MP-TOUTIAO';
-const app_type_name = '头条小程序';
-// #endif
-
-// #ifdef MP-QQ
-const app_type = 'MP-QQ';
-const app_type_name = 'QQ小程序';
-// #endif
-
-// #ifdef APP-PLUS
-const app_type = 'app';
-const app_type_name = 'APP';
-// #endif
-
-export default {
-	sendRequest(params) {
-		if (!Config.baseUrl) {
-			uni.showToast({
-				title: '未配置请求域名',
-				'icon': 'none',
-				duration: 10000
-			});
-			return;
-		}
-
-		var method = params.data != undefined ? 'POST' : 'GET', // 请求方式
-			url = Config.baseUrl + params.url, // 请求路径
-			data = {
-				app_type,
-				app_type_name
-			};
-
-		// token
-		data.token = store.state.token || '';
-		data.uniacid = Config.uniacid
-		// 门店id
-		var default_store_info = store.state.defaultStoreInfo;
-		if (default_store_info) {
-			data.store_id = default_store_info.store_id;
-		}
-
-		var store_info = store.state.globalStoreInfo;
-
-		if (store_info) data.store_id = store_info.store_id;
-
-		// 参数
-		if (params.data != undefined) Object.assign(data, params.data);
-
-		if (params.async === false) {
-			//同步
-			return new Promise((resolve, reject) => {
-				uni.request({
-					url: url,
-					method: method,
-					data: data,
-					header: params.header || {
-						// 'Accept': 'application/json',
-						'content-type': 'application/x-www-form-urlencoded;application/json'
-					},
-					dataType: params.dataType || 'json',
-					responseType: params.responseType || 'text',
-					success: (res) => {
-						// try {
-						// 	res.data = JSON.parse(res.data);
-						// } catch (e) {
-						// 	//TODO handle the exception
-						// 	console.log('api error：', e);
-						// }
-						if (res.data.code == -3 && store.state.siteState > 0) {
-							store.commit('setSiteState', -3);
-							Util.redirectTo('/pages_tool/storeclose/storeclose', {}, 'reLaunch');
-							return;
-						}
-						if (res.data.refreshtoken) {
-							store.commit('setToken', res.data.refreshtoken);
-						}
-						if (res.data.code == -10009 || res.data.code == -10010) {
-							store.commit('setToken', '');
-							store.commit('setMemberInfo', '');
-						}
-						resolve(res.data);
-					},
-					fail: (res) => {
-						if (res.errMsg && res.errMsg == 'request:fail url not in domain list') {
-							uni.showToast({
-								title: Config.baseUrl + '不在request 合法域名列表中',
-								'icon': 'none',
-								duration: 10000
-							});
-							return;
-						}
-						reject(res);
-					},
-					complete: (res) => {
-						if ((res.errMsg && res.errMsg != "request:ok") || (res.statusCode && [200, 500].indexOf(res.statusCode) == -1)) {
-							uni.showToast({
-								title: Config.baseUrl + '请求失败',
-								'icon': 'none',
-								duration: 10000
-							});
-							return;
-						}
-						reject(res.data);
-					}
-				});
-			});
-		} else {
-			//异步
-			uni.request({
-				url: url,
-				method: method,
-				data: data,
-				header: params.header || {
-					// 'Accept': 'application/json',
-					'content-type': 'application/x-www-form-urlencoded;application/json'
-				},
-				dataType: params.dataType || 'json',
-				responseType: params.responseType || 'text',
-				success: (res) => {
-					// try {
-					// 	res.data = JSON.parse(res.data);
-					// } catch (e) {
-					// 	//TODO handle the exception
-					// 	console.log('api error：', e);
-					// }
-					if (res.data.code == -3 && store.state.siteState > 0) {
-						store.commit('setSiteState', -3);
-						Util.redirectTo('/pages_tool/storeclose/storeclose', {}, 'reLaunch');
-						return;
-					}
-					if (res.data.refreshtoken) {
-						store.commit('setToken', res.data.refreshtoken);
-					}
-					if (res.data.code == -10009 || res.data.code == -10010) {
-						store.commit('setToken', '');
-						store.commit('setMemberInfo', '');
-					}
-					typeof params.success == 'function' && params.success(res.data);
-				},
-				fail: (res) => {
-					if (res.errMsg && res.errMsg == 'request:fail url not in domain list') {
-						uni.showToast({
-							title: Config.baseUrl + '不在request 合法域名列表中',
-							'icon': 'none',
-							duration: 10000
-						});
-						return;
-					}
-					typeof params.fail == 'function' && params.fail(res);
-				},
-				complete: (res) => {
-					if ((res.errMsg && res.errMsg != "request:ok") || (res.statusCode && [200, 500].indexOf(res.statusCode) == -1)) {
-						uni.showToast({
-							title: Config.baseUrl + '请求失败',
-							'icon': 'none',
-							duration: 10000
-						});
-						return;
-					}
-					typeof params.complete == 'function' && params.complete(res.data);
-				}
-			});
-		}
-	},
-	uploadBase64(params) {
-		uni.request({
-			url: Config.baseUrl + '/api/upload/headimgBase64',
-			method: 'POST',
-			header: {
-				'content-type': 'application/x-www-form-urlencoded;application/json'
-			},
-			data: {
-				app_type,
-				app_type_name,
-				images: params.base64
-			},
-			dataType: 'json',
-			responseType: 'text',
-			success: res => {
-				typeof params.success == 'function' && params.success(res.data);
-			},
-			fail: () => {
-				typeof params.fail == 'function' && params.fail(res);
-			}
-		});
-	},
-	pullImage(params) {
-		uni.request({
-			url: Config.baseUrl + '/api/upload/headimgPull',
-			method: 'POST',
-			header: {
-				'content-type': 'application/x-www-form-urlencoded;application/json'
-			},
-			data: {
-				app_type,
-				app_type_name,
-				path: params.path
-			},
-			dataType: 'json',
-			responseType: 'text',
-			success: res => {
-				typeof params.success == 'function' && params.success(res.data);
-			},
-			fail: () => {
-				typeof params.fail == 'function' && params.fail(res);
-			}
-		});
-	},
-	upload(params) {
-		uni.uploadFile({
-			url: Config.baseUrl + params.url,
-			filePath: params.filePath,
-			name: params.name || 'file',
-			fileType: params.fileType || 'image',
-			formData: {
-				app_type,
-				app_type_name,
-			},
-			header: {
-				'content-type': 'application/x-www-form-urlencoded;application/json'
-			},
-			success: (res) => {
-				typeof params.success == 'function' && params.success(JSON.parse(res.data));
-			},
-			fail: (res) => {
-				typeof params.fail == 'function' && params.fail(res);
-			}
-		});
-	}
+import Config from './config.js'
+import Util from './util.js'
+import store from '@/store/index.js'
+import { Utils } from 'common/js/map-wx-jssdk.js';
+	
+// #ifdef H5
+const app_type = Util.isWeiXin() ? 'wechat' : 'h5';
+const app_type_name = Util.isWeiXin() ? '微信公众号' : 'H5';
+// #endif
+
+// #ifdef MP-WEIXIN
+const app_type = 'weapp';
+const app_type_name = '微信小程序';
+// #endif
+
+// #ifdef MP-ALIPAY
+const app_type = 'aliapp';
+const app_type_name = '支付宝小程序';
+// #endif
+
+// #ifdef MP-BAIDU
+const app_type = 'baiduapp';
+const app_type_name = '百度小程序';
+// #endif
+
+// #ifdef MP-TOUTIAO
+const app_type = 'MP-TOUTIAO';
+const app_type_name = '头条小程序';
+// #endif
+
+// #ifdef MP-QQ
+const app_type = 'MP-QQ';
+const app_type_name = 'QQ小程序';
+// #endif
+
+// #ifdef APP-PLUS
+const app_type = 'app';
+const app_type_name = 'APP';
+// #endif
+
+export default {
+	sendRequest(params) {
+		if (!Config.baseUrl) {
+			uni.showToast({
+				title: '未配置请求域名',
+				'icon': 'none',
+				duration: 10000
+			});
+			return;
+		}
+
+		var method = params.data != undefined ? 'POST' : 'GET', // 请求方式
+			url = Config.baseUrl + params.url, // 请求路径
+			data = {
+				app_type,
+				app_type_name
+			};
+
+		// token
+		data.token = store.state.token || '';
+		data.uniacid = Config.uniacid
+		// 门店id
+		var default_store_info = store.state.defaultStoreInfo;
+		if (default_store_info) {
+			data.store_id = default_store_info.store_id;
+		}
+
+		var store_info = store.state.globalStoreInfo;
+
+		if (store_info) data.store_id = store_info.store_id;
+
+		// 参数
+		if (params.data != undefined) Object.assign(data, params.data);
+
+		if (params.async === false) {
+			//同步
+			return new Promise((resolve, reject) => {
+				uni.request({
+					url: url,
+					method: method,
+					data: data,
+					header: params.header || {
+						// 'Accept': 'application/json',
+						'content-type': 'application/x-www-form-urlencoded;application/json'
+					},
+					dataType: params.dataType || 'json',
+					responseType: params.responseType || 'text',
+					success: (res) => {
+						// try {
+						// 	res.data = JSON.parse(res.data);
+						// } catch (e) {
+						// 	//TODO handle the exception
+						// 	console.log('api error：', e);
+						// }
+						if (res.data.code == -3 && store.state.siteState > 0) {
+							store.commit('setSiteState', -3);
+							Util.redirectTo('/pages_tool/storeclose/storeclose', {}, 'reLaunch');
+							return;
+						}
+						if (res.data.refreshtoken) {
+							store.commit('setToken', res.data.refreshtoken);
+						}
+						if (res.data.code == -10009 || res.data.code == -10010) {
+							store.commit('setToken', '');
+							store.commit('setMemberInfo', '');
+						}
+						resolve(res.data);
+					},
+					fail: (res) => {
+						if (res.errMsg && res.errMsg == 'request:fail url not in domain list') {
+							uni.showToast({
+								title: Config.baseUrl + '不在request 合法域名列表中',
+								'icon': 'none',
+								duration: 10000
+							});
+							return;
+						}
+						reject(res);
+					},
+					complete: (res) => {
+						if ((res.errMsg && res.errMsg != "request:ok") || (res.statusCode && [200, 500].indexOf(res.statusCode) == -1)) {
+							uni.showToast({
+								title: Config.baseUrl + '请求失败',
+								'icon': 'none',
+								duration: 10000
+							});
+							return;
+						}
+						reject(res.data);
+					}
+				});
+			});
+		} else {
+			//异步
+			uni.request({
+				url: url,
+				method: method,
+				data: data,
+				header: params.header || {
+					// 'Accept': 'application/json',
+					'content-type': 'application/x-www-form-urlencoded;application/json'
+				},
+				dataType: params.dataType || 'json',
+				responseType: params.responseType || 'text',
+				success: (res) => {
+					// try {
+					// 	res.data = JSON.parse(res.data);
+					// } catch (e) {
+					// 	//TODO handle the exception
+					// 	console.log('api error：', e);
+					// }
+					if (res.data.code == -3 && store.state.siteState > 0) {
+						store.commit('setSiteState', -3);
+						Util.redirectTo('/pages_tool/storeclose/storeclose', {}, 'reLaunch');
+						return;
+					}
+					if (res.data.refreshtoken) {
+						store.commit('setToken', res.data.refreshtoken);
+					}
+					if (res.data.code == -10009 || res.data.code == -10010) {
+						store.commit('setToken', '');
+						store.commit('setMemberInfo', '');
+					}
+					typeof params.success == 'function' && params.success(res.data);
+				},
+				fail: (res) => {
+					if (res.errMsg && res.errMsg == 'request:fail url not in domain list') {
+						uni.showToast({
+							title: Config.baseUrl + '不在request 合法域名列表中',
+							'icon': 'none',
+							duration: 10000
+						});
+						return;
+					}
+					typeof params.fail == 'function' && params.fail(res);
+				},
+				complete: (res) => {
+					if ((res.errMsg && res.errMsg != "request:ok") || (res.statusCode && [200, 500].indexOf(res.statusCode) == -1)) {
+						uni.showToast({
+							title: Config.baseUrl + '请求失败',
+							'icon': 'none',
+							duration: 10000
+						});
+						return;
+					}
+					typeof params.complete == 'function' && params.complete(res.data);
+				}
+			});
+		}
+	},
+	needMd5Fn(params,callback) {
+		uni.request({
+			url: Config.baseUrl + '/api/config/getApiConfig',
+			method: 'POST',
+			header: {
+				'content-type': 'application/x-www-form-urlencoded;application/json'
+			},
+			data: {
+				app_type,
+				app_type_name,
+			},
+			dataType: 'json',
+			responseType: 'text',
+			success: res => {
+				var sign_str = Utils.hexMD5('key=' + res.data.data.key+'&time='+res.data.data.time)
+				typeof callback == 'function' && callback(sign_str,res.data.data.time);
+			},
+			fail: () => {
+				typeof params.fail == 'function' && params.fail(res);
+			}
+		});
+	},
+	uploadBase64(params) {
+		this.needMd5Fn(params,(sign_str,time)=>{
+			uni.request({
+				url: Config.baseUrl + '/api/upload/headimgBase64',
+				method: 'POST',
+				header: {
+					'content-type': 'application/x-www-form-urlencoded;application/json'
+				},
+				data: {
+					app_type,
+					app_type_name,
+					images: params.base64,
+					token: store.state.token || '',
+					sign: sign_str,
+					time: time
+				},
+				dataType: 'json',
+				responseType: 'text',
+				success: res => {
+					typeof params.success == 'function' && params.success(res.data);
+				},
+				fail: () => {
+					typeof params.fail == 'function' && params.fail(res);
+				}
+			});
+		})
+	},
+	pullImage(params) {
+		this.needMd5Fn(params,(sign_str,time)=>{
+			uni.request({
+				url: Config.baseUrl + '/api/upload/headimgPull',
+				method: 'POST',
+				header: {
+					'content-type': 'application/x-www-form-urlencoded;application/json'
+				},
+				data: {
+					app_type,
+					app_type_name,
+					path: params.path,
+					token: store.state.token || '',
+					sign: sign_str,
+					time: time
+				},
+				dataType: 'json',
+				responseType: 'text',
+				success: res => {
+					typeof params.success == 'function' && params.success(res.data);
+				},
+				fail: () => {
+					typeof params.fail == 'function' && params.fail(res);
+				}
+			});
+		})
+	},
+	upload(params) {
+		uni.uploadFile({
+			url: Config.baseUrl + params.url,
+			filePath: params.filePath,
+			name: params.name || 'file',
+			fileType: params.fileType || 'image',
+			formData: {
+				app_type,
+				app_type_name,
+				token: store.state.token || ''
+			},
+			header: {
+				'content-type': 'application/x-www-form-urlencoded;application/json'
+			},
+			success: (res) => {
+				typeof params.success == 'function' && params.success(JSON.parse(res.data));
+			},
+			fail: (res) => {
+				typeof params.fail == 'function' && params.fail(res);
+			}
+		});
+	}
 }
\ No newline at end of file
diff --git a/common/js/map-wx-jssdk.js b/common/js/map-wx-jssdk.js
index d26dc2b..e104cef 100644
--- a/common/js/map-wx-jssdk.js
+++ b/common/js/map-wx-jssdk.js
@@ -1,1125 +1,1127 @@
-/**
- * 微信小程序JavaScriptSDK
- * 
- * @version 1.2
- * @date 2019-03-06
- * @author v_ylyue@tencent.com
- */
-
-import Util from './util.js'
-
-var ERROR_CONF = {
-    KEY_ERR: 311,
-    KEY_ERR_MSG: 'key格式错误',
-    PARAM_ERR: 310,
-    PARAM_ERR_MSG: '请求参数信息有误',
-    SYSTEM_ERR: 600,
-    SYSTEM_ERR_MSG: '系统错误',
-    WX_ERR_CODE: 1000,
-    WX_OK_CODE: 200
-};
-var BASE_URL = 'https://apis.map.qq.com/ws/';
-var URL_SEARCH = BASE_URL + 'place/v1/search';
-var URL_SUGGESTION = BASE_URL + 'place/v1/suggestion';
-var URL_GET_GEOCODER = BASE_URL + 'geocoder/v1/';
-var URL_CITY_LIST = BASE_URL + 'district/v1/list';
-var URL_AREA_LIST = BASE_URL + 'district/v1/getchildren';
-var URL_DISTANCE = BASE_URL + 'distance/v1/';
-var URL_DIRECTION = BASE_URL + 'direction/v1/';
-var MODE = {
-  driving: 'driving',
-  transit: 'transit'
-};
-var EARTH_RADIUS = 6378136.49;
-var Utils = {
-  /**
-  * md5加密方法
-  * 版权所有©2011 Sebastian Tschan，https：//blueimp.net
-  */
-  safeAdd(x, y) {
-    var lsw = (x & 0xffff) + (y & 0xffff);
-    var msw = (x >> 16) + (y >> 16) + (lsw >> 16);
-    return (msw << 16) | (lsw & 0xffff);
-  },
-  bitRotateLeft(num, cnt) {
-    return (num << cnt) | (num >>> (32 - cnt));
-  },
-  md5cmn(q, a, b, x, s, t) {
-    return this.safeAdd(this.bitRotateLeft(this.safeAdd(this.safeAdd(a, q), this.safeAdd(x, t)), s), b);
-  },
-  md5ff(a, b, c, d, x, s, t) {
-    return this.md5cmn((b & c) | (~b & d), a, b, x, s, t);
-  },
-  md5gg(a, b, c, d, x, s, t) {
-    return this.md5cmn((b & d) | (c & ~d), a, b, x, s, t);
-  },
-  md5hh(a, b, c, d, x, s, t) {
-    return this.md5cmn(b ^ c ^ d, a, b, x, s, t);
-  },
-  md5ii(a, b, c, d, x, s, t) {
-    return this.md5cmn(c ^ (b | ~d), a, b, x, s, t);
-  },
-  binlMD5(x, len) {
-    /* append padding */
-    x[len >> 5] |= 0x80 << (len % 32);
-    x[((len + 64) >>> 9 << 4) + 14] = len;
-
-    var i;
-    var olda;
-    var oldb;
-    var oldc;
-    var oldd;
-    var a = 1732584193;
-    var b = -271733879;
-    var c = -1732584194;
-    var d = 271733878;
-
-    for (i = 0; i < x.length; i += 16) {
-      olda = a;
-      oldb = b;
-      oldc = c;
-      oldd = d;
-
-      a = this.md5ff(a, b, c, d, x[i], 7, -680876936);
-      d = this.md5ff(d, a, b, c, x[i + 1], 12, -389564586);
-      c = this.md5ff(c, d, a, b, x[i + 2], 17, 606105819);
-      b = this.md5ff(b, c, d, a, x[i + 3], 22, -1044525330);
-      a = this.md5ff(a, b, c, d, x[i + 4], 7, -176418897);
-      d = this.md5ff(d, a, b, c, x[i + 5], 12, 1200080426);
-      c = this.md5ff(c, d, a, b, x[i + 6], 17, -1473231341);
-      b = this.md5ff(b, c, d, a, x[i + 7], 22, -45705983);
-      a = this.md5ff(a, b, c, d, x[i + 8], 7, 1770035416);
-      d = this.md5ff(d, a, b, c, x[i + 9], 12, -1958414417);
-      c = this.md5ff(c, d, a, b, x[i + 10], 17, -42063);
-      b = this.md5ff(b, c, d, a, x[i + 11], 22, -1990404162);
-      a = this.md5ff(a, b, c, d, x[i + 12], 7, 1804603682);
-      d = this.md5ff(d, a, b, c, x[i + 13], 12, -40341101);
-      c = this.md5ff(c, d, a, b, x[i + 14], 17, -1502002290);
-      b = this.md5ff(b, c, d, a, x[i + 15], 22, 1236535329);
-
-      a = this.md5gg(a, b, c, d, x[i + 1], 5, -165796510);
-      d = this.md5gg(d, a, b, c, x[i + 6], 9, -1069501632);
-      c = this.md5gg(c, d, a, b, x[i + 11], 14, 643717713);
-      b = this.md5gg(b, c, d, a, x[i], 20, -373897302);
-      a = this.md5gg(a, b, c, d, x[i + 5], 5, -701558691);
-      d = this.md5gg(d, a, b, c, x[i + 10], 9, 38016083);
-      c = this.md5gg(c, d, a, b, x[i + 15], 14, -660478335);
-      b = this.md5gg(b, c, d, a, x[i + 4], 20, -405537848);
-      a = this.md5gg(a, b, c, d, x[i + 9], 5, 568446438);
-      d = this.md5gg(d, a, b, c, x[i + 14], 9, -1019803690);
-      c = this.md5gg(c, d, a, b, x[i + 3], 14, -187363961);
-      b = this.md5gg(b, c, d, a, x[i + 8], 20, 1163531501);
-      a = this.md5gg(a, b, c, d, x[i + 13], 5, -1444681467);
-      d = this.md5gg(d, a, b, c, x[i + 2], 9, -51403784);
-      c = this.md5gg(c, d, a, b, x[i + 7], 14, 1735328473);
-      b = this.md5gg(b, c, d, a, x[i + 12], 20, -1926607734);
-
-      a = this.md5hh(a, b, c, d, x[i + 5], 4, -378558);
-      d = this.md5hh(d, a, b, c, x[i + 8], 11, -2022574463);
-      c = this.md5hh(c, d, a, b, x[i + 11], 16, 1839030562);
-      b = this.md5hh(b, c, d, a, x[i + 14], 23, -35309556);
-      a = this.md5hh(a, b, c, d, x[i + 1], 4, -1530992060);
-      d = this.md5hh(d, a, b, c, x[i + 4], 11, 1272893353);
-      c = this.md5hh(c, d, a, b, x[i + 7], 16, -155497632);
-      b = this.md5hh(b, c, d, a, x[i + 10], 23, -1094730640);
-      a = this.md5hh(a, b, c, d, x[i + 13], 4, 681279174);
-      d = this.md5hh(d, a, b, c, x[i], 11, -358537222);
-      c = this.md5hh(c, d, a, b, x[i + 3], 16, -722521979);
-      b = this.md5hh(b, c, d, a, x[i + 6], 23, 76029189);
-      a = this.md5hh(a, b, c, d, x[i + 9], 4, -640364487);
-      d = this.md5hh(d, a, b, c, x[i + 12], 11, -421815835);
-      c = this.md5hh(c, d, a, b, x[i + 15], 16, 530742520);
-      b = this.md5hh(b, c, d, a, x[i + 2], 23, -995338651);
-
-      a = this.md5ii(a, b, c, d, x[i], 6, -198630844);
-      d = this.md5ii(d, a, b, c, x[i + 7], 10, 1126891415);
-      c = this.md5ii(c, d, a, b, x[i + 14], 15, -1416354905);
-      b = this.md5ii(b, c, d, a, x[i + 5], 21, -57434055);
-      a = this.md5ii(a, b, c, d, x[i + 12], 6, 1700485571);
-      d = this.md5ii(d, a, b, c, x[i + 3], 10, -1894986606);
-      c = this.md5ii(c, d, a, b, x[i + 10], 15, -1051523);
-      b = this.md5ii(b, c, d, a, x[i + 1], 21, -2054922799);
-      a = this.md5ii(a, b, c, d, x[i + 8], 6, 1873313359);
-      d = this.md5ii(d, a, b, c, x[i + 15], 10, -30611744);
-      c = this.md5ii(c, d, a, b, x[i + 6], 15, -1560198380);
-      b = this.md5ii(b, c, d, a, x[i + 13], 21, 1309151649);
-      a = this.md5ii(a, b, c, d, x[i + 4], 6, -145523070);
-      d = this.md5ii(d, a, b, c, x[i + 11], 10, -1120210379);
-      c = this.md5ii(c, d, a, b, x[i + 2], 15, 718787259);
-      b = this.md5ii(b, c, d, a, x[i + 9], 21, -343485551);
-
-      a = this.safeAdd(a, olda);
-      b = this.safeAdd(b, oldb);
-      c = this.safeAdd(c, oldc);
-      d = this.safeAdd(d, oldd);
-    }
-    return [a, b, c, d];
-  },
-  binl2rstr(input) {
-    var i;
-    var output = '';
-    var length32 = input.length * 32;
-    for (i = 0; i < length32; i += 8) {
-      output += String.fromCharCode((input[i >> 5] >>> (i % 32)) & 0xff);
-    }
-    return output;
-  },
-  rstr2binl(input) {
-    var i;
-    var output = [];
-    output[(input.length >> 2) - 1] = undefined;
-    for (i = 0; i < output.length; i += 1) {
-      output[i] = 0;
-    }
-    var length8 = input.length * 8;
-    for (i = 0; i < length8; i += 8) {
-      output[i >> 5] |= (input.charCodeAt(i / 8) & 0xff) << (i % 32);
-    }
-    return output;
-  },
-  rstrMD5(s) {
-    return this.binl2rstr(this.binlMD5(this.rstr2binl(s), s.length * 8));
-  },
-  rstrHMACMD5(key, data) {
-    var i;
-    var bkey = this.rstr2binl(key);
-    var ipad = [];
-    var opad = [];
-    var hash;
-    ipad[15] = opad[15] = undefined;
-    if (bkey.length > 16) {
-      bkey = this.binlMD5(bkey, key.length * 8);
-    }
-    for (i = 0; i < 16; i += 1) {
-      ipad[i] = bkey[i] ^ 0x36363636;
-      opad[i] = bkey[i] ^ 0x5c5c5c5c;
-    }
-    hash = this.binlMD5(ipad.concat(this.rstr2binl(data)), 512 + data.length * 8);
-    return this.binl2rstr(this.binlMD5(opad.concat(hash), 512 + 128));
-  },
-  rstr2hex(input) {
-    var hexTab = '0123456789abcdef';
-    var output = '';
-    var x;
-    var i;
-    for (i = 0; i < input.length; i += 1) {
-      x = input.charCodeAt(i);
-      output += hexTab.charAt((x >>> 4) & 0x0f) + hexTab.charAt(x & 0x0f);
-    }
-    return output;
-  },
-  str2rstrUTF8(input) {
-    return unescape(encodeURIComponent(input));
-  },
-  rawMD5(s) {
-    return this.rstrMD5(this.str2rstrUTF8(s));
-  },
-  hexMD5(s) {
-    return this.rstr2hex(this.rawMD5(s));
-  },
-  rawHMACMD5(k, d) {
-    return this.rstrHMACMD5(this.str2rstrUTF8(k), str2rstrUTF8(d));
-  },
-  hexHMACMD5(k, d) {
-    return this.rstr2hex(this.rawHMACMD5(k, d));
-  },
-
-  md5(string, key, raw) {
-    if (!key) {
-      if (!raw) {
-        return this.hexMD5(string);
-      }
-      return this.rawMD5(string);
-    }
-    if (!raw) {
-      return this.hexHMACMD5(key, string);
-    }
-    return this.rawHMACMD5(key, string);
-  },
-  /**
-   * 得到md5加密后的sig参数
-   * @param {Object} requestParam 接口参数
-   * @param {String} sk签名字符串
-   * @param {String} featrue 方法名
-   * @return 返回加密后的sig参数
-   */
-  getSig(requestParam, sk, feature, mode) {
-    var sig = null;
-    var requestArr = [];
-    Object.keys(requestParam).sort().forEach(function(key){
-      requestArr.push(key + '=' + requestParam[key]);
-    });
-    if (feature == 'search') {
-      sig = '/ws/place/v1/search?' + requestArr.join('&') + sk;
-    }
-    if (feature == 'suggest') {
-      sig = '/ws/place/v1/suggestion?' + requestArr.join('&') + sk;
-    }
-    if (feature == 'reverseGeocoder') {
-      sig = '/ws/geocoder/v1/?' + requestArr.join('&') + sk;
-    }
-    if (feature == 'geocoder') {
-      sig = '/ws/geocoder/v1/?' + requestArr.join('&') + sk;
-    }
-    if (feature == 'getCityList') {
-      sig = '/ws/district/v1/list?' + requestArr.join('&') + sk;
-    }
-    if (feature == 'getDistrictByCityId') {
-      sig = '/ws/district/v1/getchildren?' + requestArr.join('&') + sk;
-    }
-    if (feature == 'calculateDistance') {
-      sig = '/ws/distance/v1/?' + requestArr.join('&') + sk;
-    }
-    if (feature == 'direction') {
-      sig = '/ws/direction/v1/' + mode + '?' + requestArr.join('&') + sk;
-    }
-    sig = this.md5(sig);
-    return sig;
-  },
-    /**
-     * 得到终点query字符串
-     * @param {Array|String} 检索数据
-     */
-    location2query(data) {
-        if (typeof data == 'string') {
-            return data;
-        }
-        var query = '';
-        for (var i = 0; i < data.length; i++) {
-            var d = data[i];
-            if (!!query) {
-                query += ';';
-            }
-            if (d.location) {
-                query = query + d.location.lat + ',' + d.location.lng;
-            }
-            if (d.latitude && d.longitude) {
-                query = query + d.latitude + ',' + d.longitude;
-            }
-        }
-        return query;
-    },
-
-    /**
-     * 计算角度
-     */
-    rad(d) {
-      return d * Math.PI / 180.0;
-    },  
-    /**
-     * 处理终点location数组
-     * @return 返回终点数组
-     */
-    getEndLocation(location){
-      var to = location.split(';');
-      var endLocation = [];
-      for (var i = 0; i < to.length; i++) {
-        endLocation.push({
-          lat: parseFloat(to[i].split(',')[0]),
-          lng: parseFloat(to[i].split(',')[1])
-        })
-      }
-      return endLocation;
-    },
-
-    /**
-     * 计算两点间直线距离
-     * @param a 表示纬度差
-     * @param b 表示经度差
-     * @return 返回的是距离，单位m
-     */
-    getDistance(latFrom, lngFrom, latTo, lngTo) {
-      var radLatFrom = this.rad(latFrom);
-      var radLatTo = this.rad(latTo);
-      var a = radLatFrom - radLatTo;
-      var b = this.rad(lngFrom) - this.rad(lngTo);
-      var distance = 2 * Math.asin(Math.sqrt(Math.pow(Math.sin(a / 2), 2) + Math.cos(radLatFrom) * Math.cos(radLatTo) * Math.pow(Math.sin(b / 2), 2)));
-      distance = distance * EARTH_RADIUS;
-      distance = Math.round(distance * 10000) / 10000;
-      return parseFloat(distance.toFixed(0));
-    },
-    /**
-     * 使用微信接口进行定位
-     */
-    getWXLocation(success, fail, complete) {
-		Util.getLocation({
-			type: 'gcj02',
-			success: success,
-			fail: fail,
-			complete: complete
-		})
-    },
-
-    /**
-     * 获取location参数
-     */
-    getLocationParam(location) {
-        if (typeof location == 'string') {
-            var locationArr = location.split(',');
-            if (locationArr.length === 2) {
-                location = {
-                    latitude: location.split(',')[0],
-                    longitude: location.split(',')[1]
-                };
-            } else {
-                location = {};
-            }
-        }
-        return location;
-    },
-
-    /**
-     * 回调函数默认处理
-     */
-    polyfillParam(param) {
-        param.success = param.success || function () { };
-        param.fail = param.fail || function () { };
-        param.complete = param.complete || function () { };
-    },
-
-    /**
-     * 验证param对应的key值是否为空
-     * 
-     * @param {Object} param 接口参数
-     * @param {String} key 对应参数的key
-     */
-    checkParamKeyEmpty(param, key) {
-        if (!param[key]) {
-            var errconf = this.buildErrorConfig(ERROR_CONF.PARAM_ERR, ERROR_CONF.PARAM_ERR_MSG + key +'参数格式有误');
-            param.fail(errconf);
-            param.complete(errconf);
-            return true;
-        }
-        return false;
-    },
-
-    /**
-     * 验证参数中是否存在检索词keyword
-     * 
-     * @param {Object} param 接口参数
-     */
-    checkKeyword(param){
-        return !this.checkParamKeyEmpty(param, 'keyword');
-    },
-
-    /**
-     * 验证location值
-     * 
-     * @param {Object} param 接口参数
-     */
-    checkLocation(param) {
-        var location = this.getLocationParam(param.location);
-        if (!location || !location.latitude || !location.longitude) {
-            var errconf = this.buildErrorConfig(ERROR_CONF.PARAM_ERR, ERROR_CONF.PARAM_ERR_MSG + ' location参数格式有误');
-            param.fail(errconf);
-            param.complete(errconf);
-            return false;
-        }
-        return true;
-    },
-
-    /**
-     * 构造错误数据结构
-     * @param {Number} errCode 错误码
-     * @param {Number} errMsg 错误描述
-     */
-    buildErrorConfig(errCode, errMsg) {
-        return {
-            status: errCode,
-            message: errMsg
-        };
-    },
-
-    /**
-     * 
-     * 数据处理函数
-     * 根据传入参数不同处理不同数据
-     * @param {String} feature 功能名称
-     * search 地点搜索
-     * suggest关键词提示
-     * reverseGeocoder逆地址解析
-     * geocoder地址解析
-     * getCityList获取城市列表：父集
-     * getDistrictByCityId获取区县列表：子集
-     * calculateDistance距离计算
-     * @param {Object} param 接口参数
-     * @param {Object} data 数据
-     */
-    handleData(param,data,feature){
-      if (feature == 'search') {
-        var searchResult = data.data;
-        var searchSimplify = [];
-        for (var i = 0; i < searchResult.length; i++) {
-          searchSimplify.push({
-            id: searchResult[i].id || null,
-            title: searchResult[i].title || null,
-            latitude: searchResult[i].location && searchResult[i].location.lat || null,
-            longitude: searchResult[i].location && searchResult[i].location.lng || null,
-            address: searchResult[i].address || null,
-            category: searchResult[i].category || null,
-            tel: searchResult[i].tel || null,
-            adcode: searchResult[i].ad_info && searchResult[i].ad_info.adcode || null,
-            city: searchResult[i].ad_info && searchResult[i].ad_info.city || null,
-            district: searchResult[i].ad_info && searchResult[i].ad_info.district || null,
-            province: searchResult[i].ad_info && searchResult[i].ad_info.province || null
-          })
-        }
-        param.success(data, {
-          searchResult: searchResult,
-          searchSimplify: searchSimplify
-        })
-      } else if (feature == 'suggest') {
-        var suggestResult = data.data;
-        var suggestSimplify = [];
-        for (var i = 0; i < suggestResult.length; i++) {
-          suggestSimplify.push({
-            adcode: suggestResult[i].adcode || null,
-            address: suggestResult[i].address || null,
-            category: suggestResult[i].category || null,
-            city: suggestResult[i].city || null,
-            district: suggestResult[i].district || null,
-            id: suggestResult[i].id || null,
-            latitude: suggestResult[i].location && suggestResult[i].location.lat || null,
-            longitude: suggestResult[i].location && suggestResult[i].location.lng || null,
-            province: suggestResult[i].province || null,
-            title: suggestResult[i].title || null,
-            type: suggestResult[i].type || null
-          })
-        }
-        param.success(data, {
-          suggestResult: suggestResult,
-          suggestSimplify: suggestSimplify
-          })
-      } else if (feature == 'reverseGeocoder') {
-        var reverseGeocoderResult = data.result;
-        var reverseGeocoderSimplify = {
-          address: reverseGeocoderResult.address || null,
-          latitude: reverseGeocoderResult.location && reverseGeocoderResult.location.lat || null,
-          longitude: reverseGeocoderResult.location && reverseGeocoderResult.location.lng || null,
-          adcode: reverseGeocoderResult.ad_info && reverseGeocoderResult.ad_info.adcode || null,
-          city: reverseGeocoderResult.address_component && reverseGeocoderResult.address_component.city || null,
-          district: reverseGeocoderResult.address_component && reverseGeocoderResult.address_component.district || null,
-          nation: reverseGeocoderResult.address_component && reverseGeocoderResult.address_component.nation || null,
-          province: reverseGeocoderResult.address_component && reverseGeocoderResult.address_component.province || null,
-          street: reverseGeocoderResult.address_component && reverseGeocoderResult.address_component.street || null,
-          street_number: reverseGeocoderResult.address_component && reverseGeocoderResult.address_component.street_number || null,
-          recommend: reverseGeocoderResult.formatted_addresses && reverseGeocoderResult.formatted_addresses.recommend || null,
-          rough: reverseGeocoderResult.formatted_addresses && reverseGeocoderResult.formatted_addresses.rough || null
-        };
-        if (reverseGeocoderResult.pois) {//判断是否返回周边poi
-          var pois = reverseGeocoderResult.pois;
-          var poisSimplify = [];
-          for (var i = 0;i < pois.length;i++) {
-            poisSimplify.push({
-              id: pois[i].id || null,
-              title: pois[i].title || null,
-              latitude: pois[i].location && pois[i].location.lat || null,
-              longitude: pois[i].location && pois[i].location.lng || null,
-              address: pois[i].address || null,
-              category: pois[i].category || null,
-              adcode: pois[i].ad_info && pois[i].ad_info.adcode || null,
-              city: pois[i].ad_info && pois[i].ad_info.city || null,
-              district: pois[i].ad_info && pois[i].ad_info.district || null,
-              province: pois[i].ad_info && pois[i].ad_info.province || null
-            })
-          }
-          param.success(data,{
-            reverseGeocoderResult: reverseGeocoderResult,
-            reverseGeocoderSimplify: reverseGeocoderSimplify,
-            pois: pois,
-            poisSimplify: poisSimplify
-          })
-        } else {
-          param.success(data, {
-            reverseGeocoderResult: reverseGeocoderResult,
-            reverseGeocoderSimplify: reverseGeocoderSimplify
-          })
-        }
-      } else if (feature == 'geocoder') {
-        var geocoderResult = data.result;
-        var geocoderSimplify = {
-          title: geocoderResult.title || null,
-          latitude: geocoderResult.location && geocoderResult.location.lat || null,
-          longitude: geocoderResult.location && geocoderResult.location.lng || null,
-          adcode: geocoderResult.ad_info && geocoderResult.ad_info.adcode || null,
-          province: geocoderResult.address_components && geocoderResult.address_components.province || null,
-          city: geocoderResult.address_components && geocoderResult.address_components.city || null,
-          district: geocoderResult.address_components && geocoderResult.address_components.district || null,
-          street: geocoderResult.address_components && geocoderResult.address_components.street || null,
-          street_number: geocoderResult.address_components && geocoderResult.address_components.street_number || null,
-          level: geocoderResult.level || null
-        };
-        param.success(data,{
-          geocoderResult: geocoderResult,
-          geocoderSimplify: geocoderSimplify
-        });
-      } else if (feature == 'getCityList') {
-        var provinceResult = data.result[0];
-        var cityResult = data.result[1];
-        var districtResult = data.result[2];
-        param.success(data,{
-          provinceResult: provinceResult,
-          cityResult: cityResult,
-          districtResult: districtResult
-        });
-      } else if (feature == 'getDistrictByCityId') {
-        var districtByCity = data.result[0];
-        param.success(data, districtByCity);
-      } else if (feature == 'calculateDistance') {
-        var calculateDistanceResult = data.result.elements;  
-        var distance = [];
-        for (var i = 0; i < calculateDistanceResult.length; i++){
-          distance.push(calculateDistanceResult[i].distance);
-        }   
-        param.success(data, {
-          calculateDistanceResult: calculateDistanceResult,
-          distance: distance
-          });
-      } else if (feature == 'direction') {
-        var direction = data.result.routes;
-        param.success(data,direction);
-      } else {
-        param.success(data);
-      }
-    },
-
-    /**
-     * 构造微信请求参数，公共属性处理
-     * 
-     * @param {Object} param 接口参数
-     * @param {Object} param 配置项
-     * @param {String} feature 方法名
-     */
-    buildWxRequestConfig(param, options, feature) {
-        var that = this;
-        options.header = { "content-type": "application/json" };
-        options.method = 'GET';
-        options.success = function (res) {
-            var data = res.data;
-            if (data.status === 0) {
-              that.handleData(param, data, feature);
-            } else {
-                param.fail(data);
-            }
-        };
-        options.fail = function (res) {
-            res.statusCode = ERROR_CONF.WX_ERR_CODE;
-            param.fail(that.buildErrorConfig(ERROR_CONF.WX_ERR_CODE, res.errMsg));
-        };
-        options.complete = function (res) {
-            var statusCode = +res.statusCode;
-            switch(statusCode) {
-                case ERROR_CONF.WX_ERR_CODE: {
-                    param.complete(that.buildErrorConfig(ERROR_CONF.WX_ERR_CODE, res.errMsg));
-                    break;
-                }
-                case ERROR_CONF.WX_OK_CODE: {
-                    var data = res.data;
-                    if (data.status === 0) {
-                        param.complete(data);
-                    } else {
-                        param.complete(that.buildErrorConfig(data.status, data.message));
-                    }
-                    break;
-                }
-                default:{
-                    param.complete(that.buildErrorConfig(ERROR_CONF.SYSTEM_ERR, ERROR_CONF.SYSTEM_ERR_MSG));
-                }
-
-            }
-        };
-        return options;
-    },
-
-    /**
-     * 处理用户参数是否传入坐标进行不同的处理
-     */
-    locationProcess(param, locationsuccess, locationfail, locationcomplete) {
-        var that = this;
-        locationfail = locationfail || function (res) {
-            res.statusCode = ERROR_CONF.WX_ERR_CODE;
-            param.fail(that.buildErrorConfig(ERROR_CONF.WX_ERR_CODE, res.errMsg));
-        };
-        locationcomplete = locationcomplete || function (res) {
-            if (res.statusCode == ERROR_CONF.WX_ERR_CODE) {
-                param.complete(that.buildErrorConfig(ERROR_CONF.WX_ERR_CODE, res.errMsg));
-            }
-        };
-        if (!param.location) {
-            that.getWXLocation(locationsuccess, locationfail, locationcomplete);
-        } else if (that.checkLocation(param)) {
-            var location = Utils.getLocationParam(param.location);
-            locationsuccess(location);
-        }
-    }
-};
-
-
-class QQMapWX {
-
-    /**
-     * 构造函数
-     * 
-     * @param {Object} options 接口参数,key 为必选参数
-     */
-    constructor(options) {
-        if (!options.key) {
-            throw Error('key值不能为空');
-        }
-        this.key = options.key;
-    };
-
-    /**
-     * POI周边检索
-     *
-     * @param {Object} options 接口参数对象
-     * 
-     * 参数对象结构可以参考
-     * @see http://lbs.qq.com/webservice_v1/guide-search.html
-     */
-    search(options) {
-        var that = this;
-        options = options || {};
-
-        Utils.polyfillParam(options);
-
-        if (!Utils.checkKeyword(options)) {
-            return;
-        }
-
-        var requestParam = {
-            keyword: options.keyword,
-            orderby: options.orderby || '_distance',
-            page_size: options.page_size || 10,
-            page_index: options.page_index || 1,
-            output: 'json',
-            key: that.key
-        };
-
-        if (options.address_format) {
-            requestParam.address_format = options.address_format;
-        }
-
-        if (options.filter) {
-            requestParam.filter = options.filter;
-        }
-
-        var distance = options.distance || "1000";
-        var auto_extend = options.auto_extend || 1;
-        var region = null;
-        var rectangle = null;
-
-        //判断城市限定参数
-        if (options.region) {
-          region = options.region;
-        }
-
-        //矩形限定坐标(暂时只支持字符串格式)
-        if (options.rectangle) {
-          rectangle = options.rectangle;
-        }
-
-        var locationsuccess = function (result) {        
-          if (region && !rectangle) {
-            //城市限定参数拼接
-            requestParam.boundary = "region(" + region + "," + auto_extend + "," + result.latitude + "," + result.longitude + ")";
-            if (options.sig) {
-              requestParam.sig = Utils.getSig(requestParam, options.sig, 'search');
-            }
-          } else if (rectangle && !region) {
-            //矩形搜索
-            requestParam.boundary = "rectangle(" + rectangle + ")";
-            if (options.sig) {
-              requestParam.sig = Utils.getSig(requestParam, options.sig, 'search');
-            }
-            } else {
-              requestParam.boundary = "nearby(" + result.latitude + "," + result.longitude + "," + distance + "," + auto_extend + ")";
-            if (options.sig) {
-              requestParam.sig = Utils.getSig(requestParam, options.sig, 'search');
-            }
-            }            
-            wx.request(Utils.buildWxRequestConfig(options, {
-                url: URL_SEARCH,
-                data: requestParam
-            }, 'search'));
-        };
-        Utils.locationProcess(options, locationsuccess);
-    };
-
-    /**
-     * sug模糊检索
-     *
-     * @param {Object} options 接口参数对象
-     * 
-     * 参数对象结构可以参考
-     * http://lbs.qq.com/webservice_v1/guide-suggestion.html
-     */
-    getSuggestion(options) {
-        var that = this;
-        options = options || {};
-        Utils.polyfillParam(options);
-
-        if (!Utils.checkKeyword(options)) {
-            return;
-        }
-
-        var requestParam = {
-            keyword: options.keyword,
-            region: options.region || '全国',
-            region_fix: options.region_fix || 0,
-            policy: options.policy || 0,
-            page_size: options.page_size || 10,//控制显示条数
-            page_index: options.page_index || 1,//控制页数
-            get_subpois : options.get_subpois || 0,//返回子地点
-            output: 'json',
-            key: that.key
-        };
-        //长地址
-        if (options.address_format) {
-          requestParam.address_format = options.address_format;
-        }
-        //过滤
-        if (options.filter) {
-          requestParam.filter = options.filter;
-        }
-        //排序
-        if (options.location) {
-          var locationsuccess = function (result) {
-            requestParam.location = result.latitude + ',' + result.longitude;
-            if (options.sig) {
-              requestParam.sig = Utils.getSig(requestParam, options.sig, 'suggest');
-            }
-            wx.request(Utils.buildWxRequestConfig(options, {
-              url: URL_SUGGESTION,
-              data: requestParam
-            }, "suggest"));      
-          };
-          Utils.locationProcess(options, locationsuccess);
-        } else {
-          if (options.sig) {
-            requestParam.sig = Utils.getSig(requestParam, options.sig, 'suggest');
-          }
-          wx.request(Utils.buildWxRequestConfig(options, {
-            url: URL_SUGGESTION,
-            data: requestParam
-          }, "suggest"));      
-        }        
-    };
-
-    /**
-     * 逆地址解析
-     *
-     * @param {Object} options 接口参数对象
-     * 
-     * 请求参数结构可以参考
-     * http://lbs.qq.com/webservice_v1/guide-gcoder.html
-     */
-    reverseGeocoder(options) {
-        var that = this;
-        options = options || {};
-        Utils.polyfillParam(options);
-        var requestParam = {
-            coord_type: options.coord_type || 5,
-            get_poi: options.get_poi || 0,
-            output: 'json',
-            key: that.key
-        };
-        if (options.poi_options) {
-            requestParam.poi_options = options.poi_options
-        }
-
-        var locationsuccess = function (result) {
-            requestParam.location = result.latitude + ',' + result.longitude;
-          if (options.sig) {
-            requestParam.sig = Utils.getSig(requestParam, options.sig, 'reverseGeocoder');
-          }
-            wx.request(Utils.buildWxRequestConfig(options, {
-                url: URL_GET_GEOCODER,
-                data: requestParam
-            }, 'reverseGeocoder'));
-        };
-        Utils.locationProcess(options, locationsuccess);
-    };
-
-    /**
-     * 地址解析
-     *
-     * @param {Object} options 接口参数对象
-     * 
-     * 请求参数结构可以参考
-     * http://lbs.qq.com/webservice_v1/guide-geocoder.html
-     */
-    geocoder(options) {
-        var that = this;
-        options = options || {};
-        Utils.polyfillParam(options);
-
-        if (Utils.checkParamKeyEmpty(options, 'address')) {
-            return;
-        }
-
-        var requestParam = {
-            address: options.address,
-            output: 'json',
-            key: that.key
-        };
-
-        //城市限定
-        if (options.region) {
-          requestParam.region = options.region;
-        }
-
-        if (options.sig) {
-          requestParam.sig = Utils.getSig(requestParam, options.sig, 'geocoder');
-        }
-
-        wx.request(Utils.buildWxRequestConfig(options, {
-            url: URL_GET_GEOCODER,
-            data: requestParam
-        },'geocoder'));
-    };
-
-
-    /**
-     * 获取城市列表
-     *
-     * @param {Object} options 接口参数对象
-     * 
-     * 请求参数结构可以参考
-     * http://lbs.qq.com/webservice_v1/guide-region.html
-     */
-    getCityList(options) {
-        var that = this;
-        options = options || {};
-        Utils.polyfillParam(options);
-        var requestParam = {
-            output: 'json',
-            key: that.key
-        };
-
-        if (options.sig) {
-          requestParam.sig = Utils.getSig(requestParam, options.sig, 'getCityList');
-        }
-
-        wx.request(Utils.buildWxRequestConfig(options, {
-            url: URL_CITY_LIST,
-            data: requestParam
-        },'getCityList'));
-    };
-
-    /**
-     * 获取对应城市ID的区县列表
-     *
-     * @param {Object} options 接口参数对象
-     * 
-     * 请求参数结构可以参考
-     * http://lbs.qq.com/webservice_v1/guide-region.html
-     */
-    getDistrictByCityId(options) {
-        var that = this;
-        options = options || {};
-        Utils.polyfillParam(options);
-
-        if (Utils.checkParamKeyEmpty(options, 'id')) {
-            return;
-        }
-
-        var requestParam = {
-            id: options.id || '',
-            output: 'json',
-            key: that.key
-        };
-
-        if (options.sig) {
-          requestParam.sig = Utils.getSig(requestParam, options.sig, 'getDistrictByCityId');
-        }
-
-        wx.request(Utils.buildWxRequestConfig(options, {
-            url: URL_AREA_LIST,
-            data: requestParam
-        },'getDistrictByCityId'));
-    };
-
-    /**
-     * 用于单起点到多终点的路线距离(非直线距离)计算：
-     * 支持两种距离计算方式：步行和驾车。
-     * 起点到终点最大限制直线距离10公里。
-     *
-     * 新增直线距离计算。
-     * 
-     * @param {Object} options 接口参数对象
-     * 
-     * 请求参数结构可以参考
-     * http://lbs.qq.com/webservice_v1/guide-distance.html
-     */
-    calculateDistance(options) {
-        var that = this;
-        options = options || {};
-        Utils.polyfillParam(options);
-
-        if (Utils.checkParamKeyEmpty(options, 'to')) {
-            return;
-        }
-
-        var requestParam = {
-            mode: options.mode || 'walking',
-            to: Utils.location2query(options.to),
-            output: 'json',
-            key: that.key
-        };
-
-        if (options.from) {
-          options.location = options.from;
-        }
-
-        //计算直线距离
-        if(requestParam.mode == 'straight'){        
-          var locationsuccess = function (result) {
-            var locationTo = Utils.getEndLocation(requestParam.to);//处理终点坐标
-            var data = {
-              message:"query ok",
-              result:{
-                elements:[]
-              },
-              status:0
-            };
-            for (var i = 0; i < locationTo.length; i++) {
-              data.result.elements.push({//将坐标存入
-                distance: Utils.getDistance(result.latitude, result.longitude, locationTo[i].lat, locationTo[i].lng),
-                duration:0,
-                from:{
-                  lat: result.latitude,
-                  lng:result.longitude
-                },
-                to:{
-                  lat: locationTo[i].lat,
-                  lng: locationTo[i].lng
-                }
-              });            
-            }
-            var calculateResult = data.result.elements;
-            var distanceResult = [];
-            for (var i = 0; i < calculateResult.length; i++) {
-              distanceResult.push(calculateResult[i].distance);
-            }  
-            return options.success(data,{
-              calculateResult: calculateResult,
-              distanceResult: distanceResult
-            });
-          };
-          
-          Utils.locationProcess(options, locationsuccess);
-        } else {
-          var locationsuccess = function (result) {
-            requestParam.from = result.latitude + ',' + result.longitude;
-            if (options.sig) {
-              requestParam.sig = Utils.getSig(requestParam, options.sig, 'calculateDistance');
-            }
-            wx.request(Utils.buildWxRequestConfig(options, {
-              url: URL_DISTANCE,
-              data: requestParam
-            },'calculateDistance'));
-          };
-
-          Utils.locationProcess(options, locationsuccess);
-        }      
-    };
-
-  /**
-   * 路线规划：
-   * 
-   * @param {Object} options 接口参数对象
-   * 
-   * 请求参数结构可以参考
-   * https://lbs.qq.com/webservice_v1/guide-road.html
-   */
-  direction(options) {
-    var that = this;
-    options = options || {};
-    Utils.polyfillParam(options);
-
-    if (Utils.checkParamKeyEmpty(options, 'to')) {
-      return;
-    }
-
-    var requestParam = {
-      output: 'json',
-      key: that.key
-    };
-
-    //to格式处理
-    if (typeof options.to == 'string') {
-      requestParam.to = options.to;
-    } else {
-      requestParam.to = options.to.latitude + ',' + options.to.longitude;
-    }
-    //初始化局部请求域名
-    var SET_URL_DIRECTION = null;
-    //设置默认mode属性
-    options.mode = options.mode || MODE.driving;
-
-    //设置请求域名
-    SET_URL_DIRECTION = URL_DIRECTION + options.mode;
-
-    if (options.from) {
-      options.location = options.from;
-    }
-
-    if (options.mode == MODE.driving) {
-      if (options.from_poi) {
-        requestParam.from_poi = options.from_poi;
-      }
-      if (options.heading) {
-        requestParam.heading = options.heading;
-      }
-      if (options.speed) {
-        requestParam.speed = options.speed;
-      }
-      if (options.accuracy) {
-        requestParam.accuracy = options.accuracy;
-      }
-      if (options.road_type) {
-        requestParam.road_type = options.road_type;
-      }
-      if (options.to_poi) {
-        requestParam.to_poi = options.to_poi;
-      }
-      if (options.from_track) {
-        requestParam.from_track = options.from_track;
-      }
-      if (options.waypoints) {
-        requestParam.waypoints = options.waypoints;
-      }
-      if (options.policy) {
-        requestParam.policy = options.policy;
-      }
-      if (options.plate_number) {
-        requestParam.plate_number = options.plate_number;
-      }
-    }
-
-    if (options.mode == MODE.transit) {
-      if (options.departure_time) {
-        requestParam.departure_time = options.departure_time;
-      }
-      if (options.policy) {
-        requestParam.policy = options.policy;
-      }
-    } 
-
-    var locationsuccess = function (result) {
-      requestParam.from = result.latitude + ',' + result.longitude;
-      if (options.sig) {
-        requestParam.sig = Utils.getSig(requestParam, options.sig, 'direction',options.mode);
-      }
-      wx.request(Utils.buildWxRequestConfig(options, {
-        url: SET_URL_DIRECTION,
-        data: requestParam
-      }, 'direction'));
-    };
-
-    Utils.locationProcess(options, locationsuccess);
-  }
-};
-
-module.exports = QQMapWX;
\ No newline at end of file
+/**
+ * 微信小程序JavaScriptSDK
+ * 
+ * @version 1.2
+ * @date 2019-03-06
+ * @author v_ylyue@tencent.com
+ */
+
+import Util from './util.js'
+
+var ERROR_CONF = {
+    KEY_ERR: 311,
+    KEY_ERR_MSG: 'key格式错误',
+    PARAM_ERR: 310,
+    PARAM_ERR_MSG: '请求参数信息有误',
+    SYSTEM_ERR: 600,
+    SYSTEM_ERR_MSG: '系统错误',
+    WX_ERR_CODE: 1000,
+    WX_OK_CODE: 200
+};
+var BASE_URL = 'https://apis.map.qq.com/ws/';
+var URL_SEARCH = BASE_URL + 'place/v1/search';
+var URL_SUGGESTION = BASE_URL + 'place/v1/suggestion';
+var URL_GET_GEOCODER = BASE_URL + 'geocoder/v1/';
+var URL_CITY_LIST = BASE_URL + 'district/v1/list';
+var URL_AREA_LIST = BASE_URL + 'district/v1/getchildren';
+var URL_DISTANCE = BASE_URL + 'distance/v1/';
+var URL_DIRECTION = BASE_URL + 'direction/v1/';
+var MODE = {
+  driving: 'driving',
+  transit: 'transit'
+};
+var EARTH_RADIUS = 6378136.49;
+var Utils = {
+  /**
+  * md5加密方法
+  * 版权所有©2011 Sebastian Tschan，https：//blueimp.net
+  */
+  safeAdd(x, y) {
+    var lsw = (x & 0xffff) + (y & 0xffff);
+    var msw = (x >> 16) + (y >> 16) + (lsw >> 16);
+    return (msw << 16) | (lsw & 0xffff);
+  },
+  bitRotateLeft(num, cnt) {
+    return (num << cnt) | (num >>> (32 - cnt));
+  },
+  md5cmn(q, a, b, x, s, t) {
+    return this.safeAdd(this.bitRotateLeft(this.safeAdd(this.safeAdd(a, q), this.safeAdd(x, t)), s), b);
+  },
+  md5ff(a, b, c, d, x, s, t) {
+    return this.md5cmn((b & c) | (~b & d), a, b, x, s, t);
+  },
+  md5gg(a, b, c, d, x, s, t) {
+    return this.md5cmn((b & d) | (c & ~d), a, b, x, s, t);
+  },
+  md5hh(a, b, c, d, x, s, t) {
+    return this.md5cmn(b ^ c ^ d, a, b, x, s, t);
+  },
+  md5ii(a, b, c, d, x, s, t) {
+    return this.md5cmn(c ^ (b | ~d), a, b, x, s, t);
+  },
+  binlMD5(x, len) {
+    /* append padding */
+    x[len >> 5] |= 0x80 << (len % 32);
+    x[((len + 64) >>> 9 << 4) + 14] = len;
+
+    var i;
+    var olda;
+    var oldb;
+    var oldc;
+    var oldd;
+    var a = 1732584193;
+    var b = -271733879;
+    var c = -1732584194;
+    var d = 271733878;
+
+    for (i = 0; i < x.length; i += 16) {
+      olda = a;
+      oldb = b;
+      oldc = c;
+      oldd = d;
+
+      a = this.md5ff(a, b, c, d, x[i], 7, -680876936);
+      d = this.md5ff(d, a, b, c, x[i + 1], 12, -389564586);
+      c = this.md5ff(c, d, a, b, x[i + 2], 17, 606105819);
+      b = this.md5ff(b, c, d, a, x[i + 3], 22, -1044525330);
+      a = this.md5ff(a, b, c, d, x[i + 4], 7, -176418897);
+      d = this.md5ff(d, a, b, c, x[i + 5], 12, 1200080426);
+      c = this.md5ff(c, d, a, b, x[i + 6], 17, -1473231341);
+      b = this.md5ff(b, c, d, a, x[i + 7], 22, -45705983);
+      a = this.md5ff(a, b, c, d, x[i + 8], 7, 1770035416);
+      d = this.md5ff(d, a, b, c, x[i + 9], 12, -1958414417);
+      c = this.md5ff(c, d, a, b, x[i + 10], 17, -42063);
+      b = this.md5ff(b, c, d, a, x[i + 11], 22, -1990404162);
+      a = this.md5ff(a, b, c, d, x[i + 12], 7, 1804603682);
+      d = this.md5ff(d, a, b, c, x[i + 13], 12, -40341101);
+      c = this.md5ff(c, d, a, b, x[i + 14], 17, -1502002290);
+      b = this.md5ff(b, c, d, a, x[i + 15], 22, 1236535329);
+
+      a = this.md5gg(a, b, c, d, x[i + 1], 5, -165796510);
+      d = this.md5gg(d, a, b, c, x[i + 6], 9, -1069501632);
+      c = this.md5gg(c, d, a, b, x[i + 11], 14, 643717713);
+      b = this.md5gg(b, c, d, a, x[i], 20, -373897302);
+      a = this.md5gg(a, b, c, d, x[i + 5], 5, -701558691);
+      d = this.md5gg(d, a, b, c, x[i + 10], 9, 38016083);
+      c = this.md5gg(c, d, a, b, x[i + 15], 14, -660478335);
+      b = this.md5gg(b, c, d, a, x[i + 4], 20, -405537848);
+      a = this.md5gg(a, b, c, d, x[i + 9], 5, 568446438);
+      d = this.md5gg(d, a, b, c, x[i + 14], 9, -1019803690);
+      c = this.md5gg(c, d, a, b, x[i + 3], 14, -187363961);
+      b = this.md5gg(b, c, d, a, x[i + 8], 20, 1163531501);
+      a = this.md5gg(a, b, c, d, x[i + 13], 5, -1444681467);
+      d = this.md5gg(d, a, b, c, x[i + 2], 9, -51403784);
+      c = this.md5gg(c, d, a, b, x[i + 7], 14, 1735328473);
+      b = this.md5gg(b, c, d, a, x[i + 12], 20, -1926607734);
+
+      a = this.md5hh(a, b, c, d, x[i + 5], 4, -378558);
+      d = this.md5hh(d, a, b, c, x[i + 8], 11, -2022574463);
+      c = this.md5hh(c, d, a, b, x[i + 11], 16, 1839030562);
+      b = this.md5hh(b, c, d, a, x[i + 14], 23, -35309556);
+      a = this.md5hh(a, b, c, d, x[i + 1], 4, -1530992060);
+      d = this.md5hh(d, a, b, c, x[i + 4], 11, 1272893353);
+      c = this.md5hh(c, d, a, b, x[i + 7], 16, -155497632);
+      b = this.md5hh(b, c, d, a, x[i + 10], 23, -1094730640);
+      a = this.md5hh(a, b, c, d, x[i + 13], 4, 681279174);
+      d = this.md5hh(d, a, b, c, x[i], 11, -358537222);
+      c = this.md5hh(c, d, a, b, x[i + 3], 16, -722521979);
+      b = this.md5hh(b, c, d, a, x[i + 6], 23, 76029189);
+      a = this.md5hh(a, b, c, d, x[i + 9], 4, -640364487);
+      d = this.md5hh(d, a, b, c, x[i + 12], 11, -421815835);
+      c = this.md5hh(c, d, a, b, x[i + 15], 16, 530742520);
+      b = this.md5hh(b, c, d, a, x[i + 2], 23, -995338651);
+
+      a = this.md5ii(a, b, c, d, x[i], 6, -198630844);
+      d = this.md5ii(d, a, b, c, x[i + 7], 10, 1126891415);
+      c = this.md5ii(c, d, a, b, x[i + 14], 15, -1416354905);
+      b = this.md5ii(b, c, d, a, x[i + 5], 21, -57434055);
+      a = this.md5ii(a, b, c, d, x[i + 12], 6, 1700485571);
+      d = this.md5ii(d, a, b, c, x[i + 3], 10, -1894986606);
+      c = this.md5ii(c, d, a, b, x[i + 10], 15, -1051523);
+      b = this.md5ii(b, c, d, a, x[i + 1], 21, -2054922799);
+      a = this.md5ii(a, b, c, d, x[i + 8], 6, 1873313359);
+      d = this.md5ii(d, a, b, c, x[i + 15], 10, -30611744);
+      c = this.md5ii(c, d, a, b, x[i + 6], 15, -1560198380);
+      b = this.md5ii(b, c, d, a, x[i + 13], 21, 1309151649);
+      a = this.md5ii(a, b, c, d, x[i + 4], 6, -145523070);
+      d = this.md5ii(d, a, b, c, x[i + 11], 10, -1120210379);
+      c = this.md5ii(c, d, a, b, x[i + 2], 15, 718787259);
+      b = this.md5ii(b, c, d, a, x[i + 9], 21, -343485551);
+
+      a = this.safeAdd(a, olda);
+      b = this.safeAdd(b, oldb);
+      c = this.safeAdd(c, oldc);
+      d = this.safeAdd(d, oldd);
+    }
+    return [a, b, c, d];
+  },
+  binl2rstr(input) {
+    var i;
+    var output = '';
+    var length32 = input.length * 32;
+    for (i = 0; i < length32; i += 8) {
+      output += String.fromCharCode((input[i >> 5] >>> (i % 32)) & 0xff);
+    }
+    return output;
+  },
+  rstr2binl(input) {
+    var i;
+    var output = [];
+    output[(input.length >> 2) - 1] = undefined;
+    for (i = 0; i < output.length; i += 1) {
+      output[i] = 0;
+    }
+    var length8 = input.length * 8;
+    for (i = 0; i < length8; i += 8) {
+      output[i >> 5] |= (input.charCodeAt(i / 8) & 0xff) << (i % 32);
+    }
+    return output;
+  },
+  rstrMD5(s) {
+    return this.binl2rstr(this.binlMD5(this.rstr2binl(s), s.length * 8));
+  },
+  rstrHMACMD5(key, data) {
+    var i;
+    var bkey = this.rstr2binl(key);
+    var ipad = [];
+    var opad = [];
+    var hash;
+    ipad[15] = opad[15] = undefined;
+    if (bkey.length > 16) {
+      bkey = this.binlMD5(bkey, key.length * 8);
+    }
+    for (i = 0; i < 16; i += 1) {
+      ipad[i] = bkey[i] ^ 0x36363636;
+      opad[i] = bkey[i] ^ 0x5c5c5c5c;
+    }
+    hash = this.binlMD5(ipad.concat(this.rstr2binl(data)), 512 + data.length * 8);
+    return this.binl2rstr(this.binlMD5(opad.concat(hash), 512 + 128));
+  },
+  rstr2hex(input) {
+    var hexTab = '0123456789abcdef';
+    var output = '';
+    var x;
+    var i;
+    for (i = 0; i < input.length; i += 1) {
+      x = input.charCodeAt(i);
+      output += hexTab.charAt((x >>> 4) & 0x0f) + hexTab.charAt(x & 0x0f);
+    }
+    return output;
+  },
+  str2rstrUTF8(input) {
+    return unescape(encodeURIComponent(input));
+  },
+  rawMD5(s) {
+    return this.rstrMD5(this.str2rstrUTF8(s));
+  },
+  hexMD5(s) {
+    return this.rstr2hex(this.rawMD5(s));
+  },
+  rawHMACMD5(k, d) {
+    return this.rstrHMACMD5(this.str2rstrUTF8(k), str2rstrUTF8(d));
+  },
+  hexHMACMD5(k, d) {
+    return this.rstr2hex(this.rawHMACMD5(k, d));
+  },
+
+  md5(string, key, raw) {
+    if (!key) {
+      if (!raw) {
+        return this.hexMD5(string);
+      }
+      return this.rawMD5(string);
+    }
+    if (!raw) {
+      return this.hexHMACMD5(key, string);
+    }
+    return this.rawHMACMD5(key, string);
+  },
+  /**
+   * 得到md5加密后的sig参数
+   * @param {Object} requestParam 接口参数
+   * @param {String} sk签名字符串
+   * @param {String} featrue 方法名
+   * @return 返回加密后的sig参数
+   */
+  getSig(requestParam, sk, feature, mode) {
+    var sig = null;
+    var requestArr = [];
+    Object.keys(requestParam).sort().forEach(function(key){
+      requestArr.push(key + '=' + requestParam[key]);
+    });
+    if (feature == 'search') {
+      sig = '/ws/place/v1/search?' + requestArr.join('&') + sk;
+    }
+    if (feature == 'suggest') {
+      sig = '/ws/place/v1/suggestion?' + requestArr.join('&') + sk;
+    }
+    if (feature == 'reverseGeocoder') {
+      sig = '/ws/geocoder/v1/?' + requestArr.join('&') + sk;
+    }
+    if (feature == 'geocoder') {
+      sig = '/ws/geocoder/v1/?' + requestArr.join('&') + sk;
+    }
+    if (feature == 'getCityList') {
+      sig = '/ws/district/v1/list?' + requestArr.join('&') + sk;
+    }
+    if (feature == 'getDistrictByCityId') {
+      sig = '/ws/district/v1/getchildren?' + requestArr.join('&') + sk;
+    }
+    if (feature == 'calculateDistance') {
+      sig = '/ws/distance/v1/?' + requestArr.join('&') + sk;
+    }
+    if (feature == 'direction') {
+      sig = '/ws/direction/v1/' + mode + '?' + requestArr.join('&') + sk;
+    }
+    sig = this.md5(sig);
+    return sig;
+  },
+    /**
+     * 得到终点query字符串
+     * @param {Array|String} 检索数据
+     */
+    location2query(data) {
+        if (typeof data == 'string') {
+            return data;
+        }
+        var query = '';
+        for (var i = 0; i < data.length; i++) {
+            var d = data[i];
+            if (!!query) {
+                query += ';';
+            }
+            if (d.location) {
+                query = query + d.location.lat + ',' + d.location.lng;
+            }
+            if (d.latitude && d.longitude) {
+                query = query + d.latitude + ',' + d.longitude;
+            }
+        }
+        return query;
+    },
+
+    /**
+     * 计算角度
+     */
+    rad(d) {
+      return d * Math.PI / 180.0;
+    },  
+    /**
+     * 处理终点location数组
+     * @return 返回终点数组
+     */
+    getEndLocation(location){
+      var to = location.split(';');
+      var endLocation = [];
+      for (var i = 0; i < to.length; i++) {
+        endLocation.push({
+          lat: parseFloat(to[i].split(',')[0]),
+          lng: parseFloat(to[i].split(',')[1])
+        })
+      }
+      return endLocation;
+    },
+
+    /**
+     * 计算两点间直线距离
+     * @param a 表示纬度差
+     * @param b 表示经度差
+     * @return 返回的是距离，单位m
+     */
+    getDistance(latFrom, lngFrom, latTo, lngTo) {
+      var radLatFrom = this.rad(latFrom);
+      var radLatTo = this.rad(latTo);
+      var a = radLatFrom - radLatTo;
+      var b = this.rad(lngFrom) - this.rad(lngTo);
+      var distance = 2 * Math.asin(Math.sqrt(Math.pow(Math.sin(a / 2), 2) + Math.cos(radLatFrom) * Math.cos(radLatTo) * Math.pow(Math.sin(b / 2), 2)));
+      distance = distance * EARTH_RADIUS;
+      distance = Math.round(distance * 10000) / 10000;
+      return parseFloat(distance.toFixed(0));
+    },
+    /**
+     * 使用微信接口进行定位
+     */
+    getWXLocation(success, fail, complete) {
+		Util.getLocation({
+			type: 'gcj02',
+			success: success,
+			fail: fail,
+			complete: complete
+		})
+    },
+
+    /**
+     * 获取location参数
+     */
+    getLocationParam(location) {
+        if (typeof location == 'string') {
+            var locationArr = location.split(',');
+            if (locationArr.length === 2) {
+                location = {
+                    latitude: location.split(',')[0],
+                    longitude: location.split(',')[1]
+                };
+            } else {
+                location = {};
+            }
+        }
+        return location;
+    },
+
+    /**
+     * 回调函数默认处理
+     */
+    polyfillParam(param) {
+        param.success = param.success || function () { };
+        param.fail = param.fail || function () { };
+        param.complete = param.complete || function () { };
+    },
+
+    /**
+     * 验证param对应的key值是否为空
+     * 
+     * @param {Object} param 接口参数
+     * @param {String} key 对应参数的key
+     */
+    checkParamKeyEmpty(param, key) {
+        if (!param[key]) {
+            var errconf = this.buildErrorConfig(ERROR_CONF.PARAM_ERR, ERROR_CONF.PARAM_ERR_MSG + key +'参数格式有误');
+            param.fail(errconf);
+            param.complete(errconf);
+            return true;
+        }
+        return false;
+    },
+
+    /**
+     * 验证参数中是否存在检索词keyword
+     * 
+     * @param {Object} param 接口参数
+     */
+    checkKeyword(param){
+        return !this.checkParamKeyEmpty(param, 'keyword');
+    },
+
+    /**
+     * 验证location值
+     * 
+     * @param {Object} param 接口参数
+     */
+    checkLocation(param) {
+        var location = this.getLocationParam(param.location);
+        if (!location || !location.latitude || !location.longitude) {
+            var errconf = this.buildErrorConfig(ERROR_CONF.PARAM_ERR, ERROR_CONF.PARAM_ERR_MSG + ' location参数格式有误');
+            param.fail(errconf);
+            param.complete(errconf);
+            return false;
+        }
+        return true;
+    },
+
+    /**
+     * 构造错误数据结构
+     * @param {Number} errCode 错误码
+     * @param {Number} errMsg 错误描述
+     */
+    buildErrorConfig(errCode, errMsg) {
+        return {
+            status: errCode,
+            message: errMsg
+        };
+    },
+
+    /**
+     * 
+     * 数据处理函数
+     * 根据传入参数不同处理不同数据
+     * @param {String} feature 功能名称
+     * search 地点搜索
+     * suggest关键词提示
+     * reverseGeocoder逆地址解析
+     * geocoder地址解析
+     * getCityList获取城市列表：父集
+     * getDistrictByCityId获取区县列表：子集
+     * calculateDistance距离计算
+     * @param {Object} param 接口参数
+     * @param {Object} data 数据
+     */
+    handleData(param,data,feature){
+      if (feature == 'search') {
+        var searchResult = data.data;
+        var searchSimplify = [];
+        for (var i = 0; i < searchResult.length; i++) {
+          searchSimplify.push({
+            id: searchResult[i].id || null,
+            title: searchResult[i].title || null,
+            latitude: searchResult[i].location && searchResult[i].location.lat || null,
+            longitude: searchResult[i].location && searchResult[i].location.lng || null,
+            address: searchResult[i].address || null,
+            category: searchResult[i].category || null,
+            tel: searchResult[i].tel || null,
+            adcode: searchResult[i].ad_info && searchResult[i].ad_info.adcode || null,
+            city: searchResult[i].ad_info && searchResult[i].ad_info.city || null,
+            district: searchResult[i].ad_info && searchResult[i].ad_info.district || null,
+            province: searchResult[i].ad_info && searchResult[i].ad_info.province || null
+          })
+        }
+        param.success(data, {
+          searchResult: searchResult,
+          searchSimplify: searchSimplify
+        })
+      } else if (feature == 'suggest') {
+        var suggestResult = data.data;
+        var suggestSimplify = [];
+        for (var i = 0; i < suggestResult.length; i++) {
+          suggestSimplify.push({
+            adcode: suggestResult[i].adcode || null,
+            address: suggestResult[i].address || null,
+            category: suggestResult[i].category || null,
+            city: suggestResult[i].city || null,
+            district: suggestResult[i].district || null,
+            id: suggestResult[i].id || null,
+            latitude: suggestResult[i].location && suggestResult[i].location.lat || null,
+            longitude: suggestResult[i].location && suggestResult[i].location.lng || null,
+            province: suggestResult[i].province || null,
+            title: suggestResult[i].title || null,
+            type: suggestResult[i].type || null
+          })
+        }
+        param.success(data, {
+          suggestResult: suggestResult,
+          suggestSimplify: suggestSimplify
+          })
+      } else if (feature == 'reverseGeocoder') {
+        var reverseGeocoderResult = data.result;
+        var reverseGeocoderSimplify = {
+          address: reverseGeocoderResult.address || null,
+          latitude: reverseGeocoderResult.location && reverseGeocoderResult.location.lat || null,
+          longitude: reverseGeocoderResult.location && reverseGeocoderResult.location.lng || null,
+          adcode: reverseGeocoderResult.ad_info && reverseGeocoderResult.ad_info.adcode || null,
+          city: reverseGeocoderResult.address_component && reverseGeocoderResult.address_component.city || null,
+          district: reverseGeocoderResult.address_component && reverseGeocoderResult.address_component.district || null,
+          nation: reverseGeocoderResult.address_component && reverseGeocoderResult.address_component.nation || null,
+          province: reverseGeocoderResult.address_component && reverseGeocoderResult.address_component.province || null,
+          street: reverseGeocoderResult.address_component && reverseGeocoderResult.address_component.street || null,
+          street_number: reverseGeocoderResult.address_component && reverseGeocoderResult.address_component.street_number || null,
+          recommend: reverseGeocoderResult.formatted_addresses && reverseGeocoderResult.formatted_addresses.recommend || null,
+          rough: reverseGeocoderResult.formatted_addresses && reverseGeocoderResult.formatted_addresses.rough || null
+        };
+        if (reverseGeocoderResult.pois) {//判断是否返回周边poi
+          var pois = reverseGeocoderResult.pois;
+          var poisSimplify = [];
+          for (var i = 0;i < pois.length;i++) {
+            poisSimplify.push({
+              id: pois[i].id || null,
+              title: pois[i].title || null,
+              latitude: pois[i].location && pois[i].location.lat || null,
+              longitude: pois[i].location && pois[i].location.lng || null,
+              address: pois[i].address || null,
+              category: pois[i].category || null,
+              adcode: pois[i].ad_info && pois[i].ad_info.adcode || null,
+              city: pois[i].ad_info && pois[i].ad_info.city || null,
+              district: pois[i].ad_info && pois[i].ad_info.district || null,
+              province: pois[i].ad_info && pois[i].ad_info.province || null
+            })
+          }
+          param.success(data,{
+            reverseGeocoderResult: reverseGeocoderResult,
+            reverseGeocoderSimplify: reverseGeocoderSimplify,
+            pois: pois,
+            poisSimplify: poisSimplify
+          })
+        } else {
+          param.success(data, {
+            reverseGeocoderResult: reverseGeocoderResult,
+            reverseGeocoderSimplify: reverseGeocoderSimplify
+          })
+        }
+      } else if (feature == 'geocoder') {
+        var geocoderResult = data.result;
+        var geocoderSimplify = {
+          title: geocoderResult.title || null,
+          latitude: geocoderResult.location && geocoderResult.location.lat || null,
+          longitude: geocoderResult.location && geocoderResult.location.lng || null,
+          adcode: geocoderResult.ad_info && geocoderResult.ad_info.adcode || null,
+          province: geocoderResult.address_components && geocoderResult.address_components.province || null,
+          city: geocoderResult.address_components && geocoderResult.address_components.city || null,
+          district: geocoderResult.address_components && geocoderResult.address_components.district || null,
+          street: geocoderResult.address_components && geocoderResult.address_components.street || null,
+          street_number: geocoderResult.address_components && geocoderResult.address_components.street_number || null,
+          level: geocoderResult.level || null
+        };
+        param.success(data,{
+          geocoderResult: geocoderResult,
+          geocoderSimplify: geocoderSimplify
+        });
+      } else if (feature == 'getCityList') {
+        var provinceResult = data.result[0];
+        var cityResult = data.result[1];
+        var districtResult = data.result[2];
+        param.success(data,{
+          provinceResult: provinceResult,
+          cityResult: cityResult,
+          districtResult: districtResult
+        });
+      } else if (feature == 'getDistrictByCityId') {
+        var districtByCity = data.result[0];
+        param.success(data, districtByCity);
+      } else if (feature == 'calculateDistance') {
+        var calculateDistanceResult = data.result.elements;  
+        var distance = [];
+        for (var i = 0; i < calculateDistanceResult.length; i++){
+          distance.push(calculateDistanceResult[i].distance);
+        }   
+        param.success(data, {
+          calculateDistanceResult: calculateDistanceResult,
+          distance: distance
+          });
+      } else if (feature == 'direction') {
+        var direction = data.result.routes;
+        param.success(data,direction);
+      } else {
+        param.success(data);
+      }
+    },
+
+    /**
+     * 构造微信请求参数，公共属性处理
+     * 
+     * @param {Object} param 接口参数
+     * @param {Object} param 配置项
+     * @param {String} feature 方法名
+     */
+    buildWxRequestConfig(param, options, feature) {
+        var that = this;
+        options.header = { "content-type": "application/json" };
+        options.method = 'GET';
+        options.success = function (res) {
+            var data = res.data;
+            if (data.status === 0) {
+              that.handleData(param, data, feature);
+            } else {
+                param.fail(data);
+            }
+        };
+        options.fail = function (res) {
+            res.statusCode = ERROR_CONF.WX_ERR_CODE;
+            param.fail(that.buildErrorConfig(ERROR_CONF.WX_ERR_CODE, res.errMsg));
+        };
+        options.complete = function (res) {
+            var statusCode = +res.statusCode;
+            switch(statusCode) {
+                case ERROR_CONF.WX_ERR_CODE: {
+                    param.complete(that.buildErrorConfig(ERROR_CONF.WX_ERR_CODE, res.errMsg));
+                    break;
+                }
+                case ERROR_CONF.WX_OK_CODE: {
+                    var data = res.data;
+                    if (data.status === 0) {
+                        param.complete(data);
+                    } else {
+                        param.complete(that.buildErrorConfig(data.status, data.message));
+                    }
+                    break;
+                }
+                default:{
+                    param.complete(that.buildErrorConfig(ERROR_CONF.SYSTEM_ERR, ERROR_CONF.SYSTEM_ERR_MSG));
+                }
+
+            }
+        };
+        return options;
+    },
+
+    /**
+     * 处理用户参数是否传入坐标进行不同的处理
+     */
+    locationProcess(param, locationsuccess, locationfail, locationcomplete) {
+        var that = this;
+        locationfail = locationfail || function (res) {
+            res.statusCode = ERROR_CONF.WX_ERR_CODE;
+            param.fail(that.buildErrorConfig(ERROR_CONF.WX_ERR_CODE, res.errMsg));
+        };
+        locationcomplete = locationcomplete || function (res) {
+            if (res.statusCode == ERROR_CONF.WX_ERR_CODE) {
+                param.complete(that.buildErrorConfig(ERROR_CONF.WX_ERR_CODE, res.errMsg));
+            }
+        };
+        if (!param.location) {
+            that.getWXLocation(locationsuccess, locationfail, locationcomplete);
+        } else if (that.checkLocation(param)) {
+            var location = Utils.getLocationParam(param.location);
+            locationsuccess(location);
+        }
+    }
+};
+
+
+class QQMapWX {
+
+    /**
+     * 构造函数
+     * 
+     * @param {Object} options 接口参数,key 为必选参数
+     */
+    constructor(options) {
+        if (!options.key) {
+            throw Error('key值不能为空');
+        }
+        this.key = options.key;
+    };
+
+    /**
+     * POI周边检索
+     *
+     * @param {Object} options 接口参数对象
+     * 
+     * 参数对象结构可以参考
+     * @see http://lbs.qq.com/webservice_v1/guide-search.html
+     */
+    search(options) {
+        var that = this;
+        options = options || {};
+
+        Utils.polyfillParam(options);
+
+        if (!Utils.checkKeyword(options)) {
+            return;
+        }
+
+        var requestParam = {
+            keyword: options.keyword,
+            orderby: options.orderby || '_distance',
+            page_size: options.page_size || 10,
+            page_index: options.page_index || 1,
+            output: 'json',
+            key: that.key
+        };
+
+        if (options.address_format) {
+            requestParam.address_format = options.address_format;
+        }
+
+        if (options.filter) {
+            requestParam.filter = options.filter;
+        }
+
+        var distance = options.distance || "1000";
+        var auto_extend = options.auto_extend || 1;
+        var region = null;
+        var rectangle = null;
+
+        //判断城市限定参数
+        if (options.region) {
+          region = options.region;
+        }
+
+        //矩形限定坐标(暂时只支持字符串格式)
+        if (options.rectangle) {
+          rectangle = options.rectangle;
+        }
+
+        var locationsuccess = function (result) {        
+          if (region && !rectangle) {
+            //城市限定参数拼接
+            requestParam.boundary = "region(" + region + "," + auto_extend + "," + result.latitude + "," + result.longitude + ")";
+            if (options.sig) {
+              requestParam.sig = Utils.getSig(requestParam, options.sig, 'search');
+            }
+          } else if (rectangle && !region) {
+            //矩形搜索
+            requestParam.boundary = "rectangle(" + rectangle + ")";
+            if (options.sig) {
+              requestParam.sig = Utils.getSig(requestParam, options.sig, 'search');
+            }
+            } else {
+              requestParam.boundary = "nearby(" + result.latitude + "," + result.longitude + "," + distance + "," + auto_extend + ")";
+            if (options.sig) {
+              requestParam.sig = Utils.getSig(requestParam, options.sig, 'search');
+            }
+            }            
+            wx.request(Utils.buildWxRequestConfig(options, {
+                url: URL_SEARCH,
+                data: requestParam
+            }, 'search'));
+        };
+        Utils.locationProcess(options, locationsuccess);
+    };
+
+    /**
+     * sug模糊检索
+     *
+     * @param {Object} options 接口参数对象
+     * 
+     * 参数对象结构可以参考
+     * http://lbs.qq.com/webservice_v1/guide-suggestion.html
+     */
+    getSuggestion(options) {
+        var that = this;
+        options = options || {};
+        Utils.polyfillParam(options);
+
+        if (!Utils.checkKeyword(options)) {
+            return;
+        }
+
+        var requestParam = {
+            keyword: options.keyword,
+            region: options.region || '全国',
+            region_fix: options.region_fix || 0,
+            policy: options.policy || 0,
+            page_size: options.page_size || 10,//控制显示条数
+            page_index: options.page_index || 1,//控制页数
+            get_subpois : options.get_subpois || 0,//返回子地点
+            output: 'json',
+            key: that.key
+        };
+        //长地址
+        if (options.address_format) {
+          requestParam.address_format = options.address_format;
+        }
+        //过滤
+        if (options.filter) {
+          requestParam.filter = options.filter;
+        }
+        //排序
+        if (options.location) {
+          var locationsuccess = function (result) {
+            requestParam.location = result.latitude + ',' + result.longitude;
+            if (options.sig) {
+              requestParam.sig = Utils.getSig(requestParam, options.sig, 'suggest');
+            }
+            wx.request(Utils.buildWxRequestConfig(options, {
+              url: URL_SUGGESTION,
+              data: requestParam
+            }, "suggest"));      
+          };
+          Utils.locationProcess(options, locationsuccess);
+        } else {
+          if (options.sig) {
+            requestParam.sig = Utils.getSig(requestParam, options.sig, 'suggest');
+          }
+          wx.request(Utils.buildWxRequestConfig(options, {
+            url: URL_SUGGESTION,
+            data: requestParam
+          }, "suggest"));      
+        }        
+    };
+
+    /**
+     * 逆地址解析
+     *
+     * @param {Object} options 接口参数对象
+     * 
+     * 请求参数结构可以参考
+     * http://lbs.qq.com/webservice_v1/guide-gcoder.html
+     */
+    reverseGeocoder(options) {
+        var that = this;
+        options = options || {};
+        Utils.polyfillParam(options);
+        var requestParam = {
+            coord_type: options.coord_type || 5,
+            get_poi: options.get_poi || 0,
+            output: 'json',
+            key: that.key
+        };
+        if (options.poi_options) {
+            requestParam.poi_options = options.poi_options
+        }
+
+        var locationsuccess = function (result) {
+            requestParam.location = result.latitude + ',' + result.longitude;
+          if (options.sig) {
+            requestParam.sig = Utils.getSig(requestParam, options.sig, 'reverseGeocoder');
+          }
+            wx.request(Utils.buildWxRequestConfig(options, {
+                url: URL_GET_GEOCODER,
+                data: requestParam
+            }, 'reverseGeocoder'));
+        };
+        Utils.locationProcess(options, locationsuccess);
+    };
+
+    /**
+     * 地址解析
+     *
+     * @param {Object} options 接口参数对象
+     * 
+     * 请求参数结构可以参考
+     * http://lbs.qq.com/webservice_v1/guide-geocoder.html
+     */
+    geocoder(options) {
+        var that = this;
+        options = options || {};
+        Utils.polyfillParam(options);
+
+        if (Utils.checkParamKeyEmpty(options, 'address')) {
+            return;
+        }
+
+        var requestParam = {
+            address: options.address,
+            output: 'json',
+            key: that.key
+        };
+
+        //城市限定
+        if (options.region) {
+          requestParam.region = options.region;
+        }
+
+        if (options.sig) {
+          requestParam.sig = Utils.getSig(requestParam, options.sig, 'geocoder');
+        }
+
+        wx.request(Utils.buildWxRequestConfig(options, {
+            url: URL_GET_GEOCODER,
+            data: requestParam
+        },'geocoder'));
+    };
+
+
+    /**
+     * 获取城市列表
+     *
+     * @param {Object} options 接口参数对象
+     * 
+     * 请求参数结构可以参考
+     * http://lbs.qq.com/webservice_v1/guide-region.html
+     */
+    getCityList(options) {
+        var that = this;
+        options = options || {};
+        Utils.polyfillParam(options);
+        var requestParam = {
+            output: 'json',
+            key: that.key
+        };
+
+        if (options.sig) {
+          requestParam.sig = Utils.getSig(requestParam, options.sig, 'getCityList');
+        }
+
+        wx.request(Utils.buildWxRequestConfig(options, {
+            url: URL_CITY_LIST,
+            data: requestParam
+        },'getCityList'));
+    };
+
+    /**
+     * 获取对应城市ID的区县列表
+     *
+     * @param {Object} options 接口参数对象
+     * 
+     * 请求参数结构可以参考
+     * http://lbs.qq.com/webservice_v1/guide-region.html
+     */
+    getDistrictByCityId(options) {
+        var that = this;
+        options = options || {};
+        Utils.polyfillParam(options);
+
+        if (Utils.checkParamKeyEmpty(options, 'id')) {
+            return;
+        }
+
+        var requestParam = {
+            id: options.id || '',
+            output: 'json',
+            key: that.key
+        };
+
+        if (options.sig) {
+          requestParam.sig = Utils.getSig(requestParam, options.sig, 'getDistrictByCityId');
+        }
+
+        wx.request(Utils.buildWxRequestConfig(options, {
+            url: URL_AREA_LIST,
+            data: requestParam
+        },'getDistrictByCityId'));
+    };
+
+    /**
+     * 用于单起点到多终点的路线距离(非直线距离)计算：
+     * 支持两种距离计算方式：步行和驾车。
+     * 起点到终点最大限制直线距离10公里。
+     *
+     * 新增直线距离计算。
+     * 
+     * @param {Object} options 接口参数对象
+     * 
+     * 请求参数结构可以参考
+     * http://lbs.qq.com/webservice_v1/guide-distance.html
+     */
+    calculateDistance(options) {
+        var that = this;
+        options = options || {};
+        Utils.polyfillParam(options);
+
+        if (Utils.checkParamKeyEmpty(options, 'to')) {
+            return;
+        }
+
+        var requestParam = {
+            mode: options.mode || 'walking',
+            to: Utils.location2query(options.to),
+            output: 'json',
+            key: that.key
+        };
+
+        if (options.from) {
+          options.location = options.from;
+        }
+
+        //计算直线距离
+        if(requestParam.mode == 'straight'){        
+          var locationsuccess = function (result) {
+            var locationTo = Utils.getEndLocation(requestParam.to);//处理终点坐标
+            var data = {
+              message:"query ok",
+              result:{
+                elements:[]
+              },
+              status:0
+            };
+            for (var i = 0; i < locationTo.length; i++) {
+              data.result.elements.push({//将坐标存入
+                distance: Utils.getDistance(result.latitude, result.longitude, locationTo[i].lat, locationTo[i].lng),
+                duration:0,
+                from:{
+                  lat: result.latitude,
+                  lng:result.longitude
+                },
+                to:{
+                  lat: locationTo[i].lat,
+                  lng: locationTo[i].lng
+                }
+              });            
+            }
+            var calculateResult = data.result.elements;
+            var distanceResult = [];
+            for (var i = 0; i < calculateResult.length; i++) {
+              distanceResult.push(calculateResult[i].distance);
+            }  
+            return options.success(data,{
+              calculateResult: calculateResult,
+              distanceResult: distanceResult
+            });
+          };
+          
+          Utils.locationProcess(options, locationsuccess);
+        } else {
+          var locationsuccess = function (result) {
+            requestParam.from = result.latitude + ',' + result.longitude;
+            if (options.sig) {
+              requestParam.sig = Utils.getSig(requestParam, options.sig, 'calculateDistance');
+            }
+            wx.request(Utils.buildWxRequestConfig(options, {
+              url: URL_DISTANCE,
+              data: requestParam
+            },'calculateDistance'));
+          };
+
+          Utils.locationProcess(options, locationsuccess);
+        }      
+    };
+
+  /**
+   * 路线规划：
+   * 
+   * @param {Object} options 接口参数对象
+   * 
+   * 请求参数结构可以参考
+   * https://lbs.qq.com/webservice_v1/guide-road.html
+   */
+  direction(options) {
+    var that = this;
+    options = options || {};
+    Utils.polyfillParam(options);
+
+    if (Utils.checkParamKeyEmpty(options, 'to')) {
+      return;
+    }
+
+    var requestParam = {
+      output: 'json',
+      key: that.key
+    };
+
+    //to格式处理
+    if (typeof options.to == 'string') {
+      requestParam.to = options.to;
+    } else {
+      requestParam.to = options.to.latitude + ',' + options.to.longitude;
+    }
+    //初始化局部请求域名
+    var SET_URL_DIRECTION = null;
+    //设置默认mode属性
+    options.mode = options.mode || MODE.driving;
+
+    //设置请求域名
+    SET_URL_DIRECTION = URL_DIRECTION + options.mode;
+
+    if (options.from) {
+      options.location = options.from;
+    }
+
+    if (options.mode == MODE.driving) {
+      if (options.from_poi) {
+        requestParam.from_poi = options.from_poi;
+      }
+      if (options.heading) {
+        requestParam.heading = options.heading;
+      }
+      if (options.speed) {
+        requestParam.speed = options.speed;
+      }
+      if (options.accuracy) {
+        requestParam.accuracy = options.accuracy;
+      }
+      if (options.road_type) {
+        requestParam.road_type = options.road_type;
+      }
+      if (options.to_poi) {
+        requestParam.to_poi = options.to_poi;
+      }
+      if (options.from_track) {
+        requestParam.from_track = options.from_track;
+      }
+      if (options.waypoints) {
+        requestParam.waypoints = options.waypoints;
+      }
+      if (options.policy) {
+        requestParam.policy = options.policy;
+      }
+      if (options.plate_number) {
+        requestParam.plate_number = options.plate_number;
+      }
+    }
+
+    if (options.mode == MODE.transit) {
+      if (options.departure_time) {
+        requestParam.departure_time = options.departure_time;
+      }
+      if (options.policy) {
+        requestParam.policy = options.policy;
+      }
+    } 
+
+    var locationsuccess = function (result) {
+      requestParam.from = result.latitude + ',' + result.longitude;
+      if (options.sig) {
+        requestParam.sig = Utils.getSig(requestParam, options.sig, 'direction',options.mode);
+      }
+      wx.request(Utils.buildWxRequestConfig(options, {
+        url: SET_URL_DIRECTION,
+        data: requestParam
+      }, 'direction'));
+    };
+
+    Utils.locationProcess(options, locationsuccess);
+  }
+};
+module.exports = {
+    Utils,
+	QQMapWX
+};
diff --git a/common/js/map/openMap.js b/common/js/map/openMap.js
index 9333ec7..11a5299 100644
--- a/common/js/map/openMap.js
+++ b/common/js/map/openMap.js
@@ -1,107 +1,107 @@
-import TransformCoordinate from './transformCoordinate.js'
-
-function openMapByDefault(latitude, longitude, name) {
-	uni.openLocation({
-		latitude: latitude,
-		longitude: longitude,
-		name: name,
-		fail: (e) => {
-			uni.showModal({
-				content: '打开地图失败，请稍后重试'
-			})
-		},
-	})
-}
-
-function openMapByAndroid(latitude, longitude, name) {
-	let url = ''; // 回调地址
-	let identity = ''; // 程序名称
-	if (plus.runtime.isApplicationExist({
-			pname: 'com.baidu.BaiduMap'
-		})) {
-		url =
-			`baidumap://map/marker?location=${latitude},${longitude}&title=${name}&coord_type=gcj02&src=andr.baidu.openAPIdemo`
-		identity = 'com.baidu.BaiduMap'
-		openURL(url, identity)
-	} else if (plus.runtime.isApplicationExist({
-			pname: 'com.autonavi.minimap'
-		})) { // 高德
-		url = `androidamap://viewMap?sourceApplication=appname&poiname=${name}&lat=${latitude}&lon=${longitude}&dev=0`
-		identity = 'com.autonavi.minimap'
-		openURL(url, identity)
-	} else {
-		openMapByDefault(latitude, longitude, name)
-	}
-}
-
-function openMapByIos(latitude, longitude, name) {
-	let url = ''; // 回调地址
-	let errorCB = ''; // url失败的回调地址
-	let identity = ''; // 程序名称
-
-	if (plus.runtime.isApplicationExist({
-			action: 'baidumap://'
-		})) {
-		url =
-			`baidumap://map/marker?location=${latitude},${longitude}&title=${name}&content=${name}&src=ios.baidu.openAPIdemo&coord_type=gcj02`;
-		openURL(url, identity)
-	} else if (plus.runtime.isApplicationExist({
-			action: 'iosamap://'
-		})) { // 高德
-		url = `iosamap://viewMap?sourceApplication=applicationName&poiname=${name}&lat=${latitude}&lon=${longitude}&dev=0`
-		openURL(url, identity)
-	} else {
-		openMapByDefault(latitude, longitude, name)
-	}
-}
-
-function openURL(url, identity) {
-	let newurl = encodeURI(url);
-	plus.runtime.openURL(newurl, function(res) {
-		uni.showModal({
-			content: res.message
-		})
-	}, identity);
-}
-
-function getCoordByType(longitude, latitude, coord_type) {
-	switch (coord_type) {
-		case 'gcj02':
-			return [longitude, latitude]
-			break;
-		case 'bd09':
-			return TransformCoordinate.bd09togcj02(longitude, latitude)
-			break;
-		case 'wgs84':
-			return TransformCoordinate.wgs84togcj02(longitude, latitude)
-			break;
-		default:
-			return [longitude, latitude]
-			break;
-	}
-}
-export default {
-	/* 打开地图 */
-	openMap(latitude, longitude, name, coord_type = 'gcj02') {
-		let arr = getCoordByType(longitude, latitude, coord_type)
-		// #ifdef APP-PLUS
-		switch (uni.getSystemInfoSync().platform) {
-			case 'android':
-				console.log('运行Android上')
-				openMapByAndroid(arr[1], arr[0], name)
-				break;
-			case 'ios':
-				console.log('运行iOS上')
-				openMapByIos(arr[1], arr[0], name)
-				break;
-			default:
-				openMapByDefault(arr[1], arr[0], name)
-				console.log('运行在开发者工具上')
-				break;
-		}
-		// #endif
-		// #ifndef APP-PLUS
-		openMapByDefault(arr[1], arr[0], name)
-		// #endif
-	}
-}
+import TransformCoordinate from './transformCoordinate.js'
+
+function openMapByDefault(latitude, longitude, name) {
+	uni.openLocation({
+		latitude: latitude,
+		longitude: longitude,
+		name: name,
+		fail: (e) => {
+			uni.showModal({
+				content: '打开地图失败，请稍后重试'
+			})
+		},
+	})
+}
+
+function openMapByAndroid(latitude, longitude, name) {
+	let url = ''; // 回调地址
+	let identity = ''; // 程序名称
+	if (plus.runtime.isApplicationExist({
+			pname: 'com.baidu.BaiduMap'
+		})) {
+		url = `baidumap://map/marker?location=${latitude},${longitude}&title=${name}&coord_type=gcj02&src=andr.baidu.openAPIdemo`;
+		identity = 'com.baidu.BaiduMap';
+		openURL(url, identity)
+	} else if (plus.runtime.isApplicationExist({
+			pname: 'com.autonavi.minimap'
+		})) {
+		// 高德
+		url = `androidamap://viewMap?sourceApplication=appname&poiname=${name}&lat=${latitude}&lon=${longitude}&dev=0`;
+		identity = 'com.autonavi.minimap';
+		openURL(url, identity)
+	} else {
+		openMapByDefault(latitude, longitude, name)
+	}
+}
+
+function openMapByIos(latitude, longitude, name) {
+	let url = ''; // 回调地址
+	let errorCB = ''; // url失败的回调地址
+	let identity = ''; // 程序名称
+
+	if (plus.runtime.isApplicationExist({
+			action: 'baidumap://'
+		})) {
+		url = `baidumap://map/marker?location=${latitude},${longitude}&title=${name}&content=${name}&src=ios.baidu.openAPIdemo&coord_type=gcj02`;
+		openURL(url, identity)
+	} else if (plus.runtime.isApplicationExist({
+			action: 'iosamap://'
+		})) {
+		// 高德
+		url = `iosamap://viewMap?sourceApplication=applicationName&poiname=${name}&lat=${latitude}&lon=${longitude}&dev=0`;
+		openURL(url, identity)
+	} else {
+		openMapByDefault(latitude, longitude, name)
+	}
+}
+
+function openURL(url, identity) {
+	let newurl = encodeURI(url);
+	plus.runtime.openURL(newurl, function(res) {
+		uni.showModal({
+			content: res.message
+		})
+	}, identity);
+}
+
+function getCoordByType(longitude, latitude, coord_type) {
+	switch (coord_type) {
+		case 'gcj02':
+			return [longitude, latitude]
+			break;
+		case 'bd09':
+			return TransformCoordinate.bd09togcj02(longitude, latitude)
+			break;
+		case 'wgs84':
+			return TransformCoordinate.wgs84togcj02(longitude, latitude)
+			break;
+		default:
+			return [longitude, latitude]
+			break;
+	}
+}
+export default {
+	/* 打开地图 */
+	openMap(latitude, longitude, name, coord_type = 'gcj02') {
+		let arr = getCoordByType(longitude, latitude, coord_type)
+		// #ifdef APP-PLUS
+		switch (uni.getSystemInfoSync().platform) {
+			case 'android':
+				console.log('运行Android上')
+				openMapByAndroid(arr[1], arr[0], name)
+				break;
+			case 'ios':
+				console.log('运行iOS上')
+				openMapByIos(arr[1], arr[0], name)
+				break;
+			default:
+				openMapByDefault(arr[1], arr[0], name)
+				console.log('运行在开发者工具上')
+				break;
+		}
+		// #endif
+		// #ifndef APP-PLUS
+		openMapByDefault(arr[1], arr[0], name)
+		// #endif
+	}
+}
diff --git a/common/js/socketTest.js b/common/js/socketTest.js
index 29a18d1..08054ac 100644
--- a/common/js/socketTest.js
+++ b/common/js/socketTest.js
@@ -1,207 +1,215 @@
-import config from './config.js'
-
-export default {
-	data() {
-		return {
-			timeoutObj: null, //ping定时器
-			servicer_id: null, //绑定
-			pingInterval: config.pingInterval //本地端主动给服务器ping的时间, 0 则不开启
-		}
-	},
-	onLoad() {
-		let that = this;
-		// 因为图片上传，所以不能onhide关闭长链接，但是每次打开客服都会有重复请求，所以优先关闭再去打开长链接
-		uni.closeSocket();
-		// .判断是否已连接
-		that.checkOpenSocket();
-		// uni.onSocketClose(function(res) {
-		// 	console.log('WebSocket 已关闭！');
-		// });
-	},
-	methods: {
-		// 判断是否已连接
-		checkOpenSocket() {
-			console.log('判断是否已连接');
-			// alert('判断是否已连接')
-			let self = this;
-			uni.sendSocketMessage({
-				data: 'ping',
-				success: (res) => {
-					console.log('连接成功,检查');
-					// alert('连接成功,检查')
-					// self.getChatList();
-				},
-				fail: (err) => { // 未连接打开websocket连接
-					console.log('连接失败');
-					// alert('连接失败')
-					self.openConnection();
-				}
-			});
-		},
-		openConnection() { // 打开连接
-			console.log('打开连接');
-			// alert('打开连接')
-			// uni.closeSocket(); // 确保已经关闭后再重新打开
-			uni.connectSocket({
-				url: config.webSocket,
-				method: 'POST',
-				success(res) {
-					console.log('连接成功 connectSocket=', res);
-					// alert('连接成功 connectSocket=', res);
-				},
-				fail(err) {
-					console.log('连接失败 connectSocket=', err);
-				}
-			});
-			// uni.onSocketOpen((res) => {
-			// 	console.log('连接成功', res);
-			// });
-			this.onSocketMessage(); // 打开成功监听服务器返回的消息
-		},
-		//	打开成功监听服务器返回的消息
-		onSocketMessage() { // 消息
-			console.log("开始监听");
-
-			let that = this;
-			this.pingInterval = config.pingInterval;
-			this.timeoutObj = null;
-			uni.onSocketMessage((res) => { //type:init,connect,close,string,order,goods
-				let msg = JSON.parse(res.data);
-				console.log("监听该服务器消息", res);
-				if (msg.type == 'close') {
-					clearInterval(that.timeoutObj);
-					that.timeoutObj = null;
-					uni.closeSocket();
-					return;
-				}
-				this.reset();
-				this.getSocketMsg(res.data); // 监听到有新服务器消息
-			});
-		},
-		// 监听到有新服务器消息
-		getSocketMsg(reData) { // 监听到服务器消息
-			let that = this;
-			// console.log(reData)
-			let giveMsg = JSON.parse(reData);
-			let data = {
-				isItMe: false,
-			};
-			data.contentType = giveMsg.type;
-			// alert(data.contentType)
-			if (giveMsg.type == 'init') {
-				// alert(123)
-				that.$api.sendRequest({
-					url: '/servicer/api/chat/bind',
-					data: {
-						client_id: giveMsg.data.client_id,
-						site_id: that.siteId
-					},
-					success(res) {
-						if (res.code == 0) {
-							that.servicer_id = res.data.servicer_id;
-						} else {
-							that.servicer_id = 0;
-						}
-						that.getChatList();
-					}
-				})
-			} else if (giveMsg.type == 'connect') {
-				// that.servicer_id = giveMsg.data.servicer_id;
-				// let NewArr = that.messageList;
-				// let index = null;
-				// for (let i = 0; i < NewArr.length; i++) {
-				// 	if (NewArr[i].contentType == 'online' || NewArr[i].contentType == 'noline') {
-				// 		index = i;
-				// 	}
-				// }
-				// NewArr.splice(index, 1)
-				// that.messageList = NewArr;
-				// let obj = {}
-				// if (that.servicer_id > 0) {
-				// 	obj.contentType = 'online';
-				// } else if (that.servicer_id == 0) {
-				// 	obj.contentType = 'noline';
-				// }
-				// that.messageList.push(obj);
-				return false;
-			} else if (giveMsg.type == 'string') {
-				data.content = giveMsg.data.servicer_say;
-			} else if (giveMsg.type == 'image') {
-				data.image = giveMsg.data.servicer_say;
-			} else if (giveMsg.type == 'order') {
-				data.order_id = giveMsg.data.order_id;
-			} else if (giveMsg.type == 'goodssku') {
-				data.sku_id = giveMsg.data.goods_sku_id;
-			}
-			if (giveMsg.type == 'init') return;
-			that.messageList.push(data);
-			that.$nextTick(() => {
-				that.setPageScrollTo()
-			})
-		},
-		// 检测心跳reset
-		reset() {
-			console.log("检测心跳");
-			clearInterval(this.timeoutObj);
-			this.start(); // 启动心跳
-		},
-		// 启动心跳 start 
-		start() {
-			console.log("启动心跳");
-			let self = this;
-			this.timeoutObj = setInterval(function () {
-				uni.sendSocketMessage({
-					data: 'ping',
-					success: (res) => {
-						console.log('连接中....');
-					},
-					fail: (err) => {
-						console.log('连接失败重新连接....');
-						self.openConnection();
-					}
-				});
-			}, this.pingInterval);
-		}
-	},
-	// onHide() {
-	// 	// alert("关闭")
-	// 	// 改之前的
-	// 	// console.log("我出发了")
-	// 	// this.checkOpenSocket();
-	// 	clearInterval(this.timeoutObj);
-	// 	this.timeoutObj = null;
-	// 	this.$api.sendRequest({
-	// 		url: '/servicer/api/chat/bye',
-	// 		data: {
-	// 			servicer_id: this.servicer_id,
-	// 			site_id: this.siteId
-	// 		},
-	// 		success(res) {
-	// 			uni.closeSocket();
-	// 		},
-	// 		fail: (err) => {
-	// 			uni.closeSocket();
-	// 		}
-	// 	});
-	// },
-	onUnload() {
-		// alert("关闭")
-		clearInterval(this.timeoutObj);
-		this.timeoutObj = null;
-		this.$api.sendRequest({
-			url: '/servicer/api/chat/bye',
-			data: {
-				servicer_id: this.servicer_id,
-				site_id: this.siteId
-			},
-			success(res) {
-				// alert("关闭1")
-				uni.closeSocket();
-			},
-			fail: (err) => {
-				// alert("关闭2")
-				uni.closeSocket();
-			}
-		});
-	}
-}
+import config from './config.js'
+
+export default {
+	data() {
+		return {
+			timeoutObj: null, //ping定时器
+			servicer_id: null, //绑定
+			pingInterval: config.pingInterval //本地端主动给服务器ping的时间, 0 则不开启
+		}
+	},
+	onLoad() {
+		let that = this;
+		// 因为图片上传，所以不能onhide关闭长链接，但是每次打开客服都会有重复请求，所以优先关闭再去打开长链接
+		uni.closeSocket();
+		// .判断是否已连接
+		that.checkOpenSocket();
+		// uni.onSocketClose(function(res) {
+		// 	console.log('WebSocket 已关闭！');
+		// });
+	},
+	methods: {
+		// 判断是否已连接
+		checkOpenSocket() {
+			console.log('判断是否已连接');
+			// alert('判断是否已连接')
+			let self = this;
+			uni.sendSocketMessage({
+				data: 'ping',
+				success: (res) => {
+					console.log('连接成功,检查');
+					// alert('连接成功,检查')
+					// self.getChatList();
+				},
+				fail: (err) => { // 未连接打开websocket连接
+					console.log('连接失败');
+					// alert('连接失败')
+					self.openConnection();
+				}
+			});
+		},
+		openConnection() { // 打开连接
+			console.log('打开连接');
+			// alert('打开连接')
+			// uni.closeSocket(); // 确保已经关闭后再重新打开
+			
+			uni.connectSocket({
+				url: config.webSocket,
+				method: 'POST',
+				success(res) {
+					console.log('连接成功 connectSocket=', res);
+					// alert('连接成功 connectSocket=', res);
+				},
+				fail(err) {
+					console.log('连接失败 connectSocket=', err);
+				}
+			});
+			// 监听 WebSocket 连接错误事件
+			uni.onSocketError((res)=>{
+			    console.error('WebSocket 连接失败:', res.errMsg);
+				this.chatListInit();
+				this.getChatList();
+			});
+			// uni.onSocketOpen((res) => {
+			// 	console.log('连接成功', res);
+			// });
+			this.onSocketMessage(); // 打开成功监听服务器返回的消息
+		},
+		//	打开成功监听服务器返回的消息
+		onSocketMessage() { // 消息
+			console.log("开始监听");
+
+			let that = this;
+			this.pingInterval = config.pingInterval;
+			if(this.timeoutObj) clearInterval(this.timeoutObj);
+			this.timeoutObj = null;
+			uni.onSocketMessage((res) => { //type:init,connect,close,string,order,goods
+				let msg = JSON.parse(res.data);
+				console.log("监听该服务器消息", res);
+				if (msg.type == 'close') {
+					clearInterval(that.timeoutObj);
+					that.timeoutObj = null;
+					uni.closeSocket();
+					return;
+				}
+				this.reset();
+				this.getSocketMsg(res.data); // 监听到有新服务器消息
+			});
+		},
+		// 监听到有新服务器消息
+		getSocketMsg(reData) { // 监听到服务器消息
+			let that = this;
+			let giveMsg = JSON.parse(reData);
+			let data = {
+				isItMe: false,
+			};
+			data.contentType = giveMsg.type;
+			// alert(data.contentType)
+			if (giveMsg.type == 'init') {
+				// alert(123)
+				that.$api.sendRequest({
+					url: '/servicer/api/chat/bind',
+					data: {
+						client_id: giveMsg.data.client_id,
+						site_id: that.siteId
+					},
+					success(res) {
+						if (res.code == 0) {
+							that.servicer_id = res.data.servicer_id;
+						} else {
+							that.servicer_id = 0;
+						}
+						that.chatListInit();
+						that.getChatList();
+					}
+				})
+			} else if (giveMsg.type == 'connect') {
+				// that.servicer_id = giveMsg.data.servicer_id;
+				// let NewArr = that.messageList;
+				// let index = null;
+				// for (let i = 0; i < NewArr.length; i++) {
+				// 	if (NewArr[i].contentType == 'online' || NewArr[i].contentType == 'noline') {
+				// 		index = i;
+				// 	}
+				// }
+				// NewArr.splice(index, 1)
+				// that.messageList = NewArr;
+				// let obj = {}
+				// if (that.servicer_id > 0) {
+				// 	obj.contentType = 'online';
+				// } else if (that.servicer_id == 0) {
+				// 	obj.contentType = 'noline';
+				// }
+				// that.messageList.push(obj);
+				return false;
+			} else if (giveMsg.type == 'string') {
+				data.content = giveMsg.data.servicer_say;
+			} else if (giveMsg.type == 'image') {
+				data.image = giveMsg.data.servicer_say;
+			} else if (giveMsg.type == 'order') {
+				data.order_id = giveMsg.data.order_id;
+			} else if (giveMsg.type == 'goodssku') {
+				data.sku_id = giveMsg.data.goods_sku_id;
+			}
+			if (giveMsg.type == 'init') return;
+			that.messageList.push(data);
+			that.$nextTick(() => {
+				that.setPageScrollTo()
+			})
+		},
+		// 检测心跳reset
+		reset() {
+			console.log("检测心跳");
+			clearInterval(this.timeoutObj);
+			this.start(); // 启动心跳
+		},
+		// 启动心跳 start 
+		start() {
+			console.log("启动心跳");
+			let self = this;
+			this.timeoutObj = setInterval(function () {
+				uni.sendSocketMessage({
+					data: 'ping',
+					success: (res) => {
+						console.log('连接中....');
+					},
+					fail: (err) => {
+						console.log('连接失败重新连接....');
+						self.openConnection();
+					}
+				});
+			}, this.pingInterval);
+		}
+	},
+	// onHide() {
+	// 	// alert("关闭")
+	// 	// 改之前的
+	// 	// console.log("我出发了")
+	// 	// this.checkOpenSocket();
+	// 	clearInterval(this.timeoutObj);
+	// 	this.timeoutObj = null;
+	// 	this.$api.sendRequest({
+	// 		url: '/servicer/api/chat/bye',
+	// 		data: {
+	// 			servicer_id: this.servicer_id,
+	// 			site_id: this.siteId
+	// 		},
+	// 		success(res) {
+	// 			uni.closeSocket();
+	// 		},
+	// 		fail: (err) => {
+	// 			uni.closeSocket();
+	// 		}
+	// 	});
+	// },
+	onUnload() {
+		// alert("关闭")
+		clearInterval(this.timeoutObj);
+		this.timeoutObj = null;
+		this.$api.sendRequest({
+			url: '/servicer/api/chat/bye',
+			data: {
+				servicer_id: this.servicer_id,
+				site_id: this.siteId
+			},
+			success(res) {
+				// alert("关闭1")
+				uni.closeSocket();
+			},
+			fail: (err) => {
+				// alert("关闭2")
+				uni.closeSocket();
+			}
+		});
+	}
+}
diff --git a/common/js/util.js b/common/js/util.js
index 2d73a7a..a797ec9 100644
--- a/common/js/util.js
+++ b/common/js/util.js
@@ -8,15 +8,15 @@ import {
 export default {
 	/**
 	 * 页面跳转
-	 * @param {string} to 跳转链接 /pages/idnex/index
+	 * @param {string} to 跳转链接 /pages/index/index
 	 * @param {Object} param 参数 {key : value, ...}
 	 * @param {string} mode 模式
 	 */
 	redirectTo(to, param, mode) {
 		let url = to;
-		let tabbarList = ['/pages/index/index', '/pages/goods/category', '/pages/vr/index', '/pages/contact/contact',  '/pages/member/index'];
+		let tabbarList = ['/pages/index/index', '/pages/goods/category', '/pages/goods/cart', '/pages/member/index'];
 		if (param != undefined) {
-			Object.keys(param).forEach(function (key) {
+			Object.keys(param).forEach(function(key) {
 				if (url.indexOf('?') != -1) {
 					url += "&" + key + "=" + param[key];
 				} else {
@@ -26,6 +26,8 @@ export default {
 		}
 		for (let i = 0; i < tabbarList.length; i++) {
 			if (url.indexOf(tabbarList[i]) == 0) {
+				if(url.split('?')[1]) uni.setStorageSync('tabBarParams',url.split('?')[1]);
+				else uni.removeStorageSync('tabBarParams')
 				uni.switchTab({
 					url
 				});
@@ -64,8 +66,6 @@ export default {
 	 * @param {Object} params 参数，针对商品、相册里面的图片区分大中小，size: big、mid、small
 	 */
 	img(img_path, params) {
-	 
-	
 		var path = "";
 		if (img_path != undefined && img_path != "") {
 			if (img_path.split(',').length > 1) {
@@ -78,19 +78,17 @@ export default {
 				arr.pop();
 				arr[arr.length - 1] = arr[arr.length - 1] + "_" + params.size.toUpperCase();
 				arr.push(suffix);
-				// if(img_path.indexOf('attachment') == -1){
-				// 	img_path = arr.join(".");
-				// }
-				
+				img_path = arr.join(".");
 			}
 			if (img_path.indexOf("http://") == -1 && img_path.indexOf("https://") == -1) {
 				path = Config.imgDomain + "/" + img_path;
 			} else {
-				// console.log(img_path)
 				path = img_path;
 			}
+			if (Config.h5Domain.indexOf('https://') != -1) {
+				path = path.replace('http://', 'https://');
+			}
 		}
-	
 		// path += '?t=' + parseInt(new Date().getTime() / 1000);
 		return path;
 	},
@@ -98,7 +96,7 @@ export default {
 	 * 时间戳转日期格式
 	 * @param {Object} timeStamp
 	 */
-	timeStampTurnTime(timeStamp, type = "") {
+	timeStampTurnTime(timeStamp, format = "Y-m-d H:i:s") {
 		if (timeStamp != undefined && timeStamp != "" && timeStamp > 0) {
 			var date = new Date();
 			date.setTime(timeStamp * 1000);
@@ -113,14 +111,15 @@ export default {
 			var second = date.getSeconds();
 			minute = minute < 10 ? ('0' + minute) : minute;
 			second = second < 10 ? ('0' + second) : second;
-			if (type) {
-				if (type == 'yearMonthDay') {
-					return y + '年' + m + '月' + d + '日';
-				}
-				return y + '-' + m + '-' + d;
-			} else {
-				return y + '-' + m + '-' + d + ' ' + h + ':' + minute + ':' + second;
-			}
+
+			format = format.replace('Y', y);
+			format = format.replace('m', m);
+			format = format.replace('d', d);
+			format = format.replace('H', h);
+			format = format.replace('i', minute);
+			format = format.replace('s', second);
+
+			return format;
 		} else {
 			return "";
 		}
@@ -187,19 +186,19 @@ export default {
 	 * @param {Object} elem
 	 * @param {Object} arr
 	 */
-	inArray: function (elem, arr) {
+	inArray: function(elem, arr) {
 		return arr == null ? -1 : arr.indexOf(elem);
 	},
 	/**
 	 * 获取某天日期
 	 * @param {Object} day
 	 */
-	getDay: function (day) {
+	getDay: function(day) {
 		var today = new Date();
 		var targetday_milliseconds = today.getTime() + 1000 * 60 * 60 * 24 * day;
 		today.setTime(targetday_milliseconds);
 
-		const doHandleMonth = function (month) {
+		const doHandleMonth = function(month) {
 			var m = month;
 			if (month.toString().length == 1) {
 				m = "0" + month;
@@ -231,7 +230,7 @@ export default {
 	 * @param callback
 	 * @param url
 	 */
-	upload: function (num, params, callback, url) {
+	upload: function(num, params, callback, url) {
 		// #ifdef H5
 		var app_type = this.isWeiXin() ? 'wechat' : 'h5';
 		var app_type_name = this.isWeiXin() ? '微信公众号' : 'H5';
@@ -275,7 +274,7 @@ export default {
 			count: imgs_num,
 			sizeType: ['compressed'], //可以指定是原图还是压缩图，默认二者都有
 			sourceType: ['album', 'camera'], //从相册或者拍照
-			success: async function (res) {
+			success: async (res) => {
 				const tempFilePaths = res.tempFilePaths;
 				var _data = data;
 				var imgs = [];
@@ -283,9 +282,16 @@ export default {
 					title: '图片上传中'
 				})
 				for (var i = 0; i < tempFilePaths.length; i++) {
-					var path = await _self.upload_file_server(tempFilePaths[i], _data, params.path,
-						url);
-					imgs.push(path);
+					try {
+						var path = await _self.upload_file_server(tempFilePaths[i], _data, params.path,
+							url);
+						imgs.push(path);
+					} catch (e) {
+						this.showToast({
+							title: e,
+						});
+						break;
+					}
 					if (imgs.length == tempFilePaths.length) {
 						uni.hideLoading()
 						uni.showToast({
@@ -297,11 +303,12 @@ export default {
 				}
 			},
 			fail: err => {
-				uni.hideLoading()
-				uni.showToast({
-					title: '上传失败',
-					icon: 'none'
-				})
+				if (err.errMsg != 'chooseImage:fail cancel') {
+					uni.showToast({
+						title: '上传失败',
+						icon: 'none'
+					})
+				}
 			}
 		});
 	},
@@ -319,13 +326,25 @@ export default {
 				name: 'file',
 				fileType: data.fileType || 'image',
 				formData: data,
-				success: function (res) {
+				success: (res) => {
 					var path_str = JSON.parse(res.data);
 					if (path_str.code >= 0) {
 						resolve(path_str.data.pic_path);
-						typeof callback == 'function' && callback(path_str.data.pic_path);
 					} else {
-						reject("error");
+						reject(path_str.message);
+					}
+					uni.hideLoading();
+				},
+				fail: (res) => {
+					if (res.statusCode != 200) {
+						reject(res.errMsg || '上传错误');
+						uni.hideLoading();
+					}
+				},
+				complete: (res) => {
+					if (res.statusCode != 200) {
+						reject('服务器发生错误');
+						uni.hideLoading();
 					}
 				}
 			});
@@ -395,7 +414,7 @@ export default {
 	 * 检测苹果X以上的手机
 	 */
 	isIPhoneX() {
-		let res = uni.getSystemInfoSync();
+		let res = uni.getDeviceInfo();
 		if (res.model.search('iPhone X') != -1) {
 			return true;
 		}
@@ -403,7 +422,7 @@ export default {
 	},
 	//判断安卓还是iOS
 	isAndroid() {
-		let platform = uni.getSystemInfoSync().platform
+		let platform = uni.getDeviceInfo().platform
 		if (platform == 'ios') {
 			return false;
 		} else if (platform == 'android') {
@@ -415,7 +434,7 @@ export default {
 	 * @param {Object} obj
 	 */
 	deepClone(obj) {
-		const isObject = function (obj) {
+		const isObject = function(obj) {
 			return typeof obj == 'object';
 		}
 
@@ -431,7 +450,6 @@ export default {
 		}
 		return cloneObj
 	},
-
 	/**
 	 * 打开微信企业客服
 	 * @param {Function} fallbackFunc 降级处理函数
@@ -464,11 +482,11 @@ export default {
 	 * @param {Object} link
 	 */
 	diyRedirectTo(link) {
-		
-		//if (link == null || Object.keys(link).length == 1) return;
+		if (link == null || Object.keys(link).length == 1) return;
 
 		// 外部链接
-		if (link.wap_url && link.wap_url.indexOf('http') != -1 || link.wap_url && link.wap_url.indexOf('http') != -1) {
+		if (link.wap_url && link.wap_url.indexOf('http') != -1 || link.wap_url && link.wap_url.indexOf('https') != -1) {
+
 			// #ifdef H5
 			window.location.href = link.wap_url;
 			// #endif
@@ -492,10 +510,8 @@ export default {
 
 			uni.makePhoneCall({
 				phoneNumber: link.mobile,
-				success: (res) => {
-				},
-				fail: (res) => {
-				}
+				success: (res) => {},
+				fail: (res) => {}
 			});
 
 		} else if (link.name == 'MEMBER_CONTACT') {
@@ -585,9 +601,12 @@ export default {
 	 */
 	uniappIsIPhoneX() {
 		let isIphoneX = false;
-		let systemInfo = uni.getSystemInfoSync();
+		let deviceInfo = uni.getDeviceInfo();
+		let windowInfo = uni.getWindowInfo();
 		// #ifdef MP
-		if (systemInfo.model.search('iPhone X') != -1 || systemInfo.model.search('iPhone 11') != -1 || systemInfo.model.search('iPhone 12') != -1 || systemInfo.model.search('iPhone 13') != -1) {
+		if (deviceInfo.model.search('iPhone X') != -1 || deviceInfo.model.search('iPhone 11') != -1 || deviceInfo.model
+			.search('iPhone 12') != -1 || deviceInfo.model.search('iPhone 13') != -1 || parseInt(deviceInfo.model.split(
+				'iPhone')[1]) > 13) {
 			isIphoneX = true;
 		}
 		// #endif
@@ -596,11 +615,11 @@ export default {
 		var u = navigator.userAgent;
 		var isIOS = !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/); //ios终端
 		if (isIOS) {
-			if (systemInfo.screenWidth == 375 && systemInfo.screenHeight == 812 && systemInfo.pixelRatio == 3) {
+			if (windowInfo.screenWidth == 375 && windowInfo.screenHeight == 812 && deviceInfo.pixelRatio == 3) {
 				isIphoneX = true;
-			} else if (systemInfo.screenWidth == 414 && systemInfo.screenHeight == 896 && systemInfo.pixelRatio == 3) {
+			} else if (windowInfo.screenWidth == 414 && windowInfo.screenHeight == 896 && deviceInfo.pixelRatio == 3) {
 				isIphoneX = true;
-			} else if (systemInfo.screenWidth == 414 && systemInfo.screenHeight == 896 && systemInfo.pixelRatio == 2) {
+			} else if (windowInfo.screenWidth == 414 && windowInfo.screenHeight == 896 && deviceInfo.pixelRatio == 2) {
 				isIphoneX = true;
 			}
 		}
@@ -612,9 +631,9 @@ export default {
 	 */
 	uniappIsIPhone11() {
 		let isIphone11 = false;
-		let systemInfo = uni.getSystemInfoSync();
+		let deviceInfo = uni.getDeviceInfo();
 		// #ifdef MP
-		if (systemInfo.model.search('iPhone 11') != -1) {
+		if (deviceInfo.model.search('iPhone 11') != -1) {
 			isIphone11 = true;
 		}
 		// #endif
@@ -623,7 +642,6 @@ export default {
 	// #ifdef H5
 	//判断该浏览器是否为safaria浏览器
 	isSafari() {
-		let res = uni.getSystemInfoSync();
 		var ua = navigator.userAgent.toLowerCase();
 		if (ua.indexOf('applewebkit') > -1 && ua.indexOf('mobile') > -1 && ua.indexOf('safari') > -1 &&
 			ua.indexOf('linux') === -1 && ua.indexOf('android') === -1 && ua.indexOf('chrome') === -1 &&
@@ -670,7 +688,6 @@ export default {
 		}
 	},
 	/**
-	 *
 	 * @param val 转化时间字符串 （转化时分秒）
 	 * @returns {string}
 	 */
@@ -689,7 +706,7 @@ export default {
 	 * 获取定位信息
 	 */
 	getLocation(param = {}) {
-		/*uni.getLocation({
+		uni.getLocation({
 			type: param.type ?? 'gcj02',
 			success: res => {
 				store.commit('setLocation', res);
@@ -701,7 +718,7 @@ export default {
 			complete: res => {
 				typeof param.complete == 'function' && param.complete(res);
 			}
-		});*/
+		});
 	},
 	// 计算两个经纬度之间的距离
 	getDistance(lat1, lng1, lat2, lng2) {
@@ -709,8 +726,8 @@ export default {
 		var radLat2 = lat2 * Math.PI / 180.0;
 		var a = radLat1 - radLat2;
 		var b = lng1 * Math.PI / 180.0 - lng2 * Math.PI / 180.0;
-		var s = 2 * Math.asin(Math.sqrt(Math.pow(Math.sin(a / 2), 2) +
-			Math.cos(radLat1) * Math.cos(radLat2) * Math.pow(Math.sin(b / 2), 2)));
+		var s = 2 * Math.asin(Math.sqrt(Math.pow(Math.sin(a / 2), 2) + Math.cos(radLat1) * Math.cos(radLat2) * Math.pow(
+			Math.sin(b / 2), 2)));
 		s = s * 6378.137; // EARTH_RADIUS;
 		s = Math.round(s * 10000) / 10000;
 		return s;
@@ -737,7 +754,7 @@ export default {
 	/**
 	 * 微信订阅消息
 	 */
-	subscribeMessage(keywords) {
+	subscribeMessage(keywords, callback) {
 		// #ifdef MP-WEIXIN
 		let url = '/weapp/api/weapp/messagetmplids';
 		// #endif
@@ -759,6 +776,9 @@ export default {
 						},
 						fail: (res) => {
 							console.log('fail', res)
+						},
+						complete: (res) => {
+							typeof callback == 'function' && callback();
 						}
 					})
 					// #endif
@@ -771,10 +791,18 @@ export default {
 						},
 						fail: res => {
 							console.log('fail', res)
+						},
+						complete: (res) => {
+							typeof callback == 'function' && callback();
 						}
 					});
 					// #endif
+				} else {
+					typeof callback == 'function' && callback();
 				}
+			},
+			fail: res => {
+				typeof callback == 'function' && callback();
 			}
 		})
 	},
@@ -807,10 +835,8 @@ export default {
 								title: shareConfig.title,
 								path: shareConfig.path,
 								imageUrl: shareConfig.imageUrl,
-								success: res => {
-								},
-								fail: res => {
-								}
+								success: res => {},
+								fail: res => {}
 							}
 							//分享到朋友圈
 							let query = '';
@@ -846,8 +872,7 @@ export default {
 		Http.sendRequest({
 			url: '/wechat/api/wechat/jssdkconfig',
 			data: {
-				url: uni.getSystemInfoSync().platform == 'ios' ? uni.getStorageSync('initUrl') : window.location
-					.href
+				url: uni.getDeviceInfo().platform == 'ios' ? uni.getStorageSync('initUrl') : window.location.href
 			},
 			success: res => {
 				if (res.code == 0) {
@@ -870,7 +895,7 @@ export default {
 	//获取当前路由
 	getCurrentRoute() {
 		let currentRoutes = getCurrentPages(); // 获取当前打开过的页面路由数组
-		let currentRoute = currentRoutes[currentRoutes.length - 1].route //获取当前页面路由
+		let currentRoute = currentRoutes[currentRoutes.length - 1].route; //获取当前页面路由
 		let currentParam = currentRoutes[currentRoutes.length - 1].options; //获取路由参数
 		// 拼接参数
 		let param = [];
@@ -950,12 +975,10 @@ export default {
 		var points_D = [];
 		var points_E = [];
 		const DIST_AB = Math.sqrt(Math.pow(points[1]['x'] - points[0]['x'], 2) + Math.pow(points[1]['y'] - points[0][
-			'y'
-			], 2));
+			'y'], 2));
 		// 邻控制BC点间距
 		const DIST_BC = Math.sqrt(Math.pow(points[2]['x'] - points[1]['x'], 2) + Math.pow(points[2]['y'] - points[1][
-			'y'
-			], 2));
+			'y'], 2));
 		// D每次在AB方向上移动的距离
 		if (points[0]['x'] > points[2]['x']) {
 			var EACH_MOVE_AD = -(DIST_AB / times);
@@ -1017,5 +1040,157 @@ export default {
 	verifyMobile(mobile) {
 		var parse = /^\d{11}$/.test(mobile);
 		return parse;
+	},
+	// 获取缓存key
+	getStorageKey(key) {
+		return Config.storagePrefix + key;
+	},
+	// 重写uni缓存方法
+	rewriteUniStorageMethod() {
+		const setStorageSync = uni.setStorageSync;
+		const setStorage = uni.setStorage;
+		const getStorage = uni.getStorage;
+		const getStorageSync = uni.getStorageSync;
+		const removeStorage = uni.removeStorage;
+		const removeStorageSync = uni.removeStorageSync;
+
+		uni.setStorage = (options) => {
+			options.key = this.getStorageKey(options.key);
+			setStorage(options)
+		};
+
+		uni.setStorageSync = (key, data) => {
+			setStorageSync(this.getStorageKey(key), data)
+		};
+
+		uni.getStorage = (options) => {
+			options.key = this.getStorageKey(options.key);
+			getStorage(options)
+		};
+
+		uni.getStorageSync = (key) => {
+			return getStorageSync(this.getStorageKey(key))
+		};
+
+		uni.removeStorage = (options) => {
+			options.key = this.getStorageKey(options.key);
+			removeStorage(options)
+		};
+
+		uni.removeStorageSync = (key) => {
+			return removeStorageSync(this.getStorageKey(key))
+		}
+	},
+	//生成唯一id
+	generateUUID() {
+		var d = new Date().getTime(); //Timestamp
+		var d2 = (performance && performance.now && (performance.now() * 1000)) ||
+		0; //Time in microseconds since page-load or 0 if unsupported
+		return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
+			var r = Math.random() * 16; //random number between 0 and 16
+			if (d > 0) { //Use timestamp until depleted
+				r = (d + r) % 16 | 0;
+				d = Math.floor(d / 16);
+			} else { //Use microseconds since page-load if supported
+				r = (d2 + r) % 16 | 0;
+				d2 = Math.floor(d2 / 16);
+			}
+			return (c === 'x' ? r : (r & 0x3 | 0x8)).toString(16);
+		});
+	},
+	// 获取弹新人礼弹框页面
+	openRegisterRewardPath(back) {
+		return uni.getStorageSync('initiateLogin') || back;
+	},
+	// 登录完成后返回页面
+	loginComplete(back, mode) {
+		let url = uni.getStorageSync('initiateLogin') || back;
+		uni.removeStorageSync('initiateLogin')
+		
+		let jump = true;
+		let arr = getCurrentPages().reverse();
+		for (let i = 0; i < arr.length; i++) {
+			if (url.indexOf(arr[i].route) != -1) {
+				jump = false;
+				uni.navigateBack({
+					delta: i
+				});
+				break;
+			}
+		}
+		if (jump) {
+			this.redirectTo(url, {}, 'redirectTo')
+		}
+	},
+	// 微信提现收款
+	merchantTransfer(data,withdrawInfo,callback) {
+		Http.sendRequest({
+			url: '/wechatpay/api/transfer/transfer',
+			data: data,
+			success: res => {
+				if (res.code == 0) {
+					uni.hideLoading();
+					// #ifdef MP-WEIXIN
+					if (wx.canIUse('requestMerchantTransfer')) {
+						wx.requestMerchantTransfer({
+							mchId: withdrawInfo.mch_id,
+							appId: withdrawInfo.app_id,
+							package: res.data.package_info,
+							success: (res) => {
+								typeof callback == 'function' && callback(res);
+							},
+							fail: (res) => {
+								typeof callback == 'function' && callback(res);
+							},
+						});
+					} else {
+						wx.showModal({
+							content: '你的微信版本过低，请更新至最新版本。',
+							showCancel: false,
+						});
+					}
+					// #endif
+					// #ifdef H5
+							if (this.isWeiXin()) {
+								if (uni.getDeviceInfo().platform == 'ios') {
+									var url = uni.getStorageSync('initUrl');
+								} else {
+									var url = location.href;
+								}
+								// 获取jssdk配置
+								Http.sendRequest({
+									url: '/wechat/api/wechat/jssdkconfig',
+									data: {
+										url: url
+									},
+									success: jssdkRes => {
+										var wxJS = new Weixin();
+										wxJS.init(jssdkRes.data);
+										wxJS.withdrawWechat({
+												mch_id: withdrawInfo.mch_id,
+												wechat_appid: withdrawInfo.app_id,
+												package_info: res.data.package_info
+											},
+											res => {
+												typeof callback == 'function' && callback(res);
+											},
+										);
+									}
+								})
+							}
+							// #endif
+				} else {
+					this.showToast({
+						title: res.message,
+					});
+				}
+			},
+			fail: err => {
+				this.showToast({
+					title: err.message,
+				});
+			}
+		})
+
 	}
 }
\ No newline at end of file
diff --git a/common/js/wx-jssdk.js b/common/js/wx-jssdk.js
index 420b125..a07734a 100644
--- a/common/js/wx-jssdk.js
+++ b/common/js/wx-jssdk.js
@@ -1,119 +1,142 @@
-/**
- * 微信jssdk调用
- */
-let Weixin = function () {
-	var wx = require('jweixin-module');
-
-	this.weixin = wx;
-
-	this.init = function (params) {
-		wx.config({
-			debug: false, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。
-			appId: params.appId, // 必填，公众号的唯一标识
-			timestamp: params.timestamp, // 必填，生成签名的时间戳
-			nonceStr: params.nonceStr, // 必填，生成签名的随机串
-			signature: params.signature, // 必填，签名
-			jsApiList: ['chooseWXPay', 'openAddress', 'updateAppMessageShareData',
-				'updateTimelineShareData', 'scanQRCode', 'hideMenuItems'
-			] // 必填，需要使用的JS接口列表
-		});
-	}
-
-	/**
-	 * 发起支付
-	 * @param jsApiParame
-	 * @param callback
-	 * @param cancel
-	 */
-	this.pay = function (jsApiParame, callback, cancel) {
-		wx.ready(function () {
-			wx.chooseWXPay({
-				timestamp: jsApiParame
-					.timestamp, // 支付签名时间戳，注意微信jssdk中的所有使用timestamp字段均为小写。但最新版的支付后台生成签名使用的timeStamp字段名需大写其中的S字符
-				nonceStr: jsApiParame.nonceStr, // 支付签名随机串，不长于 32 位
-				package: jsApiParame.package, // 统一支付接口返回的prepay_id参数值，提交格式如：prepay_id=\*\*\*）
-				signType: jsApiParame.signType, // 签名方式，默认为'SHA1'，使用新版支付需传入'MD5'
-				paySign: jsApiParame.paySign, // 支付签名
-				success: function (res) {
-					typeof callback == 'function' && callback(res);
-				},
-				cancel: function (res) {
-					typeof cancel == 'function' && cancel(res);
-				}
-			});
-		})
-	}
-
-	/**
-	 * 获取收货地址
-	 * @param {Object} callback
-	 */
-	this.openAddress = function (callback) {
-		wx.ready(function () {
-			wx.openAddress({
-				success: function (res) {
-					typeof callback == 'function' && callback(res);
-				},
-				fail: (res) => {
-					console.log('获取收货地址 fail',res);
-					alert(JSON.stringify(res))
-				}
-			});
-		})
-	}
-
-	/**
-	 * 分享给好友
-	 * @param {Object} params
-	 * @param {Object} callback
-	 */
-	this.setShareData = function (params, callback) {
-
-		wx.ready(function () {
-			// 自定义“分享给朋友”及“分享到QQ”按钮的分享内容
-			wx.updateAppMessageShareData({
-				title: params.title || '', // 分享标题
-				desc: params.desc || '', // 分享描述
-				link: params.link || '', // 分享链接，该链接域名或路径必须与当前页面对应的公众号JS安全域名一致
-				imgUrl: params.imgUrl || '', // 分享图标
-				success: function (res) {
-					typeof callback == 'function' && callback(res);
-				},
-				fail: function (err) {
-				}
-			})
-
-			// 自定义“分享到朋友圈”及“分享到QQ空间”按钮的分享内容
-			wx.updateTimelineShareData({
-				title: params.title || '', // 分享标题
-				link: params.link || '', // 分享链接，该链接域名或路径必须与当前页面对应的公众号JS安全域名一致
-				imgUrl: params.imgUrl || '', // 分享图标
-				success: function (res) {
-					typeof callback == 'function' && callback(res);
-				}
-			})
-
-		});
-	}
-
-	/**
-	 * 扫一扫
-	 * @param {Object} callback
-	 */
-	this.scanQRCode = function (callback) {
-		wx.ready(function () {
-			wx.scanQRCode({
-				needResult: 1,
-				scanType: ["qrCode"],
-				success: function (res) {
-					typeof callback == 'function' && callback(res);
-				}
-			});
-		})
-	}
-
-}
-
-export {
-	Weixin
+/**
+ * 微信jssdk调用
+ */
+let Weixin = function () {
+	var wx = require('jweixin-module');
+
+	this.weixin = wx;
+
+	this.init = function (params) {
+		wx.config({
+			debug: false, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。
+			appId: params.appId, // 必填，公众号的唯一标识
+			timestamp: params.timestamp, // 必填，生成签名的时间戳
+			nonceStr: params.nonceStr, // 必填，生成签名的随机串
+			signature: params.signature, // 必填，签名
+			jsApiList: ['chooseWXPay', 'openAddress', 'updateAppMessageShareData',
+				'updateTimelineShareData', 'scanQRCode', 'hideMenuItems'
+			] // 必填，需要使用的JS接口列表
+		});
+	}
+
+	/**
+	 * 发起支付
+	 * @param jsApiParame
+	 * @param callback
+	 * @param cancel
+	 */
+	this.pay = function (jsApiParame, callback, cancel) {
+		wx.ready(function () {
+			wx.chooseWXPay({
+				timestamp: jsApiParame
+					.timestamp, // 支付签名时间戳，注意微信jssdk中的所有使用timestamp字段均为小写。但最新版的支付后台生成签名使用的timeStamp字段名需大写其中的S字符
+				nonceStr: jsApiParame.nonceStr, // 支付签名随机串，不长于 32 位
+				package: jsApiParame.package, // 统一支付接口返回的prepay_id参数值，提交格式如：prepay_id=\*\*\*）
+				signType: jsApiParame.signType, // 签名方式，默认为'SHA1'，使用新版支付需传入'MD5'
+				paySign: jsApiParame.paySign, // 支付签名
+				success: function (res) {
+					typeof callback == 'function' && callback(res);
+				},
+				cancel: function (res) {
+					typeof cancel == 'function' && cancel(res);
+				}
+			});
+		})
+	}
+
+	/**
+	 * 获取收货地址
+	 * @param {Object} callback
+	 */
+	this.openAddress = function (callback) {
+		wx.ready(function () {
+			wx.openAddress({
+				success: function (res) {
+					typeof callback == 'function' && callback(res);
+				},
+				fail: (res) => {
+					console.log('获取收货地址 fail',res);
+					alert(JSON.stringify(res))
+				}
+			});
+		})
+	}
+
+	/**
+	 * 分享给好友
+	 * @param {Object} params
+	 * @param {Object} callback
+	 */
+	this.setShareData = function (params, callback) {
+
+		wx.ready(function () {
+			// 自定义“分享给朋友”及“分享到QQ”按钮的分享内容
+			wx.updateAppMessageShareData({
+				title: params.title || '', // 分享标题
+				desc: params.desc || '', // 分享描述
+				link: params.link || '', // 分享链接，该链接域名或路径必须与当前页面对应的公众号JS安全域名一致
+				imgUrl: params.imgUrl || '', // 分享图标
+				success: function (res) {
+					typeof callback == 'function' && callback(res);
+				},
+				fail: function (err) {
+				}
+			})
+
+			// 自定义“分享到朋友圈”及“分享到QQ空间”按钮的分享内容
+			wx.updateTimelineShareData({
+				title: params.title || '', // 分享标题
+				link: params.link || '', // 分享链接，该链接域名或路径必须与当前页面对应的公众号JS安全域名一致
+				imgUrl: params.imgUrl || '', // 分享图标
+				success: function (res) {
+					typeof callback == 'function' && callback(res);
+				}
+			})
+
+		});
+	}
+
+	/**
+	 * 扫一扫
+	 * @param {Object} callback
+	 */
+	this.scanQRCode = function (callback) {
+		wx.ready(function () {
+			wx.scanQRCode({
+				needResult: 1,
+				scanType: ["qrCode"],
+				success: function (res) {
+					typeof callback == 'function' && callback(res);
+				}
+			});
+		})
+	}
+	
+	// 提现
+	this.withdrawWechat = function (data,callback) {
+		wx.ready(function () {
+		  wx.checkJsApi({
+		    jsApiList: ['requestMerchantTransfer'],
+		    success: function (res) {
+		      if (res.checkResult['requestMerchantTransfer']) {
+		        WeixinJSBridge.invoke('requestMerchantTransfer', {
+		            mchId: data.mch_id,
+		            appId: data.wechat_appid,
+		            package: data.package_info,
+		          },
+		          function (res) {
+						typeof callback == 'function' && callback(res);
+		          }
+		        );
+		      } else {
+					alert('你的微信版本过低，请更新至最新版本。');
+		      }
+		    },
+		  });
+		});
+	}
+}
+
+export {
+	Weixin
 }
\ No newline at end of file
diff --git a/components/common-payment/common-payment - 副本.vue b/components/common-payment/common-payment - 副本.vue
deleted file mode 100644
index 4db3da0..0000000
--- a/components/common-payment/common-payment - 副本.vue	
+++ /dev/null
@@ -1,638 +0,0 @@
-<template>
-	<view class="order-container" :class="{ 'safe-area': isIphoneX }">
-		<!-- #ifdef MP-WEIXIN -->
-		<view class="payment-navbar" :style="{ 'padding-top': menuButtonBounding.top + 'px', height: menuButtonBounding.height + 'px' }">
-			<view class="nav-wrap">
-				<text class="iconfont icon-back_light" @click="back"></text>
-				<view class="navbar-title">确认订单</view>
-			</view>
-		</view>
-		<view class="payment-navbar-block" :style="{ height: menuButtonBounding.bottom + 'px' }"></view>
-		<!-- #endif -->
-
-		<scroll-view scroll-y="true" class="order-scroll-container">
-			<view class="payment-navbar-block"></view>
-			<template v-if="paymentData">
-				<template v-if="paymentData.is_virtual">
-					<!-- 虚拟商品联系方式 -->
-					<view class="mobile-wrap">
-						<view class="tips color-base-text">
-							<text class="iconfont icongantanhao"></text>
-							购买虚拟类商品需填写手机号，方便商家与您联系
-						</view>
-						<view class="form-group">
-							<text class="icon">
-								<image :src="$util.img('public/uniapp/order/icon-mobile.png')" mode="widthFix"></image>
-							</text>
-							<text class="text">手机号码</text>
-							<input type="number" maxlength="11" placeholder="请输入您的手机号码" placeholder-class="color-tip placeholder" class="input" v-model="orderCreateData.member_address.mobile" />
-						</view>
-					</view>
-				</template>
-				<template v-else>
-					<!-- 配送方式 -->
-					<view class="delivery-mode" v-if="goodsData.delivery.express_type.length > 1">
-						<view class="action">
-							<view :class="{ active: item.name == orderCreateData.delivery.delivery_type }" v-for="(item, index) in goodsData.delivery.express_type" :key="index" @click="selectDeliveryType(item)">
-								{{ item.title }}
-								<!-- 外圆角 -->
-								<view class="out-radio"></view>
-							</view>
-						</view>
-					</view>
-
-					<view class="address-box" :class="{ 'not-delivery-type': goodsData.delivery.express_type.length <= 1 }" v-if="orderCreateData.delivery.delivery_type == 'express'">
-						<view class="info-wrap" v-if="memberAddress" @click="selectAddress">
-							<view class="content">
-								<text class="name">{{ memberAddress.name ? memberAddress.name : '' }}</text>
-								<text class="mobile">{{ memberAddress.mobile ? memberAddress.mobile : '' }}</text>
-								<view class="desc-wrap">
-									{{ memberAddress.full_address ? memberAddress.full_address : '' }}
-									{{ memberAddress.address ? memberAddress.address : '' }}
-								</view>
-							</view>
-							<text class="cell-more iconfont icon-right"></text>
-						</view>
-						<view class="empty-wrap" v-else @click="selectAddress">
-							<view class="info">请设置收货地址</view>
-							<view class="cell-more">
-								<view class="iconfont icon-right"></view>
-							</view>
-						</view>
-						<image class="address-line" :src="$util.img('public/uniapp/order/address-line.png')"></image>
-					</view>
-
-					<view class="address-box" :class="{ 'not-delivery-type': goodsData.delivery.express_type.length <= 1 }" v-if="orderCreateData.delivery.delivery_type == 'local'">
-						<view v-if="localMemberAddress">
-							<block v-if="storeList && Object.keys(storeList).length > 1">
-								<view class="local-delivery-store" v-if="storeInfo" @click="openPopup('deliveryPopup')">
-									<view class="info">
-										由
-										<text class="store-name">{{ storeInfo.store_name }}</text>
-										提供配送
-									</view>
-									<view class="cell-more">
-										<text>点击切换</text>
-										<text class="iconfont icon-right"></text>
-									</view>
-								</view>
-								<view v-else class="local-delivery-store">
-									<view class="info">
-										<text class="store-name">您的附近没有可配送的门店，请选择其他配送方式</text>
-									</view>
-								</view>
-							</block>
-							<view class="info-wrap local" @click="selectAddress">
-								<view class="content">
-									<text class="name">{{ localMemberAddress.name ? localMemberAddress.name : '' }}
-									</text>
-									<text class="mobile">{{ localMemberAddress.mobile ? localMemberAddress.mobile : '' }}
-									</text>
-									<view class="desc-wrap">
-										{{ localMemberAddress.full_address ? localMemberAddress.full_address : '' }}
-										{{ localMemberAddress.address ? localMemberAddress.address : '' }}
-									</view>
-								</view>
-								<text class="cell-more iconfont icon-right"></text>
-							</view>
-							<view class="local-box" v-if="calculateGoodsData.config.local && calculateGoodsData.delivery.local.info.time_is_open == 1">
-								<view class="pick-block" @click="localtime('')">
-									<view class="title font-size-base">送达时间</view>
-									<view class="time-picker">
-										<text :class="{ 'color-tip': !deliveryTime }">{{ deliveryTime ? deliveryTime : '请选择送达时间' }}</text>
-										<text class="iconfont icon-right cell-more"></text>
-									</view>
-								</view>
-							</view>
-						</view>
-						<view class="empty-wrap" v-else @click="selectAddress">
-							<view class="info">请设置收货地址</view>
-							<view class="cell-more">
-								<view class="iconfont icon-right"></view>
-							</view>
-						</view>
-
-						<image class="address-line" :src="$util.img('public/uniapp/order/address-line.png')"></image>
-					</view>
-
-					<!-- 门店信息 -->
-					<view class="store-box" :class="{ 'not-delivery-type': goodsData.delivery.express_type.length <= 1 }" v-if="orderCreateData.delivery.delivery_type == 'store'">
-						<block v-if="storeInfo">
-							<view @click="openPopup('deliveryPopup')" class="store-info">
-								<view class="store-address-info">
-									<view class="info-wrap">
-										<view class="title">
-											<text>{{ storeInfo.store_name }}</text>
-										</view>
-										<view class="store-detail">
-											<view v-if="storeInfo.open_date">营业时间：{{ storeInfo.open_date }}</view>
-											<view class="address">{{ storeInfo.full_address }} {{ storeInfo.address }}
-											</view>
-										</view>
-									</view>
-									<view class="cell-more iconfont icon-right" v-if="storeList && Object.keys(storeList).length > 1"></view>
-								</view>
-							</view>
-							<view class="mobile-wrap store-mobile" v-if="orderCreateData.member_address">
-								<view class="form-group">
-									<text class="text">姓名</text>
-									<input type="text" placeholder-class="color-tip placeholder" class="input" disabled v-model="orderCreateData.member_address.name" />
-								</view>
-							</view>
-							<view class="mobile-wrap store-mobile" v-if="orderCreateData.member_address">
-								<view class="form-group">
-									<text class="text">预留手机</text>
-									<input type="number" maxlength="11" placeholder="请输入您的手机号码" placeholder-class="color-tip placeholder" class="input" v-model="orderCreateData.member_address.mobile" />
-								</view>
-							</view>
-							<view class="store-time" @click="storetime('')">
-								<view class="left">提货时间</view>
-								<view class="right">
-									{{ deliveryTime }}
-									<text class="iconfont icon-right"></text>
-								</view>
-							</view>
-						</block>
-						<view v-else class="empty">当前无自提门店，请选择其它配送方式</view>
-						<image class="address-line" :src="$util.img('public/uniapp/order/address-line.png')"></image>
-					</view>
-				</template>
-
-				<!-- 店铺 -->
-				<view class="site-wrap order-goods" v-if="calculateGoodsData">
-					<view class="site-header">
-						<view class="iconfont icon-dianpu"></view>
-						<text class="site-name">门店</text>
-					</view>
-					<view class="site-body">
-						<!-- 商品 -->
-						<view class="goods-item" v-for="(goodsItem, goodsIndex) in calculateGoodsData.goods_list" :key="goodsIndex">
-							<view class="goods-wrap">
-								<view class="goods-img" @click="$util.redirectTo('/pages/goods/detail', { goods_id: goodsItem.goods_id })">
-									<image :src="$util.img(goodsItem.sku_image, { size: 'mid' })" @error="imageError(goodsIndex)" mode="aspectFill"/>
-								</view>
-								<view class="goods-info">
-									<view class="top-wrap">
-										<view @click="$util.redirectTo('/pages/goods/detail', { goods_id: goodsItem.goods_id })" class="goods-name">{{ goodsItem.sku_name }}</view>
-										<view class="sku" v-if="goodsItem.sku_spec_format">
-											<view class="goods-spec">
-												<block v-for="(x, i) in goodsItem.sku_spec_format" :key="i">
-													<view>{{ x.spec_value_name }}</view>
-												</block>
-											</view>
-										</view>
-										<block v-if="goodsItem.is_virtual == 0">
-											<view class="error-tips" v-if="orderCreateData.delivery &&
-													orderCreateData.delivery.delivery_type &&
-													goodsItem.support_trade_type &&
-													goodsItem.support_trade_type.indexOf(orderCreateData.delivery.delivery_type) == -1
-												">
-												<text class="iconfont icon-gantanhao"></text>
-												<text>该商品不支持{{ orderCreateData.delivery.delivery_type_name }}</text>
-											</view>
-										</block>
-										<view class="error-tips" v-if="goodsItem.error && goodsItem.error.message">
-											<text class="iconfont icon-gantanhao"></text>
-											<text>{{ goodsItem.error.message }}</text>
-										</view>
-									</view>
-									<view class="goods-sub-section">
-										<view class="color-base-text">
-											<text class="unit price-style small">{{ $lang('common.currencySymbol') }}</text>
-											<text class="goods-price price-style large">{{ parseFloat(goodsItem.price).toFixed(2).split('.')[0] }}</text>
-											<text class="unit price-style small">.{{ parseFloat(goodsItem.price).toFixed(2).split('.')[1] }}</text>
-										</view>
-										<view>
-											<text class="font-size-tag">x</text>
-											<text class="font-size-base">{{ goodsItem.num }}</text>
-										</view>
-									</view>
-								</view>
-							</view>
-							<view class="member-goods-card order-cell" v-if="calculateGoodsData.goods_list[goodsIndex].member_card_list" @click="selectMemberGoodsCard(goodsIndex)">
-								<text class="tit">次卡抵扣</text>
-								<view class="box text-overflow">
-									<block v-if="calculateGoodsData.goods_list[goodsIndex].card_promotion_money">
-										<text class="text">次卡抵扣{{ calculateGoodsData.goods_list[goodsIndex].card_use_num }}张/{{ calculateGoodsData.goods_list[goodsIndex].card_use_num }}次</text>
-										<text class="price-font">-￥{{ calculateGoodsData.goods_list[goodsIndex].card_promotion_money | moneyFormat }}</text>
-									</block>
-									<text class="color-tip" v-else>请选择次卡</text>
-								</view>
-								<text class="iconfont icon-right"></text>
-							</view>
-							<view class="goods-form" v-if="goodsData.goods_list[goodsIndex].goods_form" @click="editForm(goodsIndex)">
-								<ns-form :data="goodsData.goods_list[goodsIndex].goods_form.json_data" ref="goodsForm" :custom-attr="{ sku_id: goodsItem.sku_id, form_id: goodsData.goods_list[goodsIndex].goods_form.id }"/>
-								<text class="cell-more iconfont icon-right"></text>
-								<view class="shade"></view>
-							</view>
-						</view>
-					</view>
-				</view>
-
-				<view class="site-wrap buyer-message">
-					<view class="order-cell">
-						<text class="tit">买家留言</text>
-						<view class="box text-overflow " @click="openPopup('buyerMessagePopup')">
-							<text v-if="orderCreateData.buyer_message">{{ orderCreateData.buyer_message }}</text>
-							<text class="color-sub" v-else>无留言</text>
-						</view>
-						<text class="iconfont icon-right"></text>
-					</view>
-				</view>
-
-				<view v-if="paymentData.system_form" class="system-form-wrap">
-					<view class="order-cell">
-						<text class="tit">{{ paymentData.system_form.form_name }}</text>
-					</view>
-					<ns-form :data="paymentData.system_form.json_data" ref="form"/>
-				</view>
-
-				<view class="site-wrap" v-if="calculateGoodsData  || promotionInfo || (calculateGoodsData && calculateGoodsData.max_usable_point > 0) || goodsData.invoice">
-					<view class="site-footer">
-						<view class="order-cell coupon" v-if="modules.indexOf('coupon') != -1">
-							<text class="tit">优惠券</text>
-							<view class="box text-overflow" @click="openPopup('couponPopup')">
-								<template v-if="orderCreateData.coupon && orderCreateData.coupon.coupon_id">
-									<text>已使用优惠券，优惠</text>
-									<text class="unit price-font">{{ $lang('common.currencySymbol') }}</text>
-									<text class="money price-font">{{ (calculateData && calculateData.coupon_money ? calculateData.coupon_money : 0) | moneyFormat }}</text>
-								</template>
-								<text v-else>不使用优惠券</text>
-							</view>
-							<text class="iconfont icon-right"></text>
-						</view>
-						<view class="order-cell" v-if="promotionInfo">
-							<text class="tit">活动优惠</text>
-							<view class="box text-overflow" @click="openPopup('promotionPopup')">
-								<text>{{ promotionInfo.title }}</text>
-							</view>
-							<text class="iconfont icon-right"></text>
-						</view>
-						<view class="order-cell point" v-if="calculateGoodsData && calculateGoodsData.max_usable_point > 0">
-							<text class="tit">
-								<text>使用{{ parseInt(calculateGoodsData.max_usable_point) }}积分可抵扣</text>
-								<text class="unit price-font">{{ $lang('common.currencySymbol') }}</text>
-								<text class="money price-font">{{ calculateData.point_money | moneyFormat }}</text>
-							</text>
-							<view class="box"></view>
-							<ns-switch class="balance-switch" @change="usePoint" :checked="orderCreateData.is_point == 1"/>
-						</view>
-						<view class="order-cell order-invoice-cell" v-if="goodsData.invoice.invoice_status == 1">
-							<text class="tit">发票</text>
-							<view class="box text-overflow" @click="openPopup('invoicePopup')">
-								<text v-if="orderCreateData.is_invoice == 1">{{ orderCreateData.invoice_type == 1 ? '纸质' : '电子' }}发票({{ orderCreateData.invoice_content }})</text>
-								<text v-else>无需发票</text>
-							</view>
-							<text class="iconfont icon-right"></text>
-						</view>
-					</view>
-				</view>
- 
-				<view class="site-wrap box member-card-wrap" v-if="paymentData.recommend_member_card && Object.keys(paymentData.recommend_member_card).length > 0">
-					<view class="head" @click="selectMemberCard">
-						<text class="iconfont icon-huiyuan"></text>
-						<view class="info">
-							开通{{ paymentData.recommend_member_card.level_name }}
-							<text>本单预计可省</text>
-							<text class="price-color">{{ paymentData.recommend_member_card.discount_money | moneyFormat }}</text>
-							<text>元</text>
-						</view>
-						<text class="iconfont" :class="orderCreateData.is_open_card == 1 ? 'icon-yuan_checked color-base-text' : 'icon-yuan_checkbox'"></text>
-					</view>
-					<view class="body" v-if="orderCreateData.is_open_card">
-						<view class="item" :class="{ 'active color-base-border': item.key == orderCreateData.member_card_unit }" v-for="(item, index) in cardChargeType" :key="index" @click="selectMembercardUnit(item.key)">
-							<view class="title">{{ item.title }}</view>
-							<view class="price price-font">{{ $lang('common.currencySymbol') }}{{ parseFloat(item.value) }}/{{ item.unit }}</view>
-							<text class="iconfont icon-icon color-base-text price-font identify" v-if="item.key == orderCreateData.member_card_unit"></text>
-						</view>
-					</view>
-				</view>
-
-				<!-- 订单金额 -->
-				<template v-if="calculateData">
-					<view class="order-money">
-						<view class="order-cell">
-							<text class="tit">商品金额</text>
-							<view class="box">
-								<text class="unit color-title price-font">{{ $lang('common.currencySymbol') }}</text>
-								<text class="money color-title price-font">{{ calculateData.goods_money | moneyFormat }}</text>
-							</view>
-						</view>
-						<view class="order-cell" v-if="calculateData.is_virtual == 0 && calculateData.delivery_money > 0">
-							<text class="tit">运费</text>
-							<view class="box color-base-text">
-								<text class="operator">+</text>
-								<text class="unit price-font">{{ $lang('common.currencySymbol') }}</text>
-								<text class="money price-font">{{ calculateData.delivery_money | moneyFormat }}</text>
-							</view>
-						</view>
-						<view class="order-cell" v-if="orderCreateData.is_invoice && calculateData.invoice_money > 0">
-							<text class="tit">
-								<text>税费</text>
-								<text class="color-base-text font-bold price-font">({{ goodsData.invoice.invoice_rate }}%)</text>
-							</text>
-							<view class="box color-base-text">
-								<text class="operator">+</text>
-								<text class="unit price-font">{{ $lang('common.currencySymbol') }}</text>
-								<text class="money price-font">{{ calculateData.invoice_money | moneyFormat }}</text>
-							</view>
-						</view>
-						<view class="order-cell" v-if="orderCreateData.is_invoice && calculateData.invoice_delivery_money > 0">
-							<text class="tit">发票邮寄费</text>
-							<view class="box color-base-text">
-								<text class="operator">+</text>
-								<text class="unit price-font">{{ $lang('common.currencySymbol') }}</text>
-								<text class="money price-font">{{ calculateData.invoice_delivery_money | moneyFormat }}</text>
-							</view>
-						</view>
-						<view class="order-cell" v-if="calculateData.promotion_money > 0">
-							<text class="tit">优惠</text>
-							<view class="box color-base-text">
-								<text class="operator">-</text>
-								<text class="unit price-font">{{ $lang('common.currencySymbol') }}</text>
-								<text class="money price-font">{{ calculateData.promotion_money | moneyFormat }}</text>
-							</view>
-						</view>
-						<view class="order-cell" v-if="calculateData.coupon_money">
-							<text class="tit">优惠券</text>
-							<view class="box color-base-text">
-								<text class="operator">-</text>
-								<text class="unit price-font">{{ $lang('common.currencySymbol') }}</text>
-								<text class="money price-font">{{ calculateData.coupon_money | moneyFormat }}</text>
-							</view>
-						</view>
-						<view class="order-cell" v-if="calculateData.point_money > 0">
-							<text class="tit">积分抵扣</text>
-							<view class="box color-base-text">
-								<text class="operator">-</text>
-								<text class="unit price-font">{{ $lang('common.currencySymbol') }}</text>
-								<text class="money price-font">{{ calculateData.point_money | moneyFormat }}</text>
-							</view>
-						</view>
-						<view class="order-cell" v-if="calculateData.member_card_money > 0">
-							<text class="tit">会员卡</text>
-							<view class="box color-base-text">
-								<text class="operator">+</text>
-								<text class="unit price-font">{{ $lang('common.currencySymbol') }}</text>
-								<text class="money price-font">{{ calculateData.member_card_money | moneyFormat }}
-								</text>
-							</view>
-						</view>
-					</view>
-
-					<view v-if="transactionAgreement.title && transactionAgreement.content" class="agreement">购买前请先阅读<text @click="$refs.agreementPopup.open()">《{{ transactionAgreement.title }}》</text>，下单即代表同意该协议</view>
-
-					<view class="order-submit bottom-safe-area">
-						<view class="order-settlement-info">
-							<text class="font-size-base color-tip margin-right">共{{ calculateData.goods_num }}件</text>
-							<text class="font-size-base">合计：</text>
-							<text class=" unit price-font">{{ $lang('common.currencySymbol') }}</text>
-							<text class=" money price-font">{{ parseFloat(calculateData.pay_money).toFixed(2).split('.')[0] }}</text>
-							<text class=" unit price-font">.{{ parseFloat(calculateData.pay_money).toFixed(2).split('.')[1] }}</text>
-						</view>
-						<view class="submit-btn">
-							<button type="primary" class="mini" size="mini" @click="create()" v-if="!surplusStartMoney()">提交订单</button>
-							<button v-else class="no-submit mini" size="mini">差{{ surplusStartMoney() | moneyFormat }}起送</button>
-						</view>
-					</view>
-					<view class="order-submit-block"></view>
-
-					<payment ref="choosePaymentPopup" @close="payClose" v-if="calculateData"></payment>
-				</template>
-
-
-				<!-- 活动优惠弹窗 -->
-				<uni-popup ref="promotionPopup" type="bottom" v-if="promotionInfo">
-					<view class="promotion-popup popup">
-						<view class="popup-header">
-							<text class="tit">活动优惠</text>
-							<text class="iconfont icon-close" @click="closePopup('promotionPopup')"></text>
-						</view>
-						<scroll-view scroll-y="true" class="popup-body" :class="{ 'safe-area': isIphoneX }">
-							<view class="order-cell" style="align-items: baseline;">
-								<view class="tit">
-									<text class="promotion-mark ns-gradient-promotionpages-payment">{{ promotionInfo.title }}
-									</text>
-								</view>
-								<view class="promotion-content">
-									<view class="tit tit-content" style="white-space: pre-line;" v-html="promotionInfo.content"></view>
-								</view>
-							</view>
-						</scroll-view>
-						<view class="popup-footer" :class="{ 'bottom-safe-area': isIphoneX }">
-							<view class="confirm-btn color-base-bg" @click="closePopup('promotionPopup')">确定</view>
-						</view>
-					</view>
-				</uni-popup>
-
-				<!-- 门店列表弹窗 -->
-				<uni-popup ref="deliveryPopup" type="bottom">
-					<view class="delivery-popup popup">
-						<view class="popup-header">
-							<text class="tit">已为您甄选出附近所有相关门店</text>
-							<text class="iconfont icon-close" @click="closePopup('deliveryPopup')"></text>
-						</view>
-						<view class="popup-body store-popup" :class="{ 'safe-area': isIphoneX }">
-
-							<mescroll-uni @getData="getStore" ref="mescroll" top="50px">
-								<block slot="list">
-									<view class="delivery-content">
-										<block v-if="storeData">
-											<view class="item-wrap" v-for="(item, index) in storeData" :key="index" @click="selectPickupPoint(item)">
-												<view class="detail">
-													<view class="name" :class="item.store_id == orderCreateData.delivery.store_id ? 'color-base-text' : ''">
-														<text>{{ item.store_name }}</text>
-														<text v-if="item.distance">({{ item.distance }}km)</text>
-													</view>
-													<view class="info">
-														<view :class="item.store_id == orderCreateData.delivery.store_id ? 'color-base-text' : ''" class="font-size-goods-tag">营业时间：{{ item.open_date }}</view>
-														<view :class="item.store_id == orderCreateData.delivery.store_id ? 'color-base-text' : ''" class="font-size-goods-tag">地址：{{ item.full_address }}{{ item.address }}</view>
-													</view>
-												</view>
-												<view class="icon" v-if="item.store_id == orderCreateData.delivery.store_id">
-													<text class="iconfont icon-yuan_checked color-base-text"></text>
-												</view>
-											</view>
-										</block>
-										<view v-else class="empty-wrap">
-											<ns-empty text="所选择收货地址附近没有可以自提的门店" :isIndex="false"></ns-empty>
-										</view>
-									</view>
-
-								</block>
-							</mescroll-uni>
-
-						</view>
-					</view>
-				</uni-popup>
-
-				<!-- 留言弹窗 -->
-				<uni-popup ref="buyerMessagePopup" type="bottom">
-					<view style="height: auto;" class="buyermessag-popup popup" @touchmove.prevent.stop>
-						<view class="popup-header">
-							<text class="tit">买家留言</text>
-							<text class="iconfont icon-close" @click="closePopup('buyerMessagePopup')"></text>
-						</view>
-						<scroll-view scroll-y="true" class="popup-body" :class="{ 'safe-area': isIphoneX }">
-							<view>
-								<view class="buyermessag-cell">
-									<view class="buyermessag-form-group">
-										<textarea type="text" maxlength="100" placeholder="留言前建议先与商家协调一致" placeholder-class="color-tip" v-model="orderCreateData.buyer_message"/>
-									</view>
-								</view>
-							</view>
-						</scroll-view>
-						<view class="popup-footer" @click="saveBuyerMessage" :class="{ 'bottom-safe-area': isIphoneX }">
-							<view class="confirm-btn color-base-bg">确定</view>
-						</view>
-					</view>
-				</uni-popup>
-
-				<!-- 优惠券弹窗 -->
-				<uni-popup ref="couponPopup" type="bottom" v-if="calculateGoodsData" :mask-click="false">
-					<view class="coupon-popup popup" @touchmove.prevent.stop>
-						<view class="popup-header">
-							<text class="tit">优惠券</text>
-							<text class="iconfont icon-close" @click="closePopup('couponPopup')"></text>
-						</view>
-
-						<scroll-view scroll-y="true" class="popup-body" :class="{ 'safe-area': isIphoneX }">
-							<view v-if="coupon_list.length > 0">
-								<view class="coupon-item" v-for="(couponItem, couponIndex) in coupon_list" :key="couponIndex" @click="selectCoupon(couponItem)">
-									<view class="coupon-info" :style="{ backgroundColor: 'var(--main-color-shallow)' }">
-										<view class="info-wrap">
-											<image class="coupon-line" mode="heightFix" :src="$util.img('public/uniapp/coupon/coupon_line.png')"/>
-											<view class="coupon-money">
-												<template v-if="couponItem.type == 'divideticket'">
-													<text class="unit">{{ $lang('common.currencySymbol') }}</text>
-													<text class="money">{{ parseFloat(couponItem.money) }}</text>
-												</template>
-												<template v-else-if="couponItem.type == 'reward'">
-													<text class="unit">{{ $lang('common.currencySymbol') }}</text>
-													<text class="money">{{ parseFloat(couponItem.money) }}</text>
-												</template>
-												<template v-else-if="couponItem.type == 'discount'">
-													<text class="money">{{ parseFloat(couponItem.discount) }}</text>
-													<text class="unit">折</text>
-												</template>
-												<view class="at-least">
-													<template v-if="couponItem.at_least > 0">
-														满{{ couponItem.at_least }}可用
-													</template>
-													<template v-else>
-														无门槛
-													</template>
-												</view>
-											</view>
-										</view>
-										<view class="desc-wrap">
-											<view class="coupon-name">{{ couponItem.coupon_name }}</view>
-											<view v-if="couponItem.type == 'discount' && couponItem.discount_limit > 0" class="limit">最多可抵￥{{ couponItem.discount_limit }}</view>
-											<view class="time font-size-goods-tag">有效期：{{ couponItem.end_time ? $util.timeStampTurnTime(couponItem.end_time) : '长期有效' }}</view>
-										</view>
-										<view class="iconfont" :class="orderCreateData.coupon.coupon_id == couponItem.coupon_id ? 'icon-yuan_checked color-base-text' : 'icon-yuan_checkbox'"></view>
-									</view>
-								</view>
-							</view>
-							<view v-else class="coupon-empty">暂无可用的优惠券</view>
-						</scroll-view>
-
-						<view class="popup-footer" :class="{ 'bottom-safe-area': isIphoneX }">
-							<view class="confirm-btn color-base-bg" @click="useCpopon">确定</view>
-						</view>
-					</view>
-				</uni-popup>
-
-				<!-- 交易协议 -->
-				<view @touchmove.prevent>
-					<uni-popup ref="agreementPopup" type="center" :maskClick="false">
-						<view class="agreement-conten-box">
-							<view class="close">
-								<text class="iconfont icon-close" @click="$refs.agreementPopup.close()"></text>
-							</view>
-							<view class="title">{{ transactionAgreement.title }}</view>
-							<view class="con">
-								<scroll-view scroll-y="true" class="con">
-									<rich-text :nodes="transactionAgreement.content"></rich-text>
-								</scroll-view>
-							</view>
-						</view>
-					</uni-popup>
-				</view>
-
-				<!-- 表单修改弹窗 -->
-				<uni-popup ref="editFormPopup" type="bottom">
-					<view style="height: auto;" class="form-popup popup" @touchmove.prevent.stop>
-						<view class="popup-header">
-							<text class="tit">买家信息</text>
-							<text class="iconfont icon-close" @click="$refs.editFormPopup.close()"></text>
-						</view>
-						<scroll-view scroll-y="true" class="popup-body" :class="{ 'safe-area': isIphoneX }">
-							<ns-form v-if="tempFormData" :data="tempFormData.json_data" ref="tempForm"></ns-form>
-						</scroll-view>
-						<view class="popup-footer" @click="saveForm" :class="{ 'bottom-safe-area': isIphoneX }">
-							<view class="confirm-btn color-base-bg">确定</view>
-						</view>
-					</view>
-				</uni-popup>
-
-				<uni-popup ref="memberGoodsCardPopup" type="bottom">
-					<view class="member-card-popup popup" @touchmove.prevent.stop>
-						<view class="popup-header">
-							<text class="tit">选择次卡</text>
-							<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" class="card-item" @click="selectGoodsCard.click(item.item_id)">
-								<view class="content">
-									<view class="title">{{ item.goods_name }}</view>
-									<view class="info">
-										<text v-if="item.card_type == 'timecard'">不限次数</text>
-										<text v-if="item.card_type == 'oncecard'">剩余{{ item.num - item.use_num }}次</text>
-										<text v-if="item.card_type == 'commoncard'">剩余{{ item.total_num - item.total_use_num }}次</text>
-										<text>|</text>
-										<text>{{ item.end_time ? $util.timeStampTurnTime(item.end_time) : '长期有效' }}</text>
-									</view>
-								</view>
-								<view class="iconfont" :class="selectGoodsCard.itemId == item.item_id ? 'icon-yuan_checked color-base-text' : 'icon-yuan_checkbox'"></view>
-							</view>
-						</scroll-view>
-						<view class="popup-footer" @click="saveMemberGoodsCard" :class="{ 'bottom-safe-area': isIphoneX }">
-							<view class="confirm-btn color-base-bg">确定</view>
-						</view>
-					</view>
-				</uni-popup>
-			</template>
-		</scroll-view>
-
-		<!-- 门店自提时间 -->
-		<ns-select-time @selectTime="selectPickupTime" ref="timePopup"></ns-select-time>
-
-		<ns-login ref="login"></ns-login>
-		<loading-cover ref="loadingCover"></loading-cover>
-	</view>
-</template>
-
-<script>
-	import payment from './payment.js';
-
-	export default {
-		name: 'common-payment',
-		data() {
-			return {};
-		},
-		props: {
-			api: Object,
-			createDataKey: String
-		},
-		mixins: [payment]
-	};
-</script>
-
-<style lang="scss">
-	@import '@/common/css/order_parment.scss';
-
-	.order-cell .promotion-content {
-		flex: 1;
-	}
-</style>
\ No newline at end of file
diff --git a/components/common-payment/common-payment.vue b/components/common-payment/common-payment.vue
index ff86c64..06009c6 100644
--- a/components/common-payment/common-payment.vue
+++ b/components/common-payment/common-payment.vue
@@ -64,30 +64,27 @@
 
 					<view class="address-box" :class="{ 'not-delivery-type': goodsData.delivery.express_type.length <= 1 }" v-if="orderCreateData.delivery.delivery_type == 'local'">
 						<view v-if="localMemberAddress">
-							<block v-if="storeList && Object.keys(storeList).length > 1">
-								<view class="local-delivery-store" v-if="storeInfo" @click="openPopup('deliveryPopup')">
-									<view class="info">
+							<block v-if="storeList && Object.keys(storeList).length > 0">
+								<view class="local-delivery-store">
+									<view class="info" v-if="storeInfo">
 										由
 										<text class="store-name">{{ storeInfo.store_name }}</text>
 										提供配送
+										<view>营业时间：{{ storeInfo.open_date }}</view>
 									</view>
-									<view class="cell-more">
+									<view class="info" v-else>
+										<text class="store-name">超出配送范围，请选择其他门店</text>
+									</view>
+									<view class="cell-more" v-if="Object.keys(storeList).length > 1" @click="openPopup('deliveryPopup')">
 										<text>点击切换</text>
 										<text class="iconfont icon-right"></text>
 									</view>
 								</view>
-								<view v-else class="local-delivery-store">
-									<view class="info">
-										<text class="store-name">您的附近没有可配送的门店，请选择其他配送方式</text>
-									</view>
-								</view>
 							</block>
 							<view class="info-wrap local" @click="selectAddress">
 								<view class="content">
-									<text class="name">{{ localMemberAddress.name ? localMemberAddress.name : '' }}
-									</text>
-									<text class="mobile">{{ localMemberAddress.mobile ? localMemberAddress.mobile : '' }}
-									</text>
+									<text class="name">{{ localMemberAddress.name ? localMemberAddress.name : '' }}</text>
+									<text class="mobile">{{ localMemberAddress.mobile ? localMemberAddress.mobile : '' }}</text>
 									<view class="desc-wrap">
 										{{ localMemberAddress.full_address ? localMemberAddress.full_address : '' }}
 										{{ localMemberAddress.address ? localMemberAddress.address : '' }}
@@ -125,9 +122,9 @@
 											<text>{{ storeInfo.store_name }}</text>
 										</view>
 										<view class="store-detail">
+											<view class="close-desc" v-if="storeInfo.status == 0 && storeInfo.close_desc">{{ storeInfo.close_desc }}</view>
 											<view v-if="storeInfo.open_date">营业时间：{{ storeInfo.open_date }}</view>
-											<view class="address">{{ storeInfo.full_address }} {{ storeInfo.address }}
-											</view>
+											<view class="address">{{ storeInfo.full_address }} {{ storeInfo.address }}</view>
 										</view>
 									</view>
 									<view class="cell-more iconfont icon-right" v-if="storeList && Object.keys(storeList).length > 1"></view>
@@ -145,7 +142,14 @@
 									<input type="number" maxlength="11" placeholder="请输入您的手机号码" placeholder-class="color-tip placeholder" class="input" v-model="orderCreateData.member_address.mobile" />
 								</view>
 							</view>
-							<view class="store-time" @click="storetime('')">
+							<view class="store-time"  v-if="goodsData.jielong_id">
+								<view class="left">提货时间</view>
+								<view class="right">
+									{{ $util.timeStampTurnTime(goodsData.jielong_info.take_start_time,'Y/m/d') }} ~ {{ $util.timeStampTurnTime(goodsData.jielong_info.take_end_time,'Y/m/d') }}
+								</view>
+							</view>
+							
+							<view class="store-time" @click="storetime('')" v-else>
 								<view class="left">提货时间</view>
 								<view class="right">
 									{{ deliveryTime }}
@@ -159,15 +163,10 @@
 				</template>
 
 				<!-- 店铺 -->
-				
-				<view class="site-wrap order-goods" v-for="(calculateGoodsData, siteIndex) in shop_goods_list" :key="siteIndex">
-					<view class="site-header">
-						<view class="iconfont icon-dianpu"></view>
-						<text class="site-name">{{calculateGoodsData.site_name}}</text>
-					</view>
+				<view class="site-wrap order-goods" v-if="calculateGoodsData">
 					<view class="site-body">
 						<!-- 商品 -->
-						<view class="goods-item" v-for="(goodsItem, goodsIndex) in goodsSpecFormat(calculateGoodsData.goods_list)" :key="goodsIndex">
+						<view class="goods-item" v-for="(goodsItem, goodsIndex) in calculateGoodsData.goods_list" :key="goodsIndex">
 							<view class="goods-wrap">
 								<view class="goods-img" @click="$util.redirectTo('/pages/goods/detail', { goods_id: goodsItem.goods_id })">
 									<image :src="$util.img(goodsItem.sku_image, { size: 'mid' })" @error="imageError(goodsIndex)" mode="aspectFill"/>
@@ -210,6 +209,17 @@
 									</view>
 								</view>
 							</view>
+							<view class="member-goods-card order-cell" v-if="calculateGoodsData.goods_list[goodsIndex].member_card_list" @click="selectMemberGoodsCard(goodsIndex)">
+								<text class="tit">次卡抵扣</text>
+								<view class="box text-overflow">
+									<block v-if="calculateGoodsData.goods_list[goodsIndex].card_promotion_money">
+										<text class="text">次卡抵扣{{ calculateGoodsData.goods_list[goodsIndex].card_use_num }}张/{{ calculateGoodsData.goods_list[goodsIndex].card_use_num }}次</text>
+										<text class="price-font">-￥{{ calculateGoodsData.goods_list[goodsIndex].card_promotion_money | moneyFormat }}</text>
+									</block>
+									<text class="color-tip" v-else>请选择次卡</text>
+								</view>
+								<text class="iconfont icon-right"></text>
+							</view>
 							<view class="goods-form" v-if="goodsData.goods_list[goodsIndex].goods_form" @click="editForm(goodsIndex)">
 								<ns-form :data="goodsData.goods_list[goodsIndex].goods_form.json_data" ref="goodsForm" :custom-attr="{ sku_id: goodsItem.sku_id, form_id: goodsData.goods_list[goodsIndex].goods_form.id }"/>
 								<text class="cell-more iconfont icon-right"></text>
@@ -217,48 +227,18 @@
 							</view>
 						</view>
 					</view>
-					
-					<view class="site-wrap buyer-message">
-						
-					</view>
-					
-					<view class="order-money" style="margin: 0;">
-						<view class="order-cell">
-							<text class="tit">买家留言</text>
-							<view class="box text-overflow " @click="openPopup('buyerMessagePopup')">
-								<text v-if="orderCreateData.buyer_message">{{ orderCreateData.buyer_message[calculateGoodsData.merch_id] }}</text>
-								<text class="color-sub" v-else>无留言</text>
-							</view>
-							<text class="iconfont icon-right"></text>
-						</view>
-						<view class="order-cell coupon" v-if="modules.indexOf('coupon') != -1">
-							<text class="tit">优惠券</text>
-							<view class="box text-overflow"@click="openSiteCoupon(calculateGoodsData.merch_id)">
-								<template v-if="orderCreateData.coupon[calculateGoodsData.merch_id].coupon_id">
-									<text class="money price-font" style="max-width: 100%;">已选择1张优惠券</text>
-								<!-- 	<text class="unit price-font">优惠</text>
-									<text class="money price-font">{{ (calculateData && calculateData.coupon_money ? calculateData.coupon_money : 0) | moneyFormat }}</text> -->
-								</template>
-								<text v-else>不使用优惠券</text>
-							</view>
-							<text class="iconfont icon-right"></text>
-						</view>
-					</view>
-					<view class="site-wrap buyer-message">
-						<view class="order-cell">
-							<view class="box shop-item">
-								<text class="color-tip goods-num">共{{ calculateGoodsData.goods_num }}件</text>
-								<text class="font-size-base">小计：</text>
-								<text class="color-base-text unit">{{ $lang('common.currencySymbol') }}</text>
-								<text class="color-base-text money">{{ calculateGoodsData.goods_money | moneyFormat }}</text>
-							</view>
+				</view>
+
+				<view class="site-wrap buyer-message">
+					<view class="order-cell">
+						<text class="tit">买家留言</text>
+						<view class="box text-overflow " @click="openPopup('buyerMessagePopup')">
+							<text v-if="orderCreateData.buyer_message">{{ orderCreateData.buyer_message }}</text>
+							<text class="color-sub" v-else>无留言</text>
 						</view>
+						<text class="iconfont icon-right"></text>
 					</view>
 				</view>
-				
-				
-
-			
 
 				<view v-if="paymentData.system_form" class="system-form-wrap">
 					<view class="order-cell">
@@ -267,7 +247,7 @@
 					<ns-form :data="paymentData.system_form.json_data" ref="form"/>
 				</view>
 
-			<!-- 	<view class="site-wrap" v-if="calculateGoodsData  || promotionInfo || (calculateGoodsData && calculateGoodsData.max_usable_point > 0) || goodsData.invoice">
+				<view class="site-wrap" v-if="calculateGoodsData  || promotionInfo || (calculateGoodsData && calculateGoodsData.max_usable_point > 0) || goodsData.invoice">
 					<view class="site-footer">
 						<view class="order-cell coupon" v-if="modules.indexOf('coupon') != -1">
 							<text class="tit">优惠券</text>
@@ -306,8 +286,8 @@
 							<text class="iconfont icon-right"></text>
 						</view>
 					</view>
-				</view> -->
- 
+				</view>
+
 				<view class="site-wrap box member-card-wrap" v-if="paymentData.recommend_member_card && Object.keys(paymentData.recommend_member_card).length > 0">
 					<view class="head" @click="selectMemberCard">
 						<text class="iconfont icon-huiyuan"></text>
@@ -320,7 +300,7 @@
 						<text class="iconfont" :class="orderCreateData.is_open_card == 1 ? 'icon-yuan_checked color-base-text' : 'icon-yuan_checkbox'"></text>
 					</view>
 					<view class="body" v-if="orderCreateData.is_open_card">
-						<view class="item" :class="{ 'active color-base-border': item.key == orderCreateData.member_card_unit }" v-for="(item, index) in cardChargeType" :key="index" @click="selectMembercardUnit(item.key)">
+						<view class="item" :class="{ 'active color-base-border': item.key == orderCreateData.member_card_unit }" v-for="(item, index) in cardChargeType" :key="index" @click="selectMemberCardUnit(item.key)">
 							<view class="title">{{ item.title }}</view>
 							<view class="price price-font">{{ $lang('common.currencySymbol') }}{{ parseFloat(item.value) }}/{{ item.unit }}</view>
 							<text class="iconfont icon-icon color-base-text price-font identify" v-if="item.key == orderCreateData.member_card_unit"></text>
@@ -346,7 +326,7 @@
 								<text class="money price-font">{{ calculateData.delivery_money | moneyFormat }}</text>
 							</view>
 						</view>
-				<!-- 		<view class="order-cell" v-if="orderCreateData.is_invoice && calculateData.invoice_money > 0">
+						<view class="order-cell" v-if="orderCreateData.is_invoice && calculateData.invoice_money > 0">
 							<text class="tit">
 								<text>税费</text>
 								<text class="color-base-text font-bold price-font">({{ goodsData.invoice.invoice_rate }}%)</text>
@@ -356,15 +336,15 @@
 								<text class="unit price-font">{{ $lang('common.currencySymbol') }}</text>
 								<text class="money price-font">{{ calculateData.invoice_money | moneyFormat }}</text>
 							</view>
-						</view> -->
-					<!-- 	<view class="order-cell" v-if="orderCreateData.is_invoice && calculateData.invoice_delivery_money > 0">
+						</view>
+						<view class="order-cell" v-if="orderCreateData.is_invoice && calculateData.invoice_delivery_money > 0">
 							<text class="tit">发票邮寄费</text>
 							<view class="box color-base-text">
 								<text class="operator">+</text>
 								<text class="unit price-font">{{ $lang('common.currencySymbol') }}</text>
 								<text class="money price-font">{{ calculateData.invoice_delivery_money | moneyFormat }}</text>
 							</view>
-						</view> -->
+						</view>
 						<view class="order-cell" v-if="calculateData.promotion_money > 0">
 							<text class="tit">优惠</text>
 							<view class="box color-base-text">
@@ -389,7 +369,7 @@
 								<text class="money price-font">{{ calculateData.point_money | moneyFormat }}</text>
 							</view>
 						</view>
-				<!-- 		<view class="order-cell" v-if="calculateData.member_card_money > 0">
+						<view class="order-cell" v-if="calculateData.member_card_money > 0">
 							<text class="tit">会员卡</text>
 							<view class="box color-base-text">
 								<text class="operator">+</text>
@@ -397,7 +377,7 @@
 								<text class="money price-font">{{ calculateData.member_card_money | moneyFormat }}
 								</text>
 							</view>
-						</view> -->
+						</view>
 					</view>
 
 					<view v-if="transactionAgreement.title && transactionAgreement.content" class="agreement">购买前请先阅读<text @click="$refs.agreementPopup.open()">《{{ transactionAgreement.title }}》</text>，下单即代表同意该协议</view>
@@ -412,14 +392,76 @@
 						</view>
 						<view class="submit-btn">
 							<button type="primary" class="mini" size="mini" @click="create()" v-if="!surplusStartMoney()">提交订单</button>
-						<!-- 	<button v-else class="no-submit mini" size="mini">差{{ surplusStartMoney() | moneyFormat }}起送</button> -->
+							<button v-else class="no-submit mini" size="mini">差{{ surplusStartMoney() | moneyFormat }}起送</button>
 						</view>
 					</view>
-					<view class="order-submit-block"></view> 
+					<view class="order-submit-block"></view>
 
 					<payment ref="choosePaymentPopup" @close="payClose" v-if="calculateData"></payment>
 				</template>
 
+				<!-- 发票弹窗 -->
+				<uni-popup ref="invoicePopup" type="bottom" :mask-click="false">
+					<view :style="orderCreateData.is_invoice == 1 ? 'height: 83vh;' : 'height: 48vh;'" class="invoice-popup popup" @touchmove.prevent.stop>
+						<view class="popup-header">
+							<text class="tit">发票</text>
+							<text class="iconfont icon-close" @click="closePopup('invoicePopup')"></text>
+						</view>
+						<scroll-view scroll-y="true" class="popup-body" :class="{ 'safe-area': isIphoneX }">
+							<view>
+								<view class="invoice-cell" v-if="goodsData.invoice">
+									<text class="tit">需要发票</text>
+									<view class="option-grpup">
+										<view class="option-item" :class="{ 'color-base-bg active': orderCreateData.is_invoice == 0 }" @click="changeIsInvoice">不需要</view>
+										<view class="option-item" :class="{ 'color-base-bg active': orderCreateData.is_invoice == 1 }" @click="changeIsInvoice">需要</view>
+									</view>
+								</view>
+								<block v-if="orderCreateData.is_invoice == 1">
+									<view class="invoice-cell">
+										<text class="tit">发票类型</text>
+										<view class="option-grpup">
+											<view class="option-item" :class="{ 'color-base-bg active': orderCreateData.invoice_type == item }" @click="changeInvoiceType(item)" v-for="(item, index) in goodsData.invoice.invoice_type.split(',')" :key="index">
+												{{ item == 1 ? '纸质' : '电子' }}
+											</view>
+										</view>
+									</view>
+									<view class="invoice-cell">
+										<text class="tit">抬头类型</text>
+										<view class="option-grpup">
+											<view class="option-item" :class="{ 'color-base-bg active': orderCreateData.invoice_title_type == 1 }" @click="changeInvoiceTitleType(1)">
+												个人
+											</view>
+											<view class="option-item" :class="{ 'color-base-bg active': orderCreateData.invoice_title_type == 2 }" @click="changeInvoiceTitleType(2)">
+												企业
+											</view>
+										</view>
+									</view>
+									<view class="invoice-cell">
+										<text class="tit">发票信息</text>
+										<view class="invoice-form-group">
+											<input type="text" placeholder="请填写抬头名称" v-model.trim="orderCreateData.invoice_title" />
+											<input v-if="orderCreateData.invoice_title_type == 2" type="text" placeholder="请填写纳税人识别号" v-model.trim="orderCreateData.taxpayer_number" />
+											<input type="text" placeholder="请填写邮寄地址" v-model.trim="orderCreateData.invoice_full_address" v-if="orderCreateData.invoice_type == 1" />
+											<input type="text" placeholder="请填写邮箱" v-model.trim="orderCreateData.invoice_email" v-if="orderCreateData.invoice_type == 2" />
+										</view>
+									</view>
+									<view class="invoice-cell">
+										<text class="tit">发票内容</text>
+										<view class="option-grpup">
+											<view :key="index" v-for="(item, index) in goodsData.invoice.invoice_content_array" :class="{ 'color-base-bg active': item == orderCreateData.invoice_content }" @click="changeInvoiceContent(item)" class="option-item content">
+												{{ item }}
+											</view>
+										</view>
+									</view>
+								</block>
+								<view class="invoice-tops">发票内容将以根据税法调整，具体请以展示为准，发票内容显示详细商品名 称及价格信息</view>
+							</view>
+						</scroll-view>
+						<view class="popup-footer" @click="saveInvoice" :class="{ 'bottom-safe-area': isIphoneX }">
+							<view class="confirm-btn color-base-bg">确定</view>
+						</view>
+					</view>
+				</uni-popup>
 
 				<!-- 活动优惠弹窗 -->
 				<uni-popup ref="promotionPopup" type="bottom" v-if="promotionInfo">
@@ -431,8 +473,7 @@
 						<scroll-view scroll-y="true" class="popup-body" :class="{ 'safe-area': isIphoneX }">
 							<view class="order-cell" style="align-items: baseline;">
 								<view class="tit">
-									<text class="promotion-mark ns-gradient-promotionpages-payment">{{ promotionInfo.title }}
-									</text>
+									<text class="promotion-mark ns-gradient-promotionpages-payment">{{ promotionInfo.title }}</text>
 								</view>
 								<view class="promotion-content">
 									<view class="tit tit-content" style="white-space: pre-line;" v-html="promotionInfo.content"></view>
@@ -465,6 +506,7 @@
 														<text v-if="item.distance">({{ item.distance }}km)</text>
 													</view>
 													<view class="info">
+														<view v-if="item.status == 0 && item.close_desc" class="close-desc">{{ item.close_desc }}</view>
 														<view :class="item.store_id == orderCreateData.delivery.store_id ? 'color-base-text' : ''" class="font-size-goods-tag">营业时间：{{ item.open_date }}</view>
 														<view :class="item.store_id == orderCreateData.delivery.store_id ? 'color-base-text' : ''" class="font-size-goods-tag">地址：{{ item.full_address }}{{ item.address }}</view>
 													</view>
@@ -478,6 +520,33 @@
 											<ns-empty text="所选择收货地址附近没有可以自提的门店" :isIndex="false"></ns-empty>
 										</view>
 									</view>
+									<!-- <block v-if="storeList">
+										<view class="item-wrap" v-for="(item, index) in storeList" :key="index"
+											@click="selectPickupPoint(item)">
+											<view class="detail">
+												<view class="name"
+													:class="item.store_id == orderCreateData.delivery.store_id ? 'color-base-text' : ''">
+													<text>{{ item.store_name }}</text>
+													<text v-if="item.distance">({{ item.distance }}km)</text>
+												</view>
+												<view class="info">
+													<view
+														:class="item.store_id == orderCreateData.delivery.store_id ? 'color-base-text' : ''"
+														class="font-size-goods-tag">
+														营业时间：{{ item.open_date }}
+													</view>
+													<view
+														:class="item.store_id == orderCreateData.delivery.store_id ? 'color-base-text' : ''"
+														class="font-size-goods-tag">
+														地址：{{ item.full_address }}{{ item.address }}
+													</view>
+												</view>
+											</view>
+											<view class="icon" v-if="item.store_id == orderCreateData.delivery.store_id">
+												<text class="iconfont icon-yuan_checked color-base-text"></text>
+											</view>
+										</view>
+									</block> -->
 
 								</block>
 							</mescroll-uni>
@@ -509,7 +578,7 @@
 				</uni-popup>
 
 				<!-- 优惠券弹窗 -->
-				<uni-popup ref="couponPopup" type="bottom" :mask-click="false">
+				<uni-popup ref="couponPopup" type="bottom" v-if="calculateGoodsData" :mask-click="false">
 					<view class="coupon-popup popup" @touchmove.prevent.stop>
 						<view class="popup-header">
 							<text class="tit">优惠券</text>
@@ -517,8 +586,8 @@
 						</view>
 
 						<scroll-view scroll-y="true" class="popup-body" :class="{ 'safe-area': isIphoneX }">
-							<view v-if="merchCoupon.data.length > 0">
-								<view class="coupon-item" v-for="(couponItem, couponIndex) in merchCoupon.data" :key="couponIndex" @click="selectCoupon(couponItem,merchCoupon.merch_id)">
+							<view v-if="coupon_list.length > 0">
+								<view class="coupon-item" v-for="(couponItem, couponIndex) in coupon_list" :key="couponIndex" @click="selectCoupon(couponItem)">
 									<view class="coupon-info" :style="{ backgroundColor: 'var(--main-color-shallow)' }">
 										<view class="info-wrap">
 											<image class="coupon-line" mode="heightFix" :src="$util.img('public/uniapp/coupon/coupon_line.png')"/>
@@ -536,12 +605,8 @@
 													<text class="unit">折</text>
 												</template>
 												<view class="at-least">
-													<template v-if="couponItem.at_least > 0">
-														满{{ couponItem.at_least }}可用
-													</template>
-													<template v-else>
-														无门槛
-													</template>
+													<template v-if="couponItem.at_least > 0">满{{ couponItem.at_least }}可用</template>
+													<template v-else>无门槛</template>
 												</view>
 											</view>
 										</view>
@@ -550,7 +615,7 @@
 											<view v-if="couponItem.type == 'discount' && couponItem.discount_limit > 0" class="limit">最多可抵￥{{ couponItem.discount_limit }}</view>
 											<view class="time font-size-goods-tag">有效期：{{ couponItem.end_time ? $util.timeStampTurnTime(couponItem.end_time) : '长期有效' }}</view>
 										</view>
-										<view class="iconfont" :class="selectCouponId == couponItem.coupon_id ? 'icon-yuan_checked color-base-text' : 'icon-yuan_checkbox'"></view>
+										<view class="iconfont" :class="orderCreateData.coupon.coupon_id == couponItem.coupon_id ? 'icon-yuan_checked color-base-text' : 'icon-yuan_checkbox'"></view>
 									</view>
 								</view>
 							</view>
@@ -558,7 +623,7 @@
 						</scroll-view>
 
 						<view class="popup-footer" :class="{ 'bottom-safe-area': isIphoneX }">
-							<view class="confirm-btn color-base-bg" @click="useCpopon">确定</view>
+							<view class="confirm-btn color-base-bg" @click="useCoupon">确定</view>
 						</view>
 					</view>
 				</uni-popup>
@@ -573,7 +638,7 @@
 							<view class="title">{{ transactionAgreement.title }}</view>
 							<view class="con">
 								<scroll-view scroll-y="true" class="con">
-									<rich-text :nodes="transactionAgreement.content"></rich-text>
+									<ns-mp-html :content="transactionAgreement.content"></ns-mp-html>
 								</scroll-view>
 							</view>
 						</view>
@@ -588,7 +653,7 @@
 							<text class="iconfont icon-close" @click="$refs.editFormPopup.close()"></text>
 						</view>
 						<scroll-view scroll-y="true" class="popup-body" :class="{ 'safe-area': isIphoneX }">
-							<ns-form v-if="tempFormData" :data="tempFormData.json_data" ref="tempForm"></ns-form>
+							<ns-form v-if="tempFormData" :data="tempFormData.json_data" ref="tempForm" />
 						</scroll-view>
 						<view class="popup-footer" @click="saveForm" :class="{ 'bottom-safe-area': isIphoneX }">
 							<view class="confirm-btn color-base-bg">确定</view>
@@ -603,7 +668,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" class="card-item" @click="selectGoodsCard.click(item.item_id)">
+							<view v-for="(item, index) in selectGoodsCard.cardList" class="card-item" @click="selectGoodsCard.click(item.item_id)" :key="item.item_id">
 								<view class="content">
 									<view class="title">{{ item.goods_name }}</view>
 									<view class="info">
@@ -655,4 +720,4 @@
 	.order-cell .promotion-content {
 		flex: 1;
 	}
-</style>
\ No newline at end of file
+</style>
diff --git a/components/diy-components/diy-article.vue b/components/diy-components/diy-article.vue
index 7688db8..2d02e07 100644
--- a/components/diy-components/diy-article.vue
+++ b/components/diy-components/diy-article.vue
@@ -1,26 +1,27 @@
 <template>
-	<x-skeleton data-component-name="diy-article" type="list" :loading="loading" :configs="skeletonConfig">
-		<view class="article-wrap" :style="warpCss">
-			<view :class="['list-wrap', value.style]" :style="warpCss">
-				<view :class="['item', value.ornament.type]" v-for="(item, index) in list" :key="index" @click="toDetail(item)" :style="itemCss">
-					<view class="article-img">
-						<image class="cover-img" :src="$util.img(item.cover_img)" mode="widthFix" @error="imgError(index)" />
-					</view>
-					<view class="info-wrap">
-						<text class="title">{{ item.article_title }}</text>
-						<text class="desc" style="color:#888;font-size: 24rpx; display: -webkit-box;-webkit-box-orient: vertical;-webkit-line-clamp: 2;overflow: hidden;text-overflow: ellipsis;">{{ item.article_abstract }}</text>
-						<view class="read-wrap">
-							<block v-if="item.category_name">
-								<text class="category-icon"></text>
-								<text>{{ item.category_name }}</text>
-							</block>
-							<text class="date">{{ $util.timeStampTurnTime(item.create_time, 'date') }}</text>
+	<view :style="value.pageStyle" v-if="loading || (list && list.length)">
+		<x-skeleton type="list" :loading="loading" :configs="skeletonConfig">
+			<view class="article-wrap" :style="warpCss">
+				<view :class="['list-wrap', value.style]" :style="warpCss">
+					<view :class="['item', value.ornament.type]" v-for="(item, index) in list" :key="index" @click="toDetail(item)" :style="itemCss">
+						<view class="article-img">
+							<image class="cover-img" :src="$util.img(item.cover_img)" mode="widthFix" @error="imgError(index)" />
+						</view>
+						<view class="info-wrap">
+							<text class="title">{{ item.article_title }}</text>
+							<view class="read-wrap">
+								<block v-if="item.category_name">
+									<text class="category-icon"></text>
+									<text>{{ item.category_name }}</text>
+								</block>
+								<text class="date">{{ $util.timeStampTurnTime(item.create_time, 'Y-m-d') }}</text>
+							</view>
 						</view>
 					</view>
 				</view>
 			</view>
-		</view>
-	</x-skeleton>
+		</x-skeleton>
+	</view>
 </template>
 
 <script>
@@ -29,7 +30,10 @@
 		name: 'diy-article',
 		props: {
 			value: {
-				type: Object
+				type: Object,
+				default: () => {
+					return {};
+				}
 			}
 		},
 		data() {
diff --git a/components/diy-components/diy-bargain.vue b/components/diy-components/diy-bargain.vue
index f43ab9f..97a3ff0 100644
--- a/components/diy-components/diy-bargain.vue
+++ b/components/diy-components/diy-bargain.vue
@@ -1,4 +1,5 @@
 <template>
+	<view :style="value.pageStyle" v-if="loading || (list && list.length)">
 	<x-skeleton data-component-name="diy-bargain" :type="skeletonType" :loading="loading" :configs="skeletonConfig">
 		<view class="diy-bargain" :class="[value.template, value.style]" :style="warpCss">
 
@@ -123,6 +124,7 @@
 
 		</view>
 	</x-skeleton>
+	</view>
 </template>
 
 <script>
@@ -130,7 +132,10 @@
 		name: 'diy-bargain',
 		props: {
 			value: {
-				type: Object
+				type: Object,
+				default: () => {
+					return {};
+				}
 			}
 		},
 		data() {
diff --git a/components/diy-components/diy-category-item.vue b/components/diy-components/diy-category-item.vue
index 8525792..0431905 100644
--- a/components/diy-components/diy-category-item.vue
+++ b/components/diy-components/diy-category-item.vue
@@ -33,14 +33,13 @@
 		</block>
 
 		<block v-if="type == 'goods'">
-			<view class="categoty-goods-wrap" v-if="loadType == 'part'"
-				:style="'padding-top:' + (value.search ? 0 : '20rpx')">
+			<view class="categoty-goods-wrap" v-if="loadType == 'part'" :style="'padding-top:' + (value.search ? 0 : '20rpx')">
 				<!-- 分类筛选 -->
 				<block v-if="category.child_list && value.goodsLevel == 2">
 					<view class="screen-category-wrap">
 						<scroll-view scroll-x="true" class="screen-category" :class="{ 'screen-category-4': value.template == 4 }" :scroll-with-animation="true" :scroll-into-view="scrollIntoView">
-							<view class="item" id="category-2--1" :class="{ selected: categoryId == -1 }" @click="selectCategoey(-1)">全部</view>
-							<view class="item" :id="'category-2-' + oneIndex" :class="{ selected: categoryId == oneIndex }" @click="selectCategoey(oneIndex)" v-for="(one, oneIndex) in category.child_list" :key="oneIndex">
+							<view class="item" id="category-2--1" :class="{ selected: categoryId == -1 }" @click="selectCategory(-1)">全部</view>
+							<view class="item" :id="'category-2-' + oneIndex" :class="{ selected: categoryId == oneIndex }" @click="selectCategory(oneIndex)" v-for="(one, oneIndex) in category.child_list" :key="oneIndex">
 								{{ one.category_name }}
 							</view>
 						</scroll-view>
@@ -50,14 +49,14 @@
 						<view class="screen-category-popup" @click="$refs.screenCategoryPopup.close()">
 							<scroll-view scroll-y="true" class="screen-category" :class="{ 'screen-category-4': value.template == 4 }">
 								<view class="title">全部</view>
-								<view class="item" :class="{ selected: categoryId == oneIndex }" @click="selectCategoey(oneIndex)" v-for="(one, oneIndex) in category.child_list" :key="oneIndex">
+								<view class="item" :class="{ selected: categoryId == oneIndex }" @click="selectCategory(oneIndex)" v-for="(one, oneIndex) in category.child_list" :key="oneIndex">
 									{{ one.category_name }}
 								</view>
 							</scroll-view>
 						</view>
 					</uni-popup>
 				</block>
-				<!---->
+
 				<scroll-view scroll-y="true" class="scroll-goods-view" lower-threshold="300" :scroll-top="scrollTop" @scrolltolower="scrolltolower" @touchstart="touchstart" @touchend="touchend" @scroll="listenScroll">
 					
 					<!--一级分类展示商品显示-->
@@ -70,6 +69,9 @@
 								<view class="goods-img" @click="toDetail(item)">
 									<image :src="goodsImg(item.goods_image)" mode="widthFix" @error="imgError(index)"/>
 									<view class="color-base-bg goods-tag" v-if="item.label_name">{{ item.label_name }}</view>
+									<view class="sell-out" v-if="item.goods_stock <= 0">
+										<text class="iconfont icon-shuqing"></text>
+									</view>
 								</view>
 								<view class="info-wrap">
 									<view class="name-wrap" @click="toDetail(item)">
@@ -293,7 +295,7 @@
 			oneCategorySelect: function() {
 				this.scrollTop = -1;
 				this.goodsList = [];
-				this.selectCategoey(-1);
+				this.selectCategory(-1);
 			},
 			select: function() {
 				if (this.index == this.select) {
@@ -607,7 +609,7 @@
 				}
 				this.$emit('selectsku', data);
 			},
-			selectCategoey(index) {
+			selectCategory(index) {
 				this.categoryId = index;
 				this.pageIndex = 0;
 				this.totalPage = 1;
@@ -667,7 +669,7 @@
 						this.$emit('switch', index);
 					} else {
 						let index = this.categoryId - 1;
-						this.selectCategoey(index);
+						this.selectCategory(index);
 					}
 				} else {
 					if (this.categoryId == -1 || (this.category.child_list && this.categoryId == this.category.child_list.length - 1)) {
@@ -675,7 +677,7 @@
 						this.$emit('switch', index);
 					} else {
 						let index = this.categoryId + 1;
-						this.selectCategoey(index);
+						this.selectCategory(index);
 					}
 				}
 			},
@@ -995,7 +997,27 @@
 					height: 100%;
 				}
 			}
-
+			.sell-out{
+				position: absolute;
+				z-index: 1;
+				width: 180rpx;
+				height: 180rpx;
+				top: 0;
+				left: 0;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				background: rgba(0, 0, 0, 0.5);
+				border-radius: $border-radius;
+				text{
+					color: #fff;
+					font-size: 150rpx;
+					position: absolute;
+					left:50%;
+					top:50%;
+					transform: translateX(-50%) translateY(-50%);
+				}
+			}
 			.info-wrap {
 				flex: 1;
 				display: flex;
@@ -1171,10 +1193,28 @@
 				height: auto;
 				margin-right: 0;
 				line-height: 1;
-
+				position: relative;
 				image {
 					border-radius: 8rpx;
 				}
+				.sell-out{
+					position: absolute;
+					z-index: 1;
+					width: 100%;
+					height: auto;
+					top: 0;
+					left: 0;
+					bottom:0;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					background: rgba(0, 0, 0, 0.5);
+					border-radius: $border-radius;
+					text{
+						color: #fff;
+						font-size: 240rpx;
+					}
+				}
 			}
 
 			.select-sku {
@@ -1200,7 +1240,7 @@
 
 	.screen-category-wrap {
 		display: flex;
-
+		padding-top: 20rpx;
 		.icon-unfold {
 			font-size: 24rpx;
 			color: #999;
diff --git a/components/diy-components/diy-category.vue b/components/diy-components/diy-category.vue
index 4a35044..d70a695 100644
--- a/components/diy-components/diy-category.vue
+++ b/components/diy-components/diy-category.vue
@@ -2,20 +2,20 @@
 	<view data-component-name="diy-category" :class="['category-page-wrap', 'category-template-' + value.template]"
 		:style="{height: 'calc(100vh - '+ tabBarHeight +')' }">
 		<!-- #ifdef MP-WEIXIN -->
-		<!-- <block v-if="value.template == 4">
+		<block v-if="value.template == 4">
 			<view class="search-box" v-if="value.search" @click="$util.redirectTo('/pages_tool/goods/search')" :style="navbarInnerStyle">
 				<view class="search-content">
-					<input type="text" class="uni-input font-size-tag" maxlength="50" :placeholder="$lang('search')" confirm-type="search" disabled="true" />
+					<input type="text" class="uni-input font-size-tag" maxlength="50" :placeholder="$lang('search')" confirm-type="search" readonly="true" disabled="true" />
 					<text class="iconfont icon-sousuo3"></text>
 				</view>
 			</view>
 			<view :style="navbarInnerStyle" v-if="!value.search">商品分类</view>
-		</block> -->
+		</block>
 		<block v-if="value.template != 4">
-<!-- 			<view :style="navbarInnerStyle">商品分类</view> -->
+			<view :style="navbarInnerStyle">商品分类</view>
 			<view class="search-box" v-if="value.search" @click="$util.redirectTo('/pages_tool/goods/search')" :style="wxSearchHeight">
 				<view class="search-content">
-					<input type="text" class="uni-input" maxlength="50" :placeholder="$lang('search')" confirm-type="search" disabled="true" />
+					<input type="text" class="uni-input" maxlength="50" :placeholder="$lang('search')" confirm-type="search" readonly="true" disabled="true" />
 					<text class="iconfont icon-sousuo3"></text>
 				</view>
 			</view>
@@ -24,11 +24,12 @@
 		<!-- #ifdef H5 -->
 		<view class="search-box" v-if="value.search" @click="$util.redirectTo('/pages_tool/goods/search')">
 			<view class="search-content">
-				<input type="text" class="uni-input" maxlength="50" :placeholder="$lang('search')" confirm-type="search" disabled="true" />
+				<input type="text" class="uni-input" maxlength="50" :placeholder="$lang('search')" confirm-type="search" readonly="true" disabled="true" />
 				<text class="iconfont icon-sousuo3"></text>
 			</view>
 		</view>
 		<!-- #endif -->
+		
 		<view class="template-four wx" v-if="value.template == 4">
 			<scroll-view scroll-x="true" class="template-four-wrap" :scroll-with-animation="true" :scroll-into-view="'category-one-' + oneCategorySelect" enable-flex="true">
 				<view class="category-item" :id="'category-one-' + index" v-for="(item, index) in templateFourData" :key="index" :class="{ select: oneCategorySelect == index }" @click="templateFourOneFn(index)">
@@ -71,12 +72,13 @@
 								{ 'border-bottom': value.template == 4 && select + 1 === index },
 								{ 'border-top': value.template == 4 && select - 1 === index }
 							]" @click="switchOneCategory(index)">
-							<view class="">{{ item.category_name }}</view>
+							<view>{{ item.category_name }}</view>
 						</view>
 					</view>
 				</scroll-view>
 
 				<view class="right-flex-wrap">
+					
 					<scroll-view scroll-y="true" class="content-wrap" v-if="value.template == 1 || loadType == 'all'"
 						ref="contentWrap" :scroll-into-view="categoryId" :scroll-with-animation="true"
 						@scroll="listenScroll" @touchstart="touchStart" :refresher-enabled="true"
@@ -113,8 +115,8 @@
 			<image :src="$util.img('public/uniapp/category/empty.png')" mode="widthFix"></image>
 			<view class="tips">暂时没有分类哦！</view>
 		</view>
-
-	<!-- 	<view class="cart-box" v-if="(value.template == 2 || value.template == 4) && value.quickBuy && storeToken && categoryTree && categoryTree.length">
+		<view class="cart-bottom-block" v-if="(value.template == 2 || value.template == 4) && value.quickBuy && storeToken && categoryTree && categoryTree.length"></view>
+		<view class="cart-box" v-if="(value.template == 2 || value.template == 4) && value.quickBuy && storeToken && categoryTree && categoryTree.length" :style="{ bottom: tabBarHeight }" :class="{ active: isIphoneX }">
 			<view class="left-wrap">
 				<view class="cart-icon" ref="cartIcon" :animation="cartAnimation" @click="$util.redirectTo('/pages/goods/cart')">
 					<text class="iconfont icon-ziyuan1"></text>
@@ -127,9 +129,10 @@
 					<text class="unit font-size-tag price-font">.{{ cartTotalMoney[1] ? cartTotalMoney[1] : '00' }}</text>
 				</view>
 			</view>
-			<view class="right-wrap"><button type="primary" class="settlement-btn" @click="settlement">去结算</button>
+			<view class="right-wrap">
+				<button type="primary" class="settlement-btn" @click="settlement">去结算</button>
 			</view>
-		</view> -->
+		</view>
 
 		<view class="cart-point" :style="{ left: item.left + 'px', top: item.top + 'px' }" :key="index" v-for="(item, index) in carIconList"></view>
 
@@ -176,34 +179,27 @@
 				cartAnimation: {},
 				loadType: '',
 				templateFourData: [],
+				isIphoneX: false, //判断手机是否是iphoneX以上,
 				lang:uni.getStorageSync("lang")//en-us 英文
 			};
 		},
 		created() {
+			this.isIphoneX = this.$util.uniappIsIPhoneX();
 			this.getCategoryTree();
 			this.loadType = this.value.goodsLevel == 1 && this.value.loadType == 'all' ? 'all' : 'part';
 		},
 		mounted() {
 			query = uni.createSelectorQuery().in(this);
-			query
-				.select('.content-wrap')
-				.boundingClientRect(data => {
-					if (data) contentWrapHeight = data.height;
-				})
-				.exec();
+			query.select('.content-wrap').boundingClientRect(data => {
+				if (data) contentWrapHeight = data.height;
+			}).exec();
 			setTimeout(() => {
-				query
-					.select('.end-tips')
-					.boundingClientRect(data => {
-						if (data && data.top > contentWrapHeight) this.endTips = 1;
-					})
-					.exec();
-				query
-					.select('.cart-icon')
-					.boundingClientRect(data => {
-						if (data) cartPosition = data;
-					})
-					.exec();
+				query.select('.end-tips').boundingClientRect(data => {
+					if (data && data.top > contentWrapHeight) this.endTips = 1;
+				}).exec();
+				query.select('.cart-icon').boundingClientRect(data => {
+					if (data) cartPosition = data;
+				}).exec();
 				if (this.value.template == 1) this.getHeightArea(-1);
 			}, 500);
 		},
@@ -250,7 +246,7 @@
 					style += 'padding-top:' + this.navbarHeight + 'px;';
 					style += 'text-align: center;';
 					style += 'line-height:' + menuButtonInfo.height * 2 + 'rpx;';
-					style += 'font-size: 14px;';
+					style += 'font-size: 16px;';
 					style += 'padding-bottom: 10rpx;';
 				}
 				return style;
@@ -282,27 +278,48 @@
 			pageShow() {
 				this.$store.dispatch('getCartNumber');
 				if (!this.heightArea.length) this.getHeightArea(-1);
+				this.dealCategoryData()
+			},
+			dealCategoryData() {
+				if (uni.getStorageSync('tabBarParams')) {
+					if (this.value.template != 4) {
+						this.categoryTree.forEach((item,index) => {
+							if(item.category_id == uni.getStorageSync('tabBarParams').split('=')[1]) {
+								this.select = index;
+								this.categoryId = 'category-' + index;
+								// 阻止切换分类之后滚动事件也立即执行
+							}
+						})
+					} else {
+						this.templateFourData.forEach((item,index) => {
+							if(item.category_id == uni.getStorageSync('tabBarParams').split('=')[1]) {
+								this.oneCategorySelect = index;
+								this.categoryId = 'category-' + index;
+								// 阻止切换分类之后滚动事件也立即执行
+								this.categoryTree = this.templateFourData[index].child_list || [];
+								this.select = 0;
+							}
+						})
+					}
+					uni.removeStorageSync('tabBarParams')
+				}
 			},
 			/**
 			 * 获取高度区间
 			 */
 			getHeightArea(index) {
 				let heightArea = [];
-				query
-					.selectAll('.content-wrap .child-category')
-					.boundingClientRect(data => {
-						if (data && data.length) {
-							data.forEach((item, index) => {
-								if (index == 0) heightArea.push([0, item.height]);
-								else heightArea.push([heightArea[index - 1][1], heightArea[index - 1][1] +
-									item.height
-								]);
-							});
-						}
-					})
-					.exec();
+				query.selectAll('.content-wrap .child-category').boundingClientRect(data => {
+					if (data && data.length) {
+						data.forEach((item, index) => {
+							if (index == 0) heightArea.push([0, item.height]);
+							else heightArea.push([heightArea[index - 1][1], heightArea[index - 1][1] + item.height]);
+						});
+					}
+				}).exec();
 				this.heightArea = heightArea;
 				if (index != -1 && index < this.categoryTree.length - 1) this.$refs.categoryItem[index + 1].getGoodsList();
+				this.refreshData();
 			},
 			/**
 			 * 获取全部分类
@@ -332,6 +349,7 @@
 								  return item;
 								});
 							}
+							this.dealCategoryData()
 						}
 					}
 				});
@@ -364,8 +382,7 @@
 							break;
 						}
 					}
-					if (this.value.template != 1 && this.value.loadType == 'all' && this.heightArea[this.select][1] -
-						scrollTop - contentWrapHeight < 300) {
+					if (this.value.template != 1 && this.value.loadType == 'all' && this.heightArea[this.select][1] - scrollTop - contentWrapHeight < 300) {
 						this.$refs.categoryItem[this.select].getGoodsList();
 					}
 				}
@@ -433,6 +450,37 @@
 				});
 			},
 			settlement() {
+				
+				// 是否有商品库存不足 不足最小购买数 超过最大购买数
+				var no_buy = false;
+				
+				for (let k in this.cartList) {
+					let item = this.cartList[k];
+					
+					for (let sku in item) {
+						if (item.max_buy && item.num > item.max_buy){
+							no_buy = true;
+							this.$util.showToast({title: '商品' + item.goods_name+'商品最多可购买'+item.max_buy+'件'})
+							break;
+						}
+						if (typeof item[sku] == 'object') {
+							if (item[sku].num > item[sku].stock){
+								no_buy = true;
+								this.$util.showToast({title: '商品' + item.goods_name+'库存不足'})
+								break;
+							}
+							if (item[sku].min_buy && item[sku].num < item[sku].min_buy){
+								no_buy = true;
+								this.$util.showToast({title: '商品' + item.goods_name+'商品最少要购买'+item[sku].min_buy+'件'})
+								break;
+							}
+							
+						}
+					}
+				}
+				
+				if(no_buy) return;
+				
 				if (!this.cartIds.length || this.isSub) return;
 				this.isSub = true;
 
@@ -520,7 +568,7 @@
 			},
 			// 操作多规格商品弹框后，刷新商品数据
 			refreshData() {
-				this.$refs.categoryItem[this.select].loadGoodsCartNum(true);
+				if(this.$refs.categoryItem) this.$refs.categoryItem[this.select].loadGoodsCartNum(true);
 			}
 		}
 	};
@@ -529,7 +577,8 @@
 <style lang="scss">
 	.category-page-wrap {
 		width: 100vw;
-		// height: calc(100vh - var(--tab-bar-height, 0));
+		height: 100vh;
+		box-sizing: border-box;
 		display: flex;
 		flex-direction: column;
 		background-color: #fff;
@@ -584,10 +633,16 @@
 		view {
 			color: #222222;
 			width: 100%;
-			white-space: nowrap;
-			text-overflow: ellipsis;
+			// white-space: nowrap;
+			// text-overflow: ellipsis;
+			line-height: 1.3;
 			overflow: hidden;
 			text-align: center;
+			// display: -webkit-box;
+			// -webkit-line-clamp: 2;
+			// -webkit-box-orient: vertical;
+			word-break: break-all;
+			max-height: 100rpx;
 		}
 
 		&.border-top {
@@ -667,6 +722,11 @@
 	.cart-box {
 		height: 100rpx;
 		width: 100%;
+		position: fixed;
+		left: 0;
+		bottom: var(--tab-bar-height, 0);
+		// bottom: calc( constant(safe-area-inset-bottom) + 110rpx );
+		// bottom: calc( env(safe-area-inset-bottom) + 110rpx );
 		background: #fff;
 		border-top: 1px solid #f5f5f5;
 		box-sizing: border-box;
@@ -739,6 +799,11 @@
 		}
 	}
 
+	.cart-box.active {
+		bottom: calc(constant(safe-area-inset-bottom) + 110rpx) !important;
+		bottom: calc(env(safe-area-inset-bottom) + 110rpx) !important;
+	}
+	
 	.cart-point {
 		width: 26rpx;
 		height: 26rpx;
@@ -785,7 +850,7 @@
 		}
 
 		.cart-box {
-			position: relative;
+			// position: relative;
 			z-index: 2;
 		}
 
@@ -865,15 +930,30 @@
 						}
 
 						.text {
-							padding: 2rpx 16rpx;
+							padding: 2rpx 0;
 							border-radius: 40rpx;
 							font-size: $font-size-tag;
+							box-sizing: border-box;
+							width: 100%;
+							box-sizing: border-box;
+							text-align: center;
+							overflow: hidden;
+							
+						}
+						.ellipsis {
+							// text-overflow: ellipsis;
+							display: -webkit-box;
+							-webkit-line-clamp: 1;
+							-webkit-box-orient: vertical;
 						}
 
 						&.selected {
 							.text {
 								background-color: $base-color;
 								color: var(--btn-text-color);
+								line-height: 1.3;
+								border: 4rpx solid transparent;
+								border-color: $base-color;
 							}
 						}
 					}
@@ -1004,4 +1084,7 @@
 			border-bottom-right-radius: 8rpx;
 		}
 	}
+	.cart-bottom-block {
+	    height: 100rpx;
+	}
 </style>
\ No newline at end of file
diff --git a/components/diy-components/diy-comp-extend.vue b/components/diy-components/diy-comp-extend.vue
index 50e0ac3..894a491 100644
--- a/components/diy-components/diy-comp-extend.vue
+++ b/components/diy-components/diy-comp-extend.vue
@@ -1,5 +1,7 @@
 <template>
-	<view data-component-name="diy-comp-extend"></view>
+	<view data-component-name="diy-comp-extend" :style="value.pageStyle">
+	   <view></view>
+	</view>
 </template>
 
 <script>
@@ -8,7 +10,10 @@ export default {
 	name: 'diy-comp-extend',
 	props: {
 		value: {
-			type: Object
+			type: Object,
+			default: () => {
+				return {};
+			}
 		}
 	},
 	data() {
diff --git a/components/diy-components/diy-coupon.vue b/components/diy-components/diy-coupon.vue
index 7958962..1b7d5c9 100644
--- a/components/diy-components/diy-coupon.vue
+++ b/components/diy-components/diy-coupon.vue
@@ -1,23 +1,91 @@
 <template>
-	<x-skeleton data-component-name="diy-coupon" type="banner" :loading="loading" :configs="skeletonConfig">
-		<view class="coupon-wrap" :class="'coupon-box-' + value.style" :style="[
-			value.couponType == 'img' && { backgroundImage: 'url(' + $util.img(value.couponBgUrl) + ')' },
-			value.couponType == 'color' && { backgroundColor: value.couponBgColor }
-		]">
+	<view :style="value.pageStyle" v-if="loading || (computedCouponList && computedCouponList.length)">
+		<x-skeleton type="banner" :loading="loading" :configs="skeletonConfig">
+			<view class="coupon-wrap" :class="'coupon-box-' + value.style" :style="[
+				value.couponType == 'img' && { backgroundImage: 'url(' + $util.img(value.couponBgUrl) + ')' },
+				value.couponType == 'color' && { backgroundColor: value.couponBgColor }
+			]">
 
-			<template v-if="value.style == '1'">
-				<swiper class="coupon-style-one" circular>
-					<swiper-item v-for="(numItem, numIndex) in Math.ceil(computedCouponList.length / 3)" :key="numIndex" class="coupon-item-box">
+				<template v-if="value.style == '1'">
+					<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"
-							v-if="index >= [numIndex * 3] && index < [(numIndex + 1) * 3]" :style="{
-							color: value.moneyColor,
-							backgroundImage: 'url(' + $util.img('public/uniapp/coupon/style1-bg.png') + ')',
-							marginRight: couponItemHeight + 'px',
-							marginLeft: couponItemHeight + 'px'
-						}" @click="couponAction(item, index)">
+							<view v-for="(item, index) in computedCouponList" class="coupon-item" v-if="index >= [numIndex * 3] && index < [(numIndex + 1) * 3]" :style="{
+								color: value.moneyColor,
+								backgroundImage: 'url(' + $util.img('public/uniapp/coupon/style1-bg.png') + ')',
+								marginRight: couponItemHeight + 'px',
+								marginLeft: couponItemHeight + 'px'
+							}" @click="couponAction(item, index)">
 
-							<view class="coupon-info">
+								<view class="coupon-info">
+									<view class="coupon-num" :style="{ color: value.moneyColor }" v-if="!parseInt(item.discount)">
+										<text class="font-size-tag coupon-sign">￥</text>
+										<text class="coupon-size">{{ item.money | moneyConduct }}</text>
+									</view>
+									<view class="coupon-num" :style="{ color: value.moneyColor }" v-else>
+										<text class="coupon-size">{{ item.discount | moneyConduct }}</text>
+										<text class="font-size-tag coupon-sign">折</text>
+									</view>
+									<view class="coupon-type font-size-tag" :style="{ color: value.limitColor }">
+										{{ item.at_least > 0 ? '满' + Number(item.at_least) + '元可用' : '无门槛优惠券' }}
+									</view>
+								</view>
+								
+								<view class="coupon-get" :style="couponBtnStyle" v-if="item.useState == 0" >{{ value.btnStyle.text }}</view>
+								<view class="coupon-get" :style="couponBtnStyle" v-if="item.useState == 1" >去使用</view>
+								<view class="coupon-get" :style="couponBtnStyle" v-if="item.useState == 2">已抢光</view>
+								<view class="coupon-get" :style="couponBtnStyle" v-if="item.useState == 3">已失效</view>
+								<view class="coupon-get" :style="couponBtnStyle" v-if="item.useState == 4">已使用</view>
+							</view>
+
+						</swiper-item>
+					</swiper>
+				</template>
+
+				<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="index"
+								v-if="index >= [numIndex * 3] && index < [(numIndex + 1) * 3]" :style="{
+								color: value.moneyColor,
+								backgroundImage: 'url(' + $util.img('public/uniapp/coupon/coupon_bg1.png') + ')',
+								marginRight: couponItemHeight + 'px',
+								marginLeft: couponItemHeight + 'px'
+							}" @click="couponAction(item, index)">
+								<view class="coupon-info">
+									<view class="coupon-num" :style="{ color: value.moneyColor }" v-if="!parseInt(item.discount)">
+										<text class="font-size-tag coupon-sign">￥</text>
+										<text class="coupon-size">{{ item.money | moneyConduct }}</text>
+									</view>
+									<view class="coupon-num" :style="{ color: value.moneyColor }" v-else>
+										<text class="coupon-size">{{ item.discount | moneyConduct }}</text>
+										<text class="font-size-tag coupon-sign">折</text>
+									</view>
+									<view class="coupon-type font-size-tag" :style="{ color: value.limitColor }">
+										{{ item.at_least > 0 ? '满' + Number(item.at_least) + '元可用' : '无门槛优惠券' }}
+									</view>
+								</view>
+								
+								<view class="coupon-get" :style="couponBtnStyle" v-if="item.useState == 0" >{{ value.btnStyle.text || '领取' }}</view>
+								<view class="coupon-get three-text" :style="couponBtnStyle" v-if="item.useState == 1" >去使用</view>
+								<view class="coupon-get three-text" :style="couponBtnStyle" v-if="item.useState == 2">已抢光</view>
+								<view class="coupon-get three-text" :style="couponBtnStyle" v-if="item.useState == 3">已失效</view>
+								<view class="coupon-get three-text" :style="couponBtnStyle" v-if="item.useState == 4">已使用</view>
+							</view>
+						</swiper-item>
+					</swiper>
+				</template>
+
+				<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="index"
+								v-if="index >= [numIndex * 3] && index < [(numIndex + 1) * 3]" :style="{
+								color: value.moneyColor,
+								backgroundImage: 'url(' + $util.img('public/uniapp/coupon/coupon_shu.png') + ')',
+								marginRight: couponItemHeight + 'px',
+								marginLeft: couponItemHeight + 'px'
+							}" @click="couponAction(item, index)">
 								<view class="coupon-num" :style="{ color: value.moneyColor }" v-if="!parseInt(item.discount)">
 									<text class="font-size-tag coupon-sign">￥</text>
 									<text class="coupon-size">{{ item.money | moneyConduct }}</text>
@@ -26,125 +94,188 @@
 									<text class="coupon-size">{{ item.discount | moneyConduct }}</text>
 									<text class="font-size-tag coupon-sign">折</text>
 								</view>
-								<view class="coupon-type font-size-tag" :style="{ color: value.limitColor }">
-									{{ item.at_least > 0 ? '满' + Number(item.at_least) + '元可用' : '无门槛优惠券' }}
+								<view class="coupon-type font-size-tag">
+									<text :style="{ color: value.limitColor }">{{ item.at_least > 0 ? '满' + Number(item.at_least) + '元可用' : '无门槛优惠券' }}</text>
+									<view class="item-text">{{item.goods_type_name}}</view>
 								</view>
+								
+								<view class="coupon-get" :style="couponBtnStyle" v-if="item.useState == 0" >{{ value.btnStyle.text || '领取' }}</view>
+								<view class="coupon-get" :style="couponBtnStyle" v-if="item.useState == 1" >去使用</view>
+								<view class="coupon-get" :style="couponBtnStyle" v-if="item.useState == 2">已抢光</view>
+								<view class="coupon-get" :style="couponBtnStyle" v-if="item.useState == 3">已失效</view>
+								<view class="coupon-get" :style="couponBtnStyle" v-if="item.useState == 4">已使用</view>
 							</view>
-							<view class="coupon-get" :style="couponBtnStyle" v-if="item.useState == 0">
-								{{ value.btnStyle.text }}
-							</view>
-							<view class="coupon-get" :style="couponBtnStyle" v-if="parseInt(item.useState)">去使用</view>
-						</view>
+						</swiper-item>
+					</swiper>
+				</template>
 
-					</swiper-item>
-				</swiper>
-			</template>
+				<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="index"
+								v-if="index >= [numIndex * 3] && index < [(numIndex + 1) * 3]" :style="{
+								color: value.moneyColor,
+								backgroundImage: 'url(' + $util.img('public/uniapp/coupon/style4_bg.png') + ')',
+								marginRight: couponItemHeight + 'px',
+								marginLeft: couponItemHeight + 'px'
+							}" @click="couponAction(item, index)">
+								<view class="coupon-info">
+									<view class="coupon-num" :style="{ color: value.moneyColor }" v-if="!parseInt(item.discount)">
+										<text class="font-size-tag coupon-sign">￥</text>
+										<text class="coupon-size">{{ item.money | moneyConduct }}</text>
+									</view>
+									<view class="coupon-num" :style="{ color: value.moneyColor }" v-else>
+										<text class="coupon-size">{{ item.discount | moneyConduct }}</text>
+										<text class="font-size-tag coupon-sign">折</text>
+									</view>
+									<view class="coupon-type font-size-tag" :style="{ color: value.limitColor }">
+										{{ item.at_least > 0 ? '满' + Number(item.at_least) + '元可用' : '无门槛优惠券' }}
+									</view>
+								</view>
+								
+								<view class="coupon-get" :style="couponBtnStyle" v-if="item.useState == 0" >{{ value.btnStyle.text || '立即领取' }}</view>
+								<view class="coupon-get" :style="couponBtnStyle" v-if="item.useState == 1" >去使用</view>
+								<view class="coupon-get" :style="couponBtnStyle" v-if="item.useState == 2">已抢光</view>
+								<view class="coupon-get" :style="couponBtnStyle" v-if="item.useState == 3">已失效</view>
+								<view class="coupon-get" :style="couponBtnStyle" v-if="item.useState == 4">已使用</view>
+							</view>
+						</swiper-item>
+					</swiper>
+				</template>
 
-			<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="index"
-							v-if="index >= [numIndex * 3] && index < [(numIndex + 1) * 3]" :style="{
-							color: value.moneyColor,
-							backgroundImage: 'url(' + $util.img('public/uniapp/coupon/coupon_bg1.png') + ')',
-							marginRight: couponItemHeight + 'px',
-							marginLeft: couponItemHeight + 'px'
-						}" @click="couponAction(item, index)">
-							<view class="coupon-info">
-								<view class="coupon-num" :style="{ color: value.moneyColor }" v-if="!parseInt(item.discount)">
-									<text class="font-size-tag coupon-sign">￥</text>
-									<text class="coupon-size">{{ item.money | moneyConduct }}</text>
+				<template v-if="value.style == '5'">
+					<view class="coupon-style-five">
+						<view class="coupon-all">
+							<view class="coupon-box">
+								<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">
+											<view class="coupon-num" v-if="item.discount == '0.00'" :style="{ color: value.moneyColor }">
+												<text class="coupon-size">{{ item.money | moneyConduct }}</text>
+												<text class="font-size-tag coupon-sign">元</text>
+											</view>
+											<view class="coupon-num" v-else :style="{ color: value.moneyColor }">
+												<text class="coupon-size">{{ item.discount | moneyConduct }}</text>
+												<text class="font-size-tag coupon-sign">折</text>
+											</view>
+										</view>
+										<view class="coupon-line"></view>
+										<view class="coupon-content">
+											<view class="coupon-type">
+												<view class="coupon-name" :style="{ color: value.nameColor }">{{ item.coupon_name }}</view>
+												<text class="coupon-least" :style="{ color: value.limitColor }" v-if="item.at_least > 0">满{{ Number(item.at_least) }}元可用</text>
+												<text class="coupon-least" :style="{ color: value.limitColor }" v-else>无门槛优惠券</text>
+											</view>
+											
+											<view class="coupon-get" :style="couponBtnStyle" v-if="item.useState == 0" >{{ value.btnStyle.text || '立即领取' }}</view>
+											<view class="coupon-get" :style="couponBtnStyle" v-if="item.useState == 1" >去使用</view>
+											<view class="coupon-get" :style="couponBtnStyle" v-if="item.useState == 2">已抢光</view>
+											<view class="coupon-get" :style="couponBtnStyle" v-if="item.useState == 3">已失效</view>
+											<view class="coupon-get" :style="couponBtnStyle" v-if="item.useState == 4">已使用</view>
+										</view>
+									</view>
 								</view>
-								<view class="coupon-num" :style="{ color: value.moneyColor }" v-else>
-									<text class="coupon-size">{{ item.discount | moneyConduct }}</text>
-									<text class="font-size-tag coupon-sign">折</text>
-								</view>
-								<view class="coupon-type font-size-tag" :style="{ color: value.limitColor }">
-									{{ item.at_least > 0 ? '满' + Number(item.at_least) + '元可用' : '无门槛优惠券' }}
-								</view>
-							</view>
-							<view class="coupon-get" :style="couponBtnStyle" v-if="item.useState == 0">
-								{{ value.btnStyle.text || '领取' }}
-							</view>
-							<view class="coupon-get use" :style="couponBtnStyle" v-if="parseInt(item.useState)">去使用
 							</view>
 						</view>
-					</swiper-item>
-				</swiper>
-			</template>
+					</view>
+				</template>
 
-			<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="index"
-							v-if="index >= [numIndex * 3] && index < [(numIndex + 1) * 3]" :style="{
-							color: value.moneyColor,
-							backgroundImage: 'url(' + $util.img('public/uniapp/coupon/coupon_shu.png') + ')',
-							marginRight: couponItemHeight + 'px',
-							marginLeft: couponItemHeight + 'px'
-						}" @click="couponAction(item, index)">
-							<view class="coupon-num" :style="{ color: value.moneyColor }" v-if="!parseInt(item.discount)">
-								<text class="font-size-tag coupon-sign">￥</text>
-								<text class="coupon-size">{{ item.money | moneyConduct }}</text>
-							</view>
-							<view class="coupon-num" :style="{ color: value.moneyColor }" v-else>
-								<text class="coupon-size">{{ item.discount | moneyConduct }}</text>
-								<text class="font-size-tag coupon-sign">折</text>
-							</view>
-							<view class="coupon-type font-size-tag">
-								<text :style="{ color: value.limitColor }">{{ item.at_least > 0 ? '满' + Number(item.at_least) + '元可用' : '无门槛优惠券' }}</text>
-								<view class="item-text" v-if="item.goods_type == 1">所有商品可用</view>
-								<view class="item-text" v-else-if="item.goods_type == 2">指定商品可用</view>
-								<view class="item-text" v-else-if="item.goods_type == 3">指定商品不可用</view>
-							</view>
-
-							<view class="coupon-get" :style="couponBtnStyle" v-if="item.useState == 0">
-								{{ value.btnStyle.text || '领取' }}
-							</view>
-							<view class="coupon-get" :style="couponBtnStyle" v-if="parseInt(item.useState)">去使用</view>
-						</view>
-					</swiper-item>
-				</swiper>
-			</template>
-
-			<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="index"
-							v-if="index >= [numIndex * 3] && index < [(numIndex + 1) * 3]" :style="{
-							color: value.moneyColor,
-							backgroundImage: 'url(' + $util.img('public/uniapp/coupon/style4_bg.png') + ')',
-							marginRight: couponItemHeight + 'px',
-							marginLeft: couponItemHeight + 'px'
-						}" @click="couponAction(item, index)">
-							<view class="coupon-info">
-								<view class="coupon-num" :style="{ color: value.moneyColor }" v-if="!parseInt(item.discount)">
-									<text class="font-size-tag coupon-sign">￥</text>
-									<text class="coupon-size">{{ item.money | moneyConduct }}</text>
-								</view>
-								<view class="coupon-num" :style="{ color: value.moneyColor }" v-else>
-									<text class="coupon-size">{{ item.discount | moneyConduct }}</text>
-									<text class="font-size-tag coupon-sign">折</text>
-								</view>
-								<view class="coupon-type font-size-tag" :style="{ color: value.limitColor }">
-									{{ item.at_least > 0 ? '满' + Number(item.at_least) + '元可用' : '无门槛优惠券' }}
+				<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="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') + ')',
+								marginRight: couponItemHeight + 'px',
+								marginLeft: couponItemHeight + 'px'
+							}" @click="couponAction(item, index)">
+								<view class="coupon-content">
+									<view class="price-wrap">
+										<text class="price" :style="{ color: value.moneyColor }">{{ (item.discount == '0.00' ? item.money : item.discount) | moneyConduct }}</text>
+										<text class="unit">{{ item.discount == '0.00' ? '元' : '折' }}</text>
+									</view>
+									<text class="text">优惠券</text>
 								</view>
+								<!-- <text class="btn" v-if="item.useState == 0" :style="{
+									color: value.btnStyle.textColor,
+									backgroundColor: value.btnStyle.bgColor,
+									borderTopLeftRadius: value.btnStyle.aroundRadius * 2 + 'rpx',
+									borderBottomLeftRadius: value.btnStyle.aroundRadius * 2 + 'rpx'
+								}">
+									<text class="btn-content">{{ value.btnStyle.text }}</text>
+								</text>
+								<text class="btn" v-if="parseInt(item.useState)" :style="{
+									color: value.btnStyle.textColor,
+									backgroundColor: value.btnStyle.bgColor,
+									borderTopLeftRadius: value.btnStyle.aroundRadius * 2 + 'rpx',
+									borderBottomLeftRadius: value.btnStyle.aroundRadius * 2 + 'rpx'
+								}">
+									<text class="btn-content">去使用</text>
+								</text> -->
+								
+								<text class="btn" v-if="item.useState == 0" :style="{
+									color: value.btnStyle.textColor,
+									backgroundColor: value.btnStyle.bgColor,
+									borderTopLeftRadius: value.btnStyle.aroundRadius * 2 + 'rpx',
+									borderBottomLeftRadius: value.btnStyle.aroundRadius * 2 + 'rpx'
+								}">
+									<text class="btn-content">{{ value.btnStyle.text }}</text>
+								</text>
+								<text class="btn to-use" v-if="item.useState == 1" :style="{
+									color: value.btnStyle.textColor,
+									backgroundColor: value.btnStyle.bgColor,
+									borderTopLeftRadius: value.btnStyle.aroundRadius * 2 + 'rpx',
+									borderBottomLeftRadius: value.btnStyle.aroundRadius * 2 + 'rpx'
+								}">
+									<text class="btn-content">去使用</text>
+								</text>
+								<text class="btn disabled" v-if="item.useState == 2" :style="{
+									borderTopLeftRadius: value.btnStyle.aroundRadius * 2 + 'rpx',
+									borderBottomLeftRadius: value.btnStyle.aroundRadius * 2 + 'rpx'
+								}">
+									<text class="btn-content">已抢光</text>
+								</text>
+								<text class="btn disabled" v-if="item.useState == 3" :style="{
+									borderTopLeftRadius: value.btnStyle.aroundRadius * 2 + 'rpx',
+									borderBottomLeftRadius: value.btnStyle.aroundRadius * 2 + 'rpx'
+								}">
+									<text class="btn-content">已失效</text>
+								</text>
+								<text class="btn disabled" v-if="item.useState == 4" :style="{
+									borderTopLeftRadius: value.btnStyle.aroundRadius * 2 + 'rpx',
+									borderBottomLeftRadius: value.btnStyle.aroundRadius * 2 + 'rpx'
+								}">
+									<text class="btn-content">已使用</text>
+								</text>
+								
+								<text class="limit" :style="{ color: value.limitColor }" v-if="parseFloat(item.at_least) > 0">满{{ item.at_least | moneyConduct }}元使用</text>
+								<text class="limit" :style="{ color: value.limitColor }" v-else>无门槛使用</text>
 							</view>
-							<view class="coupon-get" :style="couponBtnStyle" v-if="item.useState == 0">
-								{{ value.btnStyle.text || '立即使用' }}
-							</view>
-							<view class="coupon-get" :style="couponBtnStyle" v-if="parseInt(item.useState)">去使用</view>
-						</view>
-					</swiper-item>
-				</swiper>
-			</template>
 
-			<template v-if="value.style == '5'">
-				<view class="coupon-style-five">
-					<view class="coupon-all">
-						<view class="coupon-box">
+							<div v-if="computedCouponList.length <= 2" @click="$util.redirectTo('/pages/goods/category')"
+								class="coupon coupon-null" :style="{
+								color: value.moneyColor,
+								backgroundImage: 'url(' + $util.img('public/uniapp/coupon/style6-bg-2.png') + ')',
+								marginRight: couponItemHeight + 'px',
+								marginLeft: couponItemHeight + 'px'
+							}">
+								<div class="coupon-content" :style="{ color: value.moneyColor }">
+									<span class="price">+</span>
+									<span class="text">暂无优惠券</span>
+								</div>
+								<span class="limit" :style="{ color: value.limitColor }">去逛逛</span>
+							</div>
+						</swiper-item>
+					</swiper>
+				</template>
+
+				<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="index" @click="couponAction(item, index)">
-								<image :src="$util.img('public/uniapp/coupon/style5_bg.png')"></image>
+								<image :src="$util.img('public/uniapp/coupon/style7_bg.png')"></image>
 								<view class="coupon">
 									<view class="coupon-info">
 										<view class="coupon-num" v-if="item.discount == '0.00'" :style="{ color: value.moneyColor }">
@@ -156,115 +287,32 @@
 											<text class="font-size-tag coupon-sign">折</text>
 										</view>
 									</view>
+									<view class="coupon-type">
+										<text class="coupon-name" :style="{ color: value.limitColor }" v-if="item.at_least > 0">满{{ Number(item.at_least) }}元可用</text>
+										<text class="coupon-name" :style="{ color: value.limitColor }" v-else>无门槛优惠券</text>
+										<view class="coupon-least" v-if="item.validity_type == 0" :style="{ color: value.limitColor }">有效期至{{ $util.timeStampTurnTime(item.end_time, 'Y-m-d') }}</view>
+										<view class="coupon-least" v-else-if="item.validity_type == 1" :style="{ color: value.limitColor }">领取后{{ item.fixed_term }}天有效</view>
+										<view class="coupon-least" v-else :style="{ color: value.limitColor }">领取后长期有效</view>
+									</view>
 									<view class="coupon-line"></view>
-									<view class="coupon-content">
-										<view class="coupon-type">
-											<view class="coupon-name" :style="{ color: value.nameColor }">{{ item.coupon_name }}</view>
-											<text class="coupon-least" :style="{ color: value.limitColor }" v-if="item.at_least > 0">满{{ Number(item.at_least) }}元可用</text>
-											<text class="coupon-least" :style="{ color: value.limitColor }" v-else>无门槛优惠券</text>
-										</view>
-										<view class="coupon-get" :style="couponBtnStyle" v-if="item.useState == 0">{{ value.btnStyle.text || '立即领取' }}</view>
-										<view class="coupon-get" :style="couponBtnStyle" v-if="parseInt(item.useState)">去使用</view>
-									</view>
+									
+									<view class="coupon-get" :style="couponBtnStyle" v-if="item.useState == 0" >{{ value.btnStyle.text || '立即领取' }}</view>
+									<view class="coupon-get three-text" :style="couponBtnStyle" v-if="item.useState == 1" >去使用</view>
+									<view class="coupon-get three-text" :style="couponBtnStyle" v-if="item.useState == 2">已抢光</view>
+									<view class="coupon-get three-text" :style="couponBtnStyle" v-if="item.useState == 3">已失效</view>
+									<view class="coupon-get three-text" :style="couponBtnStyle" v-if="item.useState == 4">已使用</view>
 								</view>
 							</view>
 						</view>
-					</view>
-				</view>
-			</template>
+					</scroll-view>
+				</template>
 
-			<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="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') + ')',
-							marginRight: couponItemHeight + 'px',
-							marginLeft: couponItemHeight + 'px'
-						}" @click="couponAction(item, index)">
-							<view class="coupon-content">
-								<view class="price-wrap">
-									<text class="price" :style="{ color: value.moneyColor }">{{ (item.discount == '0.00' ? item.money : item.discount) | moneyConduct }}</text>
-									<text class="unit">{{ item.discount == '0.00' ? '元' : '折' }}</text>
-								</view>
-								<text class="text">优惠券</text>
-							</view>
-							<text class="btn" v-if="item.useState == 0" :style="{
-								color: value.btnStyle.textColor,
-								backgroundColor: value.btnStyle.bgColor,
-								borderTopLeftRadius: value.btnStyle.aroundRadius * 2 + 'rpx',
-								borderBottomLeftRadius: value.btnStyle.aroundRadius * 2 + 'rpx'
-							}">
-								<text class="btn-content">{{ value.btnStyle.text }}</text>
-							</text>
-							<text class="btn" v-if="parseInt(item.useState)" :style="{
-								color: value.btnStyle.textColor,
-								backgroundColor: value.btnStyle.bgColor,
-								borderTopLeftRadius: value.btnStyle.aroundRadius * 2 + 'rpx',
-								borderBottomLeftRadius: value.btnStyle.aroundRadius * 2 + 'rpx'
-							}">
-								<text class="btn-content">去使用</text>
-							</text>
-							<text class="limit" :style="{ color: value.limitColor }" v-if="parseFloat(item.at_least) > 0">满{{ item.at_least | moneyConduct }}元使用</text>
-							<text class="limit" :style="{ color: value.limitColor }" v-else>无门槛使用</text>
-						</view>
+				<ns-login ref="login"></ns-login>
 
-						<div v-if="computedCouponList.length <= 2" @click="$util.redirectTo('/pages/goods/category')"
-							class="coupon coupon-null" :style="{
-							color: value.moneyColor,
-							backgroundImage: 'url(' + $util.img('public/uniapp/coupon/style6-bg-2.png') + ')',
-							marginRight: couponItemHeight + 'px',
-							marginLeft: couponItemHeight + 'px'
-						}">
-							<div class="coupon-content" :style="{ color: value.moneyColor }">
-								<span class="price">+</span>
-								<span class="text">暂无优惠券</span>
-							</div>
-							<span class="limit" :style="{ color: value.limitColor }">去逛逛</span>
-						</div>
-					</swiper-item>
-				</swiper>
-			</template>
+			</view>
 
-			<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="index" @click="couponAction(item, index)">
-							<image :src="$util.img('public/uniapp/coupon/style7_bg.png')"></image>
-							<view class="coupon">
-								<view class="coupon-info">
-									<view class="coupon-num" v-if="item.discount == '0.00'" :style="{ color: value.moneyColor }">
-										<text class="coupon-size">{{ item.money | moneyConduct }}</text>
-										<text class="font-size-tag coupon-sign">元</text>
-									</view>
-									<view class="coupon-num" v-else :style="{ color: value.moneyColor }">
-										<text class="coupon-size">{{ item.discount | moneyConduct }}</text>
-										<text class="font-size-tag coupon-sign">折</text>
-									</view>
-								</view>
-								<view class="coupon-type">
-									<text class="coupon-name" :style="{ color: value.limitColor }" v-if="item.at_least > 0">满{{ Number(item.at_least) }}元可用</text>
-									<text class="coupon-name" :style="{ color: value.limitColor }" v-else>无门槛优惠券</text>
-									<view class="coupon-least" :style="{ color: value.limitColor }">有效期至{{ $util.timeStampTurnTime(item.end_time, 'yearmonthday') }}</view>
-								</view>
-								<view class="coupon-line"></view>
-								<view class="coupon-get" :style="couponBtnStyle" v-if="item.useState == 0">
-									{{ value.btnStyle.text || '立即领取' }}
-								</view>
-								<view class="coupon-get" :style="couponBtnStyle" v-if="parseInt(item.useState)">去使用
-								</view>
-							</view>
-						</view>
-					</view>
-				</scroll-view>
-			</template>
-
-			<ns-login ref="login"></ns-login>
-
-		</view>
-
-	</x-skeleton>
+		</x-skeleton>
+	</view>
 </template>
 
 <script>
@@ -313,17 +361,11 @@
 			couponItemHeight() {
 				var width = '';
 				const screenWidth = uni.getSystemInfoSync().windowWidth;
-				if (this.value.style == '1') width = [screenWidth - this.rpxUpPx(210) * 3 - this.rpxUpPx(this.value.margin
-					.both * 2) * 2] / 6;
-				else if (this.value.style == '2') width = [screenWidth - this.rpxUpPx(210) * 3 - this.rpxUpPx(this.value
-					.margin.both * 2) * 2] / 6;
-				else if (this.value.style == '3') width = [screenWidth - this.rpxUpPx(24) * 2 - this.rpxUpPx(194) * 3 -
-					this.rpxUpPx(this.value.margin.both * 2) * 2
-				] / 6;
-				else if (this.value.style == '4') width = [screenWidth - this.rpxUpPx(206) * 3 - this.rpxUpPx(this.value
-					.margin.both * 2) * 2] / 6;
-				else if (this.value.style == '6') width = [screenWidth - this.rpxUpPx(208) * 3 - this.rpxUpPx(this.value
-					.margin.both * 2) * 2] / 6;
+				if (this.value.style == '1') width = [screenWidth - this.rpxUpPx(210) * 3 - this.rpxUpPx(this.value.margin.both * 2) * 2] / 6;
+				else if (this.value.style == '2') width = [screenWidth - this.rpxUpPx(210) * 3 - this.rpxUpPx(this.value.margin.both * 2) * 2] / 6;
+				else if (this.value.style == '3') width = [screenWidth - this.rpxUpPx(24) * 2 - this.rpxUpPx(194) * 3 - this.rpxUpPx(this.value.margin.both * 2) * 2] / 6;
+				else if (this.value.style == '4') width = [screenWidth - this.rpxUpPx(206) * 3 - this.rpxUpPx(this.value.margin.both * 2) * 2] / 6;
+				else if (this.value.style == '6') width = [screenWidth - this.rpxUpPx(208) * 3 - this.rpxUpPx(this.value.margin.both * 2) * 2] / 6;
 
 				return width;
 			},
@@ -357,12 +399,18 @@
 						if (data != null) {
 							this.couponList = data;
 							this.couponList.forEach(v => {
-								if (v.max_fetch != 0 && v.member_coupon_num && v.member_coupon_num >= v
-									.max_fetch) {
-									v.useState = 1;
-								} else {
-									v.useState = 0;
-								}
+								// if (v.count == v.lead_count) v.useState = 2;
+								// else if (v.max_fetch != 0 && v.member_coupon_num && v.member_coupon_num >= v.max_fetch) v.useState = 1;
+								// else v.useState = 0;
+								// if(v.received_type && v.received_type == 'expire'){
+								// 	v.useState = 2;
+								// }
+								
+								if (v.count == v.lead_count) v.useState = 2;
+								else if (v.max_fetch == 0 || (v.max_fetch != 0 && !v.member_coupon_num) || (v.max_fetch != 0 && v.member_coupon_num && v.max_fetch > v.member_coupon_num)) v.useState = 0;
+								else if (v.wait_coupon_num) v.useState = 1
+								else if (v.lose_coupon_num) v.useState = 3;
+								else if (v.use_coupon_num) v.useState = 4;
 							});
 						}
 						this.loading = false;
@@ -372,18 +420,34 @@
 			couponAction(item, index) {
 				if (item.useState == 0) {
 					this.receiveCoupon(item, index);
-				} else if (parseInt(item.useState)) {
+				} else {
 					this.couponTap(item, index);
 				}
+
+				
+				// if(item.received_type == 'out'){
+				// 	this.$util.showToast({
+				// 		title: '该优惠券已抢光'
+				// 	});
+				// }else if(item.received_type == 'expire'){
+				// 	this.$util.showToast({
+				// 		title: '该优惠券已过期'
+				// 	});
+				// }else if(item.received_type == 'limit'){
+				// 	this.$util.showToast({
+				// 		title: '该优惠券领取已达上限'
+				// 	});
+				// }
 			},
 			couponTap(item, index) {
-				if (item.count == item.lead_count) {
+				if(item.useState == 2){
 					this.$util.showToast({
 						title: '该优惠券已抢光'
 					});
 					return;
 				}
 				if (item.useState == 0) this.receiveCoupon(item, index);
+				else if (item.useState == 3 || item.useState == 4) this.$util.redirectTo('/pages_tool/member/coupon',{state: item.useState == 4 ? 2 : item.useState})
 				else this.toGoodsList(item);
 			},
 			// 领取优惠券
@@ -527,17 +591,21 @@
 
 				.coupon-get {
 					position: relative;
-					top: 2rpx;
+					top: 0;
 					right: 12rpx;
 					font-size: 24rpx;
 					letter-spacing: 16rpx;
 					width: 26rpx;
-
+					
 					&.use {
 						top: 0;
 						right: 4rpx;
 						letter-spacing: 4rpx;
 					}
+					
+					&.three-text {
+						line-height: 1.2;
+					}
 				}
 
 				.coupon-info {
@@ -873,6 +941,12 @@
 					line-height: 1;
 					transform: scale(0.8);
 				}
+				
+				&.disabled {
+					background-color: #eee;
+					color: #909399;
+				}
+				
 			}
 
 			.coupon-content {
@@ -1045,6 +1119,11 @@
 					font-size: $font-size-tag;
 					box-sizing: border-box;
 					flex-shrink: 0;
+					
+					&.three-text {
+						writing-mode: vertical-rl;
+					}
+					
 				}
 			}
 		}
diff --git a/components/diy-components/diy-digit.vue b/components/diy-components/diy-digit.vue
new file mode 100644
index 0000000..d2d9f6d
--- /dev/null
+++ b/components/diy-components/diy-digit.vue
@@ -0,0 +1,276 @@
+<template>
+	<view :style="componentStyle">
+		<scroll-view 
+			:class="['graphic-nav', value.showStyle == 'fixed' ? 'fixed-layout' : value.showStyle]" 
+			:scroll-x="value.showStyle == 'singleSlide'"
+		>
+			<view class="uni-scroll-view-content">
+				<view 
+					v-for="(item, index) in value.list" 
+					:key="index"
+					:class="['graphic-nav-item', value.mode, value.mode === 'text' ? 'newright' : '']"
+					:style="{ width: (100 / value.rowCount + '%') + ';' }"
+				>
+					<view style="display:flex;">
+						<view :style="{
+							'line-height': '1.2;',
+							'font-size': (value.font.titlesize * 2 + 'rpx') + ';',
+							'font-weight': '600;',
+							'color': value.font.titlecolor + ';'
+						}">
+							<uv-count-to 
+								:ref="`countTo-${index}`"
+								:autoplay="true" 
+								:startVal="30" 
+								:endVal="item.title" 
+								:decimals="getvalue(item.title)"
+								decimal="."
+							></uv-count-to>
+							<text :style="{
+								'margin-left': '4rpx;',
+								'font-size': (value.font.unitsize * 2 + 'rpx') + ';',
+								'font-weight': value.font.weight + ';',
+								'color': value.font.unitcolor + ';'
+							}">{{ item.unit }}</text>
+						</view>
+					</view>
+					<view class="graphic-text">
+						<text :style="{
+							'font-size': (value.font.descsize * 2 + 'rpx') + ';',
+							'font-weight': value.font.weight + ';',
+							'color': value.font.desccolor + ';'
+						}">{{ item.desc }}</text>
+					</view>
+				</view>
+			</view>
+		</scroll-view>
+		<ns-login ref="login"></ns-login>
+	</view>
+</template>
+
+<script>
+import uvCountTo from '@/components/uv-count-to/uv-count-to.vue'
+import nsLogin from '@/components/ns-login/ns-login.vue'
+
+export default {
+	name: 'diy-digit',
+	components: {
+		uvCountTo,
+		nsLogin
+	},
+	props: {
+		value: {
+			type: Object,
+			default: () => ({})
+		}
+	},
+	data() {
+		return {
+			pageWidth: '',
+			indicatorDots: false,
+			swiperCurrent: 0
+		}
+	},
+	created() {
+		// 组件创建时的逻辑
+	},
+	watch: {
+		componentRefresh(newValue) {
+			// 监听组件刷新
+		}
+	},
+	computed: {
+		componentStyle() {
+			let style = '';
+			style += 'background-image:url(' + this.$util.img(this.value.imageUrl) + ');background-size:100% 100%;';
+			
+			if (this.value.componentAngle == 'round') {
+				style += 'border-top-left-radius:' + (2 * this.value.topAroundRadius) + 'rpx;';
+				style += 'border-top-right-radius:' + (2 * this.value.topAroundRadius) + 'rpx;';
+				style += 'border-bottom-left-radius:' + (2 * this.value.bottomAroundRadius) + 'rpx;';
+				style += 'border-bottom-right-radius:' + (2 * this.value.bottomAroundRadius) + 'rpx;';
+			}
+			
+			style += 'box-shadow:' + (this.value.ornament.type == 'shadow' ? '0 0 10rpx ' + this.value.ornament.color : '') + ';';
+			style += 'border:' + (this.value.ornament.type == 'stroke' ? '2rpx solid ' + this.value.ornament.color : '') + ';';
+			
+			return style;
+		}
+	},
+	methods: {
+		// 获取小数位数
+		getvalue(value) {
+			return value % 1 !== 0 ? 2 : 0;
+		},
+		
+		// 页面跳转
+		redirectTo(item) {
+			if (!item.wap_url || this.$util.getCurrRoute() != 'pages/member/index' || this.storeToken) {
+				console.log(item);
+				this.$util.diyRedirectTo(item);
+			} else {
+				this.$refs.login.open(item.wap_url);
+			}
+		},
+		
+		// 轮播切换
+		swiperChange(event) {
+			this.swiperCurrent = event.detail.current;
+		}
+	}
+}
+</script>
+
+<style lang="scss" scoped>
+.graphic-nav {
+	padding: 16rpx;
+	box-sizing: border-box;
+	
+	&.fixed-layout {
+		.uni-scroll-view-content {
+			display: flex;
+			flex-wrap: wrap;
+		}
+	}
+	
+	&.singleSlide {
+		.uni-scroll-view-content {
+			display: flex;
+		}
+		
+		.graphic-nav-item {
+			flex-shrink: 0;
+		}
+	}
+	
+	&.pageSlide {
+		position: relative;
+		
+		.uni-swiper-dots-horizontal {
+			bottom: 0rpx;
+		}
+		
+		&.straightLine {
+			.uni-swiper-dot {
+				width: 30rpx;
+				border-radius: 0;
+				height: 8rpx;
+			}
+		}
+		
+		&.circle {
+			.uni-swiper-dot {
+				width: 14rpx;
+				height: 14rpx;
+			}
+		}
+	}
+	
+	.graphic-nav-wrap {
+		display: flex;
+		flex-wrap: wrap;
+		width: 100%;
+		height: 100%;
+	}
+	
+	.graphic-nav-item {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		padding: 14rpx 0;
+		box-sizing: border-box;
+		
+		.graphic-text {
+			line-height: 1.3;
+			white-space: nowrap;
+			text-overflow: ellipsis;
+			overflow: hidden;
+			width: 100%;
+			text-align: center;
+			
+			&.alone {
+				padding-top: 0;
+			}
+		}
+		
+		&.text {
+			.graphic-text {
+				padding-top: 0;
+			}
+		}
+		
+		.graphic-img {
+			position: relative;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			width: 100rpx;
+			height: 100rpx;
+			font-size: 90rpx;
+			
+			.tag {
+				position: absolute;
+				top: -10rpx;
+				right: -24rpx;
+				color: #fff;
+				border-radius: 24rpx;
+				border-bottom-left-radius: 0;
+				-webkit-transform: scale(0.8);
+				transform: scale(0.8);
+				padding: 8rpx 16rpx;
+				line-height: 1;
+				font-size: 24rpx;
+			}
+			
+			.icon {
+				font-size: 50rpx;
+				color: #606266;
+			}
+		}
+	}
+	
+	&.pageSlide {
+		.graphic-nav-item {
+			flex-shrink: 0;
+		}
+	}
+}
+
+.newright {
+	margin-right: 16rpx;
+}
+
+.swiper-dot-box {
+	width: 100%;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	margin-top: -20rpx;
+	padding-bottom: 8rpx;
+	
+	.swiper-dot {
+		background-color: rgba(0, 0, 0, 0.3);
+		margin: 8rpx;
+		
+		&.active {
+			background-color: #000;
+		}
+	}
+	
+	&.straightLine {
+		.swiper-dot {
+			width: 30rpx;
+			border-radius: 0;
+			height: 8rpx;
+		}
+	}
+	
+	&.circle {
+		.swiper-dot {
+			width: 15rpx;
+			border-radius: 50%;
+			height: 15rpx;
+		}
+	}
+}
+</style>
\ No newline at end of file
diff --git a/components/diy-components/diy-fenxiao-goods-list.vue b/components/diy-components/diy-fenxiao-goods-list.vue
index 1bfcb67..744adef 100644
--- a/components/diy-components/diy-fenxiao-goods-list.vue
+++ b/components/diy-components/diy-fenxiao-goods-list.vue
@@ -1,48 +1,48 @@
 <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="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>
-			<view class="info-wrap" v-if="value.goodsNameStyle.control || value.priceStyle.mainControl || value.priceStyle.lineControl || value.btnStyle.control">
-				<view class="name-wrap">
-					<view v-if="value.goodsNameStyle.control" class="goods-name"
-						:style="{ color: value.theme == 'diy' ? value.goodsNameStyle.color : '', fontWeight: value.goodsNameStyle.fontWeight ? 'bold' : '' }"
-						:class="[{ 'using-hidden': value.nameLineMode == 'single' }, { 'multi-hidden': value.nameLineMode == 'multiple' }]"
-					>
-						{{ item.goods_name }}
-					</view>
+	<view :style="value.pageStyle" v-if="list && list.length">
+		<view 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="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>
-				<view class="pro-info">
-					<view class="discount-price">
-						<view class="price-wrap" v-if="value.priceStyle.mainControl">
-							<text class="unit price-style small" :style="{ color: value.theme == 'diy' ? value.priceStyle.mainColor : '' }">赚 ￥</text>
-							<text class="price price-style large" :style="{ color: value.theme == 'diy' ? value.priceStyle.mainColor : '' }">{{ item.commission_money.split('.')[0] }}</text>
-							<text class="unit price-style small" :style="{ color: value.theme == 'diy' ? value.priceStyle.mainColor : '' }">{{ '.' + item.commission_money.split('.')[1] }}</text>
-						</view>
-						<view class="sale-btn" v-if="value.btnStyle.control && item.is_collect == 0"
-							:style="{
-								background: value.btnStyle.theme == 'diy' ? 'linear-gradient(to right,' + value.btnStyle.bgColorStart + ',' + value.btnStyle.bgColorEnd + ')' : '',
-								color: value.btnStyle.theme == 'diy' ? value.btnStyle.textColor : '',
-								borderRadius: value.btnStyle.aroundRadius * 2 + 'rpx'
-							}"
-							@click.stop="followGoods(item, index)"
+				<view class="info-wrap" v-if="value.goodsNameStyle.control || value.priceStyle.mainControl || value.priceStyle.lineControl || value.btnStyle.control">
+					<view class="name-wrap">
+						<view v-if="value.goodsNameStyle.control" class="goods-name"
+							:style="{ color: value.theme == 'diy' ? value.goodsNameStyle.color : '', fontWeight: value.goodsNameStyle.fontWeight ? 'bold' : '' }"
+							:class="[{ 'using-hidden': value.nameLineMode == 'single' }, { 'multi-hidden': value.nameLineMode == 'multiple' }]"
 						>
-							关注
-						</view>
-						<view class="sale-btn" v-if="value.btnStyle.control && item.is_collect == 1"
-							:style="{
-								background: value.btnStyle.theme == 'diy' ? 'linear-gradient(to right,' + value.btnStyle.bgColorStart + ',' + value.btnStyle.bgColorEnd + ')' : '',
-								color: value.btnStyle.theme == 'diy' ? value.btnStyle.textColor : '',
-								borderRadius: value.btnStyle.aroundRadius * 2 + 'rpx'
-							}"
-							@click.stop="delFollowTip(item, index)"
-						>
-							取消关注
+							{{ item.goods_name }}
 						</view>
 					</view>
-					<view class="delete-price" v-if="value.priceStyle.lineControl" :style="{ color: value.theme == 'diy' ? value.priceStyle.lineColor : '' }">
-						￥{{ item.discount_price }}
+					<view class="pro-info">
+						<view class="discount-price">
+							<view class="price-wrap" v-if="value.priceStyle.mainControl">
+								<text class="unit price-style small" :style="{ color: value.theme == 'diy' ? value.priceStyle.mainColor : '' }">赚 ￥</text>
+								<text class="price price-style large" :style="{ color: value.theme == 'diy' ? value.priceStyle.mainColor : '' }">{{ item.commission_money.split('.')[0] }}</text>
+								<text class="unit price-style small" :style="{ color: value.theme == 'diy' ? value.priceStyle.mainColor : '' }">{{ '.' + item.commission_money.split('.')[1] }}</text>
+							</view>
+							<view class="sale-btn" v-if="value.btnStyle.control && item.is_collect == 0"
+								:style="{
+									background: value.btnStyle.theme == 'diy' ? 'linear-gradient(to right,' + value.btnStyle.bgColorStart + ',' + value.btnStyle.bgColorEnd + ')' : '',
+									color: value.btnStyle.theme == 'diy' ? value.btnStyle.textColor : '',
+									borderRadius: value.btnStyle.aroundRadius * 2 + 'rpx'
+								}"
+								@click.stop="followGoods(item, index)">
+								关注
+							</view>
+							<view class="sale-btn" v-if="value.btnStyle.control && item.is_collect == 1"
+								:style="{
+									background: value.btnStyle.theme == 'diy' ? 'linear-gradient(to right,' + value.btnStyle.bgColorStart + ',' + value.btnStyle.bgColorEnd + ')' : '',
+									color: value.btnStyle.theme == 'diy' ? value.btnStyle.textColor : '',
+									borderRadius: value.btnStyle.aroundRadius * 2 + 'rpx'
+								}"
+								@click.stop="delFollowTip(item, index)">
+								取消关注
+							</view>
+						</view>
+						<view class="delete-price" v-if="value.priceStyle.lineControl" :style="{ color: value.theme == 'diy' ? value.priceStyle.lineColor : '' }">
+							￥{{ item.discount_price }}
+						</view>
 					</view>
 				</view>
 			</view>
@@ -55,7 +55,10 @@ export default {
 	name: 'diy-fenxiao-goods-list',
 	props: {
 		value: {
-			type: Object
+			type: Object,
+			default: () => {
+				return {};
+			}
 		}
 	},
 	data() {
diff --git a/components/diy-components/diy-float-btn.vue b/components/diy-components/diy-float-btn.vue
index 47f6b10..8c85a6f 100644
--- a/components/diy-components/diy-float-btn.vue
+++ b/components/diy-components/diy-float-btn.vue
@@ -1,12 +1,13 @@
 <template>
-	<view data-component-name="diy-float-btn" class="float-btn" :class="{ left_top: value.bottomPosition == 1, right_top: value.bottomPosition == 2, left_bottom: value.bottomPosition == 3, right_bottom: value.bottomPosition == 4 }" :style="style">
-		<block v-for="(item, index) in value.list" :key="index">
-			<view class="button-box" @click="$util.diyRedirectTo(item.link)" :style="{ width: value.imageSize + 'px', height: value.imageSize + 'px', fontSize: value.imageSize + 'px' }">
-				<image v-if="!item.iconType || item.iconType == 'img'" :src="$util.img(item.imageUrl)" mode="aspectFit" :show-menu-by-longpress="true"/>
-				<diy-icon v-else-if="item.iconType && item.iconType == 'icon'" :icon="item.icon"
-					:value="item.style ? item.style : null"></diy-icon>
-			</view>
-		</block>
+	<view :style="value.pageStyle">
+		<view class="float-btn" :class="{ left_top: value.bottomPosition == 1, right_top: value.bottomPosition == 2, left_bottom: value.bottomPosition == 3, right_bottom: value.bottomPosition == 4 }" :style="style">
+			<block v-for="(item, index) in value.list" :key="index">
+				<view class="button-box" @click="$util.diyRedirectTo(item.link)" :style="{ width: value.imageSize + 'px', height: value.imageSize + 'px', fontSize: value.imageSize + 'px' }">
+					<image v-if="!item.iconType || item.iconType == 'img'" :src="$util.img(item.imageUrl)" mode="aspectFit" :show-menu-by-longpress="true"/>
+					<diy-icon v-else-if="item.iconType && item.iconType == 'icon'" :icon="item.icon" :value="item.style ? item.style : null"></diy-icon>
+				</view>
+			</block>
+		</view>
 	</view>
 </template>
 
diff --git a/components/diy-components/diy-follow-official-account.vue b/components/diy-components/diy-follow-official-account.vue
index 6aa4514..706830f 100644
--- a/components/diy-components/diy-follow-official-account.vue
+++ b/components/diy-components/diy-follow-official-account.vue
@@ -1,7 +1,9 @@
 <template>
 	<!-- #ifdef MP -->
-	<view data-component-name="diy-follow-official-account" v-if="value.isShow">
-		<official-account></official-account>
+	<view :style="value.pageStyle">
+		<view v-if="value.isShow">
+			<official-account></official-account>
+		</view>
 	</view>
 	<!--#endif -->
 </template>
@@ -12,7 +14,10 @@
 		name: 'diy-follow-official-account',
 		props: {
 			value: {
-				type: Object
+				type: Object,
+				default: () => {
+					return {};
+				}
 			}
 		},
 		data() {
diff --git a/components/diy-components/diy-goods-brand.vue b/components/diy-components/diy-goods-brand.vue
index ba55960..c91f8e5 100644
--- a/components/diy-components/diy-goods-brand.vue
+++ b/components/diy-components/diy-goods-brand.vue
@@ -1,17 +1,18 @@
 <template>
-	<x-skeleton data-component-name="diy-goods-brand" type="waterfall" :loading="loading" :configs="skeletonConfig">
-		<view :class="['brand-wrap', value.ornament.type]" :style="warpCss">
-			<view :class="[value.style]">
-				<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="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 :style="value.pageStyle" v-if="loading || (list && list.length)">
+		<x-skeleton type="waterfall" :loading="loading" :configs="skeletonConfig">
+			<view :class="['brand-wrap', value.ornament.type]" :style="warpCss">
+				<view :class="[value.style]">
+					<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="index">
+							<image class="brand-pic" :src="$util.img(item.image_url)" mode="aspectFit" @click="toDetail(item)" @error="imgError(index)" :style="itemCss"/>
+						</view>
 					</view>
 				</view>
 			</view>
-		</view>
-	</x-skeleton>
+		</x-skeleton>
+	</view>
 </template>
 
 <script>
@@ -25,7 +26,10 @@
 		name: 'diy-goods-brand',
 		props: {
 			value: {
-				type: Object
+				type: Object,
+				default: () => {
+					return {};
+				}
 			}
 		},
 		components: {
diff --git a/components/diy-components/diy-graphic-nav.vue b/components/diy-components/diy-graphic-nav.vue
index b0aa5b2..2975a8b 100644
--- a/components/diy-components/diy-graphic-nav.vue
+++ b/components/diy-components/diy-graphic-nav.vue
@@ -3,7 +3,7 @@
         <block v-if="value.showStyle == 'pageSlide'">
             <swiper :class="['graphic-nav', 'pageSlide', value.carousel.type]" circular :indicator-dots="false" :style="swiperHeight" @change="swiperChange">
                 <swiper-item class="graphic-nav-wrap"
-                    v-for="(numItem, numIndex) in Math.ceil(value.list.length / (value.pageCount * value.rowCount))">
+                    v-for="(numItem, numIndex) in Math.ceil(value.list.length / (value.pageCount * value.rowCount))" :key="numIndex">
                     <!-- #ifdef MP -->
                     <view class="graphic-nav-item" :class="[value.mode]" v-for="(item, index) in value.list"
                         :key="index"
diff --git a/components/diy-components/diy-image-nav.vue b/components/diy-components/diy-image-nav.vue
new file mode 100644
index 0000000..6ed0ba5
--- /dev/null
+++ b/components/diy-components/diy-image-nav.vue
@@ -0,0 +1,290 @@
+<template>
+	<view :style="componentStyle">
+		<scroll-view 
+			:class="['image-nav', value.showStyle == 'fixed' ? 'fixed-layout' : value.showStyle]" 
+			:scroll-x="value.showStyle == 'singleSlide'"
+		>
+			<view class="uni-scroll-view-content">
+				<view 
+					v-for="(item, index) in value.list" 
+					:key="index"
+					:class="['image-nav-item', value.mode]"
+					style="margin-right: 28rpx;"
+				>
+					<!-- 图片部分 -->
+					<view v-if="value.mode != 'text'" class="image-img" :style="{
+						'font-size': (value.imageSize * 2 + 'rpx') + ';',
+						'width': (item.imgWidth / 2 + 'rpx') + ';',
+						'height': (item.imgHeight / 2 + 'rpx') + ';'
+					}">
+						<image 
+							v-if="item.link.wap_url"
+							:style="{
+								'width': (item.imgWidth / 2 + 'rpx') + ';',
+								'height': (item.imgHeight / 2 + 'rpx') + ';'
+							}"
+							:src="$util.img(item.imageUrl) || $util.img('public/uniapp/default_img/goods.png')"
+							:show-menu-by-longpress="true"
+							@tap="redirectTo(item.link)"
+						></image>
+						<image 
+							v-else
+							:style="{
+								'width': (item.imgWidth / 2 + 'rpx') + ';',
+								'height': (item.imgHeight / 2 + 'rpx') + ';'
+							}"
+							:src="$util.img(item.imageUrl) || $util.img('public/uniapp/default_img/goods.png')"
+							:show-menu-by-longpress="true"
+							@tap="previewImg(item.imageUrl)"
+						></image>
+					</view>
+					
+					<!-- 文字部分 -->
+					<text class="image-text" :style="{
+						'width': (item.imgWidth / 2 + 'rpx') + ';',
+						'font-size': (value.font.size * 2 + 'rpx') + ';',
+						'font-weight': value.font.weight + ';',
+						'color': value.font.color + ';'
+					}">{{ item.title }}</text>
+				</view>
+			</view>
+		</scroll-view>
+		<ns-login ref="login"></ns-login>
+	</view>
+</template>
+
+<script>
+import nsLogin from '@/components/ns-login/ns-login.vue'
+
+export default {
+	name: 'diy-image-nav',
+	components: {
+		nsLogin
+	},
+	props: {
+		value: {
+			type: Object,
+			default: () => ({})
+		}
+	},
+	data() {
+		return {
+			pageWidth: '',
+			indicatorDots: false,
+			swiperCurrent: 0
+		}
+	},
+	created() {
+		// 组件创建时的逻辑
+	},
+	watch: {
+		componentRefresh(newValue) {
+			// 监听组件刷新
+		}
+	},
+	computed: {
+		componentStyle() {
+			let style = '';
+			style += 'background-color:' + this.value.componentBgColor + ';';
+			
+			if (this.value.componentAngle == 'round') {
+				style += 'border-top-left-radius:' + (2 * this.value.topAroundRadius) + 'rpx;';
+				style += 'border-top-right-radius:' + (2 * this.value.topAroundRadius) + 'rpx;';
+				style += 'border-bottom-left-radius:' + (2 * this.value.bottomAroundRadius) + 'rpx;';
+				style += 'border-bottom-right-radius:' + (2 * this.value.bottomAroundRadius) + 'rpx;';
+			}
+			
+			style += 'box-shadow:' + (this.value.ornament.type == 'shadow' ? '0 0 10rpx ' + this.value.ornament.color : '') + ';';
+			style += 'border:' + (this.value.ornament.type == 'stroke' ? '2rpx solid ' + this.value.ornament.color : '') + ';';
+			
+			return style;
+		},
+		
+		swiperHeight() {
+			let height = 0;
+			
+			if (this.value.mode == 'graphic') {
+				height = (49 + this.value.imageSize) * this.value.pageCount;
+			} else if (this.value.mode == 'img') {
+				height = (22 + this.value.imageSize) * this.value.pageCount;
+			} else if (this.value.mode == 'text') {
+				height = 43 * this.value.pageCount;
+			}
+			
+			return 'height:' + (2 * height) + 'rpx';
+		},
+		
+		isIndicatorDots() {
+			return this.value.carousel.type != 'hide' && 
+				   1 != Math.ceil(this.value.list.length / (this.value.pageCount * this.value.rowCount));
+		}
+	},
+	methods: {
+		// 预览图片
+		previewImg(imageUrl) {
+			uni.previewImage({
+				current: 0,
+				urls: [this.$util.img(imageUrl)],
+				success: (res) => {},
+				fail: (res) => {},
+				complete: (res) => {}
+			});
+		},
+		
+		// 页面跳转
+		redirectTo(link) {
+			if (!link.wap_url || this.$util.getCurrRoute() != 'pages/member/index' || this.storeToken) {
+				this.$util.diyRedirectTo(link);
+			} else {
+				this.$refs.login.open(link.wap_url);
+			}
+		},
+		
+		// 轮播切换
+		swiperChange(event) {
+			this.swiperCurrent = event.detail.current;
+		}
+	}
+}
+</script>
+
+<style lang="scss" scoped>
+.image-nav {
+	padding: 16rpx;
+	box-sizing: border-box;
+	
+	&.fixed-layout {
+		.uni-scroll-view-content {
+			display: flex;
+			flex-wrap: wrap;
+		}
+	}
+	
+	&.singleSlide {
+		.uni-scroll-view-content {
+			display: flex;
+		}
+		
+		.image-nav-item {
+			flex-shrink: 0;
+		}
+	}
+	
+	&.pageSlide {
+		position: relative;
+		
+		.uni-swiper-dots-horizontal {
+			bottom: 0rpx;
+		}
+		
+		&.straightLine {
+			.uni-swiper-dot {
+				width: 30rpx;
+				border-radius: 0;
+				height: 8rpx;
+			}
+		}
+		
+		&.circle {
+			.uni-swiper-dot {
+				width: 14rpx;
+				height: 14rpx;
+			}
+		}
+	}
+	
+	.image-nav-wrap {
+		display: flex;
+		flex-wrap: wrap;
+		width: 100%;
+		height: 100%;
+	}
+	
+	.image-nav-item {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		padding: 14rpx 0;
+		box-sizing: border-box;
+		
+		.image-text {
+			padding-top: 12rpx;
+			line-height: 1.5;
+			text-overflow: ellipsis;
+			overflow: hidden;
+			text-align: center;
+			
+			&.alone {
+				padding-top: 0;
+			}
+		}
+		
+		&.text {
+			.image-text {
+				padding-top: 0;
+			}
+		}
+		
+		.image-img {
+			position: relative;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			font-size: 90rpx;
+			
+			.tag {
+				position: absolute;
+				top: -10rpx;
+				right: -24rpx;
+				color: #fff;
+				border-radius: 24rpx;
+				border-bottom-left-radius: 0;
+				-webkit-transform: scale(0.8);
+				transform: scale(0.8);
+				padding: 8rpx 16rpx;
+				line-height: 1;
+				font-size: 24rpx;
+			}
+			
+			.icon {
+				font-size: 50rpx;
+				color: #606266;
+			}
+		}
+	}
+}
+
+.swiper-dot-box {
+	width: 100%;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	margin-top: -20rpx;
+	padding-bottom: 8rpx;
+	
+	.swiper-dot {
+		background-color: rgba(0, 0, 0, 0.3);
+		margin: 8rpx;
+		
+		&.active {
+			background-color: #000;
+		}
+	}
+	
+	&.straightLine {
+		.swiper-dot {
+			width: 30rpx;
+			border-radius: 0;
+			height: 8rpx;
+		}
+	}
+	
+	&.circle {
+		.swiper-dot {
+			width: 15rpx;
+			border-radius: 50%;
+			height: 15rpx;
+		}
+	}
+}
+</style>
\ No newline at end of file
diff --git a/components/diy-components/diy-index-page.vue b/components/diy-components/diy-index-page.vue
index 2ff0d8a..86abbaf 100644
--- a/components/diy-components/diy-index-page.vue
+++ b/components/diy-components/diy-index-page.vue
@@ -268,7 +268,7 @@
 					.exec();
 			});
 
-			this.setModuleLocatinoFn();
+			this.setModuleLocationFn();
 		},
 		methods: {
 			initPageIndex() {
@@ -415,7 +415,7 @@
 				this.isUnfold = !this.isUnfold;
 			},
 			// 向vuex中的diyIndexPositionObj增加分类导航组件定位位置
-			setModuleLocatinoFn() {
+			setModuleLocationFn() {
 				const query = uni.createSelectorQuery().in(this);
 				query.select('.nav-top-category')
 					.boundingClientRect(data => {
diff --git a/components/diy-components/diy-kefu.vue b/components/diy-components/diy-kefu.vue
index feb47c3..33c37e7 100644
--- a/components/diy-components/diy-kefu.vue
+++ b/components/diy-components/diy-kefu.vue
@@ -1,6 +1,6 @@
 <template>
 	<view data-component-name="diy-kefu" class="diy-kefu" :style="style">
-		<view class="fui-list-group merchgroup" v-for="(item,index) in value.list">
+		<view class="fui-list-group merchgroup" v-for="(item,index) in value.list" :key="index">
 			<view class="fui-list jump" v-if="index == 0">
 				<view class="fui-list-media">
 					<image class="round" :src="$util.img(item.imageUrl)" style="border-radius:6rpx"></image>
diff --git a/components/diy-components/diy-listmenu.vue b/components/diy-components/diy-listmenu.vue
index a74962e..e1930ad 100644
--- a/components/diy-components/diy-listmenu.vue
+++ b/components/diy-components/diy-listmenu.vue
@@ -3,7 +3,7 @@
 		<view  class="fui-cell-group">
 		   <!--     <image mode="widthFix" style="width: 100%;" :src="$util.img(item.imageUrl)"></image> -->
 
-		       <view v-for="(item,index) in value.list" @click="redirectTo(item.link)" class="fui-cell" :class="item.iconType == 'img'?'img-cell':''">
+		       <view v-for="(item,index) in value.list" @click="redirectTo(item.link)" class="fui-cell" :class="item.iconType == 'img'?'img-cell':''" :key="index">
 		           <view class="fui-cell-icon" style="color:diyitem.style.iconcolo">
 					   <diy-icon v-if="item.iconType == 'icon'" :icon="item.icon"
 					       :value="item.style ? item.style : null"
diff --git a/components/diy-components/diy-map.vue b/components/diy-components/diy-map.vue
index af93cbc..98d299e 100644
--- a/components/diy-components/diy-map.vue
+++ b/components/diy-components/diy-map.vue
@@ -1,6 +1,6 @@
 <template>
 	<view data-component-name="diy-map" class="diy-map" :style="style">
-		<view class="fui-list-group merchgroup" style="margin-top:0" v-for="(item,index) in value.list">
+		<view class="fui-list-group merchgroup" style="margin-top:0" v-for="(item,index) in value.list" :key="index">
 			<map
 				id="map"
 				style="width: 100%; height:600rpx"
diff --git a/components/diy-components/diy-picture.vue b/components/diy-components/diy-picture.vue
index 20a80bc..e9823eb 100644
--- a/components/diy-components/diy-picture.vue
+++ b/components/diy-components/diy-picture.vue
@@ -1,7 +1,7 @@
 <template>
 	<view data-component-name="diy-picture" class="diy-picture" :style="style">
 		<view class="fui-picture">
-		    <view  v-for="(item,index) in value.list" style="line-height: 0;">
+		    <view  v-for="(item,index) in value.list" style="line-height: 0;" :key="index">
 		        <image mode="widthFix" style="width: 100%;height:auto" :src="$util.img(item.imageUrl)" v-if="item.link.wap_url" @click="handlerClick(item)" @tap="handlerClick(item)"></image>
 				<image mode="widthFix" style="width: 100%;height:auto" :src="$util.img(item.imageUrl)" v-else @click="handlerClick(item)" @tap="handlerClick(item)"></image>
 		    </view>
diff --git a/components/diy-components/diy-pinfan.vue b/components/diy-components/diy-pinfan.vue
index 19a0d3e..9154dc1 100644
--- a/components/diy-components/diy-pinfan.vue
+++ b/components/diy-components/diy-pinfan.vue
@@ -173,7 +173,7 @@
 				if (this.value.ornament.type == 'stroke') {
 					obj += 'border:' + '2rpx solid ' + this.value.ornament.color + ';';
 				}
-				const screenWidth = uni.getSystemInfoSync().windowWidth;
+				const screenWidth = uni.getWindowInfo().windowWidth;
 				if (this.value.template == 'horizontal-slide') {
 					var width = "";
 					if (this.value.slideMode == 'scroll' && this.value.goodsMarginType == 'diy')
@@ -217,7 +217,7 @@
 				}
 			},
 			rpxUpPx(res) {
-				const screenWidth = uni.getSystemInfoSync().windowWidth;
+				const screenWidth = uni.getWindowInfo().windowWidth;
 				var data = screenWidth * parseInt(res) / 750;
 				return Math.floor(data);
 			},
diff --git a/components/diy-components/diy-search.vue b/components/diy-components/diy-search.vue
index 60b0033..24790c5 100644
--- a/components/diy-components/diy-search.vue
+++ b/components/diy-components/diy-search.vue
@@ -1,4 +1,5 @@
 <template>
+	<view :style="value.pageStyle">
 	<view data-component-name="diy-search" class="diy-search">
 		<view class="diy-search-wrap" :class="value.positionWay" :style="fixedCss">
 			<view :class="['search-box','search-box-'+value.searchStyle]" :style="searchWrapCss" @click="handlerSearchClick" @tap="handlerSearchClick">
@@ -33,11 +34,19 @@
 		<view v-if="value.positionWay == 'fixed'" class="u-navbar-placeholder" :style="{ width: '100%', paddingTop: moduleHeight }"></view>
 		<ns-login ref="login"></ns-login>
 	</view>
+	</view>
 </template>
 
 <script>
 	// 获取系统状态栏的高度
-	let systemInfo = uni.getSystemInfoSync();
+	let systemInfo = {};
+	try {
+		// 合并设备信息和窗口信息
+		systemInfo = {...uni.getDeviceInfo(), ...uni.getWindowInfo()};
+	} catch (e) {
+		// 兼容旧版本
+		systemInfo = uni.getSystemInfoSync();
+	}
 	let menuButtonInfo = {};
 	// 如果是小程序，获取右上角胶囊的尺寸信息，避免导航栏右侧内容与胶囊重叠(支付宝小程序非本API，尚未兼容)
 	// #ifdef MP-WEIXIN || MP-BAIDU || MP-TOUTIAO || MP-QQ
@@ -125,7 +134,7 @@
 			},
 			fixedTop() {
 				let diyPositionObj = this.$store.state.diyGroupPositionObj;
-				let data = 0
+				let data = 0;
 				if (diyPositionObj.diySearch && diyPositionObj.diyIndexPage && diyPositionObj.nsNavbar) {
 					if (diyPositionObj.diySearch.moduleIndex > diyPositionObj.diyIndexPage.moduleIndex) {
 						data = diyPositionObj.nsNavbar.originalVal + diyPositionObj.diyIndexPage.originalVal;
@@ -175,7 +184,7 @@
 		},
 		mounted() {
 			if (this.value.positionWay == 'fixed')
-				this.setModuleLocatinoFn();
+				this.setModuleLocationFn();
 		},
 		methods: {
 			search() {
@@ -204,7 +213,7 @@
 				});
 			},
 			// 向vuex中的diyIndexPositionObj增加搜索组件定位位置
-			setModuleLocatinoFn() {
+			setModuleLocationFn() {
 				this.$nextTick(() => {
 					const query = uni.createSelectorQuery().in(this);
 					query.select('.diy-search-wrap')
diff --git a/components/diy-components/diy-seckill.vue b/components/diy-components/diy-seckill.vue
index 22da80c..81ec081 100644
--- a/components/diy-components/diy-seckill.vue
+++ b/components/diy-components/diy-seckill.vue
@@ -258,7 +258,7 @@
 				if (this.value.ornament.type == 'stroke') {
 					obj += 'border:' + '2rpx solid ' + this.value.ornament.color + ';';
 				}
-				const screenWidth = uni.getSystemInfoSync().windowWidth;
+				const screenWidth = uni.getWindowInfo().windowWidth;
 				if (this.value.template == 'horizontal-slide') {
 					var width = '';
 					if (this.value.slideMode == 'scroll' && this.value.goodsMarginType == 'diy') width = this.rpxUpPx(this.value.goodsMarginNum * 2);
@@ -312,7 +312,7 @@
 				}
 			},
 			rpxUpPx(res) {
-				const screenWidth = uni.getSystemInfoSync().screenWidth;
+				const screenWidth = uni.getWindowInfo().screenWidth;
 				var data = (screenWidth * parseInt(res)) / 750;
 				return Math.floor(data);
 			},
diff --git a/components/diy-components/diy-store-label.vue b/components/diy-components/diy-store-label.vue
index cf02824..3b628a3 100644
--- a/components/diy-components/diy-store-label.vue
+++ b/components/diy-components/diy-store-label.vue
@@ -1,9 +1,10 @@
 <template>
+	<view :style="value.pageStyle">
 	<x-skeleton data-component-name="diy-store-label" type="banner" :loading="loading" :configs="skeletonConfig">
 		<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" :class="['item']">
+					<view v-for="(item, index) in storeLabel" :class="['item']" :key="index">
 						<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>
@@ -11,7 +12,7 @@
 			</block>
 			<block v-else>
 				<scroll-view scroll-x="true" :class="[value.contentStyle, { between: list.length == 3 }]" :style="storeLabelWrapCss" :enable-flex="true">
-					<view v-for="(item, index) in list" :class="['item']">
+					<view v-for="(item, index) in list" :class="['item']" :key="item.label_id || index">
 						<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.label_name }}</text>
 					</view>
@@ -19,6 +20,7 @@
 			</block>
 		</view>
 	</x-skeleton>
+	</view>
 </template>
 <script>
 	// 门店标签
@@ -26,7 +28,10 @@
 		name: 'diy-store-label',
 		props: {
 			value: {
-				type: Object
+				type: Object,
+				default: () => {
+					return {};
+				}
 			}
 		},
 		data() {
diff --git a/components/diy-components/diy-store.vue b/components/diy-components/diy-store.vue
index 0339c59..43bc271 100644
--- a/components/diy-components/diy-store.vue
+++ b/components/diy-components/diy-store.vue
@@ -1,4 +1,5 @@
 <template>
+	<view :style="value.pageStyle">
 	<view data-component-name="diy-store" class="store-wrap">
 		<block v-if="value.style == 1">
 			<view class="store-box store-one">
@@ -65,6 +66,7 @@
 			</view>
 		</block>
 	</view>
+	</view>
 </template>
 
 <script>
@@ -74,7 +76,10 @@ export default {
 	name: 'diy-store',
 	props: {
 		value: {
-			type: Object
+			type: Object,
+			default: () => {
+				return {};
+			}
 		}
 	},
 	data() {
diff --git a/components/diy-components/diy-text.vue b/components/diy-components/diy-text.vue
index ae4dd26..dfb70c9 100644
--- a/components/diy-components/diy-text.vue
+++ b/components/diy-components/diy-text.vue
@@ -1,4 +1,5 @@
 <template>
+	<view :style="value.pageStyle">
 	<view data-component-name="diy-text" class="diy-text" @click="handlerClick(value.link)" @tap="handlerClick(value.link)" :style="warpCss">
 		<view :class="value.style == 'style-8' ? 'title2' : 'title'" :style="{ fontSize: value.fontSize * 2 + 'rpx', color: value.textColor }">
 			<block v-if="value.style == 'style-0'" style="height: 40rpx; line-height: 40rpx;">
@@ -254,6 +255,7 @@
 			</view>
 		</view>
 	</view>
+	</view>
 </template>
 
 <script>
@@ -263,7 +265,10 @@ export default {
 	name: 'diy-text',
 	props: {
 		value: {
-			type: Object
+			type: Object,
+			default: () => {
+				return {};
+			}
 		}
 	},
 	data() {
diff --git a/components/diy-components/diy-video-list.vue b/components/diy-components/diy-video-list.vue
new file mode 100644
index 0000000..b87d041
--- /dev/null
+++ b/components/diy-components/diy-video-list.vue
@@ -0,0 +1,704 @@
+<template>
+	<view :style="componentStyle">
+		<!-- 固定布局模式 -->
+		<view v-if="value.showStyle == 'fixed'" :class="['goods-list', 'row1-of' + value.rowCount]" style="padding:20rpx;">
+			<view 
+				v-for="(item, index) in value.list" 
+				:key="index"
+				class="goods-item"
+				@tap="showVideo(item)"
+			>
+				<view class="goods-img-wrap">
+					<image 
+						class="goods-img" 
+						style="border-radius:10rpx 10rpx 0 0;" 
+						:src="$util.img(item.imageUrl)" 
+						mode="widthFix"
+						@error="imgError(index)"
+					></image>
+					<view style="position:absolute;top:10rpx;right:10rpx;">
+						<image style="width:30rpx;" :src="$util.img('addon/personnel/shop/view/enterprise/play.png')" mode="widthFix"></image>
+					</view>
+				</view>
+				<view class="info-wrap">
+					<view 
+						class="goods-name" 
+						:style="{
+							'font-size': (value.font.size * 2 + 'rpx') + ';',
+							'font-weight': value.font.weight + ';',
+							'color': value.font.color + ';'
+						}"
+					>{{ item.title }}</view>
+				</view>
+			</view>
+		</view>
+		
+		<!-- 其他布局模式 -->
+		<scroll-view 
+			v-else
+			:class="['video-nav', value.showStyle == 'fixed' ? 'fixed-layout' : value.showStyle]" 
+			:scroll-x="value.showStyle == 'singleSlide'"
+		>
+			<view class="uni-scroll-view-content">
+				<view 
+					v-for="(item, index) in value.list" 
+					:key="index"
+					:class="['video-nav-item', value.mode]"
+					:style="{ width: (100 / value.rowCount + '%') + ';' }"
+					@tap="showVideo(item)"
+				>
+					<view class="video-img">
+						<image 
+							v-if="item.iconType == 'img'"
+							:style="{
+								'max-width': '200rpx;',
+								'max-height': '200rpx;',
+								'border-radius': '8rpx;'
+							}"
+							:src="$util.img(item.imageUrl) || $util.img('public/uniapp/default_img/goods.png')"
+							mode="widthFix"
+							:show-menu-by-longpress="true"
+						></image>
+						<view style="position:absolute;top:10rpx;right:10rpx;">
+							<image style="width:30rpx;" :src="$util.img('addon/personnel/shop/view/enterprise/play.png')" mode="widthFix"></image>
+						</view>
+					</view>
+					<view 
+						class="video-text" 
+						:style="{
+							'margin-left': '16rpx;',
+							'font-size': (value.font.size * 2 + 'rpx') + ';',
+							'font-weight': value.font.weight + ';',
+							'color': value.font.color + ';'
+						}"
+					>{{ item.title }}</view>
+				</view>
+			</view>
+		</scroll-view>
+		
+		<!-- 视频播放弹窗 -->
+		<uni-popup 
+			ref="videoPopup" 
+			type="center"
+			style="background:transparent;width:100%;height:100%;"
+		>
+			<view class="video-container" style="position:fixed;top:30%;width:100%;left:0;">
+				<video 
+					class="adaptive-video"
+					:autoPauseIfNavigate="true"
+					:autoPauseIfOpenNative="true"
+					:autoplay="false"
+					:enableAutoRotation="true"
+					id="myVideo"
+					:src="video_url"
+					:controls="true"
+				></video>
+			</view>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+import uniPopup from '@/components/uni-popup/uni-popup.vue'
+
+export default {
+	name: 'diy-video-list',
+	components: {
+		uniPopup
+	},
+	props: {
+		value: {
+			type: Object,
+			default: () => ({})
+		}
+	},
+	data() {
+		return {
+			pageWidth: '',
+			indicatorDots: false,
+			swiperCurrent: 0,
+			video_url: ''
+		}
+	},
+	created() {
+		// 组件创建时的逻辑
+	},
+	watch: {
+		componentRefresh(newValue) {
+			// 监听组件刷新
+		}
+	},
+	computed: {
+		componentStyle() {
+			let style = '';
+			style += 'background-color:' + this.value.componentBgColor + ';';
+			
+			if (this.value.componentAngle == 'round') {
+				style += 'border-top-left-radius:' + (2 * this.value.topAroundRadius) + 'rpx;';
+				style += 'border-top-right-radius:' + (2 * this.value.topAroundRadius) + 'rpx;';
+				style += 'border-bottom-left-radius:' + (2 * this.value.bottomAroundRadius) + 'rpx;';
+				style += 'border-bottom-right-radius:' + (2 * this.value.bottomAroundRadius) + 'rpx;';
+			}
+			
+			style += 'box-shadow:' + (this.value.ornament.type == 'shadow' ? '0 0 10rpx ' + this.value.ornament.color : '') + ';';
+			style += 'border:' + (this.value.ornament.type == 'stroke' ? '2rpx solid ' + this.value.ornament.color : '') + ';';
+			
+			console.log(this.value);
+			
+			return style;
+		},
+		
+		swiperHeight() {
+			let height = 0;
+			
+			if (this.value.mode == 'graphic') {
+				height = (49 + this.value.imageSize) * this.value.pageCount;
+			} else if (this.value.mode == 'img') {
+				height = (22 + this.value.imageSize) * this.value.pageCount;
+			} else if (this.value.mode == 'text') {
+				height = 43 * this.value.pageCount;
+			}
+			
+			return 'height:' + (2 * height) + 'rpx';
+		},
+		
+		isIndicatorDots() {
+			return this.value.carousel.type != 'hide' && 
+				   1 != Math.ceil(this.value.list.length / (this.value.pageCount * this.value.rowCount));
+		}
+	},
+	methods: {
+		// 显示视频播放弹窗
+		showVideo(item) {
+			this.video_url = item.videoUrl;
+			this.$refs.videoPopup.open();
+		},
+		
+		// 图片加载错误处理
+		imgError(index) {
+			// 图片加载失败的处理逻辑
+			console.log('图片加载失败:', index);
+		}
+	}
+}
+</script>
+
+<style lang="scss" scoped>
+.goods-name {
+	white-space: nowrap;
+	text-overflow: ellipsis;
+	overflow: hidden;
+}
+
+.goods-list {
+	&.row1-of3 {
+		display: flex;
+		flex-wrap: wrap;
+		
+		.goods-item {
+			position: relative;
+			display: flex;
+			flex-direction: column;
+			margin-top: 20rpx;
+			width: calc(33.3333333% - 14rpx);
+			box-sizing: border-box;
+			
+			&:nth-child(3n + 3) {
+				width: calc(33.33% - 15rpx);
+			}
+			
+			&:nth-of-type(1), &:nth-of-type(2), &:nth-of-type(3) {
+				margin-top: 0;
+			}
+			
+			&:nth-child(3n) {
+				width: calc(33.3333333% - 15rpx);
+			}
+			
+			&:nth-child(3n-1) {
+				margin-left: 20rpx;
+				margin-right: 20rpx;
+			}
+			
+			&.shadow {
+				width: calc(33.3333333% - 18rpx);
+				
+				&:nth-of-type(1), &:nth-of-type(2), &:nth-of-type(3) {
+					margin-top: 8rpx;
+				}
+				
+				&:nth-child(1n) {
+					margin-left: 8rpx;
+				}
+				
+				&:nth-child(3n-1) {
+					margin-left: 20rpx;
+					margin-right: 20rpx;
+				}
+				
+				&:nth-child(3n) {
+					margin-right: 0;
+					margin-left: 0;
+				}
+			}
+			
+			.goods-img-wrap {
+				position: relative;
+				overflow: hidden;
+				height: 220rpx;
+			}
+			
+			.goods-img {
+				width: 100%;
+			}
+			
+			.info-wrap {
+				display: flex;
+				flex-direction: column;
+				flex: 1;
+				
+				.pro-info {
+					margin-top: auto;
+					display: flex;
+					flex-direction: column;
+					justify-content: space-between;
+					
+					.discount-price {
+						display: flex;
+						justify-content: space-between;
+						align-items: center;
+						
+						.price-wrap {
+							white-space: nowrap;
+							
+							.unit {
+								font-size: 24rpx !important;
+							}
+							
+							.price {
+								font-size: 32rpx;
+								
+								text {
+									font-weight: 700;
+								}
+							}
+						}
+					}
+					
+					.delete-price {
+						text-decoration: line-through;
+						flex: 1;
+						line-height: 28rpx;
+						color: #909399;
+						font-size: 20rpx;
+					}
+				}
+			}
+		}
+		
+		&.style-1 {
+			.pro-info {
+				.price-wrap {
+					line-height: 1;
+				}
+				
+				.discount-price {
+					justify-content: unset !important;
+					align-items: baseline !important;
+					flex-wrap: wrap;
+				}
+				
+				.delete-price {
+					margin-left: 10rpx;
+				}
+			}
+		}
+		
+		&.style-2 {
+			.pro-info {
+				position: relative;
+				flex-direction: row !important;
+				align-items: center;
+				
+				.price-wrap {
+					line-height: 1;
+				}
+				
+				.discount-price {
+					align-items: flex-end !important;
+					flex-wrap: wrap;
+					justify-content: unset !important;
+				}
+				
+				.delete-price {
+					margin: 20rpx 0;
+					flex-basis: 100% !important;
+				}
+				
+				.buy-btn {
+					min-width: 112rpx;
+					height: 52rpx;
+					padding: 0 20rpx;
+					line-height: 52rpx;
+					text-align: center;
+					box-sizing: border-box;
+				}
+			}
+		}
+		
+		.sell-out {
+			text {
+				font-size: 150rpx;
+			}
+		}
+	}
+	
+	&.row1-of2 {
+		display: flex;
+		flex-wrap: wrap;
+		justify-content: space-between;
+		
+		.goods-item {
+			position: relative;
+			margin-top: 20rpx;
+			width: calc(50% - 10rpx);
+			display: flex;
+			flex-direction: column;
+			box-sizing: border-box;
+			
+			&:nth-child(2n) {
+				margin-right: 0 !important;
+			}
+			
+			&:nth-of-type(1), &:nth-of-type(2) {
+				margin-top: 0;
+			}
+			
+			&.shadow {
+				width: calc(50% - 18rpx);
+				
+				&:nth-child(2n-1) {
+					margin-left: 8rpx;
+				}
+				
+				&:nth-child(2n) {
+					margin-right: 8rpx !important;
+				}
+				
+				&:nth-of-type(1), &:nth-of-type(2) {
+					margin-top: 8rpx;
+				}
+			}
+			
+			.goods-img-wrap {
+				position: relative;
+				overflow: hidden;
+				height: 340rpx;
+			}
+			
+			.goods-img {
+				width: 100%;
+			}
+			
+			.info-wrap {
+				display: flex;
+				flex-direction: column;
+				flex: 1;
+				
+				.sale {
+					flex-basis: 100%;
+				}
+				
+				.pro-info {
+					margin-top: auto;
+					display: flex;
+					flex-direction: row;
+					justify-content: space-between;
+					
+					.discount-price {
+						.price-wrap {
+							white-space: nowrap;
+							
+							.unit {
+								font-weight: 700;
+								font-size: 24rpx !important;
+							}
+							
+							.price {
+								font-weight: 700;
+								font-size: 32rpx !important;
+							}
+						}
+					}
+					
+					.delete-price {
+						text-decoration: line-through;
+						flex: 1;
+						line-height: 28rpx;
+						color: #909399;
+						font-size: 20rpx;
+					}
+				}
+			}
+		}
+		
+		&.style-1 {
+			.pro-info {
+				.discount-price {
+					display: flex;
+					flex-wrap: wrap;
+					align-items: baseline;
+					
+					.price-wrap {
+						display: inline-block;
+						
+						text {
+							font-weight: 700;
+						}
+						
+						line-height: 1;
+					}
+				}
+				
+				.delete-price {
+					margin-top: 6rpx;
+					flex-basis: 100% !important;
+				}
+			}
+		}
+		
+		&.style-2 {
+			.pro-info {
+				position: relative;
+				align-items: center;
+				
+				.price-wrap {
+					line-height: 1;
+				}
+				
+				.discount-price {
+					display: flex;
+					flex-wrap: wrap;
+					align-items: baseline;
+				}
+				
+				.delete-price {
+					margin-top: 4rpx;
+					flex-basis: 100% !important;
+				}
+				
+				.sale {
+					line-height: 1;
+					margin-top: 10rpx;
+				}
+				
+				.buy-btn {
+					min-width: 140rpx;
+					height: 52rpx;
+					padding: 0 20rpx;
+					line-height: 52rpx;
+					text-align: center;
+					box-sizing: border-box;
+				}
+			}
+		}
+		
+		&.style-3 {
+			.pro-info {
+				.member-price {
+					margin-right: auto;
+					align-self: flex-end;
+					margin-bottom: 4rpx;
+				}
+				
+				.sale {
+					line-height: 1;
+					align-self: center;
+					margin-top: 8rpx;
+				}
+				
+				.discount-price {
+					display: flex;
+					flex-wrap: wrap;
+					flex: 1;
+					align-content: center;
+					
+					.price-wrap {
+						display: flex;
+						align-items: baseline;
+						line-height: 1;
+						align-self: center;
+					}
+				}
+			}
+			
+			.swiper {
+				padding: 20rpx 0;
+			}
+		}
+		
+		.sell-out {
+			text {
+				font-size: 250rpx;
+			}
+		}
+	}
+}
+
+.video-container {
+	width: 100%;
+	height: 300px;
+	position: relative;
+}
+
+.adaptive-video {
+	width: 100%;
+	height: 100%;
+	object-fit: contain;
+	position: absolute;
+	top: 0;
+	left: 0;
+}
+
+.video-nav {
+	padding: 16rpx;
+	box-sizing: border-box;
+	
+	&.fixed-layout {
+		.uni-scroll-view-content {
+			display: flex;
+			flex-wrap: wrap;
+			justify-content: space-between;
+		}
+	}
+	
+	&.singleSlide {
+		.uni-scroll-view-content {
+			display: flex;
+		}
+		
+		.video-nav-item {
+			flex-shrink: 0;
+		}
+	}
+	
+	&.pageSlide {
+		position: relative;
+		
+		.uni-swiper-dots-horizontal {
+			bottom: 0rpx;
+		}
+		
+		&.straightLine {
+			.uni-swiper-dot {
+				width: 30rpx;
+				border-radius: 0;
+				height: 8rpx;
+			}
+		}
+		
+		&.circle {
+			.uni-swiper-dot {
+				width: 14rpx;
+				height: 14rpx;
+			}
+		}
+	}
+	
+	.video-nav-wrap {
+		display: flex;
+		flex-wrap: wrap;
+		width: 100%;
+		height: 100%;
+	}
+	
+	.video-nav-item {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		padding: 14rpx 0;
+		box-sizing: border-box;
+		
+		.video-text {
+			padding-top: 12rpx;
+			line-height: 1.5;
+			white-space: nowrap;
+			text-overflow: ellipsis;
+			overflow: hidden;
+			width: 100%;
+			text-align: center;
+			
+			&.alone {
+				padding-top: 0;
+			}
+		}
+		
+		&.text {
+			.video-text {
+				padding-top: 0;
+			}
+		}
+		
+		.video-img {
+			position: relative;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			font-size: 90rpx;
+			
+			.tag {
+				position: absolute;
+				top: -10rpx;
+				right: -24rpx;
+				color: #fff;
+				border-radius: 24rpx;
+				border-bottom-left-radius: 0;
+				-webkit-transform: scale(0.8);
+				transform: scale(0.8);
+				padding: 8rpx 16rpx;
+				line-height: 1;
+				font-size: 24rpx;
+			}
+			
+			.icon {
+				font-size: 50rpx;
+				color: #606266;
+			}
+		}
+	}
+}
+
+.swiper-dot-box {
+	width: 100%;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	margin-top: -20rpx;
+	padding-bottom: 8rpx;
+	
+	.swiper-dot {
+		background-color: rgba(0, 0, 0, 0.3);
+		margin: 8rpx;
+		
+		&.active {
+			background-color: #000;
+		}
+	}
+	
+	&.straightLine {
+		.swiper-dot {
+			width: 30rpx;
+			border-radius: 0;
+			height: 8rpx;
+		}
+	}
+	
+	&.circle {
+		.swiper-dot {
+			width: 15rpx;
+			border-radius: 50%;
+			height: 15rpx;
+		}
+	}
+}
+</style>
\ No newline at end of file
diff --git a/components/diy-components/diy-video.vue b/components/diy-components/diy-video.vue
index 634044c..464ba91 100644
--- a/components/diy-components/diy-video.vue
+++ b/components/diy-components/diy-video.vue
@@ -1,5 +1,7 @@
 <template>
+	<view :style="value.pageStyle">
 	<video  data-component-name="diy-video" class="diy-video" :src="$util.img(value.videoUrl)" :poster="$util.img(value.imageUrl)" :style="videoWarpCss"  objectFit="cover" @click="handlerClick(value.videoUrl)" @tap="handlerClick(value.videoUrl)"></video>
+	</view>
 </template>
 
 <script>
@@ -9,7 +11,10 @@
 		name: 'diy-video',
 		props: {
 			value: {
-				type: Object
+				type: Object,
+				default: () => {
+					return {};
+				}
 			}
 		},
 		data() {
diff --git a/components/goods-detail-view/detail.js b/components/goods-detail-view/detail.js
index 45a3720..f192c19 100644
--- a/components/goods-detail-view/detail.js
+++ b/components/goods-detail-view/detail.js
@@ -64,7 +64,10 @@ export default {
 			longitude: null, // 经度
 			evaluateCount: 0, // 商品评论数量
 			deliveryType: null, // 配送方式
-			isVirtual: 0 //是否为虚拟商品
+			isVirtual: 0 ,//是否为虚拟商品
+			hasGlobalStore:false,
+			saleStore:'all',
+			isInitStoreData:false,
 		}
 	},
 	created() {
@@ -73,10 +76,7 @@ export default {
 		if (this.location) {
 			this.latitude = this.location.latitude;
 			this.longitude = this.location.longitude;
-		} else {
-			this.$util.getLocation();
 		}
-		this.getStoreData();
 	},
 	watch: {
 		location: function (nVal) {
@@ -95,26 +95,24 @@ export default {
 			this.source_member = params.source_member;
 			this.whetherCollection = params.whetherCollection;
 			this.posterParams = params.posterParams;
-
+														
 			this.shareUrl = params.shareUrl;
 			this.goodsRoute = params.goodsRoute;
 			this.posterApi = params.posterApi;
 			this.isVirtual = params.isVirtual;
 			this.deliveryType = params.deliveryType;
 			this.evaluateConfig = params.evaluateConfig;
-
+			this.saleStore = params.sale_store;
 			if (this.evaluateConfig.evaluate_show == 1) {
 				//商品评论
 				this.getGoodsEvaluate(params.evaluateList);
 				this.evaluateCount = params.evaluateCount;
 			}
-
-			for (let k in this.deliveryType) {
-				if (k == 'store') {
-					this.isShowStore = true;
-				}
+			if(	params.goods_class != 2 && params.goods_class !=3) this.isShowStore = true;
+			if(!this.isInitStoreData){
+				this.isInitStoreData = true;
+				this.getStoreData();
 			}
-
 			this.getService();
 
 			this.videoContext = uni.createVideoContext('goodsVideo');
@@ -144,11 +142,12 @@ export default {
 		closeStoreListPopup() {
 			this.$refs.storeListPopup.close();
 		},
-		getStoreData() {
+		getStoreData(){
 			//门店列表
 			let data = {
 				page: this.storeList.page,
-				page_size: this.storeList.page_size
+				page_size: this.storeList.page_size,
+				store_ids:this.saleStore
 			};
 			if (this.latitude && this.longitude) {
 				data.latitude = this.latitude;
@@ -161,6 +160,9 @@ export default {
 					if (this.storeList.page == 1) this.storeList.data == [];
 					if (res.code >= 0 && res.data) {
 						this.storeList.data = this.storeList.data.concat(res.data.list);
+						res.data.list.forEach(item=>{
+							if(item.store_id == this.globalStoreInfo.store_id) this.hasGlobalStore = true;
+						})
 					} else {
 						this.$util.showToast({
 							title: res.message
@@ -189,9 +191,6 @@ export default {
 					if (this.goodsEvaluate[index].images) this.goodsEvaluate[index].images = this.goodsEvaluate[index].images.split(",");
 					if (this.goodsEvaluate[index].is_anonymous == 1) this.goodsEvaluate[index].member_name = this.goodsEvaluate[index].member_name.replace(this.goodsEvaluate[index].member_name.substring(1, this.goodsEvaluate[index].member_name.length - 1), '***')
 				})
-				// if (this.goodsEvaluate.images) this.goodsEvaluate.images = this.goodsEvaluate.images.split(",");
-				// if (this.goodsEvaluate.is_anonymous == 1) this.goodsEvaluate.member_name = this.goodsEvaluate.member_name.replace(
-				// this.goodsEvaluate.member_name.substring(1, this.goodsEvaluate.member_name.length - 1), '***')
 			}
 		},
 		// 预览评价图片
@@ -263,6 +262,8 @@ export default {
 		copyUrl() {
 			let text = this.$config.h5Domain + this.shareUrl;
 			if (this.memberInfo && this.memberInfo.member_id) text += '&source_member=' + this.memberInfo.member_id;
+			var store_info = this.$store.state.globalStoreInfo;
+			if (store_info) text += '&store_id=' + store_info.store_id;
 			this.$util.copy(text, () => {
 				this.closeSharePopup();
 			});
@@ -283,10 +284,11 @@ export default {
 		getGoodsPoster() {
 			uni.showLoading({
 				'title': '海报生成中...'
-			})
+			});
 			//活动海报信息
 			if (this.memberInfo && this.memberInfo.member_id) this.posterParams.source_member = this.memberInfo.member_id;
-
+			var store_info = this.$store.state.globalStoreInfo;
+			if (store_info)  this.posterParams.store_id= store_info.store_id;
 			this.$api.sendRequest({
 				url: this.posterApi,
 				data: {
diff --git a/components/goods-detail-view/goods-detail-view.vue b/components/goods-detail-view/goods-detail-view.vue
index 7590573..4f11371 100644
--- a/components/goods-detail-view/goods-detail-view.vue
+++ b/components/goods-detail-view/goods-detail-view.vue
@@ -39,37 +39,37 @@
                     <slot name="price"></slot>
                 </view>
 
-                <view class="newdetail margin-bottom" v-if="goodsSkuDetail.isinformation == 0">
-					
+                <view class="newdetail margin-bottom">
                     <!-- 入口区域 -->
                     <slot name="entrance"></slot>
 
                     <!-- 配送 -->
-				<!-- 	@click="$refs.deliveryType.open()" -->
-                    <view class="item delivery-type" v-if="goodsSkuDetail.is_virtual == 0" >
-                        <view class="label">{{$lang('send')}}</view>
+                    <view class="item delivery-type" v-if="goodsSkuDetail.is_virtual == 0" @click="$refs.deliveryType.open()">
+                        <view class="label">配送</view>
                         <block v-if="deliveryType">
                             <view class="box">
                                 <block v-for="(item, index) in deliveryType" :key="index">
-                                    <text v-if="goodsSkuDetail.support_trade_type.indexOf(index) != -1">{{$lang('express')}}</text>
-								<!-- 	{{ item.name }} -->
+                                    <text v-if="goodsSkuDetail.support_trade_type.indexOf(index) != -1">{{ item.name }}</text>
                                 </block>
                             </view>
                             <text class="iconfont icon-right"></text>
                         </block>
                         <block v-else>
-                            <view class="box">未配置</view>
+                            <view class="box">商家未配置配送方式</view>
                         </block>
                     </view>
 
                     <!-- 门店 -->
-               <!--     <view class="item store-wrap" @click="openStoreListPopup()" v-if="addonIsExist.store && globalStoreInfo && isShowStore">
-                        <view class="label">门店</view>
-                        <view class="list-wrap">
+                    <view class="item store-wrap" @click="openStoreListPopup()" v-if="addonIsExist.store && globalStoreInfo && isShowStore">
+                        <view class="label">适用门店</view>
+                        <view class="list-wrap" v-if="hasGlobalStore">
                             <view class="name-wrap">
                                 <text class="icondiy icon-system-shop"></text>
-                                <text class="name">{{globalStoreInfo.store_name}}</text>
+                                <text class="name">{{ globalStoreInfo.store_name}}</text>
                             </view>
+							<view class="close-desc" v-if="globalStoreInfo.status == 0 && globalStoreInfo.close_desc">
+								{{ globalStoreInfo.close_desc }}
+							</view>
                             <view class="other-wrap">
                                 <text class="distance" v-if="parseFloat(globalStoreInfo.distance)">距离{{ globalStoreInfo.distance > 1 ? globalStoreInfo.distance + 'km' : globalStoreInfo.distance * 1000 + 'm' }}</text>
                                 <text class="decorate" v-if="parseFloat(globalStoreInfo.distance)">.</text>
@@ -77,8 +77,23 @@
                                 </view>
                             </view>
                         </view>
+						<view class="list-wrap" v-else-if="storeList && storeList.data.length">
+						    <view class="name-wrap">
+						        <text class="icondiy icon-system-shop"></text>
+						        <text class="name">{{ storeList.data[0].store_name}}</text>
+						    </view>
+							<view class="close-desc" v-if="storeList.data[0].status == 0 && storeList.data[0].close_desc">
+								{{ storeList.data[0].close_desc }}
+							</view>
+						    <view class="other-wrap">
+						        <text class="distance" v-if="parseFloat(storeList.data[0].distance)">距离{{ storeList.data[0].distance > 1 ? storeList.data[0].distance + 'km' : storeList.data[0].distance * 1000 + 'm' }}</text>
+						        <text class="decorate" v-if="parseFloat(storeList.data[0].distance)">.</text>
+						        <view class="address">{{ storeList.data[0].full_address + storeList.data[0].address }}
+						        </view>
+						    </view>
+						</view>
                         <text class="iconfont icon-right"></text>
-                    </view> -->
+                    </view>
 
                     <view class="item service" @click="openMerchantsServicePopup()" v-if="goodsSkuDetail.goods_service.length">
                         <view class="label">服务</view>
@@ -96,34 +111,6 @@
                         </view>
                         <text class="iconfont icon-right"></text>
                     </view>
-		
-                </view>
-				
-				<!--多规格区域-->
-				<view class="newdetail margin-bottom"  v-if="goodsSkuDetail.sku_spec_format">
-				    <!-- 入口区域 -->
-				  	<slot name="skuspec"></slot>
-				</view>
-			
-				 
-				 <view class="newdetail margin-bottom" v-if="goodsSkuDetail.merch_id > 0">
-                    <!-- 入口区域 -->
-                    <slot name="entrance"></slot>
-                    <!-- 商家 -->
-                   <view class="item store-wrap"  @click="$util.redirectTo('/pages_promotion/merch/detail', { merch_id: goodsSkuDetail.merch_id })">
-                        <view class="list-wrap" style="display: flex;">
-                            <view class="name-wrap">
-								<image :src="$util.img(goodsSkuDetail.merchinfo.merch_image)" mode="widthFix" style="width: 100rpx;height: 100rpx;border-radius: 50rpx;"></image>
-                            </view>
-                           <view class="other-wrap">
-                               <view class="address" style="margin-left: 30rpx;">
-								   <view>{{goodsSkuDetail.merchinfo.merch_name}}</view>
-								   <view style="font-size: 24rpx;color: #888;">官方认证商家，值得信赖！</view>
-							   </view>
-                            </view>
-                        </view>
-                        <text class="iconfont icon-right"></text>
-                    </view>
                 </view>
 
                 <!-- 配送方式 -->
@@ -182,7 +169,7 @@
                     <uni-popup ref="storeListPopup" type="bottom">
                         <view class="goods-merchants-service-popup-layer popup-layer store-list-wrap">
                             <view class="head-wrap" @click="closeStoreListPopup()">
-                                <text>门店列表</text>
+                                <text>适用门店</text>
                                 <text class="iconfont icon-close"></text>
                             </view>
                             <scroll-view scroll-y>
@@ -200,6 +187,8 @@
                                                         距离{{ item.distance > 1 ? item.distance + 'km' : item.distance * 1000 + 'm' }}
                                                     </text>
                                                 </view>
+												<view class="item-close-desc" v-if="item.status == 0 && item.close_desc">{{ item.close_desc }}
+												</view>
                                                 <view class="item-time" v-if="item.open_date">营业时间：{{ item.open_date }}
                                                 </view>
                                                 <view class="item-address">{{ item.full_address + item.address }}</view>
@@ -228,7 +217,7 @@
                 </view>
 
                 <!-- 促销 -->
-            <!--    <view class="community-model" @touchmove.prevent.stop @click.stop="onCloseCommunity()" v-show="isCommunity">
+                <view class="community-model" @touchmove.prevent.stop @click.stop="onCloseCommunity()" v-show="isCommunity">
                     <view class="community-model-content" @click.stop>
                         <view class="community-model-content-radius">
                             <view>添加社群</view>
@@ -241,13 +230,13 @@
                     <view class="community-model-close" @click.stop="onCloseCommunity()">
                         <text class="iconfont icon-close"></text>
                     </view>
-                </view> -->
+                </view>
 
                 <!-- 参与流程 -->
                 <slot name="articipation"></slot>
 
                 <!-- 商品评价 -->
-                <view class="group-wrap" v-if="evaluateConfig.evaluate_show == 1 && goodsSkuDetail.isinformation == 0" style="display: none;">
+                <view class="group-wrap" v-if="evaluateConfig.evaluate_show == 1">
                     <view class="goods-evaluate" @click="toEvaluateDetail(goodsSkuDetail.goods_id)">
                         <view class="tit">
                             <!-- <view class="tit" :class="{ active: goodsEvaluate.content }"> -->
@@ -263,8 +252,7 @@
                                 </view>
                             </view>
                         </view>
-                        <view class="evaluate-item" v-for="(item, index) in goodsEvaluate" :key="index"
-                            v-if="item.content">
+                        <view class="evaluate-item" v-for="(item, index) in goodsEvaluate" :key="index" v-if="item.content">
                             <view class="evaluator">
                                 <view class="evaluator-info">
                                     <view class="evaluator-face">
@@ -294,7 +282,7 @@
                         </view>
                     </view>
                 </view>
-				
+
                 <view class="goods-attr" v-if="goodsSkuDetail.goods_attr_format && goodsSkuDetail.goods_attr_format.length > 0">
                     <view class="title">规格属性</view>
                     <view class="attr-wrap">
@@ -315,24 +303,19 @@
                     </view>
                 </view>
 
-				
-
                 <!-- 详情 -->
                 <view class="goods-detail-tab">
                     <view class="detail-tab">
-                        <view class="tab-item">{{$lang('details')}}</view>
+                        <view class="tab-item">商品详情</view>
                     </view>
                     <view class="detail-content active">
                         <view class="detail-content-item">
                             <view class="goods-details" v-if="goodsSkuDetail.goods_content">
-                     <!--           <rich-text :nodes="goodsSkuDetail.goods_content" @click="showImg($event)" :data-nodes="goodsSkuDetail.goods_content"></rich-text> -->
-			<!-- 		 {{goodsSkuDetail.goods_content}} -->
-									<mp-html :content="goodsSkuDetail.goods_content" />
-									<!-- :loading="loading" @preview="preview" @navigate="navigate" -->
+								<ns-mp-html :content="goodsSkuDetail.goods_content"></ns-mp-html>
                             </view>
-                            <view class="goods-details active" v-else></view>
+                            <view class="goods-details active" v-else>该商家暂无上传相关详情哦！</view>
                             <view class="goods-details" v-if="service && service.is_display == 1 && service.content">
-                                <rich-text :nodes="service.content" @click="showImg($event)" :data-nodes="service.content"></rich-text>
+								<ns-mp-html :content="service.content"></ns-mp-html>
                             </view>
                         </view>
                     </view>
diff --git a/components/hover-nav/hover-nav.vue b/components/hover-nav/hover-nav.vue
index fab6a0a..52c4591 100644
--- a/components/hover-nav/hover-nav.vue
+++ b/components/hover-nav/hover-nav.vue
@@ -144,7 +144,7 @@ export default {
 						data: { t: new Date().getTime() },
 						success: (res) => {
 							const config = res.code === 0 ? res.data : this.$store.state.servicerConfig || {};
-							this.$store.commit('UPDATE_SERVICER_CONFIG', config);
+							this.$store.commit('setServicerConfig', config);
 							resolve(config);
 						},
 						fail: () => resolve(this.$store.state.servicerConfig || {})
diff --git a/components/ns-birthday-gift/ns-birthday-gift.vue b/components/ns-birthday-gift/ns-birthday-gift.vue
index e34abb7..5c7bd52 100644
--- a/components/ns-birthday-gift/ns-birthday-gift.vue
+++ b/components/ns-birthday-gift/ns-birthday-gift.vue
@@ -10,9 +10,9 @@
 						</view>
 						<view class="birthday-title-desc" v-else>感谢您一直以来的支持，在您生日到来之际，特为您送上最真诚的祝福！</view>
 						<view class="birthday-title-hint">
-							<image :src="$util.img('public/uniapp/birthday_gift/birthday_gift_left.png')" mode="" class="birthday-img-all"/>
+							<image :src="$util.img('public/uniapp/birthday_gift/birthday_gift_left.png')" mode="" class="birthday-img-all" />
 							<view class="font-size-toolbar">生日贺礼</view>
-							<image :src="$util.img('public/uniapp/birthday_gift/birthday_gift_right.png')" mode="" class="birthday-img-all"/>
+							<image :src="$util.img('public/uniapp/birthday_gift/birthday_gift_right.png')" mode="" class="birthday-img-all" />
 						</view>
 						<scroll-view scroll-y="true" class="register-box">
 							<view class="reward-content">
@@ -51,18 +51,14 @@
 									<block v-for="(item, index) in birthday.coupon_list" :key="index">
 										<view class="content">
 											<view class="info">
-												<block v-if="item.type == 'reward'">
-													<text class="num">
-														{{ parseFloat(item.money) }}
-														<text class="type">元优惠劵</text>
-													</text>
-												</block>
-												<block v-else-if="item.type == 'discount'">
-													<text class="num">
-														{{ item.discount }}
-														<text class="type">折</text>
-													</text>
-												</block>
+												<text class="num" v-if="item.type == 'reward'">
+													{{ parseFloat(item.money) }}
+													<text class="type">元优惠劵</text>
+												</text>
+												<text class="num" v-else-if="item.type == 'discount'">
+													{{ item.discount }}
+													<text class="type">折</text>
+												</text>
 												<view class="desc">用于下单时抵现或兑换商品等</view>
 											</view>
 											<view class="tip" @click="closeRewardPopup('3')">立即查看</view>
@@ -93,7 +89,8 @@
 				birthday: {
 					flag: false,
 					coupon_list: {}
-				}
+				},
+				callback: null
 			};
 		},
 		computed: {
@@ -117,7 +114,8 @@
 			this.init();
 		},
 		methods: {
-			init() {
+			init(callback = null) {
+				if (callback) this.callback = callback;
 				this.getBirthdayGift();
 			},
 			cancel() {
@@ -148,7 +146,9 @@
 						data: {
 							id: this.birthday.id
 						},
-						success: res => {}
+						success: res => {
+							if (this.callback) this.callback();
+						}
 					});
 				}
 			},
@@ -170,7 +170,7 @@
 	}
 
 	.register-box {
-		max-height: 300rpx;
+		max-height: 320rpx;
 		overflow-y: scroll;
 		/* margin-top:350rpx; */
 	}
@@ -187,12 +187,12 @@
 
 <style lang="scss">
 	.reward-wrap {
-		width: 85vw;
+		width: 600rpx;
 		height: auto;
 
 		.wrap {
-			width: 100%;
-			height: auto;
+			width: 600rpx;
+			height: 932rpx;
 			background-size: 100%;
 			background-repeat: no-repeat;
 			padding-bottom: 40rpx;
@@ -266,7 +266,8 @@
 			background: #fff;
 			border-radius: 10rpx;
 			margin-bottom: 20rpx;
-
+			box-sizing: border-box;
+			height: 136rpx;
 			.info {
 				flex: 1;
 			}
@@ -323,13 +324,6 @@
 				height: 40rpx;
 				margin: 0 auto;
 				line-height: 40rpx;
-				/* margin: 20rpx 140rpx;
-			border: none;
-			background: linear-gradient(90deg, #FF6A00, #FF3C00);
-			border-radius: 40rpx;
-			display: flex;
-			align-items: center;
-			justify-content: center; */
 			}
 		}
 	}
diff --git a/components/ns-empty/ns-empty.vue b/components/ns-empty/ns-empty.vue
index 3d46f4a..7fea535 100644
--- a/components/ns-empty/ns-empty.vue
+++ b/components/ns-empty/ns-empty.vue
@@ -1,95 +1,92 @@
-<template>
-	<view class="empty" :class="{ fixed: fixed }">
-		<view class="empty_img"><image :src="$util.img('public/uniapp/common/common-empty.png')" mode="aspectFit"></image></view>
-		<view class="color-tip margin-top title" :style="{ color: textColor + ' !important' }">{{ text }}</view>
-		<view class="color-tip margin-bottom font-size-sub">{{ subText }}</view>
-		<button type="primary" size="mini" class="button mini" @click="goIndex()" v-if="isIndex">{{ emptyBtn.text }}</button>
-	</view>
-</template>
-
-<script>
-export default {
-	data() {
-		return {};
-	},
-	props: {
-		text: {
-			type: String,
-			default: '暂无相关数据'
-		},
-		subText: {
-			type: String,
-			default: ''
-		},
-		isIndex: {
-			type: Boolean,
-			default: true
-		},
-		emptyBtn: {
-			type: Object,
-			default: () => {
-				return { text: '去逛逛' };
-			}
-		},
-		fixed: {
-			type: Boolean,
-			default: false
-		},
-		textColor: {
-			type: String,
-			default: ''
-		}
-	},
-	methods: {
-		goIndex() {
-			if (this.emptyBtn.url) {
-				this.$util.redirectTo(this.emptyBtn.url, {}, 'redirectTo');
-			} else {
-				this.$util.redirectTo('/pages/index/index');
-			}
-		},
-		re(text) {
-			this.text = text;
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-.empty {
-	width: 100%;
-	display: flex;
-	flex-direction: column;
-	align-items: center;
-	padding: $padding;
-	box-sizing: border-box;
-	justify-content: center;
-	.title {
-		font-size: 30rpx;
-	}
-	.empty_img {
-		width: 50%;
-		height: 450rpx;
-
-		image {
-			width: 100%;
-			height: 100%;
-			padding-bottom: $padding;
-		}
-	}
-	button {
-		min-width: 300rpx;
-		margin-top: 100rpx;
-		height: 70rpx;
-		line-height: 70rpx !important;
-		font-size: $font-size-base;
-		font-weight: bold;
-		border-radius: 100rpx;
-	}
-}
-.fixed {
-	position: fixed;
-	left: 0;
-	top: 20vh;
-}
-</style>
+<template>
+	<view class="empty" :class="{ fixed: fixed }">
+		<view class="empty_img"><image :src="$util.img('public/uniapp/common/common-empty.png')" mode="aspectFit"></image></view>
+		<view class="color-tip margin-top title" :style="{ color: textColor + ' !important' }">{{ text }}</view>
+		<view class="color-tip margin-bottom font-size-sub">{{ subText }}</view>
+		<button type="primary" size="mini" class="button mini" @click="goIndex()" v-if="isIndex">{{ emptyBtn.text }}</button>
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {};
+	},
+	props: {
+		text: {
+			type: String,
+			default: '暂无相关数据'
+		},
+		subText: {
+			type: String,
+			default: ''
+		},
+		isIndex: {
+			type: Boolean,
+			default: true
+		},
+		emptyBtn: {
+			type: Object,
+			default: () => {
+				return { text: '去逛逛' };
+			}
+		},
+		fixed: {
+			type: Boolean,
+			default: false
+		},
+		textColor: {
+			type: String,
+			default: ''
+		}
+	},
+	methods: {
+		goIndex() {
+			if (this.emptyBtn.url) {
+				this.$util.redirectTo(this.emptyBtn.url, {}, 'redirectTo');
+			} else {
+				this.$util.redirectTo('/pages/index/index');
+			}
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+.empty {
+	width: 100%;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	padding: $padding;
+	box-sizing: border-box;
+	justify-content: center;
+	.title {
+		font-size: 30rpx;
+	}
+	.empty_img {
+		width: 50%;
+		height: 450rpx;
+
+		image {
+			width: 100%;
+			height: 100%;
+			padding-bottom: $padding;
+		}
+	}
+	button {
+		min-width: 300rpx;
+		margin-top: 100rpx;
+		height: 70rpx;
+		line-height: 70rpx !important;
+		font-size: $font-size-base;
+		font-weight: bold;
+		border-radius: 100rpx;
+	}
+}
+.fixed {
+	position: fixed;
+	left: 0;
+	top: 20vh;
+}
+</style>
diff --git a/components/ns-form/ns-form.vue b/components/ns-form/ns-form.vue
index 452c8df..2f7309e 100644
--- a/components/ns-form/ns-form.vue
+++ b/components/ns-form/ns-form.vue
@@ -220,7 +220,7 @@
         },
         data() {
             return {
-                formData: this.data
+                formData:[]
             };
         },
         created() {
@@ -229,23 +229,26 @@
         watch: {
             data: function() {
                 this.setFormData();
-            }
+            },
+			formData: {
+				handler(newVal, oldVal) {
+					this.$emit('changeFormVal',newVal)
+				},
+				deep: true
+			}
         },
         methods: {
             setFormData() {
-                this.formData = this.data;
-
-                this.formData.forEach(item => {
+                let formData = JSON.parse(JSON.stringify(this.data));
+                formData.forEach(item => {
                     if (!item.val) item.val = item.value.default ? item.value.default : '';
-
                     if (item.value.options) {
                         item.option_lists = [];
                         item.value.options.forEach((v, k) => {
                             var obj = {};
                             obj.value = v;
                             obj.checked = false;
-                            if (item.controller == 'Radio' && ((!item.val && k == 0) || (item.val &&
-                                    item.val == v))) {
+                            if (item.controller == 'Radio' && ((!item.val && k == 0) || (item.val && item.val == v))) {
                                 obj.checked = true;
                                 item.val = v;
                             }
@@ -359,6 +362,7 @@
                         else item.default_regions = [];
                     }
                 });
+                this.formData = JSON.parse(JSON.stringify(formData))
             },
             verify() {
                 let verify = true;
@@ -392,6 +396,7 @@
                         }
 
                         // 验证手机号
+                        
                         if (item.name == 'MOBILE' && this.$util.verifyMobile(item.val) === false) {
                         	verify = !item.value.required;
                         	if (verify == false) {
@@ -515,7 +520,7 @@
                         }
                     }
                 }
-
+                console.log(verify)
                 if (verify) {
                     return this.formData;
                 } else return verify;
@@ -678,7 +683,7 @@
 
         &:last-child {
             margin-bottom: 0;
-            border-bottom: solid 1px #eee;
+            border-bottom: 0;
         }
 
         &.align-top {
@@ -836,6 +841,9 @@
             checkbox {
                 display: none;
             }
+            label {
+                padding:10rpx 0;
+            }
 
             .checkbox {
                 display: flex;
diff --git a/components/ns-goods-action-icon/ns-goods-action-icon.vue b/components/ns-goods-action-icon/ns-goods-action-icon.vue
index d88a20e..6fa3926 100644
--- a/components/ns-goods-action-icon/ns-goods-action-icon.vue
+++ b/components/ns-goods-action-icon/ns-goods-action-icon.vue
@@ -1,146 +1,146 @@
-<template>
-	<view>
-		<block v-if="text == '客服'">
-		<!-- 	<ns-contact :niushop="chatParam" :send-message-title="sendData.title" :send-message-path="sendData.path" :send-message-img="sendData.img"> -->
-				<button hoverClass="none" openType="contact" sessionFrom="weapp" showMessageCard="true" class="action-icon-wrap" style="background: transparent;padding: 0;margin: 0;">
-					<view class="iconfont color-title" :class="icon"></view>
-					<text>{{ text }}</text>
-					<view class="corner-mark color-base-bg" v-if="cornerMark.length" :style="{ background: cornerMarkBg+'!important', color: cornerMarkColor }">{{ cornerMark }}</view>
-				</button>
-			<!-- </ns-contact> -->
-		</block>
-		<block v-else>
-			<view class="action-icon-wrap" @click="clickEvent">
-				<view class="iconfont " :class="icon"></view>
-				<text>{{ text }}</text>
-				<view class="corner-mark color-base-bg" :class="{'max' : parseInt(cornerMark)>99}" v-if="cornerMark.length" :style="{ background: cornerMarkBg+'!important', color: cornerMarkColor }">{{ cornerMark > 99 ? '99+' : cornerMark }}</view>
-			</view>
-		</block>
-	</view>
-</template>
-
-<script>
-import nsContact from '@/components/ns-contact/ns-contact.vue';
-export default {
-	name: 'ns-goods-action-icon',
-	props: {
-		// 商品底部icon导航icon图标
-		icon: {
-			type: String,
-			default: ''
-		},
-		// 商品底部icon导航文字
-		text: {
-			type: String,
-			default: ''
-		},
-		// 角标文字
-		cornerMark: {
-			type: String,
-			default: ''
-		},
-		// 角标背景色
-		cornerMarkBg: {
-			type: String,
-			default: ''
-		},
-		// 角标文字颜色
-		cornerMarkColor: {
-			type: String,
-			default: '#fff'
-		},
-		// 开放能力
-		openType: {
-			type: String,
-			default: ''
-		},
-		// 发送内容 openType="contact"时有效
-		sendData: {
-			type: Object,
-			default: function() {
-				return {
-					title: '',
-					path: '',
-					img: ''
-				};
-			}
-		},
-		chatParam: {
-			type: Object,
-			default: function(){
-				return {}
-			}
-		}
-	},
-	components:{
-		nsContact
-	},
-	methods: {
-		clickEvent() {
-			this.$emit('click');
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-.action-icon-wrap {
-	display: flex;
-	flex-direction: column;
-	justify-content: center;
-	height: 100rpx;
-	min-width: 90rpx;
-	text-align: center;
-	position: relative;
-	margin-right: 6rpx;
-}
-.action-icon-wrap button {
-	width: 100%;
-	height: 100%;
-	position: absolute;
-	border: none;
-	z-index: 1;
-	padding: 0;
-	margin: 0;
-	background: none;
-	top: 0;
-	left: 0;
-	opacity: 0;
-}
-
-.action-icon-wrap button::after {
-	border: none !important;
-}
-
-.action-icon-wrap .iconfont {
-	margin: 0 auto 10rpx;
-	line-height: 1;
-	font-size: 40rpx;
-}
-
-.action-icon-wrap .corner-mark {
-	position: absolute;
-	z-index: 99;
-	font-size: $font-size-activity-tag;
-	top: 4rpx;
-	right: 12rpx;
-	color: #fff;
-	display: flex;
-	justify-content: center;
-	align-items: center;
-	width: 24rpx;
-	height: 24rpx;
-	padding: 6rpx;
-	border-radius: 50%;
-	&.max{
-		right:-4rpx;
-		width: 40rpx;
-		border-radius: 24rpx;
-	}
-}
-
-.action-icon-wrap text {
-	font-size: $font-size-tag;
-	line-height: 1;
-}
-</style>
+<template>
+	<view>
+		<block v-if="text == '客服' || text == 'Contact'">
+		<!-- 	<ns-contact :niushop="chatParam" :send-message-title="sendData.title" :send-message-path="sendData.path" :send-message-img="sendData.img"> -->
+				<button hoverClass="none" openType="contact" sessionFrom="weapp" showMessageCard="true" class="action-icon-wrap" style="background: transparent;padding: 0;margin: 0;">
+					<view class="iconfont color-title" :class="icon"></view>
+					<text>{{ text }}</text>
+					<view class="corner-mark color-base-bg" v-if="cornerMark.length" :style="{ background: cornerMarkBg+'!important', color: cornerMarkColor }">{{ cornerMark }}</view>
+				</button>
+			<!-- </ns-contact> -->
+		</block>
+		<block v-else>
+			<view class="action-icon-wrap" @click="clickEvent">
+				<view class="iconfont color-title" :class="icon"></view>
+				<text>{{ text }}</text>
+				<view class="corner-mark color-base-bg" :class="{'max' : parseInt(cornerMark)>99}" v-if="cornerMark.length" :style="{ background: cornerMarkBg+'!important', color: cornerMarkColor }">{{ cornerMark > 99 ? '99+' : cornerMark }}</view>
+			</view>
+		</block>
+	</view>
+</template>
+
+<script>
+import nsContact from '@/components/ns-contact/ns-contact.vue';
+export default {
+	name: 'ns-goods-action-icon',
+	props: {
+		// 商品底部icon导航icon图标
+		icon: {
+			type: String,
+			default: ''
+		},
+		// 商品底部icon导航文字
+		text: {
+			type: String,
+			default: ''
+		},
+		// 角标文字
+		cornerMark: {
+			type: String,
+			default: ''
+		},
+		// 角标背景色
+		cornerMarkBg: {
+			type: String,
+			default: ''
+		},
+		// 角标文字颜色
+		cornerMarkColor: {
+			type: String,
+			default: '#fff'
+		},
+		// 开放能力
+		openType: {
+			type: String,
+			default: ''
+		},
+		// 发送内容 openType="contact"时有效
+		sendData: {
+			type: Object,
+			default: function() {
+				return {
+					title: '',
+					path: '',
+					img: ''
+				};
+			}
+		},
+		chatParam: {
+			type: Object,
+			default: function(){
+				return {}
+			}
+		}
+	},
+	components:{
+		nsContact
+	},
+	methods: {
+		clickEvent() {
+			this.$emit('click');
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+.action-icon-wrap {
+	display: flex;
+	flex-direction: column;
+	justify-content: center;
+	height: 100rpx;
+	min-width: 90rpx;
+	text-align: center;
+	position: relative;
+	margin-right: 6rpx;
+}
+.action-icon-wrap button {
+	width: 100%;
+	height: 100%;
+	position: absolute;
+	border: none;
+	z-index: 1;
+	padding: 0;
+	margin: 0;
+	background: none;
+	top: 0;
+	left: 0;
+	opacity: 0;
+}
+
+.action-icon-wrap button::after {
+	border: none !important;
+}
+
+.action-icon-wrap .iconfont {
+	margin: 0 auto 10rpx;
+	line-height: 1;
+	font-size: 40rpx;
+}
+
+.action-icon-wrap .corner-mark {
+	position: absolute;
+	z-index: 99;
+	font-size: $font-size-activity-tag;
+	top: 4rpx;
+	right: 12rpx;
+	color: #fff;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	width: 24rpx;
+	height: 24rpx;
+	padding: 6rpx;
+	border-radius: 50%;
+	&.max{
+		right:-4rpx;
+		width: 40rpx;
+		border-radius: 24rpx;
+	}
+}
+
+.action-icon-wrap text {
+	font-size: $font-size-tag;
+	line-height: 1;
+}
+</style>
diff --git a/components/ns-goods-promotion/ns-goods-promotion.vue b/components/ns-goods-promotion/ns-goods-promotion.vue
index cbc219e..a58aeea 100644
--- a/components/ns-goods-promotion/ns-goods-promotion.vue
+++ b/components/ns-goods-promotion/ns-goods-promotion.vue
@@ -79,8 +79,6 @@ export default {
 <style lang="scss">
 .ns-goods-promotion {
 	background-color: #fff;
-	& > view {
-	}
 	.item {
 		display: flex;
 		font-size: $font-size-base;
diff --git a/components/ns-goods-recommend/ns-goods-recommend.vue b/components/ns-goods-recommend/ns-goods-recommend.vue
index 2bec54c..4ab4e02 100644
--- a/components/ns-goods-recommend/ns-goods-recommend.vue
+++ b/components/ns-goods-recommend/ns-goods-recommend.vue
@@ -1,5 +1,93 @@
 <template>
-	<view></view>
+	<view class="goods-recommend" v-if="list.length">
+		<view class="goods-recommend-title">
+			<text class="title">{{ config.title }}</text>
+		</view>
+
+		<view class="goods-list double-column">
+			<view class="goods-item margin-bottom" v-for="(item, index) in list" :key="index" @click="toDetail(item)">
+				<view class="goods-img">
+					<image :src="goodsImg(item.goods_image)" mode="widthFix" @error="imgError(index)" :lazy-load="true" />
+					<view class="color-base-bg goods-tag" v-if="goodsTag(item) != ''">{{ goodsTag(item) }}</view>
+					<view class="sell-out" v-if="item.goods_stock <= 0">
+						<text class="iconfont icon-shuqing"></text>
+					</view>
+				</view>
+				<view class="info-wrap">
+					<view class="goods-name" :class="[{ 'using-hidden': config.nameLineMode == 'single' }, { 'multi-hidden': config.nameLineMode == 'multiple' }]">
+						{{ item.goods_name }}
+					</view>
+
+					<view class="lineheight-clear">
+						<view class="discount-price">
+							<text class="unit  price-style small">{{ $lang('common.currencySymbol') }}</text>
+							<text class="price price-style large">{{ parseFloat(showPrice(item)).toFixed(2).split('.')[0] }}</text>
+							<text class="unit price-style small">.{{ parseFloat(showPrice(item)).toFixed(2).split('.')[1] }}</text>
+						</view>
+						<view class="member-price-tag" v-if="item.member_price && item.member_price == showPrice(item)">
+							<image :src="$util.img('public/uniapp/index/VIP.png')" mode="widthFix"/>
+						</view>
+						<view class="member-price-tag" v-else-if="item.promotion_type == 1">
+							<image :src="$util.img('public/uniapp/index/discount.png')" mode="widthFix"/>
+						</view>
+						<view class="delete-price font-size-activity-tag color-tip price-font" v-if="showMarketPrice(item)">
+							<text class="unit">{{ $lang('common.currencySymbol') }}</text>
+							<text>{{ showMarketPrice(item) }}</text>
+						</view>
+					</view>
+					<view class="pro-info">
+						<view class="block-wrap">
+							<view class="sale font-size-activity-tag color-tip" v-if="item.sale_show">已售{{ item.sale_num }}{{ item.unit ? item.unit : '件' }}</view>
+						</view>
+
+						<view class="cart-action-wrap" v-if="config.control && item.is_virtual == 0">
+							<!-- 购物车图标 -->
+							<view v-if="config.style == 'icon-cart'" :style="{
+									color: config.theme == 'diy' ? config.textColor : '',
+									borderColor: config.theme == 'diy' ? config.textColor : ''
+								}" class="cart shopping-cart-btn iconfont icon-gouwuche click-wrap" :id="'goods-' + item.id"
+								@click.stop="$refs.goodsSkuIndex.addCart(config.cartEvent, item, $event)">
+								<view class="click-event"></view>
+							</view>
+
+							<!--加号图标 -->
+							<view v-else-if="config.style == 'icon-add'" :style="{
+									color: config.theme == 'diy' ? config.textColor : '',
+									borderColor: config.theme == 'diy' ? config.textColor : ''
+								}" class="cart plus-sign-btn iconfont icon-add1 click-wrap" :id="'goods-' + item.id"
+								@click.stop="$refs.goodsSkuIndex.addCart(config.cartEvent, item, $event)">
+								<view class="click-event"></view>
+							</view>
+
+							<!-- 按钮 -->
+							<view v-else-if="config.style == 'button'" :style="{
+									backgroundColor: config.theme == 'diy' ? config.bgColor : '',
+									color: config.theme == 'diy' ? config.textColor : '',
+									fontWeight: config.theme == 'diy' ? (config.fontWeight ? 'bold' : 'normal') : '',
+									padding: config.theme == 'diy' ? '12rpx ' + config.padding * 2 + 'rpx' : ''
+								}" class="cart buy-btn click-wrap" :id="'goods-' + item.id"
+								@click.stop="$refs.goodsSkuIndex.addCart(config.cartEvent, item, $event)">
+								{{ config.text }}
+								<view class="click-event"></view>
+							</view>
+
+							<!--自定义图标 -->
+							<view v-else-if="config.style == 'icon-diy'" :style="{
+									color: config.theme == 'diy' ? config.textColor : ''
+								}" class="icon-diy click-wrap" :id="'goods-' + item.id"
+								@click.stop="$refs.goodsSkuIndex.addCart(config.cartEvent, item, $event)">
+								<view class="click-event"></view>
+								<diy-icon :icon="config.iconDiy.icon" :value="config.iconDiy.style ? config.iconDiy.style : null"></diy-icon>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="circle-box" v-if="showLoading && load"><ns-loading></ns-loading></view>
+
+		<ns-goods-sku-index ref="goodsSkuIndex" @cartListChange="cartListChange" @addCart="addCart"></ns-goods-sku-index>
+	</view>
 </template>
 
 <script>
@@ -256,6 +344,22 @@
 					right: 0;
 					// transform: translateY(-50%);
 				}
+				.sell-out{
+					position: absolute;
+					z-index: 1;
+					width: 100%;
+					height: 100%;
+					top: 0;
+					left: 0;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					background: rgba(0, 0, 0, 0.5);
+					text{
+						color: #fff;
+						font-size: 220rpx;
+					}
+				}
 			}
 
 			.goods-tag {
diff --git a/components/ns-goods-sku/ns-goods-sku-category.vue b/components/ns-goods-sku/ns-goods-sku-category.vue
index 7cc117c..b70a749 100644
--- a/components/ns-goods-sku/ns-goods-sku-category.vue
+++ b/components/ns-goods-sku/ns-goods-sku-category.vue
@@ -31,9 +31,11 @@
 											@click="change(item_value.sku_id, item_value.spec_id)">
 											<image v-if="item_value.image" :src="$util.img(item_value.image, { size: 'small' })" @error="valueImageError(index, index_value)" />
 											<text>{{ item_value.spec_value_name }}</text>
+											<view class="empty-stock" v-if="item_value.stock == 0">缺货</view>
 										</view>
 									</view>
 								</view>
+								<ns-form :data="goodsForm" v-if="goodsForm" ref="form"></ns-form>
 							</scroll-view>
 						</view>
 						<view class="footer">
@@ -50,12 +52,12 @@
 									</view>
 								</view>
 								<view class="footer-right">
-									<view class="change_num" v-if="number > 0">
+									<view class="change_num" v-if="cartInputLock">
 										<view class="num-action" @click="changeNum('-')">
 											<text class="desc iconfont icon-jianshao color-base-text"></text>
 											<view class="click-event"></view>
 										</view>
-										<input type="number" class="uni-input" @blur="blur" v-model="number" placeholder="0" @input="keyInput(false)" />
+										<input type="number" class="uni-input" @blur="blur" v-model.lazy="number" placeholder="0" @input="keyInput(false,null,true)" />
 										<view class="num-action" :id="'select-sku-num-' + goodsDetail.goods_id" @click="changeNum('+', $event)">
 											<text class="add iconfont icon-add-fill color-base-text change_hover"></text>
 											<view class="click-event"></view>
@@ -115,7 +117,9 @@
 				maxBuy: 0,
 				minBuy: 0,
 				isLoad: false,
-				timeout: null
+				timeout: null,
+				goodsForm: null,
+				skuList: []
 			};
 		},
 		created() {
@@ -124,21 +128,44 @@
 		watch: {
 			pointLimit(newNum, oldNum) {
 				this.limitNumber = Number(newNum);
-			},
-			minBuy(newData, oldData) {
-				if (this.minBuy > 1) {
-					this.number = Number(this.minBuy);
+			}
+		},
+		computed:{
+			cartInputLock:function() {
+				if(!this.isLoad){
+					return true
+				}else if(this.number>0){
+					return true
+				}else{
+					return false
 				}
+				
 			}
 		},
 		methods: {
+			calcSkuStock() {
+				if(this.goodsDetail.goods_spec_format && this.goodsDetail.goods_spec_format.length){
+					this.goodsDetail.goods_spec_format.forEach(spec => {
+						spec.value.forEach(val => {
+							this.skuList.forEach(sku => {
+								if (val.sku_id == sku.sku_id) {
+									this.$set(val,'stock',sku.stock);
+								}
+							})
+						})
+					})
+				}
+			},
 			show(data) {
+				this.number = 0 ; // 每次打开要初始化
 				this.isLoad = true;
 				this.goodsDetail = data;
 				this.goodsId = this.goodsDetail.goods_id;
 				this.skuId = this.goodsDetail.sku_id;
 				this.maxBuy = this.goodsDetail.max_buy;
 				this.minBuy = this.goodsDetail.min_buy;
+				this.goodsForm = null
+				this.getGoodsForm()
 				this.getGoodsSkuList(this.goodsId);
 				this.keyInput(false);
 				if (this.getCurrentCart()) {
@@ -146,6 +173,19 @@
 				}
 				this.$refs.skuPopup.open();
 			},
+			getGoodsForm(){
+				this.$api.sendRequest({
+					url: "/form/api/form/goodsform",
+					data: {
+						goods_id: this.goodsDetail.goods_id
+					},
+					success: res => {
+						if (res.code == 0 && res.data) {
+							this.goodsForm = res.data
+						}
+					}
+				});
+			},
 			hide() {
 				if(this.$refs.skuPopup) this.$refs.skuPopup.close();
 			},
@@ -175,6 +215,7 @@
 				} else {
 					this.number = 0;
 				}
+				this.calcSkuStock()
 			},
 			//查看规格图片
 			previewMedia() {
@@ -200,7 +241,7 @@
 						if (res.code >= 0) {
 							let data = res.data,
 								obj = {};
-
+							
 							res.data.forEach((item, index) => {
 								// 当前商品SKU规格
 								if (item.sku_spec_format) item.sku_spec_format = JSON.parse(item.sku_spec_format);
@@ -228,6 +269,8 @@
 								obj['sku_' + item.sku_id] = item;
 							});
 							this.goodsSkuList = obj;
+							this.skuList = res.data;
+							this.calcSkuStock();
 						}
 					}
 				});
@@ -281,12 +324,11 @@
 					}
 
 					const query = uni.createSelectorQuery().in(this);
-					query.select('#' + event.currentTarget.id + ' .click-event')
-						.boundingClientRect(data => {
-							if (data) {
-								this.$emit('addCart', data.left, data.top);
-							}
-						}).exec();
+					query.select('#' + event.currentTarget.id + ' .click-event').boundingClientRect(data => {
+						if (data) {
+							this.$emit('addCart', data.left, data.top);
+						}
+					}).exec();
 				} else if (tag == '-') {
 					// 减
 					if (this.number > min) {
@@ -325,14 +367,16 @@
 
 				let newNumber = parseInt(this.number);
 
-				this.isLoad = false;
+				this.isLoad = true;
+
 				setTimeout(() => {
 					this.number = newNumber;
 					this.cartNumChange(this.number);
 				}, 0);
 			},
 			//输入数量
-			keyInput(flag, callback) {
+			keyInput(flag, callback,isInput) {
+				if(isInput) this.isLoad = false
 				setTimeout(() => {
 					var stock = this.goodsDetail.stock;
 
@@ -352,7 +396,7 @@
 						this.number = stock;
 					}
 					// 商品起售数
-					if (this.minBuy > 1 && this.number < this.minBuy) {
+					if (flag && this.minBuy > 1 && this.number < this.minBuy) {
 						this.number = this.minBuy;
 					}
 
@@ -374,7 +418,13 @@
 					});
 					return;
 				}
-
+				if (this.$refs.form) {
+					if (!this.$refs.form.verify()) return;
+					uni.setStorageSync('goodFormData', {
+						goods_id: this.goodsDetail.goods_id,
+						form_data: this.$refs.form.formData
+					});
+				}
 				this.number = 1;
 				//纠正数量
 				this.keyInput(true, () => {
@@ -676,7 +726,20 @@
 		display: flex;
 		flex-wrap: wrap;
 	}
-
+	
+	.body-item .sku-list-wrap .empty-stock{
+		font-size: 18rpx;
+		line-height: 22rpx;
+		position: absolute;
+		right: 0;
+		top: 0;
+		border-radius: 4rpx;
+		transform: translateY(-50%);
+		padding: 0 2rpx;
+		color: #989898;
+		background-color: #f0f1f2;
+	}
+	
 	.sku-layer .body-item .sku-list-wrap .items {
 		text-align: center;
 		position: relative;
diff --git a/components/ns-goods-sku/ns-goods-sku-index.vue b/components/ns-goods-sku/ns-goods-sku-index.vue
index 5dcf5f0..03efb68 100644
--- a/components/ns-goods-sku/ns-goods-sku-index.vue
+++ b/components/ns-goods-sku/ns-goods-sku-index.vue
@@ -51,12 +51,7 @@
 			 * @param {Object} data 商品项
 			 */
 			singleSpecificationGoods(data, event) {
-				let cart =
-					this.cartList['goods_' + data.goods_id] && this.cartList['goods_' + data.goods_id]['sku_' + data
-						.sku_id
-					] ?
-					this.cartList['goods_' + data.goods_id]['sku_' + data.sku_id] :
-					null;
+				let cart = this.cartList['goods_' + data.goods_id] && this.cartList['goods_' + data.goods_id]['sku_' + data.sku_id] ? this.cartList['goods_' + data.goods_id]['sku_' + data.sku_id] : null;
 				
 				let cartNum = cart ? cart.num : 0;
 				let api = cart && cart.cart_id ? '/api/cart/edit' : '/api/cart/add';
@@ -66,6 +61,7 @@
 				if(cart && cart.cart_id){
 					_num = _num + (data.min_buy > 0 ? data.min_buy : 1)
 				}
+				
 				let cart_id = cart ? cart.cart_id : 0;
 				if (_num > parseInt(data.stock)) {
 					this.$util.showToast({
@@ -119,8 +115,7 @@
 						this.isRepeat = false;
 						if (res.code == 0) {
 							if (cart_id == 0) {
-								this.cartList['goods_' + data.goods_id]['sku_' + data.sku_id].cart_id =
-									res.data;
+								this.cartList['goods_' + data.goods_id]['sku_' + data.sku_id].cart_id = res.data;
 							}
 							this.$util.showToast({
 								title: "商品添加购物车成功"
diff --git a/components/ns-goods-sku/ns-goods-sku.vue b/components/ns-goods-sku/ns-goods-sku.vue
index 993553b..1d48d57 100644
--- a/components/ns-goods-sku/ns-goods-sku.vue
+++ b/components/ns-goods-sku/ns-goods-sku.vue
@@ -153,6 +153,7 @@
 								}" class="items" @click="change(item_value.sku_id, item_value.spec_id)">
 								<image v-if="item_value.image" :src="$util.img(item_value.image, { size: 'small' })" @error="valueImageError(index, index_value)" />
 								<text>{{ item_value.spec_value_name }}</text>
+								<view class="empty-stock" v-if="item_value.stock == 0">缺货</view>
 							</view>
 						</view>
 
@@ -173,8 +174,8 @@
 								</view>
 							</view>
 						</view>
-
-						<ns-form :data="goodsForm" v-if="goodsForm" ref="form"></ns-form>
+						
+						<ns-form :data="goodsForm" v-if="goodsForm" ref="form" @changeFormVal="changeFormVal"></ns-form>
 					</scroll-view>
 				</view>
 				<view class="footer" @click="confirm()">
@@ -182,7 +183,8 @@
 					<block v-if="type == 'point'">
 						<block v-if="goodsDetail.type == 1">
 							<!-- 兑换商品 -->
-							<button v-if="goodsDetail.stock && goodsDetail.stock != 0" type="primary">兑换</button>
+							<button v-if="goodsDetail.point * number > memberPoint" disabled="true" type="primary">积分不足</button>
+							<button v-else-if="goodsDetail.stock && goodsDetail.stock != 0" type="primary">兑换</button>
 							<button type="primary" v-else disabled="true">库存不足</button>
 						</block>
 						<block v-else-if="goodsDetail.type == 2 || goodsDetail.type == 3">
@@ -195,7 +197,8 @@
 						<button type="primary" v-else-if="goodsDetail.stock && goodsDetail.stock != 0 && type == 'buy_now'">立即购买</button>
 						<button type="primary" v-else-if="goodsDetail.stock && goodsDetail.stock != 0 && type == 'confirm'">确认</button>
 						<template v-else-if="goodsDetail.stock && goodsDetail.stock != 0">
-							<template v-if="goodsDetail.buy_num">
+							<!-- 拼团和拼返的buy_num代表最大购买数量，不是最小购买数量 -->
+							<template v-if="type != 'pintuan' && type != 'pinfan' && goodsDetail.buy_num">
 								<button type="primary" v-if="goodsDetail.buy_num <= goodsDetail.stock">立即抢购</button>
 								<button type="primary" v-else disabled="true">库存不足</button>
 							</template>
@@ -226,6 +229,10 @@
 				type: [Number, String],
 				default: 0
 			},
+			memberPoint: {
+				type: [Number, String],
+				default: 0
+			},
 			goodsDetail: {
 				type: Object,
 				default: null
@@ -244,6 +251,12 @@
 			minBuy: {
 				type: Number,
 				default: 0
+			},
+			goodsFormVal: {
+				type: Array,
+				default () {
+					return [];
+				}
 			}
 		},
 		data() {
@@ -265,7 +278,8 @@
 				pintuan_num_field: 'pintuan_num',
 				goodsSkuInfo: null, //所有的商品规格信息
 				goodsForm: null,
-				isLoad: false // 是否首次加载
+				isLoad: false ,// 是否首次加载
+				skuList: [],//所有规格数据
 			};
 		},
 		created() {
@@ -310,8 +324,8 @@
 						this.pintuan_num_field = newData.pintuan_num_field;
 					}
 					if (this.goodsDetail.goods_form && !this.goodsForm) this.goodsForm = this.goodsDetail.goods_form;
-
 					// 切换商品，重新赋值
+					this.calcSkuStock()
 					if (newData.goods_id != oldData.goods_id) {
 						if (this.goodsDetail.pintuan_id) {
 							this.getPintuanGoodsSkuList();
@@ -378,6 +392,34 @@
 			}
 		},
 		methods: {
+			calcSkuStock() {
+				if(this.goodsDetail.goods_spec_format && this.goodsDetail.goods_spec_format.length){
+					this.goodsDetail.goods_spec_format.forEach(spec => {
+						spec.value.forEach(val => {
+							this.skuList.forEach(sku => {
+								if (val.sku_id == sku.sku_id) {
+									this.$set(val,'stock',sku.stock);
+								}
+							})
+						})
+					})
+				}
+			},
+			changeFormVal(e) {
+				this.$emit('detailChangeVal',e)
+			},
+			getGoodsForm(){
+				this.$api.sendRequest({
+					url: "/form/api/form/goodsform",
+					data: {
+						goods_id: this.goodsDetail.goods_id
+					},
+					success: res => {
+						if (res.code == 0 && res.data) this.$set(this.goodsDetail, 'goods_form', res.data);
+						if(this.goodsFormVal.length) Object.assign(this.goodsDetail.goods_form,this.goodsFormVal)
+					}
+				});
+			},
 			//【普通商品】获取所有规格信息
 			getGeneralGoodsSkuList(callback) {
 				this.$api.sendRequest({
@@ -387,9 +429,7 @@
 					},
 					success: res => {
 						if (res.code >= 0) {
-							let data = res.data,
-								obj = {};
-
+							let obj = {};
 							res.data.forEach((item, index) => {
 								item = this.handleData(item);
 
@@ -415,6 +455,8 @@
 							if (this.skuId == 0) this.skuId = res.data[0].sku_id;
 							this.goodsSkuInfo = obj;
 							this.isLoad = false;
+							this.skuList = res.data;
+							this.calcSkuStock();
 							if (callback) callback();
 						} else {
 							this.$util.redirectTo('/pages/index/index');
@@ -493,7 +535,7 @@
 								item = this.handleData(item);
 								item.show_price = this.goodsDetail.groupbuy_price;
 								item.save_price = item.price - item.show_price > 0 ? (item.price - item.show_price).toFixed(2) : 0;
-
+								//团购buy_num指最少购买数量
 								if (data.stock > data.buy_num) {
 									this.number = this.goodsDetail.buy_num;
 									this.minNumber = this.goodsDetail.buy_num;
@@ -730,6 +772,9 @@
 			popclose() {
 				if (this.$refs.skuPopup.showPopup) {
 					this.$emit('hideSkuPop');
+				}else{
+					this.goodsForm = null
+					this.getGoodsForm()
 				}
 			},
 			//查看规格图片
@@ -766,7 +811,6 @@
 						}
 					}
 				}
-
 				this.goodsSkuDetail = this.goodsSkuInfo['sku_' + this.skuId];
 				this.$emit('refresh', this.goodsSkuDetail);
 				this.$emit('getSkuId', this.skuId);
@@ -781,6 +825,7 @@
 						this.confirmDisabled = false;
 					}
 				}
+				
 				this.keyInput(true);
 			},
 			showPrice(price) {
@@ -1013,7 +1058,7 @@
 						return;
 					}
 
-					if (this.goodsDetail.buy_num > this.goodsDetail.stock) {
+					if (this.type != 'pintuan' && this.type != 'pinfan' && this.goodsDetail.buy_num > this.goodsDetail.stock) {
 						this.$util.showToast({
 							title: '库存小于最低购买数量'
 						});
@@ -1077,7 +1122,7 @@
 										title: '加入购物车成功'
 									});
 									this.cartNum += this.number;
-
+									this.$store.dispatch('getCartNumber');
 									let discount_price = this.goodsDetail.discount_price;
 									if (this.goodsDetail.member_price > 0 && Number(this.goodsDetail.member_price) <= Number(this.goodsDetail.discount_price)) {
 										discount_price = this.goodsDetail.member_price;
@@ -1213,28 +1258,29 @@
 						});
 					} else if (this.type == 'bargain') {
 						// 砍价
-						this.$api.sendRequest({
-							url: '/bargain/api/bargain/launch',
-							data: {
-								id: this.goodsDetail.id
-							},
-							success: res => {
-								this.btnSwitch = false;
-								if (res.code == 0) {
-									this.$util.redirectTo(
-										'/pages_promotion/bargain/detail', {
+						if (this.callback) {
+							this.callback();
+						}else {
+							this.$api.sendRequest({
+								url: '/bargain/api/bargain/launch',
+								data: {
+									id: this.goodsDetail.id
+								},
+								success: res => {
+									this.btnSwitch = false;
+									if (res.code == 0) {
+										this.$util.redirectTo('/pages_promotion/bargain/detail', {
 											b_id: this.goodsDetail.bargain_id,
 											l_id: res.data
-										},
-										'redirectTo'
-									);
-								} else {
-									this.$util.showToast({
-										title: res.message
-									});
+										}, 'redirectTo');
+									} else {
+										this.$util.showToast({
+											title: res.message
+										});
+									}
 								}
-							}
-						});
+							});
+						}
 					} else if (this.type == 'point') {
 						// 积分兑换
 						var data = {
@@ -1399,13 +1445,27 @@
 
 	.body-item .sku-list-wrap {
 		padding-bottom: 0rpx;
+		position: relative;
 	}
 
 	.body-item .sku-list-wrap .title {
 		padding: 20rpx 0;
 		display: block;
 	}
-
+	
+	.body-item .sku-list-wrap .empty-stock{
+		font-size: 18rpx;
+		line-height: 22rpx;
+		position: absolute;
+		right: 0;
+		top: 0;
+		border-radius: 4rpx;
+		transform: translateY(-50%);
+		padding: 0 2rpx;
+		color: #989898;
+		background-color: #f0f1f2;
+	}
+	
 	.body-item .sku-list-wrap .items {
 		position: relative;
 		display: inline-block;
diff --git a/components/ns-login/ns-login.vue b/components/ns-login/ns-login.vue
index 3d431b6..5d291e6 100644
--- a/components/ns-login/ns-login.vue
+++ b/components/ns-login/ns-login.vue
@@ -1,784 +1,805 @@
-<template>
-	<view>
-		<!-- 完善会员资料 -->
-		<view @touchmove.prevent.stop class="complete-info-popup">
-			<uni-popup ref="completeInfoPopup" type="bottom" :maskClick="false">
-				<view class="complete-info-wrap">
-					<!-- #ifdef H5 -->
-					<template v-if="forceBindingMobileControl">
-						<view class="head">
-							<text class="title">检测到您还未绑定手机号</text>
-							<text class="color-tip tips">为了方便您接收订单等信息，需要绑定手机号</text>
-							<text class="iconfont icon-close color-tip" @click="cancelCompleteInfo"></text>
-						</view>
-						<view class="item-wrap">
-							<text class="label">手机号</text>
-							<input type="number" placeholder="请输入手机号" v-model="formData.mobile" maxlength="11" />
-						</view>
-						<view class="item-wrap" v-if="isOpenCaptcha">
-							<text class="label">验证码</text>
-							<input type="number" placeholder="请输入验证码" v-model="formData.vercode" maxlength="4" />
-							<image :src="captcha.img" class="captcha" @click="getCaptcha"></image>
-						</view>
-						<view class="item-wrap">
-							<text class="label">动态码</text>
-							<input type="number" placeholder="请输入动态码" v-model="formData.dynacode" maxlength="4" />
-							<view class="send color-base-text" @click="sendMobileCode">{{ dynacodeData.codeText }}
-							</view>
-						</view>
-					</template>
-					<button type="default" class="save-btn" @click="saveH5" :disabled="isDisabled">保存</button>
-					<!-- #endif -->
-
-					<!-- #ifdef MP -->
-					<view class="head">
-						<text class="title">
-							获取您的昵称、头像
-							<template v-if="forceBindingMobileControl">
-								、手机号
-							</template>
-						</text>
-						<text class="color-tip tips">
-							获取用户头像、昵称
-							<template v-if="forceBindingMobileControl">
-								、手机号
-							</template>
-							完善个人资料，主要用于向用户提供具有辨识度的用户中心界面
-						</text>
-						<text class="iconfont icon-close color-tip" @click="cancelCompleteInfo"></text>
-					</view>
-					<!-- #ifdef MP-WEIXIN -->
-					<view class="item-wrap">
-						<text class="label">头像</text>
-						<button open-type="chooseAvatar" @chooseavatar="onChooseAvatar">
-							<image :src="avatarUrl ? avatarUrl : $util.getDefaultImage().head" @error="avatarUrl = $util.getDefaultImage().head" mode="aspectFill"/>
-							<text class="iconfont icon-right color-tip"></text>
-						</button>
-					</view>
-					<view class="item-wrap">
-						<text class="label">昵称</text>
-						<input type="nickname" placeholder="请输入昵称" v-model="nickName" @blur="blurNickName" maxlength="50" />
-					</view>
-					<!-- #endif  -->
-
-					<!-- #ifdef MP-ALIPAY -->
-					<view class="item-wrap">
-						<text class="label">头像</text>
-						<button open-type="getAuthorize" scope="userInfo" @getAuthorize="aliappGetUserinfo" :plain="true" class="border-0">
-							<image :src="avatarUrl ? avatarUrl : $util.getDefaultImage().head" @error="avatarUrl = $util.getDefaultImage().head" mode="aspectFill"/>
-							<text class="iconfont icon-right color-tip"></text>
-						</button>
-					</view>
-					<view class="item-wrap">
-						<text class="label">昵称</text>
-						<input type="nickname" placeholder="请输入昵称" v-model="nickName" @blur="blurNickName" maxlength="50" />
-					</view>
-					<!-- #endif  -->
-					<view class="item-wrap" v-if="forceBindingMobileControl">
-						<text class="label">手机号</text>
-						<button open-type="getPhoneNumber" :plain="true" class="auth-login border-0" @getphonenumber="getPhoneNumber">
-							<text class="mobile" v-if="formData.mobile">{{ formData.mobile }}</text>
-							<text class="color-base-text" v-else>获取手机号</text>
-						</button>
-					</view>
-					<button type="default" class="save-btn" @click="saveMp" :disabled="isDisabled">保存</button>
-					<!-- #endif  -->
-				</view>
-			</uni-popup>
-		</view>
-
-		<!-- #ifdef MP-WEIXIN -->
-		<!-- 小程序隐私协议 -->
-		<privacy-popup ref="privacyPopup"></privacy-popup>
-		<!-- #endif -->
-
-		<register-reward ref="registerReward"></register-reward>
-	</view>
-</template>
-
-<script>
-	import uniPopup from '@/components/uni-popup/uni-popup.vue';
-	import registerReward from '@/components/register-reward/register-reward.vue';
-	import auth from 'common/js/auth.js';
-	import validate from 'common/js/validate.js';
-
-	export default {
-		mixins: [auth],
-		name: 'ns-login',
-		components: {
-			uniPopup,
-			registerReward
-		},
-		data() {
-			return {
-				url: '',
-				registerConfig: {},
-				avatarUrl: '', // 头像预览路径
-				headImg: '', // 头像上传路径
-				nickName: '', // 昵称
-				isSub: false,
-
-				// 绑定手机号
-				isOpenCaptcha: 0, // 前台登录验证码，0：关闭，1：开启
-				captcha: {
-					id: '',
-					img: ''
-				},
-				formData: {
-					key: '',
-					mobile: '',
-					vercode: '',
-					dynacode: ''
-				},
-				dynacodeData: {
-					seconds: 120,
-					timer: null,
-					codeText: '获取动态码',
-					isSend: false
-				},
-				// 小程序获取手机号所需数据
-				authMobileData: {
-					iv: '',
-					encryptedData: ''
-				}
-			};
-		},
-		options: {
-			styleIsolation: 'shared'
-		},
-		mounted() {},
-		watch: {
-			'dynacodeData.seconds': {
-				handler(newValue, oldValue) {
-					if (newValue == 0) {
-						this.refreshDynacodeData();
-					}
-				},
-				immediate: true,
-				deep: true
-			}
-		},
-		computed: {
-			// 控制按钮是否禁用
-			isDisabled() {
-				// #ifdef MP-WEIXIN
-				if (this.nickName.length == 0) return true;
-				// #endif
-
-				// 强制绑定手机号验证
-				if (this.forceBindingMobileControl) {
-					if (this.formData.mobile.length == 0) return true;
-
-					// #ifdef H5
-
-					// 验证码
-					if (this.isOpenCaptcha == 1 && this.formData.vercode.length == 0) return true;
-
-					// 动态码
-					if (this.formData.dynacode.length == 0) return true;
-
-					// #endif
-				}
-				return false;
-			},
-			forceBindingMobileControl() {
-				if (this.registerConfig && this.registerConfig.third_party == 1 && this.registerConfig.bind_mobile == 1)
-					return true;
-				else return false;
-			}
-		},
-		methods: {
-			// 获取注册配置
-			getRegisterConfig(callback = null) {
-				this.$api.sendRequest({
-					url: '/api/register/config',
-					success: res => {
-						if (res.code >= 0) {
-							this.registerConfig = res.data.value;
-							if (callback) callback();
-						}
-					}
-				});
-			},
-			open(url) {
-				if (url) this.url = url;
-				// #ifdef MP
-				this.getCode(authData => {
-					this.authLogin(authData, 'authOnlyLogin');
-				});
-				// #endif
-
-				// #ifdef H5
-				if (this.$util.isWeiXin()) {
-					let authData = uni.getStorageSync('authInfo');
-					if (authData) this.authLogin(authData);
-					else this.getCode();
-				} else {
-					this.toLogin();
-				}
-				// #endif
-
-				// #ifndef MP || H5
-				this.toLogin();
-				// #endif
-			},
-			// 跳转去登录页
-			toLogin() {
-				if (this.url) this.$util.redirectTo('/pages_tool/login/login', {
-					back: encodeURIComponent(this.url)
-				});
-				else this.$util.redirectTo('/pages_tool/login/login');
-			},
-			cancelCompleteInfo() {
-				if (this.$refs.completeInfoPopup) this.$refs.completeInfoPopup.close();
-				this.$store.commit('setBottomNavHidden', false); // 显示底部导航
-			},
-			blurNickName(e) {
-				if (e.detail.value) this.nickName = e.detail.value;
-			},
-			onChooseAvatar(e) {
-				this.avatarUrl = e.detail.avatarUrl;
-				uni.getFileSystemManager().readFile({
-					filePath: this.avatarUrl, //选择图片返回的相对路径
-					encoding: 'base64', //编码格式
-					success: res => {
-						let base64 = 'data:image/jpeg;base64,' + res.data; //不加上这串字符，在页面无法显示的哦
-
-						this.$api.uploadBase64({
-							base64,
-							success: res => {
-								if (res.code == 0) {
-									this.headImg = res.data.pic_path;
-								} else {
-									this.$util.showToast({
-										title: res.message
-									});
-								}
-							},
-							fail: () => {
-								this.$util.showToast({
-									title: '上传失败'
-								});
-							}
-						})
-					}
-				});
-			},
-			openCompleteInfoPop() {
-				this.getRegisterConfig();
-
-				// #ifdef H5
-				if (!this.storeToken) this.getCaptchaConfig();
-				// #endif
-
-				this.$refs.completeInfoPopup.open(() => {
-					this.$store.commit('setBottomNavHidden', false); //显示底部导航
-				});
-				this.$store.commit('setBottomNavHidden', true); //隐藏底部导航
-			},
-			// 获取前台登录验证码开关配置
-			getCaptchaConfig() {
-				this.$api.sendRequest({
-					url: '/api/config/getCaptchaConfig',
-					success: res => {
-						if (res.code >= 0) {
-							this.isOpenCaptcha = res.data.shop_reception_login;
-							if (this.isOpenCaptcha) this.getCaptcha();
-						}
-					}
-				});
-			},
-			// 获取验证码
-			getCaptcha() {
-				this.$api.sendRequest({
-					url: '/api/captcha/captcha',
-					data: {
-						captcha_id: this.captcha.id
-					},
-					success: res => {
-						if (res.code >= 0) {
-							this.captcha = res.data;
-							this.captcha.img = this.captcha.img.replace(/\r\n/g, '');
-						}
-					}
-				});
-			},
-			// 发送手机动态码
-			sendMobileCode() {
-				if (this.dynacodeData.seconds != 120 || this.dynacodeData.isSend) return;
-				var data = {
-					mobile: this.formData.mobile,
-					captcha_id: this.captcha.id,
-					captcha_code: this.formData.vercode
-				};
-				var rule = [{
-					name: 'mobile',
-					checkType: 'required',
-					errorMsg: '请输入手机号'
-				}, {
-					name: 'mobile',
-					checkType: 'phoneno',
-					errorMsg: '请输入正确的手机号'
-				}];
-				if (this.isOpenCaptcha == 1) {
-					rule.push({
-						name: 'captcha_code',
-						checkType: 'required',
-						errorMsg: '请输入验证码'
-					});
-				}
-				var checkRes = validate.check(data, rule);
-				if (!checkRes) {
-					this.$util.showToast({
-						title: validate.error
-					});
-					return;
-				}
-				this.dynacodeData.isSend = true;
-
-				if (this.dynacodeData.seconds == 120) {
-					this.dynacodeData.timer = setInterval(() => {
-						this.dynacodeData.seconds--;
-						this.dynacodeData.codeText = this.dynacodeData.seconds + 's后可重新获取';
-					}, 1000);
-				}
-
-				this.$api.sendRequest({
-					url: '/api/tripartite/mobileCode',
-					data: data,
-					success: res => {
-						if (res.code >= 0) {
-							this.formData.key = res.data.key;
-						} else {
-							this.$util.showToast({
-								title: res.message
-							});
-							this.refreshDynacodeData();
-						}
-					},
-					fail: () => {
-						this.$util.showToast({
-							title: 'request:fail'
-						});
-						this.refreshDynacodeData();
-					}
-				});
-			},
-			refreshDynacodeData() {
-				this.getCaptcha();
-				clearInterval(this.dynacodeData.timer);
-				this.dynacodeData = {
-					seconds: 120,
-					timer: null,
-					codeText: '获取动态码',
-					isSend: false
-				};
-			},
-			// 表单验证
-			verify(data) {
-				let rule = [{
-					name: 'mobile',
-					checkType: 'required',
-					errorMsg: '请输入手机号'
-				}, {
-					name: 'mobile',
-					checkType: 'phoneno',
-					errorMsg: '请输入正确的手机号'
-				}];
-				if (this.isOpenCaptcha == 1) {
-					if (this.captcha.id != '') rule.push({
-						name: 'captcha_code',
-						checkType: 'required',
-						errorMsg: '请输入验证码'
-					});
-				}
-				rule.push({
-					name: 'code',
-					checkType: 'required',
-					errorMsg: '请输入动态码'
-				});
-
-				var checkRes = validate.check(data, rule);
-				if (checkRes) {
-					return true;
-				} else {
-					this.$util.showToast({
-						title: validate.error
-					});
-					return false;
-				}
-			},
-			// 微信公众号强制绑定手机号
-			forceBindMobile() {
-				let authData = uni.getStorageSync('authInfo');
-				let data = {
-					mobile: this.formData.mobile,
-					key: this.formData.key,
-					code: this.formData.dynacode
-				};
-				if (this.captcha.id != '') {
-					data.captcha_id = this.captcha.id;
-					data.captcha_code = this.formData.vercode;
-				}
-
-				if (authData) Object.assign(data, authData);
-				if (authData.avatarUrl) data.headimg = authData.avatarUrl;
-				if (authData.nickName) data.nickname = authData.nickName;
-
-				if (uni.getStorageSync('source_member')) data.source_member = uni.getStorageSync('source_member');
-
-				if (this.isSub) return;
-				this.isSub = true;
-
-				this.$api.sendRequest({
-					url: '/api/tripartite/mobile',
-					data,
-					success: res => {
-						if (res.code >= 0) {
-							this.$store.commit('setToken', res.data.token);
-							this.getMemberInfo();
-							this.$store.dispatch('getCartNumber');
-							this.$refs.completeInfoPopup.close();
-							this.$store.commit('setBottomNavHidden', false); // 显示底部导航
-							if (res.data.is_register) this.$refs.registerReward.open(this.url);
-						} else {
-							this.isSub = false;
-							this.getCaptcha();
-							this.$util.showToast({
-								title: res.message
-							});
-						}
-					},
-					fail: res => {
-						this.isSub = false;
-						this.getCaptcha();
-					}
-				});
-			},
-			// 微信小程序获取手机号
-			getPhoneNumber(e) {
-				console.log(e)
-				if (e.detail.errMsg == 'getPhoneNumber:ok') {
-					let authData = uni.getStorageSync('authInfo');
-					if (authData) Object.assign(this.authMobileData, authData, e.detail);
-					if (uni.getStorageSync('source_member')) this.authMobileData.source_member = uni.getStorageSync('source_member');
-
-					this.$api.sendRequest({
-						url: '/api/tripartite/getPhoneNumber',
-						data: this.authMobileData,
-						success: res => {
-							if (res.code >= 0) {
-								this.formData.mobile = res.data.mobile;
-							} else {
-								this.formData.mobile = '';
-								this.$util.showToast({
-									title: res.message
-								});
-							}
-						}
-					});
-				} else {
-					this.$util.showToast({
-						title: e.detail.errMsg
-					})
-				}
-			},
-			// 微信小程序强制绑定手机号
-			bindMobile() {
-				let data = this.authMobileData;
-				let authData = uni.getStorageSync('authInfo');
-				if (authData) Object.assign(data, authData);
-				if (authData.avatarUrl) data.headimg = authData.avatarUrl;
-				if (authData.nickName) data.nickname = authData.nickName;
-
-				this.$api.sendRequest({
-					url: '/api/tripartite/mobileauth',
-					data,
-					success: res => {
-						if (res.code >= 0) {
-							this.$store.commit('setToken', res.data.token);
-							this.getMemberInfo();
-							this.$store.dispatch('getCartNumber');
-							this.cancelCompleteInfo();
-							if (res.data.is_register) this.$refs.registerReward.open(this.url);
-						} else {
-							this.$util.showToast({
-								title: res.message
-							});
-						}
-					},
-					fail: res => {
-						this.$util.showToast({
-							title: 'request:fail'
-						});
-					}
-				});
-			},
-			/**
-			 * 授权登录
-			 */
-			authLogin(data, type = 'authLogin') {
-				uni.showLoading({
-					title: '登录中'
-				});
-				uni.setStorageSync('authInfo', data);
-				if (uni.getStorageSync('source_member')) data.source_member = uni.getStorageSync('source_member');
-
-				this.$api.sendRequest({
-					url: type == 'authLogin' ? '/api/login/auth' : '/api/login/authonlylogin',
-					data,
-					success: res => {
-						if (res.code >= 0) {
-							this.$store.commit('setToken', res.data.token);
-							this.getMemberInfo();
-							this.$store.dispatch('getCartNumber');
-							if (res.data.is_register) this.$refs.registerReward.open(this
-								.url);
-							this.cancelCompleteInfo();
-							setTimeout(() => {
-								uni.hideLoading(); 
-							}, 1000);
-						} else if (res.data == 'MEMBER_NOT_EXIST') {
-							this.getRegisterConfig(() => {
-								uni.hideLoading();
-								if (this.registerConfig.third_party == 1 && this.registerConfig.bind_mobile == 1) {
-									this.openCompleteInfoPop();
-								} else if (this.registerConfig.third_party == 0) {
-									this.toLogin();
-								} else {
-									this.openCompleteInfoPop();
-								}
-							});
-						} else {
-							uni.hideLoading();
-							this.$util.showToast({
-								title: res.message
-							});
-						}
-					},
-					fail: () => {
-						uni.hideLoading();
-						this.$util.showToast({
-							title: '登录失败'
-						});
-					}
-				});
-			},
-			// 微信公众号，强制绑定手机号，验证
-			saveH5() {
-				if (this.$util.isWeiXin() && this.forceBindingMobileControl) {
-					let data = {
-						mobile: this.formData.mobile,
-						key: this.formData.key,
-						code: this.formData.dynacode
-					};
-					if (this.captcha.id != '') {
-						data.captcha_id = this.captcha.id;
-						data.captcha_code = this.formData.vercode;
-					}
-					if (!this.verify(data)) return;
-				}
-				this.forceBindMobile();
-			},
-			// 微信小程序保存数据
-			saveMp() {
-				if (this.nickName.length == 0) {
-					this.$util.showToast({
-						title: '请输入昵称'
-					});
-					return;
-				}
-				let authData = uni.getStorageSync('authInfo');
-				if (authData) Object.assign(authData, {
-					nickName: this.nickName,
-					avatarUrl: this.headImg
-				});
-				uni.setStorageSync('authInfo', authData);
-
-				if (this.forceBindingMobileControl) this.bindMobile();
-				else this.authLogin(authData);
-			},
-			// #ifdef MP-ALIPAY
-			aliappGetUserinfo() {
-				my.getOpenUserInfo({
-					success: (res) => {
-						let userInfo = JSON.parse(res.response).response
-						if (userInfo.code && userInfo.code == '10000') {
-							if (userInfo.avatar) {
-								this.avatarUrl = userInfo.avatar;
-								this.$api.pullImage({
-									path: this.avatarUrl,
-									success: res => {
-										if (res.code == 0) {
-											this.headImg = res.data.pic_path;
-										} else {
-											this.$util.showToast({
-												title: res.message
-											});
-										}
-									},
-									fail: () => {
-										this.$util.showToast({
-											title: '头像拉取失败'
-										});
-									}
-								})
-							}
-							this.nickName = userInfo.nickName
-						} else {
-							this.$util.showToast({
-								title: userInfo.subMsg
-							})
-						}
-					},
-					fail: (err) => {
-						this.$util.showToast({
-							title: err.subMsg
-						})
-					}
-				});
-			},
-			// #endif
-			getMemberInfo() {
-				this.$api.sendRequest({
-					url: '/api/member/info',
-					success: (res) => {
-						if (res.code >= 0) {
-							// 登录成功，存储会员信息
-							this.$store.commit('setMemberInfo', res.data);
-						}
-					}
-				});
-			}
-		}
-	};
-</script>
-
-<style lang="scss">
-	.complete-info-popup {
-		.complete-info-wrap {
-			background: #fff;
-			padding: 50rpx 40rpx 40rpx;
-
-			.head {
-				position: relative;
-				border-bottom: 2rpx solid $color-line;
-				padding-bottom: 20rpx;
-
-				.title {
-					font-size: $font-size-toolbar;
-					display: block;
-				}
-
-				.tips {
-					font-size: $font-size-base;
-					display: block;
-				}
-
-				.iconfont {
-					position: absolute;
-					right: 0;
-					top: -30rpx;
-					display: inline-block;
-					width: 56rpx;
-					height: 56rpx;
-					line-height: 56rpx;
-					text-align: right;
-					font-size: $font-size-toolbar;
-					font-weight: bold;
-				}
-			}
-
-			.item-wrap {
-				border-bottom: 2rpx solid $color-line;
-				display: flex;
-				align-items: center;
-				padding: 16rpx 0;
-
-				.label {
-					font-size: $font-size-toolbar;
-					margin-right: 40rpx;
-					width: 100rpx;
-				}
-
-				button {
-					background: transparent;
-					margin: 0;
-					padding: 0;
-					border-radius: 0;
-					flex: 1;
-					text-align: left;
-					display: flex;
-					align-items: center;
-					font-size: $font-size-toolbar;
-					border: none;
-
-					image {
-						width: 100rpx;
-						height: 100rpx;
-						border-radius: 10rpx;
-						overflow: hidden;
-					}
-				}
-
-				.iconfont {
-					flex: 1;
-					text-align: right;
-					font-size: $font-size-tag;
-				}
-
-				input {
-					flex: 1;
-					height: 80rpx;
-					box-sizing: border-box;
-					font-size: $font-size-toolbar;
-				}
-
-				.send {
-					border: 2rpx solid $base-color;
-					height: 60rpx;
-					line-height: 60rpx;
-					border-radius: 60rpx;
-					font-size: $font-size-tag;
-					text-align: center;
-					padding: 0 40rpx;
-				}
-
-				.captcha {
-					height: 80rpx;
-					width: 200rpx;
-				}
-
-				.auth-login {
-					width: calc(100% - 100rpx);
-					height: 80rpx;
-					line-height: 80rpx;
-					border-radius: 80rpx;
-				}
-			}
-
-			.save-btn {
-				width: 280rpx;
-				height: 90rpx;
-				line-height: 90rpx;
-				background-color: #07c160;
-				color: #fff;
-				margin: 40rpx auto 20rpx;
-			}
-		}
-	}
-</style>
-<style scoped>
-	/deep/ .reward-popup .uni-popup__wrapper-box {
-		background: none !important;
-		max-width: unset !important;
-		max-height: unset !important;
-		overflow: unset !important;
-	}
-
-	.complete-info-popup /deep/ .uni-popup__wrapper.bottom,
-	.complete-info-popup /deep/ .uni-popup__wrapper.bottom .uni-popup__wrapper-box {
-		border-top-left-radius: 30rpx !important;
-		border-top-right-radius: 30rpx !important;
-	}
+<template>
+	<view>
+		<!-- 完善会员资料 -->
+		<view @touchmove.prevent.stop class="complete-info-popup">
+			<uni-popup ref="completeInfoPopup" type="bottom" :maskClick="false">
+				<view class="complete-info-wrap">
+					<!-- #ifdef H5 -->
+					<template v-if="forceBindingMobileControl">
+						<view class="head">
+							<text class="title">检测到您还未绑定手机号</text>
+							<text class="color-tip tips">为了方便您接收订单等信息，需要绑定手机号</text>
+							<text class="iconfont icon-close color-tip" @click="cancelCompleteInfo"></text>
+						</view>
+						<view class="item-wrap">
+							<text class="label">手机号</text>
+							<input type="number" placeholder="请输入手机号" v-model="formData.mobile" maxlength="11" />
+						</view>
+						<view class="item-wrap" v-if="isOpenCaptcha">
+							<text class="label">验证码</text>
+							<input type="number" placeholder="请输入验证码" v-model="formData.vercode" maxlength="4" />
+							<image :src="captcha.img" class="captcha" @click="getCaptcha"></image>
+						</view>
+						<view class="item-wrap">
+							<text class="label">动态码</text>
+							<input type="number" placeholder="请输入动态码" v-model="formData.dynacode" maxlength="4" />
+							<view class="send color-base-text" @click="sendMobileCode">{{ dynacodeData.codeText }}
+							</view>
+						</view>
+					</template>
+					<button type="default" class="save-btn" @click="saveH5" :disabled="isDisabled">保存</button>
+					<!-- #endif -->
+
+					<!-- #ifdef MP -->
+					<view class="head">
+						<text class="title">
+							获取您的昵称、头像
+							<template v-if="forceBindingMobileControl">、手机号</template>
+						</text>
+						<text class="color-tip tips">
+							获取用户头像、昵称
+							<template v-if="forceBindingMobileControl">、手机号</template>
+							完善个人资料，主要用于向用户提供具有辨识度的用户中心界面
+						</text>
+						<text class="iconfont icon-close color-tip" @click="cancelCompleteInfo"></text>
+					</view>
+					<!-- #ifdef MP-WEIXIN -->
+					<view class="item-wrap">
+						<text class="label">头像</text>
+						<button open-type="chooseAvatar" @chooseavatar="onChooseAvatar">
+							<image :src="avatarUrl ? avatarUrl : $util.getDefaultImage().head" @error="avatarUrl = $util.getDefaultImage().head" mode="aspectFill"/>
+							<text class="iconfont icon-right color-tip"></text>
+						</button>
+					</view>
+					<view class="item-wrap">
+						<text class="label">昵称</text>
+						<input type="nickname" placeholder="请输入昵称" v-model="nickName" @blur="blurNickName" maxlength="50" />
+					</view>
+					<!-- #endif  -->
+
+					<!-- #ifdef MP-ALIPAY -->
+					<view class="item-wrap">
+						<text class="label">头像</text>
+						<button open-type="getAuthorize" scope="userInfo" @getAuthorize="aliappGetUserinfo" :plain="true" class="border-0">
+							<image :src="avatarUrl ? avatarUrl : $util.getDefaultImage().head" @error="avatarUrl = $util.getDefaultImage().head" mode="aspectFill"/>
+							<text class="iconfont icon-right color-tip"></text>
+						</button>
+					</view>
+					<view class="item-wrap">
+						<text class="label">昵称</text>
+						<input type="nickname" placeholder="请输入昵称" v-model="nickName" @blur="blurNickName" maxlength="50" />
+					</view>
+					<!-- #endif  -->
+					<view class="item-wrap" v-if="forceBindingMobileControl">
+						<text class="label">手机号</text>
+						<button open-type="getPhoneNumber" :plain="true" class="auth-login border-0" @getphonenumber="getPhoneNumber">
+							<text class="mobile" v-if="formData.mobile">{{ formData.mobile }}</text>
+							<text class="color-base-text" v-else>获取手机号</text>
+						</button>
+					</view>
+					<button type="default" class="save-btn" @click="saveMp" :disabled="isDisabled">保存</button>
+					<!-- #endif  -->
+				</view>
+			</uni-popup>
+		</view>
+
+		<!-- #ifdef MP-WEIXIN -->
+		<!-- 小程序隐私协议 -->
+		<privacy-popup ref="privacyPopup"></privacy-popup>
+		<!-- #endif -->
+
+		<register-reward ref="registerReward"></register-reward>
+	</view>
+</template>
+
+<script>
+	import uniPopup from '@/components/uni-popup/uni-popup.vue';
+	import registerReward from '@/components/register-reward/register-reward.vue';
+	import auth from 'common/js/auth.js';
+	import validate from 'common/js/validate.js';
+
+	export default {
+		mixins: [auth],
+		name: 'ns-login',
+		components: {
+			uniPopup,
+			registerReward
+		},
+		data() {
+			return {
+				url: '',
+				registerConfig: {},
+				avatarUrl: '', // 头像预览路径
+				headImg: '', // 头像上传路径
+				nickName: '', // 昵称
+				isSub: false,
+
+				// 绑定手机号
+				isOpenCaptcha: 0, // 前台登录验证码，0：关闭，1：开启
+				captcha: {
+					id: '',
+					img: ''
+				},
+				formData: {
+					key: '',
+					mobile: '',
+					vercode: '',
+					dynacode: ''
+				},
+				dynacodeData: {
+					seconds: 120,
+					timer: null,
+					codeText: '获取动态码',
+					isSend: false
+				},
+				// 小程序获取手机号所需数据
+				authMobileData: {
+					iv: '',
+					encryptedData: ''
+				}
+			};
+		},
+		options: {
+			styleIsolation: 'shared'
+		},
+		mounted() {},
+		watch: {
+			'dynacodeData.seconds': {
+				handler(newValue, oldValue) {
+					if (newValue == 0) {
+						this.refreshDynacodeData();
+					}
+				},
+				immediate: true,
+				deep: true
+			},
+		},
+		computed: {
+			// 控制按钮是否禁用
+			isDisabled() {
+				// #ifdef MP-WEIXIN
+				if (this.nickName.length == 0) return true;
+				// #endif
+
+				// 强制绑定手机号验证
+				if (this.forceBindingMobileControl) {
+					if (this.formData.mobile.length == 0) return true;
+
+					// #ifdef H5
+
+					// 验证码
+					if (this.isOpenCaptcha == 1 && this.formData.vercode.length == 0) return true;
+
+					// 动态码
+					if (this.formData.dynacode.length == 0) return true;
+
+					// #endif
+				}
+				return false;
+			},
+			forceBindingMobileControl() {
+				if (this.registerConfig && this.registerConfig.third_party == 1 && this.registerConfig.bind_mobile == 1) return true;
+				else return false;
+			},
+			wechatConfigStatus() {
+				return this.$store.state.wechatConfigStatus;
+			},
+			
+		},
+		methods: {
+			// 获取注册配置
+			getRegisterConfig(callback = null) {
+				this.$api.sendRequest({
+					url: '/api/register/config',
+					success: res => {
+						if (res.code >= 0) {
+							this.registerConfig = res.data.value;
+							if (callback) callback();
+						}
+					}
+				});
+			},
+			open(url,isMiddleIndex = false) {
+				if(!url) url = this.$util.getCurrentRoute().path;
+				this.url = url;
+				
+				if(this.url) uni.setStorageSync('initiateLogin',this.url)
+				if(!isMiddleIndex){
+					this.toLogin();
+					return;
+				}
+				// #ifdef MP
+				this.getCode(authData => {
+					this.authLogin(authData, 'authOnlyLogin');
+				});
+				// #endif
+
+				// #ifdef H5
+				if (this.$util.isWeiXin() && this.wechatConfigStatus) {
+					let authData = uni.getStorageSync('authInfo');
+					if (authData) this.authLogin(authData);
+					else this.getCode();
+				} else {
+					this.toLogin();
+				}
+				// #endif
+				// #ifndef MP || H5
+				this.toLogin();
+				// #endif
+			},
+			// 跳转去登录页
+			toLogin() {
+				if (this.url) this.$util.redirectTo('/pages_tool/login/login', {
+					back: encodeURIComponent(this.url)
+				});
+				else this.$util.redirectTo('/pages_tool/login/login');
+			},
+			cancelCompleteInfo() {
+				if (this.$refs.completeInfoPopup) this.$refs.completeInfoPopup.close();
+				this.$store.commit('setBottomNavHidden', false); // 显示底部导航
+			},
+			blurNickName(e) {
+				if (e.detail.value) this.nickName = e.detail.value;
+			},
+			onChooseAvatar(e) {
+				this.avatarUrl = e.detail.avatarUrl;
+				uni.getFileSystemManager().readFile({
+					filePath: this.avatarUrl, //选择图片返回的相对路径
+					encoding: 'base64', //编码格式
+					success: res => {
+						let base64 = 'data:image/jpeg;base64,' + res.data; //不加上这串字符，在页面无法显示的哦
+
+						this.$api.uploadBase64({
+							base64,
+							success: res => {
+								if (res.code == 0) {
+									this.headImg = res.data.pic_path;
+								} else {
+									this.$util.showToast({
+										title: res.message
+									});
+								}
+							},
+							fail: () => {
+								this.$util.showToast({
+									title: '上传失败'
+								});
+							}
+						})
+					}
+				});
+			},
+			openCompleteInfoPop() {
+				this.getRegisterConfig();
+
+				// #ifdef H5
+				if (!this.storeToken) this.getCaptchaConfig();
+				// #endif
+
+				this.$refs.completeInfoPopup.open(() => {
+					this.$store.commit('setBottomNavHidden', false); //显示底部导航
+				});
+				this.$store.commit('setBottomNavHidden', true); //隐藏底部导航
+			},
+			// 获取前台登录验证码开关配置
+			getCaptchaConfig() {
+				this.$api.sendRequest({
+					url: '/api/config/getCaptchaConfig',
+					success: res => {
+						if (res.code >= 0) {
+							this.isOpenCaptcha = res.data.shop_reception_login;
+							if (this.isOpenCaptcha) this.getCaptcha();
+						}
+					}
+				});
+			},
+			// 获取验证码
+			getCaptcha() {
+				this.$api.sendRequest({
+					url: '/api/captcha/captcha',
+					data: {
+						captcha_id: this.captcha.id
+					},
+					success: res => {
+						if (res.code >= 0) {
+							this.captcha = res.data;
+							this.captcha.img = this.captcha.img.replace(/\r\n/g, '');
+						}
+					}
+				});
+			},
+			// 发送手机动态码
+			sendMobileCode() {
+				if (this.dynacodeData.seconds != 120 || this.dynacodeData.isSend) return;
+				var data = {
+					mobile: this.formData.mobile,
+					captcha_id: this.captcha.id,
+					captcha_code: this.formData.vercode
+				};
+				var rule = [{
+					name: 'mobile',
+					checkType: 'required',
+					errorMsg: '请输入手机号'
+				}, {
+					name: 'mobile',
+					checkType: 'phoneno',
+					errorMsg: '请输入正确的手机号'
+				}];
+				if (this.isOpenCaptcha == 1) {
+					rule.push({
+						name: 'captcha_code',
+						checkType: 'required',
+						errorMsg: '请输入验证码'
+					});
+				}
+				var checkRes = validate.check(data, rule);
+				if (!checkRes) {
+					this.$util.showToast({
+						title: validate.error
+					});
+					return;
+				}
+				this.dynacodeData.isSend = true;
+
+				if (this.dynacodeData.seconds == 120) {
+					this.dynacodeData.timer = setInterval(() => {
+						this.dynacodeData.seconds--;
+						this.dynacodeData.codeText = this.dynacodeData.seconds + 's后可重新获取';
+					}, 1000);
+				}
+
+				this.$api.sendRequest({
+					url: '/api/tripartite/mobileCode',
+					data: data,
+					success: res => {
+						if (res.code >= 0) {
+							this.formData.key = res.data.key;
+						} else {
+							this.$util.showToast({
+								title: res.message
+							});
+							this.refreshDynacodeData();
+						}
+					},
+					fail: () => {
+						this.$util.showToast({
+							title: 'request:fail'
+						});
+						this.refreshDynacodeData();
+					}
+				});
+			},
+			refreshDynacodeData() {
+				this.getCaptcha();
+				clearInterval(this.dynacodeData.timer);
+				this.dynacodeData = {
+					seconds: 120,
+					timer: null,
+					codeText: '获取动态码',
+					isSend: false
+				};
+			},
+			// 表单验证
+			verify(data) {
+				let rule = [{
+					name: 'mobile',
+					checkType: 'required',
+					errorMsg: '请输入手机号'
+				}, {
+					name: 'mobile',
+					checkType: 'phoneno',
+					errorMsg: '请输入正确的手机号'
+				}];
+				if (this.isOpenCaptcha == 1) {
+					if (this.captcha.id != '') rule.push({
+						name: 'captcha_code',
+						checkType: 'required',
+						errorMsg: '请输入验证码'
+					});
+				}
+				rule.push({
+					name: 'code',
+					checkType: 'required',
+					errorMsg: '请输入动态码'
+				});
+
+				var checkRes = validate.check(data, rule);
+				if (checkRes) {
+					return true;
+				} else {
+					this.$util.showToast({
+						title: validate.error
+					});
+					return false;
+				}
+			},
+			// 微信公众号强制绑定手机号
+			forceBindMobile() {
+				let authData = uni.getStorageSync('authInfo');
+				let data = {
+					mobile: this.formData.mobile,
+					key: this.formData.key,
+					code: this.formData.dynacode
+				};
+				if (this.captcha.id != '') {
+					data.captcha_id = this.captcha.id;
+					data.captcha_code = this.formData.vercode;
+				}
+
+				if (authData) Object.assign(data, authData);
+				if (authData.avatarUrl) data.headimg = authData.avatarUrl;
+				if (authData.nickName) data.nickname = authData.nickName;
+
+				if (uni.getStorageSync('source_member')) data.source_member = uni.getStorageSync('source_member');
+
+				if (this.isSub) return;
+				this.isSub = true;
+
+				this.$api.sendRequest({
+					url: '/api/tripartite/mobile',
+					data,
+					success: res => {
+						if (res.code >= 0) {
+							this.$store.commit('setToken', res.data.token);
+							this.getMemberInfo();
+							this.$store.dispatch('getCartNumber');
+							this.$refs.completeInfoPopup.close();
+							this.$store.commit('setBottomNavHidden', false); // 显示底部导航
+							if (res.data.is_register) {
+								this.$store.commit('setCanReceiveRegistergiftInfo',{status: true,path: this.$util.openRegisterRewardPath('/pages/index/index')});
+								this.$util.loginComplete('/pages/index/index','redirectTo');
+							}
+							
+							// if (res.data.is_register) this.$refs.registerReward.open(this.url);
+						} else {
+							this.isSub = false;
+							this.getCaptcha();
+							this.$util.showToast({
+								title: res.message
+							});
+						}
+					},
+					fail: res => {
+						this.isSub = false;
+						this.getCaptcha();
+					}
+				});
+			},
+			// 微信小程序获取手机号
+			getPhoneNumber(e) {
+				if (e.detail.errMsg == 'getPhoneNumber:ok') {
+					let authData = uni.getStorageSync('authInfo');
+					if (authData) Object.assign(this.authMobileData, authData, e.detail);
+					if (uni.getStorageSync('source_member')) this.authMobileData.source_member = uni.getStorageSync('source_member');
+
+					this.$api.sendRequest({
+						url: '/api/tripartite/getPhoneNumber',
+						data: this.authMobileData,
+						success: res => {
+							if (res.code >= 0) {
+								this.formData.mobile = res.data.mobile;
+							} else {
+								this.formData.mobile = '';
+								this.$util.showToast({
+									title: res.message
+								});
+							}
+						}
+					});
+				} else {
+					this.$util.showToast({
+						title: '为了保证您账户的统一性，取消授权将无法为您提供服务'
+					})
+				}
+			},
+			// 微信小程序强制绑定手机号
+			bindMobile() {
+				let data = this.authMobileData;
+				let authData = uni.getStorageSync('authInfo');
+				if (authData) Object.assign(data, authData);
+				if (authData.avatarUrl) data.headimg = authData.avatarUrl;
+				if (authData.nickName) data.nickname = authData.nickName;
+
+				this.$api.sendRequest({
+					url: '/api/tripartite/mobileauth',
+					data,
+					success: res => {
+						if (res.code >= 0) {
+							this.$store.commit('setToken', res.data.token);
+							this.getMemberInfo();
+							this.$store.dispatch('getCartNumber');
+							this.cancelCompleteInfo();
+							if (res.data.is_register) {
+								this.$store.commit('setCanReceiveRegistergiftInfo',{status: true,path:this.$util.openRegisterRewardPath('/pages/index/index')});
+								this.$util.loginComplete('/pages/index/index','redirectTo');
+							}
+							// if (res.data.is_register) this.$refs.registerReward.open(this.url);
+						} else {
+							this.$util.showToast({
+								title: res.message
+							});
+						}
+					},
+					fail: res => {
+						this.$util.showToast({
+							title: 'request:fail'
+						});
+					}
+				});
+			},
+			/**
+			 * 授权登录
+			 */
+			authLogin(data, type = 'authLogin') {
+				uni.showLoading({
+					title: '登录中'
+				});
+				uni.setStorageSync('authInfo', data);
+				if (uni.getStorageSync('source_member')) data.source_member = uni.getStorageSync('source_member');
+				this.$api.sendRequest({
+					url: type == 'authLogin' ? '/api/login/auth' : '/api/login/authonlylogin',
+					data,
+					success: res => {
+						if (res.code >= 0) {
+							this.$store.commit('setToken', res.data.token);
+							this.getMemberInfo();
+							this.$store.dispatch('getCartNumber');
+							if (res.data.is_register){
+								this.$store.commit('setCanReceiveRegistergiftInfo',{status: true,path:this.$util.openRegisterRewardPath('/pages/index/index')});
+								this.$util.loginComplete('/pages/index/index','redirectTo');
+								// this.$refs.registerReward.open(this.url);
+							}else{
+								// if(this.url) this.$util.redirectTo(this.url,{},'redirectTo')
+								// else this.$util.redirectTo('/pages/member/index',{},'redirectTo')
+								if(this.url) this.$util.loginComplete(this.url,{},'redirectTo');
+								else this.$util.loginComplete('/pages/member/index/index',{},'redirectTo')
+							}
+							this.cancelCompleteInfo();
+							
+							setTimeout(() => {
+								uni.hideLoading();
+							}, 1000);
+						} else if (res.data == 'MEMBER_NOT_EXIST') {
+							this.getRegisterConfig(() => {
+								uni.hideLoading();
+								if (this.registerConfig.third_party == 1 && this.registerConfig.bind_mobile == 1) {
+									this.openCompleteInfoPop();
+								} else if (this.registerConfig.third_party == 0) {
+									this.toLogin();
+								} else {
+									this.openCompleteInfoPop();
+								}
+							});
+						} else {
+							uni.hideLoading();
+							this.$util.showToast({
+								title: res.message
+							});
+						}
+					},
+					fail: () => {
+						uni.hideLoading();
+						this.$util.showToast({
+							title: '登录失败'
+						});
+					}
+				});
+			},
+			// 微信公众号，强制绑定手机号，验证
+			saveH5() {
+				if (this.$util.isWeiXin() && this.forceBindingMobileControl) {
+					let data = {
+						mobile: this.formData.mobile,
+						key: this.formData.key,
+						code: this.formData.dynacode
+					};
+					if (this.captcha.id != '') {
+						data.captcha_id = this.captcha.id;
+						data.captcha_code = this.formData.vercode;
+					}
+					if (!this.verify(data)) return;
+				}
+				this.forceBindMobile();
+			},
+			// 微信小程序保存数据
+			saveMp() {
+				if (this.nickName.length == 0) {
+					this.$util.showToast({
+						title: '请输入昵称'
+					});
+					return;
+				}
+				let authData = uni.getStorageSync('authInfo');
+				if (authData) Object.assign(authData, {
+					nickName: this.nickName,
+					avatarUrl: this.headImg
+				});
+				uni.setStorageSync('authInfo', authData);
+
+				if (this.forceBindingMobileControl) this.bindMobile();
+				else this.authLogin(authData);
+			},
+			// #ifdef MP-ALIPAY
+			aliappGetUserinfo() {
+				my.getOpenUserInfo({
+					success: (res) => {
+						let userInfo = JSON.parse(res.response).response
+						if (userInfo.code && userInfo.code == '10000') {
+							if (userInfo.avatar) {
+								this.avatarUrl = userInfo.avatar;
+								this.$api.pullImage({
+									path: this.avatarUrl,
+									success: res => {
+										if (res.code == 0) {
+											this.headImg = res.data.pic_path;
+										} else {
+											this.$util.showToast({
+												title: res.message
+											});
+										}
+									},
+									fail: () => {
+										this.$util.showToast({
+											title: '头像拉取失败'
+										});
+									}
+								})
+							}
+							this.nickName = userInfo.nickName
+						} else {
+							this.$util.showToast({
+								title: userInfo.subMsg
+							})
+						}
+					},
+					fail: (err) => {
+						this.$util.showToast({
+							title: err.subMsg
+						})
+					}
+				});
+			},
+			// #endif
+			getMemberInfo() {
+				this.$api.sendRequest({
+					url: '/api/member/info',
+					success: (res) => {
+						if (res.code >= 0) {
+							// 登录成功，存储会员信息
+							this.$store.commit('setMemberInfo', res.data);
+						}
+					}
+				});
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	.complete-info-popup {
+		.complete-info-wrap {
+			background: #fff;
+			padding: 50rpx 40rpx 40rpx;
+
+			.head {
+				position: relative;
+				border-bottom: 2rpx solid $color-line;
+				padding-bottom: 20rpx;
+
+				.title {
+					font-size: $font-size-toolbar;
+					display: block;
+				}
+
+				.tips {
+					font-size: $font-size-base;
+					display: block;
+				}
+
+				.iconfont {
+					position: absolute;
+					right: 0;
+					top: -30rpx;
+					display: inline-block;
+					width: 56rpx;
+					height: 56rpx;
+					line-height: 56rpx;
+					text-align: right;
+					font-size: $font-size-toolbar;
+					font-weight: bold;
+				}
+			}
+
+			.item-wrap {
+				border-bottom: 2rpx solid $color-line;
+				display: flex;
+				align-items: center;
+				padding: 16rpx 0;
+
+				.label {
+					font-size: $font-size-toolbar;
+					margin-right: 40rpx;
+					width: 100rpx;
+				}
+
+				button {
+					background: transparent;
+					margin: 0;
+					padding: 0;
+					border-radius: 0;
+					flex: 1;
+					text-align: left;
+					display: flex;
+					align-items: center;
+					font-size: $font-size-toolbar;
+					border: none;
+
+					image {
+						width: 100rpx;
+						height: 100rpx;
+						border-radius: 10rpx;
+						overflow: hidden;
+					}
+				}
+
+				.iconfont {
+					flex: 1;
+					text-align: right;
+					font-size: $font-size-tag;
+				}
+
+				input {
+					flex: 1;
+					height: 80rpx;
+					box-sizing: border-box;
+					font-size: $font-size-toolbar;
+				}
+
+				.send {
+					border: 2rpx solid $base-color;
+					height: 60rpx;
+					line-height: 60rpx;
+					border-radius: 60rpx;
+					font-size: $font-size-tag;
+					text-align: center;
+					padding: 0 40rpx;
+				}
+
+				.captcha {
+					height: 80rpx;
+					width: 200rpx;
+				}
+
+				.auth-login {
+					width: calc(100% - 100rpx);
+					height: 80rpx;
+					line-height: 80rpx;
+					border-radius: 80rpx;
+				}
+			}
+
+			.save-btn {
+				width: 280rpx;
+				height: 90rpx;
+				line-height: 90rpx;
+				background-color: #07c160;
+				color: #fff;
+				margin: 40rpx auto 20rpx;
+			}
+		}
+	}
+</style>
+<style scoped>
+	/deep/ .reward-popup .uni-popup__wrapper-box {
+		background: none !important;
+		max-width: unset !important;
+		max-height: unset !important;
+		overflow: unset !important;
+	}
+
+	.complete-info-popup /deep/ .uni-popup__wrapper.bottom,
+	.complete-info-popup /deep/ .uni-popup__wrapper.bottom .uni-popup__wrapper-box {
+		border-top-left-radius: 30rpx !important;
+		border-top-right-radius: 30rpx !important;
+	}
 </style>
\ No newline at end of file
diff --git a/components/ns-mp-html/ns-mp-html.vue b/components/ns-mp-html/ns-mp-html.vue
new file mode 100644
index 0000000..c60d07f
--- /dev/null
+++ b/components/ns-mp-html/ns-mp-html.vue
@@ -0,0 +1,25 @@
+<template>
+	<view class="mp-html">
+		<mp-html :content="content"></mp-html>
+	</view>
+</template>
+
+<script>
+	export default {
+		props: {
+		    content: {
+		        type: String,
+		        default: '',
+		    }
+		},
+	}
+</script>
+
+<style lang="scss">
+	.mp-html{
+		/deep/ img{
+			width:100% !important;
+			display:block;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/components/ns-navbar/ns-navbar.vue b/components/ns-navbar/ns-navbar.vue
index 6667b50..2b8c694 100644
--- a/components/ns-navbar/ns-navbar.vue
+++ b/components/ns-navbar/ns-navbar.vue
@@ -1,404 +1,400 @@
-<template>
-<!-- 	<view class="ns-navbar-wrap" :class="'style-' + data.navStyle">
-
-		<view class="u-navbar" :style="{ backgroundColor: bgColor, paddingTop: navbarHeight + 'px' }">
-			<view class="navbar-inner" :style="navbarInnerStyle">
-				<view class="back-wrap" v-if="isBack && isBackShow" @tap="goBack">
-					<text class="iconfont icon-back_light" :style="{ color: titleColor }"></text>
-				</view>
-
-				<view v-if="data.navStyle == 1" class="content-wrap" :class="[data.textImgPosLink, isBack && isBackShow ? 'have-back' : '']" @click="toLink(data.moreLink.wap_url)">
-					<view class="title-wrap" :style="{ fontSize: '14px', color: data.textNavColor, textAlign: data.textImgPosLink }">
-						{{ data.title }}
-					</view>
-				</view>
-
-				<view v-if="data.navStyle == 2" class="content-wrap" @click="toLink(data.moreLink.wap_url)">
-					<view class="title-wrap" :style="{ color: data.textNavColor }">
-						<view>
-							<image :src="$util.img(data.topNavImg)" mode="heightFix"></image>
-						</view>
-						<view :style="{ color: data.textNavColor }">{{ data.title }}</view>
-					</view>
-				</view>
-
-				<view v-if="data.navStyle == 3" class="content-wrap">
-					<view class="title-wrap" @click="toLink(data.moreLink.wap_url)">
-						<image :src="$util.img(data.topNavImg)" mode="aspectFit"></image>
-					</view>
-					<view class="search" @click="$util.redirectTo('/pages_tool/goods/search')" :style="{ height: menuButtonInfo.height - 2 + 'px', lineHeight: menuButtonInfo.height - 2 + 'px' }">
-						<text class="iconfont icon-sousuo3"></text>
-						<text>请输入商品名称</text>
-					</view>
-					<view :style="{ 'width': capsuleWidth }"></view>
-				</view>
-
-				<view v-if="data.navStyle == 4" class="content-wrap" :class="{ 'have-back': isBack && isBackShow }" @click="chooseOtherStore()">
-					<text class="iconfont icon-dizhi" :style="{ color: data.textNavColor }"></text>
-					<view v-if="globalStoreInfo && globalStoreInfo.store_id" class="title-wrap" :style="{ color: data.textNavColor }">{{ globalStoreInfo.store_name }}</view>
-					<view v-else class="title-wrap" :style="{ color: data.textNavColor }">定位中...</view>
-					<text class="iconfont icon-right" :style="{ color: data.textNavColor }"></text>
-					<view class="nearby-store-name" :style="{ color: data.textNavColor }">附近门店</view>
-				</view>
-			</view>
-		</view>
-
-		<view class="u-navbar-placeholder" :style="{ width: '100%', paddingTop: placeholderHeight + 'px' }"></view>
-
-	</view> -->
-</template>
-
-<script>
-// 获取系统状态栏的高度
-let systemInfo = uni.getSystemInfoSync();
-let menuButtonInfo = {};
-// 如果是小程序，获取右上角胶囊的尺寸信息，避免导航栏右侧内容与胶囊重叠(支付宝小程序非本API，尚未兼容)
-// #ifdef MP-WEIXIN || MP-BAIDU || MP-TOUTIAO || MP-QQ
-menuButtonInfo = uni.getMenuButtonBoundingClientRect();
-// #endif
-
-// 自定义导航栏
-export default {
-	name: 'ns-navbar',
-	props: {
-		data: {
-			type: Object,
-			default() {
-				return {};
-			}
-		},
-		// 标题的颜色
-		titleColor: {
-			type: String,
-			default: '#606266'
-		},
-		// 自定义返回逻辑
-		customBack: {
-			type: Function,
-			default: null
-		},
-		scrollTop: {
-			type: [String, Number],
-			default: '0'
-		},
-		// 是否显示导航栏左边返回图标和辅助文字
-		isBack: {
-			type: Boolean,
-			default: true
-		}
-	},
-	data() {
-		return {
-			menuButtonInfo: menuButtonInfo,
-			isBackShow: false,
-			placeholderHeight: 0
-		};
-	},
-	computed: {
-		// 导航栏内部盒子的样式
-		navbarInnerStyle() {
-			let style = '';
-			// 导航栏宽度，如果在小程序下，导航栏宽度为胶囊的左边到屏幕左边的距离
-			style += 'height:' + menuButtonInfo.height * 2 + 'rpx;';
-			return style;
-		},
-		// 转换字符数值为真正的数值
-		navbarHeight() {
-			// #ifdef APP-PLUS || H5
-			return 25;
-			// #endif
-			// #ifdef MP
-			// 小程序特别处理，让导航栏高度 = 胶囊高度 + 两倍胶囊顶部与状态栏底部的距离之差(相当于同时获得了导航栏底部与胶囊底部的距离)
-			let height = menuButtonInfo.top;
-			return height;
-			// #endif
-		},
-		bgColor() {
-			var color = '';
-			if (this.data.topNavBg) {
-				// 顶部透明
-				color = 'transparent';
-				let top = 0;
-
-				if (this.data.navStyle == 4) {
-					// #ifdef H5
-					top = 15;
-					// #endif
-					// #ifdef MP
-					top = this.navbarHeight - 25;
-					// #endif
-				}
-
-				if (this.scrollTop > top) {
-					color = this.data.topNavColor;
-				} else {
-					color = 'transparent';
-				}
-			} else {
-				color = this.data.topNavColor;
-			}
-			return color;
-		},
-		capsuleWidth() {
-			let width = `calc(100vw - ${this.menuButtonInfo.right}px + ${this.menuButtonInfo.width}px + 10px)`;
-			return width;
-		}
-	},
-	created(e) {
-		// var pages = getCurrentPages();
-		// if (pages.length > 1) {
-		// 	this.isBackShow = true;
-		// }
-		// this.navbarPlaceholderHeight();
-	},
-	mounted() {
-		// this.setModuleLocatinoFn();
-	},
-	methods: {
-		toLink(val) {
-			if (val) this.$util.redirectTo(val);
-		},
-		goBack() {
-			// 如果自定义了点击返回按钮的函数，则执行，否则执行返回逻辑
-			if (typeof this.customBack === 'function') {
-				this.customBack();
-			} else {
-				uni.navigateBack();
-			}
-		},
-		// 选择其他门店
-		chooseOtherStore() {
-			if (this.globalStoreConfig && this.globalStoreConfig.is_allow_change == 1) {
-				this.$util.redirectTo('/pages_tool/store/list');
-			} else if (this.globalStoreInfo) {
-				// 禁止切换门店，进入门店详情
-				this.$util.redirectTo('/pages_tool/store/detail', {
-					store_id: this.globalStoreInfo.store_id
-				});
-			}
-		},
-		navbarPlaceholderHeight() {
-			let height = 0;
-			setTimeout(() => {
-				const query = uni.createSelectorQuery().in(this);
-				query
-					.select('.ns-navbar-wrap .u-navbar')
-					.boundingClientRect(data => {
-						// 获取公告自身高度
-						this.placeholderHeight = data.height;
-					})
-					.exec();
-			});
-		},
-		// 向vuex中的diyIndexPositionObj增加公告导航组件定位位置
-		setModuleLocatinoFn() {
-			const query = uni.createSelectorQuery().in(this);
-			query.select('.ns-navbar-wrap .u-navbar')
-				.boundingClientRect(data => {
-					let diyIndexPage = {
-						originalVal: data.height || 0, //自身高度 px
-						currVal: 0 //定位高度
-					};
-					this.$store.commit('setDiyGroupPositionObj', {
-						'nsNavbar': diyIndexPage
-					});
-				}).exec();
-		}
-	}
-};
-</script>
-
-<style scoped lang="scss">
-/* #ifdef H5 */
-.style-1,
-.style-2,
-.style-3 {
-	display: none;
-}
-
-/* #endif */
-
-.u-navbar {
-	width: 100%;
-	transition: background 0.3s;
-	position: fixed;
-	left: 0;
-	right: 0;
-	top: 0;
-	z-index: 991;
-}
-
-.navbar-inner {
-	display: flex;
-	justify-content: space-between;
-	position: relative;
-	align-items: center;
-	padding-bottom: 20rpx;
-	/* #ifdef H5 */
-	padding-bottom: 40rpx;
-	/* #endif */
-}
-
-.back-wrap {
-	padding: 0 14rpx 0 24rpx;
-
-	.iconfont {
-		font-size: 44rpx;
-	}
-}
-
-.content-wrap {
-	display: flex;
-	align-items: center;
-	justify-content: flex-start;
-	flex: 1;
-	position: absolute;
-	left: 0;
-	right: 0;
-	top: 0;
-	height: 60rpx;
-	text-align: center;
-	flex-shrink: 0;
-}
-
-.title-wrap {
-	line-height: 1;
-	flex: 1;
-	overflow: hidden;
-	text-overflow: ellipsis;
-	white-space: nowrap;
-	font-size: 32rpx;
-	color: #000000;
-}
-
-.ns-navbar-wrap {
-
-	&.style-1 {
-		.content-wrap {
-			.title-wrap {
-				font-size: 27rpx;
-			}
-
-			&.left {
-				left: 30rpx;
-			}
-
-			&.center {
-				left: 0;
-				padding-right: 0;
-			}
-
-			&.have-back {
-				left: 90rpx;
-				padding-right: 200rpx;
-			}
-		}
-	}
-
-	&.style-2 {
-		.content-wrap {
-			.title-wrap {
-				display: flex;
-				align-items: center;
-				text-align: left;
-
-				>view {
-					height: 56rpx;
-					line-height: 56rpx;
-					max-width: 300rpx;
-					margin-left: 30rpx;
-					font-size: 27rpx;
-
-					image {
-						width: 100%;
-						height: 100%;
-					}
-
-					&:last-child {
-						overflow: hidden; //超出的文本隐藏
-						text-overflow: ellipsis; //用省略号显示
-						white-space: nowrap; //不换行
-						flex: 1;
-					}
-				}
-			}
-		}
-	}
-
-	&.style-3 {
-		.content-wrap {
-			.title-wrap {
-				height: 60rpx;
-				width: 170rpx;
-				max-width: 170rpx;
-				margin-left: 30rpx;
-				flex: initial;
-				text-align: center;
-				margin-right: 10rpx;
-
-				image {
-					height: 100%;
-					width: 100%;
-				}
-			}
-
-			.search {
-				flex: 1;
-				padding: 0 20rpx;
-				background-color: #fff;
-				text-align: left;
-				border-radius: 60rpx;
-				height: 60rpx;
-				line-height: 60rpx;
-				border: 1px solid #eeeeee;
-				color: rgb(102, 102, 102);
-				display: flex;
-				align-items: center;
-				margin-right: 10rpx;
-
-				.iconfont {
-					color: #909399;
-					font-size: 32rpx;
-					margin-right: 10rpx;
-				}
-			}
-		}
-	}
-
-	&.style-4 {
-		.icon-dizhi{
-			font-size: 28rpx;
-		}
-		.content-wrap {
-			top: initial;
-			text-align: left;
-			padding-left: 30rpx;
-
-			&.have-back {
-				left: 60rpx;
-				right: 190rpx;
-			}
-
-			.title-wrap {
-				flex: none;
-				margin: 0 10rpx;
-				max-width: 360rpx;
-				font-size: 27rpx;
-			}
-
-			.icon-right {
-				font-size: 24rpx;
-			}
-
-			.nearby-store-name {
-				margin: 0 10rpx;
-				background: rgba(0, 0, 0, .2);
-				font-size: 22rpx;
-				border-radius: 40rpx;
-				padding: 10rpx 20rpx;
-				line-height: 1;
-			}
-		}
-	}
-}
+<template>
+	<view class="ns-navbar-wrap" :class="'style-' + data.navStyle">
+		<!-- #ifndef MP-ALIPAY -->
+		<view class="u-navbar" :style="{ backgroundColor: bgColor, paddingTop: navbarHeight + 'px' }">
+			<view class="navbar-inner" :style="navbarInnerStyle">
+				<view class="back-wrap" v-if="isBack && isBackShow" @tap="goBack">
+					<text class="iconfont icon-back_light" :style="{ color: titleColor }"></text>
+				</view>
+
+				<view v-if="data.navStyle == 1" class="content-wrap" :class="[data.textImgPosLink, isBack && isBackShow ? 'have-back' : '']" @click="toLink(data.moreLink.wap_url)">
+					<view class="title-wrap" :style="{ fontSize: '16px', color: data.textNavColor, textAlign: data.textImgPosLink }">
+						{{ data.title }}
+					</view>
+				</view>
+
+				<view v-if="data.navStyle == 2" class="content-wrap" @click="toLink(data.moreLink.wap_url)">
+					<view class="title-wrap" :style="{ color: data.textNavColor }">
+						<view>
+							<image :src="$util.img(data.topNavImg)" mode="heightFix"></image>
+						</view>
+						<view :style="{ color: data.textNavColor }">{{ data.title }}</view>
+					</view>
+				</view>
+
+				<view v-if="data.navStyle == 3" class="content-wrap">
+					<view class="title-wrap" @click="toLink(data.moreLink.wap_url)">
+						<image :src="$util.img(data.topNavImg)" mode="aspectFit"></image>
+					</view>
+					<view class="search" @click="$util.redirectTo('/pages_tool/goods/search')" :style="{ height: menuButtonInfo.height - 2 + 'px', lineHeight: menuButtonInfo.height - 2 + 'px' }">
+						<text class="iconfont icon-sousuo3"></text>
+						<text>请输入商品名称</text>
+					</view>
+					<view :style="{ 'width': capsuleWidth }"></view>
+				</view>
+
+				<view v-if="data.navStyle == 4" class="content-wrap" :class="{ 'have-back': isBack && isBackShow }" @click="chooseOtherStore()">
+					<text class="iconfont icon-dizhi" :style="{ color: data.textNavColor }"></text>
+					<view v-if="globalStoreInfo && globalStoreInfo.store_id" class="title-wrap" :style="{ color: data.textNavColor }">{{ globalStoreInfo.store_name }}</view>
+					<view v-else class="title-wrap" :style="{ color: data.textNavColor }">定位中...</view>
+					<text class="iconfont icon-right" :style="{ color: data.textNavColor }"></text>
+					<view class="nearby-store-name" :style="{ color: data.textNavColor }">附近门店</view>
+				</view>
+			</view>
+		</view>
+
+		<!-- 解决fixed定位后导航栏塌陷的问题 -->
+		<view class="u-navbar-placeholder" :style="{ width: '100%', paddingTop: placeholderHeight + 'px' }"></view>
+		<!-- #endif -->
+	</view>
+</template>
+
+<script>
+// 获取系统状态栏的高度
+let systemInfo = uni.getSystemInfoSync();
+let menuButtonInfo = {};
+// 如果是小程序，获取右上角胶囊的尺寸信息，避免导航栏右侧内容与胶囊重叠(支付宝小程序非本API，尚未兼容)
+// #ifdef MP-WEIXIN || MP-BAIDU || MP-TOUTIAO || MP-QQ
+menuButtonInfo = uni.getMenuButtonBoundingClientRect();
+// #endif
+
+// 自定义导航栏
+export default {
+	name: 'ns-navbar',
+	props: {
+		data: {
+			type: Object,
+			default() {
+				return {};
+			}
+		},
+		// 标题的颜色
+		titleColor: {
+			type: String,
+			default: '#606266'
+		},
+		// 自定义返回逻辑
+		customBack: {
+			type: Function,
+			default: null
+		},
+		scrollTop: {
+			type: [String, Number],
+			default: '0'
+		},
+		// 是否显示导航栏左边返回图标和辅助文字
+		isBack: {
+			type: Boolean,
+			default: true
+		}
+	},
+	data() {
+		return {
+			menuButtonInfo: menuButtonInfo,
+			isBackShow: false,
+			placeholderHeight: 0
+		};
+	},
+	computed: {
+		// 导航栏内部盒子的样式
+		navbarInnerStyle() {
+			let style = '';
+			// 导航栏宽度，如果在小程序下，导航栏宽度为胶囊的左边到屏幕左边的距离
+			style += 'height:' + menuButtonInfo.height * 2 + 'rpx;';
+			return style;
+		},
+		// 转换字符数值为真正的数值
+		navbarHeight() {
+			// #ifdef APP-PLUS || H5
+			return 25;
+			// #endif
+			// #ifdef MP
+			// 小程序特别处理，让导航栏高度 = 胶囊高度 + 两倍胶囊顶部与状态栏底部的距离之差(相当于同时获得了导航栏底部与胶囊底部的距离)
+			let height = menuButtonInfo.top;
+			return height;
+			// #endif
+		},
+		bgColor() {
+			var color = '';
+			if (this.data.topNavBg) {
+				// 顶部透明
+				color = 'transparent';
+				let top = 0;
+
+				if (this.data.navStyle == 4) {
+					// #ifdef H5
+					top = 15;
+					// #endif
+					// #ifdef MP
+					top = this.navbarHeight - 25;
+					// #endif
+				}
+
+				if (this.scrollTop > top) {
+					color = this.data.topNavColor;
+				} else {
+					color = 'transparent';
+				}
+			} else {
+				color = this.data.topNavColor;
+			}
+			return color;
+		},
+		capsuleWidth() {
+			let width = `calc(100vw - ${this.menuButtonInfo.right}px + ${this.menuButtonInfo.width}px + 10px)`;
+			return width;
+		}
+	},
+	created(e) {
+		var pages = getCurrentPages();
+		if (pages.length > 1) {
+			this.isBackShow = true;
+		}
+		this.navbarPlaceholderHeight();
+	},
+	mounted() {
+		this.setModuleLocationFn();
+	},
+	methods: {
+		toLink(val) {
+			if (val) this.$util.redirectTo(val);
+		},
+		goBack() {
+			// 如果自定义了点击返回按钮的函数，则执行，否则执行返回逻辑
+			if (typeof this.customBack === 'function') {
+				this.customBack();
+			} else {
+				uni.navigateBack();
+			}
+		},
+		// 选择其他门店
+		chooseOtherStore() {
+			if (this.globalStoreConfig && this.globalStoreConfig.is_allow_change == 1) {
+				this.$util.redirectTo('/pages_tool/store/list');
+			} else if (this.globalStoreInfo) {
+				// 禁止切换门店，进入门店详情
+				this.$util.redirectTo('/pages_tool/store/detail', {
+					store_id: this.globalStoreInfo.store_id
+				});
+			}
+		},
+		navbarPlaceholderHeight() {
+			setTimeout(() => {
+				const query = uni.createSelectorQuery().in(this);
+				query.select('.ns-navbar-wrap .u-navbar').boundingClientRect(data => {
+					// 获取公告自身高度
+					this.placeholderHeight = data.height;
+				}).exec();
+			});
+		},
+		// 向vuex中的diyIndexPositionObj增加公告导航组件定位位置
+		setModuleLocationFn() {
+			const query = uni.createSelectorQuery().in(this);
+			query.select('.ns-navbar-wrap .u-navbar').boundingClientRect(data => {
+				let diyIndexPage = {
+					originalVal: data.height || 0, //自身高度 px
+					currVal: 0 //定位高度
+				};
+				this.$store.commit('setDiyGroupPositionObj', {
+					'nsNavbar': diyIndexPage
+				});
+			}).exec();
+		}
+	}
+};
+</script>
+
+<style scoped lang="scss">
+/* #ifdef H5 */
+.style-1,
+.style-2,
+.style-3 {
+	display: none;
+}
+
+/* #endif */
+
+.u-navbar {
+	width: 100%;
+	transition: background 0.3s;
+	position: fixed;
+	left: 0;
+	right: 0;
+	top: 0;
+	z-index: 991;
+}
+
+.navbar-inner {
+	display: flex;
+	justify-content: space-between;
+	position: relative;
+	align-items: center;
+	padding-bottom: 20rpx;
+	/* #ifdef H5 */
+	padding-bottom: 40rpx;
+	/* #endif */
+}
+
+.back-wrap {
+	padding: 0 14rpx 0 24rpx;
+
+	.iconfont {
+		font-size: 44rpx;
+	}
+}
+
+.content-wrap {
+	display: flex;
+	align-items: center;
+	justify-content: flex-start;
+	flex: 1;
+	position: absolute;
+	left: 0;
+	right: 0;
+	top: 0;
+	height: 60rpx;
+	text-align: center;
+	flex-shrink: 0;
+}
+
+.title-wrap {
+	line-height: 1;
+	flex: 1;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+	font-size: 32rpx;
+	color: #000000;
+}
+
+.ns-navbar-wrap {
+
+	&.style-1 {
+		.content-wrap {
+			.title-wrap {
+				font-size: 27rpx;
+			}
+
+			&.left {
+				left: 30rpx;
+			}
+
+			&.center {
+				left: 0;
+				padding-right: 0;
+			}
+
+			&.have-back {
+				left: 90rpx;
+				padding-right: 200rpx;
+			}
+		}
+	}
+
+	&.style-2 {
+		.content-wrap {
+			.title-wrap {
+				display: flex;
+				align-items: center;
+				text-align: left;
+
+				>view {
+					height: 56rpx;
+					line-height: 56rpx;
+					max-width: 300rpx;
+					margin-left: 30rpx;
+					font-size: 27rpx;
+
+					image {
+						width: 100%;
+						height: 100%;
+					}
+
+					&:last-child {
+						overflow: hidden; //超出的文本隐藏
+						text-overflow: ellipsis; //用省略号显示
+						white-space: nowrap; //不换行
+						flex: 1;
+					}
+				}
+			}
+		}
+	}
+
+	&.style-3 {
+		.content-wrap {
+			.title-wrap {
+				height: 60rpx;
+				width: 170rpx;
+				max-width: 170rpx;
+				margin-left: 30rpx;
+				flex: initial;
+				text-align: center;
+				margin-right: 10rpx;
+
+				image {
+					height: 100%;
+					width: 100%;
+				}
+			}
+
+			.search {
+				flex: 1;
+				padding: 0 20rpx;
+				background-color: #fff;
+				text-align: left;
+				border-radius: 60rpx;
+				height: 60rpx;
+				line-height: 60rpx;
+				border: 1px solid #eeeeee;
+				color: rgb(102, 102, 102);
+				display: flex;
+				align-items: center;
+				margin-right: 10rpx;
+
+				.iconfont {
+					color: #909399;
+					font-size: 32rpx;
+					margin-right: 10rpx;
+				}
+			}
+		}
+	}
+
+	&.style-4 {
+		.icon-dizhi{
+			font-size: 28rpx;
+		}
+		.content-wrap {
+			top: initial;
+			text-align: left;
+			padding-left: 30rpx;
+
+			&.have-back {
+				left: 60rpx;
+				right: 190rpx;
+			}
+
+			.title-wrap {
+				flex: none;
+				margin: 0 10rpx;
+				max-width: 360rpx;
+				font-size: 27rpx;
+			}
+
+			.icon-right {
+				font-size: 24rpx;
+			}
+
+			.nearby-store-name {
+				margin: 0 10rpx;
+				background: rgba(0, 0, 0, .2);
+				font-size: 22rpx;
+				border-radius: 40rpx;
+				padding: 10rpx 20rpx;
+				line-height: 1;
+			}
+		}
+	}
+}
 </style>
\ No newline at end of file
diff --git a/components/ns-new-gift/ns-new-gift.vue b/components/ns-new-gift/ns-new-gift.vue
index a6553c9..7e569ce 100644
--- a/components/ns-new-gift/ns-new-gift.vue
+++ b/components/ns-new-gift/ns-new-gift.vue
@@ -1,349 +1,349 @@
-<template>
-	<view>
-		<view @touchmove.prevent.stop v-if="newgift" class="reward-popup">
-			<uni-popup ref="nsNewGift" type="center" :maskClick="false">
-				<view class="reward-wrap">
-					<view class="newgift-content" :style="{ backgroundImage: 'url(' + $util.img('public/uniapp/new_gift/holiday_polite-bg.png') + ')' }">
-						<view class="content-title-holiday">
-							<image :src="$util.img('public/uniapp/new_gift/holiday_polite_left.png')" mode="" class="birthday-img-all"/>
-							<view class="font-size-toolbar activity-name">{{ newgift.activity_name }}</view>
-							<image :src="$util.img('public/uniapp/new_gift/holiday_polite_right.png')" mode="" class="birthday-img-all"/>
-						</view>
-						<view class="content-title-name" v-if="memberInfo">Dear {{ memberInfo.nickname }}</view>
-						<view class="content-title-hint" v-if="newgift.remark">{{ newgift.remark }}</view>
-						<view class="content-title-hint" v-else>感谢您一直以来的支持，为回馈会员，商城{{ newgift.activity_name ? newgift.activity_name : 'xx' }}节日，为您提供以下福利</view>
-						<scroll-view scroll-y="true" class="register-box">
-							<view :class="introduction > 38 ? 'reward-content' : 'reward-content-two'">
-								<view class="content" v-if="newgift.award_list.point > 0">
-									<view class="info">
-										<text class="num">
-											{{ newgift.award_list.point }}
-											<text class="type">积分</text>
-										</text>
-										<view class="desc">用于参与活动购买商品时抵扣</view>
-									</view>
-									<view class="tip" @click="closeRewardPopup('1')">立即查看</view>
-								</view>
-								<view class="content" v-if="newgift.award_list.balance_type == 0 && newgift.award_list.balance > 0">
-									<view class="info">
-										<text class="num">
-											{{ newgift.award_list.balance | int }}
-											<text class="type">元红包</text>
-										</text>
-										<view class="desc">不可提现红包</view>
-									</view>
-									<view class="tip" @click="closeRewardPopup('2')">立即查看</view>
-								</view>
-								<view class="content" v-if="newgift.award_list.balance_type == 1 && newgift.award_list.balance_money > 0">
-									<view class="info">
-										<text class="num">
-											{{ newgift.award_list.balance_money | int }}
-											<text class="type">元红包</text>
-										</text>
-										<view class="desc">可提现红包</view>
-									</view>
-									<view class="tip" @click="closeRewardPopup('2')">立即查看</view>
-								</view>
-								<block v-if="newgift.award_list.coupon_list.length > 0">
-									<block v-for="(item, index) in newgift.award_list.coupon_list" :key="index">
-										<view class="content">
-											<view class="info">
-												<text v-if="item.type == 'reward'" class="num">
-													{{ parseFloat(item.money) }}
-													<text class="type">元优惠劵</text>
-												</text>
-												<text v-else-if="item.type == 'discount'" class="num">
-													{{ item.discount | int }}
-													<text class="type">折</text>
-												</text>
-												<view class="desc">用于下单时抵现或兑换商品等</view>
-											</view>
-											<view class="tip" @click="closeRewardPopup('3')">立即查看</view>
-										</view>
-									</block>
-								</block>
-							</view>
-						</scroll-view>
-					</view>
-					<view class="close-btn" @click="cancel()">
-						<text class="iconfont icon-close btn"></text>
-					</view>
-				</view>
-			</uni-popup>
-		</view>
-	</view>
-</template>
-
-<script>
-	import uniPopup from '../uni-popup/uni-popup.vue';
-
-	export default {
-		components: {
-			uniPopup
-		},
-		data() {
-			return {
-				newgift: {
-					flag: false,
-					award_list: {
-						point: 0,
-						coupon_list: {}
-					},
-					remark: {}
-				},
-				bgHight: '940rpx !important',
-				bytesCount: null,
-			};
-		},
-		filters: {
-			int(val) {
-				var str = String(val);
-				var arr = str.split('.');
-				if (parseInt(arr[1]) > 0) {
-					return str;
-				} else {
-					return arr[0];
-				}
-			}
-		},
-		computed: {
-			introduction() {
-				let bytesCount = 0;
-				for (let i = 0, n = this.newgift.remark.length; i < n; i++) {
-					let c = this.newgift.remark.charCodeAt(i);
-					if ((c >= 0x0001 && c <= 0x007e) || (0xff60 <= c && c <= 0xff9f)) {
-						bytesCount += 1;
-					} else {
-						bytesCount += 2;
-					}
-				}
-				return bytesCount;
-			}
-		},
-		created() {
-			if (!this.storeToken) return;
-			this.init();
-		},
-		methods: {
-			init() {
-				this.getHolidayGift();
-			},
-			// 查询节日有礼设置
-			getHolidayGift() {
-				this.$api.sendRequest({
-					url: '/scenefestival/api/config/config',
-					success: res => {
-						if (res.data && res.data[0]) {
-							this.newgift = res.data[0];
-							if (this.newgift.award_list.award_type.length <= 1) {
-								this.bgHight = '800rpx !important';
-							}
-							this.getGift();
-						}
-					}
-				});
-			},
-			cancel() {
-				this.$refs.nsNewGift.close();
-			},
-			getGift() {
-				if (this.newgift.flag == true) {
-					this.$refs.nsNewGift.open();
-					this.$api.sendRequest({
-						url: '/scenefestival/api/config/receive',
-						data: {
-							festival_id: this.newgift.festival_id
-						},
-						success: res => {}
-					});
-				}
-			},
-			closeRewardPopup(type) {
-				if (type == 1) {
-					this.$util.redirectTo('/pages_tool/member/point_detail', {});
-				} else if (type == 2) {
-					this.$util.redirectTo('/pages_tool/member/balance_detail', {});
-				} else if (type == 3) {
-					this.$util.redirectTo('/pages_tool/member/coupon', {});
-				}
-			}
-		}
-	};
-</script>
-
-<style scoped>
-	/deep/ .newgift-content uni-image {
-		width: 113rpx !important;
-		height: 24rpx !important;
-	}
-
-	/deep/ .reward-popup .uni-popup__wrapper.uni-custom.center .uni-popup__wrapper-box {
-		max-height: unset !important;
-		overflow-y: unset;
-	}
-
-	.register-box /deep/ .uni-scroll-view {
-		background: unset !important;
-	}
-
-	.register-box {
-		max-height: 300rpx;
-		overflow-y: scroll;
-		/* margin-top: 610rpx; */
-	}
-</style>
-
-<style lang="scss">
-	.reward-wrap {
-		width: 85vw;
-		height: auto;
-
-		.newgift-content {
-			width: 100%;
-			height: auto;
-			background-size: 100%;
-			background-repeat: no-repeat;
-			padding-bottom: 40rpx;
-		}
-
-		.content-title-holiday {
-			font-size: $font-size-toolbar;
-			font-weight: bold;
-			font-family: BDZongYi-A001;
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			// margin-bottom: 20rpx;
-			padding-top: 320rpx;
-			line-height: 1;
-
-			.birthday-img-all {
-				width: 100rpx;
-				height: 20rpx;
-			}
-
-			&>view {
-				margin: 0 20rpx;
-				color: #fff;
-				font-weight: bold;
-			}
-		}
-
-		.content-title-name {
-			font-size: $font-size-toolbar;
-			font-weight: bold;
-			overflow: hidden;
-			text-overflow: ellipsis;
-			display: -webkit-box;
-			-webkit-line-clamp: 2;
-			-webkit-box-orient: vertical;
-			text-align: center;
-			color: #fff;
-			margin: 30rpx 0 40rpx;
-			line-height: 1;
-		}
-
-		.content-title-hint {
-			margin: 0 70rpx 40rpx;
-			overflow: hidden;
-			text-overflow: ellipsis;
-			display: -webkit-box;
-			-webkit-line-clamp: 2;
-			-webkit-box-orient: vertical;
-			text-align: center;
-			color: #fff;
-		}
-
-		.reward-content {
-			max-height: 300rpx;
-			margin: 0 56rpx;
-		}
-
-		.reward-content-two {
-			max-height: 360rpx;
-			margin: 0 56rpx;
-		}
-
-		.head {
-			color: #fff;
-			text-align: center;
-			line-height: 1;
-			margin: 20rpx 0;
-		}
-
-		& .content:last-child {
-			margin-bottom: 0;
-		}
-
-		.content {
-			display: flex;
-			align-items: center;
-			padding: 16rpx 26rpx;
-			background: #fff;
-			border-radius: 10rpx;
-			margin-bottom: 20rpx;
-
-			.info {
-				flex: 1;
-			}
-
-			.tip {
-				color: #fa5b14;
-				padding: 10rpx 0 10rpx 20rpx;
-				width: 60rpx;
-				line-height: 1.5;
-				letter-spacing: 2rpx;
-				border-left: 2rpx dashed #e5e5e5;
-			}
-
-			.num {
-				font-size: 48rpx;
-				color: #fa5b14;
-				font-weight: bolder;
-				line-height: 1;
-				overflow: hidden;
-				text-overflow: ellipsis;
-				white-space: nowrap;
-				max-width: 300rpx;
-			}
-
-			.type {
-				font-size: $font-size-tag;
-				margin-left: 10rpx;
-				line-height: 1;
-				font-weight: normal;
-				color: #606266;
-			}
-
-			.desc {
-				margin-top: 8rpx;
-				color: $color-tip;
-				font-size: $font-size-tag;
-				line-height: 1;
-			}
-		}
-
-		.close-btn {
-			text-align: center;
-			margin-top: 20rpx;
-			z-index: 500;
-
-			.btn {
-				/* margin: 0 50rpx;
-				background: linear-gradient(90deg,#ff4100,#ff6a00) ;
-				border: none; */
-				color: #fff;
-				font-size: 40rpx;
-				// padding: 100px;
-				border: 4rpx solid #fff;
-				border-radius: 50%;
-				padding: 10rpx;
-				font-weight: bold;
-				width: 40rpx;
-				height: 40rpx;
-				margin: 0 auto;
-				line-height: 40rpx;
-			}
-		}
-	}
+<template>
+	<view>
+		<view @touchmove.prevent.stop v-if="newgift" class="reward-popup">
+			<uni-popup ref="nsNewGift" type="center" :maskClick="false">
+				<view class="reward-wrap">
+					<view class="newgift-content" :style="{ backgroundImage: 'url(' + $util.img('public/uniapp/new_gift/holiday_polite-bg.png') + ')' }">
+						<view class="content-title-holiday">
+							<image :src="$util.img('public/uniapp/new_gift/holiday_polite_left.png')" mode="" class="birthday-img-all" />
+							<view class="font-size-toolbar activity-name">{{ newgift.activity_name }}</view>
+							<image :src="$util.img('public/uniapp/new_gift/holiday_polite_right.png')" mode="" class="birthday-img-all" />
+						</view>
+						<view class="content-title-name" v-if="memberInfo">Dear {{ memberInfo.nickname }}</view>
+						<view class="content-title-hint" v-if="newgift.remark">{{ newgift.remark }}</view>
+						<view class="content-title-hint" v-else>感谢您一直以来的支持，为回馈会员，商城{{ newgift.activity_name ? newgift.activity_name : 'xx' }}节日，为您提供以下福利</view>
+						<scroll-view scroll-y="true" class="register-box">
+							<view :class="introduction > 38 ? 'reward-content' : 'reward-content-two'">
+								<view class="content" v-if="newgift.award_list.point > 0">
+									<view class="info">
+										<text class="num">
+											{{ newgift.award_list.point }}
+											<text class="type">积分</text>
+										</text>
+										<view class="desc">用于参与活动购买商品时抵扣</view>
+									</view>
+									<view class="tip" @click="closeRewardPopup('1')">立即查看</view>
+								</view>
+								<view class="content" v-if="newgift.award_list.balance_type == 0 && newgift.award_list.balance > 0">
+									<view class="info">
+										<text class="num">
+											{{ newgift.award_list.balance | int }}
+											<text class="type">元红包</text>
+										</text>
+										<view class="desc">不可提现红包</view>
+									</view>
+									<view class="tip" @click="closeRewardPopup('2')">立即查看</view>
+								</view>
+								<view class="content" v-if="newgift.award_list.balance_type == 1 && newgift.award_list.balance_money > 0">
+									<view class="info">
+										<text class="num">
+											{{ newgift.award_list.balance_money | int }}
+											<text class="type">元红包</text>
+										</text>
+										<view class="desc">可提现红包</view>
+									</view>
+									<view class="tip" @click="closeRewardPopup('2')">立即查看</view>
+								</view>
+								<block v-if="newgift.award_list.coupon_list.length > 0">
+									<block v-for="(item, index) in newgift.award_list.coupon_list" :key="index">
+										<view class="content">
+											<view class="info">
+												<text v-if="item.type == 'reward'" class="num">
+													{{ parseFloat(item.money) }}
+													<text class="type">元优惠劵</text>
+												</text>
+												<text v-else-if="item.type == 'discount'" class="num">
+													{{ item.discount | int }}
+													<text class="type">折</text>
+												</text>
+												<view class="desc">用于下单时抵现或兑换商品等</view>
+											</view>
+											<view class="tip" @click="closeRewardPopup('3')">立即查看</view>
+										</view>
+									</block>
+								</block>
+							</view>
+						</scroll-view>
+					</view>
+					<view class="close-btn" @click="cancel()">
+						<text class="iconfont icon-close btn"></text>
+					</view>
+				</view>
+			</uni-popup>
+		</view>
+	</view>
+</template>
+
+<script>
+	import uniPopup from '../uni-popup/uni-popup.vue';
+
+	export default {
+		components: {
+			uniPopup
+		},
+		data() {
+			return {
+				newgift: {
+					flag: false,
+					award_list: {
+						point: 0,
+						coupon_list: {}
+					},
+					remark: {}
+				},
+				bgHight: '940rpx !important',
+				bytesCount: null,
+				callback: null
+			};
+		},
+		filters: {
+			int(val) {
+				var str = String(val);
+				var arr = str.split('.');
+				if (parseInt(arr[1]) > 0) {
+					return str;
+				} else {
+					return arr[0];
+				}
+			}
+		},
+		computed: {
+			introduction() {
+				let bytesCount = 0;
+				for (let i = 0, n = this.newgift.remark.length; i < n; i++) {
+					let c = this.newgift.remark.charCodeAt(i);
+					if ((c >= 0x0001 && c <= 0x007e) || (0xff60 <= c && c <= 0xff9f)) {
+						bytesCount += 1;
+					} else {
+						bytesCount += 2;
+					}
+				}
+				return bytesCount;
+			}
+		},
+		created() {
+			if (!this.storeToken) return;
+			this.init();
+		},
+		methods: {
+			init(callback = null) {
+				if (callback) this.callback = callback;
+				this.getHolidayGift();
+			},
+			// 查询节日有礼设置
+			getHolidayGift() {
+				this.$api.sendRequest({
+					url: '/scenefestival/api/config/config',
+					success: res => {
+						if (res.data && res.data[0]) {
+							this.newgift = res.data[0];
+							if (this.newgift.award_list.award_type.length <= 1) {
+								this.bgHight = '800rpx !important';
+							}
+							this.getGift();
+						}
+					}
+				});
+			},
+			cancel() {
+				this.$refs.nsNewGift.close();
+			},
+			getGift() {
+				if (this.newgift.flag == true) {
+					this.$refs.nsNewGift.open();
+					this.$api.sendRequest({
+						url: '/scenefestival/api/config/receive',
+						data: {
+							festival_id: this.newgift.festival_id
+						},
+						success: res => {
+							if (this.callback) this.callback();
+						}
+					});
+				}
+			},
+			closeRewardPopup(type) {
+				if (type == 1) {
+					this.$util.redirectTo('/pages_tool/member/point_detail', {});
+				} else if (type == 2) {
+					this.$util.redirectTo('/pages_tool/member/balance_detail', {});
+				} else if (type == 3) {
+					this.$util.redirectTo('/pages_tool/member/coupon', {});
+				}
+			}
+		}
+	};
+</script>
+
+<style scoped>
+	/deep/ .newgift-content uni-image {
+		width: 113rpx !important;
+		height: 24rpx !important;
+	}
+
+	/deep/ .reward-popup .uni-popup__wrapper.uni-custom.center .uni-popup__wrapper-box {
+		max-height: unset !important;
+		overflow-y: unset;
+	}
+
+	.register-box /deep/ .uni-scroll-view {
+		background: unset !important;
+	}
+
+	.register-box {
+		max-height: 300rpx;
+		overflow-y: scroll;
+		/* margin-top: 610rpx; */
+	}
+</style>
+
+<style lang="scss">
+	.reward-wrap {
+		width: 85vw;
+		height: auto;
+
+		.newgift-content {
+			width: 100%;
+			height: auto;
+			background-size: 100%;
+			background-repeat: no-repeat;
+			padding-bottom: 40rpx;
+		}
+
+		.content-title-holiday {
+			font-size: $font-size-toolbar;
+			font-weight: bold;
+			font-family: BDZongYi-A001;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			// margin-bottom: 20rpx;
+			padding-top: 320rpx;
+			line-height: 1;
+
+			.birthday-img-all {
+				width: 100rpx;
+				height: 20rpx;
+			}
+
+			&>view {
+				margin: 0 20rpx;
+				color: #fff;
+				font-weight: bold;
+			}
+		}
+
+		.content-title-name {
+			font-size: $font-size-toolbar;
+			font-weight: bold;
+			overflow: hidden;
+			text-overflow: ellipsis;
+			display: -webkit-box;
+			-webkit-line-clamp: 2;
+			-webkit-box-orient: vertical;
+			text-align: center;
+			color: #fff;
+			margin: 30rpx 0 40rpx;
+			line-height: 1;
+		}
+
+		.content-title-hint {
+			margin: 0 70rpx 40rpx;
+			overflow: hidden;
+			text-overflow: ellipsis;
+			display: -webkit-box;
+			-webkit-line-clamp: 2;
+			-webkit-box-orient: vertical;
+			text-align: center;
+			color: #fff;
+		}
+
+		.reward-content {
+			max-height: 300rpx;
+			margin: 0 56rpx;
+		}
+
+		.reward-content-two {
+			max-height: 360rpx;
+			margin: 0 56rpx;
+		}
+
+		.head {
+			color: #fff;
+			text-align: center;
+			line-height: 1;
+			margin: 20rpx 0;
+		}
+
+		& .content:last-child {
+			margin-bottom: 0;
+		}
+
+		.content {
+			display: flex;
+			align-items: center;
+			padding: 16rpx 26rpx;
+			background: #fff;
+			border-radius: 10rpx;
+			margin-bottom: 20rpx;
+
+			.info {
+				flex: 1;
+			}
+
+			.tip {
+				color: #fa5b14;
+				padding: 10rpx 0 10rpx 20rpx;
+				width: 60rpx;
+				line-height: 1.5;
+				letter-spacing: 2rpx;
+				border-left: 2rpx dashed #e5e5e5;
+			}
+
+			.num {
+				font-size: 48rpx;
+				color: #fa5b14;
+				font-weight: bolder;
+				line-height: 1;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				white-space: nowrap;
+				max-width: 300rpx;
+			}
+
+			.type {
+				font-size: $font-size-tag;
+				margin-left: 10rpx;
+				line-height: 1;
+				font-weight: normal;
+				color: #606266;
+			}
+
+			.desc {
+				margin-top: 8rpx;
+				color: $color-tip;
+				font-size: $font-size-tag;
+				line-height: 1;
+			}
+		}
+
+		.close-btn {
+			text-align: center;
+			margin-top: 20rpx;
+			z-index: 500;
+
+			.btn {
+				color: #fff;
+				font-size: 40rpx;
+				border: 4rpx solid #fff;
+				border-radius: 50%;
+				padding: 10rpx;
+				font-weight: bold;
+				width: 40rpx;
+				height: 40rpx;
+				margin: 0 auto;
+				line-height: 40rpx;
+			}
+		}
+	}
 </style>
\ No newline at end of file
diff --git a/components/ns-newform/ns-newform.vue b/components/ns-newform/ns-newform.vue
new file mode 100644
index 0000000..b341175
--- /dev/null
+++ b/components/ns-newform/ns-newform.vue
@@ -0,0 +1,933 @@
+<template>
+	<view class="form-wrap form-component">
+		<view v-for="(item, index) in formData" :key="index">
+			<!-- 文本输入框 -->
+			<view v-if="item.controller == 'Text'" class="order-wrap">
+				<view class="order-cell">
+					<view class="name">
+						<text class="tit">{{ item.value.title }}</text>
+						<text class="required">{{ item.value.required ? '*' : '' }}</text>
+					</view>
+					<view class="box">
+						<input 
+							type="text" 
+							:placeholder="item.value.placeholder" 
+							placeholder-class="placeholder color-tip" 
+							v-model="item.val"
+						/>
+					</view>
+				</view>
+			</view>
+			
+			<!-- 多行文本输入框 -->
+			<view v-if="item.controller == 'Textarea'" class="order-wrap">
+				<view class="order-cell flex-box textarea">
+					<view class="name">
+						<text class="tit">{{ item.value.title }}</text>
+						<text class="required">{{ item.value.required ? '*' : '' }}</text>
+					</view>
+					<view class="box">
+						<textarea 
+							:placeholder="item.value.placeholder" 
+							placeholder-class="placeholder color-tip" 
+							v-model="item.val"
+						></textarea>
+					</view>
+				</view>
+			</view>
+			
+			<!-- 下拉选择器 -->
+			<view v-if="item.controller == 'Select'" class="order-wrap">
+				<picker 
+					mode="selector" 
+					:range="item.value.options" 
+					@change="pickerChange($event, index)"
+				>
+					<view class="order-cell">
+						<view class="name">
+							<text class="tit">{{ item.value.title }}</text>
+							<text class="required">{{ item.value.required ? '*' : '' }}</text>
+						</view>
+						<view class="box">
+							<text v-if="item.val != ''">{{ item.val }}</text>
+							<text v-else class="color-tip">请选择</text>
+						</view>
+						<text class="iconfont icon-right"></text>
+					</view>
+				</picker>
+			</view>
+			
+			<!-- 复选框 -->
+			<view v-if="item.controller == 'Checkbox'" class="order-wrap">
+				<view class="order-cell">
+					<view class="name">
+						<text class="tit">{{ item.value.title }}</text>
+						<text class="required">{{ item.value.required ? '*' : '' }}</text>
+					</view>
+					<view class="box check-group-box">
+						<checkbox-group @change="checkboxChange($event, index)">
+							<label v-for="(v, k) in item.option_lists" :key="k">
+								<checkbox :value="v.value" :checked="v.checked"></checkbox>
+								<view class="checkbox">
+									<text 
+										:class="[
+											'iconfont',
+											!v.checked ? 'icon-fuxuankuang2' : '',
+											v.checked ? 'icon-fuxuankuang1 color-base-text' : ''
+										]"
+									></text>
+									{{ v.value }}
+								</view>
+							</label>
+						</checkbox-group>
+					</view>
+				</view>
+			</view>
+			
+			<!-- 单选框 -->
+			<view v-if="item.controller == 'Radio'" class="order-wrap">
+				<view class="order-cell">
+					<view class="name">
+						<text class="tit">{{ item.value.title }}</text>
+						<text class="required">{{ item.value.required ? '*' : '' }}</text>
+					</view>
+					<view class="box radio-group-box">
+						<radio-group @change="radioChange($event, index)">
+							<label v-for="(v, k) in item.option_lists" :key="k">
+								<radio :value="v.value" :checked="item.val == v.value"></radio>
+								<view class="radio-box">
+									<text 
+										:class="[
+											'iconfont',
+											item.val != v.value ? 'icon-yuan_checkbox' : '',
+											item.val == v.value ? 'icon-yuan_checked color-base-text' : ''
+										]"
+									></text>
+									{{ v.value }}
+								</view>
+							</label>
+						</radio-group>
+					</view>
+				</view>
+			</view>
+			
+			<!-- 图片上传 -->
+			<view v-if="item.controller == 'Img'" class="order-wrap">
+				<view class="order-cell flex-box">
+					<view class="name">
+						<text class="tit">{{ item.value.title }}</text>
+						<text class="required">{{ item.value.required ? '*' : '' }}</text>
+					</view>
+					<view class="box img-boxs">
+						<view v-for="(v, k) in item.img_lists" :key="k" class="img-box" @tap="uploadImg(index)">
+							<image :src="$util.img(v)" mode="aspectFill"></image>
+							<text class="iconfont icon-guanbi" @tap.stop="delImg(k, index)"></text>
+						</view>
+						<view class="img-box" @tap="addImg(index)">
+							<text class="iconfont icon-add1"></text>
+						</view>
+					</view>
+				</view>
+			</view>
+			
+			<!-- 日期选择器 -->
+			<view v-if="item.controller == 'Date'" class="order-wrap">
+				<view class="order-cell">
+					<view class="name">
+						<text class="tit">{{ item.value.title }}</text>
+						<text class="required">{{ item.value.required ? '*' : '' }}</text>
+					</view>
+					<view class="box box-flex">
+						<picker 
+							mode="date" 
+							:value="item.val" 
+							@change="bindDateChange($event, index)"
+						>
+							<view :class="['uni-input', !item.val ? 'color-tip' : '']">
+								{{ item.val ? item.val : item.value.placeholder }}
+							</view>
+						</picker>
+					</view>
+					<text class="iconfont icon-right"></text>
+				</view>
+			</view>
+			
+			<!-- 日期范围选择器 -->
+			<view v-if="item.controller == 'Datelimit'" class="order-wrap">
+				<view class="order-cell flex-box">
+					<view class="name">
+						<text class="tit">{{ item.value.title }}</text>
+						<text class="required">{{ item.value.required ? '*' : '' }}</text>
+					</view>
+					<view class="box date-boxs">
+						<view class="date-box">
+							<picker 
+								mode="date" 
+								:value="item.start_date" 
+								@change="bindStartDateChange($event, index)"
+							>
+								<view class="picker-box">
+									<view :class="['uni-input', !item.start_date ? 'color-tip' : '']">
+										{{ item.start_date ? item.start_date : item.value.placeholder_start }}
+									</view>
+								</view>
+							</picker>
+						</view>
+						<view class="interval iconfont icon-jian"></view>
+						<view class="date-box">
+							<picker 
+								mode="date" 
+								:value="item.end_date" 
+								@change="bindEndDateChange($event, index)"
+							>
+								<view class="picker-box">
+									<view :class="['uni-input', !item.end_date ? 'color-tip' : '']">
+										{{ item.end_date ? item.end_date : item.value.placeholder_end }}
+									</view>
+								</view>
+							</picker>
+						</view>
+					</view>
+				</view>
+			</view>
+			
+			<!-- 时间选择器 -->
+			<view v-if="item.controller == 'Time'" class="order-wrap">
+				<view class="order-cell">
+					<view class="name">
+						<text class="tit">{{ item.value.title }}</text>
+						<text class="required">{{ item.value.required ? '*' : '' }}</text>
+					</view>
+					<view class="box box-flex">
+						<picker 
+							mode="time" 
+							:value="item.val" 
+							@change="bindTimeChange($event, index)"
+						>
+							<view :class="['uni-input', !item.val ? 'color-tip' : '']">
+								{{ item.val ? item.val : item.value.placeholder }}
+							</view>
+						</picker>
+					</view>
+					<text class="iconfont icon-right"></text>
+				</view>
+			</view>
+			
+			<!-- 时间范围选择器 -->
+			<view v-if="item.controller == 'Timelimit'" class="order-wrap">
+				<view class="order-cell flex-box">
+					<view class="name">
+						<text class="tit">{{ item.value.title }}</text>
+						<text class="required">{{ item.value.required ? '*' : '' }}</text>
+					</view>
+					<view class="box date-boxs">
+						<view class="date-box">
+							<picker 
+								mode="time" 
+								:value="item.start_time" 
+								@change="bindStartTimeChange($event, index)"
+							>
+								<view class="picker-box">
+									<view :class="['uni-input', !item.start_time ? 'color-tip' : '']">
+										{{ item.start_time ? item.start_time : item.value.placeholder_start }}
+									</view>
+								</view>
+							</picker>
+						</view>
+						<view class="interval iconfont icon-jian"></view>
+						<view class="date-box">
+							<picker 
+								mode="time" 
+								:value="item.end_time" 
+								@change="bindEndTimeChange($event, index)"
+							>
+								<view class="picker-box">
+									<view :class="['uni-input', !item.end_time ? 'color-tip' : '']">
+										{{ item.end_time ? item.end_time : item.value.placeholder_end }}
+									</view>
+								</view>
+							</picker>
+						</view>
+					</view>
+				</view>
+			</view>
+			
+			<!-- 城市选择器 -->
+			<view v-if="item.controller == 'City'" class="order-wrap">
+				<view class="order-cell box-flex">
+					<view class="name">
+						<text class="tit">{{ item.value.title }}</text>
+						<text class="required">{{ item.value.required ? '*' : '' }}</text>
+					</view>
+					<view class="box">
+						<pick-regions 
+							:defaultRegions="item.default_regions"
+							:selectArr="item.select_arr"
+							@getRegions="handleGetRegions($event, index)"
+						>
+							<view :class="['select-address', !item.val ? 'empty' : '', !item.val ? 'color-tip' : '']">
+								{{ item.val ? item.val : (item.select_arr == '2' ? '请选择省市' : '请选择省市区/县') }}
+							</view>
+						</pick-regions>
+					</view>
+					<text class="iconfont icon-right"></text>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+import pickRegions from '@/components/pick-regions/pick-regions.vue'
+
+export default {
+	name: 'ns-form',
+	components: {
+		pickRegions
+	},
+	props: {
+		data: {
+			type: Array,
+			default: () => ({})
+		},
+		customAttr: {
+			type: Object,
+			default: () => ({})
+		}
+	},
+	data() {
+		return {
+			formData: this.data
+		}
+	},
+	created() {
+		this.setFormData();
+	},
+	watch: {
+		data: {
+			handler() {
+				this.setFormData();
+			},
+			deep: true
+		}
+	},
+	methods: {
+		setFormData() {
+			this.formData = this.data;
+			this.formData.forEach((item) => {
+				// 初始化默认值
+				if (!item.val) {
+					item.val = item.value.default ? item.value.default : '';
+				}
+				
+				// 处理选项列表
+				if (item.value.options) {
+					item.option_lists = [];
+					item.value.options.forEach((option, index) => {
+						let optionItem = {};
+						optionItem.value = option;
+						optionItem.checked = false;
+						
+						if (item.controller == 'Radio') {
+							if ((!item.val && index == 0) || (item.val && item.val == option)) {
+								optionItem.checked = true;
+								item.val = option;
+							}
+						}
+						
+						if (item.controller == 'Checkbox' && item.val) {
+							let valArray = item.val.split(',');
+							optionItem.checked = valArray.indexOf(option) != -1;
+						}
+						
+						item.option_lists.push(optionItem);
+					});
+				}
+				
+				// 处理图片列表
+				if (item.controller == 'Img') {
+					item.img_lists = item.val ? item.val.split(',') : [];
+				}
+				
+				// 处理日期
+				if (item.controller == 'Date' && !item.val) {
+					if (item.value.is_show_default) {
+						if (item.value.is_current) {
+							item.val = this.getDate();
+						} else {
+							item.val = item.value.default;
+						}
+					} else {
+						item.val = '';
+					}
+				}
+				
+				// 处理日期范围
+				if (item.controller == 'Datelimit') {
+					if (item.val) {
+						let dateArray = item.val.split(' - ');
+						item.start_date = dateArray[0];
+						item.end_date = dateArray[1];
+					} else {
+						item.val = '';
+						
+						// 开始日期
+						if (item.value.is_show_default_start) {
+							if (item.value.is_current_start) {
+								item.start_date = this.getDate();
+							} else {
+								item.start_date = item.value.default_start;
+							}
+						} else {
+							item.start_date = '';
+						}
+						
+						// 结束日期
+						if (item.value.is_show_default_end) {
+							if (item.value.is_current_end) {
+								item.end_date = this.getDate();
+							} else {
+								item.end_date = item.value.default_end;
+							}
+						} else {
+							item.end_date = '';
+						}
+						
+						if (item.start_date && item.end_date) {
+							item.val = item.start_date + ' - ' + item.end_date;
+						}
+					}
+				}
+				
+				// 处理时间
+				if (item.controller == 'Time' && !item.val) {
+					if (item.value.is_show_default) {
+						if (item.value.is_current) {
+							item.val = this.getTime();
+						} else {
+							item.val = item.value.default;
+						}
+					} else {
+						item.val = '';
+					}
+				}
+				
+				// 处理时间范围
+				if (item.controller == 'Timelimit') {
+					if (item.val) {
+						let timeArray = item.val.split(' - ');
+						item.start_time = timeArray[0];
+						item.end_time = timeArray[1];
+					} else {
+						item.val = '';
+						
+						// 开始时间
+						if (item.value.is_show_default_start) {
+							if (item.value.is_current_start) {
+								item.start_time = this.getTime();
+							} else {
+								item.start_time = item.value.default_start;
+							}
+						} else {
+							item.start_time = '';
+						}
+						
+						// 结束时间
+						if (item.value.is_show_default_end) {
+							if (item.value.is_current_end) {
+								item.end_time = this.getTime();
+							} else {
+								item.end_time = item.value.default_end;
+							}
+						} else {
+							item.end_time = '';
+						}
+						
+						if (item.start_time && item.end_time) {
+							item.val = item.start_time + ' - ' + item.end_time;
+						}
+					}
+				}
+				
+				// 处理城市选择
+				if (item.controller == 'City') {
+					item.full_address = '';
+					item.select_arr = item.value.default_type == 1 ? '2' : '3';
+					if (item.val) {
+						item.default_regions = item.val.split('-');
+					} else {
+						item.default_regions = [];
+					}
+				}
+			});
+		},
+		
+		// 表单验证
+		verify() {
+			for (let i = 0; i < this.formData.length; i++) {
+				let item = this.formData[i];
+				
+				// 文本验证
+				if (item.controller == 'Text') {
+					if (item.value.required && !item.val) {
+						this.$util.showToast({ title: '请输入' + item.value.title });
+						return false;
+					}
+					
+					if (item.name == 'ID_CARD' && !/(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/.test(item.val)) {
+						if (!item.value.required) {
+							this.$util.showToast({ title: '身份证输入不合法' });
+							return false;
+						}
+						if (item.val != '') {
+							this.$util.showToast({ title: '身份证输入不合法' });
+							return false;
+						}
+					}
+					
+					if (item.name == 'MOBILE' && !this.$util.verifyMobile(item.val)) {
+						if (!item.value.required) {
+							this.$util.showToast({ title: '手机号输入不合法' });
+							return false;
+						}
+						if (item.val != '') {
+							this.$util.showToast({ title: '手机号输入不合法' });
+							return false;
+						}
+					}
+				}
+				
+				// 多行文本验证
+				if (item.controller == 'Textarea' && item.value.required && !item.val) {
+					this.$util.showToast({ title: '请输入' + item.value.title });
+					return false;
+				}
+				
+				// 下拉选择验证
+				if (item.controller == 'Select' && item.value.required && !item.val) {
+					this.$util.showToast({ title: '请选择' + item.value.title });
+					return false;
+				}
+				
+				// 复选框验证
+				if (item.controller == 'Checkbox' && item.value.required && !item.val) {
+					this.$util.showToast({ title: '请至少选择一个' + item.value.title });
+					return false;
+				}
+				
+				// 图片上传验证
+				if (item.controller == 'Img' && item.value.required && !item.val) {
+					this.$util.showToast({ title: '请至少上传一张' + item.value.title });
+					return false;
+				}
+				
+				// 日期验证
+				if (item.controller == 'Date' && item.value.required && !item.val) {
+					this.$util.showToast({ title: '请选择' + item.value.title });
+					return false;
+				}
+				
+				// 日期范围验证
+				if (item.controller == 'Datelimit') {
+					if (item.value.required && !item.val) {
+						this.$util.showToast({ title: '请选择' + item.value.title });
+						return false;
+					}
+					
+					if (this.$util.timeTurnTimeStamp(item.start_date) > this.$util.timeTurnTimeStamp(item.end_date)) {
+						this.$util.showToast({ title: '结束日期不能小于开始日期' });
+						return false;
+					}
+				}
+				
+				// 时间验证
+				if (item.controller == 'Time' && item.value.required && !item.val) {
+					this.$util.showToast({ title: '请选择' + item.value.title });
+					return false;
+				}
+				
+				// 时间范围验证
+				if (item.controller == 'Timelimit') {
+					if (item.value.required && !item.val) {
+						this.$util.showToast({ title: '请选择' + item.value.title });
+						return false;
+					}
+					
+					if (item.start_time >= item.end_time) {
+						this.$util.showToast({ title: '结束时间必须大于开始时间' });
+						return false;
+					}
+				}
+				
+				// 城市选择验证
+				if (item.controller == 'City' && item.value.required && !item.val) {
+					this.$util.showToast({ title: '请选择' + item.value.title });
+					return false;
+				}
+			}
+			
+			return this.formData;
+		},
+		
+		// 下拉选择改变
+		pickerChange(event, index) {
+			this.formData[index].val = this.data[index].value.options[event.detail.value];
+			this.$forceUpdate();
+		},
+		
+		// 复选框改变
+		checkboxChange(event, index) {
+			this.formData[index].val = event.detail.value.toString();
+			this.formData[index].option_lists.forEach((option) => {
+				option.checked = event.detail.value.indexOf(option.value) != -1;
+			});
+			this.$forceUpdate();
+		},
+		
+		// 单选框改变
+		radioChange(event, index) {
+			this.formData[index].val = event.detail.value;
+			this.$forceUpdate();
+		},
+		
+		// 上传图片
+		uploadImg(index) {
+			let self = this;
+			this.$util.upload(Number(this.formData[index].value.max_count), { path: 'evaluateimg' }, function(res) {
+				if (res.length > 0) {
+					res.forEach(function(img) {
+						if (self.formData[index].img_lists.length >= Number(self.formData[index].value.max_count)) {
+							self.$util.showToast({ title: '最多上传' + self.formData[index].value.max_count + '张图片' });
+							return false;
+						}
+						self.formData[index].img_lists.push(img);
+					});
+					self.formData[index].val = self.formData[index].img_lists.toString();
+					self.$forceUpdate();
+				}
+			});
+		},
+		
+		// 添加图片
+		addImg(index) {
+			let self = this;
+			if (this.formData[index].img_lists.length >= Number(this.formData[index].value.max_count)) {
+				this.$util.showToast({ title: '最多上传' + this.formData[index].value.max_count + '张图片' });
+				return false;
+			}
+			
+			this.$util.upload(Number(this.formData[index].value.max_count), { path: 'evaluateimg' }, function(res) {
+				if (res.length > 0) {
+					res.forEach(function(img) {
+						self.formData[index].img_lists.push(img);
+					});
+					self.formData[index].val = self.formData[index].img_lists.toString();
+					self.$forceUpdate();
+				}
+			});
+		},
+		
+		// 删除图片
+		delImg(imgIndex, formIndex) {
+			this.formData[formIndex].img_lists.splice(imgIndex, 1);
+			this.formData[formIndex].val = this.formData[formIndex].img_lists.toString();
+			this.$forceUpdate();
+		},
+		
+		// 获取当前日期
+		getDate() {
+			let date = new Date();
+			let year = date.getFullYear();
+			let month = date.getMonth() + 1;
+			let day = date.getDate();
+			month = month > 9 ? month : '0' + month;
+			day = day > 9 ? day : '0' + day;
+			return `${year}-${month}-${day}`;
+		},
+		
+		// 获取当前时间
+		getTime() {
+			let date = new Date();
+			let hours = date.getHours();
+			let minutes = date.getMinutes();
+			hours = hours > 9 ? hours : '0' + hours;
+			minutes = minutes > 9 ? minutes : '0' + minutes;
+			return `${hours}:${minutes}`;
+		},
+		
+		// 日期改变
+		bindDateChange(event, index) {
+			this.formData[index].val = event.detail.value;
+			this.$forceUpdate();
+		},
+		
+		// 开始日期改变
+		bindStartDateChange(event, index) {
+			this.$set(this.formData[index], 'start_date', event.detail.value);
+			this.$set(this.formData[index], 'val', this.formData[index].start_date + ' - ' + this.formData[index].end_date);
+			this.$forceUpdate();
+		},
+		
+		// 结束日期改变
+		bindEndDateChange(event, index) {
+			this.$set(this.formData[index], 'end_date', event.detail.value);
+			this.$set(this.formData[index], 'val', this.formData[index].start_date + ' - ' + this.formData[index].end_date);
+			this.$forceUpdate();
+		},
+		
+		// 时间改变
+		bindTimeChange(event, index) {
+			this.formData[index].val = event.detail.value;
+			this.$forceUpdate();
+		},
+		
+		// 开始时间改变
+		bindStartTimeChange(event, index) {
+			this.formData[index].start_time = event.detail.value;
+			this.$forceUpdate();
+		},
+		
+		// 结束时间改变
+		bindEndTimeChange(event, index) {
+			this.formData[index].end_time = event.detail.value;
+			this.formData[index].val = this.formData[index].start_time + ' - ' + this.formData[index].end_time;
+			this.$forceUpdate();
+		},
+		
+		// 处理地区选择
+		handleGetRegions(regions, index) {
+			this.formData[index].val = '';
+			this.formData[index].val += regions[0] != undefined ? regions[0].label : '';
+			this.formData[index].val += regions[1] != undefined ? '-' + regions[1].label : '';
+			this.formData[index].val += regions[2] != undefined ? '-' + regions[2].label : '';
+			this.$forceUpdate();
+		}
+	}
+}
+</script>
+
+<style lang="scss" scoped>
+.order-wrap {
+	padding: 20rpx 0;
+	
+	&:last-child {
+		margin-bottom: 0;
+		border-bottom: 0;
+	}
+	
+	.order-cell {
+		align-items: center;
+		background: #fff;
+		position: relative;
+		
+		&.textarea {
+			align-items: unset;
+		}
+		
+		&.clear-flex {
+			display: block;
+			
+			.box {
+				margin-top: 16rpx;
+				text-align: left;
+			}
+		}
+		
+		&:last-child {
+			margin-bottom: 0;
+			border-bottom: solid 1px #eee;
+		}
+		
+		&.align-top {
+			align-items: flex-start;
+		}
+		
+		text {
+			font-size: 28rpx;
+		}
+		
+		.name {
+			width: 160rpx;
+			margin-bottom: 10rpx;
+			overflow: hidden;
+			text-overflow: ellipsis;
+			white-space: nowrap;
+			
+			.tit {
+				text-align: left;
+				font-size: 32rpx;
+				color: #888;
+				
+				text {
+					font-size: 28rpx;
+				}
+			}
+			
+			.required {
+				color: red;
+				font-size: 28rpx;
+				margin-left: 4rpx;
+				width: 14rpx;
+				text-align: left;
+				display: inline-block;
+			}
+		}
+		
+		.box {
+			flex: 1;
+			padding: 0 0rpx;
+			line-height: inherit;
+			text-align: left;
+			
+			input {
+				font-size: 28rpx;
+				text-align: left;
+				height: 70rpx;
+				border: solid 2rpx #eee;
+				line-height: 70rpx;
+				padding: 0 16rpx;
+			}
+			
+			textarea {
+				font-size: 28rpx;
+				width: 100%;
+				height: 88rpx;
+				line-height: 44rpx;
+				text-align: left;
+			}
+			
+			checkbox-group {
+				display: flex;
+				flex-wrap: wrap;
+			}
+			
+			radio-group {
+				display: flex;
+				flex-wrap: wrap;
+			}
+			
+			label {
+				display: flex;
+				align-items: center;
+				line-height: 1;
+				margin-right: 30rpx;
+			}
+			
+			&.img-boxs {
+				display: flex;
+				align-items: center;
+				flex-wrap: wrap;
+				
+				.img-box {
+					margin: 10rpx 20rpx 10rpx 0;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					width: 100rpx;
+					height: 100rpx;
+					border: 1rpx solid #eee;
+					border-radius: 4rpx;
+					position: relative;
+					
+					.icon-guanbi {
+						position: absolute;
+						top: -14rpx;
+						right: -14rpx;
+						display: inline-block;
+						width: 28rpx;
+						height: 28rpx;
+						line-height: 28rpx;
+						color: #909399;
+					}
+					
+					.icon-add1 {
+						font-size: 40rpx;
+					}
+					
+					image {
+						width: 100%;
+						height: 100%;
+					}
+				}
+			}
+			
+			&.box-flex {
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+			}
+			
+			&.date-boxs {
+				padding: 0 10rpx;
+				display: flex;
+				align-items: center;
+				
+				.interval {
+					margin: 0 12rpx;
+					color: #000;
+					font-weight: 700;
+				}
+				
+				.date-box {
+					.picker-box {
+						display: flex;
+						align-items: center;
+						justify-content: flex-end;
+					}
+				}
+			}
+		}
+		
+		.radio-group-box {
+			radio {
+				display: none;
+			}
+			
+			.radio-box {
+				display: flex;
+				align-items: center;
+				line-height: 1;
+				
+				.iconfont {
+					font-size: 32rpx;
+					margin-right: 10rpx;
+				}
+			}
+		}
+		
+		.check-group-box {
+			checkbox {
+				display: none;
+			}
+			
+			.checkbox {
+				display: flex;
+				align-items: center;
+				line-height: 1;
+				
+				.iconfont {
+					font-size: 32rpx;
+					margin-right: 10rpx;
+				}
+			}
+		}
+		
+		.iconfont {
+			color: #909399;
+			font-size: 28rpx;
+		}
+		
+		.box-flex {
+			picker {
+				display: block;
+				width: 100%;
+			}
+		}
+		
+		.icon-right {
+			line-height: 1;
+			position: unset;
+		}
+	}
+}
+</style>
\ No newline at end of file
diff --git a/components/ns-payment/ns-payment.vue b/components/ns-payment/ns-payment.vue
index ba31411..3a6464b 100644
--- a/components/ns-payment/ns-payment.vue
+++ b/components/ns-payment/ns-payment.vue
@@ -1,647 +1,659 @@
-<template>
-    <view>
-        <!-- 选择支付方式弹窗 -->
-        <uni-popup ref="choosePaymentPopup" type="center" :mask-click="false">
-            <view class="choose-payment-popup popup" @touchmove.prevent.stop>
-                <view class="popup-header">
-                    <text class="tit">支付方式</text>
-                    <text class="iconfont icon-close" @click="close()"></text>
-                </view>
-                <scroll-view scroll-y="true" class="popup-body" :class="{ 'safe-area': isIphoneX }">
-                    <view class="pay-money">
-                        <!-- <text class="unit">{{ $lang('common.currencySymbol') }}</text> -->
-                        <text class="money">支付金额{{ payMoney | moneyFormat }}元</text>
-                    </view>
-                    <view class="payment-item" v-if="balanceDeduct > 0 && balanceConfig == 1 && sale">
-                        <view class="iconfont icon-yue"></view>
-                        <view class="info-wrap">
-                            <text class="name">余额抵扣</text>
-                            <view class="money">可用¥{{ balanceDeduct }}</view>
-                        </view>
-                        <ns-switch class="balance-switch" @change="useBalance" :checked="isBalance == 1"></ns-switch>
-                    </view>
-                    <block v-if="payMoney > 0">
-                        <block v-if="payTypeList.length">
-                            <view class="payment-item" v-for="(item, index) in payTypeList" :key="index" @click="payIndex = index">
-                                <view class="iconfont" :class="item.icon"></view>
-                                <text class="name">{{ item.name }}</text>
-                                <text class="iconfont" :class="payIndex == index ? 'icon-yuan_checked color-base-text' : 'icon-checkboxblank'"></text>
-                            </view>
-                        </block>
-                        <block v-else>
-                            <view class="empty">平台尚未配置支付方式！</view>
-                        </block>
-                    </block>
-                </scroll-view>
-                <view class="popup-footer" :class="{ 'bottom-safe-area': isIphoneX }">
-                    <view class="confirm-btn color-base-bg" @click="confirm()">确认支付</view>
-                </view>
-            </view>
-        </uni-popup>
-    </view>
-</template>
-
-<!-- 旧版支付组件 订单表不为order表 的订单支付时使用该组件  -->
-<script>
-    import uniPopup from '@/components/uni-popup/uni-popup.vue';
-    import nsSwitch from '@/components/ns-switch/ns-switch.vue';
-
-    // #ifdef H5
-    import { Weixin } from 'common/js/wx-jssdk.js';
-    // #endif
-
-    export default {
-        name: 'ns-payment',
-        components: {
-            uniPopup,
-            nsSwitch
-        },
-        props: {
-            balanceDeduct: {
-                type: [Number, String],
-                default: ''
-            },
-            isBalance: {
-                type: Number,
-                default: 0
-            },
-            payMoney: {
-                type: [Number, String],
-                default: 0
-            }
-        },
-        data() {
-            return {
-                isIphoneX: false,
-                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'
-                }],
-                isMatched: 0, // 支付是否需要校验
-                // #endif
-                // #ifdef MP-ALIPAY
-                payTypeList: [{
-                    name: '支付宝支付',
-                    icon: 'icon-zhifubaozhifu-',
-                    type: 'alipay',
-                    provider: 'alipay'
-                }],
-                // #endif
-                payInfo: {},
-                balanceConfig: 0,
-                // 预售页面判断
-                sale: true
-            };
-        },
-        created(e) {
-            // #ifdef H5
-            let url = window.location.href
-            // #endif
-            // #ifndef H5
-            let url = getCurrentPages()[getCurrentPages().length - 1].route
-            // #endif
-            let list = url.match('presale/order_list/order_list')
-            let detail = url.match('presale/order_detail/order_detail')
-            if (list || detail) {
-                this.sale = false
-            }
-            this.isIphoneX = this.$util.uniappIsIPhoneX();
-            this.getPayType();
-            this.getBalanceConfig();
-            // #ifdef MP-WEIXIN
-            if (uni.getStorageSync('paySource') == '') this.payIsMatched();
-            // #endif
-        },
-        methods: {
-            // #ifdef MP-WEIXIN
-            payIsMatched() {
-                if (uni.getStorageSync('is_test')) {
-                    this.isMatched = 1;
-                    return;
-                }
-                let options = wx.getLaunchOptionsSync();
-                this.$api.sendRequest({
-                    url: '/shopcomponent/api/weapp/scenecheck',
-                    data: {
-                        scene: options.scene
-                    },
-                    success: res => {
-                        if (res.code == 0) this.isMatched = res.data;
-                    }
-                })
-            },
-            // #endif
-            open() {
-                this.$refs.choosePaymentPopup.open();
-            },
-            close() {
-                this.$refs.choosePaymentPopup.close();
-            },
-            // 使用余额
-            useBalance() {
-                this.$emit('useBalance');
-            },
-            confirm() {
-                if (this.payTypeList.length == 0 && this.payMoney > 0) {
-                    this.$util.showToast({
-                        title: '请选择支付方式！'
-                    });
-                    return;
-                }
-                uni.showLoading({
-                    title: '支付中...',
-                    mask: true
-                });
-                this.$refs.choosePaymentPopup.close();
-                this.$emit('confirm');
-                uni.setStorageSync('pay_flag', 1);
-            },
-            getPayInfo(out_trade_no) {
-                this.$api.sendRequest({
-                    url: '/api/pay/info',
-                    data: {
-                        out_trade_no
-                    },
-                    success: res => {
-                        if (res.code >= 0 && res.data) {
-                            this.payInfo = res.data;
-                            this.pay();
-                        } else {
-                            this.$util.showToast({
-                                title: '未获取到支付信息！'
-                            });
-                            setTimeout(() => {
-                                this.$util.redirectTo('/pages/index/index');
-                            }, 1500);
-                        }
-                    }
-                });
-            },
-            getBalanceConfig() {
-                this.$api.sendRequest({
-                    url: '/api/pay/getBalanceConfig',
-                    data: {},
-                    success: res => {
-                        this.balanceConfig = res.data.balance_show;
-                    }
-                });
-            },
-            getPayType() {
-                this.$api.sendRequest({
-                    url: '/api/pay/type',
-                    success: res => {
-                        if (res.code == 0) {
-                            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);
-                                    }
-                                });
-                            }
-                        }
-                    }
-                });
-            },
-            // #ifdef H5
-            pay() {
-                var payType = this.payTypeList[this.payIndex];
-                if (!payType) return;
-                var return_url = '';
-                if (this.payInfo.event == 'BlindboxGoodsOrderPayNotify') {
-                    return_url = '/pages_promotion/blindbox/index?outTradeNo=';
-                } else {
-                    return_url = '/pages_tool/pay/result?code=';
-                }
-                this.$api.sendRequest({
-                    url: '/api/pay/pay',
-                    data: {
-                        out_trade_no: this.payInfo.out_trade_no,
-                        pay_type: payType.type,
-                        return_url: encodeURIComponent(this.$config.h5Domain + return_url + this.payInfo.out_trade_no)
-                    },
-                    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_tool/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 ? payData.timestamp : payData.timeStamp,
-                                                            nonceStr: payData.nonceStr,
-                                                            package: payData.package,
-                                                            signType: payData.signType,
-                                                            paySign: payData.paySign
-                                                        },
-                                                        res => {
-                                                            if (res.errMsg == 'chooseWXPay:ok') {
-                                                                if (this.payInfo.event == 'BlindboxGoodsOrderPayNotify') {
-                                                                    this.$util.redirectTo('/pages_promotion/blindbox/index', {
-                                                                        outTradeNo: this.payInfo.out_trade_no
-                                                                    }, '', 'redirectTo');
-                                                                } else {
-                                                                    this.$util.redirectTo('/pages_tool/pay/result', {
-                                                                        code: this.payInfo.out_trade_no
-                                                                    }, '', 'redirectTo');
-                                                                }
-
-                                                            } else {
-                                                                this.$util.showToast({
-                                                                    title: res.errMsg
-                                                                });
-                                                            }
-                                                        },
-                                                        res => {
-                                                            this.$util.showToast({
-                                                                title: '您已取消支付'
-                                                            });
-                                                            setTimeout(() => {
-                                                                this.$util.redirectTo('/pages_tool/pay/result', {
-                                                                    code: this.payInfo.out_trade_no
-                                                                }, 'redirectTo');
-                                                            }, 2000);
-                                                        }
-                                                );
-                                            }
-                                        });
-                                    } 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
-            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,
-                        is_matched: this.isMatched,
-                        scene: uni.getStorageSync('is_test') ? 1175 : wx.getLaunchOptionsSync().scene
-                    },
-                    success: res => {
-                        uni.hideLoading();
-                        if (res.code >= 0) {
-                            var payData = res.data.data;
-
-                            // #ifdef MP-WEIXIN
-                            var scene = uni.getStorageSync('is_test') ? 1175 : wx.getLaunchOptionsSync()
-                                    .scene;
-                            if ([1175, 1176, 1177, 1191, 1195].indexOf(scene) != -1) {
-                                uni.requestOrderPayment({
-                                    timeStamp: payData.timeStamp,
-                                    nonceStr: payData.nonceStr,
-                                    package: payData.package,
-                                    signType: payData.signType,
-                                    paySign: payData.paySign,
-                                    // orderInfo: payData.orderInfo,
-                                    success: res => {
-                                        uni.removeStorage({key: 'is_test'})
-                                        if (this.payInfo.event == 'BlindboxGoodsOrderPayNotify') {
-                                            this.$util.redirectTo(
-                                                    '/pages_promotion/blindbox/index', {
-                                                        outTradeNo: this
-                                                                .payInfo.out_trade_no
-                                                    }, '',
-                                                    'redirectTo');
-                                        } else {
-                                            this.$util.redirectTo(
-                                                    '/pages_tool/pay/result', {
-                                                        code: this
-                                                                .payInfo.out_trade_no
-                                                    }, '',
-                                                    'redirectTo');
-                                        }
-                                    },
-                                    fail: res => {
-                                        this.flag = false;
-                                        if (res.errMsg == 'requestOrderPayment:fail cancel') {
-                                            this.$util.showToast({title: '您已取消支付'});
-                                        } else {
-                                            uni.showModal({
-                                                content: '支付失败,失败原因: ' + res.errMsg,
-                                                showCancel: false
-                                            });
-                                        }
-                                        setTimeout(() => {
-                                            uni.removeStorage({key: 'is_test'})
-                                            if (this.payInfo.event == 'BlindboxGoodsOrderPayNotify') {
-                                                this.$util.redirectTo('/pages_promotion/blindbox/index', {
-                                                    outTradeNo: this.payInfo.out_trade_no
-                                                }, '', 'redirectTo');
-                                            } else {
-                                                this.$util.redirectTo('/pages_tool/pay/result', {
-                                                    code: this.payInfo.out_trade_no
-                                                }, '', 'redirectTo');
-                                            }
-                                        }, 2000);
-                                    }
-                                })
-                                return
-                            }
-                            // #endif
-
-                            uni.requestPayment({
-                                provider: payType.provider,
-                                ...payData,
-                                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
-                                        });
-                                    }
-                                    setTimeout(() => {
-                                        this.$util.redirectTo('/pages_tool/pay/result', {
-                                                    code: this.payInfo.out_trade_no
-                                                },
-                                                'redirectTo');
-                                    }, 2000);
-                                }
-                            });
-
-                        } else {
-                            this.$util.showToast({ title: res.message });
-                            setTimeout(() => {
-                                this.$util.redirectTo('/pages_tool/pay/result', {
-                                    code: this.payInfo.out_trade_no
-                                }, 'redirectTo');
-                            }, 2000);
-                        }
-                    },
-                    fail: res => {
-                        uni.hideLoading();
-                        this.$util.showToast({ title: 'request:fail' });
-                    }
-                });
-            }
-            // #endif
-        },
-        // #ifdef H5
-        deactivated() {
-            clearInterval(this.timer);
-        },
-        // #endif
-    };
-</script>
-
-<style lang="scss">
-    .popup {
-        width: 75vw;
-        background: #fff;
-        border-top-left-radius: $border-radius;
-        border-top-right-radius: $border-radius;
-
-        .popup-header {
-            display: flex;
-            border-bottom: 2rpx solid $color-line;
-            position: relative;
-            padding: 40rpx;
-
-            .tit {
-                flex: 1;
-                font-size: $font-size-toolbar;
-                line-height: 1;
-                text-align: center;
-            }
-
-            .iconfont {
-                line-height: 1;
-                position: absolute;
-                right: 30rpx;
-                top: 50%;
-                transform: translate(0, -50%);
-                color: $color-tip;
-                font-size: $font-size-toolbar;
-            }
-        }
-
-        .popup-body {
-            height: calc(100% - 250rpx);
-
-            &.safe-area {
-                height: calc(100% - 270rpx);
-            }
-        }
-
-        .popup-footer {
-            height: 100rpx;
-
-            .confirm-btn {
-                height: 72rpx;
-                line-height: 72rpx;
-                color: #fff;
-                text-align: center;
-                margin: 20rpx 30rpx 0;
-                border-radius: $border-radius;
-                font-size: $font-size-base;
-
-            }
-
-            &.bottom-safe-area {
-                padding-bottom: constant(safe-area-inset-bottom);
-                padding-bottom: env(safe-area-inset-bottom);
-            }
-        }
-    }
-
-    .choose-payment-popup {
-        .payment-item {
-            display: flex;
-            align-items: center;
-            justify-content: space-between;
-            height: 90rpx;
-            margin: 0 30rpx;
-            border-bottom: 2rpx solid $color-line;
-            padding: 20rpx 0;
-
-            &:nth-child(2) {
-                padding-top: 0;
-            }
-
-            &:last-child {
-                border-bottom: none;
-            }
-
-            .iconfont {
-                font-size: 64rpx;
-            }
-
-            .icon-yue {
-                color: #faa218;
-            }
-
-            .icon-weixin1 {
-                color: #24af41;
-            }
-
-            .icon-zhifubaozhifu- {
-                color: #00a0e9;
-            }
-
-            .icon-checkboxblank {
-                font-size: 40rpx;
-                color: $color-line;
-            }
-
-            .icon-yuan_checked {
-                font-size: 40rpx;
-            }
-
-            .name {
-                margin-left: 20rpx;
-                font-size: $font-size-base;
-                flex: 1;
-            }
-
-            .info-wrap {
-                flex: 1;
-                margin-left: 20rpx;
-
-                .name {
-                    margin-left: 0;
-                    font-size: $font-size-base;
-                    flex: 1;
-                }
-
-                .money {
-                    color: $color-tip;
-                    font-size: $font-size-tag;
-                }
-            }
-
-            .box {
-                flex: 1;
-                padding: 0 10rpx;
-                line-height: inherit;
-                text-align: right;
-
-                input {
-                    font-size: $font-size-tag !important;
-                }
-            }
-
-            &.set-pay-password {
-                height: initial;
-
-                .box {
-                    font-size: $font-size-tag !important;
-                }
-            }
-        }
-
-        .pay-money {
-            text-align: center;
-            padding: 20rpx 0 40rpx 0;
-            background-color: #fff;
-            font-weight: bold;
-            margin-top: 30rpx;
-            line-height: 1;
-
-            .unit {
-                margin-right: 4rpx;
-                font-size: $font-size-tag;
-            }
-
-            .money {
-                font-size: $font-size-toolbar;
-            }
-        }
-    }
-
-    .empty {
-        width: 100%;
-        text-align: center;
-        padding: 40rpx 0;
-        color: $color-sub;
-        font-size: $font-size-tag;
-    }
+<template>
+    <view>
+        <!-- 选择支付方式弹窗 -->
+        <uni-popup ref="choosePaymentPopup" type="center" :mask-click="false">
+            <view class="choose-payment-popup popup" @touchmove.prevent.stop>
+                <view class="popup-header">
+                    <text class="tit">支付方式</text>
+                    <text class="iconfont icon-close" @click="close()"></text>
+                </view>
+                <scroll-view scroll-y="true" class="popup-body" :class="{ 'safe-area': isIphoneX }">
+                    <view class="pay-money">
+                        <!-- <text class="unit">{{ $lang('common.currencySymbol') }}</text> -->
+                        <text class="money">支付金额{{ payMoney | moneyFormat }}元</text>
+                    </view>
+                    <view class="payment-item" v-if="balanceDeduct > 0 && balanceConfig == 1 && sale">
+                        <view class="iconfont icon-yue"></view>
+                        <view class="info-wrap">
+                            <text class="name">余额抵扣</text>
+                            <view class="money">可用¥{{ balanceDeduct }}</view>
+                        </view>
+                        <ns-switch class="balance-switch" @change="useBalance" :checked="isBalance == 1"></ns-switch>
+                    </view>
+                    <block v-if="payMoney > 0">
+                        <block v-if="payTypeList.length">
+                            <view class="payment-item" v-for="(item, index) in payTypeList" :key="index" @click="payIndex = index">
+                                <view class="iconfont" :class="item.icon"></view>
+                                <text class="name">{{ item.name }}</text>
+                                <text class="iconfont" :class="payIndex == index ? 'icon-yuan_checked color-base-text' : 'icon-checkboxblank'"></text>
+                            </view>
+                        </block>
+                        <block v-else>
+                            <view class="empty">平台尚未配置支付方式！</view>
+                        </block>
+                    </block>
+                </scroll-view>
+                <view class="popup-footer" :class="{ 'bottom-safe-area': isIphoneX }">
+                    <view class="confirm-btn color-base-bg" @click="confirm()">确认支付</view>
+                </view>
+            </view>
+        </uni-popup>
+    </view>
+</template>
+
+<!-- 旧版支付组件 订单表不为order表 的订单支付时使用该组件  -->
+<script>
+    import uniPopup from '@/components/uni-popup/uni-popup.vue';
+    import nsSwitch from '@/components/ns-switch/ns-switch.vue';
+
+    // #ifdef H5
+    import { Weixin } from 'common/js/wx-jssdk.js';
+    // #endif
+
+    export default {
+        name: 'ns-payment',
+        components: {
+            uniPopup,
+            nsSwitch
+        },
+        props: {
+            balanceDeduct: {
+                type: [Number, String],
+                default: ''
+            },
+            isBalance: {
+                type: Number,
+                default: 0
+            },
+            payMoney: {
+                type: [Number, String],
+                default: 0
+            }
+        },
+        data() {
+            return {
+                isIphoneX: false,
+                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'
+                }],
+                isMatched: 0, // 支付是否需要校验
+                // #endif
+                // #ifdef MP-ALIPAY
+                payTypeList: [{
+                    name: '支付宝支付',
+                    icon: 'icon-zhifubaozhifu-',
+                    type: 'alipay',
+                    provider: 'alipay'
+                }],
+                // #endif
+                payInfo: {},
+                balanceConfig: 0,
+                // 预售页面判断
+                sale: true
+            };
+        },
+        created(e) {
+            // #ifdef H5
+            let url = window.location.href
+            // #endif
+            // #ifndef H5
+            let url = getCurrentPages()[getCurrentPages().length - 1].route
+            // #endif
+            let list = url.match('presale/order_list/order_list')
+            let detail = url.match('presale/order_detail/order_detail')
+            if (list || detail) {
+                this.sale = false
+            }
+            this.isIphoneX = this.$util.uniappIsIPhoneX();
+            this.getPayType();
+            this.getBalanceConfig();
+            // #ifdef MP-WEIXIN
+            if (uni.getStorageSync('paySource') == '') this.payIsMatched();
+            // #endif
+        },
+        methods: {
+            // #ifdef MP-WEIXIN
+            payIsMatched() {
+                if (uni.getStorageSync('is_test')) {
+                    this.isMatched = 1;
+                    return;
+                }
+                let options = wx.getLaunchOptionsSync();
+                this.$api.sendRequest({
+                    url: '/shopcomponent/api/weapp/scenecheck',
+                    data: {
+                        scene: options.scene
+                    },
+                    success: res => {
+                        if (res.code == 0) this.isMatched = res.data;
+                    }
+                })
+            },
+            // #endif
+            open() {
+                this.$refs.choosePaymentPopup.open();
+            },
+            close() {
+                this.$refs.choosePaymentPopup.close();
+            },
+            // 使用余额
+            useBalance() {
+                this.$emit('useBalance');
+            },
+            confirm() {
+                if (this.payTypeList.length == 0 && this.payMoney > 0) {
+                    this.$util.showToast({
+                        title: '请选择支付方式！'
+                    });
+                    return;
+                }
+                uni.showLoading({
+                    title: '支付中...',
+                    mask: true
+                });
+                this.$refs.choosePaymentPopup.close();
+                this.$emit('confirm');
+                uni.setStorageSync('pay_flag', 1);
+            },
+            getPayInfo(out_trade_no) {
+                this.$api.sendRequest({
+                    url: '/api/pay/info',
+                    data: {
+                        out_trade_no
+                    },
+                    success: res => {
+                        if (res.code >= 0 && res.data) {
+                            this.payInfo = res.data;
+							if(this.payInfo['pay_status'] == 2){
+								this.$util.redirectTo('/pages_tool/pay/result', {
+								    code: this.payInfo.out_trade_no
+								}, '', 'redirectTo');
+							}else{
+								this.pay();
+							}
+                        } else {
+                            this.$util.showToast({
+                                title: '未获取到支付信息！'
+                            });
+                            setTimeout(() => {
+                                this.$util.redirectTo('/pages/index/index');
+                            }, 1500);
+                        }
+                    }
+                });
+            },
+            getBalanceConfig() {
+                this.$api.sendRequest({
+                    url: '/api/pay/getBalanceConfig',
+                    data: {},
+                    success: res => {
+                        this.balanceConfig = res.data.balance_show;
+                    }
+                });
+            },
+            getPayType() {
+                this.$api.sendRequest({
+                    url: '/api/pay/type',
+                    success: res => {
+                        if (res.code == 0) {
+                            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);
+                                    }
+                                });
+                            }
+                        }
+                    }
+                });
+            },
+            // #ifdef H5
+            pay() {
+                var payType = this.payTypeList[this.payIndex];
+                if (!payType) return;
+			
+                var return_url = '';
+                if (this.payInfo.event == 'BlindboxGoodsOrderPayNotify') {
+                    return_url = '/pages_promotion/blindbox/index?outTradeNo=';
+                } else {
+                    return_url = '/pages_tool/pay/result?code=';
+                }
+                this.$api.sendRequest({
+                    url: '/api/pay/pay',
+                    data: {
+                        out_trade_no: this.payInfo.out_trade_no,
+                        pay_type: payType.type,
+                        return_url: encodeURIComponent(this.$config.h5Domain + return_url + this.payInfo.out_trade_no)
+                    },
+                    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_tool/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 ? payData.timestamp : payData.timeStamp,
+                                                            nonceStr: payData.nonceStr,
+                                                            package: payData.package,
+                                                            signType: payData.signType,
+                                                            paySign: payData.paySign
+                                                        },
+                                                        res => {
+                                                            if (res.errMsg == 'chooseWXPay:ok') {
+                                                                if (this.payInfo.event == 'BlindboxGoodsOrderPayNotify') {
+                                                                    this.$util.redirectTo('/pages_promotion/blindbox/index', {
+                                                                        outTradeNo: this.payInfo.out_trade_no
+                                                                    }, '', 'redirectTo');
+                                                                } else {
+                                                                    this.$util.redirectTo('/pages_tool/pay/result', {
+                                                                        code: this.payInfo.out_trade_no
+                                                                    }, '', 'redirectTo');
+                                                                }
+
+                                                            } else {
+                                                                this.$util.showToast({
+                                                                    title: res.errMsg
+                                                                });
+                                                            }
+                                                        },
+                                                        res => {
+                                                            this.$util.showToast({
+                                                                title: '您已取消支付'
+                                                            });
+                                                            setTimeout(() => {
+                                                                this.$util.redirectTo('/pages_tool/pay/result', {
+                                                                    code: this.payInfo.out_trade_no
+                                                                }, 'redirectTo');
+                                                            }, 2000);
+                                                        }
+                                                );
+                                            }
+                                        });
+                                    } 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
+            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,
+                        is_matched: this.isMatched,
+                        scene: uni.getStorageSync('is_test') ? 1175 : wx.getLaunchOptionsSync().scene
+                    },
+                    success: res => {
+                        uni.hideLoading();
+                        if (res.code >= 0) {
+                            var payData = res.data.data;
+
+                            // #ifdef MP-WEIXIN
+                            var scene = uni.getStorageSync('is_test') ? 1175 : wx.getLaunchOptionsSync()
+                                    .scene;
+                            if ([1175, 1176, 1177, 1191, 1195].indexOf(scene) != -1) {
+                                uni.requestOrderPayment({
+                                    timeStamp: payData.timeStamp,
+                                    nonceStr: payData.nonceStr,
+                                    package: payData.package,
+                                    signType: payData.signType,
+                                    paySign: payData.paySign,
+                                    // orderInfo: payData.orderInfo,
+                                    success: res => {
+                                        uni.removeStorage({key: 'is_test'})
+                                        if (this.payInfo.event == 'BlindboxGoodsOrderPayNotify') {
+                                            this.$util.redirectTo('/pages_promotion/blindbox/index', {
+                                                outTradeNo: this.payInfo.out_trade_no
+                                            }, '', 'redirectTo');
+                                        } else {
+                                            this.$util.redirectTo('/pages_tool/pay/result', {
+                                                code: this.payInfo.out_trade_no
+                                            }, '', 'redirectTo');
+                                        }
+                                    },
+                                    fail: res => {
+                                        this.flag = false;
+                                        if (res.errMsg == 'requestOrderPayment:fail cancel') {
+                                            this.$util.showToast({title: '您已取消支付'});
+                                        } else {
+                                            uni.showModal({
+                                                content: '支付失败,失败原因: ' + res.errMsg,
+                                                showCancel: false
+                                            });
+                                        }
+                                        setTimeout(() => {
+                                            uni.removeStorage({key: 'is_test'})
+                                            if (this.payInfo.event == 'BlindboxGoodsOrderPayNotify') {
+                                                this.$util.redirectTo('/pages_promotion/blindbox/index', {
+                                                    outTradeNo: this.payInfo.out_trade_no
+                                                }, '', 'redirectTo');
+                                            } else {
+                                                this.$util.redirectTo('/pages_tool/pay/result', {
+                                                    code: this.payInfo.out_trade_no
+                                                }, '', 'redirectTo');
+                                            }
+                                        }, 2000);
+                                    }
+                                })
+                                return
+                            }
+                            // #endif
+
+                            uni.requestPayment({
+                                provider: payType.provider,
+                                ...payData,
+                                success: res => {
+									if (this.payInfo.event == 'BlindboxGoodsOrderPayNotify') {
+									    this.$util.redirectTo('/pages_promotion/blindbox/index', {
+									        outTradeNo: this.payInfo.out_trade_no
+									    }, '', 'redirectTo');
+									} else {
+									    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
+                                        });
+                                    }
+                                    setTimeout(() => {
+										if (this.payInfo.event == 'BlindboxGoodsOrderPayNotify') {
+										    this.$util.redirectTo('/pages_promotion/blindbox/index', {
+										        outTradeNo: this.payInfo.out_trade_no
+										    }, '', 'redirectTo');
+										} else {
+										    this.$util.redirectTo('/pages_tool/pay/result', {
+										        code: this.payInfo.out_trade_no
+										    }, '', 'redirectTo');
+										}
+                                    }, 2000);
+                                }
+                            });
+
+                        } else {
+                            this.$util.showToast({ title: res.message });
+                            setTimeout(() => {
+                                this.$util.redirectTo('/pages_tool/pay/result', {
+                                    code: this.payInfo.out_trade_no
+                                }, 'redirectTo');
+                            }, 2000);
+                        }
+                    },
+                    fail: res => {
+                        uni.hideLoading();
+                        this.$util.showToast({ title: 'request:fail' });
+                    }
+                });
+            }
+            // #endif
+        },
+        // #ifdef H5
+        deactivated() {
+            clearInterval(this.timer);
+        },
+        // #endif
+    };
+</script>
+
+<style lang="scss">
+    .popup {
+        width: 75vw;
+        background: #fff;
+        border-top-left-radius: $border-radius;
+        border-top-right-radius: $border-radius;
+
+        .popup-header {
+            display: flex;
+            border-bottom: 2rpx solid $color-line;
+            position: relative;
+            padding: 40rpx;
+
+            .tit {
+                flex: 1;
+                font-size: $font-size-toolbar;
+                line-height: 1;
+                text-align: center;
+            }
+
+            .iconfont {
+                line-height: 1;
+                position: absolute;
+                right: 30rpx;
+                top: 50%;
+                transform: translate(0, -50%);
+                color: $color-tip;
+                font-size: $font-size-toolbar;
+            }
+        }
+
+        .popup-body {
+            height: calc(100% - 250rpx);
+
+            &.safe-area {
+                height: calc(100% - 270rpx);
+            }
+        }
+
+        .popup-footer {
+            height: 100rpx;
+
+            .confirm-btn {
+                height: 72rpx;
+                line-height: 72rpx;
+                color: #fff;
+                text-align: center;
+                margin: 20rpx 30rpx 0;
+                border-radius: $border-radius;
+                font-size: $font-size-base;
+
+            }
+
+            &.bottom-safe-area {
+                padding-bottom: constant(safe-area-inset-bottom);
+                padding-bottom: env(safe-area-inset-bottom);
+            }
+        }
+    }
+
+    .choose-payment-popup {
+        .payment-item {
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
+            height: 90rpx;
+            margin: 0 30rpx;
+            border-bottom: 2rpx solid $color-line;
+            padding: 20rpx 0;
+
+            &:nth-child(2) {
+                padding-top: 0;
+            }
+
+            &:last-child {
+                border-bottom: none;
+            }
+
+            .iconfont {
+                font-size: 64rpx;
+            }
+
+            .icon-yue {
+                color: #faa218;
+            }
+
+            .icon-weixin1 {
+                color: #24af41;
+            }
+
+            .icon-zhifubaozhifu- {
+                color: #00a0e9;
+            }
+
+            .icon-checkboxblank {
+                font-size: 40rpx;
+                color: $color-line;
+            }
+
+            .icon-yuan_checked {
+                font-size: 40rpx;
+            }
+
+            .name {
+                margin-left: 20rpx;
+                font-size: $font-size-base;
+                flex: 1;
+            }
+
+            .info-wrap {
+                flex: 1;
+                margin-left: 20rpx;
+
+                .name {
+                    margin-left: 0;
+                    font-size: $font-size-base;
+                    flex: 1;
+                }
+
+                .money {
+                    color: $color-tip;
+                    font-size: $font-size-tag;
+                }
+            }
+
+            .box {
+                flex: 1;
+                padding: 0 10rpx;
+                line-height: inherit;
+                text-align: right;
+
+                input {
+                    font-size: $font-size-tag !important;
+                }
+            }
+
+            &.set-pay-password {
+                height: initial;
+
+                .box {
+                    font-size: $font-size-tag !important;
+                }
+            }
+        }
+
+        .pay-money {
+            text-align: center;
+            padding: 20rpx 0 40rpx 0;
+            background-color: #fff;
+            font-weight: bold;
+            margin-top: 30rpx;
+            line-height: 1;
+
+            .unit {
+                margin-right: 4rpx;
+                font-size: $font-size-tag;
+            }
+
+            .money {
+                font-size: $font-size-toolbar;
+            }
+        }
+    }
+
+    .empty {
+        width: 100%;
+        text-align: center;
+        padding: 40rpx 0;
+        color: $color-sub;
+        font-size: $font-size-tag;
+    }
 </style>
\ No newline at end of file
diff --git a/components/ns-select-time/ns-select-time.vue b/components/ns-select-time/ns-select-time.vue
index 15a5553..17b9de4 100644
--- a/components/ns-select-time/ns-select-time.vue
+++ b/components/ns-select-time/ns-select-time.vue
@@ -1,369 +1,386 @@
-<template>
-	<view class="ns-time">
-		<uni-popup type="bottom" ref="selectTime">
-			<view class="box">
-				<view class="title">
-					<block v-if="obj.delivery && obj.delivery.delivery_type == 'local'">选择送达时间</block>
-					<block v-if="obj.delivery && obj.delivery.delivery_type == 'store'">选择自提时间</block>
-					<text class="iconfont icon-close" @click="close"></text>
-				</view>
-				<view class="body">
-					<!-- 左侧日期选择 -->
-					<scroll-view :scroll-y="true" class="left">
-						<view class="item" :class="index == keyJudge ? 'itemDay' : ''" v-for="(item, index) in dayData" :key="index" @click="selectTime('days', index, 'yes')">
-							<block v-if="item.title">{{ item.title }}</block>
-							<block v-else>{{ item.month }}</block>
-							<text class="itemtext">{{ item.Day }}</text>
-						</view>
-					</scroll-view>
-					<!-- 右侧时间选择 -->
-					<scroll-view :scroll-y="true" class="right">
-						<view class="item" :class="key == keyJudge && index == keys ? 'itemTime' : ''" v-for="(item, index) in timeData" :key="index" @click="selectTime('time', index, 'yes')">
-							{{ item }}
-							<text v-if="key == keyJudge && index == keys" class="iconfont icon-yuan_checked color-base-text"></text>
-						</view>
-					</scroll-view>
-				</view>
-			</view>
-		</uni-popup>
-	</view>
-</template>
-
-<script>
-import uniPopup from '@/components/uni-popup/uni-popup.vue';
-export default {
-	name: "nsSelectTime",
-	components: {
-		uniPopup
-	},
-	data() {
-		return {
-			//选中日期的键值
-			key: 0,
-			//选中时间的键值
-			keys: 0,
-			//渲染用数据
-			obj: {},
-			//左侧渲染时间
-			dayData: [],
-			// 右侧渲染数据
-			timeData: [],
-			//判断弹窗打开
-			judge: false,
-			//判断左侧列表是否为日期选中列表
-			keyJudge: 0,
-			//当前时间时间戳
-			dayTime: 0
-		};
-	},
-	methods: {
-		refresh(){
-			this.key = 0;
-			this.keys = 0;
-			this.keyJudge = 0;
-		},
-		/**
-		 * 弹窗打开
-		 */
-		open(obj, type) {
-			this.dayData = [];
-			this.timeData = [];
-			this.obj = obj;
-			this.toDay(obj.dataTime.time_type, obj.dataTime.time_week);
-			if (this.judge) {
-				if (type == 'no') {
-					this.selectTime('', '', type);
-				} else {
-					this.$refs.selectTime.open();
-				}
-			}
-		},
-		/**
-		 * 时间选择
-		 */
-		selectTime(type, index, judge) {
-			if (type == 'days') {
-				this.keyJudge = index;
-				this.toTime();
-			} else if (type == 'time') {
-				this.keys = index;
-				this.key = this.keyJudge;
-				let obj = this.dayData[this.key];
-				obj.time = this.timeData[this.keys];
-				let time = obj.time.replace('立即配送（','').replace('）','');
-
-				var dateTime = new Date();
-				var format = time.split('-');
-				var startHours = format[0].split(':');
-				var endHours = format[1].split(':');
-
-				let timeData = obj.month.split('月');
-				let month = timeData[0];
-				let date = timeData[1].split('日')[0];
-
-				// 开始时间戳
-				dateTime.setHours(startHours[0],startHours[1],0,0);
-				obj.start_time = dateTime.getTime()/1000;
-				obj.start_date = dateTime.getFullYear() + '-' + month + '-' + date + ' ' + format[0];
-
-				// 结束时间戳
-				dateTime.setHours(endHours[0],endHours[1],0,0);
-				obj.end_time = dateTime.getTime()/1000;
-				obj.end_date = dateTime.getFullYear() + '-' + month + '-' + date + ' ' + format[1];
-
-				this.$emit('selectTime', { data: obj, type: judge });
-				this.$refs.selectTime.close();
-			}
-
-			if (judge == 'no') {
-				this.toTime(judge);
-				let obj = this.dayData[0];
-				obj.time = this.timeData[0];
-				this.$emit('selectTime', { data: obj, type: judge });
-			}
-			this.$forceUpdate();
-		},
-		/**
-		 * 弹窗关闭
-		 */
-		close() {
-			this.$refs.selectTime.close();
-		},
-		/**
-		 * 左侧数据处理
-		 */
-		toDay(type, obj) {
-			let today = new Date();
-			if (this.obj.dataTime.advance_day) {
-				today = new Date(today.getTime() + (this.obj.dataTime.advance_day * 86400000));
-			}
-			let nowYear = today.getFullYear(); //当前年
-			let nowMonth = today.getMonth() + 1; //当前月
-			let nowDate = today.getDate(); //当前日
-			let nowDay = today.getDay(); //当前星期几
-			let endDay = new Date(nowYear, nowMonth, 0).getDate(); //当月多少天
-			let Hours = today.getHours();
-			let Minutes = today.getMinutes();
-			this.dayTime = this.obj.dataTime.advance_day ? 0 : Number(Hours) * 3600 + Number(Minutes) * 60; //获取到当前时分秒的时间戳
-			let judge = false;
-			let num = 1; //记录循环执行过的次数
-			let mostDay = this.obj.dataTime.most_day ? this.obj.dataTime.most_day + 1 : 1;  // 最多可预约天数
-			let startTime = parseInt(today.getTime() / 1000);
-			let week = ['周日', '周一', '周二', '周三', '周四', '周五', '周六'];
-			if (obj.time_week && obj.time_week.length == 7) {
-				//判断是否七天全有
-				judge = true;
-			}
-
-			for (let i = 0; i < mostDay; i++) {
-				let objects = {};
-				let dayStr = week[ nowDay ];
-				// 判断最大可预约时间
-				if (this.obj.dataTime.most_day > 0 && ((startTime + num * 86400) > (startTime + this.obj.dataTime.most_day * 86400) ) ) {
-					this.judge = true;
-					break;
-				}
-				//判断当天是否能够配送、自提
-				if (type == 0 || judge || obj.indexOf(nowDay.toString()) != -1) {
-					let endTime = this.obj.dataTime.delivery_time[ (this.obj.dataTime.delivery_time.length - 1) ].end_time;
-						endTime -= this.obj.dataTime.time_interval * 60;
-					switch (num) {
-						case 1:
-							if (i == 0) {
-								if (endTime < this.dayTime) {
-									i = i - 1;
-								} else {
-									objects = {
-										title: this.obj.dataTime.advance_day == 0 ? '今天' : '',
-										type: 'special',
-										month: nowMonth + '月' + nowDate + '日',
-										Day: '(' + dayStr + ')'
-									};
-									this.dayData.push(objects); //左侧日期数据处理
-								}
-							}
-							break;
-						case 2:
-							if (i == 0 || i == 1) {
-								objects = {
-									title: this.obj.dataTime.advance_day == 0 ? '明天' : '',
-									month: nowMonth + '月' + nowDate + '日',
-									Day: '(' + dayStr + ')'
-								};
-								this.dayData.push(objects); //左侧日期数据处理
-							}
-							break;
-						default:
-							objects = {
-								title: '',
-								month: nowMonth + '月' + nowDate + '日',
-								Day: '(' + dayStr + ')'
-							};
-							this.dayData.push(objects); //左侧日期数据处理
-					}
-				} else {
-					i = i - 1;
-				}
-
-				if (nowDate != endDay) {
-					nowDate += 1;
-				} else {
-					if (nowMonth != 12) {
-						nowMonth += 1;
-					} else {
-						nowMonth = 1;
-					}
-					nowDate = 1;
-				}
-
-				if (nowDay != 6) {
-					nowDay += 1;
-				} else {
-					nowDay = 0;
-				}
-				num += 1;
-				
-				if (this.obj.dataTime.most_day == 0 && i == 0) {
-					this.judge = true;
-				}
-			}
-
-			this.toTime(); //处理右侧时间数据
-		},
-		/**
-		 * 处理右侧时间数据
-		 */
-		toTime(judge) {
-			//并非打开弹窗进入时，所有数据置零
-			if (judge == 'no') {
-				this.key = 0;
-				this.keys = 0;
-				this.keyJudge = 0;
-			}
-
-			let timeData = [];
-			
-			if (!this.obj.dataTime.delivery_time) {
-				this.obj.dataTime.delivery_time = [ {start_time: this.obj.dataTime.start_time, end_time: this.obj.dataTime.end_time} ]
-			}
-			
-			//判断选中是否为当天
-			let remainder = 0;
-			//当天配送自提的话，向后推迟30分钟
-			let newDayTime = JSON.parse(JSON.stringify(this.dayTime));
-			// newDayTime = Math.ceil(this.dayTime / 600) * 600 + 1800;
-			
-			//判断选中是否为当天
-			let timeJudage = false;
-			if (this.dayData[this.keyJudge] && this.dayData[this.keyJudge].type && newDayTime > this.obj.dataTime.start_time) timeJudage = true;
-			
-			let timeInterval = this.obj.dataTime.time_interval ? this.obj.dataTime.time_interval * 60 : 1200;
-			
-			this.obj.dataTime.delivery_time.forEach(item => {
-				item.end_time = item.end_time ? item.end_time : 86400; 
-				let num = parseInt((parseInt(item.end_time) - parseInt(item.start_time)) / timeInterval);
-				let time = timeJudage ? parseInt(newDayTime) : parseInt(item.start_time);
-				for (let i = 0; i < num; i++) {
-					if (parseInt(time) + parseInt(timeInterval) > item.end_time) break;
-					if (timeJudage) {
-						if (time >= newDayTime) {
-							if (this.obj.dataTime.time_interval) {
-								if (time <= item.end_time) {
-									let text = '';
-									if (this.obj.delivery.delivery_type == 'local' && i == 0) {
-										text = '立即配送（'+ this.$util.getTimeStr(time) + '-' + this.$util.getTimeStr(time + timeInterval) + '）';
-									} else {
-										text = this.$util.getTimeStr(time) + '-' + this.$util.getTimeStr(time + timeInterval);
-									}
-									timeData.push(text);
-								} 
-							} else {
-								timeData.push(this.$util.getTimeStr(time));
-							}
-						}
-					} else {
-						if (this.obj.dataTime.time_interval) {
-							if (time <= item.end_time) timeData.push(this.$util.getTimeStr(time) + '-' + this.$util.getTimeStr(time + timeInterval));
-						} else {
-							timeData.push(this.$util.getTimeStr(time));
-						}
-					}
-					time = parseInt(time) + timeInterval;
-				}
-			})
-			this.timeData = timeData;
-			this.$forceUpdate();
-		}
-	}
-};
-</script>
-
-<style lang="scss" scoped>
-.box {
-	height: 728rpx;
-	.title {
-		padding: 0 30rpx;
-		box-sizing: border-box;
-		text-align: center;
-		font-size: 28rpx;
-		font-weight: bold;
-		position: relative;
-		height: 90rpx;
-		line-height: 90rpx;
-		border-bottom: 1rpx solid #f7f4f4;
-		.icon-close {
-			font-size: 26rpx;
-			color: #909399;
-			position: absolute;
-			right: 30rpx;
-			top: 50%;
-			transform: translateY(-50%);
-		}
-	}
-	.body {
-		width: 100%;
-		height: calc(100% - 90rpx);
-		display: flex;
-		align-items: center;
-		.left {
-			width: 230rpx;
-			background: #f8f8f8;
-			height: 100%;
-			.item {
-				width: 100%;
-				padding: 16rpx 30rpx;
-				box-sizing: border-box;
-				text-align: center;
-				font-size: 24rpx;
-				display: flex;
-				align-items: center;
-			}
-			.itemDay {
-				background: #ffffff;
-			}
-		}
-		.right {
-			width: calc(100% - 230rpx);
-			height: 100%;
-			padding: 0 30rpx;
-			box-sizing: border-box;
-			.item {
-				width: 100%;
-				font-size: 24rpx;
-				border-bottom: 1rpx solid #eeeeee;
-				display: flex;
-				align-items: center;
-				justify-content: space-between;
-				height: 72rpx;
-				.icon-yuan_checked {
-					font-size: 38rpx;
-					margin-right: 30rpx;
-				}
-			}
-			.itemTime {
-				color: var(--main-color);
-			}
-		}
-	}
-}
-</style>
+<template>
+	<view class="ns-time">
+		<uni-popup type="bottom" ref="selectTime">
+			<view class="box">
+				<view class="title">
+					<block v-if="obj.delivery && obj.delivery.delivery_type == 'local'">选择送达时间</block>
+					<block v-if="obj.delivery && obj.delivery.delivery_type == 'store'">选择自提时间</block>
+					<text class="iconfont icon-close" @click="close"></text>
+				</view>
+				<view class="body">
+					<!-- 左侧日期选择 -->
+					<scroll-view :scroll-y="true" class="left">
+						<view class="item" :class="index == keyJudge ? 'itemDay' : ''" v-for="(item, index) in dayData" :key="index" @click="selectTime('days', index, 'yes')">
+							<block v-if="item.title">{{ item.title }}</block>
+							<block v-else>{{ item.month }}</block>
+							<text class="itemtext">{{ item.Day }}</text>
+						</view>
+					</scroll-view>
+					<!-- 右侧时间选择 -->
+					<scroll-view :scroll-y="true" class="right">
+						<view class="item" :class="key == keyJudge && index == keys ? 'itemTime' : ''" v-for="(item, index) in timeData" :key="index" @click="selectTime('time', index, 'yes')">
+							{{ item }}
+							<text v-if="key == keyJudge && index == keys" class="iconfont icon-yuan_checked color-base-text"></text>
+						</view>
+					</scroll-view>
+				</view>
+			</view>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+import uniPopup from '@/components/uni-popup/uni-popup.vue';
+export default {
+	name: "nsSelectTime",
+	components: {
+		uniPopup
+	},
+	data() {
+		return {
+			//选中日期的键值
+			key: 0,
+			//选中时间的键值
+			keys: 0,
+			//渲染用数据
+			obj: {},
+			//左侧渲染时间
+			dayData: [],
+			// 右侧渲染数据
+			timeData: [],
+			//判断弹窗打开
+			judge: false,
+			//判断左侧列表是否为日期选中列表
+			keyJudge: 0,
+			//当前时间时间戳
+			dayTime: 0
+		};
+	},
+	methods: {
+		refresh(){
+			this.key = 0;
+			this.keys = 0;
+			this.keyJudge = 0;
+		},
+		/**
+		 * 弹窗打开
+		 */
+		open(obj, type) {
+			this.dayData = [];
+			this.timeData = [];
+			this.obj = obj;
+			this.toDay(obj.dataTime.time_type, obj.dataTime.time_week);
+			if (this.judge) {
+				if (type == 'no') {
+					this.selectTime('', '', type);
+				} else {
+					this.$refs.selectTime.open();
+				}
+			}
+		},
+		/**
+		 * 时间选择
+		 */
+		selectTime(type, index, judge) {
+			if (type == 'days') {
+				this.keyJudge = index;
+				this.toTime();
+			} else if (type == 'time') {
+				this.keys = index;
+				this.key = this.keyJudge;
+				let obj = this.dayData[this.key];
+				obj.time = this.timeData[this.keys];
+				let time = obj.time.replace('立即配送（','').replace('）','');
+				let dateTime = new Date();
+				
+				let format = time.split('-');
+				let startHours = format[0].split(':');
+				let endHours = format[1].split(':');
+
+				let timeData = obj.month.split('月');
+				let month = timeData[0];
+				let date = timeData[1].split('日')[0];
+
+				// 开始时间戳
+				dateTime.setHours(startHours[0],startHours[1],0,0);
+				obj.start_time = dateTime.getTime()/1000;
+				obj.start_date = dateTime.getFullYear() + '-' + month + '-' + date + ' ' + format[0];
+
+				// 结束时间戳
+				dateTime.setHours(endHours[0],endHours[1],0,0);
+				obj.end_time = dateTime.getTime()/1000;
+				obj.end_date = dateTime.getFullYear() + '-' + month + '-' + date + ' ' + format[1];
+
+				this.$emit('selectTime', { data: obj, type: judge });
+				this.$refs.selectTime.close();
+			}
+
+			if (judge == 'no') {
+				this.toTime(judge);
+				let obj = this.dayData[0];
+				obj.time = this.timeData[0];
+				let dateTime = new Date();
+				let format = obj.time.replace('立即配送（','').replace('）','').split('-');
+				let startHours = format[0].split(':');
+				let endHours = format[1].split(':');
+
+				let timeData = obj.month.split('月');
+				let month = timeData[0];
+				let date = timeData[1].split('日')[0];
+
+				// 开始时间戳
+				dateTime.setHours(startHours[0],startHours[1],0,0);
+				obj.start_time = dateTime.getTime()/1000;
+				obj.start_date = dateTime.getFullYear() + '-' + month + '-' + date + ' ' + format[0];
+				// 结束时间戳
+				dateTime.setHours(endHours[0],endHours[1],0,0);
+				obj.end_time = dateTime.getTime()/1000;
+				obj.end_date = dateTime.getFullYear() + '-' + month + '-' + date + ' ' + format[1];
+				this.$emit('selectTime', { data: obj, type: judge });
+			}
+			this.$forceUpdate();
+		},
+		/**
+		 * 弹窗关闭
+		 */
+		close() {
+			this.$refs.selectTime.close();
+		},
+		/**
+		 * 左侧数据处理
+		 */
+		toDay(type, obj) {
+			let today = new Date();
+			if (this.obj.dataTime.advance_day) {
+				today = new Date(today.getTime() + (this.obj.dataTime.advance_day * 86400000));
+			}
+			let nowYear = today.getFullYear(); //当前年
+			let nowMonth = today.getMonth() + 1; //当前月
+			let nowDate = today.getDate(); //当前日
+			let nowDay = today.getDay(); //当前星期几
+			let endDay = new Date(nowYear, nowMonth, 0).getDate(); //当月多少天
+			let Hours = today.getHours();
+			let Minutes = today.getMinutes();
+			this.dayTime = this.obj.dataTime.advance_day ? 0 : Number(Hours) * 3600 + Number(Minutes) * 60; //获取到当前时分秒的时间戳
+			let judge = false;
+			let num = 1; //记录循环执行过的次数
+			let mostDay = this.obj.dataTime.most_day ? this.obj.dataTime.most_day + 1 : 1;  // 最多可预约天数
+			let startTime = parseInt(today.getTime() / 1000);
+			let week = ['周日', '周一', '周二', '周三', '周四', '周五', '周六'];
+			if (obj.time_week && obj.time_week.length == 7) {
+				//判断是否七天全有
+				judge = true;
+			}
+
+			for (let i = 0; i < mostDay; i++) {
+				let objects = {};
+				let dayStr = week[ nowDay ];
+				// 判断最大可预约时间
+				if (this.obj.dataTime.most_day > 0 && ((startTime + num * 86400) > (startTime + this.obj.dataTime.most_day * 86400) ) ) {
+					this.judge = true;
+					break;
+				}
+				//判断当天是否能够配送、自提
+				if (type == 0 || judge || obj.indexOf(nowDay.toString()) != -1) {
+
+					let endTime = this.obj.dataTime.delivery_time[ (this.obj.dataTime.delivery_time.length - 1) ].end_time;
+						endTime -= this.obj.dataTime.time_interval * 60;
+					switch (num) {
+						case 1:
+							if (i == 0) {
+								if (endTime < this.dayTime) {
+									i = i - 1;
+								} else {
+									objects = {
+										title: this.obj.dataTime.advance_day == 0 ? '今天' : '',
+										type: 'special',
+										month: nowMonth + '月' + nowDate + '日',
+										Day: '(' + dayStr + ')'
+									};
+									this.dayData.push(objects); //左侧日期数据处理
+								}
+							}
+							break;
+						case 2:
+							if (i == 0 || i == 1) {
+								objects = {
+									title: this.obj.dataTime.advance_day == 0 ? '明天' : '',
+									month: nowMonth + '月' + nowDate + '日',
+									Day: '(' + dayStr + ')'
+								};
+								this.dayData.push(objects); //左侧日期数据处理
+							}
+							break;
+						default:
+							objects = {
+								title: '',
+								month: nowMonth + '月' + nowDate + '日',
+								Day: '(' + dayStr + ')'
+							};
+							this.dayData.push(objects); //左侧日期数据处理
+					}
+				} else {
+					i = i - 1;
+				}
+
+				if (nowDate != endDay) {
+					nowDate += 1;
+				} else {
+					if (nowMonth != 12) {
+						nowMonth += 1;
+					} else {
+						nowMonth = 1;
+					}
+					nowDate = 1;
+				}
+
+				if (nowDay != 6) {
+					nowDay += 1;
+				} else {
+					nowDay = 0;
+				}
+				num += 1;
+				
+				if (this.obj.dataTime.most_day == 0 && i == 0) {
+					this.judge = true;
+				}
+			}
+			this.toTime(); //处理右侧时间数据
+		},
+		/**
+		 * 处理右侧时间数据
+		 */
+		toTime(judge) {
+			//并非打开弹窗进入时，所有数据置零
+			if (judge == 'no') {
+				this.key = 0;
+				this.keys = 0;
+				this.keyJudge = 0;
+			}
+
+			let timeData = [];
+			
+			if (!this.obj.dataTime.delivery_time) {
+				this.obj.dataTime.delivery_time = [ {start_time: this.obj.dataTime.start_time, end_time: this.obj.dataTime.end_time} ]
+			}
+			
+			//判断选中是否为当天
+			let remainder = 0;
+			//当天配送自提的话，向后推迟30分钟
+			let newDayTime = JSON.parse(JSON.stringify(this.dayTime));
+			// newDayTime = Math.ceil(this.dayTime / 600) * 600 + 1800;
+			
+			//判断选中是否为当天
+			let timeJudage = false;
+			if (this.dayData[this.keyJudge] && this.dayData[this.keyJudge].type && newDayTime > this.obj.dataTime.start_time) timeJudage = true;
+			
+			let timeInterval = this.obj.dataTime.time_interval ? this.obj.dataTime.time_interval * 60 : 1200;
+			
+			this.obj.dataTime.delivery_time.forEach(item => {
+				item.end_time = item.end_time ? item.end_time : 86400; 
+				let num = parseInt((parseInt(item.end_time) - parseInt(item.start_time)) / timeInterval);
+				let time = timeJudage ? parseInt(newDayTime) : parseInt(item.start_time);
+				for (let i = 0; i < num; i++) {
+					if (parseInt(time) + parseInt(timeInterval) > item.end_time) break;
+					if (timeJudage) {
+						if (time >= newDayTime) {
+							if (this.obj.dataTime.time_interval) {
+								if (time <= item.end_time) {
+									let text = '';
+									if (this.obj.delivery.delivery_type == 'local' && i == 0) {
+										text = '立即配送（'+ this.$util.getTimeStr(time) + '-' + this.$util.getTimeStr(time + timeInterval) + '）';
+									} else {
+										text = this.$util.getTimeStr(time) + '-' + this.$util.getTimeStr(time + timeInterval);
+									}
+									timeData.push(text);
+								} 
+							} else {
+								timeData.push(this.$util.getTimeStr(time));
+							}
+						}
+					} else {
+						if (this.obj.dataTime.time_interval) {
+							if (time <= item.end_time) timeData.push(this.$util.getTimeStr(time) + '-' + this.$util.getTimeStr(time + timeInterval));
+						} else {
+							timeData.push(this.$util.getTimeStr(time));
+						}
+					}
+					time = parseInt(time) + timeInterval;
+				}
+			})
+			this.timeData = timeData;
+			this.$forceUpdate();
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+.box {
+	height: 728rpx;
+	.title {
+		padding: 0 30rpx;
+		box-sizing: border-box;
+		text-align: center;
+		font-size: 28rpx;
+		font-weight: bold;
+		position: relative;
+		height: 90rpx;
+		line-height: 90rpx;
+		border-bottom: 1rpx solid #f7f4f4;
+		.icon-close {
+			font-size: 26rpx;
+			color: #909399;
+			position: absolute;
+			right: 30rpx;
+			top: 50%;
+			transform: translateY(-50%);
+		}
+	}
+	.body {
+		width: 100%;
+		height: calc(100% - 90rpx);
+		display: flex;
+		align-items: center;
+		.left {
+			width: 230rpx;
+			background: #f8f8f8;
+			height: 100%;
+			.item {
+				width: 100%;
+				padding: 16rpx 30rpx;
+				box-sizing: border-box;
+				text-align: center;
+				font-size: 24rpx;
+				display: flex;
+				align-items: center;
+			}
+			.itemDay {
+				background: #ffffff;
+			}
+		}
+		.right {
+			width: calc(100% - 230rpx);
+			height: 100%;
+			padding: 0 30rpx;
+			box-sizing: border-box;
+			.item {
+				width: 100%;
+				font-size: 24rpx;
+				border-bottom: 1rpx solid #eeeeee;
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				height: 72rpx;
+				.icon-yuan_checked {
+					font-size: 38rpx;
+					margin-right: 30rpx;
+				}
+			}
+			.itemTime {
+				color: var(--main-color);
+			}
+		}
+	}
+}
+</style>
diff --git a/components/payment/payment.vue b/components/payment/payment.vue
index 4147770..6015bcb 100644
--- a/components/payment/payment.vue
+++ b/components/payment/payment.vue
@@ -15,18 +15,20 @@
                     <view class="payment-item" v-if="balanceDeduct > 0 && balanceUsable && balanceConfig == 1">
                         <view class="iconfont icon-yue"></view>
                         <view class="info-wrap">
-                            <text class="name">余额支付</text>
+                            <text class="name">余额抵扣</text>
                             <view class="money">可用¥{{ balanceDeduct|moneyFormat }}</view>
                         </view>
                         <ns-switch class="balance-switch" @change="useBalance" :checked="isBalance == 1"></ns-switch>
                     </view>
                     <block v-if="payMoney > 0">
                         <block v-if="payTypeList.length">
-                            <view class="payment-item" v-for="(item, index) in payTypeList" :key="index" @click="payIndex = index">
-                                <view class="iconfont" :class="item.icon"></view>
-                                <text class="name">{{ item.name }}</text>
-                                <text class="iconfont" :class="payIndex == index ? 'icon-yuan_checked color-base-text' : 'icon-checkboxblank'"></text>
-                            </view>
+							<block v-for="(item, index) in payTypeList">
+								<view v-if="offlineShow||item.type!='offlinepay'" class="payment-item" :key="index" @click="payIndex = index">
+									<view class="iconfont" :class="item.icon"></view>
+									<text class="name">{{ item.name }}</text>
+									<text class="iconfont" :class="payIndex == index ? 'icon-yuan_checked color-base-text' : 'icon-checkboxblank'"></text>
+								</view>
+							</block>
                         </block>
                         <block v-else>
                             <view class="empty">平台尚未配置支付方式！</view>
@@ -63,47 +65,44 @@
             balanceUsable: {
                 type: Boolean,
                 default: true
-            }
+            },
         },
         data() {
             return {
                 payIndex: 0,
-                // #ifdef H5
-                payTypeList: [{
+                payTypeList: [
+					// #ifdef H5 || MP-ALIPAY
+					{
                         name: '支付宝支付',
                         icon: 'icon-zhifubaozhifu-',
                         type: 'alipay'
                     },
+					// #endif
+					// #ifdef H5 || MP-WEIXIN
                     {
                         name: '微信支付',
                         icon: 'icon-weixin1',
                         type: 'wechatpay'
-                    }
+                    },
+					// #endif
+					{
+					    name: '线下支付',
+					    icon: 'icondiy icon-yuezhifu',
+					    type: 'offlinepay'
+					},
                 ],
+				// #ifdef H5 
                 timer: null,
-                // #endif
-                // #ifdef MP-WEIXIN
-                payTypeList: [{
-                    name: '微信支付',
-                    provider: 'wxpay',
-                    icon: 'icon-weixin1',
-                    type: 'wechatpay'
-                }],
-                // #endif
-                // #ifdef MP-ALIPAY
-                payTypeList: [{
-                    name: '支付宝支付',
-                    icon: 'icon-zhifubaozhifu-',
-                    type: 'alipay',
-                    provider: 'alipay'
-                }],
-                // #endif
+				// #endif
                 payInfo: null,
                 balanceConfig: 0,
                 // 预售页面判断
                 sale: true,
                 isBalance: 0,
-                balance: 0
+                balance: 0,
+				//重置是否已完成，没有完成不能调用api/pay/pay
+				resetPayComplete:true,
+				repeatFlag:false,
             };
         },
         created(e) {
@@ -127,9 +126,32 @@
                     }
                 }
                 return money;
-            }
+            },
+			offlineShow(){
+				// 获取当前页面栈实例数组
+				const pages = getCurrentPages();
+				const currentPage = pages[pages.length - 1];
+				// 获取页面路由路径
+				let routePath = currentPage.route;
+				return this.$store.state.offlineWhiteList.length?this.$store.state.offlineWhiteList.includes(routePath):false
+			}
         },
         methods: {
+			/**
+			 * 父级页面onShow调用
+			 */
+			pageShow() {
+				if(this.payInfo){
+					let offlinepay = uni.getStorageSync('offlinepay');
+					if(offlinepay){
+						uni.removeStorageSync('offlinepay');
+						this.close()
+					}	
+				}else{
+					uni.removeStorageSync('offlinepay');
+				}
+				
+			},
             close() {
                 this.$emit('close');
                 this.$refs.choosePaymentPopup.close();
@@ -146,14 +168,22 @@
                     });
                     return;
                 }
+				if(this.resetPayComplete == false){
+					this.$util.showToast({
+					    title: '支付取消中，请稍后再试！'
+					});
+					return;
+				}
                 uni.showLoading({
                     title: '支付中...',
                     mask: true
                 });
+				if(this.repeatFlag) return;
+				this.repeatFlag = true;
                 this.pay();
                 uni.setStorageSync('pay_flag', 1);
             },
-            getPayInfo(out_trade_no) {
+            getPayInfo(out_trade_no, callback) {
                 this.$api.sendRequest({
                     url: '/api/pay/info',
                     data: {
@@ -165,6 +195,7 @@
                             if (this.balanceConfig && this.balanceUsable) this.getMemberBalance();
                             setTimeout(() => {
                                 this.$refs.choosePaymentPopup.open();
+								if(typeof callback == 'function') callback();
                             })
                         } else {
                             this.$util.showToast({
@@ -178,7 +209,6 @@
              * 获取余额配置
              */
             getBalanceConfig() {
-			
                 this.$api.sendRequest({
                     url: '/api/pay/getBalanceConfig',
                     data: {},
@@ -196,10 +226,6 @@
                     success: res => {
                         if (res.code == 0 && res.data) {
                             this.balance = parseFloat(res.data.usable_balance);
-							//余额不足以抵扣整个订单时不显示
-							if(parseFloat(this.payMoney) > this.balance){
-								this.balanceConfig = 0
-							}
                         }
                     }
                 })
@@ -215,10 +241,8 @@
                             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);
-                                    }
+                                this.payTypeList = this.payTypeList.filter((val, key) => {
+                                    return res.data.pay_type.indexOf(val.type) != -1
                                 });
                             }
                         }
@@ -239,8 +263,7 @@
                     data: {
                         out_trade_no: this.payInfo.out_trade_no,
                         pay_type: payType ? payType.type : '',
-                        return_url: encodeURIComponent(this.$config.h5Domain + return_url + this.payInfo
-                            .out_trade_no),
+                        return_url: encodeURIComponent(this.$config.h5Domain + return_url + this.payInfo.out_trade_no),
                         is_balance: this.isBalance
                     },
                     success: res => {
@@ -258,7 +281,9 @@
                                             wx_alipay: wx_alipay,
                                             out_trade_no: this.payInfo.out_trade_no
                                         }, '', 'redirectTo');
+										this.repeatFlag = false;
                                     } else {
+										this.repeatFlag = false;
                                         location.href = res.data.data;
                                         this.checkPayStatus();
                                     }
@@ -290,12 +315,14 @@
                                                     res => {
                                                         if (res.errMsg == 'chooseWXPay:ok') {
                                                             this.paySuccess();
+															this.repeatFlag = false;
                                                         } else {
                                                             this.$util.showToast({
                                                                 title: res.errMsg
                                                             });
                                                             setTimeout(() => {
                                                                 this.close();
+																this.repeatFlag = false;
                                                             }, 1500)
                                                         }
                                                     },
@@ -304,20 +331,30 @@
                                                             title: '您已取消支付'
                                                         });
                                                         this.resetpay();
+														this.repeatFlag = false;
                                                     }
                                                 );
                                             }
                                         });
                                     } else {
+										this.repeatFlag = false;
                                         location.href = res.data.url;
                                         this.checkPayStatus();
                                     }
                                     break;
+								case 'offlinepay':
+									this.$util.redirectTo('/pages_tool/pay/offlinepay', {
+										    outTradeNo: this.payInfo.out_trade_no
+										});
+									this.repeatFlag = false;
+									break;
+									
                             }
                         } else {
                             this.$util.showToast({
                                 title: res.message
                             });
+							this.repeatFlag = false;
                         }
                     },
                     fail: res => {
@@ -325,6 +362,7 @@
                         this.$util.showToast({
                             title: 'request:fail'
                         });
+						this.repeatFlag = false;
                     }
                 });
             },
@@ -365,72 +403,87 @@
                         if (res.code >= 0) {
                             if (res.data.pay_success) {
                                 this.paySuccess();
+								this.repeatFlag = false;
                                 return;
                             }
-                            var payData = res.data.data;
-
-                            // #ifdef MP-WEIXIN
-                            var scene = uni.getStorageSync('is_test') ? 1175 : wx.getLaunchOptionsSync().scene;
-                            if ([1175, 1176, 1177, 1191, 1195].indexOf(scene) != -1) {
-                                uni.requestOrderPayment({
-                                    timeStamp: payData.timeStamp,
-                                    nonceStr: payData.nonceStr,
-                                    package: payData.package,
-                                    signType: payData.signType,
-                                    paySign: payData.paySign,
-                                    success: res => {
-                                        this.paySuccess();
-                                    },
-                                    fail: res => {
-                                        this.flag = false;
-                                        if (res.errMsg == 'requestOrderPayment:fail cancel') {
-                                            this.$util.showToast({
-                                                title: '您已取消支付'
-                                            });
-                                            this.resetpay();
-                                        } else {
-                                            uni.showModal({
-                                                content: '支付失败,失败原因: ' + res.errMsg,
-                                                showCancel: false
-                                            });
-                                            setTimeout(() => {
-                                                this.close();
-                                            }, 1500)
-                                        }
-                                    }
-                                });
-                                return
-                            }
-                            // #endif
-
-                            uni.requestPayment({
-                                provider: payType.provider,
-                                ...payData,
-                                success: res => {
-                                    this.paySuccess();
-                                },
-                                fail: res => {
-                                    this.flag = false;
-                                    if (res.errMsg == 'requestPayment:fail cancel') {
-                                        this.$util.showToast({
-                                            title: '您已取消支付'
-                                        });
-                                        this.resetpay();
-                                    } else {
-                                        uni.showModal({
-                                            content: '支付失败,失败原因: ' + res.errMsg,
-                                            showCancel: false
-                                        });
-                                        setTimeout(() => {
-                                            this.close();
-                                        }, 1500)
-                                    }
-                                }
-                            });
-                        } else {
+							if (payType.type=='offlinepay') {
+								this.$util.redirectTo('/pages_tool/pay/offlinepay', {
+									outTradeNo: this.payInfo.out_trade_no
+								});
+								this.repeatFlag = false;	
+							}else{
+								var payData = res.data.data;
+								
+								// #ifdef MP-WEIXIN
+								var scene = uni.getStorageSync('is_test') ? 1175 : wx.getLaunchOptionsSync().scene;
+								if ([1175, 1176, 1177, 1191, 1195].indexOf(scene) != -1) {
+								    uni.requestOrderPayment({
+								        timeStamp: payData.timeStamp,
+								        nonceStr: payData.nonceStr,
+								        package: payData.package,
+								        signType: payData.signType,
+								        paySign: payData.paySign,
+								        success: res => {
+								            this.paySuccess();
+											this.repeatFlag = false;
+								        },
+								        fail: res => {
+								            this.flag = false;
+								            if (res.errMsg == 'requestOrderPayment:fail cancel') {
+								                this.$util.showToast({
+								                    title: '您已取消支付'
+								                });
+								                this.resetpay();
+												this.repeatFlag = false;
+								            } else {
+								                uni.showModal({
+								                    content: '支付失败,失败原因: ' + res.errMsg,
+								                    showCancel: false
+								                });
+								                setTimeout(() => {
+								                    this.close();
+													this.repeatFlag = false;
+								                }, 1500)
+								            }
+								        }
+								    });
+								    return
+								}
+								// #endif
+								
+								uni.requestPayment({
+								    provider: payType.provider,
+								    ...payData,
+								    success: res => {
+								        this.paySuccess();
+										this.repeatFlag = false;
+								    },
+								    fail: res => {
+								        this.flag = false;
+								        if (res.errMsg == 'requestPayment:fail cancel') {
+								            this.$util.showToast({
+								                title: '您已取消支付'
+								            });
+								            this.resetpay();
+											this.repeatFlag = false;
+								        } else {
+								            uni.showModal({
+								                content: '支付失败,失败原因: ' + res.errMsg,
+								                showCancel: false
+								            });
+								            setTimeout(() => {
+								                this.close();
+												this.repeatFlag = false;
+								            }, 1500)
+								        }
+								    }
+								});
+							}
+						} else {
                             this.$util.showToast({
                                 title: res.message
                             });
+							this.repeatFlag = false;
                         }
                     },
                     fail: res => {
@@ -438,6 +491,7 @@
                         this.$util.showToast({
                             title: 'request:fail'
                         });
+						this.repeatFlag = false;
                     }
                 });
             },
@@ -463,14 +517,24 @@
              * 重置支付单据
              */
             resetpay() {
+				this.resetPayComplete = false;
                 this.$api.sendRequest({
                     url: '/api/pay/resetpay',
                     data: {
                         out_trade_no: this.payInfo.out_trade_no,
                     },
                     success: res => {
-                        if (res.code == 0) this.getPayInfo(res.data);
-                    }
+                        if (res.code == 0) {
+							this.getPayInfo(res.data, ()=>{
+								this.resetPayComplete = true;
+							});
+						}else{
+							this.resetPayComplete = true;
+						}
+                    },
+					fail:res =>{
+						this.resetPayComplete = true;
+					}
                 })
             }
         },
@@ -569,7 +633,9 @@
             .icon-weixin1 {
                 color: #24af41;
             }
-
+			.icon-yuezhifu{
+				color: #f9a647;
+			}
             .icon-zhifubaozhifu- {
                 color: #00a0e9;
             }
diff --git a/components/pengpai-fadein-out/pengpai-fadein-out.vue b/components/pengpai-fadein-out/pengpai-fadein-out.vue
index 31c32aa..c96157c 100644
--- a/components/pengpai-fadein-out/pengpai-fadein-out.vue
+++ b/components/pengpai-fadein-out/pengpai-fadein-out.vue
@@ -1,269 +1,259 @@
-<template>
-	<view v-if="isShow">
-		<view ref="ani" :animation="animationData" class="message" :style="{ top: top + 'px', left: left + 'px' }" v-if="show">
-			<view class="round bg-gradual-orange flex justify-start shadow" style="padding: 3px;">
-				<view class="cu-avatar cu-a-sm round" :style="{ backgroundImage: 'url(' + $util.img(penpaiData.img) + ')' }">
-					<!-- #ifdef APP-NVUE -->
-					<!-- <image :src="penpaiData.img" class="avatarimg"></image> -->
-					<!-- #endif -->
-				</view>
-				<view class="padding-lr-sm flex align-center">
-					<text class="text-sm">{{ penpaiData.title }}</text>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-// #ifdef APP-NVUE
-const animation = uni.requireNativePlugin('animation');
-// #endif
-export default {
-	name: 'pengpai-fadein-out',
-	props: {
-		//持续时间
-		duration: {
-			type: Number,
-			default: 3000
-		},
-		//停留时间
-		wait: {
-			type: Number,
-			default: 3500
-		},
-		//顶部距离px
-		top: {
-			type: Number,
-			default: 350
-		},
-		//左边距离px
-		left: {
-			type: Number,
-			default: 10
-		},
-		//动画半径
-		radius: {
-			type: Number,
-			default: 30
-		},
-		//数据
-		info: {
-			type: [Array, Object],
-			default: () => {
-				return [];
-			}
-		}
-	},
-	data() {
-		return {
-			animationData: {},
-			animationNumber: {},
-			show: true,
-			index: 0,
-			penpaiData: {},
-			timeIndex: 0
-		};
-	},
-	computed:{
-		isShow(){
-			return this.penpaiData && Object.keys(this.penpaiData).length;
-		}
-	},
-	mounted() {
-		this.initData();
-	},
-	methods: {
-		initData() {
-			// 初始化执行第一次
-			this.penpaiData = this.info[this.index];
-			this.donghua();
-			// 开启时间函数，轮询推值
-			clearInterval(this.timeIndex);
-			this.timeIndex = setInterval(() => {
-				if (this.index == this.info.length - 1) {
-					this.index = 0;
-				} else {
-					this.index++;
-				}
-				this.penpaiData = this.info[this.index];
-				// 执行动画
-				this.donghua();
-			}, this.duration + this.wait);
-		},
-		donghua() {
-			//进入
-			// #ifndef APP-NVUE
-			this.animationData = uni
-				.createAnimation({
-					duration: this.duration / 2,
-					timingFunction: 'ease'
-				})
-				.top(this.top - this.radius)
-				.opacity(0.9)
-				.step()
-				.export();
-
-			// #endif
-
-			// #ifdef APP-NVUE
-			if (!this.$refs['ani']) return;
-			animation.transition(this.$refs['ani'].ref, {
-				styles: {
-					transform: `translateY(-${this.radius / 2}px)`,
-					opacity: 1
-				},
-				duration: this.duration / 2,
-				timingFunction: 'linear',
-				needLayout: false,
-				delay: 0
-			});
-			// #endif
-
-			//停留
-			setTimeout(() => {
-				//消失
-				// #ifndef APP-NVUE
-				this.animationData = uni
-					.createAnimation({
-						duration: this.duration / 2,
-						timingFunction: 'ease'
-					})
-					.top(this.top - this.radius * 2)
-					.opacity(0)
-					.step()
-					.export();
-
-				// #endif
-
-				// #ifdef APP-NVUE
-				if (!this.$refs['ani']) return;
-				animation.transition(this.$refs['ani'].ref, {
-					styles: {
-						transform: `translateY(-${this.radius}px)`,
-						opacity: 0
-					},
-					duration: this.duration / 2,
-					timingFunction: 'linear',
-					needLayout: false,
-					delay: 0
-				});
-				// #endif
-			}, this.wait);
-
-			// console.log('this.top', this.top);
-			// console.log('this.radius', this.radius);
-
-			setTimeout(() => {
-				this.animationData = uni
-					.createAnimation({
-						duration: this.duration / 2,
-						timingFunction: 'ease'
-					})
-					.top(this.top)
-					.opacity(0)
-					.step()
-					.export();
-			}, 2800);
-		},
-		closeTimer() {
-			clearInterval(this.timeIndex); //关闭弹幕定时器
-		}
-	}
-};
-</script>
-
-<style scoped lang="scss">
-.message {
-	position: absolute;
-	z-index: 8;
-	opacity: 0;
-}
-
-.round {
-	border-radius: 50px;
-}
-
-.bg-gradual-orange {
-	background-color: rgba($color: #000, $alpha: 0.4);
-	color: #fff;
-}
-
-.shadow {
-	box-shadow: 40rpx 40rpx 50rpx rgba(217, 109, 26, 0.2);
-}
-
-.flex {
-	/* #ifndef APP-NVUE */
-	display: flex;
-	/* #endif */
-	flex-direction: row;
-}
-
-.justify-start {
-	justify-content: flex-start;
-}
-
-.cu-avatar {
-	/* #ifndef APP-NVUE */
-	font-variant: small-caps;
-	display: inline-flex;
-	white-space: nowrap;
-	background-size: cover;
-	background-position: center;
-	vertical-align: middle;
-	/* #endif */
-	margin: 0;
-	padding: 0;
-	text-align: center;
-	justify-content: center;
-	align-items: center;
-	background-color: #ccc;
-	color: #ffffff;
-	position: relative;
-	width: 300rpx;
-	height: 300rpx;
-	font-size: 300rpx;
-}
-
-/* #ifdef APP-NVUE */
-.avatarimg {
-	width: 30rpx;
-	height: 30rpx;
-	border-radius: 50rpx;
-}
-
-/* #endif */
-.cu-a-sm {
-	width: 60rpx;
-	height: 60rpx;
-	font-size: 20rpx;
-}
-
-.padding-lr-sm {
-	padding-left: 20upx;
-	padding-right: 20upx;
-}
-
-.align-center {
-	align-items: center;
-}
-
-.margin-left-xs {
-	margin-left: 10upx;
-}
-
-.text-bold {
-	font-weight: bold;
-}
-
-.margin-lr-sm {
-	margin-left: 20upx;
-	margin-right: 20upx;
-}
-
-.text-sm {
-	font-size: $font-size-tag;
-	color: #ffffff;
-}
-</style>
+<template>
+	<view v-if="isShow">
+		<view ref="ani" :animation="animationData" class="message" :style="{ top: top + 'px', left: left + 'px' }" v-if="show">
+			<view class="round bg-gradual-orange flex justify-start shadow" style="padding: 3px;">
+				<view class="cu-avatar cu-a-sm round" :style="{ backgroundImage: 'url(' + $util.img(penpaiData.img) + ')' }">
+					<!-- #ifdef APP-NVUE -->
+					<!-- <image :src="penpaiData.img" class="avatarimg"></image> -->
+					<!-- #endif -->
+				</view>
+				<view class="padding-lr-sm flex align-center">
+					<text class="text-sm">{{ penpaiData.title }}</text>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+// #ifdef APP-NVUE
+const animation = uni.requireNativePlugin('animation');
+// #endif
+export default {
+	name: 'pengpai-fadein-out',
+	props: {
+		//持续时间
+		duration: {
+			type: Number,
+			default: 3000
+		},
+		//停留时间
+		wait: {
+			type: Number,
+			default: 3500
+		},
+		//顶部距离px
+		top: {
+			type: Number,
+			default: 350
+		},
+		//左边距离px
+		left: {
+			type: Number,
+			default: 10
+		},
+		//动画半径
+		radius: {
+			type: Number,
+			default: 30
+		},
+		//数据
+		info: {
+			type: [Array, Object],
+			default: () => {
+				return [];
+			}
+		}
+	},
+	data() {
+		return {
+			animationData: {},
+			animationNumber: {},
+			show: true,
+			index: 0,
+			penpaiData: {},
+			timeIndex: 0
+		};
+	},
+	computed:{
+		isShow(){
+			return this.penpaiData && Object.keys(this.penpaiData).length;
+		}
+	},
+	mounted() {
+		this.initData();
+	},
+	methods: {
+		initData() {
+			// 初始化执行第一次
+			this.penpaiData = this.info[this.index];
+			this.donghua();
+			// 开启时间函数，轮询推值
+			clearInterval(this.timeIndex);
+			this.timeIndex = setInterval(() => {
+				if (this.index == this.info.length - 1) {
+					this.index = 0;
+				} else {
+					this.index++;
+				}
+				this.penpaiData = this.info[this.index];
+				// 执行动画
+				this.donghua();
+			}, this.duration + this.wait);
+		},
+		donghua() {
+			//进入
+			// #ifndef APP-NVUE
+			this.animationData = uni
+				.createAnimation({
+					duration: this.duration / 2,
+					timingFunction: 'ease'
+				})
+				.top(this.top - this.radius)
+				.opacity(0.9)
+				.step()
+				.export();
+
+			// #endif
+
+			// #ifdef APP-NVUE
+			if (!this.$refs['ani']) return;
+			animation.transition(this.$refs['ani'].ref, {
+				styles: {
+					transform: `translateY(-${this.radius / 2}px)`,
+					opacity: 1
+				},
+				duration: this.duration / 2,
+				timingFunction: 'linear',
+				needLayout: false,
+				delay: 0
+			});
+			// #endif
+
+			//停留
+			setTimeout(() => {
+				//消失
+				// #ifndef APP-NVUE
+				this.animationData = uni.createAnimation({
+					duration: this.duration / 2,
+					timingFunction: 'ease'
+				}).top(this.top - this.radius * 2).opacity(0).step().export();
+
+				// #endif
+
+				// #ifdef APP-NVUE
+				if (!this.$refs['ani']) return;
+				animation.transition(this.$refs['ani'].ref, {
+					styles: {
+						transform: `translateY(-${this.radius}px)`,
+						opacity: 0
+					},
+					duration: this.duration / 2,
+					timingFunction: 'linear',
+					needLayout: false,
+					delay: 0
+				});
+				// #endif
+			}, this.wait);
+
+			// console.log('this.top', this.top);
+			// console.log('this.radius', this.radius);
+
+			setTimeout(() => {
+				this.animationData = uni.createAnimation({
+					duration: this.duration / 2,
+					timingFunction: 'ease'
+				}).top(this.top).opacity(0).step().export();
+			}, 2800);
+		},
+		closeTimer() {
+			clearInterval(this.timeIndex); //关闭弹幕定时器
+		}
+	}
+};
+</script>
+
+<style scoped lang="scss">
+.message {
+	position: absolute;
+	z-index: 8;
+	opacity: 0;
+}
+
+.round {
+	border-radius: 50px;
+}
+
+.bg-gradual-orange {
+	background-color: rgba($color: #000, $alpha: 0.4);
+	color: #fff;
+}
+
+.shadow {
+	box-shadow: 40rpx 40rpx 50rpx rgba(217, 109, 26, 0.2);
+}
+
+.flex {
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	flex-direction: row;
+}
+
+.justify-start {
+	justify-content: flex-start;
+}
+
+.cu-avatar {
+	/* #ifndef APP-NVUE */
+	font-variant: small-caps;
+	display: inline-flex;
+	white-space: nowrap;
+	background-size: cover;
+	background-position: center;
+	vertical-align: middle;
+	/* #endif */
+	margin: 0;
+	padding: 0;
+	text-align: center;
+	justify-content: center;
+	align-items: center;
+	background-color: #ccc;
+	color: #ffffff;
+	position: relative;
+	width: 300rpx;
+	height: 300rpx;
+	font-size: 300rpx;
+}
+
+/* #ifdef APP-NVUE */
+.avatarimg {
+	width: 30rpx;
+	height: 30rpx;
+	border-radius: 50rpx;
+}
+
+/* #endif */
+.cu-a-sm {
+	width: 60rpx;
+	height: 60rpx;
+	font-size: 20rpx;
+}
+
+.padding-lr-sm {
+	padding-left: 20upx;
+	padding-right: 20upx;
+}
+
+.align-center {
+	align-items: center;
+}
+
+.margin-left-xs {
+	margin-left: 10upx;
+}
+
+.text-bold {
+	font-weight: bold;
+}
+
+.margin-lr-sm {
+	margin-left: 20upx;
+	margin-right: 20upx;
+}
+
+.text-sm {
+	font-size: $font-size-tag;
+	color: #ffffff;
+}
+</style>
diff --git a/components/register-reward/register-reward.vue b/components/register-reward/register-reward.vue
index b567b1f..30a0d14 100644
--- a/components/register-reward/register-reward.vue
+++ b/components/register-reward/register-reward.vue
@@ -1,297 +1,329 @@
-<template>
-	<view>
-		<view @touchmove.prevent.stop class="reward-popup" v-if="reward">
-			<uni-popup ref="registerReward" type="center" :maskClick="false">
-				<view class="reward-wrap">
-					<image :src="$util.img('public/uniapp/register_reward/register_reward_img.png')" mode="widthFix" class="bg-img-head"/>
-					<image :src="$util.img('public/uniapp/register_reward/register_reward_money.png')" mode="widthFix" class="bg-img-money"/>
-					<image :src="$util.img('public/uniapp/register_reward/register_reward_head.png')" mode="widthFix" class="bg-img"/>
-					<view class="wrap">
-						<view>
-							<scroll-view scroll-y="true" class="register-box">
-								<view class="reward-content">
-									<view class="reward-item" v-if="reward.point > 0">
-										<view class="head">积分奖励</view>
-										<view class="content">
-											<view class="info">
-												<view>
-													<text class="num">{{ reward.point }}</text>
-													<text class="type">积分</text>
-												</view>
-												<view class="desc">用于下单时抵现或兑换商品等</view>
-											</view>
-											<view class="tip" @click="closeRewardPopup('point')">立即查看</view>
-										</view>
-									</view>
-									<view class="reward-item" v-if="reward.growth > 0">
-										<view class="head">成长值</view>
-										<view class="content">
-											<view class="info">
-												<view>
-													<text class="num">{{ reward.growth }}</text>
-													<text class="type">成长值</text>
-												</view>
-												<view class="desc">用于提升会员等级</view>
-											</view>
-											<view class="tip" @click="closeRewardPopup('growth')">立即查看</view>
-										</view>
-									</view>
-									<view class="reward-item" v-if="reward.balance > 0">
-										<view class="head">红包奖励</view>
-										<view class="content">
-											<view class="info">
-												<view>
-													<text class="num">{{ reward.balance }}</text>
-													<text class="type">元</text>
-												</view>
-												<view class="desc">不可提现下单时可用</view>
-											</view>
-											<view class="tip" @click="closeRewardPopup('balance')">立即查看</view>
-										</view>
-									</view>
-									<view class="reward-item" v-if="reward.coupon_list.length > 0">
-										<view class="head">优惠券奖励</view>
-										<view class="content" v-for="(item, index) in reward.coupon_list" :key="index">
-											<view class="info">
-												<view>
-													<text class="num coupon-name">{{ item.coupon_name }}</text>
-												</view>
-												<view class="desc" v-if="item.at_least > 0">
-													满{{ item.at_least }}{{ item.type == 'discount' ? '打' + item.discount + '折' : '减' + item.money }}
-												</view>
-												<view class="desc" v-else>
-													无门槛，{{ item.type == 'discount' ? '打' + item.discount + '折' : '减' + item.money }}
-												</view>
-											</view>
-											<view class="tip" @click="closeRewardPopup('coupon')">立即查看</view>
-										</view>
-									</view>
-								</view>
-							</scroll-view>
-						</view>
-					</view>
-					<view class="close-btn" @click="closeRewardPopup()"><text class="iconfont icon-close"></text></view>
-				</view>
-			</uni-popup>
-		</view>
-	</view>
-</template>
-
-<script>
-	import uniPopup from '@/components/uni-popup/uni-popup.vue';
-
-	// 注册奖励弹出层
-	export default {
-		name: 'register-reward',
-		components: {
-			uniPopup
-		},
-		data() {
-			return {
-				reward: null,
-				back: ''
-			};
-		},
-		created() {},
-		methods: {
-			open(back) {
-				if (back) this.back = back;
-				if (this.addonIsExist.memberregister) {
-					this.getRegisterReward();
-				} else {
-					this.closeRewardPopup();
-				}
-			},
-			cancel() {
-				this.$refs.registerReward.close();
-			},
-			/**
-			 * 获取新人礼配置
-			 */
-			getRegisterReward() {
-				this.$api.sendRequest({
-					url: '/memberregister/api/Config/Config',
-					success: res => {
-						if (res.code >= 0) {
-							let data = res.data;
-							if (data.is_use == 1 && (data.value.point > 0 || data.value.balance > 0 || data
-									.value.growth > 0 || data.value.coupon_list.length > 0)) {
-								this.reward = data.value;
-								this.$nextTick(() => {
-									if(this.$refs.registerReward) this.$refs.registerReward.open();
-								});
-							}
-						}
-						this.closeRewardPopup();
-					}
-				});
-			},
-			closeRewardPopup(type) {
-				if (this.$refs.registerReward) this.$refs.registerReward.close();
-				switch (type) {
-					case 'point':
-						this.$util.redirectTo('/pages_tool/member/point_detail', {});
-						break;
-					case 'balance':
-						this.$util.redirectTo('/pages_tool/member/balance_detail', {});
-						break;
-					case 'growth':
-						this.$util.redirectTo('/pages_tool/member/level', {});
-						break;
-					case 'coupon':
-						this.$util.redirectTo('/pages_tool/member/coupon', {});
-						break;
-					default:
-						if (this.back) this.$util.redirectTo(decodeURIComponent(this.back), {}, 'redirectTo');
-						else this.$util.redirectTo('/pages/index/index');
-						break;
-				}
-			}
-		}
-	};
-</script>
-<style scoped>
-	.register-box /deep/ .uni-scroll-view {
-		background: unset !important;
-	}
-
-	.register-box {
-		max-height: 630rpx;
-		overflow-y: scroll;
-	}
-
-	.register-box /deep/.uni-popup__wrapper-box {
-		overflow: unset !important;
-	}
-
-	.reward-popup /deep/.uni-popup__wrapper {
-		background: none;
-	}
-</style>
-
-<style lang="scss">
-	.uni-popup__wrapper-box {
-		overflow: unset !important;
-	}
-
-	.close-btn {
-		text-align: center;
-		margin-top: 20rpx;
-
-		.iconfont {
-			color: #fff;
-			font-size: 40rpx;
-		}
-	}
-
-	.reward-wrap {
-		width: 80vw;
-		height: auto;
-		position: relative;
-		// padding-top: 150rpx;
-
-		&>uni-image,
-		.bg-img {
-			width: 100%;
-			will-change: transform;
-		}
-
-		.bg-img-head {
-			position: absolute;
-			top: -150rpx;
-			width: 100vw;
-			left: -10vw;
-		}
-
-		.bg-img-money {
-			position: absolute;
-			width: 93vw;
-			left: -48rpx;
-			top: 100rpx;
-			z-index: 10;
-		}
-
-		.wrap {
-			width: calc(100% - 2rpx);
-			height: 100%;
-			background-color: #ef3030;
-			margin-top: -80rpx;
-			padding-bottom: 30rpx;
-			border-bottom-left-radius: 10rpx;
-			border-bottom-right-radius: 10rpx;
-
-			&>view {
-				position: relative;
-			}
-		}
-
-		.reward-content {
-			margin: 0 50rpx 0 50rpx;
-		}
-
-		.reward-item {
-			.head {
-				color: #fff;
-				text-align: center;
-				line-height: 1;
-				margin: 20rpx 0;
-			}
-
-			.content {
-				display: flex;
-				padding: 16rpx 26rpx;
-				background: #fff;
-				border-radius: 10rpx;
-				margin-bottom: 10rpx;
-
-				.info {
-					flex: 1;
-				}
-
-				.tip {
-					color: #ff222d;
-					padding: 10rpx 0 10rpx 30rpx;
-					width: 70rpx;
-					line-height: 1.5;
-					letter-spacing: 2rpx;
-					border-left: 2rpx dashed #e5e5e5;
-				}
-
-				.num {
-					font-size: 52rpx;
-					color: #ff222d;
-					font-weight: bolder;
-					line-height: 1;
-				}
-
-				.coupon-name {
-					font-size: 38rpx;
-				}
-
-				.type {
-					font-size: $font-size-base;
-					margin-left: 10rpx;
-					line-height: 1;
-				}
-
-				.desc {
-					margin-top: 8rpx;
-					color: $color-tip;
-					font-size: $font-size-tag;
-					line-height: 1;
-				}
-			}
-		}
-
-		.btn {
-			position: absolute;
-			width: calc(100% - 100rpx);
-			bottom: 40rpx;
-			left: 50rpx;
-
-			.btn-img {
-				width: 100%;
-			}
-		}
-	}
+<template>
+	<view>
+		<view @touchmove.prevent.stop class="reward-popup" v-if="reward">
+			<uni-popup ref="registerRewardpopup" type="center" :maskClick="false">
+				<view class="reward-wrap">
+					<image :src="$util.img('public/uniapp/register_reward/register_reward_img.png')" mode="widthFix" class="bg-img-head"/>
+					<image :src="$util.img('public/uniapp/register_reward/register_reward_money.png')" mode="widthFix" class="bg-img-money"/>
+					<image :src="$util.img('public/uniapp/register_reward/register_reward_head.png')" mode="widthFix" class="bg-img"/>
+					<view class="wrap">
+						<view>
+							<scroll-view scroll-y="true" class="register-box">
+								<view class="reward-content">
+									<view class="reward-item" v-if="reward.point > 0">
+										<view class="head">积分奖励</view>
+										<view class="content">
+											<view class="info">
+												<view>
+													<text class="num">{{ reward.point }}</text>
+													<text class="type">积分</text>
+												</view>
+												<view class="desc">用于下单时抵现或兑换商品等</view>
+											</view>
+											<view class="tip" @click="closeRewardPopup('point')">立即查看</view>
+										</view>
+									</view>
+									<view class="reward-item" v-if="reward.growth > 0">
+										<view class="head">成长值</view>
+										<view class="content">
+											<view class="info">
+												<view>
+													<text class="num">{{ reward.growth }}</text>
+													<text class="type">成长值</text>
+												</view>
+												<view class="desc">用于提升会员等级</view>
+											</view>
+											<view class="tip" @click="closeRewardPopup('growth')">立即查看</view>
+										</view>
+									</view>
+									<view class="reward-item" v-if="reward.balance > 0">
+										<view class="head">红包奖励</view>
+										<view class="content">
+											<view class="info">
+												<view>
+													<text class="num">{{ reward.balance }}</text>
+													<text class="type">元</text>
+												</view>
+												<view class="desc">不可提现下单时可用</view>
+											</view>
+											<view class="tip" @click="closeRewardPopup('balance')">立即查看</view>
+										</view>
+									</view>
+									<view class="reward-item" v-if="reward.coupon_list.length > 0">
+										<view class="head">优惠券奖励</view>
+										<view class="content" v-for="(item, index) in reward.coupon_list" :key="index">
+											<view class="info">
+												<view>
+													<text class="num coupon-name">{{ item.coupon_name }}</text>
+												</view>
+												<view class="desc" v-if="item.at_least > 0">
+													满{{ item.at_least }}{{ item.type == 'discount' ? '打' + item.discount + '折' : '减' + item.money }}
+												</view>
+												<view class="desc" v-else>
+													无门槛，{{ item.type == 'discount' ? '打' + item.discount + '折' : '减' + item.money }}
+												</view>
+											</view>
+											<view class="tip" @click="closeRewardPopup('coupon')">立即查看</view>
+										</view>
+									</view>
+								</view>
+							</scroll-view>
+						</view>
+					</view>
+					<view class="close-btn" @click="closeRewardPopup()"><text class="iconfont icon-close"></text></view>
+				</view>
+			</uni-popup>
+		</view>
+	</view>
+</template>
+
+<script>
+	import uniPopup from '@/components/uni-popup/uni-popup.vue';
+
+	// 注册奖励弹出层
+	export default {
+		name: 'register-reward',
+		components: {
+			uniPopup
+		},
+		data() {
+			return {
+				reward: null,
+				back: '',
+				path: '',
+			};
+		},
+		created() {
+			let pages = getCurrentPages();
+			let currentPage = pages[pages.length - 1].route;
+			this.path = '/'+currentPage;
+			
+		},
+		watch: {
+			'canReceiveRegistergift': {
+				handler(newValue, oldValue) {
+					if (newValue.status && newValue.status != oldValue.status && newValue.path.split('?')[0] == this.path) {
+						this.$store.commit('setCanReceiveRegistergiftInfo',{status:false,path:''});
+						// this.$nextTick(()=>{
+							this.open()
+						// })
+					}
+				},
+				deep: true
+			}
+		},
+		computed: {
+			canReceiveRegistergift() {
+				return this.$store.state.canReceiveRegistergiftInfo;
+			},
+		},
+		methods: {
+			open(back) {
+				if (back) this.back = back;
+				if (this.addonIsExist.memberregister) {
+					this.getRegisterReward();
+				} else {
+					this.closeRewardPopup();
+				}
+			},
+			cancel() {
+				this.$refs.registerRewardpopup.close();
+			},
+			/**
+			 * 获取新人礼配置
+			 */
+			getRegisterReward() {
+				this.$api.sendRequest({
+					url: '/memberregister/api/Config/Config',
+					success: res => {
+						if (res.code >= 0) {
+							let data = res.data;
+							if (data.is_use == 1 && (data.value.point > 0 || data.value.balance > 0 || data.value.growth > 0 || data.value.coupon_list.length > 0)) {
+								this.reward = data.value;
+								this.$forceUpdate()
+								this.$nextTick(()=>{
+									setTimeout(() => {
+										this.$refs.registerRewardpopup.open();
+									});
+								})
+								
+							} else {
+								this.closeRewardPopup();
+							}
+						}else{
+							this.closeRewardPopup();
+						}
+					}
+				});
+			},
+			closeRewardPopup(type) {
+				if (this.$refs.registerRewardpopup) this.$refs.registerRewardpopup.close();
+				if(!type) return;
+				switch (type) {
+					case 'point':
+						this.$util.redirectTo('/pages_tool/member/point_detail', {});
+						break;
+					case 'balance':
+						this.$util.redirectTo('/pages_tool/member/balance_detail', {});
+						break;
+					case 'growth':
+						this.$util.redirectTo('/pages_tool/member/level', {});
+						break;
+					case 'coupon':
+						this.$util.redirectTo('/pages_tool/member/coupon', {});
+						break;
+					default:
+						this.$util.loginComplete('/pages/index/index','redirectTo');
+						// if (this.back) this.$util.redirectTo(decodeURIComponent(this.back), {}, 'redirectTo');
+						// else this.$util.redirectTo('/pages/index/index');
+						break;
+				}
+			}
+		}
+	};
+</script>
+<style scoped>
+	.register-box /deep/ .uni-scroll-view {
+		background: unset !important;
+	}
+
+	.register-box {
+		max-height: 630rpx;
+		overflow-y: scroll;
+	}
+
+	.register-box /deep/.uni-popup__wrapper-box {
+		overflow: unset !important;
+	}
+
+	.reward-popup /deep/.uni-popup__wrapper {
+		background: none;
+	}
+</style>
+
+<style lang="scss">
+	.uni-popup__wrapper-box {
+		overflow: unset !important;
+	}
+
+	.close-btn {
+		text-align: center;
+		margin-top: 20rpx;
+
+		.iconfont {
+			color: #fff;
+			font-size: 40rpx;
+		}
+	}
+
+	.reward-wrap {
+		width: 80vw;
+		height: auto;
+		position: relative;
+		// padding-top: 150rpx;
+
+		&>uni-image,
+		.bg-img {
+			width: 100%;
+			will-change: transform;
+		}
+
+		.bg-img-head {
+			position: absolute;
+			top: -150rpx;
+			width: 100vw;
+			left: -10vw;
+		}
+
+		.bg-img-money {
+			position: absolute;
+			width: 93vw;
+			left: -48rpx;
+			top: 100rpx;
+			z-index: 10;
+		}
+
+		.wrap {
+			width: calc(100% - 2rpx);
+			height: 100%;
+			background-color: #ef3030;
+			margin-top: -80rpx;
+			padding-bottom: 30rpx;
+			border-bottom-left-radius: 10rpx;
+			border-bottom-right-radius: 10rpx;
+
+			&>view {
+				position: relative;
+			}
+		}
+
+		.reward-content {
+			margin: 0 50rpx 0 50rpx;
+		}
+
+		.reward-item {
+			.head {
+				color: #fff;
+				text-align: center;
+				line-height: 1;
+				margin: 20rpx 0;
+			}
+
+			.content {
+				display: flex;
+				padding: 16rpx 26rpx;
+				background: #fff;
+				border-radius: 10rpx;
+				margin-bottom: 10rpx;
+
+				.info {
+					flex: 1;
+				}
+
+				.tip {
+					color: #ff222d;
+					padding: 10rpx 0 10rpx 30rpx;
+					width: 70rpx;
+					line-height: 1.5;
+					letter-spacing: 2rpx;
+					border-left: 2rpx dashed #e5e5e5;
+				}
+
+				.num {
+					font-size: 52rpx;
+					color: #ff222d;
+					font-weight: bolder;
+					line-height: 1;
+				}
+
+				.coupon-name {
+					font-size: 38rpx;
+				}
+
+				.type {
+					font-size: $font-size-base;
+					margin-left: 10rpx;
+					line-height: 1;
+				}
+
+				.desc {
+					margin-top: 8rpx;
+					color: $color-tip;
+					font-size: $font-size-tag;
+					line-height: 1;
+				}
+			}
+		}
+
+		.btn {
+			position: absolute;
+			width: calc(100% - 100rpx);
+			bottom: 40rpx;
+			left: 50rpx;
+
+			.btn-img {
+				width: 100%;
+			}
+		}
+	}
 </style>
\ No newline at end of file
diff --git a/components/uni-grid/uni-grid.vue b/components/uni-grid/uni-grid.vue
index 979e814..c262811 100644
--- a/components/uni-grid/uni-grid.vue
+++ b/components/uni-grid/uni-grid.vue
@@ -1,95 +1,91 @@
-<template>
-	<view>
-		<view :id="elId" :class="{ border: showBorder }" :style="{ 'border-left': showBorder ? '1px ' + borderColor + ' solid' : 'none' }" class="uni-grid">
-			<slot />
-		</view>
-	</view>
-</template>
-
-<script>
-export default {
-	name: 'UniGrid',
-	props: {
-		// 每列显示个数
-		column: {
-			type: Number,
-			default: 3
-		},
-		// 是否显示边框
-		showBorder: {
-			type: Boolean,
-			default: true
-		},
-		// 是否显示边框
-		borderColor: {
-			type: String,
-			default: '#e5e5e5'
-		},
-		// 全局标记水平方向移动距离 ，起点为中心，负数为左移动，正数为右移动
-		hor: {
-			type: Number,
-			default: 0
-		},
-		// 全局标记垂直方向移动距离 ，起点为中心，负数为上移动，正数为下移动
-		ver: {
-			type: Number,
-			default: 0
-		},
-		// 是否正方形显示,默认为 true
-		square: {
-			type: Boolean,
-			default: true
-		},
-		highlight: {
-			type: Boolean,
-			default: true
-		}
-	},
-	provide() {
-		return {
-			grid: this
-		};
-	},
-	data() {
-		const elId = `Uni_${Math.ceil(Math.random() * 10e5).toString(36)}`;
-		return {
-			index: 0,
-			elId
-		};
-	},
-	created() {
-		this.index = 0;
-		this.childrens = [];
-		this.pIndex = this.pIndex ? this.pIndex++ : 0;
-	},
-	methods: {
-		change(e) {
-			this.$emit('change', e);
-		},
-		_getSize(fn) {
-			uni.createSelectorQuery()
-				.in(this)
-				.select(`#${this.elId}`)
-				.boundingClientRect()
-				.exec(ret => {
-					if (!ret[0]) {
-						setTimeout(this._getSize(fn));
-						return;
-					}
-					let width = (parseInt(ret[0].width / this.column) - 1) * 2 + 'rpx';
-					typeof fn === 'function' && fn(width);
-				});
-		}
-	}
-};
-</script>
-
-<style>
-
-.uni-grid {
-	display: flex;
-	flex-wrap: wrap;
-	box-sizing: border-box;
-	border-left: 2rpx #e5e5e5 solid;
-}
-</style>
+<template>
+	<view>
+		<view :id="elId" :class="{ border: showBorder }" :style="{ 'border-left': showBorder ? '1px ' + borderColor + ' solid' : 'none' }" class="uni-grid">
+			<slot />
+		</view>
+	</view>
+</template>
+
+<script>
+export default {
+	name: 'UniGrid',
+	props: {
+		// 每列显示个数
+		column: {
+			type: Number,
+			default: 3
+		},
+		// 是否显示边框
+		showBorder: {
+			type: Boolean,
+			default: true
+		},
+		// 是否显示边框
+		borderColor: {
+			type: String,
+			default: '#e5e5e5'
+		},
+		// 全局标记水平方向移动距离 ，起点为中心，负数为左移动，正数为右移动
+		hor: {
+			type: Number,
+			default: 0
+		},
+		// 全局标记垂直方向移动距离 ，起点为中心，负数为上移动，正数为下移动
+		ver: {
+			type: Number,
+			default: 0
+		},
+		// 是否正方形显示,默认为 true
+		square: {
+			type: Boolean,
+			default: true
+		},
+		highlight: {
+			type: Boolean,
+			default: true
+		}
+	},
+	provide() {
+		return {
+			grid: this
+		};
+	},
+	data() {
+		const elId = `Uni_${Math.ceil(Math.random() * 10e5).toString(36)}`;
+		return {
+			index: 0,
+			elId
+		};
+	},
+	created() {
+		this.index = 0;
+		this.childrens = [];
+		this.pIndex = this.pIndex ? this.pIndex++ : 0;
+	},
+	methods: {
+		change(e) {
+			this.$emit('change', e);
+		},
+		_getSize(fn) {
+			uni.createSelectorQuery().in(this).select(`#${this.elId}`).boundingClientRect().exec(ret => {
+				if (!ret[0]) {
+					setTimeout(this._getSize(fn));
+					return;
+				}
+				let width = (parseInt(ret[0].width / this.column) - 1) * 2 + 'rpx';
+				typeof fn === 'function' && fn(width);
+			});
+		}
+	}
+};
+</script>
+
+<style>
+
+.uni-grid {
+	display: flex;
+	flex-wrap: wrap;
+	box-sizing: border-box;
+	border-left: 2rpx #e5e5e5 solid;
+}
+</style>
diff --git a/components/uni-icons/uni-icons.vue b/components/uni-icons/uni-icons.vue
index bbf6631..8ef87f1 100644
--- a/components/uni-icons/uni-icons.vue
+++ b/components/uni-icons/uni-icons.vue
@@ -1,63 +1,61 @@
-<template>
-	<text :style="{ color: color, 'font-size': size * 2 + 'rpx' }" class="uni-icons" :class="colorClass" @click="_onClick">{{ icons[type] }}</text>
-</template>
-
-<script>
-import icons from './icons.js';
-// #ifdef APP-NVUE
-var domModule = weex.requireModule('dom');
-domModule.addRule('fontFace', {
-	fontFamily: 'uniicons',
-	src:
-		"url('data:font/truetype;charset=utf-8;base64,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PDgtsDEssAAWILAJI0IgICBGI0ewACsjYTgtsDIssAAWsAMlsAIlRyNHI2GwAFRYLiA8IyEbsAIlsAIlRyNHI2EgsAUlsAQlRyNHI2GwBiWwBSVJsAIlYbABRWMjIFhiGyFZY7ABRWJgIy4jICA8ijgjIVktsDMssAAWILAJQyAuRyNHI2EgYLAgYGawgGIjICA8ijgtsDQsIyAuRrACJUZSWCA8WS6xJAEUKy2wNSwjIC5GsAIlRlBYIDxZLrEkARQrLbA2LCMgLkawAiVGUlggPFkjIC5GsAIlRlBYIDxZLrEkARQrLbA3LLAuKyMgLkawAiVGUlggPFkusSQBFCstsDgssC8riiAgPLAEI0KKOCMgLkawAiVGUlggPFkusSQBFCuwBEMusCQrLbA5LLAAFrAEJbAEJiAuRyNHI2GwBkUrIyA8IC4jOLEkARQrLbA6LLEJBCVCsAAWsAQlsAQlIC5HI0cjYSCwBCNCsAZFKyCwYFBYILBAUVizAiADIBuzAiYDGllCQiMgR7AEQ7CAYmAgsAArIIqKYSCwAkNgZCOwA0NhZFBYsAJDYRuwA0NgWbADJbCAYmGwAiVGYTgjIDwjOBshICBGI0ewACsjYTghWbEkARQrLbA7LLAuKy6xJAEUKy2wPCywLyshIyAgPLAEI0IjOLEkARQrsARDLrAkKy2wPSywABUgR7AAI0KyAAEBFRQTLrAqKi2wPiywABUgR7AAI0KyAAEBFRQTLrAqKi2wPyyxAAEUE7ArKi2wQCywLSotsEEssAAWRSMgLiBGiiNhOLEkARQrLbBCLLAJI0KwQSstsEMssgAAOistsEQssgABOistsEUssgEAOistsEYssgEBOistsEcssgAAOystsEgssgABOystsEkssgEAOystsEossgEBOystsEsssgAANystsEwssgABNystsE0ssgEANystsE4ssgEBNystsE8ssgAAOSstsFAssgABOSstsFEssgEAOSstsFIssgEBOSstsFMssgAAPCstsFQssgABPCstsFUssgEAPCstsFYssgEBPCstsFcssgAAOCstsFgssgABOCstsFkssgEAOCstsFossgEBOCstsFsssDArLrEkARQrLbBcLLAwK7A0Ky2wXSywMCuwNSstsF4ssAAWsDArsDYrLbBfLLAxKy6xJAEUKy2wYCywMSuw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bmlFMjAwB3VuaUUyMDEHdW5pRTIwMgd1bmlFMjAzB3VuaUUyMzAHdW5pRTIzMQd1bmlFMjMyB3VuaUUyMzMHdW5pRTI2MAd1bmlFMjYxB3VuaUUyNjIHdW5pRTI2Mwd1bmlFMjY0B3VuaUUzMDAHdW5pRTMwMQd1bmlFMzAyB3VuaUUzMDMHdW5pRTMzMgd1bmlFMzMzB3VuaUUzNjAHdW5pRTM2Mwd1bmlFMzY0B3VuaUU0MDAHdW5pRTQwMQd1bmlFNDAyB3VuaUU0MDMHdW5pRTQwNAd1bmlFNDA1B3VuaUU0MDYHdW5pRTQwNwd1bmlFNDA4B3VuaUU0MDkHdW5pRTQxMAd1bmlFNDExB3VuaUU0MTMHdW5pRTQzNAd1bmlFNDM3B3VuaUU0MzgHdW5pRTQzOQd1bmlFNDQwB3VuaUU0NDEHdW5pRTQ0Mgd1bmlFNDQzB3VuaUU0NjAHdW5pRTQ2MQd1bmlFNDYyB3VuaUU0NjMHdW5pRTQ2NAd1bmlFNDY1B3VuaUU0NjYHdW5pRTQ2OAd1bmlFNDcwB3VuaUU0NzEHdW5pRTQ3Mgd1bmlFNTAwB3VuaUU1MDEHdW5pRTUwMgd1bmlFNTAzB3VuaUU1MDQHdW5pRTUwNQd1bmlFNTA2B3VuaUU1MDcHdW5pRTUwOAd1bmlFNTMwB3VuaUU1MzIHdW5pRTUzNAd1bmlFNTM1B3VuaUU1MzcHdW5pRTU2MAd1bmlFNTYyB3VuaUU1NjMHdW5pRTU2NQd1bmlFNTY3B3VuaUU1NjgHdW5pRTU4MAd1bmlFNTgxB3VuaUU1ODIHdW5pRTU4Mwd1bmlFNTg0B3VuaUU1ODUHdW5pRTU4Ngd1bmlFNTg3B3VuaUU1ODgHdW5pRTU4OQRFdXJvB3VuaUU2MTIAAAEAAf//AA8AAQAAAAwAAAAWAAAAAgABAAEAXwABAAQAAAACAAAAAAAAAAEAAAAA1aQnCAAAAADZqlu5AAAAANmqXAk=')"
-});
-// #endif
-export default {
-	name: 'UniIcons',
-	props: {
-		type: {
-			type: String,
-			default: ''
-		},
-		color: {
-			type: String,
-			default: '#333333'
-		},
-		colorClass: {
-			type: String,
-			default: ''
-		},
-		size: {
-			type: [Number, String],
-			default: 16
-		}
-	},
-	data() {
-		return {
-			icons: icons
-		};
-	},
-	methods: {
-		_onClick() {
-			this.$emit('click');
-		}
-	}
-};
-</script>
-
-<style lang="scss" scoped>
-/* #ifndef APP-NVUE */
-@font-face {
-	font-family: uniicons;
-	src: url('data:font/truetype;charset=utf-8;base64,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PDgtsDEssAAWILAJI0IgICBGI0ewACsjYTgtsDIssAAWsAMlsAIlRyNHI2GwAFRYLiA8IyEbsAIlsAIlRyNHI2EgsAUlsAQlRyNHI2GwBiWwBSVJsAIlYbABRWMjIFhiGyFZY7ABRWJgIy4jICA8ijgjIVktsDMssAAWILAJQyAuRyNHI2EgYLAgYGawgGIjICA8ijgtsDQsIyAuRrACJUZSWCA8WS6xJAEUKy2wNSwjIC5GsAIlRlBYIDxZLrEkARQrLbA2LCMgLkawAiVGUlggPFkjIC5GsAIlRlBYIDxZLrEkARQrLbA3LLAuKyMgLkawAiVGUlggPFkusSQBFCstsDgssC8riiAgPLAEI0KKOCMgLkawAiVGUlggPFkusSQBFCuwBEMusCQrLbA5LLAAFrAEJbAEJiAuRyNHI2GwBkUrIyA8IC4jOLEkARQrLbA6LLEJBCVCsAAWsAQlsAQlIC5HI0cjYSCwBCNCsAZFKyCwYFBYILBAUVizAiADIBuzAiYDGllCQiMgR7AEQ7CAYmAgsAArIIqKYSCwAkNgZCOwA0NhZFBYsAJDYRuwA0NgWbADJbCAYmGwAiVGYTgjIDwjOBshICBGI0ewACsjYTghWbEkARQrLbA7LLAuKy6xJAEUKy2wPCywLyshIyAgPLAEI0IjOLEkARQrsARDLrAkKy2wPSywABUgR7AAI0KyAAEBFRQTLrAqKi2wPiywABUgR7AAI0KyAAEBFRQTLrAqKi2wPyyxAAEUE7ArKi2wQCywLSotsEEssAAWRSMgLiBGiiNhOLEkARQrLbBCLLAJI0KwQSstsEMssgAAOistsEQssgABOistsEUssgEAOistsEYssgEBOistsEcssgAAOystsEgssgABOystsEkssgEAOystsEossgEBOystsEsssgAANystsEwssgABNystsE0ssgEANystsE4ssgEBNystsE8ssgAAOSstsFAssgABOSstsFEssgEAOSstsFIssgEBOSstsFMssgAAPCstsFQssgABPCstsFUssgEAPCstsFYssgEBPCstsFcssgAAOCstsFgssgABOCstsFkssgEAOCstsFossgEBOCstsFsssDArLrEkARQrLbBcLLAwK7A0Ky2wXSywMCuwNSstsF4ssAAWsDArsDYrLbBfLLAxKy6xJAEUKy2wYCywMSuw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bmlFMjAwB3VuaUUyMDEHdW5pRTIwMgd1bmlFMjAzB3VuaUUyMzAHdW5pRTIzMQd1bmlFMjMyB3VuaUUyMzMHdW5pRTI2MAd1bmlFMjYxB3VuaUUyNjIHdW5pRTI2Mwd1bmlFMjY0B3VuaUUzMDAHdW5pRTMwMQd1bmlFMzAyB3VuaUUzMDMHdW5pRTMzMgd1bmlFMzMzB3VuaUUzNjAHdW5pRTM2Mwd1bmlFMzY0B3VuaUU0MDAHdW5pRTQwMQd1bmlFNDAyB3VuaUU0MDMHdW5pRTQwNAd1bmlFNDA1B3VuaUU0MDYHdW5pRTQwNwd1bmlFNDA4B3VuaUU0MDkHdW5pRTQxMAd1bmlFNDExB3VuaUU0MTMHdW5pRTQzNAd1bmlFNDM3B3VuaUU0MzgHdW5pRTQzOQd1bmlFNDQwB3VuaUU0NDEHdW5pRTQ0Mgd1bmlFNDQzB3VuaUU0NjAHdW5pRTQ2MQd1bmlFNDYyB3VuaUU0NjMHdW5pRTQ2NAd1bmlFNDY1B3VuaUU0NjYHdW5pRTQ2OAd1bmlFNDcwB3VuaUU0NzEHdW5pRTQ3Mgd1bmlFNTAwB3VuaUU1MDEHdW5pRTUwMgd1bmlFNTAzB3VuaUU1MDQHdW5pRTUwNQd1bmlFNTA2B3VuaUU1MDcHdW5pRTUwOAd1bmlFNTMwB3VuaUU1MzIHdW5pRTUzNAd1bmlFNTM1B3VuaUU1MzcHdW5pRTU2MAd1bmlFNTYyB3VuaUU1NjMHdW5pRTU2NQd1bmlFNTY3B3VuaUU1NjgHdW5pRTU4MAd1bmlFNTgxB3VuaUU1ODIHdW5pRTU4Mwd1bmlFNTg0B3VuaUU1ODUHdW5pRTU4Ngd1bmlFNTg3B3VuaUU1ODgHdW5pRTU4OQRFdXJvB3VuaUU2MTIAAAEAAf//AA8AAQAAAAwAAAAWAAAAAgABAAEAXwABAAQAAAACAAAAAAAAAAEAAAAA1aQnCAAAAADZqlu5AAAAANmqXAk=')
-		format('truetype');
-}
-
-/* #endif */
-
-.uni-icons {
-	font-family: uniicons;
-	text-decoration: none;
-	text-align: center;
-}
-</style>
+<template>
+	<text :style="{ color: color, 'font-size': size * 2 + 'rpx' }" class="uni-icons" :class="colorClass" @click="_onClick">{{ icons[type] }}</text>
+</template>
+
+<script>
+import icons from './icons.js';
+// #ifdef APP-NVUE
+var domModule = weex.requireModule('dom');
+domModule.addRule('fontFace', {
+	fontFamily: 'uniicons',
+	src: "url('data:font/truetype;charset=utf-8;base64,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PDgtsDEssAAWILAJI0IgICBGI0ewACsjYTgtsDIssAAWsAMlsAIlRyNHI2GwAFRYLiA8IyEbsAIlsAIlRyNHI2EgsAUlsAQlRyNHI2GwBiWwBSVJsAIlYbABRWMjIFhiGyFZY7ABRWJgIy4jICA8ijgjIVktsDMssAAWILAJQyAuRyNHI2EgYLAgYGawgGIjICA8ijgtsDQsIyAuRrACJUZSWCA8WS6xJAEUKy2wNSwjIC5GsAIlRlBYIDxZLrEkARQrLbA2LCMgLkawAiVGUlggPFkjIC5GsAIlRlBYIDxZLrEkARQrLbA3LLAuKyMgLkawAiVGUlggPFkusSQBFCstsDgssC8riiAgPLAEI0KKOCMgLkawAiVGUlggPFkusSQBFCuwBEMusCQrLbA5LLAAFrAEJbAEJiAuRyNHI2GwBkUrIyA8IC4jOLEkARQrLbA6LLEJBCVCsAAWsAQlsAQlIC5HI0cjYSCwBCNCsAZFKyCwYFBYILBAUVizAiADIBuzAiYDGllCQiMgR7AEQ7CAYmAgsAArIIqKYSCwAkNgZCOwA0NhZFBYsAJDYRuwA0NgWbADJbCAYmGwAiVGYTgjIDwjOBshICBGI0ewACsjYTghWbEkARQrLbA7LLAuKy6xJAEUKy2wPCywLyshIyAgPLAEI0IjOLEkARQrsARDLrAkKy2wPSywABUgR7AAI0KyAAEBFRQTLrAqKi2wPiywABUgR7AAI0KyAAEBFRQTLrAqKi2wPyyxAAEUE7ArKi2wQCywLSotsEEssAAWRSMgLiBGiiNhOLEkARQrLbBCLLAJI0KwQSstsEMssgAAOistsEQssgABOistsEUssgEAOistsEYssgEBOistsEcssgAAOystsEgssgABOystsEkssgEAOystsEossgEBOystsEsssgAANystsEwssgABNystsE0ssgEANystsE4ssgEBNystsE8ssgAAOSstsFAssgABOSstsFEssgEAOSstsFIssgEBOSstsFMssgAAPCstsFQssgABPCstsFUssgEAPCstsFYssgEBPCstsFcssgAAOCstsFgssgABOCstsFkssgEAOCstsFossgEBOCstsFsssDArLrEkARQrLbBcLLAwK7A0Ky2wXSywMCuwNSstsF4ssAAWsDArsDYrLbBfLLAxKy6xJAEUKy2wYCywMSuw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bmlFMjAwB3VuaUUyMDEHdW5pRTIwMgd1bmlFMjAzB3VuaUUyMzAHdW5pRTIzMQd1bmlFMjMyB3VuaUUyMzMHdW5pRTI2MAd1bmlFMjYxB3VuaUUyNjIHdW5pRTI2Mwd1bmlFMjY0B3VuaUUzMDAHdW5pRTMwMQd1bmlFMzAyB3VuaUUzMDMHdW5pRTMzMgd1bmlFMzMzB3VuaUUzNjAHdW5pRTM2Mwd1bmlFMzY0B3VuaUU0MDAHdW5pRTQwMQd1bmlFNDAyB3VuaUU0MDMHdW5pRTQwNAd1bmlFNDA1B3VuaUU0MDYHdW5pRTQwNwd1bmlFNDA4B3VuaUU0MDkHdW5pRTQxMAd1bmlFNDExB3VuaUU0MTMHdW5pRTQzNAd1bmlFNDM3B3VuaUU0MzgHdW5pRTQzOQd1bmlFNDQwB3VuaUU0NDEHdW5pRTQ0Mgd1bmlFNDQzB3VuaUU0NjAHdW5pRTQ2MQd1bmlFNDYyB3VuaUU0NjMHdW5pRTQ2NAd1bmlFNDY1B3VuaUU0NjYHdW5pRTQ2OAd1bmlFNDcwB3VuaUU0NzEHdW5pRTQ3Mgd1bmlFNTAwB3VuaUU1MDEHdW5pRTUwMgd1bmlFNTAzB3VuaUU1MDQHdW5pRTUwNQd1bmlFNTA2B3VuaUU1MDcHdW5pRTUwOAd1bmlFNTMwB3VuaUU1MzIHdW5pRTUzNAd1bmlFNTM1B3VuaUU1MzcHdW5pRTU2MAd1bmlFNTYyB3VuaUU1NjMHdW5pRTU2NQd1bmlFNTY3B3VuaUU1NjgHdW5pRTU4MAd1bmlFNTgxB3VuaUU1ODIHdW5pRTU4Mwd1bmlFNTg0B3VuaUU1ODUHdW5pRTU4Ngd1bmlFNTg3B3VuaUU1ODgHdW5pRTU4OQRFdXJvB3VuaUU2MTIAAAEAAf//AA8AAQAAAAwAAAAWAAAAAgABAAEAXwABAAQAAAACAAAAAAAAAAEAAAAA1aQnCAAAAADZqlu5AAAAANmqXAk=')"
+});
+// #endif
+export default {
+	name: 'UniIcons',
+	props: {
+		type: {
+			type: String,
+			default: ''
+		},
+		color: {
+			type: String,
+			default: '#333333'
+		},
+		colorClass: {
+			type: String,
+			default: ''
+		},
+		size: {
+			type: [Number, String],
+			default: 16
+		}
+	},
+	data() {
+		return {
+			icons: icons
+		};
+	},
+	methods: {
+		_onClick() {
+			this.$emit('click');
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+/* #ifndef APP-NVUE */
+@font-face {
+	font-family: uniicons;
+	src: url('data:font/truetype;charset=utf-8;base64,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PDgtsDEssAAWILAJI0IgICBGI0ewACsjYTgtsDIssAAWsAMlsAIlRyNHI2GwAFRYLiA8IyEbsAIlsAIlRyNHI2EgsAUlsAQlRyNHI2GwBiWwBSVJsAIlYbABRWMjIFhiGyFZY7ABRWJgIy4jICA8ijgjIVktsDMssAAWILAJQyAuRyNHI2EgYLAgYGawgGIjICA8ijgtsDQsIyAuRrACJUZSWCA8WS6xJAEUKy2wNSwjIC5GsAIlRlBYIDxZLrEkARQrLbA2LCMgLkawAiVGUlggPFkjIC5GsAIlRlBYIDxZLrEkARQrLbA3LLAuKyMgLkawAiVGUlggPFkusSQBFCstsDgssC8riiAgPLAEI0KKOCMgLkawAiVGUlggPFkusSQBFCuwBEMusCQrLbA5LLAAFrAEJbAEJiAuRyNHI2GwBkUrIyA8IC4jOLEkARQrLbA6LLEJBCVCsAAWsAQlsAQlIC5HI0cjYSCwBCNCsAZFKyCwYFBYILBAUVizAiADIBuzAiYDGllCQiMgR7AEQ7CAYmAgsAArIIqKYSCwAkNgZCOwA0NhZFBYsAJDYRuwA0NgWbADJbCAYmGwAiVGYTgjIDwjOBshICBGI0ewACsjYTghWbEkARQrLbA7LLAuKy6xJAEUKy2wPCywLyshIyAgPLAEI0IjOLEkARQrsARDLrAkKy2wPSywABUgR7AAI0KyAAEBFRQTLrAqKi2wPiywABUgR7AAI0KyAAEBFRQTLrAqKi2wPyyxAAEUE7ArKi2wQCywLSotsEEssAAWRSMgLiBGiiNhOLEkARQrLbBCLLAJI0KwQSstsEMssgAAOistsEQssgABOistsEUssgEAOistsEYssgEBOistsEcssgAAOystsEgssgABOystsEkssgEAOystsEossgEBOystsEsssgAANystsEwssgABNystsE0ssgEANystsE4ssgEBNystsE8ssgAAOSstsFAssgABOSstsFEssgEAOSstsFIssgEBOSstsFMssgAAPCstsFQssgABPCstsFUssgEAPCstsFYssgEBPCstsFcssgAAOCstsFgssgABOCstsFkssgEAOCstsFossgEBOCstsFsssDArLrEkARQrLbBcLLAwK7A0Ky2wXSywMCuwNSstsF4ssAAWsDArsDYrLbBfLLAxKy6xJAEUKy2wYCywMSuw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bmlFMjAwB3VuaUUyMDEHdW5pRTIwMgd1bmlFMjAzB3VuaUUyMzAHdW5pRTIzMQd1bmlFMjMyB3VuaUUyMzMHdW5pRTI2MAd1bmlFMjYxB3VuaUUyNjIHdW5pRTI2Mwd1bmlFMjY0B3VuaUUzMDAHdW5pRTMwMQd1bmlFMzAyB3VuaUUzMDMHdW5pRTMzMgd1bmlFMzMzB3VuaUUzNjAHdW5pRTM2Mwd1bmlFMzY0B3VuaUU0MDAHdW5pRTQwMQd1bmlFNDAyB3VuaUU0MDMHdW5pRTQwNAd1bmlFNDA1B3VuaUU0MDYHdW5pRTQwNwd1bmlFNDA4B3VuaUU0MDkHdW5pRTQxMAd1bmlFNDExB3VuaUU0MTMHdW5pRTQzNAd1bmlFNDM3B3VuaUU0MzgHdW5pRTQzOQd1bmlFNDQwB3VuaUU0NDEHdW5pRTQ0Mgd1bmlFNDQzB3VuaUU0NjAHdW5pRTQ2MQd1bmlFNDYyB3VuaUU0NjMHdW5pRTQ2NAd1bmlFNDY1B3VuaUU0NjYHdW5pRTQ2OAd1bmlFNDcwB3VuaUU0NzEHdW5pRTQ3Mgd1bmlFNTAwB3VuaUU1MDEHdW5pRTUwMgd1bmlFNTAzB3VuaUU1MDQHdW5pRTUwNQd1bmlFNTA2B3VuaUU1MDcHdW5pRTUwOAd1bmlFNTMwB3VuaUU1MzIHdW5pRTUzNAd1bmlFNTM1B3VuaUU1MzcHdW5pRTU2MAd1bmlFNTYyB3VuaUU1NjMHdW5pRTU2NQd1bmlFNTY3B3VuaUU1NjgHdW5pRTU4MAd1bmlFNTgxB3VuaUU1ODIHdW5pRTU4Mwd1bmlFNTg0B3VuaUU1ODUHdW5pRTU4Ngd1bmlFNTg3B3VuaUU1ODgHdW5pRTU4OQRFdXJvB3VuaUU2MTIAAAEAAf//AA8AAQAAAAwAAAAWAAAAAgABAAEAXwABAAQAAAACAAAAAAAAAAEAAAAA1aQnCAAAAADZqlu5AAAAANmqXAk=') format('truetype');
+}
+
+/* #endif */
+
+.uni-icons {
+	font-family: uniicons;
+	text-decoration: none;
+	text-align: center;
+}
+</style>
diff --git a/components/uni-number-box/uni-number-box.vue b/components/uni-number-box/uni-number-box.vue
index d2c61c1..7153370 100644
--- a/components/uni-number-box/uni-number-box.vue
+++ b/components/uni-number-box/uni-number-box.vue
@@ -1,261 +1,263 @@
-<template>
-	<view class="uni-numbox" :class="{ small: size == 'small' }">
-		<button type="default" class="decrease" :class="{ disabled: inputValue <= min || disabled, small: size == 'small' }" @click="_calcValue('minus')">-</button>
-		<!-- <view 
-			class="uni-numbox__minus" 
-		> -->
-		<!-- :style="'background-image:url(' + $util.img('public/uniapp/jian.png') + ')'" -->
-		<!-- </view> -->
-		<!-- <input :disabled="disabled || inputDisabled" class="uni-input uni-numbox__value" type="number" @input="_onInput" @blur="_onInput" :class="{ small: size == 'small' }" v-model="inputValue"/> -->
-		<input :disabled="disabled || inputDisabled" class="uni-input uni-numbox__value" type="number" @blur="_onInput" :class="{ small: size == 'small' }" v-model="inputValue" />
-		<button type="default" class="increase" :class="{ disabled: inputValue >= max || disabled, small: size == 'small' }" @click="_calcValue('plus')">+</button>
-		<!-- <view 
-			class="uni-numbox__plus" @click="_calcValue('plus')"
-			:style="'background-image:url(' + $util.img('public/uniapp/jia.png') + ')'"
-		>
-		</view> -->
-	</view>
-</template>
-<script>
-	export default {
-		name: 'UniNumberBox',
-		props: {
-			value: {
-				type: [Number, String],
-				default: 1
-			},
-			min: {
-				type: Number,
-				default: 0
-			},
-			max: {
-				type: Number,
-				default: 100
-			},
-			step: {
-				type: Number,
-				default: 1
-			},
-			disabled: {
-				type: Boolean,
-				default: false
-			},
-			inputDisabled: {
-				type: Boolean,
-				default: false
-			},
-			size: {
-				type: String,
-				default: 'default'
-			},
-			index: {
-				type: [Number, String],
-				default: -1
-			}
-		},
-		data() {
-			return {
-				inputValue: 0,
-				initialValue: 0, // 初始值，防止第一次触发变化
-				initialIndex: 0, // 初始索引，防止第一次触发变化
-			};
-		},
-		watch: {
-			value(val) {
-				this.inputValue = +val;
-			},
-			inputValue(newVal, oldVal, params) {
-				// 与初始值相同,不允许操作
-				if (+newVal != 0 && +newVal == this.initialValue) return;
-
-				// 索引不同，不允许操作
-				if (this.initialIndex != this.index) return;
-
-				if (+newVal !== +oldVal) {
-					this.$emit('change', newVal, params);
-				}
-			}
-		},
-		created() {
-			this.initialValue = +this.value;
-			this.inputValue = +this.value;
-			this.initialIndex = this.index;
-		},
-		methods: {
-			_calcValue(type) {
-				if (this.disabled) {
-					return;
-				}
-				const scale = this._getDecimalScale();
-				let value = this.inputValue * scale;
-				let step = this.step * scale;
-				if (type === 'minus') {
-					value -= step;
-				} else if (type === 'plus') {
-					value += step;
-				}
-
-				if (value < this.min && type === 'minus') {
-					this.$emit('limit', {
-						value: this.inputValue,
-						type
-					}, this.index);
-					return;
-				}
-
-				if (value > this.max && type === 'plus') {
-					this.$emit('limit', {
-						value: this.inputValue,
-						type
-					}, this.index);
-					return;
-				}
-
-				this.inputValue = value / scale;
-			},
-			_getDecimalScale() {
-				let scale = 1;
-				// 浮点型
-				if (~~this.step !== this.step) {
-					scale = Math.pow(10, (this.step + '').split('.')[1].length);
-				}
-				return scale;
-			},
-			_onInput(event) {
-				setTimeout(() => {
-					let value = event.detail.value;
-					// if (!/(^[1-9]\d*$)/.test(value)) value = this.min;
-					// if (!value) {
-					// 	this.inputValue = 0;
-					// 	return;
-					// }
-					value = +value;
-
-					if (value > this.max) {
-						value = this.max;
-						this.$util.showToast({
-							title: '商品库存不足'
-						});
-					} else if (value < this.min) {
-						this.$util.showToast({
-							title: '商品最少购买' + this.min + '件'
-						});
-						value = this.min;
-					}
-					// 如果没有最小购买，同时也删除了输入框的内容，默认赋值为1
-					if (!value) value = 1;
-
-					this.inputValue = value;
-					this.$forceUpdate();
-				}, 0);
-			}
-		}
-	};
-</script>
-<style lang="scss">
-	.uni-numbox {
-		display: inline-flex;
-		flex-direction: row;
-		justify-content: flex-start;
-		align-items: center;
-		height: 70rpx;
-		position: relative;
-	}
-
-	.uni-numbox.small {
-		height: 44rpx;
-	}
-
-	.uni-numbox:after {
-		content: '';
-		position: absolute;
-		transform-origin: center;
-		box-sizing: border-box;
-		pointer-events: none;
-		top: -50%;
-		left: -50%;
-		right: -50%;
-		bottom: -50%;
-		border-radius: 12rpx;
-		transform: scale(0.5);
-	}
-
-	.uni-numbox__minus,
-	.uni-numbox__plus {
-		width: 40rpx;
-		height: 40rpx;
-		border-radius: 50%;
-		background-size: 100% 100%;
-		background-position: center;
-	}
-
-	.uni-numbox__value {
-		position: relative;
-		background-color: $color-bg;
-		width: 80rpx;
-		height: 40rpx;
-		text-align: center;
-		border: 1px solid $color-line;
-		display: inline-block;
-		line-height: 36rpx;
-		font-weight: bold;
-		margin: 0;
-		padding: 0;
-		vertical-align: top;
-		min-height: initial;
-		border-left: none;
-		border-right: none;
-	}
-
-	.uni-numbox__value.small {
-		width: 60rpx;
-		font-size: $font-size-tag;
-	}
-
-	.uni-numbox__value:after {
-		content: '';
-		position: absolute;
-		transform-origin: center;
-		box-sizing: border-box;
-		pointer-events: none;
-		top: -50%;
-		left: -50%;
-		right: -50%;
-		bottom: -50%;
-		border-top-width: 0;
-		border-bottom-width: 0;
-		transform: scale(0.5);
-	}
-
-	.uni-numbox--disabled {
-		color: silver;
-	}
-
-	.uni-numbox button {
-		width: 40rpx;
-		height: 40rpx;
-		display: inline-block;
-		box-sizing: content-box;
-		border: 1px solid $color-line;
-		padding: 0;
-		margin: 0;
-		border-radius: 0;
-		background-color: #fff;
-		font-weight: bold;
-
-		&.disabled {
-			color: $color-line;
-			background-color: #f8f8f8 !important;
-		}
-
-		&.decrease {
-			font-size: 44rpx;
-			line-height: 32rpx;
-		}
-
-		&.increase {
-			font-size: $font-size-toolbar;
-			line-height: 36rpx;
-		}
-	}
+<template>
+	<view class="uni-numbox" :class="{ small: size == 'small' }">
+		<button type="default" class="decrease" :class="{ disabled: inputValue <= min || disabled, small: size == 'small' }" @click="_calcValue('minus')">-</button>
+		<!-- <view 
+			class="uni-numbox__minus" 
+		> -->
+		<!-- :style="'background-image:url(' + $util.img('public/uniapp/jian.png') + ')'" -->
+		<!-- </view> -->
+		<!-- <input :disabled="disabled || inputDisabled" class="uni-input uni-numbox__value" type="number" @input="_onInput" @blur="_onInput" :class="{ small: size == 'small' }" v-model="inputValue"/> -->
+		<input :disabled="disabled || inputDisabled" class="uni-input uni-numbox__value" type="number" @blur="_onInput" :class="{ small: size == 'small' }" v-model="inputValue" />
+		<button type="default" class="increase" :class="{ disabled: inputValue >= max || disabled, small: size == 'small' }" @click="_calcValue('plus')">+</button>
+		<!-- <view 
+			class="uni-numbox__plus" @click="_calcValue('plus')"
+			:style="'background-image:url(' + $util.img('public/uniapp/jia.png') + ')'"
+		>
+		</view> -->
+	</view>
+</template>
+<script>
+	export default {
+		name: 'UniNumberBox',
+		props: {
+			value: {
+				type: [Number, String],
+				default: 1
+			},
+			min: {
+				type: Number,
+				default: 0
+			},
+			max: {
+				type: Number,
+				default: 100
+			},
+			step: {
+				type: Number,
+				default: 1
+			},
+			disabled: {
+				type: Boolean,
+				default: false
+			},
+			inputDisabled: {
+				type: Boolean,
+				default: false
+			},
+			size: {
+				type: String,
+				default: 'default'
+			},
+			index: {
+				type: [Number, String],
+				default: -1
+			}
+		},
+		data() {
+			return {
+				inputValue: 0,
+				initialValue: 0, // 初始值，防止第一次触发变化
+				initialIndex: 0, // 初始索引，防止第一次触发变化
+			};
+		},
+		watch: {
+			value(val) {
+				this.inputValue = +val;
+			},
+			inputValue(newVal, oldVal, params) {
+				// 与初始值相同,不允许操作
+				if (+newVal != 0 && +newVal == this.initialValue) return;
+
+				// 索引不同，不允许操作
+				if (this.initialIndex != this.index) return;
+
+				if (+newVal !== +oldVal) {
+					this.$emit('change', newVal, params);
+				}
+			}
+		},
+		created() {
+			this.initialValue = +this.value;
+			this.inputValue = +this.value;
+			this.initialIndex = this.index;
+		},
+		methods: {
+			_calcValue(type) {
+				if (this.disabled) {
+					return;
+				}
+				const scale = this._getDecimalScale();
+				let value = this.inputValue * scale;
+				let step = this.step * scale;
+				if (type === 'minus') {
+					value -= step;
+				} else if (type === 'plus') {
+					value += step;
+				}
+
+				if (value < this.min && type === 'minus') {
+					this.$emit('limit', {
+						value: this.inputValue,
+						type
+					}, this.index);
+					return;
+				}
+
+				if (value > this.max && type === 'plus') {
+					this.$emit('limit', {
+						value: this.inputValue,
+						type
+					}, this.index);
+					return;
+				}
+
+				this.inputValue = value / scale;
+				this.$emit('change', this.inputValue);
+			},
+			_getDecimalScale() {
+				let scale = 1;
+				// 浮点型
+				if (~~this.step !== this.step) {
+					scale = Math.pow(10, (this.step + '').split('.')[1].length);
+				}
+				return scale;
+			},
+			_onInput(event) {
+				setTimeout(() => {
+					let value = event.detail.value;
+					// if (!/(^[1-9]\d*$)/.test(value)) value = this.min;
+					// if (!value) {
+					// 	this.inputValue = 0;
+					// 	return;
+					// }
+					value = +value;
+
+					if (value > this.max) {
+						value = this.max;
+						this.$util.showToast({
+							title: '商品库存不足'
+						});
+					} else if (value < this.min) {
+						this.$util.showToast({
+							title: '商品最少购买' + this.min + '件'
+						});
+						value = this.min;
+					}
+					// 如果没有最小购买，同时也删除了输入框的内容，默认赋值为1
+					if (!value) value = 1;
+
+					this.inputValue = value;
+					this.$forceUpdate();
+					this.$emit('change', value);
+				}, 0);
+			}
+		}
+	};
+</script>
+<style lang="scss">
+	.uni-numbox {
+		display: inline-flex;
+		flex-direction: row;
+		justify-content: flex-start;
+		align-items: center;
+		height: 70rpx;
+		position: relative;
+	}
+
+	.uni-numbox.small {
+		height: 44rpx;
+	}
+
+	.uni-numbox:after {
+		content: '';
+		position: absolute;
+		transform-origin: center;
+		box-sizing: border-box;
+		pointer-events: none;
+		top: -50%;
+		left: -50%;
+		right: -50%;
+		bottom: -50%;
+		border-radius: 12rpx;
+		transform: scale(0.5);
+	}
+
+	.uni-numbox__minus,
+	.uni-numbox__plus {
+		width: 40rpx;
+		height: 40rpx;
+		border-radius: 50%;
+		background-size: 100% 100%;
+		background-position: center;
+	}
+
+	.uni-numbox__value {
+		position: relative;
+		background-color: $color-bg;
+		width: 80rpx;
+		height: 40rpx;
+		text-align: center;
+		border: 1px solid $color-line;
+		display: inline-block;
+		line-height: 36rpx;
+		font-weight: bold;
+		margin: 0;
+		padding: 0;
+		vertical-align: top;
+		min-height: initial;
+		border-left: none;
+		border-right: none;
+	}
+
+	.uni-numbox__value.small {
+		width: 60rpx;
+		font-size: $font-size-tag;
+	}
+
+	.uni-numbox__value:after {
+		content: '';
+		position: absolute;
+		transform-origin: center;
+		box-sizing: border-box;
+		pointer-events: none;
+		top: -50%;
+		left: -50%;
+		right: -50%;
+		bottom: -50%;
+		border-top-width: 0;
+		border-bottom-width: 0;
+		transform: scale(0.5);
+	}
+
+	.uni-numbox--disabled {
+		color: silver;
+	}
+
+	.uni-numbox button {
+		width: 40rpx;
+		height: 40rpx;
+		display: inline-block;
+		box-sizing: content-box;
+		border: 1px solid $color-line;
+		padding: 0;
+		margin: 0;
+		border-radius: 0;
+		background-color: #fff;
+		font-weight: bold;
+
+		&.disabled {
+			color: $color-line;
+			background-color: #f8f8f8 !important;
+		}
+
+		&.decrease {
+			font-size: 44rpx;
+			line-height: 32rpx;
+		}
+
+		&.increase {
+			font-size: $font-size-toolbar;
+			line-height: 36rpx;
+		}
+	}
 </style>
\ No newline at end of file
diff --git a/components/uni-popup/uni-popup.vue b/components/uni-popup/uni-popup.vue
index f4fa592..93f378d 100644
--- a/components/uni-popup/uni-popup.vue
+++ b/components/uni-popup/uni-popup.vue
@@ -1,244 +1,243 @@
-<template>
-    <view v-if="showPopup" class="uni-popup" :class="customClass" :style="{'top': top}">
-        <view :class="[ani, animation ? 'ani' : '', !custom ? 'uni-custom' : '']" class="uni-popup__mask" @click="close(true)" ></view>
-        <view :class="[type, ani, animation ? 'ani' : '', !custom ? 'uni-custom' : '']" class="uni-popup__wrapper goodslist-uni-popup safe-area" @click="close(true)" v-if="isIphoneX">
-            <view class="uni-popup__wrapper-box goodslist-uni-popup-box" @click.stop="clear">
-                <slot />
-            </view>
-        </view>
-        <view :class="[type, ani, animation ? 'ani' : '', !custom ? 'uni-custom' : '']" class="uni-popup__wrapper goodslist-uni-popup" @click="close(true)" v-else>
-            <view class="uni-popup__wrapper-box goodslist-uni-popup-box" @click.stop="clear">
-                <slot />
-            </view>
-        </view>
-    </view>
-</template>
-
-<script>
-    export default {
-        name: 'UniPopup',
-        props: {
-            // 开启动画
-            animation: {
-                type: Boolean,
-                default: true
-            },
-            // 弹出层类型，可选值，top: 顶部弹出层；bottom：底部弹出层；center：全屏弹出层
-            type: {
-                type: String,
-                default: 'center'
-            },
-            // 是否开启自定义
-            custom: {
-                type: Boolean,
-                default: false
-            },
-            // maskClick
-            maskClick: {
-                type: Boolean,
-                default: true
-            },
-            show: {
-                type: Boolean,
-                default: true
-            },
-            top: {
-                type: String,
-                default: '0'
-            },
-            customClass: {
-                type: String,
-                default: ''
-            }
-        },
-        data() {
-            return {
-                ani: '',
-                showPopup: false,
-                callback: null,
-                isIphoneX: false
-            };
-        },
-        watch: {
-            show(newValue) {
-                if (newValue) {
-                    this.open();
-                } else {
-                    this.close();
-                }
-            }
-        },
-        created() {
-            this.isIphoneX = this.$util.uniappIsIPhoneX();
-        },
-        methods: {
-            clear() {},
-            open(callback) {
-                if (callback) this.callback = callback;
-
-                this.$emit('change', {
-                    show: true
-                });
-                this.showPopup = true;
-                this.$nextTick(() => {
-                    setTimeout(() => {
-                        this.ani = 'uni-' + this.type;
-                    }, 30);
-                });
-            },
-            close(type, callback) {
-                if (!this.maskClick && type) return;
-                this.$emit('change', {
-                    show: false
-                });
-                this.ani = '';
-                this.$nextTick(() => {
-                    setTimeout(() => {
-                        this.showPopup = false;
-                    }, 300);
-                });
-
-                if (callback) callback();
-
-                if (this.callback) this.callback.call(this);
-            }
-        }
-    };
-</script>
-<style>
-    .uni-popup {
-        position: fixed;
-        top: 0;
-        bottom: 0;
-        left: 0;
-        right: 0;
-        z-index: 999;
-        overflow: hidden;
-    }
-
-    .uni-popup__mask {
-        position: absolute;
-        top: 0;
-        bottom: 0;
-        left: 0;
-        right: 0;
-        z-index: 998;
-        background: rgba(0, 0, 0, 0.4);
-        opacity: 0;
-    }
-
-    .uni-popup__mask.ani {
-        transition: all 0.3s;
-    }
-
-    .uni-popup__mask.uni-bottom,
-    .uni-popup__mask.uni-center,
-    .uni-popup__mask.uni-right,
-    .uni-popup__mask.uni-left,
-    .uni-popup__mask.uni-top {
-        opacity: 1;
-    }
-
-    .uni-popup__wrapper {
-        position: absolute;
-        z-index: 999;
-        box-sizing: border-box;
-        //background: #ffffff;
-    }
-
-    .uni-popup__wrapper.ani {
-        transition: all 0.3s;
-    }
-
-    .uni-popup__wrapper.top {
-        top: 0;
-        left: 0;
-        width: 100%;
-        transform: translateY(-100%);
-    }
-
-    .uni-popup__wrapper.bottom {
-        bottom: 0;
-        left: 0;
-        width: 100%;
-        transform: translateY(100%);
-        background: #ffffff;
-    }
-
-    .uni-popup__wrapper.right {
-        bottom: 0;
-        left: 0;
-        width: 100%;
-        transform: translateX(100%);
-    }
-
-    .uni-popup__wrapper.left {
-        bottom: 0;
-        left: 0;
-        width: 100%;
-        transform: translateX(-100%);
-    }
-
-    .uni-popup__wrapper.center {
-        width: 100%;
-        height: 100%;
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        transform: scale(1.2);
-        opacity: 0;
-    }
-
-    .uni-popup__wrapper-box {
-        position: relative;
-        box-sizing: border-box;
-        border-radius: 10rpx;
-    }
-
-    .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
-        background: #fff;
-    }
-
-    .uni-popup__wrapper.uni-custom.center .uni-popup__wrapper-box {
-        position: relative;
-        max-width: 80%;
-        max-height: 80%;
-        overflow-y: scroll;
-    }
-
-    .uni-popup__wrapper.uni-custom.bottom .uni-popup__wrapper-box,
-    .uni-popup__wrapper.uni-custom.top .uni-popup__wrapper-box {
-        width: 100%;
-        max-height: 500px;
-        overflow-y: scroll;
-    }
-
-    .uni-popup__wrapper.uni-bottom,
-    .uni-popup__wrapper.uni-top {
-        transform: translateY(0);
-    }
-
-    .uni-popup__wrapper.uni-left,
-    .uni-popup__wrapper.uni-right {
-        transform: translateX(0);
-    }
-
-    .uni-popup__wrapper.uni-center {
-        transform: scale(1);
-        opacity: 1;
-    }
-
-    /* isIphoneX系列手机底部安全距离 */
-    .bottom.safe-area {
-        padding-bottom: constant(safe-area-inset-bottom);
-        padding-bottom: env(safe-area-inset-bottom);
-    }
-
-    .left.safe-area {
-        padding-bottom: 68rpx;
-    }
-
-    .right.safe-area {
-        padding-bottom: 68rpx;
-    }
+<template>
+    <view v-if="showPopup" class="uni-popup" :class="customClass" :style="{'top': top}">
+        <view :class="[ani, animation ? 'ani' : '', !custom ? 'uni-custom' : '']" class="uni-popup__mask" @click="close(true)" ></view>
+        <view :class="[type, ani, animation ? 'ani' : '', !custom ? 'uni-custom' : '']" class="uni-popup__wrapper goodslist-uni-popup safe-area" @click="close(true)" v-if="isIphoneX">
+            <view class="uni-popup__wrapper-box goodslist-uni-popup-box" @click.stop="clear">
+                <slot />
+            </view>
+        </view>
+        <view :class="[type, ani, animation ? 'ani' : '', !custom ? 'uni-custom' : '']" class="uni-popup__wrapper goodslist-uni-popup" @click="close(true)" v-else>
+            <view class="uni-popup__wrapper-box goodslist-uni-popup-box" @click.stop="clear">
+                <slot />
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+    export default {
+        name: 'UniPopup',
+        props: {
+            // 开启动画
+            animation: {
+                type: Boolean,
+                default: true
+            },
+            // 弹出层类型，可选值，top: 顶部弹出层；bottom：底部弹出层；center：全屏弹出层
+            type: {
+                type: String,
+                default: 'center'
+            },
+            // 是否开启自定义
+            custom: {
+                type: Boolean,
+                default: false
+            },
+            maskClick: {
+                type: Boolean,
+                default: true
+            },
+            show: {
+                type: Boolean,
+                default: true
+            },
+            top: {
+                type: String,
+                default: '0'
+            },
+            customClass: {
+                type: String,
+                default: ''
+            }
+        },
+        data() {
+            return {
+                ani: '',
+                showPopup: false,
+                callback: null,
+                isIphoneX: false
+            };
+        },
+        watch: {
+            show(newValue) {
+                if (newValue) {
+                    this.open();
+                } else {
+                    this.close();
+                }
+            }
+        },
+        created() {
+            this.isIphoneX = this.$util.uniappIsIPhoneX();
+        },
+        methods: {
+            clear() {},
+            open(callback) {
+                if (callback) this.callback = callback;
+
+                this.$emit('change', {
+                    show: true
+                });
+                this.showPopup = true;
+                this.$nextTick(() => {
+                    setTimeout(() => {
+                        this.ani = 'uni-' + this.type;
+                    }, 30);
+                });
+            },
+            close(type, callback) {
+                if (!this.maskClick && type) return;
+                this.$emit('change', {
+                    show: false
+                });
+                this.ani = '';
+                this.$nextTick(() => {
+                    setTimeout(() => {
+                        this.showPopup = false;
+                    }, 300);
+                });
+
+                if (callback) callback();
+
+                if (this.callback) this.callback.call(this);
+            }
+        }
+    };
+</script>
+<style>
+    .uni-popup {
+        position: fixed;
+        top: 0;
+        bottom: 0;
+        left: 0;
+        right: 0;
+        z-index: 999;
+        overflow: hidden;
+    }
+
+    .uni-popup__mask {
+        position: absolute;
+        top: 0;
+        bottom: 0;
+        left: 0;
+        right: 0;
+        z-index: 998;
+        background: rgba(0, 0, 0, 0.4);
+        opacity: 0;
+    }
+
+    .uni-popup__mask.ani {
+        transition: all 0.3s;
+    }
+
+    .uni-popup__mask.uni-bottom,
+    .uni-popup__mask.uni-center,
+    .uni-popup__mask.uni-right,
+    .uni-popup__mask.uni-left,
+    .uni-popup__mask.uni-top {
+        opacity: 1;
+    }
+
+    .uni-popup__wrapper {
+        position: absolute;
+        z-index: 999;
+        box-sizing: border-box;
+        //background: #ffffff;
+    }
+
+    .uni-popup__wrapper.ani {
+        transition: all 0.3s;
+    }
+
+    .uni-popup__wrapper.top {
+        top: 0;
+        left: 0;
+        width: 100%;
+        transform: translateY(-100%);
+    }
+
+    .uni-popup__wrapper.bottom {
+        bottom: 0;
+        left: 0;
+        width: 100%;
+        transform: translateY(100%);
+        background: #ffffff;
+    }
+
+    .uni-popup__wrapper.right {
+        bottom: 0;
+        left: 0;
+        width: 100%;
+        transform: translateX(100%);
+    }
+
+    .uni-popup__wrapper.left {
+        bottom: 0;
+        left: 0;
+        width: 100%;
+        transform: translateX(-100%);
+    }
+
+    .uni-popup__wrapper.center {
+        width: 100%;
+        height: 100%;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        transform: scale(1.2);
+        opacity: 0;
+    }
+
+    .uni-popup__wrapper-box {
+        position: relative;
+        box-sizing: border-box;
+        border-radius: 10rpx;
+    }
+
+    .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+        background: #fff;
+    }
+
+    .uni-popup__wrapper.uni-custom.center .uni-popup__wrapper-box {
+        position: relative;
+        max-width: 80%;
+        max-height: 80%;
+        overflow-y: scroll;
+    }
+
+    .uni-popup__wrapper.uni-custom.bottom .uni-popup__wrapper-box,
+    .uni-popup__wrapper.uni-custom.top .uni-popup__wrapper-box {
+        width: 100%;
+        max-height: 500px;
+        overflow-y: scroll;
+    }
+
+    .uni-popup__wrapper.uni-bottom,
+    .uni-popup__wrapper.uni-top {
+        transform: translateY(0);
+    }
+
+    .uni-popup__wrapper.uni-left,
+    .uni-popup__wrapper.uni-right {
+        transform: translateX(0);
+    }
+
+    .uni-popup__wrapper.uni-center {
+        transform: scale(1);
+        opacity: 1;
+    }
+
+    /* isIphoneX系列手机底部安全距离 */
+    .bottom.safe-area {
+        padding-bottom: constant(safe-area-inset-bottom);
+        padding-bottom: env(safe-area-inset-bottom);
+    }
+
+    .left.safe-area {
+        padding-bottom: 68rpx;
+    }
+
+    .right.safe-area {
+        padding-bottom: 68rpx;
+    }
 </style>
\ No newline at end of file
diff --git a/components/uni-tag/uni-tag.vue b/components/uni-tag/uni-tag.vue
index 8702b41..d44de63 100644
--- a/components/uni-tag/uni-tag.vue
+++ b/components/uni-tag/uni-tag.vue
@@ -1,158 +1,158 @@
-<template>
-	<view
-		v-if="text"
-		:class="[
-			disabled === true || disabled === 'true' ? 'uni-tag--disabled' : '',
-			inverted === true || inverted === 'true' ? 'uni-tag--inverted' : '',
-			circle === true || circle === 'true' ? 'uni-tag--circle' : '',
-			mark === true || mark === 'true' ? 'uni-tag--mark' : '',
-			'uni-tag--' + size,
-			'uni-tag--' + type
-		]"
-		class="uni-tag"
-		@click="onClick()"
-	>
-		{{ text }}
-	</view>
-</template>
-
-<script>
-export default {
-	name: 'UniTag',
-	props: {
-		type: {
-			// 标签类型default、primary、success、warning、danger、royal
-			type: String,
-			default: 'default'
-		},
-		size: {
-			// 标签大小 normal, small
-			type: String,
-			default: 'normal'
-		},
-		// 标签内容
-		text: {
-			type: String,
-			default: ''
-		},
-		disabled: {
-			// 是否为禁用状态
-			type: [String, Boolean],
-			defalut: false
-		},
-		inverted: {
-			// 是否为空心
-			type: [String, Boolean],
-			defalut: false
-		},
-		circle: {
-			// 是否为圆角样式
-			type: [String, Boolean],
-			defalut: false
-		},
-		mark: {
-			// 是否为标记样式
-			type: [String, Boolean],
-			defalut: false
-		}
-	},
-	methods: {
-		onClick() {
-			if (this.disabled === true || this.disabled === 'true') {
-				return;
-			}
-			this.$emit('click');
-		}
-	}
-};
-</script>
-
-<style>
-
-.uni-tag {
-	box-sizing: border-box;
-	padding: 0 32rpx;
-	height: 60rpx;
-	line-height: calc(60rpx - 2px);
-	font-size: 28rpx;
-	display: inline-flex;
-	align-items: center;
-	color: #333;
-	border-radius: 6rpx;
-	background-color: #f8f8f8;
-	border: 1px solid #f8f8f8;
-}
-
-.uni-tag--circle {
-	border-radius: 30rpx;
-}
-
-.uni-tag--mark {
-	border-radius: 0 30rpx 30rpx 0;
-}
-
-.uni-tag--disabled {
-	opacity: 0.5;
-}
-
-.uni-tag--small {
-	height: 40rpx;
-	padding: 0 16rpx;
-	line-height: calc(40rpx - 2px);
-	font-size: 24rpx;
-}
-
-.uni-tag--primary {
-	color: #fff;
-	background-color: #007aff;
-	border: 1px solid #007aff;
-}
-
-.uni-tag--primary.uni-tag--inverted {
-	color: #007aff;
-	background-color: #fff;
-	border: 1px solid #007aff;
-}
-
-.uni-tag--success {
-	color: #fff;
-	background-color: #4cd964;
-	border: 1px solid #4cd964;
-}
-
-.uni-tag--success.uni-tag--inverted {
-	color: #4cd964;
-	background-color: #fff;
-	border: 1px solid #4cd964;
-}
-
-.uni-tag--warning {
-	color: #fff;
-	background-color: #f0ad4e;
-	border: 1px solid #f0ad4e;
-}
-
-.uni-tag--warning.uni-tag--inverted {
-	color: #f0ad4e;
-	background-color: #fff;
-	border: 1px solid #f0ad4e;
-}
-
-.uni-tag--error {
-	color: #fff;
-	background-color: #dd524d;
-	border: 1px solid #dd524d;
-}
-
-.uni-tag--error.uni-tag--inverted {
-	color: #dd524d;
-	background-color: #fff;
-	border: 1px solid #dd524d;
-}
-
-.uni-tag--inverted {
-	color: #333;
-	background-color: #fff;
-	border: 1px solid #f8f8f8;
-}
-</style>
+<template>
+	<view
+		v-if="text"
+		:class="[
+			disabled === true || disabled === 'true' ? 'uni-tag--disabled' : '',
+			inverted === true || inverted === 'true' ? 'uni-tag--inverted' : '',
+			circle === true || circle === 'true' ? 'uni-tag--circle' : '',
+			mark === true || mark === 'true' ? 'uni-tag--mark' : '',
+			'uni-tag--' + size,
+			'uni-tag--' + type
+		]"
+		class="uni-tag"
+		@click="onClick()"
+	>
+		{{ text }}
+	</view>
+</template>
+
+<script>
+export default {
+	name: 'UniTag',
+	props: {
+		type: {
+			// 标签类型default、primary、success、warning、danger、royal
+			type: String,
+			default: 'default'
+		},
+		size: {
+			// 标签大小 normal, small
+			type: String,
+			default: 'normal'
+		},
+		// 标签内容
+		text: {
+			type: String,
+			default: ''
+		},
+		disabled: {
+			// 是否为禁用状态
+			type: [String, Boolean],
+			default: false
+		},
+		inverted: {
+			// 是否为空心
+			type: [String, Boolean],
+			default: false
+		},
+		circle: {
+			// 是否为圆角样式
+			type: [String, Boolean],
+			default: false
+		},
+		mark: {
+			// 是否为标记样式
+			type: [String, Boolean],
+			default: false
+		}
+	},
+	methods: {
+		onClick() {
+			if (this.disabled === true || this.disabled === 'true') {
+				return;
+			}
+			this.$emit('click');
+		}
+	}
+};
+</script>
+
+<style>
+
+.uni-tag {
+	box-sizing: border-box;
+	padding: 0 32rpx;
+	height: 60rpx;
+	line-height: calc(60rpx - 2px);
+	font-size: 28rpx;
+	display: inline-flex;
+	align-items: center;
+	color: #333;
+	border-radius: 6rpx;
+	background-color: #f8f8f8;
+	border: 1px solid #f8f8f8;
+}
+
+.uni-tag--circle {
+	border-radius: 30rpx;
+}
+
+.uni-tag--mark {
+	border-radius: 0 30rpx 30rpx 0;
+}
+
+.uni-tag--disabled {
+	opacity: 0.5;
+}
+
+.uni-tag--small {
+	height: 40rpx;
+	padding: 0 16rpx;
+	line-height: calc(40rpx - 2px);
+	font-size: 24rpx;
+}
+
+.uni-tag--primary {
+	color: #fff;
+	background-color: #007aff;
+	border: 1px solid #007aff;
+}
+
+.uni-tag--primary.uni-tag--inverted {
+	color: #007aff;
+	background-color: #fff;
+	border: 1px solid #007aff;
+}
+
+.uni-tag--success {
+	color: #fff;
+	background-color: #4cd964;
+	border: 1px solid #4cd964;
+}
+
+.uni-tag--success.uni-tag--inverted {
+	color: #4cd964;
+	background-color: #fff;
+	border: 1px solid #4cd964;
+}
+
+.uni-tag--warning {
+	color: #fff;
+	background-color: #f0ad4e;
+	border: 1px solid #f0ad4e;
+}
+
+.uni-tag--warning.uni-tag--inverted {
+	color: #f0ad4e;
+	background-color: #fff;
+	border: 1px solid #f0ad4e;
+}
+
+.uni-tag--error {
+	color: #fff;
+	background-color: #dd524d;
+	border: 1px solid #dd524d;
+}
+
+.uni-tag--error.uni-tag--inverted {
+	color: #dd524d;
+	background-color: #fff;
+	border: 1px solid #dd524d;
+}
+
+.uni-tag--inverted {
+	color: #333;
+	background-color: #fff;
+	border: 1px solid #f8f8f8;
+}
+</style>
diff --git a/components/uv-count-to/uv-count-to.vue b/components/uv-count-to/uv-count-to.vue
new file mode 100644
index 0000000..c069ecf
--- /dev/null
+++ b/components/uv-count-to/uv-count-to.vue
@@ -0,0 +1,218 @@
+<template>
+  <text 
+    class="uv-count-num" 
+    :style="textStyle"
+  >
+    {{ displayValue }}
+  </text>
+</template>
+
+<script>
+export default {
+  name: 'uv-count-to',
+  props: {
+    startVal: {
+      type: [String, Number],
+      default: 0
+    },
+    endVal: {
+      type: [String, Number],
+      default: 0
+    },
+    duration: {
+      type: [String, Number],
+      default: 2000
+    },
+    autoplay: {
+      type: Boolean,
+      default: true
+    },
+    decimals: {
+      type: [String, Number],
+      default: 0
+    },
+    useEasing: {
+      type: Boolean,
+      default: true
+    },
+    decimal: {
+      type: [String, Number],
+      default: '.'
+    },
+    color: {
+      type: String,
+      default: '#606266'
+    },
+    fontSize: {
+      type: [String, Number],
+      default: 22
+    },
+    bold: {
+      type: Boolean,
+      default: false
+    },
+    separator: {
+      type: String,
+      default: ''
+    }
+  },
+  data() {
+    return {
+      localStartVal: this.startVal,
+      displayValue: this.formatNumber(this.startVal),
+      printVal: null,
+      paused: false,
+      localDuration: Number(this.duration),
+      startTime: null,
+      timestamp: null,
+      remaining: null,
+      rAF: null,
+      lastTime: 0
+    }
+  },
+  computed: {
+    countDown() {
+      return this.startVal > this.endVal
+    },
+    textStyle() {
+      return {
+        fontSize: this.fontSize + 'px',
+        fontWeight: this.bold ? 'bold' : 'normal',
+        color: this.color
+      }
+    }
+  },
+  watch: {
+    startVal() {
+      if (this.autoplay) {
+        this.start()
+      }
+    },
+    endVal() {
+      console.log(123)
+      if (this.autoplay) {
+        this.start()
+      }
+    }
+  },
+  mounted() {
+    if (this.autoplay) {
+      this.start()
+    }
+  },
+  methods: {
+    easingFn(t, b, c, d) {
+      return c * (1 - Math.pow(2, -10 * t / d)) * 1024 / 1023 + b
+    },
+    requestAnimationFrame(callback) {
+      const currTime = new Date().getTime()
+      const timeToCall = Math.max(0, 16 - (currTime - this.lastTime))
+      const id = setTimeout(() => {
+        callback(currTime + timeToCall)
+      }, timeToCall)
+      this.lastTime = currTime + timeToCall
+      return id
+    },
+    cancelAnimationFrame(id) {
+      clearTimeout(id)
+    },
+    start() {
+      this.localStartVal = this.startVal
+      this.startTime = null
+      this.localDuration = this.duration
+      this.paused = false
+      this.rAF = this.requestAnimationFrame(this.count)
+    },
+    restart() {
+      if (this.paused) {
+        this.resume()
+        this.paused = false
+      } else {
+        this.stop()
+        this.paused = true
+      }
+    },
+    stop() {
+      this.cancelAnimationFrame(this.rAF)
+      this.paused = true
+    },
+    resume() {
+      if (this.remaining) {
+        this.startTime = 0
+        this.localDuration = this.remaining
+        this.localStartVal = this.printVal
+        this.requestAnimationFrame(this.count)
+      }
+    },
+    reset() {
+      this.startTime = null
+      this.cancelAnimationFrame(this.rAF)
+      this.displayValue = this.formatNumber(this.startVal)
+    },
+    count(timestamp) {
+      if (!this.startTime) this.startTime = timestamp
+      this.timestamp = timestamp
+      const progress = timestamp - this.startTime
+      this.remaining = this.localDuration - progress
+
+      if (this.useEasing) {
+        if (this.countDown) {
+          this.printVal = this.localStartVal - this.easingFn(progress, 0, this.localStartVal - this.endVal, this.localDuration)
+        } else {
+          this.printVal = this.easingFn(progress, this.localStartVal, this.endVal - this.localStartVal, this.localDuration)
+        }
+      } else {
+        if (this.countDown) {
+          this.printVal = this.localStartVal - (this.localStartVal - this.endVal) * (progress / this.localDuration)
+        } else {
+          this.printVal = this.localStartVal + (this.endVal - this.localStartVal) * (progress / this.localDuration)
+        }
+      }
+
+      if (this.countDown) {
+        this.printVal = this.printVal < this.endVal ? this.endVal : this.printVal
+      } else {
+        this.printVal = this.printVal > this.endVal ? this.endVal : this.printVal
+      }
+
+      this.displayValue = this.formatNumber(this.printVal) || 0
+
+      if (progress < this.localDuration) {
+        this.rAF = this.requestAnimationFrame(this.count)
+      } else {
+        this.$emit('end')
+      }
+    },
+    isNumber(val) {
+      return !isNaN(parseFloat(val))
+    },
+    formatNumber(num) {
+      num = Number(num)
+      num = num.toFixed(Number(this.decimals))
+      num += ''
+      const x = num.split('.')
+      let x1 = x[0]
+      const x2 = x.length > 1 ? this.decimal + x[1] : ''
+      const rgx = /(\d+)(\d{3})/
+      
+      if (this.separator && !this.isNumber(this.separator)) {
+        while (rgx.test(x1)) {
+          x1 = x1.replace(rgx, '$1' + this.separator + '$2')
+        }
+      }
+      
+      return x1 + x2
+    }
+  },
+  destroyed() {
+    this.cancelAnimationFrame(this.rAF)
+  }
+}
+</script>
+
+<style scoped>
+.uv-count-num {
+  display: inline-flex;
+  text-align: center;
+}
+</style>
\ No newline at end of file
diff --git a/lang/zh-cn/member/address_edit.js b/lang/zh-cn/member/address_edit.js
index e93f405..4c0f2d4 100644
--- a/lang/zh-cn/member/address_edit.js
+++ b/lang/zh-cn/member/address_edit.js
@@ -1,14 +1,16 @@
-export const lang = {
-	//title为每个页面的标题
-	title: '编辑收货地址',
-	consignee: '姓名',
-	consigneePlaceholder: '收货人姓名',
-	mobile: '手机',
-	mobilePlaceholder: '收货人手机号',
-	telephone: '电话',
-	telephonePlaceholder: '收货人固定电话（选填）',
-	receivingCity: '地区',
-	address: '详细地址',
-	addressPlaceholder: '小区、街道、写字楼',
-	save: '保存'
-}
+export const lang = {
+	//title为每个页面的标题
+	title: '编辑收货地址',
+	consignee: '姓名',
+	consigneePlaceholder: '收货人姓名',
+	mobile: '手机',
+	mobilePlaceholder: '收货人手机号',
+	telephone: '电话',
+	telephonePlaceholder: '收货人固定电话（选填）',
+	receivingCity: '地区',
+	address: '详细地址',
+	house:'门牌号',
+	housePlaceholder:'请输入楼层门牌号',
+	addressPlaceholder: '小区、街道、写字楼',
+	save: '保存'
+}
diff --git a/lang/zh-cn/member/index.js b/lang/zh-cn/member/index.js
index f6250cc..949ad97 100644
--- a/lang/zh-cn/member/index.js
+++ b/lang/zh-cn/member/index.js
@@ -1,51 +1,51 @@
-export const lang = {
-	//title为每个页面的标题
-	title: '会员中心',
-	login: '登录/注册',
-	loginTpis: '点击登录 享受更多精彩信息',
-	memberLevel: '会员等级',
-	moreAuthority: '更多权限',
-	allOrders: '全部订单',
-	seeAllOrders: '查看全部订单',
-	waitPay: '待付款',
-	readyDelivery: '待发货',
-	waitDelivery: '待收货',
-	refunding: '退款',
-	// 会员中心入口
-	sign: '签到',
-	personInfo: '个人资料',
-	receivingAddress: '收货地址',
-	accountList: '账户列表',
-	couponList: '优惠券',
-	mySpellList: '我的拼单',
-	myBargain: '我的砍价',
-	virtualCode: '虚拟码',
-	winningRecord: '我的礼品',
-	myCollection: '我的关注',
-	myTracks: '我的足迹',
-	pintuanOrder: '拼团订单',
-	yushouOrder: '预售订单',
-	verification: '核销台',
-	message: '我的消息',
-	exchangeOrder: '积分兑换',
-	
-	waitpay:'待付款',
-	waitsend:'待发货',
-	waitconfirm:'待收货',
-	activist:'售后',
-	completed:'已完成',
-	
-	// 推广中心
-	balance: '余额',
-	point: '积分',
-	coupon: '优惠券',
-	memberRecommend: '邀请有礼',
-	myPresale: '我的预售',
-	myGiftcard: '我的礼品卡',
-	myDivideticket: '我的瓜分券',
-	myRebate:'拼团返利',
-	myHongbao:'我的红包列表',
-	myBlindBox:'我的盲盒',
-	
-	
-}
+export const lang = {
+	//title为每个页面的标题
+	title: '会员中心',
+	login: '立即登录',
+	loginTpis: '点击登录 享受更多精彩信息',
+	memberLevel: '会员等级',
+	moreAuthority: '更多权限',
+	allOrders: '全部订单',
+	seeAllOrders: '查看全部订单',
+	waitPay: '待付款',
+	readyDelivery: '待发货',
+	waitDelivery: '待收货',
+	refunding: '退款',
+	// 会员中心入口
+	sign: '签到',
+	personInfo: '个人资料',
+	receivingAddress: '收货地址',
+	accountList: '账户列表',
+	couponList: '优惠券',
+	mySpellList: '我的拼单',
+	myBargain: '我的砍价',
+	virtualCode: '虚拟码',
+	winningRecord: '我的礼品',
+	myCollection: '我的关注',
+	myTracks: '我的足迹',
+	pintuanOrder: '拼团订单',
+	yushouOrder: '预售订单',
+	verification: '核销台',
+	message: '我的消息',
+	exchangeOrder: '积分兑换',
+	
+	waitpay:'待付款',
+	waitsend:'待发货',
+	waitconfirm:'待收货',
+	activist:'售后',
+	completed:'已完成',
+	
+	// 推广中心
+	balance: '余额',
+	point: '积分',
+	coupon: '优惠券',
+	memberRecommend: '邀请有礼',
+	myPresale: '我的预售',
+	myGiftcard: '我的礼品卡',
+	myDivideticket: '我的瓜分券',
+	myRebate:'拼团返利',
+	myHongbao:'我的红包列表',
+	myBlindBox:'我的盲盒',
+	
+	
+}
diff --git a/lang/zh-cn/order/list.js b/lang/zh-cn/order/list.js
index 1160a28..c70eb28 100644
--- a/lang/zh-cn/order/list.js
+++ b/lang/zh-cn/order/list.js
@@ -1,13 +1,14 @@
-export const lang = {
-	//title为每个页面的标题
-	title: '订单列表',
-	emptyTips: '暂无相关订单',
-	all: '全部',
-	waitPay: '待付款',
-	readyDelivery: '待发货',
-	waitDelivery: '待收货',
-	waitEvaluate: '待评价',
-	waitUse: '待使用',
-	update: "释放刷新",
-	updateIng: "加载中..."
-}
+export const lang = {
+	//title为每个页面的标题
+	title: '订单列表',
+	emptyTips: '暂无相关订单',
+	all: '全部',
+	waitPay: '待付款',
+	readyDelivery: '待发货',
+	waitDelivery: '待收货',
+	waitEvaluate: '待评价',
+	waitUse: '待使用',
+	update: "释放刷新",
+	updateIng: "加载中...",
+	toLogin: "去登录"
+}
diff --git a/main.js b/main.js
index caad937..15ca4e4 100644
--- a/main.js
+++ b/main.js
@@ -38,12 +38,15 @@ Vue.mixin(globalConfig);
 App.mpType = 'app';
 
 // 重写存储，增加前缀
-uniStorage();
+Util.rewriteUniStorageMethod();
 
 //常用组件
 import loadingCover from '@/components/loading-cover/loading-cover.vue';
 Vue.component('loading-cover', loadingCover);
 
+import nsMpHtml from '@/components/ns-mp-html/ns-mp-html.vue';
+Vue.component('ns-mp-html', nsMpHtml);
+
 import nsEmpty from '@/components/ns-empty/ns-empty.vue';
 Vue.component('ns-empty', nsEmpty);
 
diff --git a/manifest.json b/manifest.json
index 35441a3..f4ef995 100644
--- a/manifest.json
+++ b/manifest.json
@@ -58,12 +58,14 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wxa8f94045d9c2fc10",
+        "appid" : "wx29215aa1bd97bbd6",
         "setting" : {
             "urlCheck" : false,
             "postcss" : false,
             "es6" : true,
-            "minified" : true
+            "minified" : true,
+            "codeSigning" : true,
+            "uglifyFileName" : true
         },
         "usingComponents" : true,
         "permission" : {
@@ -108,7 +110,7 @@
         },
         "optimization" : {
             "treeShaking" : {
-                "enable" : false
+                "enable" : true
             }
         },
         "domain" : " ",
diff --git a/pages.json b/pages.json
index e72cc97..be23203 100644
--- a/pages.json
+++ b/pages.json
@@ -3,7 +3,7 @@
 		{
 			"path": "pages/index/index",
 			"style": {
-				// "navigationStyle": "custom",
+				"navigationStyle": "custom",
 				"enablePullDownRefresh": true
 			}
 		},
@@ -28,15 +28,17 @@
 			"path": "pages/goods/category",
 			"style": {
 				"disableScroll": true,
+				"navigationStyle": "custom",
 				"navigationBarTitleText": "商品分类",
 				"enablePullDownRefresh": true
 			}
 		},
 
-		// 商品详情
+		// 商品详情、限时折扣、预售
 		{
 			"path": "pages/goods/detail",
 			"style": {
+				"navigationStyle": "custom",
 				"navigationBarTitleText": "商品详情"
 			}
 		},
@@ -54,6 +56,7 @@
 		{
 			"path": "pages/member/index",
 			"style": {
+				"navigationStyle": "custom",
 				"enablePullDownRefresh": true
 			}
 		},
@@ -112,6 +115,55 @@
 			//******************营销活动模块（26）******************
 			"root": "pages_promotion",
 			"pages": [
+				//----------组合套餐模块（2）----------
+				{
+					"path": "bundling/detail",
+					"style": {
+						// #ifdef H5
+						"navigationStyle": "custom"
+						// #endif
+					}
+				},
+				{
+					"path": "bundling/payment",
+					"style": {
+						// #ifdef H5
+						"navigationStyle": "custom"
+						// #endif
+					}
+				},	
+				//----------砍价模块（5）----------
+				{
+					"path": "bargain/list",
+					"style": {
+						// #ifdef H5
+						"navigationStyle": "custom"
+						// #endif
+					}
+				},
+				{
+					"path": "bargain/detail",
+					"style": {
+						// #ifdef H5
+						"navigationStyle": "custom"
+						// #endif
+					}
+				},
+				
+				{
+					"path": "bargain/my_bargain",
+					"style": {
+						// #ifdef H5
+						"navigationStyle": "custom"
+						// #endif
+					}
+				},
+				{
+					"path": "bargain/payment",
+					"style": {
+						"navigationStyle": "custom"
+					}
+				},						
 			
 				//----------积分模块（2）----------
 				{
@@ -710,11 +762,21 @@
 						// #endif
 					}
 				},
+				//******************聊天（4）******************
+				{
+					"path": "chat/room",
+					"style": {
+						// #ifdef H5
+						"navigationStyle": "custom",
+						// #endif
+						"softinputMode": "adjustResize"
+					}
+				},				
 				//******************支付模块（2）******************
 				{
 					"path": "pay/index",
 					"style": {
-						// #ifdef APP-PLUS
+						// #ifdef H5
 						"navigationStyle": "custom"
 						// #endif
 					}
@@ -722,7 +784,7 @@
 				{
 					"path": "pay/wx_pay",
 					"style": {
-						// #ifdef APP-PLUS
+						// #ifdef H5
 						"navigationStyle": "custom"
 						// #endif
 					}
@@ -730,7 +792,7 @@
 				{
 					"path": "pay/result",
 					"style": {
-						// #ifdef APP-PLUS
+						// #ifdef H5
 						"navigationStyle": "custom"
 						// #endif
 					}
@@ -738,7 +800,15 @@
 				{
 					"path": "pay/cashier",
 					"style": {
-						// #ifdef APP-PLUS
+						// #ifdef H5
+						"navigationStyle": "custom"
+						// #endif
+					}
+				},
+				{
+					"path": "pay/offlinepay",
+					"style": {
+						// #ifdef H5
 						"navigationStyle": "custom"
 						// #endif
 					}
@@ -746,7 +816,7 @@
 				{
 					"path": "storeclose/storeclose",
 					"style": {
-						// #ifdef APP-PLUS
+						// #ifdef H5
 						"navigationStyle": "custom"
 						// #endif
 					}
@@ -755,7 +825,7 @@
 				{
 					"path": "order/logistics",
 					"style": {
-						// #ifdef APP-PLUS
+						// #ifdef H5
 						"navigationStyle": "custom"
 						// #endif
 					}
@@ -763,7 +833,7 @@
 				{
 					"path": "order/evaluate",
 					"style": {
-						// #ifdef APP-PLUS
+						// #ifdef H5
 						"navigationStyle": "custom"
 						// #endif
 					}
@@ -771,7 +841,7 @@
 				{
 					"path": "order/refund",
 					"style": {
-						// #ifdef APP-PLUS
+						// #ifdef H5
 						"navigationStyle": "custom"
 						// #endif
 					}
@@ -779,7 +849,7 @@
 				{
 					"path": "order/refund_goods_select",
 					"style": {
-						// #ifdef APP-PLUS
+						// #ifdef H5
 						"navigationStyle": "custom"
 						// #endif
 					}
@@ -787,7 +857,7 @@
 				{
 					"path": "order/refund_type_select",
 					"style": {
-						// #ifdef APP-PLUS
+						// #ifdef H5
 						"navigationStyle": "custom"
 						// #endif
 					}
@@ -795,7 +865,7 @@
 				{
 					"path": "order/refund_batch",
 					"style": {
-						// #ifdef APP-PLUS
+						// #ifdef H5
 						"navigationStyle": "custom"
 						// #endif
 					}
@@ -803,7 +873,7 @@
 				{
 					"path": "order/refund_detail",
 					"style": {
-						// #ifdef APP-PLUS
+						// #ifdef H5
 						"navigationStyle": "custom"
 						// #endif
 					}
@@ -811,38 +881,130 @@
 				{
 					"path": "order/activist",
 					"style": {
-						// #ifdef APP-PLUS
+						// #ifdef H5
 						"navigationStyle": "custom",
 						// #endif
 						"navigationBarTitleText": "退款"
 					}
 				},
-				{
-					"path": "order/detail_virtual",
-					"style": {
-						// #ifdef APP-PLUS
-						"navigationStyle": "custom"
-						// #endif
-					}
-				},
 				//******************登录模块（3）******************
 				{
-					"path": "login/login",
+					"path": "login/index",
 					"style": {
-						// #ifdef APP-PLUS
+						// #ifdef H5
 						"navigationStyle": "custom",
 						// #endif
 						"navigationBarTitleText": "登录"
 					}
 				},
+				{
+					"path": "login/aggrement",
+					"style": {
+						// #ifdef H5
+						"navigationStyle": "custom",
+						// #endif
+						"navigationBarTitleText": "协议"
+					}
+				},
+				{
+					"path": "login/login",
+					"style": {
+						// #ifdef H5
+						"navigationStyle": "custom",
+						// #endif
+						"navigationBarTitleText": "登录"
+					}
+				},
+				{
+					"path": "login/register",
+					"style": {
+						// #ifdef H5
+						"navigationStyle": "custom",
+						// #endif
+						"navigationBarTitleText": "注册"
+					}
+				},
 				{
 					"path": "form/form",
 					"style": {
-						// #ifdef APP-PLUS
+						// #ifdef H5
 						"navigationStyle": "custom"
 						// #endif
 					}
 				},
+				{
+					"path": "store/list",
+					"style": {
+						// #ifdef H5
+						"navigationStyle": "custom",
+						// #endif
+						"navigationBarTitleText": "门店列表"
+					}
+				},
+				{
+					"path": "store/detail",
+					"style": {
+						// #ifdef H5
+						"navigationStyle": "custom",
+						// #endif
+						"navigationBarTitleText": "门店详情"
+					}
+				},
+				{
+					"path": "store/store_payment",
+					"style": {
+						// #ifdef H5
+						"navigationStyle": "custom",
+						// #endif
+						"navigationBarTitleText": "门店付款"
+					}
+				},
+				{
+					"path": "store/payment_qrcode",
+					"style": {
+						// #ifdef H5
+						"navigationStyle": "custom",
+						// #endif
+						"navigationBarTitleText": "付款码"
+					}
+				},
+				//******************核销模块（4）******************
+				{
+					"path": "verification/index",
+					"style": {
+						// #ifdef H5
+						"navigationStyle": "custom",
+						// #endif
+						"navigationBarTitleText": "核销台"
+					}
+				},
+				{
+					"path": "verification/list",
+					"style": {
+						// #ifdef H5
+						"navigationStyle": "custom",
+						// #endif
+						"navigationBarTitleText": "核销列表"
+					}
+				},
+				{
+					"path": "verification/detail",
+					"style": {
+						// #ifdef H5
+						"navigationStyle": "custom",
+						// #endif
+						"navigationBarTitleText": "核销详情"
+					}
+				},
+				{
+					"path": "weapp/order_shipping",
+					"style": {
+						// #ifdef H5
+						"navigationStyle": "custom",
+						// #endif
+						"navigationBarTitleText": "小程序发货"
+					}
+				},				
 				//******************AI客服******************
 				{
 					"path": "ai-chat/index",
@@ -879,7 +1041,7 @@
 				"text": ""
 			},
 			{
-				"pagePath": "pages/contact/contact",
+				"pagePath": "pages/goods/cart",
 				"text": ""
 			},
 			{
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 4f0b406..906517f 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -14,13 +14,13 @@
 			<view class="dite-button" @click="officialAccountsOpen">关注公众号</view>
 		</view>
 
-	<!-- 	<view class="page-header" v-if="diyData.global && diyData.global.navBarSwitch" :style="{ backgroundImage: bgImg }">
+		<view class="page-header" v-if="diyData.global && diyData.global.navBarSwitch" :style="{ backgroundImage: bgImg }">
 			<ns-navbar :title-color="textNavColor" :data="diyData.global" :scrollTop="scrollTop" :isBack="false"/>
-		</view> -->
+		</view>
 
 		<diy-index-page v-if="topIndexValue" ref="indexPage" :value="topIndexValue" :bgUrl="bgUrl" :scrollTop="scrollTop" :diyGlobal="diyData.global" class="diy-index-page">
 			<template v-slot:components>
-				<diy-group ref="diyGroup" v-if="diyData.value" :diyData="diyData" :scrollTop="scrollTop" :haveTopCategory="true" :followOfficialAccount="followOfficialAccount"/>
+				<diy-group ref="diyGroup" v-if="diyData.value" :refresh="refresh" :diyData="diyData" :scrollTop="scrollTop" :haveTopCategory="true" :followOfficialAccount="followOfficialAccount"/>
 			</template>
 			<template v-slot:default>
 				<ns-copyright v-show="isShowCopyRight"/>
@@ -94,26 +94,27 @@
 		<!-- 选择门店弹出框，定位当前位置，展示最近的一个门店 -->
 		<view @touchmove.prevent.stop class="choose-store">
 			<uni-popup ref="chooseStorePopup" type="center" :maskClick="false" class="choose-store">
-				<view class="choose-store-popup">
-					<view class="head-wrap" @click="closeChooseStorePopup">请确认门店</view>
+				<view class="choose-store-popup" v-if="currentStore">
+					<view class="head-wrap">请确认门店</view>
 					<view class="position-wrap">
 						<text class="iconfont icon-dizhi"></text>
-						<text class="address">{{ currentPosition }}</text>
-						<view class="reposition" @click="reposition" v-if="globalStoreConfig && globalStoreConfig.is_allow_change == 1">
+						<text class="address">{{ currentPosition || currentStore.show_address }}</text>
+						<view class="reposition" @click="reGetLocation" v-if="globalStoreConfig && globalStoreConfig.is_allow_change == 1">
 							<text class="iconfont icon-dingwei"></text>
 							<text>重新定位</text>
 						</view>
 					</view>
-					<view class="store-wrap" v-if="nearestStore">
+					<view class="store-wrap" v-if="currentStore">
 						<text class="tag">当前门店</text>
-						<view class="store-name">{{ nearestStore.store_name }}</view>
-						<view class="address">{{ nearestStore.show_address }}</view>
-						<view class="distance" v-if="nearestStore.distance">
+						<view class="store-name">{{ currentStore.store_name }}</view>
+						<view class="store-close-desc" v-if="currentStore.status == 0 && currentStore.close_desc">{{ currentStore.close_desc }}</view>
+						<view class="address">{{ currentStore.show_address }}</view>
+						<view class="distance" v-if="currentStore.distance">
 							<text class="iconfont icon-dizhi"></text>
-							<text>{{ nearestStore.distance > 1 ? nearestStore.distance + 'km' : nearestStore.distance * 1000 + 'm' }}</text>
+							<text>{{ currentStore.distance > 1 ? currentStore.distance + 'km' : currentStore.distance * 1000 + 'm' }}</text>
 						</view>
 					</view>
-					<button type="primary" @click="enterStore">确认进入</button>
+					<button type="primary" @click="closeChooseStorePopup">确认进入</button>
 					<view class="other-store" @click="chooseOtherStore" v-if="globalStoreConfig && globalStoreConfig.is_allow_change == 1">
 						<text>选择其他门店</text>
 						<text class="iconfont icon-right"></text>
@@ -121,12 +122,34 @@
 				</view>
 			</uni-popup>
 		</view>
-		<hover-nav></hover-nav>
+		<!-- 连锁门店未开启定位或定位失败弹框 -->
+		<view @touchmove.prevent.stop class="chain-stores">
+			<uni-popup ref="getLocationFailRef" type="bottom" :maskClick="false" class="choose-store">
+				<view class="chain-store-popup">
+					<view class="title">获取位置失败</view>
+					<view class="body">
+						<view class="center">
+							<view class="image">
+								<image width="341rpx" :src="$util.img('public/uniapp/index/no_location_tips.png')" mode="aspectFit"/>
+							</view>
+							<view class="text-top">系统暂时定位不到您的位置</view>
+							<view class="text-bottom" v-if="mapConfig.wap_is_open == 1">请确认定位服务已经打开或者您可手动选择附近的门店以便我们提供更精确的服务</view>
+							<view class="text-bottom" v-else>请手动选择附近的门店以便我们提供更精确的服务</view>
+							<view class="footer">
+								<button :type="mapConfig.wap_is_open == 1?'default':'primary'" @click="chooseStore">选择门店</button>
+								<button v-if="mapConfig.wap_is_open == 1" type="primary" class="btn-right" @click="openSetting">开启定位</button>
+							</view>
+							
+						</view>
+					</view>
+				</view>
+			</uni-popup>
+		</view>
 		<!-- #ifdef MP-WEIXIN -->
 		<!-- 小程序隐私协议 -->
 		<privacy-popup ref="privacyPopup"></privacy-popup>
 		<!-- #endif -->
-        <to-top v-if="showTop" @toTop="scrollToTopNative()"></to-top>
+                <to-top v-if="showTop" @toTop="scrollToTopNative()"></to-top>
 		<ns-login ref="login"></ns-login>
 	</view>
 </template>
@@ -136,8 +159,8 @@
 	import nsNavbar from '@/components/ns-navbar/ns-navbar.vue';
 	import diyJs from '@/common/js/diy.js';
 	import indexJs from './public/js/index.js';
-    import toTop from '@/components/toTop/toTop.vue';
-    import scroll from '@/common/js/scroll-view.js';
+        import toTop from '@/components/toTop/toTop.vue';
+        import scroll from '@/common/js/scroll-view.js';
 
 
 	export default {
@@ -250,6 +273,14 @@
 	/deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
 		max-height: unset !important;
 	}
+	
+	/deep/ .chain-stores .uni-popup__mask{
+		backdrop-filter: blur(10rpx);
+	}
+	
+	/deep/ .chain-stores .uni-popup__wrapper.uni-custom.bottom .uni-popup__wrapper-box, .uni-popup__wrapper.uni-custom.top .uni-popup__wrapper-box{
+		max-height: 100vh !important;
+	}	
     
     /deep/ .mescroll-totop {
         right: 24rpx!important; 
diff --git a/pages/index/public/js/index.js b/pages/index/public/js/index.js
index d72fa31..b928f96 100644
--- a/pages/index/public/js/index.js
+++ b/pages/index/public/js/index.js
@@ -3,7 +3,8 @@ export default {
 		return {
 			minScrollTop: 100, // 设置回到顶端按钮显示要求，最小页面滚动距离
 			wechatQrcode: '', // 公众号二维码
-			diyRoute: '/pages/index/index'
+			diyRoute: '/pages/index/index',
+			refresh:false,
 		};
 	},
 	onLoad(option) {
@@ -41,6 +42,9 @@ export default {
 		if (this.unsubscribe) this.unsubscribe();
 	},
 	methods: {
+		changeCategoryNav(e){
+			if(e == 0) this.refresh = !this.refresh;
+		},  
 		// 关注公众号
 		getFollowQrcode() {
 			if (!this.$util.isWeiXin()) return;
diff --git a/pages/member/index.vue b/pages/member/index.vue
index 9a1531c..31af71e 100644
--- a/pages/member/index.vue
+++ b/pages/member/index.vue
@@ -1,127 +1,127 @@
-<template>
-	<page-meta :page-style="themeColor"></page-meta>
-	<view :style="{ backgroundColor: bgColor, minHeight: openBottomNav ? 'calc(100vh - 55px)' : '' }" class="page-img">
-		<view class="page-header" v-if="diyData.global && diyData.global.navBarSwitch" :style="{ backgroundImage: bgImg }">
-			<ns-navbar :title-color="textNavColor" :data="diyData.global" :scrollTop="scrollTop" :isBack="true"/>
-		</view>
-
-		<diy-index-page v-if="topIndexValue" ref="indexPage" :value="topIndexValue" :bgUrl="bgUrl" :scrollTop="scrollTop" :diyGlobal="diyData.global" class="diy-index-page">
-			<diy-group ref="diyGroup" v-if="diyData.value" :diyData="diyData" :scrollTop="scrollTop" :haveTopCategory="true"/>
-			<ns-copyright v-show="isShowCopyRight"/>
-		</diy-index-page>
-
-		<view v-else class="bg-index" :style="{ backgroundImage: backgroundUrl, paddingTop: paddingTop, marginTop: marginTop }">
-			<diy-group ref="diyGroup" v-if="diyData.value" :diyData="diyData" :scrollTop="scrollTop"/>
-			<ns-copyright v-show="isShowCopyRight"/>
-			
-			<view class="foot">
-				<view class="item" @click="tourl('/pages_tool/agreement/contenr?type=0')">隐私协议</view>
-				<view class="item" @click="tourl('/pages_tool/agreement/contenr?type=1')">注册协议</view>
-			</view>
-		</view>
-
-		<template v-if="diyData.global && diyData.global.popWindow && diyData.global.popWindow.count != -1 && diyData.global.popWindow.imageUrl">
-			<view @touchmove.prevent.stop>
-				<uni-popup ref="uniPopupWindow" type="center" class="wap-floating" :maskClick="false">
-					<view class="image-wrap">
-						<image :src="$util.img(diyData.global.popWindow.imageUrl)" :style="popWindowStyle" @click="uniPopupWindowFn()" mode="aspectFit"/>
-					</view>
-					<text class="iconfont icon-round-close" @click="closePopupWindow"></text>
-				</uni-popup>
-			</view>
-		</template>
-
-		<!-- 底部tabBar -->
-		<view id="tab-bar" :class="{ hide: bottomNavHidden }" v-if="openBottomNav">
-			<diy-bottom-nav @callback="callback"/>
-		</view>
-
-		<!-- 收藏 -->
-		<uni-popup ref="collectPopupWindow" type="top" class="wap-floating wap-floating-collect">
-			<view v-if="showTip" class="collectPopupWindow" :style="{ marginTop: (collectTop + statusBarHeight) * 2 + 'rpx' }">
-				<image :src="$util.img('public/uniapp/index/collect2.png')" mode="aspectFit"/>
-				<text @click="closeCollectPopupWindow">我知道了</text>
-			</view>
-		</uni-popup>
-
-		<ns-birthday-gift ref="birthdayGift"></ns-birthday-gift>
-		<ns-new-gift ref="nsNewGift"></ns-new-gift>
-		
-
-		<hover-nav></hover-nav>
-		<!-- #ifdef MP-WEIXIN -->
-		<!-- 小程序隐私协议 -->
-		<privacy-popup ref="privacyPopup"></privacy-popup>
-		<!-- #endif -->
-	</view>
-</template>
-
-<script>
-	import uniPopup from '@/components/uni-popup/uni-popup.vue';
-	import nsNavbar from '@/components/ns-navbar/ns-navbar.vue';
-	import diyJs from '@/common/js/diy.js';
-	import indexJs from './public/js/index.js';
-
-	export default {
-		components: {
-			uniPopup,
-			nsNavbar
-		},
-		mixins: [diyJs, indexJs],
-		methods:{
-			
-			tourl(url){
-				this.$util.redirectTo(url);
-			}
-			
-		}
-	};
-</script>
-
-<style lang="scss">
-	@import '@/common/css/diy.scss';
-	.foot{
-		display: flex;
-		// position: absolute;
-		width: 100%;
-		margin-bottom: 40rpx;
-		.item{
-			width: 50%;
-			text-align: center;
-			color:#F4391c
-		}
-	}
-</style>
-
-<style scoped>
-	.wap-floating>>>.uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
-		background: none !important;
-	}
-
-	/deep/.diy-index-page .uni-popup .uni-popup__wrapper-box {
-		border-radius: 0;
-	}
-
-	.choose-store>>>.goodslist-uni-popup-box {
-		width: 80%;
-	}
-
-	/deep/ .placeholder {
-		height: 0;
-	}
-
-	/deep/::-webkit-scrollbar {
-		width: 0;
-		height: 0;
-		background-color: transparent;
-		display: none;
-	}
-
-	.hide {
-		display: none;
-	}
-
-	/deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
-		max-height: unset !important;
-	}
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view :style="{ backgroundColor: bgColor, minHeight: openBottomNav ? 'calc(100vh - 55px)' : '' }" class="page-img">
+		<view class="page-header" v-if="diyData.global && diyData.global.navBarSwitch" :style="{ backgroundImage: bgImg }">
+			<ns-navbar :title-color="textNavColor" :data="diyData.global" :scrollTop="scrollTop" :isBack="false"/>
+		</view>
+
+		<diy-index-page v-if="topIndexValue" ref="indexPage" :value="topIndexValue" :bgUrl="bgUrl" :scrollTop="scrollTop" :diyGlobal="diyData.global" class="diy-index-page">
+			<diy-group ref="diyGroup" v-if="diyData.value" :diyData="diyData" :scrollTop="scrollTop" :haveTopCategory="true"/>
+			<ns-copyright v-show="isShowCopyRight"/>
+		</diy-index-page>
+
+		<view v-else class="bg-index" :style="{ backgroundImage: backgroundUrl, paddingTop: paddingTop, marginTop: marginTop }">
+			<diy-group ref="diyGroup" v-if="diyData.value" :diyData="diyData" :scrollTop="scrollTop"/>
+			<ns-copyright v-show="isShowCopyRight"/>
+			
+			<view class="foot">
+				<view class="item" @click="tourl('/pages_tool/agreement/contenr?type=0')">隐私协议</view>
+				<view class="item" @click="tourl('/pages_tool/agreement/contenr?type=1')">注册协议</view>
+			</view>
+		</view>
+
+		<template v-if="diyData.global && diyData.global.popWindow && diyData.global.popWindow.count != -1 && diyData.global.popWindow.imageUrl">
+			<view @touchmove.prevent.stop>
+				<uni-popup ref="uniPopupWindow" type="center" class="wap-floating" :maskClick="false">
+					<view class="image-wrap">
+						<image :src="$util.img(diyData.global.popWindow.imageUrl)" :style="popWindowStyle" @click="uniPopupWindowFn()" mode="aspectFit"/>
+					</view>
+					<text class="iconfont icon-round-close" @click="closePopupWindow"></text>
+				</uni-popup>
+			</view>
+		</template>
+
+		<!-- 底部tabBar -->
+		<view id="tab-bar" :class="{ hide: bottomNavHidden }" v-if="openBottomNav">
+			<diy-bottom-nav @callback="callback"/>
+		</view>
+
+		<!-- 收藏 -->
+		<uni-popup ref="collectPopupWindow" type="top" class="wap-floating wap-floating-collect">
+			<view v-if="showTip" class="collectPopupWindow" :style="{ marginTop: (collectTop + statusBarHeight) * 2 + 'rpx' }">
+				<image :src="$util.img('public/uniapp/index/collect2.png')" mode="aspectFit"/>
+				<text @click="closeCollectPopupWindow">我知道了</text>
+			</view>
+		</uni-popup>
+
+		<ns-birthday-gift ref="birthdayGift"></ns-birthday-gift>
+		<ns-new-gift ref="nsNewGift"></ns-new-gift>
+		
+
+		<hover-nav></hover-nav>
+		<!-- #ifdef MP-WEIXIN -->
+		<!-- 小程序隐私协议 -->
+		<privacy-popup ref="privacyPopup"></privacy-popup>
+		<!-- #endif -->
+	</view>
+</template>
+
+<script>
+	import uniPopup from '@/components/uni-popup/uni-popup.vue';
+	import nsNavbar from '@/components/ns-navbar/ns-navbar.vue';
+	import diyJs from '@/common/js/diy.js';
+	import indexJs from './public/js/index.js';
+
+	export default {
+		components: {
+			uniPopup,
+			nsNavbar
+		},
+		mixins: [diyJs, indexJs],
+		methods:{
+			
+			tourl(url){
+				this.$util.redirectTo(url);
+			}
+			
+		}
+	};
+</script>
+
+<style lang="scss">
+	@import '@/common/css/diy.scss';
+	.foot{
+		display: flex;
+		// position: absolute;
+		width: 100%;
+		margin-bottom: 40rpx;
+		.item{
+			width: 50%;
+			text-align: center;
+			color:#F4391c
+		}
+	}
+</style>
+
+<style scoped>
+	.wap-floating>>>.uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+		background: none !important;
+	}
+
+	/deep/.diy-index-page .uni-popup .uni-popup__wrapper-box {
+		border-radius: 0;
+	}
+
+	.choose-store>>>.goodslist-uni-popup-box {
+		width: 80%;
+	}
+
+	/deep/ .placeholder {
+		height: 0;
+	}
+
+	/deep/::-webkit-scrollbar {
+		width: 0;
+		height: 0;
+		background-color: transparent;
+		display: none;
+	}
+
+	.hide {
+		display: none;
+	}
+
+	/deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+		max-height: unset !important;
+	}
 </style>
\ No newline at end of file
diff --git a/pages/member/public/js/index.js b/pages/member/public/js/index.js
index 44f9916..f4470b5 100644
--- a/pages/member/public/js/index.js
+++ b/pages/member/public/js/index.js
@@ -1,95 +1,97 @@
-export default {
-	data() {
-		return {
-			diyRoute: '/pages/member/index'
-		};
-	},
-	computed: {},
-	watch: {
-		storeToken: function(nVal, oVal) {
-			if (nVal) {
-				this.initData();
-				if (uni.getStorageSync('source_member')) this.$util.onSourceMember(uni.getStorageSync(
-					'source_member'));
-			}
-		}
-	},
-	onLoad(data) {
-		//刷新多语言
-		this.$langConfig.refresh();
-		
-		uni.hideTabBar();
-		this.name = 'DIY_VIEW_MEMBER_INDEX';
-		if (data.code) {
-			this.$api.sendRequest({
-				url: '/wechat/api/wechat/authcodetoopenid',
-				data: {
-					code: data.code
-				},
-				success: res => {
-					if (res.code >= 0) {
-						if (res.data.userinfo.nickName) this.modifyNickname(res.data.userinfo.nickName);
-						if (res.data.userinfo.avatarUrl) this.modifyHeadimg(res.data.userinfo
-							.avatarUrl);
-					}
-				}
-			});
-		}
-	},
-	onShow() {
-		
-		// 刷新会员数据
-		if (this.$refs.diyGroup) {
-			if (this.$refs.diyGroup.$refs.diyMemberIndex) this.$refs.diyGroup.$refs.diyMemberIndex[0].init();
-			if (this.$refs.diyGroup.$refs.diyMemberMyOrder) this.$refs.diyGroup.$refs.diyMemberMyOrder[0].getOrderNum();
-		}
-	},
-	methods: {
-		/**
-		 * 查询会员信息
-		 */
-		initData() {
-			if (this.storeToken) {
-				this.$nextTick(() => {
-					this.$refs.nsNewGift.init();
-					this.$refs.birthdayGift.init();
-				});
-			}
-		},
-		/**
-		 * 修改昵称
-		 * @param {Object} nickName
-		 */
-		modifyNickname(nickName) {
-			this.$api.sendRequest({
-				url: '/api/member/modifynickname',
-				data: {
-					nickname: nickName
-				},
-				success: res => {
-					if (res.code == 0) {
-						this.memberInfo.nickname = nickName;
-						this.$store.commit('setMemberInfo', this.memberInfo);
-					}
-				}
-			});
-		},
-		/**
-		 * 修改头像
-		 */
-		modifyHeadimg(headimg) {
-			this.$api.sendRequest({
-				url: '/api/member/modifyheadimg',
-				data: {
-					headimg: headimg
-				},
-				success: res => {
-					if (res.code == 0) {
-						this.memberInfo.headimg = headimg;
-						this.$store.commit('setMemberInfo', this.memberInfo);
-					}
-				}
-			});
-		},
-	},
+export default {
+	data() {
+		return {
+			diyRoute: '/pages/member/index'
+		};
+	},
+	computed: {},
+	watch: {
+		storeToken: function(nVal, oVal) {
+			if (nVal) {
+				this.initData();
+				if (uni.getStorageSync('source_member')) this.$util.onSourceMember(uni.getStorageSync('source_member'));
+			}
+		}
+	},
+	onLoad(data) {
+		uni.hideTabBar();
+		this.name = 'DIY_VIEW_MEMBER_INDEX';
+		if (data.code) {
+			this.$api.sendRequest({
+				url: '/wechat/api/wechat/authcodetoopenid',
+				data: {
+					code: data.code
+				},
+				success: res => {
+					if (res.code >= 0) {
+						if (res.data.userinfo.nickName) this.modifyNickname(res.data.userinfo.nickName);
+						if (res.data.userinfo.avatarUrl) this.modifyHeadimg(res.data.userinfo.avatarUrl);
+					}
+				}
+			});
+		}
+	},
+	onShow() {
+		// 刷新会员数据
+		if (this.$refs.diyGroup) {
+			if (this.$refs.diyGroup.$refs.diyMemberIndex) this.$refs.diyGroup.$refs.diyMemberIndex[0].init();
+			if (this.$refs.diyGroup.$refs.diyMemberMyOrder) this.$refs.diyGroup.$refs.diyMemberMyOrder[0].getOrderNum();
+		}
+	},
+	methods: {
+		/**
+		 * 查询会员信息
+		 */
+		initData() {
+			if (this.storeToken) {
+				this.$nextTick(() => {
+					let callback = () => {
+						// 刷新会员数据
+						if (this.$refs.diyGroup) {
+							if (this.$refs.diyGroup.$refs.diyMemberIndex) {
+								this.$refs.diyGroup.$refs.diyMemberIndex[0].init();
+							}
+						}
+					}
+					this.$refs.nsNewGift.init(callback);
+					this.$refs.birthdayGift.init(callback);
+				});
+			}
+		},
+		/**
+		 * 修改昵称
+		 * @param {Object} nickName
+		 */
+		modifyNickname(nickName) {
+			this.$api.sendRequest({
+				url: '/api/member/modifynickname',
+				data: {
+					nickname: nickName
+				},
+				success: res => {
+					if (res.code == 0) {
+						this.memberInfo.nickname = nickName;
+						this.$store.commit('setMemberInfo', this.memberInfo);
+					}
+				}
+			});
+		},
+		/**
+		 * 修改头像
+		 */
+		modifyHeadimg(headimg) {
+			this.$api.sendRequest({
+				url: '/api/member/modifyheadimg',
+				data: {
+					headimg: headimg
+				},
+				success: res => {
+					if (res.code == 0) {
+						this.memberInfo.headimg = headimg;
+						this.$store.commit('setMemberInfo', this.memberInfo);
+					}
+				}
+			});
+		},
+	},
 };
\ No newline at end of file
diff --git a/pages/order/detail.vue b/pages/order/detail.vue
index ec9f273..ade1155 100644
--- a/pages/order/detail.vue
+++ b/pages/order/detail.vue
@@ -11,12 +11,12 @@
 						<text v-if="orderData.promotion_status_name">（{{ orderData.promotion_status_name }}）</text>
 					</view>
 					<view class="desc" v-if="orderData.promotion_type == 'presale' && orderData.order_status == 1">
-						预计{{ $util.timeStampTurnTime(orderData.predict_delivery_time, true) }}日后发货
+						预计{{ $util.timeStampTurnTime(orderData.predict_delivery_time, 'Y-m-d') }}发货
 					</view>
 					<view class="desc" v-if="orderData.close_cause">订单关闭原因：{{ orderData.close_cause }}</view>
 				</view>
 			</view>
-			<view class="order-time" v-if="orderData.order_status == 0" id="action-date">
+			<view class="order-time" v-if="orderData.order_status == 0 && orderData.pay_type != 'offlinepay'" id="action-date">
 				剩余时间：
 				<uni-count-down :day="orderData.closeTimeMachine.d" :hour="orderData.closeTimeMachine.h"
 					:minute="orderData.closeTimeMachine.i" :second="orderData.closeTimeMachine.s" color="#fff"
@@ -42,7 +42,7 @@
 					<view class="font-size-base">送达时间：</view>
 					<view class="last-child">{{ orderData.buyer_ask_delivery_time }}</view>
 				</view>
-				<block v-if="orderData.package_list">
+				<block v-if="orderData.package_list.deliverer">
 					<view class="pick-block">
 						<view>配送员：</view>
 						<view class="last-child">{{ orderData.package_list.deliverer }}</view>
@@ -133,6 +133,10 @@
 										{{ i < goodsItem.sku_spec_format.length - 1 ? '; ' : '' }}
 									</block>
 								</view>
+								<view class="goods-num">
+									<text class="iconfont icon-close"></text>
+									<text>{{ goodsItem.num }}</text>
+								</view>
 							</view>
 							<view class="goods-sub-section">
 								<view>
@@ -142,11 +146,9 @@
 										<text class="unit price-style small">.{{ parseFloat(goodsItem.price).toFixed(2).split('.')[1] }}</text>
 									</text>
 								</view>
-								<view>
-									<text class="font-size-base">
-										<text class="iconfont icon-close"></text>
-										{{ goodsItem.num }}
-									</text>
+								<view v-if="orderData.order_type == 1 && orderData.order_status == 1 && goodsItem.delivery_status == 1" 
+								class="delivery-status color-base-text">
+									{{goodsItem.delivery_status_name}}
 								</view>
 							</view>
 							<view v-if="goodsItem.card_item_id" class="goods-card">
@@ -176,15 +178,11 @@
 					</view>
 
 					<view class="goods-action">
-						<block v-if="orderData.is_enable_refund">
-							<view @click="goRefund(goodsItem.order_goods_id)" v-if="orderData.order_scene == 'online' && (goodsItem.refund_status == 0 || goodsItem.refund_status == -1)">
-								<view class="order-box-btn" v-if="orderData.promotion_type != 'blindbox'">
-									{{ orderData.order_status == 10 ? '申请售后' : '申请退款' }}
-								</view>
-							</view>
-						</block>
-						<view @click="goRefundDetail(goodsItem.order_goods_id)" v-if="goodsItem.refund_status != 0 && goodsItem.refund_status != -1">
-							<view class="order-box-btn">{{ orderData.order_status == 10 ? '查看售后' : '查看退款' }}</view>
+						<view class="order-box-btn" @click="goRefund(goodsItem.order_goods_id)" v-if="orderData.is_enable_refund && orderData.order_scene == 'online' && goodsItem.refund_status == 0 && orderData.promotion_type != 'blindbox'">
+							{{ orderData.order_status == 10 ? '申请售后' : '申请退款' }}
+						</view>
+						<view class="order-box-btn" @click="goRefundDetail(goodsItem.order_goods_id)" v-if="goodsItem.refund_status != 0">
+							{{ goodsItem.refund_status_name }}
 						</view>
 					</view>
 				</view>
@@ -319,15 +317,36 @@
 					<view class="box"><text class="color-base-text" @click="$util.redirectTo('/pages_promotion/cardservice/card/my_card')">查看</text></view>
 				</view>
 			</block>
+			<block v-if="orderData.pay_type=='offlinepay' && orderData.offline_pay_info">
+				<view class="hr"></view>
+				<view class="order-cell">
+					<text class="tit">支付方式：</text>
+					<view class="box">
+						<text class="color-title">线下支付</text>
+					</view>
+				</view>
+				<view class="order-cell">
+					<text class="tit">支付状态：</text>
+					<view class="box">
+						<text class="color-title">{{orderData.offline_pay_info.status_info.name}}</text>
+					</view>
+				</view>
+				<view class="order-cell remark" v-if="orderData.offline_pay_info.status_info.const=='AUDIT_REFUSE'">
+					<text class="tit">审核备注：</text>
+					<view class="box">
+						<text class="color-title">{{orderData.offline_pay_info.audit_remark}}</text>
+					</view>
+				</view>
+			</block>
 			<!-- 联系客服 -->
-	<!-- 		<ns-contact :niushop="{ order_id: orderData.order_id }">
+			<ns-contact :niushop="{ order_id: orderData.order_id }">
 				<view class="kefu">
 					<view>
 						<text class="iconfont icon-ziyuan"></text>
 						<text>联系客服</text>
 					</view>
 				</view>
-			</ns-contact> -->
+			</ns-contact>
 		</view>
 
 		<block v-if="orderData.virtual_goods && orderData.goods_class == 2 && orderData.virtual_goods.is_veirfy == 0">
@@ -362,7 +381,7 @@
 					</view>
 				</view>
 			</view>
- 
+
 			<view class="verify-info-wrap">
 				<view class="head">核销记录</view>
 				<view v-if="orderData.virtual_goods.verify_record.length">
@@ -598,8 +617,7 @@
 		</view>
 
 		<!-- 订单 -->
-		<view class="fixed-bottom-box bottom-safe-area" v-if="orderData.action.length > 0 || (orderData.is_evaluate == 1 && evaluateConfig.evaluate_status == 1)">
-		</view>
+		<view class="fixed-bottom-box bottom-safe-area" v-if="orderData.action.length > 0 || (orderData.is_evaluate == 1 && evaluateConfig.evaluate_status == 1)"></view>
 
 		<ns-goods-recommend ref="goodrecommend" route="order_detail"></ns-goods-recommend>
 		<!-- 选择支付方式弹窗 -->
@@ -646,6 +664,12 @@
 			if (option.order_id) this.orderId = option.order_id;
 			if (option.merchant_trade_no) this.merchantTradeNo = option.merchant_trade_no;
 		},
+		onPullDownRefresh() {
+			this.getOrderData();
+			setTimeout(function () {
+				uni.stopPullDownRefresh();
+			}, 50);
+		},
 		onShow() {
 			this.isIphoneX = this.$util.uniappIsIPhoneX();
 
@@ -657,6 +681,7 @@
 					back: '/pages/order/detail?order_id=' + this.orderId + '&merchant_trade_no=' + this.merchantTradeNo
 				});
 			}
+			if(this.$refs.choosePaymentPopup) this.$refs.choosePaymentPopup.pageShow()
 		},
 		methods: {
 			goDetail(e) {
@@ -733,11 +758,20 @@
 			/**
 			 * 下拉刷新
 			 */
-			onPullDownRefresh() {
-				this.getOrderData();
-			},
+			
 			operation(action) {
 				switch (action) {
+					case 'orderDelete':
+						this.orderDelete(this.orderData.order_id, () => {
+							setTimeout(()=>{
+								if (getCurrentPages().length == 1) {
+									this.$util.redirectTo('/pages/member/index')
+								} else {
+									uni.navigateBack();
+								}
+							},500)
+						});
+						break;
 					case 'orderPay': // 支付
 						this.orderPay(this.orderData);
 						break;
@@ -772,6 +806,11 @@
 							this.getOrderData();
 						});
 						break;
+					case 'orderOfflinePay':
+						this.$util.redirectTo('/pages_tool/pay/offlinepay', {
+						    outTradeNo: this.orderData.out_trade_no
+						});
+						break;
 				}
 			},
 			imageError(index) {
diff --git a/pages/order/detail_point.vue b/pages/order/detail_point.vue
index 75b21f1..54582c1 100644
--- a/pages/order/detail_point.vue
+++ b/pages/order/detail_point.vue
@@ -80,14 +80,14 @@
 				</view>
 			</view>
 			<!-- 联系客服 -->
-	<!-- 		<ns-contact :niushop="{ order_id: orderData.order_id }">
+			<ns-contact :niushop="{ order_id: orderData.order_id }">
 				<view class="kefu">
 					<view>
 						<text class="iconfont icon-ziyuan"></text>
 						<text>联系客服</text>
 					</view>
 				</view>
-			</ns-contact> -->
+			</ns-contact>
 		</view>
 
 		<!-- 订单金额 -->
@@ -127,8 +127,7 @@
 
 		<ns-goods-recommend ref="goodrecommend" route="order_detail"></ns-goods-recommend>
 		<!-- 选择支付方式弹窗 -->
-		<ns-payment ref="choosePaymentPopup" :payMoney="orderData.order_money"
-			@confirm="orderPay(orderData)"></ns-payment>
+		<ns-payment ref="choosePaymentPopup" :payMoney="orderData.order_money" @confirm="orderPay(orderData)"></ns-payment>
 		<loading-cover ref="loadingCover"></loading-cover>
 	</view>
 </template>
diff --git a/pages/order/list.vue b/pages/order/list.vue
index db0ca2f..86b3cd9 100644
--- a/pages/order/list.vue
+++ b/pages/order/list.vue
@@ -1,7 +1,7 @@
 <template>
 	<page-meta :page-style="themeColor"></page-meta>
 	<view class="order-container">
-		<view class="cate-search">
+		<view class="cate-search" v-if="storeToken">
 			<view class="search-box">
 				<input class="uni-input" maxlength="50" v-model="searchText" confirm-type="search" placeholder="请输入商品名称/订单编号" @confirm="search()" />
 				<text class="iconfont icon-sousuo3" @click="search()"></text>
@@ -18,137 +18,138 @@
 		<!-- #ifdef MP -->
 		<mescroll-uni ref="mescroll" @getData="getListData" top="176rpx" v-if="storeToken">
 		<!-- #endif -->
-			<!-- #ifndef MP -->
-			<mescroll-uni ref="mescroll" @getData="getListData" top="196rpx" v-if="storeToken">
-			<!-- #endif -->
-				<block slot="list">
-					<view class="order-list" v-if="orderList.length > 0">
-						<view class="order-item" v-for="(orderItem, orderIndex) in orderList" :key="orderIndex">
-							<view class="order-header" :class="{ waitpay: orderStatus == 'waitpay' && orderItem.order_status == 0 }">
-								<!-- <view class="iconfont"
-									:class="$util.inArray(orderItem.order_id, mergePayOrder) == -1 ? 'icon-yuan_checkbox' : 'icon-yuan_checked color-base-text'"
-									@click="selectOrder(orderItem.order_id, orderItem.pay_money)"
-									v-if="orderStatus == 'waitpay' && orderItem.order_status == 0"></view> -->
-								<text class="order-no">订单号：{{ orderItem.order_no }}</text>
-								<text class="order-type-name">{{ orderItem.order_type_name }}</text>
-								<text class="status-name">{{ orderItem.order_status_name }}</text>
-							</view>
-							<view class="order-body" @click="orderDetail(orderItem)">
-								<block v-if="orderItem.order_goods.length == 1">
-									<view class="goods-wrap" v-for="(goodsItem, goodsIndex) in orderItem.order_goods" :key="goodsIndex">
-										<view class="goods-img">
-											<image :src="$util.img(goodsItem.sku_image, { size: 'mid' })" @error="imageError(orderIndex, goodsIndex)" mode="aspectFill" :lazy-load="true"/>
-										</view>
-										<view class="goods-info">
-											<view class="pro-info">
-												<view class="goods-name" v-if="goodsItem.goods_class == 2">{{ goodsItem.goods_name }}</view>
-												<view class="goods-name" v-else>{{ goodsItem.sku_name }}</view>
-												<view class="sku" v-if="goodsItem.sku_spec_format">
-													<view class="goods-spec">
-														<block v-for="(x, i) in goodsItem.sku_spec_format" :key="i">
-															{{ x.spec_value_name }}
-															{{ i < goodsItem.sku_spec_format.length - 1 ? '; ' : '' }}
-														</block>
-													</view>
+		<!-- #ifndef MP -->
+		<mescroll-uni ref="mescroll" @getData="getListData" top="196rpx" v-if="storeToken">
+		<!-- #endif -->
+			<block slot="list">
+				<view class="order-list" v-if="orderList.length > 0">
+					<view class="order-item" v-for="(orderItem, orderIndex) in orderList" :key="orderIndex">
+						<view class="order-header" :class="{ waitpay: orderStatus == 'waitpay' && orderItem.order_status == 0 }">
+							<!-- <view class="iconfont"
+								:class="$util.inArray(orderItem.order_id, mergePayOrder) == -1 ? 'icon-yuan_checkbox' : 'icon-yuan_checked color-base-text'"
+								@click="selectOrder(orderItem.order_id, orderItem.pay_money)"
+								v-if="orderStatus == 'waitpay' && orderItem.order_status == 0"></view> -->
+							<text class="order-no">订单号：{{ orderItem.order_no }}</text>
+							<text class="order-type-name">{{ orderItem.order_type_name }}</text>
+							<text class="status-name">{{ orderItem.order_status_name }}</text>
+						</view>
+						<view class="order-body" @click="orderDetail(orderItem)">
+							<block v-if="orderItem.order_goods.length == 1">
+								<view class="goods-wrap" v-for="(goodsItem, goodsIndex) in orderItem.order_goods" :key="goodsIndex">
+									<view class="goods-img">
+										<image :src="$util.img(goodsItem.sku_image, { size: 'mid' })" @error="imageError(orderIndex, goodsIndex)" mode="aspectFill" :lazy-load="true"/>
+									</view>
+									<view class="goods-info">
+										<view class="pro-info">
+											<view class="goods-name" v-if="goodsItem.goods_class == 2">{{ goodsItem.goods_name }}</view>
+											<view class="goods-name" v-else>{{ goodsItem.sku_name }}</view>
+											<view class="sku" v-if="goodsItem.sku_spec_format">
+												<view class="goods-spec">
+													<block v-for="(x, i) in goodsItem.sku_spec_format" :key="i">
+														{{ x.spec_value_name }}
+														{{ i < goodsItem.sku_spec_format.length - 1 ? '; ' : '' }}
+													</block>
 												</view>
 											</view>
-											<!-- <view class="goods-sub-section">
-											<text class="goods-price">
-												<text class="unit price-style small">{{ $lang('common.currencySymbol') }}</text>
-												<text class="price-style large">{{ parseFloat(goodsItem.price).toFixed(2).split(".")[0] }}</text>
-												<text class="unit price-style small">.{{ parseFloat(goodsItem.price).toFixed(2).split(".")[1] }}</text>
-												
-											</text>
-											<text class="goods-num">
-												<text class="iconfont icon-close"></text>
-												{{ goodsItem.num }}
-											</text>
-										</view> -->
-											<view class="goods-action"><!-- <view class="action-btn">加购物车</view> -->
-											</view>
 										</view>
-									</view>
-								</block>
-								<block v-else>
-									<view class="multi-order-goods">
-										<scroll-view scroll-x="true" class="scroll-view">
-											<view class="goods-wrap">
-												<view class="goods-img" v-for="(goodsItem, goodsIndex) in orderItem.order_goods" :key="goodsIndex">
-													<image :src="$util.img(goodsItem.sku_image, { size: 'mid' })" @error="imageError(orderIndex, goodsIndex)" mode="aspectFill" :lazy-load="true"/>
-												</view>
-											</view>
-										</scroll-view>
-										<view class="shade">
-											<image :src="$util.img('public/uniapp/order/order-shade.png')"></image>
-										</view>
-									</view>
-								</block>
-							</view>
-							<view class="order-footer">
-								<view class="order-base-info">
-									<view class="total">
-										<text class="font-size-sub">共{{ orderItem.goods_num }}件商品</text>
-										<text class="align-right font-size-base">
-											实付款：
-											<text class="font-size-base price-font">{{ $lang('common.currencySymbol') }}{{ orderItem.order_money }}</text>
+										<!-- <view class="goods-sub-section">
+										<text class="goods-price">
+											<text class="unit price-style small">{{ $lang('common.currencySymbol') }}</text>
+											<text class="price-style large">{{ parseFloat(goodsItem.price).toFixed(2).split(".")[0] }}</text>
+											<text class="unit price-style small">.{{ parseFloat(goodsItem.price).toFixed(2).split(".")[1] }}</text>
+											
 										</text>
+										<text class="goods-num">
+											<text class="iconfont icon-close"></text>
+											{{ goodsItem.num }}
+										</text>
+									</view> -->
+										<view class="goods-action"><!-- <view class="action-btn">加购物车</view> -->
+										</view>
 									</view>
 								</view>
-								<view class="order-action" v-if="orderItem.action.length > 0">
-									<view class="order-time" v-if="orderItem.order_status == 0" id="action-date">
-										<image :src="$util.img('public/uniapp/order/time.png')"></image>
-										剩余时间：
-										<uni-count-down :day="orderItem.discountTimeMachine.d"
-											:hour="orderItem.discountTimeMachine.h"
-											:minute="orderItem.discountTimeMachine.i"
-											:second="orderItem.discountTimeMachine.s" color="#FF4644"
-											splitorColor="#FF4644" />
-									</view>
-									<view class="order-box-btn"
-										v-if="evaluateConfig.evaluate_status == 1 && orderItem.is_evaluate == 1"
-										@click="operation('memberOrderEvaluation', orderItem)">
-										<text v-if="orderItem.evaluate_status == 0">评价</text>
-										<text v-else-if="orderItem.evaluate_status == 1">追评</text>
-									</view>
-									<view class="order-box-btn"
-										:class="{ 'color-base-border color-base-bg': operationItem.action == 'orderPay' }"
-										v-for="(operationItem, operationIndex) in orderItem.action"
-										:key="operationIndex" @click="operation(operationItem.action, orderItem)">
-										{{ operationItem.title }}
+							</block>
+							<block v-else>
+								<view class="multi-order-goods">
+									<scroll-view scroll-x="true" class="scroll-view">
+										<view class="goods-wrap">
+											<view class="goods-img" v-for="(goodsItem, goodsIndex) in orderItem.order_goods" :key="goodsIndex">
+												<image :src="$util.img(goodsItem.sku_image, { size: 'mid' })" @error="imageError(orderIndex, goodsIndex)" mode="aspectFill" :lazy-load="true"/>
+											</view>
+										</view>
+									</scroll-view>
+									<view class="shade">
+										<image :src="$util.img('public/uniapp/order/order-shade.png')"></image>
 									</view>
 								</view>
-								<view class="order-action" v-else-if="orderItem.action.length == 0 && orderItem.is_evaluate == 1 && evaluateConfig.evaluate_status == 1">
-									<view class="order-box-btn" v-if="orderItem.is_evaluate == 1" @click="operation('memberOrderEvaluation', orderItem)">
-										<text v-if="orderItem.evaluate_status == 0">评价</text>
-										<text v-else-if="orderItem.evaluate_status == 1">追评</text>
-									</view>
+							</block>
+						</view>
+						<view class="order-footer">
+							<view class="order-base-info">
+								<view class="total">
+									<text class="font-size-sub">共{{ orderItem.goods_num }}件商品</text>
+									<text class="align-right font-size-base">
+										实付款：
+										<text class="font-size-base price-font">{{ $lang('common.currencySymbol') }}{{ orderItem.order_money }}</text>
+									</text>
 								</view>
-								<view class="order-action" v-else>
-									<view class="order-box-btn" @click="orderDetail(orderItem)">查看详情</view>
+							</view>
+							<view class="order-action" v-if="orderItem.action.length > 0">
+								<view class="order-time" v-if="orderItem.order_status == 0 && orderItem.pay_type !== 'offlinepay'" id="action-date">
+									<image :src="$util.img('public/uniapp/order/time.png')"></image>
+									剩余时间：
+									<uni-count-down :day="orderItem.discountTimeMachine.d"
+										:hour="orderItem.discountTimeMachine.h"
+										:minute="orderItem.discountTimeMachine.i"
+										:second="orderItem.discountTimeMachine.s" color="#FF4644"
+										splitorColor="#FF4644" />
 								</view>
+								<view class="order-box-btn"
+									v-if="evaluateConfig.evaluate_status == 1 && orderItem.is_evaluate == 1"
+									@click="operation('memberOrderEvaluation', orderItem)">
+									<text v-if="orderItem.evaluate_status == 0">评价</text>
+									<text v-else-if="orderItem.evaluate_status == 1">追评</text>
+								</view>
+								<view class="order-box-btn"
+									:class="{ 'color-base-border color-base-bg': operationItem.action == 'orderPay' }"
+									v-for="(operationItem, operationIndex) in orderItem.action"
+									:key="operationIndex" @click="operation(operationItem.action, orderItem)">
+									{{ operationItem.title }}
+								</view>
+							</view>
+							<view class="order-action" v-else-if="orderItem.action.length == 0 && orderItem.is_evaluate == 1 && evaluateConfig.evaluate_status == 1">
+								<view class="order-box-btn" v-if="orderItem.is_evaluate == 1" @click="operation('memberOrderEvaluation', orderItem)">
+									<text v-if="orderItem.evaluate_status == 0">评价</text>
+									<text v-else-if="orderItem.evaluate_status == 1">追评</text>
+								</view>
+							</view>
+							<view class="order-action" v-else>
+								<view class="order-box-btn" @click="orderDetail(orderItem)">查看详情</view>
 							</view>
 						</view>
 					</view>
-					<view v-else><ns-empty :isIndex="false" :text="$lang('emptyTips')"></ns-empty></view>
-				</block>
-			</mescroll-uni>
+				</view>
+				<view v-else><ns-empty :isIndex="false" :text="$lang('emptyTips')"></ns-empty></view>
+			</block>
+		</mescroll-uni>
+		<view v-if="!storeToken" class="no-login">
+			<view><ns-empty :isIndex="false" :text="$lang('emptyTips')"></ns-empty></view>
+			<button type="primary" size="mini" class="button mini" @click="toLogin">去登录</button>
+		</view>
+		
+		
 
-			<!-- <view class="order-batch-action" :class="{ 'bottom-safe-area': isIphoneX }" v-if="mergePayOrder.length">
-				<view class="action-btn color-base-text color-base-border" @click="mergePay()">合并付款</view>
-			</view> -->
+		<!-- 选择支付方式弹窗 -->
+		<payment ref="choosePaymentPopup"></payment>
 
-			<!-- 选择支付方式弹窗 -->
-			<ns-payment ref="choosePaymentPopup"></ns-payment>
-			<ns-payment ref="choosePaymentMergePopup"></ns-payment>
-
-			<ns-login ref="login"></ns-login>
-			<loading-cover ref="loadingCover"></loading-cover>
+		<ns-login ref="login"></ns-login>
+		<loading-cover ref="loadingCover"></loading-cover>
 	</view>
 </template>
 
 <script>
 	import orderMethod from './public/js/orderMethod.js';
-	import nsPayment from '@/components/payment/payment.vue';
+	import payment from '@/components/payment/payment.vue';
 
 	export default {
 		data() {
@@ -176,7 +177,7 @@
 			};
 		},
 		components: {
-			nsPayment
+			payment
 		},
 		mixins: [orderMethod],
 		onLoad(option) {
@@ -192,14 +193,19 @@
 				if (this.$refs.mescroll) this.$refs.mescroll.refresh();
 			} else {
 				this.$nextTick(() => {
-					this.$refs.login.open('/pages/order/list?status=' + this.orderStatus);
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					// this.$refs.login.open('/pages/order/list?status=' + this.orderStatus);
 				})
 			}
+			if(this.$refs.choosePaymentPopup) this.$refs.choosePaymentPopup.pageShow()
 		},
 		onUnload() {
 			if (!this.storeToken && this.$refs.login) this.$refs.login.cancelCompleteInfo();
 		},
 		methods: {
+			toLogin() {
+				this.$refs.login.open();
+			},
 			ontabtap(e) {
 				let index = e.target.dataset.current || e.currentTarget.dataset.current;
 				this.orderStatus = this.statusList[index].status;
@@ -208,7 +214,7 @@
 				this.$refs.mescroll.refresh();
 			},
 			getListData(mescroll) {
-				
+
 				this.$api.sendRequest({
 					url: '/api/order/lists',
 					data: {
@@ -268,39 +274,39 @@
 			getOrderStatus() {
 				this.statusList = [{
 						status: 'all',
-						name:'全部', 
+						name: this.$lang('all'),
 						id: 'status_0'
 					},
 					{
 						status: 'waitpay',
-						name: '待付款',
+						name: this.$lang('waitPay'),
 						id: 'status_1'
 					},
 					{
 						status: 'waitsend',
-						name: '待发货',
+						name: this.$lang('readyDelivery'),
 						id: 'status_2'
 					},
 					{
 						status: 'waitconfirm',
-						name: '待收货',
+						name: this.$lang('waitDelivery'),
 						id: 'status_3'
 					},
 					{
-						status: 'waitrate',
-						name: '已完成',
-						id: 'status_4'
-					},
-					/*{
 						status: 'wait_use',
-						name: '待使用',
+						name: this.$lang('waitUse'),
 						id: 'status_4'
-					}*/
+					}
 				];
 			},
 			operation(action, orderData) {
 				let index = this.status;
 				switch (action) {
+					case 'orderDelete':
+						this.orderDelete(orderData.order_id, () => {
+							this.$refs.mescroll.refresh();
+						});
+						break;
 					case 'orderPay': // 支付
 						this.orderData = orderData;
 						this.payMoney = parseFloat(orderData.pay_money);
@@ -339,34 +345,18 @@
 							this.$refs.mescroll.refresh();
 						});
 						break;
+					case 'orderOfflinePay':
+						this.orderData = orderData;
+						this.$util.redirectTo('/pages_tool/pay/offlinepay', {
+						    outTradeNo: this.orderData.out_trade_no
+						});
+						break;
 				}
 			},
 			orderDetail(data) {
-				switch (parseInt(data.order_type)) {
-					case 2:
-						// 自提订单
-						this.$util.redirectTo('/pages/order/detail_pickup', {
-							order_id: data.order_id
-						});
-						break;
-					case 3:
-						// 本地配送订单
-						this.$util.redirectTo('/pages/order/detail_local_delivery', {
-							order_id: data.order_id
-						});
-						break;
-					case 4:
-						// 虚拟订单
-						this.$util.redirectTo('/pages_tool/order/detail_virtual', {
-							order_id: data.order_id
-						});
-						break;
-					default:
-						this.$util.redirectTo('/pages/order/detail', {
-							order_id: data.order_id
-						});
-						break;
-				}
+				this.$util.redirectTo('/pages/order/detail', {
+					order_id: data.order_id
+				});
 			},
 			/**
 			 * 选择订单
@@ -381,28 +371,6 @@
 					this.mergePayOrder.push(orderId);
 				}
 			},
-			/**
-			 * 合并支付
-			 */
-			mergePay() {
-				if (this.mergePayOrder.length) {
-					this.$api.sendRequest({
-						url: '/api/order/pay',
-						data: {
-							order_ids: this.mergePayOrder.toString()
-						},
-						success: res => {
-							if (res.code >= 0) {
-								this.$refs.choosePaymentMergePopup.getPayInfo(res.data);
-							} else {
-								this.$util.showToast({
-									title: res.message
-								});
-							}
-						}
-					});
-				}
-			},
 			imageError(orderIndex, goodsIndex) {
 				this.orderList[orderIndex].order_goods[goodsIndex].sku_image = this.$util.getDefaultImage().goods;
 				this.$forceUpdate();
@@ -450,4 +418,18 @@
 	/deep/ .mescroll-upwarp {
 		padding-bottom: 100rpx;
 	}
+	.no-login{
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+	}
+	.no-login .button{
+		width: 300rpx;
+		margin-top: 100rpx;
+		height: 70rpx;
+		line-height: 70rpx !important;
+		font-size: 28rpx;
+		border-radius: 50rpx;
+	}
+	
 </style>
\ No newline at end of file
diff --git a/pages/order/public/css/detail.scss b/pages/order/public/css/detail.scss
index a1b1c06..9f77258 100644
--- a/pages/order/public/css/detail.scss
+++ b/pages/order/public/css/detail.scss
@@ -435,7 +435,7 @@ view {
 					line-height: 1.3;
 					display: flex;
 					margin-top: 20rpx;
-
+					align-items: center;
 					.goods-price {
 						font-weight: 700;
 						font-size: $font-size-activity-tag;
@@ -525,7 +525,9 @@ view {
 	align-items: center;
 	background: #fff;
 	line-height: 40rpx;
-
+	&.remark{
+		align-items: flex-start !important;
+	}
 	.tit {
 		text-align: left;
 	}
@@ -847,7 +849,13 @@ view {
 	white-space: nowrap;
 	flex: 1;
 }
-
+.goods-num{
+	font-size: 22rpx;
+	margin-left: 20rpx;
+}
+.delivery-status{
+	line-height: 1.3;
+}
 .fixed-bottom {
 	width: 100%;
 	position: fixed;
diff --git a/pages/order/public/js/orderMethod.js b/pages/order/public/js/orderMethod.js
index b741e30..551ddf2 100644
--- a/pages/order/public/js/orderMethod.js
+++ b/pages/order/public/js/orderMethod.js
@@ -1,5 +1,36 @@
 export default {
 	methods: {
+		/**
+		 * 删除订单
+		 * @param {Object} orderData
+		 */
+		orderDelete(order_id, callback) {
+			uni.showModal({
+				title: '提示',
+				content: '您确定要删除该订单吗？',
+				success: res => {
+					if (res.confirm) {
+						this.$api.sendRequest({
+							url: '/api/order/delete',
+							data: {
+								order_id
+							},
+							success: res => {
+								if (res.code >= 0) {
+									this.$util.showToast({title:'删除订单成功'})
+									typeof callback == 'function' && callback();
+								} else {
+									this.$util.showToast({
+										title: '删除订单失败，' + res.message,
+										duration: 2000
+									})
+								}
+							}
+						})
+					}
+				}
+			})
+		},
 		/**
 		 * 订单支付
 		 * @param {Object} orderData
@@ -57,8 +88,7 @@ export default {
 									typeof callback == 'function' && callback();
 								} else {
 									this.$util.showToast({
-										title: '当前订单可能存在拼团，维权等操作，' + res.message +
-											'不可以关闭哦!',
+										title: '关闭失败，' + res.message,
 										duration: 2000
 									})
 								}
diff --git a/pages_promotion/bargain/detail.vue b/pages_promotion/bargain/detail.vue
new file mode 100644
index 0000000..aef2639
--- /dev/null
+++ b/pages_promotion/bargain/detail.vue
@@ -0,0 +1,471 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view class="bargain">
+		<view class="bargain_top" :style="{ backgroundImage: 'url(' + $util.img('public/uniapp/bargain/bargain_background.png') + ')' }">
+			<view>{{ goodsDetail ? goodsDetail.browse_num : 0 }}人查看</view>
+			<view>|</view>
+			<view>{{ goodsDetail ? goodsDetail.share_num : 0 }}人分享</view>
+			<view>|</view>
+			<view>{{ goodsDetail ? goodsDetail.join_num : 0 }}人参与</view>
+		</view>
+		<view class="rule-mark-enter" @click="openRulePopup">活动规则</view>
+		<view class="bargin_content">
+			<view class="uer_info_base" v-if="launchInfo">
+				<view class="user_info_img">
+					<image :src="launchInfo.headimg == '' ? $util.img($util.getDefaultImage().head) : $util.img(launchInfo.headimg)" mode="widthFix"></image>
+				</view>
+				<text class="user_info_name">{{ launchInfo.nickname }}</text>
+			</view>
+			<!-- 宣传语 -->
+			<view class="bargin_propaganda" v-if="launchInfo">
+				<text class="marks">“</text>
+				<text>我发现一件好物，快来帮我砍一刀</text>
+				<text class="marks">”</text>
+			</view>
+			<!-- 商品 -->
+			<view class="goods" v-if="goodsDetail">
+				<view class="goods_img"><image :src="$util.img(goodsDetail.sku_image, { size: 'mid' })" mode="aspectFit"></image></view>
+				<view class="goods_content" v-if="launchInfo">
+					<view class="goods_title">{{ goodsDetail.sku_name }}</view>
+					<view class="goods_price">
+						<view>
+							原价
+							<text class="original_price">{{ $lang('common.currencySymbol') }}{{ launchInfo.price }}</text>
+						</view>
+						<view>
+							最低可砍至
+							<text class="bottom_price">{{ $lang('common.currencySymbol') }}{{ launchInfo.floor_price }}</text>
+						</view>
+					</view>
+					<view class="partake_num" v-if="launchInfo">
+						已有
+						<text class="ident">{{ launchInfo.curr_num }}</text>
+						人帮砍
+						<text class="residue-num">
+							剩余库存
+							<text class="ident">{{ goodsDetail.bargain_stock }}{{ goodsDetail.unit }}</text>
+						</text>
+					</view>
+					<view v-if="launchInfo && timeMachine && goodsDetail.bargain_status == 1" class="count-down">
+						<uni-count-down
+							:day="timeMachine.d"
+							:hour="timeMachine.h"
+							:minute="timeMachine.i"
+							:second="timeMachine.s"
+							color="#fff"
+							splitorColor="#333 !important"
+							backgroundColor="#000"
+							border-color="transparent"
+							@timeup="timeUp()"
+						></uni-count-down>
+						<text>后结束</text>
+					</view>
+				</view>
+				<view class="goods_content launch" v-else>
+					<view class="goods_title">{{ goodsDetail.sku_name }}</view>
+					<view class="goods_price">
+						<view>
+							原价：
+							<text class="original_price price-font">
+								<text class="price-style small">{{ $lang('common.currencySymbol') }}</text>
+								<text class="price price-style small">{{ parseFloat(goodsDetail.price).toFixed(2).split('.')[0] }}</text>
+								<text class="price-symbol price-style small">.{{ parseFloat(goodsDetail.price).toFixed(2).split('.')[1] }}</text>
+							</text>
+						</view>
+						<view>
+							最低可砍至：
+							<text class="bottom_price price-style small">{{ $lang('common.currencySymbol') }}{{ goodsDetail.floor_price }}</text>
+						</view>
+					</view>
+				</view>
+			</view>
+			<!-- 进度 -->
+			<view class="progress">
+				<view class="progress_item" :style="{ width: (progress > 2 ? progress : 2) + '%' }"><text class="icon-futou iconfont"></text></view>
+				<view class="progress-point"></view>
+			</view>
+
+			<view class="info-bottom" v-if="goodsDetail">
+				<view class="price-box" v-if="launchInfo">
+					<view class="discount-price">
+						已砍
+						<text class="price price-font">
+							{{ $lang('common.currencySymbol') }}{{ parseFloat(parseFloat(launchInfo.price) - parseFloat(launchInfo.curr_price)).toFixed(2) }}
+						</text>
+						，
+					</view>
+					<view class="delete-price ">
+						还剩
+						<text class="price price-font">
+							{{ $lang('common.currencySymbol')
+							}}{{
+								parseFloat(
+									parseFloat(launchInfo.price) - parseFloat(launchInfo.floor_price) - (parseFloat(launchInfo.price) - parseFloat(launchInfo.curr_price))
+								).toFixed(2)
+							}}
+						</text>
+					</view>
+				</view>
+				<view class="price-box" v-else>
+					<view class="discount-price">
+						已砍
+						<text class="price price-font">{{ $lang('common.currencySymbol') }}0</text>
+						，
+					</view>
+					<view class="delete-price ">
+						还剩
+						<text class="price price-font">
+							{{ $lang('common.currencySymbol') }} {{ parseFloat(parseFloat(goodsDetail.price) - parseFloat(goodsDetail.floor_price)).toFixed(2) }}
+						</text>
+					</view>
+				</view>
+
+				<view class="pro-info" v-if="!parseFloat(goodsDetail.floor_price)"><view class="button-border">免费拿</view></view>
+			</view>
+
+			<!-- 邀请新用户 -->
+			<view class="invitation_peo" v-if="launchInfo">
+				<!-- <view class="tip">邀请新用户砍掉金额更多哦~</view> -->
+				<block v-if="launchInfo.self">
+					<view class="bargain-success" v-if="launchInfo.status == 1">
+						<text class="iconfont icon-kanjiachenggong"></text>
+						<text>恭喜您砍价成功，快去支付吧</text>
+					</view>
+					<view class="bargain-success" v-if="launchInfo.status == 2">
+						<text class="iconfont icon-biaoqing_nanguo"></text>
+						<text v-if="launchInfo.buy_type == 0 && launchInfo.order_id == 0">很遗憾未能砍至最低价，可立即支付带走您心仪的宝贝</text>
+						<text v-else-if="launchInfo.buy_type == 0 && launchInfo.order_id > 0">很遗憾未能砍至最低价</text>
+						<text v-else>很遗憾砍价未成单</text>
+					</view>
+					<view class="launch-success" v-if="launchInfo.status == 2 && launchInfo.buy_type == 0 && launchInfo.order_id > 0">恭喜您通过立即支付带走您心仪的宝贝</view>
+				</block>
+				<block v-if="goodsDetail.bargain_status == 1">
+					<view v-if="launchInfo.self" class="flex-box" :class="{ success: launchInfo.status == 1 }">
+						<block v-if="launchInfo.status != 1 && (goodsDetail.bargain_status != 1 || goodsDetail.bargain_stock == 0)">
+							<block v-if="goodsDetail.bargain_status != 1">
+								<button class="btn-vice disabled">活动已结束</button>
+								<button class="btn" @click="$util.redirectTo('/pages_promotion/bargain/list')">更多砍价商品</button>
+							</block>
+							<block v-else-if="goodsDetail.bargain_stock == 0">
+								<button class="btn-vice disabled">已售罄</button>
+								<button class="btn" @click="$util.redirectTo('/pages_promotion/bargain/list')">更多砍价商品</button>
+							</block>
+						</block>
+						<block v-else>
+							<block v-if="launchInfo.status == 0">
+								<button class="btn-vice" v-if="launchInfo.buy_type == 0" @click="buyNow">不砍了，直接买</button>
+								<button class="btn" @click="openSharePopup">喊好友砍一刀</button>
+							</block>
+							<block v-if="launchInfo.status == 1">
+								<button class="btn" @click="buyNow" v-if="launchInfo.order_id == 0">立即支付</button>
+								<button class="btn" v-if="launchInfo.order_id > 0" @click="$util.redirectTo('/pages/order/detail', { order_id: launchInfo.order_id })">
+									查看订单
+								</button>
+								<button class="btn-vice" @click="$util.redirectTo('/pages/index/index')">低价拿更多商品</button>
+							</block>
+							<block v-if="launchInfo.status == 2">
+								<button class="btn" v-if="launchInfo.order_id > 0" @click="$util.redirectTo('/pages/order/detail', { order_id: launchInfo.order_id })">
+									查看订单
+								</button>
+								<button class="btn" @click="$util.redirectTo('/pages/index/index')">低价拿更多商品</button>
+							</block>
+						</block>
+					</view>
+					<view v-else class="flex-box">
+						<block v-if="launchInfo.status == 0">
+							<button class="btn" @click="bargain" v-if="!launchInfo.cut">帮好友砍一刀</button>
+							<button class="btn-vice" @click="$util.redirectTo('/pages_promotion/bargain/list')" v-else>我也要低价拿</button>
+						</block>
+						<button v-else class="btn" @click="$util.redirectTo('/pages_promotion/bargain/list')">我也要低价拿</button>
+					</view>
+				</block>
+				<block v-else>
+					<view class="flex-box success">
+						<button class="btn" v-if="launchInfo.self && launchInfo.order_id > 0" @click="$util.redirectTo('/pages/order/detail', { order_id: launchInfo.order_id })">
+							查看订单
+						</button>
+						<button class="btn-vice disabled">活动已结束</button>
+					</view>
+				</block>
+			</view>
+			<view class="invitation_peo" v-else>
+				<view class="flex-box">
+					<button class="btn" v-if="goodsDetail && goodsDetail.bargain_status == 1" @click="createBargain()">立即参与砍价</button>
+					<button class="btn-vice disabled" v-else>活动已结束</button>
+				</view>
+			</view>
+		</view>
+
+		<view class="bargin_introduction" v-if="launchInfo">
+			<view class="bargin_introduction_title">帮砍记录</view>
+			<view class="bargin_introduction_content">
+				<view class="bargin_invitation" v-if="bargainRecord.length">
+					<view class="item" v-for="(item, index) in bargainRecord" :key="index">
+						<view class="item_left">
+							<image :src="item.headimg == '' ? $util.img($util.getDefaultImage().head) : $util.img(item.headimg)"></image>
+							<view class="bargin_info">
+								<view>{{ item.nickname[0] }}*{{ item.nickname[item.nickname.length - 1] }}</view>
+								<view>{{ $util.timeStampTurnTime(item.bargain_time) }}</view>
+							</view>
+						</view>
+						<view class="item_right">
+							<image :src="$util.img('public/uniapp/bargain/bargain-icon.png')" class="bargain-icon"></image>
+							帮砍
+							<text>￥{{ item.money }}</text>
+						</view>
+					</view>
+					<view class="item_more" v-if="showMore" @click="scrolltolower()">加载更多</view>
+				</view>
+				<view v-else class="record-empty">现在还没有砍价记录！</view>
+			</view>
+		</view>
+
+		<view class="bargin_introduction">
+			<view class="bargin_introduction_title">砍价流程</view>
+			<view class="bargin_introduction_content">
+				<view class="flow">
+					<view class="flow_item">
+						<image :src="$util.img('public/uniapp/bargain/bargain_kanjia.png')"></image>
+						<view>发起商品砍价</view>
+					</view>
+					<view class="flow_item">
+						<image :src="$util.img('public/uniapp/bargain/bargain_friend.png')"></image>
+						<view>邀请好友砍价达要求</view>
+					</view>
+					<view class="flow_item">
+						<image :src="$util.img('public/uniapp/bargain/bargain_good.png')"></image>
+						<view>领取商品带回家</view>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<view class="bargin_introduction" v-if="launchList && launchList.length > 0">
+			<view class="bargin_introduction_title">砍成晒单</view>
+			<view class="bargin_introduction_content">
+				<view class="bargain-list">
+					<swiper vertical="true" autoplay="true" interval="3000" :display-multiple-items="showNum" :circular="true" :class="'swiper-' + launchList.length">
+						<swiper-item v-for="(item, index) in launchList" :key="index">
+							<view class="bargain-item">
+								<view>
+									<view class="bargain-head"><image :src="item.headimg == '' ? $util.img($util.getDefaultImage().head) : $util.img(item.headimg)"></image></view>
+									<view class="bargain-info">
+										<view class="bargain-title">{{ item.nickname[0] }}*{{ item.nickname[item.nickname.length - 1] }}</view>
+										<view class="bargain-desc">{{ $util.timeStampTurnTime(item.end_time) }}</view>
+									</view>
+								</view>
+								<view class="bargain-price">
+									成功砍至
+									<text>{{ parseFloat(item.curr_price).toFixed(2) }}元</text>
+								</view>
+							</view>
+						</swiper-item>
+					</swiper>
+				</view>
+			</view>
+		</view>
+		<view class="bargin_introduction">
+			<view class="bargin_introduction_title">商品详情</view>
+			<view class="bargin_introduction_content">
+				<view class="detail-content">
+					<view class="goods-details" v-if="goodsDetail && goodsDetail.goods_content">
+						<ns-mp-html :content="goodsDetail.goods_content"></ns-mp-html>
+					</view>
+					<view class="goods-details active" v-else>该商家暂无上传相关详情哦！</view>
+				</view>
+			</view>
+		</view>
+
+		<ns-goods-sku
+			ref="goodsSku"
+			v-if="goodsDetail"
+			@refresh="refreshGoodsSkuDetail"
+			:goods-id="goodsDetail.goods_id"
+			:goods-detail="goodsDetail"
+			:maxBuy="maxBuy"
+		></ns-goods-sku>
+
+		<!-- 帮砍弹出 -->
+		<uni-popup ref="uniHelpPopup" type="center" :maskClick="false">
+			<view class="bargain-popup self help">
+				<image :src="$util.img('public/uniapp/bargain/bargain-pop-1.png')" mode="widthFix" class="head"></image>
+				<view class="bargain-content">
+					<view class="uer_info_base" v-if="launchInfo">
+						<view class="user_info_img">
+							<image :src="launchInfo.headimg == '' ? $util.img($util.getDefaultImage().head) : $util.img(launchInfo.headimg)" mode="widthFix"></image>
+						</view>
+						<text class="user_info_name">{{ launchInfo.nickname }}</text>
+					</view>
+					<view v-if="goodsDetail && launchInfo && timeMachine && goodsDetail.bargain_status == 1" class="count-down">
+						<text>还剩</text>
+						<uni-count-down
+							:day="timeMachine.d"
+							:hour="timeMachine.h"
+							:minute="timeMachine.i"
+							:second="timeMachine.s"
+							color="#fff"
+							splitorColor="#333 !important"
+							backgroundColor="#000"
+							border-color="transparent"
+							@timeup="timeUp()"
+						></uni-count-down>
+						<text>结束</text>
+					</view>
+				</view>
+				<button class="bargain-btn" type="primary" @click="bargain()">帮他砍价</button>
+			</view>
+			<text class="iconfont icon-round-close" @click="$refs.uniHelpPopup.close()"></text>
+		</uni-popup>
+
+		<!-- 帮砍成功 -->
+		<uni-popup ref="uniPopup" type="center" :maskClick="false">
+			<view class="bargain-popup self">
+				<image :src="$util.img('public/uniapp/bargain/bargain-pop-2.png')" mode="widthFix" class="head"></image>
+				<view class="bargain-content">
+					<text>您已帮砍</text>
+					<text class="money color-base-text">{{ bargainMoney }}</text>
+					<text>元，您也可以参与砍价，快去挑选心仪的宝贝吧~~~</text>
+				</view>
+				<button class="bargain-btn" type="primary" @click="$util.redirectTo('/pages_promotion/bargain/list')">我也要参与</button>
+			</view>
+			<text class="iconfont icon-round-close" @click="closePopup"></text>
+		</uni-popup>
+
+		<!-- 自砍一刀展示 -->
+		<uni-popup ref="uniSelfBargainPopup" type="center" :maskClick="false">
+			<view class="bargain-popup self">
+				<image :src="$util.img('public/uniapp/bargain/bargain-pop-2.png')" mode="widthFix" class="head"></image>
+				<view class="bargain-content">
+					<text>您已砍掉</text>
+					<text class="money color-base-text">{{ my_bargain_money }}</text>
+					<text>元，听说分享次数越多砍价成功的机会越大哦！</text>
+				</view>
+				<button class="bargain-btn" type="primary" @click="openSharePopup">邀请好友帮砍价</button>
+			</view>
+			<text class="iconfont icon-round-close" @click="closeSelfPop"></text>
+		</uni-popup>
+
+		<!-- 分享弹窗 -->
+		<view @touchmove.prevent.stop>
+			<uni-popup ref="sharePopup" type="bottom" class="share-popup">
+				<view>
+					<view class="share-title">分享</view>
+					<view class="share-content">
+						<!-- #ifdef MP -->
+						<view class="share-box">
+							<button class="share-btn" :plain="true" open-type="share">
+								<view class="iconfont icon-share-friend"></view>
+								<text>分享给好友</text>
+							</button>
+						</view>
+						<!-- #endif -->
+						<!-- #ifdef H5 -->
+						<view class="share-box" @click="copyUrl">
+							<button class="share-btn" :plain="true">
+								<view class="iconfont icon-fuzhilianjie"></view>
+								<text>复制链接</text>
+							</button>
+						</view>
+						<!-- #endif -->
+						<view class="share-box" @click="openPosterPopup">
+							<button class="share-btn" :plain="true">
+								<view class="iconfont icon-pengyouquan"></view>
+								<text>生成分享海报</text>
+							</button>
+						</view>
+					</view>
+					<view class="share-footer" @click="closeSharePopup"><text>取消分享</text></view>
+				</view>
+			</uni-popup>
+		</view>
+
+		<!-- 海报 -->
+		<view @touchmove.prevent.stop class="poster-layer">
+			<uni-popup ref="posterPopup" type="center">
+                <template v-if="poster != '-1'">
+                    <view class="poster-wrap">
+                        <view class="image-wrap">
+                            <image :src="$util.img(poster)" :show-menu-by-longpress="true" mode="widthFix" />
+                            <view class="close iconfont icon-close" @click="closePosterPopup()"></view>
+                        </view>
+                        <!-- #ifdef MP || APP-PLUS  -->
+                        <view class="save-btn" @click="saveGoodsPoster()">保存图片</view>
+                        <!-- #endif -->
+                        <!-- #ifdef H5 -->
+                        <view class="save-btn">长按图片进行保存</view>
+                        <!-- #endif -->
+                    </view>
+                </template>
+			</uni-popup>
+		</view>
+
+		<!-- 悬浮按钮 -->
+		<hover-nav :need="true"></hover-nav>
+
+		<!-- 活动规则 -->
+		<uni-popup ref="rulePopup" type="center" :maskClick="false">
+			<view class="rule-wrap">
+				<view class="content-wrap">
+					<image :src="$util.img('public/uniapp/common/promotion_rule_head.png')" mode="widthFix" class="rule-head"></image>
+					<scroll-view scroll-y="true" class="rule">
+						<view class="text" v-if="goodsDetail && goodsDetail.remark != ''">{{ goodsDetail.remark }}</view>
+					</scroll-view>
+					<text class="iconfont icon-round-close" @click="closeRulePopup"></text>
+				</view>
+			</view>
+		</uni-popup>
+
+		<loading-cover ref="loadingCover"></loading-cover>
+
+		<ns-login ref="login"></ns-login>
+
+		<!-- #ifdef MP-WEIXIN -->
+		<!-- 小程序隐私协议 -->
+		<privacy-popup ref="privacyPopup"></privacy-popup>
+		<!-- #endif -->
+	</view>
+</template>
+
+<script>
+import LTime from '@/pages_promotion/components/l-time/l-time.vue';
+import uniPopup from '@/components/uni-popup/uni-popup.vue';
+import goodsSku from '@/components/ns-goods-sku/ns-goods-sku.vue';
+import detail from './public/js/detail.js';
+
+export default {
+	components: {
+		LTime,
+		goodsSku,
+		uniPopup
+	},
+	mixins: [detail]
+};
+</script>
+
+<style lang="scss">
+@import './public/css/detail.scss';
+</style>
+<style scoped>
+/deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+	max-height: unset !important;
+}
+/deep/.uni-popup__wrapper.uni-custom.center .uni-popup__wrapper-box {
+	overflow-y: unset;
+	background: none !important;
+}
+.detail-content >>> img {
+	max-width: 100% !important;
+}
+.detail-content >>> image {
+	max-width: 100% !important;
+}
+/deep/.uni-countdown__number {
+	padding: 0 4rpx;
+	line-height: 36rpx;
+	height: 36rpx;
+}
+
+/deep/ .uni-countdown__splitor.day {
+	line-height: 36rpx;
+}
+</style>
diff --git a/pages_promotion/bargain/list.vue b/pages_promotion/bargain/list.vue
new file mode 100644
index 0000000..aec1266
--- /dev/null
+++ b/pages_promotion/bargain/list.vue
@@ -0,0 +1,357 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view class="page" :style="{ background: bgColor }">
+		<mescroll-uni @getData="getData" ref="mescroll" :size="10" v-if="addonIsExist.bargain">
+			<block slot="list">
+				<ns-adv keyword="NS_BARGAIN" class-name="adv-wrap"></ns-adv>
+				<block v-if="dataList.length > 0 || dataListing.length > 0">
+					<view class="goods-list single-column" v-if="dataListing.length">
+						<view class="goods-item margin-bottom" v-for="(item, index) in dataListing" :key="index">
+							<view class="goods-item-content">
+								<view class="goods-img" @click="toDetailP(item)">
+									<image :src="goodsImg(item.goods_image)" mode="widthFix" @error="imgError(index)"/>
+									<view class="color-base-bg goods-tag" v-if="goodsTag(item) != ''">{{ goodsTag(item) }}</view>
+								</view>
+
+								<view class="info-wrap">
+									<view class="name-wrap">
+										<view class="goods-name" @click="toDetailP(item)">{{ item.goods_name }}</view>
+										<text class="info-sub-title">已有{{ item.join_num }}人参与</text>
+										<view class="progress-wrap">
+											<progress percent="20" :show-info="false" stroke-width="8"
+												backgroundColor="#FFF4F4" :activeColor="themeStyle.main_color"
+												border-radius="6" :percent="progressP(item)" />
+											<view class="progress-point"></view>
+											<view class="progress-select icon"
+												:style="{ left: 'calc(' + progressP(item) + '% - 16rpx)' }">
+												<text class="iconfont icon-futou"></text>
+											</view>
+										</view>
+									</view>
+
+									<view class="info-bottom">
+										<view class="price-box">
+											<view class="discount-price">已砍<text class="price price-font">{{ (item.price - item.curr_price).toFixed(2) }}</text>，</view>
+											<view class="delete-price ">还剩<text class="price price-font">{{ $lang('common.currencySymbol') }}{{ (item.curr_price - item.floor_price).toFixed(2) }}</text></view>
+										</view>
+
+										<view class="pro-info">
+											<view class="button-border">免费拿</view>
+										</view>
+									</view>
+								</view>
+							</view>
+							<view class="goods-item-bottom">
+								<view class="item-bottom-left">
+									<uni-count-down :day="item.time.d" :hour="item.time.h" :minute="item.time.i" :second="item.time.s" color="#fff" borderColor="none" splitorColor="#303133" backgroundColor="#303133" />
+									<view class="color-sub txt">后结束</view>
+								</view>
+								<view class="item-bottom-right">
+									<button type="primary" @click="toDetailP(item)" size="mini" class="mini">继续砍价</button>
+								</view>
+							</view>
+						</view>
+					</view>
+					<view class="goods-list single-column" v-if="dataList.length">
+						<view class="goods-item margin-bottom" v-for="(item, index) in dataList" :key="index">
+							<view class="goods-item-content">
+								<view class="goods-img" @click="toDetail(item)">
+									<image :src="goodsImg(item.goods_image)" mode="widthFix" @error="imgError(index)"/>
+									<view class="color-base-bg goods-tag" v-if="goodsTag(item) != ''">{{ goodsTag(item) }}</view>
+								</view>
+								<view class="info-wrap">
+									<view class="name-wrap">
+										<view class="goods-name" @click="toDetail(item)">{{ item.sku_name }}</view>
+										<text class="info-sub-title">已有{{ item.join_num }}人参与</text>
+										<view class="progress-wrap"><progress percent="20" :show-info="false" stroke-width="8" backgroundColor="#FFF4F4" :activeColor="themeStyle.main_color" border-radius="6" :percent="progress(item)" />
+											<view class="progress-point"></view>
+											<view class="progress-select icon" :style="{ left: 'calc(' + progress(item) + '% - 8rpx)' }">
+												<text class="iconfont icon-futou"></text>
+											</view>
+										</view>
+									</view>
+									<view class="info-bottom">
+										<view class="sale-box price-font">已砍{{ item.sale_num }}件</view>
+
+										<view class="pro-info">
+											<view class="button-border">免费拿</view>
+										</view>
+									</view>
+								</view>
+							</view>
+							<view class="goods-item-bottom">
+								<view class="item-bottom-left">
+									<view class="txt">底价：</view>
+									<text class="unit price-style small">{{ $lang('common.currencySymbol') }}</text>
+									<text class="price price-style large">{{ parseFloat(item.floor_price).toFixed(2).split('.')[0] }}</text>
+									<text class="unit price-style large">.{{ parseFloat(item.floor_price).toFixed(2).split('.')[1] }}</text>
+									<view class="delete-pirce">{{ $lang('common.currencySymbol') }}{{ item.price }}</view>
+								</view>
+								<view class="item-bottom-right">
+									<button type="primary" @click="toDetail(item)" size="mini" class="mini">去砍价</button>
+								</view>
+							</view>
+						</view>
+					</view>
+				</block>
+				<ns-empty v-else-if="isLoad && isLoading" textColor="#fff" :isIndex="false" text="暂无砍价商品"></ns-empty>
+			</block>
+		</mescroll-uni>
+		<!-- 悬浮按钮 -->
+		<hover-nav></hover-nav>
+		<loading-cover ref="loadingCover"></loading-cover>
+
+		<!-- #ifdef MP-WEIXIN -->
+		<!-- 小程序隐私协议 -->
+		<privacy-popup ref="privacyPopup"></privacy-popup>
+		<!-- #endif -->
+	</view>
+</template>
+
+<script>
+	import uniCountDown from '@/components/uni-count-down/uni-count-down.vue';
+	export default {
+		components: {
+			uniCountDown
+		},
+		data() {
+			return {
+				dataList: [],
+				dataListing: [],
+				isLoading: false,
+				isLoad: false,
+				skuId: 0,
+				mpShareData: null, //小程序分享数据
+				progressBorder: '10',
+				bgColor: ''
+			};
+		},
+		onLoad(option) {
+			//小程序分享接收source_member
+			if (option.source_member) {
+				uni.setStorageSync('source_member', option.source_member);
+			}
+			// 小程序扫码进入，接收source_member
+			if (option.scene) {
+				var sceneParams = decodeURIComponent(option.scene);
+				sceneParams = sceneParams.split('&');
+				if (sceneParams.length) {
+					sceneParams.forEach(item => {
+						if (item.indexOf('sku_id') != -1) this.skuId = item.split('-')[1];
+						if (item.indexOf('m') != -1) uni.setStorageSync('source_member', item.split('-')[1]);
+						if (item.indexOf('is_test') != -1) uni.setStorageSync('is_test', 1);
+					});
+				}
+			}
+		},
+		async onShow() {
+			setTimeout( () => {
+				if (!this.addonIsExist.bargain) {
+					this.$util.showToast({
+						title: '商家未开启砍价',
+						mask: true,
+						duration: 2000
+					});
+					setTimeout(() => {
+						this.$util.redirectTo('/pages/index/index');
+					}, 2000);
+				}
+			},1000);
+
+			//记录分享关系
+			if (this.storeToken && uni.getStorageSync('source_member')) {
+				this.$util.onSourceMember(uni.getStorageSync('source_member'));
+			}
+
+			//小程序分享
+			// #ifdef MP-WEIXIN
+			this.$util.getMpShare().then(res => {
+				this.mpShareData = res;
+			});
+			// #endif
+
+			await this.getZoneConfig();
+
+			if (this.$refs.mescroll) this.$refs.mescroll.refresh();
+			this.getDataing();
+		},
+		//分享给好友
+		onShareAppMessage() {
+			return this.mpShareData.appMessage;
+		},
+		//分享到朋友圈
+		onShareTimeline() {
+			return this.mpShareData.timeLine;
+		},
+		methods: {
+			// 活动页面配置
+			async getZoneConfig() {
+				let res = await this.$api.sendRequest({
+					url: '/api/config/promotionZoneConfig',
+					data: {
+						name: 'bargain'
+					},
+					async: false
+				});
+				let data = res.data;
+				if (data) {
+					this.bgColor = data.bg_color;
+				}
+			},
+			getData(mescroll) {
+				this.$api.sendRequest({
+					url: '/bargain/api/goods/page',
+					data: {
+						page_size: mescroll.size,
+						page: mescroll.num,
+						is_exclude_bargaining: 1
+					},
+					success: res => {
+						let newArr = [];
+						let msg = res.message;
+
+						if (res.code == 0 && res.data) {
+							newArr = res.data.list;
+						} else {
+							this.$util.showToast({
+								title: msg
+							});
+						}
+
+						if (mescroll.endSuccess) mescroll.endSuccess(newArr.length);
+
+						//设置列表数据
+						if (mescroll.num == 1) this.dataList = []; //如果是第一页需手动制空列表
+						this.dataList = this.dataList.concat(newArr); //追加新数据
+
+						this.isLoad = true;
+						this.$forceUpdate();
+						setTimeout(() => {
+							if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+						}, 300);
+					},
+					fail() {
+						//联网失败的回调
+						if (mescroll.endErr) mescroll.endErr();
+						setTimeout(() => {
+							if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+						}, 300);
+					}
+				});
+			},
+			getDataing() {
+				this.$api.sendRequest({
+					url: '/bargain/api/goods/bargainingList',
+					data: {},
+					success: res => {
+						this.dataListing = res.data;
+						for (var index in res.data) {
+							this.dataListing[index].time = this.$util.countDown(res.data[index].end_time - res.timestamp);
+						}
+						this.isLoading = true;
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					},
+					fail() {
+						//联网失败的回调
+						mescroll.endErr();
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					}
+				});
+			},
+			toDetail(e) {
+				this.$util.redirectTo('/pages_promotion/bargain/detail', {
+					b_id: e.bargain_id
+				});
+			},
+			toDetailP(e) {
+				this.$util.redirectTo('/pages_promotion/bargain/detail', {
+					b_id: e.bargain_id,
+					l_id: e.launch_id
+				});
+			},
+			imgError(index) {
+				this.dataList[index].goods_image = this.$util.getDefaultImage().goods;
+				this.$forceUpdate();
+			},
+			goodsImg(imgStr) {
+				let imgs = imgStr.split(',');
+				return imgs[0] ? this.$util.img(imgs[0], {
+						size: 'mid'
+					}) : this.$util.getDefaultImage().goods;
+			},
+			progress(data) {
+				let progress = ((parseInt(data.sale_num) / (parseInt(data.bargain_stock) + parseInt(data.sale_num))) * 100).toFixed();
+				if (progress == 'NaN') {
+					progress = 0;
+				}
+				return progress;
+			},
+			progressP(data) {
+				let progress = (((parseFloat(data.price) - parseFloat(data.curr_price)) / parseFloat(data.price)) * 100).toFixed();
+				if (progress == 'NaN') {
+					progress = 0;
+				}
+				return progress;
+			},
+			goodsTag(data) {
+				return data.label_name || '';
+			}
+		},
+		onHide() {
+			if (this.$refs.loadingCover) this.$refs.loadingCover.show();
+		}
+	};
+</script>
+<style lang="scss">
+	@import './public/css/list.scss';
+</style>
+<style lang="scss" scoped>
+	/deep/ .fixed {
+		position: relative;
+		top: 0;
+	}
+
+	/deep/ .empty {
+		margin-top: 0 !important;
+	}
+
+	.clockrun {
+		.delete-price {
+			max-width: 60%;
+		}
+	}
+
+	/deep/ .uni-countdown__number {
+		min-width: 32rpx;
+		height: 32rpx;
+		text-align: center;
+		line-height: 32rpx;
+		border-radius: 4px;
+		display: inline-block;
+		padding: 4rpx;
+		margin: 0;
+		border: none !important;
+	}
+
+	/deep/ .uni-countdown__splitor {
+		width: 10rpx;
+		height: 32rpx;
+		line-height: 36rpx;
+		text-align: center;
+		display: inline-block;
+	}
+
+	/deep/ .uni-countdown__splitor.day {
+		width: initial;
+	}
+</style>
+<style>
+	.progress-wrap>>>.uni-progress .uni-progress-bar {
+		border-radius: 16rpx;
+		overflow: hidden;
+	}
+
+	.progress-wrap>>>.uni-progress-bar .uni-progress-inner-bar {
+		background: linear-gradient(to left, var(--bargain-promotion-color), var(--bargain-promotion-aux-color)) !important;
+	}
+</style>
\ No newline at end of file
diff --git a/pages_promotion/bargain/my_bargain.vue b/pages_promotion/bargain/my_bargain.vue
new file mode 100644
index 0000000..a409ef4
--- /dev/null
+++ b/pages_promotion/bargain/my_bargain.vue
@@ -0,0 +1,432 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view>
+		<view class="my_spell_category" v-if="storeToken">
+			<view class="category-item" v-for="(item, index) in statusList" :key="index" @click="categoryChange(item.id)">
+				<view class="item-con" :class="item.id == status ? 'active color-base-text color-base-bg-before' : ''">{{ item.name }}</view>
+			</view>
+		</view>
+		<mescroll-uni @getData="getData" top="90" ref="mescroll" :size="10" v-if="storeToken">
+			<block slot="list">
+				<view class="goods-list" v-for="(item, index) in dataList" :key="index">
+					<view class="goods-item-content" @click="goBargainDetail(item)">
+						<view class="goods-item-state">
+							<text class="state-time">发起砍价 {{ $util.timeStampTurnTime(item.start_time) }}</text>
+							<text class="state-sign" :style="{ color: bargainState[item.status].color }">{{ bargainState[item.status].text }}</text>
+						</view>
+						<view class="goods-item-wrap">
+							<view class="image-wrap">
+								<image :src="$util.img(item.sku_image,{'size':'mid'})" mode="aspectFit" @error="imageError(index)"></image>
+							</view>
+							<view class="content">
+								<view class="title">{{ item.sku_name }}</view>
+								<text class="residue-price color-base-text">已砍至{{ item.curr_price }}元</text>
+								<view class="price-box">
+									<text class="original-price" v-if="item.status">{{ $lang('common.currencySymbol') }}{{ item.price }}</text>
+									<view class="time" v-if="item.timeMachine && item.status == 0">
+										<uni-count-down :day="item.timeMachine.d" :hour="item.timeMachine.h"
+											:minute="item.timeMachine.i" :second="item.timeMachine.s" color="#fff"
+											splitorColor="#000 !important" backgroundColorClass="color-base-bg"
+											border-color="transparent" />
+										<text class="end-txt">后结束</text>
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+
+					<view class="goods-item-action">
+						<view class="invitation-bargain">
+							<image :src="recordItem.headimg == '' ? $util.img($util.getDefaultImage().head) : $util.img(recordItem.headimg)" v-for="(recordItem, recordIndex) in item.bargain_record" :key="recordIndex" @error="memberImageError(index, recordIndex)"/>
+							<text class="invitation-bargain-end color-base-text color-base-border" v-if="item.status == 0">+</text>
+							<text class="invitation-bargain-end color-base-text color-base-border " v-else>
+								<text class="icon-ellipsis iconfont"></text>
+							</text>
+						</view>
+						<button class="btn" type="default" v-if="item.status == 0 && item.bargain_status == 1" @click="goBargainDetail(item)">继续砍价</button>
+						<block v-if="item.status == 1 && item.bargain_status == 1">
+							<button class="btn" type="default" v-if="item.order_id == 0" @click="goBargainDetail(item)">购买商品</button>
+							<button class="btn" type="default" v-else @click="goBargainDetail(item)">查看详情</button>
+						</block>
+						<button class="btn" type="default" v-if="item.status == 2 && item.bargain_status == 1" @click="$util.redirectTo('/pages_promotion/bargain/list')">重新砍价</button>
+					</view>
+				</view>
+				<ns-empty v-if="dataList.length == 0" :isIndex="true" :emptyBtn="{url: '/pages_promotion/bargain/list',text: '去逛逛'}" text="暂无砍价订单"></ns-empty>
+			</block>
+		</mescroll-uni>
+
+		<ns-login ref="login"></ns-login>
+		<loading-cover ref="loadingCover"></loading-cover>
+	</view>
+</template>
+
+<script>
+	import uniCountDown from '@/components/uni-count-down/uni-count-down.vue';
+	export default {
+		components: {
+			uniCountDown
+		},
+		data() {
+			return {
+				mescroll: null,
+				dataList: [],
+				statusList: [{
+						id: 'all',
+						name: '全部'
+					},
+					{
+						id: 0,
+						name: '正在砍价'
+					},
+					{
+						id: 1,
+						name: '砍价成功'
+					},
+					{
+						id: 2,
+						name: '砍价失败'
+					}
+				],
+				status: 'all',
+				bargainState: [{
+						color: '#FFA044',
+						text: '正在砍价'
+					},
+					{
+						color: '#11BD64',
+						text: '砍价成功'
+					},
+					{
+						color: '#FF4544',
+						text: '砍价失败'
+					}
+				],
+			};
+		},
+		onShow() {
+			setTimeout( () => {
+				if (!this.addonIsExist.bargain) {
+					this.$util.showToast({
+						title: '商家未开启砍价',
+						mask: true,
+						duration: 2000
+					});
+					setTimeout(() => {
+						this.$util.redirectTo('/pages/index/index');
+					}, 2000);
+				}
+			},1000);
+
+			if (!this.storeToken) {
+				this.$nextTick(() => {
+					this.$refs.login.open('/pages_promotion/bargain/my_bargain');
+				});
+			}
+		},
+		methods: {
+			//请求列表数据
+			getData(mescroll) {
+				this.mescroll = mescroll;
+				this.$api.sendRequest({
+					url: '/bargain/api/bargain/launchPage',
+					data: {
+						page_size: mescroll.size,
+						page: mescroll.num,
+						status: this.status
+					},
+					success: res => {
+						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.dataList = []; //如果是第一页需手动制空列表
+						newArr.forEach(v => {
+							if (v.end_time > res.timestamp) {
+								v.timeMachine = this.$util.countDown(v.end_time - res.timestamp);
+							} else {
+								v.timeMachine = null;
+							}
+						});
+						this.dataList = this.dataList.concat(newArr); //追加新数据
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					},
+					fail() {
+						//联网失败的回调
+						mescroll.endErr();
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					}
+				});
+			},
+			//砍价详情
+			goBargainDetail(data) {
+				this.$util.redirectTo('/pages_promotion/bargain/detail', {
+					l_id: data.launch_id,
+					b_id: data.bargain_id
+				});
+			},
+			//切换分类
+			categoryChange(e) {
+				this.status = e;
+				this.mescroll.resetUpScroll();
+			},
+			imageError(index) {
+				this.dataList[index].sku_image = this.$util.getDefaultImage().goods;
+				this.$forceUpdate();
+			},
+			memberImageError(index, j) {
+				this.dataList[index].bargain_record[j].headimg = this.$util.getDefaultImage().head;
+				this.$forceUpdate();
+			}
+		},
+		onBackPress(options) {
+			if (options.from === 'navigateBack') {
+				return false;
+			}
+			this.$util.redirectTo('/pages/member/index');
+			return true;
+		},
+		watch: {
+			storeToken: function(nVal, oVal) {
+				if (nVal) {
+					this.$refs.mescroll.refresh();
+				}
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	.my_spell_category {
+		width: 100%;
+		height: 88rpx;
+		display: flex;
+		justify-content: space-around;
+		background: #fff;
+		position: fixed;
+		top: 0;
+		z-index: 999;
+		box-sizing: border-box;
+
+		.category-item {
+			width: 130rpx;
+			text-align: center;
+
+			.item-con {
+				display: inline-block;
+				height: 88rpx;
+				font-size: 30rpx;
+				position: relative;
+				line-height: 88rpx;
+			}
+
+			.item-con.active:after {
+				content: '';
+				display: block;
+				width: 100%;
+				height: 4rpx;
+				border-radius: 6rpx;
+				position: absolute;
+				left: 0;
+				bottom: 0;
+			}
+
+			&:last-of-type {
+				margin-right: 0;
+			}
+		}
+	}
+
+	.goods-list {
+		margin: 20rpx 30rpx 20rpx;
+		background-color: #fff;
+		border-radius: 10rpx;
+		height: 358rpx;
+		padding: 30rpx;
+	}
+
+	.goods-list .goods-item-content {
+		background-color: #fff;
+		border-radius: 10rpx;
+		box-sizing: border-box;
+
+		.goods-item-state {
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+
+			.state-time {
+				font-size: $font-size-base;
+				color: $color-title;
+			}
+
+			.state-sign {
+				font-size: $font-size-tag;
+			}
+		}
+
+		.goods-item-wrap {
+			display: flex;
+			margin-top: 42rpx;
+		}
+
+		.image-wrap {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			width: 170rpx;
+			height: 170rpx;
+			margin-right: 18rpx;
+			border-radius: 10rpx;
+			overflow: hidden;
+
+			image {
+				width: 170rpx;
+				height: 170rpx;
+			}
+		}
+
+		.content {
+			flex: 1;
+			position: relative;
+			line-height: 1;
+			width: calc(100% - 220rpx);
+
+			.title {
+				margin-top: -8rpx;
+				height: 84rpx;
+				font-size: $font-size-base;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				display: -webkit-box;
+				-webkit-line-clamp: 2;
+				-webkit-box-orient: vertical;
+				line-height: 42rpx;
+				color: $color-title;
+			}
+
+			.residue-price {
+				display: inline-block;
+				margin-top: 16rpx;
+				font-size: $font-size-sub;
+				padding: 2rpx 4rpx;
+			}
+
+			.price-box {
+				position: absolute;
+				bottom: 0;
+				line-height: 1.6;
+				font-size: $font-size-tag;
+				width: 100%;
+
+				.original-price {
+					color: $color-tip;
+					font-size: $font-size-tag;
+					text-decoration: line-through;
+				}
+
+				.time {
+					display: flex;
+					align-items: center;
+					margin-bottom: -12rpx;
+					font-size: $font-size-goods-tag;
+
+					.uni-countdown {
+						display: flex;
+						align-items: center;
+					}
+
+					.end-txt {
+						font-size: $font-size-base;
+						margin-left: 10rpx;
+					}
+				}
+			}
+		}
+	}
+
+	.goods-list .goods-item-action {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		height: 120rpx;
+		box-sizing: border-box;
+
+		.invitation-bargain {
+			display: flex;
+			flex-flow: wrap;
+			width: 510rpx;
+
+			image {
+				border: 2rpx solid #fff;
+			}
+
+			image,
+			.invitation-bargain-end {
+				margin-right: -24rpx;
+				width: 50rpx;
+				height: 50rpx;
+				border-radius: 50%;
+				border: 2rpx solid #fff;
+			}
+
+			.invitation-bargain-end {
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				border: 2rpx dashed;
+				font-size: 24rpx;
+				background-color: #fff;
+				z-index: 999;
+			}
+		}
+
+		.btn {
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			margin: 0;
+			padding: 0;
+			width: 130rpx;
+			height: 60rpx;
+			line-height: 1;
+			font-size: $font-size-tag;
+			border-radius: 60rpx;
+			border-color: #999999;
+
+			&.fail {
+				background-color: #aaa;
+			}
+		}
+	}
+</style>
+<style scoped>
+	>>>.uni-countdown__number,
+	>>>.uni-countdown__splitor {
+		margin: 0;
+		padding: 0;
+	}
+
+	.time>>>.uni-countdown__number {
+		min-width: 28rpx;
+		height: 28rpx;
+		text-align: center;
+		line-height: 28rpx;
+		background: #000;
+		border-radius: 4px;
+		display: inline-block;
+		padding: 4rpx;
+		margin: 0;
+		border: none;
+	}
+
+	.time>>>.uni-countdown__splitor {
+		margin: 0 4rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/pages_promotion/bargain/payment.vue b/pages_promotion/bargain/payment.vue
new file mode 100644
index 0000000..511ff64
--- /dev/null
+++ b/pages_promotion/bargain/payment.vue
@@ -0,0 +1,52 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view>
+		<common-payment :api="api" create-data-key="bargainOrderCreateData" ref="payment"></common-payment>
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			api: {
+				payment: '/bargain/api/ordercreate/payment',
+				calculate: '/bargain/api/ordercreate/calculate',
+				create: '/bargain/api/ordercreate/create'
+			}
+		}
+	},
+	provide() {
+		return {
+			promotion: this.promotion.bind(this)
+		}
+	},
+	onShow() {
+		if (this.$refs.payment) this.$refs.payment.pageShow();
+	},
+	methods:{
+		/**
+		 * 处理活动信息 如不需要则留空
+		 */
+		promotion(data){
+			if(data.bargain_info){
+				return {title: '砍价活动', content: '该商品参与砍价活动'}
+			}
+		}
+	}
+};
+</script>
+
+<style scoped lang="scss">
+/deep/ .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+	background: none;
+	max-height: unset !important;
+	overflow-y: hidden !important;
+}
+/deep/ .uni-popup__wrapper {
+	border-radius: 20rpx 20rpx 0 0;
+}
+/deep/ .uni-popup {
+	z-index: 8;
+}
+</style>
diff --git a/pages_promotion/bargain/public/css/detail.scss b/pages_promotion/bargain/public/css/detail.scss
new file mode 100644
index 0000000..29cf0b5
--- /dev/null
+++ b/pages_promotion/bargain/public/css/detail.scss
@@ -0,0 +1,989 @@
+.bargain {
+	background-size: cover;
+	background-repeat: repeat-y;
+	padding-bottom: 100rpx;
+	background: var(--bargain-promotion-color);
+	.bargain_top {
+		height: 360rpx;
+		background-size: 100% auto;
+		background-repeat: no-repeat;
+		display: flex;
+		color: #fff;
+		justify-content: center;
+		position: relative;
+		line-height: 1;
+		view {
+			color: #fff;
+			line-height: 50rpx;
+			height: 50rpx;
+			display: flex;
+			align-items: center;
+			font-size: 24rpx;
+			margin: 26rpx 2rpx;
+		}
+	}
+
+	.bargin_content {
+		background-color: #fff;
+		border-radius: 20rpx;
+		margin: 24rpx;
+		padding-bottom: 60rpx;
+		padding-top: 30rpx;
+		margin-top: 0;
+		.uer_info_base {
+			display: flex;
+			position: relative;
+			padding: 0 0;
+			flex-direction: column;
+			align-items: center;
+			justify-content: center;
+			margin-bottom: 20rpx;
+
+			.user_info_img {
+				background-color: #fff;
+				width: 120rpx;
+				height: 120rpx;
+				margin-top: -80rpx;
+				margin-left: 0;
+				border-radius: 50%;
+				border: 2px solid #fff;
+				overflow: hidden;
+
+				image {
+					width: 100%;
+					height: 100%;
+				}
+			}
+
+			.user_info_name {
+				margin-left: 0;
+				color: $color-tip;
+				align-self: center;
+			}
+
+			.rule_detail {
+				position: absolute;
+				height: 34rpx;
+				line-height: 34rpx;
+				padding: 0 12rpx;
+				font-size: 18rpx;
+				border: 1px solid;
+				right: 24rpx;
+				top: 30rpx;
+				border-radius: 34rpx;
+			}
+		}
+
+		.bargin_propaganda {
+			display: flex;
+			justify-content: space-between;
+			margin: 0 27rpx 30rpx;
+			font-size: 34rpx;
+			color: #333333;
+			font-weight: bold;
+
+			.marks {
+				font-size: 60rpx;
+				line-height: 1;
+				color: #b0b0b0;
+			}
+		}
+
+		.goods {
+			display: flex;
+			margin-top: 0;
+			margin-left: 24rpx;
+			margin-right: 24rpx;
+			padding: 24rpx;
+			background-color: #fafafa;
+			border-radius: 10rpx;
+			overflow: hidden;
+
+			.goods_img {
+				min-width: 180rpx;
+				width: 230rpx;
+				height: 230rpx;
+				margin-right: 20rpx;
+				border-radius: 10rpx;
+
+				image {
+					width: 100%;
+					height: 100%;
+				}
+			}
+
+			.goods_content {
+				flex: 1;
+				overflow: hidden;
+
+				.goods_title {
+					line-height: 1.3;
+					font-size: 30rpx;
+					margin-bottom: 10rpx;
+					overflow: hidden;
+					text-overflow: ellipsis;
+					display: -webkit-box;
+					-webkit-line-clamp: 2;
+					-webkit-box-orient: vertical;
+					display: -moz-box;
+					-moz-line-clamp: 2;
+					-moz-box-orient: vertical;
+					word-wrap: break-word;
+					word-break: break-all;
+					white-space: normal;
+					height: 78rpx;
+				}
+
+				.goods_price {
+					display: flex;
+
+					> view {
+						color: #666666;
+						font-size: 22rpx;
+
+						.original_price {
+							margin-left: 3rpx;
+						}
+
+						.bottom_price {
+							color: var(--price-color);
+							margin-left: 3rpx;
+						}
+						&:first-child {
+							margin-right: 10rpx;
+						}
+					}
+				}
+
+				.partake_num {
+					font-size: 22rpx;
+					color: #666666;
+					margin-top: 4rpx;
+					.residue-num {
+						margin-left: 10rpx;
+					}
+
+					.ident {
+						color: #fe0b42;
+						margin: 0 4rpx;
+					}
+				}
+				.count-down {
+					color: #666666;
+					margin-top: 6rpx;
+					text {
+						margin-left: 16rpx;
+					}
+				}
+				&.launch {
+					.goods_price {
+						flex-direction: column;
+						.original_price {
+							text-decoration: unset;
+							color: var(--price-color);
+						}
+					}
+				}
+			}
+		}
+
+		.progress_info {
+			display: flex;
+			justify-content: space-between;
+			margin: 40rpx 24rpx 0;
+
+			> view {
+				font-size: $font-size-tag;
+				color: #666666;
+
+				text {
+					color: var(--price-color);
+				}
+			}
+		}
+
+		.progress {
+			position: relative;
+			margin: 40rpx 35rpx 0;
+			height: 20rpx;
+
+			background-color: #fff4f4;
+			border-radius: 30rpx;
+			.progress_item {
+				width: 5%;
+				position: absolute;
+				left: 0;
+				border-radius: 30rpx;
+				height: 20rpx;
+				background: linear-gradient(to left, var(--bargain-promotion-color), var(--bargain-promotion-aux-color));
+				animation: all 1s forwards;
+
+				.iconfont {
+					position: absolute;
+					right: -20rpx;
+					top: -10rpx;
+					height: 40rpx;
+					width: 40rpx;
+					color: #fff;
+					background-color: var(--bargain-promotion-color);
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					line-height: 1;
+					border-radius: 50%;
+					font-size: 24rpx;
+					z-index: 1;
+				}
+			}
+			.progress-point {
+				position: absolute;
+				background-color: var(--bargain-promotion-color);
+				height: 26rpx;
+				width: 26rpx;
+				border-radius: 50%;
+				right: -13rpx;
+				top: -4rpx;
+			}
+		}
+		.info-bottom {
+			display: flex;
+			justify-content: space-between;
+			margin: 10px 12px 0;
+			align-items: center;
+			.sale-box {
+				color: var(--bargain-promotion-color);
+			}
+			.price-box {
+				display: flex;
+				line-height: 1;
+				.discount-price {
+					display: flex;
+					font-size: 26rpx;
+					line-height: 1;
+					margin-top: 4rpx;
+					.price {
+					}
+				}
+				.delete-price {
+					display: flex;
+					font-size: 26rpx;
+					line-height: 1;
+					margin-top: 4rpx;
+				}
+				.price {
+					line-height: 1.2;
+					color: var(--bargain-promotion-color);
+				}
+			}
+			.pro-info {
+				line-height: 1;
+				display: flex;
+				align-items: center;
+				.button-border {
+					border: 2rpx solid var(--bargain-promotion-color);
+					color: var(--bargain-promotion-color);
+					font-size: 24rpx;
+					padding: 4rpx 6rpx;
+					line-height: 1;
+					border-radius: 4rpx;
+					background-color: #fff4f4;
+					position: relative;
+					border-top-right-radius: 0;
+				}
+				.button-border::before {
+					content: '';
+					display: block;
+					position: absolute;
+					top: -10rpx;
+					right: -2rpx;
+					border-left: 10rpx solid transparent;
+					border-right: 0 solid transparent;
+					border-bottom: 10rpx solid var(--bargain-promotion-color);
+				}
+				.button-border::after {
+					content: '';
+					display: block;
+					position: absolute;
+					top: -6rpx;
+					right: 0rpx;
+					border-left: 10rpx solid transparent;
+					border-right: 0 solid transparent;
+
+					border-bottom: 10rpx solid #fff4f4;
+				}
+			}
+		}
+
+		.bragain_recode {
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			margin: 58rpx 24rpx 20rpx;
+
+			.bragain_recode_list {
+				display: flex;
+				margin: 0 26rpx;
+
+				.bragain_recode_add {
+					margin-left: 44rpx;
+				}
+
+				image {
+					width: 84rpx;
+					height: 84rpx;
+					border: 4rpx solid #fe0b42;
+					border-radius: 50%;
+					margin-left: -22rpx;
+
+					&:first-child {
+						margin-left: 0;
+					}
+				}
+			}
+
+			.bragain_recode_more {
+				width: 84rpx;
+				height: 84rpx;
+				line-height: 84rpx;
+				text-align: center;
+				font-size: 12rpx;
+				color: #999999;
+			}
+
+			.bragain_recode_add {
+				width: 84rpx;
+				height: 84rpx;
+				line-height: 76rpx;
+				text-align: center;
+				border-radius: 50%;
+				border: 1px dashed #e6e6e6;
+				font-size: 60rpx;
+				color: #e6e6e6;
+			}
+		}
+
+		.bragain_recode_detail {
+			font-size: 24rpx;
+			color: #000;
+			margin: 0 34rpx 0;
+
+			.iconfont {
+				font-size: 24rpx;
+				color: #333333;
+			}
+		}
+
+		.invitation_peo {
+			margin: 28rpx 30rpx 0;
+			.bargain-success {
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				font-size: $font-size-tag;
+				margin: 40rpx 0 0;
+				.iconfont {
+					margin-right: 8rpx;
+					color: rgb(250, 26, 26);
+				}
+				> view {
+					text-align: center;
+				}
+			}
+			.launch-success {
+				text-align: center;
+				font-size: $font-size-tag;
+			}
+			.tip {
+				text-align: center;
+				color: #fe0b42;
+				font-size: $font-size-goods-tag;
+			}
+
+			.flex-box {
+				display: flex;
+				margin-top: 20rpx;
+				button {
+					flex: 1;
+
+					&:nth-child(2) {
+						margin-left: 20rpx;
+					}
+				}
+				&.success {
+					flex-direction: column;
+					.btn {
+						margin: 0 !important;
+					}
+					.btn-vice {
+						background-color: #fff;
+						border: 2rpx solid var(--bargain-promotion-color);
+						color: var(--bargain-promotion-color);
+						margin: 0 !important;
+						margin-top: 20rpx !important;
+					}
+				}
+			}
+
+			.btn {
+				height: 80rpx;
+				line-height: 80rpx;
+				background: var(--bargain-promotion-color);
+				border-radius: $border-radius;
+				text-align: center;
+				font-size: 30rpx;
+				color: #fff;
+				font-weight: bold;
+				margin: 20rpx 0;
+			}
+
+			.btn-vice {
+				height: 80rpx;
+				line-height: 80rpx;
+				background: var(--bargain-promotion-aux-color);
+				border-radius: $border-radius;
+				text-align: center;
+				font-size: 30rpx;
+				color: #fff;
+				font-weight: bold;
+				margin: 20rpx 0;
+			}
+		}
+	}
+
+	.bargin_introduction {
+		margin: 24rpx;
+		background-color: #fff;
+		border-radius: 20rpx;
+		.record-empty {
+			text-align: center;
+			font-size: $font-size-tag;
+			color: #999;
+			padding: 100rpx 0;
+			background-color: #fff;
+			border-radius: 20rpx;
+		}
+
+		.bargin_introduction_title {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			font-size: 34rpx;
+			color: #222222;
+			padding: 36rpx 0 0;
+			font-weight: bold;
+
+			&::before {
+				content: '';
+				background-color: #222222;
+				width: 20rpx;
+				height: 5rpx;
+				display: block;
+				margin-right: 10rpx;
+			}
+			&::after {
+				content: '';
+				background-color: #222222;
+				width: 20rpx;
+				height: 5rpx;
+				display: block;
+				margin-left: 10rpx;
+			}
+		}
+		.detail-content {
+			padding: 20rpx;
+			overflow: hidden;
+			* {
+				max-width: 100%;
+			}
+			img {
+				width: 100%;
+			}
+		}
+		.flow {
+			display: flex;
+			background-color: #fff;
+			border-radius: 20rpx;
+			padding: 40rpx 0;
+
+			.flow_item {
+				position: relative;
+				flex: 1;
+				text-align: center;
+
+				image {
+					width: 88rpx;
+					height: 88rpx;
+					margin-bottom: 20rpx;
+				}
+
+				> view {
+					color: #333333;
+					font-size: 24rpx;
+				}
+
+				&::after {
+					position: absolute;
+					content: '';
+					height: 2rpx;
+					width: 100rpx;
+					background-color: #fd0742;
+					top: 44rpx;
+					right: -22%;
+				}
+
+				&:last-child::after {
+					width: 0;
+				}
+			}
+		}
+
+		.bargin_invitation {
+			background-color: #fff;
+			border-radius: 20rpx;
+			padding: 27rpx;
+
+			.item {
+				display: flex;
+				align-items: center;
+				padding: 20rpx 0;
+				border-bottom: 2rpx solid rgba(237, 237, 237, 0.5);
+				&:last-child {
+					border-bottom: 0;
+				}
+				.item_left {
+					flex: 1;
+					display: flex;
+					overflow: hidden;
+					align-items: center;
+					image {
+						height: 70rpx;
+						width: 70rpx;
+						border: 2rpx solid #979797;
+						border-radius: 50%;
+						margin-right: 20rpx;
+					}
+
+					> view {
+						overflow: hidden;
+						align-items: center;
+						display: flex;
+
+						color: #6d7278;
+						white-space: nowrap;
+						/* 不换行 */
+						text-overflow: ellipsis;
+
+						.tip {
+							font-size: 20rpx;
+							color: #666666;
+						}
+					}
+					.bargin_info {
+						display: flex;
+						flex-direction: column;
+						justify-content: left;
+						align-items: flex-start;
+						> view:last-child {
+							color: #999999;
+							font-size: $font-size-tag;
+						}
+					}
+				}
+
+				.item_right {
+					min-width: 100rpx;
+					color: var(--bargain-promotion-color);
+					font-size: $font-size-base;
+					font-weight: bold;
+					display: flex;
+					align-items: center;
+					text {
+						font-size: $font-size-base;
+						color: var(--bargain-promotion-color);
+						font-weight: bold;
+					}
+					.bargain-icon {
+						width: 44rpx;
+						height: 44rpx;
+						margin-right: 14rpx;
+					}
+				}
+			}
+
+			.item_more {
+				margin-top: 20rpx;
+				text-align: center;
+				font-size: $font-size-tag;
+				color: #999999;
+			}
+		}
+		.bargain-list {
+			padding: 40rpx 0;
+			margin: 0 24rpx;
+			swiper {
+				height: 360rpx;
+				&.swiper-1 {
+					height: 120rpx;
+				}
+				&.swiper-2 {
+					height: 240rpx;
+				}
+			}
+			.bargain-item {
+				background-color: #f2f2f2;
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				padding: 16rpx 24rpx;
+				> view:first-child {
+					display: flex;
+					align-items: center;
+				}
+				.bargain-head {
+					width: 60rpx;
+					height: 60rpx;
+					margin-right: 20rpx;
+					border: 2rpx solid #979797;
+					border-radius: 50%;
+					overflow: hidden;
+					image {
+						width: 100%;
+						height: 100%;
+					}
+				}
+				.bargain-info {
+					.bargain-title {
+						font-size: 24rpx;
+						color: #333333;
+						overflow: hidden;
+						white-space: nowrap;
+						text-overflow: ellipsis;
+						width: 260rpx;
+					}
+					.bargain-desc {
+						font-size: 22rpx;
+						color: #6d7278;
+					}
+				}
+				.bargain-price {
+					text {
+						color: var(--bargain-promotion-color);
+						margin-left: 4rpx;
+					}
+				}
+			}
+		}
+	}
+}
+
+.bargain-popup {
+	width: 70vw;
+	background-color: #fff;
+	position: relative;
+	box-sizing: border-box;
+	border-radius: 20rpx;
+	height: 650rpx;
+	.head {
+		width: 55%;
+		position: absolute;
+		left: 50%;
+		top: 0;
+		transform: translate(-50%, -70%);
+	}
+
+	.title {
+		text-align: center;
+		font-size: 38rpx;
+		margin-top: 40rpx;
+	}
+
+	.money {
+		text-align: center;
+
+		.num {
+			font-size: 36rpx;
+			font-weight: 600;
+		}
+
+		.unit {
+			font-size: 24rpx;
+			margin-left: 8rpx;
+		}
+	}
+	&.self {
+		.head {
+			position: unset;
+			transform: unset;
+			top: 0;
+			left: 0;
+			width: 100%;
+			max-height: 350rpx;
+		}
+		.bargain-content {
+			text-align: center;
+			padding: 60rpx 40rpx;
+			.money {
+				font-weight: bold;
+			}
+		}
+		.bargain-btn {
+			width: max-content;
+			margin: 0 auto;
+			font-weight: bold;
+			padding: 0 60rpx;
+			background-color: var(--bargain-promotion-color);
+			color: #ffffff;
+		}
+	}
+	&.help {
+		.bargain-content {
+			.uer_info_base {
+				display: flex;
+				position: relative;
+				padding: 0 0;
+				flex-direction: column;
+				align-items: center;
+				justify-content: center;
+				margin-bottom: 20rpx;
+
+				.user_info_img {
+					background-color: #fff;
+					width: 120rpx;
+					height: 120rpx;
+					margin-top: -240rpx;
+					margin-left: 0;
+					border-radius: 50%;
+					border: 2px solid var(--bargain-promotion-color);
+					overflow: hidden;
+					image {
+						width: 100%;
+						height: 100%;
+					}
+				}
+				.user_info_name {
+					margin-left: 0;
+					align-self: center;
+					font-size: 30rpx;
+					font-weight: bold;
+					overflow: hidden;
+					white-space: nowrap;
+					text-overflow: ellipsis;
+					width: 100%;
+				}
+			}
+			.count-down {
+				> text {
+					color: #666;
+					margin: 0 6rpx;
+				}
+			}
+		}
+	}
+}
+
+.icon-round-close {
+	display: block;
+	font-size: 60rpx;
+	color: #ffffff;
+	text-align: center;
+}
+
+.share-popup,
+.uni-popup__wrapper-box {
+	.share-title {
+		line-height: 60rpx;
+		font-size: $font-size-toolbar;
+		padding: 15rpx 0;
+		text-align: center;
+	}
+
+	.share-content {
+		display: flex;
+		display: -webkit-flex;
+		-webkit-flex-wrap: wrap;
+		-moz-flex-wrap: wrap;
+		-ms-flex-wrap: wrap;
+		-o-flex-wrap: wrap;
+		flex-wrap: wrap;
+		padding: 15rpx;
+
+		.share-box {
+			flex: 1;
+			text-align: center;
+
+			.share-btn {
+				margin: 0;
+				padding: 0;
+				border: none;
+				line-height: 1;
+				height: auto;
+                background-color: unset;
+
+				text {
+					margin-top: 20rpx;
+					font-size: $font-size-tag;
+					display: block;
+					color: $color-title;
+				}
+			}
+
+			.iconfont {
+				font-size: 80rpx;
+				line-height: initial;
+			}
+
+			.icon-fuzhilianjie,
+			.icon-pengyouquan,
+			.icon-haowuquan,
+			.icon-share-friend {
+				color: #07c160;
+			}
+		}
+	}
+
+	.share-footer {
+		height: 90rpx;
+		line-height: 90rpx;
+		border-top: 2rpx #f5f5f5 solid;
+		text-align: center;
+		color: #666;
+	}
+}
+
+.poster-layer {
+    /deep/ .uni-popup__wrapper.center {
+        width: 100vw!important;
+        height: 100vh!important;
+        background: none!important;
+    }
+    
+    /deep/ .uni-popup__wrapper.uni-custom.center .uni-popup__wrapper-box {
+        max-width: 100vw!important;
+        max-height: 100vh!important;
+        background: none!important;
+        width: 100vw;
+        height: 100vh;
+    }
+    
+    .poster-wrap {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        width: 100vw;
+        height: 100vh;
+        flex-direction: column;
+    }
+    
+	.generate-poster {
+		padding: 40rpx 0;
+		.iconfont {
+			font-size: 80rpx;
+			color: #07c160;
+			line-height: initial;
+		}
+		> view {
+			text-align: center;
+			&:last-child {
+				margin-top: 20rpx;
+			}
+		}
+	}
+    
+	.image-wrap {
+		width: 80%;
+        position: relative;
+		
+        image {
+            width: 100%;
+            line-height: 1;
+            border-radius: 10rpx;
+            overflow: hidden;
+        }
+	}
+	.msg {
+		padding: 40rpx;
+	}
+	.save-btn {
+		text-align: center;
+		height: 80rpx;
+		line-height: 80rpx;
+        background-color: $base-color;
+        border-radius: 10rpx;
+        width: 80%;
+        color: #fff;
+        margin-top: 30rpx;
+	}
+    .save-text {
+        color: #fff;
+        margin-top: 10rpx;
+    }
+	.close {
+		position: absolute;
+		top: 0;
+		right: 20rpx;
+		width: 40rpx;
+		height: 80rpx;
+		font-size: 50rpx;
+        color: #999;
+	}
+}
+.goods-details img {
+	max-width: 100%;
+}
+
+.rule-mark-enter {
+	position: absolute;
+	top: 120rpx;
+	right: 0;
+	width: 20rpx;
+	height: 100rpx;
+	line-height: 1;
+	background: #fff4f4;
+	padding: 10rpx 20rpx 10rpx 20rpx;
+	border-radius: 20rpx 0 0 20rpx;
+	color: var(--bargain-promotion-color);
+	font-size: $font-size-tag;
+	z-index: 100;
+}
+
+.rule-wrap {
+	border-radius: 10rpx;
+	background-color: #fff;
+	width: 80vw;
+	padding: 12rpx;
+	box-sizing: border-box;
+
+	.content-wrap {
+		width: 100%;
+		border-radius: 8rpx;
+		position: relative;
+
+		.rule-head {
+			width: 100%;
+			position: absolute;
+			transform: translateY(-50%);
+			left: 0;
+			top: 0;
+		}
+
+		.rule {
+			max-height: 880rpx;
+			overflow: hidden;
+			padding: 80rpx 30rpx 0 30rpx;
+			box-sizing: border-box;
+			.text {
+				font-size: $font-size-sub;
+			}
+		}
+
+		.icon-round-close {
+			color: #fff;
+			text-align: center;
+			position: absolute;
+			bottom: -150rpx;
+			left: 50%;
+			transform: translateX(-50%);
+			font-size: 70rpx;
+		}
+	}
+}
diff --git a/pages_promotion/bargain/public/css/list.scss b/pages_promotion/bargain/public/css/list.scss
new file mode 100644
index 0000000..e1657d0
--- /dev/null
+++ b/pages_promotion/bargain/public/css/list.scss
@@ -0,0 +1,243 @@
+.page {
+	width: 100%;
+	min-height: 100vh;
+	background: var(--bargain-promotion-color);
+}
+.adv-wrap {
+	margin: $margin-updown $margin-both;
+	width: auto;
+}
+
+.lineheight-clear {
+	line-height: 1 !important;
+}
+// 商品列表单列样式
+.goods-list.single-column {
+	.goods-item {
+		padding: 26rpx 26rpx 20rpx;
+		background: #fff;
+		margin: $margin-updown $margin-both;
+		border-radius: 24rpx;
+		display: flex;
+		position: relative;
+		flex-direction: column;
+		.goods-item-content {
+			display: flex;
+		}
+
+		.goods-item-bottom {
+			display: flex;
+			justify-content: space-between;
+			margin-top: 10rpx;
+			line-height: 1;
+			.item-bottom-left {
+				display: flex;
+				align-items: baseline;
+				margin-top: 10rpx;
+				.delete-pirce {
+					text-decoration: line-through;
+					color: $color-sub;
+					margin-left: 20rpx;
+				}
+				.txt {
+					margin-left: 10rpx;
+					font-weight: 26rpx;
+				}
+				.unit,
+				.price {
+					color: var(--bargain-promotion-color) !important;
+				}
+			}
+			.item-bottom-right {
+				display: flex;
+				align-items: center;
+				font-weight: bold;
+				button {
+					color: #fff;
+					background-color: var(--bargain-promotion-color);
+				}
+			}
+		}
+
+		.goods-img {
+			width: 200rpx;
+			height: 200rpx;
+			overflow: hidden;
+			border-radius: $border-radius;
+			margin-right: 20rpx;
+
+			image {
+				width: 100%;
+				height: 100%;
+			}
+		}
+
+		.goods-tag {
+			color: #fff;
+			line-height: 1;
+			padding: 8rpx 12rpx;
+			position: absolute;
+			border-top-left-radius: $border-radius;
+			border-bottom-right-radius: $border-radius;
+			top: 26rpx;
+			left: 26rpx;
+			font-size: $font-size-goods-tag;
+		}
+
+		.info-wrap {
+			flex: 1;
+			display: flex;
+			flex-direction: column;
+			width: calc(100% - 220rpx);
+			.info-sub-title {
+				color: $color-tip;
+				font-size: $font-size-tag;
+				margin-top: 6rpx;
+			}
+		}
+		.info-bottom {
+			display: flex;
+			justify-content: space-between;
+			margin-top: 10rpx;
+			align-items: center;
+			.sale-box {
+				color: var(--bargain-promotion-color);
+			}
+			.price-box {
+				display: flex;
+				line-height: 1;
+				.discount-price {
+					display: flex;
+					font-size: 26rpx;
+					line-height: 1;
+					margin-top: 4rpx;
+				}
+				.delete-price {
+					display: flex;
+					font-size: 26rpx;
+					line-height: 1;
+					margin-top: 4rpx;
+				}
+				.price {
+					line-height: 1.2;
+					color: var(--bargain-promotion-color);
+				}
+			}
+			.pro-info {
+				line-height: 1;
+				display: flex;
+				align-items: center;
+				.button-border {
+					border: 2rpx solid var(--bargain-promotion-color);
+					color: var(--bargain-promotion-color);
+					font-size: 24rpx;
+					padding: 4rpx 6rpx;
+					line-height: 1;
+					border-radius: 4rpx;
+					background-color: var(--bargain-promotion-color-shallow);
+					position: relative;
+					border-top-right-radius: 0;
+				}
+				.button-border::before {
+					content: '';
+					display: block;
+					position: absolute;
+					top: -10rpx;
+					right: -2rpx;
+					border-left: 10rpx solid transparent;
+					border-right: 0 solid transparent;
+					border-bottom: 10rpx solid var(--bargain-promotion-color);
+				}
+				.button-border::after {
+					content: '';
+					display: block;
+					position: absolute;
+					top: -6rpx;
+					right: 0rpx;
+					border-left: 10rpx solid transparent;
+					border-right: 0 solid transparent;
+
+					border-bottom: 10rpx solid var(--bargain-promotion-color-shallow);
+				}
+			}
+		}
+
+		.name-wrap {
+			flex: 1;
+		}
+
+		.goods-name {
+			font-size: $font-size-base;
+			line-height: 1.4;
+			overflow: hidden;
+			text-overflow: ellipsis;
+			display: -webkit-box;
+			-webkit-line-clamp: 2;
+			-webkit-box-orient: vertical;
+			font-weight: bold;
+			word-wrap: break-word;
+			height: 80rpx;
+		}
+
+		.progress-wrap {
+			display: flex;
+			position: relative;
+			width: calc(100% - 32rpx);
+			margin: 10rpx auto;
+			progress {
+				flex: 1;
+			}
+			.progress-point {
+				background: var(--bargain-promotion-color);
+				width: 24rpx;
+				height: 24rpx;
+				border-radius: 50%;
+				position: absolute;
+				right: -12rpx;
+				top: -4rpx;
+				z-index: 1;
+			}
+			.progress-select {
+				background-color: var(--bargain-promotion-color);
+				color: var(--bargain-promotion-aux-color);
+				width: 24rpx;
+				height: 24rpx;
+				border-radius: 50%;
+				position: absolute;
+				left: 0;
+				top: -4rpx;
+				font-size: 24rpx;
+				z-index: 11;
+
+				&.icon {
+					width: 34rpx;
+					height: 34rpx;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					top: -10rpx;
+				}
+				.iconfont {
+					background-color: unset;
+					color: #fff;
+					font-size: 20rpx;
+				}
+			}
+
+			.txt {
+				margin: 0 100rpx 0 20rpx;
+			}
+		}
+
+		.member-price-tag {
+			display: inline-block;
+			width: 60rpx;
+			line-height: 1;
+			margin-left: 6rpx;
+
+			image {
+				width: 100%;
+			}
+		}
+	}
+}
diff --git a/pages_promotion/bargain/public/js/detail.js b/pages_promotion/bargain/public/js/detail.js
new file mode 100644
index 0000000..f315c1c
--- /dev/null
+++ b/pages_promotion/bargain/public/js/detail.js
@@ -0,0 +1,537 @@
+import htmlParser from '@/common/js/html-parser';
+
+export default {
+	data() {
+		return {
+			windowHeight: 0,
+			launch_id: 0,
+			bargain_id: 0,
+			info: {
+				headimg: ''
+			},
+			bargainRecord: [],
+			page: 1,
+			totalPage: 1,
+			load: false,
+			timeMachine: null,
+			bargainMoney: '0.00',
+			poster: '-1', //海报
+			posterMsg: '', //海报错误信息
+			posterHeight: 0,
+			goodsDetail: null,
+			launchInfo: null,
+			maxBuy: 1,
+			launchList: null,
+			showMore: false,
+			isOwn: 0, //是否自己砍了一刀
+			my_bargain_money: 0,
+			shareImg: ''
+		};
+	},
+	onLoad(data) {
+		setTimeout(() => {
+			if (!this.addonIsExist.bargain) {
+				this.$util.showToast({
+					title: '商家未开启砍价',
+					mask: true,
+					duration: 2000
+				});
+				setTimeout(() => {
+					this.$util.redirectTo('/pages/index/index');
+				}, 2000);
+			}
+		}, 1000);
+
+		// #ifdef MP-ALIPAY
+		let options = my.getLaunchOptionsSync();
+		options.query && Object.assign(data, options.query);
+		// #endif
+
+		this.getHeight();
+		if (data.l_id) this.launch_id = data.l_id;
+		if (data.b_id) this.bargain_id = data.b_id;
+		if (data.is_own) this.isOwn = data.is_own;
+
+		if (data.scene) {
+			var sceneParams = decodeURIComponent(data.scene);
+			sceneParams = sceneParams.split('&');
+			if (sceneParams.length) {
+				sceneParams.forEach(item => {
+					if (item.indexOf('m') != -1) uni.setStorageSync('source_member', item.split('-')[1]);
+					if (item.indexOf('l_id') != -1) this.id = item.split('-')[1];
+					if (item.indexOf('b_id') != -1) this.bargain_id = item.split('-')[1];
+					if (item.indexOf('is_own') != -1) this.isOwn = item.split('-')[1];
+				});
+			}
+		}
+		// #ifdef MP-WEIXIN
+		this.getShareImg();
+		// #endif
+	},
+	onShow() {
+		this.getBargainInfo();
+	},
+	computed: {
+		progress() {
+			if (this.launchInfo && this.goodsDetail) {
+				let total = this.goodsDetail.price - this.launchInfo.floor_price,
+					progress = parseInt(((this.goodsDetail.price - this.launchInfo.curr_price) / total) * 100);
+
+				return isNaN(progress) ? 0 : progress;
+			} else {
+				return 0;
+			}
+		},
+		showNum() {
+			if (this.launchList && this.launchList.length < 3) {
+				return this.launchList.length;
+			} else {
+				return 3;
+			}
+		}
+	},
+	methods: {
+		timeUp() {
+			this.getBargainInfo();
+		},
+		getHeight() {
+			var self = this;
+			uni.getSystemInfo({
+				success: function (res) {
+					self.windowHeight = res.windowHeight - 44;
+					if (self.iphoneX) {
+						self.windowHeight = self.windowHeight - 33;
+					}
+				}
+			});
+		},
+		getBargainInfo() {
+			if (this.load) return;
+			this.load = true;
+			this.$api.sendRequest({
+				url: '/bargain/api/bargain/detail',
+				data: {
+					launch_id: this.launch_id,
+					bargain_id: this.bargain_id
+				},
+				success: res => {
+					if (res.code == 0) {
+						this.goodsDetail = res.data.goods_sku_detail;
+
+						if (this.goodsDetail.sku_spec_format) this.goodsDetail.sku_spec_format = JSON.parse(this.goodsDetail.sku_spec_format);
+
+						this.$langConfig.title(this.goodsDetail.sku_name);
+
+						this.goodsDetail.unit = this.goodsDetail.unit || "件";
+
+						// 商品SKU格式
+						if (this.goodsDetail.goods_spec_format) this.goodsDetail.goods_spec_format = JSON.parse(this.goodsDetail.goods_spec_format);
+
+						// if (this.goodsDetail.goods_content) this.goodsDetail.goods_content = htmlParser(this.goodsDetail.goods_content);
+
+						if (this.addonIsExist.form) {
+							this.getGoodsForm();
+						}
+
+						if (res.data.launch_info && Object.keys(res.data.launch_info).length > 0) {
+							this.launchInfo = res.data.launch_info;
+							if (this.launchInfo.status == 0) {
+								this.timeMachine = this.$util.countDown(this.launchInfo.end_time - res.timestamp);
+							}
+							this.launch_id = this.launchInfo.launch_id;
+
+						}
+						if (res.data.launch_list && Object.keys(res.data.launch_list).length > 0) {
+							this.launchList = res.data.launch_list;
+						}
+
+						//发起砍价后自砍一刀展示
+						if (this.isOwn && this.goodsDetail.is_own > 0 && this.launchInfo && this.launchInfo.self && this.launchInfo.my_bargain_money) {
+							this.my_bargain_money = this.launchInfo.my_bargain_money;
+							this.$refs.uniSelfBargainPopup.open();
+						}
+
+						//好友进来后帮砍弹出
+						if (this.launchInfo && !this.launchInfo.self && !this.launchInfo.cut && this.goodsDetail.bargain_status == 1) this.$refs.uniHelpPopup.open();
+
+						this.load = false;
+						this.getBargainRecord(1);
+						this.setPublicShare();
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					} else {
+						this.load = false;
+						this.$util.redirectTo('/pages_promotion/bargain/my_bargain');
+					}
+				},
+				fail: res => {
+					this.load = false;
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				}
+			});
+		},
+		getBargainRecord(page) {
+			if (this.load) return;
+
+			if (!this.launchInfo) return;
+
+			this.load = true;
+
+			this.$api.sendRequest({
+				url: '/bargain/api/bargain/record',
+				data: {
+					page: page,
+					id: this.launchInfo.launch_id
+				},
+				success: res => {
+					this.load = false;
+					this.totalPage = res.data.page_count;
+					this.page = page;
+					if (res.code == 0 && res.data.list.length) {
+						if (page == 1) {
+							this.bargainRecord = res.data.list;
+						} else {
+							this.bargainRecord = this.bargainRecord.concat(res.data.list);
+						}
+					}
+					this.showMore = false;
+					if (page < this.totalPage) {
+						this.showMore = true;
+					}
+				}
+			});
+		},
+		scrolltolower() {
+			let next = this.page + 1;
+			if (!this.load && next <= this.totalPage) {
+				this.getBargainRecord(next);
+			}
+		},
+		browse() {
+			this.$api.sendRequest({
+				url: '/bargain/api/bargain/browse',
+				data: {
+					bargain_id: this.goodsDetail.bargain_id
+				},
+				success: res => {
+				}
+			});
+		},
+		share() {
+			this.$api.sendRequest({
+				url: '/bargain/api/bargain/share',
+				data: {
+					bargain_id: this.goodsDetail.bargain_id
+				},
+				success: res => {
+				}
+			});
+		},
+		/**
+		 * 刷新商品详情数据
+		 * @param {Object} goodsSkuDetail
+		 */
+		refreshGoodsSkuDetail(goodsSkuDetail) {
+			Object.assign(this.goodsDetail, goodsSkuDetail);
+		},
+
+		// 发起砍价
+		createBargain() {
+			if (!this.storeToken) {
+				this.$refs.login.open('/pages_promotion/bargain/detail?l_id=' + this.launch_id + '&b_id=' + this.bargain_id);
+				return;
+			}
+
+			// #ifdef MP
+			this.$util.subscribeMessage('BARGAIN_COMPLETE');
+			// #endif
+
+			if (this.goodsDetail.sku_spec_format || this.goodsDetail.goods_form) {
+				this.$refs.goodsSku.show('bargain');
+			} else {
+				this.$api.sendRequest({
+					url: '/bargain/api/bargain/launch',
+					data: {
+						id: this.goodsDetail.id
+					},
+					success: res => {
+						if (res.code == 0) {
+							let params = {
+								l_id: res.data,
+								b_id: this.bargain_id
+							};
+							if (this.goodsDetail.is_own) params.is_own = 1;
+
+							this.$util.redirectTo('/pages_promotion/bargain/detail', params, 'redirectTo');
+						} else {
+							this.$util.showToast({
+								title: res.message
+							});
+						}
+					}
+				});
+			}
+		},
+		/**
+		 * 立即购买，不砍了，直接买
+		 */
+		buyNow() {
+			let goodsFormData = uni.getStorageSync('goodFormData');
+			let fn = ()=>{
+				uni.setStorage({
+					key: 'bargainOrderCreateData',
+					data: {
+						launch_id: this.launchInfo.launch_id
+					},
+					success: () => {
+						this.$util.redirectTo('/pages_promotion/bargain/payment');
+					}
+				});
+			};
+			if(!goodsFormData && this.goodsDetail.goods_form){
+				this.$refs.goodsSku.show('bargain',()=>{
+					fn();
+				});
+			}else{
+				fn();
+			}
+		},
+		/**
+		 * 帮好友砍价
+		 */
+		bargain() {
+			if (this.storeToken) {
+				this.$api.sendRequest({
+					url: '/bargain/api/bargain/bargain',
+					data: {
+						id: this.launchInfo.launch_id
+					},
+					success: res => {
+						if (res.code == 0) {
+							this.bargainMoney = parseFloat(res.data.bargain_money).toFixed(2);
+							this.$refs.uniHelpPopup.close();
+							this.$refs.uniPopup.open();
+							this.getBargainInfo();
+						} else {
+							this.$util.showToast({
+								title: res.message
+							});
+						}
+					}
+				});
+			} else {
+				this.$refs.login.open('/pages_promotion/bargain/detail?l_id=' + this.launch_id + '&b_id=' + this.bargain_id);
+			}
+		},
+		closePopup() {
+			this.$refs.uniPopup.close();
+		},
+		closeSelfPop() {
+			this.$refs.uniSelfBargainPopup.close();
+		},
+		// 打开分享弹出层
+		openSharePopup() {
+			this.$refs.uniSelfBargainPopup.close();
+			this.$refs.sharePopup.open();
+			this.share();
+		},
+		// 关闭分享弹出层
+		closeSharePopup() {
+			this.$refs.sharePopup.close();
+		},
+		copyUrl() {
+			let text = '嘿！朋友就差你这一刀了，帮一下忙呗~' + this.$config.h5Domain + '/pages_promotion/bargain/detail?l_id=' + this.launch_id + '&b_id=' + this.bargain_id;
+			if (this.memberInfo && this.memberInfo.member_id) text += '&source_member=' + this.memberInfo.member_id;
+			this.$util.copy(text, () => {
+				this.closeSharePopup();
+			});
+		},
+		toBargainRecode() {
+			let view = uni.createSelectorQuery().select('.bargin_introduction');
+			view.boundingClientRect(data => {
+				uni.pageScrollTo({
+					duration: 100,
+					scrollTop: data.top + 100
+				});
+			}).exec();
+		},
+		/**
+		 * 设置公众号分享
+		 */
+		setPublicShare() {
+			let shareUrl = this.$config.h5Domain + '/pages_promotion/bargain/detail?l_id=' + this.launch_id + '&b_id=' + this.bargain_id;
+			if (this.memberInfo && this.memberInfo.member_id) shareUrl += '&source_member=' + this.memberInfo.member_id;
+
+			this.$util.setPublicShare({
+					title: this.goodsDetail.sku_name,
+					desc: '嘿！朋友就差你这一刀了，帮一下忙呗~',
+					link: shareUrl,
+					imgUrl: this.goodsDetail.sku_image
+				},
+				res => {
+					// console.log('公众号分享成功');
+					// this.share();
+				}
+			);
+		},
+		//-------------------------------------海报-------------------------------------
+		// 打开海报弹出层
+		openPosterPopup() {
+			this.getGoodsPoster();
+			this.$refs.sharePopup.close();
+		},
+		// 关闭海报弹出层
+		closePosterPopup() {
+			this.$refs.posterPopup.close();
+		},
+		/**
+		 * 获取海报
+		 */
+		getGoodsPoster() {
+			uni.showLoading({
+				title: '海报生成中...'
+			});
+			//活动海报信息
+			let posterParams = {
+				l_id: this.launch_id,
+				b_id: this.bargain_id,
+				bargain_id: this.goodsDetail.bargain_id
+			};
+
+			if (this.memberInfo && this.memberInfo.member_id) posterParams.source_member = this.memberInfo.member_id;
+
+			this.$api.sendRequest({
+				url: '/bargain/api/goods/poster',
+				data: {
+					page: '/pages_promotion/bargain/detail',
+					qrcode_param: JSON.stringify(posterParams)
+				},
+				success: res => {
+					if (res.code == 0) {
+						this.poster = res.data.path + '?time=' + new Date().getTime();
+						this.$refs.posterPopup.open();
+					} else {
+						this.posterMsg = res.message;
+						this.$util.showToast({
+							title: this.posterMsg
+						})
+					}
+					uni.hideLoading();
+				},
+				fail: err => {
+					uni.hideLoading();
+				}
+			});
+		},
+		getNewArray(array, subGroupLength) {
+			if (array) {
+				let index = 0;
+				let newArray = [];
+				while (index < array.length) {
+					newArray.push(array.slice(index, (index += subGroupLength)));
+				}
+				return newArray;
+			}
+		},
+		toDetail(goods_id) {
+			this.$util.redirectTo('/pages/goods/detail', {
+				goods_id: goods_id
+			});
+		},
+		/**
+		 * 获取分享图
+		 */
+		getShareImg() {
+			let posterParams = {
+				l_id: this.launch_id,
+				b_id: this.bargain_id,
+				bargain_id: this.bargain_id
+			};
+
+			this.$api.sendRequest({
+				url: '/bargain/api/goods/shareimg',
+				data: {
+					page: '/pages_promotion/bargain/launch',
+					qrcode_param: JSON.stringify(posterParams)
+				},
+				success: res => {
+					if (res.code == 0) this.shareImg = res.data.path;
+				}
+			});
+		},
+		openRulePopup() {
+			this.$refs.rulePopup.open();
+		},
+		closeRulePopup() {
+			this.$refs.rulePopup.close();
+		},
+		/**
+		 * 获取商品表单
+		 */
+		getGoodsForm() {
+			this.$api.sendRequest({
+				url: "/form/api/form/goodsform",
+				data: {
+					goods_id: this.goodsDetail.goods_id
+				},
+				success: res => {
+					if (res.code == 0 && res.data) {
+						this.$set(this.goodsDetail, 'goods_form', res.data);
+
+						let goodsFormData = uni.getStorageSync('goodFormData');
+
+						// 检测是否填写过自定义表单，已经发起砍价后，禁止切换规格
+						if (!goodsFormData && this.launchInfo && this.goodsDetail.goods_spec_format) {
+
+							this.goodsDetail.goods_spec_format.forEach(item => {
+								item.value.forEach(specItem => {
+									for (var i = 0; i < this.goodsDetail.sku_spec_format.length; i++) {
+										let skuItem = this.goodsDetail.sku_spec_format[i];
+										if (skuItem.spec_id == specItem.spec_id && skuItem.spec_value_id != specItem.spec_value_id) {
+											specItem.disabled = true;
+											break;
+										}
+									}
+								});
+							});
+
+						}
+					}
+				}
+			});
+		}
+	},
+	filters: {
+		/**
+		 * 字符掩饰输出
+		 * @param {Object} str
+		 */
+		cover(str) {
+			if (typeof str == 'string' && str.length > 0) {
+				return str.substr(0, 1) + '******' + str.substr(-1);
+			} else {
+				return '';
+			}
+		}
+	},
+	/**
+	 * 自定义分享内容
+	 */
+	onShareAppMessage() {
+		var path = '/pages_promotion/bargain/detail?l_id=' + this.launch_id + '&b_id=' + this.bargain_id;
+		if (this.memberInfo && this.memberInfo.member_id) path += '&source_member=' + this.memberInfo.member_id;
+		this.share();
+		return {
+			title: '嘿！朋友就差你这一刀了，帮一下忙呗~',
+			imageUrl: this.shareImg ? this.$util.img(this.shareImg) : this.$util.img(this.goodsDetail.sku_image, {
+				size: 'big'
+			}),
+			path: path,
+			success: res => {
+			},
+			fail: res => {
+			},
+			complete: res => {
+			}
+		};
+	}
+}
\ No newline at end of file
diff --git a/pages_promotion/bundling/detail.vue b/pages_promotion/bundling/detail.vue
new file mode 100644
index 0000000..e8e6752
--- /dev/null
+++ b/pages_promotion/bundling/detail.vue
@@ -0,0 +1,340 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view>
+		<view class="combo-package" :class="isIphoneX ? 'combo-iphonex' : ''">
+			<view class="combo-package-content">
+				<view class="combo-package-name color-title">{{ combo.bl_name }}</view>
+
+				<view v-for="(item, index) in combo.bundling_goods" :key="index" class="goods-info" @click="toGoodsDetail(item)">
+					<view class="goods-img">
+						<view class="img-wrap"><image :src="$util.img(item.sku_image, { size: 'mid' })" @error="imageError(index)" mode="aspectFit" /></view>
+					</view>
+					<view class="data-info">
+						<view class="goods-name">{{ item.sku_name }}</view>
+						<view class="price-wrap">
+							<text class="unit price-style small">{{ $lang('common.currencySymbol') }}</text>
+							<text class="price price-style large">{{ parseFloat(item.price).toFixed(2).split(".")[0] }}</text>
+							<text class="unit price-style small">.{{ parseFloat(item.price).toFixed(2).split(".")[1] }}</text>
+							<text class="num">x1</text>
+						</view>
+						<view class="stock-tips color-base-text" v-if="item.stock < num">
+							库存不足，剩余：{{ item.stock }}
+							<block v-if="item.unit">{{ item.unit }}</block>
+							<block v-else>件</block>
+						</view>
+					</view>
+				</view>
+			</view>
+
+			<view class="footer" :class="isIphoneX ? 'padding-bottom' : ''">
+				<view class="price-wrap">
+					<text class="label">套餐价：</text>
+					<text class="unit price-color">{{ $lang('common.currencySymbol') }}</text>
+					<text class="price price-color">{{ parseFloat(packagePrice).toFixed(2).split(".")[0] }}</text>
+					<text class="unit price-color">.{{ parseFloat(packagePrice).toFixed(2).split(".")[1] }}</text>
+					
+					<!-- <text class="info-num">为您节省：{{ $lang('common.currencySymbol') }} {{ saveThePrice }}</text> -->
+				</view>
+				<button class="footer-btn mini" v-if="isDisabled" type="primary" @click="comboBuy()" size="mini">立即购买</button>
+				<button class="footer-btn mini" v-else disabled>立即购买</button>
+			</view>
+		</view>
+
+		<!-- 悬浮按钮 -->
+		<hover-nav></hover-nav>
+		<loading-cover ref="loadingCover"></loading-cover>
+		<ns-login ref="login"></ns-login>
+
+		<!-- #ifdef MP-WEIXIN -->
+		<!-- 小程序隐私协议 -->
+		<privacy-popup ref="privacyPopup"></privacy-popup>
+		<!-- #endif -->
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			num: 1, //购买数量
+			blId: 0, //商品id
+			combo: [],
+			packagePrice: [], //套餐价
+			saveThePrice: 0, //节省价格
+			isDisabled: false, //按钮失效
+			isIphoneX: false //判断是否是iphoneX以上的设备
+		};
+	},
+	onLoad(e) {
+		this.blId = e.bl_id || 0;
+		this.isIphoneX = this.$util.uniappIsIPhoneX();
+	},
+	onShow() {
+		setTimeout( () => {
+			if (!this.addonIsExist.bundling) {
+				this.$util.showToast({
+					title: '商家未开启组合套餐',
+					mask: true,
+					duration: 2000
+				});
+				setTimeout(() => {
+					this.$util.redirectTo('/pages/index/index');
+				}, 2000);
+			}
+		},1000);
+
+		this.getDetail();
+	},
+	onHide() {
+		this.btnSwitch = true;
+	},
+	methods: {
+		// 获取套餐详情
+		getDetail() {
+			this.$api.sendRequest({
+				url: '/bundling/api/bundling/detail',
+				data: {
+					bl_id: this.blId
+				},
+				success: res => {
+					if (res.data) {
+						this.combo = res.data;
+						this.numberChange();
+					} else {
+						this.$util.showToast({
+							title: res.message
+						});
+					}
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				},
+				fail: res => {
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				}
+			});
+		},
+		toGoodsDetail(e) {
+			this.$util.redirectTo('/pages/goods/detail', { goods_id: e.goods_id });
+		},
+		numberChange(flag, callback) {
+			setTimeout(() => {
+				var disabledCount = 0;
+
+				// 防止空
+				if (flag && this.num.length == 0) {
+					this.num = 1;
+					disabledCount++;
+				}
+
+				// 防止输入0和负数、非法输入
+				if (flag && (this.num <= 0 || isNaN(this.num))) {
+					this.number = 1;
+					disabledCount++;
+				}
+
+				if (flag) this.num = parseInt(this.num);
+
+				var price = 0;
+				for (var i = 0; i < this.combo.bundling_goods.length; i++) {
+					price += parseFloat(this.combo.bundling_goods[i].price);
+					//检测库存
+					if (this.combo.bundling_goods[i].stock < this.num) disabledCount++;
+				}
+				this.isDisabled = !(disabledCount > 0);
+
+				this.saveThePrice = ((price - this.combo.bl_price) * this.num).toFixed(2);
+				this.packagePrice = (this.combo.bl_price * this.num).toFixed(2);
+				if (callback) callback();
+			}, 0);
+		},
+		// 套餐立即购买点击
+		async comboBuy() {
+			if (!this.isDisabled) return;
+			//纠正数量
+			this.numberChange(true, () => {
+				if (!this.storeToken) {
+					this.$refs.login.open('/pages_promotion/bundling/detail?bl_id=' + this.blId);
+					return;
+				}
+
+				if (this.btnSwitch == false) return;
+
+				this.btnSwitch = false;
+
+				var data = {
+					bl_id: this.blId,
+					num: this.num
+				};
+
+				uni.setStorage({
+					key: 'comboOrderCreateData',
+					data: data,
+					success: () => {
+						this.$util.redirectTo('/pages_promotion/bundling/payment');
+						this.btnSwitch = true;
+					}
+				});
+			});
+			
+		},
+		imageError(index) {
+			this.combo.bundling_goods[index].sku_image = this.$util.getDefaultImage().goods;
+			this.$forceUpdate();
+		}
+	},
+	onShareAppMessage(res) {
+		var title = '购买套餐，优惠多多哦';
+		var path = '/pages_promotion/combo/detail?bl_id=' + this.blId;
+		return {
+			title: title,
+			path: path,
+			success: res => {},
+			fail: res => {}
+		};
+	}
+};
+</script>
+
+<style lang="scss">
+.combo-package {
+	border-radius: $border-radius;
+	margin: 20rpx 30rpx;
+	margin-bottom: 160rpx;
+	background: #ffffff;
+
+	&.combo-iphonex {
+		margin-bottom: 230rpx;
+	}
+
+	.combo-package-content {
+		// padding-bottom: 40rpx;
+
+		.combo-package-name {
+			padding: 20rpx 30rpx;
+		}
+
+		.goods-info {
+			overflow: hidden;
+			padding: $padding 30rpx;
+			border-radius: $border-radius;
+
+			.goods-img {
+				display: inline-block;
+				width: 30%;
+				text-align: center;
+				line-height: 100%;
+				float: left;
+
+				.img-wrap {
+					display: inline-block;
+					width: 180rpx;
+					height: 180rpx;
+					text-align: center;
+					border-radius: $border-radius;
+
+					image {
+						height: 100%;
+						width: 100%;
+						vertical-align: middle;
+					}
+				}
+			}
+
+			.data-info {
+				display: inline-block;
+				width: 66%;
+				float: left;
+				position: relative;
+				margin-left: 20rpx;
+				height: 180rpx;
+
+				.goods-name {
+					overflow: hidden;
+					text-overflow: ellipsis;
+					-webkit-line-clamp: 2;
+					-webkit-box-orient: vertical;
+					display: -webkit-box;
+					line-height: 150%;
+					// margin-bottom: 20rpx;
+				}
+				.stock-tips {
+					position: absolute;
+					width: 100%;
+					bottom: 50rpx;
+					height: 40rpx;
+					line-height: 40rpx;
+					font-size: $font-size-tag;
+				}
+
+				.price-wrap {
+					height: 50rpx;
+					line-height: 50rpx;
+					position: absolute;
+					width: 100%;
+					bottom: 0;
+					.unit {
+						font-weight: bold;
+						font-size: $font-size-tag;
+						margin-right: 4rpx;
+					}
+					.price {
+						font-weight: bold;
+						font-size: $font-size-toolbar;
+					}
+
+					.num {
+						float: right;
+					}
+				}
+			}
+		}
+	}
+	.footer {
+		width: 100%;
+		background: #fff;
+		display: flex;
+		justify-content: space-between;
+		padding: 20rpx 24rpx;
+		box-sizing: border-box;
+		position: fixed;
+		bottom: 0;
+		left: 0;
+
+		.price-wrap {
+			flex: 1;
+			text-align: right;
+			vertical-align: middle;
+			line-height: 70rpx;
+			margin-right: 30rpx;
+			.label {
+				font-size: $font-size-base;
+			}
+			.unit {
+				font-weight: bold;
+				font-size: $font-size-tag;
+				margin-right: 4rpx;
+			}
+			.price {
+				font-weight: bold;
+				font-size: $font-size-toolbar;
+			}
+			.info-num {
+				font-size: $font-size-activity-tag;
+				color: $color-tip;
+				line-height: 1;
+				margin-top: 12rpx;
+			}
+		}
+
+		.footer-btn {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			height: 70rpx;
+			line-height: 70rpx;
+		}
+	}
+	.padding-bottom {
+		padding-bottom: 80rpx;
+	}
+}
+</style>
diff --git a/pages_promotion/bundling/payment.vue b/pages_promotion/bundling/payment.vue
new file mode 100644
index 0000000..15ff2f5
--- /dev/null
+++ b/pages_promotion/bundling/payment.vue
@@ -0,0 +1,49 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view>
+		<common-payment :api="api" create-data-key="comboOrderCreateData" ref="payment"></common-payment>
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			api: {
+				payment: '/bundling/api/ordercreate/payment',
+				calculate: '/bundling/api/ordercreate/calculate',
+				create: '/bundling/api/ordercreate/create'
+			}
+		}
+	},
+	provide() {
+	    return {
+			promotion: this.promotion.bind(this)
+	    }
+	},
+	onShow() {
+		if (this.$refs.payment) this.$refs.payment.pageShow();
+	},
+	methods: {
+		promotion(data){
+			if (data.bunding_info) {
+				return {title: '组合套餐', content: data.bunding_info.bl_name}
+			}
+		}
+	}
+};
+</script>
+
+<style scoped lang="scss">
+/deep/ .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+	background: none;
+	max-height: unset !important;
+	overflow-y: hidden !important;
+}
+/deep/ .uni-popup__wrapper {
+	border-radius: 20rpx 20rpx 0 0;
+}
+/deep/ .uni-popup {
+	z-index: 8;
+}
+</style>
diff --git a/pages_promotion/components/l-time/time.js b/pages_promotion/components/l-time/time.js
index 76c5f4b..1601c7b 100644
--- a/pages_promotion/components/l-time/time.js
+++ b/pages_promotion/components/l-time/time.js
@@ -1,161 +1,159 @@
-Function.prototype.asyAfter = function(afterfn) {
-	var _self = this;
-	return function() {
-		var ret = _self.apply(this, arguments);
-		if (ret === 'next') {
-			return afterfn.apply(this, arguments);
-		}
-		return ret;
-	}
-}
-
-Date.prototype.pattern = function(fmt) {
-	var o = {
-		"M+": this.getMonth() + 1, //月份         
-		"d+": this.getDate(), //日         
-		"h+": this.getHours() % 12 == 0 ? 12 : this.getHours() % 12, //小时         
-		"H+": this.getHours(), //小时         
-		"m+": this.getMinutes(), //分         
-		"s+": this.getSeconds(), //秒         
-		"q+": Math.floor((this.getMonth() + 3) / 3), //季度         
-		"S": this.getMilliseconds() //毫秒         
-	};
-	var week = {
-		"0": "\u65e5",
-		"1": "\u4e00",
-		"2": "\u4e8c",
-		"3": "\u4e09",
-		"4": "\u56db",
-		"5": "\u4e94",
-		"6": "\u516d"
-	};
-	if (/(y+)/.test(fmt)) {
-		fmt = fmt.replace(RegExp.$1, (this.getFullYear() + "").substr(4 - RegExp.$1.length));
-	}
-	if (/(E+)/.test(fmt)) {
-		fmt = fmt.replace(RegExp.$1, ((RegExp.$1.length > 1) ? (RegExp.$1.length > 2 ? "\u661f\u671f" : "\u5468") :
-				"") +
-			week[this.getDay() + ""]);
-	}
-	for (var k in o) {
-		if (new RegExp("(" + k + ")").test(fmt)) {
-			fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k])
-				.length)));
-		}
-	}
-	return fmt;
-}
-
-const isType = type => (/^\[object\s(.*)\]$/.exec(Object.prototype.toString.call(type)))[1];
-let Time = function() {};
-let timeProto = Time.prototype;
-
-//获取当前时间戳
-timeProto.getUnix = function() {
-	return new Date().getTime();
-}
-
-//获取当天0点0分0秒时间戳
-timeProto.getTodayUnix = function() {
-	let date = new Date();
-	let myDate = `${date.getFullYear()}/${(date.getMonth() + 1)}/${date.getDate()} 00:00:00`;
-	return new Date(myDate).getTime();
-}
-
-//获取今年1月1日0点0分0秒时间戳
-timeProto.getYearUnix = function() {
-	let date = new Date();
-	date.setMonth(0);
-	date.setDate(1);
-	date.setHours(0);
-	date.setMinutes(0);
-	date.setSeconds(0);
-	date.setMilliseconds(0);
-	return date.getTime();
-}
-
-//获取当前时间标准年月日
-timeProto.getLastDate = function(constTime) {
-	if (!constTime) {
-		return;
-	}
-	let date = new Date(constTime);
-	if (date.pattern) {
-		return date.pattern("yyyy-MM-dd");
-	}
-
-	let month = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1;
-	let day = date.getDate() < 10 ? '0' + date.getDate() : date.getDate();
-	return date.getFullYear() + '-' + month + '-' + day;
-}
-
-const resDateStr = function(timer, constTime) {
-	let _just = function(timer) {
-
-		if (timer <= 0 || Math.floor(timer / 60) <= 0) {
-			return "刚刚"
-		} else return 'next';
-	}
-
-	let _mm = function(timer) {
-		if (timer < 3600) {
-			return Math.floor(timer / 60) + "分钟前"
-		} else return 'next';
-	}
-	let _hh = function(timer, constTime) {
-		let today = _time_.getTodayUnix();
-		if (timer >= 3600 && (constTime - today >= 0)) {
-			//可切换显示模式
-			// return "今天 " + new Date(constTime).pattern("HH:mm");
-			return Math.floor(timer / 60 / 60) + "小时前";
-		} else {
-			return 'next'
-		};
-	}
-	let _dd = function(timer, constTime) {
-		let today = _time_.getTodayUnix();
-		timer = (today - constTime) / 1000;
-		if (timer / 86400 <= 31) {
-			return Math.ceil(timer / 86400) + "天前"
-		} else return 'next';
-	}
-	let _dlast = function(timer, constTime) {
-		return _time_.getLastDate(constTime);
-	}
-
-	let dateFilter = _just.asyAfter(_mm).asyAfter(_hh).asyAfter(_dd).asyAfter(_dlast);
-	return dateFilter(timer, constTime);
-}
-
-
-//转换时间
-const reg = new RegExp("-", "g");
-timeProto.getFormatTime = function(constTime, max) {
-	if (!constTime) {
-		return "";
-	}
-
-	switch (isType(constTime)) {
-		case 'Date':
-			constTime = constTime.getTime();
-			break;
-		case 'String':
-			constTime = constTime.replace(reg, "/");
-		default:
-			constTime = new Date(constTime).getTime();
-			break;
-	}
-
-	let now = this.getUnix();
-	let year = this.getYearUnix();
-	let timer = (now - constTime) / 1000;
-	if (constTime > now && max) {
-		return this.getLastDate(constTime);
-	}
-
-	let _t = this;
-	return resDateStr(timer, constTime);
-}
-
-const _time_ = new Time();
-export default _time_;
+Function.prototype.asyAfter = function(afterfn) {
+	var _self = this;
+	return function() {
+		var ret = _self.apply(this, arguments);
+		if (ret === 'next') {
+			return afterfn.apply(this, arguments);
+		}
+		return ret;
+	}
+}
+
+Date.prototype.pattern = function(fmt) {
+	var o = {
+		"M+": this.getMonth() + 1, //月份         
+		"d+": this.getDate(), //日         
+		"h+": this.getHours() % 12 == 0 ? 12 : this.getHours() % 12, //小时         
+		"H+": this.getHours(), //小时         
+		"m+": this.getMinutes(), //分         
+		"s+": this.getSeconds(), //秒         
+		"q+": Math.floor((this.getMonth() + 3) / 3), //季度         
+		"S": this.getMilliseconds() //毫秒         
+	};
+	var week = {
+		"0": "\u65e5",
+		"1": "\u4e00",
+		"2": "\u4e8c",
+		"3": "\u4e09",
+		"4": "\u56db",
+		"5": "\u4e94",
+		"6": "\u516d"
+	};
+	if (/(y+)/.test(fmt)) {
+		fmt = fmt.replace(RegExp.$1, (this.getFullYear() + "").substr(4 - RegExp.$1.length));
+	}
+	if (/(E+)/.test(fmt)) {
+		fmt = fmt.replace(RegExp.$1, ((RegExp.$1.length > 1) ? (RegExp.$1.length > 2 ? "\u661f\u671f" : "\u5468") : "") + week[this.getDay() + ""]);
+	}
+	for (var k in o) {
+		if (new RegExp("(" + k + ")").test(fmt)) {
+			fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));
+		}
+	}
+	return fmt;
+}
+
+const isType = type => (/^\[object\s(.*)\]$/.exec(Object.prototype.toString.call(type)))[1];
+let Time = function() {};
+let timeProto = Time.prototype;
+
+//获取当前时间戳
+timeProto.getUnix = function() {
+	return new Date().getTime();
+}
+
+//获取当天0点0分0秒时间戳
+timeProto.getTodayUnix = function() {
+	let date = new Date();
+	let myDate = `${date.getFullYear()}/${(date.getMonth() + 1)}/${date.getDate()} 00:00:00`;
+	return new Date(myDate).getTime();
+}
+
+//获取今年1月1日0点0分0秒时间戳
+timeProto.getYearUnix = function() {
+	let date = new Date();
+	date.setMonth(0);
+	date.setDate(1);
+	date.setHours(0);
+	date.setMinutes(0);
+	date.setSeconds(0);
+	date.setMilliseconds(0);
+	return date.getTime();
+}
+
+//获取当前时间标准年月日
+timeProto.getLastDate = function(constTime) {
+	if (!constTime) {
+		return;
+	}
+	let date = new Date(constTime);
+	if (date.pattern) {
+		return date.pattern("yyyy-MM-dd");
+	}
+
+	let month = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1;
+	let day = date.getDate() < 10 ? '0' + date.getDate() : date.getDate();
+	return date.getFullYear() + '-' + month + '-' + day;
+}
+
+const resDateStr = function(timer, constTime) {
+	let _just = function(timer) {
+
+		if (timer <= 0 || Math.floor(timer / 60) <= 0) {
+			return "刚刚"
+		} else return 'next';
+	}
+
+	let _mm = function(timer) {
+		if (timer < 3600) {
+			return Math.floor(timer / 60) + "分钟前"
+		} else return 'next';
+	}
+	let _hh = function(timer, constTime) {
+		let today = _time_.getTodayUnix();
+		if (timer >= 3600 && (constTime - today >= 0)) {
+			//可切换显示模式
+			// return "今天 " + new Date(constTime).pattern("HH:mm");
+			return Math.floor(timer / 60 / 60) + "小时前";
+		} else {
+			return 'next'
+		}
+	}
+	let _dd = function(timer, constTime) {
+		let today = _time_.getTodayUnix();
+		timer = (today - constTime) / 1000;
+		if (timer / 86400 <= 31) {
+			return Math.ceil(timer / 86400) + "天前"
+		} else return 'next';
+	}
+	let _dlast = function(timer, constTime) {
+		return _time_.getLastDate(constTime);
+	}
+
+	let dateFilter = _just.asyAfter(_mm).asyAfter(_hh).asyAfter(_dd).asyAfter(_dlast);
+	return dateFilter(timer, constTime);
+}
+
+
+//转换时间
+const reg = new RegExp("-", "g");
+timeProto.getFormatTime = function(constTime, max) {
+	if (!constTime) {
+		return "";
+	}
+
+	switch (isType(constTime)) {
+		case 'Date':
+			constTime = constTime.getTime();
+			break;
+		case 'String':
+			constTime = constTime.replace(reg, "/");
+			break;
+		default:
+			constTime = new Date(constTime).getTime();
+			break;
+	}
+
+	let now = this.getUnix();
+	let year = this.getYearUnix();
+	let timer = (now - constTime) / 1000;
+	if (constTime > now && max) {
+		return this.getLastDate(constTime);
+	}
+
+	let _t = this;
+	return resDateStr(timer, constTime);
+}
+
+const _time_ = new Time();
+export default _time_;
diff --git a/pages_promotion/components/yuyue-date/yuyue-date.js b/pages_promotion/components/yuyue-date/yuyue-date.js
index bfe777e..0bc7b20 100644
--- a/pages_promotion/components/yuyue-date/yuyue-date.js
+++ b/pages_promotion/components/yuyue-date/yuyue-date.js
@@ -1,98 +1,97 @@
-//字符串拼接
-export function strFormat(str) {
-	return str < 10 ? `0${str}` : str
-}
-// 获取当前时间
-export function currentTime() {
-	const myDate = new Date();
-	const year = myDate.getFullYear()
-	const m = myDate.getMonth() + 1;
-	const d = myDate.getDate();
-	// const date = year + '-' + strFormat(m) + '-' + strFormat(d); // 隐藏年
-	const date = strFormat(m) + '-' + strFormat(d);
-
-	const hour = myDate.getHours()
-	const min = myDate.getMinutes()
-	const secon = myDate.getSeconds()
-	const time = strFormat(hour) + ':' + strFormat(min) + ':' + strFormat(secon);
-	return {
-		year,
-		date,
-		time
-	}
-}
-
-//时间戳转日期
-export function timeStamp(time) {
-	const dates = new Date(time)
-	const year = dates.getFullYear()
-	const month = dates.getMonth() + 1
-	const date = dates.getDate()
-	const day = dates.getDay()
-	const hour = dates.getHours()
-	const min = dates.getMinutes()
-	const days = ['日', '一', '二', '三', '四', '五', '六']
-	return {
-		allDate: `${year}/${strFormat(month)}/${strFormat(date)}`,
-		date: `${strFormat(month)}-${strFormat(date)}`, //返回的日期 07-01，${strFormat(year)}-${strFormat(month)}-${strFormat(date)}
-		day: `周${days[day]}`, //返回的礼拜天数  星期一
-		hour: strFormat(hour) + ':' + strFormat(min) // + ':00' //返回的时钟 08:00
-	}
-}
-
-//获取最近7天的日期和礼拜天数
-export function initData(appointedDay = '') {
-	const time = []
-	const date = appointedDay ? new Date(appointedDay) : new Date()
-
-	const now = date.getTime() //获取当前日期的时间戳
-	let timeStr = 3600 * 24 * 1000 //一天的时间戳
-	let obj = {
-		0: "今天",
-		1: "明天",
-		2: "后天"
-	}
-	for (let i = 0; i < 7; i++) {
-		const timeObj = {}
-		timeObj.date = timeStamp(now + timeStr * i).date //保存日期
-		timeObj.timeStamp = now + timeStr * i //保存时间戳
-		timeObj.week = appointedDay == '' ? (obj[i] ?? timeStamp(now + timeStr * i).day) : timeStamp(now + timeStr * i)
-			.day
-		time.push(timeObj)
-	}
-	return time
-}
-
-//时间数组
-export function initTime(startTime = '09:00', endTime = '18:30', timeInterval = 1) {
-	const time = []
-	const date = timeStamp(Date.now()).allDate
-	const startDate = `${date} ${startTime}`
-	const endDate = `${date} ${endTime}`
-	const startTimeStamp = new Date(startDate).getTime()
-	const endTimeStamp = new Date(endDate).getTime()
-	const timeStr = 3600 * 1000 * timeInterval
-	for (let i = startTimeStamp; i <= endTimeStamp; i = i + timeStr) {
-		const timeObj = {}
-		timeObj.time = timeStamp(i).hour
-		timeObj.disable = false
-		time.push(timeObj)
-	}
-	return time
-}
-
-export function weekDate(){
-	var now = new Date(); //当前日期 
-	var nowDayOfWeek = now.getDay(); //今天本周的第几天 
-	var nowDay = now.getDate(); //当前日 
-	var nowMonth = now.getMonth(); //当前月 
-	var nowYear = now.getYear(); //当前年 
-	
-	var weekStartDate = new Date(nowYear, nowMonth, nowDay - nowDayOfWeek + 1); 
-	var weekEndDate = new Date(nowYear, nowMonth, nowDay + (7 - nowDayOfWeek)); 
-	
-	var arr = [];
-	arr[0] = strFormat(weekStartDate.getMonth()+1) + '-' + strFormat(weekStartDate.getDate());
-	arr[1] = strFormat(weekEndDate.getMonth()+1) + '-' + strFormat(weekEndDate.getDate());
-	return arr;
-}
+//字符串拼接
+export function strFormat(str) {
+	return str < 10 ? `0${str}` : str
+}
+// 获取当前时间
+export function currentTime() {
+	const myDate = new Date();
+	const year = myDate.getFullYear()
+	const m = myDate.getMonth() + 1;
+	const d = myDate.getDate();
+	// const date = year + '-' + strFormat(m) + '-' + strFormat(d); // 隐藏年
+	const date = strFormat(m) + '-' + strFormat(d);
+
+	const hour = myDate.getHours()
+	const min = myDate.getMinutes()
+	const secon = myDate.getSeconds()
+	const time = strFormat(hour) + ':' + strFormat(min) + ':' + strFormat(secon);
+	return {
+		year,
+		date,
+		time
+	}
+}
+
+//时间戳转日期
+export function timeStamp(time) {
+	const dates = new Date(time)
+	const year = dates.getFullYear()
+	const month = dates.getMonth() + 1
+	const date = dates.getDate()
+	const day = dates.getDay()
+	const hour = dates.getHours()
+	const min = dates.getMinutes()
+	const days = ['日', '一', '二', '三', '四', '五', '六']
+	return {
+		allDate: `${year}/${strFormat(month)}/${strFormat(date)}`,
+		date: `${strFormat(month)}-${strFormat(date)}`, //返回的日期 07-01，${strFormat(year)}-${strFormat(month)}-${strFormat(date)}
+		day: `周${days[day]}`, //返回的礼拜天数  星期一
+		hour: strFormat(hour) + ':' + strFormat(min) // + ':00' //返回的时钟 08:00
+	}
+}
+
+//获取最近7天的日期和礼拜天数
+export function initData(appointedDay = '') {
+	const time = []
+	const date = appointedDay ? new Date(appointedDay) : new Date()
+
+	const now = date.getTime() //获取当前日期的时间戳
+	let timeStr = 3600 * 24 * 1000 //一天的时间戳
+	let obj = {
+		0: "今天",
+		1: "明天",
+		2: "后天"
+	}
+	for (let i = 0; i < 7; i++) {
+		const timeObj = {}
+		timeObj.date = timeStamp(now + timeStr * i).date //保存日期
+		timeObj.timeStamp = now + timeStr * i //保存时间戳
+		timeObj.week = appointedDay == '' ? (obj[i] ?? timeStamp(now + timeStr * i).day) : timeStamp(now + timeStr * i).day
+		time.push(timeObj)
+	}
+	return time
+}
+
+//时间数组
+export function initTime(startTime = '09:00', endTime = '18:30', timeInterval = 1) {
+	const time = []
+	const date = timeStamp(Date.now()).allDate
+	const startDate = `${date} ${startTime}`
+	const endDate = `${date} ${endTime}`
+	const startTimeStamp = new Date(startDate).getTime()
+	const endTimeStamp = new Date(endDate).getTime()
+	const timeStr = 3600 * 1000 * timeInterval
+	for (let i = startTimeStamp; i <= endTimeStamp; i = i + timeStr) {
+		const timeObj = {}
+		timeObj.time = timeStamp(i).hour
+		timeObj.disable = false
+		time.push(timeObj)
+	}
+	return time
+}
+
+export function weekDate(){
+	var now = new Date(); //当前日期 
+	var nowDayOfWeek = now.getDay(); //今天本周的第几天 
+	var nowDay = now.getDate(); //当前日 
+	var nowMonth = now.getMonth(); //当前月 
+	var nowYear = now.getYear(); //当前年 
+	
+	var weekStartDate = new Date(nowYear, nowMonth, nowDay - nowDayOfWeek + 1); 
+	var weekEndDate = new Date(nowYear, nowMonth, nowDay + (7 - nowDayOfWeek)); 
+	
+	var arr = [];
+	arr[0] = strFormat(weekStartDate.getMonth()+1) + '-' + strFormat(weekStartDate.getDate());
+	arr[1] = strFormat(weekEndDate.getMonth()+1) + '-' + strFormat(weekEndDate.getDate());
+	return arr;
+}
diff --git a/pages_promotion/fenxiao/goods_list.vue b/pages_promotion/fenxiao/goods_list.vue
index a3eac56..8127d6b 100644
--- a/pages_promotion/fenxiao/goods_list.vue
+++ b/pages_promotion/fenxiao/goods_list.vue
@@ -1,413 +1,414 @@
-<template>
-	<page-meta :page-style="themeColor"></page-meta>
-	<view class="content">
-		<mescroll-uni ref="mescroll" @getData="getGoodsList">
-			<block slot="list">
-				<view class="goods-list" :style="{ backgroundImage: 'url(' + $util.img('public/uniapp/fenxiao/promote/promote_bg.png') + ')' }">
-					<scroll-view class="quick-nav" scroll-x="true">
-						<!-- #ifdef MP -->
-						<view class="uni-scroll-view-content">
-							<!-- #endif -->
-							<view class="quick-nav-item" :class="{ selected: categoryId == 0 }" @click="changeCategory(0)">全部</view>
-							<view
-								class="quick-nav-item"
-								v-for="item in categoryList"
-								:class="{ selected: categoryId == item.category_id }"
-								@click="changeCategory(item.category_id)"
-							>
-								{{ item.category_name }}
-							</view>
-							<!-- #ifdef MP -->
-						</view>
-						<!-- #endif -->
-					</scroll-view>
-					<view v-for="(item, index) in goodsList" :key="index" class="goods-item" @click="navToDetailPage(item)">
-						<view class="image-wrap">
-							<image :src="$util.img(item.sku_image, { size: 'mid' })" @error="imageError(index)" mode="aspectFill" />
-						</view>
-						<view class="goods-content">
-							<view class="goods-name">
-								<text class="name">{{ item.sku_name }}</text>
-								<view class="label-list" v-if="item.label_name">
-									<text class="label-item">{{ item.label_name }}</text>
-								</view>
-							</view>
-							<view class="goods-bottom">
-								<view class="goods-price color-base-text">
-									<text class="font-size-tag">￥</text>
-									{{ item.discount_price }}
-								</view>
-								<view class="goods-share" @click.stop="shareFn('goods', index)">
-									<text class="icondiy icon-system-share"></text>
-									<text class="txt" v-if="!is_fenxiao">分享</text>
-									<text class="txt" v-else>赚{{ item.commission_money }}元</text>
-								</view>
-							</view>
-						</view>
-					</view>
-					<view class="empty" v-if="goodsList.length == 0">
-						<ns-empty :isIndex="false" text="暂无分销商品" textColor="#fff"></ns-empty>
-					</view>
-				</view>
-			</block>
-		</mescroll-uni>
-		<view class="active-btn" v-if="goodsList.length">
-			<!-- #ifdef MP -->
-			<button class="share-btn" :plain="true" open-type="share">分享好友</button>
-			<text class="tag">|</text>
-			<!-- #endif -->
-			<text class="btn" @click="shareFn('fenxiao')">生成海报</text>
-		</view>
-		<loading-cover ref="loadingCover"></loading-cover>
-
-		<!-- 分享弹窗 -->
-		<view @touchmove.prevent.stop>
-			<uni-popup ref="sharePopup" type="bottom" class="share-popup">
-				<view>
-					<view class="share-title">分享</view>
-					<view class="share-content">
-						<!-- #ifdef MP -->
-						<view class="share-box">
-							<button class="share-btn" :plain="true" open-type="share">
-								<view class="iconfont icon-share-friend"></view>
-								<text>分享给好友</text>
-							</button>
-						</view>
-						<!-- #endif -->
-
-						<!-- #ifdef MP-WEIXIN -->
-						<view class="share-box" v-if="goodsCircle">
-							<button class="share-btn" :plain="true" @click="openBusinessView">
-								<view class="iconfont icon-haowuquan"></view>
-								<text>分享到好物圈</text>
-							</button>
-						</view>
-						<!-- #endif -->
-
-						<view class="share-box" @click="openPosterPopup">
-							<button class="share-btn" :plain="true">
-								<view class="iconfont icon-pengyouquan"></view>
-								<text>生成分享海报</text>
-							</button>
-						</view>
-						<!-- #ifdef H5 -->
-						<view class="share-box" @click="copyUrl">
-							<button class="share-btn" :plain="true">
-								<view class="iconfont icon-fuzhilianjie"></view>
-								<text>复制链接</text>
-							</button>
-						</view>
-						<!-- #endif -->
-					</view>
-					<view class="share-footer" @click="closeSharePopup"><text>取消分享</text></view>
-				</view>
-			</uni-popup>
-		</view>
-		<!-- 海报 -->
-		<view @touchmove.prevent.stop>
-			<uni-popup ref="posterPopup" type="bottom" class="poster-layer">
-				<template v-if="poster != '-1'">
-					<view>
-						<view class="image-wrap">
-							<image :src="$util.img(poster)" :show-menu-by-longpress="true" />
-						</view>
-						<!-- #ifdef MP || APP-PLUS  -->
-						<view class="save" @click="saveGoodsPoster()">保存图片</view>
-						<!-- #endif -->
-						<!-- #ifdef H5 -->
-						<view class="save">长按保存图片</view>
-						<!-- #endif -->
-					</view>
-					<view class="close iconfont icon-close" @click="closePosterPopup()"></view>
-				</template>
-				<view v-else class="msg">{{ posterMsg }}</view>
-			</uni-popup>
-		</view>
-
-		<!-- #ifdef MP-WEIXIN -->
-		<!-- 小程序隐私协议 -->
-		<privacy-popup ref="privacyPopup"></privacy-popup>
-		<!-- #endif -->
-	</view>
-</template>
-
-<script>
-import list from './public/js/goods_list.js';
-import fenxiaoWords from 'common/js/fenxiao-words.js';
-
-export default {
-	mixins: [list, fenxiaoWords]
-};
-</script>
-
-<style>
-.quick-nav >>> .uni-scroll-view-content {
-	display: flex;
-}
-</style>
-<style lang="scss">
-/deep/ .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
-	max-height: unset !important;
-}
-.quick-nav {
-	margin-bottom: 20rpx;
-	.quick-nav-item {
-		display: flex;
-		align-items: center;
-		padding: 0 18rpx;
-		box-sizing: border-box;
-		flex-shrink: 0;
-		border-radius: 40rpx;
-		margin-right: 20rpx;
-		height: 48rpx;
-		font-size: 24rpx;
-		background: #fff;
-		color: $base-color;
-
-		&.selected {
-			background: $base-color;
-			color: #fff;
-		}
-
-		&:last-child {
-			margin-right: 0;
-		}
-	}
-}
-.content {
-	overflow: hidden;
-	padding: 0 30rpx 160rpx;
-	min-height: 100vh;
-	background-color: #ff2d46;
-
-	.goods-list {
-		min-height: 100vh;
-		padding: 420rpx 30rpx 0;
-		background-size: 100%;
-		background-repeat: no-repeat;
-		box-sizing: border-box;
-		.goods-item {
-			margin-bottom: 20rpx;
-			background: #ffffff;
-			padding: $padding;
-			display: flex;
-			border-radius: 10rpx;
-			&:last-child {
-				margin-bottom: 0;
-			}
-		}
-
-		.image-wrap {
-			display: inline-block;
-			width: 200rpx;
-			height: 200rpx;
-			line-height: 200rpx;
-			border-radius: 10rpx;
-			overflow: hidden;
-			flex-shrink: 0;
-			image {
-				width: 100%;
-				height: 100%;
-				opacity: 1;
-				border-radius: 20rpx;
-			}
-		}
-
-		.goods-content {
-			width: calc(100% - 200rpx);
-			min-height: 160rpx;
-			padding-left: $padding;
-			box-sizing: border-box;
-			display: flex;
-			flex-direction: column;
-			justify-content: space-between;
-
-			.goods-name {
-				width: 100%;
-				line-height: 1.3;
-				.name {
-					line-height: 1.3;
-					word-break: break-all;
-					text-overflow: ellipsis;
-					overflow: hidden;
-					display: -webkit-box;
-					-webkit-line-clamp: 2;
-					-webkit-box-orient: vertical;
-				}
-				.label-list {
-					display: flex;
-					align-items: center;
-					margin-top: 6rpx;
-					.label-item {
-						padding: 4rpx 10rpx;
-						font-size: $font-size-tag;
-						color: $base-color;
-						border: 2rpx solid $base-color;
-						border-radius: 6rpx;
-						line-height: 1;
-					}
-				}
-			}
-
-			.goods-bottom {
-				width: 100%;
-				display: flex;
-				justify-content: space-between;
-				align-items: center;
-
-				.goods-price {
-					line-height: 1.3;
-					font-size: $font-size-base;
-					font-weight: bold;
-				}
-
-				.goods-share {
-					height: 50rpx;
-					display: flex;
-					justify-content: center;
-					align-items: center;
-					padding: 0 $padding;
-					border-radius: 50rpx;
-					border: 2rpx solid $base-color;
-					text {
-						color: $base-color;
-						border-radius: 40rpx;
-						font-size: $font-size-tag;
-					}
-
-					.icondiy {
-						margin-right: 4rpx;
-						font-size: $font-size-base;
-					}
-				}
-			}
-		}
-	}
-	.active-btn {
-		position: fixed;
-		bottom: 40rpx;
-		left: 80rpx;
-		right: 80rpx;
-		height: 80rpx;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		z-index: 2;
-		border-radius: 50rpx;
-		background-color: $base-color;
-		color: #fff;
-		.btn {
-			flex: 1;
-			text-align: center;
-		}
-		.share-btn {
-			margin: 0;
-			padding: 0;
-			flex: 1;
-			text-align: center;
-			border: 0;
-			color: #fff;
-		}
-	}
-
-	.share-popup,
-	.uni-popup__wrapper-box {
-		.share-title {
-			line-height: 60rpx;
-			font-size: $font-size-toolbar;
-			padding: 15rpx 0;
-			text-align: center;
-		}
-
-		.share-content {
-			display: flex;
-			display: -webkit-flex;
-			-webkit-flex-wrap: wrap;
-			-moz-flex-wrap: wrap;
-			-ms-flex-wrap: wrap;
-			-o-flex-wrap: wrap;
-			flex-wrap: wrap;
-			padding: 80rpx 15rpx;
-
-			.share-box {
-				flex: 1;
-				text-align: center;
-
-				.share-btn {
-					margin: 0;
-					padding: 0;
-					border: none;
-					line-height: 1;
-					height: auto;
-					text {
-						margin-top: 20rpx;
-						font-size: $font-size-tag;
-						display: block;
-						color: $color-title;
-					}
-				}
-
-				.iconfont {
-					font-size: 80rpx;
-					line-height: initial;
-				}
-				.icon-fuzhilianjie,
-				.icon-pengyouquan,
-				.icon-haowuquan,
-				.icon-share-friend {
-					color: #07c160;
-				}
-			}
-		}
-
-		.share-footer {
-			height: 90rpx;
-			line-height: 90rpx;
-			border-top: 2rpx solid $color-line;
-			text-align: center;
-		}
-	}
-	.poster-layer {
-		.generate-poster {
-			padding: 40rpx 0;
-			.iconfont {
-				font-size: 80rpx;
-				color: #07c160;
-				line-height: initial;
-			}
-			> view {
-				text-align: center;
-				&:last-child {
-					margin-top: 20rpx;
-				}
-			}
-		}
-		.image-wrap {
-			width: 64%;
-			height: 854rpx;
-			margin: 60rpx auto 40rpx auto;
-			box-shadow: 0 0 32rpx rgba(100, 100, 100, 0.3);
-			image {
-				width: 480rpx;
-				height: 854rpx;
-			}
-		}
-		.msg {
-			padding: 40rpx;
-		}
-		.save {
-			text-align: center;
-			height: 80rpx;
-			line-height: 80rpx;
-		}
-		.close {
-			position: absolute;
-			top: 0;
-			right: 20rpx;
-			width: 40rpx;
-			height: 80rpx;
-			font-size: 50rpx;
-		}
-	}
-}
-</style>
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view class="content">
+		<mescroll-uni ref="mescroll" @getData="getGoodsList">
+			<block slot="list">
+				<view class="goods-list" :style="{ backgroundImage: 'url(' + $util.img('public/uniapp/fenxiao/promote/promote_bg.png') + ')' }">
+					<scroll-view class="quick-nav" scroll-x="true">
+						<!-- #ifdef MP -->
+						<view class="uni-scroll-view-content">
+							<!-- #endif -->
+							<view class="quick-nav-item" :class="{ selected: categoryId == 0 }" @click="changeCategory(0)">全部</view>
+							<view
+								class="quick-nav-item"
+								v-for="item in categoryList"
+								:key="item.category_id"
+								:class="{ selected: categoryId == item.category_id }"
+								@click="changeCategory(item.category_id)"
+							>
+								{{ item.category_name }}
+							</view>
+							<!-- #ifdef MP -->
+						</view>
+						<!-- #endif -->
+					</scroll-view>
+					<view v-for="(item, index) in goodsList" :key="index" class="goods-item" @click="navToDetailPage(item)">
+						<view class="image-wrap">
+							<image :src="$util.img(item.sku_image, { size: 'mid' })" @error="imageError(index)" mode="aspectFill" />
+						</view>
+						<view class="goods-content">
+							<view class="goods-name">
+								<text class="name">{{ item.sku_name }}</text>
+								<view class="label-list" v-if="item.label_name">
+									<text class="label-item">{{ item.label_name }}</text>
+								</view>
+							</view>
+							<view class="goods-bottom">
+								<view class="goods-price color-base-text">
+									<text class="font-size-tag">￥</text>
+									{{ item.discount_price }}
+								</view>
+								<view class="goods-share" @click.stop="shareFn('goods', index)">
+									<text class="icondiy icon-system-share"></text>
+									<text class="txt" v-if="!is_fenxiao">分享</text>
+									<text class="txt" v-else>赚{{ item.commission_money }}元</text>
+								</view>
+							</view>
+						</view>
+					</view>
+					<view class="empty" v-if="goodsList.length == 0">
+						<ns-empty :isIndex="false" text="暂无分销商品" textColor="#fff"></ns-empty>
+					</view>
+				</view>
+			</block>
+		</mescroll-uni>
+		<view class="active-btn" v-if="goodsList.length">
+			<!-- #ifdef MP -->
+			<button class="share-btn" :plain="true" open-type="share">分享好友</button>
+			<text class="tag">|</text>
+			<!-- #endif -->
+			<text class="btn" @click="shareFn('fenxiao')">生成海报</text>
+		</view>
+		<loading-cover ref="loadingCover"></loading-cover>
+
+		<!-- 分享弹窗 -->
+		<view @touchmove.prevent.stop>
+			<uni-popup ref="sharePopup" type="bottom" class="share-popup">
+				<view>
+					<view class="share-title">分享</view>
+					<view class="share-content">
+						<!-- #ifdef MP -->
+						<view class="share-box">
+							<button class="share-btn" :plain="true" open-type="share">
+								<view class="iconfont icon-share-friend"></view>
+								<text>分享给好友</text>
+							</button>
+						</view>
+						<!-- #endif -->
+
+						<!-- #ifdef MP-WEIXIN -->
+						<view class="share-box" v-if="goodsCircle">
+							<button class="share-btn" :plain="true" @click="openBusinessView">
+								<view class="iconfont icon-haowuquan"></view>
+								<text>分享到好物圈</text>
+							</button>
+						</view>
+						<!-- #endif -->
+
+						<view class="share-box" @click="openPosterPopup">
+							<button class="share-btn" :plain="true">
+								<view class="iconfont icon-pengyouquan"></view>
+								<text>生成分享海报</text>
+							</button>
+						</view>
+						<!-- #ifdef H5 -->
+						<view class="share-box" @click="copyUrl">
+							<button class="share-btn" :plain="true">
+								<view class="iconfont icon-fuzhilianjie"></view>
+								<text>复制链接</text>
+							</button>
+						</view>
+						<!-- #endif -->
+					</view>
+					<view class="share-footer" @click="closeSharePopup"><text>取消分享</text></view>
+				</view>
+			</uni-popup>
+		</view>
+		<!-- 海报 -->
+		<view @touchmove.prevent.stop>
+			<uni-popup ref="posterPopup" type="bottom" class="poster-layer">
+				<template v-if="poster != '-1'">
+					<view>
+						<view class="image-wrap">
+							<image :src="$util.img(poster)" :show-menu-by-longpress="true" />
+						</view>
+						<!-- #ifdef MP || APP-PLUS  -->
+						<view class="save" @click="saveGoodsPoster()">保存图片</view>
+						<!-- #endif -->
+						<!-- #ifdef H5 -->
+						<view class="save">长按保存图片</view>
+						<!-- #endif -->
+					</view>
+					<view class="close iconfont icon-close" @click="closePosterPopup()"></view>
+				</template>
+				<view v-else class="msg">{{ posterMsg }}</view>
+			</uni-popup>
+		</view>
+
+		<!-- #ifdef MP-WEIXIN -->
+		<!-- 小程序隐私协议 -->
+		<privacy-popup ref="privacyPopup"></privacy-popup>
+		<!-- #endif -->
+	</view>
+</template>
+
+<script>
+import list from './public/js/goods_list.js';
+import fenxiaoWords from 'common/js/fenxiao-words.js';
+
+export default {
+	mixins: [list, fenxiaoWords]
+};
+</script>
+
+<style>
+.quick-nav >>> .uni-scroll-view-content {
+	display: flex;
+}
+</style>
+<style lang="scss">
+/deep/ .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+	max-height: unset !important;
+}
+.quick-nav {
+	margin-bottom: 20rpx;
+	.quick-nav-item {
+		display: flex;
+		align-items: center;
+		padding: 0 18rpx;
+		box-sizing: border-box;
+		flex-shrink: 0;
+		border-radius: 40rpx;
+		margin-right: 20rpx;
+		height: 48rpx;
+		font-size: 24rpx;
+		background: #fff;
+		color: $base-color;
+
+		&.selected {
+			background: $base-color;
+			color: #fff;
+		}
+
+		&:last-child {
+			margin-right: 0;
+		}
+	}
+}
+.content {
+	overflow: hidden;
+	padding: 0 30rpx 160rpx;
+	min-height: 100vh;
+	background-color: #ff2d46;
+
+	.goods-list {
+		min-height: 100vh;
+		padding: 420rpx 30rpx 0;
+		background-size: 100%;
+		background-repeat: no-repeat;
+		box-sizing: border-box;
+		.goods-item {
+			margin-bottom: 20rpx;
+			background: #ffffff;
+			padding: $padding;
+			display: flex;
+			border-radius: 10rpx;
+			&:last-child {
+				margin-bottom: 0;
+			}
+		}
+
+		.image-wrap {
+			display: inline-block;
+			width: 200rpx;
+			height: 200rpx;
+			line-height: 200rpx;
+			border-radius: 10rpx;
+			overflow: hidden;
+			flex-shrink: 0;
+			image {
+				width: 100%;
+				height: 100%;
+				opacity: 1;
+				border-radius: 20rpx;
+			}
+		}
+
+		.goods-content {
+			width: calc(100% - 200rpx);
+			min-height: 160rpx;
+			padding-left: $padding;
+			box-sizing: border-box;
+			display: flex;
+			flex-direction: column;
+			justify-content: space-between;
+
+			.goods-name {
+				width: 100%;
+				line-height: 1.3;
+				.name {
+					line-height: 1.3;
+					word-break: break-all;
+					text-overflow: ellipsis;
+					overflow: hidden;
+					display: -webkit-box;
+					-webkit-line-clamp: 2;
+					-webkit-box-orient: vertical;
+				}
+				.label-list {
+					display: flex;
+					align-items: center;
+					margin-top: 6rpx;
+					.label-item {
+						padding: 4rpx 10rpx;
+						font-size: $font-size-tag;
+						color: $base-color;
+						border: 2rpx solid $base-color;
+						border-radius: 6rpx;
+						line-height: 1;
+					}
+				}
+			}
+
+			.goods-bottom {
+				width: 100%;
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+
+				.goods-price {
+					line-height: 1.3;
+					font-size: $font-size-base;
+					font-weight: bold;
+				}
+
+				.goods-share {
+					height: 50rpx;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					padding: 0 $padding;
+					border-radius: 50rpx;
+					border: 2rpx solid $base-color;
+					text {
+						color: $base-color;
+						border-radius: 40rpx;
+						font-size: $font-size-tag;
+					}
+
+					.icondiy {
+						margin-right: 4rpx;
+						font-size: $font-size-base;
+					}
+				}
+			}
+		}
+	}
+	.active-btn {
+		position: fixed;
+		bottom: 40rpx;
+		left: 80rpx;
+		right: 80rpx;
+		height: 80rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		z-index: 2;
+		border-radius: 50rpx;
+		background-color: $base-color;
+		color: #fff;
+		.btn {
+			flex: 1;
+			text-align: center;
+		}
+		.share-btn {
+			margin: 0;
+			padding: 0;
+			flex: 1;
+			text-align: center;
+			border: 0;
+			color: #fff;
+		}
+	}
+
+	.share-popup,
+	.uni-popup__wrapper-box {
+		.share-title {
+			line-height: 60rpx;
+			font-size: $font-size-toolbar;
+			padding: 15rpx 0;
+			text-align: center;
+		}
+
+		.share-content {
+			display: flex;
+			display: -webkit-flex;
+			-webkit-flex-wrap: wrap;
+			-moz-flex-wrap: wrap;
+			-ms-flex-wrap: wrap;
+			-o-flex-wrap: wrap;
+			flex-wrap: wrap;
+			padding: 80rpx 15rpx;
+
+			.share-box {
+				flex: 1;
+				text-align: center;
+
+				.share-btn {
+					margin: 0;
+					padding: 0;
+					border: none;
+					line-height: 1;
+					height: auto;
+					text {
+						margin-top: 20rpx;
+						font-size: $font-size-tag;
+						display: block;
+						color: $color-title;
+					}
+				}
+
+				.iconfont {
+					font-size: 80rpx;
+					line-height: initial;
+				}
+				.icon-fuzhilianjie,
+				.icon-pengyouquan,
+				.icon-haowuquan,
+				.icon-share-friend {
+					color: #07c160;
+				}
+			}
+		}
+
+		.share-footer {
+			height: 90rpx;
+			line-height: 90rpx;
+			border-top: 2rpx solid $color-line;
+			text-align: center;
+		}
+	}
+	.poster-layer {
+		.generate-poster {
+			padding: 40rpx 0;
+			.iconfont {
+				font-size: 80rpx;
+				color: #07c160;
+				line-height: initial;
+			}
+			> view {
+				text-align: center;
+				&:last-child {
+					margin-top: 20rpx;
+				}
+			}
+		}
+		.image-wrap {
+			width: 64%;
+			height: 854rpx;
+			margin: 60rpx auto 40rpx auto;
+			box-shadow: 0 0 32rpx rgba(100, 100, 100, 0.3);
+			image {
+				width: 480rpx;
+				height: 854rpx;
+			}
+		}
+		.msg {
+			padding: 40rpx;
+		}
+		.save {
+			text-align: center;
+			height: 80rpx;
+			line-height: 80rpx;
+		}
+		.close {
+			position: absolute;
+			top: 0;
+			right: 20rpx;
+			width: 40rpx;
+			height: 80rpx;
+			font-size: 50rpx;
+		}
+	}
+}
+</style>
diff --git a/pages_promotion/merch/merchcategory.vue b/pages_promotion/merch/merchcategory.vue
index 13fa130..6572d50 100644
--- a/pages_promotion/merch/merchcategory.vue
+++ b/pages_promotion/merch/merchcategory.vue
@@ -1,58 +1,58 @@
 <template>
 	<page-meta :page-style="themeColor"></page-meta>
 	<view>
-		<view class="category-page-wrap category-template-1" style="height: calc(-56px + 100vh);">
-
-		<!-- 	<view class="search-box" @click="$util.redirectTo('/pages_tool/goods/search')">
-				<view class="search-content">
-					<input type="text" class="uni-input" maxlength="50" placeholder="商品搜索" confirm-type="search" disabled="true" />
-					<text class="iconfont icon-sousuo3"></text>
-				</view>
-			</view> -->
-			<view class="content-box" v-if="categoryTree">
-				<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="index" :class="[
-									{ select: select == index },
-								]" @click="switchOneCategory(index)">
-								<view class="">{{ item.category_name }}</view>
-							</view>
-						</view>
-					</scroll-view>
-	
-					<view class="right-flex-wrap">
-						<scroll-view scroll-y="true" class="content-wrap" ref="contentWrap" :scroll-into-view="categoryId" :scroll-with-animation="true"
-						@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" :id="'category-' + index" v-if="item.child_list.length > 0">
-								<!---->
-								<view class="item-wrap category">
-									<view class="category-title">{{ item.category_name }}</view>
-									<view class="category-list">
-										<view class="category-item" v-for="(one, oneIndex) in item.child_list" :key="oneIndex" @click="$util.redirectTo('/pages_promotion/merch/detail', { merch_id: one.merch_id })">
-											<view class="img-box">
-												<image :src="$util.img(one.merch_image)" mode="widthFix"/>
-											</view>
-											<view class="name">{{ one.merch_name }}</view>
-										</view>
-									</view>
-								</view>
-								<!-- <view class="category-empty" v-else>
-									<image src="/static/common-empty.png" mode="widthFix"/>
-								</view> -->
-							</view>
-						</scroll-view>
-					</view>
-				</block>
-		<!-- 		<view class="category-empty">
-					<image :src="$util.img('public/uniapp/category/empty.png')" mode="widthFix"></image>
-					<view class="tips">暂时没有分类哦！</view>
-				</view> -->
-			</view>
+		<view class="category-page-wrap category-template-1" style="height: calc(-56px + 100vh);">
+
+		<!-- 	<view class="search-box" @click="$util.redirectTo('/pages_tool/goods/search')">
+				<view class="search-content">
+					<input type="text" class="uni-input" maxlength="50" placeholder="商品搜索" confirm-type="search" disabled="true" />
+					<text class="iconfont icon-sousuo3"></text>
+				</view>
+			</view> -->
+			<view class="content-box" v-if="categoryTree">
+				<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="index" :class="[
+									{ select: select == index },
+								]" @click="switchOneCategory(index)">
+								<view class="">{{ item.category_name }}</view>
+							</view>
+						</view>
+					</scroll-view>
+	
+					<view class="right-flex-wrap">
+						<scroll-view scroll-y="true" class="content-wrap" ref="contentWrap" :scroll-into-view="categoryId" :scroll-with-animation="true"
+						@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" :id="'category-' + index" v-if="item.child_list.length > 0" :key="item.category_id || index">
+								<!---->
+								<view class="item-wrap category">
+									<view class="category-title">{{ item.category_name }}</view>
+									<view class="category-list">
+										<view class="category-item" v-for="(one, oneIndex) in item.child_list" :key="oneIndex" @click="$util.redirectTo('/pages_promotion/merch/detail', { merch_id: one.merch_id })">
+											<view class="img-box">
+												<image :src="$util.img(one.merch_image)" mode="widthFix"/>
+											</view>
+											<view class="name">{{ one.merch_name }}</view>
+										</view>
+									</view>
+								</view>
+								<!-- <view class="category-empty" v-else>
+									<image src="/static/common-empty.png" mode="widthFix"/>
+								</view> -->
+							</view>
+						</scroll-view>
+					</view>
+				</block>
+		<!-- 		<view class="category-empty">
+					<image :src="$util.img('public/uniapp/category/empty.png')" mode="widthFix"></image>
+					<view class="tips">暂时没有分类哦！</view>
+				</view> -->
+			</view>
 		</view>
-
+
 
 		<ns-login ref="login"></ns-login>
 	<!-- 	<loading-cover ref="loadingCover"></loading-cover> -->
@@ -64,34 +64,34 @@
 	export default {
 		components: {},
 		data() {
-			return {
-				scrollTop: 0,
-				
-				select: 0,
-				categoryId: 'category-0',
-				scrollLock: false,
-				triggered: true,
-				heightArea: [],
-				loadType: '',
-				categoryTree:[
-					/*{
-						category_id:6277,
-						category_name:"物业",
-						child_list:[
-							{
-								category_id:6572,
-								category_name:"鞋里革",
-								image:"attachment\/images\/979\/2024\/04\/y46Gg41i552o9iq9249295oz991444.jpg",
-							}
+			return {
+				scrollTop: 0,
+				
+				select: 0,
+				categoryId: 'category-0',
+				scrollLock: false,
+				triggered: true,
+				heightArea: [],
+				loadType: '',
+				categoryTree:[
+					/*{
+						category_id:6277,
+						category_name:"物业",
+						child_list:[
+							{
+								category_id:6572,
+								category_name:"鞋里革",
+								image:"attachment\/images\/979\/2024\/04\/y46Gg41i552o9iq9249295oz991444.jpg",
+							}
 						]
-					},*/
-					
-			],
+					},*/
+					
+			],
 			user_type:uni.getStorageSync('user_type')
-		};
+		};
 		},
 		onLoad() {
-			uni.hideTabBar()
+			uni.hideTabBar()
 			this.getCategory()
 			// this.getgoodslist()
 		},
@@ -101,118 +101,118 @@
 		onUnload() {
 			if (!this.storeToken && this.$refs.login) this.$refs.login.cancelCompleteInfo();
 		},
-		methods: {
-			switchOnetype(e){
-				this.goods_type = e
-				this.select = -1;
-				this.categoryId = ''
-				this.getgoodslist()
+		methods: {
+			switchOnetype(e){
+				this.goods_type = e
+				this.select = -1;
+				this.categoryId = ''
+				this.getgoodslist()
+			},
+			/**
+			 * 切换一级分类
+			 * @param {Object} index
+			 */
+			switchOneCategory(index) {
+
+				if (index >= this.categoryTree.length) return;
+				this.select = index;
+				this.categoryId = 'category-' + index;
+				// 阻止切换分类之后滚动事件也立即执行
+				this.scrollLock = true;
+				console.log(index)
+
+				// this.goodsList = []
+				// this.getgoodslist()
+			},
+			touchStart() {
+				this.scrollLock = false;
+			},
+			/**
+			 * 监听滚动
+			 * @param {Object} event
+			 */
+			listenScroll(event) {
+				if (this.scrollLock) return;
+				let scrollTop = event.detail.scrollTop;
+				if (this.heightArea.length) {
+					for (let i = 0; i < this.heightArea.length; i++) {
+						if (scrollTop >= this.heightArea[i][0] && scrollTop <= this.heightArea[i][1]) {
+							this.select = i;
+							break;
+						}
+					}
+					if (this.value.template != 1 && this.value.loadType == 'all' && this.heightArea[this.select][1] -
+						scrollTop - contentWrapHeight < 300) {
+						this.$refs.categoryItem[this.select].getGoodsList();
+					}
+				}
+			},
+			sethead(item,type){
+				var is_select = item.is_select
+				this.$api.sendRequest({
+					url: 'app.ajax_batchheads',
+					data: {
+						goods_id:item.actId,
+						is_select:is_select
+					},
+					success: res => {
+						this.$util.showToast({
+							title: res.result.message
+						});
+						this.getgoodslist()
+					},
+					fail: () => {
+						this.$util.showToast({
+							title: 'request:fail'
+						});
+					}
+				});
+			},
+			//获取分类列表
+			getCategory(){
+				this.$api.sendRequest({
+					url: '/merch/api/merch/getcategory',
+					data: {
+						is_type_show:1,
+					},
+					success: res => {
+						console.log( res.data)
+						this.categoryTree = res.data
+					},
+					fail: () => {
+						this.$util.showToast({
+							title: 'request:fail'
+						});
+					}
+				});
+			},
+			onRefresh() {
+				this.triggered = false;
+			},
+			onRestore() {
+				this.triggered = 'restore'; // 需要重置
+			},
+			/**
+			 * 触摸开始
+			 * @param {Object} e
+			 */
+			// touchstart(e) {
+			// 	this.touchstartPosition = e.changedTouches[0].clientY;
+			// },
+			/**
+			 * 触摸结束
+			 * @param {Object} e
+			 */
+			touchend(e) {
+				let end = e.changedTouches[0].clientY;
+				if ((this.scrollType == 'top' || this.scrollType == 'none') && end - this.touchstartPosition > 100) {
+					// this.switchCategory('prev');
+				} else if ((this.scrollType == 'bottom' || this.scrollType == 'none') && this.touchstartPosition - end >
+					100) {
+					// this.switchCategory('next');
+				}
 			},
-			/**
-			 * 切换一级分类
-			 * @param {Object} index
-			 */
-			switchOneCategory(index) {
-
-				if (index >= this.categoryTree.length) return;
-				this.select = index;
-				this.categoryId = 'category-' + index;
-				// 阻止切换分类之后滚动事件也立即执行
-				this.scrollLock = true;
-				console.log(index)
-
-				// this.goodsList = []
-				// this.getgoodslist()
-			},
-			touchStart() {
-				this.scrollLock = false;
-			},
-			/**
-			 * 监听滚动
-			 * @param {Object} event
-			 */
-			listenScroll(event) {
-				if (this.scrollLock) return;
-				let scrollTop = event.detail.scrollTop;
-				if (this.heightArea.length) {
-					for (let i = 0; i < this.heightArea.length; i++) {
-						if (scrollTop >= this.heightArea[i][0] && scrollTop <= this.heightArea[i][1]) {
-							this.select = i;
-							break;
-						}
-					}
-					if (this.value.template != 1 && this.value.loadType == 'all' && this.heightArea[this.select][1] -
-						scrollTop - contentWrapHeight < 300) {
-						this.$refs.categoryItem[this.select].getGoodsList();
-					}
-				}
-			},
-			sethead(item,type){
-				var is_select = item.is_select
-				this.$api.sendRequest({
-					url: 'app.ajax_batchheads',
-					data: {
-						goods_id:item.actId,
-						is_select:is_select
-					},
-					success: res => {
-						this.$util.showToast({
-							title: res.result.message
-						});
-						this.getgoodslist()
-					},
-					fail: () => {
-						this.$util.showToast({
-							title: 'request:fail'
-						});
-					}
-				});
-			},
-			//获取分类列表
-			getCategory(){
-				this.$api.sendRequest({
-					url: '/merch/api/merch/getcategory',
-					data: {
-						is_type_show:1,
-					},
-					success: res => {
-						console.log( res.data)
-						this.categoryTree = res.data
-					},
-					fail: () => {
-						this.$util.showToast({
-							title: 'request:fail'
-						});
-					}
-				});
-			},
-			onRefresh() {
-				this.triggered = false;
-			},
-			onRestore() {
-				this.triggered = 'restore'; // 需要重置
-			},
-			/**
-			 * 触摸开始
-			 * @param {Object} e
-			 */
-			// touchstart(e) {
-			// 	this.touchstartPosition = e.changedTouches[0].clientY;
-			// },
-			/**
-			 * 触摸结束
-			 * @param {Object} e
-			 */
-			touchend(e) {
-				let end = e.changedTouches[0].clientY;
-				if ((this.scrollType == 'top' || this.scrollType == 'none') && end - this.touchstartPosition > 100) {
-					// this.switchCategory('prev');
-				} else if ((this.scrollType == 'bottom' || this.scrollType == 'none') && this.touchstartPosition - end >
-					100) {
-					// this.switchCategory('next');
-				}
-			},
-			getDiyInfo() {
+			getDiyInfo() {
 				
 			},
 			toLogin() {
@@ -226,8 +226,8 @@
 	};
 </script>
 
-<style lang="scss">
-	@import './public/category.scss';
+<style lang="scss">
+	@import './public/category.scss';
 	
 	/deep/ .uni-popup__wrapper.uni-center {
 		background: rgba(0, 0, 0, 0.6);
diff --git a/pages_tool/article/detail.vue b/pages_tool/article/detail.vue
index e86ed84..c8a1d6f 100644
--- a/pages_tool/article/detail.vue
+++ b/pages_tool/article/detail.vue
@@ -1,159 +1,165 @@
-<template>
-	<page-meta :page-style="themeColor"></page-meta>
-	<view class="page">
-		<view class="help-title">{{ detail.article_title }}</view>
-		<view class="help-meta" v-if="detail.is_show_release_time == 1">
-			<text class="help-time">发表时间: {{ $util.timeStampTurnTime(detail.create_time) }}</text>
-		</view>
-		<view class="help-content"><rich-text :nodes="content"></rich-text></view>
-		<view class="bottom-area">
-			<view v-if="detail.is_show_read_num == 1">
-				阅读：
-				<text class="price-font">{{ detail.read_num + detail.initial_read_num }}</text>
-			</view>
-			<view v-if="detail.is_show_dianzan_num == 1">
-				<text class="price-font">{{ detail.dianzan_num + detail.initial_dianzan_num }}</text>
-				人已赞
-			</view>
-		</view>
-		<loading-cover ref="loadingCover"></loading-cover>
-
-		<!-- #ifdef MP-WEIXIN -->
-		<!-- 小程序隐私协议 -->
-		<privacy-popup ref="privacyPopup"></privacy-popup>
-		<!-- #endif -->
-	</view>
-</template>
-
-<script>
-	import htmlParser from '@/common/js/html-parser';
-	export default {
-		data() {
-			return {
-				articleId: 0,
-				detail: {},
-				content: ''
-			};
-		},
-		onLoad(options) {
-			this.articleId = options.article_id || 0;
-			// 小程序扫码进入
-			if (options.scene) {
-				var sceneParams = decodeURIComponent(options.scene);
-				this.articleId = sceneParams.split('-')[1];
-			}
-			if (this.articleId == 0) {
-				this.$util.redirectTo('/pages_tool/article/list', {}, 'redirectTo');
-			}
-		},
-		onShow() {
-			this.getData();
-		},
-		methods: {
-			getData() {
-				this.$api.sendRequest({
-					url: '/api/article/info',
-					data: {
-						article_id: this.articleId
-					},
-					success: res => {
-						if (res.code == 0 && res.data) {
-							this.detail = res.data;
-							this.$langConfig.title(this.detail.article_title);
-							this.content = htmlParser(this.detail.article_content);
-							this.setPublicShare();
-						} else {
-							this.$util.showToast({
-								title: res.message
-							});
-							setTimeout(() => {
-								this.$util.redirectTo('/pages_tool/article/list', {}, 'redirectTo');
-							}, 2000);
-						}
-						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-					},
-					fail: res => {
-						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-					}
-				});
-			},
-			// 设置公众号分享
-			setPublicShare() {
-				let shareUrl = this.$config.h5Domain + '/pages_tool/article/detail?article_id=' + this.articleId;
-				this.$util.setPublicShare({
-					title: this.detail.article_title,
-					desc: '',
-					link: shareUrl,
-					imgUrl: this.siteInfo ? this.$util.img(this.siteInfo.logo_square) : ''
-				});
-			}
-		},
-		onShareAppMessage(res) {
-			var title = this.detail.article_title;
-			var path = '/pages_tool/article/detail?article_id=' + this.articleId;
-			return {
-				title: title,
-				path: path,
-				success: res => {},
-				fail: res => {}
-			};
-		},
-		//分享到朋友圈
-		onShareTimeline() {
-			var title = this.detail.article_title;
-			var query = 'article_id=' + this.articleId;
-			return {
-				title: title,
-				query: query,
-				imageUrl: ''
-			};
-		}
-	};
-</script>
-
-<style lang="scss">
-	.page {
-		width: 100%;
-		height: 100%;
-		padding: 30rpx;
-		box-sizing: border-box;
-		background: #ffffff;
-	}
-
-	.help-title {
-		font-size: $font-size-toolbar;
-		text-align: left;
-		font-weight: bold;
-	}
-
-	.help-content {
-		margin-top: $margin-updown;
-		word-break: break-all;
-	}
-
-	.help-meta {
-		text-align: left;
-		margin-top: $margin-updown;
-		color: $color-tip;
-
-		.help-time {
-			font-size: $font-size-tag;
-		}
-	}
-
-	.bottom-area {
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		margin-top: 40rpx;
-
-		.price-font {
-			font-weight: normal !important;
-		}
-
-		view {
-			color: #999;
-			font-size: 24rpx;
-		}
-	}
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view class="page">
+		<view class="help-title">{{ detail.article_title }}</view>
+		<view class="help-meta" v-if="detail.is_show_release_time == 1">
+			<text class="help-time">发表时间: {{ $util.timeStampTurnTime(detail.create_time) }}</text>
+		</view>
+		<view class="help-content">
+			<!-- <rich-text :nodes="content"></rich-text> -->
+			<ns-mp-html :content="content"></ns-mp-html>
+		</view>
+		<view class="bottom-area">
+			<view v-if="detail.is_show_read_num == 1">
+				阅读：
+				<text class="price-font">{{ detail.read_num + detail.initial_read_num }}</text>
+			</view>
+			<view v-if="detail.is_show_dianzan_num == 1">
+				<text class="price-font">{{ detail.dianzan_num + detail.initial_dianzan_num }}</text>
+				人已赞
+			</view>
+		</view>
+		<!-- 悬浮按钮 -->
+		<hover-nav></hover-nav>
+		<loading-cover ref="loadingCover"></loading-cover>
+
+		<!-- #ifdef MP-WEIXIN -->
+		<!-- 小程序隐私协议 -->
+		<privacy-popup ref="privacyPopup"></privacy-popup>
+		<!-- #endif -->
+	</view>
+</template>
+
+<script>
+	import htmlParser from '@/common/js/html-parser';
+	export default {
+		data() {
+			return {
+				articleId: 0,
+				detail: {},
+				content: ''
+			};
+		},
+		onLoad(options) {
+			this.articleId = options.article_id || 0;
+			// 小程序扫码进入
+			if (options.scene) {
+				var sceneParams = decodeURIComponent(options.scene);
+				this.articleId = sceneParams.split('-')[1];
+			}
+			if (this.articleId == 0) {
+				this.$util.redirectTo('/pages_tool/article/list', {}, 'redirectTo');
+			}
+		},
+		onShow() {
+			this.getData();
+		},
+		methods: {
+			getData() {
+				this.$api.sendRequest({
+					url: '/api/article/info',
+					data: {
+						article_id: this.articleId
+					},
+					success: res => {
+						if (res.code == 0 && res.data) {
+							this.detail = res.data;
+							this.$langConfig.title(this.detail.article_title);
+							// this.content = htmlParser(this.detail.article_content);
+							this.content = this.detail.article_content;
+							this.setPublicShare();
+						} else {
+							this.$util.showToast({
+								title: res.message
+							});
+							setTimeout(() => {
+								this.$util.redirectTo('/pages_tool/article/list', {}, 'redirectTo');
+							}, 2000);
+						}
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					},
+					fail: res => {
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					}
+				});
+			},
+			// 设置公众号分享
+			setPublicShare() {
+				let shareUrl = this.$config.h5Domain + '/pages_tool/article/detail?article_id=' + this.articleId;
+				this.$util.setPublicShare({
+					title: this.detail.article_title,
+					desc: '',
+					link: shareUrl,
+					imgUrl: this.siteInfo ? this.$util.img(this.siteInfo.logo_square) : ''
+				});
+			}
+		},
+		onShareAppMessage(res) {
+			var title = this.detail.article_title;
+			var path = '/pages_tool/article/detail?article_id=' + this.articleId;
+			return {
+				title: title,
+				path: path,
+				success: res => {},
+				fail: res => {}
+			};
+		},
+		//分享到朋友圈
+		onShareTimeline() {
+			var title = this.detail.article_title;
+			var query = 'article_id=' + this.articleId;
+			return {
+				title: title,
+				query: query,
+				imageUrl: ''
+			};
+		}
+	};
+</script>
+
+<style lang="scss">
+	.page {
+		width: 100%;
+		height: 100%;
+		padding: 30rpx;
+		box-sizing: border-box;
+		background: #ffffff;
+	}
+
+	.help-title {
+		font-size: $font-size-toolbar;
+		text-align: left;
+		font-weight: bold;
+	}
+
+	.help-content {
+		margin-top: $margin-updown;
+		word-break: break-all;
+	}
+
+	.help-meta {
+		text-align: left;
+		margin-top: $margin-updown;
+		color: $color-tip;
+
+		.help-time {
+			font-size: $font-size-tag;
+		}
+	}
+
+	.bottom-area {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		margin-top: 40rpx;
+
+		.price-font {
+			font-weight: normal !important;
+		}
+
+		view {
+			color: #999;
+			font-size: 24rpx;
+		}
+	}
 </style>
\ No newline at end of file
diff --git a/pages_tool/article/list.vue b/pages_tool/article/list.vue
index 499d256..6192f6a 100644
--- a/pages_tool/article/list.vue
+++ b/pages_tool/article/list.vue
@@ -1,7 +1,21 @@
 <template>
 	<page-meta :page-style="themeColor"></page-meta>
 	<view>
-		<mescroll-uni @getData="getData" ref="mescroll">
+		<scroll-view class="catrgory-nav" scroll-x="true" :scroll-left="scrollLeft" :show-scrollbar="false" scroll-with-animation="true">
+			<view class="navs">
+				<view v-for="(categoryItem, categoryIndex) in categoryList" :key="categoryIndex" class="uni-tab-item" :id="categoryItem.category_id" :data-current="categoryIndex" @click="ontabtap">
+					<text class="uni-tab-item-title" :class="categoryItem.category_id == categoryId ? 'uni-tab-item-title-active color-base-text' : ''">
+						{{ categoryItem.category_name }}
+					</text>
+				</view>
+			</view>
+		</scroll-view>
+		<!-- #ifdef MP -->
+		<mescroll-uni ref="mescroll" @getData="getData" top="60rpx" >
+		<!-- #endif -->
+		<!-- #ifndef MP -->
+		<mescroll-uni ref="mescroll" @getData="getData" top="86rpx" >
+		<!-- #endif -->
 			<block slot="list">
 				<view class="article-wrap" v-if="list.length">
 					<ns-adv keyword="NS_ARTICLE" class-name="adv-wrap"></ns-adv>
@@ -16,7 +30,7 @@
 									<text class="category-icon"></text>
 									<text>{{ item.category_name }}</text>
 								</block>
-								<text class="date">{{ $util.timeStampTurnTime(item.create_time, 'date') }}</text>
+								<text class="date">{{ $util.timeStampTurnTime(item.create_time, 'Y-m-d') }}</text>
 							</view>
 						</view>
 					</view>
@@ -25,6 +39,8 @@
 				<loading-cover ref="loadingCover"></loading-cover>
 			</block>
 		</mescroll-uni>
+		<!-- 悬浮按钮 -->
+		<hover-nav></hover-nav>
 
 		<!-- #ifdef MP-WEIXIN -->
 		<!-- 小程序隐私协议 -->
@@ -38,22 +54,71 @@
 	export default {
 		data() {
 			return {
-				list: []
+				list: [],
+				categoryList: [],
+				categoryId: '',
+				scrollLeft: 0,
+				contentScrollW: 0, // 导航区宽度
 			};
 		},
 		components: {
 			nsAdv
 		},
 		onShow() {
+			this.getArticleCategory()
 			this.setPublicShare();
 		},
 		methods: {
+			getScrollW() {
+				const query = uni.createSelectorQuery().in(this);
+
+				query.select('.catrgory-nav').boundingClientRect(data => {
+				// 拿到 scroll-view 组件宽度
+					this.contentScrollW = data.width
+				}).exec();
+
+				query.selectAll('.uni-tab-item').boundingClientRect(data => {
+					
+					let dataLen = data.length;
+					for (let i = 0; i < dataLen; i++) {
+						//  scroll-view 子元素组件距离左边栏的距离
+						this.categoryList[i].left = data[i].left;
+						//  scroll-view 子元素组件宽度
+						this.categoryList[i].width = data[i].width
+					}
+				}).exec()
+			},
+			ontabtap(e) {
+				let index = e.target.dataset.current || e.currentTarget.dataset.current;
+				this.categoryId = this.categoryList[index].category_id;
+				this.scrollLeft = this.categoryList[index].left - this.contentScrollW / 2 + this.categoryList[index].width / 2;
+				this.$refs.loadingCover.show();
+				this.$refs.mescroll.refresh();
+			},
+			/**
+			 * 获取文章分类
+			 */
+			getArticleCategory() {
+				this.$api.sendRequest({
+					url: '/api/article/category',
+					success: res => {
+						if (res.code >= 0) {
+							this.categoryList = [{ category_id: '',category_name: '全部' }]
+							this.categoryList.push(...res.data);
+							this.$nextTick(()=>{
+								this.getScrollW()
+							})
+						}
+					},
+				});
+			},
 			getData(mescroll) {
 				this.$api.sendRequest({
 					url: '/api/article/page',
 					data: {
 						page_size: mescroll.size,
-						page: mescroll.num
+						page: mescroll.num,
+						category_id: this.categoryId
 					},
 					success: res => {
 						let newArr = [];
@@ -128,7 +193,60 @@
 	.empty-wrap {
 		padding-top: 200rpx;
 	}
-
+	
+	.catrgory-nav {
+		height: 80rpx;
+		background: #fff;
+		position: fixed;
+		left: 0;
+		z-index: 998;
+		border-radius: 0px 0px 24rpx 24rpx;
+		.navs {
+			flex-direction: row;
+			/* #ifndef APP-PLUS */
+			white-space: nowrap;
+			/* #endif */
+			display: flex;
+			justify-content: space-around;
+		}
+		
+		.uni-tab-item {
+			padding: 0 30rpx;
+			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;
+		}
+	}
+	
 	.article-wrap {
 		background: #f8f8f8;
 
diff --git a/pages_tool/chat/room.vue b/pages_tool/chat/room.vue
new file mode 100644
index 0000000..5556316
--- /dev/null
+++ b/pages_tool/chat/room.vue
@@ -0,0 +1,896 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view class="container" id="container">
+		<view class="room" :class="keyWordsConfig.is_open == 1 ? 'active' : ''" @click="closePopWindow">
+			<view class="tips" :class="{ show: isLoading }">正在获取消息</view>
+			<view class="room-content-box">
+				<view :id="'chat' + index" v-for="(item, index) in messageList" :key="index">
+					<chat-message :message="item" @sendGood="sendGood($event, index)" @sendOrder="sendOrder($event, index)" :send="send"></chat-message>
+				</view>
+			</view>
+			<view class="paddingbottom" id="paddingbottom" v-if="chatBottom"></view>
+		</view>
+		<view class="input-content" :class="keyWordsConfig.is_open == 1 ? 'active' : ''">
+			<view class="keyWords" v-if="keyWordsConfig.is_open == 1">
+				<text v-for="(item, index) in keyWordsConfig.keyword_list" :key="index" @click="
+						formData.content = item.keyword;
+						sendMsg('message');
+				">
+					{{ item.keyword }}
+				</text>
+			</view>
+			<view class="input-box">
+				<view class="iconfont icon-biaoqing padding-right " @click="openEmjoy()"></view>
+				<editor id="editor" class="message-edit" v-model="formData.content" @ready="onEditorReady" @focus="inputFocus" @input="onEditorinput()" @blur="closePopWindow()"></editor>
+				<view class="iconfont icon-jiahao01 padding-right" @click="openChatMore()"></view>
+				<view class="send_btn color-base-bg" @click="sendMsg('message')">发送</view>
+			</view>
+			<view class="inputShow" v-if="inputShow && inputFirst"></view>
+			<view v-if="emjoyShow" @touchmove.prevent.stop>
+				<view class="emjoy-box">
+					<scroll-view scroll-y="true" class="emjoy-content">
+						<view class="emjoy-item" v-for="(item, index) in emjoyList" :key="index" @click="addEmjoy(item, index)">
+							<image :src="$util.img(item)"></image>
+						</view>
+					</scroll-view>
+				</view>
+			</view>
+			<view class="more_send" v-if="chatMore">
+				<view class="more_send-item" @click="addImg()">
+					<text class="iconfont icon-tupian "></text>
+					<view>图片</view>
+				</view>
+			</view>
+		</view>
+
+		<!-- 加载动画 -->
+		<loading-cover ref="loadingCover"></loading-cover>
+	</view>
+</template>
+
+<script>
+	import SocketTask from '@/common/js/socketTest.js';
+	import chatMessage from '@/pages_tool/components/chat-message/chat-message.vue';
+	import emjoy from '@/common/js/emjoy.js';
+
+	export default {
+		components: {
+			chatMessage
+		},
+		data() {
+			return {
+				emjoyList: emjoy.emjoyList,
+				emjoyShow: false,
+				chatMore: false,
+				formData: {
+					content: '',
+					goods_id: 0,
+					order_id: 0,
+					image: ''
+				},
+				isNetWork: false,
+				send: false,
+
+				messageList: [],
+				page: 1,
+				isAll: false,
+				isLoading: false,
+				showLoading: false, //显示正在加载
+
+				jumpBottom: null,
+				scrollTop: 0,
+				scrollPosition: 0,
+
+				siteId: 0, //店铺id
+				skuId: 0, //商品id
+				orderId: 0, //订单id
+				siteName: '', //店铺名称
+				orderdetail: {},
+				style: {}, //聊天框的高度
+				inputFirst: 0,
+				inputShow: false,
+				inputOffsetBottom: 0,
+
+				goodsDetails: {},
+
+				// 定位ID
+				startId: 0,
+
+				goods_type: {
+					promotion_name: '',
+					promotion_id: ''
+				},
+				keyWordsConfig: {
+					is_open: 0
+				}
+			};
+		},
+		mixins: [SocketTask],
+		computed: {
+			chatBottom() {
+				return this.emjoyShow || this.chatMore || this.inputShow;
+			}
+		},
+		onLoad(info) {
+			if (info.sku_id) {
+				this.skuId = info.sku_id;
+				this.getGoodsDetails(info.sku_id);
+			}
+			if (info.order_id) {
+				this.orderId = info.order_id;
+				this.getOrderInfo(info.order_id);
+			}
+			if (this.skuId || this.orderId) {
+				this.send = true;
+			}
+
+			this.$on('upDOM', () => {
+				this.setPageScrollTo();
+			});
+
+			if (info.type) {
+				this.goods_type.promotion_name = info.type;
+			} else {
+				this.goods_type.promotion_name = '';
+			}
+			if (info.type_id) {
+				this.goods_type.promotion_id = info.type_id;
+			} else {
+				this.goods_type.promotion_id = '';
+			}
+
+			if (!this.storeToken) {
+				this.$util.redirectTo('/pages_tool/login/login');
+				return;
+			}
+			this.inputFirst = 0;
+			this.inputShow = false;
+			this.inputOffsetBottom = 0;
+			// this.getChatList();
+			this.getKeyWordsConfig();
+
+			uni.setNavigationBarTitle({
+				title: '商家客服'
+			});
+		},
+		onReady() {
+			// 监听键盘高度变化，以便设置输入框的高度
+			uni.onKeyboardHeightChange(res => {
+				this.inputOffsetBottom = res.height;
+				if (res.height === 0) {
+					this.focus = false;
+				}
+			});
+		},
+		methods: {
+			// 初次渲染输入框
+			onEditorReady() {
+				uni.createSelectorQuery()
+					.select('#editor')
+					.context(res => {})
+					.exec();
+			},
+			// 输入时，边输入边保存
+			onEditorinput() {
+				uni.createSelectorQuery()
+					.select('#editor')
+					.context(res => {
+						this.editorCtx = res.context;
+						this.editorCtx.getContents({
+							success: res => {
+								this.formData.content = res.html;
+							}
+						});
+					})
+					.exec();
+			},
+			// 加号
+			openChatMore() {
+				if (this.$util.isAndroid) {
+					this.inputShow = false;
+					this.inputFirst = 1;
+				}
+
+				this.chatMore = !this.chatMore;
+				this.emjoyShow = false;
+
+				this.$nextTick(() => {
+					this.setPageScrollTo();
+				});
+			},
+			// 获取快捷回复设置
+			getKeyWordsConfig() {
+				this.$api.sendRequest({
+					url: '/servicer/api/chat/keyword',
+					success: res => {
+						if (res.code >= 0 && res.data) {
+							this.keyWordsConfig = res.data;
+						}
+					}
+				});
+			},
+			// 获取商品信息，用于推送的商品详情
+			getGoodsDetails(sku_id) {
+				this.$api.sendRequest({
+					url: '/api/goodssku/detail',
+					data: {
+						sku_id
+					},
+					success: res => {
+						if (res.code >= 0) {
+							this.goodsDetails = res.data.goods_sku_detail;
+						}
+					}
+				});
+			},
+			// 获取订单信息，用于推送订单
+			getOrderInfo(id) {
+				this.$api.sendRequest({
+					url: '/api/order/detail',
+					data: {
+						order_id: id
+					},
+					success: res => {
+						if (res.code >= 0) {
+							this.orderdetail = res.data;
+						}
+					}
+				});
+			},
+			chatListInit(){
+				this.isAll = false;
+				this.isLoading = false;
+				this.page = 1;
+			},
+			//获取聊天记录
+			getChatList() {
+				// 如果已经获取完了数据，直接返回不进行请求
+				if (this.isAll) {
+					this.isLoading = false;
+					return;
+				}
+				// 防重复
+				if (this.isLoading) return;
+				this.isLoading = true;
+				// 如果是第一次请求，手动置空数据
+				if (this.page == 1) this.messageList = [];
+				// 用于获取聊天记录时，进行拼接数据，同步定位的位置
+				let oldStartId = 0;
+				oldStartId = this.messageList.length;
+				// 改变this指向
+				let that = this;
+				this.$api.sendRequest({
+					url: '/servicer/api/chat/dialogs',
+					data: {
+						servicer_id: this.servicer_id,
+						page: this.page,
+						limit: 15,
+						site_id: that.siteId
+					},
+					success(res) {
+						if (res.code >= 0 && res.data) {
+							that.page += 1;
+							// 判定是否获取完数据
+							if (res.data.list && res.data.list.length < 15) that.isAll = true;
+							// 处理后的数据容器
+							let newArr = [];
+							//如果获取到历史聊天信息  转换为需要的格式  添加到数组内
+							let arr = res.data.list;
+							if (arr.length) {
+								for (let i = 0; i < arr.length; i++) {
+									let obj = {};
+									if (arr[i].content_type == 0) {
+										obj.id = that.startId;
+										obj.content = arr[i].type == 0 ? arr[i].consumer_say : arr[i].servicer_say;
+										obj.isItMe = arr[i].type == 0 ? true : false;
+										obj.contentType = 'string';
+										obj.sendStatus = true;
+										obj.avatar = arr[i].avatar;
+									} else if (arr[i].content_type == 1) {
+										obj.id = that.startId;
+										obj.isItMe = arr[i].type == 0 ? true : false;
+										obj.sku_id = arr[i].goods_sku_id;
+										obj.sendStatus = true;
+										if (arr[i].type == 0) {
+											obj.contentType = 'sendGood';
+										} else {
+											obj.contentType = 'goodssku';
+										}
+									} else if (arr[i].content_type == 2) {
+										obj.id = that.startId;
+										obj.isItMe = arr[i].type == 0 ? true : false;
+										obj.contentType = 'order';
+										obj.order_id = arr[i].order_id;
+										obj.sendStatus = true;
+									} else if (arr[i].content_type == 3) {
+										obj.id = that.startId;
+										obj.isItMe = arr[i].type == 0 ? true : false;
+										obj.contentType = 'image';
+										obj.image = arr[i].type == 0 ? arr[i].consumer_say : arr[i].servicer_say;
+										obj.sendStatus = true;
+									}
+									newArr.push(obj);
+									that.startId += 1;
+								}
+							}
+
+							setTimeout(() => {
+								// 如果请求的是第一页，并且有订单id或商品id;添加发送信息
+								if (that.page - 1 == 1) {
+									if (that.skuId && Object.keys(that.goodsDetails).length > 0) {
+										let obj = {
+											id: that.startId,
+											isItMe: true,
+											contentType: 'sendGood',
+											goodsDetail: that.goodsDetails
+										};
+										newArr.push(obj);
+										that.startId += 1;
+									}
+									if (that.orderId && Object.keys(that.orderdetail).length > 0) {
+										let obj = {
+											id: that.startId,
+											isItMe: true,
+											contentType: 'sendOrder',
+											orderDetail: that.orderdetail
+										};
+										newArr.push(obj);
+										that.startId += 1;
+									}
+
+									// 是否展示客服在线不在线
+									// let _obj = {};
+									// _obj.id = that.startId;
+									// if(that.servicer_id > 0){
+									// 	_obj.contentType = 'online';
+									// } else {
+									// 	_obj.contentType = 'noline';
+									// }
+									// newArr.push(_obj);
+									// that.startId += 1;
+								}
+								if (newArr.length) {
+									that.messageList = newArr.concat(that.messageList);
+									// 同步处理DOM，实现聊天记录的无缝对接
+									that.$nextTick(() => {
+										if (that.page - 1 == 1) {
+											setTimeout(() => {
+												that.setPageScrollTo();
+											}, 1000);
+											that.isLoading = false;
+										} else {
+											that.setPageScrollTo(
+												`#chat${that.messageList.length - oldStartId}`);
+											that.isLoading = false;
+										}
+									});
+								}
+							}, 500);
+						} else {
+							this.$util.showToast({
+								title: res.message
+							});
+						}
+						that.isLoading = false;
+						if (that.$refs.loadingCover){
+							that.$refs.loadingCover.hide();
+						}
+					}
+				});
+			},
+			// 设置页面滚动位置
+			setPageScrollTo(id) {
+				if (id) {
+					let view = uni
+						.createSelectorQuery()
+						.in(this)
+						.select(id);
+					view.boundingClientRect(res => {
+						uni.pageScrollTo({
+							scrollTop: res.top - 30, // 为多显示出大半个消息的高度，示意上面还有信息。
+							duration: 0
+						});
+					}).exec();
+				} else {
+					let query = uni.createSelectorQuery().in(this);
+					query.select('.room').boundingClientRect(data => {
+						uni.pageScrollTo({
+							scrollTop: data.height - 30, // 为多显示出大半个消息的高度，示意上面还有信息。
+							duration: 0
+						});
+					}).exec();
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				}
+			},
+			//发送商品
+			sendGood(e, index) {
+				this.sendMsg('goods');
+				this.messageList.splice(index, 1);
+			},
+			//发送订单
+			sendOrder(e, index) {
+				this.sendMsg('order');
+				this.messageList.splice(index, 1);
+			},
+			//发送消息
+			sendMsg(data) {
+				if (this.isNetWork) return;
+				this.isNetWork = true;
+				let that = this;
+				if (data == 'goods') {
+					let _type = {};
+					if (this.goods_type.promotion_id != '') {
+						_type.promotion_id = this.goods_type.promotion_id;
+						_type.promotion_name = this.goods_type.promotion_name;
+					}
+					this.$api.sendRequest({
+						url: '/servicer/api/chat/say',
+						data: {
+							goods_id: this.skuId,
+							servicer_id: this.servicer_id,
+							content_type: 1,
+							site_id: this.siteId,
+							relate_data: JSON.stringify(_type)
+						},
+						success(res) {
+							that.send = false;
+							that.joinData('send', 'goods');
+						},
+						complete() {
+							that.isNetWork = false;
+							// uni.hideKeyboard();
+						}
+					});
+				} else if (data == 'order') {
+					this.$api.sendRequest({
+						url: '/servicer/api/chat/say',
+						data: {
+							order_id: this.orderId,
+							servicer_id: this.servicer_id,
+							site_id: this.siteId,
+							content_type: 2
+						},
+						success(res) {
+							that.send = false;
+							that.joinData('send', 'order');
+						},
+
+						complete() {
+							that.isNetWork = false;
+							// uni.hideKeyboard();
+						}
+					});
+				} else if (data == 'image') {
+					that.joinData('send', 'image');
+					this.$api.sendRequest({
+						url: '/servicer/api/chat/say',
+						data: {
+							message: this.formData.image.trim(),
+							servicer_id: this.servicer_id,
+							site_id: this.siteId,
+							content_type: 3
+						},
+						success(res) {
+							console.log(res, '图片上传成功');
+						},
+						error() {
+							that.messageList[that.messageList.length - 1].sendStatus = false;
+							uni.createSelectorQuery().select('#editor').context(res => {
+								this.editorCtx = res.context;
+								this.editorCtx.clear();
+							}).exec();
+						},
+						complete() {
+							that.isNetWork = false;
+						}
+					});
+				} else {
+					let _text = this.formData.content;
+					let _testText = _text.replace(/<p>/, '');
+					let _testText2 = _testText.replace(/<\/p>/, '');
+					let _testText3 = _testText2.replace(/<br>/, '');
+					if (_text == '<p></p>' || _text == '<p><br></p>' || !_testText3.trim()) {
+						this.$util.showToast({
+							title: '发送内容不能为空'
+						});
+						uni.createSelectorQuery().select('#editor').context(res => {
+							that.editorCtx = res.context;
+							that.editorCtx.clear();
+						}).exec();
+						that.isNetWork = false;
+						return;
+					}
+					that.joinData('send', 'string');
+					this.$api.sendRequest({
+						url: '/servicer/api/chat/say',
+						data: {
+							message: this.formData.content,
+							servicer_id: this.servicer_id,
+							content_type: 0
+						},
+						success(res) {
+							if (res.code == 0) {
+								console.log(res, '文字上传成功');
+								that.formData.content = '<p></p>';
+								uni.createSelectorQuery()
+									.select('#editor')
+									.context(res => {
+										this.editorCtx = res.context;
+										this.editorCtx.clear();
+									})
+									.exec();
+							}
+						},
+						error() {
+							that.messageList[that.messageList.length - 1].sendStatus = false;
+							uni.createSelectorQuery().select('#editor').context(res => {
+								this.editorCtx = res.context;
+								this.editorCtx.clear();
+							}).exec();
+						},
+						complete() {
+							that.isNetWork = false;
+						}
+					});
+				}
+			},
+			//拼接消息 处理滚动
+			async joinData(addType, contentType) {
+				if (addType == 'send') {
+					let data = {
+						isItMe: true,
+						contentType: contentType,
+						sendStatus: true
+					};
+					if (contentType == 'string') {
+						data.content = this.formData.content;
+					} else if (contentType == 'order') {
+						data.order_id = this.orderId;
+					} else if (contentType == 'goods') {
+						data.sku_id = this.skuId;
+					} else if (contentType == 'image') {
+						data.image = this.formData.image;
+					}
+					this.messageList.push(data);
+					this.$nextTick(() => {
+						setTimeout(() => {
+							this.setPageScrollTo();
+						}, 500);
+					});
+				}
+			},
+			// 隐藏加载提示
+			hideLoadTips(flag) {
+				if (flag) {
+					this.ajax.loadText = '消息获取成功';
+					setTimeout(() => {
+						this.ajax.loading = false;
+					}, 300);
+				} else {
+					this.ajax.loading = true;
+					this.ajax.loadText = '正在获取消息';
+				}
+			},
+			onPageScroll(e) {
+				if (e.scrollTop == 0) {
+					this.getChatList();
+				}
+			},
+			inputFocus(e) {
+				if (this.$util.isAndroid() && this.inputFirst) {
+					this.inputShow = true;
+				}
+
+				this.chatMore = false;
+				// this.$nextTick(() => {
+				// 	this.setPageScrollTo();
+				// });
+			},
+			closePopWindow() {
+				this.inputFirst = 0;
+				this.chatMore = false;
+				this.inputShow = false;
+				// uni.hideKeyboard();
+			},
+			// 展开表情
+			openEmjoy() {
+				console.log(this.emjoyShow, 'this.emjoyShow');
+				// if (this.$util.isAndroid()) {
+				// 	this.inputFirst = 1;
+				// 	this.inputShow = !this.inputShow;
+				// }
+
+				// uni.hideKeyboard();
+				this.chatMore = false;
+				this.emjoyShow = !this.emjoyShow;
+				this.$nextTick(() => {
+					this.setPageScrollTo();
+				});
+			},
+			// 添加表情
+			addEmjoy(emjoy, index) {
+				uni.createSelectorQuery()
+					.select('#editor')
+					.context(res => {
+						this.editorCtx = res.context;
+						this.editorCtx.getContents({
+							success: res => {
+								if (res.html == '<p><br></p>') {
+									res.html = '<p></p>';
+								}
+								let _src = this.$util.img(emjoy);
+								let text = '<img src="' + _src + '" style="height=20px; width=20px; margin-left=20px;">';
+								let html2 = res.html.replace(/<\/p>$/, text + '</p>');
+								this.editorCtx.setContents({
+									html: html2
+								});
+								this.formData.content = html2;
+								this.emjoyShow = false;
+							}
+						});
+					})
+					.exec();
+			},
+			// 发送图片
+			addImg() {
+				this.$util.upload(
+					1, {
+						path: 'chatimg'
+					},
+					res => {
+						if (res[0]) {
+							this.formData.image = res[0];
+							this.sendMsg('image');
+						} else {
+							this.$util.showToast({
+								title: '上传失败！'
+							});
+							return false;
+						}
+					},
+					'/servicer/api/chat/chatimg'
+				);
+			}
+		},
+		beforeDestroy() {
+			clearInterval(this.timeoutObj);
+			this.timeoutObj = null;
+			this.$api.sendRequest({
+				url: '/servicer/api/chat/bye',
+				data: {
+					servicer_id: this.servicer_id,
+					site_id: this.siteId
+				},
+				success(res) {
+					uni.closeSocket();
+				}
+			});
+		}
+	};
+</script>
+
+<style lang="scss">
+	//处理H5端弹出覆盖输入框的问题
+	.more_send {
+		display: flex;
+		border-top: 2rpx solid #e5e5e5;
+		height: 390rpx;
+		flex-wrap: wrap;
+
+		>view {
+			padding-top: 16rpx;
+			width: 25%;
+			height: 156rpx;
+			text-align: center;
+
+			.iconfont {
+				display: inline;
+				font-size: 60rpx;
+				color: #333;
+				background-color: #fff;
+				border-radius: 20rpx;
+				padding: 20rpx;
+			}
+
+			>view {
+				color: #909399;
+				font-size: $font-size-goods-tag;
+			}
+		}
+	}
+
+	.chat_send {
+		display: flex;
+		height: 90rpx;
+		justify-content: space-between;
+		position: relative;
+
+		.send {
+			position: absolute;
+			right: 30rpx;
+			bottom: 30rpx;
+			color: #fff;
+			align-self: flex-end;
+			font-size: 28rpx;
+			padding: 10rpx 20rpx;
+			border-radius: 8rpx;
+		}
+
+		.emjoy_list {
+			flex: 1;
+		}
+	}
+
+	/* 加载数据提示 */
+	.tips {
+		position: fixed;
+		left: 0;
+		top: var(--window-top);
+		width: 100%;
+		z-index: 9;
+		background-color: rgba(0, 0, 0, 0);
+		height: 72rpx;
+		transform: translateY(-80rpx);
+		transition: transform 0.3s ease-in-out 0s;
+		font-size: 24rpx;
+		text-align: center;
+		line-height: 72rpx;
+
+		&.show {
+			transform: translateY(0);
+		}
+	}
+
+	.room {
+		width: 100%;
+		/* #ifdef H5 */
+		min-height: calc(100vh - 48rpx);
+		padding-bottom: calc(110rpx + 88rpx);
+		padding-bottom: calc(110rpx + 88rpx + constant(safe-area-inset-bottom));
+		padding-bottom: calc(110rpx + 88rpx + env(safe-area-inset-bottom));
+		/* #endif */
+
+		/* #ifndef H5 */
+		min-height: calc(100vh + 20rpx);
+		padding-bottom: 110rpx;
+		padding-bottom: calc(110rpx + constant(safe-area-inset-bottom));
+		padding-bottom: calc(110rpx + env(safe-area-inset-bottom));
+
+		&.active {
+			padding-bottom: 180rpx;
+			padding-bottom: calc(180rpx + constant(safe-area-inset-bottom));
+			padding-bottom: calc(180rpx + env(safe-area-inset-bottom));
+		}
+
+		/* #endif */
+
+		box-sizing: border-box;
+
+		.room-content-box {
+			width: 100%;
+			min-height: calc(100% + 20rpx);
+			padding-top: $padding;
+			box-sizing: border-box;
+		}
+	}
+
+	.paddingbottom {
+		height: calc(280rpx + 88rpx);
+	}
+
+	.emjoy-box {
+		width: 100%;
+		height: 300rpx;
+		padding: 20rpx 25rpx;
+		box-sizing: border-box;
+		background: #f4f4f4;
+		border-top: 1rpx solid #e5e5e5;
+
+		.emjoy-content {
+			width: 100%;
+			height: 100%;
+
+			.emjoy-item {
+				display: inline-block;
+				width: 100rpx;
+				height: 70rpx;
+				text-align: center;
+				line-height: 70rpx;
+
+				image {
+					display: inline-block;
+					width: 40rpx;
+					height: 40rpx;
+				}
+			}
+		}
+	}
+
+	.input-content {
+		background: #f4f4f4;
+		width: 100%;
+		min-height: 110rpx;
+		position: fixed;
+		left: 0;
+		bottom: 0;
+		padding-bottom: 0;
+		padding-bottom: constant(safe-area-inset-bottom);
+		padding-bottom: env(safe-area-inset-bottom);
+
+		&.active {
+			min-height: 180rpx !important;
+		}
+
+		.keyWords {
+			height: 60rpx;
+			line-height: 60rpx;
+			padding: $padding 0 0;
+			overflow-x: scroll;
+			display: flex;
+			margin-left: 20rpx;
+			margin-right: 20rpx;
+
+			text {
+				font-size: 24rpx;
+				margin-right: 20rpx;
+				height: 28rpx;
+				line-height: 28rpx;
+				padding: 10rpx 16rpx;
+				background-color: #fff;
+				border-radius: $border-radius;
+				white-space: nowrap;
+			}
+		}
+
+		.input-box {
+			width: 100%;
+			height: auto;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			padding: 10rpx $padding;
+			box-sizing: border-box;
+
+			.iconfont {
+				line-height: 1;
+				font-size: 52rpx;
+				padding: 15rpx;
+			}
+
+			.send_btn {
+				font-size: 24rpx;
+				min-width: 80rpx;
+				text-align: center;
+				background-color: #e8e8e8;
+				color: #fff;
+				border-radius: 8rpx;
+				height: 50rpx;
+				line-height: 50rpx;
+			}
+
+			.message-edit {
+				padding: 4rpx 15rpx;
+				line-height: 1.5;
+				background-color: #ffffff;
+				// height: 90rpx;
+				min-height: 60rpx !important;
+				// max-height: 200rpx;
+				height: auto !important;
+				border-radius: 30rpx;
+				font-size: $font-size-base;
+			}
+
+			// input {
+			// 	margin-left: 20rpx;
+			// 	margin-right: 20rpx;
+			// 	width: 630rpx;
+			// 	height: 100%;
+			// 	height: 72rpx;
+			// 	padding: 0 20rpx;
+			// 	font-size: $font-size-tag;
+			// 	background-color: #fff;
+			// 	border-radius: 8rpx;
+			// }
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages_tool/components/chat-message/chat-message.vue b/pages_tool/components/chat-message/chat-message.vue
index de52ecd..2695ed2 100644
--- a/pages_tool/components/chat-message/chat-message.vue
+++ b/pages_tool/components/chat-message/chat-message.vue
@@ -1,342 +1,335 @@
-<template>
-	<view class="chat-message">
-		<block v-if="message.contentType == 'sendGood'">
-			<ns-chat-goods :skuId="message.sku_id" :goodsDetail="message.goodsDetail" @sendMsg="sendGood"></ns-chat-goods>
-		</block>
-		<block v-if="message.contentType == 'sendOrder'">
-			<ns-chat-order :orderId="message.order_id" :orderdetails="message.orderDetail" @sendMsg="sendOrder"></ns-chat-order>
-		</block>
-		<block v-if="message.contentType == 'goodssku'">
-			<ns-chat-receiveGoods :skuId="message.sku_id"></ns-chat-receiveGoods>
-		</block>
-		<view class="message" v-if="message.contentType == 'string'">
-			<view class="message-item " :class="message.isItMe ? 'right' : 'left'">
-				<block v-if="message.isItMe">
-					<view class="head_img">
-						<image class="img" :src="myHeadImg" v-if="myHeadImg" @error="myHeadImgError" mode="aspectFit"/>
-						<image class="img" :src="defaultHead" mode="aspectFit" v-else/>
-					</view>
-				</block>
-				<block v-else>
-					<view class="head_img">
-						<image class="img" :src="avatar" mode="aspectFit" v-if="avatar"></image>
-						<image class="img" :src="defaultHead" mode="aspectFit" v-else></image>
-					</view>
-				</block>
-				<view class="chat_text">
-					<text class="iconfont icon-warn margin-right color-base-text" v-if="message.isItMe && !message.sendStatus"></text>
-					<view class="content"><rich-text :nodes="stringToEmjoy(message.content)"></rich-text></view>
-					<!-- <text class="iconfont icon-warn margin-left" v-if="!message.isItMe  && !message.sendStatus"></text> -->
-				</view>
-			</view>
-		</view>
-		<view class="message" v-if="message.contentType == 'image'">
-			<view class="message-item " :class="message.isItMe ? 'right' : 'left'">
-				<block v-if="message.isItMe">
-					<view class="head_img">
-						<image class="img" :src="myHeadImg" v-if="myHeadImg" mode="aspectFit"></image>
-						<image class="img" :src="defaultHead" mode="aspectFit" v-else></image>
-					</view>
-				</block>
-				<block v-else>
-					<view class="head_img">
-						<image class="img" :src="avatar" mode="aspectFit" v-if="avatar"></image>
-						<image class="img" :src="defaultHead" mode="aspectFit" v-else></image>
-					</view>
-				</block>
-				<view class="chat_img">
-					<text class="iconfont icon-warn margin-right color-base-text" v-if="message.isItMe && !message.sendStatus"></text>
-					<view class="content_img" @click="previewMedia($util.img(message.image))" :style="{ backgroundImage: 'url(' + $util.img(message.image) + ')' }">
-						<!-- <image class="img_img" :src="$util.img(message.image)" mode="aspectFit"></image> -->
-					</view>
-					<!-- <text class="iconfont icon-warn margin-left" v-if="!message.isItMe  && !message.sendStatus"></text> -->
-				</view>
-			</view>
-		</view>
-		<view v-else-if="message.contentType == 'goods'"><ns-chat-goods :isCanSend="false" :skuId="message.sku_id"></ns-chat-goods></view>
-		<view v-else-if="message.contentType == 'order'"><ns-chat-order :isCanSend="false" :orderId="message.order_id"></ns-chat-order></view>
-
-		<view class="no-connect-box" v-if="message.contentType == 'noline'">
-			<view class="no-connect">客服不在线</view>
-		</view>
-		<view class="no-connect-box" v-if="message.contentType == 'online'">
-			<view class="no-connect">客服在线</view>
-		</view>
-		<uni-popup ref="imgPopup" type="center">
-			<view class="imagePop">
-				<image :src="$util.img(currImg)" mode="aspectFit"></image>
-			</view>
-		</uni-popup>
-	</view>
-</template>
-
-<script>
-	import nsChatGoods from '@/pages_tool/components/ns-chat/ns-chat-goods.vue';
-	import nsChatOrder from '@/pages_tool/components/ns-chat/ns-chat-order.vue';
-	import nsChatReceiveGoods from '@/pages_tool/components/ns-chat/ns-chat-receiveGoods.vue';
-	import htmlParser from '@/common/js/html-parser';
-	import uniPopup from '@/components/uni-popup/uni-popup.vue';
-	import emjoy from '@/common/js/emjoy.js';
-
-	export default {
-		name: 'chat-message',
-		props: {
-			message: {
-				type: Object
-			},
-			send: {
-				type: Boolean
-			}
-		},
-		data() {
-			return {
-				avatar: '', //店铺头像
-				defaultAvatar: this.$util.getDefaultImage().store,
-				myHeadImg: '', //我的头像
-				defaultHead: this.$util.getDefaultImage().head,
-				emjoyList: emjoy.emjoyList,
-				currImg: ''
-			};
-		},
-		components: {
-			nsChatGoods,
-			nsChatOrder,
-			uniPopup,
-			nsChatReceiveGoods
-		},
-		mounted() {
-			this.avatar = this.$util.img(this.siteInfo.logo_square);
-			this.myHeadImg = this.$util.img(this.memberInfo.headimg);
-		},
-		methods: {
-			// 预览图片
-			previewMedia(img_url) {
-				var paths = [img_url];
-				uni.previewImage({
-					current: 0,
-					urls: paths
-				});
-			},
-			sendGood() {
-				this.$emit('sendGood', 'goods');
-			},
-			sendOrder() {
-				this.$emit('sendOrder', 'order');
-			},
-			// 处理图片错误
-			myHeadImgError() {
-				this.myHeadImg = this.defaultHead;
-			},
-			stringToEmjoy(value) {
-				if (!value) return;
-				// 兼容旧版本图片
-				var reg = RegExp(/\[/);
-				if (reg.test(value)) {
-					let string = value; // 需要把和匹配出来
-					let reg = new RegExp('\\[emjoy_(.+?)\\]', 'g');
-					let emjoyString = string.replace(reg, v => {
-						let emjoy = '';
-						for (let index in this.emjoyList) {
-							if (v == index) {
-								let _url = this.$util.img(this.emjoyList[index]);
-								emjoy = "<img class='message-img' src='" + _url + "'/>";
-								break;
-							}
-						}
-						if (emjoy) {
-							return emjoy;
-						} else {
-							return v;
-						}
-					});
-					let content = htmlParser(emjoyString);
-					content.forEach(v => {
-						if (v.name == 'img') {
-							v.attrs.style = 'display: inline-block;width: 32rpx !important;height: 32rpx !important;padding:0 2rpx;';
-						}
-					});
-					return content;
-				} else {
-					let content = value;
-					return content;
-				}
-			}
-		}
-	};
-</script>
-
-<style lang="scss">
-	/deep/.uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
-		background-color: #000;
-	}
-
-	/deep/.uni-popup__wrapper.uni-custom.center .uni-popup__wrapper-box {
-		max-width: 100%;
-		width: 100%;
-	}
-
-	.imagePop {
-		height: 50vh;
-		width: 100vw;
-		text-align: center;
-
-		image {
-			width: 100%;
-			height: 100%;
-		}
-	}
-
-	.chat-message {
-		width: 100%;
-		height: 100%;
-
-		.message {
-			padding: 13rpx 20rpx;
-			position: relative;
-		}
-
-		.left .content {
-			padding: 20rpx;
-			max-width: 450rpx;
-			border-radius: 10rpx;
-			font-size: 30rpx;
-		}
-
-		.right .content {
-			padding: 20rpx;
-			max-width: 450rpx;
-			border-radius: 10rpx;
-			font-size: 30rpx;
-		}
-
-		.content_img {
-			height: 200rpx;
-			width: 100%;
-			overflow: hidden;
-			text-align: right;
-			margin-left: 28rpx;
-			background-position: center right;
-			background-repeat: no-repeat;
-			background-size: contain;
-
-			image {
-				min-height: 80rpx;
-				min-width: 80rpx;
-				height: 100%;
-				width: 100%;
-			}
-		}
-
-		.right .content_img {
-			margin-right: 28rpx;
-			margin-left: 0;
-		}
-
-		.message-item {
-			display: flex;
-			justify-content: flex-start;
-			align-items: flex-start;
-			align-content: flex-start;
-			flex-wrap: nowrap;
-			flex-direction: row;
-
-			.head_img {
-				width: 80rpx;
-				height: 80rpx;
-				border-radius: 50%;
-				overflow: hidden;
-				position: relative;
-
-				.img {
-					width: 100%;
-					height: 100%;
-				}
-			}
-
-			//图片
-			.contentType3 {
-				padding: 0;
-				border-radius: 2rpx;
-				background-color: transparent !important;
-
-				.img {
-					width: 200rpx;
-					height: auto;
-					max-width: 300rpx;
-					max-height: 400rpx;
-				}
-			}
-
-			.contentType3::after {
-				border: none !important;
-				display: none !important;
-			}
-
-			.content-type-right {
-				flex-direction: row-reverse;
-			}
-
-			&.right {
-				flex-direction: row-reverse;
-
-				.content {
-					background-color: #4cd964;
-					margin-right: 28rpx;
-					word-break: break-all;
-					line-height: 36rpx;
-					position: relative;
-				}
-			}
-
-			&.left {
-				.content {
-					background-color: #ffffff;
-					margin-left: 28rpx;
-					word-break: break-all;
-					line-height: 36rpx;
-					position: relative;
-				}
-			}
-		}
-
-		.next {
-			width: 100%;
-			height: 20rpx;
-		}
-	}
-
-	.no-connect-box {
-		width: 100%;
-		text-align: center;
-		margin: 20rpx 0 50rpx;
-
-		.no-connect {
-			display: inline-block;
-			padding: 0 20rpx;
-			height: 40rpx;
-			background: red;
-			margin: 0 auto;
-			background: rgba(0, 0, 0, 0.5);
-			border-radius: 9rpx;
-			text-align: center;
-			line-height: 40rpx;
-			font-size: 22rpx;
-			color: #ffffff;
-		}
-	}
-
-	.chat_text,
-	.chat_img {
-		display: flex;
-		align-items: center;
-
-		.iconfont {
-			font-size: 36rpx;
-		}
-	}
-
-	.chat_img {
-		width: 30%;
-		height: 200rpx;
-	}
+<template>
+	<view class="chat-message">
+		<block v-if="message.contentType == 'sendGood'">
+			<ns-chat-goods :skuId="message.sku_id" :goodsDetail="message.goodsDetail" @sendMsg="sendGood"></ns-chat-goods>
+		</block>
+		<block v-if="message.contentType == 'sendOrder'">
+			<ns-chat-order :orderId="message.order_id" :orderdetails="message.orderDetail" @sendMsg="sendOrder"></ns-chat-order>
+		</block>
+		<block v-if="message.contentType == 'goodssku'">
+			<ns-chat-receiveGoods :skuId="message.sku_id"></ns-chat-receiveGoods>
+		</block>
+		<view class="message" v-if="message.contentType == 'string'">
+			<view class="message-item " :class="message.isItMe ? 'right' : 'left'">
+				<view class="head_img" v-if="message.isItMe">
+					<image class="img" :src="myHeadImg" v-if="myHeadImg" @error="myHeadImgError" mode="aspectFill"/>
+					<image class="img" :src="defaultHead" mode="aspectFill" v-else/>
+				</view>
+				<view class="head_img" v-else>
+					<image class="img" :src="$util.img(message.avatar)" mode="aspectFill" v-if="$util.img(message.avatar)"></image>
+					<image class="img" :src="avatar" mode="aspectFill" v-else-if="avatar"></image>
+					<image class="img" :src="defaultHead" mode="aspectFill" v-else></image>
+				</view>
+				<view class="chat_text">
+					<text class="iconfont icon-warn margin-right color-base-text" v-if="message.isItMe && !message.sendStatus"></text>
+					<view class="content"><rich-text :nodes="stringToEmjoy(message.content)"></rich-text></view>
+					<!-- <text class="iconfont icon-warn margin-left" v-if="!message.isItMe  && !message.sendStatus"></text> -->
+				</view>
+			</view>
+		</view>
+		<view class="message" v-if="message.contentType == 'image'">
+			<view class="message-item " :class="message.isItMe ? 'right' : 'left'">
+				<view class="head_img" v-if="message.isItMe">
+					<image class="img" :src="myHeadImg" v-if="myHeadImg" mode="aspectFit"></image>
+					<image class="img" :src="defaultHead" mode="aspectFit" v-else></image>
+				</view>
+				<view class="head_img" v-else>
+					<image class="img" :src="avatar" mode="aspectFit" v-if="avatar"></image>
+					<image class="img" :src="defaultHead" mode="aspectFit" v-else></image>
+				</view>
+				<view class="chat_img">
+					<text class="iconfont icon-warn margin-right color-base-text" v-if="message.isItMe && !message.sendStatus"></text>
+					<view class="content_img" @click="previewMedia($util.img(message.image))" :style="{ backgroundImage: 'url(' + $util.img(message.image) + ')' }">
+						<!-- <image class="img_img" :src="$util.img(message.image)" mode="aspectFit"></image> -->
+					</view>
+					<!-- <text class="iconfont icon-warn margin-left" v-if="!message.isItMe  && !message.sendStatus"></text> -->
+				</view>
+			</view>
+		</view>
+		<view v-else-if="message.contentType == 'goods'"><ns-chat-goods :isCanSend="false" :skuId="message.sku_id"></ns-chat-goods></view>
+		<view v-else-if="message.contentType == 'order'"><ns-chat-order :isCanSend="false" :orderId="message.order_id"></ns-chat-order></view>
+
+		<view class="no-connect-box" v-if="message.contentType == 'noline'">
+			<view class="no-connect">客服不在线</view>
+		</view>
+		<view class="no-connect-box" v-if="message.contentType == 'online'">
+			<view class="no-connect">客服在线</view>
+		</view>
+		<uni-popup ref="imgPopup" type="center">
+			<view class="imagePop">
+				<image :src="$util.img(currImg)" mode="aspectFit"></image>
+			</view>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import nsChatGoods from '@/pages_tool/components/ns-chat/ns-chat-goods.vue';
+	import nsChatOrder from '@/pages_tool/components/ns-chat/ns-chat-order.vue';
+	import nsChatReceiveGoods from '@/pages_tool/components/ns-chat/ns-chat-receiveGoods.vue';
+	import htmlParser from '@/common/js/html-parser';
+	import uniPopup from '@/components/uni-popup/uni-popup.vue';
+	import emjoy from '@/common/js/emjoy.js';
+
+	export default {
+		name: 'chat-message',
+		props: {
+			message: {
+				type: Object
+			},
+			send: {
+				type: Boolean
+			}
+		},
+		data() {
+			return {
+				avatar: '', //店铺头像
+				defaultAvatar: this.$util.getDefaultImage().store,
+				myHeadImg: '', //我的头像
+				defaultHead: this.$util.getDefaultImage().head,
+				emjoyList: emjoy.emjoyList,
+				currImg: ''
+			};
+		},
+		components: {
+			nsChatGoods,
+			nsChatOrder,
+			uniPopup,
+			nsChatReceiveGoods
+		},
+		mounted() {
+			this.avatar = this.$util.img(this.siteInfo.logo_square);
+			this.myHeadImg = this.$util.img(this.memberInfo.headimg);
+		},
+		methods: {
+			// 预览图片
+			previewMedia(img_url) {
+				var paths = [img_url];
+				uni.previewImage({
+					current: 0,
+					urls: paths
+				});
+			},
+			sendGood() {
+				this.$emit('sendGood', 'goods');
+			},
+			sendOrder() {
+				this.$emit('sendOrder', 'order');
+			},
+			// 处理图片错误
+			myHeadImgError() {
+				this.myHeadImg = this.defaultHead;
+			},
+			stringToEmjoy(value) {
+				if (!value) return;
+				// 兼容旧版本图片
+				var reg = RegExp(/\[/);
+				if (reg.test(value)) {
+					let string = value; // 需要把和匹配出来
+					let reg = new RegExp('\\[emjoy_(.+?)\\]', 'g');
+					let emjoyString = string.replace(reg, v => {
+						let emjoy = '';
+						for (let index in this.emjoyList) {
+							if (v == index) {
+								let _url = this.$util.img(this.emjoyList[index]);
+								emjoy = "<img class='message-img' src='" + _url + "'/>";
+								break;
+							}
+						}
+						if (emjoy) {
+							return emjoy;
+						} else {
+							return v;
+						}
+					});
+					let content = htmlParser(emjoyString);
+					content.forEach(v => {
+						if (v.name == 'img') {
+							v.attrs.style = 'display: inline-block;width: 32rpx !important;height: 32rpx !important;padding:0 2rpx;';
+						}
+					});
+					return content;
+				} else {
+					let content = value;
+					return content;
+				}
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	/deep/.uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+		background-color: #000;
+	}
+
+	/deep/.uni-popup__wrapper.uni-custom.center .uni-popup__wrapper-box {
+		max-width: 100%;
+		width: 100%;
+	}
+
+	.imagePop {
+		height: 50vh;
+		width: 100vw;
+		text-align: center;
+
+		image {
+			width: 100%;
+			height: 100%;
+		}
+	}
+
+	.chat-message {
+		width: 100%;
+		height: 100%;
+
+		.message {
+			padding: 13rpx 20rpx;
+			position: relative;
+		}
+
+		.left .content {
+			padding: 20rpx;
+			max-width: 450rpx;
+			border-radius: 10rpx;
+			font-size: 30rpx;
+		}
+
+		.right .content {
+			padding: 20rpx;
+			max-width: 450rpx;
+			border-radius: 10rpx;
+			font-size: 30rpx;
+		}
+
+		.content_img {
+			height: 200rpx;
+			width: 100%;
+			overflow: hidden;
+			text-align: right;
+			margin-left: 28rpx;
+			background-position: center right;
+			background-repeat: no-repeat;
+			background-size: contain;
+
+			image {
+				min-height: 80rpx;
+				min-width: 80rpx;
+				height: 100%;
+				width: 100%;
+			}
+		}
+
+		.right .content_img {
+			margin-right: 28rpx;
+			margin-left: 0;
+		}
+
+		.message-item {
+			display: flex;
+			justify-content: flex-start;
+			align-items: flex-start;
+			align-content: flex-start;
+			flex-wrap: nowrap;
+			flex-direction: row;
+
+			.head_img {
+				width: 80rpx;
+				height: 80rpx;
+				border-radius: 50%;
+				overflow: hidden;
+				position: relative;
+
+				.img {
+					width: 100%;
+					height: 100%;
+				}
+			}
+
+			//图片
+			.contentType3 {
+				padding: 0;
+				border-radius: 2rpx;
+				background-color: transparent !important;
+
+				.img {
+					width: 200rpx;
+					height: auto;
+					max-width: 300rpx;
+					max-height: 400rpx;
+				}
+			}
+
+			.contentType3::after {
+				border: none !important;
+				display: none !important;
+			}
+
+			.content-type-right {
+				flex-direction: row-reverse;
+			}
+
+			&.right {
+				flex-direction: row-reverse;
+
+				.content {
+					background-color: #4cd964;
+					margin-right: 28rpx;
+					word-break: break-all;
+					line-height: 36rpx;
+					position: relative;
+				}
+			}
+
+			&.left {
+				.content {
+					background-color: #ffffff;
+					margin-left: 28rpx;
+					word-break: break-all;
+					line-height: 36rpx;
+					position: relative;
+				}
+			}
+		}
+
+		.next {
+			width: 100%;
+			height: 20rpx;
+		}
+	}
+
+	.no-connect-box {
+		width: 100%;
+		text-align: center;
+		margin: 20rpx 0 50rpx;
+
+		.no-connect {
+			display: inline-block;
+			padding: 0 20rpx;
+			height: 40rpx;
+			background: red;
+			margin: 0 auto;
+			background: rgba(0, 0, 0, 0.5);
+			border-radius: 9rpx;
+			text-align: center;
+			line-height: 40rpx;
+			font-size: 22rpx;
+			color: #ffffff;
+		}
+	}
+
+	.chat_text,
+	.chat_img {
+		display: flex;
+		align-items: center;
+
+		.iconfont {
+			font-size: 36rpx;
+		}
+	}
+
+	.chat_img {
+		width: 30%;
+		height: 200rpx;
+	}
 </style>
\ No newline at end of file
diff --git a/pages_tool/components/img-cropping/cropping.vue b/pages_tool/components/img-cropping/cropping.vue
index bc32eec..0502b17 100644
--- a/pages_tool/components/img-cropping/cropping.vue
+++ b/pages_tool/components/img-cropping/cropping.vue
@@ -388,7 +388,6 @@ export default {
 								data: this.rtn,
 								base64: this.base64 || null
 							});
-							return;
 						});
 						// #endif
 						// #ifndef H5
diff --git a/pages_tool/components/myp-one/myp-one.vue b/pages_tool/components/myp-one/myp-one.vue
index 4b97fc6..ea8c31e 100644
--- a/pages_tool/components/myp-one/myp-one.vue
+++ b/pages_tool/components/myp-one/myp-one.vue
@@ -6,10 +6,8 @@
 				<view :class="['item', { active: codeIndex === item, middle: type === 'middle', bottom: type === 'bottom', box: type === 'box' }]">
 					<view class="line" v-if="type !== 'middle'"></view>
 					<view v-if="type === 'middle' && codeIndex <= item" class="bottom-line"></view>
-					<block v-if="isPwd && codeArr.length >= item"><text class="dot">●</text></block>
-					<block v-else>
-						<text class="number">{{ codeArr[index] ? codeArr[index] : '' }}</text>
-					</block>
+					<text v-if="isPwd && codeArr.length >= item" class="dot">●</text>
+					<text v-else class="number">{{ codeArr[index] ? codeArr[index] : '' }}</text>
 				</view>
 			</block>
 		</view>
diff --git a/pages_tool/components/ns-chat/ns-chat-goods.vue b/pages_tool/components/ns-chat/ns-chat-goods.vue
index cfc0cea..8862032 100644
--- a/pages_tool/components/ns-chat/ns-chat-goods.vue
+++ b/pages_tool/components/ns-chat/ns-chat-goods.vue
@@ -1,142 +1,142 @@
-<template>
-	<view class="message">
-		<view class="goods-item" v-if="goodsInfo.goods_name">
-			<image :src="$util.img(goodsInfo.sku_image)" mode="aspectFill"></image>
-			<view class="goods-info">
-				<view class="goods-name">{{ goodsInfo.sku_name ? goodsInfo.sku_name : goodsInfo.goods_name }}</view>
-				<view class="goods-bottom">
-					<view class="goods-price">
-						<text class="goods-price-sign color-base-text">￥</text>
-						<text class="color-base-text">{{ goodsInfo.price }}</text>
-					</view>
-					<view class="goods-option font-size-goods-tag disabled">已发送</view>
-				</view>
-			</view>
-		</view>
-		<view class="goods-item" v-else-if="goodsDetail">
-			<image :src="$util.img(goodsDetail.sku_image)" mode="aspectFill"></image>
-			<view class="goods-info">
-				<view class="goods-name">{{ goodsDetail.sku_name ? goodsDetail.sku_name : goodsDetail.goods_name }}</view>
-				<view class="goods-bottom">
-					<view class="goods-price">
-						<text class="goods-price-sign color-base-text">￥</text>
-						<text class="color-base-text">{{ goodsDetail.price }}</text>
-					</view>
-					<view class="goods-option font-size-goods-tag color-base-bg" @click="sendMsg('goods')">发送</view>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-export default {
-	name: 'ns-chat-goods',
-	props: {
-		skuId: {
-			type: [Number, String]
-		},
-		goodsDetail: {
-			type: [Object]
-		}
-	},
-	data() {
-		return {
-			goodsInfo: {}
-		};
-	},
-	mounted() {
-		this.getGoodsInfo();
-	},
-	methods: {
-		getGoodsInfo() {
-			this.$api.sendRequest({
-				url: '/api/goodssku/detail',
-				data: {
-					sku_id: this.skuId
-				},
-				success: res => {
-					if (res.code >= 0) {
-						this.goodsInfo = res.data.goods_sku_detail;
-					}
-				}
-			});
-		},
-		sendMsg() {
-			this.$emit('sendMsg', 'goods');
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-.message {
-	padding: 13rpx 20rpx;
-	box-sizing: border-box;
-	width: 100vw;
-	position: relative;
-	.goods-item {
-		width: 100%;
-		height: 220rpx;
-
-		background: #ffffff;
-		position: relative;
-		display: flex;
-		align-items: center;
-		border-radius: 20rpx;
-		margin: 0 auto;
-		padding: $padding;
-		box-sizing: border-box;
-		image {
-			width: 180rpx;
-			height: 180rpx;
-			min-width: 180rpx;
-		}
-		.goods-info {
-			width: 100%;
-			height: 180rpx;
-			display: flex;
-			flex-direction: column;
-			justify-content: space-between;
-			padding-left: 20rpx;
-			box-sizing: border-box;
-			.goods-name {
-				width: 100%;
-				line-height: 1.4;
-				display: -webkit-box;
-				-webkit-box-orient: vertical;
-				-webkit-line-clamp: 2;
-				overflow: hidden;
-			}
-			.goods-bottom {
-				display: flex;
-				justify-content: space-between;
-				align-items: flex-end;
-				text {
-					line-height: 1;
-				}
-				.goods-price {
-					display: flex;
-					align-items: flex-end;
-					padding-bottom: 10rpx;
-					font-weight: 500;
-					.goods-price-sign {
-						font-size: $font-size-activity-tag;
-					}
-				}
-				.goods-option {
-					width: 150rpx;
-					height: 50rpx;
-					line-height: 50rpx;
-					text-align: center;
-					border-radius: $border-radius;
-					color: #ffffff;
-				}
-			}
-		}
-		.disabled {
-			background: #e5e5e5;
-		}
-	}
-}
-</style>
+<template>
+	<view class="message">
+		<view class="goods-item" v-if="goodsInfo && goodsInfo.goods_name">
+			<image :src="$util.img(goodsInfo.sku_image)" mode="aspectFill"></image>
+			<view class="goods-info">
+				<view class="goods-name">{{ goodsInfo.sku_name ? goodsInfo.sku_name : goodsInfo.goods_name }}</view>
+				<view class="goods-bottom">
+					<view class="goods-price">
+						<text class="goods-price-sign color-base-text">￥</text>
+						<text class="color-base-text">{{ goodsInfo.price }}</text>
+					</view>
+					<view class="goods-option font-size-goods-tag disabled">已发送</view>
+				</view>
+			</view>
+		</view>
+		<view class="goods-item" v-else-if="goodsDetail">
+			<image :src="$util.img(goodsDetail.sku_image)" mode="aspectFill"></image>
+			<view class="goods-info">
+				<view class="goods-name">{{ goodsDetail.sku_name ? goodsDetail.sku_name : goodsDetail.goods_name }}</view>
+				<view class="goods-bottom">
+					<view class="goods-price">
+						<text class="goods-price-sign color-base-text">￥</text>
+						<text class="color-base-text">{{ goodsDetail.price }}</text>
+					</view>
+					<view class="goods-option font-size-goods-tag color-base-bg" @click="sendMsg('goods')">发送</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+export default {
+	name: 'ns-chat-goods',
+	props: {
+		skuId: {
+			type: [Number, String]
+		},
+		goodsDetail: {
+			type: [Object]
+		}
+	},
+	data() {
+		return {
+			goodsInfo: {}
+		};
+	},
+	mounted() {
+		this.getGoodsInfo();
+	},
+	methods: {
+		getGoodsInfo() {
+			this.$api.sendRequest({
+				url: '/api/goodssku/detail',
+				data: {
+					sku_id: this.skuId
+				},
+				success: res => {
+					if (res.code >= 0) {
+						this.goodsInfo = res.data.goods_sku_detail;
+					}
+				}
+			});
+		},
+		sendMsg() {
+			this.$emit('sendMsg', 'goods');
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+.message {
+	padding: 13rpx 20rpx;
+	box-sizing: border-box;
+	width: 100vw;
+	position: relative;
+	.goods-item {
+		width: 100%;
+		height: 220rpx;
+
+		background: #ffffff;
+		position: relative;
+		display: flex;
+		align-items: center;
+		border-radius: 20rpx;
+		margin: 0 auto;
+		padding: $padding;
+		box-sizing: border-box;
+		image {
+			width: 180rpx;
+			height: 180rpx;
+			min-width: 180rpx;
+		}
+		.goods-info {
+			width: 100%;
+			height: 180rpx;
+			display: flex;
+			flex-direction: column;
+			justify-content: space-between;
+			padding-left: 20rpx;
+			box-sizing: border-box;
+			.goods-name {
+				width: 100%;
+				line-height: 1.4;
+				display: -webkit-box;
+				-webkit-box-orient: vertical;
+				-webkit-line-clamp: 2;
+				overflow: hidden;
+			}
+			.goods-bottom {
+				display: flex;
+				justify-content: space-between;
+				align-items: flex-end;
+				text {
+					line-height: 1;
+				}
+				.goods-price {
+					display: flex;
+					align-items: flex-end;
+					padding-bottom: 10rpx;
+					font-weight: 500;
+					.goods-price-sign {
+						font-size: $font-size-activity-tag;
+					}
+				}
+				.goods-option {
+					width: 150rpx;
+					height: 50rpx;
+					line-height: 50rpx;
+					text-align: center;
+					border-radius: $border-radius;
+					color: #ffffff;
+				}
+			}
+		}
+		.disabled {
+			background: #e5e5e5;
+		}
+	}
+}
+</style>
diff --git a/pages_tool/components/uni-status-bar/uni-status-bar.vue b/pages_tool/components/uni-status-bar/uni-status-bar.vue
index da1f445..eae65db 100644
--- a/pages_tool/components/uni-status-bar/uni-status-bar.vue
+++ b/pages_tool/components/uni-status-bar/uni-status-bar.vue
@@ -1,23 +1,29 @@
-<template>
-	<view :style="{ height: statusBarHeight }" class="uni-status-bar"><slot /></view>
-</template>
-
-<script>
-var statusBarHeight = uni.getSystemInfoSync().statusBarHeight * 2 + 'rpx';
-export default {
-	name: 'UniStatusBar',
-	data() {
-		return {
-			statusBarHeight: statusBarHeight
-		};
-	}
-};
-</script>
-
-<style lang="scss" scoped>
-.uni-status-bar {
-	width: 750rpx;
-	height: 20px;
-	// height: var(--status-bar-height);
-}
-</style>
+<template>
+	<view :style="{ height: statusBarHeight }" class="uni-status-bar"><slot /></view>
+</template>
+
+<script>
+var statusBarHeight = 0;
+try {
+	statusBarHeight = uni.getWindowInfo().statusBarHeight * 2 + 'rpx';
+} catch (e) {
+	// 兼容旧版本
+	statusBarHeight = uni.getSystemInfoSync().statusBarHeight * 2 + 'rpx';
+}
+export default {
+	name: 'UniStatusBar',
+	data() {
+		return {
+			statusBarHeight: statusBarHeight
+		};
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+.uni-status-bar {
+	width: 750rpx;
+	height: 20px;
+	// height: var(--status-bar-height);
+}
+</style>
diff --git a/pages_tool/form/form.vue b/pages_tool/form/form.vue
index 1f3c543..33b80d9 100644
--- a/pages_tool/form/form.vue
+++ b/pages_tool/form/form.vue
@@ -1,148 +1,148 @@
-<template>
-    <page-meta :page-style="themeColor"></page-meta>
-    <view>
-        <view class="page" v-if="detail">
-            <view class="form-banner">
-                <image :src="$util.img('public/uniapp/form/banner.png')" mode="widthFix"></image>
-            </view>
-            <view class="system-form-wrap">
-                <view class="form-title">请填写表单所需信息</view>
-                <ns-form :data="detail.json_data" ref="form"></ns-form>
-                <button type="primary" size="mini" class="button mini" @click="create()">提交</button>
-            </view>
-        </view>
-        <ns-empty :text="complete  ? '提交成功' : '未获取到表单信息'" v-else></ns-empty>
-
-        <loading-cover ref="loadingCover"></loading-cover>
-        <ns-login ref="login"></ns-login>
-    </view>
-</template>
-
-<script>
-    export default {
-        data() {
-            return {
-                id: 0,
-                detail: null,
-                isRepeat: false,
-                complete: false,
-                scroll:true
-            };
-        },
-        onLoad(data) {
-            // #ifdef MP-ALIPAY
-            let options = my.getLaunchOptionsSync();
-            options.query && Object.assign(data, options.query)
-            // #endif
-
-            this.id = data.id || 0;
-            if (data.scene) {
-                var sceneParams = decodeURIComponent(data.scene);
-                sceneParams = sceneParams.split('&');
-                if (sceneParams.length) {
-                    sceneParams.forEach(item => {
-                        if (item.indexOf('id') != -1) this.id = item.split('-')[1];
-                    });
-                }
-            }
-            if (this.storeToken) {
-                this.getData();
-            } else {
-                this.$nextTick(() => {
-                    this.$refs.login.open('/pages_tool/form/form?id=' + this.id)
-                })
-            }
-        },
-        watch: {
-            storeToken: function(nVal, oVal) {
-                if (nVal) this.getData();
-            }
-        },
-        methods: {
-            getData() {
-                this.$api.sendRequest({
-                    url: '/form/api/form/info',
-                    data: {
-                        form_id: this.id
-                    },
-                    success: res => {
-                        if (res.code == 0 && res.data) {
-                            this.detail = res.data;
-                        }
-                        if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-                    },
-                    fail: res => {
-                        if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-                    }
-                });
-            },
-            create() {
-                if (this.$refs.form.verify()) {
-                    if (this.isRepeat) return;
-                    this.isRepeat = true;
-
-                    this.$api.sendRequest({
-                        url: '/form/api/form/create',
-                        data: {
-                            form_id: this.id,
-                            form_data: JSON.stringify(this.$refs.form.formData)
-                        },
-                        success: res => {
-                            if (res.code == 0) {
-                                this.$util.showToast({ title: '提交成功' })
-                                setTimeout(() => {
-                                    this.complete = true;
-                                    this.detail = null;
-                                }, 1500)
-                            } else {
-                                this.isRepeat = false;
-                                this.$util.showToast({ title: res.message })
-                            }
-                        }
-                    });
-                }
-            },
-        }
-    };
-</script>
-
-<style lang="scss">
-
-    .form-banner {
-        width: 100vw;
-        line-height: 1;
-
-        image {
-            width: 100%;
-            line-height: 1;
-        }
-    }
-
-    .system-form-wrap {
-        background: $color-bg;
-        border-radius: 32rpx;
-        overflow: hidden;
-        margin: 0 0 60rpx 0;
-        padding: 0 26rpx;
-        transform: translateY(-40rpx);
-
-        .form-title {
-            line-height: 100rpx;
-            padding-top: 20rpx;
-        }
-
-        .button {
-            height: 80rpx;
-            line-height: 80rpx !important;
-            margin-top: 30rpx !important;
-            width: 100%;
-            border-radius: 80rpx;
-        }
-
-        /deep/ .form-wrap {
-            background: #fff;
-            padding: 30rpx;
-            border-radius: 32rpx;
-        }
-    }
+<template>
+    <page-meta :page-style="themeColor"></page-meta>
+    <view>
+        <view class="page" v-if="detail">
+            <view class="form-banner">
+                <image :src="$util.img('public/uniapp/form/banner.png')" mode="widthFix"></image>
+            </view>
+            <view class="system-form-wrap">
+                <view class="form-title">请填写表单所需信息</view>
+                <ns-form :data="detail.json_data" ref="form"></ns-form>
+                <button type="primary" size="mini" class="button mini" @click="create()">提交</button>
+            </view>
+        </view>
+        <ns-empty :text="complete  ? '提交成功' : '未获取到表单信息'" v-else></ns-empty>
+
+        <loading-cover ref="loadingCover"></loading-cover>
+        <ns-login ref="login"></ns-login>
+    </view>
+</template>
+
+<script>
+    export default {
+        data() {
+            return {
+                id: 0,
+                detail: null,
+                isRepeat: false,
+                complete: false,
+                scroll:true
+            };
+        },
+        onLoad(data) {
+            // #ifdef MP-ALIPAY
+            let options = my.getLaunchOptionsSync();
+            options.query && Object.assign(data, options.query)
+            // #endif
+
+            this.id = data.id || 0;
+            if (data.scene) {
+                var sceneParams = decodeURIComponent(data.scene);
+                sceneParams = sceneParams.split('&');
+                if (sceneParams.length) {
+                    sceneParams.forEach(item => {
+                        if (item.indexOf('id') != -1) this.id = item.split('-')[1];
+                    });
+                }
+            }
+            if (this.storeToken) {
+                this.getData();
+            } else {
+                this.$nextTick(() => {
+                    this.$refs.login.open('/pages_tool/form/form?id=' + this.id)
+                })
+            }
+        },
+        watch: {
+            storeToken: function(nVal, oVal) {
+                if (nVal) this.getData();
+            }
+        },
+        methods: {
+            getData() {
+                this.$api.sendRequest({
+                    url: '/form/api/form/info',
+                    data: {
+                        form_id: this.id
+                    },
+                    success: res => {
+                        if (res.code == 0 && res.data) {
+                            this.detail = res.data;
+                        }
+                        if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+                    },
+                    fail: res => {
+                        if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+                    }
+                });
+            },
+            create() {
+                if (this.$refs.form.verify()) {
+                    if (this.isRepeat) return;
+                    this.isRepeat = true;
+
+                    this.$api.sendRequest({
+                        url: '/form/api/form/create',
+                        data: {
+                            form_id: this.id,
+                            form_data: JSON.stringify(this.$refs.form.formData)
+                        },
+                        success: res => {
+                            if (res.code == 0) {
+                                this.$util.showToast({ title: '提交成功' })
+                                setTimeout(() => {
+                                    this.complete = true;
+                                    this.detail = null;
+                                }, 1500)
+                            } else {
+                                this.isRepeat = false;
+                                this.$util.showToast({ title: res.message })
+                            }
+                        }
+                    });
+                }
+            },
+        }
+    };
+</script>
+
+<style lang="scss">
+
+    .form-banner {
+        width: 100vw;
+        line-height: 1;
+
+        image {
+            width: 100%;
+            line-height: 1;
+        }
+    }
+
+    .system-form-wrap {
+        background: $color-bg;
+        border-radius: 32rpx;
+        overflow: hidden;
+        margin: 0 0 60rpx 0;
+        padding: 0 26rpx;
+        transform: translateY(-40rpx);
+
+        .form-title {
+            line-height: 100rpx;
+            padding-top: 20rpx;
+        }
+
+        .button {
+            height: 80rpx;
+            line-height: 80rpx !important;
+            margin-top: 30rpx !important;
+            width: 90%;
+            border-radius: 80rpx;
+        }
+
+        /deep/ .form-wrap {
+            background: #fff;
+            padding: 30rpx;
+            border-radius: 32rpx;
+        }
+    }
 </style>
\ No newline at end of file
diff --git a/pages_tool/goods/brand.vue b/pages_tool/goods/brand.vue
index 35322fb..634d621 100644
--- a/pages_tool/goods/brand.vue
+++ b/pages_tool/goods/brand.vue
@@ -1,125 +1,127 @@
-<template>
-	<view :data-theme="themeStyle">
-		<mescroll-uni @getData="getBrandList" ref="mescroll" size="20">
-			<block slot="list">
-				<ns-adv keyword="NS_BRAND" class-name="adv-wrap"></ns-adv>
-				<view class="brand-content" v-if="brandList.length > 0">
-					<uni-grid :column="3" @change="change" :showBorder="!1">
-						<uni-grid-item v-for="(item, index) in brandList" :key="index" index="index">
-							<image class="brand-pic" :src="$util.img(item.image_url)" mode="widthFix"></image>
-							<view class="brand_name">{{ item.brand_name }}</view>
-						</uni-grid-item>
-					</uni-grid>
-				</view>
-				<view v-if="brandList.length == 0"><ns-empty text="暂无更多品牌,去首页看看吧"></ns-empty></view>
-			</block>
-		</mescroll-uni>
-		<loading-cover ref="loadingCover"></loading-cover>
-
-		<!-- #ifdef MP-WEIXIN -->
-		<!-- 小程序隐私协议 -->
-		<privacy-popup ref="privacyPopup"></privacy-popup>
-		<!-- #endif -->
-	</view>
-</template>
-
-<script>
-	import uniGrid from '@/components/uni-grid/uni-grid.vue';
-	import uniGridItem from '@/components/uni-grid-item/uni-grid-item.vue';
-	import nsAdv from '@/components/ns-adv/ns-adv.vue';
-	export default {
-		components: {
-			uniGrid,
-			uniGridItem,
-			nsAdv
-		},
-		data() {
-			return {
-				brandList: [],
-				siteId: 0
-			};
-		},
-		onLoad(options) {
-			if (options.site_id) this.siteId = options.site_id;
-		},
-		onShow() {},
-		methods: {
-			change(e) {
-				this.$util.redirectTo('/pages/goods/list', {
-					brand_id: this.brandList[e.detail.index].brand_id
-				});
-			},
-			getBrandList(mescroll) {
-				this.$api.sendRequest({
-					url: '/api/goodsbrand/page',
-					data: {
-						page_size: mescroll.size,
-						page: mescroll.num,
-						site_id: this.siteId
-					},
-					success: res => {
-						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.brandList = []; //如果是第一页需手动制空列表
-						this.brandList = this.brandList.concat(newArr); //追加新数据
-						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-					},
-					fail() {
-						mescroll.endErr();
-						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-					}
-				});
-			}
-		},
-		onShareAppMessage(res) {
-			var title = '你想要的大牌都在这里';
-			var path = '/pages_tool/goods/brand';
-			return {
-				title: title,
-				path: path,
-				success: res => {},
-				fail: res => {}
-			};
-		}
-	};
-</script>
-
-<style lang="scss">
-	/deep/ .uni-grid-item {
-		width: calc((100vw - (#{$margin-both} * 2)) / 3) !important;
-	}
-
-	.adv-wrap {
-		margin: $margin-updown $margin-both;
-		width: auto;
-	}
-
-	.brand-content {
-		padding: $padding 0;
-		box-sizing: border-box;
-		background: #ffffff;
-		margin: $margin-updown $margin-both 0;
-
-		.brand-pic {
-			width: 60%;
-			height: 50%;
-		}
-
-		.brand_name {
-			width: 70%;
-			overflow: hidden;
-			text-overflow: ellipsis;
-			white-space: nowrap;
-			text-align: center;
-		}
-	}
+<template>
+	<view :data-theme="themeStyle">
+		<mescroll-uni @getData="getBrandList" ref="mescroll" size="20">
+			<block slot="list">
+				<ns-adv keyword="NS_BRAND" class-name="adv-wrap"></ns-adv>
+				<view class="brand-content" v-if="brandList.length > 0">
+					<uni-grid :column="3" @change="change" :showBorder="!1">
+						<uni-grid-item v-for="(item, index) in brandList" :key="index" index="index">
+							<image class="brand-pic" :src="$util.img(item.image_url)" mode="widthFix"></image>
+							<view class="brand_name">{{ item.brand_name }}</view>
+						</uni-grid-item>
+					</uni-grid>
+				</view>
+				<view v-if="brandList.length == 0"><ns-empty text="暂无更多品牌,去首页看看吧"></ns-empty></view>
+			</block>
+		</mescroll-uni>
+		<!-- 悬浮按钮 -->
+		<hover-nav></hover-nav>
+		<loading-cover ref="loadingCover"></loading-cover>
+
+		<!-- #ifdef MP-WEIXIN -->
+		<!-- 小程序隐私协议 -->
+		<privacy-popup ref="privacyPopup"></privacy-popup>
+		<!-- #endif -->
+	</view>
+</template>
+
+<script>
+	import uniGrid from '@/components/uni-grid/uni-grid.vue';
+	import uniGridItem from '@/components/uni-grid-item/uni-grid-item.vue';
+	import nsAdv from '@/components/ns-adv/ns-adv.vue';
+	export default {
+		components: {
+			uniGrid,
+			uniGridItem,
+			nsAdv
+		},
+		data() {
+			return {
+				brandList: [],
+				siteId: 0
+			};
+		},
+		onLoad(options) {
+			if (options.site_id) this.siteId = options.site_id;
+		},
+		onShow() {},
+		methods: {
+			change(e) {
+				this.$util.redirectTo('/pages/goods/list', {
+					brand_id: this.brandList[e.detail.index].brand_id
+				});
+			},
+			getBrandList(mescroll) {
+				this.$api.sendRequest({
+					url: '/api/goodsbrand/page',
+					data: {
+						page_size: mescroll.size,
+						page: mescroll.num,
+						site_id: this.siteId
+					},
+					success: res => {
+						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.brandList = []; //如果是第一页需手动制空列表
+						this.brandList = this.brandList.concat(newArr); //追加新数据
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					},
+					fail() {
+						mescroll.endErr();
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					}
+				});
+			}
+		},
+		onShareAppMessage(res) {
+			var title = '你想要的大牌都在这里';
+			var path = '/pages_tool/goods/brand';
+			return {
+				title: title,
+				path: path,
+				success: res => {},
+				fail: res => {}
+			};
+		}
+	};
+</script>
+
+<style lang="scss">
+	/deep/ .uni-grid-item {
+		width: calc((100vw - (#{$margin-both} * 2)) / 3) !important;
+	}
+
+	.adv-wrap {
+		margin: $margin-updown $margin-both;
+		width: auto;
+	}
+
+	.brand-content {
+		padding: $padding 0;
+		box-sizing: border-box;
+		background: #ffffff;
+		margin: $margin-updown $margin-both 0;
+
+		.brand-pic {
+			width: 60%;
+			height: 50%;
+		}
+
+		.brand_name {
+			width: 70%;
+			overflow: hidden;
+			text-overflow: ellipsis;
+			white-space: nowrap;
+			text-align: center;
+		}
+	}
 </style>
\ No newline at end of file
diff --git a/pages_tool/goods/coupon.vue b/pages_tool/goods/coupon.vue
index e8d99a8..a83993f 100644
--- a/pages_tool/goods/coupon.vue
+++ b/pages_tool/goods/coupon.vue
@@ -6,7 +6,7 @@
 				<view @click="changeSort(1)"><text :class="sort == 1 ? 'color-base-text active color-base-border-bottom' : ''">全部</text></view>
 				<view @click="changeSort(2, 'reward')"><text :class="sort == 2 ? 'color-base-text active color-base-border-bottom' : ''">满减券</text></view>
 				<view @click="changeSort(3, 'discount')"><text :class="sort == 3 ? 'color-base-text active color-base-border-bottom' : ''">折扣券</text></view>
-		<!-- 		<view @click="changeSort(4, 'no_threshold')"><text :class="sort == 4 ? 'color-base-text active color-base-border-bottom' : ''">无门槛券</text></view> -->
+				<view @click="changeSort(4, 'no_threshold')"><text :class="sort == 4 ? 'color-base-text active color-base-border-bottom' : ''">无门槛券</text></view>
 			</view>
 		</view>
 
@@ -32,28 +32,31 @@
 						<view class="item-info">
 							<view class="use_title">
 								<view class="title">{{ item.coupon_name }}</view>
-								<view class="max_price" v-if="item.goods_type == 2 || item.goods_type == 3" :class="{ disabled: item.useState == 2 }">指定商品</view>
-								<view class="max_price" v-else :class="{ disabled: item.useState == 2 }">全场商品</view>
+								<view class="max_price" :class="{ disabled: item.useState == 2 }">{{item.goods_type_name}}</view>
 								<view class="max_price" v-if="item.discount_limit != '0.00'">
 									(最大优惠{{ item.discount_limit }}元)
 								</view>
 								<view class="max_price" :class="{ disabled: item.useState == 2 }">{{ item.use_channel_name }}</view>
-							<!-- 	<view class="max_price  truncate"  v-if="item.use_channel!='online'" :class="{ disabled: item.useState == 2 }">
+								<view class="max_price  truncate"  v-if="item.use_channel!='online'" :class="{ disabled: item.useState == 2 }">
 									{{ item.use_store==='all'?'适用门店：全部门店': '适用门店：'+item.use_store_name}}
-								</view> -->
+								</view>
 							</view>
-							<view class="use_time" v-if="item.validity_type == 0">
-								有效期：{{ $util.timeStampTurnTime(item.end_time) }}</view>
-							<view class="use_time" v-else-if="item.validity_type == 1">
-								有效期：领取之日起{{ item.fixed_term }}日内有效</view>
+							<view class="use_time" v-if="item.validity_type == 0">有效期：{{ $util.timeStampTurnTime(item.end_time) }}</view>
+							<view class="use_time" v-else-if="item.validity_type == 1">有效期：领取之日起{{ item.fixed_term }}日内有效</view>
 							<view class="use_time" v-else>有效期：长期有效</view>
 						</view>
 						<view class="item-btn">
-							<view v-if="item.useState == 0" @click.stop="receiveCoupon(item, index)">领取</view>
+							<view v-if="item.useState == 0" @click.stop="receiveCoupon(item, index)">去领取</view>
+							<view class="to-use" v-if="item.useState == 1" @click.stop="toGoodsList(item, index)">去使用</view>
+							<view v-if="item.useState == 2" class="disabled">已抢光</view>
+							<view v-if="item.useState == 3" class="disabled">已失效</view>
+							<view v-if="item.useState == 4" class="disabled">已使用</view>
+							<!-- <view v-if="item.useState == 0" @click.stop="receiveCoupon(item, index)">领取</view>
 							<view v-if="item.useState == 1" @click.stop="toGoodsList(item, index)">去使用</view>
-							<view v-if="item.receivedType == 'out'" class="disabled">已抢光</view>
-							<view v-if="item.receivedType == 'expire'" class="disabled">已过期</view>
-							<view v-if="item.receivedType == 'limit'" class="disabled">已达上限</view>
+							<view v-if="!item.received_type && item.useState == 2" class="disabled">已抢光</view>
+							<view v-if="item.received_type == 'out'" class="disabled">已抢光</view>
+							<view v-if="item.received_type == 'expire'" class="disabled">已过期</view>
+							<view v-if="item.received_type == 'limit'" class="disabled">已达上限</view> -->
 						</view>
 					</view>
 				</view>
@@ -62,6 +65,8 @@
 		</mescroll-uni>
 		<loading-cover ref="loadingCover"></loading-cover>
 		<ns-login ref="login"></ns-login>
+		<!-- 悬浮按钮 -->
+		<hover-nav></hover-nav>
 
 		<!-- #ifdef MP-WEIXIN -->
 		<!-- 小程序隐私协议 -->
@@ -142,11 +147,12 @@
 				this.$refs.mescroll.refresh(false);
 			},
 			liClick(item, index) {
-				if(['limit', 'expire', 'out'].includes(item.receivedType)) return false;
+				// if(['limit', 'expire', 'out'].includes(item.received_type)) return false;
+				if(item.useState == 2) return false;
 				if (item.useState == 0) this.receiveCoupon(item, index);
+				else if(item.useState == 3 || item.useState == 4) this.$util.redirectTo('/pages_tool/member/coupon',{state: item.useState == 4 ? 2 : item.useState})
 				else this.toGoodsList(item, index);
 			},
-
 			//领取优惠券
 			receiveCoupon(item, index) {
 				if (this.couponBtnSwitch) return;
@@ -173,7 +179,7 @@
 							} else {
 								for (let i = 0; i < list.length; i++) {
 									if (list[i].coupon_type_id == item.coupon_type_id) {
-										list[i].receivedType = res.data.type;
+										list[i].received_type = res.data.type;
 										list[i].useState = 2;
 									}
 								}
@@ -214,9 +220,20 @@
 						mescroll.endSuccess(newArr.length);
 						if (newArr.length) {
 							newArr.forEach(v => {
+								// if (v.count == v.lead_count) v.useState = 2;
+								// else if (v.max_fetch != 0 && v.member_coupon_num && v.member_coupon_num >= v.max_fetch) v.useState = 1;
+								// else v.useState = 0;
+
+								// if(v.received_type && v.received_type == 'expire'){
+								// 	v.useState = 2;
+								// }
+								
 								if (v.count == v.lead_count) v.useState = 2;
-								else if (v.max_fetch != 0 && v.member_coupon_num && v.member_coupon_num >= v.max_fetch) v.useState = 1;
-								else v.useState = 0;
+								else if (v.max_fetch == 0 || (v.max_fetch != 0 && !v.member_coupon_num) || (v.max_fetch != 0 && v.member_coupon_num && v.max_fetch > v.member_coupon_num)) v.useState = 0;
+								else if (v.wait_coupon_num) v.useState = 1
+								else if (v.lose_coupon_num) v.useState = 3;
+								else if (v.use_coupon_num) v.useState = 4;
+								
 							});
 						}
 						//设置列表数据
@@ -367,6 +384,12 @@
 						background: #dedede !important;
 						color: #909399 !important;
 					}
+					
+					&.to-use{
+						border: 2rpx solid var(--bg-color);
+						background: transparent;
+						color: var(--bg-color);
+					}
 				}
 
 				&::after {
diff --git a/pages_tool/goods/coupon_receive.vue b/pages_tool/goods/coupon_receive.vue
index 7fc4b73..2aeb74c 100644
--- a/pages_tool/goods/coupon_receive.vue
+++ b/pages_tool/goods/coupon_receive.vue
@@ -30,6 +30,8 @@
 		</view>
 		<loading-cover ref="loadingCover"></loading-cover>
 		<ns-login ref="login"></ns-login>
+		<!-- 悬浮按钮 -->
+		<hover-nav></hover-nav>
 
 		<!-- #ifdef MP-WEIXIN -->
 		<!-- 小程序隐私协议 -->
diff --git a/pages_tool/goods/search.vue b/pages_tool/goods/search.vue
index 72bcd9c..abcc350 100644
--- a/pages_tool/goods/search.vue
+++ b/pages_tool/goods/search.vue
@@ -4,7 +4,7 @@
 		<view class="content">
 			<view class="cate-search">
 				<view class="search-box">
-					<input class="uni-input" maxlength="50" v-model="inputValue" confirm-type="search" @focus="inputFocus" focus @confirm="search()" :placeholder="searchWords ? searchWords : ''" />
+					<input class="uni-input" maxlength="50" v-model="inputValue" confirm-type="search" @focus="inputFocus" focus @confirm="search()" :placeholder="searchWords ? searchWords : $lang('inputPlaceholder')" />
 					<text class="iconfont icon-sousuo3" @click="search()"></text>
 				</view>
 			</view>
@@ -13,7 +13,7 @@
 				<view class="history" v-if="historyList.length">
 					<view class="history-box">
 						<view class="history-top">
-							<view class="title">历史搜索</view>
+							<view class="title">{{ $lang('history') }}</view>
 							<view class="icon iconfont icon-icon7" @click="deleteHistoryList"></view>
 						</view>
 						<view class="history-bottom " id="history-list" :style="{ maxHeight: !isAllHistory ? '100%' : '168rpx' }">
@@ -31,7 +31,7 @@
 				<view class="history" v-if="hotList.length">
 					<view class="history-box">
 						<view class="history-top">
-							<view class="title">热门搜索</view>
+							<view class="title">{{ $lang('hot') }}</view>
 						</view>
 						<view class="history-bottom">
 							<view class="history-li" v-for="(item, index) in hotList" :key="index" @click="otherSearch(item)" @longtap="deleteItem(item)">
@@ -137,7 +137,6 @@
 			},
 			//搜索
 			search() {
-
 				if (this.inputValue.trim() != '') {
 
 					// 对历史搜索处理,判断有无,最近搜索显示在最前
@@ -163,7 +162,7 @@
 						});
 					} else {
 						this.$util.redirectTo('/pages/goods/list', {
-							//keyword: this.searchWords
+							keyword: this.searchWords
 						});
 					}
 				}
@@ -171,12 +170,11 @@
 			// 获取元素高度
 			getHistoryHeight() {
 				const query = uni.createSelectorQuery().in(this);
-				query.select('#history-list')
-					.boundingClientRect(data => {
-						if (data && data.height > uni.upx2px(70) * 2 + uni.upx2px(35) * 2) {
-							this.isAllHistory = true;
-						}
-					}).exec();
+				query.select('#history-list').boundingClientRect(data => {
+					if (data && data.height > uni.upx2px(70) * 2 + uni.upx2px(35) * 2) {
+						this.isAllHistory = true;
+					}
+				}).exec();
 			}
 		}
 	};
diff --git a/pages_tool/help/detail.vue b/pages_tool/help/detail.vue
index 4eabe01..5f94b34 100644
--- a/pages_tool/help/detail.vue
+++ b/pages_tool/help/detail.vue
@@ -1,141 +1,147 @@
-<template>
-	<page-meta :page-style="themeColor"></page-meta>
-	<view class="page">
-		<view class="help-title">{{ detail.title }}</view>
-		<view class="help-content"><rich-text :nodes="content"></rich-text></view>
-		<view class="help-meta">
-			<text class="help-time">发表时间: {{ $util.timeStampTurnTime(detail.create_time) }}</text>
-		</view>
-		<loading-cover ref="loadingCover"></loading-cover>
-
-		<!-- #ifdef MP-WEIXIN -->
-		<!-- 小程序隐私协议 -->
-		<privacy-popup ref="privacyPopup"></privacy-popup>
-		<!-- #endif -->
-	</view>
-</template>
-
-<script>
-	import htmlParser from '@/common/js/html-parser';
-	export default {
-		data() {
-			return {
-				id: 0,
-				detail: {},
-				content: ''
-			};
-		},
-		onLoad(options) {
-			this.id = options.id || 0;
-			// 小程序扫码进入
-			if (options.scene) {
-				var sceneParams = decodeURIComponent(options.scene);
-				this.id = sceneParams.split('-')[1];
-			}
-			if (this.id == 0) {
-				this.$util.redirectTo('/pages_tool/help/list', {}, 'redirectTo');
-			}
-		},
-		onShow() {
-			this.getData();
-		},
-		methods: {
-			getData() {
-				this.$api.sendRequest({
-					url: '/api/help/info',
-					data: {
-						id: this.id
-					},
-					success: res => {
-						if (res.code == 0) {
-							if (res.data) {
-								this.detail = res.data;
-								this.$langConfig.title(this.detail.title);
-								this.content = htmlParser(res.data.content);
-								this.setPublicShare();
-							} else {
-								this.$util.showToast({
-									title: res.message
-								});
-								setTimeout(() => {
-									this.$util.redirectTo('/pages_tool/help/list', {}, 'redirectTo');
-								}, 2000);
-							}
-						} else {
-							this.$util.showToast({
-								title: res.message
-							});
-							setTimeout(() => {
-								this.$util.redirectTo('/pages_tool/help/list', {}, 'redirectTo');
-							}, 2000);
-						}
-						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-					},
-					fail: res => {
-						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-					}
-				});
-			},
-			// 设置公众号分享
-			setPublicShare() {
-				let shareUrl = this.$config.h5Domain + '/pages_tool/help/detail?id=' + this.id;
-				this.$util.setPublicShare({
-					title: this.detail.title,
-					desc: '',
-					link: shareUrl,
-					imgUrl: this.siteInfo ? this.$util.img(this.siteInfo.logo_square) : ''
-				});
-			}
-		},
-		onShareAppMessage(res) {
-			var title = this.detail.title;
-			var path = '/pages_tool/help/detail?id=' + this.id;
-			return {
-				title: title,
-				path: path,
-				success: res => {},
-				fail: res => {}
-			};
-		},
-		//分享到朋友圈
-		onShareTimeline() {
-			var title = this.detail.title;
-			var query = 'id=' + this.id;
-			return {
-				title: title,
-				query: query,
-				imageUrl: ''
-			};
-		}
-	};
-</script>
-
-<style lang="scss">
-	.page {
-		width: 100%;
-		height: 100%;
-		padding: 30rpx;
-		box-sizing: border-box;
-		background: #ffffff;
-	}
-
-	.help-title {
-		font-size: $font-size-toolbar;
-		text-align: center;
-	}
-
-	.help-content {
-		margin-top: $margin-updown;
-		word-break: break-all;
-	}
-
-	.help-meta {
-		text-align: right;
-		margin-top: $margin-updown;
-		color: $color-tip;
-
-		.help-time {
-			font-size: $font-size-tag;
-		}
-	}
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view class="page">
+		<view class="help-title">{{ detail.title }}</view>
+		<view class="help-content">
+			<!-- <rich-text :nodes="content"></rich-text> -->
+			<ns-mp-html :content="content"></ns-mp-html>
+		</view>
+		<view class="help-meta">
+			<text class="help-time">发表时间: {{ $util.timeStampTurnTime(detail.create_time) }}</text>
+		</view>
+		<!-- 悬浮按钮 -->
+		<hover-nav></hover-nav>
+		<loading-cover ref="loadingCover"></loading-cover>
+
+		<!-- #ifdef MP-WEIXIN -->
+		<!-- 小程序隐私协议 -->
+		<privacy-popup ref="privacyPopup"></privacy-popup>
+		<!-- #endif -->
+	</view>
+</template>
+
+<script>
+	import htmlParser from '@/common/js/html-parser';
+	export default {
+		data() {
+			return {
+				id: 0,
+				detail: {},
+				content: ''
+			};
+		},
+		onLoad(options) {
+			this.id = options.id || 0;
+			// 小程序扫码进入
+			if (options.scene) {
+				var sceneParams = decodeURIComponent(options.scene);
+				this.id = sceneParams.split('-')[1];
+			}
+			if (this.id == 0) {
+				this.$util.redirectTo('/pages_tool/help/list', {}, 'redirectTo');
+			}
+		},
+		onShow() {
+			this.getData();
+		},
+		methods: {
+			getData() {
+				this.$api.sendRequest({
+					url: '/api/help/info',
+					data: {
+						id: this.id
+					},
+					success: res => {
+						if (res.code == 0) {
+							if (res.data) {
+								this.detail = res.data;
+								this.$langConfig.title(this.detail.title);
+								// this.content = htmlParser(res.data.content);
+								this.content = res.data.content;
+								this.setPublicShare();
+							} else {
+								this.$util.showToast({
+									title: res.message
+								});
+								setTimeout(() => {
+									this.$util.redirectTo('/pages_tool/help/list', {}, 'redirectTo');
+								}, 2000);
+							}
+						} else {
+							this.$util.showToast({
+								title: res.message
+							});
+							setTimeout(() => {
+								this.$util.redirectTo('/pages_tool/help/list', {}, 'redirectTo');
+							}, 2000);
+						}
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					},
+					fail: res => {
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					}
+				});
+			},
+			// 设置公众号分享
+			setPublicShare() {
+				let shareUrl = this.$config.h5Domain + '/pages_tool/help/detail?id=' + this.id;
+				this.$util.setPublicShare({
+					title: this.detail.title,
+					desc: '',
+					link: shareUrl,
+					imgUrl: this.siteInfo ? this.$util.img(this.siteInfo.logo_square) : ''
+				});
+			}
+		},
+		onShareAppMessage(res) {
+			var title = this.detail.title;
+			var path = '/pages_tool/help/detail?id=' + this.id;
+			return {
+				title: title,
+				path: path,
+				success: res => {},
+				fail: res => {}
+			};
+		},
+		//分享到朋友圈
+		onShareTimeline() {
+			var title = this.detail.title;
+			var query = 'id=' + this.id;
+			return {
+				title: title,
+				query: query,
+				imageUrl: ''
+			};
+		}
+	};
+</script>
+
+<style lang="scss">
+	.page {
+		width: 100%;
+		height: 100%;
+		padding: 30rpx;
+		box-sizing: border-box;
+		background: #ffffff;
+	}
+
+	.help-title {
+		font-size: $font-size-toolbar;
+		text-align: center;
+	}
+
+	.help-content {
+		margin-top: $margin-updown;
+		word-break: break-all;
+	}
+
+	.help-meta {
+		text-align: right;
+		margin-top: $margin-updown;
+		color: $color-tip;
+
+		.help-time {
+			font-size: $font-size-tag;
+		}
+	}
 </style>
\ No newline at end of file
diff --git a/pages_tool/help/list.vue b/pages_tool/help/list.vue
index 77efc6c..15c9291 100644
--- a/pages_tool/help/list.vue
+++ b/pages_tool/help/list.vue
@@ -1,135 +1,136 @@
-<template>
-	<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="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_index" @click="helpDetail(s_item)">{{ s_item.title }}</view>
-			</view>
-		</block>
-		<block v-else><ns-empty text="暂无帮助信息" :isIndex="false"></ns-empty></block>
-
-		<loading-cover ref="loadingCover"></loading-cover>
-
-		<!-- #ifdef MP-WEIXIN -->
-		<!-- 小程序隐私协议 -->
-		<privacy-popup ref="privacyPopup"></privacy-popup>
-		<!-- #endif -->
-	</view>
-</template>
-
-<script>
-export default {
-	data() {
-		return {
-			dataList: []
-		};
-	},
-	onLoad() {},
-	onShow() {
-		this.setPublicShare();
-		this.getData();
-	},
-	methods: {
-		getData() {
-			this.$api.sendRequest({
-				url: '/api/helpclass/lists',
-				data: {},
-				success: res => {
-					if (res.code == 0 && res.data) {
-						this.dataList = res.data;
-					} else {
-						this.$util.showToast({
-							title: res.message
-						});
-					}
-					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-				},
-				fail: res => {
-					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-				}
-			});
-		},
-		helpDetail(e) {
-			// #ifndef MP-WEIXIN
-			if (e.link_address) {
-				uni.redirectTo({
-					url: '/pages_tool/webview/webview?src=' + encodeURIComponent(e.link_address)
-				});
-			} else {
-				this.$util.redirectTo('/pages_tool/help/detail', {
-					id: e.id
-				});
-			}
-			// #endif
-
-			// #ifdef MP-WEIXIN
-			this.$util.redirectTo('/pages_tool/help/detail', {
-				id: e.id
-			});
-			// #endif
-		},
-		// 设置公众号分享
-		setPublicShare() {
-			let shareUrl = this.$config.h5Domain + '/pages_tool/help/list';
-			this.$util.setPublicShare({
-				title: '帮助中心',
-				desc: '',
-				link: shareUrl,
-				imgUrl: this.siteInfo ? this.$util.img(this.siteInfo.logo_square) : ''
-			});
-		}
-	},
-	onShareAppMessage(res) {
-		var title = '帮助中心使你更加方便';
-		var path = '/pages_tool/help/list';
-		return {
-			title: title,
-			path: path,
-			success: res => {},
-			fail: res => {}
-		};
-	}
-};
-</script>
-
-<style lang="scss" scoped>
-.help {
-	height: 100%;
-	box-sizing: border-box;
-	padding-top: 20rpx;
-
-	.help-item {
-		width: calc(100% - 60rpx);
-		margin: 0 auto;
-		padding: 32rpx 35rpx;
-		box-sizing: border-box;
-		background-color: #fff;
-		margin-bottom: 18rpx;
-		border-radius: 10rpx;
-
-		.item-title {
-			padding-bottom: 15rpx;
-			font-size: 30rpx;
-			color: #000;
-			border-bottom: 2rpx solid #f1f1f1;
-			&.empty {
-				padding-bottom: 0;
-				border-bottom: none;
-			}
-		}
-
-		.item-content {
-			padding: 24rpx 0;
-			border-bottom: 2rpx solid #f1f1f1;
-			font-size: $font-size-base;
-			color: $color-sub;
-
-			&:last-child {
-				border-bottom: none;
-				padding-bottom: 0;
-			}
-		}
-	}
-}
-</style>
+<template>
+	<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="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_index" @click="helpDetail(s_item)">{{ s_item.title }}</view>
+			</view>
+		</block>
+		<block v-else><ns-empty text="暂无帮助信息" :isIndex="false"></ns-empty></block>
+		<!-- 悬浮按钮 -->
+		<hover-nav></hover-nav>
+		<loading-cover ref="loadingCover"></loading-cover>
+
+		<!-- #ifdef MP-WEIXIN -->
+		<!-- 小程序隐私协议 -->
+		<privacy-popup ref="privacyPopup"></privacy-popup>
+		<!-- #endif -->
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			dataList: []
+		};
+	},
+	onLoad() {},
+	onShow() {
+		this.setPublicShare();
+		this.getData();
+	},
+	methods: {
+		getData() {
+			this.$api.sendRequest({
+				url: '/api/helpclass/lists',
+				data: {},
+				success: res => {
+					if (res.code == 0 && res.data) {
+						this.dataList = res.data;
+					} else {
+						this.$util.showToast({
+							title: res.message
+						});
+					}
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				},
+				fail: res => {
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				}
+			});
+		},
+		helpDetail(e) {
+			// #ifndef MP-WEIXIN
+			if (e.link_address) {
+				uni.redirectTo({
+					url: '/pages_tool/webview/webview?src=' + encodeURIComponent(e.link_address)
+				});
+			} else {
+				this.$util.redirectTo('/pages_tool/help/detail', {
+					id: e.id
+				});
+			}
+			// #endif
+
+			// #ifdef MP-WEIXIN
+			this.$util.redirectTo('/pages_tool/help/detail', {
+				id: e.id
+			});
+			// #endif
+		},
+		// 设置公众号分享
+		setPublicShare() {
+			let shareUrl = this.$config.h5Domain + '/pages_tool/help/list';
+			this.$util.setPublicShare({
+				title: '帮助中心',
+				desc: '',
+				link: shareUrl,
+				imgUrl: this.siteInfo ? this.$util.img(this.siteInfo.logo_square) : ''
+			});
+		}
+	},
+	onShareAppMessage(res) {
+		var title = '帮助中心使你更加方便';
+		var path = '/pages_tool/help/list';
+		return {
+			title: title,
+			path: path,
+			success: res => {},
+			fail: res => {}
+		};
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+.help {
+	height: 100%;
+	box-sizing: border-box;
+	padding-top: 20rpx;
+
+	.help-item {
+		width: calc(100% - 60rpx);
+		margin: 0 auto;
+		padding: 32rpx 35rpx;
+		box-sizing: border-box;
+		background-color: #fff;
+		margin-bottom: 18rpx;
+		border-radius: 10rpx;
+
+		.item-title {
+			padding-bottom: 15rpx;
+			font-size: 30rpx;
+			color: #000;
+			border-bottom: 2rpx solid #f1f1f1;
+			&.empty {
+				padding-bottom: 0;
+				border-bottom: none;
+			}
+		}
+
+		.item-content {
+			padding: 24rpx 0;
+			border-bottom: 2rpx solid #f1f1f1;
+			font-size: $font-size-base;
+			color: $color-sub;
+
+			&:last-child {
+				border-bottom: none;
+				padding-bottom: 0;
+			}
+		}
+	}
+}
+</style>
diff --git a/pages_tool/login/aggrement.vue b/pages_tool/login/aggrement.vue
new file mode 100644
index 0000000..98eecef
--- /dev/null
+++ b/pages_tool/login/aggrement.vue
@@ -0,0 +1,46 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view>
+		<view class="aggrement-info" v-if="aggrement && aggrement.content">
+			<ns-mp-html :content="aggrement.content"></ns-mp-html>
+		</view>
+		<loading-cover ref="loadingCover"></loading-cover>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				aggrement: null,
+				type: 'SERVICE'
+			}
+		},
+		onLoad(option) {
+			this.type = option.type || ''
+			this.getaggrementInfo();
+		},
+		methods: {
+			getaggrementInfo() {
+				this.$api.sendRequest({
+					url: '/api/register/aggrement',
+					data: {
+						type: this.type
+					},
+					success: res => {
+						if (res.code >= 0) {
+							this.aggrement = res.data;
+						}
+						if(this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					}
+				});
+			}
+		},
+	}
+</script>
+
+<style lang="scss" scoped>
+	.aggrement-info{
+		padding: 20rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/pages_tool/login/find.vue b/pages_tool/login/find.vue
index ab04b00..8494c54 100644
--- a/pages_tool/login/find.vue
+++ b/pages_tool/login/find.vue
@@ -1,439 +1,439 @@
-<template>
-	<page-meta :page-style="themeColor"></page-meta>
-	<view class="find">
-		<view class="iconfont icon-close" @click="navigateBack()"></view>
-		<view class="header-wrap">
-			<block v-if="stepShow == 0">
-				<view class="title">请输入手机号</view>
-				<view><text class="color-tip">请确认您的账号已绑定此手机号</text></view>
-			</block>
-
-			<block v-if="stepShow == 1">
-				<view class="title">请输入验证码</view>
-				<view>
-					<text class="color-tip">已将验证码发送至手机号：{{ formData.mobile }}</text>
-				</view>
-			</block>
-
-			<block v-if="stepShow == 2">
-				<view class="title">请设置新的密码</view>
-				<view><text class="color-tip">建议您的新密码以简单好记为标准</text></view>
-			</block>
-		</view>
-		<view class="find-form">
-			<!-- 输入手机号和验证码 -->
-			<block v-if="stepShow == 0">
-				<view class="form-input">
-					<input
-						class="uni-input"
-						placeholder-class="placeholder-class"
-						type="text"
-						maxlength="17"
-						v-model="formData.mobile"
-						:placeholder="$lang('accountPlaceholder')"
-					/>
-				</view>
-
-				<view class="form-input align-type">
-					<input
-						class="uni-input info-content"
-						placeholder-class="placeholder-class"
-						type="number"
-						maxlength="4"
-						:placeholder="$lang('captchaPlaceholder')"
-						v-model="formData.captcha"
-					/>
-					<image :src="captcha.img" class="captcha" @click="getCaptcha"></image>
-				</view>
-
-				<button type="primary" class="find-btn" @click="nextStep()">{{ $lang('next') }}</button>
-			</block>
-
-			<!-- 输入动态码 -->
-			<block v-if="stepShow == 1">
-				<myp-one :maxlength="4" @input="input" ref="input" :auto-focus="true"></myp-one>
-				<button type="primary" class="find-btn" :disabled="isSend" @click="sendDynaCode">{{ codeText }}</button>
-			</block>
-			<!-- 输入新密码 -->
-			<block v-if="stepShow == 2">
-				<view class="form-input">
-					<input
-						class="uni-input"
-						placeholder-class="placeholder-class"
-						type="text"
-						maxlength="30"
-						password="true"
-						:placeholder="$lang('passwordPlaceholder')"
-						v-model="formData.password"
-					/>
-				</view>
-
-				<view class="form-input">
-					<input
-						class="uni-input"
-						placeholder-class="placeholder-class"
-						type="text"
-						maxlength="30"
-						password="true"
-						:placeholder="$lang('rePasswordPlaceholder')"
-						v-model="formData.rePassword"
-					/>
-				</view>
-
-				<button type="primary" class="find-btn" @click="save">{{ $lang('save') }}</button>
-			</block>
-		</view>
-	</view>
-</template>
-
-<script>
-import validate from 'common/js/validate.js';
-import mypOne from '@/pages_tool/components/myp-one/myp-one.vue';
-export default {
-	components: {
-		mypOne
-	},
-	data() {
-		return {
-			findMode: 'mobile',
-			codeText: '重新获取',
-			seconds: 120,
-			timer: null,
-			formData: {
-				mobile: '',
-				password: '',
-				rePassword: '',
-				dynacode: '',
-				captcha: ''
-			},
-			stepShow: 0,
-			isSend: false,
-			captcha: {
-				id: '',
-				img: ''
-			},
-			registerConfig: {}
-		};
-	},
-	onLoad() {
-		this.getCaptcha();
-	},
-	onShow() {
-		this.getRegisterConfig();
-	},
-	methods: {
-		input(val) {
-			if (val.length == 4) {
-				this.formData.dynacode = val;
-				this.stepShow += 1;
-			}
-		},
-		// 导航跳转
-		navigateBack() {
-			if (this.stepShow > 0) {
-				this.stepShow -= 1;
-			} else {
-				this.$util.redirectTo('/pages_tool/login/login', '', 'redirectTo');
-			}
-		},
-		// 下一步
-		async nextStep() {
-			let step0Rule = [
-					{
-						name: 'mobile',
-						checkType: 'phoneno',
-						errorMsg: '请输入正确的手机号'
-					},
-					{
-						name: 'captcha',
-						checkType: 'required',
-						errorMsg: this.$lang('captchaPlaceholder')
-					}
-				], //手机验证
-				step0CheckRes;
-
-			step0CheckRes = validate.check(this.formData, step0Rule);
-
-			if (step0CheckRes) {
-				this.findMode = 'mobile';
-				let res = await this.$api.sendRequest({
-					url: '/api/member/checkmobile',
-					data: {
-						mobile: this.formData.mobile
-					},
-					async: false
-				});
-				if (res.code == 0) {
-					this.$util.showToast({
-						title: '该手机号未注册'
-					});
-					return false;
-				}
-			} else {
-				this.$util.showToast({
-					title: validate.error
-				});
-				return false;
-			}
-			this.sendDynaCode();
-		},
-		// 注册表单验证
-		vertify() {
-			let regConfig = this.registerConfig;
-			let rule = [
-				{
-					name: 'password',
-					checkType: 'required',
-					errorMsg: '请输入密码'
-				}
-			];
-			if (regConfig.pwd_len > 0) {
-				rule.push({
-					name: 'password',
-					checkType: 'lengthMin',
-					checkRule: regConfig.pwd_len,
-					errorMsg: '密码长度不能小于' + regConfig.pwd_len + '位'
-				});
-			}
-			if (regConfig.pwd_complexity != '') {
-				let passwordErrorMsg = '密码需包含',
-					reg = '';
-				if (regConfig.pwd_complexity.indexOf('number') != -1) {
-					reg += '(?=.*?[0-9])';
-					passwordErrorMsg += '数字';
-				}
-				if (regConfig.pwd_complexity.indexOf('letter') != -1) {
-					reg += '(?=.*?[a-z])';
-					passwordErrorMsg += '、小写字母';
-				}
-				if (regConfig.pwd_complexity.indexOf('upper_case') != -1) {
-					reg += '(?=.*?[A-Z])';
-					passwordErrorMsg += '、大写字母';
-				}
-				if (regConfig.pwd_complexity.indexOf('symbol') != -1) {
-					reg += '(?=.*?[#?!@$%^&*-])';
-					passwordErrorMsg += '、特殊字符';
-				}
-				rule.push({
-					name: 'password',
-					checkType: 'reg',
-					checkRule: reg,
-					errorMsg: passwordErrorMsg
-				});
-			}
-
-			var checkRes = validate.check(this.formData, rule);
-			if (checkRes) {
-				if (this.formData.password != this.formData.rePassword) {
-					this.$util.showToast({
-						title: '两次密码不一致'
-					});
-					return false;
-				}
-				return true;
-			} else {
-				this.$util.showToast({
-					title: validate.error
-				});
-				return false;
-			}
-		},
-		// 获取验证码
-		getCaptcha() {
-			this.$api.sendRequest({
-				url: '/api/captcha/captcha',
-				data: {
-					captcha_id: this.captcha.id
-				},
-				success: res => {
-					if (res.code >= 0) {
-						this.captcha = res.data;
-						this.captcha.img = this.captcha.img.replace(/\r\n/g, '');
-					}
-				}
-			});
-		},
-		// 发送动态验证码
-		async sendDynaCode() {
-			if (this.formData.captcha.length == 0) {
-				this.$util.showToast({
-					title: this.$lang('captchaPlaceholder')
-				});
-				return;
-			}
-
-			if (this.isSend) return;
-			this.isSend = true;
-
-			var url,
-				data = {
-					captcha_id: this.captcha.id,
-					captcha_code: this.formData.captcha
-				};
-			data[this.findMode] = this.formData.mobile;
-			url = '/api/findpassword/mobilecode';
-
-			this.$api.sendRequest({
-				url: url,
-				data: data,
-				success: res => {
-					let data = res.data;
-					if (data.key) {
-						if (this.seconds == 120 && this.timer == null) {
-							this.timer = setInterval(() => {
-								this.seconds--;
-								this.codeText = '重新获取(' + this.seconds + 's)';
-							}, 1000);
-						}
-						uni.setStorageSync('forgot_password_token', data.key);
-						this.stepShow += 1;
-					} else {
-						this.$util.showToast({
-							title: res.message
-						});
-						this.isSend = false;
-						this.getCaptcha();
-					}
-				},
-				fail: res => {
-					this.isSend = false;
-					this.getCaptcha();
-				}
-			});
-		},
-		save() {
-			if (this.vertify()) {
-				var url,
-					data = {
-						code: this.formData.dynacode,
-						key: uni.getStorageSync('forgot_password_token'),
-						password: this.formData.password
-					};
-				data[this.findMode] = this.formData.mobile;
-				url = '/api/findpassword/mobile';
-				this.$api.sendRequest({
-					url: url,
-					data: data,
-					success: res => {
-						this.$util.showToast({
-							title: res.message
-						});
-						if (res.code == 0) {
-							setTimeout(() => {
-								uni.removeStorage({
-									key: 'forgot_password_token'
-								});
-								this.$util.redirectTo('/pages_tool/login/login', {}, 'redirectTo');
-							}, 1000);
-						} else {
-							this.stepShow -= 1;
-						}
-					}
-				});
-			}
-		},
-		/**
-		 * 获取注册配置
-		 */
-		getRegisterConfig() {
-			this.$api.sendRequest({
-				url: '/api/register/config',
-				success: res => {
-					if (res.code >= 0) {
-						this.registerConfig = res.data.value;
-					}
-				}
-			});
-		}
-	},
-	watch: {
-		seconds(value) {
-			if (value == 0) {
-				this.seconds = 120;
-				this.codeText = '重新获取';
-				this.isSend = false;
-				clearInterval(this.timer);
-			}
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-page {
-	background: #ffffff !important;
-	overflow: hidden;
-}
-
-.captcha {
-	width: 170rpx;
-	height: 50rpx;
-}
-
-.find-form {
-	padding: 100rpx 80rpx 0;
-
-	.form-input {
-		margin-top: 60rpx;
-		height: 60rpx;
-		border-bottom: 2rpx solid $color-line;
-
-		input {
-			padding: 0;
-			font-size: $font-size-base;
-		}
-	}
-
-	.find-btn {
-		margin: 374rpx 0 0;
-		border-radius: $border-radius;
-		color: #fff;
-
-		&[disabled] {
-			background-color: #f7f7f7 !important;
-		}
-	}
-}
-
-.forget-section {
-	display: flex;
-	flex-direction: row-reverse;
-	justify-content: space-between;
-	margin-top: 10rpx;
-	height: 70rpx;
-	line-height: 70rpx;
-}
-
-.align-type {
-	display: flex;
-	justify-content: space-between;
-}
-
-.header-wrap {
-	width: 80%;
-	height: 100%;
-	margin: calc(120rpx + 88rpx) auto 0;
-	background-repeat: no-repeat;
-	background-size: contain;
-	background-position: bottom;
-	position: relative;
-
-	.title {
-		font-size: 50rpx;
-		font-weight: bold;
-	}
-}
-
-.icon-close {
-	font-size: 52rpx;
-	position: fixed;
-	left: 24rpx;
-	top: 72rpx;
-	z-index: 9;
-	color: #000;
-}
-
-.placeholder-class {
-	color: #bfbfbf;
-}
-</style>
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view class="find">
+		<view class="iconfont icon-close" @click="navigateBack()"></view>
+		<view class="header-wrap">
+			<block v-if="stepShow == 0">
+				<view class="title">请输入手机号</view>
+				<view><text class="color-tip">请确认您的账号已绑定此手机号</text></view>
+			</block>
+
+			<block v-if="stepShow == 1">
+				<view class="title">请输入验证码</view>
+				<view>
+					<text class="color-tip">已将验证码发送至手机号：{{ formData.mobile }}</text>
+				</view>
+			</block>
+
+			<block v-if="stepShow == 2">
+				<view class="title">请设置新的密码</view>
+				<view><text class="color-tip">建议您的新密码以简单好记为标准</text></view>
+			</block>
+		</view>
+		<view class="find-form">
+			<!-- 输入手机号和验证码 -->
+			<block v-if="stepShow == 0">
+				<view class="form-input">
+					<input
+						class="uni-input"
+						placeholder-class="placeholder-class"
+						type="text"
+						maxlength="17"
+						v-model="formData.mobile"
+						:placeholder="$lang('accountPlaceholder')"
+					/>
+				</view>
+
+				<view class="form-input align-type">
+					<input
+						class="uni-input info-content"
+						placeholder-class="placeholder-class"
+						type="number"
+						maxlength="4"
+						:placeholder="$lang('captchaPlaceholder')"
+						v-model="formData.captcha"
+					/>
+					<image :src="captcha.img" class="captcha" @click="getCaptcha"></image>
+				</view>
+
+				<button type="primary" class="find-btn" @click="nextStep()">{{ $lang('next') }}</button>
+			</block>
+
+			<!-- 输入动态码 -->
+			<block v-if="stepShow == 1">
+				<myp-one :maxlength="4" @input="input" ref="input" :auto-focus="true"></myp-one>
+				<button type="primary" class="find-btn" :disabled="isSend" @click="sendDynaCode">{{ codeText }}</button>
+			</block>
+			<!-- 输入新密码 -->
+			<block v-if="stepShow == 2">
+				<view class="form-input">
+					<input
+						class="uni-input"
+						placeholder-class="placeholder-class"
+						type="text"
+						maxlength="30"
+						password="true"
+						:placeholder="$lang('passwordPlaceholder')"
+						v-model="formData.password"
+					/>
+				</view>
+
+				<view class="form-input">
+					<input
+						class="uni-input"
+						placeholder-class="placeholder-class"
+						type="text"
+						maxlength="30"
+						password="true"
+						:placeholder="$lang('rePasswordPlaceholder')"
+						v-model="formData.rePassword"
+					/>
+				</view>
+
+				<button type="primary" class="find-btn" @click="save">{{ $lang('save') }}</button>
+			</block>
+		</view>
+	</view>
+</template>
+
+<script>
+import validate from 'common/js/validate.js';
+import mypOne from '@/pages_tool/components/myp-one/myp-one.vue';
+export default {
+	components: {
+		mypOne
+	},
+	data() {
+		return {
+			findMode: 'mobile',
+			codeText: '重新获取',
+			seconds: 120,
+			timer: null,
+			formData: {
+				mobile: '',
+				password: '',
+				rePassword: '',
+				dynacode: '',
+				captcha: ''
+			},
+			stepShow: 0,
+			isSend: false,
+			captcha: {
+				id: '',
+				img: ''
+			},
+			registerConfig: {}
+		};
+	},
+	onLoad() {
+		this.getCaptcha();
+	},
+	onShow() {
+		this.getRegisterConfig();
+	},
+	methods: {
+		input(val) {
+			if (val.length == 4) {
+				this.formData.dynacode = val;
+				this.stepShow += 1;
+			}
+		},
+		// 导航跳转
+		navigateBack() {
+			if (this.stepShow > 0) {
+				this.stepShow -= 1;
+			} else {
+				this.$util.redirectTo('/pages_tool/login/login', '', 'redirectTo');
+			}
+		},
+		// 下一步
+		async nextStep() {
+			let step0Rule = [
+					{
+						name: 'mobile',
+						checkType: 'phoneno',
+						errorMsg: '请输入正确的手机号'
+					},
+					{
+						name: 'captcha',
+						checkType: 'required',
+						errorMsg: this.$lang('captchaPlaceholder')
+					}
+				], //手机验证
+				step0CheckRes;
+
+			step0CheckRes = validate.check(this.formData, step0Rule);
+
+			if (step0CheckRes) {
+				this.findMode = 'mobile';
+				let res = await this.$api.sendRequest({
+					url: '/api/member/checkmobile',
+					data: {
+						mobile: this.formData.mobile
+					},
+					async: false
+				});
+				if (res.code == 0) {
+					this.$util.showToast({
+						title: '该手机号未注册'
+					});
+					return false;
+				}
+			} else {
+				this.$util.showToast({
+					title: validate.error
+				});
+				return false;
+			}
+			this.sendDynaCode();
+		},
+		// 注册表单验证
+		vertify() {
+			let regConfig = this.registerConfig;
+			let rule = [
+				{
+					name: 'password',
+					checkType: 'required',
+					errorMsg: '请输入密码'
+				}
+			];
+			if (regConfig.pwd_len > 0) {
+				rule.push({
+					name: 'password',
+					checkType: 'lengthMin',
+					checkRule: regConfig.pwd_len,
+					errorMsg: '密码长度不能小于' + regConfig.pwd_len + '位'
+				});
+			}
+			if (regConfig.pwd_complexity != '') {
+				let passwordErrorMsg = '密码需包含',
+					reg = '';
+				if (regConfig.pwd_complexity.indexOf('number') != -1) {
+					reg += '(?=.*?[0-9])';
+					passwordErrorMsg += '数字';
+				}
+				if (regConfig.pwd_complexity.indexOf('letter') != -1) {
+					reg += '(?=.*?[a-z])';
+					passwordErrorMsg += '、小写字母';
+				}
+				if (regConfig.pwd_complexity.indexOf('upper_case') != -1) {
+					reg += '(?=.*?[A-Z])';
+					passwordErrorMsg += '、大写字母';
+				}
+				if (regConfig.pwd_complexity.indexOf('symbol') != -1) {
+					reg += '(?=.*?[#?!@$%^&*-])';
+					passwordErrorMsg += '、特殊字符';
+				}
+				rule.push({
+					name: 'password',
+					checkType: 'reg',
+					checkRule: reg,
+					errorMsg: passwordErrorMsg
+				});
+			}
+
+			var checkRes = validate.check(this.formData, rule);
+			if (checkRes) {
+				if (this.formData.password != this.formData.rePassword) {
+					this.$util.showToast({
+						title: '两次密码不一致'
+					});
+					return false;
+				}
+				return true;
+			} else {
+				this.$util.showToast({
+					title: validate.error
+				});
+				return false;
+			}
+		},
+		// 获取验证码
+		getCaptcha() {
+			this.$api.sendRequest({
+				url: '/api/captcha/captcha',
+				data: {
+					captcha_id: this.captcha.id
+				},
+				success: res => {
+					if (res.code >= 0) {
+						this.captcha = res.data;
+						this.captcha.img = this.captcha.img.replace(/\r\n/g, '');
+					}
+				}
+			});
+		},
+		// 发送动态验证码
+		async sendDynaCode() {
+			if (this.formData.captcha.length == 0) {
+				this.$util.showToast({
+					title: this.$lang('captchaPlaceholder')
+				});
+				return;
+			}
+
+			if (this.isSend) return;
+			this.isSend = true;
+
+			var url,
+				data = {
+					captcha_id: this.captcha.id,
+					captcha_code: this.formData.captcha
+				};
+			data[this.findMode] = this.formData.mobile;
+			url = '/api/findpassword/mobilecode';
+
+			this.$api.sendRequest({
+				url: url,
+				data: data,
+				success: res => {
+					let data = res.data;
+					if (data.key) {
+						if (this.seconds == 120 && this.timer == null) {
+							this.timer = setInterval(() => {
+								this.seconds--;
+								this.codeText = '重新获取(' + this.seconds + 's)';
+							}, 1000);
+						}
+						uni.setStorageSync('forgot_password_token', data.key);
+						this.stepShow += 1;
+					} else {
+						this.$util.showToast({
+							title: res.message
+						});
+						this.isSend = false;
+						this.getCaptcha();
+					}
+				},
+				fail: res => {
+					this.isSend = false;
+					this.getCaptcha();
+				}
+			});
+		},
+		save() {
+			if (this.vertify()) {
+				var url,
+					data = {
+						code: this.formData.dynacode,
+						key: uni.getStorageSync('forgot_password_token'),
+						password: this.formData.password
+					};
+				data[this.findMode] = this.formData.mobile;
+				url = '/api/findpassword/mobile';
+				this.$api.sendRequest({
+					url: url,
+					data: data,
+					success: res => {
+						this.$util.showToast({
+							title: res.message
+						});
+						if (res.code == 0) {
+							setTimeout(() => {
+								uni.removeStorage({
+									key: 'forgot_password_token'
+								});
+								this.$util.redirectTo('/pages_tool/login/login', {}, 'redirectTo');
+							}, 1000);
+						} else {
+							this.stepShow -= 1;
+						}
+					}
+				});
+			}
+		},
+		/**
+		 * 获取注册配置
+		 */
+		getRegisterConfig() {
+			this.$api.sendRequest({
+				url: '/api/register/config',
+				success: res => {
+					if (res.code >= 0) {
+						this.registerConfig = res.data.value;
+					}
+				}
+			});
+		}
+	},
+	watch: {
+		seconds(value) {
+			if (value == 0) {
+				this.seconds = 120;
+				this.codeText = '重新获取';
+				this.isSend = false;
+				clearInterval(this.timer);
+			}
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+page {
+	background: #ffffff !important;
+	overflow: hidden;
+}
+
+.captcha {
+	width: 170rpx;
+	height: 50rpx;
+}
+
+.find-form {
+	padding: 100rpx 80rpx 0;
+
+	.form-input {
+		margin-top: 60rpx;
+		height: 60rpx;
+		border-bottom: 2rpx solid $color-line;
+
+		input {
+			padding: 0;
+			font-size: $font-size-base;
+		}
+	}
+
+	.find-btn {
+		margin: 374rpx 0 0;
+		border-radius: $border-radius;
+		color: #fff;
+
+		&[disabled] {
+			background-color: #f7f7f7 !important;
+		}
+	}
+}
+
+.forget-section {
+	display: flex;
+	flex-direction: row-reverse;
+	justify-content: space-between;
+	margin-top: 10rpx;
+	height: 70rpx;
+	line-height: 70rpx;
+}
+
+.align-type {
+	display: flex;
+	justify-content: space-between;
+}
+
+.header-wrap {
+	width: 80%;
+	height: 100%;
+	margin: calc(120rpx + 88rpx) auto 0;
+	background-repeat: no-repeat;
+	background-size: contain;
+	background-position: bottom;
+	position: relative;
+
+	.title {
+		font-size: 50rpx;
+		font-weight: bold;
+	}
+}
+
+.icon-close {
+	font-size: 52rpx;
+	position: fixed;
+	left: 24rpx;
+	top: 72rpx;
+	z-index: 9;
+	color: #000;
+}
+
+.placeholder-class {
+	color: #bfbfbf;
+}
+</style>
diff --git a/pages_tool/login/index.vue b/pages_tool/login/index.vue
new file mode 100644
index 0000000..e3449f2
--- /dev/null
+++ b/pages_tool/login/index.vue
@@ -0,0 +1,153 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view class="auth-index" :style="warpStyle">
+		<view class="website-logo">
+			<image class="logo" v-if="siteInfo.logo" :src="$util.img(siteInfo.logo)" mode="aspectFit"></image>
+			<view v-else class="logo"></view>
+		</view>
+		<view class="login-desc">{{registerConfig.wap_desc}}</view>
+		<view class="login-area">
+			<!-- #ifdef H5 -->
+			<view class="btn quick-login" v-if="$util.isWeiXin() && wechatConfigStatus && registerConfig && Number(registerConfig.third_party)" @click="quickLogin">快捷登录/注册</view>
+			<!-- #endif -->
+			<!-- #ifdef MP-WEIXIN -->
+			<view class="btn quick-login" v-if="registerConfig && Number(registerConfig.third_party)" @click="quickLogin">快捷登录/注册</view>
+			<!-- #endif -->
+			<view class="btn" :class="isQuickLogin ? '':'quick-login'" @click="toLogin('mobile')" v-if="registerConfig.login.indexOf('mobile') != -1">手机号登录</view>
+			<view class="btn" :class="isQuickLogin ? '':'quick-login'" @click="toLogin('account')" v-if="registerConfig.login.indexOf('mobile') == -1 && registerConfig.login.indexOf('username') != -1">账号密码登录</view>
+			<view class="agreement" v-if="registerConfig.agreement_show">
+				<text class="iconfont agree" :class=" isAgree ? 'icon-yuan_checked color-base-text' : 'icon-yuan_checkbox' " @click="isAgree = !isAgree"></text>
+				<view class="tips-text">
+					<text class="tips">请阅读并同意</text>
+					<text class="agreement-name color-base-text" @click="toAggrement('PRIVACY')">《隐私协议》</text>
+					<text class="tips">和</text>
+					<text class="agreement-name color-base-text" @click="toAggrement('SERVICE')">《用户协议》</text>
+				</view>
+			</view>
+			<view class="footer" v-if="registerConfig.login.indexOf('mobile') != -1 && registerConfig.login.indexOf('username') != -1">
+				<view class="text">其他方式登录</view>
+				<view class="mine icondiy icon-system-wodi2" @click="toLogin('account')"></view>
+				<view class="mode-name">账号密码登录</view>
+			</view>
+			
+		</view>
+		<ns-login ref="login"></ns-login>
+	</view>
+</template>
+
+<script>
+	import auth from 'common/js/auth.js';
+	export default {
+		mixins: [auth],
+		data() {
+			return {
+				back: '',
+				registerConfig: {
+					register: '',
+					login: '',
+				},
+				isAgree: false
+			}
+		},
+		computed: {
+			isQuickLogin() {
+				// #ifdef H5
+					return this.$util.isWeiXin() && this.wechatConfigStatus && this.registerConfig && Number(this.registerConfig.third_party);
+				// #endif
+				// #ifdef MP-WEIXIN
+					return this.registerConfig && Number(this.registerConfig.third_party);
+				// #endif
+			},
+			warpStyle() {
+				var style = '';
+				if(this.registerConfig.wap_bg){
+					style += 'background-image:url(' + this.$util.img(this.registerConfig.wap_bg) + ');';
+					style += 'background-size: 100%;';
+					style += 'background-position: top;';
+					style += 'background-repeat: no-repeat;';
+				}
+				return style
+			},
+			wechatConfigStatus() {
+				return this.$store.state.wechatConfigStatus;
+			}
+		},
+		onLoad(option) {
+			this.back = option.back || '';
+			// #ifdef MP-WEIXIN
+				this.back = option.back ? decodeURIComponent(option.back) : '';
+			// #endif
+			if(this.back) uni.setStorageSync('initiateLogin',this.back)
+			// #ifdef MP-WEIXIN
+				this.getCode(authData => {
+					uni.setStorageSync('authInfo', authData);
+				});
+			// #endif
+			
+			if(!uni.getStorageSync('authInfo')){
+				// #ifdef H5
+					if(this.$util.isWeiXin() && !option.code){
+						this.getCode(authData => {
+							uni.setStorageSync('authInfo', authData);
+						});
+					}
+					if(option.code){
+						this.$api.sendRequest({
+							url: '/wechat/api/wechat/authcodetoopenid',
+							data: {
+								code: urlParams.code
+							},
+							success: res => {
+								if (res.code >= 0) {
+									let data = {};
+									if (res.data.openid) data.wx_openid = res.data.openid;
+									if (res.data.unionid) data.wx_unionid = res.data.unionid;
+									if (res.data.userinfo) Object.assign(data, res.data.userinfo);
+									uni.setStorageSync('authInfo', data);
+								}
+							}
+						});
+					}
+				// #endif
+			}
+			
+			
+		},
+		onShow() {
+			this.getRegisterConfig();
+		},
+		methods: {
+			toAggrement(type){
+				this.$util.redirectTo('/pages_tool/login/aggrement',{type:type})
+			},
+			quickLogin(){
+				if(this.registerConfig.agreement_show && !this.isAgree){
+					this.$util.showToast({title:'请先阅读并同意协议'})
+					return;
+				}
+				this.$refs.login.open(this.back,true);
+			},
+			toLogin(loginMode){
+				this.$util.redirectTo('/pages_tool/login/login',{loginMode:loginMode})
+			},
+			/**
+			 * 获取注册配置
+			 */
+			getRegisterConfig() {
+				this.$api.sendRequest({
+					url: '/api/register/config',
+					success: res => {
+						if (res.code >= 0) {
+							this.registerConfig = res.data.value;
+							
+						}
+					}
+				});
+			},
+		},
+	}
+</script>
+
+<style lang="scss">
+	@import './public/css/common.scss';
+</style>
\ No newline at end of file
diff --git a/pages_tool/login/login.vue b/pages_tool/login/login.vue
index 175c51e..7356cfd 100644
--- a/pages_tool/login/login.vue
+++ b/pages_tool/login/login.vue
@@ -1,484 +1,496 @@
-<template>
-	<page-meta :page-style="themeColor"></page-meta>
-	<scroll-view scroll-y="false" class="container">
-		<view class="header-wrap" :style="{backgroundImage: 'url('+$util.img('public/uniapp/member/head.png')+')'}">
-			 <view class="t-b">
-			      您好，
-			      <br />
-			      欢迎使用
-			</view>
-		</view>
-		<view class="body-wrap">
-			<view class="form-wrap">
-				<view class="input-wrap" v-show="loginMode == 'mobile'">
-					<view class="content">
-					<!-- 	<view class="area-code">+86</view> -->
-						<input type="number" placeholder="请输入您的手机号" placeholder-class="input-placeholder" class="input" maxlength="11" v-model="formData.mobile" />
-					</view>
-				</view>
-				<view class="input-wrap" v-show="loginMode == 'account'">
-					<view class="content">
-						<input type="text" placeholder="请输入账号" placeholder-class="input-placeholder" class="input" v-model="formData.account" />
-					</view>
-				</view>
-				<view class="input-wrap" v-show="loginMode == 'account'">
-					<view class="content">
-						<input type="password" placeholder="请输入密码" placeholder-class="input-placeholder" class="input" v-model="formData.password" />
-						<view class="align-right" v-show="loginMode == 'account'">
-							<text @click="forgetPassword">忘记密码?</text>
-						</view>
-					</view>
-				</view>
-				<view class="input-wrap" v-show="loginMode == 'mobile'">
-					<view class="content">
-						<input type="text" placeholder="请输入动态码" placeholder-class="input-placeholder" class="input" v-model="formData.dynacode" />
-						<view class="dynacode" :class="dynacodeData.seconds == 120 ? 'color-base-text' : 'color-tip'"
-							@click="sendMobileCode">{{ dynacodeData.codeText }}</view>
-					</view>
-				</view>
-			</view>
-			
-			<view class="btn_view">
-				<button type="primary" @click="login" class="login-btn color-base-border color-base-bg" style="background: #2796f2 !important;border: none;">登录</button>
-			</view>
-			<view class="regisiter-agreement" style="margin: 0 50rpx;padding-top: 40rpx;line-height: 1.5;display: flex;">
-				<view style="" class="iconfont" :class=" isAgree ? 'icon-fuxuankuang1 color-base-text' : 'icon-fuxuankuang2' " @click="isAgree = !isAgree"></view>
-				<view style="text-align: left;margin-left: 10rpx;padding-top: 2rpx;">若您未注册，则登录后将自动帮您注册。注册即视为同意 <text  @click="tourl('/pages_tool/agreement/contenr?type=0')" style="color:#4395ff">《隐私条款》</text> <text  @click="tourl('/pages_tool/agreement/contenr?type=1')" style="color:#4395ff">《用户服务协议》</text></view>
-			</view>
-		</view>
-		<loading-cover ref="loadingCover"></loading-cover>
-		<register-reward ref="registerReward"></register-reward>
-	</scroll-view>
-</template>
-
-<script>
-	import validate from 'common/js/validate.js';
-	import registerReward from '@/components/register-reward/register-reward.vue';
-
-	export default {
-		data() {
-			return {
-				isAgree: false,
-				// loginMode: 'account',
-				loginMode: 'mobile',
-				formData: {
-					mobile: '',
-					account: '',
-					password: '',
-					vercode: '',
-					dynacode: '',
-					key: ''
-				},
-				captcha: {
-					id: '',
-					img: ''
-				},
-				isSub: false, // 提交防重复
-				back: '', // 返回页
-				redirect: 'redirectTo', // 跳转方式
-				dynacodeData: {
-					seconds: 120,
-					timer: null,
-					codeText: '获取动态码',
-					isSend: false
-				},
-				registerConfig: {
-					register: 'mobile',
-					login: ''
-				},
-				captchaConfig: 0,
-				authInfo: null
-			};
-		},
-		components: {
-			registerReward
-		},
-		onLoad(option) {
-			if (option.back) this.back = option.back;
-			this.getRegisterConfig();
-			// this.getCaptchaConfig();
-			this.authInfo = uni.getStorageSync('authInfo');
-		},
-		onShow() {},
-		onReady() {
-			if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-		},
-		methods: {
-			/**
-			 * 获取验证码配置
-			 */
-			getCaptchaConfig() {
-				this.$api.sendRequest({
-					url: '/api/config/getCaptchaConfig',
-					success: res => {
-						if (res.code >= 0) {
-							this.captchaConfig = res.data.shop_reception_login;
-							if (this.captchaConfig == 1) this.getCaptcha();
-						}
-					}
-				});
-			},
-			/**
-			 * 获取注册配置
-			 */
-			getRegisterConfig() {
-				this.$api.sendRequest({
-					url: '/api/register/config',
-					success: res => {
-						if (res.code >= 0) {
-							// this.registerConfig = res.data.value;
-							// if (this.registerConfig.login.indexOf('mobile') != -1) this.loginMode = 'mobile';
-							// else this.loginMode = 'account';
-						}
-					}
-				});
-			},
-			/**
-			 * 切换登录方式
-			 */
-			switchLoginMode() {
-				this.loginMode = this.loginMode == 'mobile' ? 'account' : 'mobile';
-			},
-			/**
-			 * 获取验证码
-			 */
-			getCaptcha() {
-				if (this.captchaConfig == 0) return;
-				this.$api.sendRequest({
-					url: '/api/captcha/captcha',
-					data: {
-						captcha_id: this.captcha.id
-					},
-					success: res => {
-						if (res.code >= 0) {
-							this.captcha = res.data;
-							this.captcha.img = this.captcha.img.replace(/\r\n/g, '');
-						}
-					}
-				});
-			},
-			/**
-			 * 去注册
-			 */
-			toRegister() {
-				if (this.back) this.$util.redirectTo('/pages_tool/login/register', {
-					back: encodeURIComponent(this.back)
-				});
-				else this.$util.redirectTo('/pages_tool/login/register');
-			},
-			/**
-			 * 忘记密码
-			 */
-			forgetPassword() {
-				if (this.back) this.$util.redirectTo('/pages_tool/login/find', {
-					back: encodeURIComponent(this.back)
-				});
-				else this.$util.redirectTo('/pages_tool/login/find');
-			},
-			tourl(url){
-				this.$util.redirectTo(url);
-			},
-			/**
-			 * 登录
-			 */
-			login() {
-				if (!this.isAgree) {
-					this.$util.showToast({
-						title: '请先阅读并同意协议'
-					});
-					return false;
-				}
-				if (this.loginMode == 'account') {
-					var url = '/api/login/login';
-					data = {
-						username: this.formData.account,
-						password: this.formData.password
-					};
-				} else {
-					var url = '/api/login/mobile',
-						data = {
-							mobile: this.formData.mobile,
-							key: this.formData.key,
-							code: this.formData.dynacode
-						};
-				}
-				if (this.captcha.id != '') {
-					data.captcha_id = this.captcha.id;
-					data.captcha_code = this.formData.vercode;
-				}
-				if (this.authInfo) Object.assign(data, this.authInfo);
-				if (uni.getStorageSync('source_member')) data.source_member = uni.getStorageSync('source_member');
-
-				if (this.verify(data)) {
-					if (this.isSub) return;
-					this.isSub = true;
-					this.$api.sendRequest({
-						url,
-						data,
-						success: res => {
-							if (res.code >= 0) {
-								var can_receive_registergift = res.data.can_receive_registergift;
-								this.$store.commit('setToken', res.data.token);
-								this.$store.dispatch('getCartNumber');
-								this.getMemberInfo(() => {
-									if (can_receive_registergift == 1) {
-										this.$util.showToast({
-											title: '登录成功'
-										});
-										let back = this.back ? this.back : '/pages/member/index';
-										if(this.$refs.registerReward) this.$refs.registerReward.open(back);
-									} else {
-										if (this.back != '') {
-											this.$util.redirectTo(decodeURIComponent(this.back), {}, 'reLaunch');
-										} else {
-											this.$util.redirectTo('/pages/member/index', {}, 'reLaunch');
-										}
-									}
-								});
-							} else {
-								this.isSub = false;
-								this.getCaptcha();
-								this.$util.showToast({
-									title: res.message
-								});
-							}
-						},
-						fail: res => {
-							this.isSub = false;
-							this.getCaptcha();
-						}
-					});
-				}
-			},
-			/**
-			 * 登录验证
-			 * @param {Object} data
-			 */
-			verify(data) {
-				let rule = [];
-				// 手机号验证
-				if (this.loginMode == 'mobile') {
-					rule = [{
-						name: 'mobile',
-						checkType: 'required',
-						errorMsg: '请输入手机号'
-					}, {
-						name: 'mobile',
-						checkType: 'phoneno',
-						errorMsg: '请输入正确的手机号'
-					}];
-					if (this.captchaConfig == 1) {
-						if (this.captcha.id != '') rule.push({
-							name: 'captcha_code',
-							checkType: 'required',
-							errorMsg: this.$lang('captchaPlaceholder')
-						});
-					}
-					rule.push({
-						name: 'code',
-						checkType: 'required',
-						errorMsg: this.$lang('dynacodePlaceholder')
-					});
-				}
-
-				// 账号验证
-				if (this.loginMode == 'account') {
-					rule = [{
-							name: 'username',
-							checkType: 'required',
-							errorMsg: this.$lang('accountPlaceholder')
-						},
-						{
-							name: 'password',
-							checkType: 'required',
-							errorMsg: this.$lang('passwordPlaceholder')
-						}
-					];
-					if (this.captchaConfig == 1) {
-						if (this.captcha.id != '') rule.push({
-							name: 'captcha_code',
-							checkType: 'required',
-							errorMsg: this.$lang('captchaPlaceholder')
-						});
-					}
-				}
-
-				var checkRes = validate.check(data, rule);
-				if (checkRes) {
-					return true;
-				} else {
-					this.$util.showToast({
-						title: validate.error
-					});
-					return false;
-				}
-			},
-			mobileAuthLogin(e) {
-				if (e.detail.errMsg == 'getPhoneNumber:ok') {
-					var data = {
-						iv: e.detail.iv,
-						encryptedData: e.detail.encryptedData
-					};
-					if (Object.keys(this.authInfo).length) {
-						Object.assign(data, this.authInfo);
-						if (this.authInfo.nickName) data.nickname = this.authInfo.nickName;
-						if (this.authInfo.avatarUrl) data.headimg = this.authInfo.avatarUrl;
-					}
-					if (uni.getStorageSync('source_member')) data.source_member = uni.getStorageSync('source_member');
-
-					if (this.isSub) return;
-					this.isSub = true;
-
-					this.$api.sendRequest({
-						url: '/api/tripartite/mobileauth',
-						data,
-						success: res => {
-							if (res.code >= 0) {
-								var can_receive_registergift = res.data.can_receive_registergift;
-								this.$store.commit('setToken', res.data.token);
-								this.$store.dispatch('getCartNumber');
-								this.getMemberInfo(() => {
-									if (can_receive_registergift == 1) {
-										let back = this.back ? this.back : '/pages/member/index';
-										if(this.$refs.registerReward) this.$refs.registerReward.open(back);
-									} else {
-										if (this.back != '') {
-											this.$util.redirectTo(decodeURIComponent(this.back), {}, this.redirect);
-										} else {
-											this.$util.redirectTo('/pages/member/index', {}, this.redirect);
-										}
-									}
-								})
-
-							} else {
-								this.isSub = false;
-								this.$util.showToast({
-									title: res.message
-								});
-							}
-						},
-						fail: res => {
-							this.isSub = false;
-							this.$util.showToast({
-								title: 'request:fail'
-							});
-						}
-					});
-				}
-			},
-			/**
-			 * 发送手机动态码
-			 */
-			sendMobileCode() {
-				if (this.dynacodeData.seconds != 120 || this.dynacodeData.isSend) return;
-				var data = {
-					mobile: this.formData.mobile,
-					captcha_id: this.captcha.id,
-					captcha_code: this.formData.vercode
-				};
-				var rule = [{
-					name: 'mobile',
-					checkType: 'required',
-					errorMsg: '请输入手机号'
-				}, {
-					name: 'mobile',
-					checkType: 'phoneno',
-					errorMsg: '请输入正确的手机号'
-				}];
-				if (this.captchaConfig == 1) {
-					rule.push({
-						name: 'captcha_code',
-						checkType: 'required',
-						errorMsg: '请输入验证码'
-					});
-				}
-				var checkRes = validate.check(data, rule);
-				if (!checkRes) {
-					this.$util.showToast({
-						title: validate.error
-					});
-					return;
-				}
-				this.dynacodeData.isSend = true;
-				this.dynacodeData.timer = setInterval(() => {
-					this.dynacodeData.seconds--;
-					this.dynacodeData.codeText = this.dynacodeData.seconds + 's后可重新获取';
-				}, 1000);
-
-				this.$api.sendRequest({
-					url: '/api/login/mobileCode',
-					data: data,
-					success: res => {
-						if (res.code >= 0) {
-							this.formData.key = res.data.key;
-						} else {
-							this.refreshDynacodeData();
-							this.$util.showToast({
-								title: res.message
-							});
-						}
-					},
-					fail: () => {
-						this.$util.showToast({
-							title: 'request:fail'
-						});
-						this.refreshDynacodeData();
-					}
-				});
-			},
-			refreshDynacodeData() {
-				this.getCaptcha();
-				clearInterval(this.dynacodeData.timer);
-				this.dynacodeData = {
-					seconds: 120,
-					timer: null,
-					codeText: '获取动态码',
-					isSend: false
-				};
-			},
-			getMemberInfo(callback) {
-				this.$api.sendRequest({
-					url: '/api/member/info',
-					success: (res) => {
-						if (res.code >= 0) {
-							// 登录成功，存储会员信息
-							this.$store.commit('setMemberInfo', res.data);
-							if (callback) callback();
-						}
-					}
-				});
-			}
-		},
-		watch: {
-			'dynacodeData.seconds': {
-				handler(newValue, oldValue) {
-					if (newValue == 0) {
-						this.refreshDynacodeData();
-					}
-				},
-				immediate: true,
-				deep: true
-			}
-		}
-	};
-</script>
-
-<style lang="scss">
-	@import './public/css/common.scss';
-	.color-base-text{
-		color:#2796f2 !important
-	}
-</style>
-
-<style scoped>
-	/deep/ .reward-popup .uni-popup__wrapper-box {
-		background: none !important;
-		max-width: unset !important;
-		max-height: unset !important;
-		overflow: unset !important;
-	}
-
-	/deep/ uni-toast .uni-simple-toast__text {
-		background: red !important;
-	}
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<scroll-view scroll-y="true" class="container">
+		<!-- <view class="iconfont icon-close back-btn" @click="$util.redirectTo('/pages/member/index')"></view> -->
+		<view class="header-wrap">
+			<view class="title">登录</view>
+			<view class="regisiter-agreement" v-if="registerConfig.register != ''">
+				<text class="color-tip">还没有账号,</text>
+				<text class="color-base-text" @click="toRegister">立即注册</text>
+			</view>
+		</view>
+		<view class="body-wrap">
+			<view class="form-wrap">
+				<view class="input-wrap" v-show="loginMode == 'mobile'">
+					<view class="content">
+						<view class="area-code">+86</view>
+						<input type="number" placeholder="仅限中国大陆手机号登录" placeholder-class="input-placeholder" class="input" maxlength="11" v-model="formData.mobile" />
+					</view>
+				</view>
+				<view class="input-wrap" v-show="loginMode == 'account'">
+					<view class="content">
+						<input type="text" placeholder="请输入账号" placeholder-class="input-placeholder" class="input" v-model="formData.account" />
+					</view>
+				</view>
+				<view class="input-wrap" v-show="loginMode == 'account'">
+					<view class="content">
+						<input type="password" placeholder="请输入密码" placeholder-class="input-placeholder" class="input" v-model="formData.password" />
+						<view class="align-right" v-show="loginMode == 'account'">
+							<text @click="forgetPassword">忘记密码?</text>
+						</view>
+					</view>
+				</view>
+				<view class="input-wrap" v-if="captchaConfig == 1">
+					<view class="content">
+						<input type="text" placeholder="请输入验证码" placeholder-class="input-placeholder" class="input" v-model="formData.vercode" />
+						<image :src="captcha.img" class="captcha" @click="getCaptcha"></image>
+					</view>
+				</view>
+				<view class="input-wrap" v-show="loginMode == 'mobile'">
+					<view class="content">
+						<input type="text" placeholder="请输入动态码" placeholder-class="input-placeholder" class="input" v-model="formData.dynacode" />
+						<view class="dynacode" :class="dynacodeData.seconds == 120 ? 'color-base-text' : 'color-tip'" @click="sendMobileCode">{{ dynacodeData.codeText }}</view>
+					</view>
+				</view>
+			</view>
+			<view class="login-mode-box">
+				<text @click="switchLoginMode" v-show="loginMode == 'mobile' && registerConfig.login.indexOf('username') != -1">使用账号登录</text>
+				<text @click="switchLoginMode" v-show="loginMode == 'account' && registerConfig.login.indexOf('mobile') != -1">使用手机号登录</text>
+			</view>
+			<view class="btn_view">
+				<button type="primary" @click="login" class="login-btn color-base-border color-base-bg">登录</button>
+				<!-- #ifdef MP -->
+				<!-- <button open-type="getPhoneNumber" class="auth-login color-base-border" v-if="Number(registerConfig.third_party)" @getphonenumber="mobileAuthLogin">
+					<text class="color-base-text color-base-border">一键授权手机号快捷登录</text>
+				</button> -->
+				<!-- #endif -->
+			</view>
+			<view class="regisiter-agreement" v-if="registerConfig.agreement_show">
+				<text class="iconfont is-agree" :class=" isAgree ? 'icon-yuan_checked color-base-text' : 'icon-yuan_checkbox' " @click="isAgree = !isAgree"></text>
+				<text class="tips">请阅读并同意</text>
+				<text class="color-base-text" @click="toAggrement('PRIVACY')">《隐私协议》</text>
+				<text class="tips">和</text>
+				<text class="color-base-text" @click="toAggrement('SERVICE')">《用户协议》</text>
+			</view>
+		</view>
+		<loading-cover ref="loadingCover"></loading-cover>
+		<register-reward ref="registerReward"></register-reward>
+	</scroll-view>
+</template>
+
+<script>
+	import validate from 'common/js/validate.js';
+	import registerReward from '@/components/register-reward/register-reward.vue';
+
+	export default {
+		data() {
+			return {
+				isAgree: false,
+				loginMode: '',
+				formData: {
+					mobile: '',
+					account: '',
+					password: '',
+					vercode: '',
+					dynacode: '',
+					key: ''
+				},
+				captcha: {
+					id: '',
+					img: ''
+				},
+				isSub: false, // 提交防重复
+				back: '', // 返回页
+				redirect: 'redirectTo', // 跳转方式
+				dynacodeData: {
+					seconds: 120,
+					timer: null,
+					codeText: '获取动态码',
+					isSend: false
+				},
+				registerConfig: {
+					register: '',
+					login: ''
+				},
+				captchaConfig: 1,
+				authInfo: null
+			};
+		},
+		components: {
+			registerReward
+		},
+		onLoad(option) {
+			if(option.loginMode) this.loginMode = option.loginMode;
+			if (option.back) this.back = option.back;
+			this.getRegisterConfig();
+			this.getCaptchaConfig();
+			this.authInfo = uni.getStorageSync('authInfo');
+		},
+		onShow() {},
+		onReady() {
+			if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+		},
+		methods: {
+			toAggrement(type){
+				this.$util.redirectTo('/pages_tool/login/aggrement',{type:type})
+			},
+			/**
+			 * 获取验证码配置
+			 */
+			getCaptchaConfig() {
+				this.$api.sendRequest({
+					url: '/api/config/getCaptchaConfig',
+					success: res => {
+						if (res.code >= 0) {
+							this.captchaConfig = res.data.shop_reception_login;
+							if (this.captchaConfig == 1) this.getCaptcha();
+						}
+					}
+				});
+			},
+			/**
+			 * 获取注册配置
+			 */
+			getRegisterConfig() {
+				this.$api.sendRequest({
+					url: '/api/register/config',
+					success: res => {
+						if (res.code >= 0) {
+							this.registerConfig = res.data.value;
+							if(!this.loginMode){
+								if (this.registerConfig.login.indexOf('mobile') != -1) this.loginMode = 'mobile';
+								else this.loginMode = 'account';
+							}
+						}
+					}
+				});
+			},
+			/**
+			 * 切换登录方式
+			 */
+			switchLoginMode() {
+				this.loginMode = this.loginMode == 'mobile' ? 'account' : 'mobile';
+			},
+			/**
+			 * 获取验证码
+			 */
+			getCaptcha() {
+				if (this.captchaConfig == 0) return;
+				this.$api.sendRequest({
+					url: '/api/captcha/captcha',
+					data: {
+						captcha_id: this.captcha.id
+					},
+					success: res => {
+						if (res.code >= 0) {
+							this.captcha = res.data;
+							this.captcha.img = this.captcha.img.replace(/\r\n/g, '');
+						}
+					}
+				});
+			},
+			/**
+			 * 去注册
+			 */
+			toRegister() {
+				if (this.back) this.$util.redirectTo('/pages_tool/login/register', {
+					back: encodeURIComponent(this.back)
+				});
+				else this.$util.redirectTo('/pages_tool/login/register');
+			},
+			/**
+			 * 忘记密码
+			 */
+			forgetPassword() {
+				if (this.back) this.$util.redirectTo('/pages_tool/login/find', {
+					back: encodeURIComponent(this.back)
+				});
+				else this.$util.redirectTo('/pages_tool/login/find');
+			},
+			/**
+			 * 登录
+			 */
+			login() {
+				if (this.loginMode == 'account') {
+					var url = '/api/login/login';
+					data = {
+						username: this.formData.account,
+						password: this.formData.password
+					};
+				} else {
+					var url = '/api/login/mobile',
+						data = {
+							mobile: this.formData.mobile,
+							key: this.formData.key,
+							code: this.formData.dynacode
+						};
+				}
+				if (this.captcha.id != '') {
+					data.captcha_id = this.captcha.id;
+					data.captcha_code = this.formData.vercode;
+				}
+				if (this.authInfo) Object.assign(data, this.authInfo);
+				if (uni.getStorageSync('source_member')) data.source_member = uni.getStorageSync('source_member');
+
+				if (this.verify(data)) {
+					if (this.isSub) return;
+					this.isSub = true;
+					this.$api.sendRequest({
+						url,
+						data,
+						success: res => {
+							if (res.code >= 0) {
+								var can_receive_registergift = res.data.can_receive_registergift;
+								this.$store.commit('setToken', res.data.token);
+								this.$store.dispatch('getCartNumber');
+								this.getMemberInfo(() => {
+									if (can_receive_registergift == 1) {
+										this.$util.showToast({
+											title: '登录成功'
+										});
+										
+										this.$store.commit('setCanReceiveRegistergiftInfo',{status: true,path:this.$util.openRegisterRewardPath('/pages/member/index')});
+										// if(this.$refs.registerReward) this.$refs.registerReward.open(back);
+									}
+									this.$util.loginComplete('/pages/member/index',{},this.redirect);
+								});
+							} else {
+								this.isSub = false;
+								this.getCaptcha();
+								this.$util.showToast({
+									title: res.message
+								});
+							}
+						},
+						fail: res => {
+							this.isSub = false;
+							this.getCaptcha();
+						}
+					});
+				}
+			},
+			/**
+			 * 登录验证
+			 * @param {Object} data
+			 */
+			verify(data) {
+				if (this.registerConfig.agreement_show && !this.isAgree) {
+					this.$util.showToast({
+						title: '请先阅读并同意协议'
+					});
+					return;
+				}
+				let rule = [];
+				// 手机号验证
+				if (this.loginMode == 'mobile') {
+					rule = [{
+						name: 'mobile',
+						checkType: 'required',
+						errorMsg: '请输入手机号'
+					}, {
+						name: 'mobile',
+						checkType: 'phoneno',
+						errorMsg: '请输入正确的手机号'
+					}];
+					if (this.captchaConfig == 1) {
+						if (this.captcha.id != '') rule.push({
+							name: 'captcha_code',
+							checkType: 'required',
+							errorMsg: this.$lang('captchaPlaceholder')
+						});
+					}
+					rule.push({
+						name: 'code',
+						checkType: 'required',
+						errorMsg: this.$lang('dynacodePlaceholder')
+					});
+				}
+
+				// 账号验证
+				if (this.loginMode == 'account') {
+					rule = [{
+							name: 'username',
+							checkType: 'required',
+							errorMsg: this.$lang('accountPlaceholder')
+						},
+						{
+							name: 'password',
+							checkType: 'required',
+							errorMsg: this.$lang('passwordPlaceholder')
+						}
+					];
+					if (this.captchaConfig == 1) {
+						if (this.captcha.id != '') rule.push({
+							name: 'captcha_code',
+							checkType: 'required',
+							errorMsg: this.$lang('captchaPlaceholder')
+						});
+					}
+				}
+
+				var checkRes = validate.check(data, rule);
+				if (checkRes) {
+					return true;
+				} else {
+					this.$util.showToast({
+						title: validate.error
+					});
+					return false;
+				}
+			},
+			mobileAuthLogin(e) {
+				if (e.detail.errMsg == 'getPhoneNumber:ok') {
+					var data = {
+						iv: e.detail.iv,
+						encryptedData: e.detail.encryptedData
+					};
+					if (Object.keys(this.authInfo).length) {
+						Object.assign(data, this.authInfo);
+						if (this.authInfo.nickName) data.nickname = this.authInfo.nickName;
+						if (this.authInfo.avatarUrl) data.headimg = this.authInfo.avatarUrl;
+					}
+					if (uni.getStorageSync('source_member')) data.source_member = uni.getStorageSync('source_member');
+
+					if (this.isSub) return;
+					this.isSub = true;
+
+					this.$api.sendRequest({
+						url: '/api/tripartite/mobileauth',
+						data,
+						success: res => {
+							if (res.code >= 0) {
+								var can_receive_registergift = res.data.can_receive_registergift;
+								this.$store.commit('setToken', res.data.token);
+								this.$store.dispatch('getCartNumber');
+								this.getMemberInfo(() => {
+									if (can_receive_registergift == 1) {
+										let back = this.back ? this.back : '/pages/member/index';
+										this.$store.commit('setCanReceiveRegistergiftInfo', {status: true,path:this.$util.openRegisterRewardPath(back)});
+										// if(this.$refs.registerReward) this.$refs.registerReward.open(back);
+									}
+									if (this.back != '') {
+										this.$util.loginComplete(this.back,{},this.redirect);
+									} else {
+										this.$util.loginComplete('/pages/member/index',{},this.redirect);
+									}
+								})
+
+							} else {
+								this.isSub = false;
+								this.$util.showToast({
+									title: res.message
+								});
+							}
+						},
+						fail: res => {
+							this.isSub = false;
+							this.$util.showToast({
+								title: 'request:fail'
+							});
+						}
+					});
+				}
+			},
+			/**
+			 * 发送手机动态码
+			 */
+			sendMobileCode() {
+				if (this.dynacodeData.seconds != 120 || this.dynacodeData.isSend) return;
+				var data = {
+					mobile: this.formData.mobile,
+					captcha_id: this.captcha.id,
+					captcha_code: this.formData.vercode
+				};
+				var rule = [{
+					name: 'mobile',
+					checkType: 'required',
+					errorMsg: '请输入手机号'
+				}, {
+					name: 'mobile',
+					checkType: 'phoneno',
+					errorMsg: '请输入正确的手机号'
+				}];
+				if (this.captchaConfig == 1) {
+					rule.push({
+						name: 'captcha_code',
+						checkType: 'required',
+						errorMsg: '请输入验证码'
+					});
+				}
+				var checkRes = validate.check(data, rule);
+				if (!checkRes) {
+					this.$util.showToast({
+						title: validate.error
+					});
+					return;
+				}
+				this.dynacodeData.isSend = true;
+				this.dynacodeData.timer = setInterval(() => {
+					this.dynacodeData.seconds--;
+					this.dynacodeData.codeText = this.dynacodeData.seconds + 's后可重新获取';
+				}, 1000);
+
+				this.$api.sendRequest({
+					url: '/api/login/mobileCode',
+					data: data,
+					success: res => {
+						if (res.code >= 0) {
+							this.formData.key = res.data.key;
+						} else {
+							this.refreshDynacodeData();
+							this.$util.showToast({
+								title: res.message
+							});
+						}
+					},
+					fail: () => {
+						this.$util.showToast({
+							title: 'request:fail'
+						});
+						this.refreshDynacodeData();
+					}
+				});
+			},
+			refreshDynacodeData() {
+				this.getCaptcha();
+				clearInterval(this.dynacodeData.timer);
+				this.dynacodeData = {
+					seconds: 120,
+					timer: null,
+					codeText: '获取动态码',
+					isSend: false
+				};
+			},
+			getMemberInfo(callback) {
+				this.$api.sendRequest({
+					url: '/api/member/info',
+					success: (res) => {
+						if (res.code >= 0) {
+							// 登录成功，存储会员信息
+							this.$store.commit('setMemberInfo', res.data);
+							if (callback) callback();
+						}
+					}
+				});
+			}
+		},
+		watch: {
+			'dynacodeData.seconds': {
+				handler(newValue, oldValue) {
+					if (newValue == 0) {
+						this.refreshDynacodeData();
+					}
+				},
+				immediate: true,
+				deep: true
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	@import './public/css/common.scss';
+</style>
+
+<style scoped>
+	/deep/ .reward-popup .uni-popup__wrapper-box {
+		background: none !important;
+		max-width: unset !important;
+		max-height: unset !important;
+		overflow: unset !important;
+	}
+
+	/deep/ uni-toast .uni-simple-toast__text {
+		background: red !important;
+	}
 </style>
\ No newline at end of file
diff --git a/pages_tool/login/public/css/common.scss b/pages_tool/login/public/css/common.scss
index 3977688..ce2000e 100644
--- a/pages_tool/login/public/css/common.scss
+++ b/pages_tool/login/public/css/common.scss
@@ -1,209 +1,313 @@
-/deep/.uni-scroll-view {
-	background-color: #fff;
-}
-
-/deep/.uni-scroll-view::-webkit-scrollbar {
-	/* 隐藏滚动条，但依旧具备可以滚动的功能 */
-	display: none;
-}
-page {
-	width: 100%;
-	background: #fff !important;
-}
-.align-right {
-	color: #838383;
-}
-
-.container {
-	width: 100vw;
-	height: 100vh;
-}
-.t-b {
-	text-align: left;
-	font-size: 42rpx;
-	color: #ffffff;
-	padding: 130rpx 0 50rpx 70rpx;
-	font-weight: bold;
-	line-height: 70rpx;
-}
-.header-wrap {
-	// width: 80%;
-	// margin: calc(120rpx + 44px) auto 0;
-	background-repeat: no-repeat;
-	background-size: contain;
-	background-position: bottom;
-	position: relative;
-	// margin-top:80rpx;
-	background-size: 100% 100%;
-	.title {
-		font-size: 60rpx;
-		font-weight: bold;
-	}
-}
-
-.body-wrap {
-	margin-top: 100rpx;
-	padding-bottom: 100rpx;
-
-	.form-wrap {
-		width: 80%;
-		margin: 0 auto;
-
-		.input-wrap {
-			position: relative;
-			width: 100%;
-			box-sizing: border-box;
-			height: 60rpx;
-			margin-top: 60rpx;
-
-			.iconfont {
-				width: 60rpx;
-				height: 60rpx;
-				position: absolute;
-				left: 0;
-				right: 0;
-				line-height: 60rpx;
-				font-size: $font-size-toolbar;
-				color: $color-title;
-				font-weight: 600;
-			}
-
-			.content {
-				display: flex;
-				height: 60rpx;
-				border-bottom: 2rpx solid $color-line;
-				align-items: center;
-
-				.input {
-					flex: 1;
-					height: 60rpx;
-					line-height: 60rpx;
-					font-size: $font-size-base;
-				}
-
-				.input-placeholder {
-					font-size: $font-size-base;
-					color: #bfbfbf;
-					line-height: 60rpx;
-				}
-
-				.captcha {
-					margin: 4rpx;
-					height: 52rpx;
-					width: 140rpx;
-				}
-
-				.dynacode {
-					line-height: 60rpx;
-					font-size: $font-size-tag;
-				}
-
-				.area-code {
-					line-height: 60rpx;
-					margin-right: 20rpx;
-					font-size: $font-size-base;
-				}
-			}
-		}
-	}
-
-	.forget-section {
-		display: flex;
-		width: 80%;
-		margin: 40rpx auto;
-
-		view {
-			flex: 1;
-			font-size: $font-size-tag;
-			line-height: 1;
-		}
-	}
-	.btn_view {
-		width: 100%;
-		margin: 94rpx auto auto;
-		padding: 0 $margin-both;
-		box-sizing: border-box;
-	}
-	.login-btn {
-		height: 90rpx;
-		line-height: 90rpx;
-		border-radius: $border-radius;
-		text-align: center;
-		border: 2rpx solid;
-		width: 100%;
-		margin: 0;
-	}
-	.auth-login {
-		margin-top: 20rpx;
-		width: calc(100% - 4rpx);
-		height: 90rpx;
-		line-height: 90rpx;
-		border-radius: $border-radius;
-		border: 2rpx solid;
-		color: #fff;
-		text-align: center;
-		margin-left: 0;
-		background-color: #fff;
-		text {
-			color: #d0d0d0;
-		}
-		.iconfont {
-			font-size: 70rpx;
-		}
-		.icon-weixin {
-			color: #1aad19;
-		}
-	}
-
-	// .auth-login{
-
-	// 	background-color: #fff;
-	// 	display: flex;
-	// 	justify-content: center;
-	// 	align-items: center;
-	// 	text-align: center;
-	// 	padding: 0;
-	// 	text{
-	// 		color: #D0D0D0;
-	// 	}
-	// 	.iconfont{
-	// 		font-size: 70rpx;
-	// 	}
-	// }
-
-	.regisiter-agreement {
-		// text-align: center;
-		margin-top: 30rpx;
-		color: #838383;
-		line-height: 60rpx;
-		font-size: $font-size-tag;
-		.tips{
-			margin:0 10rpx;
-		}
-	}
-}
-
-.login-btn-box {
-	margin-top: 50rpx;
-}
-.login-btn-box.active {
-	margin: 30rpx 0 50rpx;
-}
-
-.back-btn {
-	font-size: 52rpx;
-	position: fixed;
-	left: 24rpx;
-	top: 72rpx;
-	z-index: 9;
-	color: #000;
-}
-.login-mode-box {
-	display: flex;
-	justify-content: flex-end;
-	color: $color-tip;
-	margin: auto;
-	margin-top: 44rpx;
-	font-size: 26rpx;
-	width: 80%;
-}
+/deep/.uni-scroll-view {
+	background-color: #fff;
+}
+
+/deep/.uni-scroll-view::-webkit-scrollbar {
+	/* 隐藏滚动条，但依旧具备可以滚动的功能 */
+	display: none;
+}
+page {
+	width: 100%;
+	background: #fff !important;
+}
+.align-right {
+	color: #838383;
+}
+
+.container {
+	width: 100vw;
+	height: 100vh;
+}
+
+.header-wrap {
+	width: 80%;
+	margin: calc(120rpx + 44px) auto 0;
+	background-repeat: no-repeat;
+	background-size: contain;
+	background-position: bottom;
+	position: relative;
+
+	.title {
+		font-size: 60rpx;
+		font-weight: bold;
+	}
+}
+
+.body-wrap {
+	margin-top: 100rpx;
+	padding-bottom: 100rpx;
+
+	.form-wrap {
+		width: 80%;
+		margin: 0 auto;
+
+		.input-wrap {
+			position: relative;
+			width: 100%;
+			box-sizing: border-box;
+			height: 60rpx;
+			margin-top: 60rpx;
+
+			.iconfont {
+				width: 60rpx;
+				height: 60rpx;
+				position: absolute;
+				left: 0;
+				right: 0;
+				line-height: 60rpx;
+				font-size: $font-size-toolbar;
+				color: $color-title;
+				font-weight: 600;
+			}
+
+			.content {
+				display: flex;
+				height: 60rpx;
+				border-bottom: 2rpx solid $color-line;
+				align-items: center;
+
+				.input {
+					flex: 1;
+					height: 60rpx;
+					line-height: 60rpx;
+					font-size: $font-size-base;
+				}
+
+				.input-placeholder {
+					font-size: $font-size-base;
+					color: #bfbfbf;
+					line-height: 60rpx;
+				}
+
+				.captcha {
+					margin: 4rpx;
+					height: 52rpx;
+					width: 140rpx;
+				}
+
+				.dynacode {
+					line-height: 60rpx;
+					font-size: $font-size-tag;
+				}
+
+				.area-code {
+					line-height: 60rpx;
+					margin-right: 20rpx;
+					font-size: $font-size-base;
+				}
+			}
+		}
+	}
+
+	.forget-section {
+		display: flex;
+		width: 80%;
+		margin: 40rpx auto;
+
+		view {
+			flex: 1;
+			font-size: $font-size-tag;
+			line-height: 1;
+		}
+	}
+	.btn_view {
+		width: 100%;
+		margin: 94rpx auto auto;
+		padding: 0 $margin-both;
+		box-sizing: border-box;
+	}
+	.login-btn {
+		height: 90rpx;
+		line-height: 90rpx;
+		border-radius: 90rpx;
+		text-align: center;
+		border: 2rpx solid;
+		width: 100%;
+		margin: 0;
+	}
+	.auth-login {
+		margin-top: 20rpx;
+		width: calc(100% - 4rpx);
+		height: 90rpx;
+		line-height: 90rpx;
+		border-radius: $border-radius;
+		border: 2rpx solid;
+		color: #fff;
+		text-align: center;
+		margin-left: 0;
+		background-color: #fff;
+		text {
+			color: #d0d0d0;
+		}
+		.iconfont {
+			font-size: 70rpx;
+		}
+		.icon-weixin {
+			color: #1aad19;
+		}
+	}
+
+	// .auth-login{
+
+	// 	background-color: #fff;
+	// 	display: flex;
+	// 	justify-content: center;
+	// 	align-items: center;
+	// 	text-align: center;
+	// 	padding: 0;
+	// 	text{
+	// 		color: #D0D0D0;
+	// 	}
+	// 	.iconfont{
+	// 		font-size: 70rpx;
+	// 	}
+	// }
+
+	.regisiter-agreement {
+		text-align: center;
+		margin-top: 30rpx;
+		color: #838383;
+		line-height: 60rpx;
+		font-size: $font-size-tag;
+		.tips{
+			margin:0 10rpx;
+		}
+		.is-agree{
+			font-size: 26rpx;
+		}
+	}
+}
+
+.login-btn-box {
+	margin-top: 50rpx;
+}
+.login-btn-box.active {
+	margin: 30rpx 0 50rpx;
+}
+
+.back-btn {
+	font-size: 52rpx;
+	position: fixed;
+	left: 24rpx;
+	top: 72rpx;
+	z-index: 9;
+	color: #000;
+}
+.login-mode-box {
+	display: flex;
+	justify-content: flex-end;
+	color: $color-tip;
+	margin: auto;
+	margin-top: 44rpx;
+	font-size: 26rpx;
+	width: 80%;
+}
+.auth-index{
+	width: 100vw;
+	height: 100vh;
+	box-sizing: border-box;
+	padding: 0 44rpx;
+	.website-logo{
+		padding-top: 154rpx;
+		display: flex;
+		justify-content: center;
+		.logo{
+			width: 300rpx;
+			height: 90rpx;
+			display: block;
+		}
+	}
+	.login-desc{
+		color: #333;
+		font-size: 28rpx;
+		text-align: center;
+		line-height: 34rpx;
+		min-height: 34rpx;
+		margin-top: 40rpx;
+	}
+	.login-area{
+		margin-top: 181rpx;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		.btn{
+			background-color: #fff;
+			border: 2rpx solid var(--base-color);
+			color: var(--base-color);
+			box-sizing: border-box;
+			width: 630rpx;
+			height: 88rpx;
+			font-size: 26rpx;
+			border-radius: 44rpx;
+			line-height: 86rpx;
+			font-weight: 500;
+			text-align: center;
+			margin-bottom: 40rpx;
+			&.quick-login{
+				color: #fff;
+				background-color: var(--base-color);
+			}
+		}
+		.agreement{
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			width: 100%;
+			margin-top: 28rpx;
+			padding: 10rpx 0;
+			font-size: 24rpx;
+			line-height: 1;
+			.agree{
+				color: rgb(200, 201, 204);
+				font-size: 26rpx;
+				line-height: 22rpx;
+				margin-right: 12rpx;
+			}
+			.tips-text{
+				display: flex;
+				align-items: center;
+				line-height: 28rpx;
+				font-size: 24rpx;
+				.tips{
+					color: #666;
+				}
+				
+			}
+		}
+		.footer{
+			margin-top: 200rpx;
+			width: 100%;
+			box-sizing: border-box;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			.text{
+				font-size: 26rpx;
+				line-height: 36rpx;
+				color: #333;
+				text-align: center;
+				margin-bottom: 30rpx;
+				font-weight: 400;
+			}
+			.mine{
+				width: 80rpx;
+				height: 80rpx;
+				line-height: 78rpx;
+				border: 2rpx solid #ddd;
+				border-radius: 50%;
+				font-size: 46rpx;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				color: var(--base-color);
+			}
+			.mode-name{
+				font-size: 24rpx;
+				line-height: 36rpx;
+				color: #999;
+				font-weight: 400;
+				margin-top: 30rpx;
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/pages_tool/login/register.vue b/pages_tool/login/register.vue
new file mode 100644
index 0000000..a2eca31
--- /dev/null
+++ b/pages_tool/login/register.vue
@@ -0,0 +1,567 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<scroll-view scroll-y="true" class="container">
+		<!-- <view class="iconfont icon-close back-btn" @click="$util.goBack()"></view> -->
+		<view class="header-wrap">
+			<view class="title">注册</view>
+			<view class="regisiter-agreement">
+				<text class="color-tip">已有账号,</text>
+				<text class="color-base-text" @click="toLogin">立即登录</text>
+			</view>
+		</view>
+		<view class="body-wrap">
+			<view class="form-wrap">
+				<view class="input-wrap" v-show="registerMode == 'mobile'">
+					<view class="content">
+						<view class="area-code">+86</view>
+						<input type="number" placeholder="仅限中国大陆手机号注册" placeholder-class="input-placeholder" class="input" maxlength="11" v-model="formData.mobile" />
+					</view>
+				</view>
+				<view class="input-wrap" v-show="registerMode == 'account'">
+					<view class="content">
+						<input type="text" placeholder="请输入账号" placeholder-class="input-placeholder" class="input" v-model="formData.account" />
+					</view>
+				</view>
+				<view class="input-wrap" v-show="registerMode == 'account'">
+					<view class="content">
+						<input type="password" placeholder="请输入密码" placeholder-class="input-placeholder" class="input" v-model="formData.password" />
+					</view>
+				</view>
+				<view class="input-wrap" v-show="registerMode == 'account'">
+					<view class="content">
+						<input type="password" placeholder="请确认密码" placeholder-class="input-placeholder" class="input" v-model="formData.rePassword" />
+					</view>
+				</view>
+				<view class="input-wrap" v-if="isOpenCaptcha">
+					<view class="content">
+						<input type="text" placeholder="请输入验证码" placeholder-class="input-placeholder" class="input" v-model="formData.vercode" />
+						<image :src="captcha.img" class="captcha" @click="getCaptcha"></image>
+					</view>
+				</view>
+				<view class="input-wrap" v-show="registerMode == 'mobile'">
+					<view class="content">
+						<input type="text" placeholder="请输入动态码" placeholder-class="input-placeholder" class="input" v-model="formData.dynacode" />
+						<view class="dynacode" :class="dynacodeData.seconds == 120 ? 'color-base-text' : 'color-tip'" @click="sendMobileCode">{{ dynacodeData.codeText }}</view>
+					</view>
+				</view>
+			</view>
+			<view class="login-mode-box">
+				<text @click="switchRegisterMode" v-show="registerMode == 'mobile' && registerConfig.register.indexOf('username') != -1">使用用户名注册</text>
+				<text @click="switchRegisterMode" v-show="registerMode == 'account' && registerConfig.register.indexOf('mobile') != -1">使用手机号注册</text>
+			</view>
+			<view class="btn_view"><button type="primary" @click="register" class="login-btn color-base-border color-base-bg">注册</button></view>
+			<view class="regisiter-agreement" v-if="registerConfig.agreement_show">
+				<text class="iconfont is-agree" :class=" isAgree ? 'icon-yuan_checked color-base-text' : 'icon-yuan_checkbox' " @click="isAgree = !isAgree"></text>
+				<text class="tips">请阅读并同意</text>
+				<text class="color-base-text" @click="toAggrement('PRIVACY')">《隐私协议》</text>
+				<text class="tips">和</text>
+				<text class="color-base-text" @click="toAggrement('SERVICE')">《用户协议》</text>
+			</view>
+		</view>
+
+		<view @touchmove.prevent>
+			<uni-popup ref="registerPopup" type="center" :maskClick="false">
+				<view class="conten-box">
+					<view class="close"><text class="iconfont icon-close" @click="toClose"></text></view>
+					<view class="title">{{ agreement.title }}</view>
+					<view class="con">
+						<scroll-view scroll-y="true" class="con">
+							<!-- <rich-text :nodes="agreement.content"></rich-text> -->
+							<ns-mp-html :content="agreement.content"></ns-mp-html>
+						</scroll-view>
+					</view>
+				</view>
+			</uni-popup>
+		</view>
+
+		<loading-cover ref="loadingCover"></loading-cover>
+		<register-reward ref="registerReward"></register-reward>
+	</scroll-view>
+</template>
+
+<script>
+	import uniPopup from '@/components/uni-popup/uni-popup.vue';
+	import validate from 'common/js/validate.js';
+	import registerReward from '@/components/register-reward/register-reward.vue';
+	import htmlParser from '@/common/js/html-parser';
+
+	export default {
+		components: {
+			uniPopup,
+			registerReward
+		},
+		data() {
+			return {
+				allowRegister: true, // 是否允许注册
+				registerMode: 'account',
+				formData: {
+					mobile: '',
+					account: '',
+					password: '',
+					rePassword: '',
+					vercode: '',
+					dynacode: '',
+					key: ''
+				},
+				agreement: {
+					// 注册协议
+					title: '',
+					content: ''
+				},
+				captcha: {
+					// 验证码
+					id: '',
+					img: ''
+				},
+				isSub: false,
+				back: '', // 返回页
+				dynacodeData: {
+					seconds: 120,
+					timer: null,
+					codeText: '获取动态码',
+					isSend: false
+				},
+				registerConfig: {
+					register: ''
+				},
+				authInfo: null,
+				isAgree: false,
+				isOpenCaptcha: 0, // 前台登录验证码，0：关闭，1：开启
+			};
+		},
+		onLoad(option) {
+			if (option.back) this.back = option.back;
+			this.getCaptchaConfig();
+			this.getRegisiterAggrement();
+			this.getRegisterConfig();
+			this.authInfo = uni.getStorageSync('authInfo');
+		},
+		onShow() {},
+		onReady() {
+			if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+		},
+		methods: {
+			toAggrement(type){
+				this.$util.redirectTo('/pages_tool/login/aggrement',{type:type})
+			},
+			/**
+			 * 切换注册方式
+			 */
+			switchRegisterMode() {
+				this.registerMode = this.registerMode == 'mobile' ? 'account' : 'mobile';
+			},
+			/**
+			 * 展示注册协议
+			 */
+			openPopup() {
+				this.$refs.registerPopup.open();
+			},
+			/**
+			 * 点击关闭协议
+			 */
+			toClose() {
+				this.$refs.registerPopup.close();
+			},
+			/**
+			 * 获取注册协议
+			 */
+			getRegisiterAggrement() {
+				this.$api.sendRequest({
+					url: '/api/register/aggrement',
+					success: res => {
+						if (res.code >= 0) {
+							this.agreement = res.data;
+							// if (this.agreement.content) this.agreement.content = htmlParser(this.agreement.content);
+						}
+					}
+				});
+			},
+			/**
+			 * 获取注册配置
+			 */
+			getRegisterConfig() {
+				this.$api.sendRequest({
+					url: '/api/register/config',
+					success: res => {
+						if (res.code >= 0) {
+							this.registerConfig = res.data.value;
+							if (this.registerConfig.register == '') {
+								this.$util.showToast({
+									title: '平台未启用注册!'
+								});
+								setTimeout(() => {
+									this.$util.redirectTo('/pages/index/index');
+								}, 1000);
+							} else if (this.registerConfig.register.indexOf('username') != -1) {
+								this.registerMode = 'account';
+							} else {
+								this.registerMode = 'mobile';
+							}
+							if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+						}
+					}
+				});
+			},
+			/**
+			 * 获取验证码配置
+			 */
+			getCaptchaConfig() {
+				this.$api.sendRequest({
+					url: '/api/config/getCaptchaConfig',
+					success: res => {
+						if (res.code >= 0) {
+							this.isOpenCaptcha = res.data.shop_reception_register;
+							if (this.isOpenCaptcha == 1) this.getCaptcha();
+						}
+					}
+				});
+			},
+			/**
+			 * 获取验证码
+			 */
+			getCaptcha() {
+				if (this.isOpenCaptcha == 0) return;
+				this.$api.sendRequest({
+					url: '/api/captcha/captcha',
+					data: {
+						captcha_id: this.captcha.id
+					},
+					success: res => {
+						if (res.code >= 0) {
+							this.captcha = res.data;
+							this.captcha.img = this.captcha.img.replace(/\r\n/g, '');
+						}
+					}
+				});
+			},
+			/**
+			 * 注册
+			 */
+			register() {
+				if (this.registerMode == 'account') {
+					var url = '/api/register/username';
+					data = {
+						username: this.formData.account,
+						password: this.formData.password
+					};
+				} else {
+					var url = '/api/register/mobile',
+						data = {
+							mobile: this.formData.mobile,
+							key: this.formData.key,
+							code: this.formData.dynacode
+						};
+				}
+				if (this.isOpenCaptcha == 1) {
+					if (this.captcha.id != '') {
+						data.captcha_id = this.captcha.id;
+						data.captcha_code = this.formData.vercode;
+					}
+				}
+				if (this.authInfo) {
+					Object.assign(data, this.authInfo);
+					if (this.authInfo.nickName) data.nickname = this.authInfo.nickName;
+					if (this.authInfo.avatarUrl) data.headimg = this.authInfo.avatarUrl;
+				}
+				if (uni.getStorageSync('source_member')) data.source_member = uni.getStorageSync('source_member');
+
+				if (this.verify(data)) {
+					if (this.isSub) return;
+					this.isSub = true;
+					this.$api.sendRequest({
+						url,
+						data,
+						success: res => {
+							if (res.code >= 0) {
+								this.$store.commit('setToken', res.data.token);
+								this.$store.dispatch('getCartNumber');
+								this.getMemberInfo(() => {
+									this.$util.showToast({
+										title: '注册成功'
+									});
+									let back = this.back ? this.back : '/pages/member/index';
+									// this.$refs.registerReward.open(back);
+									this.$store.commit('setCanReceiveRegistergiftInfo', {status: true,path:this.$util.openRegisterRewardPath(back)});
+									this.$util.loginComplete(back,'redirectTo');
+								})
+							} else {
+								this.isSub = false;
+								this.getCaptcha();
+								this.$util.showToast({
+									title: res.message
+								});
+							}
+						},
+						fail: res => {
+							this.isSub = false;
+							this.getCaptcha();
+						}
+					});
+				}
+			},
+			verify(data) {
+				if (this.registerConfig.agreement_show && !this.isAgree) {
+					this.$util.showToast({
+						title: '请先阅读并同意协议'
+					});
+					return false;
+				}
+
+				// 手机号注册
+				var user_test = /^[A-Za-z0-9]+$/;
+				if (this.registerMode == 'mobile') {
+					var rule = [{
+						name: 'mobile',
+						checkType: 'required',
+						errorMsg: '请输入手机号'
+					}, {
+						name: 'mobile',
+						checkType: 'phoneno',
+						errorMsg: '请输入正确的手机号'
+					}];
+					if (this.isOpenCaptcha == 1) {
+						if (this.captcha.id != '') {
+							rule.push({
+								name: 'captcha_code',
+								checkType: 'required',
+								errorMsg: this.$lang('captchaPlaceholder')
+							});
+						}
+					}
+					rule.push({
+						name: 'code',
+						checkType: 'required',
+						errorMsg: this.$lang('dynacodePlaceholder')
+					});
+				}
+				// 用户名注册
+				if (this.registerMode == 'account') {
+					var rule = [{
+							name: 'username',
+							checkType: 'required',
+							errorMsg: '请输入账号'
+						}, {
+							name: 'password',
+							checkType: 'required',
+							errorMsg: '请输入密码'
+						}],
+						regConfig = this.registerConfig;
+
+					if (!user_test.test(data.username)) {
+						this.$util.showToast({
+							title: '用户名只能输入数字跟英文'
+						});
+						return;
+					}
+
+					if (regConfig.pwd_len > 0) {
+						rule.push({
+							name: 'password',
+							checkType: 'lengthMin',
+							checkRule: regConfig.pwd_len,
+							errorMsg: '密码长度不能小于' + regConfig.pwd_len + '位'
+						});
+					}
+					if (regConfig.pwd_complexity != '') {
+						let passwordErrorMsg = '密码需包含',
+							reg = '';
+						if (regConfig.pwd_complexity.indexOf('number') != -1) {
+							reg += '(?=.*?[0-9])';
+							passwordErrorMsg += '数字';
+						}
+						if (regConfig.pwd_complexity.indexOf('letter') != -1) {
+							reg += '(?=.*?[a-z])';
+							passwordErrorMsg += '、小写字母';
+						}
+						if (regConfig.pwd_complexity.indexOf('upper_case') != -1) {
+							reg += '(?=.*?[A-Z])';
+							passwordErrorMsg += '、大写字母';
+						}
+						if (regConfig.pwd_complexity.indexOf('symbol') != -1) {
+							reg += '(?=.*?[#?!@$%^&*-])';
+							passwordErrorMsg += '、特殊字符';
+						}
+						rule.push({
+							name: 'password',
+							checkType: 'reg',
+							checkRule: reg,
+							errorMsg: passwordErrorMsg
+						});
+					}
+					if (this.formData.password != this.formData.rePassword) {
+						this.$util.showToast({
+							title: '两次密码不一致'
+						});
+						return false;
+					}
+
+					if (this.isOpenCaptcha == 1) {
+						if (this.captcha.id != '') {
+							rule.push({
+								name: 'captcha_code',
+								checkType: 'required',
+								errorMsg: this.$lang('captchaPlaceholder')
+							});
+						}
+					}
+				}
+
+				var checkRes = validate.check(data, rule);
+				if (checkRes) {
+					return true;
+				} else {
+					this.$util.showToast({
+						title: validate.error
+					});
+					return false;
+				}
+			},
+			/**
+			 * 去登录
+			 */
+			toLogin() {
+				if (this.back) this.$util.redirectTo('/pages_tool/login/login', {
+					back: encodeURIComponent(this.back)
+				});
+				else this.$util.redirectTo('/pages_tool/login/login');
+			},
+			/**
+			 * 发送手机动态码
+			 */
+			sendMobileCode() {
+				if (this.dynacodeData.seconds != 120 || this.dynacodeData.isSend) return;
+				var data = {
+					mobile: this.formData.mobile
+				};
+
+				if (this.isOpenCaptcha == 1) {
+					if (this.captcha.id != '') {
+						data.captcha_id = this.captcha.id;
+						data.captcha_code = this.formData.vercode;
+					}
+				}
+
+				var rule = [{
+						name: 'mobile',
+						checkType: 'required',
+						errorMsg: '请输入手机号'
+					},
+					{
+						name: 'mobile',
+						checkType: 'phoneno',
+						errorMsg: '请输入正确的手机号'
+					}
+				];
+
+				if (this.isOpenCaptcha == 1) {
+					if (this.captcha.id != '') {
+						rule.push({
+							name: 'captcha_code',
+							checkType: 'required',
+							errorMsg: '请输入验证码'
+						});
+					}
+				}
+				var checkRes = validate.check(data, rule);
+				if (!checkRes) {
+					this.$util.showToast({
+						title: validate.error
+					});
+					return;
+				}
+				this.dynacodeData.isSend = true;
+
+				this.dynacodeData.timer = setInterval(() => {
+					this.dynacodeData.seconds--;
+					this.dynacodeData.codeText = this.dynacodeData.seconds + 's后可重新获取';
+				}, 1000);
+
+				this.$api.sendRequest({
+					url: '/api/register/mobileCode',
+					data: data,
+					success: res => {
+						if (res.code >= 0) {
+							this.formData.key = res.data.key;
+						} else {
+							this.$util.showToast({
+								title: res.message
+							});
+							this.refreshDynacodeData();
+						}
+					},
+					fail: () => {
+						this.$util.showToast({
+							title: 'request:fail'
+						});
+						this.refreshDynacodeData();
+					}
+				});
+			},
+			refreshDynacodeData() {
+				this.getCaptcha();
+				clearInterval(this.dynacodeData.timer);
+				this.dynacodeData = {
+					seconds: 120,
+					timer: null,
+					codeText: '获取动态码',
+					isSend: false
+				};
+			},
+			getMemberInfo(callback) {
+				this.$api.sendRequest({
+					url: '/api/member/info',
+					success: (res) => {
+						if (res.code >= 0) {
+							// 正常成功，存储会员信息
+							this.$store.commit('setMemberInfo', res.data);
+							if (callback) callback();
+						}
+					}
+				});
+			}
+		},
+		watch: {
+			'dynacodeData.seconds': {
+				handler(newValue, oldValue) {
+					if (newValue == 0) {
+						this.refreshDynacodeData();
+					}
+				},
+				immediate: true,
+				deep: true
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	@import './public/css/common.scss';
+</style>
+<style scoped lang="scss">
+	.conten-box {
+		padding: 0 30rpx 30rpx;
+
+		.title {
+			text-align: center;
+			margin-top: 50rpx;
+			margin-bottom: 10rpx;
+		}
+
+		.close {
+			position: absolute;
+			right: 30rpx;
+			top: 10rpx;
+		}
+
+		.con {
+			height: 500rpx;
+		}
+	}
+
+	/deep/ .reward-popup .uni-popup__wrapper-box {
+		background: none !important;
+		max-width: unset !important;
+		max-height: unset !important;
+		overflow: unset !important;
+	}
+</style>
\ No newline at end of file
diff --git a/pages_tool/member/account.vue b/pages_tool/member/account.vue
index 0d3a084..6ae59ff 100644
--- a/pages_tool/member/account.vue
+++ b/pages_tool/member/account.vue
@@ -183,8 +183,7 @@
 						};
 
 						this.dataList.forEach(item => {
-							item.withdraw_type_name = withdrawType[item.withdraw_type] ? withdrawType[
-								item.withdraw_type] : '';
+							item.withdraw_type_name = withdrawType[item.withdraw_type] ? withdrawType[item.withdraw_type] : '';
 						});
 						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
 					},
@@ -195,8 +194,7 @@
 				});
 			},
 			getTransferType() {
-				let url = this.type == "member" ? "/api/memberwithdraw/transferType" :
-				"/fenxiao/api/withdraw/transferType";
+				let url = this.type == "member" ? "/api/memberwithdraw/transferType" : "/fenxiao/api/withdraw/transferType";
 				this.$api.sendRequest({
 					url: url,
 					success: res => {
diff --git a/pages_tool/member/account_edit.vue b/pages_tool/member/account_edit.vue
index 1ff5f5a..2ec16b1 100644
--- a/pages_tool/member/account_edit.vue
+++ b/pages_tool/member/account_edit.vue
@@ -59,7 +59,7 @@ export default {
 	},
 	onShow() {
 		if (this.formData.id) {
-			this.getAccountDetail(this.formData.id);
+			this.getAccountDetail();
 		} else {
 			this.getTransferType();
 		}
@@ -74,7 +74,7 @@ export default {
 		}
 	},
 	methods: {
-		getAccountDetail(id) {
+		getAccountDetail() {
 			this.$api.sendRequest({
 				url: '/api/memberbankaccount/info',
 				data: {
diff --git a/pages_tool/member/address.vue b/pages_tool/member/address.vue
index d3cfae4..25ceaa8 100644
--- a/pages_tool/member/address.vue
+++ b/pages_tool/member/address.vue
@@ -229,7 +229,11 @@
 						if (res.data > 0) {
 							this.$refs.mescroll.refresh();
 							if (this.back != '') {
-								this.$util.redirectTo(this.back, {}, 'redirectTo');
+								// this.$util.redirectTo(this.back, {}, 'redirectTo');
+								// 回退到上一个页面
+								uni.navigateBack({
+								    delta: 1  // delta值为1时表示回退到上一级页面
+								});
 							} else {
 								if (this.$refs.loadingCover) this.$refs.loadingCover.show();
 								this.addressList = [];
@@ -333,7 +337,11 @@
 						if (res.code >= 0) {
 
 							if (this.back != '') {
-								this.$util.redirectTo(this.back, {}, 'redirectTo');
+								// this.$util.redirectTo(this.back, {}, 'redirectTo');
+								// 回退到上一个页面
+								uni.navigateBack({
+								    delta: 1  // delta值为1时表示回退到上一级页面
+								});
 							} else {
 								this.$refs.mescroll.refresh();
 							}
diff --git a/pages_tool/member/address_edit.vue b/pages_tool/member/address_edit.vue
index 4cdfccf..91114a4 100644
--- a/pages_tool/member/address_edit.vue
+++ b/pages_tool/member/address_edit.vue
@@ -1,502 +1,719 @@
 <template>
-    <page-meta :page-style="themeColor"></page-meta>
-    <view class="address-edit-content">
-        <view class="edit-wrap">
-            <view class="tip">地址信息</view>
-            <view class="edit-item">
-                <text class="tit">
-                    {{ $lang('consignee') }}
-                    <text>*</text>
-                </text>
-                <input
-                    class="uni-input"
-                    type="text"
-                    placeholder-class="placeholder-class"
-                    :placeholder="$lang('consigneePlaceholder')"
-                    maxlength="30"
-                    name="name"
-                    v-model="formData.name" />
-            </view>
-            <view class="edit-item">
-                <text class="tit">
-                    {{ $lang('mobile') }}
-                    <text>*</text>
-                </text>
-                <input class="uni-input" type="number" placeholder-class="placeholder-class" :placeholder="$lang('mobilePlaceholder')" maxlength="11" v-model="formData.mobile" />
-            </view>
-            <view class="edit-item">
-                <text class="tit">{{ $lang('telephone') }}</text>
-                <input
-                    class="uni-input"
-                    type="text"
-                    placeholder-class="placeholder-class"
-                    :placeholder="$lang('telephonePlaceholder')"
-                    maxlength="20"
-                    v-model="formData.telephone" />
-            </view>
-            <!--  外卖地址区分 -->
-            <block v-if="localType == 2">
-                <view class="edit-item">
-                    <text class="tit">
-                        {{ $lang('receivingCity') }}
-                        <text>*</text>
-                    </text>
-                    <view class="text_inp" :class="{ empty: !formData.full_address, 'color-tip': !formData.full_address }" @click="selectAddress">
-                        {{ formData.full_address ? formData.full_address : '请选择省市区县' }}
-                    </view>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view class="address-edit-content">
+		<view class="edit-wrap">
+			<view class="tip">地址信息</view>
+			<view class="edit-item">
+				<text class="tit">
+					{{ $lang('consignee') }}
+					<text>*</text>
+				</text>
+				<input class="uni-input" type="text" placeholder-class="placeholder-class"
+					:placeholder="$lang('consigneePlaceholder')" maxlength="30" name="name" v-model="formData.name" />
+			</view>
+			<view class="edit-item">
+				<text class="tit">
+					{{ $lang('mobile') }}
+					<text>*</text>
+				</text>
+				<input class="uni-input" type="number" placeholder-class="placeholder-class"
+					:placeholder="$lang('mobilePlaceholder')" maxlength="11" v-model="formData.mobile" />
+			</view>
+			<view class="edit-item">
+				<text class="tit">{{ $lang('telephone') }}</text>
+				<input class="uni-input" type="text" placeholder-class="placeholder-class"
+					:placeholder="$lang('telephonePlaceholder')" maxlength="20" v-model="formData.telephone" />
+			</view>
+			<!--  外卖地址区分 -->
+			<block v-if="localType == 2">
+				<view class="edit-item">
+					<text class="tit">
+						{{ $lang('receivingCity') }}
+						<text>*</text>
+					</text>
+					<view class="text_inp"
+						:class="{ empty: !formData.full_address, 'color-tip': !formData.full_address }"
+						@click="selectAddress">
+						{{ formData.full_address ? formData.full_address : '请选择省市区县' }}
+					</view>
 
-                    <text @click="selectAddress" class="padding-left iconfont icon-location"></text>
-                </view>
-            </block>
-            <block v-else>
-                <view class="edit-item">
-                    <text class="tit">
-                        {{ $lang('receivingCity') }}
-                        <text>*</text>
-                    </text>
-                    <pick-regions :default-regions="defaultRegions" @getRegions="handleGetRegions">
-                        <text class="select-address " :class="{ empty: !formData.full_address, 'color-tip': !formData.full_address }">
-                            {{ formData.full_address ? formData.full_address : '请选择省市区县' }}
-                        </text>
-                    </pick-regions>
-                </view>
-            </block>
+					<text @click="selectAddress" class="padding-left iconfont icon-location"></text>
+				</view>
+				<view class="edit-item">
+					<text class="tit">
+						{{ $lang('address') }}
+						<text>*</text>
+					</text>
+					<text class="select-address" :class="{ empty: !formData.address, 'color-tip': !formData.address}"
+						@click="selectAddress">
+						{{ formData.address ? formData.address : $lang('addressPlaceholder') }}
+					</text>
+				</view>
+				<view class="edit-item" v-if="isEdit">
+					<text class="tit">
+						{{ $lang('house') }}
+						<text>*</text>
+					</text>
+					<input class="uni-input" type="text" placeholder-class="placeholder-class"
+						:placeholder="$lang('housePlaceholder')" maxlength="50" v-model="formData.house" />
 
-            <view class="edit-item">
-                <text class="tit" style="">
-                    {{ $lang('address') }}
-                    <text>*</text>
-                </text>
-                <input class="uni-input" type="text" placeholder-class="placeholder-class" :placeholder="$lang('addressPlaceholder')" maxlength="50" v-model="formData.address" />
-                <!-- <textarea class="uni-input  " type="text" placeholder-class="placeholder-class" :placeholder="$lang('addressPlaceholder')" maxlength="50" v-model="formData.address" ></textarea> -->
-            </view>
-        </view>
-        <view class="btn">
-            <button type="primary" class="add" @click="saveAddress">{{ $lang('save') }}</button>
-        </view>
+				</view>
+			</block>
+			<block v-else>
+				<view class="edit-item">
+					<text class="tit">
+						{{ $lang('receivingCity') }}
+						<text>*</text>
+					</text>
+					
+					<pick-regions :default-regions="defaultRegions" @getRegions="handleGetRegions">
+						<text class="select-address "
+							:class="{ empty: !formData.full_address, 'color-tip': !formData.full_address }">
+							{{ formData.full_address ? formData.full_address : '请选择省市区县' }}
+						</text>
+					</pick-regions>
+				</view>
+				<view class="edit-item">
+					<text class="tit" style="">
+						{{ $lang('address') }}
+						<text>*</text>
+					</text>
+					<input class="uni-input" type="text" placeholder-class="placeholder-class"
+						:placeholder="$lang('addressPlaceholder')" maxlength="50" v-model="formData.address" />
+					<!-- <textarea class="uni-input  " type="text" placeholder-class="placeholder-class" :placeholder="$lang('addressPlaceholder')" maxlength="50" v-model="formData.address" ></textarea> -->
+				</view>
+			</block>
 
-        <loading-cover ref="loadingCover"></loading-cover>
-    </view>
+		</view>
+
+		<view class="identify-area" v-if="isOpenIdentify">
+			<view class="tip">智能识别地址</view>
+			<view class="paste-address">
+				<view class="sample-area">示例：小红152********山西省太原市小店区**路**号</view>
+				<view class="intelligent-identify">
+					<textarea class="input-addr" placeholder="粘贴或输入文本，智能识别姓名、电话和地址" v-model="pasteAddress" name="" id=""
+						cols="30" rows="10"></textarea>
+					<view class="action-area">
+						<view class="identify-btn color-base-bg" @click="identifyAddr()">识别</view>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<view class="btn">
+			<button type="primary" class="add" @click="saveAddress">{{ $lang('save') }}</button>
+		</view>
+		<loading-cover ref="loadingCover"></loading-cover>
+	</view>
 </template>
 
 <script>
-    import pickRegions from '@/components/pick-regions/pick-regions.vue';
-    import validate from 'common/js/validate.js';
-    import Config from '@/common/js/config.js';
+	import pickRegions from '@/components/pick-regions/pick-regions.vue';
+	import validate from 'common/js/validate.js';
+	import Config from '@/common/js/config.js';
 
-    export default {
-        components: {
-            pickRegions
-        },
-        data() {
-            return {
-                formData: {
-                    id: 0,
-                    name: '',
-                    mobile: '',
-                    telephone: '',
-                    province_id: '',
-                    city_id: '',
-                    district_id: '',
-                    community_id: '',
-                    address: '',
-                    full_address: '',
-                    latitude: 0,
-                    longitude: 0,
-                    is_default: 1
-                },
-                address: '',
-                addressValue: '',
-                back: '', // 返回页
-                redirect: 'redirectTo', // 跳转方式
-                flag: false, //防重复标识
-                defaultRegions: [],
-                localType: 1
-            };
-        },
-        onLoad(option) {
-            if (option.back) this.back = option.back;
-            if (option.redirect) this.redirect = option.redirect;
-            if (option.type) this.localType = option.type;
-            if (option.id && !option.name) {
-                this.formData.id = option.id;
-                this.getAddressDetail();
-            } else if (option.name) {
-                if (uni.getStorageSync('addressInfo')) this.formData = uni.getStorageSync('addressInfo');
-                this.formData.address = option.name;
-                this.localType = 2;
-                this.getAddress(option.latng);
-                //给formData复制
-                var tempArr = this.getQueryVariable('latng').split(',');
-                this.formData.latitude = tempArr[0];
-                this.formData.longitude = tempArr[1];
-            } else {
-                if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-            }
-        },
-        onBackPress() {
-            uni.setStorageSync('addressInfo', '');
-        },
-        onShow() {
-            if (this.formData.id) {
-                uni.setNavigationBarTitle({
-                    title: '编辑收货地址'
-                });
-            } else {
-                uni.setNavigationBarTitle({
-                    title: '新增收货地址'
-                });
-            }
-        },
-        onReady() {
-            this.$refs.loadingCover.hide();
-        },
-        onHide() {
-            this.flag = false;
-        },
-        methods: {
-            // 获取地址信息
-            getAddressDetail() {
-                this.$api.sendRequest({
-                    url: '/api/memberaddress/info',
-                    data: {
-                        id: this.formData.id
-                    },
-                    success: res => {
-                        let data = res.data;
-                        if (data != null) {
-                            this.formData.name = data.name;
-                            this.formData.mobile = data.mobile;
-                            this.formData.telephone = data.telephone;
-                            this.formData.address = data.address;
-                            this.formData.full_address = data.full_address;
-                            this.formData.latitude = data.latitude;
-                            this.formData.longitude = data.longitude;
-                            this.formData.is_default = data.is_default;
-                            this.localType = data.type;
-                            this.defaultRegions = [data.province_id, data.city_id, data.district_id];
-                        }
-                        if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-                    },
-                    fail: res => {
-                        if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-                    }
-                });
-            },
-            //获取详细地址
-            getAddress(value) {
-                this.$api.sendRequest({
-                    url: '/api/memberaddress/tranAddressInfo',
-                    data: {
-                        latlng: value
-                    },
-                    success: res => {
-                        if (res.code == 0) {
-                            this.formData.full_address = '';
-                            this.formData.full_address += res.data.province != undefined ? res.data.province : '';
-                            this.formData.full_address += res.data.city != undefined ? '-' + res.data.city : '';
-                            this.formData.full_address += res.data.district != undefined ? '-' + res.data.district : '';
-                            this.addressValue = '';
-                            this.addressValue += res.data.province_id != undefined ? res.data.province_id : '';
-                            this.addressValue += res.data.city_id != undefined ? '-' + res.data.city_id : '';
-                            this.addressValue += res.data.district_id != undefined ? '-' + res.data.district_id : '';
-                        } else {
-                            this.showToast({
-                                title: '数据有误'
-                            });
-                        }
-                    }
-                });
-            },
-            // 获取选择的地区
-            handleGetRegions(regions) {
-                this.formData.full_address = '';
-                this.formData.full_address += regions[0] != undefined ? regions[0].label : '';
-                this.formData.full_address += regions[1] != undefined ? '-' + regions[1].label : '';
-                this.formData.full_address += regions[2] != undefined ? '-' + regions[2].label : '';
-                this.addressValue = '';
-                this.addressValue += regions[0] != undefined ? regions[0].value : '';
-                this.addressValue += regions[1] != undefined ? '-' + regions[1].value : '';
-                this.addressValue += regions[2] != undefined ? '-' + regions[2].value : '';
-            },
+	export default {
+		components: {
+			pickRegions
+		},
+		data() {
+			return {
+				formData: {
+					id: 0,
+					name: '',
+					mobile: '',
+					telephone: '',
+					province_id: '',
+					city_id: '',
+					district_id: '',
+					community_id: '',
+					address: '',
+					full_address: '',
+					house: '',
+					latitude: 0,
+					longitude: 0,
+					is_default: 1
+				},
+				pasteAddress: '',
+				address: '',
+				addressValue: '',
+				back: '', // 返回页
+				redirect: 'redirectTo', // 跳转方式
+				flag: false, //防重复标识
+				defaultRegions: [],
+				localType: 1,
+				isEdit: false,
+				webSign: false, //h5进入当前页面路径参数是否携带地址信息
+				isOpenIdentify: false,
+			};
+		},
+		onLoad(option) {
+			if (option.back) this.back = option.back;
+			if (option.redirect) this.redirect = option.redirect;
+			if (option.type) this.localType = option.type;
+			if (option.id && !option.name) {
+				this.formData.id = option.id;
+				this.getAddressDetail();
+			} else if (option.name) {
+				this.isEdit = true
+				this.webSign = true
+				if (uni.getStorageSync('addressInfo')) this.formData = uni.getStorageSync('addressInfo');
+				this.formData.address = option.name;
+				this.localType = 2;
+				this.getAddress(option.latng);
+				//给formData复制
+				var tempArr = this.getQueryVariable('latng').split(',');
+				this.formData.latitude = tempArr[0];
+				this.formData.longitude = tempArr[1];
+				this.formData.house = ''
+			} else {
+				if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+			}
+			this.getMapConfig();
+		},
+		onBackPress() {
+			uni.setStorageSync('addressInfo', '');
+		},
+		onShow() {
+			if (this.formData.id) {
+				uni.setNavigationBarTitle({
+					title: '编辑收货地址'
+				});
+			} else {
+				uni.setNavigationBarTitle({
+					title: '新增收货地址'
+				});
+			}
+		},
+		onReady() {
+			this.$refs.loadingCover.hide();
+		},
+		onHide() {
+			this.flag = false;
+		},
+		methods: {
+			getMapConfig() {
+				this.$api.sendRequest({
+					url: '/api/config/geMapConfig',
+					success: res => {
+						if (res.data.key) {
+							this.isOpenIdentify = true;
+						} else {
+							this.isOpenIdentify = false;
+						}
+					},
+					fail: res => {
+					}
+				});
+			},
+			// 智能识别地址
+			identifyAddr() {
+				if (!this.pasteAddress) {
+					this.$util.showToast({
+						title: '请粘贴或输入文本信息'
+					})
+					return;
+				}
+				this.$api.sendRequest({
+					url: '/api/address/analysesAddress',
+					data: {
+						address: this.pasteAddress
+					},
+					success: res => {
+						if (res.code >= 0) {
+							if(res.data.name) this.formData.name = res.data.name;
+							if(res.data.mobile) this.formData.mobile = res.data.mobile;
+							if (res.data.province_name || res.data.city_name || res.data.district_name) {
+								this.formData.full_address = '';
+								this.formData.full_address += res.data.province_name ? res.data.province_name :	'';
+								this.formData.full_address += res.data.city_name ? '-' + res.data.city_name : '';
+								this.formData.full_address += res.data.district_name ? '-' + res.data.district_name : '';
+							}
+							let addressValueArr = this.addressValue.split('-');
+							
+							if (res.data.province_id != addressValueArr[0] || res.data.city_id != addressValueArr[1] || res.data.district_id != addressValueArr[2]) {
+								// 省市区更改
+								this.addressValue = res.data.province_id + '-' + res.data.city_id + '-' + res.data.district_id;
+								this.formData.address = res.data.detail;
+							} else {
+								if(res.data.detail) this.formData.address = res.data.detail;
+							}
+							this.formData.latitude = res.data.lat || '';
+							this.formData.longitude = res.data.lng || '';
+						} else {
+							this.$util.showToast({
+								title: res.message
+							})
+						}
+					},
+					fail: err => {
+						this.$util.showToast({
+							title: err.message
+						})
+					}
+				});
+			},
+			// 获取地址信息
+			getAddressDetail() {
+				this.$api.sendRequest({
+					url: '/api/memberaddress/info',
+					data: {
+						id: this.formData.id
+					},
+					success: res => {
+						let data = res.data;
+						if (data != null) {
+							this.formData.name = data.name;
+							this.formData.mobile = data.mobile;
+							this.formData.telephone = data.telephone;
+							this.formData.address = data.address;
+							this.formData.full_address = data.full_address;
+							this.formData.latitude = data.latitude;
+							this.formData.longitude = data.longitude;
+							this.formData.is_default = data.is_default;
+							this.localType = data.type;
+							this.defaultRegions = [data.province_id, data.city_id, data.district_id];
 
-            selectAddress() {
-                // #ifdef MP
-               /* uni.chooseLocation({
-                    success: res => {
-                        this.formData.latitude = res.latitude;
-                        this.formData.longitude = res.longitude;
-                        this.formData.address = res.name;
-                        this.getAddress(res.latitude + ',' + res.longitude);
-                    },
-                    fail(res) {
-                        uni.getSetting({
-                            success: function(res) {
-                                var statu = res.authSetting;
-                                if (!statu['scope.userLocation']) {
-                                    uni.showModal({
-                                        title: '是否授权当前位置',
-                                        content: '需要获取您的地理位置，请确认授权，否则地图功能将无法使用',
-                                        success(tip) {
-                                            if (tip.confirm) {
-                                                uni.openSetting({
-                                                    success: function (data) {
-                                                        if (data.authSetting['scope.userLocation'] === true) {
-                                                            this.$util.showToast({
-                                                                title: '授权成功'
-                                                            });
-                                                            //授权成功之后，再调用chooseLocation选择地方
-                                                            setTimeout(function () {
-                                                                uni.chooseLocation({
-                                                                    success: data => {
-                                                                        this.formData.latitude = res.latitude;
-                                                                        this.formData.longitude = res.longitude;
-                                                                        this.formData.address = res.name;
-                                                                        this.getAddress(res.latitude + ',' + res.longitude);
-                                                                    }
-                                                                });
-                                                            }, 1000);
-                                                        }
-                                                    }
-                                                });
-                                            } else {
-                                                this.$util.showToast({
-                                                    title: '授权失败'
-                                                });
-                                            }
-                                        }
-                                    });
-                                }
-                            }
-                        });
-                    }
-                });*/
-                // #endif
-                // #ifdef H5
-                var urlencode = this.formData;
-                uni.setStorageSync('addressInfo', urlencode);
-                let backurl = Config.h5Domain + '/pages_tool/member/address_edit?type=' + this.localType;
-                if (this.formData.id) backurl += '&id=' + this.formData.id;
-                if (this.back) backurl += '&back=' + this.back;
+							this.addressValue += data.province_id != undefined ? data.province_id : '';
+							this.addressValue += data.city_id != undefined ? '-' + data.city_id : '';
+							this.addressValue += data.district_id != undefined ? '-' + data.district_id : '';
+						}
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					},
+					fail: res => {
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					}
+				});
+			},
+			//获取详细地址
+			getAddress(value) {
+				this.$api.sendRequest({
+					url: '/api/memberaddress/tranAddressInfo',
+					data: {
+						latlng: value
+					},
+					success: res => {
+						if (res.code == 0) {
+							this.formData.full_address = '';
+							this.formData.full_address += res.data.province != undefined ? res.data.province :
+								'';
+							this.formData.full_address += res.data.city != undefined ? '-' + res.data.city :
+							'';
+							this.formData.full_address += res.data.district != undefined ? '-' + res.data
+								.district : '';
+							this.addressValue = '';
+							this.addressValue += res.data.province_id != undefined ? res.data.province_id : '';
+							this.addressValue += res.data.city_id != undefined ? '-' + res.data.city_id : '';
+							this.addressValue += res.data.district_id != undefined ? '-' + res.data
+								.district_id : '';
+						} else {
+							this.showToast({
+								title: '数据有误'
+							});
+						}
+					}
+				});
+			},
+			// 获取选择的地区
+			handleGetRegions(regions) {
+				this.formData.full_address = '';
+				this.formData.full_address += regions[0] != undefined ? regions[0].label : '';
+				this.formData.full_address += regions[1] != undefined ? '-' + regions[1].label : '';
+				this.formData.full_address += regions[2] != undefined ? '-' + regions[2].label : '';
+				this.addressValue = '';
+				this.addressValue += regions[0] != undefined ? regions[0].value : '';
+				this.addressValue += regions[1] != undefined ? '-' + regions[1].value : '';
+				this.addressValue += regions[2] != undefined ? '-' + regions[2].value : '';
+			},
 
-                window.location.href = 'https://apis.map.qq.com/tools/locpicker?search=1&type=0&backurl=' + encodeURIComponent(backurl) + '&key=' + Config.mpKey + '&referer=myapp';
-                // #endif
-            },
+			selectAddress() {
+				// #ifdef MP
+				uni.chooseLocation({
+					success: res => {
+						this.formData.latitude = res.latitude;
+						this.formData.longitude = res.longitude;
+						this.formData.address = res.name;
+						this.getAddress(res.latitude + ',' + res.longitude);
+						this.isEdit = true
+					},
+					fail(res) {
+						uni.getSetting({
+							success: function(res) {
+								var statu = res.authSetting;
+								if (!statu['scope.userLocation']) {
+									uni.showModal({
+										title: '是否授权当前位置',
+										content: '需要获取您的地理位置，请确认授权，否则地图功能将无法使用',
+										success(tip) {
+											if (tip.confirm) {
+												uni.openSetting({
+													success: function(data) {
+														if (data.authSetting[
+																'scope.userLocation'
+																] === true) {
+															this.$util.showToast({
+																title: '授权成功'
+															});
+															//授权成功之后，再调用chooseLocation选择地方
+															setTimeout(function() {
+																uni.chooseLocation({
+																	success: data => {
+																		this.formData
+																			.latitude =
+																			res
+																			.latitude;
+																		this.formData
+																			.longitude =
+																			res
+																			.longitude;
+																		this.formData
+																			.address =
+																			res
+																			.name;
+																		this.getAddress(
+																			res
+																			.latitude +
+																			',' +
+																			res
+																			.longitude
+																			);
+																		this.isEdit =
+																			true
+																	}
+																});
+															}, 1000);
+														}
+													}
+												});
+											} else {
+												this.$util.showToast({
+													title: '授权失败'
+												});
+											}
+										}
+									});
+								}
+							}
+						});
+					}
+				});
+				// #endif
+				// #ifdef H5
+				var urlencode = this.formData;
+				uni.setStorageSync('addressInfo', urlencode);
+				let backurl = Config.h5Domain + '/pages_tool/member/address_edit?type=' + this.localType;
+				if (this.formData.id) backurl += '&id=' + this.formData.id;
+				if (this.back) backurl += '&back=' + this.back;
 
-            getQueryVariable(variable) {
-                var query = window.location.search.substring(1);
-                var vars = query.split('&');
-                for (var i = 0; i < vars.length; i++) {
-                    var pair = vars[i].split('=');
-                    if (pair[0] == variable) {
-                        return pair[1];
-                    }
-                }
-                return false;
-            },
-            vertify() {
-                this.formData.name = this.formData.name.trim();
-                this.formData.mobile = this.formData.mobile.trim();
-                this.formData.address = this.formData.address.trim();
-                var rule = [{
-                        name: 'name',
-                        checkType: 'required',
-                        errorMsg: '请输入姓名'
-                    },
-                    {
-                        name: 'mobile',
-                        checkType: 'required',
-                        errorMsg: '请输入手机号'
-                    },
-                    {
-                        name: 'mobile',
-                        checkType: 'phoneno',
-                        errorMsg: '请输入正确的手机号'
-                    },
-                    {
-                        name: 'full_address',
-                        checkType: 'required',
-                        errorMsg: '请选择省市区县'
-                    },
-                    {
-                        name: 'address',
-                        checkType: 'required',
-                        errorMsg: '详细地址不能为空'
-                    }
-                ];
-                var checkRes = validate.check(this.formData, rule);
-                if (checkRes) {
-                    return true;
-                } else {
-                    this.$util.showToast({
-                        title: validate.error
-                    });
-                    this.flag = false;
-                    return false;
-                }
-            },
-            saveAddress() {
-                if (this.flag) return;
-                this.flag = true;
-                if (this.vertify()) {
-                    let addressValueArr = this.addressValue.split('-'),
-                        data = {},
-                        url = '';
+				window.location.href = 'https://apis.map.qq.com/tools/locpicker?search=1&type=0&backurl=' +
+					encodeURIComponent(backurl) + '&key=' + Config.mpKey + '&referer=myapp';
+				// #endif
+			},
 
-                    data = {
-                        name: this.formData.name,
-                        mobile: this.formData.mobile,
-                        telephone: this.formData.telephone,
-                        province_id: addressValueArr[0],
-                        city_id: addressValueArr[1],
-                        district_id: addressValueArr[2] ? addressValueArr[2] : '',
-                        community_id: 0,
-                        address: this.formData.address,
-                        full_address: this.formData.full_address,
-                        latitude: this.formData.latitude,
-                        longitude: this.formData.longitude,
-                        is_default: this.formData.is_default,
-                        type: this.localType
-                    };
+			getQueryVariable(variable) {
+				var query = window.location.search.substring(1);
+				var vars = query.split('&');
+				for (var i = 0; i < vars.length; i++) {
+					var pair = vars[i].split('=');
+					if (pair[0] == variable) {
+						return pair[1];
+					}
+				}
+				return false;
+			},
+			vertify() {
+				this.formData.name = this.formData.name.trim();
+				this.formData.mobile = this.formData.mobile.trim();
+				this.formData.address = this.formData.address.trim();
+				var rule = [{
+						name: 'name',
+						checkType: 'required',
+						errorMsg: '请输入姓名'
+					},
+					{
+						name: 'mobile',
+						checkType: 'required',
+						errorMsg: '请输入手机号'
+					},
+					{
+						name: 'mobile',
+						checkType: 'phoneno',
+						errorMsg: '请输入正确的手机号'
+					},
+					{
+						name: 'full_address',
+						checkType: 'required',
+						errorMsg: '请选择省市区县'
+					},
+					{
+						name: 'address',
+						checkType: 'required',
+						errorMsg: '详细地址不能为空'
+					},
 
-                    url = 'add';
-                    if (this.formData.id) {
-                        url = 'edit';
-                        data.id = this.formData.id;
-                        if (this.back != '') data.is_default = 1;
-                    }
-                    this.$api.sendRequest({
-                        url: '/api/memberaddress/' + url,
-                        data: data,
-                        success: res => {
-                            this.flag = false;
+				];
 
-                            if (res.code == 0) {
-                                if (this.back != '') {
-                                    this.$util.redirectTo(this.back, {}, 'redirectTo');
-                                } else {
-                                    this.$util.showToast({
-                                        title: res.message
-                                    });
-                                    uni.navigateBack({
-                                        delta: 1
-                                    });
-                                }
-                                uni.removeStorageSync('addressInfo');
-                            } else {
-                                this.$util.showToast({
-                                    title: res.message
-                                });
-                            }
-                        },
-                        fail: res => {
-                            this.flag = false;
-                        }
-                    });
-                }
-            }
-        }
-    };
+				if (this.isEdit) {
+					rule.push({
+						name: 'house',
+						checkType: 'required',
+						errorMsg: '门牌不能为空'
+					})
+				}
+				
+				var checkRes = validate.check(this.formData, rule);
+				if (checkRes) {
+					let addressValueArr = this.addressValue.split('-');
+					if (!addressValueArr[0]) {
+						this.$util.showToast({title: '请选择省'})
+						this.flag = false;
+						return false;
+					} else if (!addressValueArr[1]) {
+						this.$util.showToast({title: '请选择市'})
+						this.flag = false;
+						return false;
+					} else if (!addressValueArr[2]) {
+						this.$util.showToast({title: '请选择区'})
+						this.flag = false;
+						return false;
+					}
+					
+					return true;
+				} else {
+					this.$util.showToast({
+						title: validate.error
+					});
+					this.flag = false;
+					return false;
+				}
+			},
+			saveAddress() {
+				if (this.flag) return;
+				this.flag = true;
+				if (this.vertify()) {
+					
+					let addressValueArr = this.addressValue.split('-'),
+						data = {},
+						url = '';
+
+					data = {
+						name: this.formData.name,
+						mobile: this.formData.mobile,
+						telephone: this.formData.telephone,
+						province_id: addressValueArr[0],
+						city_id: addressValueArr[1],
+						district_id: addressValueArr[2] ? addressValueArr[2] : '',
+						community_id: 0,
+						address: this.isEdit ? this.formData.address + this.formData.house : this.formData.address,
+						full_address: this.formData.full_address,
+						latitude: this.localType == 1 ? '' : this.formData.latitude,
+						longitude: this.localType == 1 ? '' : this.formData.longitude,
+						is_default: this.formData.is_default,
+						type: this.localType
+					};
+
+					url = 'add';
+					if (this.formData.id) {
+						url = 'edit';
+						data.id = this.formData.id;
+						if (this.back != '') data.is_default = 1;
+					}
+					this.$api.sendRequest({
+						url: '/api/memberaddress/' + url,
+						data: data,
+						success: res => {
+							this.flag = false;
+
+							if (res.code == 0) {
+								if (this.back != '') {
+									// 回退到上一个页面
+									// #ifdef H5
+									console.log(this.webSign)
+									if (this.webSign) { //h5重新选择地址需要多回退一步
+
+										window.history.go(-3); // h5跳转外部页面后uni.navigateBack不再生效
+										return
+									}
+
+									// #endif
+									uni.navigateBack({
+										delta: 2 // delta值为1时表示回退到上一级页面
+									});
+									// this.$util.redirectTo(this.back, {}, 'redirectTo');
+								} else {
+									this.$util.showToast({
+										title: res.message
+									});
+									uni.navigateBack({
+										delta: 1
+									});
+								}
+								uni.removeStorageSync('addressInfo');
+							} else {
+								this.$util.showToast({
+									title: res.message
+								});
+							}
+						},
+						fail: res => {
+							this.flag = false;
+						}
+					});
+				}
+			}
+		}
+	};
 </script>
 
 <style lang="scss">
-    /deep/ pick-regions,
-    .pick-regions {
-        flex: 1;
-    }
+	/deep/ pick-regions,
+	.pick-regions {
+		flex: 1;
+	}
 
-    .edit-wrap {
-        background: #fff;
-        overflow: hidden;
+	.identify-area {
 
-        .tip {
-            padding: 20rpx 30rpx 10rpx;
-            background-color: #f8f8f8;
-            color: $color-tip;
-        }
-    }
+		.tip {
+			padding: 20rpx 30rpx 10rpx;
+			background-color: #f8f8f8;
+			color: $color-tip;
+		}
 
-    .edit-item {
-        display: flex;
-        align-items: center;
-        margin: 0 30rpx;
-        min-height: 100rpx;
-        background-color: #fff;
+		.paste-address {
+			margin: 0 30rpx;
 
-        .text_inp {
-            margin-left: $margin-updown;
-            flex: 1;
-        }
+			.sample-area {
+				background-color: #f8ecc5;
+				color: #7d5329;
+				font-size: 24rpx;
+				line-height: 32rpx;
+				padding: 16rpx 30rpx 60rpx;
+				border-radius: 30rpx 30rpx 0 0;
+			}
 
-        .tit {
-            width: 148rpx;
+			.intelligent-identify {
+				margin-top: -44rpx;
+				background-color: #fff;
+				border-radius: 30rpx;
+				padding: 30rpx;
 
-            text {
-                margin-left: 10rpx;
-                color: #ff4544;
-            }
+				.action-area {
+					display: flex;
+					align-items: center;
+					justify-content: flex-end;
 
-            &.margin_tit {
-                align-self: flex-start;
-                margin-top: 24rpx;
-            }
-        }
+					.identify-btn {
+						color: #fff;
+						font-size: 26rpx;
+						line-height: 30rpx;
+						border-radius: 30rpx;
+						padding: 12rpx 20rpx;
+					}
+				}
 
-        .icon-location {
-            color: #606266;
-            align-self: flex-start;
-            margin-top: 20rpx;
-        }
+				.input-addr {
+					width: 100%;
+					height: 200rpx;
+					color: #333;
+					font-size: 24rpx;
+				}
+			}
+		}
 
-        .select-address {
-            display: block;
-            margin-left: 10rpx;
+	}
 
-            &.empty {
-                color: #808080;
-            }
-        }
+	.edit-wrap {
+		background: #fff;
+		overflow: hidden;
 
-        textarea,
-        input {
-            flex: 1;
-            font-size: $font-size-base;
-            margin-left: 20rpx;
-            padding: 0;
-        }
+		.tip {
+			padding: 20rpx 30rpx 10rpx;
+			background-color: #f8f8f8;
+			color: $color-tip;
+		}
+	}
 
-        textarea {
-            margin-top: 6rpx;
-            height: 100rpx;
-            padding-bottom: 20rpx;
-            padding-top: 20rpx;
-            line-height: 50rpx;
-        }
-    }
+	.edit-item {
+		display: flex;
+		align-items: center;
+		margin: 0 30rpx;
+		min-height: 100rpx;
+		background-color: #fff;
 
-    .edit-wrap>.edit-item+.edit-item {
-        border-top: 2rpx solid #ebedf0;
-    }
+		.text_inp {
+			margin-left: $margin-updown;
+			flex: 1;
+		}
 
-    .add {
-        margin-top: 60rpx;
-        height: 80rpx;
-        line-height: 80rpx !important;
-        border-radius: 80rpx;
-        font-weight: 500;
-        width: calc(100% - 60rpx);
-        margin-left: 30rpx;
-        font-size: 32rpx;
-    }
+		.tit {
+			width: 148rpx;
 
-    .btn {
-        position: fixed;
-        width: 100%;
-        bottom: 30rpx;
-        height: auto;
-        padding-bottom: constant(safe-area-inset-bottom);
-        /*兼容 IOS<11.2*/
-        padding-bottom: env(safe-area-inset-bottom);
-        /*兼容 IOS>11.2*/
-    }
+			text {
+				margin-left: 10rpx;
+				color: #ff4544;
+			}
+
+			&.margin_tit {
+				align-self: flex-start;
+				margin-top: 24rpx;
+			}
+		}
+
+		.icon-location {
+			color: #606266;
+			align-self: flex-start;
+			margin-top: 20rpx;
+		}
+
+		.select-address {
+			display: block;
+			margin-left: 10rpx;
+
+			&.empty {
+				color: #808080;
+			}
+		}
+
+		textarea,
+		input {
+			flex: 1;
+			font-size: $font-size-base;
+			margin-left: 20rpx;
+			padding: 0;
+		}
+
+		textarea {
+			margin-top: 6rpx;
+			height: 100rpx;
+			padding-bottom: 20rpx;
+			padding-top: 20rpx;
+			line-height: 50rpx;
+		}
+	}
+
+	.edit-wrap>.edit-item+.edit-item {
+		border-top: 2rpx solid #ebedf0;
+	}
+
+	.add {
+		margin-top: 60rpx;
+		height: 80rpx;
+		line-height: 80rpx !important;
+		border-radius: 80rpx;
+		font-weight: 500;
+		width: calc(100% - 60rpx);
+		margin-left: 30rpx;
+		font-size: 32rpx;
+	}
+
+	.btn {
+		position: fixed;
+		width: 100%;
+		bottom: 30rpx;
+		height: auto;
+		padding-bottom: constant(safe-area-inset-bottom);
+		/*兼容 IOS<11.2*/
+		padding-bottom: env(safe-area-inset-bottom);
+		/*兼容 IOS>11.2*/
+	}
 </style>
\ No newline at end of file
diff --git a/pages_tool/member/apply_withdrawal.vue b/pages_tool/member/apply_withdrawal.vue
index 97b0762..0bf738c 100644
--- a/pages_tool/member/apply_withdrawal.vue
+++ b/pages_tool/member/apply_withdrawal.vue
@@ -7,14 +7,13 @@
 				<view class="tx-bank" v-if="bankAccountInfo.withdraw_type == 'wechatpay'">微信默认钱包</view>
 				<view class="tx-bank" v-else>{{ bankAccountInfo.bank_account }}</view>
 				<view class="tx-img" v-if="bankAccountInfo.withdraw_type == 'alipay'">
-					<image :src="$util.img('public/uniapp/member/apply_withdrawal/alipay.png')" mode="widthFix"></image>
+					<image :src="$util.img('public/uniapp/member/apply_withdrawal/alipay.png')" mode="widthFix"/>
 				</view>
 				<view class="tx-img" v-else-if="bankAccountInfo.withdraw_type == 'bank'">
-					<image :src="$util.img('public/uniapp/member/apply_withdrawal/bank.png')" mode="widthFix"></image>
+					<image :src="$util.img('public/uniapp/member/apply_withdrawal/bank.png')" mode="widthFix"/>
 				</view>
 				<view class="tx-img" v-else-if="bankAccountInfo.withdraw_type == 'wechatpay'">
-					<image :src="$util.img('public/uniapp/member/apply_withdrawal/wechatpay.png')" mode="widthFix">
-					</image>
+					<image :src="$util.img('public/uniapp/member/apply_withdrawal/wechatpay.png')" mode="widthFix"/>
 				</view>
 			</view>
 			<text class="tx-to" v-else>请添加提现方式</text>
@@ -192,9 +191,7 @@
 										title: '提现申请成功'
 									});
 									setTimeout(() => {
-										this.$util.redirectTo(
-											'/pages_tool/member/withdrawal', {},
-											'redirectTo');
+										this.$util.redirectTo('/pages_tool/member/withdrawal', {}, 'redirectTo');
 									}, 1500);
 								} else {
 									this.isSub = false;
@@ -228,8 +225,7 @@
 									title: '提现申请成功'
 								});
 								setTimeout(() => {
-									this.$util.redirectTo('/pages_tool/member/withdrawal', {},
-										'redirectTo');
+									this.$util.redirectTo('/pages_tool/member/withdrawal', {}, 'redirectTo');
 								}, 1500);
 							} else {
 								this.isSub = false;
@@ -246,41 +242,15 @@
 				}
 			},
 			goAccount() {
-				this.$util.redirectTo(
-					'/pages_tool/member/account', {
-						back: '/pages_tool/member/apply_withdrawal'
-					},
-					'redirectTo'
-				);
+				this.$util.redirectTo('/pages_tool/member/account', {
+					back: '/pages_tool/member/apply_withdrawal'
+				}, 'redirectTo');
 			},
 			/**
 			 * 微信订阅消息
 			 */
 			subscribeMessage(callback) {
-				this.$api.sendRequest({
-					url: '/weapp/api/weapp/messagetmplids',
-					data: {
-						keywords: 'USER_WITHDRAWAL_SUCCESS'
-					},
-					success: res => {
-						if (res.code == 0 && res.data.length) {
-							uni.requestSubscribeMessage({
-								tmplIds: res.data,
-								fail: res => {
-									console.log('fail', res);
-								},
-								complete: () => {
-									callback();
-								}
-							});
-						} else {
-							callback();
-						}
-					},
-					fail: res => {
-						callback();
-					}
-				});
+				this.$util.subscribeMessage('USER_WITHDRAWAL_SUCCESS', callback);
 			}
 		},
 	};
diff --git a/pages_tool/member/assets.vue b/pages_tool/member/assets.vue
index bf72e84..90d6bfa 100644
--- a/pages_tool/member/assets.vue
+++ b/pages_tool/member/assets.vue
@@ -79,172 +79,182 @@
 </template>
 
 <script>
-export default {
-	data() {
-		return {
-			accountInfo: {},
-			member_info: {},
-			fenxiao_info: {}
-		};
-	},
-	onLoad(option) {
-
-		if (option.back) this.back = option.back;
-
-		// 判断登录
-		if (!this.storeToken) {
-			this.$util.redirectTo('/pages_tool/login/login');
-		} else {
-			this.getAccountInfo();
-		}
-	},
-	methods: {
-		getAccountInfo() {
-			this.$api.sendRequest({
-				url: '/membercancel/api/membercancel/accountInfo',
-				success: res => {
-					if (res.code >= 0) {
-						this.accountInfo = res.data;
-						this.member_info = res.data.member_info;
-						if (res.data.member_info.is_fenxiao == 1) {
-							this.fenxiao_info = res.data.fenxiao_info;
+	export default {
+		data() {
+			return {
+				member_info: {
+					point: 0,
+					balance_money: '0.00',
+					balance: '0.00'
+				},
+				accountInfo: {
+					member_coupon_count: 0,
+					order_pay_count: 0,
+					order_delivery_count: 0,
+					order_refund_count: 0
+				},
+				fenxiao_info: {
+					account: '0.00',
+					account_withdraw_apply: '0.00',
+					fenxiao_order_count: 0
+				}
+			};
+		},
+		onLoad(option) {
+			// 判断登录
+			if (!this.storeToken) {
+				this.$util.redirectTo('/pages_tool/login/login');
+			} else {
+				this.getAccountInfo();
+			}
+		},
+		methods: {
+			getAccountInfo() {
+				this.$api.sendRequest({
+					url: '/membercancel/api/membercancel/accountInfo',
+					success: res => {
+						if (res.code >= 0) {
+							this.accountInfo = res.data;
+							this.member_info = res.data.member_info;
+							if (res.data.member_info.is_fenxiao == 1) {
+								this.fenxiao_info = res.data.fenxiao_info;
+							}
 						}
 					}
-				}
-			});
-		},
-		prev() {
-			this.$util.redirectTo('/pages_tool/member/cancellation');
-		},
-		submit() {
-			uni.showModal({
-				title: '风险提示',
-				content: '确定要注销当前账号吗？',
-				confirmColor: '#000000',
-				success: res => {
-					if (res.confirm) {
-						this.$api.sendRequest({
-							url: '/membercancel/api/membercancel/apply',
-							success: rres => {
-								let cancellation_condition = rres.data.is_audit;
-								if (rres.code >= 0) {
-									this.$util.redirectTo('/pages_tool/member/cancelstatus');
-								} else {
-									this.$util.showToast({
-										title: rres.message
-									});
+				});
+			},
+			prev() {
+				this.$util.redirectTo('/pages_tool/member/cancellation');
+			},
+			submit() {
+				uni.showModal({
+					title: '风险提示',
+					content: '确定要注销当前账号吗？',
+					confirmColor: '#000000',
+					success: res => {
+						if (res.confirm) {
+							this.$api.sendRequest({
+								url: '/membercancel/api/membercancel/apply',
+								success: rres => {
+									let cancellation_condition = rres.data.is_audit;
+									if (rres.code >= 0) {
+										this.$util.redirectTo('/pages_tool/member/cancelstatus');
+									} else {
+										this.$util.showToast({
+											title: rres.message
+										});
+									}
 								}
-							}
-						});
+							});
+						}
 					}
-				}
-			});
+				});
+			}
 		}
-	}
-};
+	};
 </script>
 
 <style lang="scss" scoped>
-.assets-wrap {
-	.assets-block {
-		padding: 0 24rpx;
-		padding-top: 30rpx;
-	}
-
-	.assets-tips {
-		width: 100%;
-		height: 56rpx;
-		background-color: rgba(250, 106, 0, 0.2);
-		border-radius: 6rpx;
-		line-height: 56rpx;
-		padding-left: 20rpx;
-		box-sizing: border-box;
-
-		text {
-			color: #fa6a00;
-			font-size: 28rpx;
+	.assets-wrap {
+		.assets-block {
+			padding: 0 24rpx;
+			padding-top: 30rpx;
 		}
-	}
 
-	.assets-box {
-		width: 100%;
-		margin-top: 30rpx;
-		background-color: #ffffff;
-		border-radius: 6rpx;
-		padding: 20rpx;
-		box-sizing: border-box;
+		.assets-tips {
+			width: 100%;
+			height: 56rpx;
+			background-color: rgba(250, 106, 0, 0.2);
+			border-radius: 6rpx;
+			line-height: 56rpx;
+			padding-left: 20rpx;
+			box-sizing: border-box;
 
-		.assets-title {
-			display: flex;
-			align-items: center;
-
-			text:nth-child(1) {
-				width: 6rpx;
-				height: 28rpx;
-				border-radius: 2rpx;
-			}
-
-			text:nth-child(2) {
-				margin-left: 20rpx;
+			text {
+				color: #fa6a00;
 				font-size: 28rpx;
-				line-height: 28rpx;
-				padding-top: 8rpx;
-				font-weight: 600;
 			}
 		}
 
-		.assets-list {
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-			flex-wrap: wrap;
-			padding: 0 26rpx 35rpx;
-			margin-top: 53rpx;
+		.assets-box {
+			width: 100%;
+			margin-top: 30rpx;
+			background-color: #ffffff;
+			border-radius: 6rpx;
+			padding: 20rpx;
+			box-sizing: border-box;
 
-			.assets-li {
-				text-align: center;
+			.assets-title {
+				display: flex;
+				align-items: center;
 
-				view:nth-child(1) {
-					font-size: 36rpx;
-					line-height: 36rpx;
+				text:nth-child(1) {
+					width: 6rpx;
+					height: 28rpx;
+					border-radius: 2rpx;
 				}
 
-				view:nth-child(2) {
+				text:nth-child(2) {
+					margin-left: 20rpx;
 					font-size: 28rpx;
 					line-height: 28rpx;
-					color: #666666;
-					margin-top: 30rpx;
+					padding-top: 8rpx;
+					font-weight: 600;
+				}
+			}
+
+			.assets-list {
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				flex-wrap: wrap;
+				padding: 0 26rpx 35rpx;
+				margin-top: 53rpx;
+
+				.assets-li {
+					text-align: center;
+
+					view:nth-child(1) {
+						font-size: 36rpx;
+						line-height: 36rpx;
+					}
+
+					view:nth-child(2) {
+						font-size: 28rpx;
+						line-height: 28rpx;
+						color: #666666;
+						margin-top: 30rpx;
+					}
 				}
 			}
 		}
-	}
 
-	.assets-btn {
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		position: fixed;
-		bottom: 0;
-		width: 100%;
-		height: 150rpx;
+		.assets-btn {
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			position: fixed;
+			bottom: 0;
+			width: 100%;
+			height: 150rpx;
 
-		button {
-			width: 300rpx;
-			height: 80rpx;
-			font-size: 28rpx;
-			line-height: 80rpx;
-			margin: 0 15rpx;
-		}
+			button {
+				width: 300rpx;
+				height: 80rpx;
+				font-size: 28rpx;
+				line-height: 80rpx;
+				margin: 0 15rpx;
+			}
 
-		button[type='primary'] {
-			background-color: unset !important;
-			color: #333333;
-			border: 2rpx solid #dddddd;
-		}
+			button[type='primary'] {
+				background-color: unset !important;
+				color: #333333;
+				border: 2rpx solid #dddddd;
+			}
 
-		button:nth-child(2) {
-			color: var(--btn-text-color);
+			button:nth-child(2) {
+				color: var(--btn-text-color);
+			}
 		}
 	}
-}
-</style>
+</style>
\ No newline at end of file
diff --git a/pages_tool/member/balance.vue b/pages_tool/member/balance.vue
index 1a70523..30cebd7 100644
--- a/pages_tool/member/balance.vue
+++ b/pages_tool/member/balance.vue
@@ -2,24 +2,20 @@
 	<page-meta :page-style="themeColor"></page-meta>
 	<view class="balance">
 		<!-- #ifdef MP-WEIXIN -->
-		<view class="custom-navbar" :style="{
-				'padding-top': menuButtonBounding.top + 'px',
-				'height': menuButtonBounding.height + 'px'
-			}">
+		<view class="custom-navbar" :style="{ 'padding-top': menuButtonBounding.top + 'px', 'height': menuButtonBounding.height + 'px' }">
 			<view class="navbar-wrap">
 				<text class="iconfont icon-back_light back" @click="$util.redirectTo('/pages/member/index')"></text>
 				<view class="navbar-title">
-					账户余额
+					我的余额
 				</view>
 			</view>
 		</view>
 		<!-- #endif -->
 		
-		<view class="head-wrap" :style="{ background: 'url(' + $util.img('public/uniapp/balance/balance-bg.png') + ')',backgroundSize:'100% 100%' }">
-		<!-- 	<view class="head-wrap" :style="{ background: 'url(' + $util.img('public/uniapp/balance/balance-bg.png') + ') no-repeat right bottom/ auto 380rpx, linear-gradient(314deg, #FE7849 0%, #FF1959 100%)' }"> -->
-			<view class="title">账户余额（元）</view>
+		<view class="head-wrap" :style="{ background: 'url(' + $util.img('public/uniapp/balance/balance_bg.png') + ') no-repeat right bottom/ auto 340rpx, linear-gradient(314deg, #FE7849 0%, #FF1959 100%)' }">
 			<view class="balance price-font">{{ (parseFloat(balanceInfo.balance) + parseFloat(balanceInfo.balance_money)).toFixed(2) }}</view>
-<!-- 			<view class="flex-box">
+			<view class="title">账户余额（元）</view>
+			<view class="flex-box">
 				<view class="flex-item">
 					<view class="num price-font">{{  balanceInfo.balance_money|moneyFormat }}</view>
 					<view class="font-size-tag">现金余额（元）</view>
@@ -28,45 +24,34 @@
 					<view class="num price-font">{{ balanceInfo.balance|moneyFormat }}</view>
 					<view class="font-size-tag">储值余额（元）</view>
 				</view>
-			</view> -->
-			<view class="btns">
-				<view class="cash btn" @click="toWithdrawal">提现</view>
-				<view class="recharge btn" @click="toList">充值</view>
 			</view>
 		</view>
 
 		<view class="menu-wrap">
-			<view class="menu-item" @click="toApply" style="border-bottom: 0.5px solid #f2f2f2;">
-				<view class="icon">
-					<text class="iconfont icon-yuemingxi"></text>
-				</view>
-				<text class="title">提现记录</text>
-				<text class="iconfont icon-right"></text>
-			</view>
-			<view class="menu-item" @click="toBalanceDetail" style="border-bottom: 0.5px solid #f2f2f2;">
+			<view class="menu-item" @click="toBalanceDetail">
 				<view class="icon">
 					<text class="iconfont icon-yuemingxi"></text>
 				</view>
 				<text class="title">余额明细</text>
 				<text class="iconfont icon-right"></text>
 			</view>
-		<!-- 	<view class="menu-item" @click="toOrderList">
+			<view class="menu-item" @click="toOrderList" v-if="addonIsExist.memberrecharge && memberrechargeConfig && memberrechargeConfig.is_use">
 				<view class="icon">
 					<text class="iconfont icon-chongzhijilu"></text>
 				</view>
 				<text class="title">充值记录</text>
 				<text class="iconfont icon-right"></text>
-			</view> -->
+			</view>
 		</view>
 		
-	<!-- 	<view class="action">
+		<view class="action">
 			<view @click="toList" class="recharge-withdraw" v-if="addonIsExist.memberrecharge && memberrechargeConfig && memberrechargeConfig.is_use">
 				{{ $lang('recharge') }}
 			</view>
 			<view class="withdraw" v-if="addonIsExist.memberwithdraw && withdrawConfig && withdrawConfig.is_use" @click="toWithdrawal">
 				{{ $lang('withdrawal') }}
 			</view>
-		</view> -->
+		</view>
 		<ns-login ref="login"></ns-login>
 		<loading-cover ref="loadingCover"></loading-cover>
 	</view>
@@ -111,9 +96,6 @@ export default {
 		toBalanceDetail() {
 			this.$util.redirectTo('/pages_tool/member/balance_detail');
 		},
-		toApply(){
-			this.$util.redirectTo('/pages_tool/member/withdrawal');
-		},
 		toList() {
 			this.$util.redirectTo('/pages_tool/recharge/list');
 		},
diff --git a/pages_tool/member/balance_detail.vue b/pages_tool/member/balance_detail.vue
index 674e0f7..802b94d 100644
--- a/pages_tool/member/balance_detail.vue
+++ b/pages_tool/member/balance_detail.vue
@@ -6,11 +6,11 @@
 				<text class="uni-tab-item-title" :class="statusIndex == orderStatus ? 'uni-tab-item-title-active' : ''">{{ statusItem.name }}</text>
 			</view>
 		</scroll-view> -->
-	<!-- 	<view class="tab color-bg">
+		<view class="tab color-bg">
 			<view class="tab-left">
-				<picker mode="date" :value="searchType.date" @change="bindDateChange" fields="month">
+				<picker :range="monthData" :value="monthIndex" @change="bindDateChange" >
 					<view class="uni-input">
-						{{ date }}
+						{{ monthData[monthIndex] }}
 						<text class="iconfont icon-iconangledown"></text>
 					</view>
 				</picker>
@@ -21,22 +21,22 @@
 					<text class="iconfont icon-iconangledown"></text>
 				</picker>
 			</view>
-		</view> -->
-		<mescroll-uni @getData="getData" ref="mescroll">
+		</view>
+		<mescroll-uni @getData="getData" ref="mescroll" v-if="monthData.length">
 			<block slot="list">
 				<!-- 明细列表 -->
 				<block v-if="dataList.length > 0">
 					<view class="detailed-wrap">
 						<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>
+							<!-- <image :src="$util.img('public/uniapp/member/balance_detail/income.png')" class="balances-img" v-if="item.account_data > 0"></image>
+							<image v-else :src="$util.img('public/uniapp/member/balance_detail/pay.png')" mode="widthFix"></image> -->
 							<view class="balances-info" @click="toFromDetail(item)">
-								<text class="title">{{ item.remark }}</text>
-							<!-- 	<text>{{ item.remark }}</text> -->
+								<text class="title">{{ item.type_name }}</text>
+								<text>{{ item.remark }}</text>
 								<text>{{ $util.timeStampTurnTime(item.create_time) }}</text>
 							</view>
 							<view class="balances-num">
-								<text :class="item.account_data > 0 ? 'color-base-text' : ''">{{ item.account_data > 0 ? '+' + item.account_data : item.account_data }}元</text>
+								<text :class="item.account_data > 0 ? 'color-base-text' : ''">{{ item.account_data > 0 ? '+' + item.account_data : item.account_data }}</text>
 							</view>
 						</view>
 					</view>
@@ -53,9 +53,6 @@
 <script>
 	export default {
 		data() {
-			const currentDate = this.getDate({
-				format: true
-			});
 			return {
 				dataList: [],
 				statusList: [{
@@ -70,7 +67,6 @@
 				}],
 				scrollInto: '',
 				orderStatus: '0',
-				date: currentDate,
 				searchType: {
 					from_type: 0,
 					date: ''
@@ -80,7 +76,9 @@
 					value: '0'
 				}], //积分类型
 				balanceIndex: 0,
-				related_id: 0
+				related_id: 0,
+				monthData:[],
+				monthIndex:0,
 			};
 		},
 		components: {},
@@ -90,6 +88,7 @@
 			if (option.related_id) this.related_id = option.related_id ? option.related_id : 0;
 			if (option.status) this.orderStatus = option.status;
 			this.getbalanceType();
+			this.getMonthData();
 		},
 		onShow() {
 			if (!this.storeToken) {
@@ -100,26 +99,19 @@
 		},
 		methods: {
 			bindDateChange: function(e) {
-				var temp = e.target.value;
-				var tempArr = temp.split('-');
-				this.date = tempArr[0] + '年' + tempArr[1] + '月';
-				this.searchType.date = e.target.value;
+				var index = e.target.value;
+				this.monthIndex = index;
+				this.searchType.date = this.monthData[index];
 				this.$refs.mescroll.refresh();
 			},
-			getDate(type) {
-				const date = new Date();
-				let year = date.getFullYear();
-				let month = date.getMonth() + 1;
-				let day = date.getDate();
-
-				if (type === 'start') {
-					year = year - 60;
-				} else if (type === 'end') {
-					year = year + 2;
-				}
-				month = month > 9 ? month : '0' + month;
-				day = day > 9 ? day : '0' + day;
-				return `${year}年${month}月`;
+			getMonthData(){
+				this.$api.sendRequest({
+					url: '/api/memberaccount/monthData',
+					success: res => {
+						this.monthData = res.data;
+						this.searchType.date = res.data[0];
+					}
+				});
 			},
 			bindPickerChange(e) {
 				this.balanceIndex = e.detail.value;
@@ -204,9 +196,8 @@
 
 <style lang="scss">
 	.detailed-wrap {
-		padding-top: 20rpx;
-		
-		margin: 24rpx;
+		padding-top: 80rpx;
+		background: #fff;
 	}
 
 	.tab {
@@ -295,20 +286,17 @@
 	}
 
 	.balances {
-		padding: $margin-both 24rpx;
-		// margin: 0 $margin-both;
+		padding: $margin-both 0;
+		margin: 0 $margin-both;
 		box-sizing: border-box;
 		display: flex;
 		align-items: flex-start;
 		border-bottom: 2rpx solid $color-line;
-		background: #fff;
-		margin-bottom: 20rpx;
-		border-radius: 24rpx;
+
 		image {
 			width: 54rpx;
 			height: 54rpx;
 			border-radius: 50%;
-			padding-top: 10rpx;
 		}
 
 		.balances-info {
@@ -342,8 +330,6 @@
 				line-height: 1;
 				font-size: $font-size-toolbar;
 				font-weight: 500;
-				color:#09c15f;
-				font-weight: 700;
 			}
 		}
 	}
diff --git a/pages_tool/member/cancellation.vue b/pages_tool/member/cancellation.vue
index 0212f3d..722a105 100644
--- a/pages_tool/member/cancellation.vue
+++ b/pages_tool/member/cancellation.vue
@@ -4,7 +4,8 @@
 		<view class="agreement-box">
 			<view class="agreement-intro">
 				<view class="align-center agreement-title">{{ agreement.title }}</view>
-				<rich-text class="agreement-content" :nodes="agreement.content"></rich-text>
+				<!-- <rich-text class="agreement-content" :nodes="agreement.content"></rich-text> -->
+				<ns-mp-html class="agreement-content" :content="agreement.content"></ns-mp-html>
 			</view>
 
 			<view class="agreement-btn">
@@ -29,7 +30,6 @@ export default {
 		};
 	},
 	onLoad(option) {
-		if (option.back) this.back = option.back;
 		// 判断登录
 		if (!this.storeToken) {
 			this.$util.redirectTo('/pages_tool/login/login');
@@ -44,7 +44,7 @@ export default {
 				success: res => {
 					if (res.code >= 0) {
 						this.agreement = res.data;
-						if (this.agreement.content) this.agreement.content = htmlParser(this.agreement.content);
+						// if (this.agreement.content) this.agreement.content = htmlParser(this.agreement.content);
 					}
 				}
 			});
@@ -66,6 +66,10 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+/deep/ .agreement-content view{
+	font-size: 24rpx;
+	line-height: 44rpx;
+}
 .agreement-box {
 	.align-center {
 		text-align: center;
diff --git a/pages_tool/member/cancelrefuse.vue b/pages_tool/member/cancelrefuse.vue
index 7e60f38..29ecc31 100644
--- a/pages_tool/member/cancelrefuse.vue
+++ b/pages_tool/member/cancelrefuse.vue
@@ -15,16 +15,12 @@
 
 <script>
 export default {
-	components: {},
 	data() {
 		return {
 			reason: ''
 		};
 	},
 	onLoad(option) {
-
-		if (option.back) this.back = option.back;
-
 		// 判断登录
 		if (!this.storeToken) {
 			this.$util.redirectTo('/pages_tool/login/login');
diff --git a/pages_tool/member/cancelstatus.vue b/pages_tool/member/cancelstatus.vue
index 4c97bfa..4cb04ef 100644
--- a/pages_tool/member/cancelstatus.vue
+++ b/pages_tool/member/cancelstatus.vue
@@ -20,9 +20,7 @@
 					<view class="cancelstatus-box-line color-base-bg" :class="{ 'opacity-4': state == 0 }"></view>
 				</view>
 				<view class="cancelstatus-box cancelstatus-box-last">
-					<view class="cancelstatus-box-sort color-base-bg" :class="[ state == 1 ?  'opacity': 'opacity-4' ]">
-						3
-					</view>
+					<view class="cancelstatus-box-sort color-base-bg" :class="[ state == 1 ?  'opacity': 'opacity-4' ]">3</view>
 					<view class="cancelstatus-box-con">
 						<view class="cancelstatus-box-name">审核通过，注销完成</view>
 						<view class="cancelstatus-box-info">您已成功注销账号，期待下一次与您相遇</view>
@@ -64,16 +62,15 @@
 							this.state = res.data.status;
 							if (this.state == -1) {
 								this.$util.redirectTo('/pages_tool/member/cancelrefuse');
+							} else if(this.state == 1){
+								this.$store.commit('setToken', '');
+								this.$store.commit('setMemberInfo', '');
+								this.$store.dispatch('emptyCart');
+								//uni.removeStorageSync('authInfo');
+								this.$util.redirectTo('/pages/index/index');
 							}
 						}
 
-						if (res.code == -1) {
-							this.$store.commit('setToken', '');
-							this.$store.commit('setMemberInfo', '');
-							this.$store.commit('setMemberInfo', '');
-							this.$store.dispatch('emptyCart');
-							this.$util.redirectTo('/pages/index/index');
-						}
 					}
 				});
 			},
diff --git a/pages_tool/member/cancelsuccess.vue b/pages_tool/member/cancelsuccess.vue
index 1e362e5..e8bdbac 100644
--- a/pages_tool/member/cancelsuccess.vue
+++ b/pages_tool/member/cancelsuccess.vue
@@ -14,38 +14,24 @@
 
 <script>
 	export default {
-		components: {},
 		data() {
-			return {
-				state: ''
-			};
+			return {};
 		},
 		onLoad(option) {
-
-			if (option.back) this.back = option.back;
-
 			// 判断登录
 			if (!this.storeToken) {
 				this.$util.redirectTo('/pages_tool/login/login');
 			} else {
-				this.getStatus();
+				this.init();
 			}
 		},
 		methods: {
-			getStatus() {
-				this.$api.sendRequest({
-					success: res => {
-						if (res.code >= 0) {
-							this.state = res.data.state;
-							if (res.data.state == 1) {
-								this.$store.commit('setToken', '');
-								this.$store.commit('setMemberInfo', '');
-								this.$store.dispatch('emptyCart');
-								this.$util.redirectTo('/pages/index/index');
-							}
-						}
-					}
-				});
+			init() {
+				this.$store.commit('setToken', '');
+				this.$store.commit('setMemberInfo', '');
+				this.$store.dispatch('emptyCart');
+				//uni.removeStorageSync('authInfo');
+				this.$util.redirectTo('/pages/index/index');
 			}
 		}
 	};
diff --git a/pages_tool/member/card.vue b/pages_tool/member/card.vue
index a168fa9..b6b1485 100644
--- a/pages_tool/member/card.vue
+++ b/pages_tool/member/card.vue
@@ -10,8 +10,7 @@
 				<image :src="$util.getDefaultImage().head" v-else mode="aspectFill"/>
 				<view class="member-desc">
 					<view class="font-size-toolbar">{{ memberInfo.nickname }}</view>
-					<view class="font-size-tag expire-time" v-if="memberInfo.level_expire_time > 0">
-						有效期至：{{ $util.timeStampTurnTime(memberInfo.level_expire_time, true) }}</view>
+					<view class="font-size-tag expire-time" v-if="memberInfo.level_expire_time > 0">有效期至：{{ $util.timeStampTurnTime(memberInfo.level_expire_time) }}</view>
 				</view>
 			</view>
 
diff --git a/pages_tool/member/card_agreement.vue b/pages_tool/member/card_agreement.vue
index 7c378c9..fb6c9c7 100644
--- a/pages_tool/member/card_agreement.vue
+++ b/pages_tool/member/card_agreement.vue
@@ -2,7 +2,10 @@
 	<page-meta :page-style="themeColor"></page-meta>
 	<view class="page">
 		<view class="agreement-title">{{ title }}</view>
-		<view class="agreement-content"><rich-text :nodes="content"></rich-text></view>
+		<view class="agreement-content">
+			<!-- <rich-text :nodes="content"></rich-text> -->
+			<ns-mp-html :content="content"></ns-mp-html>
+		</view>
 	</view>
 </template>
 
@@ -26,7 +29,8 @@ export default {
 				success: res => {
 					if (res.data && res.code == 0) {
 						this.title = res.data.title;
-						this.content = htmlParser(res.data.content);
+						// this.content = htmlParser(res.data.content);
+						this.content = res.data.content;
 						uni.setNavigationBarTitle({
 							title: this.title
 						});
diff --git a/pages_tool/member/card_buy.vue b/pages_tool/member/card_buy.vue
index 86b07b9..dccdc01 100644
--- a/pages_tool/member/card_buy.vue
+++ b/pages_tool/member/card_buy.vue
@@ -11,9 +11,7 @@
 					<image :src="$util.getDefaultImage().head" v-else mode="aspectFill"></image>
 					<view class="member-desc">
 						<view class="font-size-toolbar">{{ memberInfo.nickname }}</view>
-						<view class="font-size-tag expire-time" v-if="memberInfo.level_expire_time > 0">
-							有效期至：{{ $util.timeStampTurnTime(memberInfo.level_expire_time, true) }}
-						</view>
+						<view class="font-size-tag expire-time" v-if="memberInfo.level_expire_time > 0">有效期至：{{ $util.timeStampTurnTime(memberInfo.level_expire_time) }}</view>
 					</view>
 				</view>
 				<swiper :style="{ width: '100vw', height: '390rpx' }" class="margin-bottom"
@@ -26,21 +24,25 @@
 					<swiper-item :class="levelList.length == 1 ? 'image-container-box' : ''" v-for="(item, i) in levelList" :key="i">
 						<view class="image-container" :class="[
 								curIndex === 0
-									? i === listLen - 1
-										? 'item-left'
-										: i === 1
+									? i === 1
 										? 'item-right'
+										: i === listLen - 1
+										? 'item-left'
 										: 'item-center'
 									: curIndex === listLen - 1
-									? i === 0
+										? i === curIndex - 1
+										? 'item-left'
+										:  i === curIndex + 1
+										? 'item-right'
+										: i === 0
 										? 'item-right'
 										: i === listLen - 2
 										? 'item-left'
 										: 'item-center'
 									: i === curIndex - 1
-									? 'item-left'
-									: i === curIndex + 1
-									? 'item-right'
+										? 'item-left'
+										: i === curIndex + 1
+										? 'item-right'
 									: 'item-center'
 							]">
 							<view class="slide-image" style="background-size: 100% 100%;background-repeat:no-repeat"
@@ -51,14 +53,14 @@
 								}">
 								<view class="bg-border"></view>
 
-								<image v-if="levelList[curIndex] && levelList[curIndex]['level_picture']" :src="$util.img(levelList[curIndex]['level_picture'])"/>
-								<image v-else :style="{backgroundColor:levelList[curIndex]['bg_color']}"/>
+								<image v-if="item && item['level_picture']" :src="$util.img(item['level_picture'])"/>
+								<image v-else :style="{backgroundColor:item['bg_color']}"/>
 
 								<view class="info">
-									<view class="level-detail" :style="{color:levelList[curIndex]['level_text_color']}">{{ levelList[curIndex].level_name }}</view>
-									<view class="growr-name" :style="{color:levelList[curIndex]['level_text_color']}">{{ levelList[curIndex].level_name }}可享受消费折扣和</view>
-									<view class="growr-value" :style="{color:levelList[curIndex]['level_text_color']}">会员大礼包等权益</view>
-									<view class="growth-rules font-size-tag" @click="openExplainPopup" v-if="levelList[curIndex].remark != ''">
+									<view class="level-detail" :style="{color:item['level_text_color']}">{{ item.level_name }}</view>
+									<view class="growr-name" :style="{color:item['level_text_color']}">{{ item.level_name }}可享受消费折扣和</view>
+									<view class="growr-value" :style="{color:item['level_text_color']}">会员大礼包等权益</view>
+									<view class="growth-rules font-size-tag" @click="openExplainPopup" v-if="item.remark != ''">
 										<text class="iconfont icon-wenhao font-size-tag"></text>
 									</view>
 								</view>
@@ -93,8 +95,7 @@
 					</view>
 				</view>
 
-				<view class="card-content"
-					v-if="currCard.is_free_shipping || currCard.consume_discount < 100 || currCard.point_feedback > 0">
+				<view class="card-content" v-if="currCard.is_free_shipping || currCard.consume_discount < 100 || currCard.point_feedback > 0">
 					<view class="card-content-head">
 						<view class="line-box">
 							<view class="line right"></view>
diff --git a/pages_tool/member/contact.vue b/pages_tool/member/contact.vue
index 1a2abaf..dee03a2 100644
--- a/pages_tool/member/contact.vue
+++ b/pages_tool/member/contact.vue
@@ -2,7 +2,8 @@
 	<page-meta :page-style="themeColor"></page-meta>
 	<view class="contact">
 		<image :src="$util.img('public/uniapp/member/contact_service.png')" mode="widthFix"></image>
-		<!--<ns-contact><button type="primary">联系客服</button></ns-contact>-->
+		<view class="tips">请点击下方按钮，联系客服</view>
+		<ns-contact><button type="primary">联系客服</button></ns-contact>
 	</view>
 </template>
 
@@ -20,10 +21,18 @@ export default {
 <style lang="scss">
 .contact {
 	width: 80%;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
 	text-align: center;
-	margin: 0 auto;
+	margin: 150rpx auto 0;
 	image {
 		width: 500rpx;
 	}
+	.tips{
+		font-size: 24rpx;
+		color: #999;
+		margin-bottom: 20rpx;
+	}
 }
 </style>
diff --git a/pages_tool/member/coupon.vue b/pages_tool/member/coupon.vue
index b646bc9..a7aed24 100644
--- a/pages_tool/member/coupon.vue
+++ b/pages_tool/member/coupon.vue
@@ -15,7 +15,7 @@
 			</view> -->
 		</view>
 
-		<mescroll-uni ref="mescroll" top="100" @getData="getMemberCounponList" v-if="storeToken">
+		<mescroll-uni ref="mescroll" top="100" @getData="getMemberCouponList" v-if="storeToken">
 			<block slot="list">
 				<view class="coupon-listone">
 					<view class="item" :class="['item',item.state != 1&&'item-disabled']" v-for="(item, index) in list" :key="index" @click="toGoodsList(item)" :style="{ backgroundColor: item.state != 1 ? '#FFF' : 'var(--main-color-shallow)' }">
@@ -42,12 +42,12 @@
 						<view class="item-info">
 							<view class="use_title">
 								<view class="title">{{ item.coupon_name }}</view>
-								<view class="max_price" v-if="item.goods_type == 2 || item.goods_type == 3" :class="{ disabled: item.state == 3 }">指定商品</view>
+								<view class="max_price" :class="{ disabled: item.state == 3 }">{{item.goods_type_name}}</view>
 								<view class="max_price" v-if="item.discount_limit != '0.00'">(最大优惠{{ item.discount_limit }}元)</view>
 								<view class="max_price" :class="{ disabled: item.useState == 2 }">{{ item.use_channel_name }}</view>
-							<!-- 	<view class="max_price  truncate"  v-if="item.use_channel!='online'" :class="{ disabled: item.useState == 2 }">
+								<view class="max_price  truncate"  v-if="item.use_channel!='online'" :class="{ disabled: item.useState == 2 }">
 									{{ item.use_store==='all'?'适用门店：全部门店': '适用门店：'+item.use_store_name}}
-								</view> -->
+								</view>
 							</view>
 							<view class="use_time" v-if="item.end_time">有效期：{{ $util.timeStampTurnTime(item.end_time) }}
 							</view>
@@ -65,7 +65,7 @@
 				</view>
 			</block>
 		</mescroll-uni>
-		<ns-login ref="ns-login"></ns-login>
+		<ns-login ref="login"></ns-login>
 		<loading-cover ref="loadingCover"></loading-cover>
 	</view>
 </template>
@@ -97,7 +97,7 @@
 					}, 2000);
 				}
 			},1000);
-
+			if(data.state) this.state = data.state;
 			if (data.related_id) this.related_id = data.related_id ? data.related_id : 0;
 			this.isIphoneX = this.$util.uniappIsIPhoneX();
 		},
@@ -123,7 +123,7 @@
 				this.types = types;
 				this.$refs.mescroll.refresh(false);
 			},
-			getMemberCounponList(mescroll) {
+			getMemberCouponList(mescroll) {
 				this.showEmpty = false;
 				this.$api.sendRequest({
 					url: '/coupon/api/coupon/memberpage',
diff --git a/pages_tool/member/footprint.vue b/pages_tool/member/footprint.vue
index 3938105..c355f19 100644
--- a/pages_tool/member/footprint.vue
+++ b/pages_tool/member/footprint.vue
@@ -162,11 +162,9 @@ export default {
 		},
 		goodsImg(imgStr) {
 			let imgs = imgStr.split(',');
-			return imgs[0]
-				? this.$util.img(imgs[0], {
-						size: 'mid'
-				  })
-				: this.$util.getDefaultImage().goods;
+			return imgs[0] ? this.$util.img(imgs[0], {
+				size: 'mid'
+			}) : this.$util.getDefaultImage().goods;
 		},
 		imgError(index) {
 			dateList = [];
diff --git a/pages_tool/member/info.vue b/pages_tool/member/info.vue
index 066494d..c5e0fdc 100644
--- a/pages_tool/member/info.vue
+++ b/pages_tool/member/info.vue
@@ -2,88 +2,86 @@
 	<page-meta :page-style="themeColor"></page-meta>
 	<view>
 		<view v-if="indent == 'all' && memberInfo" class="info-wrap">
-			<!-- 头像@click="headImage" -->
-			<view  class="info-list-cell info-item info-list-con" hover-class="cell-hover">
-				<text class="cell-tit">头像</text>
+			<!-- 头像 -->
+			<view @click="headImage" class="info-list-cell info-item info-list-con" hover-class="cell-hover">
+				<text class="cell-tit">{{ $lang('headImg') }}</text>
 				<view class="info-list-head cell-tip">
 					<image :src="memberInfo.headimg ? $util.img(memberInfo.headimg) : $util.getDefaultImage().head" @error="memberInfo.headimg = $util.getDefaultImage().head" mode="aspectFill" />
 				</view>
-				<text style="margin-right: 20rpx;"></text>
+				<text class="cell-more"></text>
 			</view>
 			<!-- 账号 -->
-		<!-- 	<view class="info-list-cell info-list-con" hover-class="cell-hover" v-if="memberInfo.is_edit_username == 1" @click="modifyInfo('username')">
-				<text class="cell-tit">账号</text>
+			<view class="info-list-cell info-list-con" hover-class="cell-hover" v-if="memberInfo.is_edit_username == 1" @click="modifyInfo('username')">
+				<text class="cell-tit">{{ $lang('account') }}</text>
 				<text class="cell-tip">{{ memberInfoformData.number }}</text>
 				<text class="cell-more"></text>
-			</view> -->
+			</view>
 			<!-- 账号 -->
-		<!-- 	<view class="info-list-cell info-list-con" hover-class="cell-hover" v-else>
+			<view class="info-list-cell info-list-con" hover-class="cell-hover" v-else>
 				<text class="cell-tit">{{ $lang('account') }}</text>
 				<text class="cell-tip cell-tip1">{{ memberInfoformData.number }}</text>
-			</view> -->
+			</view>
 			<!-- 昵称 -->
 			<view class="info-list-cell info-list-con" hover-class="cell-hover" @click="modifyInfo('name')">
-				<text class="cell-tit">昵称</text>
+				<text class="cell-tit">{{ $lang('nickname') }}</text>
 				<text class="cell-tip">{{ memberInfoformData.nickName }}</text>
 				<text class="cell-more"></text>
 			</view>
 			<!-- 真实姓名 -->
 			<view class="info-list-cell info-list-con" hover-class="cell-hover" @click="modifyInfo('realName')">
-				<text class="cell-tit">姓名</text>
+				<text class="cell-tit">{{ $lang('realName') }}</text>
 				<text class="cell-tip">{{ memberInfoformData.realName }}</text>
 				<text class="cell-more"></text>
 			</view>
 			<!-- 性别 -->
 			<view class="info-list-cell info-list-con" hover-class="cell-hover" @click="modifyInfo('sex')">
-				<text class="cell-tit">性别</text>
+				<text class="cell-tit">{{ $lang('sex') }}</text>
 				<text class="cell-tip">{{ memberInfoformData.sex }}</text>
 				<text class="cell-more"></text>
 			</view>
 			<!-- 生日 -->
 			<view class="info-list-cell info-list-con" hover-class="cell-hover" @click="modifyInfo('birthday')">
-				<text class="cell-tit">生日</text>
+				<text class="cell-tit">{{ $lang('birthday') }}</text>
 				<text class="cell-tip">{{ memberInfoformData.birthday }}</text>
 				<text class="cell-more"></text>
 			</view>
 			<!-- 手机号 -->
 			<view class="info-list-cell info-list-con" @click="modifyInfo('mobile')">
-				<text class="cell-tit">手机号</text>
-				<text v-if="memberInfoformData.user_tel == ''" class="cell-tip">密码</text>
+				<text class="cell-tit">{{ $lang('mobilePhone') }}</text>
+				<text v-if="memberInfoformData.user_tel == ''" class="cell-tip">{{ $lang('bindMobile') }}</text>
 				<text v-else class="cell-tip">{{ memberInfoformData.mobile }}</text>
 				<text class="cell-more"></text>
 			</view>
 			<!-- 密码 -->
-		<!-- 	<view class="info-list-cell info-list-con" hover-class="cell-hover" @click="modifyInfo('password')">
-				<text class="cell-tit">密码</text>
+			<view class="info-list-cell info-list-con" hover-class="cell-hover" @click="modifyInfo('password')">
+				<text class="cell-tit">{{ $lang('password') }}</text>
+				<!-- <text class="cell-tip">{{ memberInfo.password ? $lang('modify') : $lang('noset') }}</text> -->
 				<text class="cell-more"></text>
-			</view> -->
+			</view>
 			<!-- 支付密码 -->
 			<!-- <view class="info-list-cell info-list-con" hover-class="cell-hover" @click="modifyInfo('paypassword')">
 				<text class="cell-tit">{{ $lang('paypassword') }}</text>
 				<text class="cell-more"></text>
 			</view> -->
 
-		<!-- 	<view class="info-list-cell info-list-con" hover-class="cell-hover" @click="modifyInfo('address')">
+			<view class="info-list-cell info-list-con" hover-class="cell-hover" @click="modifyInfo('address')">
 				<text class="cell-tit">所在地址</text>
 				<text class="cell-tip" v-if="memberInfo.full_address">{{ memberInfo.full_address }}
 					{{ memberInfo.address }}</text>
 				<text class="cell-tip" v-else>去设置</text>
 				<text class="cell-more"></text>
-			</view> -->
+			</view>
 
 			<!-- 注销 -->
-			<view class="info-list-cell info-list-con" hover-class="cell-hover" @click="cancellation()">
-				<text class="cell-tit">注销账号</text>
+			<view class="info-list-cell info-list-con" hover-class="cell-hover" @click="modifyInfo('cancellation')" v-if="addonIsExist.membercancel && memberConfig.is_enable == 1">
+				<text class="cell-tit">{{ $lang('cancellation') }}</text>
+				<!-- <text class="cell-tip">{{ $lang('modify') }}</text> -->
 				<text class="cell-more"></text>
 			</view>
-		<!-- 	<view class="info-list-cell info-list-con" hover-class="cell-hover" @click="cancellation()" v-if="addonIsExist.membercancel && memberConfig.is_enable == 1">
-				<text class="cell-tit">注销账号</text>
-				<text class="cell-more"></text>
-			</view> -->
-	<!-- 		<view class="info-list-cell info-list-con" hover-class="cell-hover">
+			<view class="info-list-cell info-list-con" hover-class="cell-hover">
 				<text class="cell-tit">版本号</text>
 				<text class="cell-tip cell-tip1">{{ version }}</text>
-			</view> -->
+			</view>
 
 			<!-- 语言 -->
 			<!-- <view class="info-list-cell info-item info-list-con" hover-class="cell-hover" @click="modifyInfo('language')">
@@ -99,7 +97,7 @@
 
 			<!-- #endif -->
 			<view class="save-item" @click="logout">
-				<button type="primary">退出登录</button>
+				<button type="primary">{{ $lang('logout') }}</button>
 			</view>
 		</view>
 
@@ -294,6 +292,7 @@
 
 		button {
 			font-size: 30rpx;
+			border-radius: 90rpx;
 		}
 	}
 
diff --git a/pages_tool/member/info_edit.vue b/pages_tool/member/info_edit.vue
index bf3de74..d8d7de9 100644
--- a/pages_tool/member/info_edit.vue
+++ b/pages_tool/member/info_edit.vue
@@ -5,38 +5,38 @@
 			<!-- 修改用户名 -->
 			<view v-if="indent == 'username'" class="edit-info">
 				<view class="edit-info-box">
-					<text class="info-name">用户名</text>
-					<input class="uni-input info-content input-len" type="text" maxlength="30" placeholder="请输入" v-model="formData.username" />
+					<text class="info-name">{{ $lang('username') }}</text>
+					<input class="uni-input info-content input-len" type="text" maxlength="30" :placeholder="$lang('usernamePlaceholder')" v-model="formData.username" />
 				</view>
 				<view class="color-tip font-size-goods-tag set-pass-tips">用户名仅可修改一次，请谨慎设置</view>
 				<view class="save-item" @click="save('username')">
-					<button type="primary">保存</button>
+					<button type="primary">{{ $lang('save') }}</button>
 				</view>
 			</view>
 			<!-- 修改昵称 -->
 			<view v-if="indent == 'name'" class="edit-info">
 				<view class="edit-info-box">
-					<text class="info-name">昵称</text>
-					<input class="uni-input info-content input-len" type="text" maxlength="30" placeholder="请输入" v-model="formData.nickName" />
+					<text class="info-name">{{ $lang('nickname') }}</text>
+					<input class="uni-input info-content input-len" type="text" maxlength="30" :placeholder="$lang('nickPlaceholder')" v-model="formData.nickName" />
 				</view>
 				<view class="save-item" @click="save('name')">
-					<button type="primary">保存</button>
+					<button type="primary">{{ $lang('save') }}</button>
 				</view>
 			</view>
 			<!-- 修改真实姓名 -->
 			<view v-if="indent == 'realName'" class="edit-info">
 				<view class="edit-info-box">
-					<text class="info-name">姓名</text>
-					<input class="uni-input info-content input-len" type="text" maxlength="30" placeholder="请输入" v-model="formData.realName" />
+					<text class="info-name">{{ $lang('realName') }}</text>
+					<input class="uni-input info-content input-len" type="text" maxlength="30" :placeholder="$lang('pleaseRealName')" v-model="formData.realName" />
 				</view>
 				<view class="save-item" @click="save('realName')">
-					<button type="primary">保存</button>
+					<button type="primary">{{ $lang('save') }}</button>
 				</view>
 			</view>
 			<!-- 修改性别 -->
 			<view v-if="indent == 'sex'" class="edit-info">
 				<view class="edit-info-box">
-					<text class="info-name">性别</text>
+					<text class="info-name">{{ $lang('sex') }}</text>
 					<radio-group @change="radioChange" class="edit-sex-list">
 						<label class="uni-list-cell uni-list-cell-pd" v-for="(item, index) in items" :key="item.value">
 							<view>
@@ -47,19 +47,19 @@
 					</radio-group>
 				</view>
 				<view class="save-item" @click="save('sex')">
-					<button type="primary">保存</button>
+					<button type="primary">{{ $lang('save') }}</button>
 				</view>
 			</view>
 			<!-- 修改生日 -->
 			<view v-if="indent == 'birthday'" class="edit-info edit-birthday-list">
 				<view class="edit-info-box">
-					<text class="info-name">生日</text>
+					<text class="info-name">{{ $lang('birthday') }}</text>
 					<picker mode="date" :value="formData.birthday" :start="startDate" :end="endDate" @change="bindDateChange">
 						<view class="uni-input">{{ formData.birthday ? formData.birthday : '请选择生日' }}</view>
 					</picker>
 				</view>
 				<view class="save-item" @click="save('birthday')">
-					<button type="primary">保存</button>
+					<button type="primary">{{ $lang('save') }}</button>
 				</view>
 			</view>
 			<!-- 修改密码 -->
@@ -75,55 +75,55 @@
 				</block>
 				<block v-else>
 					<view class="edit-info-box" v-if="memberInfo.password">
-						<text class="info-name">原密码</text>
-						<input class="uni-input info-content input-len" type="password" maxlength="30" placeholder="请输入" v-model="formData.currentPassword" />
+						<text class="info-name">{{ $lang('nowPassword') }}</text>
+						<input class="uni-input info-content input-len" type="password" maxlength="30" :placeholder="$lang('nowPassword')" v-model="formData.currentPassword" />
 					</view>
 					<block v-else>
 						<view class="edit-info-box">
-							<text class="info-name">新密码</text>
-							<input class="uni-input info-content" type="number" maxlength="4" placeholder="请输入" v-model="formData.mobileVercode" />
+							<text class="info-name">{{ $lang('confirmCode') }}</text>
+							<input class="uni-input info-content" type="number" maxlength="4" :placeholder="$lang('confirmCode')" v-model="formData.mobileVercode" />
 							<image :src="captcha.img" class="captcha" @click="getCaptcha"></image>
 						</view>
 						<view class="edit-info-box">
-							<text class="info-name">再次输入</text>
-							<input class="uni-input info-content" type="number" maxlength="6" placeholder="请输入" v-model="formData.mobileDynacode" />
+							<text class="info-name">{{ $lang('animateCode') }}</text>
+							<input class="uni-input info-content" type="number" maxlength="6" :placeholder="$lang('animateCode')" v-model="formData.mobileDynacode" />
 							<button type="primary" class="dynacode" @click="passwordMoblieCode()">{{ formData.mobileCodeText }}</button>
 						</view>
 						<view class="color-tip font-size-goods-tag set-pass-tips">
 							点击“获取动态码”，将会向您已绑定的手机号{{ memberInfoformData.mobile | mobile }}发送验证码</view>
 					</block>
 					<view class="edit-info-box">
-						<text class="info-name">新密码</text>
-						<input class="uni-input info-content input-len" type="password" maxlength="30" placeholder="请输入" v-model="formData.newPassword" />
+						<text class="info-name">{{ $lang('newPassword') }}</text>
+						<input class="uni-input info-content input-len" type="password" maxlength="30" :placeholder="$lang('newPassword')" v-model="formData.newPassword" />
 					</view>
 					<view class="edit-info-box">
-						<text class="info-name">再次输入</text>
-						<input class="uni-input info-content input-len" type="password" maxlength="30" placeholder="请输入" v-model="formData.confirmPassword" />
+						<text class="info-name">{{ $lang('confirmPassword') }}</text>
+						<input class="uni-input info-content input-len" type="password" maxlength="30" :placeholder="$lang('confirmPassword')" v-model="formData.confirmPassword" />
 					</view>
 
 					<view class="save-item" @click="save('password')">
-						<button type="primary">保存</button>
+						<button type="primary">{{ $lang('save') }}</button>
 					</view>
 				</block>
 			</view>
 			<!-- 修改手机号 -->
 			<view v-if="indent == 'mobile'" class="edit-info">
 				<view class="edit-info-box">
-					<text class="info-name">手机号</text>
-					<input class="uni-input info-content" type="number" maxlength="11" placeholder="请输入" v-model="formData.mobile" />
+					<text class="info-name">{{ $lang('phoneNumber') }}</text>
+					<input class="uni-input info-content" type="number" maxlength="11" :placeholder="$lang('phoneNumber')" v-model="formData.mobile" />
 				</view>
 				<view class="edit-info-box">
-					<text class="info-name">验证码</text>
-					<input class="uni-input info-content" type="number" maxlength="4" placeholder="请输入" v-model="formData.mobileVercode" />
+					<text class="info-name">{{ $lang('confirmCode') }}</text>
+					<input class="uni-input info-content" type="number" maxlength="4" :placeholder="$lang('confirmCode')" v-model="formData.mobileVercode" />
 					<image :src="captcha.img" class="captcha" @click="getCaptcha"></image>
 				</view>
 				<view class="edit-info-box">
-					<text class="info-name">短信验证码</text>
-					<input class="uni-input info-content" type="number" maxlength="6" placeholder="请输入" v-model="formData.mobileDynacode" />
-					<button type="primary" class="dynacode" @click="bindMoblieCode()">{{ formData.mobileCodeText }}</button>
+					<text class="info-name">{{ $lang('animateCode') }}</text>
+					<input class="uni-input info-content" type="number" maxlength="6" :placeholder="$lang('animateCode')" v-model="formData.mobileDynacode" />
+					<button type="primary" class="dynacode" @click="bindMobileCode()">{{ formData.mobileCodeText }}</button>
 				</view>
 				<view class="save-item" @click="save('mobile')">
-					<button type="primary">保存</button>
+					<button type="primary">{{ $lang('save') }}</button>
 				</view>
 			</view>
 			<!-- 绑定手机号 -->
@@ -149,7 +149,7 @@
 					<input class="uni-input info-content" type="text" placeholder="详细地址" v-model="formData.address" />
 				</view>
 				<view class="save-item" @click="save('address')">
-					<button type="primary">保存</button>
+					<button type="primary">{{ $lang('save') }}</button>
 				</view>
 			</view>
 		</template>
diff --git a/pages_tool/member/invite_friends.vue b/pages_tool/member/invite_friends.vue
index 04ba327..9f41606 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">
+							<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>
@@ -37,8 +37,7 @@
 										<block v-if="item.balance > 0">{{ item.balance }}元现金红包</block>
 										<block v-if="(item.point > 0 || item.coupon_num) && item.balance > 0">+</block>
 										<block v-if="item.point > 0">{{ parseInt(item.point) }}积分</block>
-										<block v-if="item.point > 0 && item.balance > 0 && item.coupon_num > 0">+
-										</block>
+										<block v-if="item.point > 0 && item.balance > 0 && item.coupon_num > 0">+</block>
 										<block v-if="item.coupon_num > 0">{{ item.coupon_num }}张优惠券</block>
 									</view>
 								</view>
@@ -98,24 +97,24 @@
 					<view class="desc">
 						<view class="title_desc color-tip">分享给好友，让好友通过你的分享链接进入并注册登录，可获得以下奖励：</view>
 						<view class="desc_list">
-							<view class="" v-if="$util.inArray('balance', info.type) != -1">
+							<view v-if="$util.inArray('balance', info.type) != -1">
 								<text>●</text>
 								可得{{ info.balance }}元红包奖励
 							</view>
-							<view class="" v-if="$util.inArray('point', info.type) != -1">
+							<view v-if="$util.inArray('point', info.type) != -1">
 								<text>●</text>
 								可得{{ info.point }}积分
 							</view>
-							<view class="" v-if="$util.inArray('coupon', info.type) != -1">
+							<view v-if="$util.inArray('coupon', info.type) != -1">
 								<text>●</text>
 								可得{{ info.coupon.split(',').length }}张优惠券
 							</view>
 
-							<view class="" v-if="info.max_fetch == 0">
+							<view v-if="info.max_fetch == 0">
 								<text>●</text>
 								可得奖励不受限制
 							</view>
-							<view class="" v-else>
+							<view v-else>
 								<text>●</text>
 								奖励上限为{{ info.max_fetch }}人
 							</view>
diff --git a/pages_tool/member/level.vue b/pages_tool/member/level.vue
index 899fe0d..697758a 100644
--- a/pages_tool/member/level.vue
+++ b/pages_tool/member/level.vue
@@ -23,25 +23,28 @@
 				:interval="swiperConfig.interval" :duration="swiperConfig.duration" :circular="swiperConfig.circular"
 				:previous-margin="swiperConfig.previousMargin" :next-margin="swiperConfig.nextMargin"
 				@change="swiperChange" @animationfinish="animationfinish" :current="curIndex">
-				<swiper-item :class="levelList.length == 1 ? 'image-container-box' : ''" v-for="(item, i) in levelList"
-					:key="i">
+				<swiper-item :class="levelList.length == 1 ? 'image-container-box' : ''" v-for="(item, i) in levelList" :key="i">
 					<view class="image-container" :class="[
 							curIndex === 0
-								? i === listLen - 1
-									? 'item-left'
-									: i === 1
+								? i === 1
 									? 'item-right'
+									: i === listLen - 1
+									? 'item-left'
 									: 'item-center'
 								: curIndex === listLen - 1
-								? i === 0
+									? i === curIndex - 1
+									? 'item-left'
+									:  i === curIndex + 1
+									? 'item-right'
+									: i === 0
 									? 'item-right'
 									: i === listLen - 2
 									? 'item-left'
 									: 'item-center'
 								: i === curIndex - 1
-								? 'item-left'
-								: i === curIndex + 1
-								? 'item-right'
+									? 'item-left'
+									: i === curIndex + 1
+									? 'item-right'
 								: 'item-center'
 						]">
 						<view class="slide-image" style="background-size: 100% 100%;background-repeat:no-repeat" :style="{
@@ -49,34 +52,35 @@
 								transitionDuration: '.3s',
 								transitionTimingFunction: 'ease'
 							}">
-							<image v-if="levelList[curIndex]['level_picture']" :src="$util.img(levelList[curIndex]['level_picture'])"/>
-							<image v-else :style="{backgroundColor:levelList[curIndex]['bg_color']}"/>
+							<image v-if="item['level_picture']" :src="$util.img(item['level_picture'])"/>
+							<image v-else :style="{backgroundColor:item['bg_color']}"/>
 
 							<view class="info">
-								<view class="level-detail" :style="{color:levelList[curIndex]['level_text_color']}">
-									{{ levelList[curIndex].level_name }}
-									<text class="isnow " :style="{color:levelList[curIndex]['level_text_color']}" v-if="levelId == item.level_id">当前等级</text>
+								<view class="level-detail" :style="{color:item['level_text_color']}">
+									{{ item.level_name }}
+									<text class="isnow " :style="{color:item['level_text_color']}" v-if="levelId == item.level_id">当前等级</text>
 								</view>
-								<view class="growr-name" :style="{color:levelList[curIndex]['level_text_color']}">当前成长值</view>
-								<view class="growr-value" :style="{color:levelList[curIndex]['level_text_color']}">{{ growth }}</view>
+								<view class="growr-name" :style="{color:item['level_text_color']}">当前成长值</view>
+								<view class="growr-value" :style="{color:item['level_text_color']}">{{ growth }}</view>
 								<block v-if="levelId == item.level_id">
-									<block v-if="levelList[curIndex + 1] != undefined">
-										<ns-progress :progress="levelList[curIndex + 1].rate"></ns-progress>
-										<view class="residue-growr-value"
-											:style="{color:levelList[curIndex]['level_text_color']}">
-											再获得{{ levelList[curIndex + 1].needGrowth > 0 ? levelList[curIndex + 1].needGrowth : 0 }}成长值成为{{
+									<block v-if="levelList[i + 1] != undefined">
+										<ns-progress :progress="levelList[i + 1].rate"></ns-progress>
+										<view class="residue-growr-value" :style="{color:item['level_text_color']}">
+											再获得{{ levelList[i + 1].needGrowth > 0 ? levelList[i + 1].needGrowth : 0 }}成长值成为下一等级
+											<!-- {{
 												levelList[curIndex + 1].level_name
-											}}
+											}} -->
 										</view>
 									</block>
 									<block v-else>
-										<view class="residue-growr-value" :style="{color:levelList[curIndex]['level_text_color']}">您现在已经是最高等级</view>
+										<view class="residue-growr-value" :style="{color:item['level_text_color']}">您现在已经是最高等级</view>
 									</block>
 								</block>
 								<block v-else>
-									<ns-progress :progress="levelList[curIndex].rate" v-if="levelList[curIndex].needGrowth > 0"></ns-progress>
-									<view class="residue-growr-value" v-if="levelList[curIndex].needGrowth > 0" :style="{color:levelList[curIndex]['level_text_color']}">
-										再获得{{ levelList[curIndex].needGrowth }}成长值成为{{ levelList[curIndex].level_name }}
+									<ns-progress :progress="item.rate" v-if="item.needGrowth > 0"></ns-progress>
+									<view class="residue-growr-value" v-if="item.needGrowth > 0" :style="{color:item['level_text_color']}">
+										再获得{{ item.needGrowth }}成长值成为当前等级
+										<!-- {{ levelList[curIndex].level_name }} -->
 									</view>
 								</block>
 							</view>
@@ -97,7 +101,7 @@
 					<image :src="$util.img('public/uniapp/level/consumption_discount.png')" mode="aspectFit"></image>
 					<view class="equity-content" :class="{ active: levelList[curIndex].point_feedback > 0 }">
 						<text>享受消费折扣服务</text>
-						<text class="equity-desc" v-if="levelList[curIndex].is_default == 1">不享受任何消费折扣和其他权益</text>
+						<text class="equity-desc" v-if="levelList[curIndex].consume_discount == 10">不享受任何消费折扣</text>
 						<text class="equity-desc" v-else>提供{{ levelList[curIndex].consume_discount }}折消费折扣</text>
 					</view>
 				</view>
@@ -220,7 +224,6 @@
 				}
 			},
 			nextIndex() {
-				let num = 0;
 				if (this.curIndex == this.levelList.length - 1) {
 					return this.curIndex;
 				} else {
@@ -287,8 +290,7 @@
 							this.levelList = res.data;
 							for (var i = 0; i < this.levelList.length; i++) {
 								if (this.levelList[i].send_coupon) {
-									this.levelList[i].coupon_length = this.levelList[i].send_coupon.split(',')
-										.length;
+									this.levelList[i].coupon_length = this.levelList[i].send_coupon.split(',').length;
 								}
 							}
 							this.levelId = this.memberInfo.member_level;
@@ -306,8 +308,7 @@
 									v.needGrowth = 0;
 									v.rate = 100;
 								} else {
-									v.needGrowth = (parseFloat(v.growth) - parseFloat(this.growth))
-										.toFixed(2);
+									v.needGrowth = (parseFloat(v.growth) - parseFloat(this.growth)).toFixed(2);
 									v.rate = (this.growth / v.growth).toFixed(2) * 100;
 								}
 							});
diff --git a/pages_tool/member/modify_face.vue b/pages_tool/member/modify_face.vue
index 7a2f258..276970d 100644
--- a/pages_tool/member/modify_face.vue
+++ b/pages_tool/member/modify_face.vue
@@ -44,12 +44,9 @@
 		},
 		onShow() {
 			if (!this.storeToken) {
-				this.$util.redirectTo(
-					'/pages_tool/login/login', {
-						back: '/pages_tool/member/modify_face'
-					},
-					'redirectTo'
-				);
+				this.$util.redirectTo('/pages_tool/login/login', {
+					back: '/pages_tool/member/modify_face'
+				}, 'redirectTo');
 				return;
 			}
 
@@ -75,7 +72,8 @@
 					data: {
 						app_type: app_type,
 						app_type_name: app_type_name,
-						images: rsp.base64
+						images: rsp.base64,
+						token: this.$store.state.token || '',
 					},
 					header: {
 						'content-type': 'application/x-www-form-urlencoded;application/json'
diff --git a/pages_tool/member/pay_password.vue b/pages_tool/member/pay_password.vue
index 53989b9..b7f524b 100644
--- a/pages_tool/member/pay_password.vue
+++ b/pages_tool/member/pay_password.vue
@@ -136,8 +136,7 @@
 											title: '修改成功'
 										});
 										setTimeout(() => {
-											if (this.back) this.$util.redirectTo(this.back, {},
-												'redirectTo');
+											if (this.back) this.$util.redirectTo(this.back, {}, 'redirectTo');
 											else this.$util.redirectTo('/pages/member/index');
 										}, 2000);
 									} else {
@@ -164,7 +163,6 @@
 				this.step = 1;
 				this.password = '';
 				this.repassword = '';
-				this.oldpassword = '';
 				this.isSub = false;
 				this.$refs.input.clear();
 			},
diff --git a/pages_tool/member/point.vue b/pages_tool/member/point.vue
index f226aab..9a41ce5 100644
--- a/pages_tool/member/point.vue
+++ b/pages_tool/member/point.vue
@@ -2,16 +2,10 @@
 	<page-meta :page-style="themeColor"></page-meta>
 	<view class="point">
 		<!-- #ifdef MP-WEIXIN -->
-		<view class="custom-navbar" :style="{
-				'padding-top': menuButtonBounding.top + 'px',
-				'height': menuButtonBounding.height + 'px'
-			}"
-		>
+		<view class="custom-navbar" :style="{ 'padding-top': menuButtonBounding.top + 'px', 'height': menuButtonBounding.height + 'px' }">
 			<view class="navbar-wrap">
 				<text class="iconfont icon-back_light back" @click="$util.redirectTo('/pages/member/index')"></text>
-				<view class="navbar-title">
-					我的积分
-				</view>
+				<view class="navbar-title">我的积分</view>
 			</view>
 		</view>
 		<!-- #endif -->
@@ -49,7 +43,7 @@
 				<text class="title">积分商城</text>
 			</view>
 		</view>
-<!-- 
+
 		<view class="task-wrap">
 			<view class="title">做任务赚积分</view>
 			<view class="task-item" @click="toSign">
@@ -68,7 +62,7 @@
 				</view>
 				<view class="btn">去下单</view>
 			</view>
-		</view> -->
+		</view>
 
 		<ns-login ref="login"></ns-login>
 		<loading-cover ref="loadingCover"></loading-cover>
@@ -124,19 +118,6 @@ export default {
 					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
 				}
 			});
-		},
-		/**
-		 * 获取充值提现配置
-		 */
-		getMemberrechargeConfig() {
-			this.$api.sendRequest({
-				url: '/memberrecharge/api/memberrecharge/config',
-				success: res => {
-					if (res.code >= 0 && res.data) {
-						this.memberrechargeConfig = res.data;
-					}
-				}
-			});
 		}
 	},
 	onBackPress(options) {
diff --git a/pages_tool/member/point_detail.vue b/pages_tool/member/point_detail.vue
index fd52a39..f952ba2 100644
--- a/pages_tool/member/point_detail.vue
+++ b/pages_tool/member/point_detail.vue
@@ -1,11 +1,11 @@
 <template>
 	<page-meta :page-style="themeColor"></page-meta>
 	<view>
-	<!-- 	<view class="tab color-bg">
+		<view class="tab color-bg">
 			<view class="tab-left">
-				<picker mode="date" :value="searchType.date" @change="bindDateChange" fields="month">
+				<picker :range="monthData" :value="monthIndex" @change="bindDateChange" >
 					<view class="uni-input">
-						{{ date }}
+						{{ monthData[monthIndex] }}
 						<text class="iconfont icon-iconangledown"></text>
 					</view>
 				</picker>
@@ -16,7 +16,7 @@
 					<text class="iconfont icon-iconangledown"></text>
 				</picker>
 			</view>
-		</view> -->
+		</view>
 
 		<mescroll-uni @getData="getData" class="member-point" ref="mescroll">
 			<view slot="list">
@@ -48,15 +48,11 @@
 <script>
 export default {
 	data() {
-		const currentDate = this.getDate({
-			format: true
-		});
 		return {
 			memberAccount: {
 				point: 0
 			},
 			dataList: [],
-			date: currentDate,
 			searchType: {
 				from_type: 0,
 				date: ''
@@ -68,47 +64,39 @@ export default {
 				}
 			], //积分类型
 			pointIndex: 0,
-			related_id: 0
+			related_id: 0,
+			monthData:[],
+			monthIndex:0,
 		};
 	},
 	onShow() {
 		if (!this.storeToken) {
-			this.$util.redirectTo(
-				'/pages_tool/login/login',
-				{
-					back: '/pages_tool/member/point'
-				},
-				'redirectTo'
-			);
+			this.$util.redirectTo('/pages_tool/login/login', {
+				back: '/pages_tool/member/point'
+			}, 'redirectTo');
 		}
 	},
 	onLoad(option) {
 		if (option.related_id) this.related_id = option.related_id ? option.related_id : 0;
 		if (option.from_type) this.searchType.from_type = option.from_type;
 		this.getPointType();
+		this.getMonthData();
 	},
 	methods: {
 		bindDateChange: function(e) {
-			var temp = e.target.value;
-			var tempArr = temp.split('-');
-			this.date = tempArr[0] + '年' + tempArr[1] + '月';
-			this.searchType.date = e.target.value;
+			var index = e.target.value;
+			this.monthIndex = index;
+			this.searchType.date = this.monthData[index];
 			this.$refs.mescroll.refresh();
 		},
-		getDate(type) {
-			const date = new Date();
-			let year = date.getFullYear();
-			let month = date.getMonth() + 1;
-			let day = date.getDate();
-
-			if (type === 'start') {
-				year = year - 60;
-			} else if (type === 'end') {
-				year = year + 2;
-			}
-			month = month > 9 ? month : '0' + month;
-			day = day > 9 ? day : '0' + day;
-			return `${year}年${month}月`;
+		getMonthData(){
+			this.$api.sendRequest({
+				url: '/api/memberaccount/monthData',
+				success: res => {
+					this.monthData = res.data;
+					this.searchType.date = res.data[0];
+				}
+			});
 		},
 		bindPickerChange(e) {
 			this.pointIndex = e.detail.value;
@@ -148,22 +136,9 @@ export default {
 						if (res.code >= 0) {
 							var data = res.data;
 							if (data.type == 1 && data.relate_order_id) {
-								switch (data.delivery_type) {
-									case 'store':
-										this.$util.redirectTo('/pages/order/detail_pickup', {
-											order_id: data.relate_order_id
-										});
-										break;
-									case 'local':
-										this.$util.redirectTo('/pages/order/detail_local_delivery', {
-											order_id: data.relate_order_id
-										});
-										break;
-									default:
-										this.$util.redirectTo('/pages/order/detail', {
-											order_id: data.relate_order_id
-										});
-								}
+								this.$util.redirectTo('/pages/order/detail', {
+									order_id: data.relate_order_id
+								});
 							} else {
 								this.$util.redirectTo('/pages/order/detail_point', {
 									order_id: data.order_id
@@ -276,7 +251,7 @@ export default {
 	background: #fff;
 	position: relative;
 	z-index: 9;
-	padding-top: 20rpx;
+	padding-top: 80rpx;
 
 	.head {
 		display: flex;
diff --git a/pages_tool/member/public/css/balance.scss b/pages_tool/member/public/css/balance.scss
index 09e4fd5..d919ec1 100644
--- a/pages_tool/member/public/css/balance.scss
+++ b/pages_tool/member/public/css/balance.scss
@@ -39,23 +39,21 @@
 }
 
 .head-wrap {
-	// width: 100vw;
+	width: 100vw;
 	background-size: 100%;
-	padding: 32rpx 28rpx; 
+	padding: 60rpx 68rpx 140rpx 68rpx; 
 	box-sizing: border-box;
-	// border-radius: 0 0 100% 100%/0 0 70rpx 70rpx;
+	border-radius: 0 0 100% 100%/0 0 70rpx 70rpx;
 	overflow: hidden;
-	margin: 24rpx 28rpx;
-	border-radius: 24rpx;
+	
 	// #ifdef MP-WEIXIN
 	padding-top: 160rpx;
 	// #endif
-	height: 352rpx;
+	
 	.title {
 		text-align: left;
 		line-height: 1;
 		color: #F6F6F6;
-		margin-bottom: 24rpx;
 	}
 	
 	.balance {
@@ -63,12 +61,7 @@
 		text-align: left;
 		line-height: 1;
 		margin-bottom: 20rpx;
-		// font-size: 64rpx;
-		font-size: 80rpx;
-		line-height: 112rpx;
-		font-weight: 500 !important;
-
-		font-family: PingFang SC;
+		font-size: 64rpx;
 	}
 	
 	.flex-box {
@@ -94,65 +87,19 @@
 			}
 		}
 	}
-	.btns{
-	    display: -webkit-box;
-	    display: -webkit-flex;
-	    display: flex;
-	    -webkit-flex-wrap: nowrap;
-	    flex-wrap: nowrap;
-	    position: relative;
-	    gap: 22rpx;
-	    margin-top: 32rpx;
-		.btn{
-		    -webkit-box-flex: 1;
-		    -webkit-flex: 1;
-		    flex: 1;
-		    display: -webkit-box;
-		    display: -webkit-flex;
-		    display: flex;
-		    -webkit-box-pack: center;
-		    -webkit-justify-content: center;
-		    justify-content: center;
-		    -webkit-box-align: center;
-		    -webkit-align-items: center;
-		    align-items: center;
-		    height: 80rpx;
-		    box-sizing: border-box;
-		    font-size: 32rpx;
-		    -webkit-flex-shrink: 0;
-		    flex-shrink: 0;
-		    text-align: center;
-		    font-family: PingFang SC;
-		    border-radius: 180rpx;
-		    background: transparent;
-		    color: #fff;
-		    font-style: normal;
-		    font-weight: 500;
-		    line-height: normal;
-		    border: 2rpx solid #fff;
-			:nth-child(2) {
-			    background: #fff;
-			    color: #4285f8;
-			}
-		}
-		.recharge{
-		    background: #fff;
-		    color: #4285f8;
-		}
-	}
 }
 
 .menu-wrap {
 	border-radius: 20rpx;
 	margin: 0 24rpx;
-	padding: 0 24rpx;
+	padding: 0 30rpx;
 	background: #fff;
-	// transform: translateY(-90rpx);
+	transform: translateY(-90rpx);
 	
 	.menu-item {
 		display: flex;
 		align-items: center;
-		padding: 4rpx 0;
+		padding: 12rpx 0;
 		
 		.icon {
 			height: 80rpx;
diff --git a/pages_tool/member/public/js/collection.js b/pages_tool/member/public/js/collection.js
index 9f9189b..e6d9820 100644
--- a/pages_tool/member/public/js/collection.js
+++ b/pages_tool/member/public/js/collection.js
@@ -15,10 +15,9 @@ export default {
 		//请求数据
 		getData(mescroll) {
 			this.isShowEmpty = false;
-			let url = "/api/goodscollect/page"
 			let array = []
 			this.$api.sendRequest({
-				url: url,
+				url: '/api/goodscollect/page',
 				data: {
 					page_size: mescroll.size,
 					page: mescroll.num,
diff --git a/pages_tool/member/public/js/info.js b/pages_tool/member/public/js/info.js
index 94d7fbc..d0cdcb9 100644
--- a/pages_tool/member/public/js/info.js
+++ b/pages_tool/member/public/js/info.js
@@ -184,22 +184,20 @@ export default {
 			this.memberInfoformData.nickName = this.memberInfo.nickname; //昵称
 			this.memberInfoformData.realName = this.memberInfo.realname ? this.memberInfo.realname : '请输入真实姓名'; //真实姓名
 			this.memberInfoformData.sex = this.memberInfo.sex == 0 ? '未知' : this.memberInfo.sex == 1 ? '男' : '女'; //性别
-			this.memberInfoformData.birthday = this.memberInfo.birthday ? this.$util.timeStampTurnTime(this.memberInfo.birthday, 'YYYY-MM-DD') : '请选择生日'; //生日
+			this.memberInfoformData.birthday = this.memberInfo.birthday ? this.$util.timeStampTurnTime(this.memberInfo.birthday, 'Y-m-d') : '请选择生日'; //生日
 			this.memberInfoformData.mobile = this.memberInfo.mobile; //手机号
 
 			this.formData.username = this.memberInfo.username; //用户名
 			this.formData.nickName = this.memberInfo.nickname; //昵称
 			this.formData.realName = this.memberInfo.realname; //真实姓名
 			this.formData.sex = this.memberInfo.sex; //性别
-			this.formData.birthday = this.memberInfo.birthday ? this.$util.timeStampTurnTime(this.memberInfo.birthday, 'YYYY-MM-DD') : ''; //生日
+			this.formData.birthday = this.memberInfo.birthday ? this.$util.timeStampTurnTime(this.memberInfo.birthday, 'Y-m-d') : ''; //生日
 			this.formData.provinceId = this.memberInfo.province_id;
 			this.formData.cityId = this.memberInfo.city_id;
 			this.formData.districtId = this.memberInfo.district_id;
 			this.formData.fullAddress = this.memberInfo.full_address;
 			this.formData.address = this.memberInfo.address;
-			if (this.memberInfo.full_address) this.defaultRegions = [this.memberInfo
-				.province_id, this.memberInfo.city_id, this.memberInfo.district_id
-			];
+			if (this.memberInfo.full_address) this.defaultRegions = [this.memberInfo.province_id, this.memberInfo.city_id, this.memberInfo.district_id];
 		},
 		// 切换编辑项
 		modifyInfo(action) {
@@ -239,35 +237,6 @@ export default {
 					});
 			}
 		},
-		cancellation() {
-			uni.showModal({
-				title: '风险提示',
-				content: '确定要注销当前账号吗？',
-				confirmColor: '#000000',
-				success: res => {
-					if (res.confirm) {
-						this.$api.sendRequest({
-							url: '/membercancel/api/membercancel/apply',
-							success: rres => {
-								let cancellation_condition = rres.data.is_audit;
-								if (rres.code >= 0) {
-									this.$store.commit('setToken', '');
-									this.$store.commit('setMemberInfo', '');
-									this.$store.dispatch('emptyCart');
-									this.$store.dispatch('emptyCart');
-									uni.removeStorageSync('authInfo');
-									this.$util.redirectTo('/pages/member/index');
-								} else {
-									this.$util.showToast({
-										title: rres.message
-									});
-								}
-							}
-						});
-					}
-				}
-			});
-		},
 		getCancelStatus() {
 			this.$api.sendRequest({
 				url: '/membercancel/api/membercancel/info',
@@ -288,7 +257,7 @@ export default {
 								});
 							}
 						} else {
-							this.$util.redirectTo('/pages_tool/member/assets', {
+							this.$util.redirectTo('/pages_tool/member/cancellation', {
 								back: '/pages_tool/member/info'
 							});
 						}
@@ -327,8 +296,7 @@ export default {
 						this.$store.commit('setToken', '');
 						this.$store.commit('setMemberInfo', '');
 						this.$store.dispatch('emptyCart');
-						this.$store.dispatch('emptyCart');
-						uni.removeStorageSync('authInfo');
+						// uni.removeStorageSync('authInfo');
 						this.$util.redirectTo('/pages/member/index');
 					}
 				}
@@ -616,30 +584,25 @@ export default {
 					name: 'currentPassword',
 					checkType: 'required',
 					errorMsg: this.$lang("pleaseInputOldPassword")
-				},
-					{
-						name: 'newPassword',
-						checkType: 'required',
-						errorMsg: this.$lang("pleaseInputNewPassword")
-					}
-				];
+				}, {
+					name: 'newPassword',
+					checkType: 'required',
+					errorMsg: this.$lang("pleaseInputNewPassword")
+				}];
 			} else {
 				var rule = [{
 					name: 'mobileVercode',
 					checkType: 'required',
 					errorMsg: this.$lang("confirmCodeInput")
-				},
-					{
-						name: 'mobileDynacode',
-						checkType: 'required',
-						errorMsg: this.$lang("animateCodeInput")
-					},
-					{
-						name: 'newPassword',
-						checkType: 'required',
-						errorMsg: this.$lang("pleaseInputNewPassword")
-					}
-				];
+				}, {
+					name: 'mobileDynacode',
+					checkType: 'required',
+					errorMsg: this.$lang("animateCodeInput")
+				}, {
+					name: 'newPassword',
+					checkType: 'required',
+					errorMsg: this.$lang("pleaseInputNewPassword")
+				}];
 			}
 
 			let regConfig = this.registerConfig;
@@ -725,7 +688,7 @@ export default {
 
 		// ------------------------修改手机号------------------------------
 		// 验证手机号
-		vertifyMobile() {
+		verifyMobile() {
 			var rule = [{
 				name: 'mobile',
 				checkType: 'required',
@@ -746,7 +709,7 @@ export default {
 		},
 		// 检测手机号是否存在
 		async checkMobile() {
-			if (!this.vertifyMobile()) return;
+			if (!this.verifyMobile()) return;
 			let res = await this.$api.sendRequest({
 				url: '/api/member/checkmobile',
 				data: {
@@ -764,7 +727,7 @@ export default {
 		},
 
 		// 发送短信动态码
-		async bindMoblieCode() {
+		async bindMobileCode() {
 			if (this.seconds != 120) return;
 			var rule = [{
 				name: 'mobile',
diff --git a/pages_tool/member/public/js/invite_friends.js b/pages_tool/member/public/js/invite_friends.js
index 884833b..1cc4221 100644
--- a/pages_tool/member/public/js/invite_friends.js
+++ b/pages_tool/member/public/js/invite_friends.js
@@ -52,7 +52,7 @@ export default {
 		},
 		copyUrl() {
 			let text = this.$config.h5Domain + '/pages/index/index';
-			if (this.memberInf && this.memberInfo.member_id) text += '?source_member=' + this.memberInfo.member_id;
+			if (this.memberInfo && this.memberInfo.member_id) text += '?source_member=' + this.memberInfo.member_id;
 			this.$util.copy(text, () => {
 				this.closeSharePopup();
 			});
diff --git a/pages_tool/member/public/js/signin.js b/pages_tool/member/public/js/signin.js
index c22ca2e..cc0d9ac 100644
--- a/pages_tool/member/public/js/signin.js
+++ b/pages_tool/member/public/js/signin.js
@@ -52,8 +52,7 @@ export default {
 		}
 
 		this.headimg = this.memberInfo.headimg;
-		this.signDaysSeries = this.memberInfo.sign_days_series;
-
+		this.getMemberInfo();
 		this.getSignPointData();
 		this.getSignGrowthData();
 		this.setPublicShare();
@@ -61,6 +60,16 @@ export default {
 		this.getIsSign();
 	},
 	methods: {
+		getMemberInfo(){
+			this.$api.sendRequest({
+				url: '/api/member/info',
+				success: (res) => {
+					if (res.code >= 0) {
+						this.signDaysSeries = res.data.sign_days_series;
+					}
+				}
+			});
+		},
 		// 获取签到累积积分
 		getSignPointData() {
 			this.$api.sendRequest({
diff --git a/pages_tool/member/signin.vue b/pages_tool/member/signin.vue
new file mode 100644
index 0000000..76ab8c4
--- /dev/null
+++ b/pages_tool/member/signin.vue
@@ -0,0 +1,569 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view class="signin">
+		<block v-if="signState">
+			<!-- #ifdef H5 -->
+			<view class="head-nav color-base-bg"></view>
+			<!-- #endif -->
+			<view class="sigin-box">
+				<view class="sigin-bg"></view>
+
+				<view class="signin-wrap">
+					<view class="member-info">
+						<view class="headimg">
+							<view class="headimg-img">
+								<image :src="headimg ? $util.img(headimg) : $util.getDefaultImage().head" mode="aspectFill" @error="headimg = $util.getDefaultImage().head"/>
+							</view>
+
+							<view class="signin-info">
+								<view>
+									已连续签到
+									<text>{{ signDaysSeries }}</text>
+									天
+								</view>
+								<view>{{ hasSign ? '明日' : '今日' }}签到可获得{{ pointTomorrow }}积分</view>
+							</view>
+						</view>
+
+						<view class="point-box" @click="sign()">
+							<image :src="$util.img(hasSign == 1 ? 'public/uniapp/signin/sign-btn-res.png' : 'public/uniapp/signin/sign-btn.png')" mode="widthFix"/>
+						</view>
+					</view>
+
+					<view class="signin-days-wrap">
+						<view class="signin-desc">连续签到领好礼</view>
+						<view class="signin-day-list">
+							<view class="signin-day-con">
+								<view class="signin-day-scroll">
+									<block v-for="(item, index) in showSignDays">
+										<view v-if="!item.is_last" :id="'id_' + item.day" class="signin-day-item"
+											:class="{
+												signed: item.day < signDaysSeries || (item.day == signDaysSeries && hasSign == 0) || (item.day == signDaysSeries && hasSign == 1)
+											}">
+											<view class="day">第{{ item.day }}天</view>
+											<image :src="$util.img('public/uniapp/signin/sign-icon.png')"></image>
+											<view class="point">{{ item.point }}积分</view>
+										</view>
+										<view v-else :id="'id_' + item.day" class="signin-day-item last" :class="{
+												signed: item.day < signDaysSeries || (item.day == signDaysSeries && hasSign == 0) || (item.day == signDaysSeries && hasSign == 1)
+											}">
+											<view>
+												<view class="day">第{{ item.day }}天</view>
+												<view class="point">{{ item.point }}积分</view>
+											</view>
+											<image :src="$util.img('public/uniapp/signin/sign-box.png')" mode="widthFix"/>
+										</view>
+									</block>
+								</view>
+							</view>
+						</view>
+					</view>
+
+					<view class="my-signin">
+						<view class="my-signin-title">我的签到</view>
+
+						<view class="my-signin-con">
+							<view class="my-signin-item">
+								<image :src="$util.img('public/uniapp/signin/sign-bg-yellow.png')"></image>
+								<view class="my-signin-item-num">积分：{{ signPoint }}</view>
+								<view>累计获得积分</view>
+							</view>
+							<view class="my-signin-item">
+								<image :src="$util.img('public/uniapp/signin/sign-bg-pink.png')"></image>
+								<view class="my-signin-item-num">成长值：{{ signGrowth }}</view>
+								<view>累计获得成长值</view>
+							</view>
+						</view>
+					</view>
+
+					<view class="signin-rule" v-if="rule && rule.length">
+						<view class="signin-rule-title">签到规则</view>
+
+						<view class="signin-rule-con">
+							<view class="rule-item" v-for="(item, index) in rule" :key="index">
+								<block v-if="index == 0">1. 每日签到奖励：</block>
+								<block v-else>{{ index + 1 + '. 连续签到' + item.day + '天额外奖励：' }}</block>
+								<text v-if="item.point">{{ item.point + '积分 ' }}</text>
+								<text v-if="item.growth">{{ item.growth + '成长值' }}</text>
+							</view>
+
+							<view class="rule-item">
+								{{ rule.length + 1 }}.连续签到{{ cycle }}天为一个周期，连续签到天数签满一个周期或者签到中断，将清空连签天数重新计算签到天数
+							</view>
+							<view class="rule-item">
+								{{ rule.length + 2 }}. 用户可在签到页每日签到一次，签到后可获得每日签到奖励；连续签到天数达到连签奖励的当天，可额外获得连签奖励
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+
+			<view @touchmove.prevent.stop>
+				<uni-popup ref="uniPopup" type="center" class="wap-floating" :maskClick="false">
+					<view class="popup-box" @click="close()">
+						<text class="iconfont icon-close" @click="$refs.uniPopup.close()"></text>
+						<image class="pic" :src="$util.img('public/uniapp/signin/bg1.png')"></image>
+						<view class="popup-content">
+							<view class="popup-content-wrap">
+								<view class="title" v-if="successTip.point || successTip.growth">
+									<text>恭喜您获得</text>
+									<text v-if="successTip.point">
+										<text class="num color-base-text">{{ successTip.point }}</text>
+										积分
+									</text>
+									<text v-if="successTip.growth">
+										<text class="num color-base-text">{{ successTip.growth }}</text>
+										成长值
+									</text>
+								</view>
+								<view class="desc">连续签到可获得更多奖励！</view>
+							</view>
+							<view class="other-info color-base-bg" @click="$refs.uniPopup.close()">知道了</view>
+						</view>
+					</view>
+				</uni-popup>
+			</view>
+
+			<!-- 悬浮按钮 -->
+			<hover-nav :need="true"></hover-nav>
+		</block>
+		<block v-else><ns-empty text="暂未开启签到奖励" subText="请到营销中心开启签到奖励" :isIndex="false"></ns-empty></block>
+
+		<loading-cover ref="loadingCover"></loading-cover>
+
+		<ns-login ref="login"></ns-login>
+
+		<!-- #ifdef MP-WEIXIN -->
+		<!-- 小程序隐私协议 -->
+		<privacy-popup ref="privacyPopup"></privacy-popup>
+		<!-- #endif -->
+	</view>
+</template>
+<script>
+	import uniCalender from '@/pages_tool/components/uni-calendar/uni-calendar.vue';
+	import uniPopup from '@/components/uni-popup/uni-popup.vue';
+	import signIn from './public/js/signin.js';
+	export default {
+		components: {
+			uniPopup,
+			uniCalender
+		},
+		mixins: [signIn]
+	};
+</script>
+<style lang="scss">
+	uni-page-body,
+	uni-page-refresh {
+		height: 100%;
+	}
+
+	.signin {
+		position: relative;
+		height: 100%;
+
+		.head-nav {
+			width: 100%;
+			height: var(--status-bar-height);
+		}
+
+		.head-nav.active {
+			padding-top: 40rpx;
+		}
+
+		.sigin-box {
+			position: relative;
+		}
+
+		.sigin-bg {
+			width: 100%;
+			position: absolute;
+			top: 0;
+			z-index: 1;
+			background: linear-gradient(136deg, #fe7849 0%, #ff1959 100%);
+			height: 500rpx;
+			border-radius: 0 0 100% 100%/0 0 20% 20%;
+
+			image {
+				width: 100%;
+			}
+		}
+
+		.signin-wrap {
+			padding: 0 30rpx;
+		}
+
+		.member-info {
+			position: relative;
+			z-index: 9;
+			padding: 74rpx 0 55rpx;
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+
+			.headimg {
+				display: flex;
+				align-items: center;
+
+				.headimg-img {
+					width: 100rpx;
+					height: 100rpx;
+					background: #fff;
+					border: 0px solid #fff;
+					border-radius: 50%;
+					overflow: hidden;
+					margin-right: 20rpx;
+
+					image {
+						width: 100%;
+						height: 100%;
+					}
+				}
+
+				.signin-info {
+					view {
+						color: #ffffff;
+						font-size: 24rpx;
+						line-height: 1;
+
+						&:first-child {
+							margin-bottom: 18rpx;
+							font-size: 32rpx;
+							font-weight: bold;
+
+							text {
+								margin: 0 9rpx;
+							}
+						}
+					}
+				}
+			}
+
+			.point-box {
+				display: flex;
+				align-items: center;
+				height: 68rpx;
+				padding: 13rpx 0 13rpx 0;
+				box-sizing: border-box;
+
+				image {
+					width: 160rpx;
+					height: 68rpx;
+					max-height: 80rpx;
+					margin-bottom: -6rpx;
+				}
+
+				.point {
+					margin-left: 14rpx;
+					font-size: $font-size-toolbar;
+					color: #ffffff;
+				}
+			}
+		}
+
+		.signin-days-wrap {
+			position: relative;
+			z-index: 9;
+			background-color: #ffffff;
+			border-radius: 18rpx;
+			padding: 30rpx 0 30rpx;
+			height: 468rpx;
+
+			.signin-desc {
+				font-size: 32rpx;
+				font-weight: bold;
+				line-height: 1;
+				padding: 0 30rpx;
+			}
+
+			.signin-day-list {
+				margin-top: 30rpx;
+				display: flex;
+				justify-content: space-between;
+				padding: 0 30rpx;
+
+				.signin-day-con {
+					width: 100%;
+				}
+
+				.signin-day-scroll {
+					display: flex;
+					flex-wrap: wrap;
+					width: 100%;
+					flex-direction: row;
+					white-space: nowrap;
+					line-height: 1;
+
+					.signin-day-item {
+						flex-shrink: 0;
+						background: #f5f6fa;
+						margin-right: 30rpx;
+						width: calc((100% - 90rpx) / 4);
+						height: 155rpx;
+						border-radius: 18rpx;
+						margin-bottom: 24rpx;
+
+						&:last-child {
+							margin-right: 0;
+							width: calc((100% - 30rpx) / 2);
+						}
+
+						&:nth-child(4n) {
+							margin-right: 0;
+						}
+
+						image {
+							width: 60rpx;
+							height: 60rpx;
+							margin-top: 10rpx;
+						}
+
+						&.signed {
+							background: linear-gradient(136deg, #fe7849 0%, #ff1959 100%);
+
+							view {
+								color: #ffffff;
+							}
+						}
+
+						&.last {
+							display: flex;
+							flex-direction: row;
+
+							>view {
+								width: 50%;
+
+								.point {
+									margin: 15rpx;
+								}
+							}
+
+							image {
+								width: 40%;
+								margin-top: 20rpx;
+								max-width: 130rpx;
+							}
+						}
+					}
+
+					.reward {
+						image {
+							width: 100%;
+							height: 100%;
+							margin-top: 0;
+						}
+					}
+				}
+
+				.signin-day-item {
+					display: inline-block;
+					width: 85rpx;
+					height: 103rpx;
+					border-radius: 4rpx;
+					text-align: center;
+					background-color: #f6f6fb;
+					flex-shrink: 0;
+
+					.day {
+						font-size: 24rpx;
+						line-height: 1;
+						margin-top: 18rpx;
+						font-weight: bold;
+					}
+
+					.point {
+						font-size: 20rpx;
+						line-height: 1;
+						margin-top: -4rpx;
+						color: #abb0c1;
+					}
+
+					image {
+						width: 100%;
+						height: 100%;
+					}
+				}
+			}
+
+			.signin-btn {
+				position: absolute;
+				width: 100%;
+				height: 80rpx;
+				bottom: 40rpx;
+				text-align: center;
+
+				button {
+					display: inline-block;
+					width: 442rpx;
+					height: 100%;
+					color: #ffffff;
+					background-color: #ff4544;
+				}
+
+				.btn-active {
+					color: $color-title;
+					background-color: #e1e1e1;
+				}
+			}
+		}
+
+		.my-signin {
+			padding: 30rpx;
+			margin-top: 30rpx;
+			background-color: #ffffff;
+			border-radius: 18rpx;
+
+			.my-signin-title {
+				font-size: 32rpx;
+				line-height: 1;
+				font-weight: bold;
+			}
+
+			.my-signin-con {
+				display: flex;
+				justify-content: space-between;
+				margin-top: 30rpx;
+			}
+
+			.my-signin-item {
+				width: 300rpx;
+				height: 155rpx;
+				position: relative;
+
+				image {
+					width: 300rpx;
+					height: 155rpx;
+					position: absolute;
+					top: 0;
+					left: 0;
+				}
+
+				.my-signin-item-num {
+					position: relative;
+					z-index: 9;
+					padding: 44rpx 28rpx 0;
+					line-height: $font-size-toolbar;
+					font-weight: bold;
+				}
+
+				view:last-child {
+					position: relative;
+					z-index: 9;
+					color: #abb0c1;
+					padding-left: 28rpx;
+					font-size: $font-size-activity-tag;
+					line-height: 1;
+					margin-top: 16rpx;
+				}
+			}
+		}
+
+		.signin-rule {
+			margin-top: 30rpx;
+			background-color: #ffffff;
+			border-radius: 18rpx;
+			padding: 30rpx;
+
+			.signin-rule-title {
+				display: flex;
+				align-items: center;
+				justify-content: flex-start;
+				line-height: $font-size-toolbar;
+				font-size: 32rpx;
+				font-weight: bold;
+				text-align: left;
+			}
+
+			.signin-rule-con {
+				margin-top: 30rpx;
+				padding: 0 0;
+
+				.rule-item {
+					font-size: 26rpx;
+					color: $color-sub;
+				}
+			}
+		}
+	}
+
+	.popup-box {
+		position: relative;
+		top: 0;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+
+		.icon-close {
+			width: 42rpx;
+			height: 42rpx;
+			border: 1px solid #fff;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			border-radius: 50%;
+			color: #fff;
+			position: absolute;
+			top: 70rpx;
+			right: 0;
+		}
+
+		.pic {
+			width: 274rpx;
+			height: 200rpx;
+			position: relative;
+			margin-bottom: -30rpx;
+		}
+
+		.popup-content {
+			background: #ffffff;
+			width: 70vw;
+			margin-top: -100rpx;
+			border-radius: 20rpx;
+			padding: 0 60rpx;
+			padding-bottom: 40rpx;
+			box-sizing: border-box;
+			background-size: 100% 100rpx;
+		}
+
+		.popup-content-wrap {
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+
+			.title {
+				font-size: $font-size-base;
+				margin-top: 160rpx;
+				color: #999;
+
+				.num {
+					font-size: 32rpx;
+				}
+			}
+
+			.desc {
+				color: #999;
+				font-size: $font-size-tag;
+			}
+		}
+
+		.other-info {
+			width: 300rpx;
+			height: 70rpx;
+			border-radius: 10rpx;
+			margin: 0 auto;
+			color: #fff;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			margin-top: 40rpx;
+		}
+	}
+</style>
+
+<style scoped>
+	.wap-floating>>>.uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+		background: none !important;
+		display: flex !important;
+		flex-direction: column !important;
+		align-items: center !important;
+	}
+</style>
\ No newline at end of file
diff --git a/pages_tool/member/withdrawal.vue b/pages_tool/member/withdrawal.vue
index db6a049..ff2b408 100644
--- a/pages_tool/member/withdrawal.vue
+++ b/pages_tool/member/withdrawal.vue
@@ -1,7 +1,7 @@
 <template>
 	<page-meta :page-style="themeColor"></page-meta>
 	<view>
-		<mescroll-uni @getData="getData" class="member-point">
+		<mescroll-uni @getData="getData" ref="mescroll" class="member-point">
 			<view slot="list">
 				<block v-if="dataList.length">
 					<view class="detailed-wrap">
@@ -15,8 +15,29 @@
 								</view>
 								<view class="right-wrap">
 									<view class="num color-base-text">￥{{ item.apply_money }}</view>
-									<view class="status-name">{{ item.status_name }}</view>
+									<!-- #ifdef H5 -->
+										<view class="actions" v-if="$util.isWeiXin() && isWithdrawWechat && item.transfer_type == 'wechatpay' && item.status == 1" @click.stop="toTransfer(item.id)">
+											<view class="act-btn">收款</view>
+										</view>
+										<view class="status-name" v-else :style="item.status == -1 || item.status == -2 ? 'color:red;' : ''">{{ item.status_name }}</view>
+									<!-- #endif -->
+									
+									<!-- #ifdef MP-WEIXIN -->
+										<view class="actions" v-if="isWithdrawWechat && item.transfer_type == 'wechatpay' && item.status == 1" @click.stop="toTransfer(item.id)">
+											<view class="act-btn">收款</view>
+										</view>
+										<view class="status-name" v-else :style="item.status == -1 || item.status == -2 ? 'color:red;' : ''">{{ item.status_name }}</view>
+									<!-- #endif -->
 								</view>
+								<view v-if="item.status == -1" class="fail-reason">
+									拒绝原因：{{ item.refuse_reason }}
+								</view>
+								<view v-if="item.status == -2" class="fail-reason">
+									失败原因：{{ item.fail_reason }}
+								</view>
+								
+								
+								
 							</view>
 						</view>
 					</view>
@@ -34,21 +55,36 @@
 export default {
 	data() {
 		return {
-			dataList: []
+			dataList: [],
+			isWithdrawWechat: 0 
 		};
 	},
 	onShow() {
 		if (!this.storeToken) {
-			this.$util.redirectTo(
-				'/pages_tool/login/login',
-				{
-					back: '/pages_tool/member/point'
-				},
-				'redirectTo'
-			);
+			this.$util.redirectTo('/pages_tool/login/login', {
+				back: '/pages_tool/member/point'
+			}, 'redirectTo');
 		}
+		if(this.$refs.mescroll) this.$refs.mescroll.refresh();
+		this.getWithdrawConfig()
 	},
 	methods: {
+		toTransfer(id) {
+			this.$util.redirectTo('/pages_tool/member/withdrawal_detail', {
+				id: id,
+				action: 'transfer'
+			});
+		},
+		getWithdrawConfig() {
+			this.$api.sendRequest({
+				url: '/wechatpay/api/transfer/getWithdrawConfig',
+				success: res => {
+					if (res.code == 0){
+						this.isWithdrawWechat = res.data.transfer_type;
+					}
+				},
+			});
+		},
 		//获得列表数据
 		getData(mescroll) {
 			this.$api.sendRequest({
@@ -165,6 +201,22 @@ export default {
 					font-size: $font-size-toolbar;
 				}
 			}
+			.fail-reason{
+				font-size: $font-size-base;
+				color:$color-tip;
+			}
+			.actions{
+				display: flex;
+				justify-content: flex-end;
+				.act-btn{
+					color: #fff;
+					background-color: $base-color;
+					font-size: $font-size-base;
+					line-height: 1;
+					padding: 10rpx $padding;
+					border-radius: $border-radius;
+				}
+			}
 		}
 	}
 }
diff --git a/pages_tool/member/withdrawal_detail.vue b/pages_tool/member/withdrawal_detail.vue
index c93aacd..136e64c 100644
--- a/pages_tool/member/withdrawal_detail.vue
+++ b/pages_tool/member/withdrawal_detail.vue
@@ -2,7 +2,7 @@
 	<page-meta :page-style="themeColor"></page-meta>
 	<view>
 		<view class="money-wrap">
-			<text>-{{ detail.apply_money }}</text>
+			<text>{{ detail.apply_money }}</text>
 		</view>
 
 		<!-- 状态0待审核1.待转账2已转账 -1拒绝' -->
@@ -48,37 +48,113 @@
 				<text class="value">{{ $util.timeStampTurnTime(detail.payment_time) }}</text>
 			</view>
 		</view>
-
+		<!-- #ifdef H5 -->
+			<view class="operations" v-if="$util.isWeiXin() && withdrawInfo.transfer_type && detail.transfer_type == 'wechatpay' && detail.status == 1">
+				<button class="operation" type="primary" @click="merchantTransfer()">收款</button>
+			</view>
+		<!-- #endif -->
+		<!-- #ifdef MP-WEIXIN -->
+			<view class="operations" v-if="withdrawInfo.transfer_type && detail.transfer_type == 'wechatpay' && detail.status == 1">
+				<button class="operation" type="primary" @click="merchantTransfer()">收款</button>
+			</view>
+		<!-- #endif -->
+		
 		<loading-cover ref="loadingCover"></loading-cover>
 	</view>
 </template>
 
 <script>
+
 export default {
 	data() {
 		return {
 			id: 0,
-			detail: {}
+			detail: {},
+			withdrawInfo: {},
+			requestCount: 0
 		};
 	},
-	onLoad(option) {
+	async onLoad(option) {
 		this.id = option.id || 0;
+		await this.getWithdrawConfig()
+		if(option.action) this.merchantTransfer();
 	},
 	onShow() {
 		if (this.storeToken) {
 			this.getDetail();
 		} else {
-			this.$util.redirectTo(
-				'/pages_tool/login/login',
-				{
-					back: '/pages_tool/member/point'
-				},
-				'redirectTo'
-			);
+			this.$util.redirectTo('/pages_tool/login/login', {
+				back: '/pages_tool/member/point'
+			}, 'redirectTo');
 		}
 	},
+	onPullDownRefresh() {
+		this.getDetail();
+	},
 	methods: {
-		getDetail() {
+		merchantTransfer() {
+			uni.showLoading({})
+			var app_id = ''
+			// #ifdef MP
+				app_id = this.withdrawInfo.weapp_appid;
+			// #endif
+			// #ifdef H5
+				if(this.$util.isWeiXin()){
+					app_id = this.withdrawInfo.wechat_appid;
+				}
+			// #endif
+			this.$util.merchantTransfer(
+				{
+					transfer_type: 'member_withdraw',
+					id: this.id,
+				},
+				{
+					mch_id: this.withdrawInfo.mch_id,
+					app_id: app_id,
+				},
+				(res)=>{
+					if (res.err_msg === 'requestMerchantTransfer:ok') {
+						this.updateStatusToInProcess(()=>{
+							this.getDetail(true);
+						});
+					}
+					// #ifdef MP
+					if (res.errMsg === 'requestMerchantTransfer:ok') {
+						this.updateStatusToInProcess(()=>{
+							this.getDetail(true);
+						});
+					}
+					// #endif
+				}
+			);
+		},
+		async getWithdrawConfig() {
+			let res = await this.$api.sendRequest({
+				url: '/wechatpay/api/transfer/getWithdrawConfig',
+				async: false,
+			});
+			if (res.code == 0){
+				this.withdrawInfo = res.data;
+			}
+		},
+		//修改收款状态为收款中
+		updateStatusToInProcess(callback){
+			if (this.$refs.loadingCover) this.$refs.loadingCover.show();
+			this.$api.sendRequest({
+				url: '/wechatpay/api/transfer/inprocess',
+				data: {
+					from_type: 'member_withdraw',
+					relate_tag : this.id,
+				},
+				success: (res)=>{
+					if(res.code >= 0){
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+						typeof callback == 'function' && callback();
+					}
+				}
+			});
+		},
+		getDetail(is_loop = false) {
 			this.$api.sendRequest({
 				url: '/api/memberwithdraw/detail',
 				data: {
@@ -87,6 +163,22 @@ export default {
 				success: res => {
 					if (res.data) {
 						this.detail = res.data;
+						if(is_loop && this.requestCount < 10 && this.detail.status == 3){
+							this.requestCount++;
+							setTimeout(()=>{
+								this.getDetail(true)
+							},1000)
+						}
+						// if(mode && this.detail.status == 1){
+						// 	// 提现状态还没有修改
+						// 	if(this.requestCount < 10 && this.detail.status == 1){
+						// 		this.requestCount++;
+						// 		setTimeout(()=>{
+						// 			this.getDetail('transferComplete')
+						// 		},1000)
+						// 	}
+						// }
+						uni.stopPullDownRefresh();
 					}
 					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
 				},
@@ -128,4 +220,30 @@ export default {
 		}
 	}
 }
+
+.operations {
+	margin-top: 60rpx;
+	bottom: 0;
+	width: 100%;
+	// background: #fff;
+	position: fixed;
+	padding: 0 30rpx;
+	box-sizing: border-box;
+	padding-bottom: constant(safe-area-inset-bottom);
+	padding-bottom: env(safe-area-inset-bottom);
+	z-index: 10;
+
+	.operation {
+		height: 80rpx;
+		line-height: 80rpx;
+		border-radius: 80rpx;
+		margin: 30rpx 0 30rpx;
+		font-size: $font-size-toolbar;
+
+		text {
+			margin-right: 10rpx;
+			font-size: $font-size-base;
+		}
+	}
+}
 </style>
diff --git a/pages_tool/notice/detail.vue b/pages_tool/notice/detail.vue
index b27d7ec..319bf0c 100644
--- a/pages_tool/notice/detail.vue
+++ b/pages_tool/notice/detail.vue
@@ -5,8 +5,12 @@
 		<view class="notice-meta">
 			<text class="notice-time">发表时间: {{ $util.timeStampTurnTime(detail.create_time) }}</text>
 		</view>
-		<view class="notice-content"><rich-text :nodes="content"></rich-text></view>
-	
+		<view class="notice-content">
+			<!-- <rich-text :nodes="content"></rich-text> -->
+			<ns-mp-html :content="content"></ns-mp-html>
+		</view>
+		<!-- 悬浮按钮 -->
+		<hover-nav></hover-nav>
 		<loading-cover ref="loadingCover"></loading-cover>
 
 		<!-- #ifdef MP-WEIXIN -->
@@ -51,7 +55,8 @@
 						if (res.code == 0) {
 							if (res.data) {
 								this.detail = res.data;
-								this.content = htmlParser(res.data.content);
+								// this.content = htmlParser(res.data.content);
+								this.content = res.data.content;
 								this.$langConfig.title(this.detail.title);
 								this.setPublicShare();
 
@@ -81,8 +86,7 @@
 					title: this.detail.title,
 					desc: '',
 					link: shareUrl,
-					imgUrl: this.siteInfo ? this.$util.img(this.siteInfo.logo_square) :
-						''
+					imgUrl: this.siteInfo ? this.$util.img(this.siteInfo.logo_square) : ''
 				});
 			}
 		},
diff --git a/pages_tool/notice/list.vue b/pages_tool/notice/list.vue
index 76aea2c..fb05aad 100644
--- a/pages_tool/notice/list.vue
+++ b/pages_tool/notice/list.vue
@@ -10,7 +10,7 @@
 								<text v-if="item.is_top == 1" class="color-base-bg tag">置顶</text>
 								<text class="txt using-hidden">{{ item.title }}</text>
 							</view>
-							<text class="release-time">{{ $util.timeStampTurnTime(item.create_time, 1) }}</text>
+							<text class="release-time">{{ $util.timeStampTurnTime(item.create_time, 'Y-m-d') }}</text>
 							<view class="iconfont icon-right"></view>
 						</view>
 					</view>
@@ -19,6 +19,8 @@
 				<loading-cover ref="loadingCover"></loading-cover>
 			</block>
 		</mescroll-uni>
+		<!-- 悬浮按钮 -->
+		<hover-nav></hover-nav>
 
 		<!-- #ifdef MP-WEIXIN -->
 		<!-- 小程序隐私协议 -->
diff --git a/pages_tool/order/activist.vue b/pages_tool/order/activist.vue
index 727ddee..899a9de 100644
--- a/pages_tool/order/activist.vue
+++ b/pages_tool/order/activist.vue
@@ -28,10 +28,10 @@
 							<view class="goods-btn">
 								<view class="btn-text">
 									<text>共{{ item.num }}件商品</text>
-									<text>退款：￥{{ item.refund_status == 3 ? item.refund_real_money : item.refund_apply_money }}</text>
+									<text>退款：￥{{ (Number(item.refund_status == 3 ? item.refund_real_money : item.refund_apply_money) + Number(item.shop_active_refund_money)).toFixed(2) }}</text>
 								</view>
 								<view class="order-action">
-									<view class="order-box-btn" @click="refundDetail(item.order_goods_id)">查看详情</view>
+									<view class="order-box-btn" @click="refundDetail(item.order_goods_id)">{{ $lang('checkDetail') }}</view>
 									<block v-if="item.refund_action.length">
 										<view
 											class="order-box-btn"
@@ -72,6 +72,7 @@ export default {
 				back: '/pages_tool/order/activist'
 			});
 		}
+		if(this.$refs.mescroll) this.$refs.mescroll.refresh();
 	},
 	methods: {
 		getListData(mescroll) {
@@ -130,6 +131,11 @@ export default {
 						order_goods_id: data.order_goods_id
 					});
 					break;
+				case 'orderRefundApply':
+					this.$util.redirectTo('/pages_tool/order/refund', {
+						order_goods_id: data.order_goods_id
+					});
+					break;
 			}
 		},
 		imageError(index) {
diff --git a/pages_tool/order/public/css/refund.scss b/pages_tool/order/public/css/refund.scss
index c18b3c9..650eb50 100644
--- a/pages_tool/order/public/css/refund.scss
+++ b/pages_tool/order/public/css/refund.scss
@@ -120,6 +120,54 @@
 			right: 0;
 		}
 	}
+	.other-info {
+		width: 100%;
+		box-sizing: border-box;
+		display: flex;
+		flex-wrap: wrap;
+		margin-top: $margin-updown;
+	}
+	
+	.other-info-box {
+		width: 145rpx;
+		height: 145rpx;
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		margin-right: 30rpx;
+		margin-bottom: 30rpx;
+		position: relative;
+		
+		image {
+			width: 100%;
+			border-radius: $border-radius;
+		}
+		.iconfont {
+			font-size: 60rpx;
+			color: #898989;
+			line-height: 1;
+		}
+		text {
+			line-height: 1;
+		}
+		.imgDel {
+			width: 40rpx;
+			height: 40rpx;
+			position: absolute;
+			right: -20rpx;
+			top: -20rpx;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			.iconfont {
+				font-size: $font-size-toolbar;
+			}
+		}
+	}
+	.other-info-box.active {
+		border: 1rpx dashed #898989;
+	}
 }
 .textarea-box{
 	position: relative;
@@ -139,7 +187,9 @@
 	box-sizing: border-box;
 	margin-top: 10rpx;
 }
-
+.sub-btn-empty{
+	height: 120rpx;
+}
 .sub-btn {
 	position: fixed;
 	width: 100%;
diff --git a/pages_tool/order/public/css/refund_detail.scss b/pages_tool/order/public/css/refund_detail.scss
index 2f9594f..fd5d5d6 100644
--- a/pages_tool/order/public/css/refund_detail.scss
+++ b/pages_tool/order/public/css/refund_detail.scss
@@ -140,7 +140,7 @@
 
 		.info {
 			margin-top: 20rpx;
-
+			
 			.cell {
 				height: 50rpx;
 				line-height: 50rpx;
@@ -148,6 +148,32 @@
 				font-size: $font-size-tag;
 				color: $color-tip;
 			}
+			
+			&.refund-images{
+				margin-top: 0;
+				.cell{
+					height: auto;
+					display: flex;
+					align-items: flex-start;
+					.cell-title{
+						font-size: $font-size-tag;
+						color: $color-tip;
+					}
+					.images{
+						flex: 1;
+						display: flex;
+						align-items: center;
+						flex-wrap: wrap;
+						image{
+							width: 130rpx;
+							height: 130rpx;
+							margin-right: 20rpx;
+							margin-bottom: 20rpx;
+						}
+					}
+				}
+			}
+			
 		}
 	}
 }
diff --git a/pages_tool/order/public/js/evaluate.js b/pages_tool/order/public/js/evaluate.js
index bd86771..489d343 100644
--- a/pages_tool/order/public/js/evaluate.js
+++ b/pages_tool/order/public/js/evaluate.js
@@ -3,7 +3,7 @@ export default {
 		return {
 			orderId: null,
 			orderNo: "",
-			isAnonymous: 1, //是否匿名发布  1.匿名，0.公开
+			isAnonymous: 0, //是否匿名发布  1.匿名，0.公开
 
 			goodsList: [], //订单列表
 			goodsEvalList: [], //评价列表
diff --git a/pages_tool/order/refund.vue b/pages_tool/order/refund.vue
index 7cfd496..fa4cbee 100644
--- a/pages_tool/order/refund.vue
+++ b/pages_tool/order/refund.vue
@@ -68,6 +68,17 @@
 							v-model="refund_remark"
 						/>
 						<!-- #endif -->
+						
+						<view class="other-info">
+							<view class="other-info-box" v-for="(i, t) in imgList" :key="t">
+								<image :src="$util.img(i)" mode="aspectFill" @click="preview(i)"></image>
+								<view class="imgDel" @click="deleteImg(i, t)"><text class=" icon iconfont icon-delete"></text></view>
+							</view>
+							<view class="other-info-box active" @click="addImg()" v-if="imgList.length < 5 || imgList.length == undefined">
+								<text class="icon iconfont icon-zhaoxiangji"></text>
+								<text>{{ imgList.length ? 5 - imgList.length : 0 }}/5</text>
+							</view>
+						</view>
 					</view>
 
 					<!-- 	<view class="sub-btn color-base-bg" :class="{ 'safe-area': isIphoneX }" @click="submit">{{ $lang('common.submit') }}</view> -->
@@ -116,6 +127,7 @@ export default {
 			refund_type: '',
 			refund_reason: '',
 			refund_remark: '',
+			imgList: [],
 			isIphoneX: false,
 			refund_data: {
 				refund_type: [],
@@ -139,6 +151,32 @@ export default {
 		}
 	},
 	methods: {
+		//添加图片
+		addImg(e) {
+			let size = this.imgList.length ? this.imgList.length : 0
+			this.$util.upload(5 - size, {
+				path: 'refundimg'
+			}, res => {
+				let arr = this.imgList
+				arr = arr.concat(res);
+				this.imgList = arr;
+			});
+		},
+		//删除图片
+		deleteImg(i, j) {
+			this.imgList.splice(j, 1);
+		},
+		// 图片预览
+		preview(i) {
+			let urls = this.imgList;
+			for (let k = 0; k < urls.length; k++) {
+				urls[k] = this.$util.img(urls[k])
+			}
+			uni.previewImage({
+				urls: urls,
+				current: i
+			});
+		},
 		/**
 		 * 显示弹出层
 		 * @param {Object} ref
@@ -201,7 +239,8 @@ export default {
 							order_goods_ids: this.order_goods_id,
 							refund_type: this.refund_type,
 							refund_reason: this.refund_reason,
-							refund_remark: this.refund_remark
+							refund_remark: this.refund_remark,
+							refund_images: this.imgList.toString()
 						},
 						success: res => {
 							this.$util.showToast({ title: res.message });
@@ -225,7 +264,8 @@ export default {
 						order_goods_ids: this.order_goods_id,
 						refund_type: this.refund_type,
 						refund_reason: this.refund_reason,
-						refund_remark: this.refund_remark
+						refund_remark: this.refund_remark,
+						refund_images: this.imgList.toString()
 					},
 					success: res => {
 						this.$util.showToast({ title: res.message });
@@ -259,30 +299,7 @@ export default {
 		 * 微信订阅消息
 		 */
 		subscribeMessage(callback){
-			this.$api.sendRequest({
-				url: '/weapp/api/weapp/messagetmplids',
-				data: {
-					keywords: 'ORDER_REFUND_AGREE,ORDER_REFUND_REFUSE'
-				},
-				success: res => {
-					if (res.code == 0 && res.data.length) {
-						uni.requestSubscribeMessage({
-							tmplIds: res.data,
-							fail: (res) => {
-								console.log('fail', res)
-							},
-							complete: ()=> {
-								callback();
-							}
-						})
-					} else {
-						callback();
-					}
-				},
-				fail: res => {
-					callback();
-				}
-			})
+			this.$util.subscribeMessage('ORDER_REFUND_AGREE,ORDER_REFUND_REFUSE', callback);
 		}
 	}
 };
diff --git a/pages_tool/order/refund_batch.vue b/pages_tool/order/refund_batch.vue
index a9e3084..3e2a644 100644
--- a/pages_tool/order/refund_batch.vue
+++ b/pages_tool/order/refund_batch.vue
@@ -57,8 +57,19 @@
 							v-model="refund_remark"
 						/>
 						<!-- #endif -->
+						
+						<view class="other-info">
+							<view class="other-info-box" v-for="(i, t) in imgList" :key="t">
+								<image :src="$util.img(i)" mode="aspectFill" @click="preview(i)"></image>
+								<view class="imgDel" @click="deleteImg(i, t)"><text class=" icon iconfont icon-delete"></text></view>
+							</view>
+							<view class="other-info-box active" @click="addImg()" v-if="imgList.length < 5 || imgList.length == undefined">
+								<text class="icon iconfont icon-zhaoxiangji"></text>
+								<text>{{ imgList.length ? 5 - imgList.length : 0 }}/5</text>
+							</view>
+						</view>
 					</view>
-
+					<view class="sub-btn-empty"></view>
 					<!-- 	<view class="sub-btn color-base-bg" :class="{ 'safe-area': isIphoneX }" @click="submit">{{ $lang('common.submit') }}</view> -->
 					<view class="sub-btn" :class="{ 'safe-area': isIphoneX }" @click="submit">
 						<!-- <button type="primary">提交</button> -->
@@ -106,6 +117,7 @@ export default {
 			refund_type: '',
 			refund_reason: '',
 			refund_remark: '',
+			imgList: [],
 			isIphoneX: false,
 			refund_data: {
 				refund_type: [],
@@ -131,6 +143,32 @@ export default {
 		}
 	},
 	methods: {
+		//添加图片
+		addImg(e) {
+			let size = this.imgList.length ? this.imgList.length : 0
+			this.$util.upload(5 - size, {
+				path: 'refundimg'
+			}, res => {
+				let arr = this.imgList
+				arr = arr.concat(res);
+				this.imgList = arr;
+			});
+		},
+		//删除图片
+		deleteImg(i, j) {
+			this.imgList.splice(j, 1);
+		},
+		// 图片预览
+		preview(i) {
+			let urls = this.imgList;
+			for (let k = 0; k < urls.length; k++) {
+				urls[k] = this.$util.img(urls[k])
+			}
+			uni.previewImage({
+				urls: urls,
+				current: i
+			});
+		},
 		/**
 		 * 显示弹出层
 		 * @param {Object} ref
@@ -171,7 +209,11 @@ export default {
 					} else {
 						this.$util.showToast({ title: '未获取到该订单项退款信息' });
 						setTimeout(() => {
-							this.$util.redirectTo('/pages/order/list');
+							if (getCurrentPages().length > 1) {
+								uni.navigateBack();
+							} else {
+								this.$util.redirectTo('/pages/order/list');
+							}
 						}, 1000);
 					}
 				},
@@ -193,7 +235,8 @@ export default {
 							order_goods_ids: this.order_goods_id,
 							refund_type: this.refund_type,
 							refund_reason: this.refund_reason,
-							refund_remark: this.refund_remark
+							refund_remark: this.refund_remark,
+							refund_images: this.imgList.toString()
 						},
 						success: res => {
 							this.$util.showToast({ title: res.message });
@@ -201,7 +244,7 @@ export default {
 								uni.removeStorage({
 									key:'refund_goods_data',
 									success:res=>{
-										this.$util.redirectTo('/pages_tool/order/activist');
+										this.$util.redirectTo('/pages_tool/order/activist',{}, 'redirectTo');
 									}
 								})
 							} else {
@@ -215,14 +258,15 @@ export default {
 				})
 				// #endif
 				
-				// #ifndef MP-WEIXIN
+				// #ifndef MP
 				this.$api.sendRequest({
 					url: '/api/orderrefund/refund',
 					data: {
 						order_goods_ids: this.order_goods_id,
 						refund_type: this.refund_type,
 						refund_reason: this.refund_reason,
-						refund_remark: this.refund_remark
+						refund_remark: this.refund_remark,
+						refund_images: this.imgList.toString()
 					},
 					success: res => {
 						this.$util.showToast({ title: res.message });
@@ -230,7 +274,7 @@ export default {
 							uni.removeStorage({
 								key:'refund_goods_data',
 								success:res=>{
-									this.$util.redirectTo('/pages_tool/order/activist');
+									this.$util.redirectTo('/pages_tool/order/activist',{}, 'redirectTo');
 								}
 							})
 						} else {
@@ -261,30 +305,7 @@ export default {
 		 * 微信订阅消息
 		 */
 		subscribeMessage(callback){
-			this.$api.sendRequest({
-				url: '/weapp/api/weapp/messagetmplids',
-				data: {
-					keywords: 'ORDER_REFUND_AGREE,ORDER_REFUND_REFUSE'
-				},
-				success: res => {
-					if (res.code == 0 && res.data.length) {
-						uni.requestSubscribeMessage({
-							tmplIds: res.data,
-							fail: (res) => {
-								console.log('fail', res)
-							},
-							complete: ()=> {
-								callback();
-							}
-						})
-					} else {
-						callback();
-					}
-				},
-				fail: res => {
-					callback();
-				}
-			})
+			this.$util.subscribeMessage('ORDER_REFUND_AGREE,ORDER_REFUND_REFUSE', callback);
 		}
 	}
 };
diff --git a/pages_tool/order/refund_detail.vue b/pages_tool/order/refund_detail.vue
index 898bf3e..a4b0f1c 100644
--- a/pages_tool/order/refund_detail.vue
+++ b/pages_tool/order/refund_detail.vue
@@ -48,17 +48,32 @@
 							</view>
 						</view>
 						<!-- 退款信息 -->
-						<view class="info">
+						<view class="info" v-if="detail.refund_apply_money > 0">
 							<view class="cell">退款方式：{{ detail.refund_type == 1 ? '仅退款' : '退款退货' }}</view>
-							<view class="cell" v-if="detail.refund_status == 3">退款途径：{{ detail.refund_money_type == 1 ? '原路退款' : detail.refund_money_type == 2 ? '线下退款' : '退款到余额' }}</view>
-							<view class="cell">退款原因：{{ detail.refund_reason }}</view>
-							<view class="cell" v-if="detail.refund_status == 3 && detail.refund_real_money>0">退款金额：{{ $lang('common.currencySymbol') }}{{ detail.refund_real_money }}</view>
-							<view class="cell" v-else-if="detail.refund_apply_money>0">退款金额：{{ $lang('common.currencySymbol') }}{{ detail.refund_apply_money }}</view>
+							<view class="cell">申请原因：{{ detail.refund_reason }}</view>
+							<view class="cell" v-if="detail.refund_remark != ''">申请说明：{{ detail.refund_remark }}</view>
+							<!-- <view class="cell">申请时间：{{ $util.timeStampTurnTime(detail.refund_action_time) }}</view> -->
+							<view class="cell">申请金额：{{ $lang('common.currencySymbol') }}{{ detail.refund_apply_money }}</view>
+						</view>
+						<view class="info refund-images" v-if="detail.refund_apply_money > 0">
+							<view class="cell" v-if="detail.refund_images">
+								<view class="cell-title">退款图片：</view>
+								<view class="images">
+									<image v-for="(item, index) in detail.refund_images.split(',')" :key="index" :src="$util.img(item)" mode="aspectFill"></image>
+								</view>
+							</view>
+						</view>
+						<view class="info" v-if="detail.refund_apply_money > 0 && detail.refund_status == 3">
+							<view class="cell">退款金额：{{ $lang('common.currencySymbol') }}{{ detail.refund_real_money }} ({{ detail.refund_money_type_name }})</view>
+							<view class="cell">退款说明：{{ detail.shop_refund_remark || '--' }}</view>
 							<view class="cell">退款编号：{{ detail.refund_no }}</view>
-							<view class="cell">申请时间：{{ $util.timeStampTurnTime(detail.refund_action_time) }}</view>
-							<view class="cell" v-if="detail.refund_time">退款时间：{{ $util.timeStampTurnTime(detail.refund_time) }}</view>
-							<view class="cell" v-if="detail.refund_remark != ''">退款说明：{{ detail.refund_remark }}</view>
-							<view class="cell" v-if="detail.use_point>0">退款积分：{{ detail.use_point }}</view>
+							<view class="cell">退款时间：{{ $util.timeStampTurnTime(detail.refund_time) }}</view>
+							<view class="cell" v-if="detail.use_point > 0">退款积分：{{ detail.use_point }}</view>
+						</view>
+						<view class="info" v-if="detail.shop_active_refund == 1">
+							<view class="cell">主动退款编号：{{ detail.shop_active_refund_no }}</view>
+							<view class="cell">主动退款金额：￥{{ detail.shop_active_refund_money }} ({{ detail.shop_active_refund_money_type_name }})</view>
+							<view class="cell">主动退款说明：{{ detail.shop_active_refund_remark }}</view>
 						</view>
 					</view>
 				</view>
@@ -131,12 +146,12 @@
 					<view class="empty-box"></view>
 				</view>
 				<view class="history-bottom" :class="{ 'bottom-safe-area': isIphoneX }">
-				<!-- 	<ns-contact :niushop="{order_id: detail.order_id}">
+					<ns-contact :niushop="{order_id: detail.order_id}">
 						<view>
 							<text class="iconfont icon-ziyuan"></text>
 							<text>联系客服</text>
 						</view>
-					</ns-contact> -->
+					</ns-contact>
 					<view @click="switchAction('')">返回详情</view>
 				</view>
 			</view>
@@ -213,7 +228,10 @@ export default {
 						if (res.code >= 0) {
 							this.$util.showToast({ title: '撤销成功' });
 							setTimeout(() => {
-								this.$util.redirectTo('/pages/order/list');
+								// this.$util.redirectTo('/pages/order/list');
+								uni.navigateBack({
+								    delta: 1
+								});
 							}, 1000);
 						}
 					});
@@ -224,6 +242,11 @@ export default {
 				case 'orderRefundAsk':
 					this.$util.redirectTo('/pages_tool/order/refund', { order_goods_id: this.detail.order_goods_id });
 					break;
+				case 'orderRefundApply':
+					this.$util.redirectTo('/pages_tool/order/refund', {
+						order_goods_id: this.detail.order_goods_id
+					});
+					break;
 			}
 		},
 		refurnGoods() {
diff --git a/pages_tool/order/refund_goods_select.vue b/pages_tool/order/refund_goods_select.vue
index f34e376..60f1802 100644
--- a/pages_tool/order/refund_goods_select.vue
+++ b/pages_tool/order/refund_goods_select.vue
@@ -7,7 +7,7 @@
 		
 		<view class="body">
 			<view class="item" v-for="(item,index) in refund_data" :key="index">
-				<view @click="single(index)" style="display:none">
+				<view @click="single(index)">
 					<text v-if="item.judge" class="iconfont icon-yuan_checked color-base-text"></text>
 					<text v-else class="iconfont icon-yuan_checkbox"></text>
 				</view>
@@ -19,10 +19,9 @@
 		</view>
 		
 		<view class="bottom-all">
-			<view >
-			<!-- 	@click="all"
+			<view @click="all">
 				<text v-if="judge" class="iconfont icon-yuan_checked color-base-text"></text>
-				<text v-else class="iconfont icon-yuan_checkbox"></text> -->
+				<text v-else class="iconfont icon-yuan_checkbox"></text>
 			</view>
 			
 			<view v-if="nexthover" class="next" @click="next">下一步</view>
@@ -55,7 +54,11 @@
 					icon:'none'
 				})
 				setTimeout(()=>{
-					this.$util.redirectTo('/pages/order/list');
+					if (getCurrentPages().length > 1) {
+						uni.navigateBack();
+					} else {
+						this.$util.redirectTo('/pages/order/list');
+					}
 				},1000)
 			}
 		},
@@ -133,14 +136,11 @@
 			 * 跳转退款界面
 			 */
 			next(){
-				this.refund_data.forEach(item=>{
-					this.order_goods_id.push(item.order_goods_id)
-				})
 				if(this.order_goods_id.length == 0){
 					this.getOrderIdInfo();
 				}
 				
-				this.$util.redirectTo('/pages_tool/order/refund_batch', { order_goods_id: this.order_goods_id.join(), refund_type:this.refund_type });
+				this.$util.redirectTo('/pages_tool/order/refund_batch', { order_goods_id: this.order_goods_id.join(), refund_type:this.refund_type },'redirectTo');
 			},
 			/**
 			 * 默认图片处理
diff --git a/pages_tool/order/refund_type_select.vue b/pages_tool/order/refund_type_select.vue
index 1356ef1..cbf8dbc 100644
--- a/pages_tool/order/refund_type_select.vue
+++ b/pages_tool/order/refund_type_select.vue
@@ -10,7 +10,7 @@
 					</view>
 					<text class="iconfont icon-right"></text>
 				</view>
-				<view class="option-item" @click="selectRefundType(2)" v-if="refund_data.order_status == 3">
+				<view class="option-item" @click="selectRefundType(2)" v-if="refund_data.delivery_status > 0">
 					<view>
 						<text>退货退款</text>
 						<text class="font-size-goods-tag color-tip">已收到货，需退还收到的货物</text>
@@ -59,7 +59,7 @@
 			selectRefundType(type) {
 				this.$util.redirectTo('/pages_tool/order/refund_goods_select', {
 					refund_type: type
-				});
+				},'redirectTo');
 			},
 			/**
 			 * 获取退款订单数据
@@ -83,7 +83,11 @@
 								title: '未获取到该订单项退款信息'
 							});
 							setTimeout(() => {
-								this.$util.redirectTo('/pages/order/list');
+								if (getCurrentPages().length > 1) {
+									uni.navigateBack();
+								} else {
+									this.$util.redirectTo('/pages/order/list');
+								}
 							}, 1000);
 						}
 					},
diff --git a/pages_tool/pay/index.vue b/pages_tool/pay/index.vue
index 5a1833c..56a9913 100644
--- a/pages_tool/pay/index.vue
+++ b/pages_tool/pay/index.vue
@@ -1,133 +1,132 @@
-<template>
-	<page-meta :page-style="themeColor"></page-meta>
-	<scroll-view scroll-y="true" class="pay-container">
-		<view class="payment-amount">
-			<text class="amount-tit">{{ $lang('paymentAmount') }}</text>
-			<view class="amount-num">
-				{{ $lang('common.currencySymbol') }}
-				<text>{{ payInfo.pay_money }}</text>
-			</view>
-			<view class="payment-name">{{ payInfo.pay_body }}</view>
-		</view>
-
-		<loading-cover ref="loadingCover"></loading-cover>
-		
-	</scroll-view>
-</template>
-
-<script> 
-export default {
-	components: {},
-	data() {
-		return {
-			isIphoneX: false,
-			payInfo: {},
-			outTradeNo: '',
-		};
-	},
-	onLoad(option) {
-		if (option.code) this.outTradeNo = option.code;
-		this.isIphoneX = this.$util.uniappIsIPhoneX();
-	},
-	onShow() {
-
-		if (!this.storeToken) {
-			this.$util.redirectTo('/pages_tool/login/login');
-		} else {
-			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.$refs.loadingCover) this.$refs.loadingCover.hide();
-					} else {
-						this.$util.showToast({
-							title: '未获取到支付信息！'
-						});
-						setTimeout(() => {
-							this.$util.redirectTo('/pages/index/index');
-						}, 1500);
-					}
-				},
-				fail: res => {
-					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-				}
-			});
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-.pay-container {
-	width: 100vw;
-	height: 100vh;
-}
-@mixin flex-column {
-	display: flex;
-	flex-direction: column;
-	justify-content: center;
-	align-items: center;
-}
-@mixin flex-row {
-	display: flex;
-	align-items: center;
-	justify-content: space-between;
-}
-.payment-amount {
-	@include flex-column;
-	margin: $margin-updown $margin-both;
-	border-radius: 8rpx;
-	padding: 20rpx 0 58rpx 0;
-	background-color: #fff;
-	.amount-tit {
-		font-size: $font-size-base;
-		color: #838383;
-		line-height: 1;
-		margin-top: 44rpx;
-	}
-	.amount-num {
-		color: #000;
-		margin-top: 36rpx;
-		line-height: 1;
-		text {
-			font-size: $font-size-toolbar;
-			color: #000;
-		}
-	}
-	.amount-desc {
-		font-size: $font-size-tag;
-		color: #838383;
-		padding: 0 40rpx;
-		width: 100%;
-		box-sizing: border-box;
-		text-align: center;
-		line-height: 1;
-		text {
-			width: 100%;
-			display: block;
-			overflow: hidden;
-			text-overflow: ellipsis;
-			white-space: nowrap;
-		}
-	}
-	.payment-name {
-		width: 90%;
-		overflow: hidden;
-		text-overflow: ellipsis;
-		white-space: nowrap;
-		color: #838383;
-		margin-top: 30rpx;
-		text-align: center;
-		line-height: 1;
-	}
-}
-</style>
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<scroll-view scroll-y="true" class="pay-container">
+		<view class="payment-amount">
+			<text class="amount-tit">{{ $lang('paymentAmount') }}</text>
+			<view class="amount-num">
+				{{ $lang('common.currencySymbol') }}
+				<text>{{ payInfo.pay_money }}</text>
+			</view>
+			<view class="payment-name">{{ payInfo.pay_body }}</view>
+		</view>
+
+		<loading-cover ref="loadingCover"></loading-cover>
+		
+	</scroll-view>
+</template>
+
+<script> 
+export default {
+	components: {},
+	data() {
+		return {
+			isIphoneX: false,
+			payInfo: {},
+			outTradeNo: '',
+		};
+	},
+	onLoad(option) {
+		if (option.code) this.outTradeNo = option.code;
+		this.isIphoneX = this.$util.uniappIsIPhoneX();
+	},
+	onShow() {
+		if (!this.storeToken) {
+			this.$util.redirectTo('/pages_tool/login/login');
+		} else {
+			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.$refs.loadingCover) this.$refs.loadingCover.hide();
+					} else {
+						this.$util.showToast({
+							title: '未获取到支付信息！'
+						});
+						setTimeout(() => {
+							this.$util.redirectTo('/pages/index/index');
+						}, 1500);
+					}
+				},
+				fail: res => {
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				}
+			});
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+.pay-container {
+	width: 100vw;
+	height: 100vh;
+}
+@mixin flex-column {
+	display: flex;
+	flex-direction: column;
+	justify-content: center;
+	align-items: center;
+}
+@mixin flex-row {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+}
+.payment-amount {
+	@include flex-column;
+	margin: $margin-updown $margin-both;
+	border-radius: 8rpx;
+	padding: 20rpx 0 58rpx 0;
+	background-color: #fff;
+	.amount-tit {
+		font-size: $font-size-base;
+		color: #838383;
+		line-height: 1;
+		margin-top: 44rpx;
+	}
+	.amount-num {
+		color: #000;
+		margin-top: 36rpx;
+		line-height: 1;
+		text {
+			font-size: $font-size-toolbar;
+			color: #000;
+		}
+	}
+	.amount-desc {
+		font-size: $font-size-tag;
+		color: #838383;
+		padding: 0 40rpx;
+		width: 100%;
+		box-sizing: border-box;
+		text-align: center;
+		line-height: 1;
+		text {
+			width: 100%;
+			display: block;
+			overflow: hidden;
+			text-overflow: ellipsis;
+			white-space: nowrap;
+		}
+	}
+	.payment-name {
+		width: 90%;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+		color: #838383;
+		margin-top: 30rpx;
+		text-align: center;
+		line-height: 1;
+	}
+}
+</style>
diff --git a/pages_tool/pay/offlinepay.vue b/pages_tool/pay/offlinepay.vue
new file mode 100644
index 0000000..8b1ca3b
--- /dev/null
+++ b/pages_tool/pay/offlinepay.vue
@@ -0,0 +1,571 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view class="offlinepay">
+		<view class="pay-info">
+			<view class="title">实付金额</view>
+			<view class="pay-price price-style">
+				<text class="icon">￥</text>
+				<text class="price">{{payInfo.pay_money?parseFloat(payInfo.pay_money).toFixed(2):'0.00'}}</text>
+			</view>
+			<view class="pay-time" v-if="actionStatus=='add'">
+				<view class="text">支付剩余时间</view>
+				<block v-if="payInfo.time">
+					<view class="time" v-if="parseInt(payInfo.time.h)">{{payInfo.time.h}}</view>
+					<view class="separator" v-if="parseInt(payInfo.time.h)">:</view>
+					<view class="time">{{payInfo.time.i||'00'}}</view>
+					<view class="separator">:</view>
+					<view class="time">{{payInfo.time.s||'00'}}</view>
+				</block>
+				<block v-else>
+					<view class="time">00</view>
+					<view class="separator">:</view>
+					<view class="time">00</view>
+				</block>
+			</view>
+		</view>
+		<view class="pay-type" v-if="config.length">
+			<view class="top">
+				<block v-for="(item,index) in config" :key="index">
+					<view class="item" @click.stop="offlinepayTypeChange(index)">
+						<view class="center":class="{'active':index===activeIndex}">
+							{{item.key=='bank'?'银行卡':item.key=='wechat'?'微信支付':'支付宝'}}
+						</view>
+						<block v-if="activeIndex ==index">
+							<image v-if="activeIndex==0" class="image left" :src="$util.img('public/uniapp/offlinepay/head_style_left.png')"></image>
+							<image v-if="activeIndex==1" class="image center"  :src="$util.img('public/uniapp/offlinepay/head_style_center.png')"></image>
+							<image v-if="activeIndex==2" class="image right" :src="$util.img('public/uniapp/offlinepay/head_style_right.png')"></image>
+						</block>
+					</view>
+				</block>
+			</view>
+			<view v-if="config[activeIndex].key=='bank'" class="bank">
+				<view class="item">
+					<view class="label">银行名称：</view>
+					<view class="center using-hidden">{{config[activeIndex].bank_name}}</view>
+				</view>
+				<view class="item">
+					<view class="label">账号名称：</view>
+					<view class="center using-hidden">{{config[activeIndex].account_name}}</view>
+				</view>
+				<view class="item">
+					<view class="label">银行账号：</view>
+					<view class="center using-hidden">
+						<text>{{config[activeIndex].account_number}}</text>
+						<text class="copy" @click.stop="copy(config[activeIndex].account_number)">复制</text>
+					</view>
+				</view>
+				<view class="item">
+					<view class="label">开户支行：</view>
+					<view class="center using-hidden">{{config[activeIndex].branch_name}}</view>
+				</view>
+			</view>
+			<view class="code" v-else>
+				<view class="centent">
+					<image class="image" :src="$util.img(config[activeIndex].payment_code)"></image>
+				</view>
+				<view class="bottom">{{config[activeIndex].account_name}}</view>
+			</view>
+		</view>
+		<view class="pay-form" v-if="config.length">
+			<view class="title">支付凭证（最多5张）</view>
+			<view class="image-list">
+				<view class="image-info-box" v-for="(item, index) in offlinepayInfo.imgList" :key="index">
+					<image :src="$util.img(item)" mode="aspectFill" @click="preview(index)"></image>
+					<view class="imgDel" @click="deleteImg(index)"><text class=" icon iconfont icon-delete"></text></view>
+				</view>
+				<view class="image-info-box active" @click="addImg" v-if="offlinepayInfo.imgList.length < 5">
+					<text class="icon iconfont icon-zhaoxiangji"></text>
+					<text>{{ offlinepayInfo.imgList.length ? 5 - offlinepayInfo.imgList.length : 0 }}/5</text>
+				</view>
+			</view>
+			<view class="desc">
+				<textarea v-model="offlinepayInfo.desc" class="input" placeholder-style="color:#999;font-weight: 400;font-size: 24rpx;" placeholder="请详细说明您的支付情况" :maxlength="200"/>
+			</view>
+		</view>
+		<view class="pay-footer" v-if="config.length">
+			<button class="back" @click.stop="back">返回</button>
+			<button class="save" @click.stop="save">确定提交</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data(){
+			return{
+				config:[],
+				payInfo:{},
+				offlinepayInfo:{
+					out_trade_no:'',
+					imgs:'',
+					imgList:[],
+					desc:'',
+					
+				},
+				actionStatus:'add',
+				outTradeNo:'',
+				time:null,
+				activeIndex:0,
+				repeat_flag:false,
+				routePath:''
+			}
+		},
+		onLoad(options) {
+			this.outTradeNo = options.outTradeNo;
+			this.offlinepayInfo.out_trade_no = options.outTradeNo;
+			this.getOfflinepayConfig()
+			this.getOfflinepayPayInfo(this.outTradeNo)
+			this.getPayInfo(this.outTradeNo)
+			
+			// 获取当前页面栈实例数组
+			const pages = getCurrentPages();
+			// 数组中最后一个元素即为当前页面实例
+			if(pages.length<1){
+				this.getroutePath(this.outTradeNo)
+			}
+			
+			
+		},
+		methods:{
+			getOfflinepayConfig(){
+				this.$api.sendRequest({
+				    url: '/offlinepay/api/pay/config',
+				    success: res => {
+				        if (res.code >= 0 && res.data) { 
+							let data = res.data.value
+				            Object.keys(data).forEach(key=>{
+								if(data[key].status=='1'){
+									data[key].key = key
+									this.config.push(data[key])
+								}
+							});
+				        } else {
+				            this.$util.showToast({
+				                title: '未获取到支付配置！'
+				            });
+				        }
+				    }
+				});
+			},
+			getPayInfo(out_trade_no){
+				this.$api.sendRequest({
+				    url: '/api/pay/info',
+					data:{out_trade_no},
+				    success: res => {
+				        if (res.code >= 0 && res.data) {
+				            this.payInfo = res.data;
+							this.payInfo.timestamp = res.timestamp
+							if(this.payInfo.timestamp<this.payInfo.auto_close_time){
+								this.payInfo.time = this.$util.countDown(this.payInfo.auto_close_time-this.payInfo.timestamp)
+								this.time = setInterval(()=>{
+									if(this.payInfo.timestamp>=this.payInfo.auto_close_time) clearInterval(this.time)
+									this.payInfo.timestamp+=1
+									this.payInfo.time = this.$util.countDown(this.payInfo.auto_close_time-this.payInfo.timestamp)
+									this.$forceUpdate();
+									
+								},1000)	
+							}
+							
+				        } else {
+				            this.$util.showToast({
+				                title: '未获取到支付信息！'
+				            });
+				        }
+				    }
+				});
+			},
+			getOfflinepayPayInfo(out_trade_no){
+				this.$api.sendRequest({
+				    url: '/offlinepay/api/pay/info',
+					data:{out_trade_no},
+				    success: res => {
+				        if (res.code >= 0 && res.data) {
+				            this.actionStatus = 'edit'
+							this.offlinepayInfo = res.data
+							this.offlinepayInfo.imgList = this.offlinepayInfo.imgs?this.offlinepayInfo.imgs.split(','):[]
+							// this.offlinepayInfo.out_trade_no = this.outTradeNo
+				        }
+				    }
+				});
+			},
+			//获取路由
+			getroutePath(out_trade_no){
+				this.$api.sendRequest({
+				    url: '/api/pay/outTradeNoToOrderDetailPath',
+					data:{out_trade_no},
+				    success: res => {
+				        if (res.code >= 0 && res.data) {
+				            this.routePath = res.data
+				        }
+				    }
+				});
+				
+			},
+			offlinepayTypeChange(index){
+				this.activeIndex = index
+			},
+			copy(text){
+				this.$util.copy(text);
+			},
+			//添加图片
+			addImg() {
+				let size = this.offlinepayInfo.imgList.length
+				this.$util.upload(5 - size, {
+					path: ''
+				}, res => {
+					this.offlinepayInfo.imgList = this.offlinepayInfo.imgList.concat(res);
+					this.offlinepayInfo.imgs = this.offlinepayInfo.imgList.toString()
+				},'/offlinepay/api/pay/uploadimg');
+			},
+			//删除图片
+			deleteImg(index, ) {
+				this.offlinepayInfo.imgList.splice(index, 1);
+				this.offlinepayInfo.imgs = this.offlinepayInfo.imgList.toString()
+			},
+			back(){
+				const pages = getCurrentPages();
+				// 数组中最后一个元素即为当前页面实例
+				if(pages.length>1){
+					uni.navigateBack({
+						delta: 1
+					});
+				}else{
+					this.$util.redirectTo(this.routePath,{},'redirectTo')
+				}
+				
+			},
+			save(){
+				if(this.repeat_flag) return;
+				if(!this.offlinepayInfo.imgList.length){
+					uni.showToast({
+						title: '请至少上传一张凭证',
+						icon: 'none'
+					})
+					return;
+				}
+				this.repeat_flag = true
+				// #ifdef MP
+				this.$util.subscribeMessage('OFFLINEPAY_AUDIT_REFUSE', ()=>{
+					this.saveSubmit();
+				})
+				// #endif
+				// #ifndef MP
+				this.saveSubmit();
+				// #endif
+			},
+			saveSubmit(){
+				this.$api.sendRequest({
+				    url: '/offlinepay/api/pay/pay',
+					data:this.offlinepayInfo,
+				    success: res => {
+						this.repeat_flag = false
+				        if (res.code >= 0) {
+							uni.setStorageSync('offlinepay','offlinepay')
+				            this.back()
+				        }else{
+							uni.showToast({
+								title: res.message,
+								icon: 'none'
+							})
+						}
+				    }
+				});
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.offlinepay{
+		width: 100%;
+		min-height: 100vh;
+		box-sizing: border-box;
+		background: #F6F6F6;
+		padding-top: 20rpx;
+		padding-left: 30rpx;
+		padding-right: 30rpx;
+		padding-bottom: calc(164rpx  + constant(safe-area-inset-bottom)) !important;
+		padding-bottom: calc(164rpx  + env(safe-area-inset-bottom)) !important;
+		.pay-info{
+			width: 100%;
+			padding: 40rpx 30rpx;
+			background-color: #fff;
+			border-radius: 16rpx;
+			box-sizing: border-box;
+			.title{
+				font-size: 24rpx;
+				color: #666;
+				line-height: 34rpx;
+				font-weight: 600;
+				text-align: center;
+			}
+			.pay-price{
+				width: 100%;
+				display: flex;
+				justify-content: center;
+				align-items: baseline;
+				color: #EF000C;
+				margin-top:6rpx;
+				.icon{
+					line-height: 33rpx;
+					font-weight: bold;
+					font-size: 26rpx;
+				}
+				.price{
+					line-height: 59rpx;
+					font-weight: bold;
+					font-size: 46rpx;
+				}
+			}
+			.pay-time{
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				margin-top: 14rpx;
+				.text{
+					line-height: 36rpx;
+					font-weight: 400;
+					font-size: 26rpx;
+					color: #666666;
+					margin-right: 11rpx;
+				}
+				.time{
+					width: 34rpx;
+					height: 34rpx;
+					// padding: 0 3rpx;
+					background: #F0F0F3;
+					border-radius: 2rpx 2rpx 2rpx 2rpx;
+					font-weight: 500;
+					font-size: 26rpx;
+					color: #333333;
+					line-height: 34rpx;
+					text-align: center;
+				}
+				.separator{
+					font-weight: 500;
+					font-size: 28rpx;
+					margin: 0 10rpx;
+					height: 34rpx;
+					line-height: 28rpx;
+				}
+			}
+		}
+		.pay-type{
+			margin-top: 40rpx;
+			.top{
+				width: 100%;
+				display: flex;
+				align-items: center;
+				height: 80rpx;
+				background: #F1F2F5;
+				border-radius: 16rpx 16rpx 0rpx 0rpx;
+				.item{
+					width: 230rpx;
+					height: 80rpx;
+					position: relative;
+					.center{
+						width: 100%;
+						height: 100%;
+						position: absolute;
+						left: 0;
+						bottom: 0;
+						z-index: 9;
+						line-height: 80rpx;
+						text-align: center;
+						font-weight: 400;
+						font-size: 32rpx;
+						&.active{
+							color: var(--base-color);
+							font-weight: bold;
+						}
+					}
+					.image{
+						height: 104rpx;
+						width: 267rpx;
+						position: absolute;
+						bottom: 0;
+						z-index: 2;
+						&.left{
+							left: -2rpx;
+						}
+						&.center{
+							width: 315rpx;
+							left: 50%;
+							transform: translateX(-50%);
+						}
+						&.right{
+							right:-2rpx;
+						}
+					}
+				}
+			}
+			.bank{
+				padding: 30rpx;
+				background: #fff;
+				border-radius: 0 0 16rpx 16rpx;
+				.item{
+					display: flex;
+					align-items: center;
+					margin-top: 30rpx;
+					&:first-of-type{
+						margin-top: 0 !important;
+					}
+					.label{
+						line-height: 36rpx;
+						font-weight: 400;
+						font-size: 26rpx;
+						color: #666666;
+					}
+					.center{
+						width: 500rpx;
+						line-height: 36rpx;
+						font-weight: 500;
+						font-size: 26rpx;
+						.copy{
+							color: var(--base-color);
+							margin-left: 20rpx;
+						}
+					}
+				}
+			}
+			.code{
+				padding: 50rpx 0;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				flex-direction: column;
+				background: #fff;
+				border-radius: 0 0 16rpx 16rpx;
+				.centent{
+					width: 360rpx;
+					height: 360rpx;
+					border-radius: 16rpx;
+					border: 1rpx solid #DEDEDE;
+					padding: 30rpx;
+					box-sizing: border-box;
+					.image{
+						width: 300rpx;
+						height: 300rpx;
+					}
+				}
+				.bottom{
+					height: 39rpx;
+					line-height: 39rpx;
+					font-weight: 500;
+					font-size: 28rpx;
+					margin-top: 30rpx;
+				}
+			}
+			
+		}
+		.pay-form{
+			margin-top: 20rpx;
+			padding: 30rpx;
+			border-radius: 16rpx;
+			background-color: #fff;
+			.title{
+				line-height: 33rpx;
+				font-weight: 500;
+				font-size: 26rpx;
+				color: #333333;
+			}
+			.image-list{
+				display: flex;
+				align-items: center;
+				margin-top: 30rpx;
+				.image-info-box {
+					width: 110rpx;
+					height: 110rpx;
+					display: flex;
+					flex-direction: column;
+					justify-content: center;
+					align-items: center;
+					margin-left: 20rpx;
+					position: relative;
+					-ms-flex-negative: 0;
+					-webkit-flex-shrink: 0;
+					flex-shrink: 0;
+					&:first-of-type{
+						margin-left: 0 !important;
+					}
+					image {
+						width: 100%;
+						border-radius: $border-radius;
+					}
+					.iconfont {
+						font-size: 60rpx;
+						color: #898989;
+						line-height: 1;
+					}
+					text {
+						line-height: 1;
+					}
+					.imgDel {
+						width: 40rpx;
+						height: 40rpx;
+						position: absolute;
+						right: -20rpx;
+						top: -20rpx;
+						display: flex;
+						justify-content: center;
+						align-items: center;
+						.iconfont {
+							font-size: $font-size-toolbar;
+						}
+					}
+				}
+				.image-info-box.active {
+					border: 1rpx dashed #898989;
+				}
+				.image-info-box.active:active {
+					background: rgba($color: #cccccc, $alpha: 0.6);
+				}
+			}
+			.desc{
+				margin-top: 40rpx;
+				border-top: 1rpx dashed #898989;
+				padding-top: 20rpx;
+				.input{
+					width: 100%;
+					font-weight: 400;
+					font-size: 24rpx;
+				}
+			}
+		}
+		.pay-footer{
+			position: fixed;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			left: 0;
+			right:0;
+			bottom: 0;
+			z-index: 10;
+			padding: 28rpx 30rpx;
+			padding-bottom: calc(28rpx  + constant(safe-area-inset-bottom)) !important;
+			padding-bottom: calc(28rpx  + env(safe-area-inset-bottom)) !important;
+			background: #F6F6F6;
+			.back{
+				width: 220rpx;
+				height: 88rpx;
+				line-height: 82rpx;
+				font-size: 32rpx;
+				font-weight: 500;
+				color: var(--base-color);
+				background: #FFFFFF;
+				border-radius: 50rpx 50rpx 50rpx 50rpx;
+				border: 3rpx solid var(--base-color);
+				box-sizing: border-box;
+			}
+			.save{
+				width: 430rpx;
+				height: 88rpx;
+				font-size: 32rpx;
+				font-weight: 500;
+				color: #fff;
+				background: var(--base-color);
+				border-radius: 50rpx 50rpx 50rpx 50rpx
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages_tool/pay/result.vue b/pages_tool/pay/result.vue
index 818ece9..518aca5 100644
--- a/pages_tool/pay/result.vue
+++ b/pages_tool/pay/result.vue
@@ -1,344 +1,336 @@
-<template>
-	<page-meta :page-style="themeColor"></page-meta>
-	<view class="container">
-		<template v-if="payInfo.pay_status != undefined">
-			<view class="result-box">
-				<template v-if="payInfo.pay_status">
-					<image :src="$util.img('public/uniapp/pay/pay_success.png')" mode="widthFix" lazy-load="true" class="result-image"/>
-					<view class="msg success">{{ $lang('paymentSuccess') }}</view>
-					<view class="pay-amount">
-						<text class="unit price-style small">{{ $lang('common.currencySymbol') }}</text>
-						<text class="price-style large">{{ parseFloat(payInfo.pay_money).toFixed(2).split(".")[0] }}</text>
-						<text class="price-style small">.{{ parseFloat(payInfo.pay_money).toFixed(2).split(".")[1] }}</text>
-					</view>
-				</template>
-				<template v-else>
-					<image :src="$util.img('public/uniapp/pay/pay_fail.png')" mode="widthFix" class="result-image"/>
-					<view class="msg fail">{{ $lang('paymentFail') }}</view>
-				</template>
-
-				<view class="consume-box" v-if="addonIsExist.memberconsume && consumeStatus == 1 && payInfo.pay_status">
-					<view class="consume-head">
-						<view class="consume-head-text">恭喜您获得</view>
-					</view>
-					<view class="consume-list">
-						<view class="consume-item" v-if="consumeInfo.point_num > 0">
-							<image :src="$util.img('public/uniapp/pay/point.png')" mode="widthFix"></image>
-							<view class="consume-value color-base-text">{{ consumeInfo.point_num }}</view>
-							<view class="consume-type">积分</view>
-						</view>
-						<view class="consume-item" v-if="consumeInfo.growth_num > 0">
-							<image :src="$util.img('public/uniapp/pay/growth.png')" mode="widthFix"></image>
-							<view class="consume-value color-base-text">{{ consumeInfo.growth_num }}</view>
-							<view class="consume-type">成长值</view>
-						</view>
-						<view class="consume-item" v-if="consumeInfo.coupon_list.length > 0">
-							<image :src="$util.img('public/uniapp/pay/coupon.png')" mode="widthFix"></image>
-							<view class="consume-value color-base-text">{{ consumeInfo.coupon_list.length }}</view>
-							<view class="consume-type">张优惠券</view>
-						</view>
-					</view>
-				</view>
-
-				<view class="action">
-					<template v-if="storeToken">
-						<view v-if="paySource == 'recharge'" class="btn" @click="toRecharge()">充值记录</view>
-						<view v-else-if="paySource == 'membercard'" class="btn" @click="toCard()">会员卡</view>
-						<view v-else-if="paySource == 'presale'" class="btn" @click="toPresaleOrder()">查看订单</view>
-						<view v-else-if="paySource == 'giftcard'" class="btn" @click="toOrder()">查看订单</view>
-						<view v-else-if="paySource == 'pointexchange'" class="btn" @click="toExchangeOrder()">查看订单
-						</view>
-						<view v-else class="btn" @click="toOrderDetail(payInfo.order_id)">查看订单</view>
-					</template>
-					<view class="btn go-home" @click="goHome()">{{ $lang('goHome') }}</view>
-				</view>
-			</view>
-
-			<ns-goods-recommend route="pay"></ns-goods-recommend>
-		</template>
-		<loading-cover ref="loadingCover"></loading-cover>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				payInfo: {},
-				outTradeNo: '',
-				paySource: '',
-				consumeInfo: {},
-				consumeStatus: 0,
-			};
-		},
-		onLoad(option) {
-			if (option.code) this.outTradeNo = option.code;
-			this.paySource = uni.getStorageSync('paySource');
-		},
-		onShow() {
-			this.getPayInfo();
-			this.getConsume();
-		},
-		methods: {
-			consume(type) {
-				switch (type) {
-					case 'point':
-						this.$util.redirectTo('/pages_tool/member/point_detail', {});
-						break;
-					case 'growth':
-						this.$util.redirectTo('/pages_tool/member/level', {});
-						break;
-					case 'coupon':
-						this.$util.redirectTo('/pages_tool/member/coupon', {});
-						break;
-					default:
-						this.$util.redirectTo('/pages/member/index', {}, 'reLaunch');
-						break;
-				}
-			},
-			getConsume() {
-				this.$api.sendRequest({
-					url: '/memberconsume/api/config/info',
-					data: {
-						out_trade_no: this.outTradeNo
-					},
-					success: res => {
-						if (res.code >= 0 && res.data) {
-							let reward = res.data.value;
-							if (res.data.is_use && (reward.point_num > 0 || reward.growth_num > 0 || reward.coupon_list.length)) {
-								this.consumeStatus = res.data.is_use;
-								this.consumeInfo = res.data.value;
-							}
-						}
-					},
-					fail: res => {
-						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-					}
-				});
-			},
-			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;
-							this.payInfo.pay_money = parseFloat(res.data.pay_money);
-							this.payInfo.pay_money += parseFloat(res.data.balance);
-							this.payInfo.pay_money += parseFloat(res.data.balance_money);
-							if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-						} else {
-							this.$util.showToast({
-								title: '未获取到支付信息！'
-							});
-							setTimeout(() => {
-								this.$util.redirectTo('/pages/index/index', {}, 'reLaunch');
-							}, 1500);
-						}
-					},
-					fail: res => {
-						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-					}
-				});
-			},
-			goHome() {
-				this.$util.redirectTo('/pages/index/index', {}, 'reLaunch');
-			},
-			toOrderDetail(id) {
-				if (this.payInfo.order_type == 2) {
-					this.$util.redirectTo('/pages/order/detail_pickup', {
-						order_id: id
-					}, 'redirectTo');
-				} else if (this.payInfo.order_type == 3) {
-					this.$util.redirectTo('/pages/order/detail_local_delivery', {
-						order_id: id
-					}, 'redirectTo');
-				} else if (this.payInfo.order_type == 4) {
-					this.$util.redirectTo('/pages_tool/order/detail_virtual', {
-						order_id: id
-					}, 'redirectTo');
-				} else {
-					this.$util.redirectTo('/pages/order/detail', {
-						order_id: id
-					}, 'redirectTo');
-				}
-			},
-			toOrder(id) {
-				this.$util.redirectTo('/pages_promotion/giftcard/order_list', {}, 'redirectTo');
-				uni.setStorageSync('paySource', '');
-			},
-			toRecharge() {
-				this.$util.redirectTo('/pages_tool/recharge/order_list', {}, 'redirectTo');
-				uni.setStorageSync('paySource', '');
-			},
-			toCard() {
-				this.$util.redirectTo('/pages_tool/member/card', {}, 'redirectTo');
-				uni.setStorageSync('paySource', '');
-			},
-			toPresaleOrder() {
-				this.$util.redirectTo('/pages_promotion/presale/order_list', {}, 'redirectTo');
-				uni.setStorageSync('paySource', '');
-			},
-			toExchangeOrder() {
-				this.$util.redirectTo('/pages_promotion/point/order_list', {}, 'redirectTo');
-				uni.setStorageSync('paySource', '');
-			}
-		}
-	};
-</script>
-
-<style lang="scss">
-	.consume-box {
-		padding: $padding;
-		background: #F8F8F8;
-		width: calc(100% - 48rpx);
-		margin: 0 24rpx 0 24rpx;
-		box-sizing: border-box;
-		border-radius: 20rpx;
-
-		.consume-head {
-			display: flex;
-			justify-content: center;
-			font-weight: 500;
-			font-size: 26rpx;
-
-			.consume-head-text {
-				line-height: 1;
-			}
-		}
-
-		.consume-list {
-			display: flex;
-		}
-
-		.consume-item {
-			flex: 1;
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			color: $color-title;
-			font-size: $font-size-base;
-			margin-top: 10rpx;
-
-			image {
-				width: 24rpx;
-				margin-right: 4rpx;
-			}
-
-			.consume-value {
-				font-size: 26rpx;
-			}
-		}
-
-		.consume-remark {
-			color: $color-tip;
-			font-size: $font-size-tag;
-			padding: 10rpx 20rpx;
-		}
-	}
-
-	.clear {
-		clear: both;
-	}
-
-	.container {
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-
-		.result-box {
-			padding-top: 94rpx;
-			display: flex;
-			flex-direction: column;
-			align-items: center;
-			background-color: #FFFFFF;
-			width: 100%;
-			padding-bottom: 40rpx;
-		}
-
-		.result-image {
-			width: 80rpx;
-			height: auto;
-			will-change: transform;
-		}
-
-		.msg {
-			font-size: 32rpx;
-			margin-top: 25rpx;
-
-			&.success {
-				color: #09BB07;
-			}
-
-			&.fail {
-				color: #FF4646;
-			}
-		}
-
-		.pay-amount {
-			font-size: 30rpx;
-			margin: 40rpx 0 24rpx 0;
-			font-weight: 600;
-			line-height: 50rpx;
-
-			text {
-				color: #333333 !important;
-				font-weight: bold !important;
-			}
-
-			.unit {
-				margin-right: 4rpx;
-			}
-
-			.large {
-				font-size: 60rpx !important;
-			}
-
-			.small {
-				font-size: 36rpx !important;
-			}
-		}
-
-		.action {
-			width: 100%;
-			height: 80rpx;
-			display: flex;
-			justify-content: center;
-			box-sizing: border-box;
-			margin-top: 24rpx;
-
-			.btn {
-				font-size: 30rpx;
-				width: 200rpx;
-				height: 66rpx;
-				line-height: 66rpx;
-				text-align: center;
-				border-radius: 66rpx;
-				border: 1px solid $color-tip;
-				box-sizing: border-box;
-
-				&:last-child {
-					margin-left: 40rpx;
-				}
-			}
-
-			.go-home {
-				background-color: $base-color;
-				color: #fff;
-				border-color: $base-color;
-			}
-		}
-	}
-
-	/deep/ .goods-recommend {
-		margin-top: 30rpx;
-	}
-</style>
-
-<style scoped>
-	/deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
-		max-height: unset !important;
-	}
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view class="container">
+		<template v-if="payInfo.pay_status != undefined">
+			<view class="result-box">
+				<template v-if="payInfo.pay_status">
+					<image :src="$util.img('public/uniapp/pay/pay_success.png')" mode="widthFix" lazy-load="true" class="result-image"/>
+					<view class="msg success">{{ $lang('paymentSuccess') }}</view>
+					<view class="pay-amount">
+						<text class="unit price-style small">{{ $lang('common.currencySymbol') }}</text>
+						<text class="price-style large">{{ parseFloat(payInfo.pay_money).toFixed(2).split(".")[0] }}</text>
+						<text class="price-style small">.{{ parseFloat(payInfo.pay_money).toFixed(2).split(".")[1] }}</text>
+					</view>
+				</template>
+				<template v-else>
+					<image :src="$util.img('public/uniapp/pay/pay_fail.png')" mode="widthFix" class="result-image"/>
+					<view class="msg fail">{{ $lang('paymentFail') }}</view>
+				</template>
+
+				<view class="consume-box" v-if="addonIsExist.memberconsume && consumeInfo.is_reward == 1 && payInfo.pay_status">
+					<view class="consume-head">
+						<view class="consume-head-text">恭喜您获得</view>
+					</view>
+					<view class="consume-list">
+						<view class="consume-item" v-if="consumeInfo.point_num > 0" @click="toMemberPoint()">
+							<image :src="$util.img('public/uniapp/pay/point.png')" mode="widthFix"></image>
+							<view class="consume-value color-base-text">{{ consumeInfo.point_num }}</view>
+							<view class="consume-type">积分</view>
+						</view>
+						<view class="consume-item" v-if="consumeInfo.growth_num > 0" @click="toMemberLevel()">
+							<image :src="$util.img('public/uniapp/pay/growth.png')" mode="widthFix"></image>
+							<view class="consume-value color-base-text">{{ consumeInfo.growth_num }}</view>
+							<view class="consume-type">成长值</view>
+						</view>
+						<view class="consume-item" v-if="consumeInfo.coupon_list.length > 0" @click="toMemberCoupon()">
+							<image :src="$util.img('public/uniapp/pay/coupon.png')" mode="widthFix"></image>
+							<view class="consume-value color-base-text">{{ consumeInfo.coupon_list.length }}</view>
+							<view class="consume-type">张优惠券</view>
+						</view>
+					</view>
+				</view>
+
+				<view class="action">
+					<template v-if="storeToken">
+						<view v-if="paySource == 'recharge'" class="btn" @click="toRecharge()">充值记录</view>
+						<view v-else-if="paySource == 'membercard'" class="btn" @click="toCard()">会员卡</view>
+						<view v-else-if="paySource == 'presale'" class="btn" @click="toPresaleOrder()">查看订单</view>
+						<view v-else-if="paySource == 'giftcard'" class="btn" @click="toOrder()">查看订单</view>
+						<view v-else-if="paySource == 'pointexchange'" class="btn" @click="toExchangeOrder()">查看订单
+						</view>
+						<view v-else class="btn" @click="toOrderDetail(payInfo.order_id)">查看订单</view>
+					</template>
+					<view class="btn go-home" @click="goHome()">{{ $lang('goHome') }}</view>
+				</view>
+			</view>
+
+			<ns-goods-recommend route="pay"></ns-goods-recommend>
+		</template>
+		<loading-cover ref="loadingCover"></loading-cover>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				payInfo: {},
+				outTradeNo: '',
+				paySource: '',
+				consumeInfo: {
+					is_reward:0,
+				},
+			};
+		},
+		onLoad(option) {
+			if (option.code) this.outTradeNo = option.code;
+			this.paySource = uni.getStorageSync('paySource');
+		},
+		onShow() {
+			this.getPayInfo();
+			this.getConsume();
+		},
+		methods: {
+			consume(type) {
+				switch (type) {
+					case 'point':
+						this.$util.redirectTo('/pages_tool/member/point_detail', {});
+						break;
+					case 'growth':
+						this.$util.redirectTo('/pages_tool/member/level', {});
+						break;
+					case 'coupon':
+						this.$util.redirectTo('/pages_tool/member/coupon', {});
+						break;
+					default:
+						this.$util.redirectTo('/pages/member/index', {}, 'reLaunch');
+						break;
+				}
+			},
+			getConsume() {
+				this.$api.sendRequest({
+					url: '/memberconsume/api/config/info',
+					data: {
+						out_trade_no: this.outTradeNo
+					},
+					success: res => {
+						if (res.code >= 0) {
+							this.consumeInfo = res.data;
+						}
+					},
+					fail: res => {
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					}
+				});
+			},
+			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;
+							this.payInfo.pay_money = parseFloat(res.data.pay_money);
+							this.payInfo.pay_money += parseFloat(res.data.balance);
+							this.payInfo.pay_money += parseFloat(res.data.balance_money);
+							if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+						} else {
+							this.$util.showToast({
+								title: '未获取到支付信息！'
+							});
+							setTimeout(() => {
+								this.$util.redirectTo('/pages/index/index', {}, 'reLaunch');
+							}, 1500);
+						}
+					},
+					fail: res => {
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					}
+				});
+			},
+			goHome() {
+				this.$util.redirectTo('/pages/index/index', {}, 'reLaunch');
+			},
+			toOrderDetail(id) {
+				this.$util.redirectTo('/pages/order/detail', {
+					order_id: id
+				}, 'redirectTo');
+			},
+			toOrder(id) {
+				this.$util.redirectTo('/pages_promotion/giftcard/order_list', {}, 'redirectTo');
+				uni.setStorageSync('paySource', '');
+			},
+			toRecharge() {
+				this.$util.redirectTo('/pages_tool/recharge/order_list', {}, 'redirectTo');
+				uni.setStorageSync('paySource', '');
+			},
+			toCard() {
+				this.$util.redirectTo('/pages_tool/member/card', {}, 'redirectTo');
+				uni.setStorageSync('paySource', '');
+			},
+			toPresaleOrder() {
+				this.$util.redirectTo('/pages_promotion/presale/order_list', {}, 'redirectTo');
+				uni.setStorageSync('paySource', '');
+			},
+			toExchangeOrder() {
+				this.$util.redirectTo('/pages_promotion/point/order_list', {}, 'redirectTo');
+				uni.setStorageSync('paySource', '');
+			},
+			toMemberPoint() {
+				this.$util.redirectTo('/pages_tool/member/point');
+			},
+			toMemberCoupon() {
+				this.$util.redirectTo('/pages_tool/member/coupon');
+			},
+			toMemberLevel() {
+				this.$util.redirectTo('/pages_tool/member/level');
+			},
+		}
+	};
+</script>
+
+<style lang="scss">
+	.consume-box {
+		padding: $padding;
+		background: #F8F8F8;
+		width: calc(100% - 48rpx);
+		margin: 0 24rpx 0 24rpx;
+		box-sizing: border-box;
+		border-radius: 20rpx;
+
+		.consume-head {
+			display: flex;
+			justify-content: center;
+			font-weight: 500;
+			font-size: 26rpx;
+
+			.consume-head-text {
+				line-height: 1;
+			}
+		}
+
+		.consume-list {
+			display: flex;
+		}
+
+		.consume-item {
+			flex: 1;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			color: $color-title;
+			font-size: $font-size-base;
+			margin-top: 10rpx;
+
+			image {
+				width: 24rpx;
+				margin-right: 4rpx;
+			}
+
+			.consume-value {
+				font-size: 26rpx;
+			}
+		}
+
+		.consume-remark {
+			color: $color-tip;
+			font-size: $font-size-tag;
+			padding: 10rpx 20rpx;
+		}
+	}
+
+	.clear {
+		clear: both;
+	}
+
+	.container {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+
+		.result-box {
+			padding-top: 94rpx;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			background-color: #FFFFFF;
+			width: 100%;
+			padding-bottom: 40rpx;
+		}
+
+		.result-image {
+			width: 80rpx;
+			height: auto;
+			will-change: transform;
+		}
+
+		.msg {
+			font-size: 32rpx;
+			margin-top: 25rpx;
+
+			&.success {
+				color: #09BB07;
+			}
+
+			&.fail {
+				color: #FF4646;
+			}
+		}
+
+		.pay-amount {
+			font-size: 30rpx;
+			margin: 40rpx 0 24rpx 0;
+			font-weight: 600;
+			line-height: 50rpx;
+
+			text {
+				color: #333333 !important;
+				font-weight: bold !important;
+			}
+
+			.unit {
+				margin-right: 4rpx;
+			}
+
+			.large {
+				font-size: 60rpx !important;
+			}
+
+			.small {
+				font-size: 36rpx !important;
+			}
+		}
+
+		.action {
+			width: 100%;
+			height: 80rpx;
+			display: flex;
+			justify-content: center;
+			box-sizing: border-box;
+			margin-top: 24rpx;
+
+			.btn {
+				font-size: 30rpx;
+				width: 200rpx;
+				height: 66rpx;
+				line-height: 66rpx;
+				text-align: center;
+				border-radius: 66rpx;
+				border: 1px solid $color-tip;
+				box-sizing: border-box;
+
+				&:last-child {
+					margin-left: 40rpx;
+				}
+			}
+
+			.go-home {
+				background-color: $base-color;
+				color: #fff;
+				border-color: $base-color;
+			}
+		}
+	}
+
+	/deep/ .goods-recommend {
+		margin-top: 30rpx;
+	}
+</style>
+
+<style scoped>
+	/deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+		max-height: unset !important;
+	}
 </style>
\ No newline at end of file
diff --git a/pages_tool/recharge/list.vue b/pages_tool/recharge/list.vue
index 5155b27..a9c62ba 100644
--- a/pages_tool/recharge/list.vue
+++ b/pages_tool/recharge/list.vue
@@ -1,639 +1,611 @@
-<template>
-	<page-meta :page-style="themeColor"></page-meta>
-	<view class="page">
-		
-		<view>
-		<!-- 	<view class="recharge-title">充值</view>
-			<view class="account-box">
-				<view class="label">账户余额</view>
-				<view class="value"><text class="price-font">{{balanceInfo.balance}}</text><text>元</text></view>
-			</view> -->
-			
-			<view class="recharge-box">
-				<view class="recharge-box-title">充值金额
-					<view @click="toOrderList"><text class="color-base-text" style="color:#1db03b !important">充值记录</text></view>
-				</view>
-				<view class="box-content">
-						
-						<view class="money">
-							<text class="label">￥</text>
-							<view class="input-box">
-								<input class="reg-input" v-model="payMoney" placeholder="请输入充值金额" placeholder-style="font-size:32rpx;color:#969696;font-weight:500"></input>
-							</view>
-						</view>
-						
-					<view v-if="list.length" class="content-item" v-for="(item, index) in list" :key="index" @click="itemClick(index, item.recharge_id, item.buy_price)" :class="isIndex == index ? 'active' : ''">
-						<view class="price1 ">
-							<text class="price-font">{{ parseFloat(item.face_value).toFixed(0) }}</text>
-							<text>元</text>
-						</view>
-						<view class="price2">售价 {{ item.buy_price }} 元</view>
-					</view>
-					
-					<!-- <view class="content-item" @click="openRecharge()">
-						<view class="price1 ">
-							<text class="other">其他金额</text>
-						</view>
-					</view> -->
-					
-				</view>
-				
-			<!-- 	<view class="box-text" v-if="isIndex !== -1">
-					注：充值 {{ list[isIndex].face_value }} 元赠送：
-					<text>{{ list[isIndex].point }} 积分，</text>
-					<text>{{ list[isIndex].growth }} 成长值</text>
-					<text v-if="list[isIndex].coupon_id != ''">，优惠券X{{ list[isIndex].coupon_id.split(',').length }}</text>
-				</view> -->
-			</view>
- 
-		</view>
-	<!-- 	<view class="explain">
-			<view class="title">充值说明</view>
-			<view class="explain_list">
-				<view v-for="(item,index) in list" :key="index"  v-if="item.point || item.growth || item.coupon_id != ''">
-					充值 {{ item.face_value }} 元赠送：
-					<text v-if="item.point">{{ item.point }} 积分，</text>
-					<text v-if="item.growth">{{ item.growth }} 成长值</text>
-					<text v-if="item.coupon_id != ''">，优惠券X{{ item.coupon_id.split(',').length }}</text>
-				</view>
-				<view>
-					充值任意金额后，会存到您的账户资金中
-				</view>
-			</view>
-		</view> -->
-		<uni-popup ref="rechargePopup" type="bottom">
-			<view class="rechargeList">
-				<view class="tip">请输入充值金额</view>
-				<view class="input color-tip">
-					{{keywordsInfo.price?keywordsInfo.price:'金额'}}<text class="color-base-text">元</text>
-				</view>
-				<view class="input color-tip">
-					<text class="color-base-text" v-if="payMoney > 0">售价{{payMoney}}元</text>
-				</view>
-				<view class="keywords">
-					<view class="keywords-left">
-						<view class="active" @click="keywordsDown(1)">1</view>
-						<view class="active" @click="keywordsDown(2)">2</view>
-						<view class="active" @click="keywordsDown(3)">3</view>
-						<view class="active" @click="keywordsDown(4)">4</view>
-						<view class="active" @click="keywordsDown(5)">5</view>
-						<view class="active" @click="keywordsDown(6)">6</view>
-						<view class="active" @click="keywordsDown(7)">7</view>
-						<view class="active" @click="keywordsDown(8)">8</view>
-						<view class="active" @click="keywordsDown(9)">9</view>
-						<view class=""></view>
-						<view class="active" @click="keywordsDown(0)">0</view>
-						<view class=""></view>
-					</view>
-					<view class="keywords-right">
-						<view @click="delPrice"><text class="iconfont icon-close"></text></view>
-						<view class="color-base-bg" @click="keywordsPayment()">确认充值</view>
-					</view>
-				</view>
-			</view>
-		</uni-popup>
-		<!-- 选择支付方式弹窗 -->
-		<ns-payment ref="choosePaymentPopup" :payMoney="payMoney" @confirm="toPay"></ns-payment>
-		<view style="background: #fff;width: 100%;position: fixed;bottom: 0rpx;">
-			<button class="add-account" type="primary" @click="submitPayment" >充值</button>
-		</view>
-		
-		<!-- <button class="add-account" type="primary" :disabled="recharge_id > 0 ? false : true" @click="openChoosePayment">充值</button> -->
-		<loading-cover ref="loadingCover"></loading-cover>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				list: [],
-				balanceInfo: {
-					balance: 0,
-					balance_money: 0
-				},
-				isIndex: -1,
-				recharge_id: '',
-				amount: '',
-				payMoney: '',
-				keywordsInfo: {
-					price: 0,
-					minPrice: 1,
-					maxPrice: 30
-				}
-			};
-		},
-		onShow() {
-			this.getUserInfo();
-			this.getData();
-		},
-		methods: {
-			openRecharge() {
-				this.isIndex = -1;
-				this.payMoney = 0;
-				this.keywordsInfo.price = 0;
-				this.recharge_id = '';
-				this.$refs.rechargePopup.open()
-			},
-			submitPayment(){
-				this.isIndex = -1;
-				this.keywordsInfo.price = 0;
-				this.recharge_id = '';
-				this.amount = this.payMoney;
-				this.openChoosePayment()
-			},
-			toOrderList() {
-				this.$util.redirectTo('/pages_tool/recharge/order_list');
-			},
-			//点击每一个
-			itemClick(index, id, buy_price) {
-				if (this.amount) this.amount = '';
-				this.isIndex = index;
-				this.recharge_id = id;
-				this.payMoney = parseFloat(buy_price);
-			},
-			//键盘点击
-			keywordsDown(val) {
-				var temp = this.keywordsInfo.price == 0 ? val : this.keywordsInfo.price + '' + val, tempamount = temp
-				this.keywordsInfo.price = temp;
-				this.payMoney = tempamount;
-			},
-			delPrice() {
-				var temp = this.keywordsInfo.price.toString()
-				if (temp.length) {
-					this.keywordsInfo.price = temp.slice(0, temp.length - 1)
-					if (this.keywordsInfo.price.length > 0) {
-						this.payMoney = this.keywordsInfo.price;
-					} else {
-						this.payMoney = '';
-					}
-				}
-			},
-			keywordsPayment() {
-				if (this.keywordsInfo.price > 0) {
-					this.amount = this.payMoney;
-					this.$refs.rechargePopup.close()
-					this.openChoosePayment()
-				} else {
-					this.$util.showToast({
-						title: "请输入充值金额"
-					})
-				}
-
-			},
-			//输入框聚焦
-			cumberFocus() {
-				this.isIndex = -1;
-			},
-			getUserInfo() {
-				this.$api.sendRequest({
-					url: '/api/memberaccount/info',
-					data: {
-						account_type: 'balance,balance_money'
-					},
-					success: res => {
-						if (res.data) {
-							this.balanceInfo = res.data;
-						} else {
-							this.$util.showToast({
-								title: res.message
-							});
-						}
-					}
-				});
-			},
-			getData() {
-				this.$api.sendRequest({
-					url: '/memberrecharge/api/memberrecharge/page',
-					data: {
-						page_size: 100,
-						page: 1
-					},
-					success: res => {
-						let newArr = [];
-						let msg = res.message;
-						if (res.code == 0 && res.data) {
-							newArr = res.data.list;
-						} else {
-							this.$util.showToast({
-								title: msg
-							});
-						}
-						//设置列表数据
-						this.list = newArr; //追加新数据
-						
-						if(this.list.length > 0){
-							this.isIndex = 0;
-							this.recharge_id = this.list[0]['recharge_id'];
-							this.payMoney = parseFloat(this.list[0]['buy_price']);
-						}
-						
-						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-					},
-					fail: () => {
-						//联网失败的回调
-						mescroll.endErr();
-						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-					}
-				});
-			},
-			toPay() {
-				if (this.recharge_id !== '') {
-					this.$api.sendRequest({
-						url: '/memberrecharge/api/ordercreate/create',
-						data: {
-							recharge_id: this.recharge_id
-						},
-						success: res => {
-							if (res.data && res.code == 0) {
-								this.$refs.choosePaymentPopup.getPayInfo(res.data);
-							} else {
-								this.$util.showToast({
-									title: res.message
-								});
-							}
-						}
-					});
-				} else if (this.amount !== '') {
-					this.$api.sendRequest({
-						url: '/memberrecharge/api/ordercreate/create',
-						data: {
-							recharge_id: 0,
-							face_value: this.amount
-						},
-						success: res => {
-							if (res.data && res.code == 0) {
-								this.$refs.choosePaymentPopup.getPayInfo(res.data);
-							} else {
-								this.$util.showToast({
-									title: res.message
-								});
-							}
-						}
-					});
-				} else {
-					this.$util.showToast({
-						title: '请选择套餐'
-					});
-				}
-			},
-			imageError(index) {
-				this.list[index].cover_img = this.$util.getDefaultImage().goods;
-				this.$forceUpdate();
-			},
-			// 显示选择支付方式弹框
-			openChoosePayment() {
-				uni.setStorageSync('paySource', 'recharge');
-				if (this.amount !== '') this.payMoney = parseFloat(this.amount);
-				this.$refs.choosePaymentPopup.open();
-			}
-		}
-	};
-</script>
-
-<style lang="scss">
-	.page{
-		// min-height: 100vh;
-		// // width: 100%;
-		// background-color: #FFFFFF;
-		// padding: 32rpx;
-		box-sizing: border-box;
-	}
-	
-	/deep/ .mescroll-uni-fixed {
-		bottom: 280rpx !important;
-	}
-	.recharge-title{
-		font-size: 60rpx;
-		font-weight: bold;
-	}
-	.account-box{
-		margin-top: 30rpx;
-		display: flex;
-		justify-content: space-between;
-		align-items: baseline;
-		border-bottom: 2rpx solid #F6F6F6;
-		padding-bottom: 20rpx;
-		.label{
-			font-size:30rpx;
-			font-weight:bold;
-		}
-		.value{
-			
-			text{
-				font-size: 28rpx;
-				font-weight: bold;
-			}
-			.price-font{
-				font-size: 60rpx;
-				font-weight: bold;
-			}
-			
-		}
-	}
-	.explain {
-		margin-top: 80rpx;
-		padding: $padding 0;
-		background-color: #fff;
-		border-radius: $border-radius;
-
-		.title {
-			font-size: 32rpx;
-			font-weight: bold;
-		}
-
-		.explain_list {
-
-			view {
-				font-size: $font-size-sub;
-				color: $color-tip;
-			}
-		}
-	}
-
-	.rechargeList {
-		.tip {
-			padding: $margin-both;
-			text-align: center;
-			font-size: $font-size-toolbar;
-		}
-
-		.input {
-			text-align: center;
-
-			text {
-				margin-left: 10rpx;
-			}
-
-			margin-bottom: $margin-updown;
-		}
-
-		.keywords {
-			display: flex;
-			border-top: 1px solid $color-line;
-			margin-top: $margin-updown;
-
-			.keywords-left {
-				flex: 1;
-				display: flex;
-				flex-wrap: wrap;
-
-				>view {
-					width: calc((100% - 3px) / 3);
-					text-align: center;
-					height: 112rpx;
-					line-height: 112rpx;
-					border-right: 1px solid $color-line;
-					border-bottom: 1px solid $color-line;
-					font-size: 40rpx;
-
-					&.active:active {
-						background-color: rgba($color: #000000, $alpha: 0.5);
-					}
-				}
-			}
-
-			.keywords-right {
-				display: flex;
-				flex-wrap: wrap;
-				flex-direction: column;
-				width: 200rpx;
-
-				text-align: center;
-
-				>view {
-					flex: 1;
-					line-height: 228rpx;
-
-					&:last-child {
-						color: #fff
-					}
-				}
-			}
-		}
-	}
-
-	.recharge-price {
-		width: calc(100% - 60rpx);
-		background-color: #ffffff;
-		margin: 20rpx 30rpx 0;
-		border-radius: 10rpx;
-		padding: 30rpx 30rpx 25rpx;
-		box-sizing: border-box;
-
-		.recharge-price-title {
-			font-size: $font-size-base;
-			color: $color-title;
-			line-height: 1;
-		}
-
-		.recharge-price-custom {
-			border-bottom: 1px solid #dddddd;
-			padding-bottom: 20rpx;
-			display: flex;
-			align-items: center;
-			margin-top: 45rpx;
-
-			text {
-				font-size: 54rpx;
-				color: $color-title;
-				line-height: 1;
-			}
-
-			input {
-				font-size: 54rpx;
-				line-height: 1;
-			}
-		}
-
-		.recharge-price-desc {
-			display: flex;
-			margin-top: 16rpx;
-			align-items: center;
-
-			image {
-				width: 34rpx;
-				height: 34rpx;
-				margin-right: 13rpx;
-			}
-
-			text {
-				font-size: $font-size-sub;
-				color: $color-tip;
-				line-height: 1;
-			}
-		}
-	}
-
-	.recharge-box {
-		
-		padding:28rpx 24rpx 32rpx;
-		background: #fff;
-		height: 100%;
-		box-sizing: border-box;
-		border-radius: 24rpx;
-		margin: 32rpx;
-		.recharge-box-title {
-			font-size: $font-size-base;
-			color: #212121;
-			line-height: 1;
-			display: flex;
-			align-items: center;
-			justify-content: space-between;
-			margin-bottom: 28rpx;
-		}
-
-		.box-title {
-			text-align: center;
-			font-size: $font-size-toolbar;
-		}
-
-		.box-custom {
-			width: 226rpx;
-			border-bottom: 1px solid #dddddd;
-			margin: 0 auto;
-			margin-top: 49rpx;
-			line-height: 1;
-			padding-bottom: 10rpx;
-			box-sizing: border-box;
-
-			.pla-number {
-				font-size: 30rpx;
-			}
-
-			input {
-				height: 97rpx;
-				width: 100%;
-				font-size: 62rpx;
-				color: #000;
-				text-align: center;
-				line-height: 1;
-			}
-		}
-
-		.box-content {
-			width: 100%;
-			box-sizing: border-box;
-			display: flex;
-			flex-wrap: wrap;
-			max-height: 50vh;
-			overflow-y: scroll;
-			.money{
-				width: 100%;
-				display: -webkit-box;
-				display: -webkit-flex;
-				display: flex;
-				-webkit-flex-wrap: nowrap;
-				flex-wrap: nowrap;
-				-webkit-box-align: end;
-				-webkit-align-items: flex-end;
-				align-items: flex-end;
-				.label{
-					width: 30px;
-					font-size: 30px;
-					text-align: center;
-					line-height: 42px;
-					padding-bottom: 2px;
-					color: #212121;
-					font-weight: 600;
-					-webkit-flex-shrink: 0;
-					flex-shrink: 0;
-				}
-				.input-box{
-				    width: 0;
-				    -webkit-box-flex: 1;
-				    -webkit-flex: 1;
-				    flex: 1;
-					.reg-input {
-					    height: 48px !important;
-						font-size: 34px !important;
-						line-height: 48px !important;
-						height: 48px;
-						font-weight: 700 !important;
-						color: #212121;
-					}
-				}
-			}
-			.content-item {
-				width: calc((100% - 48rpx) / 3);
-				margin-right: 24rpx;
-				height: 142rpx;
-				margin-top: 25rpx;
-				border-radius: 16rpx;
-				display: flex;
-				flex-direction: column;
-				align-items: center;
-				justify-content: center;
-				color: $color-title;
-				box-sizing: border-box;
-				text-align: center;
-				background: #F7F7FB;
-				
-				&:nth-child(3n) {
-					margin-right: 0;
-				}
-
-				.price1 {
-					font-size: $font-size-base;
-					display: flex;
-					align-items: flex-end;
-					color: #333333;
-					text:first-child {
-						font-size: 40rpx;
-						line-height: 1;
-					}
-
-					text:nth-child(2) {
-						font-size: $font-size-base;
-						line-height: 1;
-					}
-					.other{
-						font-size: 32rpx!important;
-						color: #666666;
-					}
-				}
-
-				.price2 {
-					font-size: $font-size-tag;
-					color: #666666;
-					line-height: 1;
-					margin-top: 16rpx;
-				}
-
-				&.color-base-bg {
-
-					.price1,
-					.price2 {
-						color: #ffffff !important;
-					}
-				}
-				&.active{
-					background: linear-gradient(136deg, var(--promotion-aux-color) 0%, var(--promotion-color) 100%);
-					.price1,
-					.price2 {
-						color: #ffffff !important;
-					}
-				}
-			}
-			
-		}
-
-		.box-text {
-			margin-top: 40rpx;
-			font-size: $font-size-sub;
-			color: var(--main-color);
-		}
-	}
-	.add-account {
-		margin: 0;
-		margin-top: 5vh;
-		height: 76rpx;
-		line-height: 76rpx;
-		// width: 100%;
-		border-radius: 90rpx;
-		background: #1db03b!important;
-		color:#fff !important;
-		font-size: 28rpx;
-		margin: 18rpx 24rpx;
-	}
-</style>
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view class="page">
+		<view>
+			<view class="recharge-title">充值</view>
+			<view class="account-box">
+				<view class="label">账户余额</view>
+				<view class="value"><text class="price-font">{{balanceInfo.balance}}</text><text>元</text></view>
+			</view>
+			
+			<view class="recharge-box">
+				<view class="recharge-box-title">选择充值金额
+					<view @click="toOrderList"><text class="color-base-text">充值记录</text></view>
+				</view>
+				<view class="box-content">
+					
+					<view v-if="list.length" class="content-item" v-for="(item, index) in list" :key="index" @click="itemClick(index, item.recharge_id, item.buy_price)" :class="isIndex == index ? 'active' : ''">
+						<view class="price1 ">
+							<text class="price-font">{{ parseFloat(item.face_value).toFixed(2) }}</text>
+							<text>元</text>
+						</view>
+						<view class="price2">售价 {{ item.buy_price }} 元</view>
+					</view>
+					
+					<view class="content-item" @click="openRecharge()">
+						<view class="price1 ">
+							<text class="other">其他金额</text>
+						</view>
+					</view>
+					
+				</view>
+				
+				<view class="box-text" v-if="isIndex !== -1">
+					注：实际到账 {{ list[isIndex].face_value }} 元
+					<template v-if="list[isIndex].point > 0 || list[isIndex].growth > 0 || list[isIndex].coupon_id">
+						，赠送：
+						<text v-if="list[isIndex].point > 0">{{ list[isIndex].point }} 积分，</text>
+						<text v-if="list[isIndex].growth > 0">{{ list[isIndex].growth }} 成长值</text>
+						<text v-if="list[isIndex].coupon_id != ''">，优惠券X{{ list[isIndex].coupon_id.split(',').length }}</text>
+					</template>
+				</view>
+			</view>
+ 
+		</view>
+		<view class="explain">
+			<view class="title">充值说明</view>
+			<view class="explain_list">
+				<view v-for="(item,index) in list" :key="index"  v-if="item.point || item.growth || item.coupon_id != ''">
+					充值 {{ item.face_value }} 元赠送：
+					<text v-if="item.point">{{ item.point }} 积分，</text>
+					<text v-if="item.growth">{{ item.growth }} 成长值</text>
+					<text v-if="item.coupon_id != ''">，优惠券X{{ item.coupon_id.split(',').length }}</text>
+				</view>
+				<view>
+					充值任意金额后，会存到您的账户资金中
+				</view>
+			</view>
+		</view>
+		<uni-popup ref="rechargePopup" type="bottom">
+			<view class="rechargeList">
+				<view class="tip">请输入充值金额</view>
+				<view class="input color-tip" v-if="keywordsInfo.price !== ''">
+					{{keywordsInfo.price?keywordsInfo.price:'金额'}}<text class="color-base-text">元</text>
+				</view>
+				<view class="keywords">
+					<view class="keywords-left">
+						<view class="active" @click="keywordsDown(1)">1</view>
+						<view class="active" @click="keywordsDown(2)">2</view>
+						<view class="active" @click="keywordsDown(3)">3</view>
+						<view class="active" @click="keywordsDown(4)">4</view>
+						<view class="active" @click="keywordsDown(5)">5</view>
+						<view class="active" @click="keywordsDown(6)">6</view>
+						<view class="active" @click="keywordsDown(7)">7</view>
+						<view class="active" @click="keywordsDown(8)">8</view>
+						<view class="active" @click="keywordsDown(9)">9</view>
+						<view></view>
+						<view class="active" @click="keywordsDown(0)">0</view>
+						<view class="active" @click="keywordsDown('.')">.</view>
+					</view>
+					<view class="keywords-right">
+						<view @click="delPrice"><text class="iconfont icon-close"></text></view>
+						<view class="color-base-bg" @click="keywordsPayment()">确认充值</view>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+		<!-- 选择支付方式弹窗 -->
+		<ns-payment ref="choosePaymentPopup" :payMoney="payMoney" @confirm="toPay"></ns-payment>
+		<button class="add-account" type="primary" :disabled="recharge_id > 0 ? false : true" @click="openChoosePayment">充值</button>
+		<loading-cover ref="loadingCover"></loading-cover>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				list: [],
+				balanceInfo: {
+					balance: 0,
+					balance_money: 0
+				},
+				isIndex: -1,
+				recharge_id: '',
+				amount: '',
+				payMoney: 0,
+				keywordsInfo: {
+					price: 0,
+					minPrice: 1,
+					maxPrice: 30
+				}
+			};
+		},
+		onShow() {
+			this.getMemberrechargeConfig();
+			this.getUserInfo();
+			this.getData();
+		},
+		methods: {
+			/**
+			 * 获取充值提现配置
+			 */
+			getMemberrechargeConfig() {
+				this.$api.sendRequest({
+					url: '/memberrecharge/api/memberrecharge/config',
+					success: res => {
+						if (res.code >= 0 && res.data) {
+							let memberrechargeConfig = res.data;
+							if(!(this.addonIsExist.memberrecharge && memberrechargeConfig && memberrechargeConfig.is_use)){
+								this.$util.showToast({
+									title: "充值服务未开启"
+								})
+								setTimeout(() => {
+									uni.navigateBack({
+										delta: 1
+									});
+								}, 1000);
+							}
+						}
+					}
+				});
+			},
+			openRecharge() {
+				this.isIndex = -1;
+				this.payMoney = 0;
+				this.keywordsInfo.price = '';
+				this.recharge_id = '';
+				this.$refs.rechargePopup.open()
+			},
+			toOrderList() {
+				this.$util.redirectTo('/pages_tool/recharge/order_list');
+			},
+			//点击每一个
+			itemClick(index, id, buy_price) {
+				if (this.amount) this.amount = '';
+				this.isIndex = index;
+				this.recharge_id = id;
+				this.payMoney = parseFloat(buy_price);
+			},
+			//键盘点击
+			keywordsDown(val) {
+				this.keywordsInfo.price = this.keywordsInfo.price.toString();
+				val = val.toString();
+				//已经有两位小数不可以继续输入
+				var arr = this.keywordsInfo.price.split('.');
+				if(arr.length == 2 && arr[1].length == 2) return;
+				//已经有小数点不能继续输入
+				if(val == '.' && this.keywordsInfo.price.indexOf('.') > -1) return;
+				//不能一直输入0
+				if(this.keywordsInfo.price === '0' && val === '0') return;
+				this.keywordsInfo.price += val;
+				this.payMoney = this.keywordsInfo.price;
+			},
+			delPrice() {
+				var temp = this.keywordsInfo.price.toString()
+				if (temp.length) {
+					this.keywordsInfo.price = temp.slice(0, temp.length - 1)
+					if (this.keywordsInfo.price.length > 0) {
+						this.payMoney = this.keywordsInfo.price;
+					} else {
+						this.payMoney = '';
+					}
+				}
+			},
+			keywordsPayment() {
+				if (this.keywordsInfo.price > 0) {
+					this.amount = this.payMoney;
+					this.$refs.rechargePopup.close()
+					this.openChoosePayment()
+				} else {
+					this.$util.showToast({
+						title: "请输入充值金额"
+					})
+				}
+
+			},
+			//输入框聚焦
+			cumberFocus() {
+				this.isIndex = -1;
+			},
+			getUserInfo() {
+				this.$api.sendRequest({
+					url: '/api/memberaccount/info',
+					data: {
+						account_type: 'balance,balance_money'
+					},
+					success: res => {
+						if (res.data) {
+							this.balanceInfo = res.data;
+						} else {
+							this.$util.showToast({
+								title: res.message
+							});
+						}
+					}
+				});
+			},
+			getData() {
+				this.$api.sendRequest({
+					url: '/memberrecharge/api/memberrecharge/page',
+					data: {
+						page_size: 100,
+						page: 1
+					},
+					success: res => {
+						let newArr = [];
+						let msg = res.message;
+						if (res.code == 0 && res.data) {
+							newArr = res.data.list;
+						} else {
+							this.$util.showToast({
+								title: msg
+							});
+						}
+						//设置列表数据
+						this.list = newArr; //追加新数据
+						
+						if(this.list.length > 0){
+							this.isIndex = 0;
+							this.recharge_id = this.list[0]['recharge_id'];
+							this.payMoney = parseFloat(this.list[0]['buy_price']);
+						}
+						
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					},
+					fail: () => {
+						//联网失败的回调
+						mescroll.endErr();
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					}
+				});
+			},
+			toPay() {
+				if (this.recharge_id !== '') {
+					this.$api.sendRequest({
+						url: '/memberrecharge/api/ordercreate/create',
+						data: {
+							recharge_id: this.recharge_id
+						},
+						success: res => {
+							if (res.data && res.code == 0) {
+								this.$refs.choosePaymentPopup.getPayInfo(res.data);
+							} else {
+								this.$util.showToast({
+									title: res.message
+								});
+							}
+						}
+					});
+				} else if (this.amount !== '') {
+					this.$api.sendRequest({
+						url: '/memberrecharge/api/ordercreate/create',
+						data: {
+							recharge_id: 0,
+							face_value: this.amount
+						},
+						success: res => {
+							if (res.data && res.code == 0) {
+								this.$refs.choosePaymentPopup.getPayInfo(res.data);
+							} else {
+								this.$util.showToast({
+									title: res.message
+								});
+							}
+						}
+					});
+				} else {
+					this.$util.showToast({
+						title: '请选择套餐'
+					});
+				}
+			},
+			imageError(index) {
+				this.list[index].cover_img = this.$util.getDefaultImage().goods;
+				this.$forceUpdate();
+			},
+			// 显示选择支付方式弹框
+			openChoosePayment() {
+				uni.setStorageSync('paySource', 'recharge');
+				if (this.amount !== '') this.payMoney = parseFloat(this.amount);
+				this.$refs.choosePaymentPopup.open();
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	.page{
+		min-height: 100vh;
+		width: 100%;
+		background-color: #FFFFFF;
+		padding: 32rpx;
+		box-sizing: border-box;
+	}
+	/deep/ .mescroll-uni-fixed {
+		bottom: 280rpx !important;
+	}
+	.recharge-title{
+		font-size: 60rpx;
+		font-weight: bold;
+	}
+	.account-box{
+		margin-top: 30rpx;
+		display: flex;
+		justify-content: space-between;
+		align-items: baseline;
+		border-bottom: 2rpx solid #F6F6F6;
+		padding-bottom: 20rpx;
+		.label{
+			font-size:30rpx;
+			font-weight:bold;
+		}
+		.value{
+			
+			text{
+				font-size: 28rpx;
+				font-weight: bold;
+			}
+			.price-font{
+				font-size: 60rpx;
+				font-weight: bold;
+			}
+			
+		}
+	}
+	.explain {
+		margin-top: 80rpx;
+		padding: $padding 0;
+		background-color: #fff;
+		border-radius: $border-radius;
+
+		.title {
+			font-size: 32rpx;
+			font-weight: bold;
+		}
+
+		.explain_list {
+
+			view {
+				font-size: $font-size-sub;
+				color: $color-tip;
+			}
+		}
+	}
+
+	.rechargeList {
+		.tip {
+			padding: $margin-both;
+			text-align: center;
+			font-size: $font-size-toolbar;
+		}
+
+		.input {
+			text-align: center;
+
+			text {
+				margin-left: 10rpx;
+			}
+
+			margin-bottom: $margin-updown;
+		}
+
+		.keywords {
+			display: flex;
+			border-top: 1px solid $color-line;
+			margin-top: $margin-updown;
+
+			.keywords-left {
+				flex: 1;
+				display: flex;
+				flex-wrap: wrap;
+
+				>view {
+					width: calc((100% - 3px) / 3);
+					text-align: center;
+					height: 112rpx;
+					line-height: 112rpx;
+					border-right: 1px solid $color-line;
+					border-bottom: 1px solid $color-line;
+					font-size: 40rpx;
+
+					&.active:active {
+						background-color: rgba($color: #000000, $alpha: 0.5);
+					}
+				}
+			}
+
+			.keywords-right {
+				display: flex;
+				flex-wrap: wrap;
+				flex-direction: column;
+				width: 200rpx;
+
+				text-align: center;
+
+				>view {
+					flex: 1;
+					line-height: 228rpx;
+
+					&:last-child {
+						color: #fff
+					}
+				}
+			}
+		}
+	}
+
+	.recharge-price {
+		width: calc(100% - 60rpx);
+		background-color: #ffffff;
+		margin: 20rpx 30rpx 0;
+		border-radius: 10rpx;
+		padding: 30rpx 30rpx 25rpx;
+		box-sizing: border-box;
+
+		.recharge-price-title {
+			font-size: $font-size-base;
+			color: $color-title;
+			line-height: 1;
+		}
+
+		.recharge-price-custom {
+			border-bottom: 1px solid #dddddd;
+			padding-bottom: 20rpx;
+			display: flex;
+			align-items: center;
+			margin-top: 45rpx;
+
+			text {
+				font-size: 54rpx;
+				color: $color-title;
+				line-height: 1;
+			}
+
+			input {
+				font-size: 54rpx;
+				line-height: 1;
+			}
+		}
+
+		.recharge-price-desc {
+			display: flex;
+			margin-top: 16rpx;
+			align-items: center;
+
+			image {
+				width: 34rpx;
+				height: 34rpx;
+				margin-right: 13rpx;
+			}
+
+			text {
+				font-size: $font-size-sub;
+				color: $color-tip;
+				line-height: 1;
+			}
+		}
+	}
+
+	.recharge-box {
+		
+		padding: 36rpx 0;
+		background: #fff;
+		height: 100%;
+		box-sizing: border-box;
+		border-radius: 10rpx;
+
+		.recharge-box-title {
+			font-size: $font-size-base;
+			color: #888888;
+			line-height: 1;
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+		}
+
+		.box-title {
+			text-align: center;
+			font-size: $font-size-toolbar;
+		}
+
+		.box-custom {
+			width: 226rpx;
+			border-bottom: 1px solid #dddddd;
+			margin: 0 auto;
+			margin-top: 49rpx;
+			line-height: 1;
+			padding-bottom: 10rpx;
+			box-sizing: border-box;
+
+			.pla-number {
+				font-size: 30rpx;
+			}
+
+			input {
+				height: 97rpx;
+				width: 100%;
+				font-size: 62rpx;
+				color: #000;
+				text-align: center;
+				line-height: 1;
+			}
+		}
+
+		.box-content {
+			width: 100%;
+			box-sizing: border-box;
+			display: flex;
+			flex-wrap: wrap;
+			max-height: 50vh;
+			overflow-y: scroll;
+
+			.content-item {
+				width: calc((100% - 48rpx) / 3);
+				margin-right: 24rpx;
+				height: 142rpx;
+				margin-top: 25rpx;
+				border-radius: 16rpx;
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+				justify-content: center;
+				color: $color-title;
+				box-sizing: border-box;
+				text-align: center;
+				background: #F7F7FB;
+				
+				&:nth-child(3n) {
+					margin-right: 0;
+				}
+
+				.price1 {
+					font-size: $font-size-base;
+					display: flex;
+					align-items: flex-end;
+					color: #333333;
+					text:first-child {
+						font-size: 40rpx;
+						line-height: 1;
+					}
+
+					text:nth-child(2) {
+						font-size: $font-size-base;
+						line-height: 1;
+					}
+					.other{
+						font-size: 32rpx!important;
+						color: #666666;
+					}
+				}
+
+				.price2 {
+					font-size: $font-size-tag;
+					color: #666666;
+					line-height: 1;
+					margin-top: 16rpx;
+				}
+
+				&.color-base-bg {
+
+					.price1,
+					.price2 {
+						color: #ffffff !important;
+					}
+				}
+				&.active{
+					background: linear-gradient(136deg, var(--promotion-aux-color) 0%, var(--promotion-color) 100%);
+					.price1,
+					.price2 {
+						color: #ffffff !important;
+					}
+				}
+			}
+			
+		}
+
+		.box-text {
+			margin-top: 40rpx;
+			font-size: $font-size-sub;
+			color: var(--main-color);
+		}
+	}
+	.add-account {
+		margin: 0;
+		margin-top: 5vh;
+		height: 90rpx;
+		line-height: 90rpx;
+		width: 100%;
+		border-radius: 90rpx;
+	}
+</style>
diff --git a/pages_tool/recharge/order_list.vue b/pages_tool/recharge/order_list.vue
index 900a7b3..cdf616f 100644
--- a/pages_tool/recharge/order_list.vue
+++ b/pages_tool/recharge/order_list.vue
@@ -1,177 +1,179 @@
-<template>
-	<page-meta :page-style="themeColor"></page-meta>
-	<view class="order-container">
-		<mescroll-uni ref="mescroll" @getData="getListData">
-			<block slot="list">
-				<block v-if="orderList.length > 0">
-					<view class="order-item" v-for="(orderItem, orderIndex) in orderList" :key="orderIndex">
-						<view class="order-header">
-							<view>
-								<text class="color-tip font-size-tag">{{ orderItem.order_no }}</text>
-							</view>
-							<view class="align-right">
-								<text class="color-tip font-size-tag">{{ $util.timeStampTurnTime(orderItem.create_time) }}</text>
-							</view>
-						</view>
-						<view class="order-body">
-							<view class="goods_info_flex"><view class="goods-name font-size-base">充值成功</view></view>
-
-							<view class="goods-img color-base-text">
-								￥
-								<text>{{ orderItem.buy_price }}</text>
-							</view>
-
-							<!-- <view class="goods-sub-section">
-								<view class="<strong>goods-name</strong> color-tip " v-if="orderItem.point > 0 || orderItem.growth > 0">赠送:</view>
-								<view class="goods-name color-tip " v-if="orderItem.point > 0">{{ orderItem.point }}积分</view>
-								<view class="goods-name color-tip " v-if="orderItem.point > 0 && orderItem.growth > 0">、</view>
-								<view class="goods-name color-tip " v-if="orderItem.growth > 0">{{ orderItem.growth }}成长值</view>
-								<view class="goods-name color-tip " v-if="orderItem.point > 0 && orderItem.coupon_id">、</view>
-								<view class="goods-name color-tip " v-if="orderItem.coupon_id">优惠券x{{ orderItem.coupon_id.split(',').length }}</view>
-							</view> -->
-						</view>
-					</view>
-				</block>
-				<view v-else><ns-empty :isIndex="false" text="暂无充值记录"></ns-empty></view>
-			</block>
-		</mescroll-uni>
-		<loading-cover ref="loadingCover"></loading-cover>
-		<ns-login ref="login"></ns-login>
-	</view>
-</template>
-
-<script>
-export default {
-	data() {
-		return {
-			orderList: []
-		};
-	},
-	onShow() {
-		if (this.$refs.mescroll) this.$refs.mescroll.refresh();
-
-		if (!this.storeToken) {
-			this.$nextTick(() => {
-				this.$refs.login.open('/pages_tool/recharge/order_list');
-			});
-		}
-	},
-	methods: {
-		getListData(mescroll) {
-			this.$api.sendRequest({
-				url: '/memberrecharge/api/order/page',
-				data: {
-					page: mescroll.num,
-					page_size: mescroll.size
-				},
-				success: res => {
-					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();
-				}
-			});
-		},
-		imageError(index) {
-			this.orderList[index].cover_img = this.$util.getDefaultImage().goods;
-			this.$forceUpdate();
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-.order-container {
-	width: 100vw;
-	height: 100vh;
-}
-
-.align-right {
-	text-align: right;
-}
-
-.order-item {
-	margin: $margin-updown $margin-both;
-	padding: 0 30rpx;
-	border-radius: $border-radius;
-	background: #fff;
-	position: relative;
-
-	.order-header {
-		display: flex;
-		align-items: center;
-		position: relative;
-		height: 80rpx;
-		line-height: 80rpx;
-		border-bottom: 1px solid #e3e3e3;
-
-		& > view {
-			flex: 1;
-			line-height: 1;
-			font-weight: 500;
-		}
-	}
-
-	.order-body {
-		height: 155rpx;
-		position: relative;
-
-		.goods_info_flex {
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-			padding-top: 30rpx;
-
-			.goods-name {
-				display: -webkit-box;
-				-webkit-box-orient: vertical;
-				-webkit-line-clamp: 2;
-				overflow: hidden;
-				line-height: 1;
-				font-weight: 500;
-			}
-		}
-
-		.goods-img {
-			font-size: $font-size-tag;
-			font-weight: 500;
-			position: absolute;
-			right: 0;
-			top: 20rpx;
-
-			text {
-				font-size: $font-size-toolbar;
-			}
-		}
-
-		.goods-sub-section {
-			width: 100%;
-			line-height: 1;
-			display: flex;
-			margin-top: 39rpx;
-			font-size: $font-size-tag;
-
-			view {
-				line-height: 1;
-				text-align: right;
-				margin-right: 10rpx;
-				font-size: $font-size-tag;
-			}
-		}
-	}
-}
-</style>
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view class="order-container">
+		<mescroll-uni ref="mescroll" @getData="getListData">
+			<block slot="list">
+				<block v-if="orderList.length > 0">
+					<view class="order-item" v-for="(orderItem, orderIndex) in orderList" :key="orderIndex">
+						<view class="order-header">
+							<view>
+								<text class="color-tip font-size-tag">{{ orderItem.order_no }}</text>
+							</view>
+							<view class="align-right">
+								<text class="color-tip font-size-tag">{{ $util.timeStampTurnTime(orderItem.create_time) }}</text>
+							</view>
+						</view>
+						<view class="order-body">
+							<view class="goods_info_flex"><view class="goods-name font-size-base">充值成功</view></view>
+
+							<view class="goods-img color-base-text">
+								￥
+								<text>{{ orderItem.buy_price }}</text>
+							</view>
+
+							<view class="goods-sub-section" v-if="isShowGift(orderItem)">
+								<view class="goods-name color-tip " v-if="orderItem.point > 0 || orderItem.growth > 0">赠送:</view>
+								<view class="goods-name color-tip " v-if="orderItem.point > 0">{{ orderItem.point }}积分</view>
+								<view class="goods-name color-tip " v-if="orderItem.point > 0 && orderItem.growth > 0">、</view>
+								<view class="goods-name color-tip " v-if="orderItem.growth > 0">{{ orderItem.growth }}成长值</view>
+								<view class="goods-name color-tip " v-if="orderItem.point > 0 && orderItem.coupon_id">、</view>
+								<view class="goods-name color-tip " v-if="Number(orderItem.coupon_id)">优惠券x{{ orderItem.coupon_id.split(',').length }}</view>
+							</view>
+						</view>
+					</view>
+				</block>
+				<view v-else><ns-empty :isIndex="false" text="暂无充值记录"></ns-empty></view>
+			</block>
+		</mescroll-uni>
+		<loading-cover ref="loadingCover"></loading-cover>
+		<ns-login ref="login"></ns-login>
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			orderList: []
+		};
+	},
+	onShow() {
+		if (this.$refs.mescroll) this.$refs.mescroll.refresh();
+
+		if (!this.storeToken) {
+			this.$nextTick(() => {
+				this.$refs.login.open('/pages_tool/recharge/order_list');
+			});
+		}
+	},
+	methods: {
+		isShowGift(data) {
+			return (data.point > 0 || data.growth > 0) || (data.point > 0) || (data.point > 0 && data.growth > 0) || (data.growth > 0) || (data.point > 0 && data.coupon_id) || (Number(data.coupon_id))
+		},
+		getListData(mescroll) {
+			this.$api.sendRequest({
+				url: '/memberrecharge/api/order/page',
+				data: {
+					page: mescroll.num,
+					page_size: mescroll.size
+				},
+				success: res => {
+					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();
+				}
+			});
+		},
+		imageError(index) {
+			this.orderList[index].cover_img = this.$util.getDefaultImage().goods;
+			this.$forceUpdate();
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+.order-container {
+	width: 100vw;
+	height: 100vh;
+}
+
+.align-right {
+	text-align: right;
+}
+
+.order-item {
+	margin: $margin-updown $margin-both;
+	padding: 0 30rpx;
+	border-radius: $border-radius;
+	background: #fff;
+	position: relative;
+
+	.order-header {
+		display: flex;
+		align-items: center;
+		position: relative;
+		height: 80rpx;
+		line-height: 80rpx;
+		border-bottom: 1px solid #e3e3e3;
+
+		& > view {
+			flex: 1;
+			line-height: 1;
+			font-weight: 500;
+		}
+	}
+
+	.order-body {
+		// height: 155rpx;
+		position: relative;
+		padding-bottom: 39rpx;
+		.goods_info_flex {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			padding-top: 30rpx;
+
+			.goods-name {
+				display: -webkit-box;
+				-webkit-box-orient: vertical;
+				-webkit-line-clamp: 2;
+				overflow: hidden;
+				line-height: 1;
+				font-weight: 500;
+			}
+		}
+
+		.goods-img {
+			font-size: $font-size-tag;
+			font-weight: 500;
+			position: absolute;
+			right: 0;
+			top: 20rpx;
+
+			text {
+				font-size: $font-size-toolbar;
+			}
+		}
+
+		.goods-sub-section {
+			width: 100%;
+			line-height: 1;
+			display: flex;
+			margin-top: 39rpx;
+			font-size: $font-size-tag;
+			view {
+				line-height: 1;
+				text-align: right;
+				margin-right: 10rpx;
+				font-size: $font-size-tag;
+			}
+		}
+	}
+}
+</style>
diff --git a/pages_tool/store/detail.vue b/pages_tool/store/detail.vue
new file mode 100644
index 0000000..9d43429
--- /dev/null
+++ b/pages_tool/store/detail.vue
@@ -0,0 +1,412 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view class="store-detail" v-if="store">
+		<view class="detail-head" :style="{ height: swiperHeight }">
+			<swiper class="swiper" @change="swiperChange" autoplay="true" interval="4000" circular="true">
+				<swiper-item v-for="(item, index) in store.store_images.images" :key="index" :item-id="'store_id_' + index">
+					<view class="item" @click="previewMedia(index)">
+						<image :src="$util.img(item)" @error="swiperImageError(index)" mode="aspectFit" />
+					</view>
+				</swiper-item>
+			</swiper>
+			<view class="img-indicator-dots" v-if="store.store_images.images && store.store_images.images.length">
+				<text>{{ swiperCurrent }}</text>
+				<text>/{{ store.store_images.images.length }}</text>
+			</view>
+		</view>
+		<view class="detail-content">
+			<view class="content-item">
+				<view class="store-name multi-hidden">{{ store.store_name }}</view>
+				<view class="store-state" :class="store.is_frozen.is_frozen == 1 || store.status == 0 ? 'warning' : ''">
+					{{ (store.is_frozen.is_frozen == 1 && '已停业') || (store.status == 0 && '休息中') || (store.status == 1 && '营业中') || '--' }}
+				</view>
+			</view>
+			<view class="content-item store-time-wrap" v-if="store.open_date || store.is_default || store.is_pickup || store.is_o2o || store.is_express">
+				<view v-if="store.status == 0 && store.close_desc" class="close-desc">{{ store.close_desc }}</view>
+				<view class="store-time" v-if="store.open_date">{{ store.open_date }}</view>
+				<view class="tag-wrap" v-if="store.is_default || store.is_pickup || store.is_o2o || store.is_express">
+					<text class="tag-item" v-if="store.is_default == 1">总店</text>
+					<text class="tag-item" v-if="store.is_pickup == 1">门店自提</text>
+					<text class="tag-item" v-if="store.is_o2o == 1">同城配送</text>
+					<text class="tag-item" v-if="store.is_express == 1">物流配送</text>
+				</view>
+			</view>
+			
+			<view class="content-item address-wrap" v-if="store.show_address || store.distance">
+				<view class="address-box">
+					<view class="address-name" v-if="store.show_address">{{ store.show_address }}</view>
+					<view class="address-location" v-if="store.distance">
+						<text class="icondiy icon-system-weizhi"></text>
+						<text>距您当前位置{{ store.distance }}km</text>
+					</view>
+				</view>
+				<text class="icondiy icon-daohang" @click="mapRoute()"></text>
+			</view>
+			<view class="content-item telphone-wrap" v-if="store.telphone">
+				<text v-if="store.telphone" class="telphone">{{ store.telphone }}</text>
+				<text class="iconfont icon-dianhua" @click="phoneCall"></text>
+			</view>
+		</view>
+		<view class="detail-map">
+			<view class="map-head">门店地图</view>
+			<map class="map-body" :latitude="store.latitude" :longitude="store.longitude" :markers="covers"></map>
+		</view>
+		<!-- <view class="store-action-fill"></view>
+		<view class="store-action"><button type="primary" @click="storeTap()">进入门店</button></view> -->
+	</view>
+</template>
+
+<script>
+	import Map from '@/common/js/map/openMap.js';
+	export default {
+		data() {
+			return {
+				storeId: 0,
+				latitude: null, // 纬度
+				longitude: null, // 经度
+				covers: [],
+				store: null,
+				swiperCurrent: 1,
+				swiperHeight: ''
+			};
+		},
+		onLoad(options) {
+			this.storeId = options.store_id || 0;
+			if (this.location) {
+				this.latitude = this.location.latitude;
+				this.longitude = this.location.longitude;
+			} else if (this.mapConfig.wap_is_open == 1) {
+				this.$util.getLocation();
+			}
+			this.getInfo();
+		},
+		watch: {
+			location: function(nVal) {
+				if (nVal) {
+					this.latitude = nVal.latitude;
+					this.longitude = nVal.longitude;
+					this.getInfo();
+				}
+			}
+		},
+		methods: {
+			//打电话
+			phoneCall() {
+				uni.makePhoneCall({
+					phoneNumber: this.store.telphone //仅为示例
+				});
+			},
+			//获取门店详情
+			getInfo() {
+				let data = {
+					store_id: this.storeId
+				};
+				if (this.latitude && this.longitude) {
+					data.latitude = this.latitude;
+					data.longitude = this.longitude;
+				}
+				this.$api.sendRequest({
+					url: '/api/store/info',
+					data: data,
+					success: res => {
+						if (res.data) {
+							// 默认数据
+							let defaultData = {
+								full_address: '',
+								address: '',
+								store_images: []
+							};
+
+							this.store = res.data || defaultData;
+							this.covers.push({
+								id: 1,
+								latitude: this.store.latitude,
+								longitude: this.store.longitude,
+								iconPath: this.$util.img('public/uniapp/store/map_icon.png'),
+								height: 25
+							});
+							this.store.show_address = this.store.full_address.replace(/,/g, ' ') + ' ' + this
+								.store.address;
+							this.handleStoreImage();
+						} else {
+							this.$util.showToast({
+								title: '门店不存在'
+							});
+							setTimeout(() => {
+								this.$util.redirectTo('/pages_tool/store/list', {}, 'redirectTo');
+							}, 2000);
+						}
+					}
+				});
+			},
+			// 处理门店图片+图片高度
+			handleStoreImage() {
+				if (!this.store.store_images) this.store.store_images = [];
+				this.store.store_images = this.store.store_images.reduce((pre, cur) => {
+					// 图片
+					if (!pre.images) pre.images = [];
+					if (pre.images) pre.images.push(cur.pic_path);
+					// 图片规格
+					if (!pre.spec) pre.spec = [];
+					if (pre.spec) pre.spec.push(cur.pic_spec);
+					return pre;
+				}, {});
+
+				let maxHeight = '';
+				if (this.store.store_images.spec) {
+					this.store.store_images.spec.forEach((item, index) => {
+						if (typeof item == 'string') item = item.split('*');
+
+						uni.getSystemInfo({
+							success: res => {
+								let ratio = item[0] / res.windowWidth;
+								item[0] = item[0] / ratio;
+								item[1] = item[1] / ratio;
+							}
+						});
+
+						if (!maxHeight || maxHeight > item[1]) {
+							maxHeight = item[1];
+						}
+					});
+				}
+				this.swiperHeight = Number(maxHeight) + 'px';
+
+				if (!Object.keys(this.store.store_images).length) {
+					this.store.store_images = {};
+					this.store.store_images.images = [this.$util.img('public/static/img/default_img/square.png')];
+					this.store.store_images.spec = ['350*350'];
+					this.swiperHeight = '380px';
+				}
+			},
+			swiperChange(e) {
+				this.swiperCurrent = e.detail.current + 1;
+			},
+			mapRoute() {
+				Map.openMap(Number(this.store.latitude), Number(this.store.longitude), this.store.store_name, 'gcj02');
+			},
+			swiperImageError() {
+				this.store.store_images.images = this.$util.img('public/static/img/default_img/square.png');
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	page {
+		background-color: #f5f6fa;
+	}
+
+	.store-detail {
+		.detail-head {
+			position: relative;
+			width: 100%;
+			height: 300rpx;
+			background-color: #fff;
+
+			&::after {
+				content: '';
+				position: absolute;
+				left: 0;
+				right: 0;
+				bottom: 0;
+				height: 112rpx;
+				background-image: linear-gradient(transparent 10%, #f5f6fa);
+			}
+
+			.swiper {
+				width: 100%;
+				height: 100%;
+
+				.item {
+					width: 100%;
+					height: 100%;
+				}
+
+				image {
+					width: 100%;
+					height: 100%;
+				}
+			}
+
+			.img-indicator-dots {
+				position: absolute;
+				z-index: 5;
+				bottom: 60rpx;
+				right: 40rpx;
+				background: rgba(100, 100, 100, 0.4);
+				color: #fff;
+				font-size: $font-size-tag;
+				line-height: 40rpx;
+				border-radius: 20rpx;
+				padding: 0 20rpx;
+			}
+		}
+
+		.detail-content {
+			position: relative;
+			background-color: #fff;
+			margin: -30rpx 30rpx 30rpx;
+			padding: 0 24rpx;
+			border-radius: 18rpx;
+			z-index: 9;
+
+			.content-item {
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				border-bottom: 2rpx solid #ededed;
+				padding: 24rpx 0;
+
+				&:last-of-type {
+					border-bottom: 0;
+				}
+			}
+
+			.store-name {
+				font-size: $font-size-toolbar;
+				font-weight: bold;
+				line-height: 1.5;
+				padding: 6rpx 0;
+			}
+
+			.store-state {
+				padding: 8rpx 10rpx;
+				font-size: $font-size-tag;
+				border: 2rpx solid #66ad95;
+				color: #66ad95;
+				border-radius: 4rpx;
+				line-height: 1;
+				&.warning{
+					color:red;
+					border-color: red;
+				}
+			}
+			
+			.store-time-wrap {
+				flex-direction: column;
+				align-items: baseline;
+
+				.store-time {
+					font-size: $font-size-tag;
+					color: $color-sub;
+				}
+				
+				.close-desc{
+					color:red;
+					font-size: $font-size-tag;
+				}
+
+				.tag-wrap {
+					margin-top: 20rpx;
+					display: flex;
+					flex-wrap: wrap;
+
+					.tag-item {
+						padding: 8rpx 10rpx;
+						margin-right: 10rpx;
+						color: #6f7dad;
+						background: #f4f5fa;
+						border-radius: 6rpx;
+						line-height: 1;
+						font-size: $font-size-tag;
+					}
+				}
+			}
+
+			.telphone-wrap {
+				padding: 26rpx 0;
+
+				.telphone {
+					font-weight: bold;
+					color: $base-color;
+					font-size: $font-size-sub;
+				}
+
+				&>.iconfont {
+					width: 60rpx;
+					height: 48rpx;
+					line-height: 48rpx;
+					text-align: center;
+					background-color: #f4f5fa;
+					border-radius: 6rpx;
+				}
+			}
+
+			.address-wrap {
+				.address-name {
+					width: 520rpx;
+					line-height: 1.5;
+					color: $color-sub;
+					font-size: $font-size-tag;
+				}
+
+				.address-location {
+					margin-top: 12rpx;
+					display: flex;
+					align-items: center;
+					font-size: $font-size-tag;
+					color: #999ca7;
+
+					.icondiy {
+						font-size: $font-size-tag;
+						margin-right: 4rpx;
+					}
+				}
+
+				&>.icondiy {
+					width: 60rpx;
+					height: 48rpx;
+					line-height: 48rpx;
+					text-align: center;
+					background-color: #f4f5fa;
+					border-radius: 6rpx;
+				}
+			}
+		}
+
+		.detail-map {
+			background-color: #fff;
+			margin: 0 30rpx 30rpx;
+			border-radius: 18rpx;
+			margin-bottom: calc(constant(safe-area-inset-bottom) + 170rpx);
+			margin-bottom: calc(env(safe-area-inset-bottom) + 170rpx);
+
+			.map-head {
+				padding-left: 24rpx;
+				height: 100rpx;
+				line-height: 100rpx;
+				font-size: $font-size-toolbar;
+				font-weight: bold;
+			}
+
+			.map-body {
+				width: 100%;
+				height: 460rpx;
+			}
+		}
+
+		.store-action-fill {
+			padding-bottom: calc(constant(safe-area-inset-bottom) + 170rpx);
+			padding-bottom: calc(env(safe-area-inset-bottom) + 170rpx);
+		}
+
+		.store-action {
+			position: fixed;
+			background-color: #fff;
+			bottom: 0;
+			right: 0;
+			left: 0;
+			display: flex;
+			justify-content: center;
+			padding: 30rpx 0;
+
+			button {
+				width: 406rpx;
+				color: #fff;
+				font-size: 30rpx;
+				border-radius: 50rpx;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages_tool/store/list.vue b/pages_tool/store/list.vue
new file mode 100644
index 0000000..d6cba94
--- /dev/null
+++ b/pages_tool/store/list.vue
@@ -0,0 +1,444 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view class="store-list-wrap">
+		<view class="curr-store" v-if="globalStoreConfig && globalStoreConfig.store_business == 'store'">
+			<view class="store-desc">当前定位</view>
+			<view class="store-name-wrap">
+				<view class="store-name multi-hidden">{{ currentPosition || '定位中...' }}</view>
+				<view class="store-position" @click="reposition()">
+					<text class="iconfont icon-dingwei"></text>
+					<text>重新定位</text>
+				</view>
+			</view>
+		</view>
+		<view class="store-list-box">
+			<view class="store-list-head">
+				<view class="head-name">门店列表</view>
+				<view class="head-search">
+					<text class="iconfont icon-sousuo" @click="getData()"></text>
+					<input type="text" v-model="keyword" placeholder-class="input-placeholder" placeholder="搜索门店" @confirm="getData()" />
+				</view>
+			</view>
+
+			<scroll-view scroll-y="true" class="store-list-body" :style="{ height: globalStoreConfig && globalStoreConfig.store_business == 'store' ? 'calc(100vh - 320rpx)' : '' }">
+				<view :class="['store-item', { active: globalStoreInfo && item.store_id == globalStoreInfo.store_id }]" v-for="(item, index) in dataList" :key="index" @click="storeTap(item)">
+					<view class="item-state" :class="item.is_frozen.is_frozen == 1 || item.status == 0 ? 'warning' : ''">
+						{{ (item.is_frozen.is_frozen == 1 && '已停业') || (item.status == 0 && '休息中') || (item.status == 1 && '营业中') || '--' }}
+					</view>
+					<view class="item-name multi-hidden">{{ item.store_name }}</view>
+					<view class="item-close-desc" v-if="item.status == 0 && item.close_desc">
+						{{ item.close_desc }}
+					</view>
+					<view class="item-time">
+						<view class="item-time-left">
+							<text class="iconfont icon-shijian1"></text>
+							<text>{{ item.open_date || '--' }}</text>
+						</view>
+						<view class="item-time-right" v-if="item.distance">
+							{{ item.distance > 1 ? item.distance + 'km' : item.distance * 1000 + 'm' }}
+						</view>
+					</view>
+					<view class="item-address">
+						<text class="iconfont icon-location"></text>
+						<text>{{ item.show_address }}</text>
+					</view>
+					<view class="item-other">
+						<view class="other-tag-wrap">
+							<text class="tag-item" v-if="item.is_default == 1">总店</text>
+							<text class="tag-item" v-if="item.is_pickup == 1">门店自提</text>
+							<text class="tag-item" v-if="item.is_o2o == 1">同城配送</text>
+							<text class="tag-item" v-if="item.is_express == 1">物流配送</text>
+						</view>
+						<view class="other-action" @click.stop="selectStore(item)">
+							<text>详情</text>
+							<text class="iconfont icon-right"></text>
+						</view>
+					</view>
+				</view>
+				<ns-empty v-if="!dataList.length" text="您的附近暂无可选门店" :isIndex="false"></ns-empty>
+			</scroll-view>
+		</view>
+		<loading-cover ref="loadingCover"></loading-cover>
+
+		<!-- #ifdef MP-WEIXIN -->
+		<!-- 小程序隐私协议 -->
+		<privacy-popup ref="privacyPopup"></privacy-popup>
+		<!-- #endif -->
+	</view>
+</template>
+
+<script>
+	import Config from '@/common/js/config.js';
+	export default {
+		components: {},
+		data() {
+			return {
+				dataList: [],
+				latitude: null, // 纬度
+				longitude: null, // 经度
+				currentPosition: '', //当前位置
+				keyword: '' //搜索内容
+			};
+		},
+		watch: {
+			location: function(nVal) {
+				if (nVal) {
+					this.latitude = nVal.latitude;
+					this.longitude = nVal.longitude;
+					this.getData();
+					this.getCurrentLocation();
+				}
+			}
+		},
+		onLoad(option) {
+			// #ifdef H5
+			// H5地图选择位置回调数据
+			if (option.module && option.module == 'locationPicker') {
+				this.latitude = option.latng.split(',')[0];
+				this.longitude = option.latng.split(',')[1];
+				this.currentPosition = option.addr + option.name;
+			}
+			// #endif
+
+			//地图选点已经选中坐标的话就不要再重复选择了
+			if(!this.currentPosition){
+				if (this.location) {
+					this.latitude = this.location.latitude;
+					this.longitude = this.location.longitude;
+					this.getCurrentLocation();
+				} else if (this.mapConfig.wap_is_open == 1) {
+					this.$nextTick(()=>{
+						this.$util.getLocation({
+							fail: res => {
+								// 拒绝定位
+								this.currentPosition = '未获取到定位';
+							}
+						});
+					})
+				}
+			}
+			
+			this.getData();
+		},
+		onShow() {
+			// 定位信息过期后，重新获取定位
+			if(this.mapConfig.wap_is_open == 1 && this.locationStorage && this.locationStorage.is_expired) {
+				this.$util.getLocation({
+					fail: (res) => {
+						// 拒绝定位
+						this.currentPosition = '未获取到定位';
+					}
+				});
+			}
+		},
+		methods: {
+			getData() {
+				let data = {};
+				data.keyword = this.keyword;
+				if (this.latitude && this.longitude) {
+					data.latitude = this.latitude;
+					data.longitude = this.longitude;
+				}
+
+				this.$api.sendRequest({
+					url: '/api/store/page',
+					data: data,
+					success: res => {
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+						if (res.code == 0 && res.data) {
+							this.dataList = res.data.list;
+							this.dataList.forEach(item => {
+								item.show_address = item.full_address.replace(/,/g, ' ') + ' ' + item.address;
+							});
+						} else {
+							this.$util.showToast({
+								title: res.message
+							});
+						}
+					},
+					fail: res => {
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					}
+				});
+			},
+			storeTap(item) {
+				uni.setStorageSync('manual_store_info', item); // 记录手动切换的门店
+				this.changeStore(item, true); // 切换门店数据
+			},
+			selectStore(item) {
+				this.$util.redirectTo('/pages_tool/store/detail', {
+					store_id: item.store_id
+				});
+			},
+			// 根据经纬度获取位置
+			getCurrentLocation() {
+				let data = {};
+				if (this.latitude && this.longitude) {
+					data.latitude = this.latitude;
+					data.longitude = this.longitude;
+				}
+
+				this.$api.sendRequest({
+					url: '/api/store/getLocation',
+					data: data,
+					success: res => {
+						if (res.code == 0 && res.data) {
+							this.currentPosition = res.data.formatted_addresses.recommend; // 结合知名地点形成的描述性地址，更具人性化特点
+						} else {
+							this.currentPosition = '未获取到定位';
+						}
+					}
+				});
+			},
+			// 打开地图重新选择位置
+			reposition() {
+				// #ifdef MP
+				uni.chooseLocation({
+					success: res => {
+						this.latitude = res.latitude;
+						this.longitude = res.longitude;
+						this.currentPosition = res.name;
+						this.getData();
+						this.getCurrentLocation();
+					},
+					fail(res) {
+						uni.getSetting({
+							success: function(res) {
+								var statu = res.authSetting;
+								if (!statu['scope.userLocation']) {
+									uni.showModal({
+										title: '是否授权当前位置',
+										content: '需要获取您的地理位置，请确认授权，否则地图功能将无法使用',
+										success(tip) {
+											if (tip.confirm) {
+												uni.openSetting({
+													success: function(data) {
+														if (data.authSetting['scope.userLocation'] === true) {
+															this.$util.showToast({
+																title: '授权成功'
+															});
+															//授权成功之后，再调用chooseLocation选择地方
+															setTimeout(function() {
+																uni.chooseLocation({
+																	success: data => {
+																		this.latitude = res.latitude;
+																		this.longitude = res.longitude;
+																		this.currentPosition = res.name;
+																		this.getData();
+																		this.getCurrentLocation();
+																	}
+																});
+															}, 1000);
+														}
+													}
+												});
+											} else {
+												this.$util.showToast({
+													title: '授权失败'
+												});
+											}
+										}
+									});
+								}
+							}
+						});
+					}
+				});
+				// #endif
+
+				// #ifdef H5
+				let backurl = Config.h5Domain + '/pages_tool/store/list'; // 地图选择位置后的回调页面路径
+				window.location.href = 'https://apis.map.qq.com/tools/locpicker?search=1&type=0&backurl=' + encodeURIComponent(backurl) + '&key=' + Config.mpKey + '&referer=myapp';
+				// #endif
+			}
+		}
+	};
+</script>
+<style scoped lang="scss">
+	/deep/ .input-placeholder {
+		color: #b3b4b9;
+		font-size: $font-size-tag;
+	}
+</style>
+<style lang="scss" scoped>
+	.store-list-wrap {
+		.curr-store {
+			background-color: #fff;
+			margin-bottom: 20rpx;
+			padding: 20rpx 24rpx 0;
+
+			.store-desc {
+				font-size: $font-size-tag;
+				color: #636363;
+			}
+
+			.store-name-wrap {
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				padding: 12rpx 0 30rpx;
+
+				.store-name {
+					width: 500rpx;
+					font-size: $font-size-sub;
+					font-weight: bold;
+					line-height: 1.5;
+				}
+
+				.store-position {
+					font-size: $font-size-tag;
+					color: #df5948;
+
+					.iconfont {
+						margin-right: 10rpx;
+					}
+				}
+			}
+		}
+
+		.store-list-box {
+			background-color: #fff;
+			padding: 0 24rpx 24rpx;
+
+			.store-list-head {
+				padding: 34rpx 0 10rpx;
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+
+				.head-name {
+					font-size: $font-size-sub;
+					color: #666;
+				}
+
+				.head-search {
+					display: flex;
+					align-items: center;
+					width: 218rpx;
+					height: 68rpx;
+					background-color: #f0f1f3;
+					border-radius: 50rpx;
+					color: #b3b4b9;
+					padding: 0 26rpx;
+					box-sizing: border-box;
+
+					.iconfont {
+						font-size: $font-size-sub;
+						margin-right: 10rpx;
+					}
+
+					input {
+						color: #666;
+					}
+				}
+			}
+
+			.store-list-body {
+				.store-item {
+					margin: 20rpx 6rpx 30rpx;
+					padding: 26rpx 28rpx;
+					display: flex;
+					flex-direction: column;
+					align-items: baseline;
+					box-shadow: 0 0 10rpx 0 rgba(128, 132, 148, 0.3);
+					border-radius: 10rpx;
+
+					&.active {
+						border: 2rpx solid #df5948;
+					}
+
+					.item-state {
+						padding: 8rpx 10rpx;
+						font-size: $font-size-tag;
+						border: 2rpx solid #66ad95;
+						color: #66ad95;
+						border-radius: 4rpx;
+						line-height: 1;
+						&.warning{
+							color:red;
+							border-color: red;
+						}
+					}
+
+					.item-name {
+						margin: 24rpx 0 10rpx;
+						font-size: $font-size-toolbar;
+						font-weight: bold;
+						line-height: 1.5;
+					}
+					
+					.item-close-desc{
+						font-size: $font-size-tag;
+						color:red;
+					}
+
+					.item-time {
+						display: flex;
+						align-items: center;
+						justify-content: space-between;
+						width: 100%;
+
+						.item-time-left {
+							display: flex;
+							align-items: center;
+							justify-content: space-between;
+							font-size: $font-size-tag;
+							color: #5f6067;
+
+							.iconfont {
+								margin-right: 10rpx;
+							}
+						}
+
+						.item-time-right {
+							color: #5f6067;
+							font-size: $font-size-tag;
+						}
+					}
+
+					.item-address {
+						margin-top: 6rpx;
+						font-size: $font-size-tag;
+						color: #5f6067;
+						line-height: 1.3;
+
+						.iconfont {
+							margin-right: 10rpx;
+						}
+					}
+
+					.item-other {
+						width: 100%;
+						display: flex;
+						align-items: center;
+						justify-content: space-between;
+						margin-top: 26rpx;
+
+						.other-tag-wrap {
+							.tag-item {
+								padding: 8rpx 12rpx;
+								margin-right: 20rpx;
+								font-size: $font-size-tag;
+								color: #77ab69;
+								background-color: #f3f9ed;
+								border-radius: 4rpx;
+							}
+						}
+
+						.other-action {
+							display: flex;
+							align-items: baseline;
+							font-size: $font-size-tag;
+							color: #df5948;
+							line-height: 1;
+
+							.iconfont {
+								font-size: $font-size-tag;
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages_tool/store/payment_qrcode.vue b/pages_tool/store/payment_qrcode.vue
new file mode 100644
index 0000000..ffa62bc
--- /dev/null
+++ b/pages_tool/store/payment_qrcode.vue
@@ -0,0 +1,401 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view class="container">
+		<view v-if="payInfo && memberInfo">
+			<view class="paycode-wrap">
+				<view class="member-wrap">
+					<view class="headimg" @click="getWxAuth">
+						<image :src="memberInfo.headimg ? $util.img(memberInfo.headimg) : $util.getDefaultImage().head" mode="widthFix" @error="memberInfo.headimg = $util.getDefaultImage().head"/>
+					</view>
+					<view class="info-wrap">
+						<view class="nickname">{{ memberInfo.nickname }}</view>
+						<view class="member-level" v-if="memberInfo.member_level" @click="$util.redirectTo(memberInfo.member_level_type ? '/pages_tool/member/card' : '/pages_tool/member/level')">
+							<image :src="$util.img('app/component/view/member_info/img/style_4_vip_tag.png')" mode="widthFix" class="level-icon"></image>
+							<view class="level-name">{{ memberInfo.member_level_name }}</view>
+						</view>
+					</view>
+					<view class="recharge" v-if="addonIsExist.memberrecharge && memberrechargeConfig && memberrechargeConfig.is_use" @click="$util.redirectTo('/pages_tool/recharge/list')">
+						去充值
+					</view>
+				</view>
+				<view class="body-wrap">
+					<view class="barcode-wrap">
+						<image :src="payInfo.barcode" class="barcode"></image>
+					</view>
+					<view class="auth-code">
+						<text class="price-font">{{ show ? splitFn(payInfo.auth_code) : payInfo.auth_code.substring(0, 5) + '******' }}</text>
+						<text class="show" v-if="!show" @click="showAuthCode(true)">查看数字</text>
+						<text class="show" v-else @click="showAuthCode(false)">隐藏数字</text>
+					</view>
+					<image :src="payInfo.qrcode" mode="widthFix" class="qrcode"></image>
+					<view class="dynamic-code" @click="getPayAuthCode">
+						<view class="code">
+							动态码
+							<text>{{ payInfo.dynamic_code }}</text>
+							<text class="iconfont icon-shuaxin"></text>
+						</view>
+					</view>
+					<view class="tips">付款码仅用于支付时向收银员出示，请勿发送给他人</view>
+				</view>
+				<view class="footer-wrap">
+					<view class="account-item" @click="$util.redirectTo('/pages_tool/member/point')">
+						<view class="value price-font">{{ parseInt(memberInfo.point) }}</view>
+						<view class="title">积分</view>
+					</view>
+					<view class="split"></view>
+					<view class="account-item" @click="$util.redirectTo('/pages_tool/member/balance')">
+						<view class="value price-font">
+							{{ (parseFloat(memberInfo.balance) + parseFloat(memberInfo.balance_money)) | moneyFormat }}
+						</view>
+						<view class="title">余额</view>
+					</view>
+					<view class="split"></view>
+					<view class="account-item" @click="$util.redirectTo('/pages_tool/member/coupon')">
+						<view class="value price-font">{{ memberInfo.coupon_num ? memberInfo.coupon_num : 0 }}</view>
+						<view class="title">优惠券</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<loading-cover ref="loadingCover"></loading-cover>
+		<ns-login ref="login"></ns-login>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				isRepeat: false,
+				payInfo: null,
+				error: 0,
+				timer: null,
+				show: false,
+				memberrechargeConfig: null,
+				screenBrightness: 0
+			};
+		},
+		onShow() {
+			uni.setStorageSync('paySource', '');
+			if (this.storeToken) {
+				this.getCouponNum();
+				this.getMemberrechargeConfig();
+				this.getPayAuthCode();
+
+				// #ifndef H5
+				uni.getScreenBrightness({
+					success: res => {
+						this.screenBrightness = res.value;
+					}
+				});
+
+				uni.setScreenBrightness({
+					value: 1,
+					success: function() {}
+				});
+				// #endif
+
+			} else {
+				this.$nextTick(() => {
+					this.$refs.login.open('/pages_tool/store/payment_qrcode');
+				});
+			}
+		},
+		onLoad() {},
+		methods: {
+			getPayAuthCode() {
+				if (this.isRepeat) return;
+				this.isRepeat = true;
+
+				if (this.timer) clearInterval(this.timer);
+
+				this.$api.sendRequest({
+					url: '/api/pay/memberpaycode',
+					success: res => {
+						this.isRepeat = false;
+						if (res.code == 0 && res.data) {
+							this.payInfo = res.data;
+							this.error = 0;
+							this.show = false;
+							// this.refreshPaymentCode();
+							setTimeout(() => {
+								if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+							}, 100);
+						} else if (this.error < 5) {
+							this.error++;
+							this.getPayAuthCode();
+						} else {
+							this.$util.showToast({
+								title: res.message
+							});
+						}
+					}
+				});
+			},
+			refreshPaymentCode() {
+				this.timer = setInterval(() => {
+					this.getPayAuthCode();
+				}, 30000);
+			},
+			showAuthCode(bool) {
+				this.show = bool;
+			},
+			/**
+			 * 获取充值提现配置
+			 */
+			getMemberrechargeConfig() {
+				this.$api.sendRequest({
+					url: '/memberrecharge/api/memberrecharge/config',
+					success: res => {
+						if (res.code >= 0 && res.data) {
+							this.memberrechargeConfig = res.data;
+						}
+					}
+				});
+			},
+			/**
+			 * 查询优惠券数量
+			 */
+			getCouponNum() {
+				this.$api.sendRequest({
+					url: '/coupon/api/coupon/num',
+					success: res => {
+						if (res.code == 0) {
+							this.memberInfo.coupon_num = res.data;
+							this.$forceUpdate();
+							this.$store.commit('setMemberInfo', this.memberInfo);
+						}
+					}
+				});
+			},
+			splitFn(str, length = 4) {
+				let reg = new RegExp('[^\n]{1,' + length + '}', 'g');
+				let res = str.match(reg);
+				return res.join(' ');
+			}
+		},
+		watch: {
+			storeToken: function(nVal, oVal) {
+				this.getPayAuthCode();
+			}
+		},
+		onHide() {
+			if (this.timer) clearInterval(this.timer);
+			uni.setScreenBrightness({
+				value: this.screenBrightness,
+				success: function() {}
+			});
+		},
+		onUnload() {
+			if (this.timer) clearInterval(this.timer);
+
+			uni.setScreenBrightness({
+				value: this.screenBrightness,
+				success: function() {}
+			});
+		}
+	};
+</script>
+
+<style lang="scss">
+	.container {
+		width: 100vw;
+		min-height: 100vh;
+		background: $base-color;
+		padding: 30rpx;
+		box-sizing: border-box;
+		overflow-y: auto;
+	}
+
+	.paycode-wrap {
+		overflow: hidden;
+		background: #fff;
+		border-radius: 20rpx;
+
+		.member-wrap {
+			padding: 36rpx 32rpx;
+			background: #f6f6f6;
+			display: flex;
+			align-items: center;
+
+			.headimg {
+				width: 88rpx;
+				height: 88rpx;
+				overflow: hidden;
+				border-radius: 50%;
+				margin-right: 20rpx;
+
+				image {
+					width: 88rpx;
+					height: 88rpx;
+				}
+			}
+
+			.info-wrap {
+				flex: 1;
+				width: 0;
+			}
+
+			.nickname {
+				font-size: 30rpx;
+				font-weight: 600;
+				white-space: nowrap;
+				overflow: hidden;
+				line-height: 1;
+			}
+
+			.member-level {
+				background: #474758;
+				padding: 0;
+				margin: 16rpx 0 0 0;
+				height: 40rpx;
+				border-radius: 40rpx;
+				display: inline-flex;
+				align-items: center;
+
+				.level-icon {
+					width: 40rpx;
+					vertical-align: middle;
+					margin-left: -2rpx;
+				}
+
+				.level-name {
+					padding: 0 20rpx 0 6rpx;
+					color: #ddc095;
+					font-size: 24rpx;
+					display: inline-block;
+					line-height: 1;
+				}
+			}
+
+			.recharge {
+				color: $base-color;
+				border: 2rpx solid $base-color;
+				height: 64rpx;
+				line-height: 64rpx;
+				border-radius: 64rpx;
+				font-size: 26rpx;
+				padding: 0 30rpx;
+				letter-spacing: 4rpx;
+			}
+		}
+
+		.body-wrap {
+			margin: 40rpx 40rpx 0 40rpx;
+			width: calc(100% -80rpx);
+			box-sizing: border-box;
+			text-align: center;
+			padding-bottom: 40rpx;
+			position: relative;
+			border-bottom: 2rpx dashed #dedede;
+
+			.barcode-wrap {
+				width: 590rpx;
+				height: 200rpx;
+				overflow: hidden;
+				margin: 0 auto;
+
+				.barcode {
+					width: 590rpx;
+					height: 250rpx;
+				}
+			}
+
+			.qrcode {
+				width: 320rpx;
+				margin-top: 30rpx;
+			}
+
+			.tips {
+				color: #999999;
+				font-size: 24rpx;
+				margin-top: 20rpx;
+			}
+
+			.dynamic-code {
+				display: flex;
+				align-items: center;
+				justify-content: center;
+
+				.code {
+					background: #f6f6f6;
+					color: #666;
+					padding: 4rpx 26rpx;
+					border-radius: 60rpx;
+
+					text {
+						margin-left: 10rpx;
+					}
+				}
+			}
+
+			.auth-code {
+				color: #999999;
+				font-size: 24rpx;
+				margin-top: 20rpx;
+
+				.price-font {
+					letter-spacing: 2rpx;
+				}
+
+				.show {
+					color: #163d8f;
+					font-size: 26rpx;
+					margin-left: 20rpx;
+				}
+			}
+
+			&:after,
+			&:before {
+				content: ' ';
+				width: 40rpx;
+				height: 40rpx;
+				background: $base-color;
+				border-radius: 50%;
+				z-index: 5;
+				bottom: 0;
+				display: block;
+				position: absolute;
+			}
+
+			&:after {
+				right: 0;
+				transform: translate(calc(50% + 40rpx), 50%);
+			}
+
+			&:before {
+				left: 0;
+				transform: translate(calc(-50% - 40rpx), 50%);
+			}
+		}
+
+		.footer-wrap {
+			padding: 50rpx 0;
+			display: flex;
+			align-items: center;
+
+			.split {
+				width: 2rpx;
+				background: #dddddd;
+				height: 50rpx;
+			}
+
+			.account-item {
+				flex: 1;
+				text-align: center;
+
+				.value {
+					font-size: 32rpx;
+					color: $base-color;
+					line-height: 1.5;
+				}
+
+				.title {
+					color: #999999;
+					font-size: 24rpx;
+					margin-top: 10rpx;
+				}
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages_tool/store/store_payment.vue b/pages_tool/store/store_payment.vue
new file mode 100644
index 0000000..717a278
--- /dev/null
+++ b/pages_tool/store/store_payment.vue
@@ -0,0 +1,193 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<scroll-view scroll-y="true" class="scroll-view" >
+		<view class="container" :style="{backgroundImage: 'url('+ $util.img('/public/uniapp/store/payment/header_bg.png') +')'}">
+			<view class="header-wrap"></view>
+			<view class="store-wrap">
+				<view class="tips">支付时请确保您的账户有足够的余额</view>
+				<view class="store-list" @click="$util.redirectTo('/pages_tool/store/list')" v-if="addonIsExist.store">
+					<image :src="$util.img('/public/uniapp/store/payment/vip_icon.png')" mode="widthFix"></image>
+					<text>查看门店列表</text>
+					<text class="iconfont icon-right"></text>
+				</view>
+			</view>
+			<view class="menu-wrap">
+				<view class="menu-list">
+					<view class="menu-item" @click="redirect('/pages_tool/recharge/list')">
+						<image :src="$util.img('/public/uniapp/store/payment/recharge.png')" mode="widthFix"></image>
+						<view class="title">余额充值</view>
+						<view class="desc">余额账户充值</view>
+					</view>
+					<view class="menu-item" @click="redirect('/pages_tool/recharge/order_list')">
+						<image :src="$util.img('/public/uniapp/store/payment/recharge_record.png')" mode="widthFix"></image>
+						<view class="title">充值记录</view>
+						<view class="desc">余额充值记录</view>
+					</view>
+					<view class="menu-item" @click="redirect('/pages_tool/member/balance_detail')">
+						<image :src="$util.img('/public/uniapp/store/payment/balance_detail.png')" mode="widthFix"></image>
+						<view class="title">余额明细</view>
+						<view class="desc">余额变更明细</view>
+					</view>
+					<view class="menu-item" @click="redirect('/pages_tool/member/balance')">
+						<image :src="$util.img('/public/uniapp/store/payment/balance.png')" mode="widthFix"></image>
+						<view class="title">我的余额</view>
+						<view class="desc">我的余额</view>
+					</view>
+				<!-- 	<view class="menu-item" @click="redirect('/pages_tool/member/point_detail')">
+						<image :src="$util.img('/public/uniapp/store/payment/point.png')" mode="widthFix"></image>
+						<view class="title">积分明细</view>
+						<view class="desc">积分变更明细</view>
+					</view> -->
+				</view>
+				<view class="pay-btn" @click="redirect('/pages_tool/store/payment_qrcode')">立即进入支付页面</view>
+			</view>
+			<view class="content-wrap">
+				<image :src="$util.img('/public/uniapp/store/payment/payment_tips.png')" mode="widthFix"></image>
+			</view>
+			<view class="content-wrap">
+				<image :src="$util.img('/public/uniapp/store/payment/payment_strategy.png')" mode="widthFix"></image>
+			</view>
+		</view>
+		
+		<ns-login ref="login"></ns-login>
+		<diy-bottom-nav></diy-bottom-nav>
+	</scroll-view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {};
+	},
+	onLoad(options) {},
+	methods: {
+		/**
+		 * 跳转
+		 * @param {Object} url
+		 */
+		redirect(url) {
+			if (!this.storeToken) {
+				this.$refs.login.open(url);
+			} else {
+				this.$util.redirectTo(url);
+			}
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+	.scroll-view {
+		width: 100vw;
+		height: 100vh;
+		
+		.container {
+			width: 100%;
+			background-repeat: no-repeat;
+			background-size: 100%;
+		}
+	}
+	
+	.header-wrap {
+		height: 200rpx;
+	}
+	
+	.store-wrap {
+		margin: 0 30rpx;
+		background: linear-gradient(90deg, rgba(0,0,0,0.48) 0%, rgba(0,0,0,0.88) 100%);
+		border-radius: 24rpx;
+		padding: 30rpx 20rpx 60rpx 20rpx;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		
+		.tips {
+			color: #F2C7B5;
+			font-size: 24rpx;
+			font-weight: 600;
+		}
+		
+		.store-list {
+			background: rgba(255, 255, 255, .2);
+			display: flex;
+			align-items: center;
+			height: 40rpx;
+			border-radius: 40rpx;
+			padding: 0 10rpx 0 4rpx;
+			
+			text {
+				font-size: 24rpx;
+				color: #EFCAB6;
+				margin-left: 10rpx;
+				line-height: 1;
+			}
+			
+			image {
+				width: 32rpx;
+				height: 32rpx;
+			}
+		}
+	}
+	
+	.menu-wrap {
+		background: #fff;
+		border-radius: 24rpx;
+		margin: 0 30rpx;
+		padding: 30rpx 30rpx 60rpx 30rpx;
+		transform: translateY(-40rpx);
+		
+		.menu-list {
+			display: flex;
+			
+			.menu-item {
+				flex: 1;
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+				
+				image {
+					width: 96rpx;
+					height: 96rpx;
+				}
+				
+				.title {
+					margin-top: 10rpx;
+					font-size: 28rpx;
+					color: #222;
+					font-weight: 600;
+				}
+				
+				.desc {
+					font-size: 18rpx;
+					color: #999999;
+					text-align: center;
+				}
+			}
+		}
+		
+		.pay-btn {
+			height: 98rpx;
+			line-height: 98rpx;
+			background: #F72D1E;
+			border-radius: 98rpx;
+			margin: 60rpx auto 0 auto;
+			font-size: 34rpx;
+			font-weight: 600;
+			color: #FFFFFF;
+			text-align: center;
+		}
+	}
+	
+	.content-wrap {
+		background: #fff;
+		border-radius: 24rpx;
+		margin: 30rpx;
+		padding: 0;
+		overflow: hidden;
+		transform: translateY(-40rpx);
+		
+		image {
+			width: 100%;
+		}
+	}
+</style>
diff --git a/pages_tool/verification/detail.vue b/pages_tool/verification/detail.vue
new file mode 100644
index 0000000..4c91b4e
--- /dev/null
+++ b/pages_tool/verification/detail.vue
@@ -0,0 +1,220 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view class="container">
+		<view class="site-wrap">
+			<view class="site-header">
+				<view class="shu color-base-bg"></view>
+				<view class="order-detail font-size-base">订单明细</view>
+			</view>
+			<view class="xian"></view>
+			<view class="site-body">
+				<block v-for="(goodsItem, goodsIndex) in verifyInfo.item_array" :key="goodsIndex">
+					<view class="goods-wrap">
+						<view class="goods-img"><image :src="$util.img(goodsItem.img)" @error="imageError(goodsIndex)" mode="aspectFill"></image></view>
+						<view class="info-wrap">
+							<view class="goods-info">
+								<text class="goods-name font-size-base">{{ goodsItem.name }}</text>
+							</view>
+							<view class="money-wrap">
+								<view class="align-right">{{ $lang('common.currencySymbol') }}{{ goodsItem.price | abs }}</view>
+								<view class="align-right color-tip">
+									<text class="iconfont icon-close"></text>
+									{{ goodsItem.num }}
+								</view>
+							</view>
+						</view>
+					</view>
+					<view class="all">
+						<view class="all-num">共{{ goodsItem.num }}件商品</view>
+						<view class="all-money color-base-text">
+							<text>合计:</text>
+							￥{{ goodsItem.all | abs }}
+						</view>
+					</view>
+				</block>
+				<view class="xian"></view>
+				<view class="order-cell" v-for="(remarkItem, remarkIndex) in verifyInfo.remark_array" :key="remarkIndex" v-if="remarkItem.value">
+					<text class="tit">{{ remarkItem.title }}：</text>
+					<view class="box">
+						<text class="color-tip">{{ remarkItem.value }}</text>
+						<view class="copy" @click="copy(remarkItem.value)" v-if="remarkItem.title == '订单编号'">复制</view>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<view class="order-summary">
+			<view class="site-header">
+				<view class="shu color-base-bg"></view>
+				<view class="order-detail">核销明细</view>
+			</view>
+			<view class="xian"></view>
+			<view class="order-cell">
+				<text class="tit">核销类型：</text>
+				<view class="box">
+					<text class="color-tip">{{ verifyInfo.verify_type_name }}</text>
+				</view>
+			</view>
+			<block v-if="verifyInfo.is_verify">
+				<view class="order-cell">
+					<text class="tit">核销状态：</text>
+					<view class="box"><text class="color-tip">已核销</text></view>
+				</view>
+				<view class="order-cell" v-if="verifyInfo.verify_time">
+					<text class="tit">核销人员：</text>
+					<view class="box">
+						<text class="color-tip">{{ verifyInfo.verifier_name }}</text>
+					</view>
+				</view>
+				<view class="order-cell" v-if="verifyInfo.verify_time">
+					<text class="tit">核销时间：</text>
+					<view class="box">
+						<text class="color-tip">{{ $util.timeStampTurnTime(verifyInfo.verify_time) }}</text>
+					</view>
+				</view>
+			</block>
+		</view>
+		<view class="verify-btn" @click="verify" v-if="verifyInfo.is_verify == 0"><button type="primary">确认使用</button></view>
+
+		<loading-cover ref="loadingCover"></loading-cover>
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			code: '',
+			verifyInfo: {
+				verify_content: {
+					item_array: [],
+					remark_array: []
+				}
+			},
+			info: [],
+			isSub: false
+		};
+	},
+	onLoad(option) {
+		if (option.code) this.code = option.code;
+		// 小程序扫码进入
+		if (option.scene) {
+			var sceneParams = decodeURIComponent(option.scene);
+			sceneParams = sceneParams.split('&');
+			if (sceneParams.length) {
+				sceneParams.forEach(item => {
+					if (item.indexOf('code') != -1) this.code = item.split('-')[1];
+				});
+			}
+		}
+	},
+	onShow() {
+		if (this.storeToken) this.checkIsVerifier();
+		else this.$util.redirectTo('/pages/member/index');
+
+		this.getVerifyInfo();
+	},
+	methods: {
+		checkIsVerifier() {
+			this.$api.sendRequest({
+				url: '/api/verify/checkisverifier',
+				success: res => {
+					if (!res.data) {
+						this.$util.showToast({
+							title: '非核销员无此权限'
+						});
+						setTimeout(() => {
+							uni.navigateBack({
+								delta: 1
+							});
+						}, 1000);
+					}
+				}
+			});
+		},
+		getVerifyInfo() {
+			this.$api.sendRequest({
+				url: '/api/verify/verifyInfo',
+				data: {
+					verify_code: this.code
+				},
+				success: res => {
+					if (res.code >= 0) {
+						this.verifyInfo = res.data;
+						this.info = this.verifyInfo.remark_array.splice(0, 1);
+						this.verifyInfo.item_array.forEach(item => {
+							item.all = item.num * item.price;
+						});
+						
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					} else {
+						this.$util.showToast({
+							title: res.message
+						});
+						setTimeout(() => {
+							uni.navigateBack({
+								delta: 1
+							});
+						}, 1000);
+					}
+				},
+				fail: res => {
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				}
+			});
+		},
+		verify() {
+			if (this.isSub) return;
+			this.isSub = true;
+			this.$api.sendRequest({
+				url: '/api/verify/verify',
+				data: {
+					verify_code: this.code
+				},
+				success: res => {
+					this.$util.showToast({
+						title: res.message
+					});
+					if (res.code >= 0) {
+						let jump = true;
+						let arr = getCurrentPages().reverse();
+						let jump_url = 'pages_tool/verification/index';
+						for (let i = 0; i < arr.length; i++) {
+							if (jump_url.indexOf(arr[i].route) != -1) {
+								jump = false;
+								setTimeout(() => {
+									uni.navigateBack({
+										delta: i
+									});
+								}, 1000);
+								break;
+							}
+						}
+						if (jump) {
+							this.$util.redirectTo('/pages_tool/verification/index',{},'redirectTo');
+						}
+					} else {
+						this.isSub = false;
+					}
+				}
+			});
+		},
+		imageError(index) {
+			this.verifyInfo.item_array[index].img = this.$util.getDefaultImage().goods;
+			this.$forceUpdate();
+		},
+		copy(str) {
+			this.$util.copy(str);
+		}
+	},
+	filters: {
+		abs(value) {
+			return Math.abs(parseFloat(value)).toFixed(2);
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+@import './public/css/detail.scss';
+</style>
diff --git a/pages_tool/verification/index.vue b/pages_tool/verification/index.vue
new file mode 100644
index 0000000..e6281ad
--- /dev/null
+++ b/pages_tool/verification/index.vue
@@ -0,0 +1,369 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view class="container">
+		<view class="action-wrap">
+			<view class="record-wrap color-base-text" @click="$util.redirectTo('/pages_tool/verification/list')">
+				<text class="iconfont icon-jilu color-base-text"></text>
+				<text>核销记录</text>
+			</view>
+
+			<view class="sweep-code ns-gradient-otherpages-member-balance-balance-rechange" @click="scanCode" v-show="operationType == 'sweepCode'">
+				<text class="iconfont icon-saoma"></text>
+			</view>
+			<view class="manual-input" v-show="operationType == 'manualInput'">
+				<view class="process-wrap">
+					<view class="wrap">
+						<view class="_icon"><text class="iconfont icon-shurutianxiebi color-base-text"></text></view>
+						<view class="_text">输入核销码</view>
+					</view>
+					<view>
+						<view><text class="iconfont icon-jiang-copy color-tip"></text></view>
+					</view>
+					<view class="wrap">
+						<view class="_icon"><text class="iconfont icon-hexiao color-base-text"></text></view>
+						<view class="_text">核销</view>
+					</view>
+				</view>
+				<input type="text" placeholder="请输入核销码" class="_input" placeholder-class="_placeholder" v-model="verify_code" :focus="isFocus" ref="input" />
+				<view class="_btn" @click="confirm"><button type="primary">确认</button></view>
+			</view>
+		</view>
+		<view class="arc-edge"></view>
+
+		<view class="action-type-wrap">
+			<view class="action" @click="changeOperationType('sweepCode')">
+				<view class="_icon"><text class="iconfont icon-saoma"></text></view>
+				<view class="_text">扫码核销</view>
+			</view>
+			<view class="iconfont icon-tiaoxingmasaomiao ns-gradient-otherpages-member-balance-balance-rechange"></view>
+			<view class="action" @click="changeOperationType('manualInput')">
+				<view class="_icon"><text class="iconfont icon-shuru"></text></view>
+				<view class="_text" @click="focus">手动输入</view>
+			</view>
+		</view>
+
+		<ns-login ref="login"></ns-login>
+		<loading-cover ref="loadingCover"></loading-cover>
+
+		<!-- #ifdef MP-WEIXIN -->
+		<!-- 小程序隐私协议 -->
+		<privacy-popup ref="privacyPopup"></privacy-popup>
+		<!-- #endif -->
+	</view>
+</template>
+
+<script>
+import { Weixin } from 'common/js/wx-jssdk.js';
+import Config from '@/common/js/config.js';
+
+export default {
+	data() {
+		return {
+			// #ifdef H5
+			operationType: 'manualInput',
+			// #endif
+			// #ifndef H5
+			operationType: 'sweepCode',
+			// #endif
+			verify_code: '',
+			isFocus: false,
+			detail_path:'/pages_tool/verification/detail',
+		};
+	},
+	onLoad() {},
+	onShow() {
+		if (this.storeToken) {
+			this.checkIsVerifier();
+		} else {
+			this.$nextTick(() => {
+				this.$refs.login.open('/pages_tool/verification/index');
+			});
+		}
+	},
+	methods: {
+		focus() {
+			this.isFocus = !this.isFocus;
+		},
+		scanCode() {
+			// #ifdef MP
+			uni.scanCode({
+				onlyFromCamera: true,
+				success: res => {
+					if (res.errMsg == 'scanCode:ok') {
+						let result = res.result;
+						let code = '';
+						switch(res.scanType){
+							case 'CODE_128':
+								code = result;
+								break;
+							case 'QR_CODE':
+								if(result.indexOf(this.detail_path) > -1){
+									let matchs = result.match(/\?code=(.+)/);
+									if(matchs.length == 2){
+										code = matchs[1];
+									}
+								}
+								break;
+						}
+						if(!code){
+							this.$util.showToast({
+								title: '请扫码正确的条码或二维码'
+							});
+							return;
+						}
+						this.$util.redirectTo(this.detail_path+'?code='+code);
+					} else {
+						this.$util.showToast({
+							title: res.errorMsg
+						});
+					}
+				}
+			});
+			// #endif
+
+			// #ifdef H5
+			if (this.$util.isWeiXin()) {
+				if (uni.getSystemInfoSync().platform == 'ios') {
+					var url = uni.getStorageSync('initUrl');
+				} else {
+					var url = location.href;
+				}
+				this.$api.sendRequest({
+					url: '/wechat/api/wechat/jssdkconfig',
+					data: {
+						url: url
+					},
+					success: jssdkRes => {
+						if (jssdkRes.code == 0) {
+							var wxJS = new Weixin();
+							wxJS.init(jssdkRes.data);
+							wxJS.scanQRCode(res => {
+								if (res.resultStr) {
+									let result = res.resultStr;
+									let code = '';
+									if (result.indexOf(this.detail_path) != -1){
+										let matchs = result.match(/\?code=(.+)/);
+										if(matchs.length == 2){
+											code = matchs[1];
+										}
+									}else if(result.indexOf('CODE_128') != -1){
+										code = result.split(',')[1];
+									}
+									if(!code){
+										this.$util.showToast({
+											title: '请扫码正确的条码或二维码'
+										});
+										return;
+									}
+									this.$util.redirectTo(this.detail_path+'?code='+code);
+								}
+							});
+						} else {
+							this.$util.showToast({
+								title: jssdkRes.message
+							});
+						}
+					}
+				});
+			}
+			// #endif
+		},
+		changeOperationType(type) {
+			// #ifdef H5
+			if (type == 'sweepCode' && !this.$util.isWeiXin()) {
+				this.$util.showToast({
+					title: 'H5端不支持扫码核销'
+				});
+				return;
+			}
+			// #endif
+			this.operationType = type;
+		},
+		checkIsVerifier() {
+			this.$api.sendRequest({
+				url: '/api/verify/checkisverifier',
+				success: res => {
+					if (!res.data) {
+						this.$util.showToast({ title: '非核销员无此权限' });
+						setTimeout(() => {
+							this.$util.redirectTo('/pages/member/index');
+						}, 1000);
+					}
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				}
+			});
+		},
+		confirm() {
+			var reg = /[\S]+/;
+			if (!reg.test(this.verify_code)) {
+				this.$util.showToast({ title: '请输入核销码' });
+				return false;
+			}
+			this.$api.sendRequest({
+				url: '/api/verify/verifyInfo',
+				data: {
+					verify_code: this.verify_code
+				},
+				success: res => {
+					if (res.code >= 0) {
+						this.$util.redirectTo('/pages_tool/verification/detail', { code: this.verify_code });
+					} else {
+						this.$util.showToast({ title: res.message });
+					}
+				}
+			});
+		}
+	},
+	watch: {
+		storeToken: function(nVal, oVal) {
+			if (nVal) {
+				this.checkIsVerifier();
+			}
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+.container {
+	width: 100vw;
+	height: 100vh;
+
+	.action-wrap {
+		padding: 100rpx 0;
+		background: #fff;
+		position: relative;
+
+		.record-wrap {
+			position: absolute;
+			top: 30rpx;
+			right: 30rpx;
+
+			.iconfont {
+				font-size: $font-size-tag;
+				margin-right: 10rpx;
+			}
+		}
+
+		.sweep-code {
+			width: 400rpx;
+			height: 400rpx;
+			box-shadow: 0 8px 8px 0 rgba(0, 0, 0, 0.03), 0 6px 3px 0 rgba(0, 0, 0, 0.02);
+			border-radius: 50%;
+			margin: 0 auto;
+			text-align: center;
+			line-height: 400rpx;
+			background: $base-color;
+
+			.iconfont {
+				color: #fff;
+				font-size: 150rpx;
+			}
+		}
+
+		.manual-input {
+			width: 70%;
+			margin: auto;
+
+			.process-wrap {
+				height: 140rpx;
+				display: flex;
+				padding-top: 60rpx;
+
+				.wrap {
+					flex: 1;
+					text-align: center;
+
+					._icon {
+						width: 60rpx;
+						height: 60rpx;
+						background: #eee;
+						border-radius: 50%;
+						margin: 0 auto;
+						color: $color-tip;
+
+						.iconfont {
+							font-size: $font-size-toolbar;
+						}
+					}
+
+					._text {
+						font-size: $font-size-tag;
+						margin-top: 10rpx;
+						color: $color-tip;
+					}
+				}
+			}
+
+			._input {
+				height: 80rpx;
+				border: 1px solid #eee;
+				border-radius: 8rpx;
+				box-sizing: border-box;
+				padding: 20rpx;
+				font-size: $font-size-base;
+				text-align: center;
+			}
+
+			._placeholder {
+				font-size: $font-size-base;
+				text-align: center;
+			}
+
+			._btn {
+				margin-top: 40rpx;
+				height: 80rpx;
+				line-height: 80rpx;
+			}
+		}
+	}
+
+	.arc-edge {
+		width: 100%;
+		height: 80rpx;
+		background: #fff;
+		border-radius: 400rpx/40rpx; /*上下有弧度的边*/
+		transform: translateY(-50%);
+	}
+
+	.action-type-wrap {
+		width: 70%;
+		height: 90rpx;
+		background: #fff;
+		border-radius: 90rpx;
+		display: flex;
+		position: relative;
+		box-shadow: 0 6px 6px 0 rgba(0, 0, 0, 0.03), 0 4px 2px 0 rgba(0, 0, 0, 0.04);
+		margin: 100rpx auto;
+
+		.action {
+			flex: 1;
+			text-align: center;
+			color: $color-title;
+
+			._icon {
+				line-height: 25px;
+				height: 25px;
+			}
+
+			._text {
+				font-size: $font-size-tag;
+				line-height: 1;
+			}
+		}
+
+		.icon-tiaoxingmasaomiao {
+			width: 110rpx;
+			height: 110rpx;
+			border-radius: 50%;
+			transform: translateY(-10rpx);
+			box-shadow: 0 8px 8px 0 rgba(0, 0, 0, 0.03), 0 6px 3px 0 rgba(0, 0, 0, 0.02);
+			text-align: center;
+			line-height: 110rpx;
+			background: $base-color;
+			color: #fff;
+			font-size: $font-size-toolbar;
+		}
+	}
+}
+</style>
diff --git a/pages_tool/verification/list.vue b/pages_tool/verification/list.vue
new file mode 100644
index 0000000..d27fb79
--- /dev/null
+++ b/pages_tool/verification/list.vue
@@ -0,0 +1,186 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view class="verify-container">
+		<view class="type-wrap">
+			<view v-for="(typeItem, typeIndex) in typeList" :key="typeIndex" class="uni-tab-item" :id="typeItem.pickup" :data-current="typeIndex" @click="ontabtap">
+				<text class="uni-tab-item-title" :class="type == typeIndex ? 'uni-tab-item-title-active color-base-text color-base-border' : ''">{{ typeItem.name }}</text>
+			</view>
+		</view>
+
+		<swiper :current="type" class="swiper-box" style="flex: 1;" :duration="200" @change="ontabchange">
+			<swiper-item class="swiper-item" :key="typeIndex" v-for="(typeItem, typeIndex) in typeList">
+				<scroll-view scroll-y="true" class="verify-list" @scrolltolower="scrolltolower">
+					<block v-if="verifyList[typeIndex] != undefined && verifyList[typeIndex].list.length > 0">
+						<view class="item" v-for="(item, index) in verifyList[typeIndex].list" :key="index">
+							<view @click="toDetail(item.verify_code)">
+								<view class="header">
+									<view class="color-tip font-size-goods-tag">核销码：{{ item.verify_code }}</view>
+									<view class="color-tip align-right font-size-goods-tag">核销员：{{ item.verifier_name }}</view>
+								</view>
+								<view class="xian"></view>
+								<view class="body">
+									<view class="content-item" v-for="(citem, citemIndex) in item.item_array" :key="citemIndex">
+										<view class="img-wrap">
+											<image :src="$util.img(citem.img)" @error="imageError(typeIndex, index, citemIndex)" mode="aspectFill"></image>
+										</view>
+										<view class="info-wrap">
+											<view class="name-wrap">
+												<view class="goods-name font-size-tag">{{ citem.name }}</view>
+												<view class="font-size-goods-tag color-tip">核销时间：{{ $util.timeStampTurnTime(item.verify_time) }}</view>
+											</view>
+											<view class="money-wrap">
+												<view class="align-right color-tip font-size-goods-tag">
+													<text class="iconfont icon-close font-size-goods-tag"></text>
+													<text>{{ citem.num }}</text>
+												</view>
+											</view>
+										</view>
+										<view class="money-wrap">
+											<view>
+												<text class="color-base-text font-size-goods-tag">{{ $lang('common.currencySymbol') }}</text>
+												<text class="font-size-base color-base-text">{{ citem.price | abs }}</text>
+											</view>
+										</view>
+									</view>
+								</view>
+							</view>
+						</view>
+					</block>
+					<block v-else><ns-empty :isIndex="false" text="暂无核销记录!"></ns-empty></block>
+				</scroll-view>
+			</swiper-item>
+		</swiper>
+		<loading-cover ref="loadingCover"></loading-cover>
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			scrollInto: '',
+			type: 0,
+			typeList: [],
+			verifyList: [],
+			isShow: false
+		};
+	},
+	onShow() {
+		this.getVerifyType();
+	},
+	methods: {
+		toDetail(id) {
+			this.$util.redirectTo('/pages_tool/verification/detail', {
+				code: id
+			});
+		},
+		ontabtap(e) {
+			let index = e.target.dataset.current || e.currentTarget.dataset.current;
+			this.switchTab(index);
+			this.isShow = false;
+		},
+		switchTab(index) {
+			if (this.type === index) {
+				return;
+			}
+			this.type = index;
+			this.scrollInto = this.typeList[index].type;
+		},
+		ontabchange(e) {
+			let index = e.target.current || e.detail.current;
+			this.switchTab(index);
+		},
+		getVerifyType() {
+			this.$api.sendRequest({
+				url: '/api/verify/getVerifyType',
+				success: res => {
+					if (res.code >= 0) {
+						this.typeList = [];
+						this.verifyList = [];
+
+						Object.keys(res.data).forEach(key => {
+							this.typeList.push({
+								type: key,
+								name: res.data[key].name
+							});
+							this.verifyList.push({
+								page: 1,
+								totalPage: 1,
+								list: [],
+								isLoading: false
+							});
+							this.getVerifyList(key, 1, this.typeList.length - 1);
+						});
+					}
+				},
+				fail: res => {
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				}
+			});
+		},
+		/**
+		 * 获取核销记录
+		 * @param {Object} type
+		 * @param {Object} page
+		 * @param {Object} index
+		 */
+		getVerifyList(type, page, index) {
+			if (this.verifyList[index].isLoading || (page != 1 && page > this.verifyList[index].totalPage)) return;
+
+			this.verifyList[index].isLoading = true;
+			this.verifyList[index].loadingType = 'loading';
+			this.$api.sendRequest({
+				url: '/api/verify/lists',
+				data: {
+					verify_type: type,
+					page: page
+				},
+				success: res => {
+					this.verifyList[index].page = page;
+					if (page == 1) {
+						this.verifyList[index].list = [];
+						uni.stopPullDownRefresh();
+					}
+					if (res.data.list.length) {
+						res.data.list.forEach(item => {
+							this.verifyList[index].list.push(item);
+						});
+					}
+					this.verifyList[index].totalPage = res.data.page_count;
+					this.verifyList[index].isLoading = false;
+					this.verifyList[index].loadingType = page == this.verifyList[index].totalPage ? 'nomore' : 'more';
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					this.isShow = true;
+				}
+			});
+		},
+		/**
+		 * 滑到底部加载
+		 */
+		scrolltolower() {
+			let index = this.type;
+			this.getVerifyList(this.typeList[index].type, this.verifyList[index].page + 1, index);
+		},
+		/**
+		 * 下拉刷新
+		 */
+		onPullDownRefresh() {
+			let index = this.type;
+			this.getVerifyList(this.typeList[index].type, 1, index);
+		},
+		imageError(typeIndex, index, citemIndex) {
+			this.verifyList[typeIndex].list[index].item_array[citemIndex].img = this.$util.getDefaultImage().goods;
+			this.$forceUpdate();
+		}
+	},
+	filters: {
+		abs(value) {
+			return Math.abs(parseFloat(value)).toFixed(2);
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+@import './public/css/list.scss';
+</style>
diff --git a/pages_tool/verification/public/css/detail.scss b/pages_tool/verification/public/css/detail.scss
new file mode 100644
index 0000000..f5e1ef0
--- /dev/null
+++ b/pages_tool/verification/public/css/detail.scss
@@ -0,0 +1,237 @@
+@mixin flex-row-center {
+	display: flex;
+	justify-content: center;
+	align-items: center;
+}
+
+@mixin wrap {
+	margin: $margin-updown $margin-both;
+	padding: $padding;
+	border-radius: $border-radius;
+	background: #fff;
+	position: relative;
+}
+
+.align-right {
+	text-align: right;
+}
+
+.container {
+	width: 100vw;
+	height: 100vh;
+}
+
+.site-wrap {
+	@include wrap;
+	padding: 0;
+	padding-bottom: 40rpx;
+
+	.site-header {
+		padding: 20rpx 20rpx 20rpx 30rpx;
+		display: flex;
+		align-items: center;
+
+		.shu {
+			width: 6rpx;
+			height: 30rpx;
+			background: rgba(255, 69, 68, 1);
+			margin-right: 14rpx;
+		}
+
+		.icon-dianpu {
+			display: inline-block;
+			line-height: 1;
+			margin-right: 12rpx;
+			font-size: $font-size-base;
+		}
+	}
+	.xian {
+		width: 100%;
+		border: 0.5px solid #e7e7e7;
+	}
+
+	.site-body {
+		margin: 20rpx;
+		.goods-wrap {
+			padding: 0 20rpx 20rpx 20rpx;
+			display: flex;
+			padding-top: 20rpx;
+
+			.goods-img {
+				flex: 2;
+				width: 120rpx;
+				height: 120rpx;
+
+				image {
+					width: 100%;
+					height: 100%;
+				}
+			}
+
+			.info-wrap {
+				flex: 8;
+				display: flex;
+				flex-direction: column;
+				justify-content: space-between;
+				width: 100%;
+				padding-right: 23rpx;
+				.goods-info {
+					flex: 1;
+					padding-left: 23rpx;
+
+					.goods-name {
+						display: -webkit-box;
+						-webkit-box-orient: vertical;
+						-webkit-line-clamp: 2;
+						overflow: hidden;
+						line-height: 1.5;
+						font-size: $font-size-goods-tag;
+						color: #000000;
+					}
+				}
+
+				.money-wrap {
+					margin-top: 31rpx;
+					padding: 0 23rpx;
+					display: flex;
+					justify-content: space-between;
+					width: 100%;
+					.align-right {
+						font-weight: normal;
+						font-size: $font-size-tag;
+						margin-right: 2rpx;
+					}
+
+					.iconfont {
+						line-height: 1;
+						font-size: $font-size-tag;
+					}
+				}
+			}
+		}
+		.xian {
+			width: 100%;
+			border: 0.5px solid #e7e7e7;
+		}
+		.xian-other {
+			width: 100%;
+			border: 0.5px solid #e7e7e7;
+		}
+		.all {
+			display: flex;
+			justify-content: space-between;
+			padding: 20rpx;
+			align-items: baseline;
+			.all-num {
+				font-size: $font-size-goods-tag;
+				color: #383838;
+			}
+			.all-money {
+				text {
+					font-size: $font-size-goods-tag;
+					color: #383838;
+					margin-right: 5rpx;
+				}
+				font-size: $font-size-base;
+				font-weight: 500;
+			}
+		}
+	}
+}
+
+.order-cell {
+	display: flex;
+	margin: 28rpx 0;
+	align-items: center;
+	background: #fff;
+	line-height: 40rpx;
+	padding-left: 20rpx;
+
+	.tit {
+		text-align: left;
+		color: #838383;
+		font-size: $font-size-goods-tag;
+	}
+
+	.box {
+		flex: 1;
+		padding: 0 57rpx;
+		line-height: inherit;
+		color: #000000;
+		font-size: $font-size-goods-tag;
+
+		.copy {
+			font-size: $font-size-activity-tag;
+			display: inline-block;
+			background: #f7f7f7;
+			line-height: 1;
+			padding: 6rpx 10rpx;
+			margin-left: 10rpx;
+			border-radius: 18rpx;
+			border: 2rpx solid #d2d2d2;
+		}
+
+		.textarea {
+			height: 40rpx;
+		}
+	}
+
+	.iconfont {
+		color: #bbb;
+		font-size: $font-size-base;
+	}
+
+	.order-pay {
+		padding: 0;
+
+		text {
+			display: inline-block;
+			margin-left: 6rpx;
+		}
+	}
+}
+
+.order-summary {
+	@include wrap;
+	margin-bottom: 40rpx;
+	.site-header {
+		padding: 20rpx 20rpx 20rpx 30rpx;
+		display: flex;
+		align-items: center;
+
+		.shu {
+			width: 6rpx;
+			height: 30rpx;
+			margin-right: 14rpx;
+		}
+
+		.icon-dianpu {
+			display: inline-block;
+			line-height: 1;
+			margin-right: 12rpx;
+			font-size: $font-size-base;
+		}
+	}
+	.xian {
+		width: 100%;
+		border: 0.5px solid #e7e7e7;
+	}
+
+	.order-cell {
+		.tit {
+			color: #999;
+			font-size: $font-size-goods-tag;
+		}
+
+		.box {
+			display: flex;
+			align-items: center;
+			color: #000000;
+			font-size: $font-size-goods-tag;
+		}
+	}
+}
+
+.verify-btn {
+	margin-top: $margin-updown;
+}
diff --git a/pages_tool/verification/public/css/list.scss b/pages_tool/verification/public/css/list.scss
new file mode 100644
index 0000000..4ab7eb5
--- /dev/null
+++ b/pages_tool/verification/public/css/list.scss
@@ -0,0 +1,140 @@
+.verify-container {
+	width: 100vw;
+	height: 100vh;
+}
+
+.align-right {
+	text-align: right;
+}
+
+.type-wrap {
+	display: flex;
+	background-color: #fff;
+	height: 90rpx;
+
+	& > view {
+		flex: 1;
+		text-align: center;
+
+		text {
+			line-height: 86rpx;
+			border-bottom: 4rpx solid #fff;
+			display: inline-block;
+			font-size: 30rpx;
+		}
+	}
+}
+
+.swiper-box {
+	width: 100%;
+	height: calc(100vh - 100rpx);
+
+	.swiper-item {
+		width: 100%;
+		height: 100%;
+
+		.verify-list {
+			width: 100%;
+			height: 100%;
+		}
+	}
+}
+
+.verify-list {
+	.item {
+		margin: 24rpx;
+		border-radius: $border-radius;
+		background: #fff;
+		position: relative;
+		padding: 30rpx;
+
+		.header {
+			display: flex;
+			padding-bottom: 30rpx;
+
+			view {
+				line-height: 1;
+				flex: 1;
+				max-width: 50%;
+				white-space: nowrap;
+				overflow: hidden;
+				text-overflow: ellipsis;
+			}
+		}
+
+		.xian {
+			width: 100%;
+			border: 0.5px solid #eee;
+		}
+
+		.body {
+			.content-item {
+				display: flex;
+				padding-top: 24rpx;
+
+				.img-wrap {
+					width: 120rpx;
+					height: 120rpx;
+					border-radius: $border-radius;
+					overflow: hidden;
+
+					image {
+						width: 100%;
+						height: 100%;
+					}
+				}
+
+				.info-wrap {
+					flex: 1;
+					display: flex;
+					flex-direction: column;
+					justify-content: space-between;
+					width: 100%;
+					padding-right: 23rpx;
+					.name-wrap {
+						flex: 1;
+						padding-left: 23rpx;
+
+						.goods-name {
+							display: -webkit-box;
+							-webkit-box-orient: vertical;
+							-webkit-line-clamp: 1;
+							overflow: hidden;
+							line-height: 1.5;
+							color: #000000;
+							font-size: $font-size-base;
+						}
+					}
+
+					.money-wrap {
+						margin-top: 20rpx;
+						padding: 0 23rpx;
+						display: flex;
+						justify-content: space-between;
+						width: 100%;
+						align-items: center;
+
+						& > view {
+							line-height: 1;
+						}
+
+						.unit {
+							font-weight: normal;
+							font-size: $font-size-tag;
+							margin-right: 2rpx;
+						}
+
+						.iconfont {
+							line-height: 1;
+							// font-size: $font-size-tag;
+						}
+					}
+				}
+
+				.money-wrap {
+					font-weight: bold;
+				}
+			}
+		}
+	}
+}
diff --git a/pages_tool/weapp/order_shipping.vue b/pages_tool/weapp/order_shipping.vue
new file mode 100644
index 0000000..f63a3ad
--- /dev/null
+++ b/pages_tool/weapp/order_shipping.vue
@@ -0,0 +1,48 @@
+<template>
+	<view>
+		<view class="error-msg">{{errorMsg}}</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				outTradeNo:'',
+				errorMsg:'',
+			}
+		},
+		onLoad(option) {
+			if (option.merchant_trade_no){
+				this.outTradeNo = option.merchant_trade_no;
+				this.getOrderDetailPath();
+			}else{
+				this.errorMsg = '缺少merchant_trade_no参数';
+			}
+		},
+		methods: {
+			getOrderDetailPath(){
+				this.$api.sendRequest({
+					url: '/api/pay/outTradeNoToOrderDetailPath',
+					data:{
+						out_trade_no : this.outTradeNo,
+					},
+					success: res => {
+						if (res.code < 0) {
+							this.errorMsg = res.message || '未知错误';
+						}else{
+							this.$util.redirectTo(res.data);
+						}
+					}
+				});
+			},
+		},
+	}
+</script>
+
+<style>
+	.error-msg{
+		text-align: center;
+		padding-top: 10vh;
+	}
+</style>
diff --git a/project.config.json b/project.config.json
index 14f0be7..bea71f7 100644
--- a/project.config.json
+++ b/project.config.json
@@ -1,4 +1,6 @@
 {
+  "appid": "wx29215aa1bd97bbd6",
+  "projectname": "shop-projects",
   "description": "项目配置文件",
   "packOptions": {
     "ignore": []
@@ -41,8 +43,6 @@
   },
   "compileType": "miniprogram",
   "libVersion": "2.16.1",
-  "appid": "wx29215aa1bd97bbd6",
-  "projectname": "niushop_b2c_v4_uniapp",
   "debugOptions": {
     "hidedInDevtools": []
   },
diff --git a/project.private.config.json b/project.private.config.json
deleted file mode 100644
index cd9faf2..0000000
--- a/project.private.config.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "libVersion": "3.12.0",
-  "projectname": "lucky_shop",
-  "condition": {},
-  "setting": {
-    "urlCheck": true,
-    "coverView": true,
-    "lazyloadPlaceholderEnable": false,
-    "skylineRenderEnable": false,
-    "preloadBackgroundData": false,
-    "autoAudits": false,
-    "useApiHook": true,
-    "showShadowRootInWxmlPanel": true,
-    "useStaticServer": false,
-    "useLanDebug": false,
-    "showES6CompileOption": false,
-    "compileHotReLoad": true,
-    "checkInvalidKey": true,
-    "ignoreDevUnusedFiles": true,
-    "bigPackageSizeSupport": false,
-    "useIsolateContext": true
-  }
-}
\ No newline at end of file
diff --git a/store/index.js b/store/index.js
index 037a268..4959b4a 100644
--- a/store/index.js
+++ b/store/index.js
@@ -58,6 +58,7 @@ const store = new Vuex.Store({
 		cartNumber: 0,
 		cartMoney: 0,
 		cartChange: 0,
+		wechatConfigStatus:0,
 		bottomNavHidden: false, // 底部导航是否隐藏，true：隐藏，false：显示
 		aiUnreadCount: 10, // AI未读消息数量
 		globalAIKefuConfig: null, // AI客服配置
@@ -75,11 +76,21 @@ const store = new Vuex.Store({
 		mapConfig: {
 			tencent_map_key: '',
 			wap_is_open: 1,
-			wap_valid_time: 0
+			wap_valid_time: 0,
+		},
+		copyright: null,
+		initStatus:false,
+		offlineWhiteList:['pages/order/payment','pages/order/list','pages/order/detail'],//线下支付白名单
+		canReceiveRegistergiftInfo: {
+			status: false,
+			path: ''
 		},
-		copyright: null
 	},
 	mutations: {
+		// 设置是否可以领取新人礼
+		setCanReceiveRegistergiftInfo(state, data) {
+			state.canReceiveRegistergiftInfo = data;
+		},
 		// 设置那些组件展示
 		setDiyGroupShowModule(state, data) {
 			state.diyGroupShowModule = data;
@@ -188,11 +199,19 @@ const store = new Vuex.Store({
 			uni.setStorageSync('copyright', value);
 		},
 		setMemberInfo(state, value) {
+			// 会员被锁定后，清除会员登录信息
+			if (value && value.status == 0) {
+				value = null;
+			}
 			state.memberInfo = value;
 			if (value) {
 				uni.setStorageSync('memberInfo', value);
 			} else {
+				// 会员为空时，清除会员登录信息
 				uni.removeStorageSync('memberInfo');
+				this.commit('setToken', '');
+				this.dispatch('emptyCart');
+				//uni.removeStorageSync('authInfo');
 			}
 		},
 		setCartNumber(state, cartNumber) {
@@ -207,6 +226,12 @@ const store = new Vuex.Store({
 		setCartMoney(state, value) {
 			state.cartMoney = value;
 		},
+		setInitStatus(state,value){
+			state.initStatus = value
+		},
+		setWechatConfigStatus(state,value){
+			state.wechatConfigStatus = value
+		},   
 		// 设置AI未读消息数量
 		setAiUnreadCount(state, value) {
 			state.aiUnreadCount = value;
@@ -255,6 +280,7 @@ const store = new Vuex.Store({
 							//联系我们
 							
 							this.commit('setShopInfo', data.shop_info);
+              this.commit('setWechatConfigStatus',data?.wechat_config_status);
 							// 默认总店
 							if (data.store_info) {
 								this.commit('setDefaultStoreInfo', data.store_info);
@@ -263,7 +289,7 @@ const store = new Vuex.Store({
 								this.commit('setDefaultStoreInfo', null);
 								this.commit('setGlobalStoreInfo', null);
 							}
-
+							this.commit('setInitStatus',true)
 							resolve(data);
 						}
 					}
@@ -277,7 +303,7 @@ const store = new Vuex.Store({
 				data: {},
 				success: res => {
 					if (res.code == 0) {
-						let list = [];
+						let list = {};
 						let ids = [];
 						let totalMoney = 0;
 						let totalNum = 0;
@@ -290,16 +316,17 @@ const store = new Vuex.Store({
 									goods_id: item.goods_id,
 									sku_id: item.sku_id,
 									num: item.num,
-									discount_price: item.discount_price
+									discount_price: item.discount_price,
+									min_buy: item.min_buy,
+									stock: item.stock,
 								};
 
 								if (!list['goods_' + cart.goods_id]) {
 									list['goods_' + cart.goods_id] = {};
 								}
-								list['goods_' + cart.goods_id]['sku_' + cart
-										.sku_id
-									] =
-									cart;
+								list['goods_' + cart.goods_id]['max_buy'] = item.max_buy;
+								list['goods_' + cart.goods_id]['goods_name'] = item.goods_name;
+								list['goods_' + cart.goods_id]['sku_' + cart.sku_id] = cart;
 								ids.push(cart.cart_id);
 							});
 
@@ -310,8 +337,7 @@ const store = new Vuex.Store({
 									let item = list[goods][sku];
 									if (typeof item == 'object') {
 										num += item.num;
-										money += parseFloat(item.discount_price) * parseInt(item
-											.num);
+										money += parseFloat(item.discount_price) * parseInt(item.num);
 									}
 								}
 								list[goods].num = num;
@@ -322,7 +348,6 @@ const store = new Vuex.Store({
 
 							}
 						}
-
 						this.commit('setCartList', list);
 
 						this.commit('setCartIds', ids);