commit 6632080b8364965ad190a2135429404209acacb2
Author: ZF sun <34314687@qq.com>
Date:   Mon Oct 27 15:55:29 2025 +0800

    init

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..07fb17e
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+/unpackage
+/.hbuilderx
+/.idea
diff --git a/App.vue b/App.vue
new file mode 100644
index 0000000..061c99f
--- /dev/null
+++ b/App.vue
@@ -0,0 +1,313 @@
+<script>
+	import auth from 'common/js/auth.js';
+	import colorList from 'common/js/style_color.js'
+	import {
+		Weixin
+	} from 'common/js/wx-jssdk.js';
+
+	export default {
+		mixins: [auth],
+		onLaunch: function(options) {
+			// console.log(options.query.uniacid)
+			if(options.query.uniacid){
+				uni.setStorageSync('uniacid', options.query.uniacid);
+				console.log(uni.getStorageSync('uniacid'))
+			}
+			uni.hideTabBar();
+
+			// #ifdef MP
+			const updateManager = uni.getUpdateManager();
+			updateManager.onCheckForUpdate(function(res) {
+				// 请求完新版本信息的回调
+			});
+
+			updateManager.onUpdateReady(function(res) {
+				uni.showModal({
+					title: '更新提示',
+					content: '新版本已经准备好，是否重启应用？',
+					success(res) {
+						if (res.confirm) {
+							// 新的版本已经下载好，调用 applyUpdate 应用新版本并重启
+							updateManager.applyUpdate();
+						}
+					}
+				});
+			});
+
+			updateManager.onUpdateFailed(function(res) {
+				// 新的版本下载失败
+			});
+			// #endif
+
+			// #ifdef H5
+			if (uni.getSystemInfoSync().platform == 'ios') {
+				uni.setStorageSync('initUrl', location.href);
+			}
+			// #endif
+
+			uni.onNetworkStatusChange(function(res) {
+				if (!res.isConnected) {
+					uni.showModal({
+						title: '网络失去链接',
+						content: '请检查网络链接',
+						showCancel: false
+					});
+				}
+			});
+
+			this.$store.dispatch('init');
+
+			// 存储到store中
+
+			// 主题风格
+			if (uni.getStorageSync('themeStyle')) {
+				this.$store.commit('setThemeStyle', colorList[uni.getStorageSync('themeStyle')]);
+			}
+
+			// 插件是否存在
+			if (uni.getStorageSync('addonIsExist')) {
+				this.$store.commit('setAddonIsExist', uni.getStorageSync('addonIsExist'));
+			}
+
+			// 默认图
+			if (uni.getStorageSync('defaultImg')) {
+				this.$store.commit('setDefaultImg', uni.getStorageSync('defaultImg'));
+			}
+
+			// 站点信息
+			if (uni.getStorageSync('siteInfo')) {
+				this.$store.commit('setSiteInfo', uni.getStorageSync('siteInfo'));
+			}
+
+			// 门店配置
+			if (uni.getStorageSync('globalStoreConfig')) {
+				this.$store.commit('setGlobalStoreConfig', uni.getStorageSync('globalStoreConfig'));
+			}
+
+			// 门店信息
+			if (uni.getStorageSync('globalStoreInfo')) {
+				this.$store.commit('setGlobalStoreInfo', uni.getStorageSync('globalStoreInfo'));
+			}
+
+			// 默认门店信息
+			if (uni.getStorageSync('defaultStoreInfo')) {
+				this.$store.commit('setDefaultStoreInfo', uni.getStorageSync('defaultStoreInfo'));
+			}
+
+			// 客服配置
+			if (uni.getStorageSync('servicerConfig')) {
+				this.$store.commit('setServicerConfig', uni.getStorageSync('servicerConfig'));
+			}
+
+			// 版权信息
+			if (uni.getStorageSync('copyright')) {
+				this.$store.commit('setCopyright', uni.getStorageSync('copyright'));
+			}
+
+			// 地址配置
+			if (uni.getStorageSync('mapConfig')) {
+				this.$store.commit('setMapConfig', uni.getStorageSync('mapConfig'));
+			}
+
+			if (uni.getStorageSync('token')) {
+				this.$store.commit('setToken', uni.getStorageSync('token'));
+			}
+
+			// 会员信息
+			if (uni.getStorageSync('memberInfo')) {
+				this.$store.commit('setMemberInfo', uni.getStorageSync('memberInfo'));
+
+				// 查询购物车信息
+				this.$store.dispatch('getCartNumber');
+			}
+
+			// #ifdef H5
+			// 自动授权登录
+			// 未登录情况下
+			if (!uni.getStorageSync('memberInfo')) {
+				this.getAuthInfo();
+			}
+			if (this.$store.state.token) {
+				this.$api.sendRequest({
+					url: '/api/member/info',
+					success: (res) => {
+						if (res.code >= 0) {
+							this.$store.commit('setMemberInfo', res.data);
+						}
+					}
+				});
+			}
+			// #endif
+
+			// #ifdef MP-ALIPAY
+			if (options.query && options.query.m) uni.setStorageSync('source_member', options.query.m);
+			// #endif
+		},
+		onShow: function(options) {
+			// #ifdef MP
+			// 自动授权登录
+			this.getAuthInfo();
+			if (this.$store.state.token) {
+				this.$api.sendRequest({
+					url: '/api/member/info',
+					success: (res) => {
+						if (res.code >= 0) {
+							this.$store.commit('setMemberInfo', res.data);
+						}
+					}
+				});
+			}
+			// #endif
+
+			// #ifdef MP-ALIPAY
+			if (options.query && options.query.m) uni.setStorageSync('source_member', options.query.m);
+			// #endif
+		},
+		onHide: function() {},
+		methods: {
+			/**
+			 * 获取授权信息
+			 */
+			getAuthInfo() {
+				// #ifdef H5
+				if (this.$util.isWeiXin()) {
+					this.$util.getUrlCode(urlParams => {
+						if (urlParams.source_member) uni.setStorageSync('source_member', urlParams
+							.source_member);
+
+						if (urlParams.code == undefined) {
+							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;
+									}
+								}
+							});
+						} else {
+							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);
+										this.authLogin(data);
+									}
+								}
+							});
+						}
+					});
+				}
+				// #endif
+
+				// #ifdef MP
+				this.getCode(data => {
+					this.authLogin(data, 'authOnlyLogin');
+				});
+				// #endif
+			},
+			/**
+			 * 授权登录
+			 */
+			authLogin(data, type = 'authLogin') {
+				if (uni.getStorageSync('source_member')) data.source_member = uni.getStorageSync('source_member');
+
+				uni.setStorageSync('authInfo', data);
+
+				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');
+						}
+					}
+				});
+			},
+			/**
+			 * 公众号分享设置
+			 */
+			shareConfig() {
+				this.$api.sendRequest({
+					url: '/wechat/api/wechat/share',
+					data: {
+						url: window.location.href
+					},
+					success: res => {
+						if (res.code == 0) {
+							var wxJS = new Weixin();
+							wxJS.init(res.data.jssdk_config);
+
+							let share_data = JSON.parse(JSON.stringify(res.data.share_config.data));
+							if (share_data) {
+								wxJS.setShareData({
+										title: share_data.title,
+										desc: share_data.desc,
+										link: share_data.link,
+										imgUrl: this.$util.img(share_data.imgUrl)
+									},
+									res => {
+										console.log(res);
+									}
+								);
+							}
+
+							let hideOptionMenu = res.data.share_config.permission.hideOptionMenu;
+							let hideMenuItems = res.data.share_config.permission.hideMenuItems;
+
+							if (hideOptionMenu) {
+								wxJS.weixin.hideOptionMenu(); //屏蔽分享好友等按钮
+							} else {
+								wxJS.weixin.showOptionMenu(); //放开分享好友等按钮
+							}
+						}
+					},
+					fail: err => {}
+				});
+			},
+			getMemberInfo() {
+				this.$api.sendRequest({
+					url: '/api/member/info',
+					success: (res) => {
+						if (res.code >= 0) {
+							// 登录成功，存储会员信息
+							this.$store.commit('setMemberInfo', res.data);
+						}
+					}
+				});
+			}
+		},
+		watch: {
+			$route: {
+				handler(newName, oldName) {
+					if (this.$util.isWeiXin()) {
+						this.shareConfig();
+					}
+				},
+				// 代表在wacth里声明了firstName这个方法之后立即先去执行handler方法
+				immediate: true
+			}
+		}
+	};
+</script>
+<style lang="scss">
+	@import './common/css/main.scss';
+	@import './common/css/iconfont.css';
+	@import './common/css/icondiy.css'; // 自定义图标库
+	@import './common/css/icon/extend.css'; // 扩展图标库
+	page{
+		background: #f4f6fa;
+	}
+</style>
\ No newline at end of file
diff --git a/common/css/custom.ttf b/common/css/custom.ttf
new file mode 100644
index 0000000..6483758
Binary files /dev/null and b/common/css/custom.ttf differ
diff --git a/common/css/diy.scss b/common/css/diy.scss
new file mode 100644
index 0000000..e83aaee
--- /dev/null
+++ b/common/css/diy.scss
@@ -0,0 +1,234 @@
+.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;
+}
diff --git a/common/css/goods_detail.scss b/common/css/goods_detail.scss
new file mode 100644
index 0000000..c1a25e1
--- /dev/null
+++ b/common/css/goods_detail.scss
@@ -0,0 +1,1562 @@
+.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;
+			}
+		}
+	}
+}
diff --git a/common/css/icon/extend.css b/common/css/icon/extend.css
new file mode 100644
index 0000000..af8a948
--- /dev/null
+++ b/common/css/icon/extend.css
@@ -0,0 +1 @@
+/* 扩展图标库文件 */
\ No newline at end of file
diff --git a/common/css/icondiy.css b/common/css/icondiy.css
new file mode 100644
index 0000000..f374f3f
--- /dev/null
+++ b/common/css/icondiy.css
@@ -0,0 +1,5731 @@
+
+
+@font-face {
+  font-family: "icondiy";
+  src: url('https://cdn3.codesign.qq.com/icons/MQmlyZwl3GjWRA1/latest/iconfont.eot?t=6eb737a754b77f73d83eb51514ab63f9'); /* IE9 */
+  src: url('https://cdn3.codesign.qq.com/icons/MQmlyZwl3GjWRA1/latest/iconfont.eot?t=6eb737a754b77f73d83eb51514ab63f9#iefix') format('embedded-opentype'), /* IE6-IE8 */
+  url('https://cdn3.codesign.qq.com/icons/MQmlyZwl3GjWRA1/latest/iconfont.woff?t=6eb737a754b77f73d83eb51514ab63f9') format('woff2'),
+  url('https://cdn3.codesign.qq.com/icons/MQmlyZwl3GjWRA1/latest/iconfont.woff?t=6eb737a754b77f73d83eb51514ab63f9') format('woff'), /* chrome銆乫irefox */
+  url('https://cdn3.codesign.qq.com/icons/MQmlyZwl3GjWRA1/latest/iconfont.ttf?t=6eb737a754b77f73d83eb51514ab63f9') format('truetype'), /* chrome銆乫irefox銆乷pera銆丼afari, Android, iOS 4.2+*/
+  url('https://cdn3.codesign.qq.com/icons/MQmlyZwl3GjWRA1/latest/iconfont.svg?t=6eb737a754b77f73d83eb51514ab63f9#icondiy') format('svg'); /* iOS 4.1- */
+}
+
+.icondiy {
+  font-family: "icondiy" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.icon-system-daifahuo:before {
+  content: "\e00c";
+}
+.icon-system-daifukuan:before {
+  content: "\e00d";
+}
+.icon-system-daipingjie:before {
+  content: "\e010";
+}
+.icon-system-shuhou:before {
+  content: "\e011";
+}
+.icon-system-daishouhuo:before {
+  content: "\e012";
+}
+.icon-system-my-selected:before {
+  content: "\e016";
+}
+.icon-system-cart-selected:before {
+  content: "\e019";
+}
+.icon-system-home-selected:before {
+  content: "\e01a";
+}
+.icon-system-category-selected:before {
+  content: "\e01c";
+}
+.icon-system-bargain-one:before {
+  content: "\e01d";
+}
+.icon-system-search:before {
+  content: "\e01f";
+}
+.icon-system-video:before {
+  content: "\e020";
+}
+.icon-system-img-one:before {
+  content: "\e022";
+}
+.icon-system-weizhi:before {
+  content: "\e023";
+}
+.icon-system-yushou:before {
+  content: "\e024";
+}
+.icon-system-fanlibaojia:before {
+  content: "\e025";
+}
+.icon-system-tuwendaohang:before {
+  content: "\e026";
+}
+.icon-system-youhuiquan:before {
+  content: "\e027";
+}
+.icon-system-menu:before {
+  content: "\e028";
+}
+.icon-system-live-one:before {
+  content: "\e029";
+}
+.icon-system-mofang:before {
+  content: "\e02a";
+}
+.icon-system-booking-management:before {
+  content: "\e02b";
+}
+.icon-system-category-one:before {
+  content: "\e02c";
+}
+.icon-system-agent:before {
+  content: "\e02d";
+}
+.icon-system-fans-management:before {
+  content: "\e02e";
+}
+.icon-system-edit:before {
+  content: "\e02f";
+}
+.icon-system-cart-one:before {
+  content: "\e030";
+}
+.icon-system-miaosha:before {
+  content: "\e031";
+}
+.icon-system-qrcode:before {
+  content: "\e032";
+}
+.icon-system-many-goods:before {
+  content: "\e033";
+}
+.icon-system-manual-choose:before {
+  content: "\e034";
+}
+.icon-system-servicer:before {
+  content: "\e035";
+}
+.icon-system-share:before {
+  content: "\e036";
+}
+.icon-system-download:before {
+  content: "\e037";
+}
+.icon-system-piliangfahuo:before {
+  content: "\e038";
+}
+.icon-system-exclusive-sales:before {
+  content: "\e039";
+}
+.icon-system-quick-reply-set:before {
+  content: "\e03a";
+}
+.icon-system-jiaoyi:before {
+  content: "\e03b";
+}
+.icon-system-pintuan:before {
+  content: "\e03c";
+}
+.icon-system-compass:before {
+  content: "\e03d";
+}
+.icon-system-financial-management:before {
+  content: "\e03e";
+}
+.icon-system-service-project:before {
+  content: "\e03f";
+}
+.icon-system-notice:before {
+  content: "\e040";
+}
+.icon-system-inventory-center:before {
+  content: "\e041";
+}
+.icon-system-customer-service:before {
+  content: "\e042";
+}
+.icon-system-gift:before {
+  content: "\e043";
+}
+.icon-system-fast-delivery:before {
+  content: "\e044";
+}
+.icon-system-picture:before {
+  content: "\e045";
+}
+.icon-system-countdown:before {
+  content: "\e046";
+}
+.icon-system-datab-oard:before {
+  content: "\e047";
+}
+.icon-system-withdrawal:before {
+  content: "\e048";
+}
+.icon-system-everybody:before {
+  content: "\e049";
+}
+.icon-system-zhifupeizhi:before {
+  content: "\e04a";
+}
+.icon-system-asset-management:before {
+  content: "\e04b";
+}
+.icon-system-applet:before {
+  content: "\e04c";
+}
+.icon-system-enterprise-set:before {
+  content: "\e04d";
+}
+.icon-system-deal-set:before {
+  content: "\e04e";
+}
+.icon-system-customer-stat:before {
+  content: "\e04f";
+}
+.icon-system-set:before {
+  content: "\e050";
+}
+.icon-system-shop:before {
+  content: "\e058";
+}
+.icon-system-daifukuan2:before {
+  content: "\e059";
+}
+.icon-system-shuhou2:before {
+  content: "\e05a";
+}
+.icon-system-daifahuo2:before {
+  content: "\e05b";
+}
+.icon-system-daipingjie2:before {
+  content: "\e05c";
+}
+.icon-system-daishouhuo2:before {
+  content: "\e05d";
+}
+.icon-system-huangguan:before {
+  content: "\e05e";
+}
+.icon-system-tuijian:before {
+  content: "\e060";
+}
+.icon-system-erweima:before {
+  content: "\e069";
+}
+.icon-system-liwu:before {
+  content: "\e06b";
+}
+.icon-system-coupon:before {
+  content: "\e06c";
+}
+.icon-system-bargain:before {
+  content: "\e06d";
+}
+.icon-system-miaosha-time:before {
+  content: "\e06e";
+}
+.icon-system-fenxiao-center:before {
+  content: "\e06f";
+}
+.icon-system-firend-coupon:before {
+  content: "\e070";
+}
+.icon-system-liebian-red-envelope:before {
+  content: "\e071";
+}
+.icon-system-pinqiufanli:before {
+  content: "\e072";
+}
+.icon-system-gift-card:before {
+  content: "\e073";
+}
+.icon-system-my-bargain:before {
+  content: "\e074";
+}
+.icon-system-my-pintuan:before {
+  content: "\e075";
+}
+.icon-system-my-footprint:before {
+  content: "\e076";
+}
+.icon-system-idcard:before {
+  content: "\e077";
+}
+.icon-system-my-focus:before {
+  content: "\e078";
+}
+.icon-system-account-list:before {
+  content: "\e079";
+}
+.icon-system-check-station:before {
+  content: "\e07a";
+}
+.icon-system-my-presale:before {
+  content: "\e07b";
+}
+.icon-system-delivery-address:before {
+  content: "\e07c";
+}
+.icon-system-blind-box:before {
+  content: "\e07d";
+}
+.icon-system-member-recommend:before {
+  content: "\e07e";
+}
+.icon-system-signin:before {
+  content: "\e07f";
+}
+.icon-system-seckill-time:before {
+  content: "\e082";
+}
+.icon-system-help:before {
+  content: "\e083";
+}
+.icon-system-pintuan-nav:before {
+  content: "\e084";
+}
+.icon-system-get-coupon:before {
+  content: "\e085";
+}
+.icon-system-groupbuy-nav:before {
+  content: "\e086";
+}
+.icon-system-topic-nav:before {
+  content: "\e087";
+}
+.icon-system-notice-nav:before {
+  content: "\e088";
+}
+.icon-system-point-nav:before {
+  content: "\e089";
+}
+.icon-system-bargain-nav:before {
+  content: "\e08a";
+}
+.icon-system-live-nav:before {
+  content: "\e08b";
+}
+.icon-emoji-chijing:before {
+  content: "\e0a3";
+}
+.icon-emoji-bao:before {
+  content: "\e0a4";
+}
+.icon-emoji-zhawen:before {
+  content: "\e0a6";
+}
+.icon-emoji-kaixin:before {
+  content: "\e0a7";
+}
+.icon-emoji-jingbao:before {
+  content: "\e0a8";
+}
+.icon-emoji-kaixin1:before {
+  content: "\e0a9";
+}
+.icon-emoji-chihuan:before {
+  content: "\e0ac";
+}
+.icon-emoji-qifen:before {
+  content: "\e0ad";
+}
+.icon-emoji-mamu:before {
+  content: "\e0ae";
+}
+.icon-emoji-bishi:before {
+  content: "\e0af";
+}
+.icon-emoji-zhouma:before {
+  content: "\e0b0";
+}
+.icon-emoji-ganga:before {
+  content: "\e0b1";
+}
+.icon-emoji-mogui:before {
+  content: "\e0b2";
+}
+.icon-emoji-qifen1:before {
+  content: "\e0b3";
+}
+.icon-emoji-guanghu:before {
+  content: "\e0b4";
+}
+.icon-clothes-panshenqun:before {
+  content: "\e0b5";
+}
+.icon-clothes-duanku2:before {
+  content: "\e0b7";
+}
+.icon-clothes-paopao:before {
+  content: "\e0b8";
+}
+.icon-clothes-duanku1:before {
+  content: "\e0bb";
+}
+.icon-clothes-yifu1:before {
+  content: "\e0bc";
+}
+.icon-clothes-wenjing1:before {
+  content: "\e0bd";
+}
+.icon-clothes-duanxiu1:before {
+  content: "\e0be";
+}
+.icon-clothes-kuzi:before {
+  content: "\e0bf";
+}
+.icon-clothes-jiubei:before {
+  content: "\e0c0";
+}
+.icon-clothes-duanku:before {
+  content: "\e0c1";
+}
+.icon-clothes-lianyiqun:before {
+  content: "\e0c4";
+}
+.icon-system-naozhong4:before {
+  content: "\e0c5";
+}
+.icon-clothes-jiubei1:before {
+  content: "\e0c6";
+}
+.icon-system-naozhong3:before {
+  content: "\e0c7";
+}
+.icon-clothes-yijia:before {
+  content: "\e0c8";
+}
+.icon-clothes-gongzhuangku:before {
+  content: "\e0c9";
+}
+.icon-clothes-yifu2:before {
+  content: "\e0ca";
+}
+.icon-clothes-niuziku:before {
+  content: "\e0cb";
+}
+.icon-system-naozhong2:before {
+  content: "\e0cd";
+}
+.icon-clothes-wenjing2:before {
+  content: "\e0ce";
+}
+.icon-clothes-tuowa:before {
+  content: "\e0cf";
+}
+.icon-clothes-wazi1:before {
+  content: "\e0d1";
+}
+.icon-system-naozhong1:before {
+  content: "\e0d2";
+}
+.icon-clothes-zhangxiu:before {
+  content: "\e0d4";
+}
+.icon-clothes-yongyi:before {
+  content: "\e0d5";
+}
+.icon-clothes-maozi1:before {
+  content: "\e0d6";
+}
+.icon-clothes-maozi:before {
+  content: "\e0d7";
+}
+.icon-clothes-duanxiu2:before {
+  content: "\e0d8";
+}
+.icon-system-huangguan1:before {
+  content: "\e0d9";
+}
+.icon-clothes-Txu:before {
+  content: "\e0da";
+}
+.icon-clothes-weijin:before {
+  content: "\e0db";
+}
+.icon-clothes-shangyi1:before {
+  content: "\e0dc";
+}
+.icon-clothes-lianyiqun1:before {
+  content: "\e0dd";
+}
+.icon-clothes-weiyi:before {
+  content: "\e0de";
+}
+.icon-clothes-shangyi:before {
+  content: "\e0df";
+}
+.icon-clothes-majia:before {
+  content: "\e0e0";
+}
+.icon-clothes-wazi:before {
+  content: "\e0e1";
+}
+.icon-clothes-hurongfu:before {
+  content: "\e0e2";
+}
+.icon-clothes-duanxiu:before {
+  content: "\e0e3";
+}
+.icon-system-huangguan2:before {
+  content: "\e0e4";
+}
+.icon-edu-huihua:before {
+  content: "\e0e7";
+}
+.icon-edu-jiankangchangshi:before {
+  content: "\e0e8";
+}
+.icon-edu-lishi:before {
+  content: "\e0eb";
+}
+.icon-edu-meishu:before {
+  content: "\e0ec";
+}
+.icon-edu-shengwu:before {
+  content: "\e0ee";
+}
+.icon-edu-shu:before {
+  content: "\e0ef";
+}
+.icon-edu-shuxue:before {
+  content: "\e0f3";
+}
+.icon-edu-benyu:before {
+  content: "\e0f4";
+}
+.icon-edu-wuli:before {
+  content: "\e0f7";
+}
+.icon-edu-xiangpi:before {
+  content: "\e0f8";
+}
+.icon-edu-yingyu:before {
+  content: "\e0fb";
+}
+.icon-edu-yuwen:before {
+  content: "\e0fc";
+}
+.icon-edu-chezi:before {
+  content: "\e100";
+}
+.icon-edu-deli:before {
+  content: "\e101";
+}
+.icon-edu-zhengzhi:before {
+  content: "\e102";
+}
+.icon-tourism-lvxingpao:before {
+  content: "\e106";
+}
+.icon-tourism-guanguanglanche:before {
+  content: "\e107";
+}
+.icon-tourism-lvxingxiang:before {
+  content: "\e108";
+}
+.icon-tourism-suotanyi:before {
+  content: "\e109";
+}
+.icon-sport-lanqiu1:before {
+  content: "\e168";
+}
+.icon-sport-jutong:before {
+  content: "\e169";
+}
+.icon-sport-kualan:before {
+  content: "\e16a";
+}
+.icon-sport-lanqiu:before {
+  content: "\e16b";
+}
+.icon-sport-motuo:before {
+  content: "\e16c";
+}
+.icon-sport-baiqiu:before {
+  content: "\e16d";
+}
+.icon-sport-humaoqiu:before {
+  content: "\e16e";
+}
+.icon-sport-boku:before {
+  content: "\e16f";
+}
+.icon-sport-shouqiu:before {
+  content: "\e170";
+}
+.icon-sport-shejihuan:before {
+  content: "\e171";
+}
+.icon-sport-siqiu:before {
+  content: "\e172";
+}
+.icon-sport-baolingqiu:before {
+  content: "\e173";
+}
+.icon-sport-juqiu:before {
+  content: "\e174";
+}
+.icon-sport-bingqiu:before {
+  content: "\e175";
+}
+.icon-sport-bangqiu:before {
+  content: "\e176";
+}
+.icon-sport-bobu:before {
+  content: "\e177";
+}
+.icon-sport-humaoqiubo:before {
+  content: "\e178";
+}
+.icon-sport-wangqiu:before {
+  content: "\e179";
+}
+.icon-sport-yaling:before {
+  content: "\e17a";
+}
+.icon-sport-zixingche:before {
+  content: "\e17b";
+}
+.icon-sport-wudao:before {
+  content: "\e17c";
+}
+.icon-sport-qugunqiu:before {
+  content: "\e17d";
+}
+.icon-sport-zixingche1:before {
+  content: "\e17e";
+}
+.icon-sport-tiaosheng:before {
+  content: "\e17f";
+}
+.icon-sport-xiangpu:before {
+  content: "\e180";
+}
+.icon-sport-wangqiu1:before {
+  content: "\e181";
+}
+.icon-sport-pingpangqiu:before {
+  content: "\e182";
+}
+.icon-sport-chonglang:before {
+  content: "\e183";
+}
+.icon-sport-chonglang1:before {
+  content: "\e184";
+}
+.icon-weather-duoyun1:before {
+  content: "\e185";
+}
+.icon-weather-duoyun2:before {
+  content: "\e186";
+}
+.icon-weather-duoyun3:before {
+  content: "\e187";
+}
+.icon-weather-feng:before {
+  content: "\e188";
+}
+.icon-weather-shandian:before {
+  content: "\e189";
+}
+.icon-weather-duoyun4:before {
+  content: "\e18a";
+}
+.icon-weather-feng1:before {
+  content: "\e18b";
+}
+.icon-weather-leiyujiaojia:before {
+  content: "\e18c";
+}
+.icon-weather-wanshang:before {
+  content: "\e18d";
+}
+.icon-weather-leidian:before {
+  content: "\e18e";
+}
+.icon-weather-xiaoyu:before {
+  content: "\e18f";
+}
+.icon-weather-mai:before {
+  content: "\e190";
+}
+.icon-weather-wu:before {
+  content: "\e191";
+}
+.icon-weather-xiaxiaoxue:before {
+  content: "\e192";
+}
+.icon-weather-qing:before {
+  content: "\e193";
+}
+.icon-weather-xiaoyu1:before {
+  content: "\e194";
+}
+.icon-weather-tayang:before {
+  content: "\e195";
+}
+.icon-weather-xuehua:before {
+  content: "\e196";
+}
+.icon-weather-yugaxue:before {
+  content: "\e197";
+}
+.icon-weather-yugaxue1:before {
+  content: "\e198";
+}
+.icon-weather-yangchen:before {
+  content: "\e199";
+}
+.icon-weather-ruliang:before {
+  content: "\e19a";
+}
+.icon-weather-yun:before {
+  content: "\e19b";
+}
+.icon-weather-zhongxue:before {
+  content: "\e19c";
+}
+.icon-weather-zhongxue1:before {
+  content: "\e19d";
+}
+.icon-weather-taixue1:before {
+  content: "\e19e";
+}
+.icon-weather-taiyu:before {
+  content: "\e19f";
+}
+.icon-weather-taixue:before {
+  content: "\e1a0";
+}
+.icon-weather-zhongyu:before {
+  content: "\e1a1";
+}
+.icon-weather-taiyu1:before {
+  content: "\e1a2";
+}
+.icon-weather-duoyun:before {
+  content: "\e1a3";
+}
+.icon-system-xiangzuojiantou:before {
+  content: "\e1a4";
+}
+.icon-system-xiaoxi1:before {
+  content: "\e1a5";
+}
+.icon-system-xiangzuo:before {
+  content: "\e1a6";
+}
+.icon-system-xiaoxi2:before {
+  content: "\e1a7";
+}
+.icon-system-yinle2:before {
+  content: "\e1a9";
+}
+.icon-system-yinle1:before {
+  content: "\e1aa";
+}
+.icon-system-liuhu1:before {
+  content: "\e1ab";
+}
+.icon-system-youshang:before {
+  content: "\e1ac";
+}
+.icon-system-youshangjiantou:before {
+  content: "\e1ad";
+}
+.icon-system-liuhu2:before {
+  content: "\e1ae";
+}
+.icon-system-youxiajiantou:before {
+  content: "\e1af";
+}
+.icon-system-yunduanshangzhuan:before {
+  content: "\e1b0";
+}
+.icon-system-yunduanxiazai:before {
+  content: "\e1b1";
+}
+.icon-system-zhaopian2:before {
+  content: "\e1b2";
+}
+.icon-system-zuoshangjiantou:before {
+  content: "\e1b3";
+}
+.icon-system-zhaopian1:before {
+  content: "\e1b4";
+}
+.icon-system-zuoxiajiantou:before {
+  content: "\e1b6";
+}
+.icon-system-android:before {
+  content: "\e1b7";
+}
+.icon-system-android-light:before {
+  content: "\e1b8";
+}
+.icon-system-caishan1:before {
+  content: "\e1ba";
+}
+.icon-system-bianji:before {
+  content: "\e1bb";
+}
+.icon-system-caishan2:before {
+  content: "\e1bc";
+}
+.icon-system-youxia:before {
+  content: "\e1bf";
+}
+.icon-system-dianpu:before {
+  content: "\e1c0";
+}
+.icon-system-dianpu1:before {
+  content: "\e1c1";
+}
+.icon-system-guanbi:before {
+  content: "\e1c4";
+}
+.icon-system-fangxiao:before {
+  content: "\e1c5";
+}
+.icon-system-erweima-1:before {
+  content: "\e1c7";
+}
+.icon-system-jiesuo:before {
+  content: "\e1c8";
+}
+.icon-system-fangtai:before {
+  content: "\e1c9";
+}
+.icon-system-fenlei1:before {
+  content: "\e1ca";
+}
+.icon-system-fenlei2:before {
+  content: "\e1cb";
+}
+.icon-system-guanbi1:before {
+  content: "\e1cc";
+}
+.icon-system-guanzhu1:before {
+  content: "\e1cf";
+}
+.icon-system-guanzhu2:before {
+  content: "\e1d0";
+}
+.icon-system-jiantoushang:before {
+  content: "\e1d3";
+}
+.icon-system-jiantouxia:before {
+  content: "\e1d4";
+}
+.icon-system-jiantouyou:before {
+  content: "\e1d5";
+}
+.icon-system-xiangji1:before {
+  content: "\e1d6";
+}
+.icon-system-xiayibu:before {
+  content: "\e1d7";
+}
+.icon-system-xiangshang:before {
+  content: "\e1d8";
+}
+.icon-system-xiangji2:before {
+  content: "\e1da";
+}
+.icon-system-qiafu1:before {
+  content: "\e1db";
+}
+.icon-system-qiafu2:before {
+  content: "\e1dc";
+}
+.icon-system-xiangxia:before {
+  content: "\e1dd";
+}
+.icon-system-xiangxiajiantou:before {
+  content: "\e1de";
+}
+.icon-system-xiangyoujiantou:before {
+  content: "\e1df";
+}
+.icon-system-lajietong:before {
+  content: "\e1e0";
+}
+.icon-system-lajietong1:before {
+  content: "\e1e1";
+}
+.icon-system-liuyin2:before {
+  content: "\e1e2";
+}
+.icon-system-libiao:before {
+  content: "\e1e3";
+}
+.icon-system-liuyin1:before {
+  content: "\e1e4";
+}
+.icon-system-piaoju1:before {
+  content: "\e1e5";
+}
+.icon-system-laya2:before {
+  content: "\e1e6";
+}
+.icon-system-pengluo:before {
+  content: "\e1e7";
+}
+.icon-system-qianpao1:before {
+  content: "\e1e8";
+}
+.icon-system-qianpao2:before {
+  content: "\e1ea";
+}
+.icon-system-shanglajiantou:before {
+  content: "\e1ec";
+}
+.icon-system-shouye1:before {
+  content: "\e1ee";
+}
+.icon-system-shezhi2:before {
+  content: "\e1ef";
+}
+.icon-system-shangyibu:before {
+  content: "\e1f0";
+}
+.icon-system-piaoju:before {
+  content: "\e1f1";
+}
+.icon-system-leimu:before {
+  content: "\e1f2";
+}
+.icon-system-xiaosuo1:before {
+  content: "\e1f3";
+}
+.icon-system-suoding:before {
+  content: "\e1f5";
+}
+.icon-system-laya1:before {
+  content: "\e1f6";
+}
+.icon-system-shouzang1:before {
+  content: "\e1f7";
+}
+.icon-system-xiaosuo2:before {
+  content: "\e1f8";
+}
+.icon-system-shouye2:before {
+  content: "\e1f9";
+}
+.icon-system-tongzhi:before {
+  content: "\e1fa";
+}
+.icon-system-tubiao1:before {
+  content: "\e1fb";
+}
+.icon-system-tubiao2:before {
+  content: "\e1fc";
+}
+.icon-system-tubiao6:before {
+  content: "\e1fd";
+}
+.icon-system-tubiao9:before {
+  content: "\e1fe";
+}
+.icon-system-tubiao7:before {
+  content: "\e1ff";
+}
+.icon-system-tubiao5:before {
+  content: "\e201";
+}
+.icon-system-tubiao11:before {
+  content: "\e202";
+}
+.icon-system-tongzhi1:before {
+  content: "\e203";
+}
+.icon-system-wodi1:before {
+  content: "\e204";
+}
+.icon-system-tubiao10:before {
+  content: "\e205";
+}
+.icon-system-tubiao8:before {
+  content: "\e206";
+}
+.icon-system-wodi2:before {
+  content: "\e207";
+}
+.icon-system-wodi4:before {
+  content: "\e208";
+}
+.icon-system-xialajiantou:before {
+  content: "\e209";
+}
+.icon-system-tubiao3:before {
+  content: "\e20b";
+}
+.icon-system-shezhi3:before {
+  content: "\e20d";
+}
+.icon-system-tubiao12:before {
+  content: "\e20e";
+}
+.icon-system-shouzang:before {
+  content: "\e20f";
+}
+.icon-system-tubiao4:before {
+  content: "\e210";
+}
+.icon-system-wodi3:before {
+  content: "\e211";
+}
+.icon-system-7days-return:before {
+  content: "\e212";
+}
+.icon-system-lightning-refund:before {
+  content: "\e213";
+}
+.icon-system-gongyi:before {
+  content: "\e214";
+}
+.icon-system-cash-delivery:before {
+  content: "\e215";
+}
+.icon-system-freight:before {
+  content: "\e216";
+}
+.icon-system-add-fill:before {
+  content: "\e218";
+}
+.icon-system-add-circle-line:before {
+  content: "\e219";
+}
+.icon-system-add-line:before {
+  content: "\e21a";
+}
+.icon-system-admin-fill:before {
+  content: "\e21b";
+}
+.icon-system-advertisement-fill:before {
+  content: "\e21c";
+}
+.icon-system-advertisement-line:before {
+  content: "\e21d";
+}
+.icon-system-admin-line:before {
+  content: "\e21e";
+}
+.icon-system-airplay-fill:before {
+  content: "\e21f";
+}
+.icon-system-alarm-fill:before {
+  content: "\e220";
+}
+.icon-system-alarm-line:before {
+  content: "\e221";
+}
+.icon-system-airplay-line:before {
+  content: "\e222";
+}
+.icon-system-alarm-warning-fill:before {
+  content: "\e223";
+}
+.icon-system-album-fill:before {
+  content: "\e224";
+}
+.icon-system-alarm-warning-line:before {
+  content: "\e225";
+}
+.icon-system-album-line:before {
+  content: "\e226";
+}
+.icon-system-alert-fill:before {
+  content: "\e227";
+}
+.icon-system-alert-line:before {
+  content: "\e228";
+}
+.icon-system-align-bottom:before {
+  content: "\e22b";
+}
+.icon-system-align-justify:before {
+  content: "\e22c";
+}
+.icon-system-align-left:before {
+  content: "\e22d";
+}
+.icon-system-align-center:before {
+  content: "\e22e";
+}
+.icon-system-align-right:before {
+  content: "\e22f";
+}
+.icon-system-align-top:before {
+  content: "\e230";
+}
+.icon-system-align-vertically:before {
+  content: "\e231";
+}
+.icon-system-alipay-fill:before {
+  content: "\e232";
+}
+.icon-system-alipay-line:before {
+  content: "\e233";
+}
+.icon-system-ancient-pavilion-line:before {
+  content: "\e234";
+}
+.icon-system-android-fill:before {
+  content: "\e235";
+}
+.icon-system-24-hours-fill:before {
+  content: "\e236";
+}
+.icon-system-24-hours-line:before {
+  content: "\e237";
+}
+.icon-system-a-b:before {
+  content: "\e238";
+}
+.icon-system-account-circle-fill:before {
+  content: "\e239";
+}
+.icon-system-account-box-fill:before {
+  content: "\e23a";
+}
+.icon-system-account-box-line:before {
+  content: "\e23b";
+}
+.icon-system-amazon-fill:before {
+  content: "\e23c";
+}
+.icon-system-amazon-line:before {
+  content: "\e23d";
+}
+.icon-system-anchor-fill:before {
+  content: "\e23e";
+}
+.icon-system-ancient-gate-fill:before {
+  content: "\e23f";
+}
+.icon-system-anchor-line:before {
+  content: "\e240";
+}
+.icon-system-ancient-gate-line:before {
+  content: "\e241";
+}
+.icon-system-4k-fill:before {
+  content: "\e242";
+}
+.icon-system-ancient-pavilion-fill:before {
+  content: "\e243";
+}
+.icon-system-account-circle-line:before {
+  content: "\e244";
+}
+.icon-system-android-line:before {
+  content: "\e245";
+}
+.icon-system-angularjs-fill:before {
+  content: "\e246";
+}
+.icon-system-account-pin-box-fill:before {
+  content: "\e247";
+}
+.icon-system-4k-line:before {
+  content: "\e248";
+}
+.icon-system-account-pin-box-line:before {
+  content: "\e249";
+}
+.icon-system-account-pin-circle-fill:before {
+  content: "\e24a";
+}
+.icon-system-add-box-fill:before {
+  content: "\e24b";
+}
+.icon-system-account-pin-circle-line:before {
+  content: "\e24c";
+}
+.icon-system-add-box-line:before {
+  content: "\e24d";
+}
+.icon-system-add-circle-fill:before {
+  content: "\e24e";
+}
+.icon-system-anticlockwise-fill:before {
+  content: "\e24f";
+}
+.icon-system-anticlockwise-line:before {
+  content: "\e250";
+}
+.icon-system-apple-line:before {
+  content: "\e251";
+}
+.icon-system-apps-2-line:before {
+  content: "\e252";
+}
+.icon-system-apps-2-fill:before {
+  content: "\e253";
+}
+.icon-system-apple-fill:before {
+  content: "\e254";
+}
+.icon-system-arrow-drop-up-fill:before {
+  content: "\e255";
+}
+.icon-system-apps-line:before {
+  content: "\e256";
+}
+.icon-system-apps-fill:before {
+  content: "\e257";
+}
+.icon-system-arrow-drop-right-fill:before {
+  content: "\e258";
+}
+.icon-system-app-store-fill:before {
+  content: "\e259";
+}
+.icon-system-archive-line:before {
+  content: "\e25a";
+}
+.icon-system-arrow-drop-down-fill:before {
+  content: "\e25b";
+}
+.icon-system-arrow-down-circle-fill:before {
+  content: "\e25c";
+}
+.icon-system-app-store-line:before {
+  content: "\e25d";
+}
+.icon-system-archive-drawer-fill:before {
+  content: "\e25e";
+}
+.icon-system-archive-drawer-line:before {
+  content: "\e25f";
+}
+.icon-system-archive-fill:before {
+  content: "\e260";
+}
+.icon-system-arrow-drop-left-line:before {
+  content: "\e261";
+}
+.icon-system-arrow-down-circle-line:before {
+  content: "\e262";
+}
+.icon-system-arrow-down-fill:before {
+  content: "\e263";
+}
+.icon-system-arrow-go-back-fill:before {
+  content: "\e264";
+}
+.icon-system-arrow-down-line:before {
+  content: "\e265";
+}
+.icon-system-arrow-down-s-fill:before {
+  content: "\e266";
+}
+.icon-system-arrow-drop-right-line:before {
+  content: "\e267";
+}
+.icon-system-arrow-drop-down-line:before {
+  content: "\e268";
+}
+.icon-system-arrow-drop-left-fill:before {
+  content: "\e269";
+}
+.icon-system-arrow-down-s-line:before {
+  content: "\e26a";
+}
+.icon-system-arrow-drop-up-line:before {
+  content: "\e26b";
+}
+.icon-system-arrow-go-back-line:before {
+  content: "\e26c";
+}
+.icon-system-arrow-left-circle-fill:before {
+  content: "\e26d";
+}
+.icon-system-arrow-go-forward-line:before {
+  content: "\e26e";
+}
+.icon-system-arrow-left-circle-line:before {
+  content: "\e26f";
+}
+.icon-system-arrow-up-fill:before {
+  content: "\e270";
+}
+.icon-system-arrow-left-down-fill:before {
+  content: "\e271";
+}
+.icon-system-arrow-left-down-line:before {
+  content: "\e272";
+}
+.icon-system-arrow-left-fill:before {
+  content: "\e273";
+}
+.icon-system-arrow-left-line:before {
+  content: "\e274";
+}
+.icon-system-arrow-go-forward-fill:before {
+  content: "\e275";
+}
+.icon-system-arrow-left-right-line:before {
+  content: "\e276";
+}
+.icon-system-artboard-2-fill:before {
+  content: "\e277";
+}
+.icon-system-artboard-2-line:before {
+  content: "\e278";
+}
+.icon-system-arrow-up-line:before {
+  content: "\e279";
+}
+.icon-food-chenzi:before {
+  content: "\e130";
+}
+.icon-food-hanpu:before {
+  content: "\e131";
+}
+.icon-beauty-fangshaizhuang:before {
+  content: "\e133";
+}
+.icon-beauty-fenshua:before {
+  content: "\e134";
+}
+.icon-beauty-huazhuangjing:before {
+  content: "\e135";
+}
+.icon-beauty-jimiantaozhuang:before {
+  content: "\e136";
+}
+.icon-beauty-hufa:before {
+  content: "\e137";
+}
+.icon-beauty-jinghua1:before {
+  content: "\e139";
+}
+.icon-beauty-kougong:before {
+  content: "\e13c";
+}
+.icon-beauty-meibi:before {
+  content: "\e13d";
+}
+.icon-beauty-meitong:before {
+  content: "\e13e";
+}
+.icon-beauty-mianmo:before {
+  content: "\e13f";
+}
+.icon-beauty-wenying1:before {
+  content: "\e141";
+}
+.icon-beauty-shuzhuangjing:before {
+  content: "\e145";
+}
+.icon-tourism-reqiqiu:before {
+  content: "\e10a";
+}
+.icon-tourism-zijialiu:before {
+  content: "\e10c";
+}
+.icon-tourism-liulun:before {
+  content: "\e10d";
+}
+.icon-tourism-daoyu:before {
+  content: "\e10e";
+}
+.icon-tourism-fanchuan:before {
+  content: "\e10f";
+}
+.icon-tourism-feiji:before {
+  content: "\e110";
+}
+.icon-tourism-gaotie:before {
+  content: "\e111";
+}
+.icon-food-lajiao:before {
+  content: "\e112";
+}
+.icon-food-lamei:before {
+  content: "\e114";
+}
+.icon-food-liulian:before {
+  content: "\e115";
+}
+.icon-food-liqi:before {
+  content: "\e116";
+}
+.icon-food-luobu:before {
+  content: "\e117";
+}
+.icon-food-zhumeng:before {
+  content: "\e118";
+}
+.icon-food-huangluo:before {
+  content: "\e119";
+}
+.icon-food-niuyouluo:before {
+  content: "\e11a";
+}
+.icon-food-pengluo:before {
+  content: "\e11b";
+}
+.icon-food-pisa:before {
+  content: "\e11c";
+}
+.icon-food-beitao:before {
+  content: "\e11d";
+}
+.icon-food-jiazi:before {
+  content: "\e11f";
+}
+.icon-food-regou:before {
+  content: "\e120";
+}
+.icon-food-shanzhu:before {
+  content: "\e121";
+}
+.icon-food-tiantianjuan:before {
+  content: "\e122";
+}
+.icon-food-qiaokeli:before {
+  content: "\e123";
+}
+.icon-food-zhaozi:before {
+  content: "\e124";
+}
+.icon-food-yangzhao:before {
+  content: "\e125";
+}
+.icon-food-xiangcong:before {
+  content: "\e126";
+}
+.icon-food-xigua:before {
+  content: "\e127";
+}
+.icon-food-yingzhao:before {
+  content: "\e128";
+}
+.icon-food-xilahua:before {
+  content: "\e129";
+}
+.icon-food-bomihua:before {
+  content: "\e12a";
+}
+.icon-food-yezi:before {
+  content: "\e12b";
+}
+.icon-food-boluo:before {
+  content: "\e12c";
+}
+.icon-food-binggan:before {
+  content: "\e12d";
+}
+.icon-food-caomei:before {
+  content: "\e12e";
+}
+.icon-food-fanjia:before {
+  content: "\e12f";
+}
+.icon-beauty-baoshizhuang:before {
+  content: "\e146";
+}
+.icon-beauty-mianshuang:before {
+  content: "\e14a";
+}
+.icon-beauty-zhencai:before {
+  content: "\e14b";
+}
+.icon-sport-ganlanqiu1:before {
+  content: "\e15d";
+}
+.icon-sport-ganlanqiu:before {
+  content: "\e15e";
+}
+.icon-sport-deshan:before {
+  content: "\e15f";
+}
+.icon-sport-gangling:before {
+  content: "\e160";
+}
+.icon-sport-gaoerfu:before {
+  content: "\e161";
+}
+.icon-sport-gaoerfuqiu:before {
+  content: "\e162";
+}
+.icon-sport-gongjian:before {
+  content: "\e163";
+}
+.icon-sport-huaban:before {
+  content: "\e164";
+}
+.icon-sport-jijian:before {
+  content: "\e165";
+}
+.icon-sport-huaban1:before {
+  content: "\e166";
+}
+.icon-sport-jijian1:before {
+  content: "\e167";
+}
+.icon-system-arrow-left-right-fill:before {
+  content: "\e27a";
+}
+.icon-system-arrow-up-s-fill:before {
+  content: "\e27b";
+}
+.icon-system-arrow-left-s-line:before {
+  content: "\e27c";
+}
+.icon-system-arrow-up-s-line:before {
+  content: "\e27d";
+}
+.icon-system-artboard-fill:before {
+  content: "\e27e";
+}
+.icon-system-arrow-right-circle-fill:before {
+  content: "\e27f";
+}
+.icon-system-artboard-line:before {
+  content: "\e280";
+}
+.icon-system-arrow-right-circle-line:before {
+  content: "\e281";
+}
+.icon-system-arrow-left-up-fill:before {
+  content: "\e282";
+}
+.icon-system-arrow-left-s-fill:before {
+  content: "\e283";
+}
+.icon-system-arrow-right-down-fill:before {
+  content: "\e284";
+}
+.icon-system-arrow-left-up-line:before {
+  content: "\e285";
+}
+.icon-system-arrow-right-down-line:before {
+  content: "\e286";
+}
+.icon-system-arrow-right-line:before {
+  content: "\e287";
+}
+.icon-system-arrow-right-fill:before {
+  content: "\e288";
+}
+.icon-system-arrow-right-s-fill:before {
+  content: "\e289";
+}
+.icon-system-arrow-right-s-line:before {
+  content: "\e28a";
+}
+.icon-system-arrow-right-up-fill:before {
+  content: "\e28b";
+}
+.icon-system-article-fill:before {
+  content: "\e28c";
+}
+.icon-system-arrow-right-up-line:before {
+  content: "\e28d";
+}
+.icon-system-arrow-up-circle-fill:before {
+  content: "\e28e";
+}
+.icon-system-arrow-up-circle-line:before {
+  content: "\e28f";
+}
+.icon-system-arrow-up-down-fill:before {
+  content: "\e290";
+}
+.icon-system-arrow-up-down-line:before {
+  content: "\e291";
+}
+.icon-system-article-line:before {
+  content: "\e292";
+}
+.icon-system-asterisk:before {
+  content: "\e293";
+}
+.icon-system-at-fill:before {
+  content: "\e294";
+}
+.icon-system-aspect-ratio-line:before {
+  content: "\e295";
+}
+.icon-system-aspect-ratio-fill:before {
+  content: "\e296";
+}
+.icon-system-at-line:before {
+  content: "\e297";
+}
+.icon-system-attachment-2:before {
+  content: "\e298";
+}
+.icon-system-attachment-fill:before {
+  content: "\e299";
+}
+.icon-system-auction-fill:before {
+  content: "\e29a";
+}
+.icon-system-award-fill:before {
+  content: "\e29b";
+}
+.icon-system-award-line:before {
+  content: "\e29c";
+}
+.icon-system-attachment-line:before {
+  content: "\e29d";
+}
+.icon-system-auction-line:before {
+  content: "\e29e";
+}
+.icon-system-angularjs-line:before {
+  content: "\e2a0";
+}
+.icon-system-anticlockwise-2-fill:before {
+  content: "\e2a2";
+}
+.icon-system-anticlockwise-2-line:before {
+  content: "\e2a3";
+}
+.icon-system-bank-card-2-fill:before {
+  content: "\e2a4";
+}
+.icon-system-bank-card-2-line:before {
+  content: "\e2a5";
+}
+.icon-system-bank-card-fill:before {
+  content: "\e2a6";
+}
+.icon-system-bank-fill:before {
+  content: "\e2a7";
+}
+.icon-system-bank-card-line:before {
+  content: "\e2a8";
+}
+.icon-system-bank-line:before {
+  content: "\e2a9";
+}
+.icon-system-bar-chart-box-fill:before {
+  content: "\e2aa";
+}
+.icon-system-bar-chart-box-line:before {
+  content: "\e2ab";
+}
+.icon-system-bar-chart-fill:before {
+  content: "\e2ac";
+}
+.icon-system-bar-chart-grouped-fill:before {
+  content: "\e2ad";
+}
+.icon-system-bar-chart-grouped-line:before {
+  content: "\e2ae";
+}
+.icon-system-bar-chart-2-fill:before {
+  content: "\e2af";
+}
+.icon-system-barcode-line:before {
+  content: "\e2b0";
+}
+.icon-system-bar-chart-horizontal-fill:before {
+  content: "\e2b1";
+}
+.icon-system-barcode-box-line:before {
+  content: "\e2b2";
+}
+.icon-system-barcode-box-fill:before {
+  content: "\e2b3";
+}
+.icon-system-barcode-fill:before {
+  content: "\e2b4";
+}
+.icon-system-bar-chart-horizontal-line:before {
+  content: "\e2b5";
+}
+.icon-system-bar-chart-line:before {
+  content: "\e2b6";
+}
+.icon-system-barricade-fill:before {
+  content: "\e2b7";
+}
+.icon-system-base-station-fill:before {
+  content: "\e2b8";
+}
+.icon-system-barricade-line:before {
+  content: "\e2b9";
+}
+.icon-system-bar-chart-2-line:before {
+  content: "\e2ba";
+}
+.icon-system-base-station-line:before {
+  content: "\e2bb";
+}
+.icon-system-battery-2-charge-line:before {
+  content: "\e2bc";
+}
+.icon-system-battery-2-charge-fill:before {
+  content: "\e2bd";
+}
+.icon-system-basketball-line:before {
+  content: "\e2be";
+}
+.icon-system-basketball-fill:before {
+  content: "\e2bf";
+}
+.icon-system-battery-2-fill:before {
+  content: "\e2c0";
+}
+.icon-system-battery-charge-fill:before {
+  content: "\e2c1";
+}
+.icon-system-battery-2-line:before {
+  content: "\e2c2";
+}
+.icon-system-blur-off-fill:before {
+  content: "\e2c3";
+}
+.icon-system-battery-saver-fill:before {
+  content: "\e2c4";
+}
+.icon-system-battery-share-fill:before {
+  content: "\e2c5";
+}
+.icon-system-battery-saver-line:before {
+  content: "\e2c6";
+}
+.icon-system-bear-smile-fill:before {
+  content: "\e2c7";
+}
+.icon-system-battery-share-line:before {
+  content: "\e2c8";
+}
+.icon-system-bear-smile-line:before {
+  content: "\e2c9";
+}
+.icon-system-battery-charge-line:before {
+  content: "\e2cb";
+}
+.icon-system-battery-line:before {
+  content: "\e2cc";
+}
+.icon-system-battery-fill:before {
+  content: "\e2cd";
+}
+.icon-system-battery-low-line:before {
+  content: "\e2ce";
+}
+.icon-system-bell-fill:before {
+  content: "\e2cf";
+}
+.icon-system-battery-low-fill:before {
+  content: "\e2d1";
+}
+.icon-tourism-bike-fill:before {
+  content: "\e2d2";
+}
+.icon-system-bell-line:before {
+  content: "\e2d3";
+}
+.icon-system-bilibili-fill:before {
+  content: "\e2d4";
+}
+.icon-tourism-bike-line:before {
+  content: "\e2d5";
+}
+.icon-system-bilibili-line:before {
+  content: "\e2d6";
+}
+.icon-system-bill-fill:before {
+  content: "\e2d7";
+}
+.icon-system-billiards-fill:before {
+  content: "\e2d8";
+}
+.icon-system-billiards-line:before {
+  content: "\e2d9";
+}
+.icon-system-bill-line:before {
+  content: "\e2da";
+}
+.icon-system-bit-coin-fill:before {
+  content: "\e2db";
+}
+.icon-system-bit-coin-line:before {
+  content: "\e2dc";
+}
+.icon-system-bluetooth-connect-fill:before {
+  content: "\e2dd";
+}
+.icon-system-bluetooth-connect-line:before {
+  content: "\e2de";
+}
+.icon-system-bluetooth-fill:before {
+  content: "\e2df";
+}
+.icon-system-blur-off-line:before {
+  content: "\e2e0";
+}
+.icon-system-bluetooth-line:before {
+  content: "\e2e1";
+}
+.icon-system-booklet-fill:before {
+  content: "\e2e2";
+}
+.icon-system-body-scan-fill:before {
+  content: "\e2e3";
+}
+.icon-system-booklet-line:before {
+  content: "\e2e4";
+}
+.icon-system-body-scan-line:before {
+  content: "\e2e5";
+}
+.icon-system-bold:before {
+  content: "\e2e6";
+}
+.icon-system-book-2-fill:before {
+  content: "\e2e7";
+}
+.icon-system-book-2-line:before {
+  content: "\e2e8";
+}
+.icon-system-book-3-fill:before {
+  content: "\e2e9";
+}
+.icon-system-book-3-line:before {
+  content: "\e2ea";
+}
+.icon-system-brush-4-fill:before {
+  content: "\e2eb";
+}
+.icon-system-book-fill:before {
+  content: "\e2ec";
+}
+.icon-system-brush-4-line:before {
+  content: "\e2ed";
+}
+.icon-system-brush-fill:before {
+  content: "\e2ee";
+}
+.icon-system-book-line:before {
+  content: "\e2ef";
+}
+.icon-system-brush-line:before {
+  content: "\e2f0";
+}
+.icon-system-ball-pen-fill:before {
+  content: "\e2f1";
+}
+.icon-system-bookmark-3-fill:before {
+  content: "\e2f2";
+}
+.icon-system-bookmark-2-line:before {
+  content: "\e2f3";
+}
+.icon-system-bookmark-2-fill:before {
+  content: "\e2f4";
+}
+.icon-system-ball-pen-line:before {
+  content: "\e2f5";
+}
+.icon-system-bookmark-3-line:before {
+  content: "\e2f6";
+}
+.icon-system-bookmark-fill:before {
+  content: "\e2f7";
+}
+.icon-system-book-mark-fill:before {
+  content: "\e2f8";
+}
+.icon-system-book-mark-line:before {
+  content: "\e2f9";
+}
+.icon-system-bookmark-line:before {
+  content: "\e2fa";
+}
+.icon-system-book-open-fill:before {
+  content: "\e2fb";
+}
+.icon-system-book-read-line:before {
+  content: "\e2fc";
+}
+.icon-system-book-open-line:before {
+  content: "\e2fd";
+}
+.icon-system-boxing-line:before {
+  content: "\e2ff";
+}
+.icon-system-book-read-fill:before {
+  content: "\e300";
+}
+.icon-system-boxing-fill:before {
+  content: "\e301";
+}
+.icon-system-briefcase-2-line:before {
+  content: "\e302";
+}
+.icon-system-briefcase-3-fill:before {
+  content: "\e303";
+}
+.icon-system-briefcase-3-line:before {
+  content: "\e304";
+}
+.icon-system-briefcase-4-line:before {
+  content: "\e305";
+}
+.icon-system-briefcase-4-fill:before {
+  content: "\e306";
+}
+.icon-system-briefcase-5-fill:before {
+  content: "\e307";
+}
+.icon-system-briefcase-2-fill:before {
+  content: "\e308";
+}
+.icon-system-briefcase-line:before {
+  content: "\e309";
+}
+.icon-system-bring-forward:before {
+  content: "\e30a";
+}
+.icon-system-bring-to-front:before {
+  content: "\e30b";
+}
+.icon-system-broadcast-fill:before {
+  content: "\e30d";
+}
+.icon-system-brush-2-fill:before {
+  content: "\e30f";
+}
+.icon-system-briefcase-5-line:before {
+  content: "\e310";
+}
+.icon-system-broadcast-line:before {
+  content: "\e311";
+}
+.icon-system-briefcase-fill:before {
+  content: "\e312";
+}
+.icon-system-brush-3-fill:before {
+  content: "\e314";
+}
+.icon-system-brush-2-line:before {
+  content: "\e315";
+}
+.icon-system-brush-3-line:before {
+  content: "\e316";
+}
+.icon-system-calendar-2-fill:before {
+  content: "\e317";
+}
+.icon-system-calendar-2-line:before {
+  content: "\e318";
+}
+.icon-system-calendar-check-fill:before {
+  content: "\e319";
+}
+.icon-system-calendar-check-line:before {
+  content: "\e31a";
+}
+.icon-system-calendar-event-fill:before {
+  content: "\e31b";
+}
+.icon-system-calendar-event-line:before {
+  content: "\e31c";
+}
+.icon-system-calendar-line:before {
+  content: "\e31d";
+}
+.icon-system-calendar-todo-fill:before {
+  content: "\e31e";
+}
+.icon-system-calendar-todo-line:before {
+  content: "\e31f";
+}
+.icon-system-calendar-fill:before {
+  content: "\e320";
+}
+.icon-system-camera-3-fill:before {
+  content: "\e321";
+}
+.icon-system-camera-3-line:before {
+  content: "\e322";
+}
+.icon-system-camera-fill:before {
+  content: "\e323";
+}
+.icon-system-camera-2-line:before {
+  content: "\e324";
+}
+.icon-system-camera-lens-fill:before {
+  content: "\e325";
+}
+.icon-system-camera-2-fill:before {
+  content: "\e326";
+}
+.icon-system-camera-lens-line:before {
+  content: "\e327";
+}
+.icon-system-camera-off-fill:before {
+  content: "\e328";
+}
+.icon-system-camera-switch-fill:before {
+  content: "\e329";
+}
+.icon-system-camera-switch-line:before {
+  content: "\e32a";
+}
+.icon-system-capsule-fill:before {
+  content: "\e32b";
+}
+.icon-tourism-caravan-fill:before {
+  content: "\e32c";
+}
+.icon-tourism-caravan-line:before {
+  content: "\e32d";
+}
+.icon-tourism-car-washing-fill:before {
+  content: "\e32e";
+}
+.icon-tourism-car-washing-line:before {
+  content: "\e32f";
+}
+.icon-system-cast-fill:before {
+  content: "\e330";
+}
+.icon-system-cast-line:before {
+  content: "\e331";
+}
+.icon-system-cellphone-fill:before {
+  content: "\e332";
+}
+.icon-system-capsule-line:before {
+  content: "\e333";
+}
+.icon-system-camera-line:before {
+  content: "\e334";
+}
+.icon-system-camera-off-line:before {
+  content: "\e335";
+}
+.icon-system-cellphone-line:before {
+  content: "\e336";
+}
+.icon-system-centos-fill:before {
+  content: "\e337";
+}
+.icon-system-car-fill:before {
+  content: "\e338";
+}
+.icon-system-car-line:before {
+  content: "\e339";
+}
+.icon-system-centos-line:before {
+  content: "\e33a";
+}
+.icon-system-character-recognition-fill:before {
+  content: "\e33b";
+}
+.icon-system-charging-pile-2-fill:before {
+  content: "\e33c";
+}
+.icon-system-charging-pile-2-line:before {
+  content: "\e33d";
+}
+.icon-system-chat-check-fill:before {
+  content: "\e33e";
+}
+.icon-system-chat-delete-fill:before {
+  content: "\e33f";
+}
+.icon-system-chat-check-line:before {
+  content: "\e340";
+}
+.icon-system-bubble-chart-line:before {
+  content: "\e341";
+}
+.icon-system-bug-line:before {
+  content: "\e342";
+}
+.icon-system-building-2-fill:before {
+  content: "\e343";
+}
+.icon-system-building-2-line:before {
+  content: "\e344";
+}
+.icon-system-chat-delete-line:before {
+  content: "\e345";
+}
+.icon-system-bubble-chart-fill:before {
+  content: "\e346";
+}
+.icon-system-bug-2-fill:before {
+  content: "\e347";
+}
+.icon-system-bug-fill:before {
+  content: "\e348";
+}
+.icon-system-bug-2-line:before {
+  content: "\e349";
+}
+.icon-system-building-3-fill:before {
+  content: "\e34a";
+}
+.icon-system-building-3-line:before {
+  content: "\e34b";
+}
+.icon-system-building-4-line:before {
+  content: "\e34c";
+}
+.icon-system-building-4-fill:before {
+  content: "\e34d";
+}
+.icon-system-building-fill:before {
+  content: "\e34e";
+}
+.icon-system-building-line:before {
+  content: "\e34f";
+}
+.icon-system-bus-2-fill:before {
+  content: "\e350";
+}
+.icon-system-chat-1-line:before {
+  content: "\e351";
+}
+.icon-system-chat-2-line:before {
+  content: "\e352";
+}
+.icon-tourism-bus-wifi-fill:before {
+  content: "\e353";
+}
+.icon-system-charging-pile-fill:before {
+  content: "\e354";
+}
+.icon-tourism-bus-wifi-line:before {
+  content: "\e355";
+}
+.icon-system-chat-4-line:before {
+  content: "\e356";
+}
+.icon-system-chat-1-fill:before {
+  content: "\e357";
+}
+.icon-system-bus-line:before {
+  content: "\e358";
+}
+.icon-system-character-recognition-line:before {
+  content: "\e359";
+}
+.icon-system-chat-download-fill:before {
+  content: "\e35a";
+}
+.icon-system-charging-pile-line:before {
+  content: "\e35b";
+}
+.icon-system-chat-4-fill:before {
+  content: "\e35c";
+}
+.icon-system-cactus-fill:before {
+  content: "\e35d";
+}
+.icon-system-cake-2-line:before {
+  content: "\e35e";
+}
+.icon-system-cake-3-line:before {
+  content: "\e35f";
+}
+.icon-system-chat-2-fill:before {
+  content: "\e360";
+}
+.icon-system-cake-3-fill:before {
+  content: "\e361";
+}
+.icon-system-cake-fill:before {
+  content: "\e362";
+}
+.icon-system-cake-line:before {
+  content: "\e363";
+}
+.icon-system-calculator-fill:before {
+  content: "\e364";
+}
+.icon-system-chat-3-line:before {
+  content: "\e365";
+}
+.icon-system-chat-3-fill:before {
+  content: "\e366";
+}
+.icon-system-cake-2-fill:before {
+  content: "\e367";
+}
+.icon-system-cactus-line:before {
+  content: "\e368";
+}
+.icon-system-calculator-line:before {
+  content: "\e369";
+}
+.icon-tourism-bus-2-line:before {
+  content: "\e36a";
+}
+.icon-tourism-bus-fill:before {
+  content: "\e36b";
+}
+.icon-system-chat-history-line:before {
+  content: "\e36c";
+}
+.icon-system-chat-new-fill:before {
+  content: "\e36d";
+}
+.icon-system-chat-off-fill:before {
+  content: "\e36e";
+}
+.icon-system-chat-off-line:before {
+  content: "\e36f";
+}
+.icon-system-chat-poll-fill:before {
+  content: "\e370";
+}
+.icon-system-chat-poll-line:before {
+  content: "\e371";
+}
+.icon-system-chat-private-fill:before {
+  content: "\e372";
+}
+.icon-system-chat-new-line:before {
+  content: "\e373";
+}
+.icon-system-chat-private-line:before {
+  content: "\e374";
+}
+.icon-system-chat-quote-fill:before {
+  content: "\e375";
+}
+.icon-system-chat-quote-line:before {
+  content: "\e376";
+}
+.icon-system-chat-settings-line:before {
+  content: "\e377";
+}
+.icon-system-chat-settings-fill:before {
+  content: "\e378";
+}
+.icon-system-chat-smile-2-fill:before {
+  content: "\e379";
+}
+.icon-system-chat-smile-2-line:before {
+  content: "\e37a";
+}
+.icon-system-chat-upload-line:before {
+  content: "\e37b";
+}
+.icon-system-chat-smile-3-line:before {
+  content: "\e37c";
+}
+.icon-system-chat-smile-3-fill:before {
+  content: "\e37d";
+}
+.icon-system-chat-smile-fill:before {
+  content: "\e37e";
+}
+.icon-system-chat-upload-fill:before {
+  content: "\e37f";
+}
+.icon-system-chat-smile-line:before {
+  content: "\e380";
+}
+.icon-system-chat-voice-fill:before {
+  content: "\e381";
+}
+.icon-system-chat-voice-line:before {
+  content: "\e382";
+}
+.icon-system-checkbox-blank-circle-fill:before {
+  content: "\e383";
+}
+.icon-system-checkbox-circle-fill:before {
+  content: "\e384";
+}
+.icon-system-checkbox-blank-circle-line:before {
+  content: "\e385";
+}
+.icon-system-checkbox-blank-fill:before {
+  content: "\e386";
+}
+.icon-system-checkbox-blank-line:before {
+  content: "\e387";
+}
+.icon-system-checkbox-circle-line:before {
+  content: "\e388";
+}
+.icon-system-checkbox-indeterminate-fill:before {
+  content: "\e389";
+}
+.icon-system-checkbox-fill:before {
+  content: "\e38a";
+}
+.icon-system-checkbox-indeterminate-line:before {
+  content: "\e38b";
+}
+.icon-system-checkbox-line:before {
+  content: "\e38c";
+}
+.icon-system-checkbox-multiple-fill:before {
+  content: "\e38d";
+}
+.icon-system-checkbox-multiple-blank-line:before {
+  content: "\e38e";
+}
+.icon-system-checkbox-multiple-blank-fill:before {
+  content: "\e38f";
+}
+.icon-system-checkbox-multiple-line:before {
+  content: "\e390";
+}
+.icon-system-check-double-fill:before {
+  content: "\e391";
+}
+.icon-system-close-circle-line:before {
+  content: "\e392";
+}
+.icon-system-check-double-line:before {
+  content: "\e393";
+}
+.icon-system-check-fill:before {
+  content: "\e394";
+}
+.icon-system-closed-captioning-fill:before {
+  content: "\e395";
+}
+.icon-system-check-line:before {
+  content: "\e396";
+}
+.icon-system-china-railway-fill:before {
+  content: "\e397";
+}
+.icon-system-closed-captioning-line:before {
+  content: "\e398";
+}
+.icon-system-chrome-fill:before {
+  content: "\e399";
+}
+.icon-system-close-fill:before {
+  content: "\e39a";
+}
+.icon-system-clapperboard-fill:before {
+  content: "\e39b";
+}
+.icon-system-china-railway-line:before {
+  content: "\e39c";
+}
+.icon-system-clapperboard-line:before {
+  content: "\e39d";
+}
+.icon-system-chrome-line:before {
+  content: "\e39e";
+}
+.icon-system-clipboard-fill:before {
+  content: "\e39f";
+}
+.icon-system-clipboard-line:before {
+  content: "\e3a0";
+}
+.icon-system-clockwise-2-fill:before {
+  content: "\e3a1";
+}
+.icon-system-close-line:before {
+  content: "\e3a2";
+}
+.icon-system-clockwise-fill:before {
+  content: "\e3a3";
+}
+.icon-system-cloud-fill:before {
+  content: "\e3a4";
+}
+.icon-system-clockwise-line:before {
+  content: "\e3a5";
+}
+.icon-system-clockwise-2-line:before {
+  content: "\e3a6";
+}
+.icon-system-close-circle-fill:before {
+  content: "\e3a7";
+}
+.icon-system-cloud-line:before {
+  content: "\e3a8";
+}
+.icon-system-cloud-off-line:before {
+  content: "\e3a9";
+}
+.icon-system-code-box-fill:before {
+  content: "\e3aa";
+}
+.icon-system-cloud-off-fill:before {
+  content: "\e3ab";
+}
+.icon-system-code-fill:before {
+  content: "\e3ac";
+}
+.icon-system-code-line:before {
+  content: "\e3ad";
+}
+.icon-system-code-box-line:before {
+  content: "\e3ae";
+}
+.icon-system-chat-follow-up-fill:before {
+  content: "\e3af";
+}
+.icon-system-chat-download-line:before {
+  content: "\e3b0";
+}
+.icon-system-codepen-fill:before {
+  content: "\e3b1";
+}
+.icon-system-chat-forward-fill:before {
+  content: "\e3b2";
+}
+.icon-system-chat-follow-up-line:before {
+  content: "\e3b3";
+}
+.icon-system-chat-forward-line:before {
+  content: "\e3b4";
+}
+.icon-system-chat-heart-fill:before {
+  content: "\e3b5";
+}
+.icon-system-chat-heart-line:before {
+  content: "\e3b6";
+}
+.icon-system-chat-history-fill:before {
+  content: "\e3b7";
+}
+.icon-system-contacts-book-line:before {
+  content: "\e3b8";
+}
+.icon-system-compasses-line:before {
+  content: "\e3b9";
+}
+.icon-system-computer-line:before {
+  content: "\e3ba";
+}
+.icon-system-compass-fill:before {
+  content: "\e3bb";
+}
+.icon-system-compass-line:before {
+  content: "\e3bc";
+}
+.icon-system-contacts-book-2-line:before {
+  content: "\e3bd";
+}
+.icon-system-compasses-2-line:before {
+  content: "\e3be";
+}
+.icon-system-contacts-book-fill:before {
+  content: "\e3bf";
+}
+.icon-system-contacts-book-upload-line:before {
+  content: "\e3c0";
+}
+.icon-system-compasses-fill:before {
+  content: "\e3c1";
+}
+.icon-system-computer-fill:before {
+  content: "\e3c2";
+}
+.icon-system-contacts-book-2-fill:before {
+  content: "\e3c3";
+}
+.icon-system-contacts-book-upload-fill:before {
+  content: "\e3c4";
+}
+.icon-system-contrast-fill:before {
+  content: "\e3c5";
+}
+.icon-system-contacts-fill:before {
+  content: "\e3c6";
+}
+.icon-system-contrast-2-line:before {
+  content: "\e3c7";
+}
+.icon-system-contrast-2-fill:before {
+  content: "\e3c8";
+}
+.icon-system-contrast-drop-line:before {
+  content: "\e3c9";
+}
+.icon-system-contrast-drop-2-fill:before {
+  content: "\e3ca";
+}
+.icon-system-contacts-line:before {
+  content: "\e3cb";
+}
+.icon-system-contrast-line:before {
+  content: "\e3cc";
+}
+.icon-system-contrast-drop-2-line:before {
+  content: "\e3cd";
+}
+.icon-system-contrast-drop-fill:before {
+  content: "\e3ce";
+}
+.icon-system-copper-coin-fill:before {
+  content: "\e3cf";
+}
+.icon-system-copper-diamond-line:before {
+  content: "\e3d0";
+}
+.icon-system-copper-coin-line:before {
+  content: "\e3d1";
+}
+.icon-system-copper-diamond-fill:before {
+  content: "\e3d2";
+}
+.icon-system-copyleft-fill:before {
+  content: "\e3d3";
+}
+.icon-system-copyright-fill:before {
+  content: "\e3d4";
+}
+.icon-system-coreos-line:before {
+  content: "\e3d5";
+}
+.icon-system-coreos-fill:before {
+  content: "\e3d6";
+}
+.icon-system-coupon-2-fill:before {
+  content: "\e3d7";
+}
+.icon-system-copyright-line:before {
+  content: "\e3d8";
+}
+.icon-system-coupon-2-line:before {
+  content: "\e3d9";
+}
+.icon-system-copyleft-line:before {
+  content: "\e3da";
+}
+.icon-system-coupon-4-fill:before {
+  content: "\e3db";
+}
+.icon-system-coupon-3-fill:before {
+  content: "\e3dc";
+}
+.icon-system-coupon-3-line:before {
+  content: "\e3dd";
+}
+.icon-system-cpu-fill:before {
+  content: "\e3de";
+}
+.icon-system-creative-commons-by-line:before {
+  content: "\e3df";
+}
+.icon-system-creative-commons-fill:before {
+  content: "\e3e0";
+}
+.icon-system-coupon-5-line:before {
+  content: "\e3e1";
+}
+.icon-system-creative-commons-line:before {
+  content: "\e3e3";
+}
+.icon-system-creative-commons-nd-fill:before {
+  content: "\e3e4";
+}
+.icon-system-cpu-line:before {
+  content: "\e3e5";
+}
+.icon-system-creative-commons-nd-line:before {
+  content: "\e3e7";
+}
+.icon-system-coupon-4-line:before {
+  content: "\e3e8";
+}
+.icon-system-creative-commons-by-fill:before {
+  content: "\e3e9";
+}
+.icon-system-coupon-fill:before {
+  content: "\e3ea";
+}
+.icon-system-coupon-line:before {
+  content: "\e3eb";
+}
+.icon-system-coupon-5-fill:before {
+  content: "\e3ec";
+}
+.icon-system-creative-commons-sa-fill:before {
+  content: "\e3ed";
+}
+.icon-system-creative-commons-zero-fill:before {
+  content: "\e3ee";
+}
+.icon-system-creative-commons-zero-line:before {
+  content: "\e3ef";
+}
+.icon-system-criminal-line:before {
+  content: "\e3f0";
+}
+.icon-system-crop-2-fill:before {
+  content: "\e3f1";
+}
+.icon-system-crop-2-line:before {
+  content: "\e3f2";
+}
+.icon-system-creative-commons-sa-line:before {
+  content: "\e3f3";
+}
+.icon-system-crop-fill:before {
+  content: "\e3f4";
+}
+.icon-system-criminal-fill:before {
+  content: "\e3f5";
+}
+.icon-system-cup-line:before {
+  content: "\e3f6";
+}
+.icon-system-crop-line:before {
+  content: "\e3f7";
+}
+.icon-system-css3-fill:before {
+  content: "\e3f8";
+}
+.icon-system-cup-fill:before {
+  content: "\e3f9";
+}
+.icon-system-css3-line:before {
+  content: "\e3fa";
+}
+.icon-system-currency-fill:before {
+  content: "\e3fb";
+}
+.icon-system-cursor-fill:before {
+  content: "\e3fc";
+}
+.icon-system-currency-line:before {
+  content: "\e3fd";
+}
+.icon-system-cursor-line:before {
+  content: "\e3fe";
+}
+.icon-system-customer-service-2-line:before {
+  content: "\e3ff";
+}
+.icon-system-dashboard-2-fill:before {
+  content: "\e400";
+}
+.icon-system-dashboard-2-line:before {
+  content: "\e401";
+}
+.icon-system-dashboard-3-fill:before {
+  content: "\e402";
+}
+.icon-system-dashboard-3-line:before {
+  content: "\e403";
+}
+.icon-system-dashboard-fill:before {
+  content: "\e404";
+}
+.icon-system-database-2-fill:before {
+  content: "\e405";
+}
+.icon-system-customer-service-fill:before {
+  content: "\e406";
+}
+.icon-system-customer-service-2-fill:before {
+  content: "\e407";
+}
+.icon-system-database-line:before {
+  content: "\e408";
+}
+.icon-system-database-2-line:before {
+  content: "\e409";
+}
+.icon-system-customer-service-line:before {
+  content: "\e40a";
+}
+.icon-system-dashboard-line:before {
+  content: "\e40b";
+}
+.icon-system-database-fill:before {
+  content: "\e40c";
+}
+.icon-system-delete-back-fill:before {
+  content: "\e40d";
+}
+.icon-system-delete-back-line:before {
+  content: "\e40e";
+}
+.icon-system-delete-bin-2-fill:before {
+  content: "\e40f";
+}
+.icon-system-delete-bin-3-fill:before {
+  content: "\e410";
+}
+.icon-system-delete-bin-2-line:before {
+  content: "\e411";
+}
+.icon-system-delete-bin-4-line:before {
+  content: "\e412";
+}
+.icon-system-delete-bin-5-fill:before {
+  content: "\e413";
+}
+.icon-system-delete-back-2-fill:before {
+  content: "\e414";
+}
+.icon-system-delete-bin-6-fill:before {
+  content: "\e415";
+}
+.icon-system-delete-bin-7-fill:before {
+  content: "\e416";
+}
+.icon-system-delete-bin-3-line:before {
+  content: "\e417";
+}
+.icon-system-delete-bin-5-line:before {
+  content: "\e418";
+}
+.icon-system-delete-bin-7-line:before {
+  content: "\e419";
+}
+.icon-system-delete-bin-4-fill:before {
+  content: "\e41a";
+}
+.icon-system-delete-bin-6-line:before {
+  content: "\e41b";
+}
+.icon-system-delete-bin-fill:before {
+  content: "\e41c";
+}
+.icon-system-codepen-line:before {
+  content: "\e41f";
+}
+.icon-system-coin-fill:before {
+  content: "\e423";
+}
+.icon-system-coin-line:before {
+  content: "\e424";
+}
+.icon-system-coins-fill:before {
+  content: "\e425";
+}
+.icon-system-coins-line:before {
+  content: "\e426";
+}
+.icon-system-collage-line:before {
+  content: "\e427";
+}
+.icon-system-command-fill:before {
+  content: "\e428";
+}
+.icon-system-community-fill:before {
+  content: "\e429";
+}
+.icon-system-compass-2-fill:before {
+  content: "\e42a";
+}
+.icon-system-compass-4-fill:before {
+  content: "\e42b";
+}
+.icon-system-compass-4-line:before {
+  content: "\e42c";
+}
+.icon-system-delete-back-2-line:before {
+  content: "\e42d";
+}
+.icon-system-compass-3-line:before {
+  content: "\e42e";
+}
+.icon-system-collage-fill:before {
+  content: "\e42f";
+}
+.icon-system-command-line:before {
+  content: "\e430";
+}
+.icon-system-community-line:before {
+  content: "\e431";
+}
+.icon-system-compass-2-line:before {
+  content: "\e432";
+}
+.icon-system-compass-3-fill:before {
+  content: "\e433";
+}
+.icon-system-compass-discover-line:before {
+  content: "\e434";
+}
+.icon-system-compass-discover-fill:before {
+  content: "\e435";
+}
+.icon-system-compasses-2-fill:before {
+  content: "\e436";
+}
+.icon-system-dingding-fill:before {
+  content: "\e438";
+}
+.icon-system-dingding-line:before {
+  content: "\e439";
+}
+.icon-system-direction-fill:before {
+  content: "\e43a";
+}
+.icon-system-discord-line:before {
+  content: "\e43b";
+}
+.icon-system-discord-fill:before {
+  content: "\e43c";
+}
+.icon-system-disc-line:before {
+  content: "\e43d";
+}
+.icon-system-discuss-fill:before {
+  content: "\e43e";
+}
+.icon-system-discuss-line:before {
+  content: "\e43f";
+}
+.icon-system-direction-line:before {
+  content: "\e440";
+}
+.icon-system-dislike-fill:before {
+  content: "\e441";
+}
+.icon-system-disqus-fill:before {
+  content: "\e442";
+}
+.icon-system-dislike-line:before {
+  content: "\e443";
+}
+.icon-system-disqus-line:before {
+  content: "\e444";
+}
+.icon-system-donut-chart-line:before {
+  content: "\e447";
+}
+.icon-system-donut-chart-fill:before {
+  content: "\e448";
+}
+.icon-system-door-closed-fill:before {
+  content: "\e449";
+}
+.icon-system-disc-fill:before {
+  content: "\e44a";
+}
+.icon-system-drag-drop-line:before {
+  content: "\e44b";
+}
+.icon-system-dribbble-fill:before {
+  content: "\e44d";
+}
+.icon-system-door-fill:before {
+  content: "\e44e";
+}
+.icon-system-door-closed-line:before {
+  content: "\e450";
+}
+.icon-system-download-2-fill:before {
+  content: "\e451";
+}
+.icon-system-download-2-line:before {
+  content: "\e453";
+}
+.icon-system-door-lock-box-fill:before {
+  content: "\e454";
+}
+.icon-system-door-lock-box-line:before {
+  content: "\e455";
+}
+.icon-system-door-lock-fill:before {
+  content: "\e456";
+}
+.icon-system-door-lock-line:before {
+  content: "\e457";
+}
+.icon-system-door-open-fill:before {
+  content: "\e458";
+}
+.icon-system-dv-line:before {
+  content: "\e459";
+}
+.icon-system-download-cloud-2-fill:before {
+  content: "\e45a";
+}
+.icon-system-download-cloud-fill:before {
+  content: "\e45b";
+}
+.icon-system-download-line:before {
+  content: "\e45c";
+}
+.icon-system-draft-line:before {
+  content: "\e45d";
+}
+.icon-system-door-open-line:before {
+  content: "\e45e";
+}
+.icon-system-dossier-fill:before {
+  content: "\e45f";
+}
+.icon-system-dossier-line:before {
+  content: "\e460";
+}
+.icon-system-download-cloud-2-line:before {
+  content: "\e462";
+}
+.icon-system-dvd-fill:before {
+  content: "\e464";
+}
+.icon-system-drive-fill:before {
+  content: "\e465";
+}
+.icon-system-dribbble-line:before {
+  content: "\e466";
+}
+.icon-system-door-line:before {
+  content: "\e467";
+}
+.icon-system-dropbox-fill:before {
+  content: "\e468";
+}
+.icon-system-drive-line:before {
+  content: "\e469";
+}
+.icon-system-dropbox-line:before {
+  content: "\e46a";
+}
+.icon-system-drop-fill:before {
+  content: "\e46b";
+}
+.icon-system-download-cloud-line:before {
+  content: "\e46c";
+}
+.icon-system-drop-line:before {
+  content: "\e46d";
+}
+.icon-system-draft-fill:before {
+  content: "\e46e";
+}
+.icon-system-download-fill:before {
+  content: "\e46f";
+}
+.icon-system-drag-drop-fill:before {
+  content: "\e470";
+}
+.icon-system-drag-move-2-fill:before {
+  content: "\e471";
+}
+.icon-system-drag-move-2-line:before {
+  content: "\e472";
+}
+.icon-system-drag-move-fill:before {
+  content: "\e473";
+}
+.icon-system-e-bike-2-line:before {
+  content: "\e474";
+}
+.icon-system-drag-move-line:before {
+  content: "\e475";
+}
+.icon-tourism-e-bike-fill:before {
+  content: "\e476";
+}
+.icon-tourism-e-bike-line:before {
+  content: "\e477";
+}
+.icon-system-edit-2-fill:before {
+  content: "\e479";
+}
+.icon-system-dvd-line:before {
+  content: "\e47a";
+}
+.icon-system-dv-fill:before {
+  content: "\e47b";
+}
+.icon-system-earth-fill:before {
+  content: "\e47c";
+}
+.icon-system-earth-line:before {
+  content: "\e47e";
+}
+.icon-system-e-bike-2-fill:before {
+  content: "\e47f";
+}
+.icon-emoji-emotion-fill:before {
+  content: "\e482";
+}
+.icon-emoji-emotion-happy-line:before {
+  content: "\e484";
+}
+.icon-emoji-emotion-happy-fill:before {
+  content: "\e485";
+}
+.icon-emoji-emotion-laugh-fill:before {
+  content: "\e486";
+}
+.icon-emoji-emotion-laugh-line:before {
+  content: "\e487";
+}
+.icon-emoji-emotion-line:before {
+  content: "\e488";
+}
+.icon-emoji-emotion-normal-fill:before {
+  content: "\e489";
+}
+.icon-emoji-emotion-normal-line:before {
+  content: "\e48a";
+}
+.icon-system-edit-box-fill:before {
+  content: "\e48b";
+}
+.icon-system-edit-box-line:before {
+  content: "\e48c";
+}
+.icon-system-edit-2-line:before {
+  content: "\e48d";
+}
+.icon-system-edit-circle-line:before {
+  content: "\e48e";
+}
+.icon-system-edit-circle-fill:before {
+  content: "\e48f";
+}
+.icon-system-edit-line:before {
+  content: "\e490";
+}
+.icon-system-eject-fill:before {
+  content: "\e491";
+}
+.icon-system-edit-fill:before {
+  content: "\e492";
+}
+.icon-system-eject-line:before {
+  content: "\e493";
+}
+.icon-system-emotion-2-fill:before {
+  content: "\e494";
+}
+.icon-system-emotion-2-line:before {
+  content: "\e495";
+}
+.icon-system-empathize-line:before {
+  content: "\e496";
+}
+.icon-system-eye-line:before {
+  content: "\e497";
+}
+.icon-system-eye-fill:before {
+  content: "\e498";
+}
+.icon-system-emphasis:before {
+  content: "\e499";
+}
+.icon-system-eye-close-fill:before {
+  content: "\e49a";
+}
+.icon-system-eye-2-line:before {
+  content: "\e49b";
+}
+.icon-system-eye-2-fill:before {
+  content: "\e49c";
+}
+.icon-system-eye-close-line:before {
+  content: "\e49d";
+}
+.icon-system-external-link-fill:before {
+  content: "\e49e";
+}
+.icon-system-eye-off-fill:before {
+  content: "\e49f";
+}
+.icon-system-eye-off-line:before {
+  content: "\e4a0";
+}
+.icon-emoji-emotion-sad-fill:before {
+  content: "\e4a1";
+}
+.icon-emoji-emotion-unhappy-line:before {
+  content: "\e4a2";
+}
+.icon-emoji-emotion-unhappy-fill:before {
+  content: "\e4a3";
+}
+.icon-emoji-emotion-sad-line:before {
+  content: "\e4a4";
+}
+.icon-system-empathize-fill:before {
+  content: "\e4a5";
+}
+.icon-system-exchange-box-line:before {
+  content: "\e4a8";
+}
+.icon-system-exchange-box-fill:before {
+  content: "\e4a9";
+}
+.icon-system-exchange-fill:before {
+  content: "\e4ad";
+}
+.icon-system-exchange-cny-fill:before {
+  content: "\e4ae";
+}
+.icon-system-exchange-funds-line:before {
+  content: "\e4af";
+}
+.icon-system-exchange-line:before {
+  content: "\e4b0";
+}
+.icon-system-exchange-funds-fill:before {
+  content: "\e4b1";
+}
+.icon-system-external-link-line:before {
+  content: "\e4b2";
+}
+.icon-system-facebook-box-fill:before {
+  content: "\e4b3";
+}
+.icon-system-facebook-circle-line:before {
+  content: "\e4b4";
+}
+.icon-system-facebook-box-line:before {
+  content: "\e4b5";
+}
+.icon-system-facebook-circle-fill:before {
+  content: "\e4b6";
+}
+.icon-system-feedback-fill:before {
+  content: "\e4b7";
+}
+.icon-system-facebook-fill:before {
+  content: "\e4b8";
+}
+.icon-system-facebook-line:before {
+  content: "\e4b9";
+}
+.icon-system-feedback-line:before {
+  content: "\e4ba";
+}
+.icon-system-file-2-fill:before {
+  content: "\e4bb";
+}
+.icon-system-file-2-line:before {
+  content: "\e4bc";
+}
+.icon-system-emphasis-cn:before {
+  content: "\e4bd";
+}
+.icon-system-file-3-fill:before {
+  content: "\e4be";
+}
+.icon-system-equalizer-fill:before {
+  content: "\e4bf";
+}
+.icon-system-english-input:before {
+  content: "\e4c0";
+}
+.icon-system-file-4-fill:before {
+  content: "\e4c1";
+}
+.icon-system-file-4-line:before {
+  content: "\e4c2";
+}
+.icon-system-file-3-line:before {
+  content: "\e4c3";
+}
+.icon-system-file-add-line:before {
+  content: "\e4c4";
+}
+.icon-system-file-add-fill:before {
+  content: "\e4c5";
+}
+.icon-system-file-chart-2-fill:before {
+  content: "\e4c6";
+}
+.icon-system-file-chart-fill:before {
+  content: "\e4c7";
+}
+.icon-system-file-chart-2-line:before {
+  content: "\e4c8";
+}
+.icon-system-delete-bin-line:before {
+  content: "\e4c9";
+}
+.icon-system-device-fill:before {
+  content: "\e4ca";
+}
+.icon-system-device-recover-fill:before {
+  content: "\e4cb";
+}
+.icon-system-delete-row:before {
+  content: "\e4cc";
+}
+.icon-system-delete-column:before {
+  content: "\e4cd";
+}
+.icon-system-device-line:before {
+  content: "\e4ce";
+}
+.icon-system-equalizer-line:before {
+  content: "\e4cf";
+}
+.icon-system-eraser-fill:before {
+  content: "\e4d0";
+}
+.icon-system-eraser-line:before {
+  content: "\e4d1";
+}
+.icon-system-error-warning-fill:before {
+  content: "\e4d2";
+}
+.icon-system-error-warning-line:before {
+  content: "\e4d3";
+}
+.icon-system-file-list-3-fill:before {
+  content: "\e4fd";
+}
+.icon-system-file-list-3-line:before {
+  content: "\e4fe";
+}
+.icon-system-file-list-fill:before {
+  content: "\e4ff";
+}
+.icon-system-file-list-2-line-1:before {
+  content: "\e500";
+}
+.icon-system-file-pdf-fill-1:before {
+  content: "\e501";
+}
+.icon-system-file-list-line:before {
+  content: "\e502";
+}
+.icon-system-file-lock-fill:before {
+  content: "\e503";
+}
+.icon-system-file-lock-line:before {
+  content: "\e504";
+}
+.icon-system-file-copy-2-fill:before {
+  content: "\e505";
+}
+.icon-system-file-mark-fill:before {
+  content: "\e506";
+}
+.icon-system-file-paper-2-line:before {
+  content: "\e507";
+}
+.icon-system-file-mark-line:before {
+  content: "\e508";
+}
+.icon-system-file-music-line:before {
+  content: "\e509";
+}
+.icon-system-file-reduce-fill:before {
+  content: "\e50a";
+}
+.icon-system-file-ppt-2-line:before {
+  content: "\e50b";
+}
+.icon-system-file-paper-fill:before {
+  content: "\e50c";
+}
+.icon-system-file-paper-2-fill:before {
+  content: "\e50d";
+}
+.icon-system-file-music-fill:before {
+  content: "\e50e";
+}
+.icon-system-file-paper-line:before {
+  content: "\e50f";
+}
+.icon-system-file-ppt-line-1:before {
+  content: "\e510";
+}
+.icon-system-file-pdf-line-1:before {
+  content: "\e511";
+}
+.icon-system-file-ppt-2-fill:before {
+  content: "\e512";
+}
+.icon-system-file-chart-line:before {
+  content: "\e513";
+}
+.icon-system-file-ppt-fill:before {
+  content: "\e514";
+}
+.icon-system-file-code-fill:before {
+  content: "\e515";
+}
+.icon-system-file-code-line:before {
+  content: "\e516";
+}
+.icon-system-file-cloud-line:before {
+  content: "\e517";
+}
+.icon-system-file-copy-fill:before {
+  content: "\e518";
+}
+.icon-system-file-copy-2-line:before {
+  content: "\e519";
+}
+.icon-system-file-cloud-fill:before {
+  content: "\e51a";
+}
+.icon-system-file-edit-line:before {
+  content: "\e51b";
+}
+.icon-system-file-excel-2-fill:before {
+  content: "\e51c";
+}
+.icon-system-file-copy-line:before {
+  content: "\e51d";
+}
+.icon-system-file-excel-2-line:before {
+  content: "\e51e";
+}
+.icon-system-file-excel-fill:before {
+  content: "\e51f";
+}
+.icon-system-file-excel-line:before {
+  content: "\e520";
+}
+.icon-system-file-fill:before {
+  content: "\e521";
+}
+.icon-system-file-forbid-fill:before {
+  content: "\e522";
+}
+.icon-system-file-damage-line:before {
+  content: "\e523";
+}
+.icon-system-file-history-line:before {
+  content: "\e524";
+}
+.icon-system-file-hwp-fill:before {
+  content: "\e525";
+}
+.icon-system-file-forbid-line:before {
+  content: "\e526";
+}
+.icon-system-file-gif-fill:before {
+  content: "\e527";
+}
+.icon-system-file-damage-fill:before {
+  content: "\e528";
+}
+.icon-system-file-gif-line:before {
+  content: "\e529";
+}
+.icon-system-file-download-fill:before {
+  content: "\e52a";
+}
+.icon-system-file-download-line:before {
+  content: "\e52b";
+}
+.icon-system-file-edit-fill:before {
+  content: "\e52c";
+}
+.icon-system-file-history-fill:before {
+  content: "\e52d";
+}
+.icon-system-file-line-1:before {
+  content: "\e52e";
+}
+.icon-system-file-hwp-line:before {
+  content: "\e52f";
+}
+.icon-system-file-info-line:before {
+  content: "\e530";
+}
+.icon-system-file-info-fill:before {
+  content: "\e531";
+}
+.icon-system-file-list-2-fill:before {
+  content: "\e532";
+}
+.icon-system-ghost-2-line:before {
+  content: "\e533";
+}
+.icon-system-ghost-fill:before {
+  content: "\e534";
+}
+.icon-system-ghost-line:before {
+  content: "\e535";
+}
+.icon-system-gift-2-fill:before {
+  content: "\e536";
+}
+.icon-system-ghost-smile-line:before {
+  content: "\e537";
+}
+.icon-system-ghost-smile-fill:before {
+  content: "\e538";
+}
+.icon-system-gift-fill:before {
+  content: "\e539";
+}
+.icon-system-gift-2-line:before {
+  content: "\e53a";
+}
+.icon-system-gift-line:before {
+  content: "\e53b";
+}
+.icon-system-git-commit-fill:before {
+  content: "\e53c";
+}
+.icon-system-git-branch-fill:before {
+  content: "\e53d";
+}
+.icon-system-git-branch-line:before {
+  content: "\e53e";
+}
+.icon-system-git-commit-line:before {
+  content: "\e53f";
+}
+.icon-system-git-merge-fill:before {
+  content: "\e544";
+}
+.icon-system-git-merge-line:before {
+  content: "\e545";
+}
+.icon-system-git-pull-request-fill:before {
+  content: "\e546";
+}
+.icon-system-git-pull-request-line:before {
+  content: "\e547";
+}
+.icon-system-folder-zip-fill:before {
+  content: "\e548";
+}
+.icon-system-football-line:before {
+  content: "\e549";
+}
+.icon-system-git-repository-commits-fill:before {
+  content: "\e54a";
+}
+.icon-system-git-repository-commits-line:before {
+  content: "\e54b";
+}
+.icon-system-git-repository-fill:before {
+  content: "\e54c";
+}
+.icon-system-folder-upload-line:before {
+  content: "\e54d";
+}
+.icon-system-folder-user-fill:before {
+  content: "\e54e";
+}
+.icon-system-folder-warning-line:before {
+  content: "\e54f";
+}
+.icon-system-folder-user-line:before {
+  content: "\e550";
+}
+.icon-system-folder-warning-fill:before {
+  content: "\e551";
+}
+.icon-system-folder-zip-line:before {
+  content: "\e552";
+}
+.icon-system-font-color:before {
+  content: "\e553";
+}
+.icon-system-font-size-2:before {
+  content: "\e554";
+}
+.icon-system-font-size:before {
+  content: "\e555";
+}
+.icon-system-football-fill:before {
+  content: "\e556";
+}
+.icon-system-footprint-fill:before {
+  content: "\e557";
+}
+.icon-system-funds-line:before {
+  content: "\e558";
+}
+.icon-system-footprint-line:before {
+  content: "\e559";
+}
+.icon-system-gallery-fill:before {
+  content: "\e55a";
+}
+.icon-system-gallery-line:before {
+  content: "\e55b";
+}
+.icon-system-gallery-upload-line:before {
+  content: "\e55c";
+}
+.icon-system-game-line:before {
+  content: "\e55d";
+}
+.icon-system-gamepad-fill:before {
+  content: "\e55e";
+}
+.icon-system-gallery-upload-fill:before {
+  content: "\e55f";
+}
+.icon-system-gamepad-line:before {
+  content: "\e560";
+}
+.icon-system-gas-station-fill:before {
+  content: "\e561";
+}
+.icon-system-game-fill:before {
+  content: "\e562";
+}
+.icon-system-gas-station-line:before {
+  content: "\e563";
+}
+.icon-system-forbid-2-line:before {
+  content: "\e564";
+}
+.icon-system-forbid-fill:before {
+  content: "\e565";
+}
+.icon-system-forbid-2-fill:before {
+  content: "\e566";
+}
+.icon-system-forbid-line:before {
+  content: "\e567";
+}
+.icon-system-fullscreen-fill:before {
+  content: "\e568";
+}
+.icon-system-fullscreen-exit-line:before {
+  content: "\e569";
+}
+.icon-system-function-fill:before {
+  content: "\e56b";
+}
+.icon-system-function-line:before {
+  content: "\e56c";
+}
+.icon-system-genderless-fill:before {
+  content: "\e56d";
+}
+.icon-system-gatsby-fill:before {
+  content: "\e56e";
+}
+.icon-system-gatsby-line:before {
+  content: "\e570";
+}
+.icon-system-fridge-line:before {
+  content: "\e571";
+}
+.icon-system-fullscreen-line:before {
+  content: "\e572";
+}
+.icon-system-fridge-fill:before {
+  content: "\e573";
+}
+.icon-system-ghost-2-fill:before {
+  content: "\e574";
+}
+.icon-system-genderless-line:before {
+  content: "\e575";
+}
+.icon-system-funds-box-line:before {
+  content: "\e576";
+}
+.icon-system-funds-box-fill:before {
+  content: "\e577";
+}
+.icon-system-functions:before {
+  content: "\e578";
+}
+.icon-system-funds-fill:before {
+  content: "\e579";
+}
+.icon-weather-drizzle-fill:before {
+  content: "\e57a";
+}
+.icon-weather-cloudy-fill:before {
+  content: "\e57b";
+}
+.icon-weather-fahrenheit-line:before {
+  content: "\e57c";
+}
+.icon-weather-fire-fill:before {
+  content: "\e57d";
+}
+.icon-weather-cloudy-2-line:before {
+  content: "\e57e";
+}
+.icon-weather-drizzle-line:before {
+  content: "\e57f";
+}
+.icon-weather-cloudy-line:before {
+  content: "\e580";
+}
+.icon-weather-fire-line:before {
+  content: "\e581";
+}
+.icon-weather-earthquake-fill:before {
+  content: "\e582";
+}
+.icon-weather-earthquake-line:before {
+  content: "\e583";
+}
+.icon-weather-fahrenheit-fill:before {
+  content: "\e584";
+}
+.icon-weather-hail-line:before {
+  content: "\e585";
+}
+.icon-weather-haze-2-line:before {
+  content: "\e586";
+}
+.icon-weather-flood-line:before {
+  content: "\e587";
+}
+.icon-weather-flood-fill:before {
+  content: "\e588";
+}
+.icon-weather-haze-fill:before {
+  content: "\e589";
+}
+.icon-weather-hail-fill:before {
+  content: "\e58a";
+}
+.icon-weather-haze-2-fill:before {
+  content: "\e58b";
+}
+.icon-weather-haze-line:before {
+  content: "\e58c";
+}
+.icon-weather-flashlight-line:before {
+  content: "\e58d";
+}
+.icon-weather-foggy-line:before {
+  content: "\e58e";
+}
+.icon-weather-flashlight-fill:before {
+  content: "\e58f";
+}
+.icon-weather-foggy-fill:before {
+  content: "\e590";
+}
+.icon-weather-heavy-showers-fill:before {
+  content: "\e591";
+}
+.icon-weather-heavy-showers-line:before {
+  content: "\e592";
+}
+.icon-weather-meteor-fill:before {
+  content: "\e593";
+}
+.icon-weather-meteor-line:before {
+  content: "\e594";
+}
+.icon-weather-mist-fill:before {
+  content: "\e595";
+}
+.icon-weather-mist-line:before {
+  content: "\e596";
+}
+.icon-weather-moon-clear-fill:before {
+  content: "\e597";
+}
+.icon-weather-moon-clear-line:before {
+  content: "\e598";
+}
+.icon-weather-moon-cloudy-line:before {
+  content: "\e599";
+}
+.icon-weather-moon-cloudy-fill:before {
+  content: "\e59a";
+}
+.icon-weather-blaze-fill:before {
+  content: "\e59b";
+}
+.icon-weather-blaze-line:before {
+  content: "\e59c";
+}
+.icon-weather-celsius-fill:before {
+  content: "\e59d";
+}
+.icon-weather-celsius-line:before {
+  content: "\e59e";
+}
+.icon-weather-cloud-windy-fill:before {
+  content: "\e59f";
+}
+.icon-weather-cloud-windy-line:before {
+  content: "\e5a0";
+}
+.icon-weather-cloudy-2-fill:before {
+  content: "\e5a1";
+}
+.icon-weather-sun-cloudy-fill:before {
+  content: "\e5a2";
+}
+.icon-weather-sun-cloudy-line:before {
+  content: "\e5a3";
+}
+.icon-weather-sun-foggy-fill:before {
+  content: "\e5a4";
+}
+.icon-weather-sun-foggy-line:before {
+  content: "\e5a5";
+}
+.icon-weather-sun-fill:before {
+  content: "\e5a6";
+}
+.icon-weather-sun-line:before {
+  content: "\e5a7";
+}
+.icon-weather-temp-cold-fill:before {
+  content: "\e5a8";
+}
+.icon-weather-temp-hot-line:before {
+  content: "\e5a9";
+}
+.icon-weather-temp-cold-line:before {
+  content: "\e5aa";
+}
+.icon-weather-temp-hot-fill:before {
+  content: "\e5ab";
+}
+.icon-weather-thunderstorms-fill:before {
+  content: "\e5ac";
+}
+.icon-weather-tornado-fill:before {
+  content: "\e5ad";
+}
+.icon-weather-thunderstorms-line:before {
+  content: "\e5ae";
+}
+.icon-weather-tornado-line:before {
+  content: "\e5af";
+}
+.icon-weather-typhoon-fill:before {
+  content: "\e5b0";
+}
+.icon-weather-typhoon-line:before {
+  content: "\e5b1";
+}
+.icon-weather-windy-fill:before {
+  content: "\e5b2";
+}
+.icon-weather-windy-line:before {
+  content: "\e5b3";
+}
+.icon-weather-moon-fill:before {
+  content: "\e5b4";
+}
+.icon-weather-moon-foggy-fill:before {
+  content: "\e5b5";
+}
+.icon-weather-moon-foggy-line:before {
+  content: "\e5b6";
+}
+.icon-weather-rainbow-line:before {
+  content: "\e5b7";
+}
+.icon-weather-moon-line:before {
+  content: "\e5b8";
+}
+.icon-weather-rainbow-fill:before {
+  content: "\e5b9";
+}
+.icon-weather-rainy-line:before {
+  content: "\e5ba";
+}
+.icon-weather-rainy-fill:before {
+  content: "\e5bb";
+}
+.icon-weather-showers-fill:before {
+  content: "\e5bc";
+}
+.icon-weather-snowy-fill:before {
+  content: "\e5bd";
+}
+.icon-weather-showers-line:before {
+  content: "\e5be";
+}
+.icon-weather-snowy-line:before {
+  content: "\e5bf";
+}
+.icon-system-google-fill:before {
+  content: "\e5c0";
+}
+.icon-system-google-line:before {
+  content: "\e5c1";
+}
+.icon-system-google-play-fill:before {
+  content: "\e5c2";
+}
+.icon-system-government-fill:before {
+  content: "\e5c3";
+}
+.icon-system-google-play-line:before {
+  content: "\e5c4";
+}
+.icon-system-government-line:before {
+  content: "\e5c5";
+}
+.icon-system-gps-fill:before {
+  content: "\e5c6";
+}
+.icon-system-gps-line:before {
+  content: "\e5c7";
+}
+.icon-system-gradienter-fill:before {
+  content: "\e5c8";
+}
+.icon-system-gradienter-line:before {
+  content: "\e5c9";
+}
+.icon-system-grid-fill:before {
+  content: "\e5ca";
+}
+.icon-system-grid-line:before {
+  content: "\e5cb";
+}
+.icon-system-group-2-fill:before {
+  content: "\e5cc";
+}
+.icon-system-group-2-line:before {
+  content: "\e5cd";
+}
+.icon-system-guide-line:before {
+  content: "\e5ce";
+}
+.icon-system-group-fill:before {
+  content: "\e5d0";
+}
+.icon-system-guide-fill:before {
+  content: "\e5d5";
+}
+.icon-system-handbag-fill:before {
+  content: "\e5d7";
+}
+.icon-system-group-line:before {
+  content: "\e5d8";
+}
+.icon-system-hand-heart-line:before {
+  content: "\e5d9";
+}
+.icon-system-hammer-fill:before {
+  content: "\e5da";
+}
+.icon-system-hammer-line:before {
+  content: "\e5db";
+}
+.icon-system-hand-sanitizer-fill:before {
+  content: "\e5dc";
+}
+.icon-system-handbag-line:before {
+  content: "\e5dd";
+}
+.icon-system-hand-coin-fill:before {
+  content: "\e5de";
+}
+.icon-system-hand-heart-fill:before {
+  content: "\e5df";
+}
+.icon-system-hard-drive-2-fill:before {
+  content: "\e5e0";
+}
+.icon-system-hand-coin-line:before {
+  content: "\e5e1";
+}
+.icon-system-hand-sanitizer-line:before {
+  content: "\e5e2";
+}
+.icon-system-hard-drive-line:before {
+  content: "\e5e3";
+}
+.icon-system-hard-drive-fill:before {
+  content: "\e5e4";
+}
+.icon-system-history-line:before {
+  content: "\e5e5";
+}
+.icon-system-hard-drive-2-line:before {
+  content: "\e5e6";
+}
+.icon-system-home-2-line:before {
+  content: "\e5e7";
+}
+.icon-system-home-2-fill:before {
+  content: "\e5e8";
+}
+.icon-system-hashtag:before {
+  content: "\e5e9";
+}
+.icon-system-git-repository-line:before {
+  content: "\e5ea";
+}
+.icon-system-git-repository-private-fill:before {
+  content: "\e5eb";
+}
+.icon-system-git-repository-private-line:before {
+  content: "\e5ec";
+}
+.icon-system-global-fill:before {
+  content: "\e5ed";
+}
+.icon-system-globe-line:before {
+  content: "\e5ee";
+}
+.icon-system-globe-fill:before {
+  content: "\e5ef";
+}
+.icon-system-hd-fill:before {
+  content: "\e5f0";
+}
+.icon-system-goblet-fill:before {
+  content: "\e5f1";
+}
+.icon-system-global-line:before {
+  content: "\e5f2";
+}
+.icon-system-goblet-line:before {
+  content: "\e5f3";
+}
+.icon-system-health-book-fill:before {
+  content: "\e5f4";
+}
+.icon-system-headphone-line:before {
+  content: "\e5f5";
+}
+.icon-system-heart-2-fill:before {
+  content: "\e5f6";
+}
+.icon-system-headphone-fill:before {
+  content: "\e5f7";
+}
+.icon-system-heading:before {
+  content: "\e5f8";
+}
+.icon-system-hd-line:before {
+  content: "\e5f9";
+}
+.icon-system-health-book-line:before {
+  content: "\e5fa";
+}
+.icon-system-heart-3-fill:before {
+  content: "\e5fb";
+}
+.icon-system-heart-3-line:before {
+  content: "\e5fc";
+}
+.icon-system-heart-2-line:before {
+  content: "\e5fd";
+}
+.icon-system-heart-fill:before {
+  content: "\e5fe";
+}
+.icon-system-heart-add-fill:before {
+  content: "\e5ff";
+}
+.icon-system-heart-pulse-fill:before {
+  content: "\e600";
+}
+.icon-system-heart-line:before {
+  content: "\e601";
+}
+.icon-system-heart-add-line:before {
+  content: "\e602";
+}
+.icon-system-heart-pulse-line:before {
+  content: "\e603";
+}
+.icon-system-hearts-line:before {
+  content: "\e604";
+}
+.icon-system-hearts-fill:before {
+  content: "\e605";
+}
+.icon-system-history-fill:before {
+  content: "\e606";
+}
+.icon-system-home-6-fill:before {
+  content: "\e607";
+}
+.icon-system-home-7-fill:before {
+  content: "\e608";
+}
+.icon-system-home-7-line:before {
+  content: "\e609";
+}
+.icon-system-home-6-line:before {
+  content: "\e60a";
+}
+.icon-system-home-8-fill:before {
+  content: "\e60b";
+}
+.icon-system-hq-line:before {
+  content: "\e60c";
+}
+.icon-system-html5-fill:before {
+  content: "\e60d";
+}
+.icon-system-image-2-line:before {
+  content: "\e60e";
+}
+.icon-system-inbox-unarchive-line:before {
+  content: "\e60f";
+}
+.icon-system-ie-fill:before {
+  content: "\e610";
+}
+.icon-system-home-heart-line:before {
+  content: "\e611";
+}
+.icon-system-image-2-fill:before {
+  content: "\e612";
+}
+.icon-system-home-8-line:before {
+  content: "\e613";
+}
+.icon-system-home-fill:before {
+  content: "\e614";
+}
+.icon-system-home-gear-fill:before {
+  content: "\e615";
+}
+.icon-system-home-gear-line:before {
+  content: "\e616";
+}
+.icon-system-hotspot-fill:before {
+  content: "\e617";
+}
+.icon-system-home-heart-fill:before {
+  content: "\e618";
+}
+.icon-system-home-line:before {
+  content: "\e619";
+}
+.icon-system-home-wifi-line:before {
+  content: "\e61a";
+}
+.icon-system-honor-of-kings-fill:before {
+  content: "\e61b";
+}
+.icon-system-home-smile-line:before {
+  content: "\e61c";
+}
+.icon-system-inbox-fill:before {
+  content: "\e61d";
+}
+.icon-system-home-smile-fill:before {
+  content: "\e61e";
+}
+.icon-system-home-smile-2-line:before {
+  content: "\e61f";
+}
+.icon-system-home-wifi-fill:before {
+  content: "\e620";
+}
+.icon-system-honor-of-kings-line:before {
+  content: "\e621";
+}
+.icon-system-home-smile-2-fill:before {
+  content: "\e622";
+}
+.icon-system-honour-line:before {
+  content: "\e623";
+}
+.icon-system-honour-fill:before {
+  content: "\e624";
+}
+.icon-system-hotel-bed-fill:before {
+  content: "\e625";
+}
+.icon-system-hotel-bed-line:before {
+  content: "\e626";
+}
+.icon-system-hospital-line:before {
+  content: "\e627";
+}
+.icon-system-hospital-fill:before {
+  content: "\e628";
+}
+.icon-system-hotel-line:before {
+  content: "\e629";
+}
+.icon-system-hotel-fill:before {
+  content: "\e62a";
+}
+.icon-system-hotspot-line:before {
+  content: "\e62b";
+}
+.icon-system-html5-line:before {
+  content: "\e62c";
+}
+.icon-system-ie-line:before {
+  content: "\e62d";
+}
+.icon-system-hq-fill:before {
+  content: "\e62e";
+}
+.icon-system-image-add-fill:before {
+  content: "\e62f";
+}
+.icon-system-image-edit-fill:before {
+  content: "\e630";
+}
+.icon-system-image-add-line:before {
+  content: "\e631";
+}
+.icon-system-image-edit-line:before {
+  content: "\e632";
+}
+.icon-system-image-fill:before {
+  content: "\e633";
+}
+.icon-system-image-line:before {
+  content: "\e634";
+}
+.icon-system-increase-decrease-line:before {
+  content: "\e635";
+}
+.icon-system-inbox-archive-line:before {
+  content: "\e636";
+}
+.icon-system-increase-decrease-fill:before {
+  content: "\e637";
+}
+.icon-system-inbox-archive-fill:before {
+  content: "\e638";
+}
+.icon-system-inbox-line:before {
+  content: "\e639";
+}
+.icon-system-inbox-unarchive-fill:before {
+  content: "\e63a";
+}
+.icon-system-indent-decrease:before {
+  content: "\e63b";
+}
+.icon-system-indent-increase:before {
+  content: "\e63c";
+}
+.icon-system-indeterminate-circle-line:before {
+  content: "\e63d";
+}
+.icon-system-information-fill:before {
+  content: "\e63e";
+}
+.icon-system-information-line:before {
+  content: "\e63f";
+}
+.icon-system-indeterminate-circle-fill:before {
+  content: "\e640";
+}
+.icon-system-infrared-thermometer-fill:before {
+  content: "\e641";
+}
+.icon-system-ink-bottle-fill:before {
+  content: "\e642";
+}
+.icon-system-infrared-thermometer-line:before {
+  content: "\e643";
+}
+.icon-system-ink-bottle-line:before {
+  content: "\e644";
+}
+.icon-system-input-cursor-move:before {
+  content: "\e645";
+}
+.icon-system-input-method-fill:before {
+  content: "\e646";
+}
+.icon-system-input-method-line:before {
+  content: "\e647";
+}
+.icon-system-home-3-fill:before {
+  content: "\e648";
+}
+.icon-system-home-4-fill:before {
+  content: "\e649";
+}
+.icon-system-home-3-line:before {
+  content: "\e64a";
+}
+.icon-system-home-4-line:before {
+  content: "\e64b";
+}
+.icon-system-home-5-line:before {
+  content: "\e64c";
+}
+.icon-system-home-5-fill:before {
+  content: "\e64d";
+}
+.icon-system-layout-right-2-fill:before {
+  content: "\e64e";
+}
+.icon-system-layout-right-fill:before {
+  content: "\e64f";
+}
+.icon-system-layout-right-2-line:before {
+  content: "\e650";
+}
+.icon-system-layout-row-fill:before {
+  content: "\e651";
+}
+.icon-system-layout-right-line:before {
+  content: "\e652";
+}
+.icon-system-layout-row-line:before {
+  content: "\e653";
+}
+.icon-system-layout-top-2-fill:before {
+  content: "\e654";
+}
+.icon-system-layout-top-2-line:before {
+  content: "\e655";
+}
+.icon-system-layout-top-fill:before {
+  content: "\e656";
+}
+.icon-system-layout-top-line:before {
+  content: "\e657";
+}
+.icon-system-leaf-fill:before {
+  content: "\e658";
+}
+.icon-system-leaf-line:before {
+  content: "\e659";
+}
+.icon-system-lifebuoy-fill:before {
+  content: "\e65a";
+}
+.icon-system-lightbulb-fill:before {
+  content: "\e65b";
+}
+.icon-system-lifebuoy-line:before {
+  content: "\e65c";
+}
+.icon-system-lightbulb-flash-fill:before {
+  content: "\e65d";
+}
+.icon-system-lightbulb-flash-line:before {
+  content: "\e65e";
+}
+.icon-system-lightbulb-line:before {
+  content: "\e65f";
+}
+.icon-system-line-chart-fill:before {
+  content: "\e660";
+}
+.icon-system-line-chart-line:before {
+  content: "\e661";
+}
+.icon-system-line-fill:before {
+  content: "\e662";
+}
+.icon-system-line-height:before {
+  content: "\e663";
+}
+.icon-system-link:before {
+  content: "\e664";
+}
+.icon-system-line-line:before {
+  content: "\e665";
+}
+.icon-system-linkedin-box-line:before {
+  content: "\e666";
+}
+.icon-system-linkedin-box-fill:before {
+  content: "\e667";
+}
+.icon-system-linkedin-line:before {
+  content: "\e668";
+}
+.icon-system-linkedin-fill:before {
+  content: "\e669";
+}
+.icon-system-link-m:before {
+  content: "\e66a";
+}
+.icon-system-links-fill:before {
+  content: "\e66b";
+}
+.icon-system-links-line:before {
+  content: "\e66c";
+}
+.icon-system-list-ordered:before {
+  content: "\e66d";
+}
+.icon-system-link-unlink:before {
+  content: "\e66e";
+}
+.icon-system-link-unlink-m:before {
+  content: "\e66f";
+}
+.icon-system-list-settings-fill:before {
+  content: "\e670";
+}
+.icon-system-list-check-2:before {
+  content: "\e671";
+}
+.icon-system-list-check:before {
+  content: "\e672";
+}
+.icon-system-list-settings-line:before {
+  content: "\e673";
+}
+.icon-system-live-fill:before {
+  content: "\e674";
+}
+.icon-system-list-unordered:before {
+  content: "\e675";
+}
+.icon-system-loader-3-fill:before {
+  content: "\e676";
+}
+.icon-system-loader-2-fill:before {
+  content: "\e677";
+}
+.icon-system-loader-2-line:before {
+  content: "\e678";
+}
+.icon-system-live-line:before {
+  content: "\e679";
+}
+.icon-system-loader-4-fill:before {
+  content: "\e67a";
+}
+.icon-system-loader-3-line:before {
+  content: "\e67b";
+}
+.icon-system-loader-4-line:before {
+  content: "\e67c";
+}
+.icon-system-loader-fill:before {
+  content: "\e67f";
+}
+.icon-system-loader-line:before {
+  content: "\e680";
+}
+.icon-system-lock-2-line:before {
+  content: "\e681";
+}
+.icon-system-lock-2-fill:before {
+  content: "\e682";
+}
+.icon-system-lock-fill:before {
+  content: "\e683";
+}
+.icon-system-lock-line:before {
+  content: "\e684";
+}
+.icon-system-lock-password-fill:before {
+  content: "\e685";
+}
+.icon-system-lock-password-line:before {
+  content: "\e686";
+}
+.icon-system-lock-unlock-fill:before {
+  content: "\e687";
+}
+.icon-system-lock-unlock-line:before {
+  content: "\e688";
+}
+.icon-system-login-box-fill:before {
+  content: "\e689";
+}
+.icon-system-login-box-line:before {
+  content: "\e68a";
+}
+.icon-system-layout-fill:before {
+  content: "\e68b";
+}
+.icon-system-layout-grid-fill:before {
+  content: "\e68c";
+}
+.icon-system-layout-grid-line:before {
+  content: "\e68d";
+}
+.icon-system-layout-left-2-fill:before {
+  content: "\e68e";
+}
+.icon-system-layout-left-line:before {
+  content: "\e68f";
+}
+.icon-system-layout-left-fill:before {
+  content: "\e690";
+}
+.icon-system-layout-left-2-line:before {
+  content: "\e691";
+}
+.icon-system-layout-line:before {
+  content: "\e692";
+}
+.icon-system-layout-masonry-fill:before {
+  content: "\e693";
+}
+.icon-system-layout-masonry-line:before {
+  content: "\e694";
+}
+.icon-system-file-shield-2-line:before {
+  content: "\e695";
+}
+.icon-system-file-shield-2-fill:before {
+  content: "\e696";
+}
+.icon-system-file-shield-fill:before {
+  content: "\e697";
+}
+.icon-system-file-shield-line:before {
+  content: "\e698";
+}
+.icon-system-file-shred-fill:before {
+  content: "\e699";
+}
+.icon-system-file-text-fill:before {
+  content: "\e69a";
+}
+.icon-system-file-upload-fill:before {
+  content: "\e69b";
+}
+.icon-system-file-transfer-fill:before {
+  content: "\e69c";
+}
+.icon-system-file-upload-line:before {
+  content: "\e69d";
+}
+.icon-system-file-user-fill:before {
+  content: "\e69e";
+}
+.icon-system-file-user-line:before {
+  content: "\e69f";
+}
+.icon-system-file-warning-fill:before {
+  content: "\e6a0";
+}
+.icon-system-file-text-line:before {
+  content: "\e6a1";
+}
+.icon-system-file-warning-line:before {
+  content: "\e6a2";
+}
+.icon-system-file-shred-line:before {
+  content: "\e6a3";
+}
+.icon-system-file-word-2-fill:before {
+  content: "\e6a4";
+}
+.icon-system-file-word-2-line:before {
+  content: "\e6a5";
+}
+.icon-system-file-word-fill:before {
+  content: "\e6a6";
+}
+.icon-system-file-word-line:before {
+  content: "\e6a7";
+}
+.icon-system-filter-3-line:before {
+  content: "\e6a8";
+}
+.icon-system-file-unknow-fill:before {
+  content: "\e6a9";
+}
+.icon-system-file-transfer-line:before {
+  content: "\e6aa";
+}
+.icon-system-file-unknow-line:before {
+  content: "\e6ab";
+}
+.icon-system-file-zip-fill:before {
+  content: "\e6ac";
+}
+.icon-system-file-zip-line:before {
+  content: "\e6ad";
+}
+.icon-system-film-fill:before {
+  content: "\e6ae";
+}
+.icon-system-film-line:before {
+  content: "\e6af";
+}
+.icon-system-filter-2-line:before {
+  content: "\e6b0";
+}
+.icon-system-filter-2-fill:before {
+  content: "\e6b1";
+}
+.icon-system-filter-3-fill:before {
+  content: "\e6b2";
+}
+.icon-system-filter-line:before {
+  content: "\e6b3";
+}
+.icon-system-filter-off-fill:before {
+  content: "\e6b4";
+}
+.icon-system-filter-off-line:before {
+  content: "\e6b5";
+}
+.icon-system-filter-fill:before {
+  content: "\e6b9";
+}
+.icon-system-fingerprint-2-fill:before {
+  content: "\e6bb";
+}
+.icon-system-fingerprint-fill:before {
+  content: "\e6bc";
+}
+.icon-system-fingerprint-line:before {
+  content: "\e6be";
+}
+.icon-system-first-aid-kit-fill:before {
+  content: "\e6c0";
+}
+.icon-system-first-aid-kit-line:before {
+  content: "\e6c1";
+}
+.icon-system-flag-2-fill:before {
+  content: "\e6c2";
+}
+.icon-system-flag-line:before {
+  content: "\e6c3";
+}
+.icon-system-fingerprint-2-line:before {
+  content: "\e6c4";
+}
+.icon-system-flask-fill:before {
+  content: "\e6c5";
+}
+.icon-system-flag-fill:before {
+  content: "\e6c6";
+}
+.icon-tourism-flight-land-fill:before {
+  content: "\e6c7";
+}
+.icon-system-flag-2-line:before {
+  content: "\e6c8";
+}
+.icon-tourism-flight-takeoff-line:before {
+  content: "\e6c9";
+}
+.icon-system-flask-line:before {
+  content: "\e6ca";
+}
+.icon-tourism-flight-takeoff-fill:before {
+  content: "\e6cb";
+}
+.icon-tourism-flight-land-line:before {
+  content: "\e6cc";
+}
+.icon-system-flow-chart:before {
+  content: "\e6cd";
+}
+.icon-system-file-search-fill:before {
+  content: "\e6ce";
+}
+.icon-system-file-reduce-line:before {
+  content: "\e6cf";
+}
+.icon-system-file-search-line:before {
+  content: "\e6d0";
+}
+.icon-system-file-settings-fill:before {
+  content: "\e6d1";
+}
+.icon-system-file-settings-line:before {
+  content: "\e6d2";
+}
+.icon-system-folder-4-fill:before {
+  content: "\e6d3";
+}
+.icon-system-folder-4-line:before {
+  content: "\e6d4";
+}
+.icon-system-folder-5-fill:before {
+  content: "\e6d5";
+}
+.icon-system-folder-5-line:before {
+  content: "\e6d6";
+}
+.icon-system-folder-chart-2-line:before {
+  content: "\e6d7";
+}
+.icon-system-folder-history-fill:before {
+  content: "\e6d8";
+}
+.icon-system-folder-history-line:before {
+  content: "\e6d9";
+}
+.icon-system-folder-chart-fill:before {
+  content: "\e6da";
+}
+.icon-system-folder-chart-2-fill:before {
+  content: "\e6db";
+}
+.icon-system-folder-chart-line:before {
+  content: "\e6dc";
+}
+.icon-system-folder-add-fill:before {
+  content: "\e6dd";
+}
+.icon-system-folder-add-line:before {
+  content: "\e6de";
+}
+.icon-system-folder-download-fill:before {
+  content: "\e6df";
+}
+.icon-system-folder-keyhole-line:before {
+  content: "\e6e0";
+}
+.icon-system-folder-keyhole-fill:before {
+  content: "\e6e1";
+}
+.icon-system-folder-info-line:before {
+  content: "\e6e2";
+}
+.icon-system-folder-info-fill:before {
+  content: "\e6e3";
+}
+.icon-system-folder-shield-line:before {
+  content: "\e6e4";
+}
+.icon-system-folder-lock-fill:before {
+  content: "\e6e5";
+}
+.icon-system-folder-line:before {
+  content: "\e6e6";
+}
+.icon-system-folder-download-line:before {
+  content: "\e6e7";
+}
+.icon-system-folder-forbid-line:before {
+  content: "\e6e8";
+}
+.icon-system-folder-lock-line:before {
+  content: "\e6e9";
+}
+.icon-system-folder-transfer-fill:before {
+  content: "\e6ea";
+}
+.icon-system-folder-fill:before {
+  content: "\e6eb";
+}
+.icon-system-folder-music-fill:before {
+  content: "\e6ec";
+}
+.icon-system-folder-music-line:before {
+  content: "\e6ed";
+}
+.icon-system-folder-open-line:before {
+  content: "\e6ee";
+}
+.icon-system-folder-received-fill:before {
+  content: "\e6ef";
+}
+.icon-system-folder-received-line:before {
+  content: "\e6f0";
+}
+.icon-system-folder-reduce-fill:before {
+  content: "\e6f1";
+}
+.icon-system-folder-reduce-line:before {
+  content: "\e6f2";
+}
+.icon-system-folder-forbid-fill:before {
+  content: "\e6f3";
+}
+.icon-system-folder-open-fill:before {
+  content: "\e6f4";
+}
+.icon-system-folders-fill:before {
+  content: "\e6f5";
+}
+.icon-system-login-circle-fill:before {
+  content: "\e6f7";
+}
+.icon-system-login-circle-line:before {
+  content: "\e6f8";
+}
+.icon-system-folder-upload-fill:before {
+  content: "\e6f9";
+}
+.icon-system-folder-shared-line:before {
+  content: "\e6fd";
+}
+.icon-system-folder-shared-fill:before {
+  content: "\e6fe";
+}
+.icon-system-folder-shield-2-fill:before {
+  content: "\e6ff";
+}
+.icon-system-folder-shield-2-line:before {
+  content: "\e700";
+}
+.icon-system-folder-shield-fill:before {
+  content: "\e701";
+}
+.icon-system-folders-line:before {
+  content: "\e702";
+}
+.icon-system-folder-transfer-line:before {
+  content: "\e703";
+}
+.icon-system-logout-box-fill:before {
+  content: "\e704";
+}
+.icon-system-logout-box-r-fill:before {
+  content: "\e705";
+}
+.icon-system-logout-box-line:before {
+  content: "\e706";
+}
+.icon-system-logout-box-r-line:before {
+  content: "\e707";
+}
+.icon-system-logout-circle-line:before {
+  content: "\e708";
+}
+.icon-system-logout-circle-r-fill:before {
+  content: "\e709";
+}
+.icon-system-logout-circle-fill:before {
+  content: "\e70a";
+}
+.icon-system-logout-circle-r-line:before {
+  content: "\e70b";
+}
+.icon-system-flutter-fill:before {
+  content: "\e70c";
+}
+.icon-system-flutter-line:before {
+  content: "\e70d";
+}
+.icon-system-luggage-cart-fill:before {
+  content: "\e70e";
+}
+.icon-system-luggage-cart-line:before {
+  content: "\e70f";
+}
+.icon-system-luggage-deposit-fill:before {
+  content: "\e710";
+}
+.icon-system-focus-2-fill:before {
+  content: "\e711";
+}
+.icon-system-focus-2-line:before {
+  content: "\e712";
+}
+.icon-system-focus-fill:before {
+  content: "\e713";
+}
+.icon-system-focus-3-line:before {
+  content: "\e714";
+}
+.icon-system-focus-3-fill:before {
+  content: "\e715";
+}
+.icon-system-focus-line:before {
+  content: "\e716";
+}
+.icon-system-folder-2-line:before {
+  content: "\e717";
+}
+.icon-system-folder-3-fill:before {
+  content: "\e718";
+}
+.icon-system-folder-2-fill:before {
+  content: "\e719";
+}
+.icon-system-folder-3-line:before {
+  content: "\e71a";
+}
+.icon-system-mac-line:before {
+  content: "\e71b";
+}
+.icon-system-magic-line:before {
+  content: "\e71c";
+}
+.icon-system-mail-add-fill:before {
+  content: "\e71d";
+}
+.icon-system-mail-add-line:before {
+  content: "\e71e";
+}
+.icon-system-mail-check-fill:before {
+  content: "\e71f";
+}
+.icon-system-mail-check-line:before {
+  content: "\e720";
+}
+.icon-system-mail-close-fill:before {
+  content: "\e721";
+}
+.icon-system-mail-close-line:before {
+  content: "\e722";
+}
+.icon-system-magic-fill:before {
+  content: "\e723";
+}
+.icon-system-mail-download-fill:before {
+  content: "\e724";
+}
+.icon-system-mail-fill:before {
+  content: "\e725";
+}
+.icon-system-mail-download-line:before {
+  content: "\e726";
+}
+.icon-system-mail-forbid-fill:before {
+  content: "\e727";
+}
+.icon-system-mail-forbid-line:before {
+  content: "\e728";
+}
+.icon-system-mail-settings-line:before {
+  content: "\e729";
+}
+.icon-system-notification-off-fill:before {
+  content: "\e72a";
+}
+.icon-system-mail-send-line:before {
+  content: "\e72b";
+}
+.icon-system-mail-star-fill:before {
+  content: "\e72c";
+}
+.icon-system-mail-star-line:before {
+  content: "\e72d";
+}
+.icon-system-mail-unread-line:before {
+  content: "\e72e";
+}
+.icon-system-mail-unread-fill:before {
+  content: "\e72f";
+}
+.icon-system-notification-line:before {
+  content: "\e730";
+}
+.icon-system-notification-off-line:before {
+  content: "\e731";
+}
+.icon-system-mail-line:before {
+  content: "\e732";
+}
+.icon-system-mail-settings-fill:before {
+  content: "\e733";
+}
+.icon-system-mail-lock-fill:before {
+  content: "\e734";
+}
+.icon-system-mail-open-fill:before {
+  content: "\e735";
+}
+.icon-system-mail-lock-line:before {
+  content: "\e736";
+}
+.icon-system-mail-send-fill:before {
+  content: "\e737";
+}
+.icon-system-mail-open-line:before {
+  content: "\e738";
+}
+.icon-system-npmjs-fill:before {
+  content: "\e73b";
+}
+.icon-system-npmjs-line:before {
+  content: "\e73e";
+}
+.icon-system-numbers-fill:before {
+  content: "\e73f";
+}
+.icon-system-numbers-line:before {
+  content: "\e740";
+}
+.icon-system-oil-fill:before {
+  content: "\e741";
+}
+.icon-system-phone-camera-line:before {
+  content: "\e743";
+}
+.icon-system-phone-fill:before {
+  content: "\e744";
+}
+.icon-system-phone-find-fill:before {
+  content: "\e745";
+}
+.icon-system-phone-line:before {
+  content: "\e747";
+}
+.icon-system-phone-lock-fill:before {
+  content: "\e748";
+}
+.icon-system-percent-fill:before {
+  content: "\e749";
+}
+.icon-system-nurse-line:before {
+  content: "\e74a";
+}
+.icon-system-phone-find-line:before {
+  content: "\e74d";
+}
+.icon-system-phone-camera-fill:before {
+  content: "\e750";
+}
+.icon-system-phone-lock-line:before {
+  content: "\e752";
+}
+.icon-system-luggage-deposit-line:before {
+  content: "\e753";
+}
+.icon-system-nurse-fill:before {
+  content: "\e754";
+}
+.icon-system-lungs-fill:before {
+  content: "\e755";
+}
+.icon-system-lungs-line:before {
+  content: "\e756";
+}
+.icon-system-macbook-fill:before {
+  content: "\e757";
+}
+.icon-system-macbook-line:before {
+  content: "\e758";
+}
+.icon-system-mac-fill:before {
+  content: "\e759";
+}
+.icon-system-pie-chart-line:before {
+  content: "\e75a";
+}
+.icon-system-pie-chart-fill:before {
+  content: "\e75b";
+}
+.icon-system-pin-distance-fill:before {
+  content: "\e75c";
+}
+.icon-system-pin-distance-line:before {
+  content: "\e75d";
+}
+.icon-system-pixelfed-fill:before {
+  content: "\e75e";
+}
+.icon-tourism-plane-line:before {
+  content: "\e75f";
+}
+.icon-system-pinterest-line:before {
+  content: "\e760";
+}
+.icon-system-pinterest-fill:before {
+  content: "\e761";
+}
+.icon-system-pixelfed-line:before {
+  content: "\e762";
+}
+.icon-tourism-plane-fill:before {
+  content: "\e763";
+}
+.icon-system-pinyin-input:before {
+  content: "\e764";
+}
+.icon-system-plant-fill:before {
+  content: "\e765";
+}
+.icon-system-plant-line:before {
+  content: "\e766";
+}
+.icon-system-play-circle-line:before {
+  content: "\e767";
+}
+.icon-system-play-circle-fill:before {
+  content: "\e768";
+}
+.icon-system-play-fill:before {
+  content: "\e769";
+}
+.icon-system-play-line:before {
+  content: "\e76a";
+}
+.icon-system-play-list-2-line:before {
+  content: "\e76b";
+}
+.icon-system-picture-in-picture-exit-line:before {
+  content: "\e76c";
+}
+.icon-system-play-list-add-fill:before {
+  content: "\e76d";
+}
+.icon-system-picture-in-picture-line:before {
+  content: "\e76e";
+}
+.icon-system-play-mini-line:before {
+  content: "\e76f";
+}
+.icon-system-pie-chart-2-fill:before {
+  content: "\e770";
+}
+.icon-system-plug-2-fill:before {
+  content: "\e771";
+}
+.icon-system-pie-chart-2-line:before {
+  content: "\e772";
+}
+.icon-system-play-list-2-fill:before {
+  content: "\e773";
+}
+.icon-system-plug-fill:before {
+  content: "\e774";
+}
+.icon-system-pie-chart-box-fill:before {
+  content: "\e775";
+}
+.icon-system-plug-2-line:before {
+  content: "\e776";
+}
+.icon-system-play-list-add-line:before {
+  content: "\e777";
+}
+.icon-system-play-mini-fill:before {
+  content: "\e778";
+}
+.icon-system-plug-line:before {
+  content: "\e779";
+}
+.icon-system-polaroid-2-fill:before {
+  content: "\e77b";
+}
+.icon-system-polaroid-2-line:before {
+  content: "\e77c";
+}
+.icon-tourism-police-car-line:before {
+  content: "\e77f";
+}
+.icon-system-price-tag-2-fill:before {
+  content: "\e780";
+}
+.icon-tourism-police-car-fill:before {
+  content: "\e781";
+}
+.icon-system-picture-in-picture-fill:before {
+  content: "\e785";
+}
+.icon-system-order-play-line:before {
+  content: "\e786";
+}
+.icon-system-organization-chart:before {
+  content: "\e787";
+}
+.icon-system-outlet-2-fill:before {
+  content: "\e788";
+}
+.icon-system-outlet-2-line:before {
+  content: "\e789";
+}
+.icon-system-outlet-fill:before {
+  content: "\e78a";
+}
+.icon-system-paint-brush-fill:before {
+  content: "\e78b";
+}
+.icon-system-outlet-line:before {
+  content: "\e78c";
+}
+.icon-system-page-separator:before {
+  content: "\e78d";
+}
+.icon-system-paint-line:before {
+  content: "\e78e";
+}
+.icon-system-palette-line:before {
+  content: "\e78f";
+}
+.icon-system-palette-fill:before {
+  content: "\e790";
+}
+.icon-system-pages-fill:before {
+  content: "\e791";
+}
+.icon-system-pages-line:before {
+  content: "\e792";
+}
+.icon-system-paint-brush-line:before {
+  content: "\e793";
+}
+.icon-system-parent-fill:before {
+  content: "\e794";
+}
+.icon-system-parking-box-fill:before {
+  content: "\e795";
+}
+.icon-system-parking-box-line:before {
+  content: "\e796";
+}
+.icon-system-passport-line:before {
+  content: "\e797";
+}
+.icon-system-passport-fill:before {
+  content: "\e798";
+}
+.icon-system-pause-circle-fill:before {
+  content: "\e79a";
+}
+.icon-system-parent-line:before {
+  content: "\e79b";
+}
+.icon-system-open-arm-fill:before {
+  content: "\e79c";
+}
+.icon-system-open-arm-line:before {
+  content: "\e79d";
+}
+.icon-system-open-source-fill:before {
+  content: "\e79e";
+}
+.icon-system-paypal-line:before {
+  content: "\e79f";
+}
+.icon-system-pencil-fill:before {
+  content: "\e7a0";
+}
+.icon-system-pencil-ruler-2-fill:before {
+  content: "\e7a1";
+}
+.icon-system-pencil-line:before {
+  content: "\e7a2";
+}
+.icon-system-pencil-ruler-2-line:before {
+  content: "\e7a3";
+}
+.icon-system-pencil-ruler-line:before {
+  content: "\e7a4";
+}
+.icon-system-pen-nib-fill:before {
+  content: "\e7a5";
+}
+.icon-system-pencil-ruler-fill:before {
+  content: "\e7a7";
+}
+.icon-system-open-source-line:before {
+  content: "\e7a8";
+}
+.icon-system-pen-nib-line:before {
+  content: "\e7a9";
+}
+.icon-system-oil-line:before {
+  content: "\e7aa";
+}
+.icon-system-order-play-fill:before {
+  content: "\e7ad";
+}
+.icon-system-music-2-fill:before {
+  content: "\e7ae";
+}
+.icon-system-music-line:before {
+  content: "\e7af";
+}
+.icon-system-music-2-line:before {
+  content: "\e7b0";
+}
+.icon-system-mv-fill:before {
+  content: "\e7b1";
+}
+.icon-system-music-fill:before {
+  content: "\e7b2";
+}
+.icon-system-mv-line:before {
+  content: "\e7b3";
+}
+.icon-system-navigation-line:before {
+  content: "\e7b4";
+}
+.icon-system-navigation-fill:before {
+  content: "\e7b7";
+}
+.icon-system-notification-fill:before {
+  content: "\e7b8";
+}
+.icon-system-map-fill:before {
+  content: "\e7bc";
+}
+.icon-system-notification-4-fill:before {
+  content: "\e7bd";
+}
+.icon-system-notification-3-line:before {
+  content: "\e7be";
+}
+.icon-system-node-tree:before {
+  content: "\e7c0";
+}
+.icon-system-notification-2-line:before {
+  content: "\e7c1";
+}
+.icon-system-notification-2-fill:before {
+  content: "\e7c2";
+}
+.icon-system-map-line:before {
+  content: "\e7c3";
+}
+.icon-system-notification-badge-fill:before {
+  content: "\e7c4";
+}
+.icon-system-notification-3-fill:before {
+  content: "\e7c5";
+}
+.icon-system-notification-4-line:before {
+  content: "\e7c6";
+}
+.icon-system-notification-badge-line:before {
+  content: "\e7c7";
+}
+.icon-system-mail-volume-fill:before {
+  content: "\e7c8";
+}
+.icon-system-map-2-line:before {
+  content: "\e7c9";
+}
+.icon-system-map-2-fill:before {
+  content: "\e7ca";
+}
+.icon-system-map-pin-5-fill:before {
+  content: "\e7cb";
+}
+.icon-system-map-pin-5-line:before {
+  content: "\e7cc";
+}
+.icon-system-map-pin-2-fill:before {
+  content: "\e7cd";
+}
+.icon-system-map-pin-2-line:before {
+  content: "\e7ce";
+}
+.icon-system-map-pin-add-fill:before {
+  content: "\e7cf";
+}
+.icon-system-map-pin-4-fill:before {
+  content: "\e7d0";
+}
+.icon-system-mark-pen-fill:before {
+  content: "\e7d1";
+}
+.icon-system-markup-line:before {
+  content: "\e7d2";
+}
+.icon-system-map-pin-fill:before {
+  content: "\e7d4";
+}
+.icon-system-medal-2-fill:before {
+  content: "\e7d5";
+}
+.icon-system-map-pin-add-line:before {
+  content: "\e7d6";
+}
+.icon-system-map-pin-line:before {
+  content: "\e7d7";
+}
+.icon-system-map-pin-range-line:before {
+  content: "\e7d8";
+}
+.icon-system-map-pin-time-fill:before {
+  content: "\e7d9";
+}
+.icon-system-map-pin-user-fill:before {
+  content: "\e7da";
+}
+.icon-system-map-pin-range-fill:before {
+  content: "\e7db";
+}
+.icon-system-map-pin-4-line:before {
+  content: "\e7dc";
+}
+.icon-system-map-pin-time-line:before {
+  content: "\e7dd";
+}
+.icon-system-map-pin-user-line:before {
+  content: "\e7de";
+}
+.icon-system-medal-2-line:before {
+  content: "\e7df";
+}
+.icon-system-markdown-fill:before {
+  content: "\e7e0";
+}
+.icon-system-medal-fill:before {
+  content: "\e7e1";
+}
+.icon-system-medium-line:before {
+  content: "\e7e2";
+}
+.icon-system-markdown-line:before {
+  content: "\e7e3";
+}
+.icon-system-medal-line:before {
+  content: "\e7e4";
+}
+.icon-system-medium-fill:before {
+  content: "\e7e5";
+}
+.icon-system-men-line:before {
+  content: "\e7e6";
+}
+.icon-system-men-fill:before {
+  content: "\e7e7";
+}
+.icon-system-menu-5-line:before {
+  content: "\e7e8";
+}
+.icon-system-medicine-bottle-line:before {
+  content: "\e7e9";
+}
+.icon-system-markup-fill:before {
+  content: "\e7ea";
+}
+.icon-system-menu-add-fill:before {
+  content: "\e7eb";
+}
+.icon-system-menu-add-line:before {
+  content: "\e7ed";
+}
+.icon-system-menu-2-fill:before {
+  content: "\e7f0";
+}
+.icon-system-mark-pen-line:before {
+  content: "\e7f1";
+}
+.icon-system-menu-2-line:before {
+  content: "\e7f2";
+}
+.icon-system-menu-fill:before {
+  content: "\e7f3";
+}
+.icon-system-movie-line:before {
+  content: "\e7f4";
+}
+.icon-system-menu-3-fill:before {
+  content: "\e7f5";
+}
+.icon-system-menu-4-line:before {
+  content: "\e7f6";
+}
+.icon-system-menu-3-line:before {
+  content: "\e7f7";
+}
+.icon-system-menu-4-fill:before {
+  content: "\e7f8";
+}
+.icon-system-menu-5-fill:before {
+  content: "\e7f9";
+}
+.icon-system-message-3-line:before {
+  content: "\e7fa";
+}
+.icon-system-message-fill:before {
+  content: "\e7fb";
+}
+.icon-system-message-3-fill:before {
+  content: "\e7fc";
+}
+.icon-system-messenger-line:before {
+  content: "\e7fd";
+}
+.icon-system-mic-2-fill:before {
+  content: "\e7fe";
+}
+.icon-system-message-line:before {
+  content: "\e7ff";
+}
+.icon-system-mic-fill:before {
+  content: "\e800";
+}
+.icon-system-messenger-fill:before {
+  content: "\e801";
+}
+.icon-system-mic-2-line:before {
+  content: "\e804";
+}
+.icon-system-mic-off-fill:before {
+  content: "\e805";
+}
+.icon-system-mic-line:before {
+  content: "\e806";
+}
+.icon-system-microsoft-fill:before {
+  content: "\e809";
+}
+.icon-system-microsoft-line:before {
+  content: "\e80a";
+}
+.icon-system-mind-map:before {
+  content: "\e80b";
+}
+.icon-system-money-cny-box-line:before {
+  content: "\e80c";
+}
+.icon-system-money-cny-circle-fill:before {
+  content: "\e80d";
+}
+.icon-system-mini-program-line:before {
+  content: "\e80e";
+}
+.icon-system-money-cny-box-fill:before {
+  content: "\e80f";
+}
+.icon-system-mic-off-line:before {
+  content: "\e810";
+}
+.icon-system-mini-program-fill:before {
+  content: "\e811";
+}
+.icon-system-money-cny-circle-line:before {
+  content: "\e812";
+}
+.icon-system-more-2-fill:before {
+  content: "\e813";
+}
+.icon-system-more-fill:before {
+  content: "\e814";
+}
+.icon-system-more-2-line:before {
+  content: "\e815";
+}
+.icon-system-more-line:before {
+  content: "\e816";
+}
+.icon-tourism-motorbike-line:before {
+  content: "\e817";
+}
+.icon-tourism-motorbike-fill:before {
+  content: "\e818";
+}
+.icon-system-mouse-line:before {
+  content: "\e819";
+}
+.icon-system-mouse-fill:before {
+  content: "\e81a";
+}
+.icon-system-movie-2-fill:before {
+  content: "\e81b";
+}
+.icon-system-movie-2-line:before {
+  content: "\e81c";
+}
+.icon-system-movie-fill:before {
+  content: "\e81d";
+}
+.icon-system-message-2-fill:before {
+  content: "\e81e";
+}
+.icon-system-fenleiweixuanzhongbeifen2:before {
+  content: "\e82f";
+}
+.icon-system-fenleixuanzhongbeifen1:before {
+  content: "\e830";
+}
+.icon-system-shouyexuanzhongbeifen2:before {
+  content: "\e831";
+}
+.icon-system-shouyeweixuanzhongbeifen:before {
+  content: "\e832";
+}
+.icon-system-article-nav:before {
+  content: "\e833";
+}
+.icon-rili:before {
+  content: "\e834";
+}
+.icon-shijian:before {
+  content: "\e835";
+}
+.icon-xuanzhaijishi:before {
+  content: "\e836";
+}
+.icon-qiafu:before {
+  content: "\e837";
+}
+.icon-shouzang:before {
+  content: "\e838";
+}
+.icon-shouye:before {
+  content: "\e839";
+}
+.icon-fenxiang:before {
+  content: "\e83a";
+}
+.icon-gongqi_gaoliang:before {
+  content: "\e83b";
+}
+.icon-system-daishiyong:before {
+  content: "\e83e";
+}
+.icon-system-daishiyong2:before {
+  content: "\e83f";
+}
+.icon-daohang:before {
+  content: "\f686";
+}
+.icon-system-tuihuoguanli:before {
+  content: "\f687";
+}
+.icon-system-pingjia:before {
+  content: "\f688";
+}
+.icon-system-beihuozhong:before {
+  content: "\f689";
+}
+.icon-system-daizhifu:before {
+  content: "\f68a";
+}
+.icon-system-paisongzhong:before {
+  content: "\f68b";
+}
+.icon-system-my:before {
+  content: "\f68c";
+}
+.icon-system-cart:before {
+  content: "\f68d";
+}
+.icon-system-home:before {
+  content: "\f68e";
+}
+.icon-system-category:before {
+  content: "\f68f";
+}
+.icon-yuezhifu:before {
+  content: "\f690";
+}
+/*新版人人字体*/
+@font-face {font-family: "iconfont-remix";
+    src: url('data:application/x-font-woff2;charset=utf-8;base64,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') format('woff2');
+}
+.iconfont-remix {
+  font-family: "iconfont-remix" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+.icon-remix-shouye5:before {
+  content: "\e7af";
+}
+.icon-remix-fenlei4:before {
+  content: "\e7a8";
+}
+.icon-remix-gouwulan4:before {
+  content: "\e79e";
+}
+.icon-remix-wode3:before {
+  content: "\e79b";
+}
+.icon-remix-xiaoxi6:before {
+ content: "\e731";
+}
+.icon-remix-wode6:before {
+    content: "\e79a";
+}
+
+/*原版人人字体*/
+@font-face {font-family: "icox";
+    src: url(data:application/x-font-woff;charset=utf-8;base64,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) format('woff');
+}
+  
+  .icox {
+    font-family:"icox" !important;
+    font-size:16px;
+    font-style:normal;
+    -webkit-font-smoothing: antialiased;
+    -moz-osx-font-smoothing: grayscale;
+  }
+  
+  .icox-close:before { content: "\e602"; }
+  
+  .icox-search:before { content: "\e611"; }
+  
+  .icox-likefill:before { content: "\e61c"; }
+  
+  .icox-like:before { content: "\e61d"; }
+  
+  .icox-shop:before { content: "\e627"; }
+  
+  .icox-footprint:before { content: "\e639"; }
+  
+  .icox-cart:before { content: "\e642"; }
+  
+  .icox-cartfill:before { content: "\e648"; }
+  
+  .icox-vip:before { content: "\e650"; }
+  
+  .icox-add:before { content: "\e662"; }
+  
+  .icox-service:before { content: "\e682"; }
+  
+  .icox-app:before { content: "\e6ef"; }
+  
+  .icox-notification:before { content: "\e721"; }
+  
+  .icox-toleft:before { content: "\e739"; }
+  
+  .icox-delete:before { content: "\e75b"; }
+  
+  .icox-edit:before { content: "\e75c"; }
+  
+  .icox-viewlist:before { content: "\e772"; }
+  
+  .icox-icon02:before { content: "\e80d"; }
+  
+  .icox-gifts:before { content: "\e788"; }
+  
+  .icox-icon049:before { content: "\e7f1"; }
+  
+  .icox-heilongjiangtubiao11:before { content: "\e81c"; }
+  
+  .icox-dingdan2:before { content: "\e80a"; }
+  
+  .icox-erweima1:before { content: "\e81d"; }
+  
+  .icox-huiyuan1:before { content: "\e820"; }
+  
+  .icox-gouwuche:before { content: "\e63f"; }
+  
+  .icox-gouwuchetianjia:before { content: "\e640"; }
+  
+  .icox-lajixiang:before { content: "\e645"; }
+  
+  .icox-naozhong:before { content: "\e64a"; }
+  
+  .icox-shezhi:before { content: "\e64b"; }
+  
+  .icox-shijian:before { content: "\e64d"; }
+  
+  .icox-shouhuodizhi:before { content: "\e64e"; }
+  
+  .icox-shouye:before { content: "\e64f"; }
+  
+  .icox-sousuo:before { content: "\e654"; }
+  
+  .icox-wodeyouhuiquan:before { content: "\e65a"; }
+  
+  .icox-yijianfankui:before { content: "\e664"; }
+  
+  .icox-lingcunwei:before { content: "\e666"; }
+  
+  .icox-focus1:before { content: "\e8cf"; }
+  
+  .icox-shouhuodizhi1:before { content: "\e64c"; }
+  
+  .icox-liwu:before { content: "\e685"; }
+  
+  .icox-haoping:before { content: "\e636"; }
+  
+  .icox-haoping1:before { content: "\e647"; }
+  
+  .icox-shouhuodizhi2:before { content: "\e641"; }
+  
+  .icox-fenlei:before { content: "\e6b0"; }
+  
+  .icox-xing:before { content: "\e7fa"; }
+  
+  .icox-dianpu1:before { content: "\e82c"; }
+  
+  .icox-fenlei1:before { content: "\e82b"; }
+  
+  .icox-kefu2:before { content: "\e655"; }
+  
+  .icox-qian:before { content: "\e80b"; }
+  
+  .icox-yinhangqia:before { content: "\e621"; }
+  
+  .icox-gonggao:before { content: "\e606"; }
+  
+  .icox-hongbao:before { content: "\e62d"; }
+  
+  .icox-dianhua:before { content: "\e834"; }
+  
+  .icox-tixian1:before { content: "\e81a"; }
+  
+  .icox-youhuiquan:before { content: "\e835"; }
+  
+  .icox-shouji:before { content: "\e643"; }
+  
+  .icox-shezhi1:before { content: "\e836"; }
+  
+  .icox-haoping2:before { content: "\e631"; }
+  
+  .icox-icon_huida_tianxiebtn:before { content: "\e837"; }
+  
+  .icox-star:before { content: "\e802"; }
+  
+  .icox-fenxiang:before { content: "\e605"; }
+  
+  .icox-dianpu:before { content: "\e68c"; }
+  
+  .icox-arrow-down:before { content: "\e838"; }
+  
+  .icox-huiyuan:before { content: "\e66b"; }
+  
+  .icox-fenxiao:before { content: "\e600"; }
+  
+  .icox-guanbi1:before { content: "\e83a"; }
+  
+  .icox-huiyuan2:before { content: "\e83d"; }
+  
+  .icox-kefu:before { content: "\e625"; }
+  
+  .icox-shoucang:before { content: "\e628"; }
+  
+  .icox-daifahuo1:before { content: "\e808"; }
+  
+  .icox-xiaofei:before { content: "\e817"; }
+  
+  .icox-bangzhuzhongxin:before { content: "\e7f2"; }
+  
+  .icox-dingwei1:before { content: "\e7f3"; }
+  
+  .icox-guanzhu:before { content: "\e7f4"; }
+  
+  .icox-gouwuche3:before { content: "\e7f5"; }
+  
+  .icox-zuji:before { content: "\e7f6"; }
+  
+  .icox-dingdan1:before { content: "\e7f7"; }
+  
+  .icox-lingquyouhuiquan1:before { content: "\e7f9"; }
+  
+  .icox-fenxiao2:before { content: "\e7fc"; }
+  
+  .icox-shouji1:before { content: "\e7fd"; }
+  
+  .icox-daituikuan2:before { content: "\e7fe"; }
+  
+  .icox-daishouhuo1:before { content: "\e800"; }
+  
+  .icox-daifukuan1:before { content: "\e801"; }
+  
+  .icox-tixian:before { content: "\e805"; }
+  
+  
+  @font-face {
+    font-family: "iconj"; /* Project id 1752049 */
+    src: url('//at.alicdn.com/t/c/font_1752049_n0jw9cvfunm.woff2?t=1727498649486') format('woff2'),
+         url('//at.alicdn.com/t/c/font_1752049_n0jw9cvfunm.woff?t=1727498649486') format('woff'),
+         url('//at.alicdn.com/t/c/font_1752049_n0jw9cvfunm.ttf?t=1727498649486') format('truetype');
+  }
+  
+  .iconj {
+    font-family: "iconj" !important;
+    font-size: 16px;
+    font-style: normal;
+    -webkit-font-smoothing: antialiased;
+    -moz-osx-font-smoothing: grayscale;
+  }
+  
+  .icon-07zanting:before {
+    content: "\e6df";
+  }
+  
+  .icon-bofang:before {
+    content: "\e6e0";
+  }
+  
+  .icon-zanting1:before {
+    content: "\e6e1";
+  }
\ No newline at end of file
diff --git a/common/css/iconfont.css b/common/css/iconfont.css
new file mode 100644
index 0000000..67d57ff
--- /dev/null
+++ b/common/css/iconfont.css
@@ -0,0 +1,463 @@
+/* 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";
+}
\ No newline at end of file
diff --git a/common/css/main.scss b/common/css/main.scss
new file mode 100644
index 0000000..9f7542b
--- /dev/null
+++ b/common/css/main.scss
@@ -0,0 +1,876 @@
+@font-face {
+	font-family: 'myFont';
+	/* #ifdef MP */
+	src: url('data:font/ttf;charset=utf-8;base64,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/+8ALP/LADH/7wAz/+8ANf/3ADYACgA3/8sAOAAKADkACgA6AAcAOwAKAED/3QBC/90AQ//dAET/3QBF//QARv/dAEz/6gBN/+oATv/dAE//6gBQ/90AUf/qAFL/3wBT//UAVP/sAFUACwBX//UAWP/1AFn/7wAPACMACAAl//IAKf/yADH/8gAz//IAQv/1AEP/9QBE//UARv/1AE7/9QBQ//UAVP/1AFX/8gBW//IAWP/yAAIAVf/3AFj/9wAEAFX/+gBX//gAWP/6AFn/+AACAFX/9QBY//kABQBC//MAQ//zAET/8wBG//MAUP/zAAYAQv/1AEP/9QBE//UARv/1AEj/9QBQ//UABABV//gAV//1AFj/+ABZ//cACgBA/+QAQv/kAEP/6gBE/+QARQALAEb/6gBO/+EAUP/qAFMAHABYAAoAAgBE//UATv/uAAgAQP/4AEL/+ABD//gARP/1AEUACABG//gATv/4AFD/+AAGAEL/9QBD//UARP/1AEb/9QBO/+oAUP/1AAgAQP/4AEL/+ABD//gARP/4AEUACABG//gATv/vAFD/+AAGAEL/9wBD//cARP/3AEb/9wBO//cAUP/3AAIACwAjACgAAAAqADQABgA2ADwAEQBAAEEAGABEAEUAGgBKAEoAHABOAE8AHQBRAFEAHwBTAFMAIABVAFUAIQBXAFkAIgAAAAAAAQAAAADVpCcIAAAAANbRI74AAAAA2D0KNg==') format('truetype');
+	/* #endif */
+	/* #ifndef MP */
+	src: url('@/common/css/custom.ttf') format('truetype');
+	/* #endif */
+}
+
+view {
+	line-height: 1.8;
+	font-family: 'PingFang SC', 'Roboto Medium';
+	font-size: $font-size-base;
+	color: $color-title;
+}
+
+page {
+	background-color: $color-bg;
+}
+
+:root {
+	$base-color: #ff4544;
+	$base-help-color: #ffb644; //辅助颜色
+	--tab-bar-height: 112rpx;
+}
+
+.uni-input-input:-webkit-autofill {
+	-webkit-transition-delay: 111111s;
+	-webkit-transition: color 11111s ease-out, background-color 111111s ease-out;
+}
+
+.color-base-text {
+	color: $base-color !important;
+}
+
+//背景色
+.color-base-bg {
+	background-color: $base-color !important;
+}
+
+.color-base-bg-before {
+	&::after,
+	&::before {
+		background: $base-color !important;
+	}
+}
+
+.color-base-text-before {
+	&::after,
+	&::before {
+		color: $base-color !important;
+	}
+}
+
+// 浅主色调背景
+.color-base-bg-light {
+	// background-color: lighten($base-color, 35%) !important;
+}
+
+//边框
+.color-base-border {
+	border-color: $base-color !important;
+	&-top {
+		border-top-color: $base-color !important;
+	}
+	&-bottom {
+		border-bottom-color: $base-color !important;
+	}
+	&-right {
+		border-right-color: $base-color !important;
+	}
+	&-left {
+		border-left-color: $base-color !important;
+	}
+}
+
+// ***************文字颜色***************
+
+// 主标题
+.color-title {
+	color: $color-title !important;
+}
+
+// 副标题
+.color-sub {
+	color: $color-sub !important;
+}
+
+// 辅助提示色
+.color-tip {
+	color: $color-tip !important;
+}
+
+// 灰背景色
+.color-bg {
+	background-color: $color-bg !important;
+}
+
+// 分割线
+.color-line {
+	color: $color-line !important;
+}
+
+// 分割线边框
+.color-line-border {
+	border-color: $color-line !important;
+}
+
+// 禁用色
+.color-disabled {
+	color: $color-disabled !important;
+}
+
+// ***************文字大小***************
+input {
+	max-height: unset;
+	min-height: unset;
+	font-size: $font-size-base;
+    background: unset;
+}
+
+// 14px，正文文字
+.font-size-base {
+	font-size: $font-size-base !important;
+}
+
+// 16px，用于标题、导航栏
+.font-size-toolbar {
+	font-size: $font-size-toolbar !important;
+}
+
+// 13px，副标题
+.font-size-sub {
+	font-size: $font-size-sub !important;
+}
+
+// 12px，辅助性文字/大标签
+.font-size-tag {
+	font-size: $font-size-tag !important;
+}
+
+// 11px，商品列表角标
+.font-size-goods-tag {
+	font-size: $font-size-goods-tag !important;
+}
+
+// 10px，活动角标（拼团等角标）/小标签文字
+.font-size-activity-tag {
+	font-size: $font-size-activity-tag !important;
+}
+
+//内边距
+.padding {
+	padding: $padding !important;
+	&-top {
+		padding-top: $padding !important;
+	}
+	&-right {
+		padding-right: $padding !important;
+	}
+	&-bottom {
+		padding-bottom: $padding !important;
+	}
+	&-left {
+		padding-left: $padding !important;
+	}
+}
+
+//外边距
+.margin {
+	margin: $margin-updown $margin-both !important;
+	&-top {
+		margin-top: $margin-updown !important;
+	}
+	&-right {
+		margin-right: $margin-both !important;
+	}
+	&-bottom {
+		margin-bottom: $margin-updown !important;
+	}
+	&-left {
+		margin-left: $margin-both !important;
+	}
+}
+
+/**
+ * 按钮
+ * size='mini' 小规格的
+ * type='default' 普通的
+ * type='primary' 主色背景+白色字
+ * .button-border 主色边框+主色字 
+ * .shadow 主色阴影
+ * .default 去除margin
+ * .disabled 禁止状态
+ */
+button {
+	margin: 0 30rpx;
+	font-size: $font-size-base;
+	border-radius: 10rpx;
+	line-height: 2.8;
+    background-color: $base-color;
+    // #ifdef MP-ALIPAY
+    border: none;
+    // #endif
+    
+	&[type='primary'] {
+		background-color: $base-color;
+		color: var(--btn-text-color);
+		&[plain] {
+			background-color: transparent;
+			color: $base-color;
+			border-color: $base-color;
+		}
+	}
+	&[type='default'] {
+		background: #fff;
+		border: 2rpx solid $color-line;
+	}
+	&.mini, &[size='mini'] {
+		margin: 0 !important;
+        height: 60rpx;
+		line-height: 60rpx;
+        box-sizing: content-box;
+		font-size: $font-size-tag;
+        padding: 0 30rpx;
+		&[type='default'] {
+			background-color: #fff;
+		}
+	}
+	&.button-hover[type='primary'] {
+		background-color: $base-color;
+	}
+	&[type='primary'][plain],
+	&.button-hover[type='primary'][plain] {
+		color: $base-color;
+		border-color: $base-color;
+	}
+	&.button-hover[type='primary'] {
+		color: var(--btn-text-color);
+	}
+
+	&[disabled],
+	&.disabled {
+		background: $color-line !important;
+		color: rgba(0, 0, 0, 0.3) !important;
+		border-color: $color-line !important;
+	}
+	&::after {
+		border: none !important;
+	}
+}
+
+uni-button:after {
+	border: none !important;
+}
+
+// 复选框
+uni-checkbox .uni-checkbox-input.uni-checkbox-input-checked {
+	color: $base-color !important;
+}
+
+uni-checkbox:not([disabled]) .uni-checkbox-input:hover {
+	border-color: $base-color !important;
+}
+
+.form-component uni-checkbox .uni-checkbox-input.uni-checkbox-input-checked {
+	background-color: $base-color !important;
+	border-color: $base-color !important;
+}
+
+// 开关
+uni-switch .uni-switch-input.uni-switch-input-checked {
+	background-color: $base-color !important;
+	border-color: $base-color !important;
+}
+
+// 单选
+uni-radio .uni-radio-input-checked {
+	background-color: $base-color !important;
+	border-color: $base-color !important;
+}
+
+// 滑块
+uni-slider .uni-slider-track {
+	background-color: $base-color !important;
+}
+
+.uni-tag--primary {
+	color: #fff !important;
+	background-color: $base-color !important;
+	border-color: $base-color !important;
+}
+
+.uni-tag--primary.uni-tag--inverted {
+	color: $base-color !important;
+	background-color: #fff !important;
+	border-color: $base-color !important;
+}
+
+// 圆角
+.border-radius {
+	border-radius: $border-radius !important;
+}
+
+.uni-tag--inverted {
+	border-color: $color-line !important;
+	color: $color-title !important;
+}
+
+// ***************商品详情***************
+//商品详情，优惠券弹出层，项
+// .goods-coupon-popup-layer .coupon-body .item {
+// 	background-color: lighten($base-color, 45%) !important;
+// 	view {
+// 		color: lighten($base-color, 10%) !important;
+// 	}
+// }
+
+// 商品详情加入购物车背景色
+.color-join-cart {
+	background-color: $base-help-color !important;
+}
+
+// 商品详情，sku选中
+.sku-layer .body-item .sku-list-wrap {
+	.items {
+		// background-color: #f5f5f5 !important;
+		&.selected {
+			// background-color: lighten($base-color, 35%) !important;
+			// background-color: lighten($base-color, 45%) !important;
+			color: $base-color !important;
+			border-color: $base-color !important;
+		}
+		&.disabled {
+			color: $color-sub !important;
+			cursor: not-allowed !important;
+			pointer-events: none !important;
+			opacity: 0.5 !important;
+			box-shadow: none !important;
+			filter: grayscale(100%);
+		}
+	}
+}
+
+.goods-detail .goods-coupon-popup-layer .coupon-info button {
+	// background: linear-gradient(to right, #ff4544, lighten(#ff4544, 10%));
+	// background: linear-gradient(to right, $base-color, lighten($base-color, 10%));
+}
+
+// 秒杀商品详情
+.goods-detail .seckill-wrap {
+	// background: linear-gradient(to right, $base-color, lighten($base-color, 20%)) !important;
+}
+
+.goods-detail .goods-module-wrap .original-price .seckill-save-price {
+	// background: lighten($base-color, 40%) !important;
+	color: $base-color !important;
+}
+
+// 拼团商品详情
+.goods-detail .goods-pintuan {
+	background: rgba($base-color, 0.2);
+	.price-info {
+		// background: linear-gradient(to right, $base-color, lighten($base-color, 10%)) !important;
+	}
+}
+
+// 预售商品详情
+.goods-detail .presale-rule {
+	.process-item .number {
+		background: rgba($base-color, 0.2);
+	}
+}
+
+// 专题商品详情
+.goods-detail .topic-wrap .price-info {
+	// background: linear-gradient(to right, $base-color, #ff7877) !important;
+}
+
+// 团购商品详情
+.goods-detail .goods-groupbuy {
+	background: rgba($base-color, 0.2);
+	.price-info {
+		// background: linear-gradient(to right, $base-color, lighten($base-color, 10%)) !important;
+	}
+}
+
+// 商品详情优惠券
+.newdetail .coupon .coupon-item {
+	&::after,
+	&::before {
+		border-color: $base-color !important;
+	}
+}
+
+// 商品详情，数量加减
+.sku-layer .body-item .number-wrap .number {
+	button,
+	input {
+		border-color: rgba(229, 229, 229, 0.5) !important;
+		background-color: rgba(229, 229, 229, 0.4) !important;
+	}
+}
+
+// ***************订单***************
+// 订单列表按钮样式
+.order-box-btn {
+	&.order-pay {
+		background: $base-color;
+	}
+}
+
+.ns-gradient-otherpages-fenxiao-apply-apply-bg {
+	// background: linear-gradient(to left, $base-color, lighten($base-color, 20%));
+}
+
+.ns-gradient-otherpages-member-widthdrawal-withdrawal {
+	// background: linear-gradient(to left, $base-color, lighten($base-color, 20%));
+}
+
+.ns-gradient-otherpages-member-balance-balance-rechange {
+	// background: linear-gradient(to bottom, $base-color, #fd7e4b);
+}
+
+.ns-gradient-pages-member-index-index {
+	// background: linear-gradient(to left, lighten($base-color, 10%), darken($base-color, 1%));
+}
+
+.ns-gradient-promotionpages-pintuan-share-share {
+	// background-image: linear-gradient(to right, mix($base-color, #fff), $base-color);
+}
+
+.ns-gradient-promotionpages-payment {
+	// background: linear-gradient(to right, mix($base-color, #fff), $base-color) !important;
+}
+
+.ns-gradient-promotionpages-pintuan-payment {
+	background: rgba($base-color, 0.08) !important;
+}
+
+.ns-gradient-diy-goods-list {
+	border-color: rgba($base-color, 0.2) !important;
+}
+
+.ns-gradient-detail-coupons-right-border {
+	border-right-color: rgba($base-color, 0.2) !important;
+}
+
+.ns-gradient-detail-coupons {
+	background-color: rgba($base-color, 0.8) !important;
+}
+
+.ns-pages-goods-category-category {
+	// background-image: linear-gradient(135deg, $base-color, #ff7444) !important;
+}
+
+.ns-gradient-pintuan-border-color {
+	border-color: rgba($base-color, 0.2) !important;
+}
+
+.goods-list.single-column .pro-info button,
+.goods-list.single-column .pro-info .buy-btn {
+	// background: linear-gradient(to right, mix($base-color, #fff), $base-color) !important;
+}
+
+.goods-list.single-column .pintuan-info .pintuan-num {
+	// background: mix($base-color, #fff, 30%) !important;
+}
+.goods-list.single-column .pintuan-info .pinfan-num {
+	// background: mix($base-color, #fff, 10%) !important;
+}
+
+.order-box-btn {
+	display: inline-block;
+	line-height: 56rpx;
+	padding: 0 30rpx;
+	font-size: 26rpx;
+	color: $color-title;
+	border: 1.5px solid #999;
+	box-sizing: border-box;
+	border-radius: 60rpx;
+	margin-left: $margin-both;
+	&.order-pay {
+		color: #fff;
+		border-color: #fff;
+	}
+	&.color-base-bg {
+		color: #fff;
+	}
+}
+
+// ***************余额***************
+// 余额背景色渐变
+.balance-wrap {
+	// background: linear-gradient(to right, $base-color, mix($base-color, #fff, 70%)) !important;
+}
+
+.color-base-text-light {
+	// color: mix($base-color, #fff, 50%) !important;
+}
+//瓜分红包规则背景
+.ns-rule-bg {
+	background: rgba(#fff, 0.1) !important;
+}
+
+// 解决uni.showModal弹窗标题继承父级样式
+uni-modal .uni-modal__hd {
+	font-size: 36rpx;
+}
+
+// 解决弹框的字体大小
+uni-toast {
+	.uni-simple-toast__text {
+		font-size: 26rpx;
+		padding: 20rpx 40rpx;
+		border-radius: 10rpx;
+	}
+	.uni-toast {
+		width: 200rpx;
+	}
+	.uni-icon_toast.uni-loading {
+		margin: 40rpx 0 0;
+		width: 76rpx;
+		height: 76rpx;
+	}
+	.uni-toast__content {
+		font-size: 28rpx;
+		margin: 0 0 30rpx;
+	}
+}
+
+.iconfont {
+	font-size: 32rpx;
+}
+
+/* 兼容苹果X以上的手机样式 */
+.iphone-x {
+	/* 	padding-bottom: 68rpx !important; */
+	padding-bottom: constant(safe-area-inset-bottom);
+	padding-bottom: env(safe-area-inset-bottom);
+}
+
+.iphone-x-fixed {
+	bottom: 68rpx !important;
+}
+
+// ***************其他***************
+/* 隐藏滚动条 */
+::-webkit-scrollbar {
+	width: 0;
+	height: 0;
+	color: transparent;
+}
+
+scroll-view ::-webkit-scrollbar {
+	width: 0;
+	height: 0;
+	background-color: transparent;
+}
+
+/deep/::-webkit-scrollbar {
+	width: 0;
+	height: 0;
+	background-color: transparent;
+	display: none;
+}
+
+/* 单行超出隐藏 */
+.using-hidden {
+	word-break: break-all;
+	text-overflow: ellipsis;
+	overflow: hidden;
+	display: -webkit-box;
+	-webkit-line-clamp: 1;
+	-webkit-box-orient: vertical;
+	white-space: break-spaces;
+}
+/* 多行超出隐藏 */
+.multi-hidden {
+	word-break: break-all;
+	text-overflow: ellipsis;
+	overflow: hidden;
+	display: -webkit-box;
+	-webkit-line-clamp: 2;
+	-webkit-box-orient: vertical;
+}
+
+// 价格样式
+.price-color{
+	color: var(--price-color)!important;
+}
+.price-style{
+	font-family: 'myFont','-apple-system', 'BlinkMacSystemFont', 'Helvetica Neue', 'Helvetica', 'Segoe UI', 'Arial', 'Roboto', 'PingFang SC', 'Hiragino Sans GB', 'Microsoft Yahei','sans-serif';
+	// font-family: 'PingFang SC', 'Roboto Medium';
+	color: var(--price-color)!important;
+	font-weight: 500!important;
+	&.large{
+		font-size: 32rpx!important;
+	}
+	&.small{
+		font-size: 24rpx!important;
+	}
+}
+ 
+.price-font{
+	font-family: 'myFont','-apple-system', 'BlinkMacSystemFont', 'Helvetica Neue', 'Helvetica', 'Segoe UI', 'Arial', 'Roboto', 'PingFang SC', 'Hiragino Sans GB', 'Microsoft Yahei','sans-serif';
+	// font-family: 'PingFang SC', 'Roboto Medium';
+	font-weight: 500!important;
+}
+
+/deep/ .reward-popup .uni-popup__wrapper-box {
+	background: none !important;
+	max-width: unset !important;
+	max-height: unset !important;
+	overflow: unset !important;
+}
+
+// #ifdef H5
+// 下拉加载动画【页面】
+/deep/ body uni-page-refresh div{
+	width: 14rpx !important;
+	height: 14rpx !important;
+	background-color: #ccc;
+	box-shadow: inherit !important;
+	clip: rect(-152rpx, 90rpx, 90rpx, -30rpx) !important;
+	animation:.6s backgroundChange linear infinite;
+}
+/deep/ body uni-page-refresh div::after{
+	content: "";
+	position: absolute;
+	left: -22rpx;
+	width: 14rpx !important;
+	height: 14rpx !important;
+	border-radius: 50%;
+	background-color: #ccc;
+	animation:.5s backgroundChange linear infinite;
+}
+/deep/ body uni-page-refresh div::before{
+	content: "";
+	position: absolute;
+	right: -22rpx;
+	width: 14rpx !important;
+	height: 14rpx !important;
+	border-radius: 50%;
+	background-color: #ccc;
+	animation:.7s backgroundChange linear infinite;
+}
+/deep/ body uni-page-refresh > div > div{
+	display: none !important;
+}
+
+// 下拉加载动画【scroll-view】
+/deep/ body .uni-scroll-view-refresher{
+	background-color: transparent !important;
+}
+/deep/ body .uni-scroll-view-refresher div{
+	left: 50%;
+	top: 50%;
+	transform: translate(-50%, -50%);
+	width: 14rpx !important;
+	height: 14rpx !important;
+	background-color: #ccc;
+	box-shadow: inherit !important;
+	border-radius: 50%;
+	clip: rect(-152rpx, 90rpx, 90rpx, -30rpx) !important;
+	animation:.6s backgroundChange linear infinite;
+}
+/deep/ body .uni-scroll-view-refresher div::after{
+	content: "";
+	position: absolute;
+	left: -22rpx;
+	width: 14rpx !important;
+	height: 14rpx !important;
+	border-radius: 50%;
+	background-color: #ccc;
+	animation:.5s backgroundChange linear infinite;
+}
+/deep/ body .uni-scroll-view-refresher div::before{
+	content: "";
+	position: absolute;
+	right: -22rpx;
+	width: 14rpx !important;
+	height: 14rpx !important;
+	border-radius: 50%;
+	background-color: #ccc;
+	animation:.7s backgroundChange linear infinite;
+}
+/deep/ body .uni-scroll-view-refresher > div > div{
+	display: none !important;
+}
+@keyframes backgroundChange {
+	from {
+		background-color: #ccc;
+	}
+	to {
+		background-color: #999;
+	}
+}
+// #endif
+
+.border-0 {
+    border: none;
+}
+
+
+/*-------------*/
+.fui-list-group {
+	background-color: #fff;
+	position: relative;
+	margin-top: 20rpx;
+	.fui-list {
+		position: relative;
+		display: flex;
+		padding: 16rpx 24rpx;
+		transition-duration: 300ms;
+		align-items: center;
+		overflow: hidden;
+		.fui-list-media {
+			display: flex;
+			flex-shrink: 0;
+			flex-wrap: nowrap;
+			box-sizing: border-box;
+			align-items: center;
+			margin-right: 20rpx;
+			color: #000;
+			position: relative;
+			image {
+				width: 100rpx;
+				height: 100rpx;
+			}
+		}
+		.fui-list-inner {
+			position: relative;
+			flex: 1;
+			overflow: hidden;
+			box-sizing: border-box;
+			display: block;
+			 .title {
+				position: relative;
+				font-size: 28rpx;
+				color: #000;
+				white-space: nowrap;
+				text-overflow: ellipsis;
+				overflow: hidden;
+				height: 40rpx;
+				line-height: 40rpx;
+			}
+		}
+	}
+	
+}
+.fui-cell-group {
+	margin-top: 0rpx;
+	background-color: #fff;
+	line-height: 1.4;
+	font-size: 32rpx;
+	overflow: hidden;
+	position: relative;
+	.fui-cell {
+		position: relative;
+		padding: 24rpx;
+		display: -webkit-box;
+		display: -webkit-flex;
+		display: -ms-flexbox;
+		display: flex;
+		-webkit-box-align: center;
+		-ms-flex-align: center;
+		align-items: center;
+		transition-duration: 300ms;
+		transition-property: background-color;
+		.fui-cell-label {
+			position: relative;
+			display: block;
+			width: 160rpx;
+			padding: 0;
+			font-size: 28rpx;
+			color: #666;
+		}
+		.fui-cell-info {
+			flex: 1;
+			white-space: nowrap;
+			text-overflow: ellipsis;
+			overflow: hidden;
+			font-size: 28rpx;
+			color: #000;
+			input {
+				width: 100%;
+				border: 0;
+				outline: 0;
+				background-color: transparent;
+				font-size: inherit;
+				color: inherit;
+				height: 1.41176471em;
+				line-height: 1.41176471;
+			}
+		}
+		.fui-cell-text {
+		    flex: 1;
+		    color: #000;
+		    font-size: 28rpx;
+		}
+		.fui-cell-remark {
+		    color: #888;
+		    text-align: right;
+		    font-size: 30rpx;
+		    margin-right: 8rpx;
+		}
+	}
+	.fui-cell-remark:after {
+	    content: " ";
+	    display: inline-block;
+	    transform: rotate(45deg);
+	    height: 16rpx;
+	    width: 16rpx;
+	    border-width: 1px 1px 0 0;
+	    border-color: #C8C8CD;
+	    border-style: solid;
+	    position: relative;
+	    top: 0;
+	    margin-left: .3em;
+	}
+	 .fui-cell:before {
+		content: " ";
+		position: absolute;
+		left: 20rpx;
+		right: 20rpx;
+		top: 0;
+		height: 1px;
+		border-top: 1px solid #ebebeb;
+		color: #D9D9D9;
+		transform-origin: 0 0;
+		transform: scaleY(0.5);
+	}
+	.fui-cell-icon{
+		margin-top: 10rpx;
+		margin-right: 16rpx;
+	}
+	
+}
+.fui-btn.mtop {
+    margin-top: 1rem;
+}
+.fui-btn.btn-danger {
+    background: #4390FF;
+    color: #fff;
+    border: 1px solid #4390FF;
+}
+.fui-btn.block {
+    display: block;
+}
+
+.fui-btn {
+    -moz-appearance: none;
+    background: rgba(0,0,0,0) none repeat scroll 0 0;
+    border-radius: 10rpx;
+    box-sizing: border-box;
+    cursor: pointer;
+    font-family: inherit;
+    font-size: 30rpx;
+    height: 80rpx;
+    line-height: 76rpx;
+    padding: 0 20rpx;
+    position: relative;
+    text-align: center;
+    text-decoration: none;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    border: 1px solid #f90;
+    margin: 0.5em;
+    user-select: none;
+    transition-duration: 300ms;
+    transition-property: background-color;
+    display: inline-block;
+    z-index: 100;
+}
\ No newline at end of file
diff --git a/common/css/order_parment.scss b/common/css/order_parment.scss
new file mode 100644
index 0000000..0f1bc27
--- /dev/null
+++ b/common/css/order_parment.scss
@@ -0,0 +1,1452 @@
+@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;
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/common/js/auth.js b/common/js/auth.js
new file mode 100644
index 0000000..b73f8d6
--- /dev/null
+++ b/common/js/auth.js
@@ -0,0 +1,103 @@
+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
+		}
+	}
+}
\ No newline at end of file
diff --git a/common/js/config.js b/common/js/config.js
new file mode 100644
index 0000000..1072062
--- /dev/null
+++ b/common/js/config.js
@@ -0,0 +1,50 @@
+var config = {
+
+	// baseUrl: site.baseUrl,
+	// imgDomain: site.baseUrl,
+	// h5Domain: site.baseUrl,
+
+	//api请求地址
+	baseUrl: 'https://xcx30.5g-quickapp.com/',
+
+	// 图片域名
+	imgDomain: 'https://xcx30.5g-quickapp.com/',
+	
+	// H5端域名
+	h5Domain: 'https://xcx30.5g-quickapp.com/',
+	
+	// // api请求地址
+	// baseUrl: 'https://tsaas.liveplatform.cn/',
+	
+	// // 图片域名
+	// imgDomain: 'https://tsaas.liveplatform.cn/',
+	
+	// // H5端域名
+	// h5Domain: 'https://tsaas.liveplatform.cn/',
+	
+	// api请求地址
+	// baseUrl: 'http://saas.cn/',
+	
+	// // 图片域名
+	// imgDomain: 'http://saas.cn/',
+	
+	// // H5端域名
+	// h5Domain: 'http://saas.cn/',
+
+
+	// 腾讯地图key 
+	mpKey: 'TUHBZ-CNWKU-UHAVP-GZQ26-HNZFO-3YBF4',
+
+	//客服地址
+	webSocket: '{{$webSocket}}',
+
+	//本地端主动给服务器ping的时间, 0 则不开启 , 单位秒
+	pingInterval: 1500,
+	uniacid:305,//825
+	// uniacid:site.uniacid,//825
+	// 版本号 
+	version: '1.0'
+
+};
+
+export default config;
\ No newline at end of file
diff --git a/common/js/diy.js b/common/js/diy.js
new file mode 100644
index 0000000..f30445f
--- /dev/null
+++ b/common/js/diy.js
@@ -0,0 +1,611 @@
+import WxMap from 'common/js/map-wx-jssdk.js';
+import Config from '@/common/js/config.js';
+
+let systemInfo = uni.getSystemInfoSync();
+export default {
+	data() {
+		return {
+			diyData: {
+				global: {
+					title: '',
+					popWindow: {
+						imageUrl: '',
+						count: -1,
+						link: {},
+						imgWidth: '',
+						imgHeight: ''
+					}
+				}
+			},
+			id: 0,
+			name: '',
+
+			topIndexValue: null,
+			statusBarHeight: systemInfo.statusBarHeight,
+			collectTop: 44,
+			showTip: false,
+			mpCollect: false,
+			mpShareData: null, //小程序分享数据
+			scrollTop: 0, // 滚动位置
+			paddingTop: (44 + systemInfo.statusBarHeight) + 'px',
+			marginTop: -(44 + systemInfo.statusBarHeight) + 'px',
+			followOfficialAccount: null, // 关注公众号组件
+
+			latitude: null, // 纬度
+			longitude: null, // 经度
+			currentPosition: '', // 当前位置
+			nearestStore: null, // 离自己最近的门店
+
+			storeTimeOut: null, // 没有获取到定位，则获取默认门店
+			locationModule: '', // 模式，locationPicker H5选择地图
+
+			diyRoute: '', // 页面路由
+			openBottomNav: false,
+			isShowCopyRight: false,
+			
+			//启动广告
+			adv:{},
+			
+		};
+	},
+	onLoad(option) {
+		uni.hideTabBar();
+
+		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) {
+				sceneParams.forEach(item => {
+					if (item.indexOf('m') != -1) uni.setStorageSync('source_member', item.split('-')[1]);
+				});
+			}
+		}
+
+		// #ifdef H5
+		// H5地图选择位置回调数据
+		if (option.module && option.module == 'locationPicker') {
+			option.name = ''; // 清空地址
+			this.locationModule = option.module;
+			this.latitude = option.latng.split(',')[0];
+			this.longitude = option.latng.split(',')[1];
+		}
+		// #endif
+
+		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();
+		}
+		
+	},
+	onShow() {
+		
+		this.init();
+	},
+	onHide() {
+		if (this.storeTimeOut) {
+			clearTimeout(this.storeTimeOut);
+		}
+
+		// 跳转页面要关闭门店弹出框
+		this.closeChooseStorePopup();
+
+		// 清除限时秒杀定时器
+		this.$store.commit('setDiySeckillInterval', 0);
+	},
+	computed: {
+		bgColor() {
+			let str = '';
+			if (this.diyData && this.diyData.global) {
+				str = this.diyData.global.pageBgColor;
+			}
+			return str;
+		},
+		bgImg() {
+			let str = '';
+			if (this.diyData && this.diyData.global) {
+				str = this.diyData.global.topNavBg ? 'url(' + this.$util.img(this.diyData.global.bgUrl) + ')' : this.diyData.global.pageBgColor;
+			}
+			return str;
+		},
+		bgUrl() {
+			let str = '';
+			if (this.diyData && this.diyData.global) {
+				str = this.diyData.global.topNavBg ? 'transparent' : this.diyData.global.bgUrl;
+			}
+			return str;
+		},
+		backgroundUrl() {
+			var str = this.diyData.global.bgUrl && this.diyData.global.bgUrl != 'transparent' ? 'url(' + this.$util.img(this.diyData.global.bgUrl) + ') ' : '';
+			return str;
+		},
+		textNavColor() {
+			if (this.diyData && this.diyData.global && this.diyData.global.textNavColor) {
+				return this.diyData.global.textNavColor;
+			} else {
+				return '#ffffff';
+			}
+		},
+		//计算首页弹框的显示宽高
+		popWindowStyle() {
+			// 做大展示宽高
+			let max_width = 290;
+			let max_height = 410;
+			// 参照宽高
+			let refer_width = 290;
+			let refer_height = 290;
+
+			let scale = this.diyData.global.popWindow.imgHeight / this.diyData.global.popWindow.imgWidth;
+			let width, height;
+			if (scale < refer_height / refer_width) {
+				width = max_width;
+				height = width * scale;
+			} else {
+				height = max_height;
+				width = height / scale;
+			}
+
+			let obj = '';
+			if (this.diyData.global.popWindow && this.diyData.global.popWindow.count != -1 && this.diyData.global.popWindow.imageUrl) {
+				obj += 'height:' + (height * 2) + 'rpx;';
+				obj += 'width:' + (width * 2) + 'rpx;';
+			}
+			return obj;
+		}
+	},
+	watch: {
+		location: function (nVal) {
+			if (nVal) {
+				this.latitude = nVal.latitude;
+				this.longitude = nVal.longitude;
+				this.getNearestStore();
+				this.getCurrentLocation();
+			}
+		}
+	},
+	methods: {
+		play(){
+			console.log(123)
+		},
+		async init() {
+
+			// 定位信息过期后，重新获取定位
+			if(this.mapConfig.wap_is_open == 1 && this.locationStorage && this.locationStorage.is_expired) {
+				this.$util.getLocation({
+					fail: (res) => {
+						// 拒绝定位，进入默认总店
+						this.enterDefaultStore();
+					}
+				});
+			}
+
+			if (this.storeToken) {
+				//记录分享关系
+				if (uni.getStorageSync('source_member')) {
+					this.$util.onSourceMember(uni.getStorageSync('source_member'));
+				}
+			}
+
+			await this.getDiyInfo();
+			//获取启动广告
+			await this.getDiyAdv();
+
+			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');
+
+				// 滚动至顶部
+				uni.pageScrollTo({
+					duration: 200,
+					scrollTop: 0
+				});
+			}
+		},
+		callback() {
+			if (this.$refs.indexPage) {
+				this.$refs.indexPage.initPageIndex();
+			}
+		},
+		//计算高度
+		getHeight() {
+			// #ifdef H5
+			if (this.diyData && this.diyData.global && this.diyData.global.navBarSwitch) {
+				// H5端，导航栏样式1 2 3不显示，要减去高度
+				if ([1, 2, 3].indexOf(parseInt(this.diyData.global.navStyle)) != -1) {
+					this.paddingTop = 0;
+					this.marginTop = 0;
+				}
+			}
+			// #endif
+
+			// #ifdef MP || APP-PLUS
+			let time = setInterval(() => {
+				this.$nextTick(() => {
+					const query = uni.createSelectorQuery().in(this);
+					query.select('.page-header').boundingClientRect(data => {
+						if (data && data.height) {
+							// 从状态栏高度开始算
+							this.paddingTop = data.height + 'px';
+							this.marginTop = -data.height + 'px';
+							clearInterval(time);
+						}
+					}).exec();
+				});
+			}, 50);
+			// #endif
+		},
+		async getDiyAdv(){
+			//启动广告
+			let res = await this.$api.sendRequest({
+				url: '/api/diyview/getstartadv',
+				data: {},
+				async: false
+			});
+			this.adv = res.value
+			// 弹框形式，首次弹出 1，每次弹出 0
+			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);
+						}
+					} else if (res.value.advtype == 0) {
+						this.$refs.uniPopupWindow.open();
+						uni.setStorageSync(this.id + this.name + '_popwindow_count', 0);
+					}
+				}, 500);
+			}
+			
+		},
+		async getDiyInfo() {
+			let res = await this.$api.sendRequest({
+				url: '/api/diyview/info',
+				data: {
+					id: this.id,
+					name: this.name,
+					en_type:uni.getStorageSync("lang"),//获取语言底部
+				},
+				async: false
+			});
+			if (res.code != 0 || !res.data) {
+				if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+
+				if (res.code == -3) {
+					this.$util.showToast({
+						title: res.message
+					});
+					this.diyData = {};
+					return;
+				}
+
+				this.$util.showToast({
+					title: '未配置自定义页面数据'
+				});
+				this.diyData = {};
+				return;
+			}
+
+			let diyDataValue = res.data;
+			if (diyDataValue.value) {
+				this.diyData = JSON.parse(diyDataValue.value);
+				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) {
+					// 弹框形式，首次弹出 1，每次弹出 0
+					setTimeout(() => {
+						if (this.diyData.global.popWindow.count == 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);
+							}
+						} else if (this.diyData.global.popWindow.count == 0) {
+							this.$refs.uniPopupWindow.open();
+							uni.setStorageSync(this.id + this.name + '_popwindow_count', 0);
+						}
+					}, 500);
+				}*/
+
+				// 修改diy数据结构排序
+				let searchIndex = -1;
+				let topCategoryIndex = -1;
+				this.diyData.value.forEach((item, index) => {
+					if (item.componentName == 'Search') {
+						if (item.positionWay == 'fixed') {
+							searchIndex = index;
+						}
+					}
+					if (item.componentName == 'TopCategory') {
+						topCategoryIndex = index;
+					}
+				})
+				if (searchIndex != -1 && topCategoryIndex != -1) {
+					let searchData = this.diyData.value.slice(searchIndex, searchIndex + 1);
+					let topCategoryData = this.diyData.value.slice(topCategoryIndex, topCategoryIndex + 1);
+					this.diyData.value.splice(searchIndex, 1);
+					if (searchIndex > topCategoryIndex) {
+						this.diyData.value.splice(topCategoryIndex, 1);
+						this.diyData.value.splice(0, 0, ...topCategoryData);
+						this.diyData.value.splice(1, 0, ...searchData);
+					} 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);
+				}
+
+				for (var i = 0; i < this.diyData.value.length; i++) {
+					// 分类导航组件
+					if (this.diyData.value[i].componentName == 'TopCategory') {
+						this.topIndexValue = this.diyData.value[i];
+						this.topIndexValue.moduleIndex = i; //设置定位索引，根据此来确定定位顺序
+						this.diyData.value.splice(i, 1);
+						continue;
+					}
+
+					// 关注公众号组件
+					if (this.diyData.value[i].componentName == 'FollowOfficialAccount') {
+						this.followOfficialAccount = this.diyData.value[i];
+						// #ifdef H5
+						this.diyData.value.splice(i, 1);
+						// #endif
+						continue;
+					}
+
+				}
+
+				// #ifdef MP
+				//小程序收藏
+				if (!uni.getStorageSync('isCollect') && this.diyData.global.mpCollect) {
+					this.$refs.collectPopupWindow.open();
+					this.showTip = true;
+				}
+				// #endif
+
+				this.getHeight();
+				if (this.diyData && this.diyData.global) {
+					this.openBottomNav = this.diyData.global.openBottomNav;
+				}
+				this.isShowCopyRight = true;
+			}
+		},
+		closePopupWindow() {
+			this.$refs.uniPopupWindow.close();
+			uni.setStorageSync(this.id + this.name + '_popwindow_count', -1);
+		},
+		closeCollectPopupWindow() {
+			this.$refs.collectPopupWindow.close();
+			uni.setStorageSync('isCollect', true);
+		},
+		uniPopupWindowFn() {
+			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();
+				}
+			}
+
+			let manualStoreInfo = uni.getStorageSync('manual_store_info'); // 手动选择门店
+			if (manualStoreInfo) {
+				this.nearestStore = manualStoreInfo;
+			}
+			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() {
+			// #ifdef MP
+			/*uni.chooseLocation({
+				success: res => {
+					this.latitude = res.latitude;
+					this.longitude = res.longitude;
+					this.currentPosition = res.name;
+					this.getNearestStore();
+					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.getNearestStore();
+																	this.getCurrentLocation();
+																}
+															});
+														}, 1000);
+													}
+												}
+											});
+										} else {
+											this.$util.showToast({
+												title: '授权失败'
+											});
+										}
+									}
+								});
+							}
+						}
+					});
+				}
+			});*/
+			// #endif
+
+			// #ifdef H5
+			let backurl = Config.h5Domain; // 地图选择位置后的回调页面路径
+			window.location.href = 'https://apis.map.qq.com/tools/locpicker?search=1&type=0&backurl=' +
+				encodeURIComponent(backurl) + '&key=' + Config.mpKey + '&referer=myapp';
+			// #endif
+		},
+		// 获取离自己最近的一个门店
+		getNearestStore() {
+			let data = {};
+			if (this.latitude && this.longitude) {
+				data.latitude = this.latitude;
+				data.longitude = this.longitude;
+			}
+			this.$api.sendRequest({
+				url: '/api/store/nearestStore',
+				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();
+					}
+				}
+			});
+		},
+		// 根据经纬度获取位置
+		getCurrentLocation() {
+			var _this = this;
+			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 = '未获取到定位';
+					}
+				}
+			});
+		},
+		// 定位失败，进入默认门店
+		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();
+			}
+		},
+		// 设置公众号分享
+		setPublicShare() {
+			let shareUrl = this.$config.h5Domain + this.diyRoute;
+			if (this.id) shareUrl += '?id=' + this.id;
+			else if (this.name) shareUrl += '?name=' + this.name;
+			this.$util.setPublicShare({
+				title: this.diyData.global.title,
+				desc: '',
+				link: shareUrl,
+				imgUrl: this.siteInfo ? this.$util.img(this.siteInfo.logo_square) : ''
+			});
+		}
+	},
+	onPageScroll(e) {
+		this.scrollTop = e.scrollTop;
+		if (this.$refs.topNav) {
+			if (e.scrollTop >= 20) {
+				this.$refs.topNav.navTopBg();
+			} else {
+				this.$refs.topNav.unSetnavTopBg();
+			}
+		}
+	},
+	// 下拉刷新
+	onPullDownRefresh() {
+		this.$store.commit('setComponentRefresh');
+		setTimeout(() => {
+			uni.stopPullDownRefresh();
+		}, 50);
+	},
+	// 分享给好友
+	onShareAppMessage() {
+		return this.mpShareData.appMessage;
+	},
+	// 分享到朋友圈
+	onShareTimeline() {
+		return this.mpShareData.timeLine;
+	}
+}
\ No newline at end of file
diff --git a/common/js/emjoy.js b/common/js/emjoy.js
new file mode 100644
index 0000000..c0116e6
--- /dev/null
+++ b/common/js/emjoy.js
@@ -0,0 +1,55 @@
+export default {
+	emjoyList: {
+		"[emjoy_01]": 'public/static/img/emjoy/emjoy_01.gif',
+		"[emjoy_02]": 'public/static/img/emjoy/emjoy_02.gif',
+		"[emjoy_03]": 'public/static/img/emjoy/emjoy_03.gif',
+		"[emjoy_04]": 'public/static/img/emjoy/emjoy_04.gif',
+		"[emjoy_05]": 'public/static/img/emjoy/emjoy_05.gif',
+		"[emjoy_06]": 'public/static/img/emjoy/emjoy_06.gif',
+		"[emjoy_07]": 'public/static/img/emjoy/emjoy_07.gif',
+		"[emjoy_08]": 'public/static/img/emjoy/emjoy_08.gif',
+		"[emjoy_09]": 'public/static/img/emjoy/emjoy_09.gif',
+
+		"[emjoy_10]": 'public/static/img/emjoy/emjoy_10.gif',
+		"[emjoy_11]": 'public/static/img/emjoy/emjoy_11.gif',
+		"[emjoy_12]": 'public/static/img/emjoy/emjoy_12.gif',
+		"[emjoy_13]": 'public/static/img/emjoy/emjoy_13.gif',
+		"[emjoy_14]": 'public/static/img/emjoy/emjoy_14.gif',
+		"[emjoy_15]": 'public/static/img/emjoy/emjoy_15.gif',
+		"[emjoy_16]": 'public/static/img/emjoy/emjoy_16.gif',
+		"[emjoy_17]": 'public/static/img/emjoy/emjoy_17.gif',
+		"[emjoy_18]": 'public/static/img/emjoy/emjoy_18.gif',
+		"[emjoy_19]": 'public/static/img/emjoy/emjoy_19.gif',
+
+		"[emjoy_20]": 'public/static/img/emjoy/emjoy_20.gif',
+		"[emjoy_21]": 'public/static/img/emjoy/emjoy_21.gif',
+		"[emjoy_22]": 'public/static/img/emjoy/emjoy_22.gif',
+		"[emjoy_23]": 'public/static/img/emjoy/emjoy_23.gif',
+		"[emjoy_24]": 'public/static/img/emjoy/emjoy_24.gif',
+		"[emjoy_25]": 'public/static/img/emjoy/emjoy_25.gif',
+		"[emjoy_26]": 'public/static/img/emjoy/emjoy_26.gif',
+		"[emjoy_27]": 'public/static/img/emjoy/emjoy_27.gif',
+		"[emjoy_28]": 'public/static/img/emjoy/emjoy_28.gif',
+		"[emjoy_29]": 'public/static/img/emjoy/emjoy_29.gif',
+
+		"[emjoy_30]": 'public/static/img/emjoy/emjoy_30.gif',
+		"[emjoy_31]": 'public/static/img/emjoy/emjoy_31.gif',
+		"[emjoy_32]": 'public/static/img/emjoy/emjoy_32.gif',
+		"[emjoy_33]": 'public/static/img/emjoy/emjoy_33.gif',
+		"[emjoy_34]": 'public/static/img/emjoy/emjoy_34.gif',
+		"[emjoy_35]": 'public/static/img/emjoy/emjoy_35.gif',
+		"[emjoy_36]": 'public/static/img/emjoy/emjoy_36.gif',
+		"[emjoy_37]": 'public/static/img/emjoy/emjoy_37.gif',
+		"[emjoy_38]": 'public/static/img/emjoy/emjoy_38.gif',
+		"[emjoy_39]": 'public/static/img/emjoy/emjoy_39.gif',
+
+		"[emjoy_40]": 'public/static/img/emjoy/emjoy_40.gif',
+		"[emjoy_41]": 'public/static/img/emjoy/emjoy_41.gif',
+		"[emjoy_42]": 'public/static/img/emjoy/emjoy_42.gif',
+		"[emjoy_43]": 'public/static/img/emjoy/emjoy_43.gif',
+		"[emjoy_44]": 'public/static/img/emjoy/emjoy_44.gif',
+		"[emjoy_45]": 'public/static/img/emjoy/emjoy_45.gif',
+		"[emjoy_46]": 'public/static/img/emjoy/emjoy_46.gif',
+		"[emjoy_47]": 'public/static/img/emjoy/emjoy_47.gif',
+	}
+}
diff --git a/common/js/fenxiao-words.js b/common/js/fenxiao-words.js
new file mode 100644
index 0000000..69bf003
--- /dev/null
+++ b/common/js/fenxiao-words.js
@@ -0,0 +1,24 @@
+export default {
+	data() {
+		return {
+			fenxiaoWords: {}
+		}
+	},
+	methods: {
+		getFenxiaoWrods() {
+			this.$api.sendRequest({
+				url: '/fenxiao/api/config/words',
+				success: res => {
+					if (res.code >= 0 && res.data) {
+						this.fenxiaoWords = res.data;
+						uni.setStorageSync('fenxiaoWords', res.data);
+					}
+				}
+			})
+		}
+	},
+	onShow() {
+		if (uni.getStorageSync('fenxiaoWords')) this.fenxiaoWords = uni.getStorageSync('fenxiaoWords');
+		this.getFenxiaoWrods();
+	}
+}
diff --git a/common/js/golbalConfig.js b/common/js/golbalConfig.js
new file mode 100644
index 0000000..73f39c6
--- /dev/null
+++ b/common/js/golbalConfig.js
@@ -0,0 +1,186 @@
+export default {
+	data() {
+		return {
+			// 页面样式，动态设置主色调
+			themeColor: '' //''--base-color:#fa5d14;--base-help-color:#ff7e00;'
+		}
+	},
+	onLoad() {},
+	onShow() {
+		// 刷新多语言
+		this.$langConfig.refresh();
+		let time = setInterval(() => {
+			let theme = this.themeStyle;
+			if (theme && theme.main_color) {
+				this.themeColorSet();
+				clearInterval(time);
+			}
+		}, 50);
+	},
+	computed: {
+		themeStyle() {
+			return this.$store.state.themeStyle;
+		},
+		// 插件是否存在
+		addonIsExist() {
+			return this.$store.state.addonIsExist;
+		},
+		tabBarList() {
+			return this.$store.state.tabBarList;
+		},
+		siteInfo() {
+			return this.$store.state.siteInfo;
+		},
+		memberInfo() {
+			return this.$store.state.memberInfo;
+		},
+		storeToken() {
+			return this.$store.state.token;
+		},
+		bottomNavHidden() {
+			return this.$store.state.bottomNavHidden;
+		},
+		globalStoreConfig() {
+			return this.$store.state.globalStoreConfig;
+		},
+		globalStoreInfo() {
+			return this.$store.state.globalStoreInfo;
+		},
+		// 定位信息
+		location() {
+			return this.$store.state.location;
+		},
+		// 定位信息（缓存）
+		locationStorage() {
+			let data = uni.getStorageSync('location');
+			if (data) {
+				var date = new Date();
+				if (this.mapConfig.wap_valid_time > 0) {
+					data.is_expired = (date.getTime() / 1000) > data.valid_time; // 是否过期
+				} else {
+					data.is_expired = false;
+				}
+			}
+			return data;
+		},
+		// 默认总店（定位失败后使用）
+		defaultStoreInfo() {
+			return this.$store.state.defaultStoreInfo;
+		},
+		// 组件刷新计数
+		componentRefresh() {
+			return this.$store.state.componentRefresh;
+		},
+		// 客服配置
+		servicerConfig() {
+			return this.$store.state.servicerConfig;
+		},
+		diySeckillInterval() {
+			return this.$store.state.diySeckillInterval;
+		},
+		tabBarHeight() {
+			return this.$store.state.tabBarHeight;
+		},
+		mapConfig() {
+			return this.$store.state.mapConfig;
+		},
+		copyright() {
+			let copyright = this.$store.state.copyright;
+			// 判断是否授权
+			if (copyright && !copyright.auth) {
+				copyright.logo = '';
+				copyright.copyright_link = '';
+			}
+			return copyright;
+		},
+		cartList() {
+			return this.$store.state.cartList;
+		},
+		cartIds() {
+			return this.$store.state.cartIds;
+		},
+		cartNumber() {
+			return this.$store.state.cartNumber;
+		},
+		cartMoney() {
+			return this.$store.state.cartMoney;
+		}
+	},
+	methods: {
+		themeColorSet() {
+			let theme = this.themeStyle;
+			this.themeColor = `--base-color:${theme.main_color};--base-help-color:${theme.aux_color};`;
+			if (this.tabBarHeight != '56px') this.themeColor += `--tab-bar-height:${this.tabBarHeight};`
+			Object.keys(theme).forEach(key => {
+				let data = theme[key];
+				if (typeof(data) == "object") {
+					Object.keys(data).forEach(k => {
+						this.themeColor += '--' + k.replace(/_/g, "-") + ':' + data[k] + ';';
+					});
+				} else if (typeof(key) == "string" && key) {
+					this.themeColor += '--' + key.replace(/_/g, "-") + ':' + data + ';';
+				}
+			});
+			for (let i = 9; i >= 5; i--) {
+				let color = this.$util.colourBlend(theme.main_color, '#ffffff', (i / 10));
+				this.themeColor += `--base-color-light-${i}:${color};`;
+			}
+		},
+		// 颜色变浅（>0）、变深函数（<0）
+		lightenDarkenColor(color, amount) {
+
+			var usePound = false;
+
+			if (color[0] == "#") {
+				color = color.slice(1);
+				usePound = true;
+			}
+
+			var num = parseInt(color, 16);
+
+			var r = (num >> 16) + amount;
+
+			if (r > 255) r = 255;
+			else if (r < 0) r = 0;
+
+			var b = ((num >> 8) & 0x00FF) + amount;
+
+			if (b > 255) b = 255;
+			else if (b < 0) b = 0;
+
+			var g = (num & 0x0000FF) + amount;
+
+			if (g > 255) g = 255;
+			else if (g < 0) g = 0;
+
+			return (usePound ? "#" : "") + (g | (b << 8) | (r << 16)).toString(16);
+
+		},
+		/**
+		 * 切换门店
+		 * @param {Object} info 门店信息
+		 * @param {Object} isJump 是否跳转到首页
+		 */
+		changeStore(info, isJump) {
+			if (info) {
+				this.$store.commit('setGlobalStoreInfo', info);
+			}
+			let route = this.$util.getCurrRoute();
+			if (isJump && route != 'pages/index/index') {
+				uni.setStorageSync('manual_change_store', true); // 手动切换门店
+				this.$store.dispatch('getCartNumber'); //重新获取购物车数据
+				this.$util.redirectTo('/pages/index/index');
+			}
+		}
+	},
+	filters: {
+		/**
+		 * 金额格式化输出
+		 * @param {Object} money
+		 */
+		moneyFormat(money) {
+			if (isNaN(parseFloat(money))) return money;
+			return parseFloat(money).toFixed(2);
+		}
+	}
+}
\ No newline at end of file
diff --git a/common/js/goods_detail_base.js b/common/js/goods_detail_base.js
new file mode 100644
index 0000000..53ef66e
--- /dev/null
+++ b/common/js/goods_detail_base.js
@@ -0,0 +1,371 @@
+// 商品详情业务
+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
+}
\ No newline at end of file
diff --git a/common/js/html-parser.js b/common/js/html-parser.js
new file mode 100644
index 0000000..5360f81
--- /dev/null
+++ b/common/js/html-parser.js
@@ -0,0 +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;
+}
+
+export default parseHtml;
\ No newline at end of file
diff --git a/common/js/http.js b/common/js/http.js
new file mode 100644
index 0000000..9ee01c6
--- /dev/null
+++ b/common/js/http.js
@@ -0,0 +1,255 @@
+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);
+			}
+		});
+	}
+}
\ No newline at end of file
diff --git a/common/js/lang.js b/common/js/lang.js
new file mode 100644
index 0000000..9a4eff7
--- /dev/null
+++ b/common/js/lang.js
@@ -0,0 +1,129 @@
+const langList = ['zh-cn', 'en-us'];
+
+var locale = uni.getStorageSync('lang') || "zh-cn"; //设置语言
+
+export default {
+	langList: ['zh-cn', 'en-us'],
+	/**
+	 * * 解析多语言
+	 * @param {Object} field
+	 */
+	lang(field) {
+		let _this = getCurrentPages()[getCurrentPages().length - 1];
+		if (!_this) return;
+
+		var value = '';
+		let newRoute;
+		try {
+			//公共语言包
+			var lang = require('../../lang/' + locale + '/common.js').lang;
+		
+			//当前页面语言包
+			let route = _this.route.split("/");
+			newRoute = route.slice(1, route.length);
+			let currentPageLang = require('../../lang/' + locale + '/' + newRoute.join("/") + '.js').lang;
+
+			for (let f in currentPageLang) {
+				lang[f] = currentPageLang[f];
+			}
+
+			var arr = field.split(".");
+			if (arr.length > 1) {
+				for (let i in arr) {
+					var next = parseInt(i) + 1;
+					if (next < arr.length) {
+						value = lang[arr[i]][arr[next]];
+					}
+				}
+				
+			} else {
+				value = lang[field];
+			}
+			
+		} catch (e) {
+			if (field.indexOf("common.") != -1 || field.indexOf("tabBar.") != -1) {
+				value = lang[field];
+			} else {
+				value = field;
+			}
+		
+		}
+
+		if (arguments.length > 1) {
+			//有参数,需要替换
+			for (var i = 1; i < arguments.length; i++) {
+				value = value.replace("{" + (i - 1) + "}", arguments[i]);
+			}
+		}
+		if (value == undefined || (value == 'title' && field == 'title')) value = ''; // field
+		return value;
+	},
+	//切换语言
+	change(value) {
+		let _this = getCurrentPages()[getCurrentPages().length - 1];
+		if (!_this) return;
+
+		uni.setStorageSync("lang", value);
+		locale = uni.getStorageSync('lang') || "zh-cn"; //设置语言
+		
+		this.refresh();
+
+		uni.reLaunch({
+			url: '/pages/member/index'
+		});
+	},
+	//刷新标题、tabbar
+	refresh() {
+		let _this = getCurrentPages()[getCurrentPages().length - 1];
+		if (!_this) return;
+		locale = uni.getStorageSync('lang') || "zh-cn"; //设置语言
+	
+		this.title(this.lang("title"));
+
+		//设置tabbar的文字语言
+		// uni.setTabBarItem({
+		// 	index: 0,
+		// 	text: this.lang("tabBar.home")
+		// });
+		// uni.setTabBarItem({
+		// 	index: 1,
+		// 	text: this.lang("tabBar.category")
+		// });
+		// uni.setTabBarItem({
+		// 	index: 2,
+		// 	text: this.lang("tabBar.cart")
+		// });
+		// uni.setTabBarItem({
+		// 	index: 3,
+		// 	text: this.lang("tabBar.member")
+		// });
+	},
+	title(str) {
+		if (str) {
+			uni.setNavigationBarTitle({
+				title: str,
+				success: function (res) {
+				},
+				fail: function (err) {
+				}
+			});
+		}
+	},
+	// 获取语言包列表
+	list() {
+		var list = [];
+		try {
+			//公共语言包
+			for (var i = 0; i < langList.length; i++) {
+				let item = require('../../lang/' + langList[i] + '/common.js').lang;
+				list.push({
+					name: item.common.name,
+					value: langList[i]
+				});
+			}
+		} catch (e) {
+			// "没有找到语言包:", '../../lang/' + locale + '/common.js'
+		}
+		return list;
+	}
+}
diff --git a/common/js/map-wx-jssdk.js b/common/js/map-wx-jssdk.js
new file mode 100644
index 0000000..d26dc2b
--- /dev/null
+++ b/common/js/map-wx-jssdk.js
@@ -0,0 +1,1125 @@
+/**
+ * 微信小程序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
diff --git a/common/js/map/openMap.js b/common/js/map/openMap.js
new file mode 100644
index 0000000..9333ec7
--- /dev/null
+++ b/common/js/map/openMap.js
@@ -0,0 +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
+	}
+}
diff --git a/common/js/map/transformCoordinate.js b/common/js/map/transformCoordinate.js
new file mode 100644
index 0000000..0dec3d4
--- /dev/null
+++ b/common/js/map/transformCoordinate.js
@@ -0,0 +1,124 @@
+/**
+ * Created by Wandergis on 2015/7/8.
+ * 提供了百度坐标（BD09）、国测局坐标（火星坐标，GCJ02）、和WGS84坐标系之间的转换
+ */
+
+//定义一些常量
+var x_PI = 3.14159265358979324 * 3000.0 / 180.0;
+var PI = 3.1415926535897932384626;
+var a = 6378245.0;
+var ee = 0.00669342162296594323;
+
+/**
+ * 百度坐标系 (BD-09) 与 火星坐标系 (GCJ-02)的转换
+ * 即 百度 转 谷歌、高德
+ * @param bd_lon
+ * @param bd_lat
+ * @returns {*[]}
+ */
+function bd09togcj02(bd_lon, bd_lat) {
+	var x_pi = 3.14159265358979324 * 3000.0 / 180.0;
+	var x = bd_lon - 0.0065;
+	var y = bd_lat - 0.006;
+	var z = Math.sqrt(x * x + y * y) - 0.00002 * Math.sin(y * x_pi);
+	var theta = Math.atan2(y, x) - 0.000003 * Math.cos(x * x_pi);
+	var gg_lng = z * Math.cos(theta);
+	var gg_lat = z * Math.sin(theta);
+	return [gg_lng, gg_lat]
+}
+
+/**
+ * 火星坐标系 (GCJ-02) 与百度坐标系 (BD-09) 的转换
+ * 即谷歌、高德 转 百度
+ * @param lng
+ * @param lat
+ * @returns {*[]}
+ */
+function gcj02tobd09(lng, lat) {
+	var z = Math.sqrt(lng * lng + lat * lat) + 0.00002 * Math.sin(lat * x_PI);
+	var theta = Math.atan2(lat, lng) + 0.000003 * Math.cos(lng * x_PI);
+	var bd_lng = z * Math.cos(theta) + 0.0065;
+	var bd_lat = z * Math.sin(theta) + 0.006;
+	return [bd_lng, bd_lat]
+}
+
+/**
+ * WGS84转GCj02
+ * @param lng
+ * @param lat
+ * @returns {*[]}
+ */
+function wgs84togcj02(lng, lat) {
+	if (out_of_china(lng, lat)) {
+		return [lng, lat]
+	} else {
+		var dlat = transformlat(lng - 105.0, lat - 35.0);
+		var dlng = transformlng(lng - 105.0, lat - 35.0);
+		var radlat = lat / 180.0 * PI;
+		var magic = Math.sin(radlat);
+		magic = 1 - ee * magic * magic;
+		var sqrtmagic = Math.sqrt(magic);
+		dlat = (dlat * 180.0) / ((a * (1 - ee)) / (magic * sqrtmagic) * PI);
+		dlng = (dlng * 180.0) / (a / sqrtmagic * Math.cos(radlat) * PI);
+		var mglat = lat + dlat;
+		var mglng = lng + dlng;
+		return [mglng, mglat]
+	}
+}
+
+/**
+ * GCJ02 转换为 WGS84
+ * @param lng
+ * @param lat
+ * @returns {*[]}
+ */
+function gcj02towgs84(lng, lat) {
+	if (out_of_china(lng, lat)) {
+		return [lng, lat]
+	} else {
+		var dlat = transformlat(lng - 105.0, lat - 35.0);
+		var dlng = transformlng(lng - 105.0, lat - 35.0);
+		var radlat = lat / 180.0 * PI;
+		var magic = Math.sin(radlat);
+		magic = 1 - ee * magic * magic;
+		var sqrtmagic = Math.sqrt(magic);
+		dlat = (dlat * 180.0) / ((a * (1 - ee)) / (magic * sqrtmagic) * PI);
+		dlng = (dlng * 180.0) / (a / sqrtmagic * Math.cos(radlat) * PI);
+		mglat = lat + dlat;
+		mglng = lng + dlng;
+		return [lng * 2 - mglng, lat * 2 - mglat]
+	}
+}
+
+function transformlat(lng, lat) {
+	var ret = -100.0 + 2.0 * lng + 3.0 * lat + 0.2 * lat * lat + 0.1 * lng * lat + 0.2 * Math.sqrt(Math.abs(lng));
+	ret += (20.0 * Math.sin(6.0 * lng * PI) + 20.0 * Math.sin(2.0 * lng * PI)) * 2.0 / 3.0;
+	ret += (20.0 * Math.sin(lat * PI) + 40.0 * Math.sin(lat / 3.0 * PI)) * 2.0 / 3.0;
+	ret += (160.0 * Math.sin(lat / 12.0 * PI) + 320 * Math.sin(lat * PI / 30.0)) * 2.0 / 3.0;
+	return ret
+}
+
+function transformlng(lng, lat) {
+	var ret = 300.0 + lng + 2.0 * lat + 0.1 * lng * lng + 0.1 * lng * lat + 0.1 * Math.sqrt(Math.abs(lng));
+	ret += (20.0 * Math.sin(6.0 * lng * PI) + 20.0 * Math.sin(2.0 * lng * PI)) * 2.0 / 3.0;
+	ret += (20.0 * Math.sin(lng * PI) + 40.0 * Math.sin(lng / 3.0 * PI)) * 2.0 / 3.0;
+	ret += (150.0 * Math.sin(lng / 12.0 * PI) + 300.0 * Math.sin(lng / 30.0 * PI)) * 2.0 / 3.0;
+	return ret
+}
+
+/**
+ * 判断是否在国内，不在国内则不做偏移
+ * @param lng
+ * @param lat
+ * @returns {boolean}
+ */
+function out_of_china(lng, lat) {
+	return (lng < 72.004 || lng > 137.8347) || ((lat < 0.8293 || lat > 55.8271) || false);
+}
+
+export default {
+	bd09togcj02: bd09togcj02, // 百度坐标系 (BD-09) 与 火星坐标系 (GCJ-02)的转换
+	gcj02tobd09: gcj02tobd09, // 火星坐标系 (GCJ-02) 与百度坐标系 (BD-09) 的转换
+	wgs84togcj02: wgs84togcj02, // 
+	gcj02towgs84: gcj02towgs84,
+}
diff --git a/common/js/pc.js b/common/js/pc.js
new file mode 100644
index 0000000..9e08408
--- /dev/null
+++ b/common/js/pc.js
@@ -0,0 +1,10 @@
+(function() {
+	var u = navigator.userAgent,
+		w = window.innerWidth;
+	if (w >= 960) {
+		window.innerWidth = 960;
+		window.onload = function() {
+			window.innerWidth = 960;
+		}
+	}
+})();
diff --git a/common/js/scroll-view.js b/common/js/scroll-view.js
new file mode 100644
index 0000000..431e278
--- /dev/null
+++ b/common/js/scroll-view.js
@@ -0,0 +1,28 @@
+export default {
+	data() {
+		return {
+			showTop: false,
+			scrollTop: 0,
+			oldLocation: 0
+		}
+	},
+	methods: {
+		scrollToTopNative() {
+			uni.pageScrollTo({
+				duration: 200,
+				scrollTop: 0
+			});
+		}
+	},
+	onReachBottom() {
+		if(this.$refs.goodrecommend) this.$refs.goodrecommend.getLikeList(10)
+	},
+	onPageScroll(e) {
+		this.oldLocation = e.scrollTop;
+		if (e.scrollTop > 400) {
+			this.showTop = true;
+		} else {
+			this.showTop = false;
+		}
+	}
+}
diff --git a/common/js/socketTest.js b/common/js/socketTest.js
new file mode 100644
index 0000000..29a18d1
--- /dev/null
+++ b/common/js/socketTest.js
@@ -0,0 +1,207 @@
+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();
+			}
+		});
+	}
+}
diff --git a/common/js/storage.js b/common/js/storage.js
new file mode 100644
index 0000000..5e9bc7c
--- /dev/null
+++ b/common/js/storage.js
@@ -0,0 +1,51 @@
+import Config from './config.js'
+
+const prefix = Config.baseUrl.replace(/(http:\/\/)|(https:\/\/)/g, '');
+var oldPrefix = uni.getStorageSync('prefix');
+
+// 域名不一致，清空
+if (oldPrefix != prefix) {
+	uni.clearStorageSync();
+}
+uni.setStorageSync('prefix', prefix);
+
+const handleKey = (key) => {
+	const storageKey = (prefix ? `${prefix}_` : '') + key;
+	return storageKey;
+};
+
+export function uniStorage() {
+	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 = handleKey(options.key);
+		setStorage(options)
+	};
+
+	uni.setStorageSync = (key, data) => {
+		setStorageSync(handleKey(key), data)
+	};
+
+	uni.getStorage = (options) => {
+		options.key = handleKey(options.key);
+		getStorage(options)
+	};
+
+	uni.getStorageSync = (key) => {
+		return getStorageSync(handleKey(key))
+	};
+
+	uni.removeStorage = (options) => {
+		options.key = handleKey(options.key);
+		removeStorage(options)
+	};
+
+	uni.removeStorageSync = (key) => {
+		return removeStorageSync(handleKey(key))
+	}
+}
\ No newline at end of file
diff --git a/common/js/style_color.js b/common/js/style_color.js
new file mode 100644
index 0000000..67de27c
--- /dev/null
+++ b/common/js/style_color.js
@@ -0,0 +1,419 @@
+export default {
+	'default': {
+		//红色
+		name: 'default',
+		main_color: '#F4391c',
+		aux_color: '#F7B500',
+		bg_color: '#FF4646',//主题背景
+		bg_color_shallow: '#FF4646',//主题背景渐变浅色
+		promotion_color: '#FF4646',//活动背景
+		promotion_aux_color: '#F7B500',//活动背景辅色
+		main_color_shallow: '#FFF4F4',//淡背景
+		price_color: 'rgb(252,82,39)',//价格颜色
+		btn_text_color: '#FFFFFF',//按钮文字颜色
+		goods_detail: {
+			goods_price: 'rgb(252,82,39,1)',//价格
+			promotion_tag: '#FF4646',
+			goods_card_bg: '#201A18',//会员卡背景
+			goods_card_bg_shallow: '#7C7878',//会员卡背景浅色
+			goods_card_color: '#FFD792',
+			goods_coupon: '#FC5227',
+			goods_cart_num_corner: '#FC5227',//购物车数量角标
+			goods_btn_color: '#FF4646',//按钮颜色
+			goods_btn_color_shallow: '#F7B500',//副按钮颜色
+		},
+		pintuan: {
+			pintuan_label_bg: '#F7B500',
+			pintuan_label_color: '#FFFFFF',
+			pintuan_color: '#FA6400',
+			pintuan_promotion_color: '#FA3A1D',//活动背景
+			pintuan_promotion_aux_color: '#FD9A01',//活动背景辅色
+		},
+		super_member: {
+			super_member_start_bg: '#7c7878',
+			super_member_end_bg: '#201a18',
+			super_member_start_text_color: '#FFDBA6',
+			super_member_end_text_color: '#FFEBCA',
+		},
+		bargain: {
+			bargain_promotion_color: '#F0353E',//活动背景
+			bargain_promotion_aux_color: '#FD9A01',//活动辅色
+		},
+		seckill: {
+			seckill_promotion_color: '#F83530',//活动背景
+			seckill_promotion_aux_color: '#FD9A01',//活动辅色
+		},
+		giftcard: {
+			giftcard_promotion_color: '#FF3369',//活动背景
+			giftcard_promotion_aux_color: '#F7B500',//活动辅色
+		},
+		groupby: {
+			groupby_promotion_color: '#E64136',//活动背景
+			groupby_promotion_aux_color: '#F7B500',//活动辅色
+		},
+	},
+	'green': {
+		name: 'green',
+		main_color: '#19C650',
+		aux_color: '#FA6400',
+		bg_color: '#19C650',
+		bg_color_shallow: '#19C650',
+		promotion_color: '#19C650',
+		promotion_aux_color: '#FA6400',
+		main_color_shallow: '#F0FFF5',//淡背景
+		price_color: 'rgba(252,82,39,1)',//价格颜色
+		btn_text_color: '#FFFFFF',//按钮文字颜色
+		goods_detail: {
+			goods_price: 'rgba(252,82,39,1)',//价格
+			promotion_tag: '#19C650',
+			goods_card_bg: '#201A18',//会员卡背景
+			goods_card_bg_shallow: '#7C7878',//会员卡背景浅色
+			goods_card_color: '#FFD792',
+			goods_coupon: '#FC5227',
+			goods_cart_num_corner: '#FC5227',//购物车数量角标
+			goods_btn_color: '#19C650',//按钮颜色
+			goods_btn_color_shallow: '#FA6400',//副按钮颜色
+		},
+		pintuan: {
+			pintuan_label_bg: '#F7B500',
+			pintuan_label_color: '#FFFFFF',
+			pintuan_color: '#FA6400',
+			pintuan_promotion_color: '#FA3A1D',//活动背景
+			pintuan_promotion_aux_color: '#FD9A01',//活动背景辅色
+		},
+		super_member: {
+			super_member_start_bg: '#7c7878',
+			super_member_end_bg: '#201a18',
+			super_member_start_text_color: '#FFDBA6',
+			super_member_end_text_color: '#FFEBCA',
+		},
+		bargain: {
+			bargain_promotion_color: '#F0353E',//活动背景
+			bargain_promotion_aux_color: '#FD9A01',//活动辅色
+		},
+		seckill: {
+			seckill_promotion_color: '#F83530',//活动背景
+			seckill_promotion_aux_color: '#FD9A01',//活动辅色
+		},
+		giftcard: {
+			giftcard_promotion_color: '#FF3369',//活动背景
+			giftcard_promotion_aux_color: '#F7B500',//活动辅色
+		},
+		groupby: {
+			groupby_promotion_color: '#E64136',//活动背景
+			groupby_promotion_aux_color: '#F7B500',//活动辅色
+		},
+	},
+	'blue': {
+		name: 'blue',
+		main_color: '#36ABFF',
+		aux_color: '#FA6400',
+		bg_color: '#36ABFF',
+		bg_color_shallow: '#36ABFF',
+		promotion_color: '#36ABFF ',
+		promotion_aux_color: '#FA6400',
+		main_color_shallow: '#E2F3FF',
+		price_color: 'rgba(252,82,39,1)',//价格颜色
+		btn_text_color: '#FFFFFF',//按钮文字颜色
+		goods_detail: {
+			goods_price: 'rgba(252,82,39,1)',//价格
+			promotion_tag: '#36ABFF',
+			goods_card_bg: '#201A18',//会员卡背景
+			goods_card_bg_shallow: '#7C7878',//会员卡背景浅色
+			goods_card_color: '#FFD792',
+			goods_coupon: '#FC5227',
+			goods_cart_num_corner: '#FC5227',//购物车数量角标
+			goods_btn_color: '#36ABFF',//按钮颜色
+			goods_btn_color_shallow: '#FA6400',//副按钮颜色
+		},
+		pintuan: {
+			pintuan_label_bg: '#F7B500',
+			pintuan_label_color: '#FFFFFF',
+			pintuan_color: '#FA6400',
+			pintuan_promotion_color: '#FA3A1D',//活动背景
+			pintuan_promotion_aux_color: '#FD9A01',//活动背景辅色
+		},
+		super_member: {
+			super_member_start_bg: '#7c7878',
+			super_member_end_bg: '#201a18',
+			super_member_start_text_color: '#FFDBA6',
+			super_member_end_text_color: '#FFEBCA',
+		},
+		bargain: {
+			bargain_promotion_color: '#F0353E',//活动背景
+			bargain_promotion_aux_color: '#FD9A01',//活动辅色
+		},
+		seckill: {
+			seckill_promotion_color: '#F83530',//活动背景
+			seckill_promotion_aux_color: '#FD9A01',//活动辅色
+		},
+		giftcard: {
+			giftcard_promotion_color: '#FF3369',//活动背景
+			giftcard_promotion_aux_color: '#F7B500',//活动辅色
+		},
+		groupby: {
+			groupby_promotion_color: '#E64136',//活动背景
+			groupby_promotion_aux_color: '#F7B500',//活动辅色
+		},
+	},
+	'pink': {
+		name: 'pink',
+		main_color: '#FF407E',
+		aux_color: '#F7B500',
+		bg_color: '#FF407E',//主题背景
+		bg_color_shallow: '#FF407E',//主题背景渐变浅色
+		promotion_color: '#FF407E',//活动背景
+		promotion_aux_color: '#F7B500',//活动背景辅色
+		main_color_shallow: '#FFF5F8',//淡背景
+		price_color: 'rgba(252,82,39,1)',//价格颜色
+		btn_text_color: '#FFFFFF',//按钮文字颜色
+		goods_detail: {
+			goods_price: 'rgba(252,82,39,1)',//价格
+			promotion_tag: '#FF407E',
+			goods_card_bg: '#201A18',//会员卡背景
+			goods_card_bg_shallow: '#7C7878',//会员卡背景浅色
+			goods_card_color: '#FFD792',
+			goods_coupon: '#FC5227',
+			goods_cart_num_corner: '#FC5227',//购物车数量角标
+			goods_btn_color: '#FF407E',//按钮颜色
+			goods_btn_color_shallow: '#F7B500',//副按钮颜色
+		},
+		pintuan: {
+			pintuan_label_bg: '#F7B500',
+			pintuan_label_color: '#FFFFFF',
+			pintuan_color: '#FA6400',
+			pintuan_promotion_color: '#FA3A1D',//活动背景
+			pintuan_promotion_aux_color: '#FD9A01',//活动背景辅色
+		},
+		super_member: {
+			super_member_start_bg: '#7c7878',
+			super_member_end_bg: '#201a18',
+			super_member_start_text_color: '#FFDBA6',
+			super_member_end_text_color: '#FFEBCA',
+		},
+		bargain: {
+			bargain_promotion_color: '#F0353E',//活动背景
+			bargain_promotion_aux_color: '#FD9A01',//活动辅色
+		},
+		seckill: {
+			seckill_promotion_color: '#F83530',//活动背景
+			seckill_promotion_aux_color: '#FD9A01',//活动辅色
+		},
+		giftcard: {
+			giftcard_promotion_color: '#FF3369',//活动背景
+			giftcard_promotion_aux_color: '#F7B500',//活动辅色
+		},
+		groupby: {
+			groupby_promotion_color: '#E64136',//活动背景
+			groupby_promotion_aux_color: '#F7B500',//活动辅色
+		},
+	},
+	'gold': {
+		name: 'gold',
+		main_color: '#CFAF70',
+		aux_color: '#444444',
+		bg_color: '#CFAF70',//主题背景
+		bg_color_shallow: '#CFAF70',//主题背景渐变浅色
+		promotion_color: '#CFAF70',//活动背景
+		promotion_aux_color: '#444444',//活动背景辅色
+		main_color_shallow: '#FFFAF1',//淡背景
+		price_color: 'rgba(252,82,39,1)',//价格颜色
+		btn_text_color: '#FFFFFF',//按钮文字颜色
+		goods_detail: {
+			goods_price: 'rgba(252,82,39,1)',//价格
+			promotion_tag: '#CFAF70',
+			goods_card_bg: '#201A18',//会员卡背景
+			goods_card_bg_shallow: '#7C7878',//会员卡背景浅色
+			goods_card_color: '#FFD792',
+			goods_coupon: '#FC5227',
+			goods_cart_num_corner: '#FC5227',//购物车数量角标
+			goods_btn_color: '#CFAF70',//按钮颜色
+			goods_btn_color_shallow: '#444444',//副按钮颜色
+		},
+		pintuan: {
+			pintuan_label_bg: '#F7B500',
+			pintuan_label_color: '#FFFFFF',
+			pintuan_color: '#FA6400',
+			pintuan_promotion_color: '#FA3A1D',//活动背景
+			pintuan_promotion_aux_color: '#FD9A01',//活动背景辅色
+		},
+		super_member: {
+			super_member_start_bg: '#7c7878',
+			super_member_end_bg: '#201a18',
+			super_member_start_text_color: '#FFDBA6',
+			super_member_end_text_color: '#FFEBCA',
+		},
+		bargain: {
+			bargain_promotion_color: '#F0353E',//活动背景
+			bargain_promotion_aux_color: '#FD9A01',//活动辅色
+		},
+		seckill: {
+			seckill_promotion_color: '#F83530',//活动背景
+			seckill_promotion_aux_color: '#FD9A01',//活动辅色
+		},
+		giftcard: {
+			giftcard_promotion_color: '#FF3369',//活动背景
+			giftcard_promotion_aux_color: '#F7B500',//活动辅色
+		},
+		groupby: {
+			groupby_promotion_color: '#E64136',//活动背景
+			groupby_promotion_aux_color: '#F7B500',//活动辅色
+		},
+	},
+	'purple': {
+		name: 'purple',
+		main_color: '#A253FF',
+		aux_color: '#222222',
+		bg_color: '#A253FF',//主题背景
+		bg_color_shallow: '#A253FF',//主题背景渐变浅色
+		promotion_color: '#A253FF',//活动背景
+		promotion_aux_color: '#222222',//活动背景辅色
+		main_color_shallow: '#F8F3FF',//淡背景
+		price_color: 'rgba(252,82,39,1)',//价格颜色
+		btn_text_color: '#FFFFFF',//按钮文字颜色
+		goods_detail: {
+			goods_price: 'rgba(252,82,39,1)',//价格
+			promotion_tag: '#A253FF',
+			goods_card_bg: '#201A18',//会员卡背景
+			goods_card_bg_shallow: '#7C7878',//会员卡背景浅色
+			goods_card_color: '#FFD792',
+			goods_coupon: '#FC5227',
+			goods_cart_num_corner: '#FC5227',//购物车数量角标
+			goods_btn_color: '#A253FF',//按钮颜色
+			goods_btn_color_shallow: '#222222',//副按钮颜色
+		},
+		pintuan: {
+			pintuan_label_bg: '#F7B500',
+			pintuan_label_color: '#FFFFFF',
+			pintuan_color: '#FA6400',
+			pintuan_promotion_color: '#FA3A1D',//活动背景
+			pintuan_promotion_aux_color: '#FD9A01',//活动背景辅色
+		},
+		super_member: {
+			super_member_start_bg: '#7c7878',
+			super_member_end_bg: '#201a18',
+			super_member_start_text_color: '#FFDBA6',
+			super_member_end_text_color: '#FFEBCA',
+		},
+		bargain: {
+			bargain_promotion_color: '#F0353E',//活动背景
+			bargain_promotion_aux_color: '#FD9A01',//活动辅色
+		},
+		seckill: {
+			seckill_promotion_color: '#F83530',//活动背景
+			seckill_promotion_aux_color: '#FD9A01',//活动辅色
+		},
+		giftcard: {
+			giftcard_promotion_color: '#FF3369',//活动背景
+			giftcard_promotion_aux_color: '#F7B500',//活动辅色
+		},
+		groupby: {
+			groupby_promotion_color: '#E64136',//活动背景
+			groupby_promotion_aux_color: '#F7B500',//活动辅色
+		},
+	},
+	'yellow': {
+		name: 'yellow',
+		main_color: '#FFD009',
+		aux_color: '#1D262E',
+		bg_color: '#FFD009',//主题背景
+		bg_color_shallow: '#FFD009',//主题背景渐变浅色
+		promotion_color: '#FFD009',//活动背景
+		promotion_aux_color: '#1D262E',//活动背景辅色
+		main_color_shallow: '#FFFBEF',//淡背景
+		price_color: 'rgba(252,82,39,1)',//价格颜色
+		btn_text_color: '#303133',//按钮文字颜色
+		goods_detail: {
+			goods_price: 'rgba(252,82,39,1)',//价格
+			promotion_tag: '#FFD009',
+			goods_card_bg: '#201A18',//会员卡背景
+			goods_card_bg_shallow: '#7C7878',//会员卡背景浅色
+			goods_card_color: '#FFD792',
+			goods_coupon: '#FC5227',
+			goods_cart_num_corner: '#FC5227',//购物车数量角标
+			goods_btn_color: '#FFD009',//按钮颜色
+			goods_btn_color_shallow: '#1D262E',//副按钮颜色
+		},
+		pintuan: {
+			pintuan_label_bg: '#F7B500',
+			pintuan_label_color: '#FFFFFF',
+			pintuan_color: '#FA6400',
+			pintuan_promotion_color: '#FA3A1D',//活动背景
+			pintuan_promotion_aux_color: '#FD9A01',//活动背景辅色
+		},
+		super_member: {
+			super_member_start_bg: '#7c7878',
+			super_member_end_bg: '#201a18',
+			super_member_start_text_color: '#FFDBA6',
+			super_member_end_text_color: '#FFEBCA',
+		},
+		bargain: {
+			bargain_promotion_color: '#F0353E',//活动背景
+			bargain_promotion_aux_color: '#FD9A01',//活动辅色
+		},
+		seckill: {
+			seckill_promotion_color: '#F83530',//活动背景
+			seckill_promotion_aux_color: '#FD9A01',//活动辅色
+		},
+		giftcard: {
+			giftcard_promotion_color: '#FF3369',//活动背景
+			giftcard_promotion_aux_color: '#F7B500',//活动辅色
+		},
+		groupby: {
+			groupby_promotion_color: '#E64136',//活动背景
+			groupby_promotion_aux_color: '#F7B500',//活动辅色
+		},
+	},
+	'black': {
+		name: 'black',
+		main_color: '#222222',
+		aux_color: '#FFFFFF',
+		bg_color: '#222222',//主题背景
+		bg_color_shallow: '#333333',//主题背景渐变浅色
+		promotion_color: '#222222',//活动背景
+		promotion_aux_color: '#FA8B00',//活动背景辅色
+		main_color_shallow: '#efefef',//淡背景
+		price_color: 'rgba(255,0,0,1)',//价格颜色
+		btn_text_color: '#FFFFFF',//按钮文字颜色
+		goods_detail: {
+			goods_price: 'rgba(255,0,0,1)',//价格
+			promotion_tag: '#222222',
+			goods_card_bg: '#201A18',//会员卡背景
+			goods_card_bg_shallow: '#7C7878',//会员卡背景浅色
+			goods_card_color: '#FFD792',
+			goods_coupon: '#222222',
+			goods_cart_num_corner: '#FF0000',//购物车数量角标
+			goods_btn_color: '#222222',//按钮颜色
+			goods_btn_color_shallow: '#FA8B00',//副按钮颜色
+		},
+		pintuan: {
+			pintuan_label_bg: '#F7B500',
+			pintuan_label_color: '#FFFFFF',
+			pintuan_color: '#FA6400',
+			pintuan_promotion_color: '#FA3A1D',//活动背景
+			pintuan_promotion_aux_color: '#FD9A01',//活动背景辅色
+		},
+		super_member: {
+			super_member_start_bg: '#fadcb5',
+			super_member_end_bg: '#f6bd74',
+			super_member_start_text_color: '#ab6126',
+			super_member_end_text_color: '#d19336',
+		},
+		bargain: {
+			bargain_promotion_color: '#F0353E',//活动背景
+			bargain_promotion_aux_color: '#FD9A01',//活动辅色
+		},
+		seckill: {
+			seckill_promotion_color: '#F83530',//活动背景
+			seckill_promotion_aux_color: '#FD9A01',//活动辅色
+		},
+		giftcard: {
+			giftcard_promotion_color: '#FF3369',//活动背景
+			giftcard_promotion_aux_color: '#F7B500',//活动辅色
+		},
+		groupby: {
+			groupby_promotion_color: '#E64136',//活动背景
+			groupby_promotion_aux_color: '#F7B500',//活动辅色
+		},
+	}
+}
diff --git a/common/js/util.js b/common/js/util.js
new file mode 100644
index 0000000..cbe0f01
--- /dev/null
+++ b/common/js/util.js
@@ -0,0 +1,990 @@
+import Config from './config.js'
+import store from '@/store/index.js'
+import Http from './http.js'
+import {
+	Weixin
+} from 'common/js/wx-jssdk.js';
+
+export default {
+	/**
+	 * 页面跳转
+	 * @param {string} to 跳转链接 /pages/idnex/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'];
+		if (param != undefined) {
+			Object.keys(param).forEach(function (key) {
+				if (url.indexOf('?') != -1) {
+					url += "&" + key + "=" + param[key];
+				} else {
+					url += "?" + key + "=" + param[key];
+				}
+			});
+		}
+		for (let i = 0; i < tabbarList.length; i++) {
+			if (url.indexOf(tabbarList[i]) == 0) {
+				uni.switchTab({
+					url
+				});
+				return;
+			}
+		}
+		switch (mode) {
+			case 'tabbar':
+				// 跳转到 tabBar 页面，并关闭其他所有非 tabBar 页面。
+				uni.switchTab({
+					url
+				});
+				break;
+			case 'redirectTo':
+				// 关闭当前页面，跳转到应用内的某个页面。
+				uni.redirectTo({
+					url
+				});
+				break;
+			case 'reLaunch':
+				// 关闭所有页面，打开到应用内的某个页面。
+				uni.reLaunch({
+					url
+				});
+				break;
+			default:
+				// 保留当前页面，跳转到应用内的某个页面
+				uni.navigateTo({
+					url
+				});
+		}
+	},
+	/**
+	 * 图片路径转换
+	 * @param {String} img_path 图片地址
+	 * @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) {
+				img_path = img_path.split(',')[0];
+			}
+			if (params && img_path != this.getDefaultImage().goods) {
+				// 过滤默认图
+				let arr = img_path.split(".");
+				let suffix = arr[arr.length - 1];
+				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(".");
+				// }
+				
+			}
+			if (img_path.indexOf("http://") == -1 && img_path.indexOf("https://") == -1) {
+				path = Config.imgDomain + "/" + img_path;
+			} else {
+				// console.log(img_path)
+				path = img_path;
+			}
+		}
+	
+		// path += '?t=' + parseInt(new Date().getTime() / 1000);
+		return path;
+	},
+	/**
+	 * 时间戳转日期格式
+	 * @param {Object} timeStamp
+	 */
+	timeStampTurnTime(timeStamp, type = "") {
+		if (timeStamp != undefined && timeStamp != "" && timeStamp > 0) {
+			var date = new Date();
+			date.setTime(timeStamp * 1000);
+			var y = date.getFullYear();
+			var m = date.getMonth() + 1;
+			m = m < 10 ? ('0' + m) : m;
+			var d = date.getDate();
+			d = d < 10 ? ('0' + d) : d;
+			var h = date.getHours();
+			h = h < 10 ? ('0' + h) : h;
+			var minute = date.getMinutes();
+			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;
+			}
+		} else {
+			return "";
+		}
+	},
+	/**
+	 * 日期格式转时间戳
+	 * @param {Object} string
+	 */
+	timeTurnTimeStamp(string) {
+		var f = string.split(' ', 2);
+		var d = (f[0] ? f[0] : '').split('-', 3);
+		var t = (f[1] ? f[1] : '').split(':', 3);
+		return (new Date(
+			parseInt(d[0], 10) || null,
+			(parseInt(d[1], 10) || 1) - 1,
+			parseInt(d[2], 10) || null,
+			parseInt(t[0], 10) || null,
+			parseInt(t[1], 10) || null,
+			parseInt(t[2], 10) || null
+		)).getTime() / 1000;
+	},
+	/**
+	 * 倒计时
+	 * @param {Object} seconds 秒
+	 */
+	countDown(seconds) {
+		let [day, hour, minute, second] = [0, 0, 0, 0]
+		if (seconds > 0) {
+			day = Math.floor(seconds / (60 * 60 * 24))
+			hour = Math.floor(seconds / (60 * 60)) - (day * 24)
+			minute = Math.floor(seconds / 60) - (day * 24 * 60) - (hour * 60)
+			second = Math.floor(seconds) - (day * 24 * 60 * 60) - (hour * 60 * 60) - (minute * 60)
+		}
+		if (day < 10) {
+			day = '0' + day
+		}
+		if (hour < 10) {
+			hour = '0' + hour
+		}
+		if (minute < 10) {
+			minute = '0' + minute
+		}
+		if (second < 10) {
+			second = '0' + second
+		}
+		return {
+			d: day,
+			h: hour,
+			i: minute,
+			s: second
+		};
+	},
+	/**
+	 * 数值去重
+	 * @param {Array} arr 数组
+	 * @param {string} field 字段
+	 */
+	unique(arr, field) {
+		const res = new Map();
+		return arr.filter((a) => !res.has(a[field]) && res.set(a[field], 1));
+	},
+	/**
+	 * 判断值是否在数组中
+	 * @param {Object} elem
+	 * @param {Object} arr
+	 */
+	inArray: function (elem, arr) {
+		return arr == null ? -1 : arr.indexOf(elem);
+	},
+	/**
+	 * 获取某天日期
+	 * @param {Object} 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) {
+			var m = month;
+			if (month.toString().length == 1) {
+				m = "0" + month;
+			}
+			return m
+		}
+
+		var tYear = today.getFullYear();
+		var tMonth = today.getMonth();
+		var tDate = today.getDate();
+		var tWeek = today.getDay();
+		var time = parseInt(today.getTime() / 1000);
+		tMonth = doHandleMonth(tMonth + 1);
+		tDate = doHandleMonth(tDate);
+
+		const week = ['周日', '周一', '周二', '周三', '周四', '周五', '周六']
+		return {
+			't': time,
+			'y': tYear,
+			'm': tMonth,
+			'd': tDate,
+			'w': week[tWeek]
+		};
+	},
+	/**
+	 * 图片选择加上传
+	 * @param num
+	 * @param params
+	 * @param callback
+	 * @param url
+	 */
+	upload: function (num, params, callback, url) {
+		// #ifdef H5
+		var app_type = this.isWeiXin() ? 'wechat' : 'h5';
+		var app_type_name = this.isWeiXin() ? '微信公众号' : 'H5';
+		// #endif
+
+		// #ifdef MP-WEIXIN
+		var app_type = 'weapp';
+		var app_type_name = '微信小程序';
+		// #endif
+
+		// #ifdef MP-ALIPAY
+		var app_type = 'aliapp';
+		var app_type_name = '支付宝小程序';
+		// #endif
+
+		// #ifdef MP-BAIDU
+		var app_type = 'baiduapp';
+		var app_type_name = '百度小程序';
+		// #endif
+
+		// #ifdef MP-TOUTIAO
+		var app_type = 'MP-TOUTIAO';
+		var app_type_name = '头条小程序';
+		// #endif
+
+		// #ifdef MP-QQ
+		var app_type = 'MP-QQ';
+		var app_type_name = 'QQ小程序';
+		// #endif
+		var data = {
+			token: store.state.token,
+			app_type: app_type,
+			app_type_name: app_type_name
+		}
+		data = Object.assign(data, params);
+
+		var imgs_num = num;
+		var _self = this;
+
+		uni.chooseImage({
+			count: imgs_num,
+			sizeType: ['compressed'], //可以指定是原图还是压缩图，默认二者都有
+			sourceType: ['album', 'camera'], //从相册或者拍照
+			success: async function (res) {
+				const tempFilePaths = res.tempFilePaths;
+				var _data = data;
+				var imgs = [];
+				uni.showLoading({
+					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);
+					if (imgs.length == tempFilePaths.length) {
+						uni.hideLoading()
+						uni.showToast({
+							title: '上传成功',
+							icon: 'none'
+						})
+						typeof callback == 'function' && callback(imgs);
+					}
+				}
+			},
+			fail: err => {
+				uni.hideLoading()
+				uni.showToast({
+					title: '上传失败',
+					icon: 'none'
+				})
+			}
+		});
+	},
+	//上传
+	upload_file_server(tempFilePath, data, path, url = "", callback) {
+		if (url) {
+			var uploadUrl = Config.baseUrl + url
+		} else {
+			var uploadUrl = Config.baseUrl + '/api/upload/' + path
+		}
+		return new Promise((resolve, reject) => {
+			uni.uploadFile({
+				url: uploadUrl,
+				filePath: tempFilePath,
+				name: 'file',
+				fileType: data.fileType || 'image',
+				formData: data,
+				success: function (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");
+					}
+				}
+			});
+
+		});
+
+	},
+	/**
+	 * 复制
+	 * @param {Object} value
+	 * @param {Object} callback
+	 */
+	copy(value, callback) {
+		// #ifdef H5
+		var oInput = document.createElement('input'); //创建一个隐藏input（重要！）
+		oInput.value = value; //赋值
+		oInput.setAttribute("readonly", "readonly");
+		document.body.appendChild(oInput);
+		oInput.select(); // 选择对象
+		document.execCommand("Copy"); // 执行浏览器复制命令
+		oInput.className = 'oInput';
+		oInput.style.display = 'none';
+		uni.hideKeyboard();
+		this.showToast({
+			title: '复制成功'
+		});
+
+		typeof callback == 'function' && callback();
+		// #endif
+
+		// #ifdef MP || APP-PLUS
+		uni.setClipboardData({
+			data: value,
+			success: () => {
+				typeof callback == 'function' && callback();
+			}
+		});
+		// #endif
+	},
+	/**
+	 * 是否是微信浏览器
+	 */
+	isWeiXin() {
+		// #ifndef H5
+		return false;
+		// #endif
+		var ua = navigator.userAgent.toLowerCase();
+		if (ua.match(/MicroMessenger/i) == "micromessenger") {
+			return true;
+		} else {
+			return false;
+		}
+	},
+	/**
+	 * 显示消息提示框
+	 *  @param {Object} params 参数
+	 */
+	showToast(params = {}) {
+		params.title = params.title || "";
+		params.icon = params.icon || "none";
+		// params.position = params.position || 'bottom';
+		params.duration = params.duration || 1500;
+		uni.showToast(params);
+		if (params.success) params.success();
+	},
+	/**
+	 * 检测苹果X以上的手机
+	 */
+	isIPhoneX() {
+		let res = uni.getSystemInfoSync();
+		if (res.model.search('iPhone X') != -1) {
+			return true;
+		}
+		return false;
+	},
+	//判断安卓还是iOS
+	isAndroid() {
+		let platform = uni.getSystemInfoSync().platform
+		if (platform == 'ios') {
+			return false;
+		} else if (platform == 'android') {
+			return true;
+		}
+	},
+	/**
+	 * 深度拷贝对象
+	 * @param {Object} obj
+	 */
+	deepClone(obj) {
+		const isObject = function (obj) {
+			return typeof obj == 'object';
+		}
+
+		if (!isObject(obj)) {
+			throw new Error('obj 不是一个对象！')
+		}
+		//判断传进来的是对象还是数组
+		let isArray = Array.isArray(obj)
+		let cloneObj = isArray ? [] : {}
+		//通过for...in来拷贝
+		for (let key in obj) {
+			cloneObj[key] = isObject(obj[key]) ? this.deepClone(obj[key]) : obj[key]
+		}
+		return cloneObj
+	},
+	/**
+	 * 自定义模板的跳转链接
+	 * @param {Object} link
+	 */
+	diyRedirectTo(link) {
+		
+		//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) {
+			// #ifdef H5
+			window.location.href = link.wap_url;
+			// #endif
+
+			// #ifdef MP
+			this.redirectTo('/pages_tool/webview/webview', {
+				src: encodeURIComponent(link.wap_url)
+			});
+			// #endif
+
+		} else if (link.appid) {
+			// 跳转其他小程序
+
+			uni.navigateToMiniProgram({
+				appId: link.appid,
+				path: link.page
+			})
+
+		} else if (link.name == 'MOBILE' && !link.wap_url) {
+			// 拨打电话
+
+			uni.makePhoneCall({
+				phoneNumber: link.mobile,
+				success: (res) => {
+				},
+				fail: (res) => {
+				}
+			});
+
+		} else if (link.name == 'MEMBER_CONTACT') {
+			// 客服
+			let servicerConfig = store.state.servicerConfig
+			let config = {
+				type: 'none'
+			};
+
+			// #ifdef H5
+			config = servicerConfig.h5;
+			// #endif
+
+			// #ifdef MP-WEIXIN
+			config = servicerConfig.weapp;
+			// #endif
+
+			switch (config.type) {
+				case 'wxwork':
+					// 企业微信客服
+
+					// #ifdef H5
+					window.location.href = config.wxwork_url;
+					// #endif
+
+					// #ifdef MP-WEIXIN
+					wx.openCustomerServiceChat({
+						extInfo: {
+							url: config.wxwork_url
+						},
+						corpId: config.corpid,
+						showMessageCard: true,
+						sendMessageTitle: 'this.sendMessageTitle',
+						sendMessagePath: 'this.sendMessagePath',
+						sendMessageImg: 'this.sendMessageImg'
+					});
+					// #endif
+					break;
+				case 'third':
+					// 第三方客服
+					window.location.href = config.third_url;
+					break;
+				case 'niushop':
+					// Niushop客服
+					this.redirectTo('/pages_tool/chat/room');
+					break;
+				case 'weapp':
+					// 微信小程序，由于需要手动点击按钮触发，所以要跳转到中间页
+					this.redirectTo(link.wap_url);
+					break;
+				default:
+					// 拨打客服电话
+					let siteInfo = store.state.siteInfo;
+					if (siteInfo && siteInfo.site_tel) {
+						uni.makePhoneCall({
+							phoneNumber: siteInfo.site_tel
+						});
+					} else {
+						this.showToast({
+							title: '抱歉，商家暂无客服，请线下联系',
+						})
+					}
+			}
+
+		} else if (link.wap_url) {
+			this.redirectTo(link.wap_url);
+		}
+	},
+	/**
+	 * 获取默认图
+	 */
+	getDefaultImage() {
+		let defaultImg = store.state.defaultImg;
+		defaultImg.goods = this.img(defaultImg.goods);
+		defaultImg.head = this.img(defaultImg.head);
+		defaultImg.store = this.img(defaultImg.store);
+		defaultImg.article = this.img(defaultImg.article);
+		defaultImg.kefu = this.img(defaultImg.kefu);
+		defaultImg.phone = this.img(defaultImg.phone);
+		return defaultImg;
+	},
+	/**
+	 * 判断手机是否为iphoneX系列
+	 */
+	uniappIsIPhoneX() {
+		let isIphoneX = false;
+		let systemInfo = uni.getSystemInfoSync();
+		// #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) {
+			isIphoneX = true;
+		}
+		// #endif
+
+		// #ifdef H5
+		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) {
+				isIphoneX = true;
+			} else if (systemInfo.screenWidth == 414 && systemInfo.screenHeight == 896 && systemInfo.pixelRatio == 3) {
+				isIphoneX = true;
+			} else if (systemInfo.screenWidth == 414 && systemInfo.screenHeight == 896 && systemInfo.pixelRatio == 2) {
+				isIphoneX = true;
+			}
+		}
+		// #endif
+		return isIphoneX;
+	},
+	/**
+	 * 判断手机是否为iphone11系列
+	 */
+	uniappIsIPhone11() {
+		let isIphone11 = false;
+		let systemInfo = uni.getSystemInfoSync();
+		// #ifdef MP
+		if (systemInfo.model.search('iPhone 11') != -1) {
+			isIphone11 = true;
+		}
+		// #endif
+		return isIphone11;
+	},
+	// #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 &&
+			ua.indexOf('ios') === -1 && ua.indexOf('browser') === -1) {
+			return true;
+		} else {
+			return false;
+		}
+	},
+	// #endif
+	numberFixed(e, f) {
+		if (!f) {
+			f = 0;
+		}
+		return Number(e).toFixed(f);
+	},
+	/**
+	 * 获取url参数
+	 */
+	getUrlCode(callback) {
+		var url = location.search;
+		var theRequest = new Object();
+		if (url.indexOf('?') != -1) {
+			var str = url.substr(1);
+			var strs = str.split('&');
+			for (var i = 0; i < strs.length; i++) {
+				theRequest[strs[i].split('=')[0]] = strs[i].split('=')[1];
+			}
+		}
+		typeof callback == 'function' && callback(theRequest);
+	},
+	/**
+	 * 获取当前页面路由
+	 */
+	getCurrRoute() {
+		let routes = getCurrentPages(); // 获取当前打开过的页面路由数组
+		return routes.length ? routes[routes.length - 1].route : '';
+	},
+	goBack(backUrl = '/pages/index/index') {
+		if (getCurrentPages().length == 1) {
+			this.redirectTo(backUrl);
+		} else {
+			uni.navigateBack();
+		}
+	},
+	/**
+	 *
+	 * @param val 转化时间字符串 （转化时分秒）
+	 * @returns {string}
+	 */
+	getTimeStr(val) {
+		var h = parseInt(val / 3600).toString();
+		var m = parseInt((val % 3600) / 60).toString();
+		if (m.length == 1) {
+			m = '0' + m;
+		}
+		if (h.length == 1) {
+			h = '0' + h;
+		}
+		return h + ':' + m;
+	},
+	/**
+	 * 获取定位信息
+	 */
+	getLocation(param = {}) {
+		/*uni.getLocation({
+			type: param.type ?? 'gcj02',
+			success: res => {
+				store.commit('setLocation', res);
+				typeof param.success == 'function' && param.success(res);
+			},
+			fail: res => {
+				typeof param.fail == 'function' && param.fail(res);
+			},
+			complete: res => {
+				typeof param.complete == 'function' && param.complete(res);
+			}
+		});*/
+	},
+	// 计算两个经纬度之间的距离
+	getDistance(lat1, lng1, lat2, lng2) {
+		var radLat1 = lat1 * Math.PI / 180.0;
+		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)));
+		s = s * 6378.137; // EARTH_RADIUS;
+		s = Math.round(s * 10000) / 10000;
+		return s;
+	},
+	//记录分享人
+	onSourceMember(source_member) {
+		Http.sendRequest({
+			url: '/api/Member/alterShareRelation',
+			data: {
+				share_member: source_member,
+			},
+			success: res => {
+				if (res.code >= 0) {
+					uni.removeStorage({
+						key: 'source_member',
+						success: res => {
+							console.log('删除成功', res)
+						}
+					})
+				}
+			}
+		})
+	},
+	/**
+	 * 微信订阅消息
+	 */
+	subscribeMessage(keywords) {
+		// #ifdef MP-WEIXIN
+		let url = '/weapp/api/weapp/messagetmplids';
+		// #endif
+		// #ifdef MP-ALIPAY
+		let url = '/aliapp/api/aliapp/messagetmplids';
+		// #endif
+		Http.sendRequest({
+			url,
+			data: {
+				keywords: keywords
+			},
+			success: res => {
+				if (res.data.length) {
+					// #ifdef MP-WEIXIN
+					uni.requestSubscribeMessage({
+						tmplIds: res.data,
+						success: (res) => {
+							console.log("res", res)
+						},
+						fail: (res) => {
+							console.log('fail', res)
+						}
+					})
+					// #endif
+
+					// #ifdef MP-ALIPAY
+					my.requestSubscribeMessage({
+						entityIds: res.data,
+						success: res => {
+							console.log("res", res)
+						},
+						fail: res => {
+							console.log('fail', res)
+						}
+					});
+					// #endif
+				}
+			}
+		})
+	},
+	/**
+	 * 获取小程序分享内容数据
+	 */
+	getMpShare(path) {
+		//如果没有特别指定 则获取当前页面的路由
+		if (!path) {
+			let route = this.getCurrentRoute();
+			path = route.path;
+			if (path == '/pages/member/index') {
+				return new Promise((resolve, reject) => {
+					resolve({})
+				});
+			}
+		}
+		return new Promise((resolve, reject) => {
+			Http.sendRequest({
+				url: "/weapp/api/weapp/share",
+				data: {
+					path: path
+				},
+				success: res => {
+					if (res.code >= 0) {
+						let shareConfig = res.data.data;
+						if (shareConfig) {
+							//分享给好友
+							let appMessageData = {
+								title: shareConfig.title,
+								path: shareConfig.path,
+								imageUrl: shareConfig.imageUrl,
+								success: res => {
+								},
+								fail: res => {
+								}
+							}
+							//分享到朋友圈
+							let query = '';
+							if (shareConfig.path.indexOf('?') > 0) {
+								query = shareConfig.path.split('?')[1];
+							}
+							let timeLineData = {
+								title: shareConfig.title,
+								query: shareConfig.path,
+								imageUrl: shareConfig.imageUrl,
+							}
+							resolve({
+								appMessage: appMessageData,
+								timeLine: timeLineData,
+							})
+						} else {
+							reject(res.data);
+						}
+					} else {
+						reject(res.data)
+					}
+				}
+			});
+		})
+	},
+	/**
+	 * 设置公众号分享
+	 * @param shareData
+	 * @param callback
+	 */
+	setPublicShare(shareData, callback) {
+		if (!this.isWeiXin()) return;
+		Http.sendRequest({
+			url: '/wechat/api/wechat/jssdkconfig',
+			data: {
+				url: uni.getSystemInfoSync().platform == 'ios' ? uni.getStorageSync('initUrl') : window.location
+					.href
+			},
+			success: res => {
+				if (res.code == 0) {
+					var wxJS = new Weixin();
+					wxJS.init(res.data);
+					wxJS.weixin.showOptionMenu();
+
+					wxJS.setShareData({
+						title: shareData.title ?? '',
+						desc: shareData.desc ?? '',
+						link: shareData.link ?? location.href,
+						imgUrl: shareData.imgUrl ? this.img(shareData.imgUrl) : ''
+					}, (res) => {
+						typeof callback == 'function' && callback(res);
+					})
+				}
+			}
+		})
+	},
+	//获取当前路由
+	getCurrentRoute() {
+		let currentRoutes = getCurrentPages(); // 获取当前打开过的页面路由数组
+		let currentRoute = currentRoutes[currentRoutes.length - 1].route //获取当前页面路由
+		let currentParam = currentRoutes[currentRoutes.length - 1].options; //获取路由参数
+		// 拼接参数
+		let param = [];
+		for (let key in currentParam) {
+			param.push(key + '=' + currentParam[key])
+		}
+		let currentPath = '/' + currentRoute;
+		let currentQuery = param.join('&');
+		if (currentQuery) currentPath += '?' + currentQuery;
+
+		return {
+			path: currentPath,
+			query: currentQuery,
+		}
+	},
+	//获取分享路由
+	getCurrentShareRoute(member_id) {
+		let route = this.getCurrentRoute();
+		//去掉原来的分享人数据
+		route.path = route.path.replace(/[?|&]source_member=\d+/, '');
+		if (member_id) {
+			//路径的处理
+			if (route.path.indexOf('?') > 0) {
+				route.path += '&';
+			} else {
+				route.path += '?';
+			}
+			route.path += 'source_member=' + member_id;
+			//参数的处理
+			if (route.query) {
+				route.query += '&';
+			}
+			route.query += 'source_member=' + member_id;
+		}
+		return route;
+	},
+	/**
+	 * 对象转style字符串
+	 * @param {Object} obj
+	 */
+	objToStyle(obj) {
+		let s = [];
+		for (let i in obj) {
+			s.push(i + ':' + obj[i]);
+		}
+		return s.join(';')
+	},
+	/**
+	 * 颜色减值
+	 * @param {Object} c1
+	 * @param {Object} c2
+	 * @param {Object} ratio
+	 */
+	colourBlend(c1, c2, ratio) {
+		ratio = Math.max(Math.min(Number(ratio), 1), 0)
+		let r1 = parseInt(c1.substring(1, 3), 16)
+		let g1 = parseInt(c1.substring(3, 5), 16)
+		let b1 = parseInt(c1.substring(5, 7), 16)
+		let r2 = parseInt(c2.substring(1, 3), 16)
+		let g2 = parseInt(c2.substring(3, 5), 16)
+		let b2 = parseInt(c2.substring(5, 7), 16)
+		let r = Math.round(r1 * (1 - ratio) + r2 * ratio)
+		let g = Math.round(g1 * (1 - ratio) + g2 * ratio)
+		let b = Math.round(b1 * (1 - ratio) + b2 * ratio)
+		r = ('0' + (r || 0).toString(16)).slice(-2)
+		g = ('0' + (g || 0).toString(16)).slice(-2)
+		b = ('0' + (b || 0).toString(16)).slice(-2)
+		return '#' + r + g + b
+	},
+	/**
+	 * 生成贝塞尔曲线轨迹
+	 * @param {Object} points
+	 * @param {Object} times
+	 */
+	bezier(points, times) {
+		var bezier_points = [];
+		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));
+		// 邻控制BC点间距
+		const DIST_BC = Math.sqrt(Math.pow(points[2]['x'] - points[1]['x'], 2) + Math.pow(points[2]['y'] - points[1][
+			'y'
+			], 2));
+		// D每次在AB方向上移动的距离
+		if (points[0]['x'] > points[2]['x']) {
+			var EACH_MOVE_AD = -(DIST_AB / times);
+			// E每次在BC方向上移动的距离
+			var EACH_MOVE_BE = -(DIST_BC / times);
+		} else {
+			var EACH_MOVE_AD = +(DIST_AB / times);
+			// E每次在BC方向上移动的距离
+			var EACH_MOVE_BE = +(DIST_BC / times);
+		}
+		// 点AB的正切
+		const TAN_AB = (points[1]['y'] - points[0]['y']) / (points[1]['x'] - points[0]['x']);
+		// 点BC的正切
+		const TAN_BC = (points[2]['y'] - points[1]['y']) / (points[2]['x'] - points[1]['x']);
+		// 点AB的弧度值
+		const RADIUS_AB = Math.atan(TAN_AB);
+		// 点BC的弧度值
+		const RADIUS_BC = Math.atan(TAN_BC);
+		// 每次执行
+		for (var i = 1; i <= times; i++) {
+			// AD的距离
+			var dist_AD = EACH_MOVE_AD * i;
+			// BE的距离
+			var dist_BE = EACH_MOVE_BE * i;
+			// D点的坐标
+			var point_D = {};
+			point_D['x'] = dist_AD * Math.cos(RADIUS_AB) + points[0]['x'];
+			point_D['y'] = dist_AD * Math.sin(RADIUS_AB) + points[0]['y'];
+			points_D.push(point_D);
+			// E点的坐标
+			var point_E = {};
+			point_E['x'] = dist_BE * Math.cos(RADIUS_BC) + points[1]['x'];
+			point_E['y'] = dist_BE * Math.sin(RADIUS_BC) + points[1]['y'];
+			points_E.push(point_E);
+			// 此时线段DE的正切值
+			var tan_DE = (point_E['y'] - point_D['y']) / (point_E['x'] - point_D['x']);
+			// tan_DE的弧度值
+			var radius_DE = Math.atan(tan_DE);
+			// 地市DE的间距
+			var dist_DE = Math.sqrt(Math.pow((point_E['x'] - point_D['x']), 2) + Math.pow((point_E['y'] - point_D['y']),
+				2));
+			// 此时DF的距离
+			var dist_DF = (dist_AD / DIST_AB) * dist_DE;
+			// 此时DF点的坐标
+			var point_F = {};
+			point_F['x'] = dist_DF * Math.cos(radius_DE) + point_D['x'];
+			point_F['y'] = dist_DF * Math.sin(radius_DE) + point_D['y'];
+			bezier_points.push(point_F);
+		}
+		return {
+			'bezier_points': bezier_points
+		};
+	},
+	/**
+	 * 验证手机号
+	 * @param  {string} mobile 被验证的mobile
+	 * @return {object}   验证后的结果
+	 **/
+	verifyMobile(mobile) {
+		var parse = /^\d{11}$/.test(mobile);
+		return parse;
+	}
+}
\ No newline at end of file
diff --git a/common/js/validate.js b/common/js/validate.js
new file mode 100644
index 0000000..f47d1fe
--- /dev/null
+++ b/common/js/validate.js
@@ -0,0 +1,165 @@
+/**
+ * 数据验证（表单验证）
+ */
+module.exports = {
+	error: '',
+	check: function (data, rule) {
+		for (var i = 0; i < rule.length; i++) {
+			if (!rule[i].checkType) {
+				return true;
+			}
+			if (!rule[i].name) {
+				return true;
+			}
+			if (!rule[i].errorMsg) {
+				return true;
+			}
+			if (!data[rule[i].name]) {
+				this.error = rule[i].errorMsg;
+				return false;
+			}
+			switch (rule[i].checkType) {
+				case 'custom':
+					if (typeof rule[i].validate == 'function') {
+						if (!rule[i].validate(data[rule[i].name])) {
+							this.error = rule[i].errorMsg;
+							return false;
+						}
+					}
+					break;
+				case 'required':
+					var reg = new RegExp('/[\S]+/');
+					if (reg.test(data[rule[i].name])) {
+						this.error = rule[i].errorMsg;
+						return false;
+					}
+					break;
+				case 'string':
+					var reg = new RegExp('^.{' + rule[i].checkRule + '}$');
+					if (!reg.test(data[rule[i].name])) {
+						this.error = rule[i].errorMsg;
+						return false;
+					}
+					break;
+				case 'int':
+					var reg = new RegExp('^(-[1-9]|[1-9])[0-9]{' + rule[i].checkRule + '}$');
+					if (!reg.test(data[rule[i].name])) {
+						this.error = rule[i].errorMsg;
+						return false;
+					}
+					break;
+				case 'between':
+					if (!this.isNumber(data[rule[i].name])) {
+						this.error = rule[i].errorMsg;
+						return false;
+					}
+					var minMax = rule[i].checkRule.split(',');
+					minMax[0] = Number(minMax[0]);
+					minMax[1] = Number(minMax[1]);
+					if (data[rule[i].name] > minMax[1] || data[rule[i].name] < minMax[0]) {
+						this.error = rule[i].errorMsg;
+						return false;
+					}
+					break;
+				case 'betweenD':
+					var reg = /^-?[1-9][0-9]?$/;
+					if (!reg.test(data[rule[i].name])) {
+						this.error = rule[i].errorMsg;
+						return false;
+					}
+					var minMax = rule[i].checkRule.split(',');
+					minMax[0] = Number(minMax[0]);
+					minMax[1] = Number(minMax[1]);
+					if (data[rule[i].name] > minMax[1] || data[rule[i].name] < minMax[0]) {
+						this.error = rule[i].errorMsg;
+						return false;
+					}
+					break;
+				case 'betweenF':
+					var reg = /^-?[0-9][0-9]?.+[0-9]+$/;
+					if (!reg.test(data[rule[i].name])) {
+						this.error = rule[i].errorMsg;
+						return false;
+					}
+					var minMax = rule[i].checkRule.split(',');
+					minMax[0] = Number(minMax[0]);
+					minMax[1] = Number(minMax[1]);
+					if (data[rule[i].name] > minMax[1] || data[rule[i].name] < minMax[0]) {
+						this.error = rule[i].errorMsg;
+						return false;
+					}
+					break;
+				case 'same':
+					if (data[rule[i].name] != rule[i].checkRule) {
+						this.error = rule[i].errorMsg;
+						return false;
+					}
+					break;
+				case 'notsame':
+					if (data[rule[i].name] == rule[i].checkRule) {
+						this.error = rule[i].errorMsg;
+						return false;
+					}
+					break;
+				case 'email':
+					var reg = /^[a-z0-9]+([._\\-]*[a-z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,63}[a-z0-9]+$/;
+					if (!reg.test(data[rule[i].name])) {
+						this.error = rule[i].errorMsg;
+						return false;
+					}
+					break;
+				case 'phoneno':
+					var reg = /^\d{11}$/;
+					if (!reg.test(data[rule[i].name])) {
+						this.error = rule[i].errorMsg;
+						return false;
+					}
+					break;
+				case 'zipcode':
+					var reg = /^[0-9]{6}$/;
+					if (!reg.test(data[rule[i].name])) {
+						this.error = rule[i].errorMsg;
+						return false;
+					}
+					break;
+				case 'reg':
+					var reg = new RegExp(rule[i].checkRule);
+					if (!reg.test(data[rule[i].name])) {
+						this.error = rule[i].errorMsg;
+						return false;
+					}
+					break;
+				case 'in':
+					if (rule[i].checkRule.indexOf(data[rule[i].name]) == -1) {
+						this.error = rule[i].errorMsg;
+						return false;
+					}
+					break;
+				case 'notnull':
+					if (data[rule[i].name] == 0 || data[rule[i].name] == undefined || data[rule[i].name] == null || data[rule[i].name]
+						.length < 1) {
+						this.error = rule[i].errorMsg;
+						return false;
+					}
+					break;
+				case 'lengthMin':
+					if (data[rule[i].name].length < rule[i].checkRule) {
+						this.error = rule[i].errorMsg;
+						return false;
+					}
+					break;
+				case 'lengthMax':
+					if (data[rule[i].name].length > rule[i].checkRule) {
+						this.error = rule[i].errorMsg;
+						return false;
+					}
+					break;
+			}
+		}
+		return true;
+	},
+	isNumber: function (checkVal) {
+		var reg = /^-?[1-9][0-9]?.?[0-9]*$/;
+		return reg.test(checkVal);
+	}
+}
diff --git a/common/js/wx-jssdk.js b/common/js/wx-jssdk.js
new file mode 100644
index 0000000..420b125
--- /dev/null
+++ b/common/js/wx-jssdk.js
@@ -0,0 +1,119 @@
+/**
+ * 微信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
+}
\ No newline at end of file
diff --git a/components/common-payment/common-payment - 副本.vue b/components/common-payment/common-payment - 副本.vue
new file mode 100644
index 0000000..4db3da0
--- /dev/null
+++ b/components/common-payment/common-payment - 副本.vue	
@@ -0,0 +1,638 @@
+<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
new file mode 100644
index 0000000..ff86c64
--- /dev/null
+++ b/components/common-payment/common-payment.vue
@@ -0,0 +1,658 @@
+<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-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-body">
+						<!-- 商品 -->
+						<view class="goods-item" v-for="(goodsItem, goodsIndex) in goodsSpecFormat(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="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 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>
+				</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" :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="merchCoupon.data.length > 0">
+								<view class="coupon-item" v-for="(couponItem, couponIndex) in merchCoupon.data" :key="couponIndex" @click="selectCoupon(couponItem,merchCoupon.merch_id)">
+									<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="selectCouponId == 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/payment.js b/components/common-payment/payment.js
new file mode 100644
index 0000000..eb91860
--- /dev/null
+++ b/components/common-payment/payment.js
@@ -0,0 +1,1078 @@
+import htmlParser from '@/common/js/html-parser';
+
+export default {
+	options: {
+		styleIsolation: 'shared'
+	},
+	data() {
+		return {
+			outTradeNo: '',
+			isIphoneX: false,
+			orderCreateData: {
+				is_balance: 0,
+				is_point: 1,
+				is_invoice: 0, // 是否需要发票 0 无发票  1 有发票
+				invoice_type: 0, // 发票类型  1 纸质 2 电子
+				invoice_title_type: 1, // 抬头类型  1 个人 2 企业
+				is_tax_invoice: 0, // 是否需要增值税专用发票  0 不需要 1 需要
+				/*coupon: {
+					coupon_id: 0
+				},*/
+				coupon: [],
+				delivery: {},
+				member_goods_card: {}, // 会员次卡
+				order_key: '',
+				buyer_message: ''
+			},
+			paymentData: null,
+			calculateData: null,
+			tempData: null,
+			storeId: 0,
+			deliveryTime: '', // 提货时间
+			memberAddress: null, // 会员收货地址
+			localMemberAddress: null, // 会员本地配送收货地址
+			isRepeat: false,
+			promotionInfo: null,
+			transactionAgreement: {}, // 购买须知
+			tempFormData: null,
+			menuButtonBounding: {}, // 小程序胶囊属性
+			storeConfig: null,
+			localConfig: null,
+			selectGoodsCard: {
+				skuId: 0,
+				itemId: 0,
+				cardList: {}
+			}, // 当前选择的次卡
+			storeData: [],
+			latitude: '',
+			longitude: '',
+			coupon_list: [],
+			modules: [],
+			
+			//商户
+			shop_goods_list:[],
+			merchCoupon: {
+				merch_id: 0,
+				data: []
+			},
+			selectCouponId:0
+		}
+	},
+	inject: ['promotion'],
+	created() {
+		// #ifdef MP
+		this.menuButtonBounding = uni.getMenuButtonBoundingClientRect();
+		// #endif
+		this.isIphoneX = this.$util.uniappIsIPhoneX()
+		if (this.storeToken) {
+			Object.assign(this.orderCreateData, uni.getStorageSync(this.createDataKey))
+			if (this.location) {
+				this.orderCreateData.latitude = this.location.latitude;
+				this.orderCreateData.longitude = this.location.longitude;
+				this.latitude = this.location.latitude;
+				this.longitude = this.location.longitude;
+			}
+			this.payment();
+		} else {
+			this.$nextTick(() => {
+				this.$refs.loadingCover.hide();
+				this.$refs.login.open(this.$util.getCurrentRoute().path)
+			})
+		}
+		this.getTransactionAgreement();
+	},
+	computed: {
+		goodsData() {
+			if (this.paymentData) {
+				this.paymentData.goods_list.forEach(item => {
+					if (item.sku_spec_format) item.sku_spec_format = JSON.parse(item.sku_spec_format);
+				})
+				return this.paymentData;
+			}
+		},
+		calculateGoodsData() {
+			if (this.calculateData) {
+				this.calculateData.goods_list.forEach(item => {
+					if (item.sku_spec_format) item.sku_spec_format = JSON.parse(item.sku_spec_format);
+				})
+				return this.calculateData;
+			}
+		},
+		// 余额可抵扣金额
+		balanceDeduct() {
+			if (this.calculateData) {
+				if (this.calculateData.member_account && this.calculateData.member_account.balance_total <= parseFloat(this.calculateData.order_money).toFixed(2)) {
+					return parseFloat(this.calculateData.member_account.balance_total).toFixed(2);
+				} else {
+					return parseFloat(this.calculateData.order_money).toFixed(2);
+				}
+			}
+		},
+		// 门店列表
+		storeList() {
+			return this.getStoreList();
+		},
+		// 门店信息
+		storeInfo() {
+			let storeList = this.getStoreList();
+			if (storeList && this.orderCreateData.delivery && this.orderCreateData.delivery.delivery_type != 'express' && this.storeId) {
+				return storeList[this.orderCreateData.delivery.store_id];
+			}
+			return null;
+		},
+		// 会员卡购买周期
+		cardChargeType() {
+			if (this.paymentData && this.paymentData.recommend_member_card && Object.keys(this.paymentData.recommend_member_card).length > 0) {
+				let charge_rule_arr = [];
+				let charge_rule = this.paymentData.recommend_member_card.charge_rule;
+				Object.keys(charge_rule).forEach((key, index) => {
+					switch (key) {
+						case 'week':
+							charge_rule_arr.push({
+								'key': key,
+								'value': charge_rule[key],
+								'title': '周卡',
+								unit: '周'
+							});
+							break;
+						case 'month':
+							charge_rule_arr.push({
+								'key': key,
+								'value': charge_rule[key],
+								'title': '月卡',
+								unit: '月'
+							});
+							break;
+						case 'quarter':
+							charge_rule_arr.push({
+								'key': key,
+								'value': charge_rule[key],
+								'title': '季卡',
+								unit: '季'
+							});
+							break;
+						case 'year':
+							charge_rule_arr.push({
+								'key': key,
+								'value': charge_rule[key],
+								'title': '年卡',
+								unit: '年'
+							});
+							break;
+					}
+				})
+				return charge_rule_arr;
+			}
+		}
+	},
+	watch: {
+		storeToken: function (nVal, oVal) {
+			this.payment();
+		},
+		deliveryTime: function (nVal) {
+			if (!nVal) this.$refs.timePopup.refresh();
+		},
+		location: function (nVal) {
+			if (nVal) {
+				this.orderCreateData.latitude = nVal.latitude;
+				this.orderCreateData.longitude = nVal.longitude;
+				this.latitude = nVal.latitude;
+				this.longitude = nVal.longitude;
+				this.payment();
+			}
+		},
+		calculateGoodsData(nVal) {
+			if (nVal && nVal.local_config && nVal.local_config.info.time_is_open && !this.deliveryTime) this.localtime('no');
+		}
+	},
+	methods: {
+		//多商户商品分类
+		goodsSpecFormat(goods_list){
+			goods_list.forEach(item => {
+				if (item.sku_spec_format) item.sku_spec_format = JSON.parse(item.sku_spec_format);
+			})
+			return goods_list
+		},
+		/**
+		 * 父级页面onShow调用
+		 */
+		pageShow() {
+			if (uni.getStorageSync('addressBack')) {
+				uni.removeStorageSync('addressBack');
+				this.payment();
+			}
+		},
+		/**
+		 * 获取订单结算数据
+		 */
+		payment() {
+			this.$api.sendRequest({
+				url: this.api.payment,
+				data: this.handleCreateData(),
+				success: res => {
+					if (res.code == 0 && res.data) {
+						let data = res.data;
+
+						// #ifdef MP-WEIXIN
+						var scene = uni.getStorageSync('is_test') ? 1175 : wx.getLaunchOptionsSync().scene;
+						if ([1175, 1176, 1177, 1191, 1195].indexOf(scene) != -1 && data.delivery.express_type) {
+							data.delivery.express_type = data.delivery.express_type.filter(item => item.name == 'express');
+						}
+						// #endif
+
+						if (data) {
+							// 配送方式
+							if (data.delivery.express_type && data.delivery.express_type.length) {
+								let deliveryStorage = uni.getStorageSync('delivery');
+								let delivery = data.delivery.express_type[0];
+								data.delivery.express_type.forEach(item => {
+									if (deliveryStorage && item.name == deliveryStorage.delivery_type) {
+										delivery = item;
+									}
+									if (item.name == 'local') this.localConfig = item;
+									if (item.name == 'store') this.storeConfig = item;
+								})
+								this.selectDeliveryType(delivery, false, data.member_account);
+							}
+						}
+
+						// 地址、手机号
+						if (data.is_virtual) {
+							this.orderCreateData.member_address = {
+								mobile: data.member_account.mobile ? data.member_account.mobile : ''
+							}
+						}
+
+						//记录订单key
+						this.orderCreateData.order_key = data.order_key;
+
+						this.modules = data.modules;
+						
+						//记录多商户优惠券
+						this.orderCreateData.coupon = data.coupon
+						
+						//查询优惠券
+						this.getCouponList();
+
+						// 处理表单数据
+						data = this.handleGoodsFormData(data);
+
+						// 该方法在父级组件中
+						this.promotionInfo = this.promotion(data);
+
+						this.paymentData = data;
+						
+						this.$forceUpdate();
+						this.calculate();
+					} else {
+						this.$util.showToast({
+							title: res.message
+						});
+
+						setTimeout(() => {
+							this.$util.redirectTo('/pages/index/index');
+						}, 1000)
+					}
+				}
+			})
+		},
+		//查询优惠券
+		getCouponList() {
+			//查询优惠券
+			if (this.modules.indexOf('coupon') != -1) {
+				this.$api.sendRequest({
+					url: '/api/ordercreate/getcouponlist',
+					data: this.orderCreateData,
+					success: res => {
+						if (res.code == 0 && res.data) {
+							let data = res.data;
+							this.coupon_list = data;
+							this.$forceUpdate();
+						} else {
+							this.$util.showToast({
+								title: res.message
+							});
+						}
+					}
+				});
+
+				// this.orderCreateData.coupon.coupon_id = 0;
+			}
+
+		},
+		/**
+		 * 处理商品表单数据
+		 * @param {Object} data
+		 */
+		handleGoodsFormData(data) {
+			let goodsFormData = uni.getStorageSync('goodFormData');
+			data.goods_list.forEach(item => {
+				if (item.goods_form) {
+					let formData = {};
+					if (item.form_data) {
+						item.form_data.map(formIem => {
+							formData[formIem.id] = formIem;
+						})
+					} else if (goodsFormData && goodsFormData.goods_id == item.goods_id) {
+						goodsFormData.form_data.map(formIem => {
+							formData[formIem.id] = formIem;
+						})
+					}
+					if (Object.keys(formData).length) {
+						item.goods_form.json_data.forEach(formIem => {
+							if (formData[formIem.id]) {
+								formIem.val = formData[formIem.id].val;
+							}
+						})
+					}
+				}
+			});
+			return data;
+		},
+		/**
+		 * 订单创建
+		 */
+		calculate() {
+			this.$api.sendRequest({
+				url: this.api.calculate,
+				data: this.handleCreateData(),
+				success: res => {
+					if (this.$refs.loadingCover && this.$refs.loadingCover.isShow) this.$refs.loadingCover.hide();
+					if (res.code == 0 && res.data) {
+
+						// 处理表单数据
+						this.calculateData = this.handleGoodsFormData(res.data);
+
+						//多商户商品
+						this.shop_goods_list = res.data.shop_goods_list
+						//---------
+						this.calculateData.coupon_list = this.coupon_list;
+						if (res.data.delivery) {
+							if (res.data.delivery.delivery_type == 'express') this.memberAddress = res.data.delivery.member_address;
+							if (res.data.delivery.delivery_type == 'local') {
+								this.localMemberAddress = res.data.delivery.member_address;
+							}
+						}
+						// 次卡
+						res.data.goods_list.forEach(item => {
+							if (item.member_card_list) {
+								if (this.orderCreateData.member_goods_card[item.sku_id]) {
+									let itemId = this.orderCreateData.member_goods_card[item.sku_id];
+									if (!item.member_card_list[itemId]) delete this.orderCreateData.member_goods_card[item.sku_id];
+								}
+							} else if (this.orderCreateData.member_goods_card[item.sku_id]) {
+								delete this.orderCreateData.member_goods_card[item.sku_id];
+							}
+						});
+						//多商户
+						this.orderCreateData.coupon = res.data.coupon
+						// if (!res.data.coupon_id) this.orderCreateData.coupon.coupon_id = 0;
+						// else this.orderCreateData.coupon.coupon_id = res.data.coupon_id;
+
+						this.$forceUpdate();
+					} else {
+						this.$util.showToast({
+							title: res.message
+						});
+					}
+				}
+			})
+		},
+		/**
+		 * 提交订单
+		 */
+		create() {
+			if (!this.verify() || this.isRepeat) return;
+			this.isRepeat = true;
+			uni.showLoading({
+				title: ''
+			});
+			this.$api.sendRequest({
+				url: this.api.create,
+				data: this.handleCreateData(),
+				success: res => {
+					uni.hideLoading();
+					if (res.code == 0) {
+						this.outTradeNo = res.data;
+						uni.removeStorageSync('deliveryTime');
+						uni.removeStorageSync('goodFormData');
+						uni.setStorageSync('paySource', '');
+						if (this.calculateData.pay_money == 0) {
+							// #ifdef MP
+							if (this.paymentData.is_virtual || this.orderCreateData.delivery.delivery_type == 'store') {
+								this.$util.subscribeMessage('ORDER_VERIFY_OUT_TIME,VERIFY_CODE_EXPIRE,VERIFY');
+							}
+							// #endif
+							this.$util.redirectTo('/pages_tool/pay/result', {
+								code: res.data
+							}, 'redirectTo');
+						} else {
+							this.openChoosePayment();
+						}
+						// 更新购物车数量
+						this.$store.dispatch('getCartNumber');
+					} else {
+						this.$util.showToast({
+							title: res.message
+						});
+						this.isRepeat = false;
+					}
+				}
+			})
+		},
+		/**
+		 * 处理订单计算、创建传参
+		 */
+		handleCreateData() {
+			let data = this.$util.deepClone(this.orderCreateData);
+			// 订单表单
+			if (this.$refs.form) {
+				data.form_data = {
+					form_id: this.paymentData.system_form.id,
+					form_data: this.$util.deepClone(this.$refs.form.formData)
+				};
+			}
+			// 商品表单
+			if (this.$refs.goodsForm) {
+				if (!data.form_data) data.form_data = {};
+				data.form_data.goods_form = {};
+				this.$refs.goodsForm.forEach(item => {
+					data.form_data.goods_form[item._props.customAttr.sku_id] = {
+						form_id: item._props.customAttr.form_id,
+						form_data: this.$util.deepClone(item.formData)
+					}
+				})
+			}
+			Object.keys(data).forEach((key) => {
+				let item = data[key];
+				if (typeof item == 'object') data[key] = JSON.stringify(item);
+			})
+
+			if (this.paymentData && this.orderCreateData.is_virtual == 0) {
+				if (data.member_address && this.orderCreateData.delivery && this.orderCreateData.delivery.delivery_type != 'store') {
+					delete data.member_address;
+				}
+			}
+
+			return data;
+		},
+		/**
+		 * 打开支付弹窗
+		 */
+		openChoosePayment() {
+			// #ifdef MP
+			if (this.paymentData.is_virtual) {
+				this.$util.subscribeMessage('ORDER_URGE_PAYMENT,ORDER_PAY');
+			} else {
+				switch (this.orderCreateData.delivery.delivery_type) {
+					case 'express': //物流配送
+						this.$util.subscribeMessage('ORDER_URGE_PAYMENT,ORDER_PAY,ORDER_DELIVERY');
+						break;
+					case 'store': //门店自提
+						this.$util.subscribeMessage('ORDER_URGE_PAYMENT,ORDER_PAY');
+						break;
+					case 'local': //同城配送
+						this.$util.subscribeMessage('ORDER_URGE_PAYMENT,ORDER_PAY,ORDER_DELIVERY');
+						break;
+				}
+			}
+			// #endif
+
+			this.$refs.choosePaymentPopup.getPayInfo(this.outTradeNo);
+		},
+		verify() {
+			if (this.paymentData.is_virtual == 1) {
+				if (!this.orderCreateData.member_address.mobile) {
+					this.$util.showToast({
+						title: '请输入预留手机'
+					});
+					return false;
+				}
+				if (!this.$util.verifyMobile(this.orderCreateData.member_address.mobile)) {
+					this.$util.showToast({
+						title: '请输入正确的手机号'
+					});
+					return false;
+				}
+			} else {
+				if (!this.orderCreateData.delivery || !this.orderCreateData.delivery.delivery_type) {
+					this.$util.showToast({
+						title: '商家未设置配送方式'
+					});
+					return false;
+				}
+				if (
+					(this.orderCreateData.delivery.delivery_type == 'express' && !this.memberAddress) ||
+					(this.orderCreateData.delivery.delivery_type == 'local' && !this.localMemberAddress)
+				) {
+					this.$util.showToast({
+						title: '请先选择您的收货地址'
+					});
+					return false;
+				}
+
+				if (this.orderCreateData.delivery.delivery_type == 'store') {
+					if (!this.orderCreateData.delivery.store_id) {
+						this.$util.showToast({
+							title: '没有可提货的门店,请选择其他配送方式'
+						});
+						return false;
+					}
+					if (!this.orderCreateData.member_address.mobile) {
+						this.$util.showToast({
+							title: '请输入预留手机'
+						});
+						return false;
+					}
+					if (!this.$util.verifyMobile(this.orderCreateData.member_address.mobile)) {
+						this.$util.showToast({
+							title: '请输入正确的手机号'
+						});
+						return false;
+					}
+					if (!this.deliveryTime) {
+						this.$util.showToast({
+							title: '请选择提货时间'
+						});
+						return false;
+					}
+				}
+
+				if (this.orderCreateData.delivery.delivery_type == 'local') {
+					if (!this.orderCreateData.delivery.store_id) {
+						this.$util.showToast({
+							title: '没有可配送的门店,请选择其他配送方式'
+						});
+						return false;
+					}
+					if (this.calculateGoodsData.config.local.is_use && this.calculateGoodsData.delivery.local.info.time_is_open == 1 && !this.deliveryTime) {
+						this.$util.showToast({
+							title: '请选择送达时间'
+						});
+						return false;
+					}
+				}
+			}
+
+			if (this.$refs.goodsForm) {
+				let formVerify = true;
+				for (let i = 0; i < this.$refs.goodsForm.length; i++) {
+					let item = this.$refs.goodsForm[i];
+					formVerify = item.verify();
+					if (!formVerify) {
+						break;
+					}
+				}
+				if (!formVerify) return false;
+			}
+			if (this.paymentData.system_form) {
+				let formVerify = this.$refs.form.verify();
+				if (!formVerify) return false;
+			}
+			return true;
+		},
+		/**
+		 * 选择收货地址
+		 */
+		selectAddress() {
+			var params = {
+				back: this.$util.getCurrentRoute().path,
+				local: 0,
+				type: 1
+			}
+			// 外卖配送需要定位地址
+			if (this.orderCreateData.delivery.delivery_type == 'local') {
+				params.local = 1;
+				params.type = 2;
+			}
+			this.$util.redirectTo('/pages_tool/member/address', params);
+		},
+		/**
+		 * 选择配送方式
+		 * @param data
+		 * @param calculate
+		 * @param member_account
+		 */
+		selectDeliveryType(data, calculate = true, member_account = null) {
+			if (this.orderCreateData.delivery && this.orderCreateData.delivery.delivery_type == data.name) return;
+
+			this.orderCreateData.delivery.buyer_ask_delivery_time = {
+				start_date: '',
+				end_date: ''
+			};
+			this.deliveryTime = '';
+
+			let delivery = {
+				delivery_type: data.name,
+				delivery_type_name: data.title
+			}
+			// 如果是门店配送
+			if (data.name == 'store' || data.name == 'local') {
+				if (data.store_list[0]) {
+					delivery.store_id = data.store_list[0].store_id;
+				}
+				this.storeId = delivery.store_id ? delivery.store_id : 0;
+
+				if (!this.orderCreateData.member_address) {
+					if (this.paymentData) {
+						this.orderCreateData.member_address = {
+							name: this.paymentData.member_account.nickname,
+							mobile: this.paymentData.member_account.mobile
+						};
+					} else if (member_account) {
+						this.orderCreateData.member_address = {
+							name: member_account.nickname,
+							mobile: member_account.mobile
+						};
+
+					}
+				}
+			}
+			
+			this.$set(this.orderCreateData, 'delivery', delivery);
+			uni.setStorageSync('delivery', delivery);
+
+			// 配送方式不为门店配送时
+			if (this.orderCreateData.delivery.delivery_type != 'express' && !this.location) this.$util.getLocation();
+			if (calculate) this.payment();
+
+			if (data.name == 'store') this.storetime('no');
+			if (data.name == 'local') this.localtime('no');
+		},
+		/**
+		 * 图片错误
+		 * @param {Object} index
+		 */
+		imageError(index) {
+			this.paymentData.goods_list[index].sku_image = this.$util.getDefaultImage().goods;
+			this.calculateData.goods_list[index].sku_image = this.$util.getDefaultImage().goods;
+			this.$forceUpdate();
+		},
+		/**
+		 * 选择门店
+		 * @param {Object} data
+		 */
+		selectPickupPoint(data) {
+			if (data.store_id != this.storeId) {
+				this.storeId = data.store_id;
+				this.orderCreateData.delivery.store_id = data.store_id;
+				this.payment();
+				this.resetDeliveryTime();
+				// 存储所选门店
+				let delivery = uni.getStorageSync('delivery');
+				delivery.store_id = data.store_id;
+				uni.setStorageSync('delivery', delivery)
+			}
+			this.$refs.deliveryPopup.close();
+		},
+		/**
+		 * 重置提货时间
+		 */
+		resetDeliveryTime() {
+			this.orderCreateData.delivery.buyer_ask_delivery_time = {
+				start_date: '',
+				end_date: ''
+			};
+			this.deliveryTime = '';
+			uni.removeStorageSync('deliveryTime');
+		},
+		/**
+		 * 门店
+		 */
+		storetime(type = '') {
+			if (this.storeInfo) {
+				let data = this.$util.deepClone(this.storeInfo);
+				data.delivery_time = typeof data.delivery_time == 'string' && data.delivery_time ? JSON.parse(data.delivery_time) : data.delivery_time;
+				if (!data.delivery_time || data.delivery_time.length == undefined && !data.delivery_time.length) {
+					data.delivery_time = [{
+						start_time: data.start_time,
+						end_time: data.end_time
+					}]
+				}
+				let obj = {
+					delivery: this.orderCreateData.delivery,
+					dataTime: data
+				}
+				this.$refs.timePopup.open(obj, type);
+				this.$forceUpdate();
+			}
+		},
+		/**
+		 * 选择自提时间
+		 * @param {Object} data
+		 */
+		selectPickupTime(data) {
+			this.deliveryTime = data.data.month + '(' + data.data.time + ')';
+
+			this.orderCreateData.delivery.buyer_ask_delivery_time = {
+				start_date:data.data.start_date,
+				end_date:data.data.end_date
+			};
+
+			//将时间缓存，避免切换地址时重置
+			uni.setStorageSync('deliveryTime', {
+				'deliveryTime': this.deliveryTime,
+				'buyer_ask_delivery_time': this.orderCreateData.delivery.buyer_ask_delivery_time,
+				'delivery_type': this.orderCreateData.delivery.delivery_type
+			});
+
+		},
+		storeImgError() {
+			this.storeInfo.store_image = this.$util.getDefaultImage().store;
+		},
+		openPopup(ref) {
+			if (ref == 'deliveryPopup' && (!this.storeList || Object.keys(this.storeList).length <= 1)) return;
+			this.tempData = this.$util.deepClone(this.orderCreateData);
+			this.$refs[ref].open();
+		},
+		closePopup(ref) {
+			this.orderCreateData = this.$util.deepClone(this.tempData);
+			this.$refs[ref].close();
+			this.tempData = null;
+		},
+		//优惠券单独多商户
+		/**
+		 * 显示店铺优惠券信息
+		 * @param {Object} siteId
+		 * @param {Object} couponData
+		 */
+		openSiteCoupon(merch_id) {
+		
+			this.tempData = this.$util.deepClone(this.orderCreateData);
+			this.merchCoupon.merch_id = merch_id;
+			this.selectCouponId = this.orderCreateData.coupon[merch_id].coupon_id;
+			// this.selectCouponMoney = this.orderCreateData.coupon[siteId].coupon_money;
+		
+			this.merchCoupon.data = this.coupon_list[merch_id];
+			this.$refs.couponPopup.open();
+			this.$forceUpdate();
+		},
+		/**商户选择券*/
+		selectCoupon(data,merch_id) {
+		
+			// if (this.orderCreateData.coupon[merch_id].coupon_id == data.coupon_id){
+			// 	this.orderCreateData.coupon[merch_id].coupon_id = 0
+			// }else{
+			// 	this.orderCreateData.coupon[merch_id].coupon_id = data.coupon_id
+			// };
+			if (this.selectCouponId != data.coupon_id) {
+				this.selectCouponId = data.coupon_id;
+			} else {
+				this.selectCouponId = 0;
+			}
+			this.$forceUpdate();
+			// this.orderCreateData.coupon[merch_id].coupon_id = data.coupon_id
+			console.log(this.selectCouponId)
+		},
+		//确定使用优惠券
+		useCpopon() {
+			console.log(this.merchCoupon.merch_id)
+			this.orderCreateData.coupon[this.merchCoupon.merch_id].coupon_id = this.selectCouponId;
+			console.log(this.orderCreateData.coupon)
+			this.$refs.couponPopup.close();
+			this.calculate();
+		},
+		
+		//-------------------
+		/**
+		 * 选择优惠券
+		 * @param {Object} data
+		 */
+		/*selectCoupon(data) {
+			if (this.orderCreateData.coupon.coupon_id == data.coupon_id) this.orderCreateData.coupon = {
+				coupon_id: 0
+			};
+			else this.orderCreateData.coupon = {
+				coupon_id: data.coupon_id
+			};
+		},*/
+		/**
+		 * 使用优惠券
+		 */
+		// useCpopon() {
+		// 	this.$refs.couponPopup.close();
+		// 	this.calculate();
+		// },
+		/**
+		 * 切换发票开关
+		 */
+		changeIsInvoice() {
+			if (this.orderCreateData.is_invoice == 0) {
+				this.orderCreateData.is_invoice = 1;
+				if (!this.orderCreateData.invoice_type) this.orderCreateData.invoice_type = this.goodsData.invoice.invoice_type.split(',')[0];
+			} else {
+				this.orderCreateData.is_invoice = 0;
+			}
+		},
+		/**
+		 * 切换发票类型
+		 * @param {Object} invoice_type
+		 */
+		changeInvoiceType(invoice_type) {
+			this.orderCreateData.invoice_type = invoice_type;
+		},
+		/**
+		 * 切换发票个人还是企业
+		 * @param {Object} invoice_title_type
+		 */
+		changeInvoiceTitleType(invoice_title_type) {
+			this.orderCreateData.invoice_title_type = invoice_title_type;
+		},
+		/**
+		 * 切换增值税专用发票开关
+		 */
+		changeIsTaxInvoice() {
+			if (this.orderCreateData.is_tax_invoice == 0) this.orderCreateData.is_tax_invoice = 1;
+			else this.orderCreateData.is_tax_invoice = 0;
+			this.$forceUpdate();
+		},
+		/**
+		 * 选择发票内容
+		 * @param {Object} invoice_content
+		 */
+		changeInvoiceContent(invoice_content) {
+			this.orderCreateData.invoice_content = invoice_content;
+			this.$forceUpdate();
+		},
+		/**
+		 * 验证发票内容
+		 */
+		invoiceVerify() {
+			if (!this.orderCreateData.invoice_title) {
+				this.$util.showToast({
+					title: '请填写发票抬头'
+				});
+				return false;
+			}
+			if (!this.orderCreateData.taxpayer_number && this.orderCreateData.invoice_title_type == 2) {
+				this.$util.showToast({
+					title: '请填写纳税人识别号'
+				});
+				return false;
+			}
+			if (this.orderCreateData.invoice_type == 1 && !this.orderCreateData.invoice_full_address && this.paymentData.is_virtual == 1) {
+				this.$util.showToast({
+					title: '请填写发票邮寄地址'
+				});
+				return false;
+			}
+			if (this.orderCreateData.invoice_type == 2 && !this.orderCreateData.invoice_email) {
+				this.$util.showToast({
+					title: '请填写邮箱'
+				});
+				return false;
+			}
+			if (this.orderCreateData.invoice_type == 2) {
+				var reg = /^([a-zA-Z]|[0-9])(\w|\-)+@[a-zA-Z0-9]+\.([a-zA-Z]{2,4})$/;
+				if (!reg.test(this.orderCreateData.invoice_email)) {
+					this.$util.showToast({
+						title: '请填写正确的邮箱'
+					});
+					return false;
+				}
+			}
+			if (!this.orderCreateData.invoice_content) {
+				this.$util.showToast({
+					title: '请选择发票内容'
+				});
+				return false;
+			}
+			return true;
+		},
+		/**
+		 * 保存发票设置
+		 */
+		saveInvoice() {
+			if (this.orderCreateData.is_invoice == 1 && !this.invoiceVerify()) return;
+			this.calculate();
+			this.$refs.invoicePopup.close();
+		},
+		/**
+		 * 保存留言
+		 */
+		saveBuyerMessage() {
+			this.$refs.buyerMessagePopup.close();
+		},
+		/**
+		 * 选择会员卡
+		 */
+		selectMemberCard() {
+			this.orderCreateData.is_open_card = this.orderCreateData.is_open_card ? 0 : 1;
+			if (!this.orderCreateData.member_card_unit) this.orderCreateData.member_card_unit = this.cardChargeType[0].key;
+			this.payment();
+		},
+		/**
+		 * 选择会员卡充值类型
+		 * @param {Object} key
+		 */
+		selectMembercardUnit(key) {
+			this.orderCreateData.member_card_unit = key;
+			this.calculate();
+		},
+		/**
+		 * 使用积分抵扣
+		 */
+		usePoint() {
+			this.orderCreateData.is_point = this.orderCreateData.is_point ? 0 : 1;
+			this.calculate();
+		},
+		/**
+		 * 支付弹窗关闭
+		 */
+		payClose() {
+			// 更新购物车数量
+			this.$store.dispatch('getCartNumber');
+			this.$util.redirectTo('/pages/order/detail', {
+				order_id: this.$refs.choosePaymentPopup.payInfo.order_id
+			}, 'redirectTo');
+		},
+		
+		/**
+		 * 同城配送送达时间
+		 */
+		localtime(type = '') {
+			if (this.calculateGoodsData && this.calculateGoodsData.config.local) {
+				let data = this.$util.deepClone(this.calculateGoodsData.delivery.local.info);
+				if (Object.keys(data).length) {
+					if (data.delivery_time) {
+						data.end_time = data.delivery_time[(data.delivery_time.length - 1)].end_time;
+					}
+
+					let obj = {
+						delivery: this.orderCreateData.delivery,
+						dataTime: data
+					}
+
+					this.$refs.timePopup.open(obj, type);
+				}
+
+			}
+		},
+		/**
+		 * 剩余起送价
+		 */
+		surplusStartMoney() {
+			let money = 0;
+			if (this.calculateData && this.calculateData.delivery && this.calculateData.delivery.delivery_type == 'local') {
+				let startDeliveryMoney = this.calculateGoodsData.delivery.start_money ?? 0;
+				money = parseFloat(startDeliveryMoney) - parseFloat(this.calculateData.goods_money);
+				money = money < 0 ? 0 : money;
+			}
+			return money;
+		},
+		/**
+		 * 交易协议
+		 */
+		getTransactionAgreement() {
+			this.$api.sendRequest({
+				url: '/api/order/transactionagreement',
+				success: res => {
+					if (res.data) {
+						this.transactionAgreement = res.data;
+						if (this.transactionAgreement.content) this.transactionAgreement.content = htmlParser(this.transactionAgreement.content);
+					}
+				}
+			})
+		},
+		editForm(index) {
+			this.tempFormData = {
+				index: index,
+				json_data: this.$util.deepClone(this.goodsData.goods_list[index].goods_form.json_data)
+			};
+			this.$refs.editFormPopup.open();
+		},
+		saveForm() {
+			if (this.$refs.tempForm.verify()) {
+				this.$set(this.paymentData.goods_list[this.tempFormData.index].goods_form, 'json_data', this.$refs.tempForm.formData);
+				this.$refs.editFormPopup.close();
+			}
+		},
+		/**
+		 * 切换次卡
+		 * @param {Object} index
+		 */
+		selectMemberGoodsCard(index) {
+			let sku_id = this.goodsData.goods_list[index].sku_id;
+			this.selectGoodsCard = {
+				skuId: sku_id,
+				itemId: this.orderCreateData.member_goods_card[sku_id] ? this.orderCreateData.member_goods_card[sku_id] : 0,
+				cardList: this.$util.deepClone(this.calculateGoodsData.goods_list[index].member_card_list),
+				click: (item_id) => {
+					this.selectGoodsCard.itemId = this.selectGoodsCard.itemId == item_id ? 0 : item_id;
+				}
+			}
+			this.$refs.memberGoodsCardPopup.open();
+		},
+		/**
+		 * 选择次卡
+		 */
+		saveMemberGoodsCard() {
+			this.orderCreateData.member_goods_card[this.selectGoodsCard.skuId] = this.selectGoodsCard.itemId || 0;
+			this.$refs.memberGoodsCardPopup.close();
+			this.payment();
+		},
+		back() {
+			uni.navigateBack({
+				delta: 1
+			});
+		},
+		getStoreList() {
+			let storeList = null;
+			if (this.orderCreateData.delivery) {
+				if (this.orderCreateData.delivery.delivery_type == 'local' && this.localConfig) {
+					storeList = this.localConfig.store_list;
+					storeList = storeList.reduce((res, item) => {
+						return {
+							...res,
+							[item.store_id]: item
+						};
+					}, {});
+
+				}
+				if (this.orderCreateData.delivery.delivery_type == 'store' && this.storeConfig) {
+					storeList = this.storeConfig.store_list;
+					storeList = storeList.reduce((res, item) => {
+						return {
+							...res,
+							[item.store_id]: item
+						};
+					}, {});
+				}
+			}
+			return storeList;
+		},
+		getStore(mescroll) {
+			this.$api.sendRequest({
+				url: '/api/store/getStorePage',
+				data: {
+					page_size: mescroll.size,
+					page: mescroll.num,
+					latitude: this.latitude ?? '',
+					longitude: this.longitude ?? '',
+					type: this.orderCreateData.delivery.delivery_type
+				},
+				success: res => {
+					let newArr = [];
+					let msg = res.message;
+					if (res.code == 0 && res.data) {
+						newArr = res.data.list;
+					}
+					mescroll.endSuccess(newArr.length);
+					//设置列表数据
+
+					if (mescroll.num == 1) this.storeData = []; //如果是第一页需手动制空列表
+					this.storeData = this.storeData.concat(newArr); //追加新数据
+				},
+				fail: res => {
+					mescroll.endErr();
+				}
+			});
+		}
+	},
+	filters: {
+		// 金额格式化输出
+		moneyFormat(money) {
+			return parseFloat(money).toFixed(2);
+		}
+	}
+}
\ No newline at end of file
diff --git a/components/diy-components/diy-article.vue b/components/diy-components/diy-article.vue
new file mode 100644
index 0000000..1fc23ef
--- /dev/null
+++ b/components/diy-components/diy-article.vue
@@ -0,0 +1,211 @@
+<template>
+	<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>
+						<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>
+					</view>
+				</view>
+			</view>
+		</view>
+	</x-skeleton>
+</template>
+
+<script>
+	// 文章
+	export default {
+		name: 'diy-article',
+		props: {
+			value: {
+				type: Object
+			}
+		},
+		data() {
+			return {
+				list: [],
+				loading: true,
+				skeletonConfig: {
+					gridRows: 1,
+					gridRowsGap: '40rpx',
+					headWidth: '160rpx',
+					headHeight: '160rpx',
+					textRows: 2
+				}
+			};
+		},
+		created() {
+			this.getList();
+		},
+		watch: {
+			// 组件刷新监听
+			componentRefresh: function (nval) {
+				this.getList();
+			}
+		},
+		computed: {
+			warpCss() {
+				var obj = '';
+				obj += 'background-color:' + this.value.componentBgColor + ';';
+				if (this.value.componentAngle == 'round') {
+					obj += 'border-top-left-radius:' + this.value.topAroundRadius * 2 + 'rpx;';
+					obj += 'border-top-right-radius:' + this.value.topAroundRadius * 2 + 'rpx;';
+					obj += 'border-bottom-left-radius:' + this.value.bottomAroundRadius * 2 + 'rpx;';
+					obj += 'border-bottom-right-radius:' + this.value.bottomAroundRadius * 2 + 'rpx;';
+				}
+				return obj;
+			},
+			// 子项样式
+			itemCss() {
+				var obj = '';
+				obj += 'background-color:' + this.value.elementBgColor + ';';
+				if (this.value.elementAngle == 'round') {
+					obj += 'border-top-left-radius:' + this.value.topElementAroundRadius * 2 + 'rpx;';
+					obj += 'border-top-right-radius:' + this.value.topElementAroundRadius * 2 + 'rpx;';
+					obj += 'border-bottom-left-radius:' + this.value.bottomElementAroundRadius * 2 + 'rpx;';
+					obj += 'border-bottom-right-radius:' + this.value.bottomElementAroundRadius * 2 + 'rpx;';
+				}
+				if (this.value.ornament.type == 'shadow') {
+					obj += 'box-shadow:' + '0 0 10rpx ' + this.value.ornament.color;
+				}
+				if (this.value.ornament.type == 'stroke') {
+					obj += 'border:' + '2rpx solid ' + this.value.ornament.color;
+				}
+				return obj;
+			}
+		},
+		methods: {
+			getList() {
+				var data = {
+					num: this.value.count
+				};
+				if (this.value.sources == 'diy') {
+					data.num = 0;
+					data.article_id_arr = this.value.articleIds.toString();
+				}
+
+				this.$api.sendRequest({
+					url: '/api/article/lists',
+					data: data,
+					success: res => {
+						if (res.code == 0 && res.data) {
+							let data = res.data;
+							this.list = data;
+						}
+						this.loading = false;
+					}
+				});
+			},
+			toDetail(item) {
+				this.$util.redirectTo('/pages_tool/article/detail', {
+					article_id: item.article_id
+				});
+			},
+			imgError(index) {
+				if (this.list[index]) this.list[index].cover_img = this.$util.getDefaultImage().article;
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	.article-wrap {
+		.list-wrap {
+			&.style-1 {
+				.item {
+					display: flex;
+					padding: 20rpx;
+					margin-top: 24rpx;
+
+					&:first-of-type {
+						margin-top: 0;
+					}
+
+					.article-img {
+						margin-right: 20rpx;
+						width: 160rpx;
+						height: 160rpx;
+						overflow: hidden;
+						display: flex;
+						align-items: center;
+						justify-content: center;
+
+						image {
+							width: 100%;
+						}
+					}
+
+					.info-wrap {
+						flex: 1;
+						display: flex;
+						flex-direction: column;
+						justify-content: space-between;
+
+						.title {
+							font-weight: bold;
+							margin-bottom: 10rpx;
+							overflow: hidden;
+							text-overflow: ellipsis;
+							display: -webkit-box;
+							-webkit-line-clamp: 2;
+							-webkit-box-orient: vertical;
+							font-size: 30rpx;
+							line-height: 1.5;
+						}
+
+						.abstract {
+							overflow: hidden;
+							text-overflow: ellipsis;
+							display: -webkit-box;
+							-webkit-line-clamp: 2;
+							-webkit-box-orient: vertical;
+							font-size: $font-size-tag;
+						}
+
+						.read-wrap {
+							display: flex;
+							color: #999ca7;
+							justify-content: flex-start;
+							align-items: center;
+							margin-top: 10rpx;
+							line-height: 1;
+
+							text {
+								font-size: $font-size-tag;
+							}
+
+							.iconfont {
+								font-size: 36rpx;
+								vertical-align: bottom;
+								margin-right: 10rpx;
+							}
+
+							.category-icon {
+								width: 8rpx;
+								height: 8rpx;
+								border-radius: 50%;
+								background: $base-color;
+								margin-right: 10rpx;
+							}
+
+							.date {
+								margin-left: 20rpx;
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/components/diy-components/diy-audio.vue b/components/diy-components/diy-audio.vue
new file mode 100644
index 0000000..80a3121
--- /dev/null
+++ b/components/diy-components/diy-audio.vue
@@ -0,0 +1,444 @@
+<template>
+	<view>
+		<view class="fui-audio style1" :style="{background:value.background}" v-if="value.type == 'style-2'">
+			<view class="content" style="padding-top: 20rpx;">
+				<view class="name" :style="{color:value.textcolor}">{{value.text}}</view>
+				<view class="author" :style="{color:value.subtitlecolor}">{{value.desc}}----{{value.id}}</view>
+			</view>
+			<view class="progress">
+				<view class="progressBar" :style="{width:audiowidth}"></view>
+			</view>
+			<view class="time" :style="{color:value.timecolor}">
+			{{audiotime}}
+			</view>
+			<view @click="play()" class="start" :class="status?'iconj icon-07zanting':'iconj icon-bofang'" style="padding-top: 18rpx"></view>
+		</view>
+		<view class="fui-audio style3" :style="{background:value.background}" v-else>
+		<!-- 	<audio src="/static/audio/bgm.mp3" controls loop></audio> -->
+			<view class="img">
+				<image :src="$util.img(value.imageUrl)"></image>
+			</view>
+			<view class="content">
+				<view class="name" :style="{color:value.textcolor}">{{value.text}}</view>
+				<view class="author" :style="{color:value.subtitlecolor}">{{value.desc}}</view>
+			</view>
+			<view class="progress">
+				<view class="progressBar" :style="{width:audiowidth}"></view>
+			</view>
+			<view class="time" :style="{color:value.timecolor}">
+			<!-- {{audios[value.id].audiotime}} -->
+			{{audiotime}}
+			</view>
+			<view @click="play()" class="start" :class="status?'iconj icon-07zanting':'iconj icon-bofang'"></view>
+		</view>
+	</view>
+</template>
+
+<script>
+	// 视频
+	export default {
+		name: 'diy-audio',
+		props: {
+			value: {
+				type: Object
+			}
+		},
+		data() {
+			return {
+				audiosObj:[],
+				audios: {},
+				audioContext:null,
+				audiotime:'00:01',
+				audiowidth:0,
+				status:0,//1播放0停止
+			};
+		},
+		created() {
+			// console.log(this.value)
+			this.audios[this.value.id] = {
+				audiotime:'00:01',
+				audiowidth:0
+			}
+		},
+		watch: {
+			// 组件刷新监听
+			componentRefresh: function(nval) {}
+		},
+		computed: {
+			videoWarpCss: function() {
+				var obj = '';
+				if (this.value.componentAngle == 'round') {
+					obj += 'border-top-left-radius:' + this.value.topAroundRadius * 2 + 'rpx;';
+					obj += 'border-top-right-radius:' + this.value.topAroundRadius * 2 + 'rpx;';
+					obj += 'border-bottom-left-radius:' + this.value.bottomAroundRadius * 2 + 'rpx;';
+					obj += 'border-bottom-right-radius:' + this.value.bottomAroundRadius * 2 + 'rpx;';
+				}
+				return obj;
+			}
+		},
+		methods: {
+			
+			play(){
+				
+				var t = this.value.id, a = this.audiosObj[t] || !1;
+				var e = {
+					audio:this.$util.img(this.value.audioUrl),
+				}
+				if (!a) {
+					a = uni.createInnerAudioContext("audio_" + t);
+					var i = this.audiosObj;
+					i[t] = a, this.audiosObj = i
+					// uni.setStorageSync('audio_list',audio_list)
+					var audio_list = uni.getStorageSync('audio_list')?uni.getStorageSync('audio_list'):[]
+					if(audio_list.includes(t) == false){
+						audio_list.push(t)
+						uni.setStorageSync('audio_list',audio_list)
+					}
+				}
+				console.log(uni.getStorageSync('audio_list'))
+				var n = this;
+				// console.log(a)
+				a.onPlay(function() {
+					var e = setInterval(function() {
+						var i = a.currentTime / a.duration * 100 + "%", s = Math.floor(Math.ceil(a.currentTime) / 60), o = (Math.ceil(a.currentTime) % 60 / 100).toFixed(2).slice(-2), r = Math.ceil(a.currentTime);
+						s < 10 && (s = "0" + s);
+						var u = s + ":" + o, c = n.audios;
+						// console.log(i)
+						c[t].audiowidth = i, c[t].Time = e, c[t].audiotime = u, c[t].seconds = r, n.audios = c;
+					}, 1e3);
+				});
+			
+				var s = n.$util.img(n.value.audioUrl), o = n.audios[n.value.id].seconds || 0, r = 0, u = 1;
+				0 == u && a.onEnded(function(e) {
+					c[t].status = !1,n.status=!1,c[t].seconds = 0,console.log(c),n.audios = c;
+				});
+				var c = n.audios;
+				c[t] || (c[t] = {}), a.paused && 0 == o ? (a.src = s, a.play(), 1 == u && (a.loop = !0), 
+				c[t].status = !0,n.status=!0, n.pauseOther(t)) : a.paused && o > 0 ? (a.play(), 0 == r ? a.seek(o) : a.seek(0), 
+				c[t].status = !0,n.status=!0, n.pauseOther(t)) : (a.pause(), c[t].status = !1,n.status=!1),n.audios = c;
+				console.log(n.audios)
+			},
+			pauseOther: function(e) {
+				var t = this;
+				 // console.log(this.audiosObj[this.value.id]);
+				 var i = this.audiosObj[this.value.id],a = this.value.id
+				 // console.log(i)
+				 // console.log(a)
+				 // if (a != e) {
+					// i.pause();
+					// var n = t.audios;
+					// n[a] && (n[a].status = !1, this.audios=n); 
+				 // }
+				var audios = document.getElementsByTagName("audio");
+				// 暂停函数
+				function pauseAll() {
+				var self = this;
+				[].forEach.call(audios, function (i) {
+				// 将audios中其他的audio全部暂停
+				i !== self && i.pause();
+				})
+				}
+				// 给play事件绑定暂停函数
+				[].forEach.call(audios, function (i) {
+				i.addEventListener("play", pauseAll.bind(i));
+				})
+				
+				
+				// var audio_list = uni.getStorageSync('audio_list')
+				//  audio_list.forEach(function(value, index) {
+				//    	if (value != e) {
+				// 		console.log(e)
+				// 	   uni.createInnerAudioContext("audio_" + value).pause();
+				//    }
+				// });
+			
+				// this.audiosObj.forEach(function(value, index) {
+				//    console.log(value);
+				// });
+				// this.each(this.audiosObj, function(a, i) {
+				// 	if (a != e) {
+				// 		i.pause();
+				// 		var n = t.data.audios;
+				// 		n[a] && (n[a].status = !1, t.setData({
+				// 			audios: n
+				// 		}));
+				// 	}
+				// });
+			},
+			
+		
+			play_bak(){
+				
+				var t = this.value.id
+				this.audioContext = uni.createInnerAudioContext("audio_" + this.value.id);
+				this.audioContext.src = this.$util.img(this.value.audioUrl);
+				var that = this
+				if(this.status == 1){
+					this.audioContext.pause();
+					this.status = 0
+					return false
+				}  
+				this.audioContext.play();
+				this.status = 1
+				 this.audioContext.onCanplay(function(s){
+					var e = setInterval(function() {
+						var i = parseFloat(that.audioContext.currentTime) / parseFloat(that.audioContext.duration) * 100 + "%", s = Math.floor(Math.ceil(that.audioContext.currentTime) / 60), o = (Math.ceil(that.audioContext.currentTime) % 60 / 100).toFixed(2).slice(-2), r = Math.ceil(that.audioContext.currentTime);
+						s < 10 && (s = "0" + s);
+						var u = s + ":" + o, c = that.audios;
+						c[t].audiowidth = i, c[t].Time = e, c[t].audiotime = u, c[t].seconds = r
+						that.audios = c
+						// console.log(c)
+						 console.log(that.audios[that.value.id].audiotime)
+						 that.audiotime = that.audios[that.value.id].audiotime
+						 that.audiowidth = that.audios[that.value.id].audiowidth
+						 console.log(i)
+						 that.lyg = i
+					}, 1e3);
+				 });
+				
+				
+				this.audioContext.onEnded(() => {
+				  console.log('播放结束');
+				  this.status = 0
+				});
+			}
+		}
+	};
+</script>
+
+<style scoped>
+	
+	.fui-audio {
+	    width: 100%;
+	    border: 1rpx solid #eeeeee;
+	    padding: 0 30rpx 0 20rpx;
+	    box-sizing: border-box;
+	    position: relative;
+	    overflow: hidden;
+	    background: #fff;
+	}
+	
+	.fui-audio .img {
+	    width: 100rpx;
+	    height: 100rpx;
+	    background: #000;
+	}
+	
+	.fui-audio .img image {
+	    width: 100%;
+	    height: 100%;
+	}
+	
+	.fui-audio .name {
+	    font-size: 26rpx;
+	    color: #333;
+	}
+	
+	.fui-audio .author {
+	    font-size: 26rpx;
+	    color: #666;
+	}
+	
+	.fui-audio .time {
+	    font-size: 24rpx;
+	    color: #999;
+	}
+	
+	.fui-audio .start {
+	    border: 0;
+	    padding: 0;
+	    margin: 0;
+	    font-size: 28rpx;
+	}
+	
+	.progressBar {
+	    height: 2rpx;
+	    width: 0;
+	    background: #333;
+	}
+	
+	.fui-audio.style1 {
+	    height: 86rpx;
+	    line-height: 82rpx;
+	}
+	
+	.fui-audio.style1 .img,.fui-audio.style2 .img {
+	    display: none;
+	}
+	
+	.fui-audio.style1 .name,.fui-audio.style2 .name {
+	    float: left;
+	    overflow: hidden;
+	    text-overflow: ellipsis;
+	    white-space: nowrap;
+	    max-width: 300rpx;
+	}
+	
+	.fui-audio.style1 .author,.fui-audio.style2 .author {
+	    float: left;
+	    margin-left: 12rpx;
+	    overflow: hidden;
+	    text-overflow: ellipsis;
+	    white-space: nowrap;
+	    max-width: 200rpx;
+	}
+	
+	.fui-audio.style1 .time,.fui-audio.style4 .time {
+	    display: none;
+	}
+	
+	.fui-audio.style1 .start {
+	    position: absolute;
+	    top: 0rpx;
+	    right: 40rpx;
+	    width: 40rpx;
+	    height: 40rpx;
+	    color: #000;
+	}
+	
+	.fui-audio.style1 .progress {
+	    position: absolute;
+	    bottom: 0;
+	    left: 0;
+	    right: 0;
+	}
+	
+	.fui-audio.style2 {
+	    height: 86rpx;
+	    line-height: 82rpx;
+	}
+	
+	.fui-audio.style2 .img {
+	    display: none;
+	}
+	
+	.fui-audio.style2 .time {
+	    position: absolute;
+	    top: 0;
+	    right: 30rpx;
+	}
+	
+	.fui-audio.style2 .name {
+	    margin-left: 70rpx;
+	}
+	
+	.fui-audio.style2 .start {
+	    position: absolute;
+	    top: 0rpx;
+	    left: 30rpx;
+	    width: 30rpx;
+	    height: 30rpx;
+	    color: #000;
+	}
+	
+	.fui-audio.style2 .progress,.fui-audio.style3 .progress {
+	    display: none;
+	}
+	
+	.fui-audio.style3 {
+	    padding: 8rpx;
+	}
+	
+	.fui-audio.style3 .start {
+	    position: absolute;
+	    top: 30rpx;
+	    left: 28rpx;
+	    width: 56rpx;
+	    height: 56rpx;
+	    color: #fff;
+	 /*   border: 2rpx solid #fff; */
+	    border-radius: 50%;
+	    text-indent: 18rpx;
+	    line-height: 56rpx;
+	}
+	
+	.fui-audio.style3 .img,.fui-audio.style4 .img {
+	    float: left;
+	    margin-right: 20rpx;
+	}
+	
+	.fui-audio.style3 .content {
+	    width: 468rpx;
+	}
+	
+	.fui-audio.style3 .content,.fui-audio.style4 .content {
+	    float: left;
+	    height: 100rpx;
+	    display: flex;
+	    flex-direction: column;
+	    justify-content: center;
+	}
+	
+	.fui-audio.style3 .content .name {
+	    height: 40rpx;
+	    overflow: hidden;
+	    text-overflow: ellipsis;
+	    white-space: nowrap;
+	}
+	
+	.fui-audio.style3 .content .author {
+	    overflow: hidden;
+	    text-overflow: ellipsis;
+	    white-space: nowrap;
+	}
+	
+	.fui-audio.style3 .time {
+	    position: absolute;
+	    top: 40rpx;
+	    right: 30rpx;
+	}
+	
+	.fui-audio.style4 {
+	    padding: 10rpx;
+	}
+	
+	.fui-audio.style4 .content {
+	    padding-bottom: 18rpx;
+	    height: 82rpx;
+	    width: 500rpx;
+	}
+	
+	.fui-audio.style4 .start {
+	    position: absolute;
+	    top: 32rpx;
+	    right: 30rpx;
+	    width: 30rpx;
+	    height: 30rpx;
+	    color: #000;
+	}
+	
+	.fui-audio.style4 .name {
+	    line-height: 1.2;
+	    overflow: hidden;
+	    text-overflow: ellipsis;
+	    white-space: nowrap;
+	}
+	
+	.fui-audio.style4 .author {
+	    line-height: 1.2;
+	    overflow: hidden;
+	    text-overflow: ellipsis;
+	    white-space: nowrap;
+	}
+	
+	.fui-audio.style4 .progress {
+	    background: #f5f5f5;
+	    height: 4rpx;
+	    position: absolute;
+	    bottom: 24rpx;
+	    left: 130rpx;
+	    right: 30rpx;
+	    border-radius: 2rpx;
+	    overflow: hidden;
+	}
+	
+	.fui-audio.style4 .progressBar {
+	    height: 4rpx;
+	}
+
+	
+
+	.diy-audio>>>.uni-video-container {
+		background-color: transparent;
+	}
+</style>
\ No newline at end of file
diff --git a/components/diy-components/diy-bargain.vue b/components/diy-components/diy-bargain.vue
new file mode 100644
index 0000000..186a8e3
--- /dev/null
+++ b/components/diy-components/diy-bargain.vue
@@ -0,0 +1,723 @@
+<template>
+	<x-skeleton :type="skeletonType" :loading="loading" :configs="skeletonConfig">
+		<view class="diy-bargain" :class="[value.template, value.style]" :style="warpCss">
+
+			<!-- 商品头部 -->
+			<view v-if="value.titleStyle.isShow && list && list.length" :class="[value.titleStyle.style, 'bargain-head']" :style="{ backgroundImage: 'url(' + $util.img(value.titleStyle.backgroundImage) + '), linear-gradient(to right,' + value.titleStyle.bgColorStart + ',' + value.titleStyle.bgColorEnd + ')' }">
+				<view v-if="value.titleStyle.leftStyle == 'text'" class="left-text" :style="{ fontSize: value.titleStyle.fontSize * 2 + 'rpx', color: value.titleStyle.textColor, fontWeight: value.titleStyle.fontWeight ? 'bold' : '' }">
+					{{ value.titleStyle.leftText }}
+				</view>
+				<image v-else class="left-img" :src="$util.img(value.titleStyle.leftImg)" mode="heightFix"></image>
+				<view class="head-content" v-if="value.titleStyle.style == 'style-1'" :style="{ color: value.titleStyle.textColor }">低至0元免费拿</view>
+				<view class="head-right" :style="{ fontSize: value.titleStyle.moreFontSize * 2 + 'rpx', color: value.titleStyle.moreColor }" @click="$util.redirectTo('/pages_promotion/bargain/list')">
+					<text>{{ value.titleStyle.more }}</text>
+					<text class="iconfont icon-right"></text>
+				</view>
+			</view>
+
+			<!-- 商品列表 -->
+			<template v-if="value.template == 'row1-of1'">
+				<view class="item" v-for="(item, index) in list" :key="index" @click="toDetail(item)" :class="[value.ornament.type]" :style="goodsItemCss">
+					<view class="img-wrap" :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }">
+						<image :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }" :src="$util.img(item.goods_image, { size: 'mid' })" mode="widthFix" @error="imageError(index)"/>
+					</view>
+					<view class="content"
+						v-if="value.goodsNameStyle.control || value.priceStyle.mainControl || value.btnStyle.control">
+						<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 class="progress" v-if="value.style == 'style-2'">
+							<view class="bg">
+								<view class="curr" :style="{ width: progress(item) * 2 + 'rpx' }">
+									<image class="progress-bar" mode="widthFix" :src="$util.img('public/uniapp/bargain/progress_bar_01.png')"/>
+								</view>
+							</view>
+							<view class="num" v-if="item.is_bargaining">
+								已砍
+								<text>￥{{ (item.price - item.curr_price).toFixed(2) }}</text>
+								，仅差
+								<text>￥{{ item.curr_price }}</text>
+							</view>
+							<view class="num" v-else>
+								最低可砍至
+								<text>￥{{ item.floor_price }}</text>
+							</view>
+						</view>
+						<view class="progress" v-if="value.style == 'style-3'">
+							最低可砍至
+							<text class="num">￥{{ item.floor_price }}</text>
+						</view>
+						<view class="price-wrap">
+							<view class="discount-price" v-if="value.priceStyle.mainControl">
+								<text class="unit price-style small" :style="{ color: value.theme == 'diy' ? value.priceStyle.mainColor + '!important' : '' }">¥</text>
+								<text class="price price-style large" :style="{ color: value.theme == 'diy' ? value.priceStyle.mainColor + '!important' : '' }">{{ item.price.split('.')[0] }}</text>
+								<text class="unit price-style small" :style="{ color: value.theme == 'diy' ? value.priceStyle.mainColor + '!important' : '' }">.{{ item.price.split('.')[1] }}</text>
+							</view>
+							<button v-if="value.btnStyle.control" :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'
+							}">
+								{{ item.is_bargaining ? '继续砍价' : value.btnStyle.text }}
+							</button>
+						</view>
+					</view>
+				</view>
+			</template>
+
+			<template v-if="value.template == 'horizontal-slide'">
+				<scroll-view v-if="value.slideMode == 'scroll'" class="scroll" :scroll-x="true" :show-scrollbar="false">
+					<view class="item" v-for="(item, index) in list" :key="index" @click="toDetail(item)" :class="[value.ornament.type]" :style="goodsItemCss">
+						<view class="img-wrap" :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }">
+							<image :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }" :src="$util.img(item.goods_image, { size: 'mid' })" mode="widthFix" @error="imageError(index)" :lazy-load="true"/>
+							<image class="bg" v-if="value.saleStyle.control && value.template == 'horizontal-slide' && value.style != 'style-2'" :src="$util.img('public/uniapp/bargain/bg.png')" mode="widthFix"/>
+							<view class="num" v-if="value.saleStyle.control && value.template == 'horizontal-slide' && value.style != 'style-2'" :style="{ color: value.theme == 'diy' ? value.saleStyle.color : '' }">
+								已砍{{ item.sale_num }}件
+							</view>
+						</view>
+						<view :class="['content', { 'multi-content': value.nameLineMode == 'multiple' }]"
+							v-if="value.goodsNameStyle.control || value.priceStyle.mainControl || value.priceStyle.lineControl">
+							<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 class="discount-price"
+								v-if="value.priceStyle.mainControl && value.template == 'horizontal-slide' && value.style != 'style-2'">
+								<text class="unit price-style small" :style="{ color: value.theme == 'diy' ? value.priceStyle.mainColor + '!important' : '' }">¥</text>
+								<text class="price price-style large" :style="{ color: value.theme == 'diy' ? value.priceStyle.mainColor + '!important' : '' }">{{ item.floor_price.split('.')[0] }}</text>
+								<text class="unit price-style small" :style="{ color: value.theme == 'diy' ? value.priceStyle.mainColor + '!important' : '' }">{{ '.' + item.floor_price.split('.')[1] }}</text>
+							</view>
+							<view class="original-price price-font" v-if="value.priceStyle.lineControl" :style="{ color: value.theme == 'diy' ? value.priceStyle.lineColor : '' }">
+								¥{{ item.price }}
+							</view>
+						</view>
+					</view>
+				</scroll-view>
+
+				<swiper v-if="value.slideMode == 'slide'" :autoplay="false" class="swiper" :style="{ height: swiperHeight }">
+					<swiper-item v-for="(pageItem, pageIndex) in page" :key="pageIndex" :class="['swiper-item', (list.length && [list[pageIndex].length / 3] >= 1) && 'flex-between']">
+						<view class="item" v-for="(item, dataIndex) in list[pageIndex]" :key="dataIndex" @click="toDetail(item)" :class="[value.ornament.type]" :style="goodsItemCss">
+							<view class="img-wrap" :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }">
+								<image :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }" :src="$util.img(item.goods_image, { size: 'mid' })" mode="widthFix" @error="imageError(dataIndex)" :lazy-load="true"/>
+								<image class="bg" v-if="value.saleStyle.control && value.template == 'horizontal-slide' && value.style != 'style-2'" :src="$util.img('public/uniapp/bargain/bg.png')" mode="widthFix"/>
+								<view class="num" v-if="value.saleStyle.control && value.template == 'horizontal-slide' && value.style != 'style-2'" :style="{ color: value.theme == 'diy' ? value.saleStyle.color : '' }">
+									已砍{{ item.sale_num }}件
+								</view>
+							</view>
+							<view :class="['content', { 'multi-content': value.nameLineMode == 'multiple' }]" v-if="value.goodsNameStyle.control || value.priceStyle.mainControl || value.priceStyle.lineControl">
+								<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 class="discount-price" v-if="value.priceStyle.mainControl && value.template == 'horizontal-slide' && value.style != 'style-2'">
+									<text class="unit price-style small" :style="{ color: value.theme == 'diy' ? value.priceStyle.mainColor + '!important' : '' }">¥</text>
+									<text class="price price-style large" :style="{ color: value.theme == 'diy' ? value.priceStyle.mainColor + '!important' : '' }">{{ item.floor_price.split('.')[0] }}</text>
+									<text class="unit price-style small" :style="{ color: value.theme == 'diy' ? value.priceStyle.mainColor + '!important' : '' }">{{ '.' + item.floor_price.split('.')[1] }}</text>
+								</view>
+								<view class="original-price price-font" v-if="value.priceStyle.lineControl" :style="{ color: value.theme == 'diy' ? value.priceStyle.lineColor : '' }">
+									¥{{ item.price }}
+								</view>
+							</view>
+						</view>
+					</swiper-item>
+				</swiper>
+			</template>
+
+		</view>
+	</x-skeleton>
+</template>
+
+<script>
+	export default {
+		name: 'diy-bargain',
+		props: {
+			value: {
+				type: Object
+			}
+		},
+		data() {
+			return {
+				list: [],
+				page: 1,
+				loading: true,
+				skeletonType: '',
+				skeletonConfig: {}
+			};
+		},
+		components: {},
+		async created() {
+			this.initSkeleton();
+			if (this.value.template == 'row1-of1' && this.value.style == 'style-2') await this.getDataing();
+			this.getData();
+		},
+		watch: {
+			// 组件刷新监听
+			componentRefresh: async function(nval) {
+				if (this.value.template == 'row1-of1' && this.value.style == 'style-2') await this.getDataing();
+				this.getData();
+			}
+		},
+		computed: {
+			warpCss() {
+				var obj = '';
+				if (this.value.componentBgColor) obj += 'background:' + this.value.componentBgColor + ';';
+				if (this.value.componentAngle == 'round') {
+					obj += 'border-top-left-radius:' + this.value.topAroundRadius * 2 + 'rpx;';
+					obj += 'border-top-right-radius:' + this.value.topAroundRadius * 2 + 'rpx;';
+					obj += 'border-bottom-left-radius:' + this.value.bottomAroundRadius * 2 + 'rpx;';
+					obj += 'border-bottom-right-radius:' + this.value.bottomAroundRadius * 2 + 'rpx;';
+				}
+				return obj;
+			},
+			// 商品项样式
+			goodsItemCss() {
+				var obj = '';
+				obj += 'background-color:' + this.value.elementBgColor + ';';
+				if (this.value.elementAngle == 'round') {
+					obj += 'border-top-left-radius:' + this.value.topElementAroundRadius * 2 + 'rpx;';
+					obj += 'border-top-right-radius:' + this.value.topElementAroundRadius * 2 + 'rpx;';
+					obj += 'border-bottom-left-radius:' + this.value.bottomElementAroundRadius * 2 + 'rpx;';
+					obj += 'border-bottom-right-radius:' + this.value.bottomElementAroundRadius * 2 + 'rpx;';
+				}
+				if (this.value.ornament.type == 'shadow') {
+					obj += 'box-shadow:' + '0 0 10rpx ' + this.value.ornament.color + ';';
+				}
+				if (this.value.ornament.type == 'stroke') {
+					obj += 'border:' + '2rpx solid ' + this.value.ornament.color + ';';
+				}
+				const screenWidth = uni.getSystemInfoSync().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);
+					else width = [screenWidth - this.rpxUpPx(20) * 2 - this.rpxUpPx(200) * 3 - this.rpxUpPx(this.value
+						.margin.both * 2) * 2] / 6;
+
+					obj += 'margin-left:' + width + 'px;';
+					obj += 'margin-right:' + width + 'px;';
+				}
+				return obj;
+			},
+			swiperHeight() {
+				if (this.value.nameLineMode == 'multiple') {
+					if (this.value.ornament.type == 'shadow') return '420rpx';
+					else return '400rpx';
+				}
+				if (this.value.ornament.type == 'shadow') return '386rpx';
+				else return '378rpx';
+			}
+		},
+		methods: {
+			initSkeleton() {
+				if (this.value.template == 'row1-of1') {
+
+					// 单列 风格
+					this.skeletonType = 'list';
+					this.skeletonConfig = {
+						textRows: 2
+					};
+
+				} else if (this.value.template == 'horizontal-slide') {
+
+					// 横向滑动 风格
+					this.skeletonType = 'waterfall';
+					this.skeletonConfig = {
+						gridRows: 1,
+						gridColumns: 3,
+						headHeight: '200rpx',
+						textRows: 2,
+						textWidth: ['100%', '80%']
+					};
+
+				}
+			},
+			rpxUpPx(res) {
+				const screenWidth = uni.getSystemInfoSync().windowWidth;
+				var data = (screenWidth * parseInt(res)) / 750;
+				return Math.floor(data);
+			},
+			// 查找自己参与的砍价
+			async getDataing() {
+				var res = await this.$api.sendRequest({
+					url: '/bargain/api/goods/bargainingList',
+					data: {},
+					async: false
+				});
+
+				res.data &&
+					res.data.forEach((item, index) => {
+						item.is_bargaining = 1;
+					});
+				this.list = res.data || [];
+				this.loading = false;
+			},
+			// 查找可砍价的商品
+			getData() {
+				var data = {
+					num: this.value.count,
+					is_exclude_bargaining: 1
+				};
+				if (this.value.sources == 'diy') {
+					data.num = 0;
+					data.id_arr = this.value.goodsId.toString();
+				}
+
+				this.$api.sendRequest({
+					url: '/bargain/api/goods/lists',
+					data: data,
+					success: res => {
+						if (res.code == 0) {
+							if (this.value.template == 'row1-of1' && this.value.style == 'style-2') this.list =
+								this.list.concat(res.data).splice(0, this.value.count);
+							else this.list = res.data;
+
+							// 切屏滚动，每页显示固定数量
+							if (this.value.template == 'horizontal-slide' && this.value.slideMode == 'slide') {
+								let size = 3;
+								let temp = [];
+								this.page = Math.ceil(this.list.length / size);
+								for (var i = 0; i < this.page; i++) {
+									temp[i] = [];
+									for (var j = i * size; j < this.list.length; j++) {
+										if (temp[i].length == size) break;
+										temp[i].push(this.list[j]);
+									}
+								}
+								this.list = temp;
+							}
+						}
+						this.loading = false;
+					}
+				});
+			},
+			progress(data) {
+				// 214 表示当前进度条的宽度
+				let progress = (((parseFloat(data.price) - parseFloat(data.curr_price)) / parseFloat(data.price)) * 214)
+					.toFixed();
+				if (progress == 'NaN') {
+					progress = 0;
+				}
+				return progress;
+			},
+			toDetail(e) {
+				this.$util.redirectTo('/pages_promotion/bargain/detail', {
+					b_id: e.bargain_id
+				});
+			},
+			imageError(index) {
+				this.list[index].goods_image = this.$util.getDefaultImage().goods;
+				this.$forceUpdate();
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	/deep/.uni-scroll-view ::-webkit-scrollbar {
+		/* 隐藏滚动条，但依旧具备可以滚动的功能 */
+		display: none;
+		width: 0;
+		height: 0;
+		color: transparent;
+		background: transparent;
+	}
+
+	/deep/::-webkit-scrollbar {
+		display: none;
+		width: 0;
+		height: 0;
+		color: transparent;
+		background: transparent;
+	}
+
+	scroll-view ::-webkit-scrollbar {
+		width: 0;
+		height: 0;
+		background-color: transparent;
+		touch-action: none;
+	}
+
+	.diy-bargain {
+		overflow: hidden;
+
+		// 头部
+		.bargain-head {
+			&.style-1 {
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				height: 88rpx;
+				box-sizing: border-box;
+				padding: 0 20rpx;
+				background-repeat: no-repeat;
+				background-size: cover;
+				margin-bottom: 20rpx;
+				border-radius: 18rpx 18rpx 0 0;
+
+				.left-img {
+					height: 40rpx;
+					width: 156rpx;
+				}
+
+				.head-content {
+					position: relative;
+					color: #fff;
+					font-size: $font-size-tag;
+					margin-right: auto;
+					margin-left: 20rpx;
+					line-height: 1;
+
+					&::after {
+						content: '';
+						position: absolute;
+						width: 2rpx;
+						height: 24rpx;
+						background-color: #fff;
+						top: 50%;
+						transform: translateY(-50%);
+						left: -12rpx;
+					}
+				}
+
+				.head-right {
+					display: flex;
+					align-items: center;
+					font-size: $font-size-sub;
+					color: #fff;
+				}
+			}
+
+			&.style-2 {
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				height: 88rpx;
+				box-sizing: border-box;
+				padding: 0 20rpx;
+				background-repeat: no-repeat;
+				background-size: cover;
+				margin-bottom: 20rpx;
+				border-radius: 18rpx 18rpx 0 0;
+
+				.left-img {
+					height: 40rpx;
+					width: 156rpx;
+				}
+
+				.head-right {
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					height: 36rpx;
+					background: linear-gradient(270deg, #ffbd5b 0%, #fd882e 100%);
+					border-radius: 24rpx;
+					padding: 2rpx;
+
+					text:nth-child(1) {
+						position: relative;
+						left: 6rpx;
+						transform: scale(0.9);
+					}
+
+					text:nth-child(2) {
+						padding: 6rpx 4rpx 4rpx;
+						background-color: #fff;
+						color: #ffbd5b;
+						border-radius: 50%;
+						transform: scale(0.6);
+						font-weight: bold;
+						line-height: 1;
+					}
+				}
+			}
+		}
+
+		// 商品列表
+		&.row1-of1 {
+			.item {
+				display: flex;
+				margin-bottom: 20rpx;
+				padding: 16rpx;
+
+				&.shadow {
+					margin: 8rpx 8rpx 20rpx 8rpx;
+				}
+
+				&:last-child {
+					margin-bottom: 0;
+					padding-bottom: 20rpx;
+				}
+
+				.img-wrap {
+					width: 200rpx;
+					height: 200rpx;
+
+					>image {
+						width: 200rpx;
+					}
+				}
+
+				.content {
+					flex: 1;
+					display: flex;
+					flex-direction: column;
+					justify-content: space-between;
+					padding: 6rpx 0 6rpx 20rpx;
+
+					.goods-name {
+						&.multi-hidden {
+							line-height: 1.3;
+						}
+					}
+
+					.price-wrap {
+						display: flex;
+						justify-content: space-between;
+						align-items: center;
+					}
+
+					.discount-price {
+						white-space: nowrap;
+						font-weight: bold;
+						line-height: 1;
+
+						.unit {
+							font-size: $font-size-tag;
+							margin-right: 4rpx;
+							color: var(--price-color);
+						}
+
+						.price {
+							font-size: $font-size-toolbar;
+							color: var(--price-color);
+						}
+					}
+
+					button {
+						margin: 0;
+						padding: 0 20rpx;
+						color: var(--btn-text-color);
+						background-color: $base-color;
+						color: #fff;
+						min-width: 112rpx;
+						height: 52rpx;
+						line-height: 52rpx;
+						font-size: $font-size-tag;
+						font-weight: bold;
+					}
+				}
+			}
+
+			&.style-2 {
+				.discount-price {
+					position: relative;
+				}
+
+				.progress {
+					display: flex;
+					flex-direction: column;
+					margin-top: 10rpx;
+					margin-right: 16rpx;
+
+					.bg {
+						margin-left: 6rpx;
+						width: auto;
+						height: 20rpx;
+						border-radius: 20rpx;
+						background-color: #ffeadb;
+						position: relative;
+
+						&::after {
+							content: '';
+							width: 26rpx;
+							height: 26rpx;
+							border-radius: 50%;
+							background-color: #fa1a1a;
+							position: absolute;
+							top: 50%;
+							transform: translateY(-50%);
+							right: -18rpx;
+						}
+
+						.curr {
+							width: 0;
+							height: 20rpx;
+							border-radius: 20rpx;
+							background-color: #fa1a1a;
+							position: relative;
+
+							.progress-bar {
+								position: absolute;
+								right: -20rpx;
+								width: 30rpx;
+								height: 30rpx;
+								max-width: inherit !important;
+								max-height: inherit !important;
+								top: 50%;
+								transform: translateY(-50%);
+								z-index: 1;
+							}
+						}
+					}
+
+					.num {
+						font-size: $font-size-tag;
+						margin-top: 12rpx;
+						line-height: 1;
+
+						text {
+							color: #fa1a1a;
+						}
+					}
+				}
+			}
+
+			&.style-3 {
+				.progress {
+					display: flex;
+					color: $color-tip;
+					font-size: $font-size-sub;
+
+					.num {
+						color: var(--price-color);
+					}
+				}
+
+				.item {
+					.content {
+						justify-content: space-around;
+					}
+
+					.img-wrap {
+						overflow: hidden;
+					}
+				}
+			}
+		}
+
+		&.horizontal-slide {
+			.scroll {
+				width: calc(100% - 40rpx);
+				padding: 20rpx;
+				line-height: 1;
+				white-space: nowrap;
+
+				.item.shadow {
+					margin-bottom: 8rpx;
+				}
+			}
+
+			.flex-between {
+				justify-content: space-between;
+			}
+
+			.item {
+				display: inline-block;
+				width: 200rpx;
+				overflow: hidden;
+				box-sizing: border-box;
+
+				&:nth-child(3n + 3) {
+					width: 198rpx;
+				}
+
+				&.shadow {
+					margin-top: 8rpx;
+				}
+
+				.img-wrap {
+					width: 200rpx;
+					height: 200rpx;
+					position: relative;
+					overflow: hidden;
+					margin: 0 auto;
+
+					>image {
+						width: 100%;
+					}
+
+					.bg {
+						position: absolute;
+						width: 100%;
+						height: 60rpx;
+						bottom: 0;
+						left: 0;
+						z-index: 2;
+					}
+
+					.num {
+						width: 180rpx;
+						position: absolute;
+						bottom: 10rpx;
+						padding-left: 20rpx;
+						font-size: 20rpx;
+						line-height: 1;
+						color: #ffffff;
+						z-index: 3;
+					}
+				}
+
+				.content {
+					padding: 10rpx;
+					display: flex;
+					flex-direction: column;
+					justify-content: space-between;
+
+					&.multi-content {
+						height: 160rpx;
+						box-sizing: border-box;
+					}
+
+					.goods-name {
+						line-height: 1.3;
+
+						&.multi-hidden {
+							white-space: break-spaces;
+						}
+					}
+
+					.discount-price {
+						white-space: nowrap;
+						margin-top: auto;
+						font-weight: bold;
+						line-height: 1;
+
+						.unit {
+							font-size: $font-size-tag;
+							margin-right: 4rpx;
+							color: var(--price-color);
+						}
+
+						.price {
+							font-size: $font-size-toolbar;
+							color: var(--price-color);
+						}
+					}
+
+					.original-price {
+						margin-top: 4rpx;
+						font-size: $font-size-tag;
+						color: $color-tip;
+						line-height: 1;
+						text-decoration: line-through;
+					}
+				}
+			}
+
+			.swiper {
+				padding: 20rpx;
+				width: 100%;
+				white-space: nowrap;
+				box-sizing: border-box;
+
+				.swiper-item {
+					display: flex;
+					align-items: center;
+				}
+
+				.item {
+					width: 200rpx;
+					box-sizing: border-box;
+				}
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/components/diy-components/diy-bottom-nav.vue b/components/diy-components/diy-bottom-nav.vue
new file mode 100644
index 0000000..48a6374
--- /dev/null
+++ b/components/diy-components/diy-bottom-nav.vue
@@ -0,0 +1,293 @@
+<template>
+	<view v-if="tabBarList && tabBarList.list">
+		<view class="tab-bar" :style="{ backgroundColor: tabBarList.backgroundColor }">
+			<view class="tabbar-border"></view>
+			<view class="item" v-for="(item, index) in tabBarList.list" :key="item.id" @click="redirectTo(item.link)">
+				<view class="bd">
+					<block v-if="item.link.wap_url == '/pages/goods/cart'">
+						<view class="icon" v-if="tabBarList.type == 1 || tabBarList.type == 2" :animation="cartAnimation" id="tabbarCart">
+							<block v-if="verify(item.link)">
+								<image v-if="item.selected_icon_type == 'img'" :src="$util.img(item.selectedIconPath)" />
+								<diy-icon v-if="item.selected_icon_type == 'icon'" :icon="item.selectedIconPath" :value="item.selected_style ? item.selected_style : null"></diy-icon>
+							</block>
+							<block v-else>
+								<image v-if="item.icon_type == 'img'" :src="$util.img(item.iconPath)" />
+								<diy-icon v-if="item.icon_type == 'icon'" :icon="item.iconPath" :value="item.style ? item.style : null"></diy-icon>
+							</block>
+							<view class="cart-count-mark font-size-activity-tag"
+								:class="{ max: item.link.wap_url == '/pages/goods/cart' && cartNumber > 99 }"
+								:style="{ background: 'var(--price-color)' }" v-if="cartNumber > 0">
+								{{ cartNumber > 99 ? '99+' : cartNumber }}
+							</view>
+						</view>
+					</block>
+					<block v-else>
+						<view class="icon" v-if="tabBarList.type == 1 || tabBarList.type == 2">
+							<block v-if="verify(item.link)">
+								<image v-if="item.selected_icon_type == 'img'" :src="$util.img(item.selectedIconPath)" />
+								<diy-icon v-if="item.selected_icon_type == 'icon'" :icon="item.selectedIconPath"
+									:value="item.selected_style ? item.selected_style : null"></diy-icon>
+							</block>
+							<block v-else>
+								<image v-if="item.icon_type == 'img'" :src="$util.img(item.iconPath)" />
+								<diy-icon v-if="item.icon_type == 'icon'" :icon="item.iconPath" :value="item.style ? item.style : null"></diy-icon>
+							</block>
+						</view>
+					</block>
+					<view class="label" v-if="(tabBarList.type == 1 || tabBarList.type == 3) && tabBarList.theme == 'diy'" :style="{ color: verify(item.link) ? tabBarList.textHoverColor : tabBarList.textColor }">
+						{{ lang =='en-us'?item.en_text:item.text }}
+					</view>
+					<view class="label" v-if="(tabBarList.type == 1 || tabBarList.type == 3) && tabBarList.theme == 'default'" :style="{ color: verify(item.link) ? 'var(--base-color)' : '#333333' }">
+						{{ lang =='en-us'?item.en_text:item.text }}
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- 解决fixed定位后底部导航栏塌陷问题 -->
+		<view class="tab-bar-placeholder"></view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: 'diy-bottom-nav',
+		props: {
+			value: {
+				type: Object
+			},
+			name: {
+				type: String,
+				default: ''
+			}
+		},
+		data() {
+			return {
+				lang:uni.getStorageSync("lang"),
+				currentRoute: '', //当前页面路径
+				jumpFlag: true, //是否可以跳转，防止重复点击
+				cartAnimation: {}
+			};
+		},
+		mounted() {
+			let currentPage = getCurrentPages()[getCurrentPages().length - 1];
+			if (currentPage && currentPage.route) {
+				this.currentRoute = currentPage.route;
+			}
+			this.$nextTick(() => {
+				if (!this.$store.state.cartPosition) {
+					let query = uni.createSelectorQuery().in(this);
+					query.select('#tabbarCart')
+						.boundingClientRect(data => {
+							if (data) this.$store.commit('setCartPosition', data);
+						}).exec();
+
+					query.select('.tab-bar')
+						.boundingClientRect(data => {
+							if (data) this.$store.commit('setTabBarHeight', data.height +
+								'px');
+						}).exec();
+				}
+			});
+		},
+		computed: {
+			cartChange() {
+				return this.$store.state.cartChange;
+			}
+		},
+		watch: {
+			cartChange: function (nval, oval) {
+				if (nval > oval) {
+					let animation = uni.createAnimation({
+						duration: 200,
+						timingFunction: 'ease'
+					});
+					animation.scale(1.2).step();
+					this.cartAnimation = animation.export();
+					setTimeout(() => {
+						animation.scale(1).step();
+						this.cartAnimation = animation.export();
+					}, 300);
+				}
+			}
+		},
+		methods: {
+			redirectTo(link) {
+				this.$emit('callback');
+				this.$util.diyRedirectTo(link);
+			},
+			verify(link) {
+				if (link == null || link == '' || !link.wap_url) return false;
+				if (this.name) {
+					var url = this.currentRoute + '?name=' + this.name;
+				} else {
+					var url = this.currentRoute;
+				}
+
+				// 首页特殊处理
+				if (link.wap_url == '/pages/index/index' && this.name == 'DIY_VIEW_INDEX') {
+					return true;
+				} else if (url && link.wap_url.indexOf(url) != -1) {
+					return true;
+				}
+				return false;
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	.placeholder {
+		height: 112rpx;
+
+		&.bluge {
+			height: 180rpx;
+		}
+	}
+
+	.safe-area {
+		padding-bottom: 0;
+		padding-bottom: constant(safe-area-inset-bottom);
+		padding-bottom: env(safe-area-inset-bottom);
+	}
+
+	.tab-bar {
+		background-color: #fff;
+		box-sizing: border-box;
+		position: fixed;
+		left: 0;
+		bottom: 0;
+		width: 100%;
+		z-index: 998;
+		display: flex;
+		border-top: 2rpx solid #f5f5f5;
+		padding-bottom: 0;
+		padding-bottom: constant(safe-area-inset-bottom);
+		padding-bottom: env(safe-area-inset-bottom);
+
+		.tabbar-border {
+			background-color: rgba(255, 255, 255, 0.329412);
+			position: absolute;
+			left: 0;
+			top: 0;
+			width: 100%;
+			height: 2rpx;
+			-webkit-transform: scaleY(0.5);
+			transform: scaleY(0.5);
+		}
+
+		.item {
+			display: flex;
+			align-items: center;
+			-webkit-box-orient: vertical;
+			-webkit-box-direction: normal;
+			flex: 1;
+			flex-direction: column;
+			padding-bottom: 10rpx;
+			box-sizing: border-box;
+
+			.bd {
+				position: relative;
+				height: 100rpx;
+				flex-direction: column;
+				text-align: center;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+
+				.icon {
+					position: relative;
+					display: inline-block;
+					margin-top: 10rpx;
+					width: 40rpx;
+					height: 40rpx;
+					font-size: 40rpx;
+					line-height: 40rpx;
+
+					image {
+						width: 100%;
+						height: 100%;
+					}
+
+					>view {
+						height: inherit;
+						display: flex;
+						align-items: center;
+					}
+
+					.bar-icon {
+						font-size: 42rpx;
+					}
+				}
+
+				.label {
+					position: relative;
+					text-align: center;
+					font-size: 24rpx;
+					line-height: 1;
+					margin-top: 12rpx;
+				}
+			}
+
+			&.bulge {
+				.bd {
+					position: relative;
+					height: 100rpx;
+					flex-direction: column;
+					text-align: center;
+
+					.icon {
+						margin-top: -60rpx;
+						margin-bottom: 4rpx;
+						border-radius: 50%;
+						width: 100rpx;
+						height: 102rpx;
+						padding: 10rpx;
+						border-top: 2rpx solid #f5f5f5;
+						background-color: #fff;
+						box-sizing: border-box;
+
+						image {
+							width: 100%;
+							height: 100%;
+							border-radius: 50%;
+						}
+					}
+
+					.label {
+						position: relative;
+						text-align: center;
+						font-size: 24rpx;
+						height: 40rpx;
+						line-height: 40rpx;
+					}
+				}
+			}
+
+			.cart-count-mark {
+				position: absolute;
+				top: -8rpx;
+				right: -18rpx;
+				width: 24rpx;
+				height: 24rpx !important;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				color: #fff;
+				padding: 6rpx;
+				border-radius: 50%;
+				z-index: 99;
+
+				&.max {
+					width: 40rpx;
+					border-radius: 24rpx;
+					right: -28rpx;
+				}
+			}
+		}
+	}
+
+	.tab-bar-placeholder {
+		padding-bottom: calc(constant(safe-area-inset-bottom) + 112rpx);
+		padding-bottom: calc(env(safe-area-inset-bottom) + 112rpx);
+	}
+</style>
\ No newline at end of file
diff --git a/components/diy-components/diy-category-item.vue b/components/diy-components/diy-category-item.vue
new file mode 100644
index 0000000..93e76be
--- /dev/null
+++ b/components/diy-components/diy-category-item.vue
@@ -0,0 +1,1303 @@
+<template>
+	<view class="item-wrap" :class="type">
+		<block v-if="type == 'category' && category.child_list && category.child_list.length">
+			<view class="category-adv" v-if="category.image_adv" @click="diyRedirectTo(category.link_url)">
+				<image :src="$util.img(category.image_adv)" mode="widthFix"/>
+			</view>
+ 
+			<block v-if="value.level == 2">
+				<view class="category-title">{{ category.category_name }}</view>
+				<view class="category-list">
+					<view class="category-item" v-for="(one, oneIndex) in category.child_list" :key="oneIndex" @click="$util.redirectTo('/pages/goods/list', { category_id: one.category_id })">
+						<view class="img-box">
+							<image :src="$util.img(one.image)" mode="widthFix"/>
+						</view>
+						<view class="name">{{ one.category_name }}</view>
+					</view>
+				</view>
+			</block>
+
+			<block v-if="value.level == 3">
+				<block v-for="(one, oneIndex) in category.child_list" :key="oneIndex">
+					<view class="category-title">{{ one.category_name }}</view>
+					<view class="category-list">
+						<view class="category-item" v-for="(two, twoIndex) in one.child_list" :key="twoIndex" @click="$util.redirectTo('/pages/goods/list', { category_id: two.category_id })">
+							<view class="img-box">
+								<image :src="$util.img(two.image)" mode="widthFix" :lazy-load="true"/>
+							</view>
+							<view class="name">{{ two.category_name }}</view>
+						</view>
+					</view>
+				</block>
+			</block>
+		</block>
+
+		<block v-if="type == 'goods'">
+			<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">
+								{{ one.category_name }}
+							</view>
+						</scroll-view>
+						<view class="iconfont icon-unfold" @click="$refs.screenCategoryPopup.open()"></view>
+					</view>
+					<uni-popup type="top" ref="screenCategoryPopup">
+						<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">
+									{{ 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">
+					
+					<!--一级分类展示商品显示-->
+					<view class="category-title" style="font-size: 28rpx;padding-bottom: 0;">{{ category.category_name }}</view>
+					
+					<!--一级-->
+					<view class="goods-list  double-column show" :data-template="value.template">
+						<block v-if="goodsList.length">
+							<view class="goods-item" v-for="(item, index) in goodsList" :key="index" >
+								<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>
+								<view class="info-wrap">
+									<view class="name-wrap" @click="toDetail(item)">
+										<view class="goods-name">{{ item.goods_name }}</view>
+									</view>
+									<view class="price-wrap">
+										<view class="discount-price">
+											<block v-if="item.isinformation == 0">
+												<text class="unit  price-style small">￥</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>
+											</block>
+											<block v-else>
+												<text class="unit  price-style small">咨询</text>
+											</block>
+										</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>
+									<view class="footer-wrap">
+										<view class="pro-info">
+											<view class="delete-price font-size-activity-tag color-tip price-font" v-if="showMarketPrice(item)">
+												<text class="unit">￥</text>
+												<text>{{ showMarketPrice(item) }}</text>
+											</view>
+										</view>
+										<!-- <view class="right-wrap" v-if="value.template == 2 || value.template == 4">
+											<block v-if="item.is_virtual">
+												<view class="color-base-bg select-sku" @click="toDetail(item)">立即购买</view>
+											</block>
+											<block v-else>
+												<view v-if="item.goods_spec_format" class="color-base-bg select-sku" @click="selectSku(item)">
+													<text>选规格</text>
+													<text class="num-tag" v-if="item.num">{{ item.num }}</text>
+												</view>
+												<block v-else>
+													<block v-if="cartList['goods_' + item.goods_id]&&cartList['goods_' + item.goods_id]['sku_' + item.sku_id]">
+														<view class="num-action reduce" @click="reduce(item)">
+															<text class="iconfont icon-jian"></text>
+														</view>
+														<view class="num">{{ cartList['goods_' + item.goods_id]['sku_' + item.sku_id].num }}</view>
+														<view class="num-action" :id="'cart-num-' + index" @click="increase($event, item)">
+															<text class="iconfont icon-jia"></text>
+															<view class="click-event"></view>
+														</view>
+													</block>
+													<view class="num-action" v-else :id="'cart-num-' + index" @click="increase($event, item, 0)">
+														<text class="iconfont icon-jia"></text>
+														<view class="click-event"></view>
+													</view>
+												</block>
+											</block>
+										</view> -->
+									<!-- 	<view class="right-wrap" v-if="value.template == 3">
+											<view class="color-base-bg select-sku" @click="toDetail(item)">立即购买</view>
+										</view> -->
+									</view>
+								</view>
+							</view>
+						</block>
+						<view class="category-empty" v-else>
+							<image :src="$util.img('public/uniapp/category/empty.png')" mode="widthFix"/>
+						</view>
+				<!-- 		<view class="end-tips" ref="endTips" v-if="last && (categoryId == -1 || !category.child_list || (category.child_list && categoryId == category.child_list.length - 1))">已经到底了~</view>
+						<view class="end-tips" ref="endTips" v-else @click="switchCategory('next')">
+							<text class="iconfont icon-xiangshangzhanhang"></text>
+							上滑查看下一分类
+						</view> -->
+					</view>
+					
+					
+					<loading-cover ref="loadingCover" :init-show="loading"></loading-cover>
+				</scroll-view>
+			</view>
+
+			<block v-if="loadType == 'all' && goodsList.length">
+				<view class="goods-list" :data-template="value.template">
+					<view class="goods-item" v-for="(item, index) in goodsList" :key="index">
+						<view class="goods-img" @click="toDetail(item)">
+							<image :src="goodsImg(item.goods_image)" mode="widthFix" @error="imgError(index)" :lazy-load="true"/>
+							<view class="color-base-bg goods-tag" v-if="item.label_name">{{ item.label_name }}</view>
+						</view>
+						<view class="info-wrap">
+							<view class="name-wrap" @click="toDetail(item)">
+								<view class="goods-name">{{ item.goods_name }}</view>
+							</view>
+							<view class="price-wrap">
+								<view class="discount-price">
+									<block v-if="item.isinformation == 0">
+										<text class="unit  price-style small">￥</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>
+									</block>
+									<block v-else>
+										<text class="unit  price-style small">咨询</text>
+									</block>
+								
+								</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>
+							<view class="footer-wrap">
+								<view class="pro-info">
+									<view class="delete-price font-size-activity-tag color-tip price-font" v-if="showMarketPrice(item)">
+										<text class="unit">￥</text>
+										<text>{{ showMarketPrice(item) }}</text>
+									</view>
+								</view>
+								<view class="right-wrap" v-if="value.template == 2">
+									<block v-if="item.is_virtual">
+										<view class="color-base-bg select-sku" @click="toDetail(item)">立即购买</view>
+									</block>
+									<block v-else>
+										<view v-if="item.goods_spec_format" class="color-base-bg select-sku" @click="selectSku(item)">
+											<text>选规格</text>
+											<text class="num-tag" v-if="item.num">{{ item.num }}</text>
+										</view>
+										<block v-else>
+											<block v-if="cartList['goods_' + item.goods_id]&&cartList['goods_' + item.goods_id]['sku_' + item.sku_id]">
+												<view class="num-action reduce" @click="reduce(item)">
+													<text class="iconfont icon-jian"></text>
+												</view>
+												<view class="num">{{ cartList['goods_' + item.goods_id]['sku_' + item.sku_id].num }}</view>
+												<view class="num-action" :id="'cart-num-' + index" @click="increase($event, item)">
+													<text class="iconfont icon-jia"></text>
+													<view class="click-event"></view>
+												</view>
+											</block>
+											<view class="num-action" v-else :id="'cart-num-' + index" @click="increase($event, item, 0)">
+												<text class="iconfont icon-jia"></text>
+												<view class="click-event"></view>
+											</view>
+										</block>
+									</block>
+								</view>
+								<view class="right-wrap" v-if="value.template == 3">
+									<view class="color-base-bg select-sku" @click="toDetail(item)">立即购买</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</block>
+		</block>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: 'diy-category-item',
+		props: {
+			category: {
+				type: Object
+			},
+			value: {
+				type: Object,
+				default: () => {
+					return {};
+				}
+			},
+			index: {
+				type: Number,
+				default: 0
+			},
+			select: {
+				type: Number,
+				default: 0
+			},
+			oneCategorySelect: {
+				type: Number,
+				default: 0
+			},
+			last: {
+				type: Boolean,
+				default: false
+			}
+		},
+		data() {
+			return {
+				type: 'goods',
+				level: 3,
+				categoryId: -1,
+				loading: false,
+				goodsList: [],
+				pageIndex: 0,
+				pageSize: 10,
+				totalPage: 1,
+				touchstartPosition: 0,
+				scrollType: 'top',
+				contentWrapHeight: 0,
+				scrollIntoView: 'category-2--1',
+				scrollTop: 0,
+				loadType: '',
+				timeout: {},
+				cartEditRepeat: false
+			};
+		},
+		created() {
+			this.type = this.value.template == 1 ? 'category' : 'goods';
+			if (this.index == this.select && this.pageIndex == 0) this.getGoodsList();
+			this.loadType = this.value.goodsLevel == 1 && this.value.loadType == 'all' ? 'all' : 'part';
+		},
+		mounted() {
+			setTimeout(() => {
+				const query = uni.createSelectorQuery().in(this);
+				query.select('.scroll-goods-view')
+					.boundingClientRect(data => {
+						if (data) this.contentWrapHeight = data.height;
+					}).exec();
+			}, 1000);
+		},
+		watch: {
+			oneCategorySelect: function() {
+				this.scrollTop = -1;
+				this.goodsList = [];
+				this.selectCategoey(-1);
+			},
+			select: function() {
+				if (this.index == this.select) {
+					this.scrollTop = 0;
+					if (this.pageIndex == 0) {
+						this.getGoodsList();
+					} else if (this.$refs.loadingCover && this.loadType == 'part') {
+						this.$refs.loadingCover.show();
+						setTimeout(() => {
+							this.$refs.loadingCover.hide();
+						}, 300);
+					}
+					if (!this.contentWrapHeight) {
+						const query = uni.createSelectorQuery().in(this);
+						query.select('.scroll-goods-view')
+							.boundingClientRect(data => {
+								if (data) this.contentWrapHeight = data.height;
+							}).exec();
+					}
+				} else if (this.loadType == 'part') {
+					this.scrollTop = -1;
+				}
+			},
+			'globalStoreInfo.store_id': {
+				handler(nval, oval) {
+					if (nval != oval) {
+						if (this.index == this.select || this.loadType == 'all') {
+							this.pageIndex = 0;
+							this.categoryId = -1;
+							this.totalPage = 1;
+							this.getGoodsList();
+						}
+					}
+				},
+				deep: true
+			}
+		},
+		methods: {
+			/**
+			 * 查询商品列表
+			 */
+			getGoodsList() {
+				if (this.type != 'goods' || this.loading || this.pageIndex >= this.totalPage) return;
+				this.loading = true;
+				this.pageIndex++;
+				if (this.$refs.loadingCover && this.pageIndex == 1 && this.loadType == 'part') {
+					setTimeout(() => {
+						this.$refs.loadingCover.show();
+					});
+				}
+
+				let order = '';
+				let sort = '';
+				if (this.value.sortWay) {
+					if (this.value.sortWay == 'default') {
+						// 综合排序
+						order = '';
+						sort = '';
+					} else if (this.value.sortWay == 'sales') {
+						// 销量排序
+						order = 'sale_num';
+						sort = 'desc';
+					} else if (this.value.sortWay == 'price') {
+						// 价格排序
+						order = 'discount_price';
+						sort = 'desc';
+					} else if (this.value.sortWay == 'news') {
+						// 上架时间排序
+						order = 'create_time';
+						sort = 'desc';
+					}
+				}
+				this.$api.sendRequest({
+					url: '/api/goodssku/pageByCategory',
+					data: {
+						page: this.pageIndex,
+						page_size: this.pageSize,
+						category_id: this.categoryId != -1 ? this.category.child_list[this.categoryId]
+							.category_id : this.category.category_id,
+						order: order,
+						sort: sort
+					},
+					success: res => {
+						if (res.code == 0 && res.data) {
+							if (this.pageIndex == 1) this.goodsList = [];
+							//切换英文标题
+							if(uni.getStorageSync("lang") == 'en-us'){
+								// res.data.list.map(item => {
+								//    item.goods_name = item.en_goods_name;
+								//    return item;
+								// });
+							}
+							
+							this.goodsList = this.goodsList.concat(res.data.list);
+							this.loadGoodsCartNum();
+							this.totalPage = res.data.page_count;
+							this.loading = false;
+							if (this.$refs.loadingCover && this.loadType == 'part') this.$refs.loadingCover.hide();
+							setTimeout(() => {
+								if (this.loadType == 'all') this.$emit('loadfinish', this.pageIndex == 1 ? this.index : -1);
+								const query = uni.createSelectorQuery().in(this);
+								query
+									.select('.goods-list')
+									.boundingClientRect(data => {
+										if (data && data.height < this.contentWrapHeight) this
+											.scrollType = 'none';
+									})
+									.exec();
+							}, 500);
+						}
+					}
+				});
+			},
+			/**
+			 * 商品图片处理
+			 * @param {Object} imgStr
+			 */
+			goodsImg(imgStr) {
+				let imgs = imgStr.split(',');
+				return imgs[0] ?
+					this.$util.img(imgs[0], {
+						size: this.value == 3 ? 'big' : 'mid'
+					}) :
+					this.$util.getDefaultImage().goods;
+			},
+			imgError(index) {
+				this.goodsList[index].goods_image = this.$util.getDefaultImage().goods;
+			},
+			showPrice(data) {
+				let price = data.discount_price;
+				if (data.member_price && parseFloat(data.member_price) < parseFloat(price)) price = data.member_price;
+				return price;
+			},
+			showMarketPrice(item) {
+				if (item.market_price_show) {
+					let price = this.showPrice(item);
+					if (item.market_price > 0) {
+						return item.market_price;
+					} else if (parseFloat(item.price) > parseFloat(price)) {
+						return item.price;
+					}
+				}
+				return '';
+			},
+			/**
+			 * 跳转商品详情
+			 * @param {Object} item
+			 */
+			toDetail(item) {
+				this.$util.redirectTo('/pages/goods/detail', {
+					goods_id: item.goods_id
+				});
+			},
+			/**
+			 * 购物车数量增加
+			 */
+			increase(event, data) {
+				if (!this.storeToken) {
+					this.$emit('tologin');
+					return;
+				}
+
+				if (this.cartEditRepeat) return;
+
+				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';
+				let minBuy = data.min_buy > 0 ? data.min_buy - 1 : 0;
+				let num = cartNum >= data.min_buy ? cartNum : minBuy;
+				let _num = num + 1;
+				let cart_id = cart ? cart.cart_id : 0;
+
+				if (_num > parseInt(data.stock)) {
+					this.$util.showToast({
+						title: '商品库存不足'
+					});
+					return;
+				}
+				if (data.is_limit && data.max_buy && _num > parseInt(data.max_buy)) {
+					this.$util.showToast({
+						title: `该商品每人限购${data.max_buy}${data.unit || '件'}`
+					});
+					return;
+				}
+
+				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();
+
+				if (this.timeout[data.sku_id]) clearTimeout(this.timeout[data.sku_id]);
+
+				if (cart) {
+					this.cartList['goods_' + data.goods_id]['sku_' + data.sku_id].num = _num;
+				} else {
+
+					// 如果商品第一次添加，则初始化数据
+					if (!this.cartList['goods_' + data.goods_id]) {
+						this.cartList['goods_' + data.goods_id] = {};
+					}
+
+					let discount_price = data.discount_price;
+					if (data.member_price > 0 && Number(data.member_price) <= Number(data.discount_price)) {
+						discount_price = data.member_price;
+					}
+
+					this.cartList['goods_' + data.goods_id]['sku_' + data.sku_id] = {
+						cart_id,
+						goods_id: data.goods_id,
+						sku_id: data.sku_id,
+						num: _num,
+						discount_price
+					};
+				}
+
+				this.$forceUpdate();
+
+				this.timeout[data.sku_id] = setTimeout(() => {
+					this.cartEditRepeat = true;
+					this.$api.sendRequest({
+						url: api,
+						data: {
+							cart_id,
+							sku_id: data.sku_id,
+							num: _num
+						},
+						success: res => {
+							this.cartEditRepeat = false;
+							if (res.code == 0) {
+								if (cart_id == 0) {
+									this.cartList['goods_' + data.goods_id]['sku_' + data.sku_id].cart_id = res.data;
+								}
+								this.$store.dispatch('cartCalculate');
+							} else {
+								this.$util.showToast({
+									title: res.message
+								});
+							}
+						}
+					});
+				}, 800);
+			},
+			/**
+			 * 购物车数量减少
+			 */
+			reduce(data) {
+				if (this.cartEditRepeat) return;
+
+				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 num = cart.num > data.min_buy ? cart.num : 1;
+				let api = num > 1 ? '/api/cart/edit' : '/api/cart/delete';
+				let _num = num - 1;
+
+				if (this.timeout[data.sku_id]) clearTimeout(this.timeout[data.sku_id]);
+
+				if (_num) {
+					this.cartList['goods_' + data.goods_id]['sku_' + data.sku_id].num = _num;
+				} else {
+					delete this.cartList['goods_' + data.goods_id]['sku_' + data.sku_id];
+					if (Object.keys(this.cartList['goods_' + data.goods_id]).length == 2) {
+						delete this.cartList['goods_' + data.goods_id];
+					}
+				}
+				this.$forceUpdate();
+
+				// 防止点击太快
+				if (cart && cart.cart_id == 0) {
+					return;
+				}
+
+				this.timeout[data.sku_id] = setTimeout(() => {
+					this.cartEditRepeat = true;
+					this.$api.sendRequest({
+						url: api,
+						data: {
+							cart_id: cart.cart_id,
+							sku_id: data.sku_id,
+							num: _num
+						},
+						success: res => {
+							this.cartEditRepeat = false;
+							if (res.code == 0) {
+								this.$store.dispatch('cartCalculate');
+							} else {
+								this.$util.showToast({
+									title: res.message
+								});
+							}
+						}
+					});
+				}, 800);
+			},
+			/**
+			 * 选择规格
+			 * @param {Object} data
+			 */
+			selectSku(data) {
+				if (!this.storeToken) {
+					this.$emit('tologin');
+					return;
+				}
+				this.$emit('selectsku', data);
+			},
+			selectCategoey(index) {
+				this.categoryId = index;
+				this.pageIndex = 0;
+				this.totalPage = 1;
+				this.getGoodsList();
+				setTimeout(() => {
+					this.scrollIntoView = 'category-2-' + index;
+				});
+			},
+			/**
+			 * 滚动到底部加载
+			 */
+			scrolltolower() {
+				this.getGoodsList();
+			},
+			/**
+			 * 监听滚动
+			 * @param {Object} e
+			 */
+			listenScroll(e) {
+				if (e.detail.scrollTop <= 10) {
+					this.scrollType = 'top';
+				} else if (parseInt(e.detail.scrollTop + this.contentWrapHeight + 30) >= e.detail.scrollHeight) {
+					this.scrollType = 'bottom';
+				} else {
+					this.scrollType = '';
+				}
+			},
+			/**
+			 * 触摸开始
+			 * @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} action
+			 */
+			switchCategory(action) {
+				if (action == 'prev') {
+					if (this.categoryId == -1) {
+						let index = this.index - 1;
+						if (index == -1) return;
+						this.$emit('switch', index);
+					} else {
+						let index = this.categoryId - 1;
+						this.selectCategoey(index);
+					}
+				} else {
+					if (this.categoryId == -1 || (this.category.child_list && this.categoryId == this.category.child_list.length - 1)) {
+						let index = this.index + 1;
+						this.$emit('switch', index);
+					} else {
+						let index = this.categoryId + 1;
+						this.selectCategoey(index);
+					}
+				}
+			},
+			diyRedirectTo(link) {
+				if (!link) return;
+				this.$util.diyRedirectTo(JSON.parse(link));
+			},
+			//加载商品在购物车的总数量
+			loadGoodsCartNum(isRefresh = false) {
+				this.goodsList.forEach((item) => {
+					item.num = this.cartList['goods_' + item.goods_id] ? this.cartList['goods_' + item.goods_id].num : 0;
+				})
+				if (isRefresh) this.$forceUpdate();
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	.small{
+		font-size: 28rpx !important;
+	}
+	.item-wrap {
+		width: 100%;
+		box-sizing: border-box;
+		padding: 0 0rpx;
+
+		&.goods {
+			height: 100%;
+		}
+	}
+
+	.category-title {
+		padding: 20rpx 0;
+		font-size: 26rpx;
+		// font-weight: bold;
+		color: #222;
+		position: relative;
+		text-align: left;
+		padding-left: 30rpx;
+		// &::after,
+		// &::before {
+		// 	content: ' ';
+		// 	width: 46rpx;
+		// 	border-top: 2rpx solid #dfdfdf;
+		// 	position: absolute;
+		// 	top: 50%;
+		// }
+
+		&::after {
+			margin-left: 40rpx;
+		}
+
+		&::before {
+			margin-left: -80rpx;
+		}
+	}
+
+	.category-adv {
+		width: 100%;
+		overflow: hidden;
+		line-height: 1;
+		padding: 20rpx 0;
+
+		image {
+			width: 100%;
+			border-radius: 8rpx;
+		}
+	}
+
+	.category-list {
+		display: flex;
+		flex-wrap: wrap;
+		background: #fff;
+		margin: 0 20rpx;
+		border-radius: 10rpx;
+		padding: 10rpx 0;
+		.category-item {
+			width: 33.33%;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			justify-content: center;
+			padding: 16rpx;
+			box-sizing: border-box;
+
+			.img-box {
+				width: 80%;
+				padding-top: 80%;
+				margin: 0 auto;
+				overflow: hidden;
+				margin-bottom: 20rpx;
+				position: relative;
+
+				image {
+					position: absolute;
+					width: 100%;
+					left: 50%;
+					top: 50%;
+					transform: translate(-50%, -50%);
+				}
+			}
+
+			.name {
+				width: 100%;
+				text-overflow: ellipsis;
+				overflow: hidden;
+				white-space: nowrap;
+				text-align: center;
+				line-height: 1;
+
+				font-size: 24rpx;
+			}
+		}
+	}
+
+	.goods-list {
+		/*双列*/
+		display: none;
+		margin: 0 24rpx;
+		padding-top: $margin-updown;
+		position: relative;
+		flex-wrap: wrap;
+		justify-content: space-between;
+		
+		&.show {
+			display: flex;
+		}
+		.goods-item {
+			display: flex;
+			flex-direction: column;
+			width: calc(50% - 10rpx);
+			border-radius: $border-radius;
+			overflow: hidden;
+			background-color: #fff;
+			margin-bottom: 20rpx;
+			&:nth-child(2n + 2) {
+				margin-right: 0;
+			}
+		
+			.goods-img {
+				position: relative;
+				overflow: hidden;
+				padding-top: 100%;
+				border-top-left-radius: $border-radius;
+				border-top-right-radius: $border-radius;
+		
+				image {
+					width: 100%;
+					position: absolute !important;
+					top: 50%;
+					left: 0;
+					transform: translateY(-50%);
+				}
+			}
+		
+			.goods-tag {
+				color: #fff;
+				line-height: 1;
+				padding: 8rpx 16rpx;
+				position: absolute;
+				border-bottom-right-radius: $border-radius;
+				top: 0;
+				left: 0;
+				font-size: $font-size-goods-tag;
+			}
+		
+			.goods-tag-img {
+				position: absolute;
+				border-top-left-radius: $border-radius;
+				width: 80rpx;
+				height: 80rpx;
+				top: 0;
+				left: 0;
+				z-index: 5;
+				overflow: hidden;
+		
+				image {
+					width: 100%;
+					height: 100%;
+				}
+			}
+		
+			.info-wrap {
+				padding: 0 20rpx;
+				display: flex;
+				flex-direction: column;
+				flex: 1;
+			}
+		
+			.goods-name {
+				font-size: $font-size-base;
+				line-height: 1.3;
+				margin-top: 20rpx;
+			    white-space: nowrap;
+			    overflow: hidden; 
+			    text-overflow: ellipsis;
+			}
+		
+			.lineheight-clear {
+				margin-top: 16rpx;
+			}
+		
+			.discount-price {
+				display: inline-block;
+				font-weight: bold;
+				line-height: 1;
+		
+				.unit {
+					margin-right: 6rpx;
+					color: var(--price-color);
+				}
+				.price {
+					color: var(--price-color);
+				}
+			}
+		
+			.pro-info {
+				display: flex;
+				margin-top: auto;
+				align-items: center;
+		
+				.block-wrap {
+					flex: 1;
+					line-height: 1;
+					margin-right: 20rpx;
+					.sale {
+						font-size: $font-size-tag !important;
+					}
+				}
+			}
+		
+			.delete-price {
+				// display: inline-block;
+				// margin-left: 6rpx;
+				// float: right;
+				.unit {
+					margin-right: 6rpx;
+				}
+				text {
+					line-height: 1;
+					font-size: $font-size-tag !important;
+				}
+			}
+		
+			.member-price-tag {
+				display: inline-block;
+				width: 60rpx;
+				line-height: 1;
+				margin-left: 6rpx;
+		
+				image {
+					width: 100%;
+				}
+			}
+			.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: 250rpx;
+				}
+			}
+		}
+		/**/
+		/*.goods-item {
+			padding: 0 0 26rpx 0;
+			background: #fff;
+			display: flex;
+			position: relative;
+
+			.goods-img {
+				width: 180rpx;
+				height: 180rpx;
+				overflow: hidden;
+				border-radius: $border-radius;
+				margin-right: 14rpx;
+
+				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: 0;
+				left: 0;
+				font-size: $font-size-goods-tag;
+			}
+
+			.goods-tag-img {
+				position: absolute;
+				border-top-left-radius: $border-radius;
+				width: 80rpx;
+				height: 80rpx;
+				top: 26rpx;
+				left: 26rpx;
+				z-index: 5;
+				overflow: hidden;
+
+				image {
+					width: 100%;
+					height: 100%;
+				}
+			}
+
+			.info-wrap {
+				flex: 1;
+				display: flex;
+				flex-direction: column;
+				width: 0;
+			}
+
+			.name-wrap {
+				flex: 1;
+			}
+
+			.goods-name {
+				font-size: $font-size-base;
+				line-height: 1.3;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				display: -webkit-box;
+				-webkit-line-clamp: 2;
+				-webkit-box-orient: vertical;
+			}
+
+			.introduction {
+				line-height: 1;
+				margin-top: 10rpx;
+			}
+
+			.discount-price {
+				display: inline-block;
+				font-weight: bold;
+				line-height: 1;
+				margin-top: 16rpx;
+				color: var(--price-color);
+
+				.unit {
+					margin-right: 6rpx;
+				}
+			}
+
+			.pro-info {
+				display: flex;
+				margin-top: 16rpx;
+
+				.delete-price {
+					text-decoration: line-through;
+					flex: 1;
+
+					.unit {
+						margin-right: 0rpx;
+					}
+				}
+
+				&>view {
+					line-height: 1;
+
+					&:nth-child(2) {
+						text-align: right;
+					}
+				}
+			}
+
+			.member-price-tag {
+				display: inline-block;
+				width: 60rpx;
+				line-height: 1;
+				margin-left: 6rpx;
+				height: 28rpx;
+
+				image {
+					width: 100%;
+					height: 100%;
+				}
+			}
+
+			.footer-wrap {
+				display: flex;
+				justify-content: space-between;
+
+				.right-wrap {
+					display: flex;
+					align-items: center;
+					justify-content: end;
+
+					.num {
+						width: auto;
+						padding: 0 20rpx;
+						line-height: 1;
+					}
+
+					.num-action {
+						display: flex;
+						align-items: center;
+						justify-content: center;
+						width: 40rpx;
+						height: 40rpx;
+						background: $base-color;
+						border-radius: 50%;
+						position: relative;
+
+						.click-event {
+							position: absolute;
+							width: 2rpx;
+							height: 2rpx;
+							left: 0;
+							top: 0;
+							transform: translate(-50%, -50%);
+							z-index: 5;
+						}
+
+						&.reduce {
+							width: 38rpx;
+							height: 38rpx;
+							background-color: transparent;
+							border: 2rpx solid $base-color;
+							box-sizing: border-box;
+
+							.icon-jian {
+								color: $base-color;
+							}
+						}
+					}
+
+					.icon-jian,
+					.icon-jia {
+						color: var(--btn-text-color);
+						font-weight: bold;
+						font-size: 26rpx;
+						line-height: 1;
+					}
+
+					.select-sku {
+						font-weight: bold;
+						color: var(--btn-text-color);
+						font-size: 24rpx;
+						padding: 16rpx 24rpx;
+						position: relative;
+						// height: 40rpx;
+						line-height: 1;
+						text-align: center;
+						border-radius: 50rpx;
+
+						.num-tag {
+							position: absolute;
+							top: 0;
+							right: 0;
+							transform: translateY(-50%);
+							display: inline-block;
+							box-sizing: border-box;
+							color: #fff;
+							line-height: 1.2;
+							text-align: center;
+							font-size: 24rpx;
+							padding: 0 6rpx;
+							min-width: 32rpx;
+							border-radius: 16rpx;
+							background-color: $base-color;
+							border: 2rpx solid #fff;
+						}
+					}
+				}
+			}
+		}*/
+
+		&[data-template='3'] .goods-item {
+			flex-direction: column;
+
+			.info-wrap {
+				width: 100%;
+				margin-top: 12rpx;
+			}
+
+			.goods-img {
+				width: 100%;
+				height: auto;
+				margin-right: 0;
+				line-height: 1;
+
+				image {
+					border-radius: 8rpx;
+				}
+			}
+
+			.select-sku {
+				font-weight: bold;
+				width: 128rpx;
+				height: 52rpx !important;
+				line-height: 52rpx !important;
+			}
+		}
+	}
+
+	.categoty-goods-wrap {
+		display: flex;
+		flex-direction: column;
+		height: 100%;
+
+		.scroll-goods-view {
+			flex: 1;
+			height: 0;
+			transform: translateX(0px);
+		}
+	}
+
+	.screen-category-wrap {
+		display: flex;
+
+		.icon-unfold {
+			font-size: 24rpx;
+			color: #999;
+			padding: 0 0 0 20rpx;
+		}
+	}
+
+	.screen-category {
+		flex: 1;
+		width: 0;
+		padding: 0 0 20rpx 0;
+		white-space: nowrap;
+		height: 60rpx;
+
+		.item {
+			display: inline-block;
+			padding: 4rpx 24rpx;
+			background: #f5f5f5;
+			color: #666;
+			margin-right: 20rpx;
+			border-radius: 40rpx;
+
+			&.selected {
+				background-color: $base-color;
+				color: var(--btn-text-color);
+			}
+		}
+	}
+
+	/deep/ .uni-popup__wrapper-box {
+		border-radius: 0;
+	}
+
+	.screen-category-popup {
+		display: flex;
+
+		.screen-category {
+			white-space: break-spaces;
+			padding: 20rpx;
+			height: auto;
+		}
+
+		.title {
+			line-height: 1;
+			margin-bottom: 20rpx;
+			font-weight: bold;
+		}
+
+		.item {
+			margin-bottom: 20rpx;
+		}
+	}
+
+	.end-tips {
+		text-align: center;
+		color: #999;
+		font-size: 24rpx;
+		padding: 30rpx 0 30rpx 0;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+
+	/deep/ .loading-layer {
+		background: #fff !important;
+	}
+
+	.category-empty {
+		flex: 1;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		flex-direction: column;
+		padding-top: 100rpx;
+
+		image {
+			width: 280rpx;
+			height: 252rpx;
+		}
+
+		.tips {
+			font-size: 26rpx;
+			font-weight: 500;
+			color: #999;
+			margin-top: 50rpx;
+		}
+	}
+
+	.screen-category-4 .item {
+		background-color: #f2f2f2 !important;
+		padding: 10rpx 24rpx;
+		line-height: 1;
+		font-size: $font-size-tag;
+
+		&.selected {
+			background-color: var(--main-color-shallow) !important;
+			color: var(--main-color);
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/components/diy-components/diy-category.vue b/components/diy-components/diy-category.vue
new file mode 100644
index 0000000..5ce0a35
--- /dev/null
+++ b/components/diy-components/diy-category.vue
@@ -0,0 +1,1007 @@
+<template>
+	<view :class="['category-page-wrap', 'category-template-' + value.template]"
+		:style="{height: 'calc(100vh - '+ tabBarHeight +')' }">
+		<!-- #ifdef MP-WEIXIN -->
+		<!-- <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" />
+					<text class="iconfont icon-sousuo3"></text>
+				</view>
+			</view>
+			<view :style="navbarInnerStyle" v-if="!value.search">商品分类</view>
+		</block> -->
+		<block v-if="value.template != 4">
+<!-- 			<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" />
+					<text class="iconfont icon-sousuo3"></text>
+				</view>
+			</view>
+		</block>
+		<!-- #endif -->
+		<!-- #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" />
+				<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)">
+					<view class="image-warp" :class="[{ 'color-base-border': oneCategorySelect == index }]">
+						<image :src="$util.img(item.image)" mode="aspectFill"/>
+					</view>
+					<view :class="['text', { 'color-base-bg': oneCategorySelect == index }]">{{ item.category_name }}</view>
+				</view>
+			</scroll-view>
+			<view class="category-item-all" @click="$refs.templateFourPopup.open()">
+				<view class="category-item-all-wrap">
+					<text class="text">展开</text>
+					<image class="img" :src="$util.img('/public/uniapp/category/unfold.png')" mode="aspectFill"></image>
+				</view>
+			</view>
+			<uni-popup type="top" ref="templateFourPopup" :top="uniPopupTop">
+				<view class="template-four-popup">
+					<scroll-view scroll-y="true" class="template-four-scroll" enable-flex="true">
+						<view class="item" :class="{ selected: oneCategorySelect == index }" @click="templateFourOneFn(index)" v-for="(item, index) in templateFourData" :key="index">
+							<view class="image-warp" :class="[{ 'color-base-border': oneCategorySelect == index }]">
+								<image :src="$util.img(item.image)" mode="aspectFill"></image>
+							</view>
+							<view :class="['text', { 'color-base-bg': oneCategorySelect == index }]">{{ item.category_name }}</view>
+						</view>
+					</scroll-view>
+					<view class="pack-up" @click="$refs.templateFourPopup.close()">
+						<text>点击收起</text>
+						<text class="iconfont icon-iconangledown-copy"></text>
+					</view>
+				</view>
+			</uni-popup>
+		</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 },
+								{ '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>
+					</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"
+						refresher-default-style="none" :refresher-triggered="triggered" @refresherrefresh="onRefresh"
+						@refresherrestore="onRestore">
+						<view class="child-category" v-for="(item, index) in categoryTree" :key="index" :id="'category-' + index">
+							<diy-category-item :category="item" :value="value" ref="categoryItem" :index="index"
+								:select="select" :oneCategorySelect="oneCategorySelect" @tologin="toLogin"
+								@selectsku="selectSku($event, index)" @addCart="addCartPoint"
+								@loadfinish="getHeightArea"></diy-category-item>
+						</view>
+						<view class="end-tips" ref="endTips" :style="{ opacity: endTips }">已经到底了~</view>
+					</scroll-view>
+
+					<view class="content-wrap"
+						v-if="(value.template == 2 || value.template == 3 || value.template == 4) && loadType == 'part'">
+						<view class="child-category-wrap" v-for="(item, index) in categoryTree" :key="index"
+							:id="'category-' + index" :style="{ display: select == index ? 'block' : 'none' }">
+							<diy-category-item :category="item" :value="value" ref="categoryItem" :index="index"
+								:last="index == categoryTree.length - 1 ? true : false" :select="select"
+								:oneCategorySelect="oneCategorySelect" @tologin="toLogin"
+								@selectsku="selectSku($event, index)" @addCart="addCartPoint"
+								@switch="switchOneCategory"></diy-category-item>
+						</view>
+					</view>
+				</view>
+			</block>
+			<view class="category-empty" v-else>
+				<image :src="$util.img('public/uniapp/category/empty.png')" mode="widthFix"></image>
+				<view class="tips">暂时没有分类哦！</view>
+			</view>
+		</view>
+		<view class="category-empty" v-else>
+			<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="left-wrap">
+				<view class="cart-icon" ref="cartIcon" :animation="cartAnimation" @click="$util.redirectTo('/pages/goods/cart')">
+					<text class="iconfont icon-ziyuan1"></text>
+					<view class="num" v-if="cartNumber">{{ cartNumber < 99 ? cartNumber : '99+' }}</view>
+				</view>
+				<view class="price">
+					<text class="title">总计：</text>
+					<text class="unit font-size-tag price-font">￥</text>
+					<text class="money font-size-toolbar price-font">{{ cartTotalMoney[0] }}</text>
+					<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>
+		</view> -->
+
+		<view class="cart-point" :style="{ left: item.left + 'px', top: item.top + 'px' }" :key="index" v-for="(item, index) in carIconList"></view>
+
+		<ns-goods-sku-category ref="skuSelect" @refresh="refreshData" @addCart="addCartPoint"></ns-goods-sku-category>
+	</view>
+</template>
+
+<script>
+	// 获取系统状态栏的高度
+	let systemInfo = uni.getSystemInfoSync();
+	let menuButtonInfo = {};
+	// 如果是小程序，获取右上角胶囊的尺寸信息，避免导航栏右侧内容与胶囊重叠(支付宝小程序非本API，尚未兼容)
+	// #ifdef MP-WEIXIN || MP-BAIDU || MP-TOUTIAO || MP-QQ
+	menuButtonInfo = uni.getMenuButtonBoundingClientRect();
+	// #endif
+
+	import nsGoodsSkuCategory from '@/components/ns-goods-sku/ns-goods-sku-category.vue';
+	var contentWrapHeight, query, cartPosition;
+	export default {
+		components: {
+			nsGoodsSkuCategory
+		},
+		name: 'diy-category',
+		props: {
+			value: {
+				type: Object,
+				default: () => {
+					return {};
+				}
+			}
+		},
+		data() {
+			return {
+				oneCategorySelect: 0,
+				select: 0,
+				categoryId: 'category-0',
+				categoryTree: null,
+				scrollLock: false,
+				triggered: true,
+				heightArea: [],
+				isSub: false,
+				carIconList: {},
+				endTips: 0,
+				cartAnimation: {},
+				loadType: '',
+				templateFourData: [],
+				lang:uni.getStorageSync("lang")//en-us 英文
+			};
+		},
+		created() {
+			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();
+			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();
+				if (this.value.template == 1) this.getHeightArea(-1);
+			}, 500);
+		},
+		watch: {
+			// 组件刷新监听
+			componentRefresh: function(nval) {}
+		},
+		computed: {
+			cartTotalMoney() {
+				let money = parseFloat(this.cartMoney).toFixed(2);
+				return money.split('.');
+			},
+			// 转换字符数值为真正的数值
+			navbarHeight() {
+				// #ifdef APP-PLUS || H5
+				return 44;
+				// #endif
+				// #ifdef MP
+				// 小程序特别处理，让导航栏高度 = 胶囊高度 + 两倍胶囊顶部与状态栏底部的距离之差(相当于同时获得了导航栏底部与胶囊底部的距离)
+				// 此方法有缺陷，暂不用(会导致少了几个px)，采用直接固定值的方式
+				// return menuButtonInfo.height + (menuButtonInfo.top - this.navbarHeight) * 2;//导航高度
+				// let height = systemInfo.platform == 'ios' ? 44 : 48;
+				let height = menuButtonInfo.top;
+				// height += systemInfo.navbarHeight;
+				return height;
+				// #endif
+			},
+			// 导航栏内部盒子的样式
+			navbarInnerStyle() {
+				let style = '';
+				// 导航栏宽度，如果在小程序下，导航栏宽度为胶囊的左边到屏幕左边的距离
+				// style += 'height:' + this.navbarHeight + 'px;';
+				// // 如果是各家小程序，导航栏内部的宽度需要减少右边胶囊的宽度
+				// #ifdef MP
+				if (this.value.template == 4 && this.value.search) {
+					style += 'height:' + menuButtonInfo.height + 'px;';
+					let rightButtonWidth = menuButtonInfo.width ? menuButtonInfo.width * 2 + 'rpx' : '70rpx';
+					style += 'padding-right:calc(' + rightButtonWidth + ' + 30rpx);';
+					style += 'padding-top:' + this.navbarHeight + 'px;';
+				}
+				// #endif
+				if (this.value.template != 4 || (this.value.template == 4 && !this.value.search)) {
+					style += 'height:' + menuButtonInfo.height * 2 + 'rpx;';
+					style += 'padding-top:' + this.navbarHeight + 'px;';
+					style += 'text-align: center;';
+					style += 'line-height:' + menuButtonInfo.height * 2 + 'rpx;';
+					style += 'font-size: 14px;';
+					style += 'padding-bottom: 10rpx;';
+				}
+				return style;
+			},
+			wxSearchHeight() {
+				let style = '';
+				// #ifdef MP
+				style += 'height: 64rpx;';
+				// #endif
+				return style;
+			},
+			uniPopupTop() {
+				let top = 0;
+				// #ifdef MP
+				top = this.navbarHeight + menuButtonInfo.height + 'px';
+				// #endif
+
+				// #ifdef H5
+				top = '100rpx';
+				// #endif
+
+				return top;
+			}
+		},
+		methods: {
+			/**
+			 * 页面显示
+			 */
+			pageShow() {
+				this.$store.dispatch('getCartNumber');
+				if (!this.heightArea.length) this.getHeightArea(-1);
+			},
+			/**
+			 * 获取高度区间
+			 */
+			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();
+				this.heightArea = heightArea;
+				if (index != -1 && index < this.categoryTree.length - 1) this.$refs.categoryItem[index + 1].getGoodsList();
+			},
+			/**
+			 * 获取全部分类
+			 */
+			getCategoryTree() {
+				this.$api.sendRequest({
+					url: '/api/goodscategory/tree',
+					data: {
+						level: 3
+					},
+					success: res => {
+						if (res.code == 0) {
+							
+							this.categoryTree = res.data;
+							if (this.value.template == 4) {
+								this.templateFourData = JSON.parse(JSON.stringify(this.categoryTree));
+								this.categoryTree = this.templateFourData[0].child_list;
+							}
+							//切换英文标题
+							if(this.lang == 'en-us'){
+								this.categoryTree.map(item => {
+									item.child_list.map(items => {
+										items.category_name = items.en_category_name;
+										return items;
+									})
+								  item.category_name = item.en_category_name;
+								  return item;
+								});
+							}
+						}
+					}
+				});
+			},
+			/**
+			 * 切换一级分类
+			 * @param {Object} index
+			 */
+			switchOneCategory(index) {
+				if (index >= this.categoryTree.length) return;
+				this.select = index;
+				this.categoryId = 'category-' + index;
+				// 阻止切换分类之后滚动事件也立即执行
+				this.scrollLock = true;
+			},
+			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();
+					}
+				}
+			},
+			onRefresh() {
+				this.triggered = false;
+			},
+			onRestore() {
+				this.triggered = 'restore'; // 需要重置
+			},
+			toLogin() {
+				this.$emit('tologin');
+			},
+			/**
+			 * sku选择
+			 * @param {Object} data
+			 * @param {Object} index
+			 */
+			selectSku(data, index) {
+				this.$api.sendRequest({
+					url: '/api/goodssku/getInfoForCategory',
+					data: {
+						sku_id: data.sku_id
+					},
+					success: res => {
+						if (res.code >= 0) {
+							let item = res.data;
+							item.unit = item.unit || '件';
+
+							if (item.sku_images) item.sku_images = item.sku_images.split(',');
+							else item.sku_images = [];
+
+							// 多规格时合并主图
+							if (item.goods_spec_format && item.goods_image) {
+								item.goods_image = item.goods_image.split(',');
+								item.sku_images = item.goods_image.concat(item.sku_images);
+							}
+
+							// 当前商品SKU规格
+							if (item.sku_spec_format) item.sku_spec_format = JSON.parse(item.sku_spec_format);
+
+							// 商品SKU格式
+							if (item.goods_spec_format) item.goods_spec_format = JSON.parse(item.goods_spec_format);
+
+							// 限时折扣
+							if (item.promotion_type == 1) {
+								item.discountTimeMachine = this.$util.countDown(item.end_time - res.timestamp);
+							}
+
+							if (item.promotion_type == 1 && item.discountTimeMachine) {
+								if (item.member_price > 0 && Number(item.member_price) <= Number(item.discount_price)) {
+									item.show_price = item.member_price;
+								} else {
+									item.show_price = item.discount_price;
+								}
+							} else if (item.member_price > 0) {
+								item.show_price = item.member_price;
+							} else {
+								item.show_price = item.price;
+							}
+
+							this.$refs.skuSelect.show(item);
+						}
+					}
+				});
+			},
+			settlement() {
+				if (!this.cartIds.length || this.isSub) return;
+				this.isSub = true;
+
+				uni.removeStorageSync('delivery');
+				uni.setStorage({
+					key: 'orderCreateData',
+					data: {
+						cart_ids: this.cartIds.toString()
+					},
+					success: () => {
+						this.$util.redirectTo('/pages/order/payment');
+						this.isSub = false;
+					}
+				});
+			},
+			/**
+			 * 添加点
+			 * @param {Object} left
+			 * @param {Object} top
+			 */
+			addCartPoint(left, top) {
+				if (this.value.template != 2 && !this.value.quickBuy) return;
+
+				let key = new Date().getTime();
+				this.$set(this.carIconList, key, {
+					left: left,
+					top: top,
+					index: 0,
+					bezierPos: this.$util.bezier([{
+							x: left,
+							y: top
+						}, {
+							x: left - 200,
+							y: left - 120
+						},
+						{
+							x: cartPosition.left + 10,
+							y: cartPosition.top
+						}
+					], 6).bezier_points,
+					timer: null
+				});
+				this.startAnimation(key);
+			},
+			/**
+			 * 执行动画
+			 * @param {Object} key
+			 */
+			startAnimation(key) {
+				let bezierPos = this.carIconList[key].bezierPos,
+					index = this.carIconList[key].index;
+
+				this.carIconList[key].timer = setInterval(() => {
+					if (index < 6) {
+						this.carIconList[key].left = bezierPos[index].x;
+						this.carIconList[key].top = bezierPos[index].y;
+						index++;
+					} else {
+						clearInterval(this.carIconList[key].timer);
+						delete this.carIconList[key];
+						this.$forceUpdate();
+
+						// 购物车图标
+						setTimeout(() => {
+							this.$store.commit('setCartChange');
+						}, 100);
+						let animation = uni.createAnimation({
+							duration: 200,
+							timingFunction: 'ease'
+						});
+						animation.scale(1.2).step();
+						this.cartAnimation = animation.export();
+						setTimeout(() => {
+							animation.scale(1).step();
+							this.cartAnimation = animation.export();
+						}, 300);
+					}
+				}, 50);
+			},
+			// 风格四头部切换
+			templateFourOneFn(index) {
+				this.categoryTree = this.templateFourData[index].child_list || [];
+				this.oneCategorySelect = index;
+				this.select = 0;
+			},
+			// 操作多规格商品弹框后，刷新商品数据
+			refreshData() {
+				this.$refs.categoryItem[this.select].loadGoodsCartNum(true);
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	.category-page-wrap {
+		width: 100vw;
+		// height: calc(100vh - var(--tab-bar-height, 0));
+		display: flex;
+		flex-direction: column;
+		background-color: #fff;
+	}
+
+	.content-box {
+		flex: 1;
+		height: 0;
+		display: flex;
+
+		.tree-wrap {
+			width: 170rpx;
+			height: 100%;
+			background-color: #f5f5f5;
+		}
+
+		.right-flex-wrap {
+			flex: 1;
+			width: 0;
+			height: 100%;
+			background: #f4f6fa;
+			display: flex;
+			flex-direction: column;
+			transform: translateX(0px);
+
+			.content-wrap {
+				display: flex;
+				flex: 1;
+				height: 0;
+				width: 100%;
+			}
+
+			.child-category-wrap {
+				width: 100%;
+				height: 100%;
+			}
+		}
+	}
+
+	.tree-wrap .category-item-wrap {
+		height: auto;
+		background-color: #fff;
+	}
+
+	.tree-wrap .category-item {
+		line-height: 1.5;
+		padding: 26rpx 28rpx;
+		box-sizing: border-box;
+		position: relative;
+		background-color: #f5f5f5;
+
+		view {
+			color: #222222;
+			width: 100%;
+			white-space: nowrap;
+			text-overflow: ellipsis;
+			overflow: hidden;
+			text-align: center;
+		}
+
+		&.border-top {
+			border-bottom-right-radius: 12rpx;
+		}
+
+		&.border-bottom {
+			border-top-right-radius: 12rpx;
+		}
+
+		&.select {
+			background: #fff;
+
+			view {
+				color: #333;
+				font-weight: bold;
+			}
+
+			&::before {
+				content: ' ';
+				width: 8rpx;
+				height: 34rpx;
+				background: var(--base-color);
+				display: block;
+				position: absolute;
+				left: 0;
+				top: 50%;
+				transform: translateY(-50%);
+			}
+		}
+	}
+
+	.search-box {
+		position: relative;
+		padding: 20rpx 30rpx;
+		display: flex;
+		align-items: center;
+		background: #fff;
+
+		.search-content {
+			position: relative;
+			/* #ifndef MP-WEIXIN */
+			height: 64rpx;
+			/* #endif */
+			/* #ifdef MP-WEIXIN */
+			height: 100%;
+			/* #endif */
+			border-radius: 40rpx;
+			flex: 1;
+			background-color: #f5f5f5;
+
+			input {
+				box-sizing: border-box;
+				display: block;
+				height: 100%;
+				width: 100%;
+				padding: 0 20rpx 0 40rpx;
+				background: #f5f5f5;
+				color: #333;
+				border-radius: 40rpx;
+			}
+
+			.iconfont {
+				position: absolute;
+				top: 50%;
+				right: 10rpx;
+				transform: translateY(-50%);
+				font-size: $font-size-toolbar;
+				z-index: 10;
+				color: #89899a;
+				width: 80rpx;
+				text-align: center;
+			}
+		}
+	}
+
+	.cart-box {
+		height: 100rpx;
+		width: 100%;
+		background: #fff;
+		border-top: 1px solid #f5f5f5;
+		box-sizing: border-box;
+		padding: 0 30rpx;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+
+		.left-wrap {
+			display: flex;
+			align-items: center;
+		}
+
+		.cart-icon {
+			width: 70rpx;
+			height: 70rpx;
+			position: relative;
+
+			.iconfont {
+				color: var(--btn-text-color);
+				width: inherit;
+				height: inherit;
+				background-color: $base-color;
+				border-radius: 50%;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+			}
+
+			.num {
+				position: absolute;
+				top: 0;
+				right: 0;
+				transform: translate(60%, 0);
+				display: inline-block;
+				box-sizing: border-box;
+				color: #fff;
+				line-height: 1.2;
+				text-align: center;
+				font-size: 24rpx;
+				padding: 0 6rpx;
+				min-width: 30rpx;
+				border-radius: 16rpx;
+				background-color: var(--price-color);
+				border: 2rpx solid #fff;
+			}
+		}
+
+		.price {
+			margin-left: 30rpx;
+
+			.title {
+				color: #333;
+			}
+
+			.money,
+			.unit {
+				font-weight: bold;
+				color: var(--price-color);
+			}
+		}
+
+		.settlement-btn {
+			margin: 0 0 0 20rpx;
+			width: 200rpx;
+			font-weight: bold;
+			border-radius: 50rpx;
+			height: 70rpx;
+			line-height: 70rpx;
+		}
+	}
+
+	.cart-point {
+		width: 26rpx;
+		height: 26rpx;
+		position: fixed;
+		z-index: 1000;
+		background: #f00;
+		border-radius: 50%;
+		transition: all 0.05s;
+	}
+
+	.category-empty {
+		flex: 1;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		flex-direction: column;
+
+		image {
+			width: 380rpx;
+		}
+
+		.tips {
+			font-size: 26rpx;
+			font-weight: 500;
+			color: #999;
+			margin-top: 50rpx;
+		}
+	}
+
+	.end-tips {
+		text-align: center;
+		color: #999;
+		font-size: 24rpx;
+		padding: 20rpx 0;
+		opacity: 0;
+	}
+
+	// 风格四
+	.category-template-4 {
+		.search-box {
+			.search-content input {
+				background-color: #f1f1f1;
+			}
+		}
+
+		.cart-box {
+			position: relative;
+			z-index: 2;
+		}
+
+		/deep/ .template-four {
+			position: relative;
+			z-index: 1;
+
+			.template-four-wrap {
+				position: relative;
+				z-index: 1;
+				padding-left: 20rpx;
+				padding-right: 80rpx;
+				padding-bottom: 10rpx;
+				display: flex;
+				height: 172rpx;
+				align-items: baseline;
+				box-sizing: border-box;
+				box-shadow: 0 4rpx 4rpx rgba(123, 123, 123, 0.1);
+			}
+
+			.template-four-popup {
+				display: flex;
+				flex-direction: column;
+				overflow: hidden;
+
+				.title {
+					line-height: 1;
+					margin-bottom: 20rpx;
+					font-weight: bold;
+				}
+
+				.template-four-scroll {
+					display: flex;
+					flex-wrap: wrap;
+					align-items: baseline;
+					align-content: baseline;
+					padding: 20rpx;
+					white-space: nowrap;
+					height: 380rpx;
+					box-sizing: border-box;
+
+					.uni-scroll-view-content {
+						flex-wrap: wrap;
+						align-items: baseline;
+						align-content: baseline;
+					}
+
+					.item {
+						display: flex;
+						flex-direction: column;
+						align-items: center;
+						padding: 4rpx 0;
+						color: #666;
+						margin-right: 16rpx;
+						border-radius: 40rpx;
+						margin-bottom: 10rpx;
+						width: calc((100% - 64rpx) / 5);
+
+						&:nth-child(5n + 5) {
+							margin-right: 0;
+						}
+
+						.image-warp {
+							margin-bottom: 6rpx;
+							padding: 4rpx;
+							display: flex;
+							align-items: center;
+							justify-content: center;
+							border-radius: 42rpx;
+							border: 4rpx solid transparent;
+						}
+
+						image {
+							width: 84rpx;
+							height: 84rpx;
+							border-radius: 32rpx;
+						}
+
+						.text {
+							padding: 2rpx 16rpx;
+							border-radius: 40rpx;
+							font-size: $font-size-tag;
+						}
+
+						&.selected {
+							.text {
+								background-color: $base-color;
+								color: var(--btn-text-color);
+							}
+						}
+					}
+				}
+
+				.pack-up {
+					font-size: $font-size-tag;
+					color: #888888;
+					height: 74rpx;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					border-top: 2rpx solid #f2f2f2;
+
+					.iconfont {
+						font-size: 40rpx;
+						margin-left: -4rpx;
+					}
+				}
+			}
+
+			.category-item-all {
+				position: absolute;
+				bottom: 0;
+				z-index: 1;
+				right: 0;
+				top: 0;
+				width: 72rpx;
+				line-height: 1;
+				background-color: #fff;
+
+				.category-item-all-wrap {
+					position: absolute;
+					bottom: 0;
+					right: 0;
+					top: 0;
+					left: 0;
+					display: flex;
+					flex-direction: column;
+					justify-content: center;
+					align-items: center;
+					z-index: 2;
+				}
+
+				.text {
+					writing-mode: tb-rl;
+					margin-bottom: 6rpx;
+					letter-spacing: 4rpx;
+					font-size: $font-size-tag;
+					font-weight: bold;
+				}
+
+				.img {
+					width: 20rpx;
+					height: 20rpx;
+				}
+
+				&::after {
+					content: '';
+					// box-shadow: -4rpx 10rpx 20rpx rgba(0, 0, 0, 0.1);
+					position: absolute;
+					left: 0;
+					width: 10rpx;
+					// height: 100rpx;
+					top: 20%;
+					bottom: 20%;
+					// transform: translateY(-50%);
+					// background-color: #F0F5FF;
+				}
+			}
+
+			.uni-scroll-view-content {
+				display: flex;
+			}
+
+			.category-item {
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+				justify-content: center;
+				min-width: 130rpx;
+				flex-shrink: 0;
+				margin-right: 20rpx;
+				padding: 4rpx 0;
+
+				&:last-of-type {
+					margin-right: 0;
+				}
+
+				.image-warp {
+					margin-bottom: 6rpx;
+					padding: 4rpx;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					border-radius: 42rpx;
+					border: 4rpx solid transparent;
+				}
+
+				image {
+					width: 84rpx;
+					height: 84rpx;
+					border-radius: 32rpx;
+				}
+
+				.text {
+					font-size: $font-size-tag;
+				}
+			}
+
+			.select {
+				.text {
+					padding: 8rpx 16rpx;
+					border-radius: 40rpx;
+					color: #fff;
+					font-size: $font-size-tag;
+					line-height: 1;
+				}
+			}
+		}
+
+		.content-wrap .categoty-goods-wrap .goods-list {
+			margin-top: 30rpx;
+		}
+
+		.tree-wrap .category-item.select::before {
+			border-top-right-radius: 8rpx;
+			border-bottom-right-radius: 8rpx;
+		}
+	}
+</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
new file mode 100644
index 0000000..7ff6eb7
--- /dev/null
+++ b/components/diy-components/diy-comp-extend.vue
@@ -0,0 +1,23 @@
+<template>
+	<view></view>
+</template>
+
+<script>
+// 自定义扩展组件
+export default {
+	name: 'diy-comp-extend',
+	props: {
+		value: {
+			type: Object
+		}
+	},
+	data() {
+		return {};
+	},
+	computed: {},
+	created() {},
+	methods: {}
+};
+</script>
+
+<style></style>
diff --git a/components/diy-components/diy-coupon.vue b/components/diy-components/diy-coupon.vue
new file mode 100644
index 0000000..00f605f
--- /dev/null
+++ b/components/diy-components/diy-coupon.vue
@@ -0,0 +1,1074 @@
+<template>
+	<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">
+
+						<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-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="parseInt(item.useState)">去使用</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 use" :style="couponBtnStyle" v-if="parseInt(item.useState)">去使用
+							</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>
+							</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) + '元可用' : '无门槛优惠券' }}
+								</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 == '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="parseInt(item.useState)">去使用</view>
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</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>
+
+						<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/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>
+</template>
+
+<script>
+	// 优惠券
+	export default {
+		name: 'diy-coupon',
+		props: {
+			value: {
+				type: Object,
+				default: () => {
+					return {};
+				}
+			}
+		},
+		data() {
+			return {
+				couponList: [],
+				isHave: true,
+				couponBtnSwitch: false,
+				isSuccess: false,
+				loading: true,
+				skeletonConfig: {
+					gridRows: 2,
+					gridRowsGap: '20rpx',
+					headHeight: '160rpx'
+				}
+			};
+		},
+		created() {
+			this.getCanReceiveCouponQuery();
+		},
+		watch: {
+			// 组件刷新监听
+			componentRefresh: function(nval) {
+				this.getCanReceiveCouponQuery();
+			}
+		},
+		computed: {
+			computedCouponList() {
+				var list = [];
+				this.couponList.filter(function(item) {
+					if (item.count != item.lead_count) list.push(item);
+				});
+				return list;
+			},
+			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;
+
+				return width;
+			},
+			couponBtnStyle() {
+				var css = '';
+				css += 'color:' + this.value.btnStyle.textColor + ';';
+				css += 'background-color:' + this.value.btnStyle.bgColor + ';';
+				css += 'border-radius:' + this.value.btnStyle.aroundRadius * 2 + 'rpx;';
+				return css;
+			}
+		},
+		methods: {
+			rpxUpPx(res) {
+				const screenWidth = uni.getSystemInfoSync().windowWidth;
+				var data = (screenWidth * parseInt(res)) / 750;
+				return Math.floor(data);
+			},
+			getCanReceiveCouponQuery() {
+				var data = {
+					num: this.value.count,
+					can_receive: 1
+				};
+				if (this.value.sources == 'diy') {
+					data.coupon_type_id_arr = this.value.couponIds.toString();
+				}
+				this.$api.sendRequest({
+					url: '/coupon/api/coupon/typelists',
+					data: data,
+					success: res => {
+						let data = res.data;
+						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;
+								}
+							});
+						}
+						this.loading = false;
+					}
+				});
+			},
+			couponAction(item, index) {
+				if (item.useState == 0) {
+					this.receiveCoupon(item, index);
+				} else if (parseInt(item.useState)) {
+					this.couponTap(item, index);
+				}
+			},
+			couponTap(item, index) {
+				if (item.count == item.lead_count) {
+					this.$util.showToast({
+						title: '该优惠券已抢光'
+					});
+					return;
+				}
+				if (item.useState == 0) this.receiveCoupon(item, index);
+				else this.toGoodsList(item);
+			},
+			// 领取优惠券
+			receiveCoupon(item, index) {
+				let that = this;
+				if (this.couponBtnSwitch) return;
+				this.couponBtnSwitch = true;
+				if (this.storeToken) {
+					this.$api.sendRequest({
+						url: '/coupon/api/coupon/receive',
+						data: {
+							coupon_type_id: item.coupon_type_id,
+							get_type: 2 //获取方式:1订单2.直接领取3.活动领取
+						},
+						success: res => {
+							var data = res.data;
+							let msg = res.message;
+							if (res.code == 0) {
+								msg = '领取成功';
+								if (res.data.is_exist == 1) {
+									for (let i = 0; i < that.couponList.length; i++) {
+										if (that.couponList[i].coupon_type_id == item.coupon_type_id) {
+											that.$set(that.couponList[i], 'useState', 1);
+										}
+									}
+								} else {
+									for (let i = 0; i < that.couponList.length; i++) {
+										if (that.couponList[i].coupon_type_id == item.coupon_type_id) {
+											that.$set(that.couponList[i], 'useState', 2);
+										}
+									}
+								}
+							}
+							this.$util.showToast({
+								title: msg
+							});
+
+							this.$forceUpdate();
+							this.couponBtnSwitch = false;
+						},
+						fail: res => {
+							this.couponBtnSwitch = false;
+						}
+					});
+				} else {
+					this.$refs.login.open('/pages/index/index');
+					this.couponBtnSwitch = false;
+				}
+			},
+			//去使用
+			toGoodsList(item) {
+				if (item.goods_type != 1) {
+					this.$util.redirectTo('/pages/goods/list', {
+						coupon: item.coupon_type_id
+					});
+				} else {
+					this.$util.redirectTo('/pages/goods/list', {});
+				}
+			}
+		},
+		filters: {
+			moneyConduct(value) {
+				var arr = value.split('.');
+				var str = parseInt(arr[1].split('').reverse().join('')) + '';
+				str = str.split('').reverse().join('');
+				if (str == 0) return arr[0];
+				else return arr[0] + '.' + str;
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	.coupon-wrap {
+		background-size: cover;
+		background-repeat: no-repeat;
+	}
+
+	// 风格一
+	/deep/.coupon-style-one {
+		height: 110rpx;
+
+		.coupon-item-box {
+			display: flex;
+			box-sizing: border-box;
+
+			.coupon-item {
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				width: 210rpx;
+				height: 110rpx;
+				background-repeat: no-repeat;
+				background-size: contain;
+
+				.coupon-get {
+					position: relative;
+					right: 14rpx;
+					font-size: 24rpx;
+					width: 26rpx;
+					line-height: 1.1;
+				}
+
+				.coupon-info {
+					width: 156rpx;
+					display: flex;
+					flex-direction: column;
+					align-items: center;
+
+					.coupon-type {
+						margin-top: 14rpx;
+						line-height: 1;
+					}
+
+					.coupon-num {
+						margin-top: -6rpx;
+						font-size: 40rpx;
+						line-height: 1;
+					}
+				}
+			}
+		}
+	}
+
+	// 风格二
+	/deep/.coupon-style-two {
+		height: 96rpx;
+
+		.coupon-item-box {
+			display: flex;
+			box-sizing: border-box;
+
+			.coupon-item {
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				width: 210rpx;
+				height: 96rpx;
+				background-repeat: no-repeat;
+				background-size: contain;
+
+				.coupon-get {
+					position: relative;
+					top: 2rpx;
+					right: 12rpx;
+					font-size: 24rpx;
+					letter-spacing: 16rpx;
+					width: 26rpx;
+
+					&.use {
+						top: 0;
+						right: 4rpx;
+						letter-spacing: 4rpx;
+					}
+				}
+
+				.coupon-info {
+					width: 156rpx;
+					display: flex;
+					flex-direction: column;
+					align-items: center;
+					margin-top: -8rpx;
+
+					.coupon-type {
+						margin-top: 10rpx;
+						line-height: 1;
+					}
+
+					.coupon-num {
+						font-size: 40rpx;
+						line-height: 1;
+					}
+				}
+			}
+		}
+	}
+
+	// 风格三
+	.coupon-wrap.coupon-box-3 {
+		background-size: 100% 100%;
+	}
+
+	/deep/.coupon-style-three {
+		height: 284rpx;
+		padding: 20rpx;
+		box-sizing: border-box;
+
+		.coupon-item-box {
+			height: 250rpx !important;
+			display: flex;
+
+			.coupon-item {
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+				justify-content: center;
+				width: 206rpx;
+				height: 250rpx;
+				background-repeat: no-repeat;
+				background-size: contain;
+
+				.coupon-size {
+					font-size: 40rpx;
+				}
+
+				.coupon-type {
+					margin-top: 20rpx;
+					margin-bottom: 6rpx;
+					line-height: 1;
+					text-align: center;
+				}
+
+				.coupon-num {
+					margin-top: 8rpx;
+					line-height: 1;
+				}
+
+				.coupon-get {
+					width: 120rpx;
+					height: 46rpx;
+					line-height: 46rpx;
+					text-align: center;
+					font-size: 24rpx;
+				}
+			}
+		}
+	}
+
+	// 风格四
+	/deep/.coupon-style-four {
+		height: 108rpx;
+
+		.coupon-item-box {
+			display: flex;
+			box-sizing: border-box;
+
+			.coupon-item {
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				width: 206rpx;
+				height: 108rpx;
+				background-repeat: no-repeat;
+				background-size: contain;
+
+				.coupon-get {
+					position: relative;
+					top: 0;
+					right: 12rpx;
+					font-size: 24rpx;
+					width: 26rpx;
+					line-height: 1.1;
+				}
+
+				.coupon-info {
+					width: 156rpx;
+					display: flex;
+					flex-direction: column;
+					align-items: center;
+
+					.coupon-type {
+						margin-top: 10rpx;
+						line-height: 1;
+					}
+
+					.coupon-num {
+						font-size: 40rpx;
+						line-height: 1;
+					}
+				}
+			}
+		}
+	}
+
+	/* 样式一 */
+	.coupon-all {
+		width: 100%;
+		flex-direction: row;
+		white-space: nowrap;
+		box-sizing: border-box;
+		line-height: 1;
+	}
+
+	.coupon-list {
+		position: relative;
+		line-height: 1;
+	}
+
+	.coupon {
+		width: 254rpx;
+		height: 114rpx;
+		border-radius: $border-radius;
+		overflow: hidden;
+		display: flex;
+		justify-content: space-between;
+		position: absolute;
+		left: 0;
+		top: 0;
+
+		.coupon-info {
+			width: 71%;
+			height: 100%;
+			padding: 10rpx 15rpx;
+			box-sizing: border-box;
+			display: flex;
+			flex-direction: column;
+			justify-content: center;
+
+			.coupon-type {
+				color: #ffffff;
+				font-size: $font-size-activity-tag;
+				text-align: center;
+				overflow: hidden;
+				white-space: nowrap;
+			}
+
+			.coupon-num {
+				display: flex;
+				align-items: flex-end;
+				justify-content: center;
+				margin-bottom: 10rpx;
+
+				.coupon-sign {
+					margin-bottom: 4rpx;
+				}
+
+				.coupon-size {
+					font-size: 40rpx;
+				}
+
+				text {
+					line-height: 1;
+				}
+			}
+		}
+
+		.coupon-get {
+			width: 26%;
+			height: 100%;
+			display: flex;
+			flex-direction: column;
+			justify-content: center;
+			align-items: center;
+
+			view {
+				line-height: 1.2;
+				font-size: $font-size-tag;
+			}
+		}
+	}
+
+	//风格五
+	.coupon-style-five {
+		.coupon-all {
+			.coupon-box {
+				width: 100%;
+				display: inline-block;
+				position: relative;
+
+				.coupon-list {
+					height: 160rpx;
+					position: relative;
+					padding: 10rpx 0;
+
+					image {
+						width: 100%;
+						height: 100%;
+					}
+
+					.coupon {
+						width: 100%;
+						height: 100%;
+						display: flex;
+						align-items: center;
+						justify-content: flex-start;
+
+						.coupon-info {
+							width: 25%;
+							min-width: 25%;
+							max-width: 25%;
+
+							.coupon-num {
+								margin: 0;
+								overflow: hidden;
+								white-space: nowrap;
+								text-overflow: ellipsis;
+								width: 100%;
+
+								.coupon-size {
+									font-weight: bold;
+								}
+
+								.coupon-sign {}
+							}
+						}
+
+						.coupon-line {
+							border-left: 1rpx dashed #999;
+							height: 65%;
+						}
+
+						.coupon-content {
+							display: flex;
+							width: 100%;
+							justify-content: space-between;
+							padding: 0 20rpx;
+							align-items: center;
+
+							.coupon-type {
+								.coupon-name {
+									font-size: 32rpx;
+									font-weight: bold;
+									width: 300rpx;
+									overflow: hidden;
+									white-space: nowrap;
+									text-overflow: ellipsis;
+								}
+
+								.coupon-least {
+									font-size: 28rpx;
+									color: #999;
+								}
+							}
+
+							.coupon-get {
+								color: #fff;
+								background-color: #303133;
+								border-radius: 6rpx;
+								padding: 4rpx 8rpx;
+								margin-right: 20rpx;
+								font-size: $font-size-tag;
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+
+	//风格六
+	.coupon-style-six {
+		height: 270rpx;
+		box-sizing: border-box;
+
+		.style-six-wrap {
+			display: flex;
+		}
+
+		.coupon {
+			margin-right: 20rpx;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			justify-content: center;
+			width: 208rpx;
+			height: 270rpx;
+			background-repeat: no-repeat;
+			background-size: contain;
+			box-sizing: border-box;
+			position: relative;
+			flex-shrink: 0;
+
+			&::after {
+				content: '';
+				position: absolute;
+				left: 26rpx;
+				right: 26rpx;
+				bottom: 70rpx;
+				border-bottom: 2rpx dashed #999;
+			}
+
+			.btn {
+				position: absolute;
+				height: 36rpx;
+				min-width: 62rpx;
+				font-size: 24rpx;
+				top: 20rpx;
+				right: 0;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				line-height: 1;
+				padding: 0 4rpx 0 6rpx;
+
+				.btn-content {
+					display: inline-block;
+					line-height: 1;
+					transform: scale(0.8);
+				}
+			}
+
+			.coupon-content {
+				display: flex;
+				flex-direction: column;
+				justify-content: space-between;
+				align-items: center;
+				font-size: 24rpx;
+				height: 200rpx;
+
+				.price-wrap {
+					margin-top: 60rpx;
+				}
+
+				.price {
+					font-size: 60rpx;
+					font-weight: bold;
+					line-height: 1;
+				}
+
+				.text {
+					position: relative;
+					color: #401d00;
+					margin-bottom: 16rpx;
+
+					&::after {
+						content: '';
+						position: absolute;
+						top: 50%;
+						transform: translateY(-50%);
+						width: 20rpx;
+						right: -26rpx;
+						border-bottom: 1px solid #401d00;
+					}
+
+					&::before {
+						content: '';
+						position: absolute;
+						top: 50%;
+						transform: translateY(-50%);
+						width: 20rpx;
+						left: -26rpx;
+						border-bottom: 2rpx solid #401d00;
+					}
+				}
+
+				.unit {
+					line-height: 1;
+					margin-top: 13px;
+					color: #222;
+					display: inline-block;
+					transform: scale(0.8);
+				}
+			}
+
+			.limit {
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				height: 70rpx;
+				font-size: 24rpx;
+				font-weight: bold;
+			}
+
+			&.coupon-null {
+				.limit {
+					color: #333;
+				}
+
+				.unit {
+					color: #6f5640;
+				}
+
+				.text {
+					color: #6f5640;
+				}
+
+				.coupon-content .text::before,
+				.coupon-content .text::after {
+					border-color: #6f5640;
+				}
+
+				.coupon-content .price {
+					color: #999;
+					font-weight: inherit;
+					border: 4rpx solid #999;
+					border-radius: 50%;
+					height: 42rpx;
+					width: 42rpx;
+					line-height: 38rpx;
+					text-align: center;
+					font-size: 50rpx;
+					margin-top: 60rpx;
+				}
+			}
+		}
+	}
+
+	//风格七
+	/deep/ .coupon-style-seven {
+		.wrap {
+			display: flex;
+		}
+
+		.coupon-list {
+			margin-right: 16rpx;
+			flex-shrink: 0;
+			width: 608rpx;
+			height: 160rpx;
+			position: relative;
+			padding: 10rpx 0;
+
+			image {
+				width: 100%;
+				height: 100%;
+			}
+
+			.coupon {
+				width: 100%;
+				height: 100%;
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+
+				.coupon-info {
+					min-width: 25%;
+					max-width: 30%;
+					padding: 0;
+
+					.coupon-num {
+						margin: 0;
+						overflow: hidden;
+						white-space: nowrap;
+						text-overflow: ellipsis;
+						width: 100%;
+
+						.coupon-size {
+							font-size: 60rpx;
+							font-weight: bold;
+							margin-right: 4rpx;
+						}
+					}
+				}
+
+				.coupon-line {
+					border-left: 1rpx dashed #fd463e;
+					height: 65%;
+				}
+
+				.coupon-type {
+					.coupon-name {
+						display: block;
+						font-size: 32rpx;
+						font-weight: bold;
+						width: 280rpx;
+						overflow: hidden;
+						white-space: nowrap;
+						text-overflow: ellipsis;
+					}
+
+					.coupon-least {
+						font-size: $font-size-tag;
+						color: #999;
+					}
+				}
+
+				.coupon-get {
+					padding: 4rpx 40rpx;
+					width: 130rpx;
+					font-size: $font-size-tag;
+					box-sizing: border-box;
+					flex-shrink: 0;
+				}
+			}
+		}
+	}
+
+	/deep/.uni-scroll-view ::-webkit-scrollbar {
+		/* 隐藏滚动条，但依旧具备可以滚动的功能 */
+		display: none;
+		width: 0;
+		height: 0;
+		color: transparent;
+		background: transparent;
+	}
+
+	/deep/::-webkit-scrollbar {
+		display: none;
+		width: 0;
+		height: 0;
+		color: transparent;
+		background: transparent;
+	}
+</style>
+<style scoped>
+	.coupon-all>>>.uni-scroll-view::-webkit-scrollbar {
+		display: none;
+	}
+</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
new file mode 100644
index 0000000..16bc90a
--- /dev/null
+++ b/components/diy-components/diy-fenxiao-goods-list.vue
@@ -0,0 +1,419 @@
+<template>
+	<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="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>
+				<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>
+	</view>
+</template>
+
+<script>
+export default {
+	name: 'diy-fenxiao-goods-list',
+	props: {
+		value: {
+			type: Object
+		}
+	},
+	data() {
+		return {
+			list: [],
+			currentRoute: ''
+		};
+	},
+	created() {
+		let currentPage = getCurrentPages()[getCurrentPages().length - 1];
+		this.currentRoute = '/' + currentPage.route;
+		if (!this.storeToken) {
+			this.$util.redirectTo(
+				'/pages_tool/login/login',
+				{
+					back: this.currentRoute
+				},
+				'redirectTo'
+			);
+		}
+		this.getData();
+	},
+	watch: {
+		// 组件刷新监听
+		componentRefresh: function(nval) {
+			this.getData();
+		}
+	},
+	computed: {
+		goodsListWarpCss() {
+			var obj = '';
+			obj += 'background-color:' + this.value.componentBgColor + ';';
+			if (this.value.componentAngle == 'round') {
+				obj += 'border-top-left-radius:' + this.value.topAroundRadius * 2 + 'rpx;';
+				obj += 'border-top-right-radius:' + this.value.topAroundRadius * 2 + 'rpx;';
+				obj += 'border-bottom-left-radius:' + this.value.bottomAroundRadius * 2 + 'rpx;';
+				obj += 'border-bottom-right-radius:' + this.value.bottomAroundRadius * 2 + 'rpx;';
+			}
+			return obj;
+		},
+		// 商品项样式
+		goodsItemCss() {
+			var obj = '';
+			obj += 'background-color:' + this.value.elementBgColor + ';';
+			if (this.value.elementAngle == 'round') {
+				obj += 'border-top-left-radius:' + this.value.topElementAroundRadius * 2 + 'rpx;';
+				obj += 'border-top-right-radius:' + this.value.topElementAroundRadius * 2 + 'rpx;';
+				obj += 'border-bottom-left-radius:' + this.value.bottomElementAroundRadius * 2 + 'rpx;';
+				obj += 'border-bottom-right-radius:' + this.value.bottomElementAroundRadius * 2 + 'rpx;';
+			}
+			if (this.value.ornament.type == 'shadow') {
+				obj += 'box-shadow:' + '0 0 10rpx ' + this.value.ornament.color;
+			}
+			if (this.value.ornament.type == 'stroke') {
+				obj += 'border:' + '2rpx solid ' + this.value.ornament.color;
+			}
+			return obj;
+		}
+	},
+	methods: {
+		//页面跳转
+		toDetail(e) {
+			this.$util.redirectTo('/pages/goods/detail', { goods_id: e.goods_id });
+		},
+		//关注
+		followGoods(e, index) {
+			let goods_id = e.goods_id;
+			let sku_id = e.sku_id;
+			this.$api.sendRequest({
+				url: '/fenxiao/api/goodscollect/add',
+				data: {
+					goods_id: goods_id,
+					sku_id: sku_id
+				},
+				success: res => {
+					if (res.code >= 0) {
+						this.$util.showToast({ title: '关注成功' });
+						this.list[index].is_collect = 1;
+						this.list[index].collect_id = res.data;
+					}
+					this.$forceUpdate();
+				}
+			});
+		},
+		//取消关注
+		delFollowTip(e, index) {
+			uni.showModal({
+				title: '提示',
+				content: '确认取消关注该商品吗',
+				success: res => {
+					if (res.confirm) {
+						this.delFollow(e.collect_id, index);
+					}
+				}
+			});
+		},
+		delFollow(e, f) {
+			this.$api.sendRequest({
+				url: '/fenxiao/api/goodscollect/delete',
+				data: {
+					collect_id: e
+				},
+				success: res => {
+					let msg = '';
+					if (res.code == 0) {
+						msg = '取消成功';
+					} else {
+						msg = res.message;
+					}
+					this.$util.showToast({
+						title: msg
+					});
+
+					let arr = this.list;
+					arr[f].is_collect = 0;
+					this.list = arr;
+					this.$forceUpdate();
+				}
+			});
+		},
+		toMore() {
+			this.$util.redirectTo('/pages_promotion/fenxiao/goods_list');
+		},
+		getData() {
+			var data = {
+				page: 1,
+				page_size: this.value.count
+			};
+			if (this.value.sources == 'category') {
+				data.category_id = this.value.categoryId;
+				data.category_level = 1;
+			} else if (this.value.sources == 'diy') {
+				data.page_size = 0;
+				data.goods_id_arr = this.value.goodsId.toString();
+			}
+			this.$api.sendRequest({
+				url: '/fenxiao/api/goods/page',
+				data: data,
+				success: res => {
+					if (res.code == 0) {
+						this.list = res.data.list;
+					}
+				}
+			});
+		},
+		imgError(index) {
+			if (this.list[index]) this.list[index].goods_image = this.$util.getDefaultImage().goods;
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+.diy-fenxiao {
+}
+
+// 商品列表单列样式
+.goods-list.row1-of1 {
+	.goods-item {
+		background-color: #fff;
+		display: flex;
+		margin-bottom: 20rpx;
+		&:last-of-type {
+			margin-bottom: 0;
+		}
+		&.shadow {
+			margin: 8rpx 8rpx 20rpx 8rpx;
+		}
+
+		.goods-img {
+			width: 180rpx;
+			overflow: hidden;
+			margin-right: 20rpx;
+			image {
+				width: 100%;
+			}
+		}
+
+		.info-wrap {
+			flex: 1;
+			display: flex;
+			flex-direction: column;
+			justify-content: space-between;
+			position: relative;
+
+			.name-wrap {
+				flex: 1;
+				margin-bottom: 10rpx;
+				.goods-name {
+					font-size: $font-size-base;
+					line-height: 1.3;
+					&.multi-hidden {
+						height: 72rpx;
+					}
+				}
+			}
+
+			.pro-info {
+				display: flex;
+				flex-direction: column;
+				justify-content: space-between;
+				.sale {
+					font-size: 20rpx;
+					line-height: 1;
+					color: #999;
+				}
+				.discount-price {
+					display: flex;
+					justify-content: space-between;
+					align-items: center;
+					margin-bottom: 10rpx;
+					.price-wrap {
+						white-space: nowrap;
+						.unit {
+							font-size: $font-size-tag;
+							color: $base-color;
+						}
+						.price {
+							font-size: $font-size-toolbar;
+						}
+						text {
+							font-weight: bold;
+							color: $base-color;
+						}
+					}
+				}
+
+				.delete-price {
+					text-decoration: line-through;
+					flex: 1;
+					line-height: 28rpx;
+					color: $color-tip;
+					font-size: $font-size-activity-tag;
+				}
+			}
+			.sale-btn {
+				position: absolute;
+				right: 20rpx;
+				bottom: 26rpx;
+				height: 50rpx;
+				line-height: 52rpx;
+				color: #fff;
+				width: 120rpx;
+				text-align: center;
+				background-color: $base-color;
+			}
+		}
+	}
+}
+
+// 商品列表两列样式
+.goods-list.row1-of2 {
+	display: flex;
+	flex-wrap: wrap;
+	.goods-item {
+		position: relative;
+		background: #fff;
+		overflow: hidden;
+		margin-right: 20rpx;
+		margin-top: 20rpx;
+		width: calc(50% - 10rpx);
+		&:nth-child(2n + 2) {
+			width: calc(50% - 11rpx);
+			margin-right: 0;
+		}
+		&:nth-of-type(1),
+		&:nth-of-type(2) {
+			margin-top: 0;
+		}
+		&.shadow {
+			width: calc(50% - 18rpx);
+			&:nth-child(2n-1) {
+				margin-left: 8rpx;
+			}
+			&:nth-of-type(1),
+			&:nth-of-type(2) {
+				margin-top: 8rpx;
+			}
+		}
+		.goods-img {
+			position: relative;
+			overflow: hidden;
+			height: 350rpx;
+
+			image {
+				width: 100%;
+				height: 100%;
+				position: absolute;
+				top: 49%;
+				left: 0;
+				transform: translateY(-50%);
+			}
+		}
+
+		.info-wrap {
+			padding: 10rpx 20rpx;
+
+			.name-wrap {
+				margin-bottom: 10rpx;
+				.goods-name {
+					font-size: $font-size-base;
+					line-height: 1.3;
+					&.multi-hidden {
+						height: 72rpx;
+					}
+				}
+			}
+
+			.pro-info {
+				margin-top: 10rpx;
+				display: flex;
+				flex-direction: column;
+				justify-content: space-between;
+				.sale {
+					font-size: 20rpx;
+					line-height: 1;
+					color: #999;
+				}
+				.discount-price {
+					display: flex;
+					justify-content: space-between;
+					align-items: center;
+					.price-wrap {
+						white-space: nowrap;
+						.unit {
+							font-size: $font-size-tag;
+							color: $base-color;
+						}
+						.price {
+							font-size: $font-size-toolbar;
+						}
+						text {
+							font-weight: bold;
+							color: $base-color;
+						}
+					}
+				}
+
+				.delete-price {
+					text-decoration: line-through;
+					flex: 1;
+					line-height: 28rpx;
+					color: $color-tip;
+					font-size: $font-size-activity-tag;
+				}
+			}
+			.sale-btn {
+				position: absolute;
+				right: 20rpx;
+				bottom: 26rpx;
+				height: 50rpx;
+				line-height: 52rpx;
+				color: #fff;
+				width: 120rpx;
+				text-align: center;
+				background-color: $base-color;
+			}
+		}
+	}
+}
+</style>
diff --git a/components/diy-components/diy-float-btn.vue b/components/diy-components/diy-float-btn.vue
new file mode 100644
index 0000000..c381f8c
--- /dev/null
+++ b/components/diy-components/diy-float-btn.vue
@@ -0,0 +1,114 @@
+<template>
+	<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>
+</template>
+
+<script>
+	// 获取系统状态栏的高度
+	let systemInfo = uni.getSystemInfoSync();
+	export default {
+		name: 'diy-float-btn',
+		props: {
+			value: {
+				type: Object,
+				default: () => {
+					return {};
+				}
+			}
+		},
+		data() {
+			return {
+				navHeight: 0,
+				statusBarHeight: systemInfo.statusBarHeight
+			};
+		},
+		created() {},
+		watch: {
+			// 组件刷新监听
+			componentRefresh: function(nval) {}
+		},
+		components: {},
+		methods: {},
+		computed: {
+			style() {
+				let style = {},
+					height = 54;
+				// #ifdef MP
+				height = systemInfo.platform == 'ios' ? 54 : 58;
+				// #endif
+				switch (parseInt(this.value.bottomPosition)) {
+					case 1:
+						style.top = (this.navHeight + this.statusBarHeight + parseInt(this.value.btnBottom)) * 2 + 'rpx';
+						break;
+					case 2:
+						style.top = (this.navHeight + this.statusBarHeight + parseInt(this.value.btnBottom)) * 2 + 'rpx';
+						break;
+					case 3:
+						style.bottom = (100 + parseInt(this.value.btnBottom)) * 2 + 'rpx';
+						break;
+					case 4:
+						style.bottom = (100 + parseInt(this.value.btnBottom)) * 2 + 'rpx';
+						break;
+				}
+				return this.$util.objToStyle(style);
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	.float-btn {
+		position: fixed;
+		bottom: 20%;
+		right: 40rpx;
+		z-index: 990;
+
+		&.left_top {
+			top: 100rpx;
+			left: 30rpx;
+		}
+
+		&.right_top {
+			top: 100rpx;
+			right: 30rpx;
+		}
+
+		&.left_bottom {
+			bottom: 160rpx;
+			left: 30rpx;
+			padding-bottom: constant(safe-area-inset-bottom);
+			/*兼容 IOS<11.2*/
+			padding-bottom: env(safe-area-inset-bottom);
+			/*兼容 IOS>11.2*/
+		}
+
+		&.right_bottom {
+			bottom: 160rpx;
+			right: 30rpx;
+			padding-bottom: constant(safe-area-inset-bottom);
+			/*兼容 IOS<11.2*/
+			padding-bottom: env(safe-area-inset-bottom);
+			/*兼容 IOS>11.2*/
+		}
+
+		.button-box {
+			margin-bottom: 20rpx;
+
+			&:last-child {
+				margin-bottom: 0;
+			}
+
+			image {
+				width: 100%;
+				height: 100%;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/components/diy-components/diy-follow-official-account.vue b/components/diy-components/diy-follow-official-account.vue
new file mode 100644
index 0000000..0b637b5
--- /dev/null
+++ b/components/diy-components/diy-follow-official-account.vue
@@ -0,0 +1,29 @@
+<template>
+	<!-- #ifdef MP -->
+	<view v-if="value.isShow">
+		<official-account></official-account>
+	</view>
+	<!--#endif -->
+</template>
+
+<script>
+	// 关注公众号
+	export default {
+		name: 'diy-follow-official-account',
+		props: {
+			value: {
+				type: Object
+			}
+		},
+		data() {
+			return {};
+		},
+		watch: {
+			// 组件刷新监听
+			componentRefresh: function(nval) {}
+		},
+		methods: {}
+	};
+</script>
+
+<style></style>
\ No newline at end of file
diff --git a/components/diy-components/diy-form.vue b/components/diy-components/diy-form.vue
new file mode 100644
index 0000000..ed581fd
--- /dev/null
+++ b/components/diy-components/diy-form.vue
@@ -0,0 +1,110 @@
+<template>
+	<view class="diy-from" :style="style">
+			<view class="fui-cell-group">
+				<view class="fui-cell  ">
+					<view class="fui-cell-label ">您的姓名</view>
+					<view class="fui-cell-info">
+						<input v-model="Form.realname" class="fui-input" placeholder="请输入您的姓名" value=""></input>
+					</view>
+				</view>
+				<view class="fui-cell ">
+					<view class="fui-cell-label">手机号码</view>
+					<view class="fui-cell-info">
+						<input v-model="Form.mobile" class="fui-input" maxlength="11" placeholder="请输入您的手机号" type="number" ></input>
+					</view>
+				</view>
+				<view class="fui-cell ">
+					<view class="fui-cell-label">您的邮箱</view>
+					<view class="fui-cell-info">
+						<input v-model="Form.mailbox"  class="fui-input" placeholder="请输入您的邮箱" type="text" ></input>
+					</view>
+				</view>
+				<view class="fui-cell">
+					<view class="fui-cell-label">所在城市</view>
+					<view class="fui-cell-info">
+						<input v-model="Form.citys" class="fui-input" placeholder="请输入您的所在地" value=""></input>
+					</view>
+				</view>
+				<view class="fui-cell">
+					<view class="fui-cell-label">备注</view>
+					<view class="fui-cell-info">
+						<input v-model="Form.remark" class="fui-input" placeholder="请输入备注" value=""></input>
+					</view>
+				</view>
+			</view>
+			<view @click="submitform" class="fui-btn btn-danger block mtop">提交信息</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: 'diy-from',
+		props: {
+			value: {
+				type: Object
+			}
+		},
+		data() {
+			return {
+				loading: true,
+				markers:[],
+				Form:{
+					realname:'',
+					mobile:'',
+					mailbox:'',
+					citys:'',
+					remark:'',
+				}
+			};
+		},
+		created() {
+		},
+		watch: {
+			// 组件刷新监听
+			componentRefresh: function(nval) {
+				// this.getDataList();
+			}
+		},
+		computed: {
+			markerst(){
+				return [{
+						id:1,
+						latitude:this.value.list[0].lat,
+						longitude:this.value.list[0].lng
+					}]
+			},
+			style() {
+				var css = '';
+				css += 'background-color:' + this.value.contentBgColor + ';';
+				if (this.value.elementAngle == 'round') {
+					css += 'border-top-left-radius:' + this.value.topElementAroundRadius * 2 + 'rpx;';
+					css += 'border-top-right-radius:' + this.value.topElementAroundRadius * 2 + 'rpx;';
+					css += 'border-bottom-left-radius:' + this.value.bottomElementAroundRadius * 2 + 'rpx;';
+					css += 'border-bottom-right-radius:' + this.value.bottomElementAroundRadius * 2 + 'rpx;';
+				}
+				return css;
+			}
+		},
+		methods: {
+			submitform(){
+				this.$api.sendRequest({
+					url: '/api/member/information',
+					data: this.Form,
+					success: res => {
+						this.$util.showToast({
+							title: res.message
+						});
+					}
+				});
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	.diy-from{
+		background: #fff;
+		padding-bottom: 20rpx;
+		border-radius: 10rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/components/diy-components/diy-goods-brand.vue b/components/diy-components/diy-goods-brand.vue
new file mode 100644
index 0000000..f4d7323
--- /dev/null
+++ b/components/diy-components/diy-goods-brand.vue
@@ -0,0 +1,158 @@
+<template>
+	<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>
+	</x-skeleton>
+</template>
+
+<script>
+	// 商品品牌
+	import uniGrid from '@/components/uni-grid/uni-grid.vue';
+	import uniGridItem from '@/components/uni-grid-item/uni-grid-item.vue';
+
+	export default {
+		name: 'diy-goods-brand',
+		props: {
+			value: {
+				type: Object
+			}
+		},
+		components: {
+			uniGrid,
+			uniGridItem
+		},
+		data() {
+			return {
+				list: [],
+				loading: true,
+				skeletonConfig: {
+					gridRows: 2,
+					gridColumns: 4,
+					gridRowsGap: '20rpx',
+					headWidth: '120rpx',
+					headHeight: '120rpx',
+					textShow: false
+				}
+			};
+		},
+		created() {
+			this.getBrandList();
+		},
+		watch: {
+			// 组件刷新监听
+			componentRefresh: function(nval) {
+				this.getBrandList();
+			}
+		},
+		computed: {
+			warpCss() {
+				var obj = '';
+				obj += 'background-color:' + this.value.componentBgColor + ';';
+				if (this.value.componentAngle == 'round') {
+					obj += 'border-top-left-radius:' + this.value.topAroundRadius * 2 + 'rpx;';
+					obj += 'border-top-right-radius:' + this.value.topAroundRadius * 2 + 'rpx;';
+					obj += 'border-bottom-left-radius:' + this.value.bottomAroundRadius * 2 + 'rpx;';
+					obj += 'border-bottom-right-radius:' + this.value.bottomAroundRadius * 2 + 'rpx;';
+				}
+				if (this.value.ornament.type == 'shadow') {
+					obj += 'box-shadow:' + '0 0 10rpx ' + this.value.ornament.color;
+				}
+				if (this.value.ornament.type == 'stroke') {
+					obj += 'border:' + '2rpx solid ' + this.value.ornament.color;
+				}
+				return obj;
+			},
+			// 子项样式
+			itemCss() {
+				var obj = '';
+				if (this.value.elementAngle == 'round') {
+					obj += 'border-top-left-radius:' + this.value.topElementAroundRadius * 2 + 'rpx;';
+					obj += 'border-top-right-radius:' + this.value.topElementAroundRadius * 2 + 'rpx;';
+					obj += 'border-bottom-left-radius:' + this.value.bottomElementAroundRadius * 2 + 'rpx;';
+					obj += 'border-bottom-right-radius:' + this.value.bottomElementAroundRadius * 2 + 'rpx;';
+				}
+				return obj;
+			}
+		},
+		methods: {
+			getBrandList() {
+				var data = {
+					page: 1,
+					page_size: this.value.count
+				};
+				if (this.value.sources == 'diy') {
+					data.page_size = 0;
+					data.brand_id_arr = this.value.brandIds.toString();
+				}
+
+				this.$api.sendRequest({
+					url: '/api/goodsbrand/page',
+					data: data,
+					success: res => {
+						if (res.code == 0 && res.data) {
+							let data = res.data;
+							this.list = data.list;
+						}
+						this.loading = false;
+					}
+				});
+			},
+			toDetail(item) {
+				this.$util.redirectTo('/pages/goods/list', {
+					brand_id: item.brand_id
+				});
+			},
+			imgError(index) {
+				if (this.list[index]) this.list[index].image_url = this.$util.getDefaultImage().goods;
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	.brand-wrap {
+		&.shadow {
+			margin-left: 8rpx;
+			margin-right: 8rpx;
+			margin-top: 8rpx;
+			margin-bottom: 8rpx;
+		}
+
+		.style-1 {
+			.title-wrap {
+				text-align: center;
+				padding: 20rpx 0 10rpx;
+			}
+
+			.ul-wrap {
+				display: flex;
+				flex-wrap: wrap;
+				padding: 20rpx;
+
+				.li-item {
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					width: calc(100% / 4 - 20rpx) !important;
+					height: 124rpx;
+					margin: 10rpx;
+					background-color: #fff;
+
+					.brand-pic {
+						width: 100%;
+						height: 100%;
+					}
+				}
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/components/diy-components/diy-goods-list.vue b/components/diy-components/diy-goods-list.vue
new file mode 100644
index 0000000..a2bc1b6
--- /dev/null
+++ b/components/diy-components/diy-goods-list.vue
@@ -0,0 +1,1410 @@
+<template>
+	<x-skeleton :type="skeletonType" :loading="loading" :configs="skeletonConfig">
+		<view :class="['goods-list', goodsValue.template, goodsValue.style]" :style="goodsListWarpCss">
+			<template v-if="goodsValue.template != 'horizontal-slide'">
+				<view class="goods-item" v-for="(item, index) in list" :key="index" @click="toDetail(item)" :class="[goodsValue.ornament.type]" :style="goodsItemCss">
+					<view class="goods-img-wrap">
+						<image class="goods-img" :src="$util.img(item.goods_image, { size: goodsValue.template == 'large-mode' ? 'big' : 'mid' })" mode="widthFix" @error="imgError(index)" :style="{ borderRadius: goodsValue.imgAroundRadius * 2 + 'rpx' }"/>
+						<view class="sell-out" v-if="item.stock <= 0">
+							<text class="iconfont icon-shuqing"></text>
+						</view>
+					</view>
+					<view class="info-wrap" v-if="
+							goodsValue.goodsNameStyle.control ||
+								(goodsValue.tag && goodsValue.tag.value != 'hidden') ||
+								goodsValue.priceStyle.mainControl ||
+								goodsValue.priceStyle.lineControl ||
+								goodsValue.btnStyle.control
+						">
+						<view v-if="goodsValue.goodsNameStyle.control" class="goods-name"
+							:style="{ color: goodsValue.theme == 'diy' ? goodsValue.goodsNameStyle.color : '', fontWeight: goodsValue.goodsNameStyle.fontWeight ? 'bold' : '' }"
+							:class="[{ 'using-hidden': goodsValue.nameLineMode == 'single' }, { 'multi-hidden': goodsValue.nameLineMode == 'multiple' }]">
+							{{ lang=='en-us'?item.en_goods_name:item.goods_name }}
+						</view>
+						<template v-if="goodsValue.tag">
+							<view class="tag-wrap" v-if="goodsValue.tag.value == 'label' && item.label_name">
+								<text class="hollow-tag">{{ item.label_name }}</text>
+							</view>
+							<view class="tag-wrap" v-else-if="goodsValue.tag.value == 'diy'">
+								<text class="hollow-tag">{{ goodsValue.tag.text }}</text>
+							</view>
+						</template>
+						<view class="pro-info">
+							<view class="discount-price">
+								<view class="price-wrap" v-if="goodsValue.priceStyle.mainControl">
+									<text class="unit price-style small" :style="{ color: goodsValue.theme == 'diy' ? goodsValue.priceStyle.mainColor + '!important' : '' }">￥</text>
+									<text class="price price-style large" :style="{ color: goodsValue.theme == 'diy' ? goodsValue.priceStyle.mainColor + '!important' : '' }">{{ showPrice(item).split('.')[0] }}</text>
+									<text class="unit price-style small" :style="{ color: goodsValue.theme == 'diy' ? goodsValue.priceStyle.mainColor + '!important' : '' }">{{ '.' + showPrice(item).split('.')[1] }}</text>
+								</view>
+								<view class="member-price" v-if="(item.member_price && item.member_price == showPrice(item)) || item.promotion_type == 1">
+									<image v-if="item.member_price && item.member_price == showPrice(item)" :src="$util.img('public/uniapp/index/VIP.png')"/>
+									<image v-else-if="item.promotion_type == 1" :src="$util.img('public/uniapp/index/discount.png')"/>
+								</view>
+								<view v-if="goodsValue.priceStyle.lineControl && showMarketPrice(item)"
+									class="delete-price price-font"
+									:style="{ color: goodsValue.theme == 'diy' ? goodsValue.priceStyle.lineColor : '' }">
+									￥{{ showMarketPrice(item) }}
+								</view>
+								<view class="sale" v-if="goodsValue.saleStyle.control"
+									:style="{ color: goodsValue.theme == 'diy' ? goodsValue.saleStyle.color : '' }">
+									已售{{ item.sale_num }}{{ item.unit ? item.unit : '件' }}
+								</view>
+							</view>
+
+							<view class="cart-action-wrap" v-if="goodsValue.btnStyle.control">
+								<!-- <text class="cart-num" v-if="cartList['goods_' + item.goods_id] && goodsValue.btnStyle.style != 'button'">{{ cartList['goods_' + item.goods_id].num }}</text> -->
+								<!-- 购物车图标 -->
+								<view v-if="goodsValue.btnStyle.style == 'icon-cart'" :style="{
+										color: goodsValue.btnStyle.theme == 'diy' ? goodsValue.btnStyle.textColor : '',
+										borderColor: goodsValue.btnStyle.theme == 'diy' ? goodsValue.btnStyle.textColor : ''
+									}" class="cart shopping-cart-btn iconfont icon-gouwuche click-wrap" :id="'goods-' + item.id"
+									@click.stop="$refs.goodsSkuIndex.addCart(goodsValue.btnStyle.cartEvent, item, $event)">
+									<view class="click-event"></view>
+								</view>
+
+								<!--加号图标 -->
+								<view v-else-if="goodsValue.btnStyle.style == 'icon-add'" :style="{
+										color: goodsValue.btnStyle.theme == 'diy' ? goodsValue.btnStyle.textColor : '',
+										borderColor: goodsValue.btnStyle.theme == 'diy' ? goodsValue.btnStyle.textColor : ''
+									}" class="cart plus-sign-btn iconfont icon-add1 click-wrap" :id="'goods-' + item.id"
+									@click.stop="$refs.goodsSkuIndex.addCart(goodsValue.btnStyle.cartEvent, item, $event)">
+									<view class="click-event"></view>
+								</view>
+
+								<!-- 按钮 -->
+								<view v-else-if="goodsValue.btnStyle.style == 'button'" :style="{
+										backgroundColor: goodsValue.btnStyle.theme == 'diy' ? goodsValue.btnStyle.bgColor : '',
+										color: goodsValue.btnStyle.theme == 'diy' ? goodsValue.btnStyle.textColor : '',
+										fontWeight: goodsValue.btnStyle.theme == 'diy' ? (goodsValue.btnStyle.fontWeight ? 'bold' : 'normal') : '',
+										padding: goodsValue.btnStyle.theme == 'diy' ? '0 ' + goodsValue.btnStyle.padding * 2 + 'rpx' : ''
+									}" class="cart buy-btn click-wrap" :id="'goods-' + item.id"
+									@click.stop="$refs.goodsSkuIndex.addCart(goodsValue.btnStyle.cartEvent, item, $event)">
+									{{ goodsValue.btnStyle.text }}
+									<view class="click-event"></view>
+									<!-- <text class="cart-num" v-if="cartList['goods_' + item.goods_id]">{{ cartList['goods_' + item.goods_id].num }}</text> -->
+								</view>
+
+								<!--自定义图标 -->
+								<view v-else-if="goodsValue.btnStyle.style == 'icon-diy'" :style="{
+										color: goodsValue.btnStyle.theme == 'diy' ? goodsValue.btnStyle.textColor : ''
+									}" class="icon-diy click-wrap" :id="'goods-' + item.id"
+									@click.stop="$refs.goodsSkuIndex.addCart(goodsValue.btnStyle.cartEvent, item, $event)">
+									<view class="click-event"></view>
+									<diy-icon :icon="goodsValue.btnStyle.iconDiy.icon"
+										:value="goodsValue.btnStyle.iconDiy.style ? goodsValue.btnStyle.iconDiy.style : null"></diy-icon>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</template>
+			<scroll-view v-if="goodsValue.template == 'horizontal-slide' && goodsValue.slideMode == 'scroll'" class="scroll" :scroll-x="true">
+				<view class="goods-item" v-for="(item, index) in list" :key="index" @click="toDetail(item)" :class="[goodsValue.ornament.type]" :style="goodsItemCss">
+					<view class="goods-img-wrap">
+						<image class="goods-img" :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }" :src="$util.img(item.goods_image, { size: 'mid' })" mode="widthFix" @error="imgError(index)" :lazy-load="true"/>
+						<view class="sell-out" v-if="item.stock <= 0">
+							<text class="iconfont icon-shuqing"></text>
+						</view>
+					</view>
+					<view :class="['info-wrap', { 'multi-content': value.nameLineMode == 'multiple' }]" v-if="
+							goodsValue.goodsNameStyle.control ||
+								(goodsValue.tag && goodsValue.tag.value != 'hidden') ||
+								goodsValue.priceStyle.mainControl ||
+								goodsValue.priceStyle.lineControl
+						">
+						<view v-if="goodsValue.goodsNameStyle.control" class="goods-name"
+							:style="{ color: goodsValue.theme == 'diy' ? goodsValue.goodsNameStyle.color : '', fontWeight: goodsValue.goodsNameStyle.fontWeight ? 'bold' : '' }"
+							:class="[{ 'using-hidden': goodsValue.nameLineMode == 'single' }, { 'multi-hidden': goodsValue.nameLineMode == 'multiple' }]">
+							{{ lang=='en-us'?item.en_goods_name:item.goods_name }}
+						</view>
+						<template v-if="goodsValue.tag">
+							<view class="tag-wrap" v-if="goodsValue.tag.value == 'label' && item.label_name">
+								<text class="hollow-tag">{{ item.label_name }}</text>
+							</view>
+							<view class="tag-wrap" v-else-if="goodsValue.tag.value == 'diy'">
+								<text class="hollow-tag">{{ goodsValue.tag.text }}</text>
+							</view>
+						</template>
+						<view class="pro-info">
+							<view class="discount-price">
+								<view class="price-wrap" v-if="goodsValue.priceStyle.mainControl">
+									<text class="unit price-style small" :style="{ color: goodsValue.theme == 'diy' ? goodsValue.priceStyle.mainColor + '!important' : '' }">￥</text>
+									<text class="price price-style large" :style="{ color: goodsValue.theme == 'diy' ? goodsValue.priceStyle.mainColor + '!important' : '' }">{{ showPrice(item).split('.')[0] }}</text>
+									<text class="unit price-style small" :style="{ color: goodsValue.theme == 'diy' ? goodsValue.priceStyle.mainColor + '!important' : '' }">{{ '.' + showPrice(item).split('.')[1] }}</text>
+								</view>
+								<view class="member-price" v-if="(item.member_price && item.member_price == showPrice(item)) || item.promotion_type == 1">
+									<image v-if="item.member_price && item.member_price == showPrice(item)" :src="$util.img('public/uniapp/index/VIP.png')"/>
+									<image v-else-if="item.promotion_type == 1" :src="$util.img('public/uniapp/index/discount.png')"/>
+								</view>
+								<view v-if="goodsValue.priceStyle.lineControl && showMarketPrice(item)" class="delete-price price-font" :style="{ color: goodsValue.theme == 'diy' ? goodsValue.priceStyle.lineColor : '' }">
+									￥{{ showMarketPrice(item) }}
+								</view>
+								<view class="sale" v-if="goodsValue.saleStyle.control" :style="{ color: goodsValue.theme == 'diy' ? goodsValue.saleStyle.color : '' }">
+									已售{{ item.sale_num }}{{ item.unit ? item.unit : '件' }}
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</scroll-view>
+			<swiper v-if="goodsValue.template == 'horizontal-slide' && goodsValue.slideMode == 'slide'" :autoplay="false" class="swiper" :style="{ height: swiperHeight }">
+				<swiper-item v-for="(pageItem, pageIndex) in page" :key="pageIndex" :class="['swiper-item',  (list.length && [list[pageIndex].length / 3] >= 1) && 'flex-between']">
+					<view class="goods-item" v-for="(dataItem, dataIndex) in list[pageIndex]" :key="dataIndex" @click="toDetail(dataItem)" :class="[goodsValue.ornament.type]" :style="goodsItemCss">
+						<view class="goods-img-wrap">
+							<image class="goods-img" :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }" :src="$util.img(dataItem.goods_image, { size: 'mid' })" mode="widthFix" @error="imgError(dataIndex)" :lazy-load="true"/>
+							<view class="sell-out" v-if="dataItem.stock <= 0">
+								<text class="iconfont icon-shuqing"></text>
+							</view>
+						</view>
+						<view :class="['info-wrap', { 'multi-content': value.nameLineMode == 'multiple' }]" v-if="
+								goodsValue.goodsNameStyle.control ||
+									(goodsValue.tag && goodsValue.tag.value != 'hidden') ||
+									goodsValue.priceStyle.mainControl ||
+									goodsValue.priceStyle.lineControl
+							">
+							<view v-if="goodsValue.goodsNameStyle.control" class="goods-name"
+								:style="{ color: goodsValue.theme == 'diy' ? goodsValue.goodsNameStyle.color : '', fontWeight: goodsValue.goodsNameStyle.fontWeight ? 'bold' : '' }"
+								:class="[{ 'using-hidden': goodsValue.nameLineMode == 'single' }, { 'multi-hidden': goodsValue.nameLineMode == 'multiple' }]">
+								{{ lang=='en-us'?dataItem.en_goods_name:dataItem.goods_name }}
+							</view>
+							<template v-if="goodsValue.tag">
+								<view class="tag-wrap" v-if="goodsValue.tag.value == 'label' && dataItem.label_name">
+									<text class="hollow-tag">{{ dataItem.label_name }}</text>
+								</view>
+								<view class="tag-wrap" v-else-if="goodsValue.tag.value == 'diy'">
+									<text class="hollow-tag">{{ goodsValue.tag.text }}</text>
+								</view>
+							</template>
+							<view class="pro-info">
+								<view class="discount-price">
+									<view class="price-wrap" v-if="goodsValue.priceStyle.mainControl">
+										<text class="unit price-style small" :style="{ color: goodsValue.theme == 'diy' ? goodsValue.priceStyle.mainColor + '!important' : '' }">￥</text>
+										<text class="price price-style large" :style="{ color: goodsValue.theme == 'diy' ? goodsValue.priceStyle.mainColor + '!important' : '' }">
+											{{ showPrice(dataItem).split('.')[0] }}
+										</text>
+										<text class="unit price-style small" :style="{ color: goodsValue.theme == 'diy' ? goodsValue.priceStyle.mainColor + '!important' : '' }">
+											{{ '.' + showPrice(dataItem).split('.')[1] }}
+										</text>
+									</view>
+									<view class="member-price" v-if="(dataItem.member_price && dataItem.member_price == showPrice(dataItem)) || dataItem.promotion_type == 1">
+										<image v-if="dataItem.member_price && dataItem.member_price == showPrice(dataItem)" :src="$util.img('public/uniapp/index/VIP.png')"/>
+										<image v-else-if="dataItem.promotion_type == 1" :src="$util.img('public/uniapp/index/discount.png')"/>
+									</view>
+									<view v-if="goodsValue.priceStyle.lineControl && showMarketPrice(dataItem)" class="delete-price" :style="{ color: goodsValue.theme == 'diy' ? goodsValue.priceStyle.lineColor : '' }">
+										￥{{ showMarketPrice(dataItem) }}
+									</view>
+									<view class="sale" v-if="goodsValue.saleStyle.control" :style="{ color: goodsValue.theme == 'diy' ? goodsValue.saleStyle.color : '' }">
+										已售{{ dataItem.sale_num }}{{ dataItem.unit ? dataItem.unit : '件' }}
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</swiper-item>
+			</swiper>
+		</view>
+		<ns-goods-sku-index ref="goodsSkuIndex" @addCart="addCartPoint"></ns-goods-sku-index>
+		<view class="cart-point" :style="{ left: item.left + 'px', top: item.top + 'px' }" :key="index" v-for="(item, index) in carIconList"></view>
+	</x-skeleton>
+</template>
+
+<script>
+	import nsGoodsSkuIndex from '@/components/ns-goods-sku/ns-goods-sku-index.vue';
+	export default {
+		name: 'diy-goods-list',
+		components: {
+			nsGoodsSkuIndex
+		},
+		props: {
+			value: {
+				type: Object,
+				default: () => {
+					return {};
+				}
+			}
+		},
+		data() {
+			return {
+				loading: true,
+				skeletonType: '',
+				skeletonConfig: {},
+				list: [],
+				goodsValue: {},
+				page: 1,
+				carIconList: {},
+				cartAnimation: {},
+				lang:uni.getStorageSync("lang")
+			};
+		},
+		created() {
+			this.goodsValue = this.value;
+			this.initSkeleton();
+			this.getGoodsList();
+		},
+		watch: {
+			'globalStoreInfo.store_id': {
+				handler(nval, oval) {
+					if (nval != oval) {
+						this.getGoodsList();
+					}
+				},
+				deep: true
+			},
+			// 组件刷新监听
+			componentRefresh: function(nval) {
+				this.getGoodsList();
+			}
+		},
+		computed: {
+			goodsListWarpCss() {
+				var obj = '';
+				obj += 'background-color:' + this.goodsValue.componentBgColor + ';';
+				if (this.goodsValue.componentAngle == 'round') {
+					obj += 'border-top-left-radius:' + this.goodsValue.topAroundRadius * 2 + 'rpx;';
+					obj += 'border-top-right-radius:' + this.goodsValue.topAroundRadius * 2 + 'rpx;';
+					obj += 'border-bottom-left-radius:' + this.goodsValue.bottomAroundRadius * 2 + 'rpx;';
+					obj += 'border-bottom-right-radius:' + this.goodsValue.bottomAroundRadius * 2 + 'rpx;';
+				}
+				return obj;
+			},
+			// 商品项样式
+			goodsItemCss() {
+				var obj = '';
+				obj += 'background-color:' + this.goodsValue.elementBgColor + ';';
+				if (this.goodsValue.elementAngle == 'round') {
+					obj += 'border-top-left-radius:' + this.goodsValue.topElementAroundRadius * 2 + 'rpx;';
+					obj += 'border-top-right-radius:' + this.goodsValue.topElementAroundRadius * 2 + 'rpx;';
+					obj += 'border-bottom-left-radius:' + this.goodsValue.bottomElementAroundRadius * 2 + 'rpx;';
+					obj += 'border-bottom-right-radius:' + this.goodsValue.bottomElementAroundRadius * 2 + 'rpx;';
+				}
+				if (this.goodsValue.ornament.type == 'shadow') {
+					obj += 'box-shadow:' + '0 0 10rpx ' + this.goodsValue.ornament.color + ';';
+				}
+				if (this.goodsValue.ornament.type == 'stroke') {
+					obj += 'border:' + '2rpx solid ' + this.goodsValue.ornament.color + ';';
+				}
+				const screenWidth = uni.getSystemInfoSync().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);
+					else width = [screenWidth - this.rpxUpPx(20) * 2 - this.rpxUpPx(200) * 3 - this.rpxUpPx(this.value
+						.margin.both * 2) * 2] / 6;
+					obj += 'margin-left:' + width + 'px;';
+					obj += 'margin-right:' + width + 'px;';
+				}
+				return obj;
+			},
+			swiperHeight() {
+				if (this.value.nameLineMode == 'multiple') {
+					if (this.value.ornament.type == 'shadow') return '414rpx';
+					else return '402rpx';
+				}
+				if (this.value.ornament.type == 'shadow') return '370rpx';
+				else return '358rpx';
+			},
+			cartPosition() {
+				return this.$store.state.cartPosition;
+			}
+		},
+		methods: {
+			initSkeleton() {
+				if (this.goodsValue.template == 'row1-of1') {
+
+					// 单列 风格
+					this.skeletonType = 'list';
+					this.skeletonConfig = {};
+
+				} else if (this.goodsValue.template == 'row1-of2') {
+
+					// 两列 风格
+					this.skeletonType = 'waterfall';
+					this.skeletonConfig = {
+						headHeight: '320rpx',
+						textRows: 2,
+						textWidth: ['100%', '80%']
+					};
+
+				} else if (this.goodsValue.template == 'row1-of3') {
+
+					// 三列 风格
+					this.skeletonType = 'waterfall';
+					this.skeletonConfig = {
+						gridColumns: 3,
+						headHeight: '200rpx',
+						textRows: 2,
+						textWidth: ['100%', '80%']
+					};
+
+				} else if (this.goodsValue.template == 'horizontal-slide') {
+
+					// 横向滑动 风格
+					this.skeletonType = 'waterfall';
+					this.skeletonConfig = {
+						gridRows: 1,
+						gridColumns: 3,
+						headHeight: '200rpx',
+						textRows: 2,
+						textWidth: ['100%', '80%']
+					};
+
+				} else if (this.goodsValue.template == 'large-mode') {
+
+					// 大图 风格
+					this.skeletonType = 'list';
+					this.skeletonConfig = {
+						itemDirection: 'column',
+						headWidth: '100%',
+						headHeight: '320rpx',
+						textRows: 2,
+						textWidth: ['100%', '80%']
+					};
+
+				}
+			},
+			rpxUpPx(res) {
+				const screenWidth = uni.getSystemInfoSync().windowWidth;
+				var data = (screenWidth * parseInt(res)) / 750;
+				return Math.floor(data);
+			},
+			getGoodsList() {
+				var data = {
+					num: this.goodsValue.count
+				};
+				if (this.goodsValue.sources == 'category') {
+					data.category_id = this.goodsValue.categoryId;
+					data.category_level = 1;
+				} else if (this.goodsValue.sources == 'diy') {
+					data.num = 0;
+					data.goods_id_arr = this.goodsValue.goodsId.toString();
+				}
+				data.order = this.goodsValue.sortWay;
+
+				this.$api.sendRequest({
+					url: '/api/goodssku/components',
+					data: data,
+					success: res => {
+						if (res.code == 0 && res.data) {
+							let data = res.data;
+							this.list = data.map(item => {
+								item.id = this.genNonDuplicate();
+								return item;
+							});
+
+							// 切屏滚动，每页显示固定数量
+							if (this.goodsValue.template == 'horizontal-slide' && this.goodsValue.slideMode == 'slide') {
+								let size = 3;
+								let temp = [];
+								this.page = Math.ceil(this.list.length / size);
+								for (var i = 0; i < this.page; i++) {
+									temp[i] = [];
+									for (var j = i * size; j < this.list.length; j++) {
+										if (temp[i].length == size) break;
+										temp[i].push(this.list[j]);
+									}
+								}
+								this.list = temp;
+							}
+						}
+
+						this.loading = false;
+					}
+				});
+			},
+			toDetail(item) {
+				this.$util.redirectTo('/pages/goods/detail', {
+					goods_id: item.goods_id
+				});
+			},
+			imgError(index) {
+				if (this.list[index]) this.list[index].goods_image = this.$util.getDefaultImage().goods;
+			},
+			showPrice(data) {
+				let price = data.discount_price;
+				if (data.member_price && parseFloat(data.member_price) < parseFloat(price)) price = data.member_price;
+				return price;
+			},
+			showMarketPrice(item) {
+				let price = this.showPrice(item);
+				if (item.market_price > 0) {
+					return item.market_price;
+				} else if (parseFloat(item.price) > parseFloat(price)) {
+					return item.price;
+				}
+				return '';
+			},
+			/**
+			 * 添加点
+			 * @param {Object} id
+			 */
+			addCartPoint(id) {
+				if (!this.cartPosition) return;
+
+				const query = uni.createSelectorQuery().in(this);
+				query
+					.select('#' + id + ' .click-event')
+					.boundingClientRect(data => {
+						if (data) {
+							let left = data.left;
+							let top = data.top;
+
+							if (left < this.cartPosition.left) {
+								var bezierPos = [{
+									x: left,
+									y: top
+								}, {
+									x: left + 50,
+									y: top - 150
+								}, {
+									x: this
+										.cartPosition.left,
+									y: this.cartPosition.top
+								}];
+							} else {
+								var bezierPos = [{
+									x: left,
+									y: top
+								}, {
+									x: left - 50,
+									y: top - 150
+								}, {
+									x: this
+										.cartPosition.left,
+									y: this.cartPosition.top
+								}];
+							}
+
+							let key = new Date().getTime();
+							this.$set(this.carIconList, key, {
+								left: left,
+								top: top,
+								index: 0,
+								bezierPos: this.$util.bezier(bezierPos, 6).bezier_points,
+								timer: null
+							});
+							this.startAnimation(key);
+						}
+					})
+					.exec();
+			},
+			/**
+			 * 执行动画
+			 * @param {Object} key
+			 */
+			startAnimation(key) {
+				let bezierPos = this.carIconList[key].bezierPos,
+					index = this.carIconList[key].index;
+
+				this.carIconList[key].timer = setInterval(() => {
+					if (index < 6) {
+						this.carIconList[key].left = bezierPos[index].x;
+						this.carIconList[key].top = bezierPos[index].y;
+						index++;
+					} else {
+						clearInterval(this.carIconList[key].timer);
+						delete this.carIconList[key];
+						this.$forceUpdate();
+
+						// 购物车图标
+						let animation = uni.createAnimation({
+							duration: 200,
+							timingFunction: 'ease'
+						});
+						animation.scale(1.2).step();
+						this.cartAnimation = animation.export();
+						setTimeout(() => {
+							animation.scale(1).step();
+							this.cartAnimation = animation.export();
+						}, 300);
+					}
+				}, 50);
+			},
+			genNonDuplicate(len = 6) {
+				return Number(
+					Math.random()
+					.toString()
+					.substr(3, len) + Date.now()
+				).toString(36);
+			}
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	.goods-list {
+		overflow: hidden;
+		padding-bottom: 10rpx;
+
+		.goods-item {
+			position: relative;
+			overflow: hidden;
+			line-height: 1;
+
+			.sale {
+				align-self: baseline;
+				color: $color-tip;
+				font-size: $font-size-activity-tag;
+			}
+
+			.info-wrap {
+				.goods-name {
+					margin-bottom: 10rpx;
+					line-height: 1.3;
+				}
+
+				.tag-wrap {
+					margin-bottom: 20rpx;
+
+					text {
+						display: inline-block;
+						font-size: 18rpx;
+					}
+
+					.hollow-tag {
+						border: 2rpx solid $base-color;
+						border-radius: 4rpx;
+						margin-right: 10rpx;
+						box-sizing: border-box;
+						line-height: 1.2;
+						padding: 2rpx 4rpx 0;
+						max-width: 100%;
+						color: $base-color;
+					}
+				}
+
+				.member-price {
+					display: flex;
+					align-items: center;
+
+					image {
+						margin-left: 4rpx;
+						width: 50rpx;
+						height: 24rpx;
+					}
+				}
+			}
+
+			.shopping-cart-btn {
+				font-size: 36rpx;
+				border: 2rpx solid $base-color;
+				border-radius: 50%;
+				padding: 10rpx;
+				color: $base-color;
+				width: 36rpx;
+				height: 36rpx;
+				text-align: center;
+				line-height: 36rpx;
+			}
+
+			.plus-sign-btn {
+				font-size: 36rpx;
+				border: 2rpx solid $base-color;
+				border-radius: 50%;
+				padding: 10rpx;
+				color: $base-color;
+				width: 36rpx;
+				height: 36rpx;
+				text-align: center;
+				line-height: 36rpx;
+			}
+
+			.buy-btn {
+				background-color: $base-color;
+				color: var(--btn-text-color);
+				border-radius: 50rpx;
+				font-size: $font-size-tag;
+				padding: 12rpx 30rpx;
+				line-height: 1;
+			}
+
+			.icon-diy {
+				font-size: 80rpx;
+			}
+			.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;
+				}
+			}
+		}
+	}
+
+	// 商品列表单列样式
+	.goods-list.row1-of1 {
+		.goods-item {
+			position: relative;
+			background-color: #fff;
+			display: flex;
+			margin-bottom: 20rpx;
+			padding: 16rpx;
+
+			&:last-of-type {
+				margin-bottom: 0;
+			}
+
+			&.shadow {
+				margin: 8rpx 8rpx 20rpx 8rpx;
+			}
+
+			.goods-img-wrap {
+				position: relative;
+				overflow: hidden;
+				width: 260rpx;
+				height: 260rpx;
+			}
+
+			.goods-img {
+				width: 260rpx;
+			}
+
+			.info-wrap {
+				width: calc(100% - 260rpx);
+				padding: 6rpx 0 6rpx 20rpx;
+				flex: 1;
+				display: flex;
+				flex-direction: column;
+				box-sizing: border-box;
+
+				.pro-info {
+					margin-top: auto;
+					display: flex;
+					flex-direction: row;
+					justify-content: space-between;
+					align-items: center;
+
+					.discount-price {
+						display: flex;
+						justify-content: space-between;
+						flex-direction: column;
+
+						.price-wrap {
+							white-space: nowrap;
+
+							.unit {
+								font-size: $font-size-tag !important;
+							}
+
+							.price {
+								font-size: $font-size-toolbar;
+							}
+
+							text {
+								font-weight: bold;
+							}
+						}
+					}
+
+					.delete-price {
+						text-decoration: line-through;
+						flex: 1;
+						line-height: 28rpx;
+						color: $color-tip;
+						font-size: $font-size-activity-tag;
+					}
+				}
+			}
+		}
+
+		&.style-1 {
+			.pro-info {
+				position: relative;
+
+				.price-wrap {
+					line-height: 1;
+				}
+
+				.discount-price {
+					align-items: flex-end;
+				}
+
+				.delete-price {
+					margin: 4rpx 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: 200rpx;
+			}
+		}
+	}
+
+	// 两列（一行两列）
+	.goods-list.row1-of2 {
+		display: flex;
+		flex-wrap: wrap;
+		justify-content: space-between;
+
+		.goods-item {
+			position: relative;
+			// overflow: hidden;//排查开启此行回影响IOS字体颜色
+			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: 344rpx;
+			}
+
+			.goods-img {
+				width: 100%;
+			}
+
+			.info-wrap {
+				display: flex;
+				flex-direction: column;
+				flex: 1;
+				padding: 20rpx;
+
+				.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: bold;
+								font-size: $font-size-tag !important;
+							}
+
+							.price {
+								font-weight: bold;
+								font-size: $font-size-toolbar !important;
+							}
+						}
+					}
+
+					.delete-price {
+						text-decoration: line-through;
+						flex: 1;
+						line-height: 28rpx;
+						color: $color-tip;
+						font-size: $font-size-activity-tag;
+					}
+				}
+			}
+		}
+
+		&.style-1 {
+			.pro-info {
+				.discount-price {
+					display: flex;
+					flex-wrap: wrap;
+					align-items: baseline;
+
+					.price-wrap {
+						display: inline-block;
+
+						text {
+							font-weight: bold;
+						}
+					}
+
+					.price-wrap {
+						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;
+			}
+		}
+	}
+
+	// 商品列表三列样式
+	.goods-list.row1-of3 {
+		display: flex;
+		flex-wrap: wrap;
+
+		.goods-item {
+			position: relative;
+			display: flex;
+			flex-direction: column;
+			// overflow: hidden;
+			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;
+				padding: 10rpx;
+
+				.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: $font-size-tag !important;
+							}
+
+							.price {
+								font-size: $font-size-toolbar;
+							}
+
+							text {
+								font-weight: bold;
+							}
+						}
+					}
+
+					.delete-price {
+						text-decoration: line-through;
+						flex: 1;
+						line-height: 28rpx;
+						color: $color-tip;
+						font-size: $font-size-activity-tag;
+					}
+				}
+			}
+		}
+
+		&.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: initial !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;
+			}
+		}
+	}
+
+	// 商品列表横向滚动样式
+	.goods-list.horizontal-slide {
+		.scroll {
+			width: calc(100% - 40rpx);
+			padding: 20rpx;
+			line-height: 1;
+			white-space: nowrap;
+
+			&.shadow {
+				margin-bottom: 8rpx;
+			}
+		}
+
+		.flex-between {
+			justify-content: space-between;
+		}
+
+		.goods-item {
+			position: relative;
+			// overflow: hidden;
+			width: 200rpx;
+			display: inline-block;
+			box-sizing: border-box;
+
+			&:nth-child(3n + 3) {
+				width: 198rpx;
+			}
+
+			&.shadow {
+				margin-top: 8rpx;
+			}
+			.goods-img-wrap{
+				position: relative;
+				width: 100%;
+				max-height: 200rpx;
+				height: 200rpx;
+			}
+			.goods-img {
+				width: 100%;
+				max-height: 200rpx;
+				height: 200rpx;
+			}
+
+			.info-wrap {
+				padding: 10rpx;
+				display: flex;
+				flex-direction: column;
+				justify-content: space-between;
+
+				&.multi-content {
+					height: 162rpx;
+					box-sizing: border-box;
+				}
+
+				.goods-name {
+					line-height: 1;
+					margin-bottom: 10rpx;
+
+					&.multi-hidden {
+						white-space: break-spaces;
+						line-height: 1.3;
+					}
+				}
+
+				.pro-info {
+					display: flex;
+					flex-direction: column;
+					justify-content: space-between;
+
+					.discount-price {
+						display: flex;
+						flex-wrap: wrap;
+						align-items: baseline;
+
+						.price-wrap {
+							line-height: 1;
+							white-space: nowrap;
+
+							.unit {
+								font-size: $font-size-tag !important;
+								// color: var(--price-color);
+							}
+
+							.price {
+								font-size: $font-size-toolbar;
+							}
+
+							text {
+								font-weight: bold;
+								// color: var(--price-color);
+							}
+						}
+					}
+
+					.delete-price {
+						margin-left: 6rpx;
+						text-decoration: line-through;
+						flex: 1;
+						line-height: 28rpx;
+						color: $color-tip;
+						font-size: $font-size-activity-tag;
+						flex-basis: 100%;
+					}
+				}
+			}
+		}
+
+		.swiper {
+			width: 100%;
+			white-space: nowrap;
+			padding: 20rpx;
+			box-sizing: border-box;
+
+			.swiper-item {
+				display: flex;
+				align-items: baseline;
+			}
+
+			.goods-item {
+				position: relative;
+				width: 200rpx;
+
+				.goods-img {
+					width: 100%;
+				}
+			}
+		}
+		.sell-out{
+			text{
+				font-size: 190rpx;
+			}
+		}
+	}
+
+	// 商品列表大图样式
+	.goods-list.large-mode {
+		.goods-item {
+			position: relative;
+			background-color: #fff;
+			margin-top: 20rpx;
+			display: flex;
+			flex-direction: column;
+
+			&:first-child {
+				margin-top: 0;
+			}
+
+			&.shadow {
+				margin-left: 8rpx;
+				margin-right: 8rpx;
+
+				&:first-child {
+					margin-top: 8rpx;
+				}
+			}
+
+			.goods-img-wrap {
+				position: relative;
+				width: 100%;
+			}
+			.goods-img {
+				width: 100%;
+			}
+
+			.info-wrap {
+				padding: 20rpx;
+
+				.sale {
+					line-height: 1;
+				}
+
+				.pro-info {
+					margin-top: 10rpx;
+					display: flex;
+					justify-content: space-between;
+					align-items: center;
+
+					.discount-price {
+						.price-wrap {
+							white-space: nowrap;
+							line-height: 1;
+
+							.unit {
+								font-size: $font-size-tag !important;
+								// color: var(--price-color);
+							}
+
+							.price {
+								font-size: $font-size-toolbar;
+							}
+
+							text {
+								font-weight: bold;
+								// color: var(--price-color);
+							}
+						}
+					}
+
+					.delete-price {
+						margin-left: 10rpx;
+						text-decoration: line-through;
+						flex: 1;
+						line-height: 28rpx;
+						color: $color-tip;
+						font-size: $font-size-activity-tag;
+					}
+				}
+			}
+		}
+
+		&.style-1 {
+			.info-wrap {
+				padding: 20rpx 20rpx 52rpx;
+			}
+
+			.pro-info {
+				.discount-price {
+					position: relative;
+					flex: 1;
+					display: flex;
+					align-items: baseline;
+
+					.sale {
+						position: absolute;
+						bottom: -34rpx;
+						left: 6rpx;
+					}
+
+					.price-wrap {
+						display: inline-block;
+					}
+
+					.delete-price {
+						display: inline-block;
+					}
+				}
+			}
+
+			.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: 500rpx;
+			}
+		}
+	}
+
+	.cart-action-wrap {
+		position: relative;
+
+		.cart-num {
+			position: absolute;
+			top: -16rpx;
+			right: -10rpx;
+			padding: 2rpx 4rpx;
+			min-width: 30rpx;
+			height: 30rpx;
+			line-height: 30rpx;
+			text-align: center;
+			color: #fff;
+			background-color: red;
+			border-radius: 30rpx;
+			font-size: $font-size-activity-tag;
+		}
+	}
+
+	.cart-point {
+		width: 26rpx;
+		height: 26rpx;
+		position: fixed;
+		z-index: 1000;
+		background: #f00;
+		border-radius: 50%;
+		transition: all 0.05s;
+	}
+
+	.click-wrap {
+		.click-event {
+			position: absolute;
+			width: 2rpx;
+			height: 2rpx;
+			left: 50%;
+			top: 50%;
+			transform: translate(-50%, -50%);
+			z-index: 5;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/components/diy-components/diy-goods-recommend.vue b/components/diy-components/diy-goods-recommend.vue
new file mode 100644
index 0000000..e8e55ff
--- /dev/null
+++ b/components/diy-components/diy-goods-recommend.vue
@@ -0,0 +1,599 @@
+<template>
+	<x-skeleton type="waterfall" :loading="loading" :configs="skeletonConfig">
+		<view v-if="list.length" :class="['goods-list', goodsValue.style]" :style="goodsListWarpCss">
+			<view class="top-wrap" v-if="goodsValue.topStyle.support">
+				<text :class="['js-icon', goodsValue.topStyle.icon.value]" :style="{ backgroundColor: goodsValue.topStyle.icon.bgColor, color: goodsValue.topStyle.icon.color }"></text>
+				<text class="title" :style="{ color: goodsValue.topStyle.color }">{{ goodsValue.topStyle.title }}</text>
+				<text class="line" :style="{ color: goodsValue.topStyle.subColor }"></text>
+				<text class="sub" :style="{ color: goodsValue.topStyle.subColor }">{{ goodsValue.topStyle.subTitle }}</text>
+			</view>
+			<swiper :autoplay="false" class="swiper" :style="{ height: swiperHeight }">
+				<swiper-item v-for="(item, index) in page" :key="index" :class="['swiper-item', [list[index].length / 3] >= 1 && 'flex-between']">
+					<view class="goods-item" v-for="(dataItem, dataIndex) in list[index]" :key="dataIndex" @click="toDetail(dataItem)" :class="[goodsValue.ornament.type]" :style="goodsItemCss">
+						<div class="goods-img-wrap">
+							<image class="goods-img" :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }" :src="$util.img(dataItem.goods_image, { size: 'mid' })" mode="widthFix" @error="imgError(index,dataIndex)" :lazy-load="true"/>
+							<view class="sell-out" v-if="dataItem.stock <= 0">
+								<text class="iconfont icon-shuqing"></text>
+							</view>
+						</div>
+						<view :class="['info-wrap', { 'multi-content': value.nameLineMode == 'multiple' }]" v-if="goodsValue.goodsNameStyle.control || goodsValue.priceStyle.mainControl || goodsValue.priceStyle.lineControl || goodsValue.labelStyle.support">
+							<view v-if="goodsValue.goodsNameStyle.control" class="goods-name"
+								:style="{ color: goodsValue.theme == 'diy' ? goodsValue.goodsNameStyle.color : '', fontWeight: goodsValue.goodsNameStyle.fontWeight ? 'bold' : '' }"
+								:class="[{ 'using-hidden': goodsValue.nameLineMode == 'single' }, { 'multi-hidden': goodsValue.nameLineMode == 'multiple' }]">
+								{{ dataItem.goods_name }}
+							</view>
+							<view class="pro-info">
+								<view class="label-wrap" v-if="goodsValue.labelStyle.support" :style="{ background: goodsValue.labelStyle.bgColor, color: goodsValue.labelStyle.color }">
+									<image :src="$util.img('app/component/view/goods_recommend/img/label.png')" mode="widthFix"/>
+									<text>{{ goodsValue.labelStyle.title }}</text>
+								</view>
+								<view class="discount-price">
+									<view class="price-wrap" v-if="goodsValue.priceStyle.mainControl">
+										<text class="unit price-style small" :style="{ color: goodsValue.theme == 'diy' ? goodsValue.priceStyle.mainColor + '!important' : '' }">￥</text>
+										<text class="price price-style large" :style="{ color: goodsValue.theme == 'diy' ? goodsValue.priceStyle.mainColor + '!important' : '' }">{{ showPrice(dataItem).split('.')[0] }}</text>
+										<text class="unit price-style small" :style="{ color: goodsValue.theme == 'diy' ? goodsValue.priceStyle.mainColor + '!important' : '' }">{{ '.' + showPrice(dataItem).split('.')[1] }}</text>
+									</view>
+									<view v-if="goodsValue.priceStyle.lineControl && showMarketPrice(dataItem)" class="delete-price price-font" :style="{ color: goodsValue.theme == 'diy' ? goodsValue.priceStyle.lineColor : '' }">￥{{ showMarketPrice(dataItem) }}</view>
+									<view class="sale" v-if="goodsValue.saleStyle.control" :style="{ color: goodsValue.theme == 'diy' ? goodsValue.saleStyle.color : '' }">
+										售{{ dataItem.sale_num }}{{ dataItem.unit ? dataItem.unit : '件' }}
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</swiper-item>
+			</swiper>
+		</view>
+	</x-skeleton>
+</template>
+
+<script>
+	export default {
+		name: 'diy-goods-recommend',
+		props: {
+			value: {
+				type: Object,
+				default: () => {
+					return {};
+				}
+			}
+		},
+		data() {
+			return {
+				loading: true,
+				skeletonConfig: {
+					gridRows: 1,
+					gridColumns: 3,
+					headWidth: '200rpx',
+					headHeight: '200rpx',
+					textRows: 2,
+					textWidth: ['100%', '60%'],
+				},
+				list: [],
+				goodsValue: {},
+				page: 1
+			};
+		},
+		created() {
+			this.goodsValue = this.value;
+			this.getGoodsList();
+		},
+		watch: {
+			'globalStoreInfo.store_id': {
+				handler(nval, oval) {
+					if (nval != oval) {
+						this.getGoodsList();
+					}
+				},
+				deep: true
+			},
+			// 组件刷新监听
+			componentRefresh: function(nval) {
+				this.getGoodsList();
+			}
+		},
+		computed: {
+			goodsListWarpCss() {
+				var obj = '';
+				obj += 'background-color:' + this.goodsValue.componentBgColor + ';';
+				if (this.goodsValue.componentAngle == 'round') {
+					obj += 'border-top-left-radius:' + this.goodsValue.topAroundRadius * 2 + 'rpx;';
+					obj += 'border-top-right-radius:' + this.goodsValue.topAroundRadius * 2 + 'rpx;';
+					obj += 'border-bottom-left-radius:' + this.goodsValue.bottomAroundRadius * 2 + 'rpx;';
+					obj += 'border-bottom-right-radius:' + this.goodsValue.bottomAroundRadius * 2 + 'rpx;';
+				}
+				if (this.goodsValue.bgUrl) {
+					obj += `background-image: url('${this.$util.img(this.goodsValue.bgUrl)}');`;
+				}
+				return obj;
+			},
+			// 商品项样式
+			goodsItemCss() {
+				var obj = '';
+				obj += 'background-color:' + this.value.elementBgColor + ';';
+				if (this.goodsValue.elementAngle == 'round') {
+					obj += 'border-top-left-radius:' + this.goodsValue.topElementAroundRadius * 2 + 'rpx;';
+					obj += 'border-top-right-radius:' + this.goodsValue.topElementAroundRadius * 2 + 'rpx;';
+					obj += 'border-bottom-left-radius:' + this.goodsValue.bottomElementAroundRadius * 2 + 'rpx;';
+					obj += 'border-bottom-right-radius:' + this.goodsValue.bottomElementAroundRadius * 2 + 'rpx;';
+				}
+				if (this.goodsValue.ornament.type == 'shadow') {
+					obj += 'box-shadow:' + '0 0 10rpx ' + this.goodsValue.ornament.color + ';';
+				}
+				if (this.goodsValue.ornament.type == 'stroke') {
+					obj += 'border:' + '2rpx solid ' + this.goodsValue.ornament.color + ';';
+				}
+				const screenWidth = uni.getSystemInfoSync().windowWidth;
+				var width = '';
+				if (this.goodsValue.style != 'style-2') {
+					width = [screenWidth - this.rpxUpPx(20) * 2 - this.rpxUpPx(200) * 3 - this.rpxUpPx(this.value.margin
+						.both * 2) * 2] / 6;
+				} else {
+					width = [screenWidth - this.rpxUpPx(20) * 2 - this.rpxUpPx(20) * 2 - this.rpxUpPx(200) * 3 - this
+						.rpxUpPx(this.value.margin.both * 2) * 2
+					] / 6;
+				}
+				obj += 'margin-left:' + width + 'px;';
+				obj += 'margin-right:' + width + 'px;';
+				return obj;
+			},
+			swiperHeight() {
+				if (this.goodsValue.style == 'style-3') {
+					return '330rpx';
+				} else if (this.goodsValue.style != 'style-2') {
+					if (this.value.nameLineMode == 'multiple') {
+						return '348rpx';
+					}
+					return '312rpx';
+				} else {
+					if (this.value.nameLineMode == 'multiple') {
+						return '360rpx';
+					}
+					return '320rpx';
+				}
+			}
+		},
+		methods: {
+			rpxUpPx(res) {
+				const screenWidth = uni.getSystemInfoSync().windowWidth;
+				var data = (screenWidth * parseInt(res)) / 750;
+				return Math.floor(data);
+			},
+			getGoodsList() {
+				var data = {
+					num: this.goodsValue.count
+				};
+				if (this.goodsValue.sources == 'category') {
+					data.category_id = this.goodsValue.categoryId;
+					data.category_level = 1;
+				} else if (this.goodsValue.sources == 'diy') {
+					data.num = 0;
+					data.goods_id_arr = this.goodsValue.goodsId.toString();
+				}
+				data.order = this.goodsValue.sortWay;
+
+				this.$api.sendRequest({
+					url: '/api/goodssku/components',
+					data: data,
+					success: res => {
+						if (res.code == 0 && res.data) {
+							let data = res.data;
+							this.list = data;
+
+							// 切屏滚动，每页显示固定数量
+							let size = 3;
+							let temp = [];
+							this.page = Math.ceil(this.list.length / size);
+							for (var i = 0; i < this.page; i++) {
+								temp[i] = [];
+								for (var j = i * size; j < this.list.length; j++) {
+									if (temp[i].length == size) break;
+									temp[i].push(this.list[j]);
+								}
+							}
+							this.list = temp;
+						}
+						this.loading = false;
+					}
+				});
+			},
+			toDetail(item) {
+				this.$util.redirectTo('/pages/goods/detail', {
+					goods_id: item.goods_id
+				});
+			},
+			imgError(pageIndex, index) {
+				this.list[pageIndex][index].goods_image = this.$util.getDefaultImage().goods;
+			},
+			showPrice(data) {
+				let price = data.discount_price;
+				if (data.member_price && parseFloat(data.member_price) < parseFloat(price)) price = data.member_price;
+				return price;
+			},
+			showMarketPrice(item) {
+				let price = this.showPrice(item);
+				if (item.market_price > 0) {
+					return item.market_price;
+				} else if (item.price > price) {
+					return item.price;
+				}
+				return '';
+			},
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	.goods-list {
+		.goods-item {
+			line-height: 1;
+
+			.sale {
+				line-height: 1;
+				color: $color-tip;
+				font-size: $font-size-activity-tag;
+			}
+
+			.info-wrap {
+				.goods-name {
+					margin-bottom: 10rpx;
+					line-height: 1.3;
+				}
+			}
+			.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: 180rpx;
+				}
+			}
+		}
+	}
+
+	// 商品列表横向滚动样式
+	.goods-list.style-1 {
+		width: 100%;
+		white-space: nowrap;
+		background-repeat: round;
+
+		.top-wrap {
+			display: flex;
+			align-items: center;
+			padding: 20rpx 0;
+
+			.js-icon {
+				border-radius: 50%;
+				font-size: 40rpx;
+				margin-right: 10rpx;
+				width: 70rpx;
+				height: 70rpx;
+				text-align: center;
+				line-height: 70rpx;
+			}
+
+			.line {
+				height: 28rpx;
+				margin: 0 10rpx;
+				border: 2rpx solid;
+			}
+
+			.title {
+				font-weight: bold;
+				font-size: $font-size-toolbar;
+			}
+
+			.sub {
+				font-size: $font-size-tag;
+			}
+		}
+
+		.flex-between {
+			justify-content: space-between;
+		}
+
+		.swiper {
+			display: flex;
+			flex-wrap: wrap;
+			margin: 0 20rpx;
+
+			.swiper-item {
+				display: flex;
+				align-items: center;
+			}
+		}
+
+		.goods-item {
+			overflow: hidden;
+			width: 200rpx;
+			display: inline-block;
+			box-sizing: border-box;
+
+			&:nth-child(3n + 3) {
+				width: 198rpx;
+			}
+
+			&.shadow {
+				margin-top: 8rpx;
+			}
+			.goods-img, .goods-img-wrap {
+				position: relative;
+				width: 100%;
+				height: 196rpx;
+			}
+
+			.info-wrap {
+				display: flex;
+				flex-direction: column;
+				padding: 10rpx;
+
+				&.multi-content {
+					height: 130rpx;
+					box-sizing: border-box;
+				}
+
+				.goods-name {
+					font-size: $font-size-sub;
+
+					&.multi-hidden {
+						white-space: break-spaces;
+					}
+				}
+
+				.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 {
+							line-height: 1;
+							white-space: nowrap;
+
+							.unit {
+								font-size: $font-size-tag;
+								color: $base-color;
+							}
+
+							.price {
+								font-size: $font-size-toolbar;
+							}
+
+							text {
+								font-weight: bold;
+								color: $base-color;
+							}
+						}
+					}
+
+					.delete-price {
+						margin-left: 10rpx;
+						text-decoration: line-through;
+						flex: 1;
+						line-height: 28rpx;
+						color: $color-tip;
+						font-size: $font-size-activity-tag;
+					}
+				}
+			}
+		}
+	}
+
+	// 商品列表横向滚动样式
+	.goods-list.style-2 {
+		width: 100%;
+		white-space: nowrap;
+		background-repeat: round;
+		padding-bottom: 20rpx;
+
+		.top-wrap {
+			display: flex;
+			align-items: center;
+			padding: 20rpx;
+
+			.js-icon {
+				border-radius: 50%;
+				font-size: 40rpx;
+				margin-right: 20rpx;
+				width: 70rpx;
+				height: 70rpx;
+				text-align: center;
+				line-height: 70rpx;
+			}
+
+			.line {
+				height: 28rpx;
+				margin: 0 10rpx;
+				border: 2rpx solid;
+			}
+
+			.title {
+				font-weight: bold;
+				font-size: $font-size-toolbar;
+			}
+
+			.sub {
+				font-size: $font-size-tag;
+			}
+		}
+
+		.swiper {
+			display: flex;
+			flex-wrap: wrap;
+			margin: 0 20rpx;
+			padding: 20rpx;
+			border-radius: 20rpx;
+			background-color: #fff;
+		}
+
+		.goods-item {
+			overflow: hidden;
+			width: 200rpx;
+			display: inline-block;
+			box-sizing: border-box;
+
+			&.shadow {
+				margin-top: 8rpx;
+				width: 200rpx;
+			}
+
+			.goods-img, .goods-img-wrap {
+				position: relative;
+				width: 100%;
+				height: 200rpx;
+			}
+
+			.info-wrap {
+				padding: 10rpx;
+
+				.goods-name {
+					line-height: 1;
+
+					&.multi-hidden {
+						line-height: 1.3;
+						height: 68rpx;
+						white-space: break-spaces;
+					}
+				}
+
+				.pro-info {
+					display: flex;
+					flex-direction: column;
+					justify-content: space-between;
+
+					.discount-price {
+						display: flex;
+						justify-content: space-between;
+						align-items: center;
+
+						.price-wrap {
+							line-height: 1.3;
+
+							.unit {
+								font-size: $font-size-tag;
+								color: $base-color;
+							}
+
+							text {
+								font-weight: bold;
+								color: $base-color;
+
+								&:last-of-type {
+									font-size: 32rpx;
+								}
+							}
+						}
+					}
+
+					.delete-price {
+						margin-left: 10rpx;
+						text-decoration: line-through;
+						flex: 1;
+						line-height: 28rpx;
+						color: $color-tip;
+						font-size: $font-size-activity-tag;
+					}
+				}
+			}
+		}
+	}
+
+	.goods-list.style-3 {
+		background-position: bottom;
+
+		.swiper {
+			display: flex;
+			flex-wrap: wrap;
+			margin: 0 20rpx;
+			padding: 10rpx 0;
+
+			.swiper-item {
+				display: flex;
+				align-items: center;
+			}
+		}
+
+		.goods-item {
+			overflow: hidden;
+			width: 200rpx;
+			display: inline-block;
+			box-sizing: border-box;
+
+			&.shadow {
+				// margin-top: 20rpx;
+			}
+
+			.goods-img, .goods-img-wrap {
+				position: relative;
+				width: 100%;
+				height: 200rpx;
+			}
+
+			.info-wrap {
+				display: flex;
+				flex-direction: column;
+				padding: 10rpx;
+
+				.pro-info {
+					text-align: center;
+
+					.label-wrap {
+						border-radius: 40rpx;
+						display: inline-block;
+						margin: 10rpx 0;
+						position: relative;
+						padding-left: 52rpx;
+						padding-right: 16rpx;
+						line-height: 1.7;
+
+						image {
+							position: absolute;
+							top: -2rpx;
+							left: -2rpx;
+							width: 46rpx;
+							height: 46rpx;
+						}
+
+						text {
+							font-size: $font-size-tag;
+						}
+					}
+
+					.discount-price {
+						.price-wrap {
+							line-height: 1;
+							white-space: nowrap;
+
+							.unit {
+								font-size: $font-size-tag;
+								color: $base-color;
+							}
+
+							.price {
+								font-size: $font-size-toolbar;
+							}
+
+							text {
+								font-weight: bold;
+								color: $base-color;
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/components/diy-components/diy-graphic-nav.vue b/components/diy-components/diy-graphic-nav.vue
new file mode 100644
index 0000000..1e86dcf
--- /dev/null
+++ b/components/diy-components/diy-graphic-nav.vue
@@ -0,0 +1,304 @@
+<template>
+    <view :style="componentStyle">
+        <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))">
+                    <!-- #ifdef MP -->
+                    <view class="graphic-nav-item" :class="[value.mode]" v-for="(item, index) in value.list"
+                        :key="index"
+                        v-if="index >= [(numItem) * (value.pageCount * value.rowCount)] && index < [(numItem+1) * (value.pageCount * value.rowCount)]"
+                        :style="{ width: 100 / value.rowCount + '%' }" @click="redirectTo(item.link)">
+                        <!-- #endif -->
+                        <!-- #ifdef H5 -->
+                        <view class="graphic-nav-item" :class="[value.mode]" v-for="(item, index) in value.list"
+                            :key="index"
+                            v-if="index >= [(numItem - 1) * (value.pageCount * value.rowCount)] && index < [numItem * (value.pageCount * value.rowCount)]"
+                            :style="{ width: 100 / value.rowCount + '%' }" @click="redirectTo(item.link)">
+                            <!-- #endif -->
+                            <view class="graphic-img" v-if="value.mode != 'text'"
+                                :style="{ fontSize: value.imageSize * 2 + 'rpx', width: value.imageSize * 2 + 'rpx', height: value.imageSize * 2 + 'rpx' }">
+                                <image v-if="item.iconType == 'img'"
+                                    :src="$util.img(item.imageUrl) || $util.img('public/uniapp/default_img/goods.png')"
+                                    mode="aspectFill"
+                                    :style="{ maxWidth: value.imageSize * 2 + 'rpx', maxHeight: value.imageSize * 2 + 'rpx', borderRadius: value.aroundRadius * 2 + 'rpx' }"
+                                    :show-menu-by-longpress="true"/>
+
+                                <diy-icon v-if="item.iconType == 'icon'" :icon="item.icon"
+                                    :value="item.style ? item.style : null"
+                                    :style="{ maxWidth: value.imageSize * 2 + 'rpx', maxHeight: value.imageSize * 2 + 'rpx', width: '100%', height: '100%' }"></diy-icon>
+
+                                <text class="tag" v-if="item.label.control"
+                                    :style="{ color: item.label.textColor, backgroundImage: 'linear-gradient(' + item.label.bgColorStart + ',' + item.label.bgColorEnd + ')' }">
+                                    {{ item.label.text }}
+                                </text>
+                            </view>
+                            <text v-if="value.mode != 'img'" class="graphic-text"
+                                :style="{ fontSize: value.font.size * 2 + 'rpx', fontWeight: value.font.weight, color: value.font.color }">
+                                {{ item.title }}
+                            </text>
+                        </view>
+                </swiper-item>
+            </swiper>
+
+            <view class="swiper-dot-box" v-if="isIndicatorDots" :class="value.carousel.type">
+                <view v-for="(numItem, numIndex) in Math.ceil(value.list.length / (value.pageCount * value.rowCount))" :key="numIndex">
+                    <view class="swiper-dot" :class="{'active':numIndex==swiperCurrent}"></view>
+                </view>
+            </view>
+
+        </block>
+        <scroll-view v-else :scroll-x="value.showStyle == 'singleSlide'" :class="['graphic-nav', value.showStyle == 'fixed' ? 'fixed-layout' : value.showStyle ]">
+            <!-- #ifdef MP -->
+            <view class="uni-scroll-view-content">
+                <!-- #endif -->
+
+                <view class="graphic-nav-item" :class="[value.mode]" v-for="(item, index) in value.list" :key="index" :style="{ width: 100 / value.rowCount + '%' }" @click="redirectTo(item.link)">
+                    <view class="graphic-img" v-if="value.mode != 'text'" :style="{ fontSize: value.imageSize * 2 + 'rpx', width: value.imageSize * 2 + 'rpx', height: value.imageSize * 2 + 'rpx' }">
+                        <image v-if="item.iconType == 'img'"
+                            :src="$util.img(item.imageUrl) || $util.img('public/uniapp/default_img/goods.png')"
+                            mode="aspectFill"
+                            :style="{ maxWidth: value.imageSize * 2 + 'rpx', maxHeight: value.imageSize * 2 + 'rpx', borderRadius: value.aroundRadius * 2 + 'rpx' }"
+                            :show-menu-by-longpress="true"/>
+                        <diy-icon v-if="item.iconType == 'icon'" :icon="item.icon"
+                            :value="item.style ? item.style : null"
+                            :style="{  maxWidth: value.imageSize * 2 + 'rpx', maxHeight: value.imageSize * 2 + 'rpx', width: '100%', height: '100%' }"></diy-icon>
+                        <text :class="['tag', { alone: value.mode == 'text' }]" v-if="item.label.control"
+                            :style="{ color: item.label.textColor, backgroundImage: 'linear-gradient(' + item.label.bgColorStart + ',' + item.label.bgColorEnd + ')' }">
+                            {{ item.label.text }}
+                        </text>
+                    </view>
+                    <text v-if="value.mode != 'img'" class="graphic-text" :style="{ fontSize: value.font.size * 2 + 'rpx', fontWeight: value.font.weight, color: value.font.color }">
+                        {{ item.title }}
+                    </text>
+                </view>
+
+                <!-- #ifdef MP -->
+            </view>
+            <!-- #endif -->
+
+        </scroll-view>
+        <ns-login ref="login"></ns-login>
+    </view>
+</template>
+
+<script>
+    export default {
+        name: 'diy-graphic-nav',
+        props: {
+            value: {
+                type: Object
+            }
+        },
+        data() {
+            return {
+                pageWidth: '',
+                indicatorDots: false,
+                swiperCurrent: 0
+            };
+        },
+        created() {},
+        watch: {
+            // 组件刷新监听
+            componentRefresh: function(nval) {}
+        },
+        computed: {
+            componentStyle() {
+                var css = '';
+                css += 'background-color:' + this.value.componentBgColor + ';';
+                if (this.value.componentAngle == 'round') {
+                    css += 'border-top-left-radius:' + this.value.topAroundRadius * 2 + 'rpx;';
+                    css += 'border-top-right-radius:' + this.value.topAroundRadius * 2 + 'rpx;';
+                    css += 'border-bottom-left-radius:' + this.value.bottomAroundRadius * 2 + 'rpx;';
+                    css += 'border-bottom-right-radius:' + this.value.bottomAroundRadius * 2 + 'rpx;';
+                }
+                css += 'box-shadow:' + (this.value.ornament.type == 'shadow' ? '0 0 10rpx ' + this.value.ornament
+                    .color :
+                    '') + ';';
+                css += 'border:' + (this.value.ornament.type == 'stroke' ? '2rpx solid ' + this.value.ornament.color :
+                    '') + ';';
+                return css;
+            },
+            // 滑块容器的高度
+            swiperHeight() {
+                var css = '';
+                var height = 0;
+                if (this.value.mode == 'graphic') {
+                    height = (21 + 6 + 14 + 8 + this.value.imageSize) * this.value
+                        .pageCount; // 21 = 文字高度，8 = 文字上边距，14 = 上下内边距，8 = 外边距
+                } else if (this.value.mode == 'img') {
+                    height = (14 + 8 + this.value.imageSize) * this.value.pageCount; // 14 = 上下内边距，8 = 外边距
+                } else if (this.value.mode == 'text') {
+                    height = (21 + 14 + 8) * this.value.pageCount; // 21 = 文字高度，14 = 上下内边距，8 = 外边距
+                }
+                css += 'height:' + height * 2 + 'rpx';
+                return css;
+            },
+            // 是否显示轮播点
+            isIndicatorDots() {
+                var bool = true;
+                bool = this.value.carousel.type == 'hide' || Math.ceil(this.value.list.length / (this.value.pageCount * this.value.rowCount)) == 1 ? false : true;
+                return bool;
+            }
+        },
+        methods: {
+            redirectTo(link) {
+			
+                if (link.wap_url) {
+                    if (this.$util.getCurrRoute() == 'pages/member/index' && !this.storeToken) {
+                        this.$refs.login.open(link.wap_url);
+                        return;
+                    }
+                }
+					console.log(link)
+                this.$util.diyRedirectTo(link);
+            },
+            swiperChange(e) {
+                this.swiperCurrent = e.detail.current
+            }
+        }
+    };
+</script>
+<style>
+    /* 固定显示 */
+    .graphic-nav.fixed-layout>>>.uni-scroll-view-content {
+        display: flex;
+        flex-wrap: wrap;
+    }
+
+    /* 单行滑动 */
+    .graphic-nav.singleSlide>>>.uni-scroll-view-content {
+        display: flex;
+    }
+
+    .graphic-nav.pageSlide>>>.uni-swiper-dots-horizontal {
+        bottom: 0rpx;
+    }
+
+    .graphic-nav.pageSlide.straightLine>>>.uni-swiper-dot {
+        width: 30rpx;
+        border-radius: 0;
+        height: 8rpx;
+    }
+
+    .graphic-nav.pageSlide.circle>>>.uni-swiper-dot {
+        width: 14rpx;
+        height: 14rpx;
+    }
+</style>
+<style lang="scss">
+    .graphic-nav {
+        padding: 16rpx;
+        box-sizing: border-box;
+
+        &.singleSlide {
+            .graphic-nav-item {
+                flex-shrink: 0;
+            }
+        }
+
+        &.pageSlide {
+            position: relative;
+
+            .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 {
+                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 {
+
+                .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;
+                    transform: scale(0.8);
+                    padding: 8rpx 16rpx;
+                    line-height: 1;
+                    font-size: 24rpx;
+                }
+
+                .icon {
+                    font-size: 50rpx;
+                    color: $color-sub;
+                }
+            }
+        }
+    }
+
+    .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, .3);
+            margin: 8rpx;
+
+            &.active {
+                background-color: rgba(0, 0, 0, 1);
+            }
+
+        }
+
+        &.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-group.vue b/components/diy-components/diy-group.vue
new file mode 100644
index 0000000..06fa0a2
--- /dev/null
+++ b/components/diy-components/diy-group.vue
@@ -0,0 +1,317 @@
+<template>
+	<view class="diy-group">
+		<view v-for="(item, index) in diyDataArray" :key="index" :style="item.pageStyle">
+			<view v-if="addonIsExist.store && item.componentName == 'StoreShow'">
+				<!-- 门店展示 -->
+				<diy-store :value="item"></diy-store>
+			</view>
+				
+			<template v-if="item.componentName == 'Kefu'">
+				<!-- 客服按钮 -->
+				<diy-kefu :value="item"></diy-kefu>
+			</template>
+			
+			<template v-if="item.componentName == 'Form'">
+				<!-- 表单组件 -->
+				<diy-form :value="item"></diy-form>
+			</template>
+			
+
+
+			<template v-if="addonIsExist.store && item.componentName == 'StoreLabel'">
+				<!-- 门店标签 -->
+				<diy-store-label :value="item"></diy-store-label>
+			</template>
+			
+			<template v-if="item.componentName == 'Picture'">
+				<!-- 单图组组件 -->
+				<diy-picture :value="item"></diy-picture>
+			</template>
+			
+			<template v-if="item.componentName == 'Listmenu'">
+				<!-- 列表按钮组件 -->
+				<diy-listmenu :value="item"></diy-listmenu>
+			</template>
+			
+			<template v-if="item.componentName == 'Text'">
+				<!-- 文本 -->
+				<diy-text :value="item"></diy-text>
+			</template>
+
+			<template v-if="item.componentName == 'Notice'">
+				<!-- 公告 -->
+				<diy-notice :value="item"></diy-notice>
+			</template>
+
+			<template v-if="item.componentName == 'GraphicNav'">
+				<!-- 图文导航 -->
+				<diy-graphic-nav :value="item"></diy-graphic-nav>
+			</template>
+
+			<template v-if="item.componentName == 'ImageAds'">
+				<!-- 图片广告 -->
+				<diy-img-ads :value="item"></diy-img-ads>
+			</template>
+
+			<template v-if="item.componentName == 'Search'">
+				<!-- 搜索 -->
+				<diy-search :value="item" :topNavColor="topNavColor" :global="diyGlobalData.global" :haveTopCategory="haveTopCategory" :followOfficialAccount="followOfficialAccount"></diy-search>
+			</template>
+
+			<template v-if="item.componentName == 'RichText'">
+				<!-- 富文本 -->
+				<diy-rich-text :value="item"></diy-rich-text>
+			</template>
+
+			<template v-if="item.componentName == 'HorzLine'">
+				<!-- 辅助线 -->
+				<diy-horz-line :value="item"></diy-horz-line>
+			</template>
+
+			<template v-if="item.componentName == 'HorzBlank'">
+				<!-- 辅助空白 -->
+				<diy-horz-blank :value="item"></diy-horz-blank>
+			</template>
+
+			<template v-if="item.componentName == 'Coupon' && addonIsExist.coupon">
+				<!-- 优惠券 -->
+				<diy-coupon :value="item"></diy-coupon>
+			</template>
+
+			<template v-if="item.componentName == 'GoodsList'">
+				<!-- 商品列表 -->
+				<diy-goods-list :value="item"></diy-goods-list>
+			</template>
+
+			<template v-if="item.componentName == 'ManyGoodsList'">
+				<!-- 多商品组 -->
+				<diy-many-goods-list :value="item" :global="diyGlobalData.global" :scrollTop="scrollTop"></diy-many-goods-list>
+			</template>
+
+			<template v-if="item.componentName == 'RubikCube'">
+				<!-- 魔方、橱窗 -->
+				<diy-rubik-cube :value="item"></diy-rubik-cube>
+			</template>
+
+			<template v-if="item.componentName == 'Video'">
+				<!-- 视频 -->
+				<diy-video :value="item"></diy-video>
+			</template>
+			
+			
+
+
+			<template v-if="item.componentName == 'Seckill' && addonIsExist.seckill">
+				<!-- 秒杀 -->
+				<diy-seckill :value="item"></diy-seckill>
+			</template>
+
+			<template v-if="item.componentName == 'Pintuan' && addonIsExist.pintuan">
+				<!-- 拼团 -->
+				<diy-pintuan :value="item"></diy-pintuan>
+			</template>
+
+			<template v-if="item.componentName == 'Groupbuy' && addonIsExist.groupbuy">
+				<!-- 团购 -->
+				<diy-groupbuy :value="item"></diy-groupbuy>
+			</template>
+
+			<!-- 拼团返利 -->
+			<template v-if="item.componentName == 'Pinfan' && addonIsExist.pinfan">
+				<diy-pinfan :value="item"></diy-pinfan>
+			</template>
+
+			<template v-if="item.componentName == 'Bargain' && addonIsExist.bargain">
+				<!-- 砍价 -->
+				<diy-bargain :value="item"></diy-bargain>
+			</template>
+
+			<template v-if="item.componentName == 'Presale' && addonIsExist.bargain">
+				<!-- 预售 -->
+				<diy-presale :value="item"></diy-presale>
+			</template>
+
+			<template v-if="item.componentName == 'Notes' && addonIsExist.notes">
+				<!-- 店铺笔记 -->
+				<diy-notes :value="item"></diy-notes>
+			</template>
+
+			<template v-if="item.componentName == 'FloatBtn'">
+				<!-- 浮动按钮 -->
+				<diy-float-btn :value="item"></diy-float-btn>
+			</template>
+
+			<template v-if="item.componentName == 'LiveInfo'">
+				<!-- 小程序直播 -->
+				<!-- #ifdef MP-WEIXIN -->
+				<diy-live :value="item"></diy-live>
+				<!-- #endif -->
+			</template>
+
+			<template v-if="item.componentName == 'FenxiaoGoodsList'">
+				<!-- 分销商品 -->
+				<diy-fenxiao-goods-list :value="item"></diy-fenxiao-goods-list>
+			</template>
+
+			<template v-if="item.componentName == 'GoodsRecommend'">
+				<!-- 商品推荐 -->
+				<diy-goods-recommend :value="item"></diy-goods-recommend>
+			</template>
+
+			<template v-if="item.componentName == 'GoodsBrand'">
+				<!-- 商品品牌 -->
+				<diy-goods-brand :value="item"></diy-goods-brand>
+			</template>
+
+			<template v-if="item.componentName == 'Article'">
+				<!-- 文章 -->
+				<diy-article :value="item"></diy-article>
+			</template>
+			
+			<template v-if="item.componentName == 'MerchList'">
+				<!-- 商户列表 -->
+				<diy-merch-list :value="item"></diy-merch-list>
+			</template>
+
+			<template v-if="item.componentName == 'MemberInfo'">
+				<!-- 自定义会员中心——会员信息 -->
+				<diy-member-info ref="diyMemberIndex" :value="item" :global="diyGlobalData.global"></diy-member-info>
+			</template>
+
+			<template v-if="item.componentName == 'MemberMyOrder'">
+				<!-- 自定义会员中心——我的订单 -->
+				<diy-member-my-order ref="diyMemberMyOrder" :value="item"></diy-member-my-order>
+			</template>
+
+			<template v-if="item.componentName == 'QuickNav'">
+				<!-- 快捷导航 -->
+				<diy-quick-nav :value="item"></diy-quick-nav>
+			</template>
+
+			<template v-if="item.componentName == 'PaymentQrcode'">
+				<!-- 付款码 -->
+				<diy-payment-qrcode :value="item"></diy-payment-qrcode>
+			</template>
+
+			<template v-if="item.componentName == 'HotArea'">
+				<!-- 热区 -->
+				<diy-hot-area :value="item"></diy-hot-area>
+			</template>
+
+			<template v-if="item.componentName == 'FollowOfficialAccount'">
+				<!-- 关注公众号 -->
+				<diy-follow-official-account :value="item"></diy-follow-official-account>
+			</template>
+		
+			<template v-if="item.componentName == 'Map'">
+				<!-- 地图组件 -->
+				<diy-map :value="item"></diy-map>
+			</template>
+			
+			
+			<template v-if="item.componentName == 'Audio'">
+				<!-- 音频 -->
+				<diy-audio :value="item"></diy-audio>
+			</template>
+		
+			
+		
+			<!-- 自定义扩展组件 -->
+			<diy-comp-extend :value="item"></diy-comp-extend>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		components: {},
+		props: {
+			diyData: {
+				type: Object
+			},
+			scrollTop: {
+				type: [String, Number],
+				default: '0'
+			},
+			haveTopCategory: {
+				type: Boolean
+			},
+			followOfficialAccount: {
+				type: Object
+			},
+		},
+		data() {
+			return {
+				diyGlobalData: null
+			};
+		},
+		created() {
+			this.diyGlobalData = JSON.parse(JSON.stringify(this.diyData));
+		},
+		computed: {
+			topNavColor() {
+				var color = '';
+				if (this.diyData.global.topNavBg) {
+					color = 'transparent';
+					if (this.scrollTop > 20) {
+						color = this.diyData.global.topNavColor;
+					} else {
+						color = 'transparent';
+					}
+				} else {
+					color = this.diyData.global.topNavColor;
+				}
+				return color;
+			},
+			// 修改属性样式
+			setPagestyle() {
+				this.diyGlobalData.value.forEach((item, index) => {
+					item.pageStyle = '';
+					// 给每个组件增加位置属性，用于定位，搜索、分类导航等定位
+					item.moduleIndex = index + 1;
+
+					// 特殊处理搜索框 当显示位置为滚动至顶部固定时，只设置背景颜色
+					if (item.componentName == 'Search' && item.positionWay == 'fixed') {
+						// item.pageStyle = 'background-color:' + item.pageBgColor + ';';
+						return false;
+					}
+
+					item.pageStyle += 'background-color:' + item.pageBgColor + ';';
+					if (item.margin) {
+						item.pageStyle += 'padding-top:' + item.margin.top * 2 + 'rpx' + ';';
+						item.pageStyle += 'padding-bottom:' + item.margin.bottom * 2 + 'rpx' + ';';
+						item.pageStyle += 'padding-right:' + item.margin.both * 2 + 'rpx' + ';';
+						item.pageStyle += 'padding-left:' + item.margin.both * 2 + 'rpx' + ';';
+					}
+				});
+
+				return this.diyGlobalData.value;
+			},
+			// 过滤组件的渲染
+			diyDataArray() {
+				let data = [],
+					showModuleData = this.$store.state.diyGroupShowModule ? JSON.parse(this.$store.state
+						.diyGroupShowModule) : '';
+
+				if (showModuleData.length) {
+					if (showModuleData.includes('null')) return [];
+
+					let diyDataArr = this.setPagestyle;
+					diyDataArr.forEach((item, index) => {
+						if (showModuleData.includes(item.componentName)) {
+							data.push(item);
+						}
+					});
+				} else data = this.setPagestyle;
+				return data;
+			}
+		},
+		methods: {}
+	};
+</script>
+
+<style lang="scss">
+	.diy-group {
+		width: 100%;
+	}
+</style>
\ No newline at end of file
diff --git a/components/diy-components/diy-groupbuy.vue b/components/diy-components/diy-groupbuy.vue
new file mode 100644
index 0000000..a59c111
--- /dev/null
+++ b/components/diy-components/diy-groupbuy.vue
@@ -0,0 +1,462 @@
+<template>
+	<x-skeleton :type="skeletonType" :loading="loading" :configs="skeletonConfig">
+		<view class="diy-groupbuy" :class="[value.template, value.style]" :style="warpCss">
+			<template v-if="value.template == 'row1-of1'">
+				<view class="item" v-for="(item, index) in list" :key="index" @click="toDetail(item)"
+					:class="[value.ornament.type]" :style="goodsItemCss">
+					<view class="img-wrap" :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }">
+						<image :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }" :src="$util.img(item.goods_image, { size: 'mid' })" mode="widthFix" @error="imageError(index)">
+						</image>
+					</view>
+					<view class="content"
+						v-if="value.goodsNameStyle.control || value.priceStyle.mainControl || value.priceStyle.lineControl || value.btnStyle.control">
+						<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 class="discount-price" v-if="value.priceStyle.mainControl">
+							<text class="unit price-style small" :style="{ color: value.theme == 'diy' ? value.priceStyle.mainColor + '!important' : '' }">¥</text>
+							<text class="price price-style large" :style="{ color: value.theme == 'diy' ? value.priceStyle.mainColor + '!important' : '' }">{{ item.groupbuy_price.split('.')[0] }}</text>
+							<text class="unit price-style small" :style="{ color: value.theme == 'diy' ? value.priceStyle.mainColor + '!important' : '' }">{{ '.' + item.groupbuy_price.split('.')[1] }}</text>
+						</view>
+						<button v-if="value.btnStyle.control" :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'
+						}">
+							{{ value.btnStyle.text }}
+						</button>
+					</view>
+				</view>
+			</template>
+			<template v-if="value.template == 'horizontal-slide'">
+				<scroll-view v-if="value.slideMode == 'scroll'" class="scroll" :scroll-x="true" :show-scrollbar="false">
+					<view class="item" v-for="(item, index) in list" :key="index" @click="toDetail(item)" :class="[value.ornament.type]" :style="goodsItemCss">
+						<view class="img-wrap" :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }">
+							<image :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }" :src="$util.img(item.goods_image, { size: 'mid' })" mode="widthFix" @error="imageError(index)"/>
+							<image class="bg" v-if="value.saleStyle.control" :src="$util.img('public/uniapp/groupbuy/bg.png')" mode="widthFix"/>
+							<view class="num" v-if="value.saleStyle.control" :style="{ color: value.theme == 'diy' ? value.saleStyle.color : '' }">
+								已团{{ item.sell_num }}件
+							</view>
+						</view>
+						<view :class="['content', { 'multi-content': value.nameLineMode == 'multiple' }]" v-if="value.goodsNameStyle.control || value.priceStyle.mainControl || value.priceStyle.lineControl">
+							<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 class="discount-price" v-if="value.priceStyle.mainControl">
+								<text class="unit price-style small" :style="{ color: value.theme == 'diy' ? value.priceStyle.mainColor + '!important' : '' }">¥</text>
+								<text class="price price-style large" :style="{ color: value.theme == 'diy' ? value.priceStyle.mainColor + '!important' : '' }">{{ item.groupbuy_price.split('.')[0] }}</text>
+								<text class="unit price-style small" :style="{ color: value.theme == 'diy' ? value.priceStyle.mainColor + '!important' : '' }">{{ '.' + item.groupbuy_price.split('.')[1] }}</text>
+							</view>
+							<view class="original-price price-font" v-if="value.priceStyle.lineControl" :style="{ color: value.theme == 'diy' ? value.priceStyle.lineColor : '' }">¥{{ item.price }}</view>
+						</view>
+					</view>
+				</scroll-view>
+
+				<swiper v-if="value.slideMode == 'slide'" :autoplay="false" class="swiper" :style="{ height: swiperHeight }">
+					<swiper-item v-for="(pageItem, pageIndex) in page" :key="pageIndex" :class="['swiper-item', (list.length && [list[pageIndex].length / 3] >= 1)  && 'flex-between']">
+						<view class="item" v-for="(item, dataIndex) in list[pageIndex]" :key="dataIndex"
+							@click="toDetail(item)" :class="[value.ornament.type]" :style="goodsItemCss">
+							<view class="img-wrap" :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }">
+								<image :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }" :src="$util.img(item.goods_image, { size: 'mid' })" mode="widthFix" @error="imageError(dataIndex)"/>
+								<image class="bg" v-if="value.saleStyle.control" :src="$util.img('public/uniapp/groupbuy/bg.png')" mode="widthFix"/>
+								<view class="num" v-if="value.saleStyle.control" :style="{ color: value.theme == 'diy' ? value.saleStyle.color : '' }">已团{{ item.sell_num }}件</view>
+							</view>
+							<view :class="['content', { 'multi-content': value.nameLineMode == 'multiple' }]" v-if="value.goodsNameStyle.control || value.priceStyle.mainControl || value.priceStyle.lineControl">
+								<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 class="discount-price" v-if="value.priceStyle.mainControl">
+									<text class="unit price-style small" :style="{ color: value.theme == 'diy' ? value.priceStyle.mainColor + '!important' : '' }">¥</text>
+									<text class="price price-style large" :style="{ color: value.theme == 'diy' ? value.priceStyle.mainColor + '!important' : '' }">{{ item.groupbuy_price.split('.')[0] }}</text>
+									<text class="unit price-style small" :style="{ color: value.theme == 'diy' ? value.priceStyle.mainColor + '!important' : '' }">{{ '.' + item.groupbuy_price.split('.')[1] }}</text>
+								</view>
+								<view class="original-price price-font" v-if="value.priceStyle.lineControl" :style="{ color: value.theme == 'diy' ? value.priceStyle.lineColor : '' }">¥{{ item.price }}</view>
+							</view>
+						</view>
+					</swiper-item>
+				</swiper>
+			</template>
+		</view>
+	</x-skeleton>
+</template>
+
+<script>
+	export default {
+		name: 'diy-groupbuy',
+		props: {
+			value: {
+				type: Object
+			}
+		},
+		data() {
+			return {
+				loading: true,
+				skeletonType: '',
+				skeletonConfig: {},
+				list: [],
+				page: 1
+			};
+		},
+		created() {
+			this.initSkeleton();
+			this.getData();
+		},
+		watch: {
+			// 组件刷新监听
+			componentRefresh: function(nval) {
+				this.getData();
+			}
+		},
+		computed: {
+			warpCss() {
+				var obj = '';
+				obj += 'background-color:' + this.value.componentBgColor + ';';
+				if (this.value.componentAngle == 'round') {
+					obj += 'border-top-left-radius:' + this.value.topAroundRadius * 2 + 'rpx;';
+					obj += 'border-top-right-radius:' + this.value.topAroundRadius * 2 + 'rpx;';
+					obj += 'border-bottom-left-radius:' + this.value.bottomAroundRadius * 2 + 'rpx;';
+					obj += 'border-bottom-right-radius:' + this.value.bottomAroundRadius * 2 + 'rpx;';
+				}
+				return obj;
+			},
+			// 商品项样式
+			goodsItemCss() {
+				var obj = '';
+				obj += 'background-color:' + this.value.elementBgColor + ';';
+				if (this.value.elementAngle == 'round') {
+					obj += 'border-top-left-radius:' + this.value.topElementAroundRadius * 2 + 'rpx;';
+					obj += 'border-top-right-radius:' + this.value.topElementAroundRadius * 2 + 'rpx;';
+					obj += 'border-bottom-left-radius:' + this.value.bottomElementAroundRadius * 2 + 'rpx;';
+					obj += 'border-bottom-right-radius:' + this.value.bottomElementAroundRadius * 2 + 'rpx;';
+				}
+				if (this.value.ornament.type == 'shadow') {
+					obj += 'box-shadow:' + '0 0 10rpx ' + this.value.ornament.color + ';';
+				}
+				if (this.value.ornament.type == 'stroke') {
+					obj += 'border:' + '2rpx solid ' + this.value.ornament.color + ';';
+				}
+				const screenWidth = uni.getSystemInfoSync().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);
+					else width = [screenWidth - this.rpxUpPx(20) * 2 - this.rpxUpPx(200) * 3 - this.rpxUpPx(this.value
+						.margin.both * 2) * 2] / 6;
+					obj += 'margin-left:' + width + 'px;';
+					obj += 'margin-right:' + width + 'px;';
+				}
+				return obj;
+			},
+			swiperHeight() {
+				if (this.value.nameLineMode == 'multiple') return this.value.ornament.type == 'shadow' ? '404rpx' :
+					'392rpx';
+				return this.value.ornament.type == 'shadow' ? '376rpx' : '368rpx';
+			}
+		},
+		methods: {
+			initSkeleton() {
+				if (this.value.template == 'row1-of1') {
+
+					// 单列 风格
+					this.skeletonType = 'list';
+					this.skeletonConfig = {
+						textRows: 2
+					};
+
+				} else if (this.value.template == 'horizontal-slide') {
+
+					// 横向滑动 风格
+					this.skeletonType = 'waterfall';
+					this.skeletonConfig = {
+						gridRows: 1,
+						gridColumns: 3,
+						headHeight: '200rpx',
+						textRows: 2,
+						textWidth: ['100%', '80%']
+					};
+
+				}
+			},
+			rpxUpPx(res) {
+				const screenWidth = uni.getSystemInfoSync().windowWidth;
+				var data = (screenWidth * parseInt(res)) / 750;
+				return Math.floor(data);
+			},
+			getData() {
+				var data = {
+					num: this.value.count
+				};
+				if (this.value.sources == 'diy') {
+					data.num = 0;
+					data.goods_id_arr = this.value.goodsId.toString();
+				}
+				this.$api.sendRequest({
+					url: '/groupbuy/api/goods/lists',
+					data: data,
+					success: res => {
+						if (res.code == 0) {
+							this.list = res.data;
+
+							// 切屏滚动，每页显示固定数量
+							if (this.value.template == 'horizontal-slide' && this.value.slideMode == 'slide') {
+								let size = 3;
+								let temp = [];
+								this.page = Math.ceil(this.list.length / size);
+								for (var i = 0; i < this.page; i++) {
+									temp[i] = [];
+									for (var j = i * size; j < this.list.length; j++) {
+										if (temp[i].length == size) break;
+										temp[i].push(this.list[j]);
+									}
+								}
+								this.list = temp;
+							}
+							this.loading = false;
+						}
+					}
+				});
+			},
+			toDetail(e) {
+				this.$util.redirectTo('/pages_promotion/groupbuy/detail', {
+					groupbuy_id: e.groupbuy_id
+				});
+			},
+			imageError(index) {
+				this.list[index].goods_image = this.$util.getDefaultImage().goods;
+				this.$forceUpdate();
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	/deep/.uni-scroll-view ::-webkit-scrollbar {
+		/* 隐藏滚动条，但依旧具备可以滚动的功能 */
+		display: none;
+		width: 0;
+		height: 0;
+		color: transparent;
+		background: transparent;
+	}
+
+	/deep/::-webkit-scrollbar {
+		display: none;
+		width: 0;
+		height: 0;
+		color: transparent;
+		background: transparent;
+	}
+
+	scroll-view ::-webkit-scrollbar {
+		width: 0;
+		height: 0;
+		background-color: transparent;
+		touch-action: none;
+	}
+
+	.diy-groupbuy {
+		&.row1-of1 {
+			.item {
+				display: flex;
+				margin-bottom: 20rpx;
+				padding: 16rpx;
+
+				&.shadow {
+					margin: 8rpx 8rpx 20rpx 8rpx;
+				}
+
+				&:last-child {
+					margin-bottom: 0;
+					padding-bottom: 20rpx;
+				}
+
+				.img-wrap {
+					width: 200rpx;
+					height: 200rpx;
+
+					>image {
+						width: 200rpx;
+					}
+				}
+
+				.goods-name {
+					margin-top: 6rpx;
+					line-height: 1.5;
+				}
+
+				.content {
+					flex: 1;
+					margin-left: 20rpx;
+					position: relative;
+
+					.discount-price {
+						white-space: nowrap;
+						font-weight: bold;
+						position: absolute;
+						bottom: 20rpx;
+						left: 0;
+						display: flex;
+						align-items: baseline;
+						line-height: 1;
+
+						.unit {
+							font-size: $font-size-tag;
+							margin-right: 4rpx;
+							color: $base-color;
+						}
+
+						.price {
+							font-size: $font-size-toolbar;
+							color: $base-color;
+						}
+					}
+
+					button {
+						position: absolute;
+						bottom: 10rpx;
+						right: 20rpx;
+						margin: 0;
+						padding: 0 20rpx;
+						background-color: $base-color;
+						color: #fff;
+						min-width: 112rpx;
+						height: 52rpx;
+						line-height: 52rpx;
+						font-size: $font-size-tag;
+					}
+				}
+			}
+		}
+
+		&.horizontal-slide {
+			.scroll {
+				width: calc(100% - 40rpx);
+				padding: 20rpx;
+				line-height: 1;
+				white-space: nowrap;
+
+				.item.shadow {
+					margin-bottom: 8rpx;
+				}
+			}
+
+			.flex-between {
+				justify-content: space-between;
+			}
+
+			.item {
+				display: inline-block;
+				width: 200rpx;
+				overflow: hidden;
+				box-sizing: border-box;
+
+				&:nth-child(3n + 3) {
+					width: 198rpx;
+				}
+
+				&.shadow {
+					margin-top: 8rpx;
+				}
+
+				.img-wrap {
+					width: 200rpx;
+					height: 200rpx;
+					position: relative;
+					overflow: hidden;
+					margin: 0 auto;
+
+					>image {
+						width: 200rpx;
+					}
+
+					.bg {
+						position: absolute;
+						width: 100%;
+						height: 60rpx;
+						bottom: 0;
+						left: 0;
+						z-index: 2;
+					}
+
+					.num {
+						width: 180rpx;
+						position: absolute;
+						bottom: 10rpx;
+						padding-left: 20rpx;
+						font-size: 20rpx;
+						line-height: 1;
+						color: #ffffff;
+						z-index: 3;
+					}
+				}
+
+				.content {
+					padding: 10rpx;
+					display: flex;
+					flex-direction: column;
+					justify-content: space-between;
+
+					&.multi-content {
+						height: 158rpx;
+						box-sizing: border-box;
+					}
+
+					.goods-name {
+						line-height: 1.3;
+
+						&.multi-hidden {
+							white-space: break-spaces;
+						}
+					}
+
+					.discount-price {
+						white-space: nowrap;
+						margin-top: auto;
+						font-weight: bold;
+						line-height: 1;
+
+						.unit {
+							font-size: $font-size-tag;
+							margin-right: 4rpx;
+							color: $base-color;
+						}
+
+						.price {
+							font-size: $font-size-toolbar;
+							color: $base-color;
+						}
+					}
+
+					.original-price {
+						font-size: $font-size-tag;
+						color: $color-tip;
+						line-height: 1;
+						text-decoration: line-through;
+					}
+				}
+			}
+
+			.swiper {
+				width: 100%;
+				white-space: nowrap;
+				padding: 20rpx;
+				box-sizing: border-box;
+
+				.swiper-item {
+					display: flex;
+					align-items: center;
+				}
+
+				.item {
+					width: 200rpx;
+				}
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/components/diy-components/diy-horz-blank.vue b/components/diy-components/diy-horz-blank.vue
new file mode 100644
index 0000000..d1d3447
--- /dev/null
+++ b/components/diy-components/diy-horz-blank.vue
@@ -0,0 +1,40 @@
+<template>
+	<view :style="horzBlankGaugeWrap"></view>
+</template>
+
+<script>
+// 辅助空白
+export default {
+	name: 'diy-horz-blank',
+	props: {
+		value: {
+			type: Object
+		}
+	},
+	data() {
+		return {};
+	},
+	watch: {
+		// 组件刷新监听
+		componentRefresh: function(nval) {}
+	},
+	computed: {
+		horzBlankGaugeWrap: function() {
+			var obj = '';
+			obj += 'background-color:' + this.value.componentBgColor + ';';
+			if (this.value.componentAngle == 'round') {
+				obj += 'border-top-left-radius:' + this.value.topAroundRadius * 2 + 'rpx;';
+				obj += 'border-top-right-radius:' + this.value.topAroundRadius * 2 + 'rpx;';
+				obj += 'border-bottom-left-radius:' + this.value.bottomAroundRadius * 2 + 'rpx;';
+				obj += 'border-bottom-right-radius:' + this.value.bottomAroundRadius * 2 + 'rpx;';
+			}
+			obj += 'height:' + this.value.height * 2 + 'rpx';
+			return obj;
+		}
+	},
+	created() {},
+	methods: {}
+};
+</script>
+
+<style></style>
diff --git a/components/diy-components/diy-horz-line.vue b/components/diy-components/diy-horz-line.vue
new file mode 100644
index 0000000..4c00b44
--- /dev/null
+++ b/components/diy-components/diy-horz-line.vue
@@ -0,0 +1,25 @@
+<template>
+	<view :style="{ borderTop: '2rpx ' + value.borderStyle + ' ' + value.color }"></view>
+</template>
+
+<script>
+// 辅助线
+export default {
+	name: 'diy-horz-line',
+	props: {
+		value: {
+			type: Object
+		}
+	},
+	data() {
+		return {};
+	},
+	watch: {
+		// 组件刷新监听
+		componentRefresh: function(nval) {}
+	},
+	methods: {}
+};
+</script>
+
+<style></style>
diff --git a/components/diy-components/diy-hot-area.vue b/components/diy-components/diy-hot-area.vue
new file mode 100644
index 0000000..413091a
--- /dev/null
+++ b/components/diy-components/diy-hot-area.vue
@@ -0,0 +1,73 @@
+<template>
+	<view :style="hotAreaWarp" class="hot-area-box">
+		<view class="simple-graph-wrap">
+			<image :style="{ height: value.imgHeight }" :src="$util.img(value.imageUrl)" mode="widthFix" :show-menu-by-longpress="true"/>
+			<!-- 热区功能 -->
+			<view class="heat-map" v-for="(mapItem, mapIndex) in value.heatMapData" :key="mapIndex" :style="{
+					width: mapItem.width + '%',
+					height: mapItem.height + '%',
+					left: mapItem.left + '%',
+					top: mapItem.top + '%'
+				}" @click.stop="$util.diyRedirectTo(mapItem.link)"></view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: 'diy-hot-area',
+		props: {
+			value: {
+				type: Object,
+				default: () => {
+					return {};
+				}
+			}
+		},
+		data() {
+			return {};
+		},
+		created() {},
+		watch: {
+			// 组件刷新监听
+			componentRefresh: function(nval) {}
+		},
+		computed: {
+			hotAreaWarp: function() {
+				var obj = '';
+				obj = 'background-color:' + this.value.componentBgColor + ';';
+				if (this.value.componentAngle == 'round') {
+					obj += 'border-top-left-radius:' + this.value.topAroundRadius * 2 + 'rpx;';
+					obj += 'border-top-right-radius:' + this.value.topAroundRadius * 2 + 'rpx;';
+					obj += 'border-bottom-left-radius:' + this.value.bottomAroundRadius * 2 + 'rpx;';
+					obj += 'border-bottom-right-radius:' + this.value.bottomAroundRadius * 2 + 'rpx;';
+				}
+				return obj;
+			}
+		},
+		methods: {}
+	};
+</script>
+
+<style lang="scss" scoped>
+	.hot-area-box {
+		position: relative;
+		width: 100%;
+		overflow: hidden;
+		box-sizing: border-box;
+	}
+
+	.simple-graph-wrap {
+		line-height: 0;
+		overflow: hidden;
+		position: relative;
+
+		image {
+			width: 100%;
+		}
+
+		.heat-map {
+			position: absolute;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/components/diy-components/diy-icon.vue b/components/diy-components/diy-icon.vue
new file mode 100644
index 0000000..db5a648
--- /dev/null
+++ b/components/diy-components/diy-icon.vue
@@ -0,0 +1,84 @@
+<template>
+	<view class="diy-icon" :style="iconBgStyle">
+		<text class="js-icon" :class="iconClass" :style="iconStyle"></text>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: 'diy-icon',
+		props: {
+			icon: {
+				type: String,
+				default: ''
+			},
+			value: {
+				type: Object,
+				default: function () {
+					return null;
+				}
+			}
+		},
+		computed: {
+			iconClass(){
+				var _class = ' ' + this.icon;
+				if (this.value && this.value.iconColor.length > 1) _class += ' gradient';
+				return _class;
+			},
+			iconBgStyle(){
+				if (!this.value) return {};
+	
+				var style = {
+					'border-radius': this.value.bgRadius + '%',
+					'background': ''
+				};
+	
+				if (this.value.iconBgImg) style['background'] += 'url('+ this.$util.img(this.value.iconBgImg) +') no-repeat bottom / contain'
+				if (this.value.iconBgColor.length) {
+					if (style.background) style.background += ',';
+					if (this.value.iconBgColor.length == 1) {
+						style.background += this.value.iconBgColor[0];
+					} else {
+						style['background'] += 'linear-gradient('+ this.value.iconBgColorDeg +'deg, '+ this.value.iconBgColor.join(',') +')';
+					}
+				}
+				return this.$util.objToStyle(style);
+			},
+			iconStyle(){
+				if (!this.value) return {};
+	
+				var style = {
+					'font-size': this.value.fontSize + '%'
+				}
+				if (this.value.iconColor.length == 1) {
+					style.color = this.value.iconColor[0];
+				} else {
+					style['background'] = 'linear-gradient('+ this.value.iconColorDeg +'deg, '+ this.value.iconColor.join(',') +')';
+				}
+				return this.$util.objToStyle(style);
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.diy-icon {
+	    width: 100%;
+	    height: 100%;
+	    font-size: 100%;
+	    color: #000;
+	    display: flex;
+	    align-items: center;
+	    justify-content: center;
+		
+		.js-icon {
+		    font-size: 50%;
+		    line-height:1;
+			padding: 1rpx;
+			&.gradient {
+				-webkit-background-clip:text!important;
+				-webkit-text-fill-color:transparent;
+			}
+		}
+	}
+</style>
diff --git a/components/diy-components/diy-img-ads.vue b/components/diy-components/diy-img-ads.vue
new file mode 100644
index 0000000..12e7303
--- /dev/null
+++ b/components/diy-components/diy-img-ads.vue
@@ -0,0 +1,301 @@
+<template>
+	<view class="single-graph">
+		<view :style="imgAdsMarginWarp" class="swiper-box">
+			<block v-if="imgAdsValue.list.length == 1">
+				<view class="simple-graph-wrap" :style="imgAdsSwiper" @click="$util.diyRedirectTo(imgAdsValue.list[0].link)">
+					<image :style="{ height: imgAdsValue.list[0].imgHeight }" :src="$util.img(imgAdsValue.list[0].imageUrl)" mode="widthFix" :show-menu-by-longpress="true"/>
+				</view>
+			</block>
+			<swiper v-else class="swiper" :style="{ height: swiperHeight }" :class="{
+					'swiper-left': imgAdsValue.indicatorLocation == 'left',
+					'swiper-right': imgAdsValue.indicatorLocation == 'right',
+					'ns-indicator-dots': imgAdsValue.carouselStyle == 'line'
+				}" :autoplay="true" :interval="imgAdsValue.interval" circular="true" :indicator-dots="isDots"
+				indicator-color="rgba(130, 130, 130, .5)" :indicator-active-color="imgAdsValue.indicatorColor"
+				@change="swiperChange">
+				<swiper-item class="swiper-item" :style="imgAdsSwiper" v-for="(item, index) in imgAdsValue.list" :key="index" v-if="item.imageUrl" @click="$util.diyRedirectTo(item.link)">
+					<view class="item" :style="imgAdsSwiper + 'height: ' + item.imgHeight">
+						<image :src="$util.img(item.imageUrl)" :mode="item.imageMode || 'scaleToFill'" :show-menu-by-longpress="true"/>
+					</view>
+				</swiper-item>
+			</swiper>
+			<!-- #ifdef MP-WEIXIN -->
+			<view v-if="imgAdsValue.list.length > 1 && value.indicatorIsShow" :class="[
+					'swiper-dot-box',
+					{ straightLine: imgAdsValue.carouselStyle == 'line' },
+					{ 'swiper-left': imgAdsValue.indicatorLocation == 'left' },
+					{ 'swiper-right': imgAdsValue.indicatorLocation == 'right' }
+				]">
+				<view v-for="(numItem, numIndex) in imgAdsValue.list.length" :key="numIndex" :class="['swiper-dot', { active: numIndex == swiperIndex }]" :style="[numIndex == swiperIndex && { backgroundColor: imgAdsValue.indicatorColor }]"></view>
+			</view>
+			<!-- #endif -->
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: 'diy-img-ads',
+		props: {
+			value: {
+				type: Object,
+				default: () => {
+					return {};
+				}
+			}
+		},
+		data() {
+			return {
+				isDots: true,
+				swiperHeight: 0,
+				imgAdsValue: null, // 深拷贝一遍数据，防止动态计算图片展示尺寸的时候，影响到父级的数据，导致二次渲染的时候，数据错误
+				swiperIndex: 0
+			};
+		},
+		created() {
+			this.calcSingleRow();
+		},
+		watch: {
+			// 组件刷新监听
+			componentRefresh: function(nval) {}
+		},
+		computed: {
+			imgAdsMarginWarp: function() {
+				var obj = '';
+				obj = 'background-color:' + this.value.componentBgColor + ';';
+				return obj;
+			},
+			imgAdsSwiper: function() {
+				var obj = '';
+				if (this.value.componentAngle == 'round') {
+					obj += 'border-top-left-radius:' + this.value.topAroundRadius * 2 + 'rpx;';
+					obj += 'border-top-right-radius:' + this.value.topAroundRadius * 2 + 'rpx;';
+					obj += 'border-bottom-left-radius:' + this.value.bottomAroundRadius * 2 + 'rpx;';
+					obj += 'border-bottom-right-radius:' + this.value.bottomAroundRadius * 2 + 'rpx;';
+				}
+				return obj;
+			},
+			singleGraphBg: function() {
+				var imgArr = [];
+				for (let i = 0; i < this.imgAdsValue.list.length; i++) {
+					let item = this.imgAdsValue.list[i];
+					imgArr[i] = parseFloat(item.imgHeight);
+				}
+				imgArr.sort(function(a, b) {
+					return b - a;
+				});
+				var obj = '';
+				obj += 'background-color:' + this.imgAdsValue.backgroundColor + ';';
+				obj += 'height:' + imgArr[0] * (this.imgAdsValue.backgroundHeight / 100) * 2 + 'rpx;';
+				return obj;
+			}
+		},
+		methods: {
+			swiperChange(e) {
+				this.swiperIndex = e.detail.current;
+			},
+			calcSingleRow() {
+				let minHeight = 0;
+				let systemInfo = uni.getSystemInfoSync()
+				// 深拷贝一层数据，防止数据更改越权
+				this.imgAdsValue = JSON.parse(JSON.stringify(this.value));
+				this.imgAdsValue.list.forEach((item, index) => {
+					var ratio = item.imgHeight / item.imgWidth;
+					item.imgWidth = systemInfo.windowWidth;
+					item.imgWidth -= this.value.margin.both * 2;
+					item.imgHeight = item.imgWidth * ratio;
+
+					// 获取最大高度 if (maxHeight == 0 || maxHeight < item.imgHeight) maxHeight = item.imgHeight;
+					if (minHeight == 0 || minHeight > item.imgHeight) minHeight = item.imgHeight;
+				});
+
+				this.imgAdsValue.list.forEach((item, index) => {
+					item.imgHeight = minHeight + 'px';
+					this.swiperHeight = minHeight + 'px';
+				});
+				this.imgAdsValue.indicatorColor = this.imgAdsValue.indicatorColor || '#fff';
+
+				if (this.value.indicatorIsShow === undefined) {
+					this.value.indicatorIsShow = true; // 控制指示点是否展示
+				}
+
+				// 是否显示指示器
+				if (this.imgAdsValue.list.length <= 1) {
+					this.isDots = false;
+				}
+
+				// #ifdef H5
+				this.isDots = this.value.indicatorIsShow;
+				// #endif
+
+				// #ifdef MP-WEIXIN
+				this.isDots = false;
+				// #endif
+			}
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	.single-graph {
+		width: 100%;
+		line-height: 0;
+		display: flex;
+		justify-content: center;
+		flex-direction: column;
+		align-items: center;
+		box-sizing: border-box;
+	}
+
+	.simple-graph-wrap {
+		line-height: 0;
+		overflow: hidden;
+		position: relative;
+
+		image {
+			width: 100%;
+		}
+
+		.heat-map {
+			position: absolute;
+		}
+	}
+
+	.item.active text {
+		background: rgba(0, 0, 0, 0.3);
+		position: absolute;
+		bottom: 0;
+		color: #ffffff;
+		font-size: $font-size-tag;
+		width: 100%;
+		left: 0;
+		line-height: 40rpx;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		overflow: hidden;
+		padding: 0 10rpx;
+		text-align: center;
+	}
+
+	.swiper-box {
+		position: relative;
+		width: 100%;
+		overflow: hidden;
+		box-sizing: border-box;
+	}
+
+	.swiper {
+		margin: 0 auto;
+		overflow: hidden;
+	}
+
+	.swiper-item {
+		width: 100%;
+		height: auto !important;
+		display: flex;
+		justify-content: center;
+		flex-direction: column;
+		// position: relative;
+		overflow: hidden;
+
+		.item {
+			width: 100%;
+			height: auto;
+			text-align: center;
+			position: relative;
+			overflow: hidden;
+
+			image {
+				width: 100%;
+				max-width: 100%;
+				height: 100%;
+				will-change: transform;
+			}
+
+			.heat-map {
+				position: absolute;
+			}
+		}
+	}
+
+	.swiper-dot-box {
+		position: absolute;
+		bottom: 20rpx;
+		width: 100%;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		padding: 0 40rpx 8rpx;
+		box-sizing: border-box;
+
+		&.swiper-left {
+			justify-content: flex-start;
+		}
+
+		&.swiper-right {
+			justify-content: flex-end;
+		}
+
+		.swiper-dot {
+			background-color: #b2b2b2;
+			width: 15rpx;
+			border-radius: 50%;
+			height: 15rpx;
+			margin: 8rpx;
+
+			&.active {
+				background-color: rgba(0, 0, 0, 1);
+			}
+		}
+
+		&.straightLine {
+			.swiper-dot {
+				width: 18rpx;
+				height: 6rpx;
+				border-radius: 4rpx;
+
+				&.active {
+					width: 36rpx;
+					background-color: rgba(0, 0, 0, 1);
+				}
+			}
+		}
+	}
+
+	/* 隐藏滚动条，但依旧具备可以滚动的功能 */
+	/deep/.uni-scroll-view::-webkit-scrollbar {
+		display: none;
+	}
+
+	.swiper /deep/ .uni-swiper-dots-horizontal {
+		bottom: 25rpx;
+	}
+
+	.swiper-left /deep/ .uni-swiper-dots-horizontal {
+		left: 40rpx;
+		transform: translate(0);
+	}
+
+	.swiper-right /deep/ .uni-swiper-dots-horizontal {
+		right: 40rpx;
+		display: flex;
+		justify-content: flex-end;
+		transform: translate(0);
+	}
+
+	.carousel-angle /deep/ .uni-swiper-dots-horizontal .uni-swiper-dot {
+		width: 24rpx;
+		border-radius: 0;
+		height: 8rpx;
+	}
+
+	.swiper.ns-indicator-dots /deep/ .uni-swiper-dot {
+		width: 18rpx;
+		height: 6rpx;
+		border-radius: 4rpx;
+	}
+
+	.swiper.ns-indicator-dots /deep/ .uni-swiper-dot-active {
+		width: 36rpx;
+	}
+</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
new file mode 100644
index 0000000..db4df4b
--- /dev/null
+++ b/components/diy-components/diy-index-page.vue
@@ -0,0 +1,830 @@
+<template>
+	<view>
+		<view class="bg" :style="warpCss">
+			<view class="index-page-content">
+				<view class="nav-top-category" :style="categoryCss">
+					<scroll-view v-if="value" scroll-with-animation class="diyIndex" scroll-x="true"
+						:scroll-into-view="'a' + pageIndex"
+						:style="{ background: value.backgroundColor ? value.backgroundColor : '', width: 'calc(100% - 48rpx)' }"
+						@touchmove.stop>
+						<view class="item" :id="'a' + index" v-for="(item, index) in cateList" :key="index"
+							@click="changePageIndex(index)" :class="{ fill: value.styleType == 'fill' }"
+							:style="{ background: index == pageIndex && value.styleType == 'fill' ? value.selectColor : '' }">
+							<view class="text-con" :class="index == pageIndex ? 'active' : ''" :style="{
+									color: index == pageIndex ? '' : value.noColor
+								}" v-if="value.styleType == 'fill'">
+								{{ item.short_name ? item.short_name : item.category_name }}
+							</view>
+							<view class="text-con" :class="index == pageIndex ? 'active' : ''" :style="{ color: index == pageIndex ? value.selectColor : value.noColor }" v-else>
+								{{ item.short_name ? item.short_name : item.category_name }}
+							</view>
+							<view class="color-base-bg line" v-if="index == pageIndex && value.styleType != 'fill'" :style="{ background: value.selectColor ? value.selectColor + '!important' : 'rgba(0,0,0,0)' + '!important' }">
+							</view>
+						</view>
+					</scroll-view>
+					<text class="iconfont icon-unfold unfold-arrows" :style="{ color: value.moreColor }" @click="unfoldMenu"></text>
+				</view>
+				<uni-popup ref="navTopCategoryPop" type="top" :top="uniPopTop">
+					<view class="nav-topcategory-pop">
+						<text v-for="(item, index) in cateList" :key="index" :class="['category-item', { 'color-base-text color-base-border active': pageIndex == index }]" @click="changePageIndex(index)">
+							{{ item.short_name ? item.short_name : item.category_name }}
+						</text>
+					</view>
+				</uni-popup>
+				<view class="nav_top_category-fill" :style="{ height: moduleHeight }"></view>
+				<block v-if="pageIndex == 0">
+					<slot name="components"></slot>
+					<slot></slot>
+				</block>
+				<block v-else>
+					<slot name="components"></slot>
+					<view class="index-category-box">
+						<view class="category-goods" v-show="!isloading">
+							<mescroll-uni :top="uniPopTop" ref="mescroll" @getData="getGoodsList" :background="'url(' + $util.img(bgUrl) + ') 0px -50px / 100% no-repeat'" :paddingBoth="'30rpx'" @touchmove.prevent.stop>
+								<block slot="list">
+									<!-- 二级分类 -->
+									<view class="twoCategorylist" v-if="twoCategorylist != 'undefined' && twoCategorylist && twoCategorylist.length > 0">
+										<view class="twoCategory min" v-if="twoCategorylist.length <= 5">
+											<view class="twoCategory-page">
+												<view class="swiper-item" v-for="(item, index) in twoCategorylist" :key="index" @click="toCateGoodsList(item.category_id_2, 2)">
+													<view class="item-box">
+														<image :src="$util.img(item.image)" v-if="item.image" mode="aspectFill"/>
+														<image :src="$util.getDefaultImage().goods" v-else mode="aspectFill"/>
+														<view>{{ item.category_name }}</view>
+													</view>
+												</view>
+											</view>
+										</view>
+										<view class="twoCategory base" v-if="twoCategorylist.length > 5 && twoCategorylist.length <= 10">
+											<view class="twoCategory-page">
+												<view class="swiper-item" v-for="(item, index) in twoCategorylist" :key="index" @click="toCateGoodsList(item.category_id_2, 2)">
+													<view class="item-box">
+														<image :src="$util.img(item.image)" v-if="item.image" mode="aspectFill"/>
+														<image :src="$util.getDefaultImage().goods" v-else mode="aspectFill"/>
+														<view>{{ item.category_name }}</view>
+													</view>
+												</view>
+											</view>
+										</view>
+										<swiper class="twoCategory big" :duration="500" v-if="twoCategorylist.length > 10" @change="swiperTocategoryChange">
+											<swiper-item class="twoCategory-page" v-for="page in maxPage" :key="page">
+												<view class="swiper-item" v-for="(item, index) in twoCategorylist" :key="index" v-if="index >= (page - 1) * 10 && index < page * 10" @click="toCateGoodsList(item.category_id_2, 2)">
+													<view class="item-box">
+														<image :src="item.image" mode="aspectFill"/>
+														<view>{{ item.category_name }}</view>
+													</view>
+												</view>
+											</swiper-item>
+										</swiper>
+										<view class="dot-box">
+											<view class="dot-item" v-for="page in maxPage" v-if="maxPage > 1" :key="page" :class="twoCategorylistId == page - 1 ? 'active color-base-bg' : ''"></view>
+										</view>
+									</view>
+
+									<!-- 分类广告 -->
+									<image class="category_adv" v-if="cateList[pageIndex].image_adv" :src="$util.img(cateList[pageIndex].image_adv)" mode="widthFix"/>
+
+									<view class="goods-list double-column" v-if="goodsList[pageIndex].list.length">
+										<view class="goods-item" v-for="(item, index) in goodsList[pageIndex].list" :key="index" @click="toDetail(item)">
+											<view class="goods-img">
+												<image :src="goodsImg(item.goods_image)" mode="widthFix" @error="imgError(index)"/>
+												<view class="color-base-bg goods-tag" v-if="value.goodsTag == 'default' && goodsTag(item) != ''">{{ goodsTag(item) }}</view>
+												<view class="goods-tag-img" v-if="value.goodsTag == 'diy'">
+													<image :src="$util.img(value.tagImg.imageUrl)"/>
+												</view>
+											</view>
+											<view class="info-wrap">
+												<view class="name-wrap">
+													<view class="goods-name">{{ item.goods_name }}</view>
+												</view>
+												<view class="lineheight-clear">
+													<view class="discount-price">
+														<text class="unit color-base-text font-size-tag">{{ $lang('common.currencySymbol') }}</text>
+														<text class="price color-base-text font-size-toolbar">{{ showPrice(item) }}</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>
+												<view class="pro-info">
+													<view class="delete-price font-size-activity-tag color-tip" v-if="showMarketPrice(item)">
+														<text class="unit">{{ $lang('common.currencySymbol') }}</text>
+														<text>{{ showMarketPrice(item) }}</text>
+													</view>
+													<view class="sale font-size-activity-tag color-tip">已售{{ item.sale_num }}{{ item.unit ? item.unit : '件' }}</view>
+												</view>
+											</view>
+										</view>
+									</view>
+									<view v-if="!isloading && goodsList[pageIndex].list.length == 0">
+										<ns-empty text="该分类下暂无商品" :isIndex="false"></ns-empty>
+									</view>
+								</block>
+							</mescroll-uni>
+
+							<!-- <ns-empty v-else-if="!isloading" :isIndex="false" text="该分类下暂无商品"></ns-empty> -->
+						</view>
+						<view class="loading" v-show="isloading"><ns-loading ref="loading"></ns-loading></view>
+					</view>
+				</block>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import nsLoading from '@/components/ns-loading/ns-loading.vue';
+	export default {
+		props: {
+			value: {
+				type: Object
+			},
+			bgUrl: {
+				type: String
+			},
+			scrollTop: {
+				type: [String, Number],
+				default: '0'
+			},
+			diyGlobal: {
+				type: Object
+			}
+		},
+		components: {
+			nsLoading
+		},
+		data() {
+			return {
+				pageIndex: 0, //当前选中分类id
+				cateList: [{
+					//header分类
+					category_name: '首页'
+				}],
+				twoCategorylist: [], //二级分类
+				twoCategorylistId: 0, //二级分类所在的swiper
+				goodsList: {},
+				isloading: true,
+				top: 0,
+				isUnfold: true, //是否展开菜单
+				moduleHeight: '' //组件高度
+			};
+		},
+		computed: {
+			warpCss() {
+				var obj = '';
+				obj += (this.bgUrl ? 'background:' + 'url(' + this.$util.img(this.bgUrl) + ') no-repeat 0 0/100%' : '') + ';';
+				return obj;
+			},
+			categoryCss() {
+				var obj = '';
+				obj += 'top:' + this.fixedTop + ';';
+				// obj += 'background-color:' + (this.value.componentBgColor || this.value.pageBgColor) + ';';
+				obj += 'background-color:' + this.topNavColor + ';';
+				return obj;
+			},
+			maxPage() {
+				let num = 0;
+				if (this.twoCategorylist && this.twoCategorylist.length) {
+					num = Math.ceil(this.twoCategorylist.length / 10);
+				}
+				return num;
+			},
+			type() {
+				if (this.value) {
+					return true;
+				} else {
+					return false;
+				}
+			},
+			topNavColor() {
+				var color = this.value.componentBgColor || this.value.pageBgColor;
+				if (this.diyGlobal.topNavBg && this.scrollTop > 20) color = this.diyGlobal.topNavColor;
+				return color;
+			},
+			fixedTop() {
+				let diyPositionObj = this.$store.state.diyGroupPositionObj;
+				let data = 0;
+				if (diyPositionObj.diySearch && diyPositionObj.diyIndexPage && diyPositionObj.nsNavbar) {
+					if (diyPositionObj.diySearch.moduleIndex > diyPositionObj.diyIndexPage.moduleIndex) data =
+						diyPositionObj.nsNavbar.originalVal + 'px';
+					else data = diyPositionObj.nsNavbar.originalVal + diyPositionObj.diySearch.originalVal + 'px';
+				} else if (diyPositionObj.diyIndexPage && diyPositionObj.nsNavbar) {
+					data = diyPositionObj.nsNavbar.originalVal + 'px';
+				}
+				return data;
+			},
+			// 分类导航展开菜单的位置
+			uniPopTop() {
+				let diyPositionObj = this.$store.state.diyGroupPositionObj;
+				let data = '0';
+
+				if (this.fixedTop && diyPositionObj.diyIndexPage)
+					data = Number.parseFloat(this.fixedTop) + diyPositionObj.diyIndexPage.originalVal + 'px';
+				return data;
+			}
+		},
+		watch: {
+			type(newVal, oldVal) {
+				if (newVal) {
+					this.getCategoryList();
+				}
+			}
+		},
+		mounted() {
+			this.getCategoryList();
+			setTimeout(() => {
+				// 获取组件的高度，默认高度为45（45是在375屏幕上的高度）
+				const query = uni.createSelectorQuery();
+				// #ifdef H5
+				let cssSelect = '.page-header .u-navbar';
+				this.top = 100;
+				// #endif
+
+				// #ifdef MP
+				let cssSelect = '.page-header >>> .u-navbar';
+				this.top = 20;
+				// #endif
+
+				query
+					.select(cssSelect)
+					.boundingClientRect(data => {
+						let height;
+						if (this.diyGlobal.navBarSwitch) {
+							height = data ? data.height : 45;
+						} else {
+							height = data ? data.height : 0;
+						}
+
+						// #ifdef H5
+						this.top += height * 2;
+						// #endif
+
+						// #ifdef MP
+						this.top += height;
+						// #endif
+					})
+					.exec();
+			});
+
+			this.setModuleLocatinoFn();
+		},
+		methods: {
+			initPageIndex() {
+				this.pageIndex = 0;
+				this.showModuleFn();
+			},
+			//请求分类列表
+			getCategoryList() {
+				let url = '/api/goodscategory/tree';
+				let data = {
+					level: 3
+				};
+				this.$api.sendRequest({
+					url: url,
+					data: data,
+					success: res => {
+						if (res.code >= 0) {
+							let arr = [];
+							let obj = {
+								list: []
+							};
+							obj.category_name = this.value.title ? this.value.title : '首页';
+							arr.push(obj);
+							this.cateList = arr.concat(res.data);
+							Object.keys(this.cateList).forEach((key, index) => {
+								this.goodsList[key] = {
+									page: 1,
+									list: []
+								};
+							});
+							this.twoCategorylist = this.cateList[this.pageIndex].child_list;
+						}
+					}
+				});
+			},
+			//修改当前页面id
+			changePageIndex(e) {
+				this.isloading = true;
+				this.pageIndex = e;
+				this.showModuleFn();
+				if (e == 0) return;
+				this.twoCategorylist = this.cateList[this.pageIndex].child_list;
+				if (this.cateList[this.pageIndex].child_list) {
+					this.twoCategorylist = this.cateList[this.pageIndex].child_list;
+					this.twoCategorylist.forEach(v => {
+						if (v.image) {
+							v.image = this.$util.img(v.image);
+						} else {
+							v.image = this.$util.getDefaultImage().goods;
+						}
+					});
+				} else {
+					this.twoCategorylist = false;
+				}
+
+				if (this.$refs.mescroll) {
+					this.$refs.mescroll.refresh();
+					this.$refs.mescroll.myScrollTo(0);
+				}
+			},
+
+			//监听二级分类  页面切换
+			swiperTocategoryChange(e) {
+				this.twoCategorylistId = e.detail.current;
+			},
+
+			toDetail(item) {
+				this.$util.redirectTo('/pages/goods/detail', {
+					goods_id: item.goods_id
+				});
+			},
+			getGoodsList(mescroll) {
+				let id = this.pageIndex;
+				var data = {
+					page: mescroll.num,
+					page_size: mescroll.size
+				};
+				data.category_id = this.cateList[this.pageIndex].category_id_1;
+				data.category_level = 1;
+				this.$api.sendRequest({
+					url: '/api/goodssku/page',
+					data: data,
+					success: res => {
+						this.isloading = false;
+						let newArr = [];
+						let msg = res.message;
+						if (res.code == 0 && res.data) {
+							this.count = res.data.count;
+							newArr = res.data.list;
+						} else {
+							this.$util.showToast({
+								title: msg
+							});
+						}
+
+						mescroll.endSuccess(newArr.length);
+						//设置列表数据
+						if (mescroll.num == 1) this.goodsList[id].list = []; //如果是第一页需手动制空列表
+						this.goodsList[id].list = this.goodsList[id].list.concat(newArr); //追加新数据
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+
+						this.$forceUpdate();
+					}
+				});
+			},
+			toCateGoodsList(e, f) {
+				this.$util.redirectTo('/pages/goods/list', {
+					category_id: e,
+					category_level: f
+				});
+			},
+			goodsImg(imgStr) {
+				let imgs = imgStr.split(',');
+				return imgs[0] ? this.$util.img(imgs[0], {
+					size: 'mid'
+				}) : this.$util.getDefaultImage().goods;
+			},
+			imgError(index) {
+				this.goodsList[index].goods_image = this.$util.getDefaultImage().goods;
+			},
+			showPrice(data) {
+				let price = data.discount_price;
+				if (data.member_price && parseFloat(data.member_price) < parseFloat(price)) price = data.member_price;
+				return price;
+			},
+			showMarketPrice(item) {
+				if (item.market_price_show) {
+					let price = this.showPrice(item);
+					if (item.market_price > 0) {
+						return item.market_price;
+					} else if (parseFloat(item.price) > parseFloat(price)) {
+						return item.price;
+					}
+				}
+				return '';
+			},
+			goodsTag(data) {
+				return data.label_name || '';
+			},
+			// 控制菜单展开关闭
+			unfoldMenu() {
+				if (this.isUnfold) this.$refs.navTopCategoryPop.open();
+				else this.$refs.navTopCategoryPop.close();
+				this.isUnfold = !this.isUnfold;
+			},
+			// 向vuex中的diyIndexPositionObj增加分类导航组件定位位置
+			setModuleLocatinoFn() {
+				const query = uni.createSelectorQuery().in(this);
+				query.select('.nav-top-category')
+					.boundingClientRect(data => {
+						let diyIndexPage = {
+							originalVal: data.height || 0, //自身高度 px
+							moduleIndex: this.value.moduleIndex //组件在diy-group的位置
+						};
+						this.moduleHeight = (data.height || 0) + 'px';
+						this.$store.commit('setDiyGroupPositionObj', {
+							diyIndexPage: diyIndexPage
+						});
+					}).exec();
+			},
+			showModuleFn() {
+				let searchModule = this.$root.diyData.value.filter((item, index) => {
+					return item.componentName == 'Search';
+				});
+				// setDiyGroupShowModule值为【】表示显示所有组件,为【‘null’】则什么组件也不显示
+				if (this.pageIndex == 0) this.$store.commit('setDiyGroupShowModule', JSON.stringify([]));
+				else {
+					if (searchModule[0].positionWay == 'fixed') this.$store.commit('setDiyGroupShowModule', JSON.stringify(
+						['Search']));
+					else this.$store.commit('setDiyGroupShowModule', JSON.stringify(['null']));
+				}
+				// 特殊处理，切换分类导航导致页面无法上下滚动
+				// #ifdef H5
+				if (this.pageIndex == 0) {
+					// 标记当前页使用了mescroll (需延时,确保page已切换)
+					setTimeout(function() {
+						let uniPageDom = document.getElementsByTagName('uni-page')[0];
+						uniPageDom && uniPageDom.removeAttribute('use_mescroll');
+					}, 30);
+				}
+				// #endif
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	.bg {
+		width: 100%;
+		height: 100%;
+	}
+
+	.nav-top-category {
+		display: flex;
+		align-items: center;
+		position: fixed;
+		z-index: 999;
+		transition: background 0.3s;
+		width: 100%;
+		padding: 0 24rpx;
+		box-sizing: border-box;
+
+		.text-fiexd {
+			.text-con {
+				line-height: 60rpx;
+			}
+		}
+
+		.unfold-arrows {
+			position: relative;
+			margin-left: 4rpx;
+			padding-left: 16rpx;
+			height: 80rpx;
+			line-height: 80rpx;
+			text-align: center;
+			color: #fff;
+		}
+	}
+
+	.nav-topcategory-pop {
+		padding: 0 10rpx 20rpx;
+		display: flex;
+		flex-wrap: wrap;
+		background-color: #fff;
+
+		.category-item {
+			padding: 0 30rpx;
+			height: 60rpx;
+			text-align: center;
+			line-height: 56rpx;
+			border-radius: 40rpx;
+			background-color: #f0f0f0;
+			margin: 20rpx 10rpx 0;
+			font-size: 24rpx;
+			border: 2rpx solid transparent;
+			box-sizing: border-box;
+
+			&.active {
+				background-color: transparent;
+			}
+		}
+	}
+
+	.diyIndex {
+		width: 100%;
+		height: 100rpx;
+		white-space: nowrap;
+		padding: 20rpx 0 0;
+		box-sizing: border-box;
+
+		&.widthAuto {
+			width: auto;
+		}
+
+		.item {
+			position: relative;
+			margin-right: 40rpx;
+			display: inline-block;
+			line-height: 80rpx;
+			font-size: $font-size-base;
+			text-align: center;
+
+			.text-con {
+				height: 30px;
+				line-height: 30px;
+
+				&.active {
+					font-size: $font-size-base;
+					font-weight: bold;
+				}
+			}
+
+			.text-con.active {
+				font-size: $font-size-base;
+				font-weight: bold;
+			}
+
+			.line {
+				position: absolute;
+				left: calc(50% - 14rpx);
+				width: 28rpx;
+				height: 5rpx;
+				border-radius: 5rpx;
+			}
+
+			&.fill {
+				border-radius: 50rpx;
+				padding: 0 10rpx;
+
+				.text-con.active {
+					font-size: $font-size-base;
+					font-weight: 600;
+					color: #fff;
+				}
+			}
+		}
+	}
+
+	.index-page-box {
+		width: 100%;
+		height: calc(100vh - 288rpx);
+	}
+
+	.index-page-content {
+		width: 100%;
+		// height: calc(100vh - 144px);
+	}
+
+	.index-category-box.active {
+		padding-bottom: 160rpx;
+		padding-bottom: calc(160rpx + constant(safe-area-inset-bottom));
+		padding-bottom: calc(160rpx + env(safe-area-inset-bottom));
+	}
+
+	.index-category-box {
+		width: 100%;
+		padding-bottom: 110rpx;
+		padding-bottom: calc(110rpx + constant(safe-area-inset-bottom));
+		padding-bottom: calc(110rpx + env(safe-area-inset-bottom));
+
+		.twoCategorylist {
+			position: relative;
+		}
+
+		.twoCategory.min {
+			height: 160rpx;
+		}
+
+		.twoCategory.big {
+			height: 340rpx;
+		}
+
+		.twoCategory {
+			width: 100%;
+			background: #ffffff;
+			border-radius: 15rpx;
+			overflow: hidden;
+			margin-top: 20rpx;
+
+			.twoCategory-page {
+				width: 100%;
+				height: 100%;
+				padding: 20rpx;
+				box-sizing: border-box;
+			}
+
+			.swiper-item {
+				width: 120rpx;
+				height: 120rpx;
+				display: inline-block;
+				margin-right: calc((100% - 120rpx * 5) / 4);
+				overflow: hidden;
+
+				.item-box {
+					width: 100%;
+					height: 100%;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					flex-direction: column;
+
+					image {
+						width: 88rpx;
+						height: 88rpx;
+					}
+
+					view {
+						width: 100%;
+						font-size: 22rpx;
+						line-height: 1;
+						margin-top: 10rpx;
+						display: -webkit-box;
+						-webkit-box-orient: vertical;
+						-webkit-line-clamp: 1;
+						overflow: hidden;
+						text-align: center;
+					}
+				}
+			}
+
+			.swiper-item:nth-child(5n) {
+				margin-right: 0;
+			}
+
+			.swiper-item:nth-child(10n + 6) {
+				margin-top: 15rpx;
+			}
+		}
+
+		.dot-box {
+			width: calc(100% - 40rpx);
+			height: 50rpx;
+			position: absolute;
+			bottom: 0rpx;
+			left: 20rpx;
+			background: rgba($color: #000000, $alpha: 0);
+			display: flex;
+			justify-content: center;
+			align-items: center;
+
+			.dot-item {
+				width: 12rpx;
+				height: 12rpx;
+				background: #cccccc;
+				border-radius: 6rpx;
+				margin-right: 10rpx;
+			}
+
+			.dot-item.active {
+				width: 24rpx;
+			}
+		}
+
+		.category_adv {
+			width: 100%;
+			margin: 20rpx 0;
+			border-radius: 15rpx;
+		}
+
+		.category-goods {
+			width: 100%;
+		}
+	}
+
+	.loading {
+		width: 100%;
+		height: 50rpx;
+		margin-top: 100rpx;
+	}
+
+	/deep/.uni-scroll-view::-webkit-scrollbar {
+		/* 隐藏滚动条，但依旧具备可以滚动的功能 */
+		display: none;
+	}
+
+	.goods-list.double-column {
+		display: flex;
+		flex-wrap: wrap;
+		margin-top: $margin-updown;
+
+		.goods-item {
+			flex: 1;
+			position: relative;
+			background-color: #fff;
+			flex-basis: 48%;
+			max-width: calc((100% - 30rpx) / 2);
+			margin-right: $margin-both;
+			margin-bottom: $margin-updown;
+			border-radius: $border-radius;
+
+			&:nth-child(2n) {
+				margin-right: 0;
+			}
+
+			.goods-img {
+				position: relative;
+				overflow: hidden;
+				padding-top: 100%;
+				border-top-left-radius: $border-radius;
+				border-top-right-radius: $border-radius;
+
+				image {
+					width: 100%;
+					position: absolute;
+					top: 50%;
+					left: 0;
+					transform: translateY(-50%);
+				}
+			}
+
+			.goods-tag {
+				color: #fff;
+				line-height: 1;
+				padding: 8rpx 16rpx;
+				position: absolute;
+				border-bottom-right-radius: $border-radius;
+				top: 0;
+				left: 0;
+				font-size: $font-size-goods-tag;
+			}
+
+			.goods-tag-img {
+				position: absolute;
+				border-top-left-radius: $border-radius;
+				width: 80rpx;
+				height: 80rpx;
+				top: 0;
+				left: 0;
+				z-index: 5;
+				overflow: hidden;
+
+				image {
+					width: 100%;
+					height: 100%;
+				}
+			}
+
+			.info-wrap {
+				padding: 0 26rpx 26rpx 26rpx;
+			}
+
+			.goods-name {
+				font-size: $font-size-base;
+				line-height: 1.3;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				display: -webkit-box;
+				-webkit-line-clamp: 2;
+				-webkit-box-orient: vertical;
+				margin-top: 20rpx;
+				height: 68rpx;
+			}
+
+			.discount-price {
+				display: inline-block;
+				font-weight: bold;
+				line-height: 1;
+				margin-top: 16rpx;
+
+				.unit {
+					margin-right: 6rpx;
+				}
+			}
+
+			.pro-info {
+				display: flex;
+				margin-top: 16rpx;
+
+				.delete-price {
+					text-decoration: line-through;
+					flex: 1;
+
+					.unit {
+						margin-right: 6rpx;
+					}
+				}
+
+				&>view {
+					line-height: 1;
+
+					&:nth-child(2) {
+						text-align: right;
+					}
+				}
+			}
+
+			.member-price-tag {
+				display: inline-block;
+				width: 60rpx;
+				line-height: 1;
+				margin-left: 6rpx;
+
+				image {
+					width: 100%;
+				}
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/components/diy-components/diy-kefu.vue b/components/diy-components/diy-kefu.vue
new file mode 100644
index 0000000..fa37ed9
--- /dev/null
+++ b/components/diy-components/diy-kefu.vue
@@ -0,0 +1,71 @@
+<template>
+	<view class="diy-kefu" :style="style">
+		<view class="fui-list-group merchgroup" v-for="(item,index) in value.list">
+			<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>
+				</view>
+				<view class="fui-list-inner" >
+					<view class="title" style="color: ;height: 75rpx;">
+						<text style="font-weight:600" :style="{color:item.textColor}">{{item.title}}</text>
+						<view class="subtitle" style="font-size:24rpx" :style="{color:item.textColor}">{{item.desc}}</view>
+					</view>
+				</view>
+				<view class="fui-remark jump" style="padding-right: 20rpx; text-align: center; line-height: 140rpx;">
+					<span style="font-size:24rpx;padding: 14rpx 18rpx;border-radius:8rpx" :style="{background:item.BtBgColor,color:item.BtColor}" @click="previewSqs()">立即添加</span>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: 'diy-picture',
+		props: {
+			value: {
+				type: Object
+			}
+		},
+		data() {
+			return {
+				loading: true,
+			};
+		},
+		created() {
+			// this.getDataList();
+		},
+		watch: {
+			// 组件刷新监听
+			componentRefresh: function(nval) {
+				// this.getDataList();
+			}
+		},
+		computed: {
+			style() {
+				var css = '';
+				css += 'background-color:' + this.value.contentBgColor + ';';
+				if (this.value.elementAngle == 'round') {
+					css += 'border-top-left-radius:' + this.value.topElementAroundRadius * 2 + 'rpx;';
+					css += 'border-top-right-radius:' + this.value.topElementAroundRadius * 2 + 'rpx;';
+					css += 'border-bottom-left-radius:' + this.value.bottomElementAroundRadius * 2 + 'rpx;';
+					css += 'border-bottom-right-radius:' + this.value.bottomElementAroundRadius * 2 + 'rpx;';
+				}
+				return css;
+			}
+		},
+		methods: {
+			previewSqs(){
+				var img = this.$util.img(this.value.list[1].imageUrl)
+				 uni.previewImage({
+					current: img,
+					urls: [img] 
+				})
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+
+</style>
\ No newline at end of file
diff --git a/components/diy-components/diy-listmenu.vue b/components/diy-components/diy-listmenu.vue
new file mode 100644
index 0000000..0fc8d28
--- /dev/null
+++ b/components/diy-components/diy-listmenu.vue
@@ -0,0 +1,77 @@
+<template>
+	<view class="diy-picture" :style="style">
+		<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 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"
+					       :style="{ maxWidth: value.imageSize * 2 + 'rpx', maxHeight: value.imageSize * 2 + 'rpx', width: '100%', height: '100%' }"></diy-icon>
+						<image v-if="item.iconType == 'img'" mode="widthFix" :src="$util.img(item.imageUrl)" style="border-radius:6rpx;width: 60rpx;"></image>
+		           </view>
+		           <view class="fui-cell-text" style="color:#333;">{{item.title}}</view>
+		           <view class="fui-cell-remark" style="font-size: 24rpx;">{{lang=='en-us'?'view':'查看'}}</view>
+		       </view>
+		    </view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: 'diy-listmenu',
+		props: {
+			value: {
+				type: Object
+			}
+		},
+		data() {
+			return {
+				loading: true,
+				lang:uni.getStorageSync("lang")//en-us 英文
+			};
+		},
+		created() {
+			// this.getDataList();
+		},
+		watch: {
+			// 组件刷新监听
+			componentRefresh: function(nval) {
+				// this.getDataList();
+			}
+		},
+		computed: {
+			style() {
+				var css = '';
+				css += 'background-color:' + this.value.contentBgColor + ';';
+				if (this.value.elementAngle == 'round') {
+					
+					css += 'border-top-left-radius:' + this.value.topElementAroundRadius * 2 + 'rpx;';
+					css += 'border-top-right-radius:' + this.value.topElementAroundRadius * 2 + 'rpx;';
+					css += 'border-bottom-left-radius:' + this.value.bottomElementAroundRadius * 2 + 'rpx;';
+					css += 'border-bottom-right-radius:' + this.value.bottomElementAroundRadius * 2 + 'rpx;';
+				}
+				if(this.value.margin.top > 0)css += 'margin-top:' + this.value.margin.top * 2 + 'rpx;';
+				return css; 
+			}
+		},
+		methods: {
+			redirectTo(link) {
+			    if (link.wap_url) {
+			        if (this.$util.getCurrRoute() == 'pages/member/index' && !this.storeToken) {
+			            this.$refs.login.open(link.wap_url);
+			            return;
+			        }
+			    }
+			    this.$util.diyRedirectTo(link);
+			},
+		}
+	};
+</script>
+
+<style lang="scss">
+.img-cell{
+	padding:0 16rpx !important;
+}
+</style>
\ No newline at end of file
diff --git a/components/diy-components/diy-live.vue b/components/diy-components/diy-live.vue
new file mode 100644
index 0000000..d6316da
--- /dev/null
+++ b/components/diy-components/diy-live.vue
@@ -0,0 +1,241 @@
+<template>
+	<x-skeleton type="banner" :loading="loading" :configs="skeletonConfig">
+		<view class="live-wrap" @click="entryRoom(liveInfo.roomid)" v-if="liveInfo">
+			<view class="banner-wrap">
+				<image :src="liveInfo.banner != '' ? $util.img(liveInfo.banner) : $util.img('public/uniapp/live/live_default_banner.png')"
+					mode="widthFix" @error="liveInfo.banner = $util.img('public/uniapp/live/live_default_banner.png')"/>
+				<view class="shade"></view>
+				<view class="wrap">
+					<view class="room-name">
+						<text class="status-name font-size-base" :class="{ 'color-base-bg': liveInfo.live_status == '101' }">
+							<text class="iconfont icon-zhibozhong font-size-sub" v-if="liveInfo.live_status == '101'"></text>
+							<text class="iconfont icon-zhibojieshu font-size-sub" v-else></text>
+							{{ liveInfo.status_name }}
+						</text>
+						{{ liveInfo.name }}
+					</view>
+				</view>
+			</view>
+			<view class="room-info" v-if="value.isShowAnchorInfo || value.isShowLiveGood">
+				<block v-if="value.isShowAnchorInfo">
+					<image :src="liveInfo.anchor_img != '' ? $util.img(liveInfo.anchor_img) : $util.getDefaultImage().head" class="anchor-img" @error="liveInfo.anchor_img = $util.getDefaultImage().head"/>
+					<text class="anchor-name">主播：{{ liveInfo.anchor_name }}</text>
+				</block>
+				<text class="separate" v-if="value.isShowAnchorInfo && value.isShowLiveGood">|</text>
+				<block v-if="value.isShowLiveGood">
+					<text class="goods-text">直播商品：{{ liveInfo.goods.length }}</text>
+				</block>
+			</view>
+		</view>
+	</x-skeleton>
+</template>
+
+<script>
+	// 直播
+	export default {
+		components: {},
+		name: 'diy-live',
+		props: {
+			value: {
+				type: Object,
+				default: () => {
+					return {};
+				}
+			}
+		},
+		data() {
+			return {
+				loading: true,
+				skeletonConfig: {
+					headHeight: '200rpx'
+				},
+				liveInfo: {
+					banner: '',
+					anchor_img: ''
+				}
+
+			};
+		},
+		created() {
+			this.getLiveInfo();
+		},
+		watch: {
+			// 组件刷新监听
+			componentRefresh: function(nval) {
+				this.getLiveInfo();
+			}
+		},
+		methods: {
+			getLiveInfo() {
+				this.$api.sendRequest({
+					url: '/live/api/live/info',
+					success: res => {
+						if (res.code == 0 && res.data) {
+							this.liveInfo = res.data;
+							this.getLiveStatus();
+						} else {
+							this.liveInfo = null;
+						}
+						this.loading = false;
+					}
+				});
+			},
+			entryRoom(roomId) {
+				// #ifdef MP-WEIXIN
+				wx.navigateTo({
+					url: `plugin-private://wx2b03c6e691cd7370/pages/live-player-plugin?room_id=${roomId}`
+				});
+				// #endif
+			},
+			getLiveStatus() {
+				// #ifdef MP-WEIXIN
+				let livePlayer = requirePlugin('live-player-plugin');
+
+				livePlayer.getLiveStatus({
+						room_id: this.liveInfo.roomid
+					}).then(res => {
+						const liveStatus = res.liveStatus;
+						if (liveStatus && liveStatus != this.liveInfo.live_status) {
+							this.changeLiveStatus(liveStatus);
+						}
+					})
+					.catch(err => {console.log('get live status', err);
+					});
+
+				// 往后间隔1分钟或更慢的频率去轮询获取直播状态
+				var timer = setInterval(() => {
+					livePlayer
+						.getLiveStatus({
+							room_id: this.liveInfo.roomid
+						})
+						.then(res => {
+							const liveStatus = res.liveStatus;
+							if (liveStatus && liveStatus != this.liveInfo.live_status) {
+								this.changeLiveStatus(liveStatus);
+							}
+							if (this.$util.inArray(liveStatus, [103, 104, 106, 107])) {
+								clearInterval(timer);
+							}
+						})
+						.catch(err => {
+							console.log('get live status', err);
+						});
+				}, 60000);
+				// #endif
+			},
+			changeLiveStatus(status) {
+				this.$api.sendRequest({
+					url: '/live/api/live/modifyLiveStatus',
+					data: {
+						room_id: this.liveInfo.roomid,
+						status: status
+					},
+					success: res => {
+						if (res.code == 0) {
+							this.getLiveInfo();
+						}
+					}
+				});
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	.live-wrap {
+		background: #fff;
+		border-radius: 16rpx;
+		overflow: hidden;
+	}
+
+	.banner-wrap {
+		width: 100%;
+		position: relative;
+		line-height: 1;
+		display: flex;
+
+		image {
+			width: 100%;
+		}
+
+		.shade {
+			width: 100%;
+			height: 100%;
+			position: absolute;
+			background: rgba($color: #888, $alpha: 0.3);
+			left: 0;
+			top: 0;
+			z-index: 5;
+		}
+
+		.wrap {
+			width: 100%;
+			height: 100%;
+			position: absolute;
+			left: 0;
+			top: 0;
+			z-index: 10;
+			padding: 26rpx 20rpx;
+			box-sizing: border-box;
+
+			.room-name {
+				font-size: $font-size-toolbar;
+				color: #fff;
+				line-height: 1;
+				width: 100%;
+				white-space: nowrap;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				display: flex;
+				align-items: center;
+
+				.status-name {
+					display: inline-block;
+					font-size: $font-size-activity-tag;
+					color: #fff;
+					padding: 8rpx 12rpx;
+					background-color: rgba(0, 0, 0, 0.6);
+					border-radius: 36rpx;
+					margin-right: 20rpx;
+
+					.icon-zhibozhong {
+						font-size: $font-size-activity-tag;
+						color: #fff;
+						margin-right: 9rpx;
+					}
+				}
+			}
+		}
+	}
+
+	.room-info {
+		padding: 20rpx 30rpx;
+		background: #fff;
+		display: flex;
+
+		.anchor-img {
+			width: 60rpx;
+			height: 60rpx;
+			border-radius: 50%;
+			overflow: hidden;
+			margin-right: 20rpx;
+		}
+
+		.anchor-name,
+		.goods-text {
+			font-size: $font-size-base;
+			line-height: 60rpx;
+		}
+
+		.separate {
+			color: #808080;
+			margin: 0 10rpx;
+			line-height: 56rpx;
+		}
+	}
+</style>
+<style scoped>
+	.coupon-all>>>.uni-scroll-view::-webkit-scrollbar {
+		display: none;
+	}
+</style>
\ No newline at end of file
diff --git a/components/diy-components/diy-many-goods-list.vue b/components/diy-components/diy-many-goods-list.vue
new file mode 100644
index 0000000..0df252b
--- /dev/null
+++ b/components/diy-components/diy-many-goods-list.vue
@@ -0,0 +1,247 @@
+<template>
+	<view class="many-goods-list">
+		<scroll-view scroll-x="true" class="many-goods-list-head" :scroll-into-view="'a' + cateIndex" :style="manyWrapCss">
+			<view v-for="(item, index) in value.list" class="scroll-item" :class="{ active: index == cateIndex }" :id="'a' + index" :key="index" @click="changeCateIndex(item, index)">
+				<view class="split-line" v-if="index > 0"></view>
+				<view class="cate">
+					<view class="name" :style="{ color : value.headStyle.titleColor }">{{ item.title }}</view>
+					<view class="desc" :class="{ 'color-base-bg': index == cateIndex && item.desc }">{{ item.desc }}
+					</view>
+				</view>
+			</view>
+		</scroll-view>
+		<view class="many-goods-list-fill" :style="{'height': manyInfo.height}" v-if="fixedTop"></view>
+		<diy-goods-list class="many-goods-list-body" v-if="goodsValue" :value="goodsValue" ref="diyGoodsList"></diy-goods-list>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: 'diy-many-goods-list',
+		props: {
+			value: {
+				type: Object,
+				default: () => {
+					return {};
+				}
+			},
+			scrollTop: {
+				type: [Number, String]
+			},
+			global: {
+				type: Object,
+				default: () => {
+					return {};
+				}
+			}
+		},
+		data() {
+			return {
+				cateIndex: 0, // 当前选中的分类id
+				goodsValue: null, // 商品列表数据
+				manyInfo: {
+					bodyHeight: 0,
+					bodyTop: 0,
+					height: 0,
+					top: 0
+				}
+			};
+		},
+		created() {
+			this.changeCateIndex(this.value.list[0], 0, true);
+		},
+		watch: {
+			// 组件刷新监听
+			componentRefresh: function(nval) {
+				this.changeCateIndex(this.value.list[0], 0, true);
+			},
+			scrollTop: function(nval) {
+				const query = uni.createSelectorQuery().in(this);
+				query
+					.select('.many-goods-list')
+					.boundingClientRect(data => {
+						if (data) {
+							this.manyInfo.top = data.top;
+						}
+					})
+					.exec();
+
+				query
+					.select('.many-goods-list .many-goods-list-body')
+					.boundingClientRect(data => {
+						if (data) {
+							this.manyInfo.bodyHeight = (data.height || 0);
+							this.manyInfo.bodyTop = (data.top || 0);
+						}
+					})
+					.exec();
+			}
+		},
+		computed: {
+			fixedTop() {
+				let diyPositionObj = JSON.parse(JSON.stringify(this.$store.state.diyGroupPositionObj));
+				let positionHeight = 0;
+				let height = 0;
+
+				delete diyPositionObj.diyManyGoodsList;
+
+				if (diyPositionObj) {
+					let arr = Object.values(diyPositionObj);
+					arr.forEach((item, index) => {
+						positionHeight += item.originalVal; //定位的高度【搜索框+导航分类+自定义头部】
+					});
+				}
+
+				if (this.manyInfo.top < positionHeight && (this.manyInfo.bodyTop + this.manyInfo.bodyHeight >
+						positionHeight + Number.parseFloat(this.manyInfo.height))) {
+					height = positionHeight;
+				}
+				return height;
+			},
+			manyWrapCss() {
+				let html = '';
+				html += `position: ${this.fixedTop ? 'fixed' : 'initial'};`
+				html += `top: ${this.fixedTop}px;`
+				if (!this.global.topNavBg)
+					html += `background-color: #fff;`
+				else
+					html += `background-color: ${this.fixedTop ? this.global.topNavColor : 'transparent'};`
+				return html;
+			}
+		},
+		mounted() {
+			const query = uni.createSelectorQuery().in(this);
+			query
+				.select('.many-goods-list .many-goods-list-head')
+				.boundingClientRect(data => {
+					if (data) {
+						this.manyInfo.height = (data.height || 0) + 'px';
+						// 向vuex中的diyIndexPositionObj增加多商品组件定位位置
+						let diyManyGoodsList = {
+							originalVal: data.height || 0 //自身高度 px
+						}
+						this.$store.commit('setDiyGroupPositionObj', {
+							diyManyGoodsList: diyManyGoodsList
+						});
+					}
+				})
+				.exec();
+		},
+		methods: {
+			changeCateIndex(item, index, isFirst) {
+				this.cateIndex = index;
+				this.goodsValue = {
+					sources: item.sources,
+					categoryId: item.categoryId,
+					categoryName: item.categoryName,
+					goodsId: item.goodsId,
+					componentBgColor: this.value.componentBgColor,
+					componentAngle: this.value.componentAngle,
+					topAroundRadius: this.value.topAroundRadius,
+					bottomAroundRadius: this.value.bottomAroundRadius,
+					elementBgColor: this.value.elementBgColor,
+					elementAngle: this.value.elementAngle,
+					topElementAroundRadius: this.value.topElementAroundRadius,
+					bottomElementAroundRadius: this.value.bottomElementAroundRadius,
+					count: this.value.count,
+					nameLineMode: this.value.nameLineMode,
+					template: this.value.template,
+					style: this.value.style,
+					ornament: this.value.ornament,
+					sortWay: this.value.sortWay,
+					saleStyle: this.value.saleStyle,
+					tag: this.value.tag,
+					btnStyle: this.value.btnStyle,
+					goodsNameStyle: this.value.goodsNameStyle,
+					theme: this.value.theme,
+					priceStyle: this.value.priceStyle,
+					slideMode: this.value.slideMode,
+					imgAroundRadius: this.value.imgAroundRadius,
+					margin: this.value.margin,
+					goodsMarginType: this.value.goodsMarginType,
+					goodsMarginNum: this.value.goodsMarginNum
+				};
+
+				// 如果是第一次加载，不需要执行下面代码
+				if (isFirst) return;
+				this.$refs.diyGoodsList.goodsValue = this.goodsValue;
+				this.$refs.diyGoodsList.getGoodsList();
+			}
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	.many-goods-list-head {
+		left: 0;
+		right: 0;
+		z-index: 5;
+		background-color: #fff;
+	}
+
+	scroll-view {
+		width: 100%;
+		white-space: nowrap;
+		box-sizing: border-box;
+		padding: 20rpx 0;
+
+		.scroll-item {
+			display: inline-block;
+			text-align: center;
+			vertical-align: top;
+			width: calc(25% - 40rpx);
+			position: relative;
+			padding: 0 20rpx;
+
+			&:first-child {
+				width: calc(25% - 20rpx);
+				padding-left: 0;
+			}
+
+			.split-line {
+				display: inline-block;
+				width: 1rpx;
+				height: 30rpx;
+				background-color: #e5e5e5;
+				position: absolute;
+				left: 0;
+				top: 50%;
+				transform: translateY(-50%);
+			}
+
+			&.active {
+				.name {
+					font-weight: bold;
+				}
+
+				.desc {
+					color: #ffffff;
+					border-radius: 20rpx;
+				}
+			}
+
+			.name {
+				font-size: 32rpx;
+				color: $color-title;
+				line-height: 1;
+			}
+
+			.cate {
+				display: inline-block;
+			}
+
+			.desc {
+				font-size: $font-size-tag;
+				color: $color-tip;
+				height: 36rpx;
+				line-height: 36rpx;
+				margin-top: 10rpx;
+				min-width: 120rpx;
+				max-width: 220rpx;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				padding: 0 10rpx;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/components/diy-components/diy-map.vue b/components/diy-components/diy-map.vue
new file mode 100644
index 0000000..4c5265f
--- /dev/null
+++ b/components/diy-components/diy-map.vue
@@ -0,0 +1,78 @@
+<template>
+	<view class="diy-map" :style="style">
+		<view class="fui-list-group merchgroup" style="margin-top:0" v-for="(item,index) in value.list">
+			<map
+				id="map"
+				style="width: 100%; height:600rpx"
+				scale="12"
+				:markers="markerst"
+				bindupdated="bindupdated"
+				:longitude="item.lng"
+				:latitude="item.lat"
+				show-location>
+				<cover-view style="position:absolute;right:10px;bottom:30rpx;z-index:99999;background:#4390FF;padding:5px 10px;wxcs_style_padding:10rpx 20rpx;border-radius:8rpx;color: #fff;" @click="tomap(item)">
+				<cover-view style="font-size:24rpx">一键导航</cover-view>
+				</cover-view>    
+			</map>
+		</view>
+
+	</view>
+</template>
+
+<script>
+	export default {
+		name: 'diy-map',
+		props: {
+			value: {
+				type: Object
+			}
+		},
+		data() {
+			return {
+				loading: true,
+				markers:[]
+			};
+		},
+		created() {
+		},
+		watch: {
+			// 组件刷新监听
+			componentRefresh: function(nval) {
+				// this.getDataList();
+			}
+		},
+		computed: {
+			markerst(){
+				return [{
+						id:1,
+						latitude:this.value.list[0].lat,
+						longitude:this.value.list[0].lng
+					}]
+			},
+			style() {
+				var css = '';
+				css += 'background-color:' + this.value.contentBgColor + ';';
+				if (this.value.elementAngle == 'round') {
+					css += 'border-top-left-radius:' + this.value.topElementAroundRadius * 2 + 'rpx;';
+					css += 'border-top-right-radius:' + this.value.topElementAroundRadius * 2 + 'rpx;';
+					css += 'border-bottom-left-radius:' + this.value.bottomElementAroundRadius * 2 + 'rpx;';
+					css += 'border-bottom-right-radius:' + this.value.bottomElementAroundRadius * 2 + 'rpx;';
+				}
+				return css;
+			}
+		},
+		methods: {
+			tomap(item){
+				  uni.openLocation({
+					latitude: parseFloat(item.lat),
+					longitude: parseFloat(item.lng),
+					name:"一键导航",
+				  })
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	
+</style>
\ No newline at end of file
diff --git a/components/diy-components/diy-member-info.vue b/components/diy-components/diy-member-info.vue
new file mode 100644
index 0000000..bde0e11
--- /dev/null
+++ b/components/diy-components/diy-member-info.vue
@@ -0,0 +1,1466 @@
+<template>
+	<view class="container" :style="warpCss">
+		<!-- 会员信息 -->
+		<view class="common-wrap info-wrap" :class="[`data-style-${value.style}`]">
+			<view class="member-info" :style="memberInfoStyle">
+				<view class="info-wrap" :style="infoStyle" v-if="memberInfo">
+					<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">
+						<!-- #ifdef MP -->
+						<block v-if="(memberInfo.nickname.indexOf('u_') != -1 && memberInfo.nickname == memberInfo.username) || memberInfo.nickname == memberInfo.mobile">
+							<view class="nickname"><text class="name" @click="getWxAuth">点击授权头像昵称</text></view>
+						</block>
+						<view class="nickname" v-else>
+							<text class="name" @click="getWxAuth">{{ memberInfo.nickname }}</text>
+							<view class="member-level" v-if="(value.style == 1 || value.style == 2) && memberInfo.member_level" >
+							<!-- 	<text class="icondiy icon-system-huangguan"></text> -->
+								<text class="level-name">{{ memberInfo.member_level_name }}</text>
+							</view>
+						</view>
+						<view class="member-level" v-if="value.style == 3 && memberInfo.member_level" >
+							<!-- <image :src="$util.img('public/uniapp/member/supervip_icon.png')" mode="widthFix" class="level-icon"/> -->
+							<view class="level-name">{{ memberInfo.member_level_name }}</view>
+						</view>
+						<view class="member-level" v-if="value.style == 4 && memberInfo.member_level" >
+							<image :src="$util.img('app/component/view/member_info/img/style_4_vip_tag.png')" mode="widthFix" class="level-icon"/>
+							<text class="level-name">{{ memberInfo.member_level_name }}</text>
+						</view>
+						<!-- #endif -->
+
+						<!-- #ifdef H5 -->
+						<block v-if="$util.isWeiXin() && ((memberInfo.nickname.indexOf('u_') != -1 && memberInfo.nickname == memberInfo.username) || memberInfo.nickname == memberInfo.mobile) ">
+							<view class="nickname"><text class="name" @click="getWxAuth">点击获取微信头像</text></view>
+						</block>
+						<view class="nickname" v-else>
+							<text class="name" @click="redirect('/pages_tool/member/info')">{{ memberInfo.nickname }}</text>
+							<view class="member-level" v-if="(value.style == 1 || value.style == 2) && memberInfo.member_level">
+							<!-- 	<text class="icondiy icon-system-huangguan"></text> -->
+								<text class="level-name">{{ memberInfo.member_level_name }}VIP1</text>
+							</view>
+						</view>
+						<view class="member-level" v-if="value.style == 3 && memberInfo.member_level" >
+			<!-- 				<image :src="$util.img('public/uniapp/member/supervip_icon.png')" mode="widthFix" class="level-icon"/> -->
+							<view class="level-name">{{ memberInfo.member_level_name }}</view>
+						</view>
+						
+						<view class="member-level" v-if="value.style == 4 && memberInfo.member_level" ><image :src="$util.img('app/component/view/member_info/img/style_4_vip_tag.png')" mode="widthFix" class="level-icon"/>
+							<text class="level-name">{{ memberInfo.member_level_name }}</text>
+						</view>
+						<!-- #endif -->
+					</view>
+					<view v-if="ischina == 1" style="background: #fff;height: 60rpx;width: 60rpx;border-radius: 50rpx;line-height:65rpx;text-align: center;color:#000" @click.stop="modifyInfo()">{{langIndex == 0?'CN':'EN'}}</view>
+				</view>
+
+				<view class="info-wrap" v-else :style="infoStyle" @click="redirect('/pages/member/index')">
+					<view class="headimg">
+						<image :src="$util.getDefaultImage().head" mode="widthFix"></image>
+					</view>
+					<view class="info">
+						<view class="nickname"><text class="name">{{$lang('login')}}</text></view>
+						<view class="desc">{{$lang('loginTpis')}}</view>
+					</view>
+					
+					<view v-if="ischina == 1" style="background: #fff;height: 60rpx;width: 60rpx;border-radius: 50rpx;line-height:65rpx;text-align: center;color:#000" @click.stop="modifyInfo()">{{langIndex == 0?'CN':'EN'}}</view>
+				</view>
+
+				<view class="account-info" v-show="value.style == 1" :style="{ 'margin-left': parseInt(value.infoMargin) * 2 + 'rpx', 'margin-right': parseInt(value.infoMargin) * 2 + 'rpx' }">
+					<view class="account-item" @click="redirect('/pages_tool/member/balance')">
+						<view class="value price-font">
+							{{ memberInfo ? (parseFloat(memberInfo.balance) + parseFloat(memberInfo.balance_money)).toFixed(2) : '--' }}
+						</view>
+						<view class="title">{{ $lang('balance') }}</view>
+					</view>
+					<view class="solid"></view>
+					<view class="account-item" @click="redirect('/pages_tool/member/point_detail')">
+						<view class="value price-font">{{ memberInfo ? parseFloat(memberInfo.point) : '--' }}</view>
+						<view class="title">{{ $lang('point') }}</view>
+					</view>
+					<view class="solid"></view>
+					<view class="account-item" @click="redirect('/pages_tool/member/coupon')">
+						<view class="value price-font">
+							{{ memberInfo && memberInfo.coupon_num != undefined ? memberInfo.coupon_num : '--' }}
+						</view>
+						<view class="title">{{ $lang('coupon') }}</view>
+					</view>
+				</view>
+<!-- 
+				<view class="super-member"
+					v-if="superMember && (value.style == 1 || value.style == 2 || value.style == 3)"
+					:style="superMemberStyle">
+					<block v-if="value.style == 1 || value.style == 2">
+						<view class="super-info">
+							<text class="icondiy icon-system-huangguan"></text>
+							<text>超级会员</text>
+						</view>
+						<view class="super-text">
+							<text class="see" v-if="memberInfo && memberInfo.member_level_type" @click="redirectBeforeAuth('/pages_tool/member/card')">查看特权</text>
+							<text class="see" v-else @click="redirectBeforeAuth('/pages_tool/member/card_buy')">会员可享更多权益</text>
+							<text class="iconfont icon-right"></text>
+						</view>
+					</block>
+					<block v-if="value.style == 3">
+						<view class="super-info">
+							<image :src="$util.img('public/uniapp/member/open_member.png')" class="title" mode="heightFix" />
+							<view class="desc">开通可享更多权益</view>
+						</view>
+						<view class="super-text">
+							<text class="see" v-if="memberInfo && memberInfo.member_level_type" @click="redirectBeforeAuth('/pages_tool/member/card')">查看特权</text>
+							<text class="see" v-else @click="redirectBeforeAuth('/pages_tool/member/card_buy')">立即开通</text>
+						</view>
+					</block>
+				</view>
+
+				<view class="member-info-style4" v-show="value.style == 4">
+					<view class="super-member" v-if="superMember" :style="superMemberStyle">
+						<view class="super-info">
+							<image :src="$util.img('app/component/view/member_info/img/style_4_vip_huangguan.png')" class="title" mode="widthFix" />
+							<view class="desc">开通可享更多权益</view>
+						</view>
+						<view class="super-text" :class="{ 'more' : memberInfo && memberInfo.member_level_type }">
+							<text class="see" v-if="memberInfo && memberInfo.member_level_type" @click="redirectBeforeAuth('/pages_tool/member/card')">查看更多权益</text>
+							<text class="see" v-else @click="redirectBeforeAuth('/pages_tool/member/card_buy')">立即开通</text>
+						</view>
+					</view>
+					<view class="account-info" :style="{ 'margin-left': parseInt(value.infoMargin) * 2 + 'rpx', 'margin-right': parseInt(value.infoMargin) * 2 + 'rpx' }">
+						<view class="account-item" @click="redirect('/pages_tool/member/balance_detail')">
+							<view class="value price-font">
+								{{ memberInfo ? (parseFloat(memberInfo.balance) + parseFloat(memberInfo.balance_money)).toFixed(2) : '--' }}
+							</view>
+							<view class="title">余额</view>
+						</view>
+						<view class="solid"></view>
+						<view class="account-item" @click="redirect('/pages_tool/member/point_detail')">
+							<view class="value price-font">{{ memberInfo ? parseFloat(memberInfo.point) : '--' }}
+							</view>
+							<view class="title">积分</view>
+						</view>
+						<view class="solid"></view>
+						<view class="account-item" @click="redirect('/pages_tool/member/coupon')">
+							<view class="value price-font">
+								{{ memberInfo && memberInfo.coupon_num != undefined ? memberInfo.coupon_num : '--' }}
+							</view>
+							<view class="title">优惠券</view>
+						</view>
+					</view>
+					<view class="style4-other">
+						<view class="style4-btn-wrap">
+							<view @click="redirect('/pages_tool/recharge/list')" class="recharge-btn">余额充值</view>
+						</view>
+					</view>
+				</view> -->
+			</view>
+
+			<view class="account-info" v-show="value.style == 2" :style="{ 'margin-left': parseInt(value.infoMargin) * 2 + 'rpx', 'margin-right': parseInt(value.infoMargin) * 2 + 'rpx' }">
+				<view class="account-item"  @click="redirect('/pages_tool/member/balance')">
+					<view class="value price-font">{{ memberInfo ? (parseFloat(memberInfo.balance) + parseFloat(memberInfo.balance_money)).toFixed(2) : '--' }}</view>
+					<view class="title">{{ $lang('balance') }}</view>
+				</view>
+				<view class="solid"></view>
+				<view class="account-item" @click="redirect('/pages_tool/member/point_detail')">
+					<view class="value price-font">{{ memberInfo ? parseFloat(memberInfo.point) : '--' }}</view>
+					<view class="title">{{ $lang('point') }}</view>
+				</view>
+				<view class="solid"></view>
+				<view class="account-item" @click="redirect('/pages_tool/member/coupon')">
+					<view class="value price-font">
+						{{ memberInfo && memberInfo.coupon_num != undefined ? memberInfo.coupon_num : '--' }}
+					</view>
+					<view class="title">{{ $lang('coupon') }}</view>
+				</view>
+			</view>
+		</view>
+
+		<!-- 完善会员资料 -->
+		<view @touchmove.prevent.stop class="member-complete-info-popup">
+			<uni-popup ref="completeInfoPopup" type="bottom" :maskClick="false">
+				<view class="complete-info-wrap">
+					<view class="head">
+						<text class="title">获取您的昵称、头像</text>
+						<text class="color-tip tips">获取用户头像、昵称完善个人资料，主要用于向用户提供具有辨识度的用户中心界面</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" />
+					</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" />
+					</view>
+					<!-- #endif -->
+					<button type="default" class="save-btn" @click="saveCompleteInfo" :disabled="isDisabled">保存</button>
+				</view>
+			</uni-popup>
+		</view>
+
+		<ns-login ref="login"></ns-login>
+	</view>
+</template>
+
+<script>
+	let menuButtonInfo = {};
+	// 如果是小程序，获取右上角胶囊的尺寸信息，避免导航栏右侧内容与胶囊重叠(支付宝小程序非本API，尚未兼容)
+	// #ifdef MP-WEIXIN || MP-BAIDU || MP-TOUTIAO || MP-QQ
+	menuButtonInfo = uni.getMenuButtonBoundingClientRect();
+	// #endif
+	// 自定义会员中心——会员信息
+	import nsContact from '@/components/ns-contact/ns-contact.vue';
+	export default {
+		name: 'diy-member-info',
+		props: {
+			value: {
+				type: Object
+			},
+			global: {
+				type: Object,
+				default: () => {
+					return {};
+				}
+			}
+		},
+		components: {
+			nsContact
+		},
+		data() {
+			return {
+				info: null,
+				superMember: null,
+				memberCode: null,
+				avatarUrl: '', // 头像预览
+				headImg: '', // 头像保存
+				nickName: '',
+				completeInfoCallback: null,
+				menuButtonInfo: menuButtonInfo,
+				
+				langList: [],
+				langIndex: 0,
+				ischina:0
+			};
+		},
+		options: {
+			styleIsolation: 'shared'
+		},
+		created() {
+			this.ischina = uni.getStorageSync('shopInfo').ischina
+			this.initLang()
+			this.init(false);
+		},
+		watch: {
+			storeToken(nVal, oVal) {
+				this.init();
+			},
+			// 组件刷新监听
+			componentRefresh: function(nval) {
+				this.init();
+			}
+		},
+		computed: {
+			memberInfoStyle() {
+				let style = {},
+					img = '',
+					backSize = 'contain';
+				if (this.global.navBarSwitch == false) {
+					// #ifdef MP
+					// this.menuButtonInfo.height + this.menuButtonInfo.top ==>是胶囊按钮到顶部的距离，因为后台有可能设置margin.top,所以要减去
+					style['padding-top'] = this.menuButtonInfo.height + this.menuButtonInfo.top - this.value.margin
+						.top + 'px';
+					// #endif
+				}
+				if (this.value.style == 4) {
+					img = this.$util.img('app/component/view/member_info/img/style_4_bg.png');
+					backSize = 'cover';
+				} else if (this.value.style != 3) {
+					img = this.$util.img('public/static/img/diy_view/member_info_bg.png');
+				}
+
+				if (this.value.theme == 'default') {
+					style.background = `url('${img}') no-repeat bottom / ${backSize}, var(--base-color)`;
+				} else {
+					style.background =
+						`url('${img}') no-repeat bottom / ${backSize},linear-gradient(${this.value.gradientAngle}deg, ${this.value.bgColorStart} 0%, ${this.value.bgColorEnd} 100%)`;
+				}
+
+				return this.$util.objToStyle(style);
+			},
+			infoStyle() {
+				let style = {};
+
+				if (this.value.style == 4) {
+
+					if (this.superMember) {
+						style['padding-bottom'] = '276rpx';
+					} else {
+						style['padding-bottom'] = '166rpx';
+					}
+				}
+
+				return this.$util.objToStyle(style);
+			},
+			superMemberStyle() {
+				let style = {
+					'margin-left': parseInt(this.value.infoMargin) * 2 + 'rpx ',
+					'margin-right': parseInt(this.value.infoMargin) * 2 + 'rpx '
+				};
+				if (this.value.style == 3) {
+					style.background = `#292f45 url(` + this.$util.img('public/uniapp/member/supervip_bg.png') + `) no-repeat bottom / 100% 100%`;
+				} else if (this.value.style == 4) {
+					style = {};
+					style.background = `url(` + this.$util.img('app/component/view/member_info/img/super_vip_bg_4.png') + `) no-repeat bottom / contain`;
+				} else {
+					style.background = `url('` + this.$util.img('public/static/img/diy_view/super_member_bg.png') + `') no-repeat bottom / 100% 100%, linear-gradient(107deg, ` + this.themeStyle.super_member.super_member_start_bg + ` 0%, ` + this.themeStyle.super_member.super_member_end_bg + ` 100%)`;
+				}
+				return this.$util.objToStyle(style);
+			},
+			warpCss() {
+				var obj = '';
+				obj += 'background-color:' + this.value.componentBgColor + ';';
+				if (this.value.componentAngle == 'round') {
+					obj += 'border-top-left-radius:' + this.value.topAroundRadius * 2 + 'rpx;';
+					obj += 'border-top-right-radius:' + this.value.topAroundRadius * 2 + 'rpx;';
+					obj += 'border-bottom-left-radius:' + this.value.bottomAroundRadius * 2 + 'rpx;';
+					obj += 'border-bottom-right-radius:' + this.value.bottomAroundRadius * 2 + 'rpx;';
+				}
+				return obj;
+			},
+			isDisabled() {
+				if (this.nickName.length > 0) return false;
+				return true;
+			}
+		},
+		methods: {
+			initLang() {
+				//获取语言列表
+				this.langList = this.$langConfig.list();
+				if (!uni.getStorageSync("lang")) {
+					this.langIndex = 0;
+				} else {
+					for (let i = 0; i < this.langList.length; i++) {
+						if (this.langList[i].value == uni.getStorageSync("lang")) {
+							this.langIndex = i;
+							break;
+						}
+					}
+				}
+			},
+			modifyInfo(){
+				this.$langConfig.change(this.langIndex==1?'zh-cn':'en-us')
+			},
+			// isRefresh 是否刷新会员数据，true：刷新，false：不刷新
+			init(isRefresh = true) {
+				if (isRefresh) {
+					if (this.storeToken) this.getMemberInfo();
+					else this.$store.commit('setMemberInfo', '');
+				} else {
+					if (this.memberInfo) {
+						this.headImg = this.memberInfo.headimg;
+						this.nickName = this.memberInfo.nickname;
+						this.avatarUrl = this.headImg ? this.$util.img(this.headImg) : this.$util
+							.getDefaultImage().head;
+
+						/*
+						小程序用户头像昵称获取规则调整公告
+						https://developers.weixin.qq.com/community/develop/doc/00022c683e8a80b29bed2142b56c01
+						用于处理昵称将统一返回 “微信用户”
+					*/
+						if (this.nickName == '微信用户') {
+							this.openCompleteInfoPop();
+						}
+						this.getCouponNum();
+					}
+				}
+				this.getMemberCardInfo();
+			},
+			/**
+			 * 查询会员信息
+			 */
+			getMemberInfo() {
+				this.$api.sendRequest({
+					url: '/api/member/info',
+					data: {},
+					success: res => {
+						if (res.code == 0) {
+							this.info = res.data;
+
+							this.headImg = this.info.headimg;
+							this.nickName = this.info.nickname;
+							this.avatarUrl = this.headImg ? this.$util.img(this.headImg) : this.$util
+								.getDefaultImage().head;
+
+							/*
+                            	小程序用户头像昵称获取规则调整公告
+                            	https://developers.weixin.qq.com/community/develop/doc/00022c683e8a80b29bed2142b56c01
+                            	用于处理昵称将统一返回 “微信用户”
+							*/
+							if (this.nickName == '微信用户') {
+								this.openCompleteInfoPop();
+							}
+							this.getCouponNum();
+						}
+					}
+				});
+			},
+			/**
+			 * 查询优惠券数量
+			 */
+			getCouponNum() {
+				this.$api.sendRequest({
+					url: '/coupon/api/coupon/num',
+					success: res => {
+						if (res.code == 0) {
+							if (this.info) {
+								// 二次刷新数据
+								this.info.coupon_num = res.data;
+								this.$store.commit('setMemberInfo', this.info);
+							} else {
+								// 第一次赋值
+								this.memberInfo.coupon_num = res.data;
+								this.$forceUpdate();
+								this.$store.commit('setMemberInfo', this.memberInfo);
+							}
+						}
+					}
+				});
+			},
+			/**
+			 * 查询超级会员信息
+			 */
+			getMemberCardInfo() {
+				this.$api.sendRequest({
+					url: '/supermember/api/membercard/firstcard',
+					success: res => {
+						if (res.code == 0 && res.data) {
+							this.superMember = res.data;
+						}
+					}
+				});
+			},
+			/**
+			 * 跳转
+			 * @param {Object} url
+			 */
+			redirect(url) {
+				if (!this.storeToken) {
+					this.$refs.login.open(url);
+				} else {
+					this.$util.redirectTo(url);
+				}
+			},
+			/**
+			 * 显示会员码
+			 */
+			showMemberQrcode() {
+				if (!this.memberInfo.mobile && !this.memberInfo.member_code) {
+					uni.showModal({
+						title: '提示',
+						content: '使用会员码需先绑定手机号，是否绑定手机号？',
+						success: res => {
+							if (res.confirm) {
+								// #ifdef MP-WEIXIN
+								this.$util.redirectTo('/pages_tool/member/info_edit', {
+									action: 'bind_mobile'
+								});
+								// #endif
+								// #ifndef MP-WEIXIN
+								this.$util.redirectTo('/pages_tool/member/info_edit', {
+									action: 'mobile'
+								});
+								// #endif
+							}
+						}
+					});
+					return;
+				}
+				if (this.memberCode) {
+					this.$refs.erWeiPopup.open();
+				}
+				this.$api.sendRequest({
+					url: '/api/member/membereqrcode',
+					data: {
+						page: ''
+					},
+					success: res => {
+						if (res.code == 0) {
+							let time = new Date().getTime();
+							this.memberCode = {
+								barcode: res.bar_code + '?rand=' + time,
+								qrcode: res.data.path + '?rand=' + time,
+								member_code: res.member_code
+							};
+							this.$refs.erWeiPopup.open();
+						}
+					}
+				});
+			},
+			/**
+			 * 关闭会员码
+			 */
+			closeMemberQrcode() {
+				this.$refs.erWeiPopup.close();
+			},
+			/**
+			 * 跳转之前需先进行授权
+			 * @param {Object} url
+			 */
+			redirectBeforeAuth(url) {
+				if (!this.storeToken) {
+					this.$refs.login.open('/pages/member/index');
+					return;
+				}
+
+				// #ifdef MP
+				if ((this.memberInfo.nickname.indexOf('u_') != -1 && this.memberInfo.nickname == this.memberInfo.username) || this.memberInfo.nickname == this.memberInfo.mobile) {
+					this.getWxAuth(() => {
+						this.$util.redirectTo(url);
+					});
+				} else {
+					this.$util.redirectTo(url);
+				}
+				// #endif
+
+				// #ifdef H5
+				if (this.$util.isWeiXin() && ((this.memberInfo.nickname.indexOf('u_') != -1 && this.memberInfo.nickname == this.memberInfo.username) || this.memberInfo.nickname == this.memberInfo.mobile)) {
+					this.getWxAuth();
+				} else {
+					this.$util.redirectTo(url);
+				}
+				// #endif
+			},
+			/**
+			 * 获取微信授权
+			 */
+			getWxAuth(callback) {
+				// #ifdef MP
+				this.openCompleteInfoPop(() => {
+					typeof callback == 'function' && callback();
+				});
+				// #endif
+
+				// #ifdef H5
+				if (this.$util.isWeiXin()) {
+					this.$api.sendRequest({
+						url: '/wechat/api/wechat/authcode',
+						data: {
+							scopes: 'snsapi_userinfo',
+							redirect_url: this.$config.h5Domain + '/pages/member/index'
+						},
+						success: res => {
+							if (res.code >= 0) {
+								location.href = res.data;
+							}
+						}
+					});
+				}
+				// #endif
+			},
+			/**
+			 * 修改昵称
+			 * @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);
+						}
+					}
+				});
+			},
+			openCompleteInfoPop(callback) {
+				this.$refs.completeInfoPopup.open(() => {
+					this.$store.commit('setBottomNavHidden', false); //显示底部导航
+				});
+				this.$store.commit('setBottomNavHidden', true); // 隐藏底部导航
+				this.completeInfoCallback = callback;
+			},
+			saveCompleteInfo() {
+				if (this.nickName.length == 0) {
+					this.$util.showToast({
+						title: '请输入昵称'
+					});
+					return;
+				}
+
+				this.modifyNickname(this.nickName);
+				this.modifyHeadimg(this.headImg);
+				this.$refs.completeInfoPopup.close();
+				this.$store.commit('setBottomNavHidden', false); // 显示底部导航
+				typeof this.completeInfoCallback == 'function' && this.completeInfoCallback();
+			},
+			cancelCompleteInfo() {
+				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: '上传失败'
+								});
+							}
+						})
+					}
+				});
+			},
+			splitFn(str) {
+				return str.replace(/(?=(\d{4})+$)/g, ' ');
+			},
+			// #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
+		}
+	};
+</script>
+<style lang="scss">
+	// 增加超出隐藏，是为样式四进行占位【样式四是有定位部分】，定位部分也可以设置颜色
+	.container {
+		overflow: hidden;
+	}
+
+	.common-wrap {
+		width: 100%;
+		box-sizing: border-box;
+	}
+
+	// 会员信息
+	.member-info {
+		.info-wrap {
+			padding: 44rpx 30rpx;
+			display: flex;
+			align-items: center;
+
+			view {
+				color: var(--btn-text-color);
+			}
+
+			.info {
+				flex: 1;
+				width: 0;
+				padding-right: 20rpx;
+				overflow: hidden;
+			}
+		}
+
+		.headimg {
+			width: 120rpx;
+			height: 120rpx;
+			overflow: hidden;
+			border-radius: 50%;
+			margin-right: 20rpx;
+
+			image {
+				width: 100%;
+			}
+		}
+
+		.nickname {
+			font-weight: bold;
+			white-space: nowrap;
+			margin-bottom: 0;
+			// display: flex;
+			align-items: center;
+			flex-wrap: wrap;
+		}
+
+		.name {
+			overflow: hidden;
+			text-overflow: ellipsis;
+			white-space: nowrap;
+			font-size: 38rpx;
+			font-weight: 600;
+		}
+
+		.mobile {
+			font-size: 26rpx;
+			line-height: 1.5;
+		}
+
+		.desc {
+			font-size: 24rpx;
+		}
+
+		.member-code,
+		.user-info {
+			font-size: 40rpx;
+			margin-left: 20rpx;
+			line-height: 1;
+			color: var(--btn-text-color);
+		}
+		.member-level {
+			font-size: 24rpx;
+			background: none;
+			color: #f7c774 !important;
+			line-height: 40rpx;
+			height: 40rpx;
+			border-radius: 4rpx;
+			// padding: 0 16rpx;
+			// margin-left: 20rpx;
+			// display: flex;
+			align-items: center;
+
+			.icondiy {
+				line-height: 1;
+				font-size: 24rpx;
+				margin-right: 10rpx;
+			}
+
+			&.auth {
+				margin-left: 0;
+			}
+			.level-name{
+				background: #31312d;
+				color: rgb(242, 220, 172) !important;
+				padding: 6rpx 24rpx;
+				border-radius: 50rpx;
+				font-size: 24rpx;
+				font-weight: 500;
+			}
+
+			// .level-name {
+			// 	max-width: 240rpx;
+			// 	xword-break: break-all;
+			// 	text-overflow: ellipsis;
+			// 	overflow: hidden;
+			// 	display: -webkit-box;
+			// 	-webkit-line-clamp: 1;
+			// 	-webkit-box-orient: vertical;
+			// 	white-space: break-spaces;
+			// }
+		}
+
+		.super-member {
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			height: 120rpx;
+			border-top-left-radius: 10rpx;
+			border-top-right-radius: 10rpx;
+			background: linear-gradient(107deg, #7c7878 0%, #201a18 100%);
+			padding: 30rpx 40rpx;
+			box-sizing: border-box;
+
+			.icon-huangguan {
+				margin-right: 10rpx;
+				font-size: 40rpx;
+			}
+
+			.super-info {
+				flex: 1;
+				width: 0;
+				font-size: 36rpx;
+				color: var(--super-member-start-text-color);
+				// background-image: linear-gradient(90deg, var(--super-member-start-text-color) 0%, var(--super-member-end-text-color) 100%);
+				// -webkit-background-clip: text;
+				// -webkit-text-fill-color: transparent;
+				display: flex;
+				align-items: center;
+
+				.icondiy {
+					margin-right: 10rpx;
+				}
+			}
+
+			.see {
+				line-height: 1;
+				font-size: 30rpx;
+			}
+
+			.icon-right {
+				font-size: 28rpx;
+				margin-left: 10rpx;
+			}
+		}
+	}
+
+	.account-info {
+		display: flex;
+		padding: 40rpx 0;
+		align-items: center;
+		justify-content: center;
+
+		view {
+			color: #fff;
+		}
+
+		.solid {
+			height: 70rpx;
+			width: 2rpx;
+			background: #fff;
+			border-radius: 2rpx;
+		}
+
+		.account-item {
+			flex: 1;
+			text-align: center;
+
+			.value {
+				font-size: 34rpx;
+				font-weight: bold !important;
+				margin-bottom: 4rpx;
+				line-height: 1.3;
+			}
+
+			.title {
+				font-size: 26rpx;
+			}
+		}
+	}
+
+	.data-style-1 {
+		.account-info {
+			padding: 20rpx 0;
+		}
+
+		.super-member {
+			height: 100rpx;
+		}
+
+		.super-text {
+			background-image: linear-gradient(90deg, #ffdba6 0%, #ffebca 49%, #f7c774 100%);
+			-webkit-background-clip: text;
+			-webkit-text-fill-color: transparent;
+			display: flex;
+			align-items: center;
+		}
+	}
+
+	.data-style-2 {
+		.member-info {
+			// border-radius: 0 0 100% 100%/0 0 70rpx 70rpx;
+			overflow: hidden;
+
+			.member-level {
+				background: none;
+				.level-name{
+					background: #31312d;
+					color: rgb(242, 220, 172) !important;
+					padding: 6rpx 24rpx;
+					border-radius: 50rpx;
+					font-size: 24rpx;
+					font-weight: 500;
+				}
+			}
+		}
+
+		.account-info {
+			background: #fff;
+			margin: 20rpx 0 0 0;
+			color: #333;
+			border-radius: 18rpx;
+
+			.solid {
+				background: #f2f2f2;
+			}
+
+			.account-item {
+				.value {
+					color: #000000;
+				}
+
+				.title {
+					color: #666666;
+				}
+			}
+		}
+
+		.super-member {
+			color: #8d4b16;
+			background: linear-gradient(107deg, #fadcb5 0%, #f6bd74 100%);
+			border-top-left-radius: 18rpx;
+			border-top-right-radius: 18rpx;
+
+			.super-info {
+				color: var(--super-member-start-text-color);
+				// background-image: linear-gradient(90deg, var(--super-member-start-text-color) 0%, var(--super-member-end-text-color) 100%);
+			}
+
+			.see {
+				color: var(--super-member-start-text-color);
+			}
+
+			.icon-right {
+				color: var(--super-member-start-text-color);
+			}
+		}
+	}
+
+	.data-style-3 {
+		.info-wrap view {
+			color: #282c38;
+		}
+
+		.member-code,
+		.user-info {
+			color: #282c38;
+			font-weight: bold;
+		}
+
+		.member-code {
+			font-size: 36rpx;
+		}
+
+		.super-member {
+			border-radius: 22rpx;
+
+			.super-text {
+				.see {
+					width: 160rpx;
+					height: 56rpx;
+					line-height: 56rpx;
+					background: #e3c377;
+					border-radius: 56rpx;
+					color: #77413e;
+					text-align: center;
+					font-weight: bold;
+					font-size: 24rpx;
+					display: block;
+				}
+			}
+
+			.super-info {
+				flex-direction: column;
+				align-items: normal;
+
+				.title {
+					height: 36rpx;
+					width: auto;
+					margin-bottom: 14rpx;
+				}
+
+				.desc {
+					color: #e3c377;
+					line-height: 1;
+				}
+			}
+		}
+
+		.account-info {
+			.solid {
+				background: none;
+			}
+		}
+
+		.account-item {
+			.value {
+				color: #282c38;
+				font-size: 44rpx;
+			}
+
+			.title {
+				color: #aab0ba;
+			}
+		}
+
+		.member-level {
+			background: none;
+			padding: 0;
+			margin: 0;
+			height: auto;
+			display: flex;
+			align-items: center;
+
+			.level-icon {
+				width: 40rpx;
+				height: auto;
+				will-change: transform;
+			}
+
+			.level-name {
+				height: 36rpx;
+				line-height: 36rpx;
+				padding: 2rpx 20rpx;
+				color: #f2dcac;
+				background: #31312d;
+				font-size: 24rpx;
+				margin-left: 10rpx;
+				border-radius: 36rpx;
+				// border-bottom-left-radius: 0;
+				// border-top-left-radius: 40rpx;
+				// font-weight: bold;
+			}
+		}
+	}
+
+	.data-style-4 {
+		position: relative;
+
+		.info-wrap {
+			padding-bottom: 276rpx;
+			margin-bottom: 226rpx;
+
+			view {
+				color: #282c38;
+			}
+
+			.info {
+				display: flex;
+				flex-direction: column;
+				align-items: baseline;
+
+				.name,
+				.desc {
+					color: #fff;
+				}
+			}
+		}
+
+		.member-code,
+		.user-info {
+			color: #fff;
+			font-weight: bold;
+			font-size: 36rpx;
+		}
+
+		.member-level {
+			background: #474758;
+			padding: 0;
+			margin: 10rpx 0 0;
+			height: auto;
+			border-radius: 10px;
+
+			.level-icon {
+				width: 40rpx;
+				height: auto;
+				vertical-align: middle;
+				will-change: transform;
+			}
+
+			.level-name {
+				padding: 0 20rpx 0 6rpx;
+				color: #ddc095;
+				font-size: 24rpx;
+			}
+		}
+
+		.member-info-style4 {
+			position: absolute;
+			bottom: -226rpx;
+			left: 24rpx;
+			right: 24rpx;
+			padding: 30rpx;
+			background-color: #fff;
+			border-radius: 16rpx;
+
+			.account-info {
+				padding: 50rpx 0;
+
+				.account-item {
+					.value {
+						color: #282c38;
+						font-size: 38rpx;
+					}
+
+					.title {
+						color: #666666;
+						font-size: $font-size-tag;
+					}
+				}
+			}
+
+			.super-member {
+				border-radius: 22rpx;
+				height: 120rpx;
+				line-height: 100rpx;
+				padding: 20rpx;
+
+				.super-info {
+					display: flex;
+					align-items: center;
+
+					.title {
+						width: 80rpx;
+						height: auto;
+						will-change: transform;
+						margin-right: 20rpx;
+					}
+
+					.desc {
+						font-size: 30rpx;
+						color: #333;
+						font-weight: bold;
+					}
+				}
+
+				.super-text {
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					background-color: #333;
+					border-radius: 26rpx;
+					width: 138rpx;
+					height: 52rpx;
+
+					&.more {
+						width: 180rpx;
+					}
+
+					.see {
+						color: #f6dcad;
+						font-size: $font-size-goods-tag;
+					}
+				}
+			}
+
+			.style4-other {
+				display: flex;
+				justify-content: space-between;
+				padding: 0 10rpx;
+
+				.style4-btn-wrap {
+					flex: 1;
+					display: flex;
+
+					.recharge-btn,
+					.kefu-btn {
+						margin: 0;
+						width: 200rpx;
+						height: 80rpx;
+						line-height: 84rpx;
+						border-radius: 44rpx;
+						text-align: center;
+						border: 2rpx solid transparent;
+					}
+
+					.recharge-btn {
+						margin-right: 30rpx;
+						background-color: $base-color;
+						color: #fff;
+					}
+
+					.kefu-btn {
+						color: $base-color;
+						border-color: $base-color;
+					}
+
+					.contact-wrap {
+						flex: 1;
+					}
+				}
+
+				.code {
+					width: 80rpx;
+					height: 80rpx;
+					padding: 20rpx;
+					background-color: $base-color;
+					border-radius: 50%;
+					box-sizing: border-box;
+
+					image {
+						width: 40rpx;
+						height: 40rpx;
+					}
+				}
+			}
+		}
+	}
+
+	.member-code-popup {
+		width: 100%;
+		min-height: 900rpx;
+		background: none;
+
+		.popup-top {
+			padding: 40rpx;
+			box-sizing: border-box;
+			width: 100%;
+			height: 800rpx;
+			background: #ffffff;
+			border-radius: 12rpx;
+
+			.popup-top-title {
+				display: flex;
+				align-items: center;
+				margin-bottom: 60rpx;
+
+				.popup-top-title-txt {
+					font-size: 30rpx;
+					margin-left: 16rpx;
+				}
+			}
+
+			.popup-top-tiao {
+				width: 480rpx;
+				height: 130rpx;
+				overflow: hidden;
+				margin: 0 auto 20rpx;
+
+				image {
+					width: 480rpx;
+					height: 160rpx;
+					max-height: unset !important;
+				}
+			}
+
+			.popup-top-code {
+				text-align: center;
+				color: #000;
+				font-size: 28rpx;
+				margin: 0 auto 20rpx;
+				line-height: 1;
+			}
+
+			.popup-top-tiaoJie {
+				text-align: center;
+				font-size: 28rpx;
+				color: rgb(153, 153, 153);
+				margin-bottom: 40rpx;
+			}
+
+			.popup-top-erwei {
+				width: 254rpx;
+				height: 254rpx;
+				margin: 0 auto 20rpx;
+
+				image {
+					width: 100%;
+					height: 100%;
+				}
+			}
+
+			.popup-top-shauxin {
+				width: 350rpx;
+				height: 80rpx;
+				border-radius: $border-radius;
+				background: rgb(245, 249, 247);
+				margin: 0 auto;
+				font-size: 30rpx;
+				text-align: center;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+
+				.iconfont {
+					margin-left: 20rpx;
+				}
+			}
+
+			.popup-top-text {
+				text-align: center;
+				font-size: 18rpx;
+				color: rgb(153, 153, 153);
+				margin-top: 30rpx;
+			}
+		}
+
+		.popup-bottom {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			background: none !important;
+
+			.iconfont-delete {
+				font-size: 60rpx;
+				margin-top: 20rpx;
+				color: white;
+			}
+		}
+	}
+
+	/deep/ .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+		background: none !important;
+	}
+
+	/deep/ .member-info-style4 .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+		background: #fff !important;
+	}
+
+	.member-code-popup .popup-top {
+		height: auto;
+	}
+
+	.member-complete-info-popup {
+		.complete-info-wrap {
+			background: #fff;
+			padding: 50rpx 40rpx 40rpx;
+			padding-bottom: calc(40rpx + constant(safe-area-inset-bottom));
+			padding-bottom: calc(40rpx + env(safe-area-inset-bottom));
+
+			.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: 20rpx 0;
+
+				.label {
+					font-size: $font-size-toolbar;
+					margin-right: 40rpx;
+				}
+
+				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;
+				}
+
+				input {
+					flex: 1;
+					height: 80rpx;
+					box-sizing: border-box;
+					font-size: $font-size-toolbar;
+				}
+			}
+
+			.save-btn {
+				width: 280rpx;
+				height: 90rpx;
+				line-height: 90rpx;
+				background-color: #07c160;
+				color: #fff;
+				margin: 40rpx auto 20rpx;
+			}
+		}
+	}
+</style>
+<style scoped>
+	.member-complete-info-popup /deep/ .uni-popup__wrapper.bottom,
+	.member-complete-info-popup /deep/ .uni-popup__wrapper.bottom .uni-popup__wrapper-box {
+		border-top-left-radius: 30rpx !important;
+		border-top-right-radius: 30rpx !important;
+	}
+</style>
\ No newline at end of file
diff --git a/components/diy-components/diy-member-my-order.vue b/components/diy-components/diy-member-my-order.vue
new file mode 100644
index 0000000..ea971b5
--- /dev/null
+++ b/components/diy-components/diy-member-my-order.vue
@@ -0,0 +1,249 @@
+<template>
+	<view class="common-wrap" :style="warpCss">
+		<view class="order-wrap">
+			<view class="status-wrap">
+				<view class="item-wrap" @click="redirect('/pages/order/list?status=waitpay')" style="margin-right: 10rpx;">
+					<view class="icon-block">
+						<template v-if="value.style == 3">
+							<image :src="$util.img('public/uniapp/member/order/wait_pay.png')" mode="widthFix"/>
+							<view class="icon-shade" :style="'-webkit-mask-image: url(' + $util.img('public/uniapp/member/order/wait_pay_shade.png') + ')'"></view>
+						</template>
+						<template v-else>
+							<diy-icon :icon="value.icon.waitPay.icon" v-if="value.icon.waitPay" :value="value.icon.waitPay.style ? value.icon.waitPay.style : null"></diy-icon>
+						</template>
+						<text v-if="orderNum.waitpay > 0" class="order-num color-base-bg price-font">{{ orderNum.waitpay > 99 ? '99+' : orderNum.waitpay }}</text>
+					</view>
+					<view class="title">{{ $lang('waitpay') }}</view>
+				</view>
+				<view class="item-wrap" @click="redirect('/pages/order/list?status=waitsend')" style="margin-right: 10rpx;">
+					<view class="icon-block">
+						<template v-if="value.style == 3">
+							<image :src="$util.img('public/uniapp/member/order/wait_send.png')" mode="widthFix"></image>
+							<view class="icon-shade" :style="'-webkit-mask-image: url(' + $util.img('public/uniapp/member/order/wait_send_shade.png') + ')'"></view>
+						</template>
+						<template v-else>
+							<diy-icon :icon="value.icon.waitSend.icon" v-if="value.icon.waitSend" :value="value.icon.waitSend.style ? value.icon.waitSend.style : null"></diy-icon>
+						</template>
+						<text v-if="orderNum.waitsend > 0" class="order-num color-base-bg price-font">{{ orderNum.waitsend > 99 ? '99+' : orderNum.waitsend }}</text>
+					</view>
+					<view class="title">{{ $lang('waitsend') }}</view>
+				</view>
+				<view class="item-wrap" @click="redirect('/pages/order/list?status=waitconfirm')" style="margin-right: 10rpx;">
+					<view class="icon-block">
+						<template v-if="value.style == 3">
+							<image :src="$util.img('public/uniapp/member/order/wait_confirm.png')" mode="widthFix"/>
+							<view class="icon-shade" :style="'-webkit-mask-image: url(' + $util.img('public/uniapp/member/order/wait_confirm_shade.png') + ')'"></view>
+						</template>
+						<template v-else>
+							<diy-icon :icon="value.icon.waitConfirm.icon" v-if="value.icon.waitConfirm" :value="value.icon.waitConfirm.style ? value.icon.waitConfirm.style : null"></diy-icon>
+						</template>
+						<text v-if="orderNum.waitconfirm > 0" class="order-num color-base-bg price-font">{{ orderNum.waitconfirm > 99 ? '99+' : orderNum.waitconfirm }}</text>
+					</view>
+					<view class="title">{{ $lang('waitconfirm') }}</view>
+				</view>
+				<view class="item-wrap" @click="redirect('/pages/order/list?status=waitrate')" style="margin-right: 10rpx;">
+					<view class="icon-block">
+						<template v-if="value.style == 3">
+							<image :src="$util.img('public/uniapp/member/order/wait_use.png')" mode="widthFix"/>
+							<view class="icon-shade" :style="'-webkit-mask-image: url(' + $util.img('public/uniapp/member/order/wait_rate_shade.png') + ')'"></view>
+						</template>
+						<template v-else> 
+							<diy-icon :icon="value.icon.waitUse.icon" v-if="value.icon.waitUse" :value="value.icon.waitUse.style ? value.icon.waitUse.style : null"></diy-icon>
+						</template>
+						<!-- <text v-if="orderNum.wait_use > 0" class="order-num color-base-bg price-font">{{ orderNum.wait_use > 99 ? '99+' : orderNum.wait_use }}</text> -->
+					</view>
+					<view class="title">{{ $lang('completed') }}</view>
+				</view>
+				<view class="item-wrap" @click="redirect('/pages_tool/order/activist')">
+					<view class="icon-block">
+						<template v-if="value.style == 3">
+							<image :src="$util.img('public/uniapp/member/order/refunding.png')" mode="widthFix"/>
+							<view class="icon-shade" :style="'-webkit-mask-image: url(' + $util.img('public/uniapp/member/order/refunding_shade.png') + ')'"></view>
+						</template>
+						<template v-else>
+							<diy-icon :icon="value.icon.refunding.icon" v-if="value.icon.refunding" :value="value.icon.refunding.style ? value.icon.refunding.style : null"></diy-icon>
+						</template>
+						<text v-if="orderNum.refunding > 0" class="order-num color-base-bg price-font">{{ orderNum.refunding > 99 ? '99+' : orderNum.refunding }}</text>
+					</view>
+					<view class="title">{{ $lang('activist') }}</view>
+				</view>
+			</view>
+		</view>
+		<ns-login ref="login"></ns-login>
+	</view>
+</template>
+
+<script>
+	// 自定义会员中心——我的订单
+	export default {
+		name: 'diy-member-my-order',
+		props: {
+			value: {
+				type: Object
+			}
+		},
+		data() {
+			return {
+				orderNum: {
+					waitpay: 0,
+					waitsend: 0,
+					waitconfirm: 0,
+					refunding: 0,
+					wait_use: 0,
+					waitrate: 0
+				}
+			};
+		},
+		created() {
+			this.init();
+		},
+		watch: {
+			storeToken(nVal, oVal) {
+				this.init();
+			},
+			// 组件刷新监听
+			componentRefresh: function(nval) {
+				this.init();
+			}
+		},
+		computed: {
+			warpCss() {
+				var obj = '';
+				obj += 'background-color:' + this.value.componentBgColor + ';';
+				if (this.value.componentAngle == 'round') {
+					obj += 'border-top-left-radius:' + this.value.topAroundRadius * 2 + 'rpx;';
+					obj += 'border-top-right-radius:' + this.value.topAroundRadius * 2 + 'rpx;';
+					obj += 'border-bottom-left-radius:' + this.value.bottomAroundRadius * 2 + 'rpx;';
+					obj += 'border-bottom-right-radius:' + this.value.bottomAroundRadius * 2 + 'rpx;';
+				}
+				return obj;
+			}
+		},
+		methods: {
+			init() {
+				if (this.storeToken) {
+					this.getOrderNum();
+				} else {
+					this.orderNum = {
+						waitpay: 0,
+						waitsend: 0,
+						waitconfirm: 0,
+						refunding: 0,
+						wait_use: 0,
+						waitrate: 0
+					};
+				}
+			},
+			/**
+			 * 获取订单数量
+			 */
+			getOrderNum() {
+				this.$api.sendRequest({
+					url: '/api/order/num',
+					data: {
+						order_status: 'waitpay,waitsend,waitconfirm,refunding,wait_use,waitrate'
+					},
+					success: res => {
+						if (res.code == 0) {
+							this.orderNum = res.data;
+						} else {
+							this.orderNum = {
+								waitpay: 0,
+								waitsend: 0,
+								waitconfirm: 0,
+								refunding: 0,
+								wait_use: 0,
+								waitrate: 0
+							};
+						}
+					}
+				});
+			},
+			/**
+			 * 跳转
+			 * @param {Object} url
+			 */
+			redirect(url) {
+				if (this.storeToken) {
+					this.$util.redirectTo(url);
+				} else {
+					this.$refs.login.open(url);
+				}
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	.common-wrap {
+		width: 100%;
+		box-sizing: border-box;
+	}
+
+	.order-wrap {
+		.status-wrap {
+			display: flex;
+			padding: 30rpx 0;
+			align-items: center;
+			justify-content: center;
+			color: #333;
+		}
+
+		.item-wrap {
+			flex: 1;
+			text-align: center;
+			background: #f6f7f9;
+			padding: 20rpx 0;
+			.icon-block {
+				width: 60rpx;
+				height: 60rpx;
+				font-size: 60rpx;
+				margin: 4rpx auto;
+				position: relative;
+
+				&>image {
+					position: absolute;
+					top: 5%;
+					right: 5%;
+					width: 90%;
+					height: 90%;
+					z-index: 5;
+				}
+
+				.icon-shade {
+					width: 90%;
+					height: 90%;
+					position: absolute;
+					z-index: 4;
+					top: 5%;
+					right: 5%;
+					background: $base-color;
+					-webkit-mask: no-repeat center / contain;
+				}
+			}
+
+			.order-num {
+				position: absolute;
+				top: 0;
+				right: 0;
+				transform: translate(50%, -50%);
+				box-sizing: border-box;
+				color: #ffffff;
+				line-height: 1.2;
+				text-align: center;
+				font-size: 24rpx;
+				padding: 0 6rpx;
+				min-width: 30rpx;
+				border-radius: 16rpx;
+				height: 30rpx;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+			}
+
+			.title {
+				font-size: 26rpx;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/components/diy-components/diy-merch-list.vue b/components/diy-components/diy-merch-list.vue
new file mode 100644
index 0000000..aa6ed96
--- /dev/null
+++ b/components/diy-components/diy-merch-list.vue
@@ -0,0 +1,350 @@
+<template>
+	<view>
+		<x-skeleton type="list" :loading="loading" :configs="skeletonConfig" v-if="value.ornament.type == 'default'">
+			<view class="merch-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" :style="itemCss" @click="toDetail(item)">
+						<view class="merch-img">
+							<image class="cover-img" :src="$util.img(item.merch_image)" mode="widthFix" @error="imgError(index)" />
+						</view> 
+						<view class="info-wrap">
+							<text class="title">{{ item.merch_name }}</text>
+							<text class="desc">{{ item.desc }}</text>
+							<view class="read-wrap"></view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</x-skeleton>
+		<view v-else :style="warpCss">
+			<scroll-view :scroll-x="true" :class="['merch-nav', 'singleSlide' ]">
+				<!-- #ifdef MP -->
+				<view class="uni-scroll-view-content">
+					<!-- #endif -->
+			
+					<view class="merch-nav-item graphic" v-for="(item, index) in list" :key="index" :style="{ width: 100 / 4 + '%' }" @click="toDetail(item)">
+					   <view class="graphic-img" v-if="value.mode != 'text'" :style="{ fontSize: value.imageSize * 2 + 'rpx', width: value.imageSize * 2 + 'rpx', height: value.imageSize * 2 + 'rpx' }">
+						   <image
+								:src="$util.img(item.merch_image) || $util.img('public/uniapp/default_img/goods.png')"
+								mode="aspectFill"
+								:show-menu-by-longpress="true"
+								style="max-width: 80rpx; max-height: 80rpx; border-radius: 50rpx;"
+							/>
+						</view>
+						<text class="graphic-text" style="font-size: 28rpx; font-weight: normal; color: rgb(48, 49, 51);">
+							{{ item.merch_name }}
+						</text>
+					</view>
+			
+					<!-- #ifdef MP -->
+				</view>
+				<!-- #endif -->
+			</scroll-view>
+		</view>
+	</view>
+</template>
+
+<script>
+	// 文章
+	export default {
+		name: 'diy-article',
+		props: {
+			value: {
+				type: Object
+			}
+		},
+		data() {
+			return {
+				list: [
+					/*{
+						merch_name:'品牌',
+						merch_image:'http://saas.cn//upload/4/common/images/20240824/20240824040223172448654356147.jpg'
+					},
+					{
+						merch_name:'品牌',
+						merch_image:'http://saas.cn//upload/4/common/images/20240824/20240824040223172448654356147.jpg'
+					},
+					{
+						merch_name:'品牌',
+						merch_image:'http://saas.cn//upload/4/common/images/20240824/20240824040223172448654356147.jpg'
+					},
+					{
+						merch_name:'品牌',
+						merch_image:'http://saas.cn//upload/4/common/images/20240824/20240824040223172448654356147.jpg'
+					},
+					{
+						merch_name:'品牌',
+						merch_image:'http://saas.cn//upload/4/common/images/20240824/20240824040223172448654356147.jpg'
+					},
+					{
+						merch_name:'品牌',
+						merch_image:'http://saas.cn//upload/4/common/images/20240824/20240824040223172448654356147.jpg'
+					},
+					{
+						merch_name:'品牌',
+						merch_image:'http://saas.cn//upload/4/common/images/20240824/20240824040223172448654356147.jpg'
+					}*/
+				],
+				loading: true,
+				skeletonConfig: {
+					gridRows: 1,
+					gridRowsGap: '40rpx',
+					headWidth: '160rpx',
+					headHeight: '160rpx',
+					textRows: 2
+				}
+			};
+		},
+		created() {
+			this.getList();
+		},
+		watch: {
+			// 组件刷新监听
+			componentRefresh: function (nval) {
+				this.getList();
+			}
+		},
+		computed: {
+			warpCss() {
+				var obj = '';
+				obj += 'background-color:' + this.value.componentBgColor + ';';
+				if (this.value.componentAngle == 'round') {
+					obj += 'border-top-left-radius:' + this.value.topAroundRadius * 2 + 'rpx;';
+					obj += 'border-top-right-radius:' + this.value.topAroundRadius * 2 + 'rpx;';
+					obj += 'border-bottom-left-radius:' + this.value.bottomAroundRadius * 2 + 'rpx;';
+					obj += 'border-bottom-right-radius:' + this.value.bottomAroundRadius * 2 + 'rpx;';
+				}
+				console.log(obj)
+				return obj;
+			},
+			// 子项样式
+			itemCss() {
+				var obj = '';
+				obj += 'background-color:' + this.value.elementBgColor + ';';
+				if (this.value.elementAngle == 'round') {
+					obj += 'border-top-left-radius:' + this.value.topElementAroundRadius * 2 + 'rpx;';
+					obj += 'border-top-right-radius:' + this.value.topElementAroundRadius * 2 + 'rpx;';
+					obj += 'border-bottom-left-radius:' + this.value.bottomElementAroundRadius * 2 + 'rpx;';
+					obj += 'border-bottom-right-radius:' + this.value.bottomElementAroundRadius * 2 + 'rpx;';
+				}
+				if (this.value.ornament.type == 'shadow') {
+					obj += 'box-shadow:' + '0 0 10rpx ' + this.value.ornament.color;
+				}
+				if (this.value.ornament.type == 'stroke') {
+					obj += 'border:' + '2rpx solid ' + this.value.ornament.color;
+				}
+				return obj;
+			}
+		},
+		methods: {
+			getList() {
+				console.log(121)
+				var data = {
+					num: this.value.count
+				};
+				console.log(this.value)
+				if (this.value.sources == 'diy') {
+					data.num = 0;
+					data.merch_id_arr = this.value.merchIds.toString();
+				}
+
+				this.$api.sendRequest({
+					url: '/merch/api/merch/lists',
+					data: data,
+					success: res => {
+						if (res.code == 0 && res.data) {
+							let data = res.data;
+							this.list = data;
+						}
+						this.loading = false;
+					}
+				});
+			},
+			toDetail(item) {
+				this.$util.redirectTo('/pages_promotion/merch/detail', {
+					merch_id: item.merch_id
+				});
+			},
+			imgError(index) {
+				if (this.list[index]) this.list[index].merch_image = this.$util.getDefaultImage().article;
+			}
+		}
+	};
+</script>
+<style>
+	/* 单行滑动 */
+	.merch-nav.singleSlide>>>.uni-scroll-view-content {
+	    display: flex;
+	}
+</style>
+<style lang="scss">
+	
+	.merch-nav {
+	    padding: 16rpx;
+	    box-sizing: border-box;
+	
+	    &.singleSlide {
+	        .merch-nav-item {
+	            flex-shrink: 0;
+	        }
+	    }
+	
+	    &.pageSlide {
+	        position: relative;
+	
+	        .merch-nav-wrap {
+	            display: flex;
+	            flex-wrap: wrap;
+	            width: 100%;
+	            height: 100%;
+	        }
+	    }
+	
+	    .merch-nav-item {
+	        display: flex;
+	        flex-direction: column;
+	        align-items: center;
+	        padding: 14rpx 0;
+	        box-sizing: border-box;
+	
+	        .graphic-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 {
+	
+	            .graphic-text {
+	                padding-top: 0;
+	            }
+	        }
+	
+	        .graphic-img {
+	            position: relative;
+	            display: flex;
+	            align-items: center;
+	            justify-content: center;
+	            width: 100rpx;
+	            height: 100rpx;
+	            font-size: 24rpx;
+	
+	            .tag {
+	                position: absolute;
+	                top: -10rpx;
+	                right: -24rpx;
+	                color: #fff;
+	                border-radius: 24rpx;
+	                border-bottom-left-radius: 0;
+	                transform: scale(0.8);
+	                padding: 8rpx 16rpx;
+	                line-height: 1;
+	                font-size: 24rpx;
+	            }
+	
+	            .icon {
+	                font-size: 50rpx;
+	                color: $color-sub;
+	            }
+	        }
+	    }
+	}
+	.merch-wrap {
+		.list-wrap {
+			&.style-1 {
+				.item {
+					display: flex;
+					padding: 20rpx;
+					margin-top: 24rpx;
+
+					&:first-of-type {
+						margin-top: 0;
+					}
+
+					.merch-img {
+						margin-right: 20rpx;
+						width: 160rpx;
+						height: 160rpx;
+						overflow: hidden;
+						display: flex;
+						align-items: center;
+						justify-content: center;
+
+						image {
+							width: 100%;
+						}
+					}
+
+					.info-wrap {
+						// flex: 1;
+						// display: flex;
+						// flex-direction: column;
+						// justify-content: space-between;
+						.desc{
+							color:#888
+						}
+						.title {
+							font-weight: bold;
+							// margin-bottom: 10rpx;
+							overflow: hidden;
+							text-overflow: ellipsis;
+							display: -webkit-box;
+							-webkit-line-clamp: 2;
+							-webkit-box-orient: vertical;
+							font-size: 30rpx;
+							line-height: 1.5;
+						}
+
+						.abstract {
+							overflow: hidden;
+							text-overflow: ellipsis;
+							display: -webkit-box;
+							-webkit-line-clamp: 2;
+							-webkit-box-orient: vertical;
+							font-size: $font-size-tag;
+						}
+
+						.read-wrap {
+							display: flex;
+							color: #999ca7;
+							justify-content: flex-start;
+							align-items: center;
+							margin-top: 10rpx;
+							line-height: 1;
+
+							text {
+								font-size: $font-size-tag;
+							}
+
+							.iconfont {
+								font-size: 36rpx;
+								vertical-align: bottom;
+								margin-right: 10rpx;
+							}
+
+							.category-icon {
+								width: 8rpx;
+								height: 8rpx;
+								border-radius: 50%;
+								background: $base-color;
+								margin-right: 10rpx;
+							}
+
+							.date {
+								margin-left: 20rpx;
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/components/diy-components/diy-notes.vue b/components/diy-components/diy-notes.vue
new file mode 100644
index 0000000..d28244e
--- /dev/null
+++ b/components/diy-components/diy-notes.vue
@@ -0,0 +1,351 @@
+<template>
+	<x-skeleton type="list" :loading="loading" :configs="skeletonConfig">
+		<view class="diy-notes" :style="{ backgroundColor: value.componentBgColor }">
+			<view class="diy-notes-top">
+				<view class="notes-title" :style="{ color: value.titleTextColor }">{{ value.title }}</view>
+				<view class="notes-more" @click="toMore()" :style="{ color: value.moreTextColor }">{{ value.more }}</view>
+			</view>
+
+			<scroll-view class="diy-notes-box" scroll-x="true" show-scrollbar="true">
+				<view class="notes-box-item" v-for="(item, i) in dataList" :key="i" @click="toDetail(item.note_id)"
+					:style="notesItemStyle">
+					<view class="notes-item" v-if="item.status == 1">
+						<view class="notes-item-con">
+							<view class="notes-title">{{ item.note_title }}</view>
+							<view class="notes-highlights-list" v-if="value.notesLabel == 1 && item.goods_highlights">
+								<text class="color-base-bg" v-for="(labelItem, labelIndex) in item.label" :key="labelIndex">{{ labelItem }}</text>
+							</view>
+							<view class="notes-intro">
+								<text class="notes-label color-base-text">#{{ item.note_type == 'goods_item' ? '单品介绍' : '掌柜说' }}#</text>
+								{{ item.note_abstract }}
+							</view>
+						</view>
+
+						<view class="notes-img-wrap" :class="{ 'notes-img-wrap-list': item.cover_type == 1 }">
+							<image v-if="item.cover_type == 0" :src="$util.img(item.img)" @error="imageError(i)" mode="aspectFill" class="notes-item-image"/>
+							<image v-else v-for="(imgItem, imgIndex) in item.img" :key="imgIndex" :src="$util.img(imgItem)" @error="imageError(i)" mode="aspectFit" class="notes-item-image-li"/>
+						</view>
+
+						<view class="notes-item-con">
+							<view class="notes-info" v-if="(value.readNum == 1 && item.is_show_read_num == 1) || (value.uploadTime == 1 && item.is_show_release_time == 1)">
+								<view class="notes-num">
+									<text v-show="value.uploadTime == 1 && item.is_show_release_time == 1">{{ item.update_time_day }}</text>
+								</view>
+								<view class="notes-num">
+									<text v-show="value.readNum == 1 && item.is_show_read_num == 1">阅读 {{ item.initial_read_num + item.read_num }}</text>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</scroll-view>
+
+			<ns-login ref="login"></ns-login>
+		</view>
+	</x-skeleton>
+</template>
+
+<script>
+	export default {
+		name: 'diy-notes',
+		props: {
+			value: {
+				type: Object
+			}
+		},
+		data() {
+			return {
+				loading: true,
+				skeletonConfig: {
+					itemDirection: 'column',
+					headWidth: '100%',
+					headHeight: '320rpx',
+					textRows: 2,
+					textWidth: ['100%', '80%']
+				},
+				dataList: [],
+				giveLikeFlag: false
+			};
+		},
+		created() {
+			this.getDataList();
+		},
+		watch: {
+			// 组件刷新监听
+			componentRefresh: function(nval) {
+				this.getDataList();
+			}
+		},
+		computed: {
+			notesItemStyle() {
+				var css = '';
+				css += 'background-color:' + this.value.contentBgColor + ';';
+				if (this.value.elementAngle == 'round') {
+					css += 'border-top-left-radius:' + this.value.topElementAroundRadius * 2 + 'rpx;';
+					css += 'border-top-right-radius:' + this.value.topElementAroundRadius * 2 + 'rpx;';
+					css += 'border-bottom-left-radius:' + this.value.bottomElementAroundRadius * 2 + 'rpx;';
+					css += 'border-bottom-right-radius:' + this.value.bottomElementAroundRadius * 2 + 'rpx;';
+				}
+				return css;
+			}
+		},
+		methods: {
+			refresh() {
+				this.getDataList();
+			},
+			getDataList() {
+				var data = {
+					num: this.value.count
+				};
+
+				if (this.value.sources == 'diy') {
+					data.num = 0;
+					data.note_id_arr = this.value.noteId.toString();
+				}
+
+				this.$api.sendRequest({
+					url: '/notes/api/notes/lists',
+					data: data,
+					success: res => {
+						var data = res.data;
+						this.dataList = [];
+						if (data) {
+							for (var i = 0; i < data.length; i++) {
+								var item = {};
+								item = data[i];
+								if (data[i].cover_type == 1) {
+									item.img = data[i].cover_img.split(',');
+								} else {
+									item.img = data[i].cover_img;
+								}
+
+								if (data[i].upload_time) {
+									item.update_time_day = this.$util.timeStampTurnTime(data[i].upload_time)
+										.split(' ')[0];
+								} else {
+									item.update_time_day = this.$util.timeStampTurnTime(data[i].create_time)
+										.split(' ')[0];
+								}
+
+								item.label = data[i].goods_highlights.split(',');
+								this.dataList.push(item);
+							}
+						}
+						this.loading = false;
+					}
+				});
+			},
+			toMore() {
+				this.$util.redirectTo('/pages_tool/store_notes/note_list');
+			},
+			toDetail(id) {
+				this.$util.redirectTo('/pages_tool/store_notes/note_detail', {
+					note_id: id
+				});
+			},
+			/* 点赞 */
+			giveLike(noteId, index) {
+				if (!this.storeToken) {
+					this.$refs.login.open('/pages/index/index');
+					return;
+				}
+
+				if (this.giveLikeFlag) return false;
+				this.giveLikeFlag = true;
+
+				var url = this.dataList[index].is_dianzan == 1 ? '/notes/api/record/delete' : '/notes/api/record/add';
+				this.$api.sendRequest({
+					url: url,
+					data: {
+						note_id: noteId
+					},
+					success: res => {
+						this.giveLikeFlag = false;
+						if (res.code == 0 && res.data > 0) {
+							if (this.noteType != 'goods_item')
+								this.dataList[index].dianzan_num = this.dataList[index].is_dianzan == 1 ? this.dataList[index].dianzan_num - 1 : this.dataList[index].dianzan_num + 1;
+							else {
+								this.dataList[index].dianzan_num = this.dataList[index].is_dianzan == 1 ? this.dataList[index].dianzan_num - 1 : this.dataList[index].dianzan_num + 1;
+							}
+							this.dataList[index].is_dianzan = this.dataList[index].is_dianzan == 1 ? 0 : 1;
+						} else {
+							this.$util.showToast({
+								title: res.message
+							});
+						}
+					}
+				});
+			},
+			imageError(index) {
+				this.dataList[index].img = this.$util.getDefaultImage().goods;
+				this.$forceUpdate();
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	scroll-view ::-webkit-scrollbar {
+		width: 0;
+		height: 0;
+		background-color: transparent;
+		touch-action: none;
+	}
+
+	.diy-notes {
+		width: 100%;
+		box-sizing: border-box;
+	}
+
+	.diy-notes-top {
+		width: 100%;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		box-sizing: border-box;
+
+		.notes-title {
+			width: 70%;
+			font-size: 28rpx;
+			font-weight: 600;
+		}
+
+		.notes-more {
+			font-size: $font-size-tag;
+			color: #858585;
+		}
+
+		.notes-more::after {
+			font-family: 'iconfont';
+			content: '\e6a3';
+			font-size: $font-size-tag;
+			line-height: 1;
+			position: relative;
+			margin-left: 4rpx;
+		}
+	}
+
+	.diy-notes-box {
+		width: 100%;
+		padding: 30rpx 0 20rpx;
+	}
+
+	.notes-box-item {
+		width: calc(100% - 8rpx);
+		margin: 0 auto;
+		height: 100%;
+		margin-bottom: 30rpx;
+		border-radius: 10rpx;
+		overflow: hidden;
+		-moz-box-shadow: 0 0 20rpx rgba(0, 0, 0, 0.02);
+		-webkit-box-shadow: 0 0 20rpx rgba(0, 0, 0, 0.02);
+		box-shadow: 0 0 20rpx rgba(0, 0, 0, 0.02);
+
+		.notes-item {
+			width: 100%;
+			height: 100%;
+			padding: 20rpx;
+			box-sizing: border-box;
+		}
+
+		.notes-img-wrap {
+			position: relative;
+			height: 300rpx;
+
+			.notes-item-image {
+				width: 100%;
+				height: 300rpx;
+				object-fit: cover;
+			}
+
+			.notes-label {
+				display: inline-block;
+				position: absolute;
+				left: 20rpx;
+				bottom: 20rpx;
+				max-width: calc(100vh - 40rpx);
+				background-color: #ffffff;
+				line-height: 36rpx;
+				padding: 0 10rpx 0 4rpx;
+			}
+		}
+
+		.notes-img-wrap-list {
+			display: flex;
+			justify-content: space-between;
+			flex-wrap: wrap;
+			height: auto;
+
+			image {
+				width: calc((100% - 40rpx) / 3);
+				height: 210rpx;
+				margin-top: 20rpx;
+
+				&:nth-child(-n + 3) {
+					margin-top: 0;
+				}
+			}
+
+			&:after {
+				content: '';
+				width: calc((100% - 40rpx) / 3);
+			}
+		}
+
+		.notes-item-con {
+			.notes-title {
+				font-size: 30rpx;
+				font-weight: 600;
+				line-height: 44rpx;
+				display: -webkit-box;
+				-webkit-box-orient: vertical;
+				-webkit-line-clamp: 2;
+				overflow: hidden;
+			}
+
+			.notes-highlights-list {
+				text {
+					display: inline-block;
+					color: #ffffff;
+					font-size: 24rpx;
+					line-height: 36rpx;
+					padding: 0 10rpx;
+					border-radius: 4rpx;
+					margin: 0 5rpx;
+				}
+			}
+
+			.notes-intro {
+				margin: 4rpx 0 8rpx;
+				line-height: 40rpx;
+				overflow: hidden;
+
+				text {
+					float: left;
+					margin-right: 16rpx;
+				}
+			}
+
+			.notes-info {
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				margin-top: 20rpx;
+
+				.notes-num {
+					>text {
+						display: flex;
+						align-items: center;
+						font-size: $font-size-tag;
+						color: #969799;
+
+						text.iconfont {
+							font-size: 26rpx;
+							margin-right: 6rpx;
+						}
+					}
+				}
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/components/diy-components/diy-notice.vue b/components/diy-components/diy-notice.vue
new file mode 100644
index 0000000..fe1039b
--- /dev/null
+++ b/components/diy-components/diy-notice.vue
@@ -0,0 +1,300 @@
+<template>
+	<view class="diy-notice">
+		<view :class="['notice', value.contentStyle]" :style="noticeWrapCss">
+			
+			<image v-if="value.iconType == 'img'" class="notice-img" :src="$util.img(value.imageUrl)" mode="heightFix"/>
+			<diy-icon v-if="value.iconType == 'icon'" :icon="value.icon" :value="value.style ? value.style : 'null'" :style="{ maxWidth: 30 * 2 + 'rpx', maxHeight: 30 * 2 + 'rpx', width: '100%', height: '100%' }"></diy-icon>
+			<view class="notice-xian"></view>
+			<view class="main-wrap">
+				<!-- 横向滚动 -->
+				<view class="horizontal-wrap" v-if="value.scrollWay == 'horizontal'">
+					<view class="marquee-wrap">
+						<view class="marquee" :style="marqueeStyle">
+							<text v-for="(item, index) in list" :key="index" :style="{ color: value.textColor, fontSize: value.fontSize * 2 + 'rpx', fontWeight: value.fontWeight }">{{ item.title }}</text>
+						</view>
+						<view class="marquee" :style="marqueeAgainStyle">
+							<text v-for="(item, index) in list" :key="index" :style="{ color: value.textColor, fontSize: value.fontSize * 2 + 'rpx', fontWeight: value.fontWeight }">{{ item.title }}</text>
+						</view>
+					</view>
+				</view>
+
+				<!-- 上下滚动 -->
+				<template v-if="value.scrollWay == 'upDown'">
+					<swiper :vertical="true" :duration="500" autoplay="true" circular="true">
+						<swiper-item v-for="(item, index) in list" :key="index" @touchmove.prevent.stop>
+							<text class="beyond-hiding using-hidden" :style="{ color: value.textColor, fontSize: value.fontSize * 2 + 'rpx', fontWeight: value.fontWeight }">
+								{{ item.title }}
+							</text>
+						</swiper-item>
+					</swiper>
+				</template>
+			</view>
+		</view>
+
+		<view @touchmove.prevent.stop>
+			<uni-popup ref="noticePopup" type="center">
+				<view class="notice-popup">
+					<view class="head-wrap" @click="closeNoticePopup">
+						<text>公告</text>
+						<text class="iconfont icon-close"></text>
+					</view>
+					<view class="content-wrap">{{ notice }}</view>
+					<button type="primary" @click="closeNoticePopup">我知道了</button>
+				</view>
+			</uni-popup>
+		</view>
+	</view>
+</template>
+<script>
+	// 公告
+	export default {
+		name: 'diy-notice',
+		props: {
+			value: {
+				type: Object
+			}
+		},
+		data() {
+			return {
+				list: [],
+				notice: '', // 当前点击的弹框内容
+				marqueeWrapWidth: 0, // 容器宽度
+				marqueeWidth: 0, // 公告内容累加宽度
+				marqueeStyle: '', // 横向滚动样式
+				marqueeAgainStyle: '', // 横向滚动复制样式
+				time: 0, // 滚动完成时间
+				delayTime: 1000 // 动画延迟时间
+			};
+		},
+		watch: {
+			// 组件刷新监听
+			componentRefresh: function(nval) {
+				if (this.value.sources == 'initial') this.getData();
+			}
+		},
+		created() {},
+		mounted() {
+			// 数据源：公告系统
+			if (this.value.sources == 'initial') {
+				this.getData();
+			} else {
+				this.list = this.value.list;
+				this.bindCrossSlipEvent();
+			}
+		},
+		computed: {
+			noticeWrapCss: function() {
+				var obj = '';
+				obj += 'background-color:' + this.value.componentBgColor + ';';
+				if (this.value.componentAngle == 'round') {
+					obj += 'border-top-left-radius:' + this.value.topAroundRadius * 2 + 'rpx;';
+					obj += 'border-top-right-radius:' + this.value.topAroundRadius * 2 + 'rpx;';
+					obj += 'border-bottom-left-radius:' + this.value.bottomAroundRadius * 2 + 'rpx;';
+					obj += 'border-bottom-right-radius:' + this.value.bottomAroundRadius * 2 + 'rpx;';
+				}
+				return obj;
+			}
+		},
+		methods: {
+			getData() {
+				var data = {
+					page_size: 0
+				};
+
+				if (this.value.sources == 'initial') {
+					data.page_size = this.value.count;
+				}
+
+				if (this.value.noticeIds.length) {
+					data.id_arr = this.value.noticeIds.toString();
+					data.page_size = 0;
+				}
+				this.$api.sendRequest({
+					url: '/api/notice/page',
+					data: data,
+					success: res => {
+						if (res.code == 0 && res.data) {
+							this.list = res.data.list;
+							this.bindCrossSlipEvent();
+						}
+					}
+				});
+			},
+			toLink(item) {
+				if (this.value.sources == 'initial') {
+					this.$util.redirectTo('/pages_tool/notice/detail', {
+						notice_id: item.id
+					});
+				} else if (!item) {
+					this.$util.redirectTo('/pages_tool/notice/list');
+				} else if (Object.keys(item.link).length > 1) {
+					this.$util.diyRedirectTo(item.link);
+				} else {
+					// 如果不设置跳转链接，则点击弹框展示
+					this.notice = item.title;
+					this.$refs.noticePopup.open();
+				}
+			},
+			closeNoticePopup() {
+				this.$refs.noticePopup.close();
+			},
+			// 绑定横向滚动事件
+			bindCrossSlipEvent() {
+				if (this.value.scrollWay == 'horizontal') {
+					setTimeout(() => {
+						this.$nextTick(() => {
+							uni.createSelectorQuery()
+								.in(this)
+								.select('.marquee-wrap')
+								.boundingClientRect(res => {
+									this.marqueeWrapWidth = res.width;
+									const query = uni.createSelectorQuery().in(this);
+									query
+										.select('.marquee')
+										.boundingClientRect(data => {
+											this.marqueeWidth = data.width + 30; // 30px是间距
+											this.time = Math.ceil(this.marqueeWidth * 10);
+
+											if (this.marqueeWrapWidth > this.marqueeWidth) {
+												this.marqueeStyle = `animation: none;`;
+												this.marqueeAgainStyle = 'display:none;';
+											} else {
+												this.marqueeStyle = `
+												width: ${this.marqueeWidth}px;
+												animation-duration: ${this.time}ms;
+												animation-delay: ${this.delayTime}ms;
+											`;
+												this.marqueeAgainStyle = `
+												width: ${this.marqueeWidth}px;
+												left: ${this.marqueeWidth}px;
+												animation-duration: ${this.time}ms;
+												animation-delay: ${this.delayTime}ms;
+											`;
+											}
+										})
+										.exec();
+								})
+								.exec();
+						});
+					});
+				}
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	.notice {
+		height: 80rpx;
+		position: relative;
+		display: flex;
+		align-items: center;
+		overflow: hidden;
+		padding: 20rpx 0 20rpx 20rpx;
+		font-size: 70rpx;
+		box-sizing: border-box;
+
+		.notice-img {
+			width: 44rpx;
+			height: 80rpx;
+		}
+
+		.notice-xian {
+			width: 1rpx;
+			height: 26rpx;
+			background-color: #e4e4e4;
+			margin: 0 22rpx;
+		}
+	}
+
+	.main-wrap {
+		display: inline-block;
+		width: calc(100% - 115rpx);
+		position: relative;
+	}
+
+	swiper {
+		height: 50rpx;
+	}
+
+	.beyond-hiding {
+		display: inline-block;
+		width: 100%;
+		white-space: nowrap;
+	}
+
+	.notice-popup {
+		padding: 0 30rpx 40rpx;
+		background-color: #fff;
+
+		.head-wrap {
+			font-size: $font-size-toolbar;
+			line-height: 100rpx;
+			height: 100rpx;
+			display: block;
+			text-align: center;
+			position: relative;
+			border-bottom: 2rpx solid $color-line;
+			margin-bottom: 20rpx;
+
+			.iconfont {
+				position: absolute;
+				float: right;
+				right: 0;
+				font-size: $font-size-toolbar;
+			}
+		}
+
+		.content-wrap {
+			max-height: 600rpx;
+			overflow-y: auto;
+		}
+
+		button {
+			margin-top: 40rpx;
+		}
+	}
+
+	.horizontal-wrap {
+		height: 30px;
+		line-height: 30px;
+		position: relative;
+		overflow: hidden;
+		width: 100%;
+	}
+
+	.marquee-wrap {
+		display: inline-block;
+		width: 100%;
+		height: 100%;
+		vertical-align: middle;
+		overflow: hidden;
+		box-sizing: border-box;
+		position: relative;
+	}
+
+	.marquee {
+		display: flex;
+		position: absolute;
+		white-space: nowrap;
+		animation: marquee 0s 0s linear infinite;
+
+		text {
+			margin-left: 40rpx;
+
+			&:first-child {
+				margin-left: 0;
+			}
+		}
+	}
+
+	@keyframes marquee {
+		0% {
+			transform: translateX(0);
+		}
+
+		100% {
+			transform: translateX(-100%);
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/components/diy-components/diy-payment-qrcode.vue b/components/diy-components/diy-payment-qrcode.vue
new file mode 100644
index 0000000..593b31a
--- /dev/null
+++ b/components/diy-components/diy-payment-qrcode.vue
@@ -0,0 +1,203 @@
+<template>
+	<view class="payment-qrocde-wrap" :style="warpCss">
+		<view class="payment-qrocde-box">
+			<view class="qrocde-left">
+				<view class="qrocde-desc">
+					<text>门店消费时使用，支付时点击下方展示付款码</text>
+					<!-- <text class="iconfont icon-shuaxin"></text> -->
+				</view>
+				<view class="qrocde-action">
+					<button type="primary" @click="toLink">
+						<text class="iconfont icon-fukuanma"></text>
+						<text class="action-name">付款码</text>
+					</button>
+					<button type="primary" @click="openPaymentPopup">
+						<text class="iconfont icon-saomafu"></text>
+						<text class="action-name">扫码付</text>
+					</button>
+				</view>
+			</view>
+			<view class="qrocde-right">
+				<text class="iconfont icon-zhifu"></text>
+				<text class="name">门店支付</text>
+			</view>
+		</view>
+
+		<view @touchmove.prevent.stop>
+			<uni-popup ref="paymentPopup" type="center">
+				<view class="payment-popup">
+					<view class="head-wrap" @click="closePaymentPopup">
+						<text>提示</text>
+						<text class="iconfont icon-close"></text>
+					</view>
+					<view class="content-wrap">扫码付请退出程序后直接使用微信扫一扫或返回上一页使用付款码进行支付</view>
+					<button type="primary" @click="closePaymentPopup">我知道了</button>
+				</view>
+			</uni-popup>
+		</view>
+	</view>
+</template>
+
+<script>
+// 付款码
+export default {
+	name: 'diy-payment-qrcode',
+	props: {
+		value: {
+			type: Object
+		}
+	},
+	data() {
+		return {};
+	},
+	created() {},
+	computed: {
+		warpCss() {
+			var obj = '';
+			return obj;
+		}
+	},
+	watch: {
+		// 组件刷新监听
+		componentRefresh: function(nval) {}
+	},
+	methods: {
+		toLink() {
+			this.$util.redirectTo('/pages_tool/store/payment_qrcode');
+		},
+		scanCodeFn() {
+			// #ifdef APP-PLUS
+			this.toLink();
+			// #endif
+			// #ifndef H5
+			// 允许从相机和相册扫码,h5端不起作用
+			uni.scanCode({
+				success: function(res) {
+					console.log('条码类型：' + res.scanType);
+					console.log('条码内容：' + res.result);
+				}
+			});
+			// #endif
+		},
+		openPaymentPopup() {
+			this.$refs.paymentPopup.open();
+		},
+		closePaymentPopup() {
+			this.$refs.paymentPopup.close();
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+.payment-qrocde-box {
+	overflow: hidden;
+	display: flex;
+	background-color: #fff;
+	border-radius: 16rpx;
+	.qrocde-left {
+		flex: 1;
+		.qrocde-desc {
+			margin-top: 20rpx;
+			margin-bottom: 26rpx;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			color: $color-tip;
+			font-size: $font-size-tag;
+			.iconfont {
+				margin-left: 10rpx;
+				font-size: $font-size-tag;
+				font-weight: bold;
+			}
+		}
+		.qrocde-action {
+			padding-bottom: 36rpx;
+			display: flex;
+			justify-content: center;
+			button {
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				margin: 0;
+				width: 230rpx;
+				height: 86rpx;
+				border-radius: 50rpx;
+				&:first-of-type {
+					margin-right: 46rpx;
+					background-color: $base-color;
+				}
+				&:last-of-type {
+					background-color: #999;
+				}
+				.iconfont {
+					margin-right: 10rpx;
+				}
+				.action-name {
+					font-size: 30rpx;
+				}
+			}
+		}
+	}
+	.qrocde-right {
+		position: relative;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		padding-left: 16rpx;
+		width: 90rpx;
+		z-index: 2;
+		box-sizing: border-box;
+		.name {
+			font-size: $font-size-sub;
+			writing-mode: tb-rl;
+			color: #fff;
+			letter-spacing: 6rpx;
+		}
+		.iconfont {
+			color: #fff;
+		}
+		&::after {
+			content: '';
+			position: absolute;
+			top: 50%;
+			left: 0;
+			width: 500rpx;
+			height: 500rpx;
+			border-radius: 50%;
+			background-color:  $base-color;
+			transform: translateY(-50%);
+			z-index: -1;
+		}
+	}
+}
+.payment-popup {
+	padding: 0 30rpx 40rpx;
+	background-color: #fff;
+
+	.head-wrap {
+		font-size: $font-size-toolbar;
+		line-height: 100rpx;
+		height: 100rpx;
+		display: block;
+		text-align: center;
+		position: relative;
+		border-bottom: 2rpx solid $color-line;
+		margin-bottom: 20rpx;
+		.iconfont {
+			position: absolute;
+			float: right;
+			right: 0;
+			font-size: $font-size-toolbar;
+		}
+	}
+	.content-wrap {
+		max-height: 600rpx;
+		overflow-y: auto;
+	}
+	button {
+		margin-top: 40rpx;
+	}
+}
+</style>
diff --git a/components/diy-components/diy-picture.vue b/components/diy-components/diy-picture.vue
new file mode 100644
index 0000000..ce49f83
--- /dev/null
+++ b/components/diy-components/diy-picture.vue
@@ -0,0 +1,77 @@
+<template>
+	<view class="diy-picture" :style="style">
+		<view class="fui-picture">
+		    <view  v-for="(item,index) in value.list" style="line-height: 0;">
+		        <image mode="widthFix" style="width: 100%;height:auto" :src="$util.img(item.imageUrl)" v-if="item.link.wap_url" @click="redirectTo(item.link)"></image>
+				<image mode="widthFix" style="width: 100%;height:auto" :src="$util.img(item.imageUrl)" v-else @click="previewImg(item.imageUrl)"></image>
+		    </view>
+		<!--   <view wx:if="{{!childitem.linkurl}}" bindtap="previewImg" data-src="{{childitem.imgurl}}" style="padding:{{diyitem.style.paddingtop==0?0:diyitem.style.paddingtop+'rpx'}} {{diyitem.style.paddingleft==0?0:diyitem.style.paddingleft+'rpx'}}" wx:for="{{diyitem.data}}" wx:for-index="childid" wx:for-item="childitem" wx:key="{{childid}}">
+		        <image mode="widthFix" src="{{childitem.imgurl}}" style="{{bannerheight?'height:'+bannerheight+'px':'height:auto'}}"></image>
+		    </view> -->
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: 'diy-picture',
+		props: {
+			value: {
+				type: Object
+			}
+		},
+		data() {
+			return {
+				loading: true,
+			};
+		},
+		created() {
+			// this.getDataList();
+		},
+		watch: {
+			// 组件刷新监听
+			componentRefresh: function(nval) {
+				// this.getDataList();
+			}
+		},
+		computed: {
+			style() {
+				var css = '';
+				css += 'background-color:' + this.value.contentBgColor + ';';
+				if (this.value.elementAngle == 'round') {
+					css += 'border-top-left-radius:' + this.value.topElementAroundRadius * 2 + 'rpx;';
+					css += 'border-top-right-radius:' + this.value.topElementAroundRadius * 2 + 'rpx;';
+					css += 'border-bottom-left-radius:' + this.value.bottomElementAroundRadius * 2 + 'rpx;';
+					css += 'border-bottom-right-radius:' + this.value.bottomElementAroundRadius * 2 + 'rpx;';
+				}
+				return css;
+			}
+		},
+		methods: {
+			previewImg(img){
+				// #ifdef MP-WEIXIN
+				 uni.previewImage({
+					current: 0, 
+					urls: [this.$util.img(img)], 
+					success: function (res) {},
+					fail: function (res) {},
+					complete: function (res) {},
+				  })
+				 // #endif
+			},
+			redirectTo(link) {
+			    if (link.wap_url) {
+			        if (this.$util.getCurrRoute() == 'pages/member/index' && !this.storeToken) {
+			            this.$refs.login.open(link.wap_url);
+			            return;
+			        }
+			    }
+			    this.$util.diyRedirectTo(link);
+			},
+		}
+	};
+</script>
+
+<style lang="scss">
+
+</style>
\ No newline at end of file
diff --git a/components/diy-components/diy-pinfan.vue b/components/diy-components/diy-pinfan.vue
new file mode 100644
index 0000000..6082776
--- /dev/null
+++ b/components/diy-components/diy-pinfan.vue
@@ -0,0 +1,540 @@
+<template>
+	<x-skeleton :type="skeletonType" :loading="loading" :configs="skeletonConfig">
+		<view class="diy-pinfan" :class="[value.template, value.style]" :style="warpCss">
+			<template v-if="value.template == 'row1-of1'">
+				<view class="item" v-for="(item, index) in list" :key="index" @click="toDetail(item)" :class="[value.ornament.type]" :style="goodsItemCss">
+					<view class="img-wrap" :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }">
+						<image :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }" :src="$util.img(item.goods_image,{size: 'mid'})" mode="widthFix" @error="imageError(index)"/>
+					</view>
+					<view class="content" v-if="value.goodsNameStyle.control || value.priceStyle.mainControl || value.priceStyle.lineControl || value.btnStyle.control">
+						<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 class="tag-wrap" v-if="value.groupStyle.control || value.saleStyle.control">
+							<view v-if="value.groupStyle.control" :style="{ color: value.theme == 'diy' ? value.groupStyle.bgColor : '', borderColor: value.theme == 'diy' ? value.groupStyle.bgColor : '' }">
+								<text class="iconfont icon-yonghu3" :style="{ backgroundColor: value.theme == 'diy' ? value.groupStyle.bgColor : '' }"></text>
+								<text>{{ item.pintuan_num }}人团</text>
+							</view>
+							<view v-if="value.saleStyle.control" :style="{ color: value.theme == 'diy' ? value.saleStyle.color : '', borderColor: value.theme == 'diy' ? value.saleStyle.color : '' }">
+								<text>已拼{{ item.order_num }}件</text>
+							</view>
+						</view>
+						<view class="price-wrap">
+							<view class="discount-price" v-if="value.priceStyle.mainControl">
+								<text class="unit price-style small" :style="{ color: value.theme == 'diy' ? value.priceStyle.mainColor +'!important' : '' }">¥</text>
+								<text class="price price-style large" :style="{ color: value.theme == 'diy' ? value.priceStyle.mainColor +'!important' : '' }">{{ item.pintuan_price.split(".")[0] }}</text>
+								<text class="unit price-style small" :style="{ color: value.theme == 'diy' ? value.priceStyle.mainColor +'!important' : '' }">{{ "."+item.pintuan_price.split(".")[1] }}</text>
+							</view>
+							<view class="original-price  price-font" v-if="value.priceStyle.lineControl" :style="{ color: value.theme == 'diy' ? value.priceStyle.lineColor : '' }">
+								¥{{ item.price }}
+							</view>
+							<button v-if="value.btnStyle.control" :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'
+							}">
+								<text class="text">{{ value.btnStyle.text }}</text>
+								<text class="fan" v-if="item.reward_type == 4">返{{ item.reward_type_num }}积分</text>
+								<text class="fan" v-if="item.reward_type == 1 || item.reward_type == 2">返￥{{ item.reward_type_num }}</text>
+								<text class="fan" v-if="item.reward_type == 3">返优惠券</text>
+							</button>
+						</view>
+					</view>
+				</view>
+			</template>
+
+			<template v-if="value.template == 'horizontal-slide'">
+				<scroll-view v-if="value.slideMode == 'scroll'" class="scroll" :scroll-x="true" :show-scrollbar="false">
+					<view class="item" v-for="(item, index) in list" :key="index" @click="toDetail(item)" :class="[value.ornament.type]" :style="goodsItemCss">
+						<view class="img-wrap" :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }">
+							<image :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }" :src="$util.img(item.goods_image,{size: 'mid'})" mode="widthFix" @error="imageError(index)"/>
+						</view>
+						<view :class="['content', { 'multi-content': value.nameLineMode == 'multiple' }]" v-if="value.goodsNameStyle.control || value.priceStyle.mainControl">
+							<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 v-if="value.groupStyle.control" class="num">
+								<text class="content-tuan-box" :style="{ color: value.theme == 'diy' ? value.groupStyle.color : '', backgroundColor: value.theme == 'diy' ? value.groupStyle.bgColor : '' }">
+									{{ item.pintuan_num }}人团
+								</text>
+								<text class="content-tuan-price" :style="{ color: value.theme == 'diy' ? value.groupStyle.bgColor : '' }" v-if="item.reward_type == 4">
+									返{{ item.reward_type_num }}积分
+								</text>
+								<text class="content-tuan-price" :style="{ color: value.theme == 'diy' ? value.groupStyle.bgColor : '' }" v-if="item.reward_type == 1 || item.reward_type == 2">
+									返￥{{ item.reward_type_num }}
+								</text>
+								<text class="content-tuan-price" :style="{ color: value.theme == 'diy' ? value.groupStyle.bgColor : '' }" v-if="item.reward_type == 3">返优惠券</text>
+							</view>
+							<view class="price-wrap" v-if="value.priceStyle.mainControl">
+								<text class="unit price-style small" :style="{ color: value.theme == 'diy' ? value.priceStyle.mainColor +'!important' : '' }">¥</text>
+								<text class="price price-style large" :style="{ color: value.theme == 'diy' ? value.priceStyle.mainColor +'!important' : '' }">{{ item.pintuan_price.split('.')[0] }}</text>
+								<text class="unit price-style small" :style="{ color: value.theme == 'diy' ? value.priceStyle.mainColor +'!important' : '' }">{{ "."+item.pintuan_price.split('.')[1] }}</text>
+							</view>
+						</view>
+					</view>
+				</scroll-view>
+
+				<swiper v-if="value.slideMode == 'slide'" :autoplay="false" class="swiper" :style="{ height: swiperHeight }">
+					<swiper-item v-for="(pageItem,pageIndex) in page" :key="pageIndex" :class="['swiper-item',(list.length && [list[pageIndex].length / 3] >= 1) && 'flex-between']">
+						<view class="item" v-for="(item, dataIndex) in list[pageIndex]" :key="dataIndex" @click="toDetail(item)" :class="[value.ornament.type]" :style="goodsItemCss">
+							<view class="img-wrap" :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }">
+								<image :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }" :src="$util.img(item.goods_image,{size: 'mid'})" mode="widthFix" @error="imageError(dataIndex)"/>
+							</view>
+							<view :class="['content', { 'multi-content': value.nameLineMode == 'multiple' }]" v-if="value.goodsNameStyle.control || value.priceStyle.mainControl">
+								<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 v-if="value.groupStyle.control" class="num">
+									<text class="content-tuan-box" :style="{ color: value.theme == 'diy' ? value.groupStyle.color : '', backgroundColor: value.theme == 'diy' ? value.groupStyle.bgColor : '' }">
+										{{ item.pintuan_num }}人团
+									</text>
+									<text class="content-tuan-price" :style="{ color: value.theme == 'diy' ? value.groupStyle.bgColor : '' }" v-if="item.reward_type == 4">
+										返{{ item.reward_type_num }}积分
+									</text>
+									<text class="content-tuan-price" :style="{ color: value.theme == 'diy' ? value.groupStyle.bgColor : '' }" v-if="item.reward_type == 1 || item.reward_type == 2">
+										返￥{{ item.reward_type_num }}
+									</text>
+									<text class="content-tuan-price" :style="{ color: value.theme == 'diy' ? value.groupStyle.bgColor : '' }" v-if="item.reward_type == 3">
+										返优惠券
+									</text>
+								</view>
+								<view class="price-wrap" v-if="value.priceStyle.mainControl">
+									<text class="unit price-style small" :style="{ color: value.theme == 'diy' ? value.priceStyle.mainColor +'!important' : '' }">¥</text>
+									<text class="price price-style large" :style="{ color: value.theme == 'diy' ? value.priceStyle.mainColor +'!important' : '' }">{{ item.pintuan_price.split('.')[1] }}</text>
+									<text class="unit price-style small" :style="{ color: value.theme == 'diy' ? value.priceStyle.mainColor +'!important' : '' }">{{ "."+item.pintuan_price.split('.')[1] }}</text>
+								</view>
+							</view>
+						</view>
+					</swiper-item>
+				</swiper>
+			</template>
+		</view>
+	</x-skeleton>
+</template>
+
+<script>
+	export default {
+		name: 'diy-pinfan',
+		props: {
+			value: {
+				type: Object
+			}
+		},
+		data() {
+			return {
+				loading: true,
+				skeletonType:'',
+				skeletonConfig: {},
+				list: [],
+				page: 1
+			};
+		},
+		created() {
+			this.initSkeleton();
+			this.getData();
+		},
+		watch: {
+			// 组件刷新监听
+			componentRefresh: function(nval) {
+				this.getData();
+			}
+		},
+		computed: {
+			warpCss() {
+				var obj = '';
+				obj += 'background-color:' + this.value.componentBgColor + ';';
+				if (this.value.componentAngle == 'round') {
+					obj += 'border-top-left-radius:' + this.value.topAroundRadius * 2 + 'rpx;';
+					obj += 'border-top-right-radius:' + this.value.topAroundRadius * 2 + 'rpx;';
+					obj += 'border-bottom-left-radius:' + this.value.bottomAroundRadius * 2 + 'rpx;';
+					obj += 'border-bottom-right-radius:' + this.value.bottomAroundRadius * 2 + 'rpx;';
+				}
+				return obj;
+			},
+			// 商品项样式
+			goodsItemCss() {
+				var obj = '';
+				obj += 'background-color:' + this.value.elementBgColor + ';';
+				if (this.value.elementAngle == 'round') {
+					obj += 'border-top-left-radius:' + this.value.topElementAroundRadius * 2 + 'rpx;';
+					obj += 'border-top-right-radius:' + this.value.topElementAroundRadius * 2 + 'rpx;';
+					obj += 'border-bottom-left-radius:' + this.value.bottomElementAroundRadius * 2 + 'rpx;';
+					obj += 'border-bottom-right-radius:' + this.value.bottomElementAroundRadius * 2 + 'rpx;';
+				}
+				if (this.value.ornament.type == 'shadow') {
+					obj += 'box-shadow:' + '0 0 10rpx ' + this.value.ornament.color + ';';
+				}
+				if (this.value.ornament.type == 'stroke') {
+					obj += 'border:' + '2rpx solid ' + this.value.ornament.color + ';';
+				}
+				const screenWidth = uni.getSystemInfoSync().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);
+					else
+						width = [screenWidth - (this.rpxUpPx(20) * 2) - (this.rpxUpPx(200) * 3) - (this.rpxUpPx(this.value
+							.margin.both * 2) * 2)] / 6;
+					obj += 'margin-left:' + width + "px;";
+					obj += 'margin-right:' + width + "px;";
+				}
+				return obj;
+			},
+			swiperHeight() {
+				if (this.value.nameLineMode == 'multiple')
+					return this.value.ornament.type == 'shadow' ? '444rpx' : '432rpx';
+				return this.value.ornament.type == 'shadow' ? '404rpx' : '396rpx';
+			}
+		},
+		methods: {
+			initSkeleton() {
+				if (this.value.template == 'row1-of1') {
+
+					// 单列 风格
+					this.skeletonType = 'list';
+					this.skeletonConfig = {
+						textRows: 3
+					};
+
+				} else if (this.value.template == 'horizontal-slide') {
+
+					// 横向滑动 风格
+					this.skeletonType = 'waterfall';
+					this.skeletonConfig = {
+						gridRows: 1,
+						gridColumns: 3,
+						headHeight: '200rpx',
+						textRows: 2,
+						textWidth: ['100%', '80%']
+					};
+
+				}
+			},
+			rpxUpPx(res) {
+				const screenWidth = uni.getSystemInfoSync().windowWidth;
+				var data = screenWidth * parseInt(res) / 750;
+				return Math.floor(data);
+			},
+			getData() {
+				var data = {
+					num: this.value.count
+				};
+				if (this.value.sources == 'diy') {
+					data.num = 0;
+					data.goods_id_arr = this.value.goodsId.toString();
+				}
+				this.$api.sendRequest({
+					url: '/pinfan/api/goods/lists',
+					data: data,
+					success: res => {
+						if (res.code == 0 && res.data) {
+							this.list = res.data;
+
+							// 切屏滚动，每页显示固定数量
+							if (this.value.template == 'horizontal-slide' && this.value.slideMode == 'slide') {
+								let size = 3;
+								let temp = [];
+								this.page = Math.ceil(this.list.length / size);
+								for (var i = 0; i < this.page; i++) {
+									temp[i] = [];
+									for (var j = i * size; j < this.list.length; j++) {
+										if (temp[i].length == size) break;
+										temp[i].push(this.list[j]);
+									}
+								}
+								this.list = temp;
+							}
+						}
+						this.loading = false;
+					}
+				});
+			},
+			toDetail(e) {
+				this.$util.redirectTo('/pages_promotion/pinfan/detail', {
+					pinfan_id: e.pintuan_id
+				});
+			},
+			imageError(index) {
+				this.list[index].goods_image = this.$util.getDefaultImage().goods;
+				this.$forceUpdate();
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	/deep/.uni-scroll-view ::-webkit-scrollbar {
+		/* 隐藏滚动条，但依旧具备可以滚动的功能 */
+		display: none;
+		width: 0;
+		height: 0;
+		color: transparent;
+		background: transparent;
+	}
+
+	/deep/::-webkit-scrollbar {
+		display: none;
+		width: 0;
+		height: 0;
+		color: transparent;
+		background: transparent;
+	}
+
+	scroll-view ::-webkit-scrollbar {
+		width: 0;
+		height: 0;
+		background-color: transparent;
+		touch-action: none;
+	}
+
+	.diy-pinfan {
+		&.row1-of1 {
+			.item {
+				display: flex;
+				margin-bottom: 20rpx;
+				padding: 16rpx;
+
+				&.shadow {
+					margin: 8rpx 8rpx 20rpx 8rpx;
+				}
+
+				&:last-child {
+					margin-bottom: 0;
+				}
+
+				.img-wrap {
+					width: 200rpx;
+					height: 200rpx;
+
+					image {
+						width: 200rpx;
+					}
+				}
+
+				.content {
+					flex: 1;
+					margin-left: 20rpx;
+					position: relative;
+					display: flex;
+					justify-content: space-between;
+					flex-direction: column;
+					padding: 6rpx 0;
+
+					.goods-name {
+						line-height: 1.3;
+					}
+
+					.tag-wrap {
+						display: flex;
+						align-items: center;
+						margin-top: 4rpx;
+
+						>view {
+							height: 30rpx;
+							line-height: 30rpx;
+							border: 2rpx solid $base-color;
+							border-radius: 6rpx;
+							margin-right: 10rpx;
+							font-size: $font-size-activity-tag;
+							color: $base-color;
+
+							.iconfont {
+								display: inline-block;
+								width: 30rpx;
+								height: 30rpx;
+								font-size: $font-size-activity-tag;
+								color: #ffffff;
+								text-align: center;
+								margin-right: -6rpx;
+								background: $base-color;
+							}
+
+							text:last-child {
+								padding: 0 10rpx;
+							}
+						}
+					}
+
+					.price-wrap {
+						display: flex;
+						align-items: flex-end;
+
+						>view:last-of-type {
+							flex: 1;
+						}
+
+						.discount-price {
+							white-space: nowrap;
+							font-weight: bold;
+
+							.unit {
+								font-size: $font-size-tag;
+								color: $base-color;
+							}
+
+							.price {
+								font-size: $font-size-toolbar;
+								color: $base-color;
+							}
+						}
+
+						.original-price {
+							font-size: $font-size-tag;
+							color: $color-tip;
+							text-decoration: line-through;
+							margin: 0 10rpx 4rpx 10rpx;
+						}
+					}
+
+					button {
+						bottom: 10rpx;
+						height: 90rpx;
+						line-height: 40rpx;
+						padding: 0 16rpx;
+						margin: 0;
+						text-align: center;
+						background-color: $base-color;
+						color: #ffffff;
+
+						.text {
+							display: block;
+							margin-top: 6rpx;
+							font-size: $font-size-tag;
+						}
+
+						.fan {
+							font-size: $font-size-activity-tag;
+						}
+					}
+				}
+			}
+		}
+
+		&.horizontal-slide {
+			display: flex;
+			justify-content: space-around;
+
+			.scroll {
+				width: calc(100% - 40rpx);
+				padding: 20rpx;
+				line-height: 1;
+				white-space: nowrap;
+
+				.item.shadow {
+					margin-bottom: 8rpx;
+				}
+			}
+
+			.flex-between {
+				justify-content: space-between;
+			}
+
+			.item {
+				display: inline-block;
+				width: 200rpx;
+				overflow: hidden;
+				box-sizing: border-box;
+
+				&:nth-child(3n+3) {
+					width: 198rpx;
+				}
+
+				&.shadow {
+					margin-top: 8rpx;
+				}
+
+				.img-wrap {
+					width: 200rpx;
+					height: 200rpx;
+					position: relative;
+					overflow: hidden;
+					margin: 0 auto;
+
+					>image {
+						width: 200rpx;
+					}
+				}
+
+				.content {
+					padding: 10rpx;
+					display: flex;
+					flex-direction: column;
+					justify-content: space-between;
+
+					&.multi-content {
+						height: 188rpx;
+						box-sizing: border-box;
+					}
+
+					.goods-name {
+						line-height: 1.3;
+
+						&.multi-hidden {
+							white-space: break-spaces;
+						}
+					}
+
+					.num {
+						margin-top: auto;
+						font-size: $font-size-activity-tag;
+
+						.content-tuan-box {
+							border-radius: 4rpx;
+							color: #ffffff;
+							background-color: $base-color;
+							padding: 6rpx;
+						}
+
+						.content-tuan-price {
+							border-radius: 4rpx;
+							padding: 4rpx 6rpx;
+							border: 2rpx solid $base-color;
+							color: $base-color;
+							margin-left: -2rpx;
+						}
+					}
+
+					.price-wrap {
+						white-space: nowrap;
+						margin-top: 10rpx;
+						font-weight: bold;
+						line-height: 1;
+
+						.unit {
+							font-size: $font-size-tag;
+							height: 32rpx;
+							color: $base-color;
+						}
+
+						.price {
+							font-size: $font-size-toolbar;
+							color: $base-color;
+						}
+					}
+				}
+			}
+
+			.swiper {
+				width: 100%;
+				white-space: nowrap;
+				padding: 20rpx;
+				box-sizing: border-box;
+
+				.swiper-item {
+					display: flex;
+					align-items: center;
+				}
+
+				.item {
+					width: 200rpx;
+				}
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/components/diy-components/diy-pintuan.vue b/components/diy-components/diy-pintuan.vue
new file mode 100644
index 0000000..715a636
--- /dev/null
+++ b/components/diy-components/diy-pintuan.vue
@@ -0,0 +1,776 @@
+<template>
+	<x-skeleton :type="skeletonType" :loading="loading" :configs="skeletonConfig">
+		<view class="diy-pintuan" :class="[value.template, value.style]" :style="warpCss">
+			<view v-if="value.titleStyle.isShow && list && list.length" :class="[value.titleStyle.style, 'pintuan-head']" :style="{
+				backgroundImage:
+					'url(' + $util.img(value.titleStyle.backgroundImage) + '), linear-gradient(to right,' + value.titleStyle.bgColorStart + ',' + value.titleStyle.bgColorEnd + ')'
+			}">
+				<view v-if="value.titleStyle.leftStyle == 'text'" class="left-text" :style="{ fontSize: value.titleStyle.fontSize * 2 + 'rpx', color: value.titleStyle.textColor, fontWeight: value.titleStyle.fontWeight ? 'bold' : '' }">
+					{{ value.titleStyle.leftText }}
+				</view>
+				<image v-else class="left-img" :src="$util.img(value.titleStyle.leftImg)" mode="heightFix"/>
+				<view class="head-content">
+					<view class="img-warp">
+						<block v-if="headData && headData.member_list && headData.member_list.length">
+							<image v-for="(item, index) in headData.member_list" :key="index" :src="$util.img(item.member_img || 'public/static/img/default_img/square.png')" mode="aspectFill" @error="headImageError(index)"/>
+						</block>
+						<block v-else>
+							<image :src="$util.img('public/static/img/default_img/square.png')" mode="aspectFill"/>
+							<image :src="$util.img('public/static/img/default_img/square.png')" mode="aspectFill"/>
+							<image :src="$util.img('public/static/img/default_img/square.png')" mode="aspectFill"/>
+						</block>
+					</view>
+					<view :style="{ color: value.titleStyle.textColor }">
+						<text>{{ value.titleStyle.virtualNum || headData.pintuan_count }}</text>
+						<text>{{ value.titleStyle.style == 'style-2' ? '人参与' : '人拼团成功' }}</text>
+					</view>
+				</view>
+				<view class="head-right" :style="{ fontSize: value.titleStyle.moreFontSize * 2 + 'rpx', color: value.titleStyle.moreColor }" @click="$util.redirectTo('/pages_promotion/pintuan/list')">
+					<text>{{ value.titleStyle.more }}</text>
+					<text class="iconfont icon-right"></text>
+				</view>
+			</view>
+
+			<template v-if="value.template == 'row1-of1'">
+				<view class="item" v-for="(item, index) in list" :key="index" @click="toDetail(item)" :class="[value.ornament.type]" :style="goodsItemCss">
+					<view class="img-wrap" :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }">
+						<image :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }" :src="$util.img(item.goods_image, { size: 'mid' })" mode="widthFix" @error="imageError(index)"/>
+					</view>
+					<view class="content" v-if="value.goodsNameStyle.control || value.priceStyle.mainControl || value.priceStyle.lineControl || value.btnStyle.control">
+						<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 class="tag-wrap" v-if="value.groupStyle.control || value.saleStyle.control">
+							<view v-if="value.groupStyle.control" :style="{
+								color: value.theme == 'diy' ? value.groupStyle.bgColorStart : '',
+								borderColor: value.theme == 'diy' ? value.groupStyle.bgColorStart : ''
+							}">
+								<text class="iconfont icon-yonghu3" :style="{ backgroundColor: value.theme == 'diy' ? value.groupStyle.bgColorStart : '' }"></text>
+								<text>{{ item.pintuan_num }}人团</text>
+							</view>
+							<view v-if="value.saleStyle.control"
+								:style="{ color: value.theme == 'diy' ? value.saleStyle.color : '', borderColor: value.theme == 'diy' ? value.saleStyle.color : '' }">
+								<text>已拼{{ item.order_num }}件</text>
+							</view>
+						</view>
+
+						<view class="bottom-wrap">
+							<view class="price-wrap">
+								<view class="discount-price" v-if="value.priceStyle.mainControl">
+									<text class="unit price-style small" :style="{ color: value.theme == 'diy' ? value.priceStyle.mainColor + '!important' : '' }">¥</text>
+									<text class="price price-style large" :style="{ color: value.theme == 'diy' ? value.priceStyle.mainColor + '!important' : '' }">
+										{{ item.pintuan_price.split('.')[0] }}
+									</text>
+									<text class="unit price-style small" :style="{ color: value.theme == 'diy' ? value.priceStyle.mainColor + '!important' : '' }">
+										{{ '.' + item.pintuan_price.split('.')[1] }}
+									</text>
+								</view>
+								<view class="original-price  price-font" v-if="value.priceStyle.lineControl" :style="{ color: value.theme == 'diy' ? value.priceStyle.lineColor : '' }">
+									¥{{ item.price }}
+								</view>
+							</view>
+							<button v-if="value.btnStyle.control" :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'
+							}">
+								{{ value.btnStyle.text }}
+							</button>
+						</view>
+					</view>
+				</view>
+			</template>
+
+			<template v-if="value.template == 'horizontal-slide'">
+				<scroll-view v-if="value.slideMode == 'scroll'" class="scroll" :scroll-x="true" :show-scrollbar="false">
+					<view class="item" v-for="(item, index) in list" :key="index" @click="toDetail(item)" :class="[value.ornament.type]" :style="goodsItemCss">
+						<view class="img-wrap" :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }">
+							<image :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }" :src="$util.img(item.goods_image, { size: 'mid' })" mode="widthFix" @error="imageError(index)"/>
+							<view v-if="value.groupStyle.control && value.style == 'style-1'" class="num" :style="{
+								color: value.theme == 'diy' ? value.groupStyle.color : '',
+								background: value.theme == 'diy' ? 'linear-gradient(to right,' + value.groupStyle.bgColorStart + ',' + value.groupStyle.bgColorEnd + ')' : ''
+							}">
+								{{ item.pintuan_num }}人团
+							</view>
+						</view>
+						<view :class="['content', { 'multi-content': value.nameLineMode == 'multiple' }]" v-if="value.goodsNameStyle.control || value.priceStyle.mainControl">
+							<view
+								v-if="value.goodsNameStyle.control && (value.style == 'style-1' || value.style == 'style-3')"
+								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 class="price-wrap" v-if="value.priceStyle.mainControl && value.style != 'style-3'">
+								<text class="unit price-style small" :style="{ color: value.theme == 'diy' ? value.priceStyle.mainColor + '!important' : '' }">¥</text>
+								<text class="price price-style large" :style="{ color: value.theme == 'diy' ? value.priceStyle.mainColor + '!important' : '' }">
+									{{ item.pintuan_price.split('.')[0] }}
+								</text>
+								<text class="unit price-style small" :style="{ color: value.theme == 'diy' ? value.priceStyle.mainColor + '!important' : '' }">
+									{{ '.' + item.pintuan_price.split('.')[1] }}
+								</text>
+							</view>
+
+							<view class="other-info-wrap" v-if="value.style == 'style-3'">
+								<view class="price-wrap" v-if="value.priceStyle.mainControl">
+									<text class="unit price-style small" :style="{ color: value.theme == 'diy' ? value.priceStyle.mainColor + '!important' : '' }">¥</text>
+									<text class="price price-style large" :style="{ color: value.theme == 'diy' ? value.priceStyle.mainColor + '!important' : '' }">
+										{{ item.pintuan_price.split('.')[0] }}
+									</text>
+									<text class="unit price-style small" :style="{ color: value.theme == 'diy' ? value.priceStyle.mainColor + '!important' : '' }">
+										{{ '.' + item.pintuan_price.split('.')[1] }}
+									</text>
+								</view>
+								<view class="sale-action">去参团</view>
+							</view>
+
+							<view class="sale-num" v-if="value.style == 'style-2'">已拼{{ item.sale_num }}件</view>
+						</view>
+					</view>
+				</scroll-view>
+
+				<swiper v-if="value.slideMode == 'slide'" :autoplay="false" class="swiper" :style="{ height: swiperHeight }">
+					<swiper-item v-for="(pageItem, pageIndex) in page" :key="pageIndex" :class="['swiper-item', (list.length && [list[pageIndex].length / 3] >= 1) && 'flex-between']">
+						<view class="item" v-for="(item, dataIndex) in list[pageIndex]" :key="dataIndex" @click="toDetail(item)" :class="[value.ornament.type]" :style="goodsItemCss">
+							<view class="img-wrap" :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }">
+								<image :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }" :src="$util.img(item.goods_image, { size: 'mid' })" mode="widthFix" @error="imageError(dataIndex)"/>
+								<view v-if="value.groupStyle.control && value.style != 'style-2'" class="num" :style="{
+									color: value.theme == 'diy' ? value.groupStyle.color : '',
+									background: value.theme == 'diy' ? 'linear-gradient(to right,' + value.groupStyle.bgColorStart + ',' + value.groupStyle.bgColorEnd + ')' : ''
+								}">
+									{{ item.pintuan_num }}人团
+								</view>
+							</view>
+							<view :class="['content', { 'multi-content': value.nameLineMode == 'multiple' }]" v-if="value.goodsNameStyle.control || value.priceStyle.mainControl">
+								<view v-if="value.goodsNameStyle.control && value.style != 'style-2'" 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 class="price-wrap" v-if="value.priceStyle.mainControl">
+									<text class="unit price-style small" :style="{ color: value.theme == 'diy' ? value.priceStyle.mainColor + '!important' : '' }">¥</text>
+									<text class="price price-style large" :style="{ color: value.theme == 'diy' ? value.priceStyle.mainColor + '!important' : '' }">
+										{{ item.pintuan_price.split('.')[0] }}
+									</text>
+									<text class="unit price-style small" :style="{ color: value.theme == 'diy' ? value.priceStyle.mainColor + '!important' : '' }">
+										{{ '.' + item.pintuan_price.split('.')[1] }}
+									</text>
+								</view>
+								<view class="sale-num" v-if="value.style == 'style-2'">已拼{{ item.sale_num }}件</view>
+							</view>
+						</view>
+					</swiper-item>
+				</swiper>
+			</template>
+		</view>
+	</x-skeleton>
+</template>
+
+<script>
+	export default {
+		name: 'diy-pintuan',
+		props: {
+			value: {
+				type: Object
+			}
+		},
+		data() {
+			return {
+				loading: true,
+				skeletonType:'',
+				skeletonConfig: {},
+				list: [],
+				page: 1,
+				scrollWidth: 0,
+				headData: []
+			};
+		},
+		created() {
+			this.initSkeleton();
+			this.getData();
+			this.getHeadData();
+		},
+		watch: {
+			// 组件刷新监听
+			componentRefresh: function(nval) {
+				this.getData();
+				this.getHeadData();
+			}
+		},
+		computed: {
+			warpCss() {
+				var obj = '';
+				obj += 'background-color:' + this.value.componentBgColor + ';';
+				if (this.value.componentAngle == 'round') {
+					obj += 'border-top-left-radius:' + this.value.topAroundRadius * 2 + 'rpx;';
+					obj += 'border-top-right-radius:' + this.value.topAroundRadius * 2 + 'rpx;';
+					obj += 'border-bottom-left-radius:' + this.value.bottomAroundRadius * 2 + 'rpx;';
+					obj += 'border-bottom-right-radius:' + this.value.bottomAroundRadius * 2 + 'rpx;';
+				}
+				return obj;
+			},
+			// 商品项样式
+			goodsItemCss() {
+				var obj = '';
+				obj += 'background-color:' + this.value.elementBgColor + ';';
+				if (this.value.elementAngle == 'round') {
+					obj += 'border-top-left-radius:' + this.value.topElementAroundRadius * 2 + 'rpx;';
+					obj += 'border-top-right-radius:' + this.value.topElementAroundRadius * 2 + 'rpx;';
+					obj += 'border-bottom-left-radius:' + this.value.bottomElementAroundRadius * 2 + 'rpx;';
+					obj += 'border-bottom-right-radius:' + this.value.bottomElementAroundRadius * 2 + 'rpx;';
+				}
+				if (this.value.ornament.type == 'shadow') {
+					obj += 'box-shadow:' + '0 0 10rpx ' + this.value.ornament.color + ';';
+				}
+				if (this.value.ornament.type == 'stroke') {
+					obj += 'border:' + '2rpx solid ' + this.value.ornament.color + ';';
+				}
+
+				const screenWidth = uni.getSystemInfoSync().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);
+					else if (this.value.template == 'horizontal-slide' && this.value.style == 'style-2')
+						width = [screenWidth - this.rpxUpPx(212) * 3 - this.rpxUpPx(this.value.margin.both * 2) * 2] / 6;
+					else width = [screenWidth - this.rpxUpPx(20) * 2 - this.rpxUpPx(200) * 3 - this.rpxUpPx(this.value
+						.margin.both * 2) * 2] / 6;
+					obj += 'margin-left:' + width + 'px;';
+					obj += 'margin-right:' + width + 'px;';
+				}
+				return obj;
+			},
+			swiperHeight() {
+				if (this.value.template == 'horizontal-slide' && this.value.style == 'style-2') {
+					if (this.value.nameLineMode == 'multiple') {
+						if (this.value.ornament.type == 'shadow') return '360rpx';
+						else return '342rpx';
+					}
+					if (this.value.ornament.type == 'shadow') return '324rpx';
+					else return '308rpx';
+				} else {
+					if (this.value.nameLineMode == 'multiple') {
+						if (this.value.ornament.type == 'shadow') return '400rpx';
+						else return '382rpx';
+					}
+					if (this.value.ornament.type == 'shadow') return '364rpx';
+					else return '348rpx';
+				}
+			}
+		},
+		methods: {
+			initSkeleton() {
+				if (this.value.template == 'row1-of1') {
+
+					// 单列 风格
+					this.skeletonType = 'list';
+					this.skeletonConfig = {
+						textRows: 3
+					};
+
+				} else if (this.value.template == 'horizontal-slide') {
+
+					// 横向滑动 风格
+					this.skeletonType = 'waterfall';
+					this.skeletonConfig = {
+						gridRows: 1,
+						gridColumns: 3,
+						headHeight: '200rpx',
+						textRows: 2,
+						textWidth: ['100%', '80%']
+					};
+
+				}
+			},
+			rpxUpPx(res) {
+				const screenWidth = uni.getSystemInfoSync().windowWidth;
+				var data = (screenWidth * parseInt(res)) / 750;
+				return Math.floor(data);
+			},
+			getHeadData() {
+				var data = {
+					num: 3
+				};
+				this.$api.sendRequest({
+					url: '/pintuan/api/order/pintuanmember',
+					data: data,
+					success: res => {
+						if (res.code == 0 && res.data) {
+							this.headData = res.data;
+						}
+					}
+				});
+			},
+			getData() {
+				var data = {
+					num: this.value.count
+				};
+				if (this.value.sources == 'diy') {
+					data.num = 6;
+					data.goods_id_arr = this.value.goodsId.toString();
+				}
+				this.$api.sendRequest({
+					url: '/pintuan/api/goods/lists',
+					data: data,
+					success: res => {
+						if (res.code == 0 && res.data) {
+							this.list = res.data;
+
+							// 切屏滚动，每页显示固定数量
+							if (this.value.template == 'horizontal-slide' && this.value.slideMode == 'slide') {
+								let size = 3;
+								let temp = [];
+								this.page = Math.ceil(this.list.length / size);
+								for (var i = 0; i < this.page; i++) {
+									temp[i] = [];
+									for (var j = i * size; j < this.list.length; j++) {
+										if (temp[i].length == size) break;
+										temp[i].push(this.list[j]);
+									}
+								}
+								this.list = temp;
+							}
+						}
+						this.loading = false;
+					}
+				});
+			},
+			toDetail(e) {
+				this.$util.redirectTo('/pages_promotion/pintuan/detail', {
+					pintuan_id: e.pintuan_id
+				});
+			},
+			imageError(index) {
+				if (this.list[index]) this.list[index].goods_image = this.$util.getDefaultImage().goods;
+				this.$forceUpdate();
+			},
+			headImageError(index) {
+				this.headData.member_list[index].member_img = this.$util.img('public/static/img/default_img/square.png');
+				this.$forceUpdate();
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	/deep/.uni-scroll-view ::-webkit-scrollbar {
+		/* 隐藏滚动条，但依旧具备可以滚动的功能 */
+		display: none;
+		width: 0;
+		height: 0;
+		color: transparent;
+		background: transparent;
+	}
+
+	/deep/::-webkit-scrollbar {
+		display: none;
+		width: 0;
+		height: 0;
+		color: transparent;
+		background: transparent;
+	}
+
+	scroll-view ::-webkit-scrollbar {
+		width: 0;
+		height: 0;
+		background-color: transparent;
+		touch-action: none;
+	}
+
+	.diy-pintuan {
+		overflow: hidden;
+
+		.pintuan-head {
+			padding: 0 24rpx;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			height: 88rpx;
+			box-sizing: border-box;
+			background-repeat: no-repeat;
+			background-size: cover;
+			margin-bottom: 20rpx;
+			border-radius: 18rpx 18rpx 0 0;
+
+			.left-img {
+				width: 174rpx;
+				height: 40rpx;
+			}
+
+			.head-content {
+				display: flex;
+				align-items: center;
+				margin-left: 50rpx;
+				margin-right: auto;
+				color: #fff;
+
+				.img-warp {
+					position: relative;
+					margin-right: 8rpx;
+					line-height: 1;
+
+					image {
+						width: 40rpx;
+						height: 40rpx;
+						border-radius: 50%;
+						border: 2rpx solid #ff3d3d;
+						margin-left: -14rpx;
+					}
+
+					&:after {
+						content: '';
+						width: 2rpx;
+						height: 28rpx;
+						background-color: #fff;
+						position: absolute;
+						left: -32rpx;
+						top: 50%;
+						transform: translateY(-50%);
+					}
+				}
+			}
+
+			.head-right {
+				display: flex;
+				align-items: center;
+				font-size: $font-size-sub;
+				color: #fff;
+				line-height: 1;
+			}
+
+			&.style-2 {
+				.head-right {
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					height: 36rpx;
+					background: linear-gradient(270deg, #ffbd5b 0%, #fd882e 100%);
+					border-radius: 24rpx;
+					padding: 2rpx;
+
+					text:nth-child(1) {
+						position: relative;
+						left: 6rpx;
+						transform: scale(0.9);
+					}
+
+					text:nth-child(2) {
+						padding: 6rpx 4rpx 4rpx;
+						background-color: #fff;
+						color: #ffbd5b;
+						border-radius: 50%;
+						transform: scale(0.6);
+						font-weight: bold;
+						line-height: 1;
+					}
+				}
+			}
+		}
+
+		&.row1-of1 {
+			.item {
+				display: flex;
+				margin-bottom: 20rpx;
+				padding: 16rpx;
+
+				&.shadow {
+					margin: 8rpx 8rpx 20rpx 8rpx;
+				}
+
+				&:last-child {
+					margin-bottom: 0;
+				}
+
+				.img-wrap {
+					width: 200rpx;
+					height: 200rpx;
+
+					image {
+						width: 200rpx;
+					}
+				}
+
+				.content {
+					flex: 1;
+					margin-left: 20rpx;
+					position: relative;
+					display: flex;
+					justify-content: space-between;
+					flex-direction: column;
+					padding: 6rpx 0;
+
+					.tag-wrap {
+						display: flex;
+						align-items: center;
+
+						>view {
+							height: 30rpx;
+							line-height: 30rpx;
+							border: 2rpx solid $base-color;
+							border-radius: 6rpx;
+							margin-right: 10rpx;
+							font-size: $font-size-activity-tag;
+							color: $base-color;
+
+							.iconfont {
+								display: inline-block;
+								width: 30rpx;
+								height: 30rpx;
+								font-size: $font-size-activity-tag;
+								color: #ffffff;
+								text-align: center;
+								margin-right: -6rpx;
+								background: $base-color;
+							}
+
+							text:last-child {
+								padding: 0 10rpx;
+							}
+						}
+					}
+
+					.goods-name {
+						line-height: 1.3;
+					}
+
+					.bottom-wrap {
+						display: flex;
+						align-items: center;
+						justify-content: space-between;
+					}
+
+					.price-wrap {
+						overflow: hidden;
+						width: 260rpx;
+						display: flex;
+						align-items: flex-end;
+						flex-wrap: wrap;
+
+						>view:last-of-type {
+							flex: 1;
+						}
+
+						.discount-price {
+							white-space: nowrap;
+							font-weight: bold;
+							line-height: 1;
+
+							.unit {
+								font-size: $font-size-tag;
+								color: var(--price-color);
+							}
+
+							.price {
+								font-size: $font-size-toolbar;
+								color: var(--price-color);
+							}
+						}
+
+						.original-price {
+							font-size: $font-size-tag;
+							color: $color-tip;
+							line-height: 1;
+							text-decoration: line-through;
+							margin: 0 10rpx;
+						}
+					}
+
+					button {
+						margin-right: 20rpx;
+						min-width: 112rpx;
+						height: 52rpx;
+						line-height: 52rpx;
+						padding: 0 20rpx;
+						margin: 0;
+						color: var(--btn-text-color);
+						background-color: $base-color;
+						color: #fff;
+						font-size: 24rpx;
+					}
+				}
+			}
+		}
+
+		&.horizontal-slide {
+			display: flex;
+			flex-direction: column;
+
+			.flex-between {
+				justify-content: space-between;
+			}
+
+			.scroll {
+				width: calc(100% - 40rpx);
+				padding: 20rpx;
+				line-height: 1;
+				white-space: nowrap;
+
+				.item.shadow {
+					margin-bottom: 4rpx;
+				}
+			}
+
+			.item {
+				display: inline-block;
+				width: 200rpx;
+				overflow: hidden;
+				box-sizing: border-box;
+				flex-shrink: 0;
+
+				&:nth-child(3n + 3) {
+					width: 198rpx;
+				}
+
+				&.shadow {
+					margin-top: 8rpx;
+				}
+
+				.img-wrap {
+					width: 200rpx;
+					height: 200rpx;
+					position: relative;
+					overflow: hidden;
+					margin: 0 auto;
+
+					>image {
+						width: 200rpx;
+					}
+
+					.num {
+						width: 80rpx;
+						position: absolute;
+						bottom: 0;
+						font-size: $font-size-tag;
+						line-height: 1;
+						color: #ffffff;
+						text-align: center;
+						border-top-left-radius: 20rpx;
+						border-top-right-radius: 20rpx;
+						padding: 10rpx;
+						transform: translate(50%);
+						background: $base-color;
+					}
+				}
+
+				.content {
+					padding: 10rpx 10rpx 16rpx;
+					display: flex;
+					flex-direction: column;
+					justify-content: space-between;
+
+					&.multi-content {
+						height: 142rpx;
+						box-sizing: border-box;
+					}
+
+					.goods-name {
+						line-height: 1.3;
+						font-size: $font-size-base;
+
+						&.multi-hidden {
+							white-space: break-spaces;
+						}
+					}
+
+					.price-wrap {
+						line-height: 1;
+						white-space: nowrap;
+						margin-top: 10rpx;
+						font-weight: bold;
+
+						.unit {
+							font-size: $font-size-tag;
+							height: 32rpx;
+							color: var(--price-color);
+						}
+
+						.price {
+							font-size: $font-size-toolbar;
+							color: var(--price-color);
+						}
+					}
+				}
+			}
+
+			.swiper {
+				padding: 20rpx;
+				width: 100%;
+				white-space: nowrap;
+				box-sizing: border-box;
+
+				.swiper-item {
+					display: flex;
+					align-items: center;
+				}
+
+				.item {
+					width: 200rpx;
+					box-sizing: border-box;
+				}
+			}
+
+			&.style-2 {
+				.item {
+					width: 212rpx;
+
+					&:nth-child(3n + 3) {
+						width: 210rpx;
+					}
+
+					.img-wrap {
+						width: 212rpx;
+						height: 212rpx;
+
+						>image {
+							width: 212rpx !important;
+						}
+					}
+
+					.price-wrap {
+						text-align: center;
+						margin-top: 0 !important;
+						margin-bottom: 10rpx;
+					}
+
+					.sale-num {
+						text-align: center;
+						color: #666666;
+						line-height: 1;
+					}
+				}
+
+				.scroll {
+					padding: 0;
+					width: auto;
+				}
+
+				.swiper {
+					padding: 0;
+				}
+			}
+
+			&.style-3 {
+				.other-info-wrap {
+					width: 100%;
+					display: flex;
+					justify-content: space-between;
+					align-items: center;
+				}
+
+				.sale-action {
+					font-size: $font-size-tag;
+					width: 94rpx;
+					height: 44rpx;
+					background: linear-gradient(131deg, #3edb73 0%, #1db576 100%);
+					border-radius: 8rpx;
+					color: #fff;
+					text-align: center;
+					line-height: 44rpx;
+					transform: scale(0.9);
+				}
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/components/diy-components/diy-presale.vue b/components/diy-components/diy-presale.vue
new file mode 100644
index 0000000..4798511
--- /dev/null
+++ b/components/diy-components/diy-presale.vue
@@ -0,0 +1,435 @@
+<template>
+	<x-skeleton :type="skeletonType" :loading="loading" :configs="skeletonConfig">
+		<view class="diy-presale" v-if="list.length" :class="[value.template, value.style]" :style="warpCss">
+			<template v-if="value.template == 'row1-of1'">
+				<view class="item" v-for="(item, index) in list" :key="index" @click="toDetail(item)" :class="[value.ornament.type]" :style="goodsItemCss">
+					<view class="img-wrap" :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }">
+						<image :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }" :src="$util.img(item.goods_image, { size: 'mid' })" mode="widthFix" @error="imageError(index)"/>
+					</view>
+					<view class="content" v-if="value.goodsNameStyle.control || value.priceStyle.mainControl || value.btnStyle.control">
+						<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 class="discount-price" v-if="value.priceStyle.mainControl">
+							<text class="unit price-style small" :style="{ color: value.theme == 'diy' ? value.priceStyle.mainColor + '!important' : '' }">¥</text>
+							<text class="price price-style large" :style="{ color: value.theme == 'diy' ? value.priceStyle.mainColor + '!important' : '' }">
+								{{ showPrice(item).split('.')[0] }}
+							</text>
+							<text class="unit price-style small" :style="{ color: value.theme == 'diy' ? value.priceStyle.mainColor + '!important' : '' }">
+								{{ '.' + showPrice(item).split('.')[1] }}
+							</text>
+						</view>
+						<button v-if="value.btnStyle.control" :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'
+						}">
+							{{ value.btnStyle.text }}
+						</button>
+					</view>
+				</view>
+			</template>
+			<template v-if="value.template == 'horizontal-slide'">
+				<scroll-view v-if="value.slideMode == 'scroll'" class="scroll" :scroll-x="true" :show-scrollbar="false">
+					<view class="item" v-for="(item, index) in list" :key="index" @click="toDetail(item)" :class="[value.ornament.type]" :style="goodsItemCss">
+						<view class="img-wrap" :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }">
+							<image :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }" :src="$util.img(item.goods_image, { size: 'mid' })" mode="widthFix" @error="imageError(index)"/>
+						</view>
+						<view :class="['content', { 'multi-content': value.nameLineMode == 'multiple' }]" v-if="value.goodsNameStyle.control || value.priceStyle.mainControl">
+							<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 class="discount-price" v-if="value.priceStyle.mainControl">
+								<text class="unit price-style small" :style="{ color: value.theme == 'diy' ? value.priceStyle.mainColor + '!important' : '' }">¥</text>
+								<text class="price price-style large" :style="{ color: value.theme == 'diy' ? value.priceStyle.mainColor + '!important' : '' }">
+									{{ showPrice(item).split('.')[0] }}
+								</text>
+								<text class="unit price-style small" :style="{ color: value.theme == 'diy' ? value.priceStyle.mainColor + '!important' : '' }">
+									{{ '.' + showPrice(item).split('.')[1] }}
+								</text>
+							</view>
+						</view>
+					</view>
+				</scroll-view>
+
+				<swiper v-if="value.slideMode == 'slide'" :autoplay="false" class="swiper" :style="{ height: swiperHeight }">
+					<swiper-item v-for="(pageItem, pageIndex) in page" :key="pageIndex" :class="['swiper-item', (list.length && [list[pageIndex].length / 3] >= 1) && 'flex-between']">
+						<view class="item" v-for="(item, dataIndex) in list[pageIndex]" :key="dataIndex" @click="toDetail(item)" :class="[value.ornament.type]" :style="goodsItemCss">
+							<view class="img-wrap" :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }">
+								<image :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }" :src="$util.img(item.goods_image, { size: 'mid' })" mode="widthFix" @error="imageError(dataIndex)"/>
+							</view>
+							<view :class="['content', { 'multi-content': value.nameLineMode == 'multiple' }]" v-if="value.goodsNameStyle.control || value.priceStyle.mainControl">
+								<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 class="discount-price" v-if="value.priceStyle.mainControl">
+									<text class="unit price-style small" :style="{ color: value.theme == 'diy' ? value.priceStyle.mainColor + '!important' : '' }">¥</text>
+									<text class="price price-style large" :style="{ color: value.theme == 'diy' ? value.priceStyle.mainColor + '!important' : '' }">
+										{{ showPrice(item).split('.')[0] }}
+									</text>
+									<text class="unit price-style small" :style="{ color: value.theme == 'diy' ? value.priceStyle.mainColor + '!important' : '' }">
+										{{ '.' + showPrice(item).split('.')[1] }}
+									</text>
+								</view>
+							</view>
+						</view>
+					</swiper-item>
+				</swiper>
+			</template>
+		</view>
+	</x-skeleton>
+</template>
+
+<script>
+	export default {
+		name: 'diy-presale',
+		props: {
+			value: {
+				type: Object
+			}
+		},
+		data() {
+			return {
+				loading: true,
+				skeletonType:'',
+				skeletonConfig: {},
+				list: [],
+				page: 1
+			};
+		},
+		created() {
+			this.initSkeleton();
+			this.getData();
+		},
+		watch: {
+			// 组件刷新监听
+			componentRefresh: function(nval) {
+				this.getData();
+			}
+		},
+		computed: {
+			warpCss() {
+				var obj = '';
+				obj += 'background-color:' + this.value.componentBgColor + ';';
+				if (this.value.componentAngle == 'round') {
+					obj += 'border-top-left-radius:' + this.value.topAroundRadius * 2 + 'rpx;';
+					obj += 'border-top-right-radius:' + this.value.topAroundRadius * 2 + 'rpx;';
+					obj += 'border-bottom-left-radius:' + this.value.bottomAroundRadius * 2 + 'rpx;';
+					obj += 'border-bottom-right-radius:' + this.value.bottomAroundRadius * 2 + 'rpx;';
+				}
+				return obj;
+			},
+			// 商品项样式
+			goodsItemCss() {
+				var obj = '';
+				obj += 'background-color:' + this.value.elementBgColor + ';';
+				if (this.value.elementAngle == 'round') {
+					obj += 'border-top-left-radius:' + this.value.topElementAroundRadius * 2 + 'rpx;';
+					obj += 'border-top-right-radius:' + this.value.topElementAroundRadius * 2 + 'rpx;';
+					obj += 'border-bottom-left-radius:' + this.value.bottomElementAroundRadius * 2 + 'rpx;';
+					obj += 'border-bottom-right-radius:' + this.value.bottomElementAroundRadius * 2 + 'rpx;';
+				}
+				if (this.value.ornament.type == 'shadow') {
+					obj += 'box-shadow:' + '0 0 10rpx ' + this.value.ornament.color + ';';
+				}
+				if (this.value.ornament.type == 'stroke') {
+					obj += 'border:' + '2rpx solid ' + this.value.ornament.color + ';';
+				}
+				const screenWidth = uni.getSystemInfoSync().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);
+					else width = [screenWidth - this.rpxUpPx(20) * 2 - this.rpxUpPx(200) * 3 - this.rpxUpPx(this.value
+						.margin.both * 2) * 2] / 6;
+					obj += 'margin-right:' + width + 'px;';
+					obj += 'margin-left:' + width + 'px;';
+				}
+				return obj;
+			},
+			swiperHeight() {
+				if (this.value.nameLineMode == 'multiple') {
+					return this.value.ornament.type == 'shadow' ? '390rpx' : '382rpx';
+				}
+				return this.value.ornament.type == 'shadow' ? '364rpx' : '348rpx';
+			}
+		},
+		methods: {
+			initSkeleton() {
+				if (this.value.template == 'row1-of1') {
+
+					// 单列 风格
+					this.skeletonType = 'list';
+					this.skeletonConfig = {
+						textRows: 2
+					};
+
+				} else if (this.value.template == 'horizontal-slide') {
+
+					// 横向滑动 风格
+					this.skeletonType = 'waterfall';
+					this.skeletonConfig = {
+						gridRows: 1,
+						gridColumns: 3,
+						headHeight: '200rpx',
+						textRows: 2,
+						textWidth: ['100%', '80%']
+					};
+
+				}
+			},
+			rpxUpPx(res) {
+				const screenWidth = uni.getSystemInfoSync().windowWidth;
+				var data = (screenWidth * parseInt(res)) / 750;
+				return Math.floor(data);
+			},
+			getData() {
+				var data = {
+					num: this.value.count
+				};
+				if (this.value.sources == 'diy') {
+					data.num = 0;
+					data.goods_id_arr = this.value.goodsId.toString();
+				}
+				this.$api.sendRequest({
+					url: '/presale/api/goods/lists',
+					data: data,
+					success: res => {
+						if (res.code == 0 && res.data) {
+							this.list = res.data;
+
+							// 切屏滚动，每页显示固定数量
+							if (this.value.template == 'horizontal-slide' && this.value.slideMode == 'slide') {
+								let size = 3;
+								let temp = [];
+								this.page = Math.ceil(this.list.length / size);
+								for (var i = 0; i < this.page; i++) {
+									temp[i] = [];
+									for (var j = i * size; j < this.list.length; j++) {
+										if (temp[i].length == size) break;
+										temp[i].push(this.list[j]);
+									}
+								}
+								this.list = temp;
+							}
+						}
+						this.loading = false;
+					}
+				});
+			},
+			toDetail(e) {
+				this.$util.redirectTo('/pages_promotion/presale/detail', {
+					id: e.presale_id
+				});
+			},
+			imageError(index) {
+				this.list[index].goods_image = this.$util.getDefaultImage().goods;
+				this.$forceUpdate();
+			},
+			showPrice(data) {
+				let price = data.price;
+				if (data.member_price && parseFloat(data.member_price) < parseFloat(price)) price = data.member_price;
+				return price;
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	/deep/.uni-scroll-view ::-webkit-scrollbar {
+		/* 隐藏滚动条，但依旧具备可以滚动的功能 */
+		display: none;
+		width: 0;
+		height: 0;
+		color: transparent;
+		background: transparent;
+	}
+
+	/deep/::-webkit-scrollbar {
+		display: none;
+		width: 0;
+		height: 0;
+		color: transparent;
+		background: transparent;
+	}
+
+	scroll-view ::-webkit-scrollbar {
+		width: 0;
+		height: 0;
+		background-color: transparent;
+		touch-action: none;
+	}
+
+	.diy-presale {
+		&.row1-of1 {
+			.item {
+				display: flex;
+				margin-bottom: 20rpx;
+				padding: 16rpx;
+
+				&.shadow {
+					margin: 8rpx 8rpx 20rpx 8rpx;
+				}
+
+				&:last-child {
+					margin-bottom: 0;
+				}
+
+				.img-wrap {
+					width: 200rpx;
+					height: 200rpx;
+
+					>image {
+						width: 200rpx;
+					}
+				}
+
+				.content {
+					flex: 1;
+					margin-left: 20rpx;
+					position: relative;
+					padding: 6rpx 0;
+
+					.goods-name {
+						line-height: 1.5;
+					}
+
+					.discount-price {
+						white-space: nowrap;
+						font-weight: bold;
+						position: absolute;
+						bottom: 10rpx;
+						left: 0;
+
+						.unit {
+							font-size: $font-size-tag;
+							margin-right: 4rpx;
+							color: $base-color;
+						}
+
+						.price {
+							font-size: $font-size-toolbar;
+							color: $base-color;
+						}
+					}
+
+					button {
+						position: absolute;
+						bottom: 10rpx;
+						right: 20rpx;
+						margin: 0;
+						padding: 0 20rpx;
+						background-color: $base-color;
+						color: #fff;
+						min-width: 112rpx;
+						height: 52rpx;
+						line-height: 52rpx;
+						font-size: $font-size-tag;
+					}
+				}
+			}
+		}
+
+		&.horizontal-slide {
+			.scroll {
+				width: calc(100% - 40rpx);
+				padding: 20rpx;
+				line-height: 1;
+				white-space: nowrap;
+
+				.item.shadow {
+					margin-bottom: 8rpx;
+				}
+			}
+
+			.flex-between {
+				justify-content: space-between;
+			}
+
+			.item {
+				display: inline-block;
+				width: 200rpx;
+				overflow: hidden;
+				box-sizing: border-box;
+
+				&:nth-child(3n + 3) {
+					width: 198rpx;
+				}
+
+				&.shadow {
+					margin-top: 8rpx;
+				}
+
+				.img-wrap {
+					width: 200rpx;
+					height: 200rpx;
+					margin: 0 auto;
+
+					>image {
+						width: 200rpx;
+					}
+				}
+
+				.content {
+					padding: 10rpx;
+					display: flex;
+					flex-direction: column;
+					justify-content: space-between;
+
+					&.multi-content {
+						height: 134rpx;
+						box-sizing: border-box;
+					}
+
+					.goods-name {
+						line-height: 1.3;
+
+						&.multi-hidden {
+							white-space: break-spaces;
+						}
+					}
+
+					.discount-price {
+						white-space: nowrap;
+						margin-top: auto;
+						font-weight: bold;
+						line-height: 1;
+
+						.unit {
+							font-size: $font-size-tag;
+							margin-right: 4rpx;
+							color: $base-color;
+						}
+
+						.price {
+							font-size: $font-size-toolbar;
+							color: $base-color;
+						}
+					}
+				}
+			}
+
+			.swiper {
+				padding: 20rpx;
+				width: 100%;
+				white-space: nowrap;
+				box-sizing: border-box;
+
+				.swiper-item {
+					display: flex;
+					align-items: center;
+				}
+
+				.item {
+					width: 200rpx;
+				}
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/components/diy-components/diy-quick-nav.vue b/components/diy-components/diy-quick-nav.vue
new file mode 100644
index 0000000..cceb9ac
--- /dev/null
+++ b/components/diy-components/diy-quick-nav.vue
@@ -0,0 +1,116 @@
+<template>
+	<view :style="componentStyle">
+		<scroll-view class="quick-nav" scroll-x="true">
+			<!-- #ifdef MP -->
+			<view class="uni-scroll-view-content">
+				<!-- #endif -->
+				<view
+					class="quick-nav-item"
+					v-for="(item, index) in value.list"
+					:key="index"
+					@click="redirectTo(item.link)"
+					:style="{ background: 'linear-gradient(to right,' + item.bgColorStart ? item.bgColorStart : '' + ',' + item.bgColorEnd ? item.bgColorEnd : '' + ')' }"
+				>
+					<view class="quick-img" v-if="item.imageUrl || item.icon">
+						<image v-if="item.iconType == 'img'" :src="$util.img(item.imageUrl) || $util.img('public/uniapp/default_img/goods.png')" mode="heightFix" :show-menu-by-longpress="true"></image>
+						<diy-icon v-if="item.iconType == 'icon'" :icon="item.icon" :value="item.style ? item.style : null" :style="{ fontSize: '60rpx' }"></diy-icon>
+					</view>
+					<text class="quick-text" :style="{ color: item.textColor }">{{ item.title }}</text>
+				</view>
+
+				<!-- #ifdef MP -->
+			</view>
+			<!-- #endif -->
+		</scroll-view>
+		<ns-login ref="login"></ns-login>
+	</view>
+</template>
+
+<script>
+export default {
+	name: 'diy-quick-nav',
+	props: {
+		value: {
+			type: Object
+		}
+	},
+	data() {
+		return {};
+	},
+	created() {},
+	watch: {
+		// 组件刷新监听
+		componentRefresh: function(nval) {}
+	},
+	computed: {
+		componentStyle() {
+			var css = '';
+			css += 'background-color:' + this.value.componentBgColor + ';';
+			if (this.value.componentAngle == 'round') {
+				css += 'border-top-left-radius:' + this.value.topAroundRadius * 2 + 'rpx;';
+				css += 'border-top-right-radius:' + this.value.topAroundRadius * 2 + 'rpx;';
+				css += 'border-bottom-left-radius:' + this.value.bottomAroundRadius * 2 + 'rpx;';
+				css += 'border-bottom-right-radius:' + this.value.bottomAroundRadius * 2 + 'rpx;';
+			}
+			css += 'box-shadow:' + (this.value.ornament.type == 'shadow' ? '0 0 10rpx ' + this.value.ornament.color : '') + ';';
+			css += 'border:' + (this.value.ornament.type == 'stroke' ? '2rpx solid ' + this.value.ornament.color : '') + ';';
+			return css;
+		}
+	},
+	methods: {
+		redirectTo(link) {
+			if (link.wap_url) {
+				if (this.$util.getCurrRoute() == 'pages/member/index' && !this.storeToken) {
+					this.$refs.login.open(link.wap_url);
+					return;
+				}
+			}
+			this.$util.diyRedirectTo(link);
+		}
+	}
+};
+</script>
+<style>
+.quick-nav >>> .uni-scroll-view-content {
+	display: flex;
+}
+</style>
+<style lang="scss">
+.quick-nav {
+	.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;
+		&:first-of-type{
+			padding-left: 12rpx;
+		}
+		&:last-child {
+			margin-right: 0;
+		}
+
+		.quick-img {
+			margin-right: 6rpx;
+			height: 30rpx;
+			line-height: 1;
+			image {
+				width: 30rpx;
+				height: 30rpx;
+			}
+		}
+
+		.quick-text {
+			white-space: nowrap;
+			text-overflow: ellipsis;
+			overflow: hidden;
+			width: 100%;
+			font-size: 24rpx;
+			line-height: 1;
+		}
+	}
+}
+</style>
diff --git a/components/diy-components/diy-rich-text.vue b/components/diy-components/diy-rich-text.vue
new file mode 100644
index 0000000..de28770
--- /dev/null
+++ b/components/diy-components/diy-rich-text.vue
@@ -0,0 +1,56 @@
+<template>
+	<view class="rich-text-box" :style="richTextWarpCss">
+		<rich-text :nodes="html"></rich-text>
+	</view>
+</template>
+
+<script>
+// 富文本
+import htmlParser from '@/common/js/html-parser';
+export default {
+	name: 'diy-rich-text',
+	props: {
+		value: {
+			type: Object
+		}
+	},
+	data() {
+		return {
+			html: ''
+		};
+	},
+	created() {
+		this.html = htmlParser(this.value.html);
+	},
+	watch: {
+		// 组件刷新监听
+		componentRefresh: function(nval) {}
+	},
+	computed: {
+		richTextWarpCss: function() {
+			var obj = '';
+			obj += 'background-color:' + this.value.componentBgColor + ';';
+			if (this.value.componentAngle == 'round') {
+				obj += 'border-top-left-radius:' + this.value.topAroundRadius * 2 + 'rpx;';
+				obj += 'border-top-right-radius:' + this.value.topAroundRadius * 2 + 'rpx;';
+				obj += 'border-bottom-left-radius:' + this.value.bottomAroundRadius * 2 + 'rpx;';
+				obj += 'border-bottom-right-radius:' + this.value.bottomAroundRadius * 2 + 'rpx;';
+			}
+			return obj;
+		}
+	},
+	mounted() {},
+	methods: {}
+};
+</script>
+
+<style lang="scss">
+.rich-text-box {
+	padding: $padding;
+	box-sizing: border-box;
+	height: auto;
+	line-height: 1.5;
+	white-space: pre-wrap;
+	word-break: break-all;
+}
+</style>
diff --git a/components/diy-components/diy-rubik-cube.vue b/components/diy-components/diy-rubik-cube.vue
new file mode 100644
index 0000000..efe0bf5
--- /dev/null
+++ b/components/diy-components/diy-rubik-cube.vue
@@ -0,0 +1,514 @@
+<template>
+	<view>
+		<!-- 自定义 -->
+		<view v-if="value.mode == 'custom-rubik-cube'">
+			<view style="position: relative;"><rich-text :nodes="customHtml"></rich-text></view>
+		</view>
+		<view v-else :class="['rubik-cube', value.mode]" :style="rubikCubeWrapCss">
+			<!-- 1左2右 -->
+			<template v-if="value.mode == 'row1-lt-of2-rt'">
+				<view class="template-left">
+					<view :class="['item', value.mode]" @click="$util.diyRedirectTo(value.list[0].link)" :style="{ marginRight: value.imageGap * 2 + 'rpx', width: list[0].imgWidth, height: list[0].imgHeight + 'px' }">
+						<image :src="$util.img(value.list[0].imageUrl)" :mode="list[0].imageMode || 'scaleToFill'" :style="list[0].pageItemStyle" :show-menu-by-longpress="true"/>
+					</view>
+				</view>
+
+				<view class="template-right">
+					<template v-for="(item, index) in list">
+						<template v-if="index > 0">
+							<view :key="index" :class="['item', value.mode]" @click="$util.diyRedirectTo(item.link)" :style="{ marginBottom: value.imageGap * 2 + 'rpx', width: item.imgWidth, height: item.imgHeight + 'px' }">
+								<image :src="$util.img(item.imageUrl)" :mode="item.imageMode || 'scaleToFill'" :style="item.pageItemStyle" :show-menu-by-longpress="true"/>
+							</view>
+						</template>
+					</template>
+				</view>
+			</template>
+
+			<!-- 1左3右 -->
+			<template v-else-if="value.mode == 'row1-lt-of1-tp-of2-bm'">
+				<view class="template-left">
+					<view :class="['item', value.mode]" :style="{ marginRight: value.imageGap * 2 + 'rpx', width: list[0].imgWidth, height: list[0].imgHeight + 'px' }" @click="$util.diyRedirectTo(value.list[0].link)">
+						<image :src="$util.img(value.list[0].imageUrl)" :mode="list[0].imageMode || 'scaleToFill'" :style="list[0].pageItemStyle" :show-menu-by-longpress="true"/>
+					</view>
+				</view>
+
+				<view class="template-right">
+					<view :class="['item', value.mode]" :style="{ marginBottom: value.imageGap * 2 + 'rpx', width: list[1].imgWidth, height: list[1].imgHeight + 'px' }" @click="$util.diyRedirectTo(value.list[1].link)">
+						<image :src="$util.img(value.list[1].imageUrl)" :mode="list[1].imageMode || 'scaleToFill'" :style="list[1].pageItemStyle" :show-menu-by-longpress="true"/>
+					</view>
+					<view class="template-bottom">
+						<template v-for="(item, index) in list">
+							<template v-if="index > 1">
+								<view :key="index" :class="['item', value.mode]" @click="$util.diyRedirectTo(item.link)"
+									:style="{
+										marginRight: value.imageGap * 2 + 'rpx',
+										width: item.imgWidth,
+										height: item.imgHeight + 'px'
+									}">
+									<image :src="$util.img(item.imageUrl)" :mode="item.imageMode || 'scaleToFill'" :style="item.pageItemStyle" :show-menu-by-longpress="true"/>
+								</view>
+							</template>
+						</template>
+					</view>
+				</view>
+			</template>
+
+			<template v-else>
+				<view :class="['item', value.mode]" v-for="(item, index) in list" :key="index"
+					@click="$util.diyRedirectTo(item.link)"
+					:style="{ marginRight: value.imageGap * 2 + 'rpx', marginBottom: value.imageGap * 2 + 'rpx', width: item.widthStyle, height: item.imgHeight + 'px' }">
+					<image :src="$util.img(item.imageUrl)" :mode="item.imageMode || 'scaleToFill'" :style="item.pageItemStyle" :show-menu-by-longpress="true"/>
+				</view>
+			</template>
+		</view>
+	</view>
+</template>
+
+<script>
+	// 魔方、橱窗
+	import htmlParser from '@/common/js/html-parser';
+	export default {
+		name: 'diy-rubik-cube',
+		props: {
+			value: {
+				type: Object,
+				default: () => {
+					return {};
+				}
+			}
+		},
+		data() {
+			return {
+				customHtml: ''
+			};
+		},
+		created() {
+			if (this.value.mode == 'custom-rubik-cube') {
+				this.value.diyHtml = this.value.diyHtml.replace(/&quot;/g, '"');
+				this.customHtml = htmlParser(this.value.diyHtml);
+			} else {
+				var singleRow = {
+					'row1-of2': {
+						ratio: 2,
+						width: 'calc((100% - ' + uni.upx2px(this.value.imageGap * 2) + 'px) / 2)'
+					},
+					'row1-of3': {
+						ratio: 3,
+						width: 'calc((100% - ' + uni.upx2px(this.value.imageGap * 4) + 'px) / 3)'
+					},
+					'row1-of4': {
+						ratio: 4,
+						width: 'calc((100% - ' + uni.upx2px(this.value.imageGap * 6) + 'px) / 4)'
+					}
+				};
+
+				if (singleRow[this.value.mode]) {
+					this.calcSingleRow(singleRow[this.value.mode]);
+				} else if (this.value.mode == 'row2-lt-of2-rt') {
+					this.calcFourSquare();
+				} else if (this.value.mode == 'row1-lt-of2-rt') {
+					this.calcRowOneLeftOfTwoRight();
+				} else if (this.value.mode == 'row1-tp-of2-bm') {
+					this.calcRowOneTopOfTwoBottom();
+				} else if (this.value.mode == 'row1-lt-of1-tp-of2-bm') {
+					this.calcRowOneLeftOfOneTopOfTwoBottom();
+				}
+			}
+		},
+		watch: {
+			// 组件刷新监听
+			componentRefresh: function(nval) {}
+		},
+		computed: {
+			list() {
+				var arr = JSON.parse(JSON.stringify(this.value.list));
+				arr.forEach((item, index) => {
+					item.pageItemStyle = this.countBorderRadius(this.value.mode, index);
+				});
+				return arr;
+			},
+			rubikCubeWrapCss() {
+				var obj = '';
+				obj += 'background-color:' + this.value.componentBgColor + ';';
+				if (this.value.componentAngle == 'round') {
+					obj += 'border-top-left-radius:' + this.value.topAroundRadius * 2 + 'rpx;';
+					obj += 'border-top-right-radius:' + this.value.topAroundRadius * 2 + 'rpx;';
+					obj += 'border-bottom-left-radius:' + this.value.bottomAroundRadius * 2 + 'rpx;';
+					obj += 'border-bottom-right-radius:' + this.value.bottomAroundRadius * 2 + 'rpx;';
+				}
+				return obj;
+			}
+		},
+		methods: {
+			/**
+			 * 魔方：单行多个，平分宽度
+			 * 公式：
+			 * 宽度：屏幕宽度/2，示例：375/2=187.5
+			 * 比例：原图高/原图宽，示例：322/690=0.46
+			 * 高度：宽度*比例，示例：187.5*0.46=86.25
+			 */
+			calcSingleRow(params) {
+				uni.getSystemInfo({
+					success: res => {
+						let maxHeight = 0;
+
+						this.list.forEach((item, index) => {
+							var ratio = item.imgHeight / item.imgWidth;
+
+							let width = res.windowWidth - uni.upx2px(this.value.margin.both *
+								2); // 减去左右间距
+							if (this.value.imageGap > 0) {
+								width -= uni.upx2px(params.ratio * this.value.imageGap * 2); // 减去间隙
+							}
+							item.imgWidth = width / params.ratio;
+							item.imgHeight = item.imgWidth * ratio;
+
+							if (maxHeight == 0 || maxHeight < item.imgHeight) maxHeight = item
+								.imgHeight;
+						})
+
+						this.list.forEach((item, index) => {
+							item.widthStyle = params.width;
+							item.imgHeight = maxHeight;
+						});
+					}
+				})
+			},
+			/**
+			 * 魔方：四方型，各占50%
+			 */
+			calcFourSquare() {
+				uni.getSystemInfo({
+					success: res => {
+						let maxHeightFirst = 0;
+						let maxHeightTwo = 0;
+						this.list.forEach((item, index) => {
+							var ratio = item.imgHeight / item.imgWidth;
+							item.imgWidth = res.windowWidth;
+							item.imgWidth -= uni.upx2px(this.value.margin.both * 4);
+							if (this.value.imageGap > 0) {
+								item.imgWidth -= uni.upx2px(this.value.imageGap * 2);
+							}
+							item.imgWidth = item.imgWidth / 2;
+							item.imgHeight = item.imgWidth * ratio;
+
+
+							// 获取每行最大高度
+							if (index <= 1) {
+								if (maxHeightFirst == 0 || maxHeightFirst < item.imgHeight) {
+									maxHeightFirst = item.imgHeight;
+								}
+							} else if (index > 1) {
+								if (maxHeightTwo == 0 || maxHeightTwo < item.imgHeight) {
+									maxHeightTwo = item.imgHeight;
+								}
+							}
+						});
+						this.list.forEach((item, index) => {
+							item.imgWidth = 'calc((100% - ' + uni.upx2px(this.value.imageGap * 2) +
+								'px) / 2)';
+							item.widthStyle = item.imgWidth;
+							if (index <= 1) {
+								item.imgHeight = maxHeightFirst;
+							} else if (index > 1) {
+								item.imgHeight = maxHeightTwo;
+							}
+						});
+					}
+				});
+			},
+			/**
+			 * 魔方：1左2右
+			 */
+			calcRowOneLeftOfTwoRight() {
+				let rightHeight = 0; // 右侧两图平分高度
+				let divide = 'left'; // 划分规则，left：左，right：右
+				if (this.list[1].imgWidth === this.list[2].imgWidth) divide = 'right';
+				uni.getSystemInfo({
+					success: res => {
+						this.list.forEach((item, index) => {
+							if (index == 0) {
+								var ratio = item.imgHeight / item.imgWidth; // 获取左图的尺寸比例
+								item.imgWidth = res.windowWidth - uni.upx2px(this.value.margin.both * 4) - uni.upx2px(this.value.imageGap * 2);
+								item.imgWidth = item.imgWidth / 2;
+								item.imgHeight = item.imgWidth * ratio;
+								rightHeight = (item.imgHeight - uni.upx2px(this.value.imageGap * 2)) / 2;
+								item.imgWidth += 'px';
+							} else {
+								item.imgWidth = this.list[0].imgWidth;
+								item.imgHeight = rightHeight;
+							}
+						});
+					}
+				});
+			},
+			/**
+			 * 魔方：1上2下
+			 */
+			calcRowOneTopOfTwoBottom() {
+				var maxHeight = 0;
+				uni.getSystemInfo({
+					success: res => {
+						this.list.forEach((item, index) => {
+
+							var ratio = item.imgHeight / item.imgWidth; // 获取左图的尺寸比例
+							if (index == 0) {
+								item.imgWidth = res.windowWidth - uni.upx2px(this.value.margin.both * 4);
+							} else if (index > 0) {
+								item.imgWidth = res.windowWidth - uni.upx2px(this.value.margin.both * 4) - uni.upx2px(this.value.imageGap * 2);
+								item.imgWidth = item.imgWidth / 2;
+							}
+
+							item.imgHeight = item.imgWidth * ratio;
+
+							// 获取最大高度
+							if (index > 0 && (maxHeight == 0 || maxHeight < item.imgHeight))
+								maxHeight = item.imgHeight;
+
+						});
+						this.list.forEach((item, index) => {
+							item.imgWidth += 'px';
+							item.widthStyle = item.imgWidth;
+							if (index > 0) item.imgHeight = maxHeight;
+						});
+					}
+				});
+			},
+			/**
+			 * 魔方：1左3右
+			 */
+			calcRowOneLeftOfOneTopOfTwoBottom() {
+				uni.getSystemInfo({
+					success: res => {
+						this.list.forEach((item, index) => {
+							// 左图
+							if (index == 0) {
+								var ratio = item.imgHeight / item.imgWidth; // 获取左图的尺寸比例
+								item.imgWidth = res.windowWidth - uni.upx2px(this.value.margin.both * 4) - uni.upx2px(this.value.imageGap * 2);
+								item.imgWidth = item.imgWidth / 2;
+								item.imgHeight = item.imgWidth * ratio;
+							} else if (index == 1) {
+								item.imgWidth = this.list[0].imgWidth;
+								item.imgHeight = (this.list[0].imgHeight - uni.upx2px(this.value.imageGap * 2)) / 2;
+							} else if (index > 1) {
+								item.imgWidth = (this.list[0].imgWidth - uni.upx2px(this.value.imageGap * 2)) / 2;
+								item.imgHeight = this.list[1].imgHeight;
+							}
+						});
+
+						this.list.forEach((item, index) => {
+							item.imgWidth += 'px';
+							item.imgHeight;
+						});
+					}
+				});
+			},
+			countBorderRadius(type, index) {
+				var obj = '';
+				if (this.value.elementAngle == 'right') {
+					return obj;
+				}
+				var defaultData = {
+					'row1-lt-of2-rt': [
+						['border-top-right-radius', 'border-bottom-right-radius'],
+						['border-top-left-radius', 'border-bottom-left-radius', 'border-bottom-right-radius'],
+						['border-top-left-radius', 'border-bottom-left-radius', 'border-top-right-radius']
+					],
+					'row1-lt-of1-tp-of2-bm': [
+						['border-top-right-radius', 'border-bottom-right-radius'],
+						['border-top-left-radius', 'border-bottom-left-radius', 'border-bottom-right-radius'],
+						['border-radius'],
+						['border-top-left-radius', 'border-bottom-left-radius', 'border-top-right-radius']
+					],
+					'row1-tp-of2-bm': [
+						['border-bottom-left-radius', 'border-bottom-right-radius'],
+						['border-top-left-radius', 'border-bottom-right-radius', 'border-top-right-radius'],
+						['border-top-left-radius', 'border-bottom-left-radius', 'border-top-right-radius']
+					],
+					'row2-lt-of2-rt': [
+						['border-top-right-radius', 'border-bottom-left-radius', 'border-bottom-right-radius'],
+						['border-top-left-radius', 'border-bottom-right-radius', 'border-bottom-left-radius'],
+						['border-top-left-radius', 'border-bottom-right-radius', 'border-top-right-radius'],
+						['border-top-left-radius', 'border-bottom-left-radius', 'border-top-right-radius']
+					],
+					'row1-of4': [
+						['border-top-right-radius', 'border-bottom-right-radius'],
+						['border-radius'],
+						['border-radius'],
+						['border-top-left-radius', 'border-bottom-left-radius']
+					],
+					'row1-of3': [
+						['border-top-right-radius', 'border-bottom-right-radius'],
+						['border-radius'],
+						['border-top-left-radius', 'border-bottom-left-radius']
+					],
+					'row1-of2': [
+						['border-top-right-radius', 'border-bottom-right-radius'],
+						['border-top-left-radius', 'border-bottom-left-radius']
+					]
+				};
+
+				defaultData[type][index].forEach((item, index) => {
+					// obj += item + ':' + this.value.aroundRadius * 2 + 'rpx;';
+					obj += 'border-top-left-radius:' + this.value.topElementAroundRadius * 2 + 'rpx;';
+					obj += 'border-top-right-radius:' + this.value.topElementAroundRadius * 2 + 'rpx;';
+					obj += 'border-bottom-left-radius:' + this.value.bottomElementAroundRadius * 2 + 'rpx;';
+					obj += 'border-bottom-right-radius:' + this.value.bottomElementAroundRadius * 2 + 'rpx;';
+				});
+				return obj;
+			}
+		}
+	};
+</script>
+<style lang="scss">
+	.rubik-cube {
+		overflow: hidden;
+		display: flex;
+		flex-wrap: wrap;
+		justify-content: space-between;
+	}
+
+	.rubik-cube .item {
+		text-align: center;
+		line-height: 0;
+		overflow: hidden;
+	}
+
+	.rubik-cube .item image {
+		width: 100%;
+		max-width: 100%;
+		height: 100%;
+	}
+
+	// 一行两个
+	.rubik-cube .item.row1-of2 {
+		box-sizing: border-box;
+		margin-top: 0 !important;
+		margin-bottom: 0 !important;
+	}
+
+	.rubik-cube .item.row1-of2:nth-child(1) {
+		margin-left: 0 !important;
+	}
+
+	.rubik-cube .item.row1-of2:nth-child(2) {
+		margin-right: 0 !important;
+	}
+
+	// 一行三个
+	.rubik-cube .item.row1-of3 {
+		box-sizing: border-box;
+		margin-top: 0 !important;
+		margin-bottom: 0 !important;
+	}
+
+	.rubik-cube .item.row1-of3:nth-child(1) {
+		margin-left: 0 !important;
+	}
+
+	.rubik-cube .item.row1-of3:nth-child(3) {
+		margin-right: 0 !important;
+	}
+
+	// 一行四个
+	.rubik-cube .item.row1-of4 {
+		box-sizing: border-box;
+		margin-top: 0 !important;
+		margin-bottom: 0 !important;
+	}
+
+	.rubik-cube .item.row1-of4:nth-child(1) {
+		margin-left: 0 !important;
+	}
+
+	.rubik-cube .item.row1-of4:nth-child(4) {
+		margin-right: 0 !important;
+	}
+
+	// 两左两右
+	.rubik-cube .item.row2-lt-of2-rt {
+		// width: 50%;
+		display: inline-block;
+		box-sizing: border-box;
+	}
+
+	.rubik-cube .item.row2-lt-of2-rt:nth-child(1) {
+		margin-left: 0 !important;
+		margin-top: 0 !important;
+	}
+
+	.rubik-cube .item.row2-lt-of2-rt:nth-child(2) {
+		margin-right: 0 !important;
+		margin-top: 0 !important;
+	}
+
+	.rubik-cube .item.row2-lt-of2-rt:nth-child(3) {
+		margin-left: 0 !important;
+		margin-bottom: 0 !important;
+	}
+
+	.rubik-cube .item.row2-lt-of2-rt:nth-child(4) {
+		margin-right: 0 !important;
+		margin-bottom: 0 !important;
+	}
+
+	// 一左两右
+	.rubik-cube .template-left,
+	.rubik-cube .template-right {
+		// width: 50%;
+		box-sizing: border-box;
+	}
+
+	.rubik-cube .template-left .item.row1-lt-of2-rt:nth-child(1) {
+		margin-bottom: 0;
+	}
+
+	.rubik-cube .template-right .item.row1-lt-of2-rt:nth-child(2) {
+		margin-bottom: 0 !important;
+	}
+
+	.rubik-cube.row1-lt-of2-rt .template-right {
+		display: flex;
+		flex-direction: column;
+		justify-content: space-between;
+	}
+
+	// 一上两下
+	.rubik-cube .item.row1-tp-of2-bm:nth-child(1) {
+		width: 100%;
+		box-sizing: border-box;
+		margin-top: 0 !important;
+		margin-left: 0 !important;
+		margin-right: 0 !important;
+	}
+
+	.rubik-cube .item.row1-tp-of2-bm:nth-child(2) {
+		// width: 50%;
+		box-sizing: border-box;
+		margin-left: 0 !important;
+		margin-bottom: 0 !important;
+	}
+
+	.rubik-cube .item.row1-tp-of2-bm:nth-child(3) {
+		// width: 50%;
+		box-sizing: border-box;
+		margin-right: 0 !important;
+		margin-bottom: 0 !important;
+	}
+
+	// 一左三右
+	.rubik-cube .template-left .item.row1-lt-of1-tp-of2-bm {
+		width: 100%;
+		box-sizing: border-box;
+	}
+
+	.rubik-cube .template-bottom {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+	}
+
+	.rubik-cube .template-bottom .item:nth-child(2) {
+		margin-right: 0 !important;
+	}
+</style>
\ No newline at end of file
diff --git a/components/diy-components/diy-search.vue b/components/diy-components/diy-search.vue
new file mode 100644
index 0000000..076b937
--- /dev/null
+++ b/components/diy-components/diy-search.vue
@@ -0,0 +1,336 @@
+<template>
+	<view class="diy-search">
+		<view class="diy-search-wrap" :class="value.positionWay" :style="fixedCss">
+			<view :class="['search-box','search-box-'+value.searchStyle]" :style="searchWrapCss" @click="search()">
+				<block v-if="[1,2].includes(value.searchStyle)">
+					<view class="img" v-if="value.searchStyle == 2 && value.iconType == 'img'">
+						<image :src="$util.img(value.imageUrl)" mode="heightFix"/>
+					</view>
+					<diy-icon class="icon" v-if="value.searchStyle == 2 && value.iconType == 'icon'" :icon="value.icon"
+						:value="value.style ? value.style : 'null'"
+						:style="{ maxWidth: 30 * 2 + 'rpx', maxHeight: 30 * 2 + 'rpx' }"></diy-icon>
+					<view class="search-content" :style="inputStyle">
+						<input type="text" class="uni-input ns-font-size-base" maxlength="50" :placeholder="value.title" v-model="searchText" @confirm="search()" disabled="true" :placeholderStyle="placeholderStyle" />
+						<text class="iconfont icon-sousuo3" @click.stop="search()" :style="{ color: value.textColor ? value.textColor : 'rgba(0,0,0,0)' }"></text>
+					</view>
+				</block>
+				<block v-if="value.searchStyle == 3">
+					<view class="search-content" :style="inputStyle" @click.stop="search()">
+						<text class="iconfont icon-sousuo3" :style="{ color: value.textColor ? value.textColor : 'rgba(0,0,0,0)' }"></text>
+						<input type="text" class="uni-input ns-font-size-base" maxlength="50" :placeholder="value.title" v-model="searchText" @confirm="search()" disabled="true" @click.stop="search()" :placeholderStyle="placeholderStyle" />
+						<text class="search-content-btn" @click.stop="search()" :style="{ 'backgroundColor': value.pageBgColor ? value.pageBgColor : 'rgba(0,0,0,0)' }">搜索</text>
+					</view>
+					<view class="img" v-if="value.iconType == 'img'" @click.stop="redirectTo(value.searchLink)"><image :src="$util.img(value.imageUrl)" mode="heightFix"/>
+					</view>
+					<diy-icon class="icon" v-if="value.iconType == 'icon'" :icon="value.icon"
+						:value="value.style ? value.style : 'null'"
+						:style="{ maxWidth: 30 * 2 + 'rpx', maxHeight: 30 * 2 + 'rpx' }"
+						@click.stop="redirectTo(value.searchLink)"></diy-icon>
+				</block>
+			</view>
+		</view>
+		<!-- 解决fixed定位后导航栏塌陷的问题 -->
+		<view v-if="value.positionWay == 'fixed'" class="u-navbar-placeholder" :style="{ width: '100%', paddingTop: moduleHeight }"></view>
+		<ns-login ref="login"></ns-login>
+	</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: 'diy-search',
+		props: {
+			value: {
+				type: Object,
+				default: () => {
+					return {};
+				}
+			},
+			topNavColor: String,
+			global: {
+				type: Object,
+				default: () => {
+					return {};
+				}
+			},
+			haveTopCategory: {
+				type: Boolean
+			},
+			followOfficialAccount: {
+				type: Object
+			},
+		},
+		data() {
+			return {
+				searchText: '',
+				menuButtonInfo: menuButtonInfo,
+				height: 0,
+				placeholderHeight: 0,
+				moduleHeight: 0
+			};
+		},
+		computed: {
+			fixedCss() {
+				var obj = '';
+				if (this.value.positionWay == 'fixed') {
+					let top = this.fixedTop;
+					// 固定定位
+					if (this.global.topNavBg)
+						obj += 'background-color:' + (this.topNavColor == 'transparent' ? this.value.pageBgColor : this
+							.topNavColor) + ';';
+					else
+						obj += 'background-color:' + this.value.pageBgColor + ';';
+					obj += 'top:' + top + ';';
+					obj += 'padding-top:' + this.value.margin.top * 2 + 'rpx;';
+					obj += 'padding-left:' + this.value.margin.both * 2 + 'rpx;';
+					obj += 'padding-right:' + this.value.margin.both * 2 + 'rpx;';
+					obj += 'padding-bottom:' + this.value.margin.bottom * 2 + 'rpx;';
+
+				}
+				return obj;
+			},
+			searchWrapCss() {
+				var obj = '';
+				obj += 'background-color:' + this.value.componentBgColor + ';';
+				obj += 'text-align:' + this.value.textAlign + ';';
+				return obj;
+			},
+			inputStyle() {
+				var obj = '';
+				obj += 'background-color:' + this.value.elementBgColor + ';';
+				if (this.value.borderType == 2) {
+					obj += 'border-radius:' + '40rpx;';
+				}
+				return obj;
+			},
+			placeholderStyle() {
+				var obj = '';
+				if (this.value.textColor) {
+					obj += 'color:' + this.value.textColor;
+				} else {
+					obj += 'color: rgba(0,0,0,0)';
+				}
+				return obj;
+			},
+			fixedTop() {
+				let diyPositionObj = this.$store.state.diyGroupPositionObj;
+				let data = 0
+				if (diyPositionObj.diySearch && diyPositionObj.diyIndexPage && diyPositionObj.nsNavbar) {
+					if (diyPositionObj.diySearch.moduleIndex > diyPositionObj.diyIndexPage.moduleIndex) {
+						data = diyPositionObj.nsNavbar.originalVal + diyPositionObj.diyIndexPage.originalVal;
+					} else {
+						data = diyPositionObj.nsNavbar.originalVal;
+					}
+				} else if (diyPositionObj.diySearch && diyPositionObj.nsNavbar) {
+					data = diyPositionObj.nsNavbar.originalVal;
+				}
+
+				data += 'px';
+				return data;
+			}
+		},
+		watch: {
+			// 组件刷新监听
+			componentRefresh: function (nval) {
+			}
+		},
+		created() {
+			setTimeout(() => {
+				// 获取组件的高度，默认高度为45（45是在375屏幕上的高度）
+				const query = uni.createSelectorQuery();
+				// #ifdef H5
+				let cssSelect = '.page-header .u-navbar';
+				// #endif
+
+				// #ifdef MP
+				let cssSelect = '.page-header >>> .u-navbar';
+				// #endif
+				query
+					.select(cssSelect)
+					.boundingClientRect(data => {
+						if (this.global.navBarSwitch) {
+							this.height = data ? data.height : 45;
+						} else {
+							this.height = data ? data.height : 0;
+						}
+						// 如果存在分类导航组件，则追加该组件的高度
+						if (this.haveTopCategory) {
+							this.height += 49;
+						}
+					})
+					.exec();
+			});
+			if (this.value.positionWay == 'fixed') this.navbarPlaceholderHeight();
+		},
+		mounted() {
+			if (this.value.positionWay == 'fixed')
+				this.setModuleLocatinoFn();
+		},
+		methods: {
+			search() {
+				this.$util.redirectTo('/pages_tool/goods/search');
+			},
+			redirectTo(link) {
+				if (link.wap_url) {
+					if (this.$util.getCurrRoute() == 'pages/member/index' && !this.storeToken) {
+						this.$refs.login.open(link.wap_url);
+						return;
+					}
+				}
+				this.$util.diyRedirectTo(link);
+			},
+			navbarPlaceholderHeight() {
+				let height = 0;
+				setTimeout(() => {
+					const query = uni.createSelectorQuery().in(this);
+					query.select('.diy-search-wrap')
+						.boundingClientRect(data => {
+							// 获取搜索框自身高度
+							this.placeholderHeight = data.height;
+							// 通过搜索框自身高度 - 定位模式下的多出的padding-bottom高度
+							if (this.placeholderHeight) this.placeholderHeight -= this.value.margin.bottom;
+						}).exec();
+				});
+			},
+			// 向vuex中的diyIndexPositionObj增加搜索组件定位位置
+			setModuleLocatinoFn() {
+				this.$nextTick(() => {
+					const query = uni.createSelectorQuery().in(this);
+					query.select('.diy-search-wrap')
+						.boundingClientRect(data => {
+							let diySearch = {
+								originalVal: data.height || 0, //自身高度 px
+								currVal: 0, //定位高度
+								moduleIndex: this.value.moduleIndex //组件在diy-group的位置
+							};
+							this.moduleHeight = (data.height || 0) + 'px';
+							this.$store.commit('setDiyGroupPositionObj', {
+								'diySearch': diySearch
+							});
+						}).exec();
+				})
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	/deep/ .uni-input-placeholder {
+		overflow: initial;
+	}
+
+	.diy-search-wrap {
+		overflow: hidden;
+	}
+
+	.fixed {
+		position: fixed;
+		left: 0;
+		right: 0;
+		top: 0;
+		z-index: 991;
+		transition: background 0.3s;
+	}
+
+	.search-box {
+		position: relative;
+		display: flex;
+		align-items: center;
+
+		.img {
+			height: 60rpx;
+			margin-right: 20rpx;
+
+			image {
+				width: 100%;
+				height: 100%;
+			}
+		}
+
+		.icon {
+			width: 170rpx;
+			height: 60rpx;
+			margin-right: 20rpx;
+		}
+	}
+
+	.search-box-3 {
+		.search-content {
+			display: flex;
+			align-items: center;
+			height: 68rpx;
+
+			.iconfont {
+				position: initial;
+				transform: translateY(0);
+				width: auto;
+				margin-left: 26rpx;
+				margin-right: 12rpx;
+				font-size: $font-size-base;
+				line-height: 1;
+			}
+
+			.uni-input {
+				flex: 1;
+				padding-left: 0;
+				height: 68rpx;
+			}
+
+			.search-content-btn {
+				margin-right: 8rpx;
+				width: 116rpx;
+				height: 54rpx;
+				line-height: 54rpx;
+				text-align: center;
+				color: #fff;
+				border-radius: 30rpx;
+			}
+		}
+
+		.diy-icon {
+			margin-left: 20rpx;
+			margin-right: 0;
+			width: auto;
+			font-size: 74rpx;
+		}
+
+		.img {
+			margin-left: 20rpx;
+			margin-right: 0;
+		}
+	}
+
+	.search-content {
+		flex: 1;
+	}
+
+	.search-content input {
+		box-sizing: border-box;
+		display: block;
+		height: 64rpx;
+		width: 100%;
+		padding: 0 20rpx 0 40rpx;
+		color: #333333;
+		background: none;
+	}
+
+	.search-content .iconfont {
+		position: absolute;
+		top: 50%;
+		right: 4rpx;
+		transform: translateY(-50%);
+		font-size: 30rpx;
+		z-index: 10;
+		width: 80rpx;
+		font-weight: bold;
+		text-align: center;
+	}
+</style>
\ No newline at end of file
diff --git a/components/diy-components/diy-seckill.vue b/components/diy-components/diy-seckill.vue
new file mode 100644
index 0000000..a431fa3
--- /dev/null
+++ b/components/diy-components/diy-seckill.vue
@@ -0,0 +1,1182 @@
+<template>
+	<x-skeleton :type="skeletonType" :loading="loading" :configs="skeletonConfig">
+		<view class="diy-seckill" v-if="timeList.length > 1 || (timeList.length == 1 && dataList.length)" :class="[value.template, value.style]" :style="wrapStyle">
+			<view v-if="value.titleStyle.isShow && dataList && dataList.length" :class="['title-wrap', value.titleStyle.style]" :style="{
+				backgroundImage:
+					'url(' + $util.img(value.titleStyle.backgroundImage) + '), linear-gradient(to right,' + value.titleStyle.bgColorStart + ',' + value.titleStyle.bgColorEnd + ')'
+			}">
+				<view v-if="value.titleStyle.leftStyle == 'text'" :style="{ fontSize: value.titleStyle.fontSize * 2 + 'rpx', color: value.titleStyle.textColor, fontWeight: value.titleStyle.fontWeight ? 'bold' : '' }">
+					{{ value.titleStyle.leftText }}
+				</view>
+				<image v-else class="title-img" :src="$util.img(value.titleStyle.leftImg)" mode="heightFix"/>
+				<text v-if="value.titleStyle.style == 'style-2' && isFuture" :style="{ color: value.titleStyle.textColor }" class="seckill-style-name">距离开始</text>
+				<view class="time" :style="{ background: value.titleStyle.timeBgColor }">
+					<text :style="{ color: value.titleStyle.textColor }" class="seckill-title-name text">{{ isFuture ? '距离开始' : '距离结束' }}</text>
+					<text v-if="value.titleStyle.timeImageUrl" :class="['seckill-title-name icon', value.titleStyle.timeImageUrl]"></text>
+					<text class="hour number" :style="titleTimeStyle">{{ seckillH ? seckillH : '00' }}</text>
+					<text class="symbol" :style="{ color: value.titleStyle.colonColor }">:</text>
+					<text class="minute number" :style="titleTimeStyle">{{ seckillI ? seckillI : '00' }}</text>
+					<text class="symbol" :style="{ color: value.titleStyle.colonColor }">:</text>
+					<text class="second number" :style="titleTimeStyle">{{ seckillS ? seckillS : '00' }}</text>
+				</view>
+				<view class="marketimg-box-title-right" v-if="value.titleStyle.moreSupport" :style="{ fontSize: value.titleStyle.moreFontSize * 2 + 'rpx', color: value.titleStyle.moreColor }" @click="toMore">
+					<text>{{ value.titleStyle.more }}</text>
+					<text class="iconfont icon-right"></text>
+				</view>
+			</view>
+
+			<view class="content-wrap">
+				<template v-if="value.template == 'row1-of1'">
+					<view class="item" v-for="(item, index) in dataList" :key="index" @click="toDetail(item.id)" :class="[value.ornament.type]" :style="goodsItemCss">
+						<view class="img-wrap" :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }">
+							<image :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }" :src="$util.img(item.goods_image, { size: 'mid' })" mode="widthFix" @error="imageError(index)"/>
+						</view>
+						<view class="content">
+							<view class="goods-name" v-if="value.goodsNameStyle.control"
+								: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 class="progress" v-if="value.progressStyle.control">
+								<view class="bg" :style="{ backgroundColor: value.theme == 'diy' ? value.progressStyle.bgColor : '' }">
+									<view class="curr" :style="{
+										backgroundColor: value.theme == 'diy' ? value.progressStyle.currColor : '',
+										width: (item.goods_stock + item.sale_num ? Math.floor((item.sale_num / (item.goods_stock + item.sale_num)) * 240) : 0) + 'rpx'
+									}">
+										<image v-if="value.style == 'style-2'" class="progress-bar" :src="$util.img('public/uniapp/seckill/progress_bar_01.png')" mode="widthFix"/>
+									</view>
+								</view>
+								<view class="num" :style="{ color: value.theme == 'diy' ? value.saleStyle.color : '', borderColor: value.theme == 'diy' ? value.saleStyle.color : '' }">
+									已抢{{ item.goods_stock + item.sale_num ? ((item.sale_num / (item.goods_stock + item.sale_num)) * 100).toFixed(2) : '0.00' }}%
+								</view>
+							</view>
+							<view class="bottom-wrap">
+								<view class="price-wrap">
+									<view class="discount-price">
+										<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.seckill_price.split('.')[0] }}
+										</text>
+										<text class="unit price-style small" :style="{ color: value.theme == 'diy' ? value.priceStyle.mainColor : '' }">
+											{{ '.' + item.seckill_price.split('.')[1] }}
+										</text>
+									</view>
+									<view class="original-price price-font" v-if="value.priceStyle.lineControl && value.style != 'style-2'" :style="{ color: value.theme == 'diy' ? value.priceStyle.lineColor : '' }">
+										¥{{ item.price }}
+									</view>
+									<view class="price-font" v-else>
+										<text :style="{ color: value.theme == 'diy' ? value.priceStyle.lineColor : '' }">原价：</text>
+										<text :style="{ color: value.theme == 'diy' ? value.priceStyle.lineColor : '' }" class="original-price">¥{{ item.price }}</text>
+									</view>
+								</view>
+								<button v-if="value.btnStyle.control && isLoad" :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'
+								}">
+									{{ isFuture ? '即将开始' : value.btnStyle.text }}
+								</button>
+							</view>
+						</view>
+					</view>
+				</template>
+
+				<template v-if="value.template == 'row1-of2'">
+					<view class="item" v-for="(item, index) in dataList" :key="index" @click="toDetail(item.id)" :class="[value.ornament.type]" :style="goodsItemCss">
+						<view class="img-wrap" :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }">
+							<image :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }" :src="$util.img(item.goods_image, { size: 'mid' })" mode="widthFix" @error="imageError(index)"/>
+						</view>
+						<view class="content" v-if="value.goodsNameStyle.control || value.priceStyle.mainControl">
+							<view class="goods-name" v-if="value.goodsNameStyle.control"
+								: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 class="discount-price" 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.seckill_price.split('.')[0] }}
+								</text>
+								<text class="unit price-style small" :style="{ color: value.theme == 'diy' ? value.priceStyle.mainColor : '' }">
+									{{ '.' + item.seckill_price.split('.')[1] }}
+								</text>
+							</view>
+							<view class="bottom-wrap">
+								<view class="original-price price-font" v-if="value.priceStyle.lineControl" :style="{ color: value.theme == 'diy' ? value.priceStyle.lineColor : '' }">
+									¥{{ item.price }}
+								</view>
+								<button v-if="value.btnStyle.control && isLoad" :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'
+								}">
+									{{ isFuture ? '即将开始' : value.btnStyle.text }}
+								</button>
+							</view>
+						</view>
+					</view>
+				</template>
+
+				<template v-if="value.template == 'horizontal-slide'">
+					<scroll-view v-if="value.slideMode == 'scroll'" class="scroll" :scroll-x="true" :show-scrollbar="false">
+						<view class="item" v-for="(item, index) in dataList" :key="index" @click="toDetail(item.id)" :class="[value.ornament.type]" :style="goodsItemCss">
+							<view class="img-wrap" :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }">
+								<image :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }" :src="$util.img(item.goods_image, { size: 'mid' })" mode="widthFix" @error="imageError(index)"/>
+							</view>
+							<view class="content" v-if="value.goodsNameStyle.control || value.priceStyle.mainControl">
+								<view class="goods-name" v-if="value.goodsNameStyle.control"
+									: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 class="discount-price" v-if="value.priceStyle.mainControl">
+									<image v-if="value.style == 'style-2'" class="tag" :src="$util.img('addon/seckill/component/view/seckill/img/style_4_tag.png')" mode="widthFix"/>
+									<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.seckill_price.split('.')[0] }}
+									</text>
+									<text class="unit price-style small" :style="{ color: value.theme == 'diy' ? value.priceStyle.mainColor : '' }">
+										{{ '.' + item.seckill_price.split('.')[1] }}
+									</text>
+								</view>
+								<view class="original-price price-font" v-if="value.priceStyle.lineControl" :style="{ color: value.theme == 'diy' ? value.priceStyle.lineColor : '' }">
+									¥{{ item.price }}
+								</view>
+							</view>
+						</view>
+					</scroll-view>
+					<swiper v-if="value.slideMode == 'slide'" :autoplay="false" class="swiper" :style="{ height: swiperHeight }">
+						<swiper-item v-for="(pageItem, pageIndex) in page" :key="pageIndex" :class="['swiper-item', dataList[pageIndex] && [dataList[pageIndex].length / 3].length >= 1 && 'flex-between']">
+							<view class="item" v-for="(item, dataIndex) in dataList[pageIndex]" :key="dataIndex" @click="toDetail(item.id)" :class="[value.ornament.type]" :style="goodsItemCss">
+								<view class="img-wrap" :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }">
+									<image :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }" :src="$util.img(item.goods_image, { size: 'mid' })" mode="widthFix" @error="imageError(dataIndex, pageIndex)"/>
+								</view>
+								<view class="content" v-if="value.goodsNameStyle.control || value.priceStyle.mainControl">
+									<view class="goods-name" v-if="value.goodsNameStyle.control"
+										: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 class="discount-price" v-if="value.priceStyle.mainControl">
+										<image v-if="value.style == 'style-2'" class="tag" :src="$util.img('addon/seckill/component/view/seckill/img/style_4_tag.png')" mode="widthFix"/>
+										<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.seckill_price.split('.')[0] }}
+										</text>
+										<text class="unit price-style small" :style="{ color: value.theme == 'diy' ? value.priceStyle.mainColor : '' }">
+											{{ '.' + item.seckill_price.split('.')[1] }}
+										</text>
+									</view>
+									<view class="original-price price-font" v-if="value.priceStyle.lineControl" :style="{ color: value.theme == 'diy' ? value.priceStyle.lineColor : '' }">
+										¥{{ item.price }}
+									</view>
+								</view>
+							</view>
+						</swiper-item>
+					</swiper>
+				</template>
+			</view>
+		</view>
+	</x-skeleton>
+</template>
+
+<script>
+	export default {
+		name: 'diy-seckill',
+		props: {
+			value: {
+				type: Object
+			}
+		},
+		data() {
+			return {
+				loading: true,
+				skeletonType: '',
+				skeletonConfig: {},
+				seckillId: 0,
+				index: null, //当前正在抢购的index,
+				timeList: [],
+				dataList: [],
+				isFuture: false, //是否是预告
+				seckillH: '',
+				seckillI: '',
+				seckillS: '',
+				seckillInterval: null,
+				page: 1,
+				isLoad: false,
+				headData: null
+			};
+		},
+		created() {
+			this.initSkeleton();
+			this.getHeadData();
+		},
+		watch: {
+			diySeckillInterval(val, old) {
+				if (val == 0) {
+					clearInterval(this.seckillInterval);
+				} else if (val == 1) {
+					this.setHeadTime();
+				}
+			},
+			// 组件刷新监听
+			componentRefresh: function(nval) {}
+		},
+		computed: {
+			wrapStyle() {
+				var obj = 'background-color:' + this.value.componentBgColor + ';';
+				if (this.value.componentAngle == 'round') {
+					obj += 'border-top-left-radius:' + this.value.topAroundRadius * 2 + 'rpx;';
+					obj += 'border-top-right-radius:' + this.value.topAroundRadius * 2 + 'rpx;';
+					obj += 'border-bottom-left-radius:' + this.value.bottomAroundRadius * 2 + 'rpx;';
+					obj += 'border-bottom-right-radius:' + this.value.bottomAroundRadius * 2 + 'rpx;';
+				}
+				return obj;
+			},
+			// 头部时间样式
+			titleTimeStyle() {
+				var obj = 'color:' + this.value.titleStyle.numTextColor + ';';
+				if (this.value.titleStyle.numBgColorStart && this.value.titleStyle.numBgColorEnd) {
+					obj += 'background:linear-gradient(to right,' + this.value.titleStyle.numBgColorStart + ',' + this.value.titleStyle.numBgColorEnd + ');';
+				}
+				return obj;
+			},
+			// 商品项样式
+			goodsItemCss() {
+				var obj = '';
+				obj += 'background-color:' + this.value.elementBgColor + ';';
+				if (this.value.elementAngle == 'round') {
+					obj += 'border-top-left-radius:' + this.value.topElementAroundRadius * 2 + 'rpx;';
+					obj += 'border-top-right-radius:' + this.value.topElementAroundRadius * 2 + 'rpx;';
+					obj += 'border-bottom-left-radius:' + this.value.bottomElementAroundRadius * 2 + 'rpx;';
+					obj += 'border-bottom-right-radius:' + this.value.bottomElementAroundRadius * 2 + 'rpx;';
+				}
+				if (this.value.ornament.type == 'shadow') {
+					obj += 'box-shadow:' + '0 0 10rpx ' + this.value.ornament.color + ';';
+				}
+				if (this.value.ornament.type == 'stroke') {
+					obj += 'border:' + '2rpx solid ' + this.value.ornament.color + ';';
+				}
+				const screenWidth = uni.getSystemInfoSync().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);
+					else width = [screenWidth - this.rpxUpPx(20) * 2 - this.rpxUpPx(200) * 3 - this.rpxUpPx(this.value.margin.both * 2) * 2] / 6;
+					// obj += 'margin-left:' + width + 'px;';
+					// obj += 'margin-right:' + width + 'px;';
+				}
+				return obj;
+			},
+			swiperHeight() {
+				if (this.value.nameLineMode == 'multiple') {
+					if (this.value.ornament.type == 'shadow') return '388rpx';
+					else return '380rpx';
+				}
+				if (this.value.ornament.type == 'shadow') return '358rpx';
+				else return '350rpx';
+			}
+		},
+		methods: {
+			initSkeleton() {
+				if (this.value.template == 'row1-of1') {
+
+					// 单列 风格
+					this.skeletonType = 'list';
+					this.skeletonConfig = {
+						textRows: 3
+					};
+
+				} else if (this.value.template == 'row1-of2') {
+
+					// 两列 风格
+					this.skeletonType = 'waterfall';
+					this.skeletonConfig = {
+						headHeight: '320rpx',
+						textRows: 2,
+						textWidth: ['100%', '80%']
+					};
+
+				} else if (this.value.template == 'horizontal-slide') {
+
+					// 横向滑动 风格
+					this.skeletonType = 'waterfall';
+					this.skeletonConfig = {
+						gridRows: 1,
+						gridColumns: 3,
+						headHeight: '200rpx',
+						textRows: 3,
+						textWidth: ['100%', '80%', '70%']
+					};
+
+				}
+			},
+			rpxUpPx(res) {
+				const screenWidth = uni.getSystemInfoSync().screenWidth;
+				var data = (screenWidth * parseInt(res)) / 750;
+				return Math.floor(data);
+			},
+			getHeadData() {
+				this.$api.sendRequest({
+					url: '/seckill/api/seckill/lists',
+					success: res => {
+						this.headData = res;
+						this.setHeadTime();
+					}
+				});
+			},
+			setHeadTime() {
+				if (this.headData == null) return;
+				clearInterval(this.seckillInterval);
+				this.seckillId = 0;
+				this.isFuture = false;
+				this.isLoad = false;
+				this.seckillH = '';
+				this.seckillI = '';
+				this.seckillS = '';
+
+				let time = new Date(this.headData.timestamp * 1000); //当前时间
+				let newTimes = time.getHours() * 60 * 60 + time.getMinutes() * 60 + time.getSeconds(); //获取当前时间 时分秒的时间戳
+
+				if (!(this.headData.data.list instanceof Array)) {
+					var tempArr = Object.values(this.headData.list);
+				} else {
+					var tempArr = this.headData.data.list;
+				}
+
+				try {
+					tempArr.forEach((v, k) => {
+						if (v.type == 'today' && newTimes > v.seckill_end_time) return false;
+						if (v.seckill_start_time <= newTimes && newTimes < v.seckill_end_time) this.isFuture = false;
+						else this.isFuture = true;
+
+						this.seckillId = v.id;
+						this.index = k;
+						v.isNow = true;
+						throw new Error('end');
+					});
+				} catch (e) {
+					if (e.message != 'end') throw e;
+				}
+
+				if (!this.seckillId) {
+					for (let i = 0; i < tempArr.length; i++) {
+						if (newTimes < tempArr[i].seckill_start_time && i == 0) {
+							this.seckillId = tempArr[i].id;
+							this.index = i;
+						} else if (newTimes < tempArr[i].seckill_start_time && newTimes > tempArr[i - 1].seckill_end_time && i != 0) {
+							this.seckillId = tempArr[i].id;
+							this.index = i;
+						} else if (i == tempArr.length - 1 && newTimes > tempArr[i].seckill_end_time) {
+							this.seckillId = tempArr[i].id;
+							this.index = i;
+						}
+					}
+				}
+
+				if (tempArr.length) {
+					var self = this;
+					let currTime = new Date();
+					let newTimes = currTime.getHours() * 60 * 60 + currTime.getMinutes() * 60 + currTime.getSeconds();
+					var obj;
+					if (self.isFuture) obj = self.$util.countDown(24 * 60 * 60 + tempArr[self.index].seckill_start_time - newTimes);
+					else obj = self.$util.countDown(tempArr[self.index].seckill_end_time - newTimes);
+
+					self.seckillH = obj.h;
+					self.seckillI = obj.i;
+					self.seckillS = obj.s;
+					this.seckillInterval = setInterval(function() {
+						currTime = new Date();
+						newTimes = currTime.getHours() * 60 * 60 + currTime.getMinutes() * 60 + currTime.getSeconds();
+						if (self.isFuture) obj = self.$util.countDown(24 * 60 * 60 + tempArr[self.index].seckill_start_time - newTimes);
+						else obj = self.$util.countDown(tempArr[self.index].seckill_end_time - newTimes);
+
+						self.seckillH = obj.h;
+						self.seckillI = obj.i;
+						self.seckillS = obj.s;
+						if (self.seckillH == '00' && self.seckillI == '00' && self.seckillS == '00') {
+							clearInterval(self.seckillInterval);
+							self.seckillH = '';
+							self.seckillI = '';
+							self.seckillS = '';
+							self.index = 1;
+							if (self.timeList.length) self.getHeadData();
+						}
+					}, 1000);
+				}
+				this.timeList = tempArr;
+				this.isLoad = true;
+				if (this.seckillId) {
+					this.getDataList(this.seckillId);
+				}else{
+					this.loading = false;
+				}
+			},
+			getDataList(seckillId) {
+				var num = this.value.count;
+
+				this.$api.sendRequest({
+					url: '/seckill/api/seckillgoods/lists',
+					data: {
+						seckill_time_id: seckillId,
+						num: num
+					},
+					success: res => {
+						var data = res.data;
+						if (data) {
+							this.dataList = data;
+
+							// 切屏滚动，每页显示固定数量
+							if (this.value.template == 'horizontal-slide' && this.value.slideMode == 'slide') {
+								let size = 3;
+								let temp = [];
+								this.page = Math.ceil(this.dataList.length / size);
+								for (var i = 0; i < this.page; i++) {
+									temp[i] = [];
+									for (var j = i * size; j < this.dataList.length; j++) {
+										if (temp[i].length == size) break;
+										temp[i].push(this.dataList[j]);
+									}
+								}
+								this.dataList = temp;
+							}
+						}
+						this.loading = false;
+					}
+				});
+			},
+			toDetail(id) {
+				if (this.isFuture) {
+					this.$util.showToast({
+						title: '秒杀活动即将开启，敬请期待!'
+					});
+					return false;
+				}
+				this.$util.redirectTo('/pages_promotion/seckill/detail', {
+					seckill_id: id
+				});
+			},
+			imageError(index, pageIndex) {
+				if (this.value.slideMode == 'slide') {
+					this.dataList[pageIndex][index].goods_image = this.$util.getDefaultImage().goods;
+				} else {
+					this.dataList[index].goods_image = this.$util.getDefaultImage().goods;
+				}
+				this.$forceUpdate();
+			},
+			toMore() {
+				this.$util.redirectTo('/pages_promotion/seckill/list');
+			}
+		},
+		onPageHide() {
+			clearInterval(this.seckillInterval);
+		}
+	};
+</script>
+
+<style lang="scss">
+	scroll-view ::-webkit-scrollbar {
+		width: 0;
+		height: 0;
+		background-color: transparent;
+		touch-action: none;
+	}
+
+	/deep/.uni-scroll-view ::-webkit-scrollbar {
+		/* 隐藏滚动条，但依旧具备可以滚动的功能 */
+		display: none;
+		width: 0;
+		height: 0;
+		color: transparent;
+		background: transparent;
+	}
+
+	/deep/::-webkit-scrollbar {
+		display: none;
+		width: 0;
+		height: 0;
+		color: transparent;
+		background: transparent;
+	}
+
+	.diy-seckill {
+		overflow: hidden;
+
+		.title-wrap.style-1 {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			padding: 20rpx;
+
+			.time {
+				display: flex;
+				align-items: center;
+				line-height: 1;
+				margin-right: auto;
+				margin-left: 20rpx;
+
+				.seckill-title-name {
+					margin-right: 10rpx;
+					font-size: $font-size-tag;
+				}
+
+				.number {
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					padding: 4rpx;
+					min-width: 38rpx;
+					height: 36rpx;
+					box-sizing: border-box;
+					font-size: $font-size-tag;
+					border-radius: 6rpx;
+				}
+
+				.symbol {
+					margin: 0 6rpx;
+				}
+			}
+
+			.marketimg-box-title-right {
+				display: flex;
+				align-items: center;
+			}
+		}
+
+		.title-wrap.style-2 {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			padding: 20rpx;
+
+			.seckill-style-name {
+				margin-left: 12rpx;
+				margin-right: -12rpx;
+				font-size: 24rpx;
+			}
+
+			.time {
+				display: flex;
+				align-items: center;
+				line-height: 1;
+				margin-right: auto;
+				margin-left: 20rpx;
+				border-radius: 30rpx;
+				padding: 0 20rpx;
+				height: 44rpx;
+				background-image: radial-gradient(transparent 50%, #fff);
+				font-size: $font-size-tag;
+
+				.seckill-title-name {
+					font-size: $font-size-tag;
+					background-image: radial-gradient(transparent 35%, #fff);
+					border-radius: 50%;
+					position: relative;
+					margin-left: -20rpx;
+					height: 44rpx;
+					width: 44rpx;
+					line-height: 44rpx;
+					text-align: center;
+					margin-right: 6rpx;
+				}
+			}
+
+			.marketimg-box-title-right {
+				display: flex;
+				align-items: center;
+			}
+		}
+
+		.title-wrap.style-3 {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			padding: 20rpx;
+			border-radius: 18rpx 18rpx 0 0;
+			margin-bottom: 20rpx;
+			height: 88rpx;
+			box-sizing: border-box;
+			background-repeat: no-repeat;
+			background-size: cover;
+
+			.title-img {
+				height: 40rpx;
+			}
+
+			.time {
+				display: flex;
+				align-items: center;
+				line-height: 1;
+				margin-right: auto;
+				margin-left: 20rpx;
+
+				.seckill-title-name {
+					position: relative;
+					margin-right: 10rpx;
+					font-size: $font-size-tag;
+
+					&::after {
+						content: '';
+						position: absolute;
+						left: -10rpx;
+						height: 24rpx;
+						width: 2rpx;
+						background-color: #fff;
+					}
+				}
+
+				.number {
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					padding: 4rpx;
+					min-width: 38rpx;
+					height: 36rpx;
+					box-sizing: border-box;
+					font-size: $font-size-tag;
+					border-radius: 6rpx;
+				}
+
+				.symbol {
+					margin: 0 6rpx;
+				}
+			}
+
+			.marketimg-box-title-right {
+				display: flex;
+				align-items: center;
+			}
+		}
+
+		.title-wrap.style-4 {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			padding: 20rpx;
+			border-radius: 18rpx 18rpx 0 0;
+			margin-bottom: 20rpx;
+			height: 88rpx;
+			box-sizing: border-box;
+			background-repeat: no-repeat;
+			background-size: cover;
+
+			.title-img {
+				height: 40rpx;
+			}
+
+			.time {
+				display: flex;
+				align-items: center;
+				line-height: 1;
+
+				.seckill-title-name {
+					position: relative;
+					margin-right: 20rpx;
+					font-size: $font-size-tag;
+				}
+
+				.number {
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					padding: 4rpx;
+					min-width: 38rpx;
+					height: 36rpx;
+					box-sizing: border-box;
+					font-size: $font-size-tag;
+					border-radius: 6rpx;
+				}
+
+				.symbol {
+					margin: 0 6rpx;
+				}
+			}
+
+			.marketimg-box-title-right {
+				display: flex;
+				align-items: center;
+			}
+		}
+
+		&.row1-of1 {
+			.item {
+				display: flex;
+				padding: 20rpx;
+
+				&.shadow {
+					margin: 8rpx 8rpx 20rpx 8rpx;
+				}
+
+				&:last-child {
+					margin-bottom: 0;
+				}
+
+				.img-wrap {
+					width: 200rpx;
+					height: 200rpx;
+
+					image {
+						width: 200rpx;
+					}
+				}
+
+				.content {
+					display: flex;
+					justify-content: space-between;
+					flex-direction: column;
+					flex: 1;
+					margin: 10rpx 0 10rpx 20rpx;
+
+					.goods-name {
+						&.multi-hidden {
+							line-height: 1.3;
+						}
+					}
+
+					.progress {
+						display: flex;
+						align-items: center;
+
+						.bg {
+							width: 240rpx;
+							height: 20rpx;
+							border-radius: 20rpx;
+							margin-right: 20rpx;
+							background-color: #fcecd7;
+
+							.curr {
+								height: 20rpx;
+								border-radius: 20rpx;
+								background-color: #fdbe6c;
+							}
+						}
+
+						.num {
+							font-size: $font-size-tag;
+							color: $color-tip;
+						}
+					}
+
+					.bottom-wrap {
+						display: flex;
+						justify-content: space-between;
+						align-items: center;
+
+						.price-wrap {
+							overflow: hidden;
+							display: flex;
+							align-items: baseline;
+							flex-wrap: wrap;
+							width: 260rpx;
+							font-size: $font-size-tag;
+
+							.discount-price {
+								font-weight: bold;
+								margin-right: 10rpx;
+								line-height: 1;
+							}
+
+							.unit {
+								font-size: $font-size-tag;
+								color: var(--price-color);
+							}
+
+							.price {
+								font-size: $font-size-toolbar;
+								color: var(--price-color);
+							}
+						}
+
+						.original-price {
+							margin-top: 4rpx;
+							font-size: $font-size-tag;
+							text-decoration: line-through;
+							line-height: 1;
+							color: $color-tip;
+						}
+
+						button {
+							min-width: 112rpx;
+							height: 52rpx;
+							line-height: 52rpx;
+							background-color: $base-color;
+							color: #fff;
+							margin: 0;
+							padding: 0 20rpx;
+							font-size: $font-size-tag;
+							font-weight: bold;
+						}
+					}
+				}
+			}
+
+			&.style-1 {
+				.progress .bg {
+					overflow: hidden;
+				}
+			}
+
+			&.style-2 {
+				.item {
+					overflow: hidden;
+					position: relative;
+					padding: 16rpx;
+
+					.img-wrap {
+						position: relative;
+						overflow: hidden;
+					}
+
+					.bottom-wrap .price-font {
+						color: #999;
+						font-size: $font-size-tag;
+					}
+
+					.content .progress {
+						.num {
+							color: #ff3d3d;
+						}
+
+						.bg {
+							background-color: #ffd5d5;
+
+							.curr {
+								position: relative;
+								background-color: #ff0400 !important;
+							}
+						}
+					}
+
+					.progress-bar {
+						position: absolute;
+						right: -24rpx;
+						width: 30rpx;
+						height: 30rpx;
+						top: 50%;
+						transform: translateY(-50%);
+					}
+
+					.price-wrap {
+						flex-direction: column-reverse;
+					}
+				}
+			}
+		}
+
+		&.row1-of2 {
+			&.style-1 {
+				.content-wrap {
+					display: flex;
+					flex-wrap: wrap;
+					justify-content: space-between;
+				}
+
+				.item {
+					overflow: hidden;
+					width: calc(50% - 10rpx);
+					display: flex;
+					flex-direction: column;
+					box-sizing: border-box;
+					margin-bottom: 20rpx;
+
+					&:nth-child(2n) {
+						margin-right: 0;
+					}
+
+					&:nth-of-type(1),
+					&:nth-of-type(2) {
+						margin-top: 0;
+					}
+
+					&.shadow {
+						width: calc(50% - 18rpx);
+						margin-top: 20rpx;
+
+						&:nth-of-type(1),
+						&:nth-of-type(2) {
+							margin-top: 8rpx;
+						}
+
+						&:nth-child(2n-1) {
+							margin-left: 8rpx;
+						}
+					}
+
+					.img-wrap {
+						image {
+							width: 100%;
+						}
+					}
+
+					.content {
+						display: flex;
+						flex-direction: column;
+						flex: 1;
+						padding: 10rpx 20rpx;
+						position: relative;
+
+						.goods-name {
+							font-size: $font-size-sub;
+							line-height: 1.5;
+							margin-bottom: 10rpx;
+						}
+
+						.discount-price {
+							margin-top: auto;
+							line-height: 1;
+							white-space: nowrap;
+							font-weight: bold;
+
+							.unit {
+								display: inline-block;
+								font-size: $font-size-tag;
+								color: var(--price-color);
+							}
+
+							.price {
+								font-size: $font-size-toolbar;
+								color: var(--price-color);
+							}
+						}
+
+						.bottom-wrap {
+							display: flex;
+							justify-content: space-between;
+							align-items: flex-end;
+
+							.original-price {
+								font-size: $font-size-goods-tag;
+								text-decoration: line-through;
+								color: $color-tip;
+							}
+
+							button {
+								min-width: 112rpx;
+								width: auto;
+								height: 52rpx;
+								line-height: 52rpx;
+								background-color: $base-color;
+								color: #fff;
+								margin: 0;
+								padding: 0 20rpx;
+								font-size: $font-size-tag;
+								font-weight: bold;
+							}
+						}
+					}
+				}
+			}
+		}
+
+		&.horizontal-slide {
+			&.style-1 {
+				.scroll {
+					width: calc(100% - 40rpx);
+					padding: 0 20rpx 20rpx;
+					line-height: 1;
+					white-space: nowrap;
+				}
+
+				.flex-between {
+					justify-content: space-between;
+				}
+
+				.item {
+					display: inline-block;
+					width: 200rpx;
+					overflow: hidden;
+					box-sizing: border-box;
+
+					&:nth-child(3n + 3) {
+						width: 198rpx;
+					}
+
+					&.shadow {
+						margin-top: 8rpx;
+					}
+
+					.img-wrap {
+						width: 200rpx;
+						height: 200rpx;
+						position: relative;
+						overflow: hidden;
+						margin: 0 auto;
+
+						>image {
+							width: 200rpx;
+						}
+					}
+
+					.content {
+						padding: 10rpx;
+						display: flex;
+						flex-direction: column;
+						justify-content: space-between;
+
+						.goods-name {
+							line-height: 1.3;
+
+							&.multi-hidden {
+								white-space: break-spaces;
+							}
+						}
+
+						.discount-price {
+							margin-top: 10rpx;
+							white-space: nowrap;
+							font-weight: bold;
+							line-height: 1;
+
+							.unit {
+								display: inline-block;
+								font-size: $font-size-tag;
+								color: var(--price-color);
+							}
+
+							.price {
+								font-size: $font-size-toolbar;
+								color: var(--price-color);
+							}
+						}
+
+						.original-price {
+							line-height: 1;
+							font-size: $font-size-tag;
+							text-decoration: line-through;
+							color: $color-tip;
+						}
+					}
+				}
+
+				.swiper {
+					width: 100%;
+					white-space: nowrap;
+					padding: 0 20rpx 20rpx;
+					box-sizing: border-box;
+
+					.swiper-item {
+						display: flex;
+						align-items: baseline;
+					}
+
+					.item {
+						width: 200rpx;
+						box-sizing: border-box;
+					}
+				}
+			}
+
+			&.style-2 {
+				.scroll {
+					width: calc(100% - 40rpx);
+					padding: 0 20rpx 20rpx;
+					line-height: 1;
+					white-space: nowrap;
+				}
+
+				.flex-between {
+					justify-content: space-between;
+				}
+
+				.item {
+					display: inline-block;
+					width: 200rpx;
+					overflow: hidden;
+					box-sizing: border-box;
+
+					&:nth-child(3n + 3) {
+						width: 198rpx;
+					}
+
+					&.shadow {
+						margin-top: 8rpx;
+					}
+
+					.img-wrap {
+						width: 200rpx;
+						height: 200rpx;
+						position: relative;
+						overflow: hidden;
+						margin: 0 auto;
+
+						>image {
+							width: 200rpx;
+						}
+					}
+
+					.content {
+						padding: 10rpx 30rpx;
+						display: flex;
+						flex-direction: column;
+						justify-content: space-between;
+						text-align: center;
+
+						.goods-name {
+							line-height: 1.3;
+
+							&.multi-hidden {
+								white-space: break-spaces;
+							}
+						}
+
+						.discount-price {
+							margin-top: 10rpx;
+							white-space: nowrap;
+							font-weight: bold;
+							line-height: 1;
+							background: linear-gradient(to right, #ff5f17, #fe2f18);
+							padding: 4rpx 4rpx 4rpx 10rpx;
+							border-top-right-radius: 10rpx;
+							border-bottom-right-radius: 10rpx;
+							position: relative;
+
+							.tag {
+								display: block;
+								position: absolute;
+								width: 26rpx;
+								left: -10rpx;
+								top: 0;
+							}
+
+							.unit {
+								display: inline-block;
+								font-size: 26rpx !important;
+								color: #fff !important;
+							}
+
+							.price {
+								font-size: 26rpx !important;
+								color: #fff !important;
+								margin-left: 6rpx;
+							}
+						}
+
+						.original-price {
+							line-height: 1;
+							font-size: $font-size-tag;
+							text-decoration: line-through;
+							color: $color-tip;
+							margin-top: 10rpx;
+						}
+					}
+				}
+
+				.swiper {
+					width: 100%;
+					white-space: nowrap;
+					padding: 0 20rpx 20rpx;
+					box-sizing: border-box;
+
+					.swiper-item {
+						display: flex;
+						align-items: baseline;
+					}
+
+					.item {
+						width: 200rpx;
+						box-sizing: border-box;
+					}
+				}
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/components/diy-components/diy-store-label.vue b/components/diy-components/diy-store-label.vue
new file mode 100644
index 0000000..7fd4ca8
--- /dev/null
+++ b/components/diy-components/diy-store-label.vue
@@ -0,0 +1,170 @@
+<template>
+	<x-skeleton 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']">
+						<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>
+				</scroll-view>
+			</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']">
+						<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>
+				</scroll-view>
+			</block>
+		</view>
+	</x-skeleton>
+</template>
+<script>
+	// 门店标签
+	export default {
+		name: 'diy-store-label',
+		props: {
+			value: {
+				type: Object
+			}
+		},
+		data() {
+			return {
+				loading: true,
+				skeletonConfig: {
+					gridRows: 1,
+					gridRowsGap: '20rpx',
+					headHeight: '40rpx',
+					headBorderRadius: '0'
+				},
+				list: [],
+				notice: '',
+				storeLabel: [],
+				businessConfig: ""
+			};
+		},
+		created() {
+			this.getData();
+			this.getStoreConfig();
+		},
+		watch: {
+			// 组件刷新监听
+			componentRefresh: function(nval) {
+				this.getData();
+			}
+		},
+		computed: {
+			storeLabelWrapCss: function() {
+				var obj = '';
+				obj += 'background-color:' + this.value.componentBgColor + ';';
+				if (this.value.componentAngle == 'round') {
+					obj += 'border-top-left-radius:' + this.value.topAroundRadius * 2 + 'rpx;';
+					obj += 'border-top-right-radius:' + this.value.topAroundRadius * 2 + 'rpx;';
+					obj += 'border-bottom-left-radius:' + this.value.bottomAroundRadius * 2 + 'rpx;';
+					obj += 'border-bottom-right-radius:' + this.value.bottomAroundRadius * 2 + 'rpx;';
+				}
+				return obj;
+			}
+		},
+		methods: {
+			getData() {
+				var data = {
+					page: 1,
+					page_size: 0
+				};
+
+				if (this.value.sources == 'initial') {
+					data.page_size = this.value.count;
+				} else if (this.value.sources == 'diy') {
+					data.label_id_arr = this.value.labelIds.toString();
+				}
+				this.$api.sendRequest({
+					url: '/store/api/store/labelPage',
+					data: data,
+					success: res => {
+						if (res.code == 0 && res.data) {
+							this.list = res.data.list;
+						}
+						this.loading = false;
+					}
+				});
+			},
+			getStoreConfig() {
+				this.$api.sendRequest({
+					url: '/store/api/config/config',
+					success: res => {
+						if (res.code >= 0) {
+							this.businessConfig = res.data.business_config;
+							if (res.data.business_config.store_business == "store") {
+								this.getStoreInfo();
+							}
+						}
+					}
+				});
+			},
+			getStoreInfo() {
+				this.$api.sendRequest({
+					url: '/api/store/info',
+					success: res => {
+						if (res.data) {
+							let label_arr = res.data.label_name.split(",");
+							let label_count = 3;
+							if (this.value.sources == 'initial') label_count = this.value.count;
+							for (let i = 0; i < label_arr.length; i++) {
+								if (this.storeLabel.length < label_count && label_arr[i] != '') {
+									this.storeLabel.push(label_arr[i])
+								}
+							}
+						}
+					}
+				});
+			},
+		}
+	};
+</script>
+
+<style lang="scss">
+	.diy-store-label {
+		.style-1 {
+			display: flex;
+			align-items: baseline;
+
+			/deep/ .uni-scroll-view-content {
+				display: flex;
+				align-items: center;
+			}
+
+			&.between {
+				justify-content: space-between;
+
+				/deep/.uni-scroll-view-content {
+					justify-content: space-between;
+				}
+			}
+
+			.item {
+				flex-shrink: 0;
+				display: flex;
+				align-items: center;
+				padding-right: 20rpx;
+
+				.icon-box {
+					font-size: 50rpx;
+					width: 40rpx;
+					height: 40rpx;
+					margin-right: 10rpx;
+					margin-top: 2rpx;
+				}
+
+				.label-name {
+					line-height: 40rpx;
+				}
+
+				&:last-of-type {
+					padding-right: 0;
+				}
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/components/diy-components/diy-store.vue b/components/diy-components/diy-store.vue
new file mode 100644
index 0000000..5e7caad
--- /dev/null
+++ b/components/diy-components/diy-store.vue
@@ -0,0 +1,273 @@
+<template>
+	<view class="store-wrap">
+		<block v-if="value.style == 1">
+			<view class="store-box store-one">
+				<view class="store-info">
+					<view class="info-box" :style="{ color: value.textColor }" @click="toStoreList()">
+						<block v-if="globalStoreInfo && globalStoreInfo.store_id">
+							<text class="title">{{ globalStoreInfo.store_name }}</text>
+							<text>
+								<text class="change margin-left">切换</text>
+								<text class="iconfont icon-right"></text>
+							</text>
+						</block>
+						<text class="title" v-else>定位中...</text>
+					</view>
+					<view class="address-wrap" :style="{ color: value.textColor }">
+						<text class="iconfont icon-dizhi"></text>
+						<text v-if="globalStoreInfo && globalStoreInfo.store_id" @click="mapRoute" class="address">{{ globalStoreInfo.show_address }}</text>
+						<text v-else>获取当前位置...</text>
+					</view>
+				</view>
+				<view class="store-image" @click="selectStore()">
+					<image :src="$util.img(globalStoreInfo.store_image)" v-if="globalStoreInfo && globalStoreInfo.store_image" mode="aspectFill"></image>
+					<image :src="$util.getDefaultImage().store" v-else mode="aspectFill"></image>
+				</view>
+			</view>
+		</block>
+
+		<block v-if="value.style == 2">
+			<view class="store-box store-three" @click="toStoreList()">
+				<view class="store-info">
+					<view class="store-image" @click="selectStore()">
+						<image :src="$util.img(globalStoreInfo.store_image)" v-if="globalStoreInfo && globalStoreInfo.store_image" mode="aspectFill"></image>
+						<image :src="$util.getDefaultImage().store" v-else mode="aspectFill"></image>
+					</view>
+					<view class="info-box" :style="{ color: value.textColor }">
+						<block v-if="globalStoreInfo && globalStoreInfo.store_id">
+							<text class="title">{{ globalStoreInfo.store_name }}</text>
+							<text>
+								<text class="change margin-left">切换</text>
+								<text class="iconfont icon-right"></text>
+							</text>
+						</block>
+						<text class="title" v-else>定位中...</text>
+					</view>
+				</view>
+				<view class="store-icon" @click.stop="search()"><text class="iconfont icon-sousuo3" :style="{ color: value.textColor }"></text></view>
+			</view>
+		</block>
+
+		<block v-if="value.style == 3">
+			<view class="store-box store-four" @click="toStoreList()">
+				<view class="store-left-wrap">
+					<block v-if="globalStoreInfo && globalStoreInfo.store_id">
+						<text class="iconfont icon-weizhi" :style="{ color: value.textColor }"></text>
+						<text class="title" :style="{ color: value.textColor }">{{ globalStoreInfo.store_name }}</text>
+						<text class="iconfont icon-unfold" :style="{ color: value.textColor }"></text>
+					</block>
+					<text class="title" v-else>定位中...</text>
+				</view>
+				<view class="store-right-search">
+					<input type="text" class="uni-input font-size-tag" disabled placeholder="商品搜索" @click.stop="search()" />
+					<text class="iconfont icon-sousuo3" @click.stop="search()"></text>
+				</view>
+			</view>
+		</block>
+	</view>
+</template>
+
+<script>
+// 门店展示
+import Map from '@/common/js/map/openMap.js';
+export default {
+	name: 'diy-store',
+	props: {
+		value: {
+			type: Object
+		}
+	},
+	data() {
+		return {};
+	},
+	computed: {},
+	watch: {
+		// 组件刷新监听
+		componentRefresh: function(nval) {}
+	},
+	created() {},
+	methods: {
+		//跳转至门店列表
+		toStoreList() {
+			this.$util.redirectTo('/pages_tool/store/list');
+		},
+		selectStore() {
+			if (this.globalStoreInfo) {
+				this.$util.redirectTo('/pages_tool/store/detail', { store_id: this.globalStoreInfo.store_id });
+			}
+		},
+		search() {
+			this.$util.redirectTo('/pages_tool/goods/search');
+		},
+		mapRoute() {
+			if (!isNaN(Number(this.globalStoreInfo.latitude)) && !isNaN(Number(this.globalStoreInfo.longitude))) {
+				Map.openMap(Number(this.globalStoreInfo.latitude), Number(this.globalStoreInfo.longitude), this.globalStoreInfo.store_name, 'gcj02');
+			}
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+.store-wrap {
+	.store-box {
+		box-sizing: border-box;
+		width: 100%;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+	}
+	.store-info {
+		height: 100rpx;
+		display: flex;
+		flex: 1;
+		flex-direction: column;
+		justify-content: space-around;
+		margin-right: 20rpx;
+
+		.info-box {
+			display: flex;
+			align-items: flex-end;
+			margin-bottom: 6rpx;
+
+			text {
+				line-height: 1.2;
+			}
+
+			.title {
+				max-width: 480rpx;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				white-space: nowrap;
+				font-size: $font-size-toolbar;
+				flex: 1;
+			}
+
+			.change {
+				font-size: $font-size-goods-tag;
+			}
+
+			.iconfont {
+				font-size: $font-size-goods-tag;
+			}
+		}
+		.address-wrap {
+			line-height: 1.2;
+			font-size: $font-size-goods-tag;
+			display: flex;
+			align-items: center;
+
+			.iconfont {
+				font-size: $font-size-goods-tag;
+				margin-right: 6rpx;
+			}
+
+			.address {
+				overflow: hidden;
+				text-overflow: ellipsis;
+				white-space: nowrap;
+			}
+		}
+	}
+
+	.store-image {
+		width: 72rpx;
+		height: 72rpx;
+		border-radius: 50%;
+
+		image {
+			width: 100%;
+			height: 100%;
+			border-radius: 50%;
+		}
+	}
+}
+
+.store-one,
+.store-three {
+	// padding: 0 20rpx;
+}
+
+.store-two {
+	.store-image {
+		align-self: flex-start;
+		margin-right: 14rpx;
+	}
+	.info-box {
+		margin-bottom: 0 !important;
+	}
+	.store-info {
+		height: 106rpx;
+	}
+	.switchover {
+		display: flex;
+		width: 120rpx;
+	}
+}
+.store-three {
+	.store-info {
+		height: auto;
+		justify-content: flex-start;
+		flex-direction: inherit;
+		align-items: center;
+	}
+	.info-box {
+		margin-left: 18rpx;
+		margin-bottom: 0 !important;
+	}
+	.store-icon text {
+		font-size: 36rpx;
+		color: #fff;
+	}
+}
+
+.store-four {
+	padding: 0 !important;
+
+	.store-left-wrap {
+		display: flex;
+		align-items: center;
+		line-height: 1;
+		.icon-weizhi {
+			margin-right: 6rpx;
+			font-size: 28rpx;
+		}
+
+		.icon-unfold {
+			margin-left: 6rpx;
+		}
+
+		.title {
+			display: inline-block;
+			max-width: 160rpx;
+			overflow: hidden;
+			text-overflow: ellipsis;
+			white-space: nowrap;
+		}
+	}
+
+	.store-right-search {
+		width: calc(100% - 260rpx);
+		position: relative;
+
+		input {
+			width: 100%;
+			height: 72rpx;
+			line-height: 72rpx;
+			background-color: #ffffff;
+			border: none;
+			border-radius: 72rpx;
+			padding-left: 30rpx;
+			box-sizing: border-box;
+		}
+
+		.icon-sousuo3 {
+			position: absolute;
+			right: 30rpx;
+			top: 10rpx;
+			font-size: 28rpx;
+			color: #909399;
+		}
+	}
+}
+</style>
diff --git a/components/diy-components/diy-text.vue b/components/diy-components/diy-text.vue
new file mode 100644
index 0000000..4a33ef3
--- /dev/null
+++ b/components/diy-components/diy-text.vue
@@ -0,0 +1,981 @@
+<template>
+	<view class="diy-text" @click="$util.diyRedirectTo(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;">
+				<text :style="{ fontWeight: value.fontWeight}">{{ value.text }}</text>
+			</block>
+			<block v-if="value.style == 'style-1'" style="height: 40rpx; line-height: 40rpx;">
+				<view class="text-left" :style="{ color: value.textColor}"><text>───</text></view>
+				<text :style="{ fontWeight: value.fontWeight}">{{ value.text }}</text>
+				<view class="text-right" :style="{ color: value.textColor}"><text>───</text></view>
+			</block>
+			<block v-else-if="value.style == 'style-2'">
+				<view class="style2">
+					<text :style="{ color: value.textColor, fontSize: value.fontSize * 2 + 'rpx', fontWeight: value.fontWeight }">{{ value.text }}</text>
+					<view class="xian" :style="{ background: value.textColor }">
+						<view class="line-triangle" :style="{ borderColor: value.textColor }"></view>
+					</view>
+				</view>
+			</block>
+			<block v-else-if="value.style == 'style-3'">
+				<view class="style3">
+					<text :style="{ color: value.textColor, fontSize: value.fontSize * 2 + 'rpx' ,fontWeight: value.fontWeight}">{{ value.text }}</text>
+					<view class="inner-line" :style="{ background: value.textColor }"><view class="line-short" :style="{ background: value.textColor }"></view></view>
+				</view>
+			</block>
+			<block v-else-if="value.style == 'style-4'">
+				<view class="style4">
+					<text :style="{ color: value.textColor, fontSize: value.fontSize * 2 + 'rpx',fontWeight: value.fontWeight }">{{ value.text }}</text>
+					<view class="line-box">
+						<view class="line-left" :style="{ background: value.textColor }"></view>
+						<view class="line-center" :style="{ borderColor: value.textColor }"></view>
+						<view class="line-right" :style="{ background: value.textColor }"></view>
+					</view>
+				</view>
+			</block>
+			<block v-else-if="value.style == 'style-5'">
+				<view class="style5">
+					<view class="style5-box" :style="{ color: value.textColor }">
+						<text class="style5-title" :style="{ color: value.textColor, fontSize: value.fontSize * 2 + 'rpx' ,fontWeight: value.fontWeight}">{{ value.text }}</text>
+						<view class="line-left" :style="{ background: value.textColor }"></view>
+						<view class="line-right" :style="{ background: value.textColor }"></view>
+					</view>
+				</view>
+			</block>
+			<block v-else-if="value.style == 'style-6'">
+				<view class="style6">
+					<view class="style6-box" :style="{ color: value.textColor }">
+						<text class="style6-title" :style="{ color: value.textColor, fontSize: value.fontSize * 2 + 'rpx',fontWeight: value.fontWeight }">{{ value.text }}</text>
+						<view class="style6-wrap" :style="{ color: value.textColor }"></view>
+					</view>
+				</view>
+			</block>
+			<block v-else-if="value.style == 'style-7'">
+				<view class="style7">
+					<view class="style7-box" :style="{ color: value.textColor }">
+						<text class="style7-title" :style="{ background: value.textColor, fontSize: value.fontSize * 2 + 'rpx',fontWeight: value.fontWeight }">{{ value.text }}</text>
+						<view class="style7-wrap" :style="{ color: value.textColor }"></view>
+					</view>
+				</view>
+			</block>
+			<block v-else-if="value.style == 'style-8'">
+				<view class="style8">
+					<view class="style8-box" :style="{ color: value.textColor }">
+						<text class="style8-title" :style="{ color: value.textColor, fontSize: value.fontSize * 2 + 'rpx',fontWeight: value.fontWeight }">{{ value.text }}</text>
+						<view class="style8-wrap" :style="{ background: value.textColor, height: value.fontSize * 2 + 'rpx' }"></view>
+					</view>
+				</view>
+			</block>
+			<block v-else-if="value.style == 'style-9'">
+				<view class="style9">
+					<view class="style9-box">
+						<view class="style9-center">
+							<view class="left-img"><image :src="$util.img('public/uniapp/diy/style9-1.png')"/></view>
+							<text class="style9-title" :style="{ fontSize: value.fontSize * 2 + 'rpx', color: value.textColor, fontWeight: value.fontWeight }">
+								{{ value.text }}
+							</text>
+							<view class="right-img"><image :src="$util.img('public/uniapp/diy/style9-2.png')"/></view>
+							<view class="style9-more" v-if="value.more.isShow" :style="{ color: value.more.color }" @click.stop="$util.diyRedirectTo(value.more.link)">
+								{{ value.more.text }}
+								<view class="iconfont icon-right" :style="{ color: value.more.color }"></view>
+							</view>
+						</view>
+						<text class="sub-title" :style="{ color: value.subTitle.color }">{{ value.subTitle.text }}</text>
+					</view>
+				</view>
+			</block>
+			<block v-else-if="value.style == 'style-10'">
+				<view class="style10">
+					<view class="style10-box">
+						<view class="style10-center">
+							<view class="left-img"><image :src="$util.img('public/uniapp/diy/style10-1.png')"></image></view>
+							<text
+								class="style10-title"
+								v-if="$util.img('public/uniapp/diy/style10-3.png')"
+								:style="{
+									backgroundImage: 'url(' + $util.img('public/uniapp/diy/style10-3.png') + ')',
+									backgroundSize: 100 + '%',
+									backgroundPositionY: 93 + '%',
+									backgroundRepeat: 'no-repeat',
+									fontSize: value.fontSize * 2 + 'rpx',
+									color: value.textColor,
+									fontWeight: value.fontWeight
+								}"
+							>
+								{{ value.text }}
+							</text>
+							<view class="right-img"><image :src="$util.img('public/uniapp/diy/style10-2.png')"></image></view>
+							<view class="style10-more" v-if="value.more.isShow" :style="{ color: value.more.color }" @click.stop="$util.diyRedirectTo(value.more.link)">
+								{{ value.more.text }}
+								<view class="iconfont icon-right" :style="{ color: value.more.color }"></view>
+							</view>
+						</view>
+						<text class="sub-title" :style="{ color: value.subTitle.color }">{{ value.subTitle.text }}</text>
+					</view>
+				</view>
+			</block>
+			<block v-else-if="value.style == 'style-11'">
+				<view class="style11" :style="{ backgroundColor: value.backgroundColor }">
+					<view class="style11-box">
+						<view class="style11-conter">
+							<view class="style11-conter-box">
+								<view class="left">
+									<view class="style11-title"
+										:style="{
+											fontSize: value.fontSize * 2 + 'rpx',
+											color: value.textColor,
+											fontWeight: value.fontWeight
+										}"
+									>
+										{{ value.text }}
+									</view>
+									<view class="style11-sub" :style="{ color: value.subTitle.color }">{{ value.subTitle.text }}</view>
+								</view>
+								<view class="style11-more" v-if="value.more.isShow" :style="{ color: value.more.color }" @click.stop="$util.diyRedirectTo(value.more.link)">
+									{{ value.more.text }}
+									<view class="iconfont icon-right" :style="{ color: value.more.color }"></view>
+								</view>
+
+								<image class="center-img" :src="$util.img('public/uniapp/diy/style11-1.png')" mode="widthFix"></image>
+
+								<image class="right-img" :src="$util.img('public/uniapp/diy/style11-2.png')" mode="widthFix"></image>
+							</view>
+						</view>
+					</view>
+				</view>
+			</block>
+			<view class="style12" v-if="value.style == 'style-12'">
+				<view class="style12-title"
+					:style="{
+						fontSize: value.fontSize * 2 + 'rpx',
+						color: value.textColor,
+						fontWeight: value.fontWeight
+					}"
+				>
+					{{ value.text }}
+				</view>
+				<text class="style12-sub-title" :style="{ color: value.subTitle.color }">{{ value.subTitle.text }}</text>
+				<view class="style12-more" v-if="value.more.isShow" :style="{ color: value.more.color }" @click.stop="$util.diyRedirectTo(value.more.link)">
+					<text>{{ value.more.text }}</text>
+					<view class="iconfont icon-right" :style="{ color: value.more.color }"></view>
+				</view>
+			</view>
+			<view class="style13" v-else-if="value.style == 'style-13'">
+				<image class="left-img" :src="$util.img('public/uniapp/diy/style13-1.png')" mode="widthFix"></image>
+				<view
+					class="style13-title"
+					:style="{
+						fontSize: value.fontSize * 2 + 'rpx',
+						color: value.textColor,
+						fontWeight: value.fontWeight
+					}"
+				>
+					{{ value.text }}
+				</view>
+				<image class="right-img" :src="$util.img('public/uniapp/diy/style13-1.png')" mode="widthFix"></image>
+			</view>
+			<view class="style14" v-else-if="value.style == 'style-14'">
+				<view class="title-wrap">
+					<view class="text">
+						<text :style="{ fontSize: value.fontSize * 2 + 'rpx', color: value.textColor, fontWeight: value.fontWeight }">
+							{{ value.text }}
+						</text>
+						<text class="zone" :style="{ fontSize: value.fontSize * 2 + 'rpx', fontWeight: value.fontWeight }">专区</text>
+					</view>
+					<text class="iconfont icon-danxuan-xuanzhong" :style="{ color: value.textColor, fontWeight: value.fontWeight }"></text>
+					<text class="iconfont icon-danxuan-xuanzhong" :style="{ color: value.textColor, fontWeight: value.fontWeight }"></text>
+					<text class="iconfont icon-danxuan-xuanzhong" :style="{ color: value.textColor, fontWeight: value.fontWeight }"></text>
+					<view
+						class="sub-title"
+						v-show="value.subTitle.text"
+						:style="{ fontSize: value.subTitle.fontSize * 2 + 'rpx', color: value.subTitle.color }"
+					>
+						{{ value.subTitle.text }}
+					</view>
+				</view>
+				<view v-show="value.more.isShow == 1" class="more" :style="{ color: value.more.color }">
+					<text>{{ value.more.text }}</text>
+					<text class="iconfont icon-right"></text>
+				</view>
+			</view>
+
+			<!-- 图十五 -->
+			<view class="style15" v-else-if="value.style == 'style-15'">
+				<view class="title-wrap">
+					<view class="ornament" style="margin-right: 40rpx;">
+						<text class="line" :style="{ color: value.textColor, fontWeight: value.fontWeight }"></text>
+						<text class="line" :style="{ color: value.textColor, fontWeight: value.fontWeight }"></text>
+						<text class="my">
+							<text class="yuan" :style="{ backgroundColor: value.textColor, fontWeight: value.fontWeight }"></text>
+							<text class="vertical" :style="{ color: value.textColor, fontWeight: value.fontWeight }"></text>
+						</text>
+					</view>
+					<text :style="{ fontSize: value.fontSize * 2 + 'rpx', color: value.textColor, fontWeight: value.fontWeight }">
+						{{ value.text }}
+					</text>
+					<view class="ornament" style="margin-left: 40rpx;">
+						<text class="line" :style="{ color: value.textColor, fontWeight: value.fontWeight }"></text>
+						<text class="line" :style="{ color: value.textColor, fontWeight: value.fontWeight }"></text>
+						<text class="my">
+							<text class="yuan" :style="{ backgroundColor: value.textColor, fontWeight: value.fontWeight }"></text>
+							<text class="vertical" :style="{ color: value.textColor, fontWeight: value.fontWeight }"></text>
+						</text>
+					</view>
+				</view>
+				<view
+					class="sub-title"
+					v-show="value.subTitle.text"
+					:style="{ fontSize: value.subTitle.fontSize * 2 + 'rpx', color: value.subTitle.color }"
+				>
+					{{ value.subTitle.text }}
+				</view>
+			</view>
+
+			<!-- 图十六 -->
+			<view class="style16" v-if="value.style == 'style-16'">
+				<view
+					class="style16-title"
+					:style="{
+						fontSize: value.fontSize * 2 + 'rpx',
+						color: value.textColor,
+						fontWeight: value.fontWeight
+					}"
+				>
+					{{ value.text }}
+				</view>
+				<view class="style16-sub-title" v-show="value.subTitle.text" :style="{ color: value.subTitle.color, backgroundColor: value.subTitle.bgColor }">
+					<text :class="['js-icon', value.subTitle.icon]" :style="{ backgroundColor: value.subTitle.bgColor }"></text>
+					<text :style="{ fontWeight: value.subTitle.fontWeight }">{{ value.subTitle.text }}</text>
+				</view>
+				<view class="style16-more" v-if="value.more.isShow" :style="{ color: value.more.color }" @click.stop="$util.diyRedirectTo(value.more.link)">
+					<text>{{ value.more.text }}</text>
+					<view class="iconfont icon-right" :style="{ color: value.more.color }"></view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+// 标题
+export default {
+	name: 'diy-text',
+	props: {
+		value: {
+			type: Object
+		}
+	},
+	data() {
+		return {};
+	},
+	created() {},
+	watch: {
+		// 组件刷新监听
+		componentRefresh: function(nval) {}
+	},
+	computed: {
+		warpCss() {
+			var obj = '';
+			obj += 'background-color:' + this.value.componentBgColor + ';';
+			if (this.value.componentAngle == 'round') {
+				obj += 'border-top-left-radius:' + this.value.topAroundRadius * 2 + 'rpx;';
+				obj += 'border-top-right-radius:' + this.value.topAroundRadius * 2 + 'rpx;';
+				obj += 'border-bottom-left-radius:' + this.value.bottomAroundRadius * 2 + 'rpx;';
+				obj += 'border-bottom-right-radius:' + this.value.bottomAroundRadius * 2 + 'rpx;';
+			}
+			return obj;
+		}
+	},
+	methods: {}
+};
+</script>
+
+<style lang="scss">
+.diy-text {
+	padding: 0;
+	display: flex;
+	justify-content: center;
+}
+
+.diy-text .title {
+	margin: 0;
+	color: #333;
+	display: flex;
+	align-items: center;
+	width: 100%;
+	justify-content: center;
+}
+
+.diy-text .title2 {
+	margin: 0;
+	color: #333;
+	display: flex;
+	align-items: center;
+	width: 100%;
+}
+
+.diy-text .title > text {
+	padding: 0 15rpx;
+}
+
+.left {
+	transform: translateY(0%);
+	width: 30rpx;
+	height: 24rpx;
+}
+
+.right {
+	transform: translateY(0%);
+	width: 30rpx;
+	height: 24rpx;
+}
+
+.style2 {
+	width: 100%;
+	text-align: center;
+
+	.xian {
+		width: 100%;
+		height: 2rpx;
+		vertical-align: top;
+		position: relative;
+	}
+
+	.line-triangle {
+		background: transparent !important;
+		position: absolute;
+		border: 12rpx solid #000;
+		border-top-color: transparent !important;
+		border-left-color: transparent !important;
+		left: 50%;
+		bottom: -10rpx;
+		margin-left: -12rpx;
+		transform: rotate(45deg);
+	}
+}
+
+.style3 {
+	width: 100%;
+	text-align: center;
+
+	.inner-line {
+		width: 100%;
+		height: 2rpx;
+		vertical-align: top;
+		position: relative;
+	}
+
+	.line-short {
+		width: 324rpx;
+		height: 6rpx;
+		position: absolute;
+		bottom: 0;
+		left: 50%;
+		margin-left: -162rpx;
+	}
+}
+
+.style4 {
+	text-align: center;
+	width: 100%;
+
+	.line-box {
+		height: 5rpx;
+		position: relative;
+		text-align: center;
+		margin-top: 5rpx;
+		width: 100%;
+
+		.line-left {
+			display: inline-block;
+			position: absolute;
+			top: 8rpx;
+			left: 0;
+			bottom: 0;
+			width: calc((100% - 44rpx) / 2);
+			height: 2rpx;
+		}
+
+		.line-center {
+			width: 12rpx;
+			height: 12rpx;
+			border: 2rpx solid;
+			display: inline-block;
+			-webkit-transform: rotate(45deg);
+			transform: rotate(45deg);
+			position: absolute;
+			top: 0;
+			left: 50%;
+			bottom: 0;
+			margin-left: -6rpx;
+		}
+
+		.line-right {
+			display: inline-block;
+			position: absolute;
+			top: 8rpx;
+			bottom: 0;
+			right: 0;
+			width: calc((100% - 44rpx) / 2);
+			height: 2rpx;
+		}
+	}
+}
+
+.style5 {
+	text-align: center;
+	position: relative;
+
+	.style5-box {
+		display: inline-block;
+		padding: 10rpx !important;
+		border: 1rpx solid;
+		position: relative;
+
+		.style5-title {
+			display: inline-block;
+			padding: 10rpx 30rpx;
+			border: 1rpx solid;
+			line-height: 1;
+		}
+
+		.line-left {
+			height: 10rpx;
+			position: absolute;
+			width: 80rpx;
+			top: 50%;
+			margin-top: -4rpx;
+			left: 0;
+			margin-left: -60rpx;
+		}
+
+		.line-right {
+			height: 10rpx;
+			position: absolute;
+			width: 80rpx;
+			top: 50%;
+			margin-top: -4rpx;
+			right: 0;
+			margin-right: -60rpx;
+		}
+	}
+}
+
+.style6 {
+	text-align: center;
+	position: relative;
+
+	.style6-box {
+		display: inline-block;
+		position: relative;
+
+		.style6-title {
+			display: inline-block;
+			padding: 6rpx 50rpx;
+			border: 1rpx solid;
+			position: relative;
+			z-index: 2;
+			background: rgb(255, 255, 255);
+			line-height: 1.5;
+		}
+
+		.style6-wrap {
+			position: absolute;
+			display: inline-block;
+			width: 100%;
+			top: 10rpx;
+			right: 4rpx;
+			bottom: -10rpx;
+			left: 10rpx;
+			border: 1rpx solid;
+			z-index: 0;
+			box-sizing: border-box;
+		}
+	}
+}
+
+.style7 {
+	text-align: center;
+	position: relative;
+
+	.style7-box {
+		display: inline-block;
+		position: relative;
+
+		.style7-title {
+			display: inline-block;
+			padding: 0rpx 50rpx;
+			position: relative;
+			z-index: 2;
+			padding-bottom: 6rpx;
+			color: rgb(255, 255, 255);
+			line-height: 1.5;
+		}
+
+		.style7-wrap {
+			width: 100%;
+			box-sizing: border-box;
+			position: absolute;
+			top: 10rpx;
+			right: 4rpx;
+			bottom: -10rpx;
+			left: 10rpx;
+			border: 1rpx solid;
+			z-index: 0;
+		}
+	}
+}
+
+.style8 {
+	position: relative;
+	text-align: left;
+
+	.style8-box {
+		text-align: left !important;
+		.style8-title{
+			margin-left: 20rpx;
+		}
+		.style8-wrap {
+			height: 100%;
+			position: absolute;
+			top: 50%;
+			transform: translateY(-50%);
+			left: 0;
+			width: 4rpx;
+		}
+	}
+}
+
+.style9 {
+	width: 100%;
+
+	.style9-box {
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		width: 100%;
+
+		.style9-center {
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			width: calc(100% - 264rpx);
+			position: relative;
+
+			text {
+				max-width: 100%;
+				overflow: hidden;
+				white-space: nowrap;
+				text-overflow: ellipsis;
+			}
+
+			.left-img {
+				width: 40rpx;
+				height: 40rpx;
+				text-align: center;
+				flex-shrink: 0;
+
+				image {
+					width: 100%;
+					height: 100%;
+				}
+			}
+
+			.right-img {
+				width: 40rpx;
+				height: 40rpx;
+				text-align: center;
+				flex-shrink: 0;
+
+				image {
+					width: 100%;
+					height: 100%;
+				}
+			}
+
+			.style9-more {
+				display: flex;
+				position: absolute;
+				right: -140rpx;
+				/* #ifdef MP-WEIXIN */
+				right: -120rpx;
+				/* #endif */
+				top: 14rpx;
+				line-height: 1;
+				align-items: center;
+
+				.iconfont {
+					line-height: 1;
+				}
+			}
+
+			.sub-title {
+				line-height: 1;
+			}
+		}
+	}
+}
+
+.style10 {
+	width: 100%;
+
+	.style10-box {
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		width: 100%;
+
+		.style10-center {
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			width: calc(100% - 264rpx);
+			position: relative;
+
+			text {
+				max-width: 100%;
+				overflow: hidden;
+				white-space: nowrap;
+				text-overflow: ellipsis;
+				padding-bottom: 8rpx;
+				z-index: 99;
+			}
+
+			.left-img {
+				padding-bottom: 13rpx;
+				width: 40rpx;
+				height: 40rpx;
+				text-align: center;
+				flex-shrink: 0;
+
+				image {
+					width: 100%;
+					height: 100%;
+				}
+			}
+
+			.center-img {
+				width: 198rpx;
+				height: 18rpx;
+				text-align: center;
+				flex-shrink: 0;
+				position: absolute;
+				bottom: 26rpx;
+				z-index: 5;
+
+				image {
+					width: 100%;
+					height: 100%;
+				}
+			}
+
+			.right-img {
+				padding-bottom: 13rpx;
+				width: 40rpx;
+				height: 40rpx;
+				text-align: center;
+				flex-shrink: 0;
+
+				image {
+					width: 100%;
+					height: 100%;
+				}
+			}
+
+			.style10-more {
+				display: flex;
+				position: absolute;
+				right: -140rpx;
+				/* #ifdef MP-WEIXIN */
+				right: -120rpx;
+				/* #endif */
+				top: 14rpx;
+				line-height: 1;
+				align-items: center;
+
+				.iconfont {
+					line-height: 1;
+				}
+			}
+
+			.sub-title {
+				line-height: 1;
+			}
+		}
+	}
+}
+
+.style11 {
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	width: 100%;
+
+	.style11-box {
+		width: 100%;
+		margin: 10rpx 0;
+
+		.style11-conter {
+			.style11-conter-box {
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				position: relative;
+
+				.left {
+					display: flex;
+					width: 70%;
+					flex-direction: column;
+					justify-content: space-between;
+					height: 100%;
+					margin: 15rpx 0;
+					padding-left: 34rpx;
+					z-index: 9;
+
+					.style11-title {
+						width: 100%;
+						overflow: hidden;
+						white-space: nowrap;
+						text-overflow: ellipsis;
+					}
+
+					.style11-sub {
+						letter-spacing: 14rpx;
+						width: 100%;
+						overflow: hidden;
+						white-space: nowrap;
+						text-overflow: ellipsis;
+					}
+				}
+
+				.style11-more {
+					display: flex;
+					margin-right: 20rpx;
+				}
+			}
+
+			.center-img {
+				width: 61rpx;
+				position: absolute;
+				bottom: -26rpx;
+				left: 16rpx;
+				z-index: 0;
+			}
+
+			.right-img {
+				width: 35rpx;
+				position: absolute;
+				top: -14rpx;
+				left: 172rpx;
+				z-index: 0;
+			}
+		}
+	}
+}
+
+.style12 {
+	display: flex;
+	align-items: center;
+	width: 100%;
+	padding: 20rpx;
+
+	.style12-title {
+		text-align: left;
+		max-width: 200rpx;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		overflow: hidden;
+		margin-right: 10rpx;
+	}
+
+	.style12-sub-title {
+		text-align: left;
+		max-width: 300rpx;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		overflow: hidden;
+	}
+
+	.style12-more {
+		display: flex;
+		align-items: center;
+		margin-left: auto;
+
+		text {
+			padding: 0;
+			max-width: 160rpx;
+			white-space: nowrap;
+			text-overflow: ellipsis;
+			overflow: hidden;
+			font-size: 24rpx;
+			margin-right: 8rpx;
+		}
+		.iconfont{
+			font-size: 24rpx;
+		}
+	}
+}
+
+.style13 {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+
+	.style13-title {
+		max-width: 420rpx;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		overflow: hidden;
+		margin: 0 10rpx;
+	}
+
+	image {
+		height: 50rpx;
+		width: 76rpx;
+	}
+
+	.right-img {
+		transform: rotateY(180deg);
+	}
+}
+.style14 {
+	display: flex;
+	justify-content: space-between;
+	text-align: initial;
+	align-items: center;
+	flex: 1;
+	padding: 0 20rpx;
+	text {
+		padding: 0 !important;
+	}
+	.title-wrap {
+		.text {
+			display: inline-block;
+		}
+		.iconfont {
+			font-size: 24rpx;
+			&:nth-of-type(1) {
+				margin-left: 20rpx;
+			}
+			&:nth-of-type(2) {
+				opacity: 0.6;
+			}
+			&:nth-of-type(3) {
+				opacity: 0.4;
+			}
+		}
+		.sub-title {
+			opacity: 0.6;
+		}
+		.more {
+			text:first-child {
+				font-size: 28rpx;
+			}
+		}
+	}
+}
+.style15 {
+	flex: 1;
+	text {
+		padding: 0 !important;
+		line-height: 1;
+	}
+	.title-wrap {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	}
+	.ornament {
+		display: flex;
+		align-items: flex-end;
+		.line {
+			border-left: 8rpx solid;
+			transform: rotate(40deg);
+			border-radius: 40rpx;
+			height: 28rpx;
+			display: block;
+			margin-right: 12rpx;
+			&:nth-of-type(2) {
+				height: 40rpx;
+				margin-right: 10rpx;
+				position: relative;
+				top: 4rpx;
+			}
+		}
+		.my {
+			transform: rotate(40deg);
+			line-height: 0;
+			position: relative;
+			top: 4rpx;
+			.yuan {
+				font-size: 100rpx;
+				border-radius: 50%;
+				width: 8rpx;
+				height: 8rpx;
+				display: block;
+			}
+			.vertical {
+				border-left: 8rpx solid;
+				height: 20rpx;
+				margin-top: 4rpx;
+				display: inline-block;
+				border-radius: 40rpx;
+			}
+		}
+	}
+	.sub-title {
+		opacity: 0.6;
+		text-align: center;
+	}
+}
+.style16 {
+	display: flex;
+	align-items: center;
+	width: 100%;
+	padding: 20rpx;
+	.style16-more {
+		display: flex;
+		align-items: center;
+		margin-left: auto;
+		& > text {
+			max-width: 200rpx;
+			white-space: nowrap;
+			text-overflow: ellipsis;
+			overflow: hidden;
+		}
+	}
+	.style16-title {
+		text-align: left;
+		max-width: 200rpx;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		overflow: hidden;
+	}
+	.style16-sub-title {
+		margin-left: 20rpx;
+		text-align: left;
+		max-width: 300rpx;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		overflow: hidden;
+		border-radius: 34rpx;
+		background-image: radial-gradient(transparent 60%, #fff);
+		height: 50rpx;
+		display: flex;
+		align-items: center;
+		padding: 0 20rpx;
+		position: relative;
+		&> .js-icon {
+			padding: 8rpx;
+			background-image: radial-gradient(transparent 30%, #fff);
+			border-radius: 50%;
+			margin-left: -20rpx;
+			margin-right: 6rpx;
+			font-size: 28rpx;
+			line-height: 1;
+		}
+	}
+}
+</style>
diff --git a/components/diy-components/diy-video.vue b/components/diy-components/diy-video.vue
new file mode 100644
index 0000000..05c6bf6
--- /dev/null
+++ b/components/diy-components/diy-video.vue
@@ -0,0 +1,46 @@
+<template>
+	<video class="diy-video" :src="$util.img(value.videoUrl)" :poster="$util.img(value.imageUrl)" :style="videoWarpCss"  objectFit="cover"></video>
+</template>
+
+<script>
+	// 视频
+	export default {
+		name: 'diy-video',
+		props: {
+			value: {
+				type: Object
+			}
+		},
+		data() {
+			return {};
+		},
+		created() {},
+		watch: {
+			// 组件刷新监听
+			componentRefresh: function(nval) {}
+		},
+		computed: {
+			videoWarpCss: function() {
+				var obj = '';
+				if (this.value.componentAngle == 'round') {
+					obj += 'border-top-left-radius:' + this.value.topAroundRadius * 2 + 'rpx;';
+					obj += 'border-top-right-radius:' + this.value.topAroundRadius * 2 + 'rpx;';
+					obj += 'border-bottom-left-radius:' + this.value.bottomAroundRadius * 2 + 'rpx;';
+					obj += 'border-bottom-right-radius:' + this.value.bottomAroundRadius * 2 + 'rpx;';
+				}
+				return obj;
+			}
+		},
+		methods: {}
+	};
+</script>
+
+<style scoped>
+	video {
+		width: 100%;
+	}
+
+	.diy-video>>>.uni-video-container {
+		background-color: transparent;
+	}
+</style>
\ No newline at end of file
diff --git a/components/goods-detail-view/detail.js b/components/goods-detail-view/detail.js
new file mode 100644
index 0000000..45a3720
--- /dev/null
+++ b/components/goods-detail-view/detail.js
@@ -0,0 +1,465 @@
+// 商品详情业务
+import {
+	Weixin
+} from '@/common/js/wx-jssdk.js';
+
+export default {
+	data() {
+		return {
+			skuId: 0,
+			goodsId: 0,
+			isIphoneX: false, //判断手机是否是iphoneX以上
+			whetherCollection: 0,
+
+			//是否开启预览，0：不开启，1：开启
+			preview: 0,
+			videoContext: '',
+
+			// 媒体,图片,视频
+
+			// 解决每个商品SKU图片数量不同时，无法切换到第一个，导致轮播图显示不出来
+			swiperInterval: 1,
+			swiperAutoplay: false,
+			swiperCurrent: 1,
+			switchMedia: 'img',
+
+			//评价
+			goodsEvaluate: [{
+				member_headimg: '',
+				member_name: '',
+				content: '',
+				images: [],
+				create_time: 0,
+				sku_name: ''
+			}],
+			evaluateConfig: {
+				evaluate_audit: 1,
+				evaluate_show: 0,
+				evaluate_status: 1
+			},
+
+			// 是否可分享到好物圈
+			goodsCircle: false,
+			service: null,
+			shareUrl: '', // 分享链接
+			source_member: 0, //分享人的id
+			isCommunity: false, //社群弹窗
+
+			poster: "-1", //海报
+			posterMsg: "", //海报错误信息
+			posterHeight: 0,
+			posterParams: {}, //海报所需参数
+			goodsRoute: '',
+			posterApi: '',
+			goodsAttrShow: false, // 商品属性是否展开
+
+			//门店列表
+			storeList: {
+				data: [],
+				page: 1,
+				page_size: 10
+			},
+			isShowStore: false,
+			latitude: null, // 纬度
+			longitude: null, // 经度
+			evaluateCount: 0, // 商品评论数量
+			deliveryType: null, // 配送方式
+			isVirtual: 0 //是否为虚拟商品
+		}
+	},
+	created() {
+		this.isIphoneX = this.$util.uniappIsIPhoneX();
+
+		if (this.location) {
+			this.latitude = this.location.latitude;
+			this.longitude = this.location.longitude;
+		} else {
+			this.$util.getLocation();
+		}
+		this.getStoreData();
+	},
+	watch: {
+		location: function (nVal) {
+			if (nVal) {
+				this.latitude = nVal.latitude;
+				this.longitude = nVal.longitude;
+				this.getStoreData();
+			}
+		}
+	},
+	methods: {
+		init(params) {
+			this.skuId = params.sku_id;
+			this.goodsId = params.goods_id;
+			this.preview = params.preview;
+			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;
+
+			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;
+				}
+			}
+
+			this.getService();
+
+			this.videoContext = uni.createVideoContext('goodsVideo');
+
+			// #ifdef MP-WEIXIN
+			this.goodsSyncToGoodsCircle();
+			// #endif
+
+		},
+		swiperChange(e) {
+			this.swiperCurrent = e.detail.current + 1;
+		},
+
+		//-------------------------------------服务-------------------------------------
+
+		openMerchantsServicePopup() {
+			this.$refs.merchantsServicePopup.open();
+		},
+		closeMerchantsServicePopup() {
+			this.$refs.merchantsServicePopup.close();
+		},
+
+		//-------------------------------------门店列表-------------------------------------
+		openStoreListPopup() {
+			this.$refs.storeListPopup.open();
+		},
+		closeStoreListPopup() {
+			this.$refs.storeListPopup.close();
+		},
+		getStoreData() {
+			//门店列表
+			let data = {
+				page: this.storeList.page,
+				page_size: this.storeList.page_size
+			};
+			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.storeList.page == 1) this.storeList.data == [];
+					if (res.code >= 0 && res.data) {
+						this.storeList.data = this.storeList.data.concat(res.data.list);
+					} else {
+						this.$util.showToast({
+							title: res.message
+						});
+					}
+				}
+			});
+		},
+		selectStore(item) {
+			this.$util.redirectTo('/pages_tool/store/detail', {
+				store_id: item.store_id
+			});
+			this.closeStoreListPopup();
+		},
+		//-------------------------------------属性-------------------------------------
+
+		switchGoodsAttr() {
+			this.goodsAttrShow = !this.goodsAttrShow;
+		},
+		//-------------------------------------评价-------------------------------------
+		//商品评论列表
+		getGoodsEvaluate(list) {
+			if (list) {
+				this.goodsEvaluate = list;
+				this.goodsEvaluate.forEach((item, index) => {
+					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), '***')
+			}
+		},
+		// 预览评价图片
+		previewEvaluate(index, img_index, field) {
+			var paths = [];
+			for (let i = 0; i < this.goodsEvaluate[index][field].length; i++) {
+				paths.push(this.$util.img(this.goodsEvaluate[index][field][i]));
+			}
+			uni.previewImage({
+				current: img_index,
+				urls: paths
+			});
+		},
+		//-------------------------------------关注-------------------------------------
+		async collection() {
+			if (this.preview) return; // 开启预览，禁止任何操作和跳转
+
+			if (this.storeToken) {
+
+				//未关注添加关注
+				if (this.whetherCollection == 0) {
+					let res = await this.$api.sendRequest({
+						url: "/api/goodscollect/add",
+						data: {
+							sku_id: this.skuId,
+							goods_id: this.goodsSkuDetail.goods_id,
+							sku_name: this.goodsSkuDetail.sku_name,
+							sku_price: this.goodsSkuDetail.show_price,
+							sku_image: this.goodsSkuDetail.sku_image
+						},
+						async: false,
+					});
+					var data = res.data;
+					if (data > 0) {
+						this.whetherCollection = 1;
+					}
+				} else {
+					//已关注取消关注
+					let res = await this.$api.sendRequest({
+						url: "/api/goodscollect/delete",
+						data: {
+							goods_id: this.goodsSkuDetail.goods_id
+						},
+						async: false,
+					});
+					var data = res.data;
+					if (data > 0) {
+						this.whetherCollection = 0;
+					}
+				}
+				return this.whetherCollection;
+			} else {
+				if (this.source_member) {
+					this.$refs.login.open(this.shareUrl + '&source_member=' + this.source_member);
+				} else {
+					this.$refs.login.open(this.shareUrl);
+				}
+			}
+		},
+		//-------------------------------------分享-------------------------------------
+		// 打开分享弹出层
+		openSharePopup() {
+			this.$refs.sharePopup.open();
+		},
+		// 关闭分享弹出层
+		closeSharePopup() {
+			this.$refs.sharePopup.close();
+		},
+		copyUrl() {
+			let text = this.$config.h5Domain + this.shareUrl;
+			if (this.memberInfo && this.memberInfo.member_id) text += '&source_member=' + this.memberInfo.member_id;
+			this.$util.copy(text, () => {
+				this.closeSharePopup();
+			});
+		},
+
+		//-------------------------------------海报-------------------------------------
+		// 打开海报弹出层
+		openPosterPopup() {
+			this.getGoodsPoster();
+			this.$refs.sharePopup.close();
+		},
+		// 关闭海报弹出层
+		closePosterPopup() {
+			this.$refs.posterPopup.close();
+			this.poster = ''
+		},
+		//生成海报
+		getGoodsPoster() {
+			uni.showLoading({
+				'title': '海报生成中...'
+			})
+			//活动海报信息
+			if (this.memberInfo && this.memberInfo.member_id) this.posterParams.source_member = this.memberInfo.member_id;
+
+			this.$api.sendRequest({
+				url: this.posterApi,
+				data: {
+					page: this.goodsRoute,
+					qrcode_param: JSON.stringify(this.posterParams)
+				},
+				success: res => {
+					if (res.code == 0) {
+						this.$refs.posterPopup.open();
+						this.poster = res.data.path + "?time=" + new Date().getTime();
+					} else {
+						this.posterMsg = res.message;
+						this.$util.showToast({
+							title: res.message
+						})
+					}
+					uni.hideLoading();
+				},
+				fail: err => {
+					uni.hideLoading();
+				}
+			});
+		},
+		// 预览图片
+		previewMedia(index) {
+			var paths = [];
+			for (let i = 0; i < this.goodsSkuDetail.sku_images.length; i++) {
+				paths.push(this.$util.img(this.goodsSkuDetail.sku_images[i], {
+					size: 'big'
+				}));
+			}
+			uni.previewImage({
+				current: index,
+				urls: paths,
+				// longPressActions: {
+				// 	itemList: ['发送给朋友', '保存图片', '关注'],
+				// 	success: function(data) {
+				// 		console.log('选中了第' + (data.tapIndex + 1) + '个按钮,第' + (data.index + 1) + '张图片');
+				// 	},
+				// 	fail: function(err) {
+				// 		console.log(err.errMsg);
+				// 	}
+				// }
+			});
+		},
+		swiperImageError(index) {
+			this.goodsSkuDetail.sku_images[index] = this.$util.getDefaultImage().goods;
+			this.$forceUpdate();
+		},
+		// #ifdef MP || APP-PLUS
+		//小程序中保存海报
+		saveGoodsPoster() {
+			let url = this.$util.img(this.poster);
+			uni.downloadFile({
+				url: url,
+				success: (res) => {
+					if (res.errMsg == "downloadFile:ok") {
+						uni.saveImageToPhotosAlbum({
+							filePath: res.tempFilePath,
+							success: () => {
+								this.$util.showToast({
+									title: "保存成功"
+								});
+							},
+							fail: (err) => {
+								this.$util.showToast({
+									title: "保存失败，请稍后重试"
+								});
+							}
+						});
+					}
+				},
+				fail: (err) => {
+					this.$util.showToast({
+						title: "保存失败，请稍后重试"
+					});
+				}
+			});
+		},
+		// #endif
+		//售后保障查询
+		getService() {
+			this.$api.sendRequest({
+				url: '/api/goods/aftersale',
+				success: res => {
+					if (res.code == 0 && res.data) {
+						this.service = res.data;
+					}
+				}
+			});
+		},
+
+		// #ifdef MP-WEIXIN
+		/**
+		 *    将商品同步到微信圈子
+		 */
+		goodsSyncToGoodsCircle() {
+			this.$api.sendRequest({
+				url: '/goodscircle/api/goods/sync',
+				data: {
+					goods_id: this.goodsSkuDetail.goods_id
+				},
+				success: res => {
+					if (res.code == 0) {
+						this.goodsCircle = true;
+					}
+				}
+			})
+		},
+		/**
+		 * 将商品推荐到微信圈子
+		 */
+		openBusinessView() {
+			if (wx.openBusinessView) {
+				wx.openBusinessView({
+					businessType: 'friendGoodsRecommend',
+					extraData: {
+						product: {
+							item_code: this.goodsSkuDetail.goods_id,
+							title: this.goodsSkuDetail.sku_name,
+							image_list: this.goodsSkuDetail.sku_images.map((ele) => {
+								return this.$util.img(ele);
+							})
+						}
+					},
+					success: function (res) {
+						console.log('success', res);
+					},
+					fail: function (res) {
+						console.log('fail', res);
+					}
+				})
+			}
+		},
+		// #endif
+		toEvaluateDetail(id) {
+			this.$util.redirectTo('/pages_tool/goods/evaluate', {
+				goods_id: id
+			});
+		},
+		showImg(e) {
+			//拿到图片的路径里面的内容放在我们数组中
+			let contentimg = e.target.dataset.nodes;
+			let arrImg = [];
+			for (var i = 0; i < contentimg.length; i++) {
+				var img = contentimg[i].children;
+				if (Array.isArray(img)) {
+					for (var j = 0; j < img.length; j++) {
+						if (img[j].attrs && img[j].name == "img") {
+							if (img[j].attrs.src) {
+								arrImg.push(img[j].attrs.src)
+							}
+						}
+					}
+				}
+			}
+			//最后一步就是把我们的所有图片放在预览的api中就可以了
+			uni.previewImage({
+				current: arrImg,
+				urls: arrImg,
+			})
+		},
+
+		//-------------------------------------社群-------------------------------------
+
+		//添加福利群
+		onCommunity() {
+			this.isCommunity = true
+		},
+		onCloseCommunity() {
+			this.isCommunity = false
+		},
+
+	}
+
+}
\ No newline at end of file
diff --git a/components/goods-detail-view/goods-detail-view.vue b/components/goods-detail-view/goods-detail-view.vue
new file mode 100644
index 0000000..7590573
--- /dev/null
+++ b/components/goods-detail-view/goods-detail-view.vue
@@ -0,0 +1,455 @@
+<template>
+    <view>
+        <view scroll-y="true" class="goods-detail" :class="isIphoneX ? 'active' : ''">
+            <view class="goods-container">
+                <!-- 弹幕 -->
+                <pengpai-fadein-out v-if="goodsSkuDetail.barrage_show && goodsSkuDetail.barrageData" ref="pengpai" :duration="1600" :wait="1900" :top="200" :left="0" :radius="60" :loop="true" :info="goodsSkuDetail.barrageData"/>
+
+                <!-- 商品媒体信息 -->
+                <view class="goods-media" :style="{height: goodsSkuDetail.swiperHeight}">
+                    <!-- 商品图片 -->
+                    <view class="goods-img" :class="{ show: switchMedia == 'img' }">
+                        <swiper class="swiper" @change="swiperChange" :interval="swiperInterval" :autoplay="swiperAutoplay" autoplay="true" interval="4000" circular="true">
+                            <swiper-item v-for="(item, index) in goodsSkuDetail.sku_images" :key="index" :item-id="'goods_id_' + index">
+                                <view class="item" @click="previewMedia(index)">
+                                    <image :src="$util.img(item, { size: 'big' })" @error="swiperImageError(index)" mode="aspectFit" />
+                                </view>
+                            </swiper-item>
+                        </swiper>
+                        <view class="img-indicator-dots">
+                            <text>{{ swiperCurrent }}</text>
+                            <text v-if="goodsSkuDetail.sku_images">/{{ goodsSkuDetail.sku_images.length }}</text>
+                        </view>
+                    </view>
+
+                    <!-- 商品视频 -->
+                    <view class="goods-video" :class="{ show: switchMedia == 'video' }">
+                        <video id="goodsVideo" :src="$util.img(goodsSkuDetail.video_url)" :poster="$util.img(goodsSkuDetail.sku_image, { size: 'big' })" objectFit="cover"></video>
+                    </view>
+
+                    <!-- 切换视频、图片 -->
+                    <view class="media-mode" v-if="goodsSkuDetail.video_url != ''">
+                        <text :class="{ 'color-base-bg': switchMedia == 'video' }" @click="switchMedia = 'video'">{{ $lang('video') }}</text>
+                        <text :class="{ 'color-base-bg': switchMedia == 'img' }" @click="(switchMedia = 'img'), videoContext.pause()">{{ $lang('image') }}</text>
+                    </view>
+                </view>
+
+                <!-- 价格区域 -->
+                <view class="goods-gression">
+                    <slot name="price"></slot>
+                </view>
+
+                <view class="newdetail margin-bottom" v-if="goodsSkuDetail.isinformation == 0">
+					
+                    <!-- 入口区域 -->
+                    <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>
+                        <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 }} -->
+                                </block>
+                            </view>
+                            <text class="iconfont icon-right"></text>
+                        </block>
+                        <block v-else>
+                            <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="name-wrap">
+                                <text class="icondiy icon-system-shop"></text>
+                                <text class="name">{{globalStoreInfo.store_name}}</text>
+                            </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>
+                                <view class="address">{{ globalStoreInfo.full_address + globalStoreInfo.address }}
+                                </view>
+                            </view>
+                        </view>
+                        <text class="iconfont icon-right"></text>
+                    </view> -->
+
+                    <view class="item service" @click="openMerchantsServicePopup()" v-if="goodsSkuDetail.goods_service.length">
+                        <view class="label">服务</view>
+                        <view class="list-wrap">
+                            <view class="item-wrap" v-for="(item, index) in goodsSkuDetail.goods_service" :key="index" v-if="index < 3">
+                                <view class="item-wrap-box">
+                                    <view class="item-wrap-icon">
+                                        <text class="iconfont icon-dui" v-if="!item.icon || (!item.icon.imageUrl && !item.icon.icon)"></text>
+                                        <image class="icon-img" v-else-if="item.icon.iconType == 'img'" :src=" $util.img(item.icon.imageUrl)" />
+                                        <diy-icon class="icon-box" v-else-if="item.icon.iconType == 'icon'" :icon="item.icon.icon" :value="item.icon.style ? item.icon.style : null"></diy-icon>
+                                    </view>
+                                    <text>{{ item.service_name }}</text>
+                                </view>
+                            </view>
+                        </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>
+
+                <!-- 配送方式 -->
+                <view @touchmove.prevent.stop>
+                    <uni-popup ref="deliveryType" type="bottom">
+                        <view class="deliverytype-popup-layer popup-layer">
+                            <view class="head-wrap" @click="$refs.deliveryType.close()">
+                                <text>配送</text>
+                                <text class="iconfont icon-close"></text>
+                            </view>
+                            <scroll-view scroll-y class="type-body">
+                                <block v-for="(item, index) in deliveryType" :key="index">
+                                    <view class="type-item" :class="{ 'not-support': goodsSkuDetail.support_trade_type.indexOf(index) == -1 }">
+                                        <text class="iconfont" :class="item.icon"></text>
+                                        <view class="content">
+                                            <view class="title">{{ item.name }}</view>
+                                            <view class="desc">{{ item.desc }}</view>
+                                        </view>
+                                    </view>
+                                </block>
+                            </scroll-view>
+                        </view>
+                    </uni-popup>
+                </view>
+
+                <!-- 商品服务 -->
+                <view @touchmove.prevent.stop>
+                    <uni-popup ref="merchantsServicePopup" type="bottom">
+                        <view class="goods-merchants-service-popup-layer popup-layer">
+                            <view class="head-wrap" @click="closeMerchantsServicePopup()">
+                                <text>商品服务</text>
+                                <text class="iconfont icon-close"></text>
+                            </view>
+                            <scroll-view scroll-y>
+                                <view class="item" :class="{ 'empty-desc': !item.desc }" v-for="(item, index) in goodsSkuDetail.goods_service" :key="index">
+                                    <view class="item-icon" :class="{'empty-desc':!item.desc}">
+                                        <text class="iconfont icon-dui color-base-text" v-if="!item.icon || (!item.icon.imageUrl && !item.icon.icon)"></text>
+                                        <image class="icon-img" v-else-if="item.icon.iconType == 'img'" :src=" $util.img(item.icon.imageUrl)" />
+                                        <diy-icon class="icon-box" v-else-if="item.icon.iconType == 'icon'" :icon="item.icon.icon" :value="item.icon.style ? item.icon.style : null"></diy-icon>
+                                    </view>
+                                    <view class="info-wrap">
+                                        <text class="title">{{ item.service_name }}</text>
+                                        <text class="describe" v-if="item.desc">{{ item.desc }}</text>
+                                    </view>
+                                </view>
+                            </scroll-view>
+                            <view class="button-box">
+                                <button type="primary" @click="closeMerchantsServicePopup()">确定</button>
+                            </view>
+                        </view>
+                    </uni-popup>
+                </view>
+
+                <!-- 门店列表 -->
+                <view @touchmove.prevent.stop>
+                    <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 class="iconfont icon-close"></text>
+                            </view>
+                            <scroll-view scroll-y>
+                                <view class="store-list-content">
+                                    <view class="list-item" v-for="(item, index) in storeList.data" :key="index" @click="selectStore(item)">
+                                        <view class="item-box">
+                                            <view class="item-image">
+                                                <image :src="$util.img(item.store_image)" v-if="item.store_image"/>
+                                                <image :src="$util.getDefaultImage().store" v-else/>
+                                            </view>
+                                            <view class="item-info">
+                                                <view class="item-title">
+                                                    <text class="title">{{ item.store_name }}</text>
+                                                    <text class="distance color-base-text" v-if="item.distance">
+                                                        距离{{ item.distance > 1 ? item.distance + 'km' : item.distance * 1000 + 'm' }}
+                                                    </text>
+                                                </view>
+                                                <view class="item-time" v-if="item.open_date">营业时间：{{ item.open_date }}
+                                                </view>
+                                                <view class="item-address">{{ item.full_address + item.address }}</view>
+                                            </view>
+                                            <view class="item-right"><text class="iconfont icon-right"></text></view>
+                                        </view>
+                                    </view>
+                                </view>
+                            </scroll-view>
+                        </view>
+                    </uni-popup>
+                </view>
+
+                <!-- 业务区域 -->
+                <slot name="business"></slot>
+
+                <view class="detail-community" v-if="goodsSkuDetail.qr_data && goodsSkuDetail.qr_data.qr_state == 1">
+                    <view class="community-box">
+                        <image :src="$util.img('public/uniapp/goods/detail_erweiImage.png')" mode="aspectFill"></image>
+                        <view class="community-content">
+                            <view class="community-title">{{ goodsSkuDetail.qr_data.qr_name }}</view>
+                            <view class="community-txt">{{ goodsSkuDetail.qr_data.community_describe }}</view>
+                        </view>
+                    </view>
+                    <view class="community-btn" @click="onCommunity()">添加</view>
+                </view>
+
+                <!-- 促销 -->
+            <!--    <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>
+                        </view>
+                        <view class="community-model-content-draw" v-if="goodsSkuDetail.qr_data && goodsSkuDetail.qr_data.qr_img">
+                            <image :src="goodsSkuDetail.qr_data.qr_img != '' && goodsSkuDetail.qr_data.qr_state == 1 ? $util.img(goodsSkuDetail.qr_data.qr_img) : $util.img('public/uniapp/goods/detail_erweiImage.png') " mode="aspectFill" show-menu-by-longpress="true"/>
+                        </view>
+                        <view class="community-model-content-text">长按识别二维码，添加社群</view>
+                    </view>
+                    <view class="community-model-close" @click.stop="onCloseCommunity()">
+                        <text class="iconfont icon-close"></text>
+                    </view>
+                </view> -->
+
+                <!-- 参与流程 -->
+                <slot name="articipation"></slot>
+
+                <!-- 商品评价 -->
+                <view class="group-wrap" v-if="evaluateConfig.evaluate_show == 1 && goodsSkuDetail.isinformation == 0" style="display: none;">
+                    <view class="goods-evaluate" @click="toEvaluateDetail(goodsSkuDetail.goods_id)">
+                        <view class="tit">
+                            <!-- <view class="tit" :class="{ active: goodsEvaluate.content }"> -->
+                            <view>
+                                <text class="color-title font-size-base">
+                                    评价
+                                    <text class="font-size-base">({{ evaluateCount }})</text>
+                                </text>
+                                <text class="evaluate-item-empty" v-if="!evaluateCount">暂无评价</text>
+                                <view class="evaluate-item-empty" v-else>
+                                    <text class="font-size-tag">查看全部</text>
+                                    <text class="iconfont icon-right font-size-tag"></text>
+                                </view>
+                            </view>
+                        </view>
+                        <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">
+                                        <image v-if="item.member_headimg" :src="$util.img(item.member_headimg)" @error="item.member_headimg = $util.getDefaultImage().head" mode="aspectFill" />
+                                        <image v-else :src="$util.getDefaultImage().head" @error="item.member_headimg = $util.getDefaultImage().head" mode="aspectFill" />
+                                    </view>
+                                    <view class="evaluator-name-wrap">
+                                        <text class="evaluator-name using-hidden" v-if="item.member_name.length > 2 && item.is_anonymous == 1">
+                                            {{ item.member_name[0] }}***{{ item.member_name[item.member_name.length - 1] }}
+                                        </text>
+                                        <text class="evaluator-name using-hidden" v-else>{{ item.member_name }}</text>
+                                        <view v-if="item.scores" class="evaluator-xing">
+                                            <xiaoStarComponent :starCount="item.scores * 2"></xiaoStarComponent>
+                                        </view>
+                                    </view>
+                                </view>
+                                <text class="time color-tip">{{ $util.timeStampTurnTime(item.create_time) }}</text>
+                            </view>
+                            <view class="cont margin-top">{{ item.content }}</view>
+                            <scroll-view scroll-x="true">
+                                <view class="evaluate-img" v-if="item.images">
+                                    <view class="img-box" v-for="(img, img_index) in item.images" :key="img_index" @click="previewEvaluate(index, img_index, 'images')">
+                                        <image :src="$util.img(img)" mode="aspectFill" />
+                                    </view>
+                                </view>
+                            </scroll-view>
+                        </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">
+                        <block v-for="(item, index) in goodsSkuDetail.goods_attr_format" :key="index">
+                            <view class="item" v-if="goodsAttrShow || (!goodsAttrShow && index < 4)">
+                                <text class="attr-name">{{ item.attr_name }}</text>
+                                <text class="value-name">{{ item.attr_value_name }}</text>
+                            </view>
+                        </block>
+                        <view class="attr-action" v-if="goodsSkuDetail.goods_attr_format.length > 4" @click="switchGoodsAttr">
+                            <block v-if="!goodsAttrShow">
+                                展开<text class="iconfont icon-iconangledown"></text>
+                            </block>
+                            <block v-else>
+                                收起<text class="iconfont icon-iconangledown-copy"></text>
+                            </block>
+                        </view>
+                    </view>
+                </view>
+
+				
+
+                <!-- 详情 -->
+                <view class="goods-detail-tab">
+                    <view class="detail-tab">
+                        <view class="tab-item">{{$lang('details')}}</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" -->
+                            </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>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+
+                <!-- 商品推荐 -->
+                <ns-goods-recommend ref="goodrecommend" route="goods_detail"></ns-goods-recommend>
+
+                <ns-copyright></ns-copyright>
+
+                <!-- 海报 -->
+                <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>
+
+                <!-- 分享弹窗 -->
+                <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>
+
+                <slot name="fixedbtn"></slot>
+            </view>
+        </view>
+
+        <!-- 操作区域 -->
+        <slot name="action"></slot>
+        <to-top v-if="showTop" @toTop="scrollToTopNative()"></to-top>
+        <ns-login ref="login"></ns-login>
+    </view>
+</template>
+
+<script>
+    // 商品详情视图
+    import uniPopup from '@/components/uni-popup/uni-popup.vue';
+    import nsGoodsRecommend from '@/components/ns-goods-recommend/ns-goods-recommend.vue';
+    import pengpaiFadeinOut from '@/components/pengpai-fadein-out/pengpai-fadein-out.vue';
+    import xiaoStarComponent from '@/components/xiao-star-component/xiao-star-component.vue';
+    import scroll from '@/common/js/scroll-view.js';
+    import toTop from '@/components/toTop/toTop.vue';
+    import detail from './detail.js';
+
+    export default {
+        name: 'goods-detail-view',
+        props: {
+            goodsSkuDetail: {
+                type: Object,
+                default: () => {
+                    return {};
+                }
+            }
+        },
+        components: {
+            uniPopup,
+            nsGoodsRecommend,
+            pengpaiFadeinOut,
+            toTop,
+            xiaoStarComponent
+        },
+        mixins: [scroll, detail]
+    };
+</script>
+
+<style lang="scss">
+    @import '@/common/css/goods_detail.scss';
+</style>
+<style scoped></style>
\ No newline at end of file
diff --git a/components/hover-nav/hover-nav.vue b/components/hover-nav/hover-nav.vue
new file mode 100644
index 0000000..c4f38c3
--- /dev/null
+++ b/components/hover-nav/hover-nav.vue
@@ -0,0 +1,142 @@
+<template>
+	<!-- 悬浮按钮 -->
+	<view v-if="pageCount == 1 || need" class="fixed-box" :style="{ height: fixBtnShow ? '330rpx' : '120rpx' }">
+		<!-- <view class="btn-item" v-if="fixBtnShow" @click="$util.redirectTo('/pages/index/index')"> -->
+		<!-- #ifdef MP-WEIXIN -->
+		<button class="btn-item" v-if="fixBtnShow" hoverClass="none" openType="contact" sessionFrom="weapp" showMessageCard="true" :style="{backgroundImage:'url('+(kefuimg?kefuimg:'')+')',backgroundSize:'100% 100%'}">
+			<text class="icox icox-kefu" v-if="!kefuimg"></text>
+		<!-- 	<view>首页</view> -->
+		</button>
+		<!-- #endif -->
+		<view class="btn-item" v-if="fixBtnShow" @click="call()"  :style="{backgroundImage:'url('+(phoneimg?phoneimg:'')+')',backgroundSize:'100% 100%'}">
+			<text class="iconfont icon-dianhua" v-if="!phoneimg"></text>
+			<!-- <view>我的</view> -->
+		</view>
+
+	<!-- 	<view class="btn-item icon-xiala" v-if="fixBtnShow" @click="fixBtnShow ? (fixBtnShow = false) : (fixBtnShow = true)">
+			<text class="iconfont icon-unfold"></text>
+		</view>
+		<view class="btn-item switch" v-else :class="{ show: fixBtnShow }"
+			@click="fixBtnShow ? (fixBtnShow = false) : (fixBtnShow = true)">
+			<view class="">快捷</view>
+			<view>导航</view>
+		</view> -->
+	</view>
+</template>
+
+<script>
+	export default {
+		name: 'hover-nav',
+		props: {
+			need: {
+				type: Boolean,
+				default: false
+			},
+		},
+		data() {
+			return {
+				pageCount: 0,
+				fixBtnShow: true,
+				tel:'',
+				kefuimg:'',
+				phoneimg:''
+			};
+		},
+		created() {
+			this.kefuimg = this.$util.getDefaultImage().kefu
+			this.phoneimg = this.$util.getDefaultImage().phone
+			this.pageCount = getCurrentPages().length;
+			var that = this
+			uni.getStorage({
+				key:'shopInfo',
+				success(e){
+					that.tel = e.data.mobile
+				}
+			})
+		
+		},
+		methods: {
+			//拨打电话
+			call(){
+				uni.makePhoneCall({
+					phoneNumber:this.tel+''
+				})
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	.container-box {
+		width: 100%;
+
+		.item-wrap {
+			border-radius: 10rpx;
+
+			.image-box {
+				border-radius: 10rpx;
+			}
+
+			image {
+				width: 100%;
+				height: auto;
+				border-radius: 10rpx;
+				will-change: transform;
+			}
+		}
+	}
+
+	//悬浮按钮
+	.fixed-box {
+		position: fixed;
+		right: 0rpx;
+		bottom: 200rpx;
+		z-index: 10;
+		// background: #fff;
+		// box-shadow: 2rpx 2rpx 22rpx rgba(0, 0, 0, 0.3);
+		border-radius: 120rpx;
+		padding: 20rpx 0;
+		display: flex;
+		justify-content: center;
+		flex-direction: column;
+		width: 100rpx;
+		box-sizing: border-box;
+		transition: 0.3s;
+		overflow: hidden;
+
+		.btn-item {
+			display: flex;
+			justify-content: center;
+			text-align: center;
+			flex-direction: column;
+			line-height: 1;
+			margin: 14rpx 0;
+			transition: 0.1s;
+			background: #fff;
+			border-radius: 50rpx;
+			width: 80rpx;
+			height: 80rpx;
+			padding: 0;
+			text {
+				font-size: 36rpx;
+				font-weight: bold;
+			}
+
+			view {
+				font-size: 26rpx;
+				font-weight: bold;
+			}
+
+			&.show {
+				transform: rotate(180deg);
+			}
+
+			&.switch {}
+
+			&.icon-xiala {
+				margin: 0;
+				margin-top: 0.1rpx;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/components/loading-cover/loading-cover.vue b/components/loading-cover/loading-cover.vue
new file mode 100644
index 0000000..4bac381
--- /dev/null
+++ b/components/loading-cover/loading-cover.vue
@@ -0,0 +1,115 @@
+<template>
+	<view class="loading-layer" v-if="isShow">
+		<view class="loading-anim" v-if="themeStyle">
+			<view class="box item">
+				<view class="border out item" :style="{'border-left-color':themeStyle.main_color, 'border-top-color':themeStyle.main_color}"></view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+export default {
+	name: 'loading-cover',
+	props: {
+		initShow: {
+			type: Boolean,
+			default: true
+		}
+	},
+	data() {
+		return {
+			isShow: true
+		};
+	},
+	components: {},
+	created() {
+		this.isShow = this.initShow;
+	},
+	methods: {
+		show() {
+			this.isShow = true;
+		},
+		hide() {
+			this.isShow = false;
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+@keyframes spin {
+	from {
+		transform: rotate(0deg);
+	}
+
+	to {
+		transform: rotate(360deg);
+	}
+}
+.loading-layer {
+	width: 100%;
+	height: 100%;
+	position: fixed;
+	top: 0;
+	left: 0;
+	z-index: 997;
+	background: #f8f8f8;
+}
+
+.loading-anim {
+	position: absolute;
+	left: 50%;
+	top: 40%;
+	transform: translate(-50%, -50%);
+}
+
+.loading-anim > .item {
+	position: relative;
+	width: 70rpx;
+	height: 70rpx;
+	perspective: 1600rpx;
+	transform-style: preserve-3d;
+	transition: all 0.2s ease-out;
+}
+
+.loading-anim .border {
+	position: absolute;
+	border-radius: 50%;
+	border: 6rpx solid;
+}
+
+.loading-anim .out {
+	top: 15%;
+	left: 15%;
+	width: 70%;
+	height: 70%;
+	border-left-color: #FF4646;
+	border-right-color: #C5C5C5 !important;
+	// border-right-color: rgba($color: #000000, $alpha: 0) !important;
+	border-top-color: #FF4646 ;
+	border-bottom-color: #C5C5C5 !important;
+	// border-bottom-color: rgba($color: #000000, $alpha: 0) !important;
+	animation: spin 0.6s linear normal infinite;
+}
+
+.loading-anim .in {
+	top: 25%;
+	left: 25%;
+	width: 50%;
+	height: 50%;
+	border-top-color: transparent !important;
+	border-bottom-color: transparent !important;
+	animation: spin 0.8s linear infinite;
+}
+
+.loading-anim .mid {
+	top: 40%;
+	left: 40%;
+	width: 20%;
+	height: 20%;
+	border-left-color: transparent;
+	border-right-color: transparent;
+	animation: spin 0.6s linear infinite;
+}
+</style>
diff --git a/components/mescroll/components/mescroll-down.css b/components/mescroll/components/mescroll-down.css
new file mode 100644
index 0000000..1b31399
--- /dev/null
+++ b/components/mescroll/components/mescroll-down.css
@@ -0,0 +1,55 @@
+/* 下拉刷新区域 */
+.mescroll-downwarp {
+	position: absolute;
+	top: -100%;
+	left: 0;
+	width: 100%;
+	height: 100%;
+	text-align: center;
+}
+
+/* 下拉刷新--内容区,定位于区域底部 */
+.mescroll-downwarp .downwarp-content {
+	position: absolute;
+	left: 0;
+	bottom: 0;
+	width: 100%;
+	min-height: 60rpx;
+	padding: 20rpx 0;
+	text-align: center;
+}
+
+/* 下拉刷新--提示文本 */
+.mescroll-downwarp .downwarp-tip {
+	display: inline-block;
+	font-size: 28rpx;
+	color: gray;
+	vertical-align: middle;
+	margin-left: 16rpx;
+}
+
+/* 下拉刷新--旋转进度条 */
+.mescroll-downwarp .downwarp-progress {
+	display: inline-block;
+	width: 32rpx;
+	height: 32rpx;
+	border-radius: 50%;
+	border: 2rpx solid gray;
+	border-bottom-color: transparent;
+	vertical-align: middle;
+}
+
+/* 旋转动画 */
+.mescroll-downwarp .mescroll-rotate {
+	animation: mescrollDownRotate 0.6s linear infinite;
+}
+
+@keyframes mescrollDownRotate {
+	0% {
+		transform: rotate(0deg);
+	}
+
+	100% {
+		transform: rotate(360deg);
+	}
+}
diff --git a/components/mescroll/components/mescroll-down.vue b/components/mescroll/components/mescroll-down.vue
new file mode 100644
index 0000000..b37b696
--- /dev/null
+++ b/components/mescroll/components/mescroll-down.vue
@@ -0,0 +1,52 @@
+<!-- 下拉刷新区域 -->
+<template>
+	<view v-if="mOption.use" class="mescroll-downwarp">
+		<view class="downwarp-content">
+			<view class="downwarp-progress" :class="{ 'mescroll-rotate': isDownLoading }" :style="{ transform: downRotate }"></view>
+			<view class="downwarp-tip">{{ downText }}</view>
+		</view>
+	</view>
+</template>
+
+<script>
+export default {
+	props: {
+		option: Object, // down的配置项
+		type: Number, // 下拉状态（inOffset：1， outOffset：2， showLoading：3， endDownScroll：4）
+		rate: Number // 下拉比率 (inOffset: rate<1; outOffset: rate>=1)
+	},
+	computed: {
+		// 支付宝小程序需写成计算属性,prop定义default仍报错
+		mOption() {
+			return this.option || {};
+		},
+		// 是否在加载中
+		isDownLoading() {
+			return this.type === 3;
+		},
+		// 旋转的角度
+		downRotate() {
+			return 'rotate(' + 360 * this.rate + 'deg)';
+		},
+		// 文本提示
+		downText() {
+			switch (this.type) {
+				case 1:
+					return this.mOption.textInOffset;
+				case 2:
+					return this.mOption.textOutOffset;
+				case 3:
+					return this.mOption.textLoading;
+				case 4:
+					return this.mOption.textLoading;
+				default:
+					return this.mOption.textInOffset;
+			}
+		}
+	}
+};
+</script>
+
+<style>
+@import './mescroll-down.css';
+</style>
diff --git a/components/mescroll/components/mescroll-empty.vue b/components/mescroll/components/mescroll-empty.vue
new file mode 100644
index 0000000..f34da7c
--- /dev/null
+++ b/components/mescroll/components/mescroll-empty.vue
@@ -0,0 +1,90 @@
+<!--空布局
+
+可作为独立的组件, 不使用mescroll的页面也能单独引入, 以便APP全局统一管理:
+import MescrollEmpty from '@/components/mescroll-uni/components/mescroll-empty.vue';
+<mescroll-empty v-if="isShowEmpty" :option="optEmpty" @emptyclick="emptyClick"></mescroll-empty>
+
+-->
+<template>
+	<view class="mescroll-empty" :class="{ 'empty-fixed': option.fixed }" :style="{ 'z-index': option.zIndex, top: option.top }">
+		<image v-if="icon" class="empty-icon" :src="icon" mode="widthFix" />
+		<view v-if="tip" class="empty-tip">{{ tip }}</view>
+		<view v-if="option.btnText" class="empty-btn" @click="emptyClick">{{ option.btnText }}</view>
+	</view>
+</template>
+
+<script>
+// 引入全局配置
+import GlobalOption from './../mescroll-uni-option.js';
+export default {
+	props: {
+		// empty的配置项: 默认为GlobalOption.up.empty
+		option: {
+			type: Object,
+			default() {
+				return {};
+			}
+		}
+	},
+	// 使用computed获取配置,用于支持option的动态配置
+	computed: {
+		// 图标
+		icon() {
+			return this.option.icon == null ? GlobalOption.up.empty.icon : this.option.icon; // 此处不使用短路求值, 用于支持传空串不显示图标
+		},
+		// 文本提示
+		tip() {
+			return this.option.tip == null ? GlobalOption.up.empty.tip : this.option.tip; // 此处不使用短路求值, 用于支持传空串不显示文本提示
+		}
+	},
+	methods: {
+		// 点击按钮
+		emptyClick() {
+			this.$emit('emptyclick');
+		}
+	}
+};
+</script>
+
+<style>
+/* 无任何数据的空布局 */
+.mescroll-empty {
+	box-sizing: border-box;
+	width: 100%;
+	padding: 100rpx 50rpx;
+	text-align: center;
+}
+
+.mescroll-empty.empty-fixed {
+	z-index: 99;
+	position: absolute; /*transform会使fixed失效,最终会降级为absolute */
+	top: 100rpx;
+	left: 0;
+}
+
+.mescroll-empty .empty-icon {
+	width: 280rpx;
+	height: 280rpx;
+}
+
+.mescroll-empty .empty-tip {
+	margin-top: 20rpx;
+	font-size: $font-size-tag;
+	color: gray;
+}
+
+.mescroll-empty .empty-btn {
+	display: inline-block;
+	margin-top: 40rpx;
+	min-width: 200rpx;
+	padding: 18rpx;
+	font-size: $font-size-base;
+	border: 1rpx solid #e04b28;
+	border-radius: 60rpx;
+	color: #e04b28;
+}
+
+.mescroll-empty .empty-btn:active {
+	opacity: 0.75;
+}
+</style>
diff --git a/components/mescroll/components/mescroll-top.vue b/components/mescroll/components/mescroll-top.vue
new file mode 100644
index 0000000..3bc0641
--- /dev/null
+++ b/components/mescroll/components/mescroll-top.vue
@@ -0,0 +1,81 @@
+<!-- 回到顶部的按钮 -->
+<template>
+	<image
+		v-if="mOption.src"
+		class="mescroll-totop"
+		:class="[value ? 'mescroll-totop-in' : 'mescroll-totop-out', { 'mescroll-safe-bottom': mOption.safearea }]"
+		:style="{ 'z-index': mOption.zIndex, left: left, right: right, bottom: addUnit(mOption.bottom), width: addUnit(mOption.width), 'border-radius': addUnit(mOption.radius) }"
+		:src="mOption.src"
+		mode="widthFix"
+		@click="toTopClick"
+	/>
+</template>
+
+<script>
+export default {
+	props: {
+		// up.toTop的配置项
+		option: Object,
+		// 是否显示
+		value: false
+	},
+	computed: {
+		// 支付宝小程序需写成计算属性,prop定义default仍报错
+		mOption() {
+			return this.option || {};
+		},
+		// 优先显示左边
+		left() {
+			return this.mOption.left ? this.addUnit(this.mOption.left) : 'auto';
+		},
+		// 右边距离 (优先显示左边)
+		right() {
+			return this.mOption.left ? 'auto' : this.addUnit(this.mOption.right);
+		}
+	},
+	methods: {
+		addUnit(num) {
+			if (!num) return 0;
+			if (typeof num === 'number') return num + 'rpx';
+			return num;
+		},
+		toTopClick() {
+			this.$emit('input', false); // 使v-model生效
+			this.$emit('click'); // 派发点击事件
+		}
+	}
+};
+</script>
+
+<style>
+/* 回到顶部的按钮 */
+.mescroll-totop {
+	z-index: 99;
+	position: fixed !important; /* 加上important避免编译到H5,在多mescroll中定位失效 */
+	right: 46rpx !important;
+	bottom: 272rpx !important;
+	width: 72rpx;
+	height: auto;
+	border-radius: 50%;
+	opacity: 0;
+	transition: opacity 0.5s; /* 过渡 */
+	margin-bottom: var(--window-bottom); /* css变量 */
+}
+
+/* 适配 iPhoneX */
+.mescroll-safe-bottom {
+	margin-bottom: calc(var(--window-bottom) + constant(safe-area-inset-bottom)); /* window-bottom + 适配 iPhoneX */
+	margin-bottom: calc(var(--window-bottom) + env(safe-area-inset-bottom));
+}
+
+/* 显示 -- 淡入 */
+.mescroll-totop-in {
+	opacity: 1;
+}
+
+/* 隐藏 -- 淡出且不接收事件*/
+.mescroll-totop-out {
+	opacity: 0;
+	pointer-events: none;
+}
+</style>
diff --git a/components/mescroll/components/mescroll-up.css b/components/mescroll/components/mescroll-up.css
new file mode 100644
index 0000000..ca835c3
--- /dev/null
+++ b/components/mescroll/components/mescroll-up.css
@@ -0,0 +1,47 @@
+/* 上拉加载区域 */
+.mescroll-upwarp {
+	min-height: 60rpx;
+	padding: 30rpx 0;
+	text-align: center;
+	clear: both;
+	margin-bottom: 20rpx;
+}
+
+/*提示文本 */
+.mescroll-upwarp .upwarp-tip,
+.mescroll-upwarp .upwarp-nodata {
+	display: inline-block;
+	font-size: 28rpx;
+	color: #b1b1b1;
+	vertical-align: middle;
+}
+
+.mescroll-upwarp .upwarp-tip {
+	margin-left: 16rpx;
+}
+
+/*旋转进度条 */
+.mescroll-upwarp .upwarp-progress {
+	display: inline-block;
+	width: 32rpx;
+	height: 32rpx;
+	border-radius: 50%;
+	border: 2rpx solid #b1b1b1;
+	border-bottom-color: transparent;
+	vertical-align: middle;
+}
+
+/* 旋转动画 */
+.mescroll-upwarp .mescroll-rotate {
+	animation: mescrollUpRotate 0.6s linear infinite;
+}
+
+@keyframes mescrollUpRotate {
+	0% {
+		transform: rotate(0deg);
+	}
+
+	100% {
+		transform: rotate(360deg);
+	}
+}
diff --git a/components/mescroll/components/mescroll-up.vue b/components/mescroll/components/mescroll-up.vue
new file mode 100644
index 0000000..beab032
--- /dev/null
+++ b/components/mescroll/components/mescroll-up.vue
@@ -0,0 +1,39 @@
+<!-- 上拉加载区域 -->
+<template>
+	<view class="mescroll-upwarp">
+		<!-- 加载中 (此处不能用v-if,否则android小程序快速上拉可能会不断触发上拉回调) -->
+		<view v-show="isUpLoading">
+			<view class="upwarp-progress mescroll-rotate"></view>
+			<view class="upwarp-tip">{{ mOption.textLoading }}</view>
+		</view>
+		<!-- 无数据 -->
+		<view v-if="isUpNoMore" class="upwarp-nodata">{{ mOption.textNoMore }}</view>
+	</view>
+</template>
+
+<script>
+export default {
+	props: {
+		option: Object, // up的配置项
+		type: Number // 上拉加载的状态：0（loading前），1（loading中），2（没有更多了）
+	},
+	computed: {
+		// 支付宝小程序需写成计算属性,prop定义default仍报错
+		mOption() {
+			return this.option || {};
+		},
+		// 加载中
+		isUpLoading() {
+			return this.type === 1;
+		},
+		// 没有更多了
+		isUpNoMore() {
+			return this.type === 2;
+		}
+	}
+};
+</script>
+
+<style>
+@import './mescroll-up.css';
+</style>
diff --git a/components/mescroll/mescroll-body.css b/components/mescroll/mescroll-body.css
new file mode 100644
index 0000000..86cd5f8
--- /dev/null
+++ b/components/mescroll/mescroll-body.css
@@ -0,0 +1,15 @@
+page {
+	-webkit-overflow-scrolling: touch;
+	/* 使iOS滚动流畅 */
+}
+
+.mescroll-body {
+	position: relative;
+	/* 下拉刷新区域相对自身定位 */
+	height: auto;
+	/* 不可固定高度,否则overflow: hidden, 可通过设置最小高度使列表不满屏仍可下拉*/
+	overflow: hidden;
+	/* 遮住顶部下拉刷新区域 */
+	box-sizing: border-box;
+	/* 避免设置padding出现双滚动条的问题 */
+}
diff --git a/components/mescroll/mescroll-body.vue b/components/mescroll/mescroll-body.vue
new file mode 100644
index 0000000..f3199c0
--- /dev/null
+++ b/components/mescroll/mescroll-body.vue
@@ -0,0 +1,298 @@
+<template>
+	<view
+		class="mescroll-body"
+		:style="{ minHeight: minHeight, 'padding-top': padTop, 'padding-bottom': padBottom, 'padding-bottom': padBottomConstant, 'padding-bottom': padBottomEnv }"
+		@touchstart="touchstartEvent"
+		@touchmove="touchmoveEvent"
+		@touchend="touchendEvent"
+		@touchcancel="touchendEvent"
+	>
+		<view class="mescroll-body-content mescroll-touch" :style="{ transform: translateY, transition: transition }">
+			<!-- 下拉加载区域 (支付宝小程序子组件传参给子子组件仍报单项数据流的异常,暂时不通过mescroll-down组件实现)-->
+			<!-- <mescroll-down :option="mescroll.optDown" :type="downLoadType" :rate="downRate"></mescroll-down> -->
+			<view v-if="mescroll.optDown.use" class="mescroll-downwarp">
+				<view class="downwarp-content">
+					<view class="downwarp-progress" :class="{ 'mescroll-rotate': isDownLoading }" :style="{ transform: downRotate }"></view>
+					<view class="downwarp-tip">{{ downText }}</view>
+				</view>
+			</view>
+
+			<!-- 列表内容 -->
+			<slot></slot>
+
+			<!-- 空布局 -->
+			<!-- 	<mescroll-empty v-if="isShowEmpty" :option="mescroll.optUp.empty" @emptyclick="emptyClick"></mescroll-empty> -->
+
+			<!-- 上拉加载区域 (下拉刷新时不显示, 支付宝小程序子组件传参给子子组件仍报单项数据流的异常,暂时不通过mescroll-up组件实现)-->
+			<!-- <mescroll-up v-if="mescroll.optUp.use && !isDownLoading" :option="mescroll.optUp" :type="upLoadType"></mescroll-up> -->
+			<view v-if="mescroll.optUp.use && !isDownLoading" class="mescroll-upwarp">
+				<!-- 加载中 (此处不能用v-if,否则android小程序快速上拉可能会不断触发上拉回调) -->
+				<view v-show="upLoadType === 1">
+					<view class="upwarp-progress mescroll-rotate"></view>
+					<view class="upwarp-tip">{{ mescroll.optUp.textLoading }}</view>
+				</view>
+				<!-- 无数据 -->
+				<view v-if="upLoadType === 2" class="upwarp-nodata">{{ mescroll.optUp.textNoMore }}</view>
+			</view>
+		</view>
+
+		<!-- 回到顶部按钮 (fixed元素需写在transform外面,防止降级为absolute)-->
+		<mescroll-top v-model="isShowToTop" :option="mescroll.optUp.toTop" @click="toTopClick" v-if="showTop"></mescroll-top>
+	</view>
+</template>
+
+<script>
+// 引入mescroll-uni.js,处理核心逻辑
+import MeScroll from './mescroll-uni.js';
+// 引入全局配置
+import GlobalOption from './mescroll-uni-option.js';
+// 引入空布局组件
+import MescrollEmpty from './components/mescroll-empty.vue';
+// 引入回到顶部组件
+import MescrollTop from './components/mescroll-top.vue';
+
+export default {
+	components: {
+		MescrollEmpty,
+		MescrollTop
+	},
+	data() {
+		return {
+			mescroll: { optDown: {}, optUp: {} }, // mescroll实例
+			downHight: 0, //下拉刷新: 容器高度
+			downRate: 0, // 下拉比率(inOffset: rate<1; outOffset: rate>=1)
+			downLoadType: 4, // 下拉刷新状态 （inOffset：1， outOffset：2， showLoading：3， endDownScroll：4）
+			upLoadType: 0, // 上拉加载状态：0（loading前），1（loading中），2（没有更多了）
+			isShowEmpty: false, // 是否显示空布局
+			isShowToTop: false, // 是否显示回到顶部按钮
+			windowHeight: 0, // 可使用窗口的高度
+			statusBarHeight: 0 // 状态栏高度
+		};
+	},
+	props: {
+		down: Object, // 下拉刷新的参数配置
+		up: Object, // 上拉加载的参数配置
+		top: [String, Number], // 下拉布局往下的偏移量 (支持20, "20rpx", "20px", "20%"格式的值, 其中纯数字则默认单位rpx, 百分比则相对于windowHeight)
+		topbar: Boolean, // top的偏移量是否加上状态栏高度, 默认false (使用场景:取消原生导航栏时,配置此项可自动加上状态栏高度的偏移量)
+		bottom: [String, Number], // 上拉布局往上的偏移量 (支持20, "20rpx", "20px", "20%"格式的值, 其中纯数字则默认单位rpx, 百分比则相对于windowHeight)
+		safearea: Boolean, // bottom的偏移量是否加上底部安全区的距离, 默认false (需要适配iPhoneX时使用)
+		height: [String, Number], // 指定mescroll最小高度,默认windowHeight,使列表不满屏仍可下拉
+		showTop: {
+			type: Boolean,
+			default: true
+		}
+	},
+	computed: {
+		// mescroll最小高度,默认windowHeight,使列表不满屏仍可下拉
+		minHeight() {
+			return this.toPx(this.height || '100%') + 'px';
+		},
+		// 下拉布局往下偏移的距离 (px)
+		numTop() {
+			return this.toPx(this.top) + (this.topbar ? this.statusBarHeight : 0);
+		},
+		padTop() {
+			return this.numTop + 'px';
+		},
+		// 上拉布局往上偏移 (px)
+		numBottom() {
+			return this.toPx(this.bottom);
+		},
+		padBottom() {
+			return this.numBottom + 'px';
+		},
+		padBottomConstant() {
+			return this.safearea ? 'calc(' + this.padBottom + ' + constant(safe-area-inset-bottom))' : this.padBottom;
+		},
+		padBottomEnv() {
+			return this.safearea ? 'calc(' + this.padBottom + ' + env(safe-area-inset-bottom))' : this.padBottom;
+		},
+		// 是否为重置下拉的状态
+		isDownReset() {
+			return this.downLoadType === 3 || this.downLoadType === 4;
+		},
+		// 过渡
+		transition() {
+			return this.isDownReset ? 'transform 300ms' : '';
+		},
+		translateY() {
+			return this.downHight > 0 ? 'translateY(' + this.downHight + 'px)' : ''; // transform会使fixed失效,需注意把fixed元素写在mescroll之外
+		},
+		// 是否在加载中
+		isDownLoading() {
+			return this.downLoadType === 3;
+		},
+		// 旋转的角度
+		downRotate() {
+			return 'rotate(' + 360 * this.downRate + 'deg)';
+		},
+		// 文本提示
+		downText() {
+			switch (this.downLoadType) {
+				case 1:
+					return this.mescroll.optDown.textInOffset;
+				case 2:
+					return this.mescroll.optDown.textOutOffset;
+				case 3:
+					return this.mescroll.optDown.textLoading;
+				case 4:
+					return this.mescroll.optDown.textLoading;
+				default:
+					return this.mescroll.optDown.textInOffset;
+			}
+		}
+	},
+	methods: {
+		//number,rpx,upx,px,% --> px的数值
+		toPx(num) {
+			if (typeof num === 'string') {
+				if (num.indexOf('px') !== -1) {
+					if (num.indexOf('rpx') !== -1) {
+						// "10rpx"
+						num = num.replace('rpx', '');
+					} else if (num.indexOf('upx') !== -1) {
+						// "10upx"
+						num = num.replace('upx', '');
+					} else {
+						// "10px"
+						return Number(num.replace('px', ''));
+					}
+				} else if (num.indexOf('%') !== -1) {
+					// 传百分比,则相对于windowHeight,传"10%"则等于windowHeight的10%
+					let rate = Number(num.replace('%', '')) / 100;
+					return this.windowHeight * rate;
+				}
+			}
+			return num ? uni.upx2px(Number(num)) : 0;
+		},
+		//注册列表touchstart事件,用于下拉刷新
+		touchstartEvent(e) {
+			this.mescroll.touchstartEvent(e);
+		},
+		//注册列表touchmove事件,用于下拉刷新
+		touchmoveEvent(e) {
+			this.mescroll.touchmoveEvent(e);
+		},
+		//注册列表touchend事件,用于下拉刷新
+		touchendEvent(e) {
+			this.mescroll.touchendEvent(e);
+		},
+		// 点击空布局的按钮回调
+		emptyClick() {
+			this.$emit('emptyclick', this.mescroll);
+		},
+		// 点击回到顶部的按钮回调
+		toTopClick() {
+			this.mescroll.scrollTo(0, this.mescroll.optUp.toTop.duration); // 执行回到顶部
+			this.$emit('topclick', this.mescroll); // 派发点击回到顶部按钮的回调
+		}
+	},
+	// 使用created初始化mescroll对象; 如果用mounted部分css样式编译到H5会失效
+	created() {
+		let vm = this;
+
+		let diyOption = {
+			// 下拉刷新的配置
+			down: {
+				inOffset(mescroll) {
+					vm.downLoadType = 1; // 下拉的距离进入offset范围内那一刻的回调 (自定义mescroll组件时,此行不可删)
+				},
+				outOffset(mescroll) {
+					vm.downLoadType = 2; // 下拉的距离大于offset那一刻的回调 (自定义mescroll组件时,此行不可删)
+				},
+				onMoving(mescroll, rate, downHight) {
+					// 下拉过程中的回调,滑动过程一直在执行;
+					vm.downHight = downHight; // 设置下拉区域的高度 (自定义mescroll组件时,此行不可删)
+					vm.downRate = rate; //下拉比率 (inOffset: rate<1; outOffset: rate>=1)
+				},
+				showLoading(mescroll, downHight) {
+					vm.downLoadType = 3; // 显示下拉刷新进度的回调 (自定义mescroll组件时,此行不可删)
+					vm.downHight = downHight; // 设置下拉区域的高度 (自定义mescroll组件时,此行不可删)
+				},
+				endDownScroll(mescroll) {
+					vm.downLoadType = 4; // 结束下拉 (自定义mescroll组件时,此行不可删)
+					vm.downHight = 0; // 设置下拉区域的高度 (自定义mescroll组件时,此行不可删)
+				},
+				// 派发下拉刷新的回调
+				callback: function(mescroll) {
+					vm.$emit('down', mescroll);
+				}
+			},
+			// 上拉加载的配置
+			up: {
+				// 显示加载中的回调
+				showLoading() {
+					vm.upLoadType = 1;
+				},
+				// 显示无更多数据的回调
+				showNoMore() {
+					vm.upLoadType = 2;
+				},
+				// 隐藏上拉加载的回调
+				hideUpScroll() {
+					vm.upLoadType = 0;
+				},
+				// 空布局
+				empty: {
+					onShow(isShow) {
+						// 显示隐藏的回调
+						vm.isShowEmpty = isShow;
+					}
+				},
+				// 回到顶部
+				toTop: {
+					onShow(isShow) {
+						// 显示隐藏的回调
+						vm.isShowToTop = isShow;
+					}
+				},
+				// 派发上拉加载的回调
+				callback: function(mescroll) {
+					vm.$emit('up', mescroll);
+				}
+			}
+		};
+
+		MeScroll.extend(diyOption, GlobalOption); // 混入全局的配置
+		let myOption = JSON.parse(
+			JSON.stringify({
+				down: vm.down,
+				up: vm.up
+			})
+		); // 深拷贝,避免对props的影响
+		MeScroll.extend(myOption, diyOption); // 混入具体界面的配置
+
+		// 初始化MeScroll对象
+		vm.mescroll = new MeScroll(myOption, true); // 传入true,标记body为滚动区域
+		// init回调mescroll对象
+		vm.$emit('init', vm.mescroll);
+
+		// 设置高度
+		const sys = uni.getSystemInfoSync();
+		if (sys.windowHeight) vm.windowHeight = sys.windowHeight;
+		if (sys.statusBarHeight) vm.statusBarHeight = sys.statusBarHeight;
+		// 使down的bottomOffset生效
+		vm.mescroll.setBodyHeight(sys.windowHeight);
+
+		// 因为使用的是page的scroll,这里需自定义scrollTo
+		vm.mescroll.resetScrollTo((y, t) => {
+			uni.pageScrollTo({
+				scrollTop: y,
+				duration: t
+			});
+		});
+
+		// 具体的界面如果不配置up.toTop.safearea,则取本vue的safearea值
+		if (vm.up && vm.up.toTop && vm.up.toTop.safearea != null) {
+		} else {
+			vm.mescroll.optUp.toTop.safearea = vm.safearea;
+		}
+	}
+};
+</script>
+
+<style>
+@import './mescroll-body.css';
+@import './components/mescroll-down.css';
+@import './components/mescroll-up.css';
+</style>
diff --git a/components/mescroll/mescroll-mixins.js b/components/mescroll/mescroll-mixins.js
new file mode 100644
index 0000000..4b3ba3f
--- /dev/null
+++ b/components/mescroll/mescroll-mixins.js
@@ -0,0 +1,60 @@
+// mescroll-body 和 mescroll-uni 通用
+
+// import MescrollUni from "./mescroll-uni.vue";
+// import MescrollBody from "./mescroll-body.vue";
+
+const MescrollMixin = {
+	// components: { // 非H5端无法通过mixin注册组件, 只能在main.js中注册全局组件或具体界面中注册
+	// 	MescrollUni,
+	// 	MescrollBody
+	// },
+	data() {
+		return {
+			mescroll: null //mescroll实例对象
+		}
+	},
+	// 注册系统自带的下拉刷新 (配置down.native为true时生效, 还需在pages配置enablePullDownRefresh:true;详请参考mescroll-native的案例)
+	onPullDownRefresh() {
+		this.mescroll && this.mescroll.onPullDownRefresh();
+	},
+	// 注册列表滚动事件,用于判定在顶部可下拉刷新,在指定位置可显示隐藏回到顶部按钮 (此方法为页面生命周期,无法在子组件中触发, 仅在mescroll-body生效)
+	onPageScroll(e) {
+		this.mescroll && this.mescroll.onPageScroll(e);
+	},
+	// 注册滚动到底部的事件,用于上拉加载 (此方法为页面生命周期,无法在子组件中触发, 仅在mescroll-body生效)
+	onReachBottom() {
+		this.mescroll && this.mescroll.onReachBottom();
+	},
+	methods: {
+		// mescroll组件初始化的回调,可获取到mescroll对象
+		mescrollInit(mescroll) {
+			this.mescroll = mescroll;
+			this.mescrollInitByRef(); // 兼容字节跳动小程序
+		},
+		// 以ref的方式初始化mescroll对象 (兼容字节跳动小程序: http://www.mescroll.com/qa.html?v=20200107#q26)
+		mescrollInitByRef() {
+			if (!this.mescroll || !this.mescroll.resetUpScroll) {
+				let mescrollRef = this.$refs.mescrollRef;
+				if (mescrollRef) this.mescroll = mescrollRef.mescroll
+			}
+		},
+		// 下拉刷新的回调
+		downCallback() {
+			// mixin默认resetUpScroll
+			this.mescroll.resetUpScroll()
+		},
+		// 上拉加载的回调
+		upCallback() {
+			// mixin默认延时500自动结束加载
+			setTimeout(() => {
+				this.mescroll.endErr();
+			}, 500)
+		}
+	},
+	mounted() {
+		this.mescrollInitByRef(); // 兼容字节跳动小程序, 避免未设置@init或@init此时未能取到ref的情况
+	}
+
+}
+
+export default MescrollMixin;
diff --git a/components/mescroll/mescroll-uni-option.js b/components/mescroll/mescroll-uni-option.js
new file mode 100644
index 0000000..bfcd06d
--- /dev/null
+++ b/components/mescroll/mescroll-uni-option.js
@@ -0,0 +1,35 @@
+// 全局配置
+// mescroll-body 和 mescroll-uni 通用
+const GlobalOption = {
+	down: {
+		// 其他down的配置参数也可以写,这里只展示了常用的配置:
+		textInOffset: '下拉刷新', // 下拉的距离在offset范围内的提示文本
+		textOutOffset: '释放更新', // 下拉的距离大于offset范围的提示文本
+		textLoading: '加载中 ...', // 加载中的提示文本
+		offset: 80, // 在列表顶部,下拉大于80px,松手即可触发下拉刷新的回调
+		native: false // 是否使用系统自带的下拉刷新; 默认false; 仅在mescroll-body生效 (值为true时,还需在pages配置enablePullDownRefresh:true;详请参考mescroll-native的案例)
+	},
+	up: {
+		// 其他up的配置参数也可以写,这里只展示了常用的配置:
+		textLoading: '加载中 ...', // 加载中的提示文本
+		textNoMore: '', // 没有更多数据的提示文本
+		// textNoMore: '— 我是有底线的 —', // 没有更多数据的提示文本
+		offset: 80, // 距底部多远时,触发upCallback
+		isBounce: false, // 默认禁止橡皮筋的回弹效果, 必读事项: http://www.mescroll.com/qa.html?v=190725#q25
+		toTop: {
+			// 回到顶部按钮,需配置src才显示
+			src: "http://www.mescroll.com/img/mescroll-totop.png?v=1", // 图片路径 (建议放入static目录, 如 /static/img/mescroll-totop.png )
+			offset: 1000, // 列表滚动多少距离才显示回到顶部按钮,默认1000px
+			right: 20, // 到右边的距离, 默认20 (支持"20rpx", "20px", "20%"格式的值, 纯数字则默认单位rpx)
+			bottom: 120, // 到底部的距离, 默认120 (支持"20rpx", "20px", "20%"格式的值, 纯数字则默认单位rpx)
+			width: 72 // 回到顶部图标的宽度, 默认72 (支持"20rpx", "20px", "20%"格式的值, 纯数字则默认单位rpx)
+		},
+		empty: {
+			use: true, // 是否显示空布局
+			icon: "http://www.mescroll.com/img/mescroll-empty.png?v=1", // 图标路径 (建议放入static目录, 如 /static/img/mescroll-empty.png )
+			tip: '~ 暂无相关数据 ~' // 提示
+		}
+	}
+}
+
+export default GlobalOption
diff --git a/components/mescroll/mescroll-uni.css b/components/mescroll/mescroll-uni.css
new file mode 100644
index 0000000..1c97a00
--- /dev/null
+++ b/components/mescroll/mescroll-uni.css
@@ -0,0 +1,33 @@
+page {
+	height: 100%;
+	box-sizing: border-box;
+	/* 避免设置padding出现双滚动条的问题 */
+}
+
+.mescroll-uni-warp {
+	height: 100%;
+}
+
+.mescroll-uni {
+	position: relative;
+	width: 100%;
+	height: 100%;
+	min-height: 200rpx;
+	overflow-y: auto;
+	box-sizing: border-box;
+	/* 避免设置padding出现双滚动条的问题 */
+}
+
+/* 定位的方式固定高度 */
+.mescroll-uni-fixed {
+	z-index: 1;
+	position: fixed;
+	top: 0;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	width: auto;
+	/* 使right生效 */
+	height: auto;
+	/* 使bottom生效 */
+}
diff --git a/components/mescroll/mescroll-uni.js b/components/mescroll/mescroll-uni.js
new file mode 100644
index 0000000..1b2eb9d
--- /dev/null
+++ b/components/mescroll/mescroll-uni.js
@@ -0,0 +1,841 @@
+/* mescroll
+ * version 1.2.3
+ * 2020-02-18 wenju
+ * http://www.mescroll.com
+ */
+
+export default function MeScroll(options, isScrollBody) {
+	let me = this;
+	me.version = '1.2.3'; // mescroll版本号
+	me.options = options || {}; // 配置
+	me.isScrollBody = isScrollBody || false; // 滚动区域是否为原生页面滚动; 默认为scroll-view
+
+	me.isDownScrolling = false; // 是否在执行下拉刷新的回调
+	me.isUpScrolling = false; // 是否在执行上拉加载的回调
+	let hasDownCallback = me.options.down && me.options.down.callback; // 是否配置了down的callback
+
+	// 初始化下拉刷新
+	me.initDownScroll();
+	// 初始化上拉加载,则初始化
+	me.initUpScroll();
+
+	// 自动加载
+	setTimeout(function() { // 待主线程执行完毕再执行,避免new MeScroll未初始化,在回调获取不到mescroll的实例
+		// 自动触发下拉刷新 (只有配置了down的callback才自动触发下拉刷新)
+		if (me.optDown.use && me.optDown.auto && hasDownCallback) {
+			if (me.optDown.autoShowLoading) {
+				me.triggerDownScroll(); // 显示下拉进度,执行下拉回调
+			} else {
+				me.optDown.callback && me.optDown.callback(me); // 不显示下拉进度,直接执行下拉回调
+			}
+		}
+		// 自动触发上拉加载
+		setTimeout(function() { // 延时确保先执行down的callback,再执行up的callback,因为部分小程序emit是异步,会导致isUpAutoLoad判断有误
+			me.optUp.use && me.optUp.auto && !me.isUpAutoLoad && me.triggerUpScroll();
+		}, 100)
+	}, 30); // 需让me.optDown.inited和me.optUp.inited先执行
+}
+
+/* 配置参数:下拉刷新 */
+MeScroll.prototype.extendDownScroll = function(optDown) {
+	// 下拉刷新的配置
+	MeScroll.extend(optDown, {
+		use: true, // 是否启用下拉刷新; 默认true
+		auto: true, // 是否在初始化完毕之后自动执行下拉刷新的回调; 默认true
+		native: false, // 是否使用系统自带的下拉刷新; 默认false; 仅mescroll-body生效 (值为true时,还需在pages配置enablePullDownRefresh:true;详请参考mescroll-native的案例)
+		autoShowLoading: false, // 如果设置auto=true(在初始化完毕之后自动执行下拉刷新的回调),那么是否显示下拉刷新的进度; 默认false
+		isLock: false, // 是否锁定下拉刷新,默认false;
+		offset: 80, // 在列表顶部,下拉大于80px,松手即可触发下拉刷新的回调
+		startTop: 100, // scroll-view滚动到顶部时,此时的scroll-top不一定为0, 此值用于控制最大的误差
+		fps: 80, // 下拉节流 (值越大每秒刷新频率越高)
+		inOffsetRate: 1, // 在列表顶部,下拉的距离小于offset时,改变下拉区域高度比例;值小于1且越接近0,高度变化越小,表现为越往下越难拉
+		outOffsetRate: 0.2, // 在列表顶部,下拉的距离大于offset时,改变下拉区域高度比例;值小于1且越接近0,高度变化越小,表现为越往下越难拉
+		bottomOffset: 20, // 当手指touchmove位置在距离body底部20px范围内的时候结束上拉刷新,避免Webview嵌套导致touchend事件不执行
+		minAngle: 45, // 向下滑动最少偏移的角度,取值区间  [0,90];默认45度,即向下滑动的角度大于45度则触发下拉;而小于45度,将不触发下拉,避免与左右滑动的轮播等组件冲突;
+		textInOffset: '下拉刷新', // 下拉的距离在offset范围内的提示文本
+		textOutOffset: '释放更新', // 下拉的距离大于offset范围的提示文本
+		textLoading: '加载中 ...', // 加载中的提示文本
+		inited: null, // 下拉刷新初始化完毕的回调
+		inOffset: null, // 下拉的距离进入offset范围内那一刻的回调
+		outOffset: null, // 下拉的距离大于offset那一刻的回调
+		onMoving: null, // 下拉过程中的回调,滑动过程一直在执行; rate下拉区域当前高度与指定距离的比值(inOffset: rate<1; outOffset: rate>=1); downHight当前下拉区域的高度
+		beforeLoading: null, // 准备触发下拉刷新的回调: 如果return true,将不触发showLoading和callback回调; 常用来完全自定义下拉刷新, 参考案例【淘宝 v6.8.0】
+		showLoading: null, // 显示下拉刷新进度的回调
+		afterLoading: null, // 准备结束下拉的回调. 返回结束下拉的延时执行时间,默认0ms; 常用于结束下拉之前再显示另外一小段动画,才去隐藏下拉刷新的场景, 参考案例【dotJump】
+		endDownScroll: null, // 结束下拉刷新的回调
+		callback: function(mescroll) {
+			// 下拉刷新的回调;默认重置上拉加载列表为第一页
+			mescroll.resetUpScroll();
+		}
+	})
+}
+
+/* 配置参数:上拉加载 */
+MeScroll.prototype.extendUpScroll = function(optUp) {
+	// 上拉加载的配置
+	MeScroll.extend(optUp, {
+		use: true, // 是否启用上拉加载; 默认true
+		auto: true, // 是否在初始化完毕之后自动执行上拉加载的回调; 默认true
+		isLock: false, // 是否锁定上拉加载,默认false;
+		isBoth: true, // 上拉加载时,如果滑动到列表顶部是否可以同时触发下拉刷新;默认true,两者可同时触发;
+		isBounce: false, // 默认禁止橡皮筋的回弹效果, 必读事项: http://www.mescroll.com/qa.html?v=190725#q25
+		callback: null, // 上拉加载的回调;function(page,mescroll){ }
+		page: {
+			num: 0, // 当前页码,默认0,回调之前会加1,即callback(page)会从1开始
+			size: 10, // 每页数据的数量
+			time: null // 加载第一页数据服务器返回的时间; 防止用户翻页时,后台新增了数据从而导致下一页数据重复;
+		},
+		noMoreSize: 5, // 如果列表已无数据,可设置列表的总数量要大于等于5条才显示无更多数据;避免列表数据过少(比如只有一条数据),显示无更多数据会不好看
+		offset: 80, // 距底部多远时,触发upCallback
+		textLoading: '加载中 ...', // 加载中的提示文本
+		textNoMore: '-- END --', // 没有更多数据的提示文本
+		inited: null, // 初始化完毕的回调
+		showLoading: null, // 显示加载中的回调
+		showNoMore: null, // 显示无更多数据的回调
+		hideUpScroll: null, // 隐藏上拉加载的回调
+		errDistance: 60, // endErr的时候需往上滑动一段距离,使其往下滑动时再次触发onReachBottom,仅mescroll-body生效
+		toTop: {
+			// 回到顶部按钮,需配置src才显示
+			src: null, // 图片路径,默认null (绝对路径或网络图)
+			offset: 1000, // 列表滚动多少距离才显示回到顶部按钮,默认1000
+			duration: 300, // 回到顶部的动画时长,默认300ms (当值为0或300则使用系统自带回到顶部,更流畅; 其他值则通过step模拟,部分机型可能不够流畅,所以非特殊情况不建议修改此项)
+			btnClick: null, // 点击按钮的回调
+			onShow: null, // 是否显示的回调
+			zIndex: 9990, // fixed定位z-index值
+			left: null, // 到左边的距离, 默认null. 此项有值时,right不生效. (支持20, "20rpx", "20px", "20%"格式的值, 其中纯数字则默认单位rpx)
+			right: 20, // 到右边的距离, 默认20 (支持20, "20rpx", "20px", "20%"格式的值, 其中纯数字则默认单位rpx)
+			bottom: 120, // 到底部的距离, 默认120 (支持20, "20rpx", "20px", "20%"格式的值, 其中纯数字则默认单位rpx)
+			safearea: false, // bottom的偏移量是否加上底部安全区的距离, 默认false, 需要适配iPhoneX时使用 (具体的界面如果不配置此项,则取本vue的safearea值)
+			width: 72, // 回到顶部图标的宽度, 默认72 (支持20, "20rpx", "20px", "20%"格式的值, 其中纯数字则默认单位rpx)
+			radius: "50%" // 圆角, 默认"50%" (支持20, "20rpx", "20px", "20%"格式的值, 其中纯数字则默认单位rpx)
+		},
+		empty: {
+			use: true, // 是否显示空布局
+			icon: null, // 图标路径
+			tip: '~ 暂无相关数据 ~', // 提示
+			btnText: '', // 按钮
+			btnClick: null, // 点击按钮的回调
+			onShow: null, // 是否显示的回调
+			fixed: false, // 是否使用fixed定位,默认false; 配置fixed为true,以下的top和zIndex才生效 (transform会使fixed失效,最终会降级为absolute)
+			top: "100rpx", // fixed定位的top值 (完整的单位值,如 "10%"; "100rpx")
+			zIndex: 99 // fixed定位z-index值
+		},
+		onScroll: false // 是否监听滚动事件
+	})
+}
+
+/* 配置参数 */
+MeScroll.extend = function(userOption, defaultOption) {
+	if (!userOption) return defaultOption;
+	for (let key in defaultOption) {
+		if (userOption[key] == null) {
+			let def = defaultOption[key];
+			if (def != null && typeof def === 'object') {
+				userOption[key] = MeScroll.extend({}, def); // 深度匹配
+			} else {
+				userOption[key] = def;
+			}
+		} else if (typeof userOption[key] === 'object') {
+			MeScroll.extend(userOption[key], defaultOption[key]); // 深度匹配
+		}
+	}
+	return userOption;
+}
+
+/* -------初始化下拉刷新------- */
+MeScroll.prototype.initDownScroll = function() {
+	let me = this;
+	// 配置参数
+	me.optDown = me.options.down || {};
+	me.extendDownScroll(me.optDown);
+
+	// 如果是mescroll-body且配置了native,则禁止自定义的下拉刷新
+	if (me.isScrollBody && me.optDown.native) {
+		me.optDown.use = false
+	} else {
+		me.optDown.native = false // 仅mescroll-body支持,mescroll-uni不支持
+	}
+
+	me.downHight = 0; // 下拉区域的高度
+
+	// 在页面中加入下拉布局
+	if (me.optDown.use && me.optDown.inited) {
+		// 初始化完毕的回调
+		setTimeout(function() { // 待主线程执行完毕再执行,避免new MeScroll未初始化,在回调获取不到mescroll的实例
+			me.optDown.inited(me);
+		}, 0)
+	}
+}
+
+/* 列表touchstart事件 */
+MeScroll.prototype.touchstartEvent = function(e) {
+	if (!this.optDown.use) return;
+
+	this.startPoint = this.getPoint(e); // 记录起点
+	this.startTop = this.getScrollTop(); // 记录此时的滚动条位置
+	this.lastPoint = this.startPoint; // 重置上次move的点
+	this.maxTouchmoveY = this.getBodyHeight() - this.optDown.bottomOffset; // 手指触摸的最大范围(写在touchstart避免body获取高度为0的情况)
+	this.inTouchend = false; // 标记不是touchend
+}
+
+/* 列表touchmove事件 */
+MeScroll.prototype.touchmoveEvent = function(e) {
+	if (!this.optDown.use) return;
+	if (!this.startPoint) return;
+	let me = this;
+
+	// 节流
+	let t = new Date().getTime();
+	if (me.moveTime && t - me.moveTime < me.moveTimeDiff) { // 小于节流时间,则不处理
+		return;
+	} else {
+		me.moveTime = t
+		if (!me.moveTimeDiff) me.moveTimeDiff = 1000 / me.optDown.fps
+	}
+
+	let scrollTop = me.getScrollTop(); // 当前滚动条的距离
+	let curPoint = me.getPoint(e); // 当前点
+
+	let moveY = curPoint.y - me.startPoint.y; // 和起点比,移动的距离,大于0向下拉,小于0向上拉
+
+	// 向下拉 && 在顶部
+	// mescroll-body,直接判定在顶部即可
+	// scroll-view在滚动时不会触发touchmove,当触顶/底/左/右时,才会触发touchmove
+	// scroll-view滚动到顶部时,scrollTop不一定为0; 在iOS的APP中scrollTop可能为负数,不一定和startTop相等
+	if (moveY > 0 && (
+			(me.isScrollBody && scrollTop <= 0) ||
+			(!me.isScrollBody && (scrollTop <= 0 || (scrollTop <= me.optDown.startTop && scrollTop === me.startTop)))
+		)) {
+		// 可下拉的条件
+		if (!me.inTouchend && !me.isDownScrolling && !me.optDown.isLock && (!me.isUpScrolling || (me.isUpScrolling &&
+				me.optUp.isBoth))) {
+
+			// 下拉的角度是否在配置的范围内
+			let angle = me.getAngle(me.lastPoint, curPoint); // 两点之间的角度,区间 [0,90]
+			if (angle < me.optDown.minAngle) return; // 如果小于配置的角度,则不往下执行下拉刷新
+
+			// 如果手指的位置超过配置的距离,则提前结束下拉,避免Webview嵌套导致touchend无法触发
+			if (me.maxTouchmoveY > 0 && curPoint.y >= me.maxTouchmoveY) {
+				me.inTouchend = true; // 标记执行touchend
+				me.touchendEvent(); // 提前触发touchend
+				return;
+			}
+
+			me.preventDefault(e); // 阻止默认事件
+
+			let diff = curPoint.y - me.lastPoint.y; // 和上次比,移动的距离 (大于0向下,小于0向上)
+
+			// 下拉距离  < 指定距离
+			if (me.downHight < me.optDown.offset) {
+				if (me.movetype !== 1) {
+					me.movetype = 1; // 加入标记,保证只执行一次
+					me.optDown.inOffset && me.optDown.inOffset(me); // 进入指定距离范围内那一刻的回调,只执行一次
+					me.isMoveDown = true; // 标记下拉区域高度改变,在touchend重置回来
+				}
+				me.downHight += diff * me.optDown.inOffsetRate; // 越往下,高度变化越小
+
+				// 指定距离  <= 下拉距离
+			} else {
+				if (me.movetype !== 2) {
+					me.movetype = 2; // 加入标记,保证只执行一次
+					me.optDown.outOffset && me.optDown.outOffset(me); // 下拉超过指定距离那一刻的回调,只执行一次
+					me.isMoveDown = true; // 标记下拉区域高度改变,在touchend重置回来
+				}
+				if (diff > 0) { // 向下拉
+					me.downHight += Math.round(diff * me.optDown.outOffsetRate); // 越往下,高度变化越小
+				} else { // 向上收
+					me.downHight += diff; // 向上收回高度,则向上滑多少收多少高度
+				}
+			}
+
+			let rate = me.downHight / me.optDown.offset; // 下拉区域当前高度与指定距离的比值
+			me.optDown.onMoving && me.optDown.onMoving(me, rate, me.downHight); // 下拉过程中的回调,一直在执行
+		}
+	}
+
+	me.lastPoint = curPoint; // 记录本次移动的点
+}
+
+/* 列表touchend事件 */
+MeScroll.prototype.touchendEvent = function(e) {
+	if (!this.optDown.use) return;
+	// 如果下拉区域高度已改变,则需重置回来
+	if (this.isMoveDown) {
+		if (this.downHight >= this.optDown.offset) {
+			// 符合触发刷新的条件
+			this.triggerDownScroll();
+		} else {
+			// 不符合的话 则重置
+			this.downHight = 0;
+			this.optDown.endDownScroll && this.optDown.endDownScroll(this);
+		}
+		this.movetype = 0;
+		this.isMoveDown = false;
+	} else if (!this.isScrollBody && this.getScrollTop() === this.startTop) { // scroll-view到顶/左/右/底的滑动事件
+		let isScrollUp = this.getPoint(e).y - this.startPoint.y < 0; // 和起点比,移动的距离,大于0向下拉,小于0向上拉
+		// 上滑
+		if (isScrollUp) {
+			// 需检查滑动的角度
+			let angle = this.getAngle(this.getPoint(e), this.startPoint); // 两点之间的角度,区间 [0,90]
+			if (angle > 80) {
+				// 检查并触发上拉
+				this.triggerUpScroll(true);
+			}
+		}
+	}
+}
+
+/* 根据点击滑动事件获取第一个手指的坐标 */
+MeScroll.prototype.getPoint = function(e) {
+	if (!e) {
+		return {
+			x: 0,
+			y: 0
+		}
+	}
+	if (e.touches && e.touches[0]) {
+		return {
+			x: e.touches[0].pageX,
+			y: e.touches[0].pageY
+		}
+	} else if (e.changedTouches && e.changedTouches[0]) {
+		return {
+			x: e.changedTouches[0].pageX,
+			y: e.changedTouches[0].pageY
+		}
+	} else {
+		return {
+			x: e.clientX,
+			y: e.clientY
+		}
+	}
+}
+
+/* 计算两点之间的角度: 区间 [0,90]*/
+MeScroll.prototype.getAngle = function(p1, p2) {
+	let x = Math.abs(p1.x - p2.x);
+	let y = Math.abs(p1.y - p2.y);
+	let z = Math.sqrt(x * x + y * y);
+	let angle = 0;
+	if (z !== 0) {
+		angle = Math.asin(y / z) / Math.PI * 180;
+	}
+	return angle
+}
+
+/* 触发下拉刷新 */
+MeScroll.prototype.triggerDownScroll = function() {
+	if (this.optDown.beforeLoading && this.optDown.beforeLoading(this)) {
+		//return true则处于完全自定义状态
+	} else {
+		this.showDownScroll(); // 下拉刷新中...
+		this.optDown.callback && this.optDown.callback(this); // 执行回调,联网加载数据
+	}
+}
+
+/* 显示下拉进度布局 */
+MeScroll.prototype.showDownScroll = function() {
+	this.isDownScrolling = true; // 标记下拉中
+	if (this.optDown.native) {
+		uni.startPullDownRefresh(); // 系统自带的下拉刷新
+		this.optDown.showLoading && this.optDown.showLoading(this, 0); // 仍触发showLoading,因为上拉加载用到
+	} else {
+		this.downHight = this.optDown.offset; // 更新下拉区域高度
+		this.optDown.showLoading && this.optDown.showLoading(this, this.downHight); // 下拉刷新中...
+	}
+}
+
+/* 显示系统自带的下拉刷新时需要处理的业务 */
+MeScroll.prototype.onPullDownRefresh = function() {
+	this.isDownScrolling = true; // 标记下拉中
+	this.optDown.showLoading && this.optDown.showLoading(this, 0); // 仍触发showLoading,因为上拉加载用到
+	this.optDown.callback && this.optDown.callback(this); // 执行回调,联网加载数据
+}
+
+/* 结束下拉刷新 */
+MeScroll.prototype.endDownScroll = function() {
+	if (this.optDown.native) { // 结束原生下拉刷新
+		this.isDownScrolling = false;
+		this.optDown.endDownScroll && this.optDown.endDownScroll(this);
+		uni.stopPullDownRefresh();
+		return
+	}
+	let me = this;
+	// 结束下拉刷新的方法
+	let endScroll = function() {
+		me.downHight = 0;
+		me.isDownScrolling = false;
+		me.optDown.endDownScroll && me.optDown.endDownScroll(me);
+		!me.isScrollBody && me.setScrollHeight(0) // scroll-view重置滚动区域,使数据不满屏时仍可检查触发翻页
+	}
+	// 结束下拉刷新时的回调
+	let delay = 0;
+	if (me.optDown.afterLoading) delay = me.optDown.afterLoading(me); // 结束下拉刷新的延时,单位ms
+	if (typeof delay === 'number' && delay > 0) {
+		setTimeout(endScroll, delay);
+	} else {
+		endScroll();
+	}
+}
+
+/* 锁定下拉刷新:isLock=ture,null锁定;isLock=false解锁 */
+MeScroll.prototype.lockDownScroll = function(isLock) {
+	if (isLock == null) isLock = true;
+	this.optDown.isLock = isLock;
+}
+
+/* 锁定上拉加载:isLock=ture,null锁定;isLock=false解锁 */
+MeScroll.prototype.lockUpScroll = function(isLock) {
+	if (isLock == null) isLock = true;
+	this.optUp.isLock = isLock;
+}
+
+/* -------初始化上拉加载------- */
+MeScroll.prototype.initUpScroll = function() {
+	let me = this;
+	// 配置参数
+	me.optUp = me.options.up || {
+		use: false
+	};
+	me.extendUpScroll(me.optUp);
+
+	if (!me.optUp.isBounce) me.setBounce(false); // 不允许bounce时,需禁止window的touchmove事件
+
+	if (me.optUp.use === false) return; // 配置不使用上拉加载时,则不初始化上拉布局
+	me.optUp.hasNext = true; // 如果使用上拉,则默认有下一页
+	me.startNum = me.optUp.page.num + 1; // 记录page开始的页码
+
+	// 初始化完毕的回调
+	if (me.optUp.inited) {
+		setTimeout(function() { // 待主线程执行完毕再执行,避免new MeScroll未初始化,在回调获取不到mescroll的实例
+			me.optUp.inited(me);
+		}, 0)
+	}
+}
+
+/*滚动到底部的事件 (仅mescroll-body生效)*/
+MeScroll.prototype.onReachBottom = function() {
+	if (this.isScrollBody && !this.isUpScrolling) { // 只能支持下拉刷新的时候同时可以触发上拉加载,否则滚动到底部就需要上滑一点才能触发onReachBottom
+		if (!this.optUp.isLock && this.optUp.hasNext) {
+			this.triggerUpScroll();
+		}
+	}
+}
+
+/*列表滚动事件 (仅mescroll-body生效)*/
+MeScroll.prototype.onPageScroll = function(e) {
+	if (!this.isScrollBody) return;
+
+	// 更新滚动条的位置 (主要用于判断下拉刷新时,滚动条是否在顶部)
+	this.setScrollTop(e.scrollTop);
+
+	// 顶部按钮的显示隐藏
+	if (e.scrollTop >= this.optUp.toTop.offset) {
+		this.showTopBtn();
+	} else {
+		this.hideTopBtn();
+	}
+}
+
+/*列表滚动事件*/
+MeScroll.prototype.scroll = function(e, onScroll) {
+	// 更新滚动条的位置
+	this.setScrollTop(e.scrollTop);
+	// 更新滚动内容高度
+	this.setScrollHeight(e.scrollHeight);
+
+	// 向上滑还是向下滑动
+	if (this.preScrollY == null) this.preScrollY = 0;
+	this.isScrollUp = e.scrollTop - this.preScrollY > 0;
+	this.preScrollY = e.scrollTop;
+
+	// 上滑 && 检查并触发上拉
+	this.isScrollUp && this.triggerUpScroll(true);
+
+	// 顶部按钮的显示隐藏
+	if (e.scrollTop >= this.optUp.toTop.offset) {
+		this.showTopBtn();
+	} else {
+		this.hideTopBtn();
+	}
+
+	// 滑动监听
+	this.optUp.onScroll && onScroll && onScroll()
+}
+
+/* 触发上拉加载 */
+MeScroll.prototype.triggerUpScroll = function(isCheck) {
+	if (!this.isUpScrolling && this.optUp.use && this.optUp.callback) {
+		// 是否校验在底部; 默认不校验
+		if (isCheck === true) {
+			let canUp = false;
+			// 还有下一页 && 没有锁定 && 不在下拉中
+			if (this.optUp.hasNext && !this.optUp.isLock && !this.isDownScrolling) {
+				if (this.getScrollBottom() <= this.optUp.offset) { // 到底部
+					canUp = true; // 标记可上拉
+				}
+			}
+			if (canUp === false) return;
+		}
+		this.showUpScroll(); // 上拉加载中...
+		this.optUp.page.num++; // 预先加一页,如果失败则减回
+		this.isUpAutoLoad = true; // 标记上拉已经自动执行过,避免初始化时多次触发上拉回调
+		this.num = this.optUp.page.num; // 把最新的页数赋值在mescroll上,避免对page的影响
+		this.size = this.optUp.page.size; // 把最新的页码赋值在mescroll上,避免对page的影响
+		this.time = this.optUp.page.time; // 把最新的页码赋值在mescroll上,避免对page的影响
+		this.optUp.callback(this); // 执行回调,联网加载数据
+	}
+}
+
+/* 显示上拉加载中 */
+MeScroll.prototype.showUpScroll = function() {
+	this.isUpScrolling = true; // 标记上拉加载中
+	this.optUp.showLoading && this.optUp.showLoading(this); // 回调
+}
+
+/* 显示上拉无更多数据 */
+MeScroll.prototype.showNoMore = function() {
+	this.optUp.hasNext = false; // 标记无更多数据
+	this.optUp.showNoMore && this.optUp.showNoMore(this); // 回调
+}
+
+/* 隐藏上拉区域**/
+MeScroll.prototype.hideUpScroll = function() {
+	this.optUp.hideUpScroll && this.optUp.hideUpScroll(this); // 回调
+}
+
+/* 结束上拉加载 */
+MeScroll.prototype.endUpScroll = function(isShowNoMore) {
+	if (isShowNoMore != null) { // isShowNoMore=null,不处理下拉状态,下拉刷新的时候调用
+		if (isShowNoMore) {
+			this.showNoMore(); // isShowNoMore=true,显示无更多数据
+		} else {
+			this.hideUpScroll(); // isShowNoMore=false,隐藏上拉加载
+		}
+	}
+	this.isUpScrolling = false; // 标记结束上拉加载
+}
+
+/* 重置上拉加载列表为第一页
+ *isShowLoading 是否显示进度布局;
+ * 1.默认null,不传参,则显示上拉加载的进度布局
+ * 2.传参true, 则显示下拉刷新的进度布局
+ * 3.传参false,则不显示上拉和下拉的进度 (常用于静默更新列表数据)
+ */
+MeScroll.prototype.resetUpScroll = function(isShowLoading) {
+	if (this.optUp && this.optUp.use) {
+		let page = this.optUp.page;
+		this.prePageNum = page.num; // 缓存重置前的页码,加载失败可退回
+		this.prePageTime = page.time; // 缓存重置前的时间,加载失败可退回
+		page.num = this.startNum; // 重置为第一页
+		page.time = null; // 重置时间为空
+		if (!this.isDownScrolling && isShowLoading !== false) { // 如果不是下拉刷新触发的resetUpScroll并且不配置列表静默更新,则显示进度;
+			if (isShowLoading == null) {
+				this.removeEmpty(); // 移除空布局
+				this.showUpScroll(); // 不传参,默认显示上拉加载的进度布局
+			} else {
+				this.showDownScroll(); // 传true,显示下拉刷新的进度布局,不清空列表
+			}
+		}
+		this.isUpAutoLoad = true; // 标记上拉已经自动执行过,避免初始化时多次触发上拉回调
+		this.num = page.num; // 把最新的页数赋值在mescroll上,避免对page的影响
+		this.size = page.size; // 把最新的页码赋值在mescroll上,避免对page的影响
+		this.time = page.time; // 把最新的页码赋值在mescroll上,避免对page的影响
+		this.optUp.callback && this.optUp.callback(this); // 执行上拉回调
+	}
+}
+
+/* 设置page.num的值 */
+MeScroll.prototype.setPageNum = function(num) {
+	this.optUp.page.num = num - 1;
+}
+
+/* 设置page.size的值 */
+MeScroll.prototype.setPageSize = function(size) {
+	this.optUp.page.size = size;
+}
+
+/* 联网回调成功,结束下拉刷新和上拉加载
+ * dataSize: 当前页的数据量(必传)
+ * totalPage: 总页数(必传)
+ * systime: 服务器时间 (可空)
+ */
+MeScroll.prototype.endByPage = function(dataSize, totalPage, systime) {
+	let hasNext;
+	if (this.optUp.use && totalPage != null) hasNext = this.optUp.page.num < totalPage; // 是否还有下一页
+	this.endSuccess(dataSize, hasNext, systime);
+}
+
+/* 联网回调成功,结束下拉刷新和上拉加载
+ * dataSize: 当前页的数据量(必传)
+ * totalSize: 列表所有数据总数量(必传)
+ * systime: 服务器时间 (可空)
+ */
+MeScroll.prototype.endBySize = function(dataSize, totalSize, systime) {
+	let hasNext;
+	if (this.optUp.use && totalSize != null) {
+		let loadSize = (this.optUp.page.num - 1) * this.optUp.page.size + dataSize; // 已加载的数据总数
+		hasNext = loadSize < totalSize; // 是否还有下一页
+	}
+	this.endSuccess(dataSize, hasNext, systime);
+}
+
+/* 联网回调成功,结束下拉刷新和上拉加载
+ * dataSize: 当前页的数据个数(不是所有页的数据总和),用于上拉加载判断是否还有下一页.如果不传,则会判断还有下一页
+ * hasNext: 是否还有下一页,布尔类型;用来解决这个小问题:比如列表共有20条数据,每页加载10条,共2页.如果只根据dataSize判断,则需翻到第三页才会知道无更多数据,如果传了hasNext,则翻到第二页即可显示无更多数据.
+ * systime: 服务器时间(可空);用来解决这个小问题:当准备翻下一页时,数据库新增了几条记录,此时翻下一页,前面的几条数据会和上一页的重复;这里传入了systime,那么upCallback的page.time就会有值,把page.time传给服务器,让后台过滤新加入的那几条记录
+ */
+MeScroll.prototype.endSuccess = function(dataSize, hasNext, systime) {
+	let me = this;
+	// 结束下拉刷新
+	if (me.isDownScrolling) me.endDownScroll();
+
+	// 结束上拉加载
+	if (me.optUp.use) {
+		let isShowNoMore; // 是否已无更多数据
+		if (dataSize != null) {
+			let pageNum = me.optUp.page.num; // 当前页码
+			let pageSize = me.optUp.page.size; // 每页长度
+			// 如果是第一页
+			if (pageNum === 1) {
+				if (systime) me.optUp.page.time = systime; // 设置加载列表数据第一页的时间
+			}
+			if (dataSize < pageSize || hasNext === false) {
+				// 返回的数据不满一页时,则说明已无更多数据
+				me.optUp.hasNext = false;
+				if (dataSize === 0 && pageNum === 1) {
+					// 如果第一页无任何数据且配置了空布局
+					isShowNoMore = false;
+					me.showEmpty();
+				} else {
+					// 总列表数少于配置的数量,则不显示无更多数据
+					let allDataSize = (pageNum - 1) * pageSize + dataSize;
+					if (allDataSize < me.optUp.noMoreSize) {
+						isShowNoMore = false;
+					} else {
+						isShowNoMore = true;
+					}
+					me.removeEmpty(); // 移除空布局
+				}
+			} else {
+				// 还有下一页
+				isShowNoMore = false;
+				me.optUp.hasNext = true;
+				me.removeEmpty(); // 移除空布局
+			}
+		}
+
+		// 隐藏上拉
+		me.endUpScroll(isShowNoMore);
+	}
+}
+
+/* 回调失败,结束下拉刷新和上拉加载 */
+MeScroll.prototype.endErr = function(errDistance) {
+	// 结束下拉,回调失败重置回原来的页码和时间
+	if (this.isDownScrolling) {
+		let page = this.optUp.page;
+		if (page && this.prePageNum) {
+			page.num = this.prePageNum;
+			page.time = this.prePageTime;
+		}
+		this.endDownScroll();
+	}
+	// 结束上拉,回调失败重置回原来的页码
+	if (this.isUpScrolling) {
+		this.optUp.page.num--;
+		this.endUpScroll(false);
+		// 如果是mescroll-body,则需往回滚一定距离
+		if (this.isScrollBody && errDistance !== 0) { // 不处理0
+			if (!errDistance) errDistance = this.optUp.errDistance; // 不传,则取默认
+			this.scrollTo(this.getScrollTop() - errDistance, 0) // 往上回滚的距离
+		}
+	}
+}
+
+/* 显示空布局 */
+MeScroll.prototype.showEmpty = function() {
+	this.optUp.empty.use && this.optUp.empty.onShow && this.optUp.empty.onShow(true)
+}
+
+/* 移除空布局 */
+MeScroll.prototype.removeEmpty = function() {
+	this.optUp.empty.use && this.optUp.empty.onShow && this.optUp.empty.onShow(false)
+}
+
+/* 显示回到顶部的按钮 */
+MeScroll.prototype.showTopBtn = function() {
+	if (!this.topBtnShow) {
+		this.topBtnShow = true;
+		this.optUp.toTop.onShow && this.optUp.toTop.onShow(true);
+	}
+}
+
+/* 隐藏回到顶部的按钮 */
+MeScroll.prototype.hideTopBtn = function() {
+	if (this.topBtnShow) {
+		this.topBtnShow = false;
+		this.optUp.toTop.onShow && this.optUp.toTop.onShow(false);
+	}
+}
+
+/* 获取滚动条的位置 */
+MeScroll.prototype.getScrollTop = function() {
+	return this.scrollTop || 0
+}
+
+/* 记录滚动条的位置 */
+MeScroll.prototype.setScrollTop = function(y) {
+	this.scrollTop = y;
+}
+
+/* 滚动到指定位置 */
+MeScroll.prototype.scrollTo = function(y, t) {
+	this.myScrollTo && this.myScrollTo(y, t) // scrollview需自定义回到顶部方法
+}
+
+/* 自定义scrollTo */
+MeScroll.prototype.resetScrollTo = function(myScrollTo) {
+	this.myScrollTo = myScrollTo
+}
+
+/* 滚动条到底部的距离 */
+MeScroll.prototype.getScrollBottom = function() {
+	return this.getScrollHeight() - this.getClientHeight() - this.getScrollTop()
+}
+
+/* 计步器
+ star: 开始值
+ end: 结束值
+ callback(step,timer): 回调step值,计步器timer,可自行通过window.clearInterval(timer)结束计步器;
+ t: 计步时长,传0则直接回调end值;不传则默认300ms
+ rate: 周期;不传则默认30ms计步一次
+ * */
+MeScroll.prototype.getStep = function(star, end, callback, t, rate) {
+	let diff = end - star; // 差值
+	if (t === 0 || diff === 0) {
+		callback && callback(end);
+		return;
+	}
+	t = t || 300; // 时长 300ms
+	rate = rate || 30; // 周期 30ms
+	let count = t / rate; // 次数
+	let step = diff / count; // 步长
+	let i = 0; // 计数
+	let timer = setInterval(function() {
+		if (i < count - 1) {
+			star += step;
+			callback && callback(star, timer);
+			i++;
+		} else {
+			callback && callback(end, timer); // 最后一次直接设置end,避免计算误差
+			clearInterval(timer);
+		}
+	}, rate);
+}
+
+/* 滚动容器的高度 */
+MeScroll.prototype.getClientHeight = function(isReal) {
+	let h = this.clientHeight || 0
+	if (h === 0 && isReal !== true) { // 未获取到容器的高度,可临时取body的高度 (可能会有误差)
+		h = this.getBodyHeight()
+	}
+	return h
+}
+MeScroll.prototype.setClientHeight = function(h) {
+	this.clientHeight = h;
+}
+
+/* 滚动内容的高度 */
+MeScroll.prototype.getScrollHeight = function() {
+	return this.scrollHeight || 0;
+}
+MeScroll.prototype.setScrollHeight = function(h) {
+	this.scrollHeight = h;
+}
+
+/* body的高度 */
+MeScroll.prototype.getBodyHeight = function() {
+	return this.bodyHeight || 0;
+}
+MeScroll.prototype.setBodyHeight = function(h) {
+	this.bodyHeight = h;
+}
+
+/* 阻止浏览器默认滚动事件 */
+MeScroll.prototype.preventDefault = function(e) {
+	// 小程序不支持e.preventDefault
+	// app的bounce只能通过配置pages.json的style.app-plus.bounce为"none"来禁止
+	// cancelable:是否可以被禁用; defaultPrevented:是否已经被禁用
+	if (e && e.cancelable && !e.defaultPrevented) e.preventDefault()
+}
+
+/* 是否允许下拉回弹(橡皮筋效果); true或null为允许; false禁止bounce */
+MeScroll.prototype.setBounce = function(isBounce) {
+	// #ifdef H5
+	if (isBounce === false) {
+		this.optUp.isBounce = false; // 禁止
+		// 标记当前页使用了mescroll (需延时,确保page已切换)
+		setTimeout(function() {
+			let uniPageDom = document.getElementsByTagName('uni-page')[0];
+			uniPageDom && uniPageDom.setAttribute('use_mescroll', true)
+		}, 30);
+		// 避免重复添加事件
+		if (window.isSetBounce) return;
+		window.isSetBounce = true;
+		// 需禁止window的touchmove事件才能有效的阻止bounce
+		window.bounceTouchmove = function(e) {
+			let el = e.target;
+			// 当前touch的元素及父元素是否要拦截touchmove事件
+			let isPrevent = true;
+			while (el !== document.body && el !== document) {
+				if (el.tagName === 'UNI-PAGE') { // 只扫描当前页
+					if (!el.getAttribute('use_mescroll')) {
+						isPrevent = false; // 如果当前页没有使用mescroll,则不阻止
+					}
+					break;
+				}
+				let cls = el.classList;
+				if (cls) {
+					if (cls.contains('mescroll-touch')) { // 采用scroll-view 此处不能过滤mescroll-uni,否则下拉仍然有回弹
+						isPrevent = false; // mescroll-touch无需拦截touchmove事件
+						break;
+					} else if (cls.contains('mescroll-touch-x') || cls.contains('mescroll-touch-y')) {
+						// 如果配置了水平或者垂直滑动
+						let curX = e.touches ? e.touches[0].pageX : e.clientX; // 当前第一个手指距离列表顶部的距离x
+						let curY = e.touches ? e.touches[0].pageY : e.clientY; // 当前第一个手指距离列表顶部的距离y
+						if (!this.preWinX) this.preWinX = curX; // 设置上次移动的距离x
+						if (!this.preWinY) this.preWinY = curY; // 设置上次移动的距离y
+						// 计算两点之间的角度
+						let x = Math.abs(this.preWinX - curX);
+						let y = Math.abs(this.preWinY - curY);
+						let z = Math.sqrt(x * x + y * y);
+						this.preWinX = curX; // 记录本次curX的值
+						this.preWinY = curY; // 记录本次curY的值
+						if (z !== 0) {
+							let angle = Math.asin(y / z) / Math.PI * 180; // 角度区间 [0,90]
+							if ((angle <= 45 && cls.contains('mescroll-touch-x')) || (angle > 45 && cls.contains('mescroll-touch-y'))) {
+								isPrevent = false; // 水平滑动或者垂直滑动,不拦截touchmove事件
+								break;
+							}
+						}
+					}
+				}
+				el = el.parentNode; // 继续检查其父元素
+			}
+			// 拦截touchmove事件:是否可以被禁用&&是否已经被禁用 (这里不使用me.preventDefault(e)的方法,因为某些情况下会报找不到方法的异常)
+			if (isPrevent && e.cancelable && !e.defaultPrevented && typeof e.preventDefault === "function") e.preventDefault();
+		}
+		window.addEventListener('touchmove', window.bounceTouchmove, {
+			passive: false
+		});
+	} else {
+		this.optUp.isBounce = true; // 允许
+		if (window.bounceTouchmove) {
+			window.removeEventListener('touchmove', window.bounceTouchmove);
+			window.bounceTouchmove = null;
+			window.isSetBounce = false;
+		}
+	}
+	// #endif
+}
diff --git a/components/mescroll/mescroll-uni.vue b/components/mescroll/mescroll-uni.vue
new file mode 100644
index 0000000..7a40618
--- /dev/null
+++ b/components/mescroll/mescroll-uni.vue
@@ -0,0 +1,429 @@
+<template>
+	<view class="mescroll-uni-warp">
+		<scroll-view :id="viewId" class="mescroll-uni" :class="{ 'mescroll-uni-fixed': isFixed }" :style="{
+				height: scrollHeight,
+				'padding-top': padTop,
+				'padding-bottom': padBottom,
+				'padding-bottom': padBottomConstant,
+				'padding-bottom': padBottomEnv,
+				top: fixedTop,
+				bottom: fixedBottom,
+				bottom: fixedBottomConstant,
+				bottom: fixedBottomEnv,
+				background: background,
+				'padding-left': paddingBoth,
+				'padding-right': paddingBoth
+			}" :scroll-top="scrollTop" :scroll-with-animation="scrollAnim" @scroll="scroll" @touchstart="touchstartEvent"
+			@touchmove="touchmoveEvent" @touchend="touchendEvent" @touchcancel="touchendEvent" :scroll-y="isDownReset"
+			:enable-back-to-top="true">
+			<view class="mescroll-uni-content" :style="{ transform: translateY, transition: transition }">
+				<!-- 下拉加载区域 (支付宝小程序子组件传参给子子组件仍报单项数据流的异常,暂时不通过mescroll-down组件实现)-->
+				<!-- <mescroll-down :option="mescroll.optDown" :type="downLoadType" :rate="downRate"></mescroll-down> -->
+				<view v-if="mescroll.optDown.use" class="mescroll-downwarp">
+					<view class="downwarp-content">
+						<!-- <view class="downwarp-progress" :class="{'mescroll-rotate': isDownLoading}" :style="{'transform': downRotate}"></view> -->
+						<view class="downwarp-tip">{{ downText }}</view>
+					</view>
+				</view>
+
+				<!-- 列表内容 -->
+				<slot></slot>
+
+				<!-- 空布局 -->
+				<!-- <mescroll-empty v-if="isShowEmpty" :option="mescroll.optUp.empty" @emptyclick="emptyClick"></mescroll-empty> -->
+
+				<!-- 上拉加载区域 (下拉刷新时不显示, 支付宝小程序子组件传参给子子组件仍报单项数据流的异常,暂时不通过mescroll-up组件实现)-->
+				<!-- <mescroll-up v-if="mescroll.optUp.use && !isDownLoading" :option="mescroll.optUp" :type="upLoadType"></mescroll-up> -->
+				<view v-if="mescroll.optUp.use && !isDownLoading" class="mescroll-upwarp">
+					<!-- 加载中 (此处不能用v-if,否则android小程序快速上拉可能会不断触发上拉回调) -->
+					<view v-show="upLoadType === 1">
+						<!-- <view class="upwarp-progress mescroll-rotate"></view>
+						<view class="upwarp-tip">{{ mescroll.optUp.textLoading }}</view> -->
+						<ns-loading></ns-loading>
+					</view>
+					<!-- 无数据 -->
+					<view v-if="upLoadType === 2" class="upwarp-nodata">{{ mescroll.optUp.textNoMore }}</view>
+				</view>
+			</view>
+		</scroll-view>
+
+		<!-- 回到顶部按钮 (fixed元素,需写在scroll-view外面,防止滚动的时候抖动)-->
+		<mescroll-top v-if="showTop" v-model="isShowToTop" :option="mescroll.optUp.toTop" @click="toTopClick"></mescroll-top>
+	</view>
+</template>
+
+<script>
+	// 引入mescroll-uni.js,处理核心逻辑
+	import MeScroll from './mescroll-uni.js';
+	// 引入全局配置
+	import GlobalOption from './mescroll-uni-option.js';
+	// 引入空布局组件
+	import MescrollEmpty from './components/mescroll-empty.vue';
+	// 引入回到顶部组件
+	import MescrollTop from './components/mescroll-top.vue';
+
+	import nsLoading from '@/components/ns-loading/ns-loading.vue';
+
+	export default {
+		name: 'mescroll-uni',
+		components: {
+			MescrollEmpty,
+			MescrollTop
+		},
+		props: {
+			down: Object, // 下拉刷新的参数配置
+			up: Object, // 上拉加载的参数配置
+			top: [String, Number], // 下拉布局往下的偏移量 (支持20, "20rpx", "20px", "20%"格式的值, 其中纯数字则默认单位rpx, 百分比则相对于windowHeight)
+			topbar: Boolean, // top的偏移量是否加上状态栏高度, 默认false (使用场景:取消原生导航栏时,配置此项可自动加上状态栏高度的偏移量)
+			bottom: [String, Number], // 上拉布局往上的偏移量 (支持20, "20rpx", "20px", "20%"格式的值, 其中纯数字则默认单位rpx, 百分比则相对于windowHeight)
+			safearea: Boolean, // bottom的偏移量是否加上底部安全区的距离, 默认false (需要适配iPhoneX时使用)
+			fixed: {
+				// 是否通过fixed固定mescroll的高度, 默认true
+				type: Boolean,
+				default () {
+					return true;
+				}
+			},
+			height: [String,
+				Number
+			], // 指定mescroll的高度, 此项有值,则不使用fixed. (支持20, "20rpx", "20px", "20%"格式的值, 其中纯数字则默认单位rpx, 百分比则相对于windowHeight)
+			showTop: {
+				//是否需要展示返回顶部按钮
+				type: Boolean,
+				default () {
+					return true;
+				}
+			},
+			background: String,
+			paddingBoth: {
+				type: [String, Number],
+				default () {
+					return 0;
+				}
+			}
+		},
+		data() {
+			return {
+				mescroll: {
+					optDown: {},
+					optUp: {}
+				}, // mescroll实例
+				viewId: 'id_' +
+					Math.random()
+					.toString(36)
+					.substr(2), // 随机生成mescroll的id(不能数字开头,否则找不到元素)
+				downHight: 0, //下拉刷新: 容器高度
+				downRate: 0, // 下拉比率(inOffset: rate<1; outOffset: rate>=1)
+				downLoadType: 4, // 下拉刷新状态 （inOffset：1， outOffset：2， showLoading：3， endDownScroll：4）
+				upLoadType: 0, // 上拉加载状态：0（loading前），1（loading中），2（没有更多了）
+				isShowEmpty: false, // 是否显示空布局
+				isShowToTop: false, // 是否显示回到顶部按钮
+				scrollTop: 0, // 滚动条的位置
+				scrollAnim: false, // 是否开启滚动动画
+				windowTop: 0, // 可使用窗口的顶部位置
+				windowBottom: 0, // 可使用窗口的底部位置
+				windowHeight: 0, // 可使用窗口的高度
+				statusBarHeight: 0 // 状态栏高度
+			};
+		},
+		computed: {
+			// 是否使用fixed定位 (当height有值,则不使用)
+			isFixed() {
+				return !this.height && this.fixed;
+			},
+			// mescroll的高度
+			scrollHeight() {
+				if (this.isFixed) {
+					return 'auto';
+				} else if (this.height) {
+					return this.toPx(this.height) + 'px';
+				} else {
+					return '100%';
+				}
+			},
+			// 下拉布局往下偏移的距离 (px)
+			numTop() {
+				// #ifdef H5
+				return this.toPx(this.top) + (this.topbar ? this.statusBarHeight : 0);
+				// #endif
+
+				// #ifdef MP
+				return this.toPx(this.top) + (this.topbar ? 44 + this.statusBarHeight : 0);
+				// #endif
+			},
+			fixedTop() {
+				return this.isFixed ? this.numTop + this.windowTop + 'px' : 0;
+			},
+			padTop() {
+				return !this.isFixed ? this.numTop + 'px' : 0;
+			},
+			// 上拉布局往上偏移 (px)
+			numBottom() {
+				return this.toPx(this.bottom);
+			},
+			fixedBottom() {
+				return this.isFixed ? this.numBottom + this.windowBottom + 'px' : 0;
+			},
+			fixedBottomConstant() {
+				return this.safearea ? 'calc(' + this.fixedBottom + ' + constant(safe-area-inset-bottom))' : this
+					.fixedBottom;
+			},
+			fixedBottomEnv() {
+				return this.safearea ? 'calc(' + this.fixedBottom + ' + env(safe-area-inset-bottom))' : this.fixedBottom;
+			},
+			padBottom() {
+				return !this.isFixed ? this.numBottom + 'px' : 0;
+			},
+			padBottomConstant() {
+				return this.safearea ? 'calc(' + this.padBottom + ' + constant(safe-area-inset-bottom))' : this.padBottom;
+			},
+			padBottomEnv() {
+				return this.safearea ? 'calc(' + this.padBottom + ' + env(safe-area-inset-bottom))' : this.padBottom;
+			},
+			// 是否为重置下拉的状态
+			isDownReset() {
+				return this.downLoadType === 3 || this.downLoadType === 4;
+			},
+			// 过渡
+			transition() {
+				return this.isDownReset ? 'transform 300ms' : '';
+			},
+			translateY() {
+				return this.downHight > 0 ? 'translateY(' + this.downHight + 'px)' :
+					''; // transform会使fixed失效,需注意把fixed元素写在mescroll之外
+			},
+			// 是否在加载中
+			isDownLoading() {
+				return this.downLoadType === 3;
+			},
+			// 旋转的角度
+			downRotate() {
+				return 'rotate(' + 360 * this.downRate + 'deg)';
+			},
+			// 文本提示
+			downText() {
+				switch (this.downLoadType) {
+					case 1:
+						return this.mescroll.optDown.textInOffset;
+					case 2:
+						return this.mescroll.optDown.textOutOffset;
+					case 3:
+						return this.mescroll.optDown.textLoading;
+					case 4:
+						return this.mescroll.optDown.textLoading;
+					default:
+						return this.mescroll.optDown.textInOffset;
+				}
+			}
+		},
+		methods: {
+			//number,rpx,upx,px,% --> px的数值
+			toPx(num) {
+				if (typeof num === 'string') {
+					if (num.indexOf('px') !== -1) {
+						if (num.indexOf('rpx') !== -1) {
+							// "10rpx"
+							num = num.replace('rpx', '');
+						} else if (num.indexOf('upx') !== -1) {
+							// "10upx"
+							num = num.replace('upx', '');
+						} else {
+							// "10px"
+							return Number(num.replace('px', ''));
+						}
+					} else if (num.indexOf('%') !== -1) {
+						// 传百分比,则相对于windowHeight,传"10%"则等于windowHeight的10%
+						let rate = Number(num.replace('%', '')) / 100;
+						return this.windowHeight * rate;
+					}
+				}
+				return num ? uni.upx2px(Number(num)) : 0;
+			},
+			//注册列表滚动事件,用于下拉刷新和上拉加载
+			scroll(e) {
+				this.mescroll.scroll(e.detail, () => {
+					this.$emit('scroll', this
+						.mescroll); // 此时可直接通过 this.mescroll.scrollTop获取滚动条位置; this.mescroll.isScrollUp获取是否向上滑动
+				});
+			},
+			//注册列表touchstart事件,用于下拉刷新
+			touchstartEvent(e) {
+				this.mescroll.touchstartEvent(e);
+			},
+			//注册列表touchmove事件,用于下拉刷新
+			touchmoveEvent(e) {
+				this.mescroll.touchmoveEvent(e);
+			},
+			//注册列表touchend事件,用于下拉刷新
+			touchendEvent(e) {
+				this.mescroll.touchendEvent(e);
+			},
+			// 点击空布局的按钮回调
+			emptyClick() {
+				this.$emit('emptyclick', this.mescroll);
+			},
+			// 点击回到顶部的按钮回调
+			toTopClick() {
+				this.mescroll.scrollTo(0, this.mescroll.optUp.toTop.duration); // 执行回到顶部
+				this.$emit('topclick', this.mescroll); // 派发点击回到顶部按钮的回调
+			},
+			// 更新滚动区域的高度 (使内容不满屏和到底,都可继续翻页)
+			setClientHeight() {
+				if (this.mescroll.getClientHeight(true) === 0 && !this.isExec) {
+					this.isExec = true; // 避免多次获取
+					this.$nextTick(() => {
+						// 确保dom已渲染
+						try {
+							let view = uni
+								.createSelectorQuery()
+								.in(this)
+								.select('#' + this.viewId);
+							view.boundingClientRect(data => {
+								this.isExec = false;
+								if (data) {
+									this.mescroll.setClientHeight(data.height);
+								} else if (this.clientNum != 3) {
+									// 极少部分情况,可能dom还未渲染完毕,递归获取,最多重试3次
+									this.clientNum = this.clientNum == null ? 1 : this.clientNum + 1;
+									setTimeout(() => {
+										this.setClientHeight();
+									}, this.clientNum * 100);
+								}
+							}).exec();
+						} catch (e) {}
+					});
+				}
+			}
+		},
+		// 使用created初始化mescroll对象; 如果用mounted部分css样式编译到H5会失效
+		created() {
+			let vm = this;
+
+			let diyOption = {
+				// 下拉刷新的配置
+				down: {
+					inOffset(mescroll) {
+						vm.downLoadType = 1; // 下拉的距离进入offset范围内那一刻的回调 (自定义mescroll组件时,此行不可删)
+					},
+					outOffset(mescroll) {
+						vm.downLoadType = 2; // 下拉的距离大于offset那一刻的回调 (自定义mescroll组件时,此行不可删)
+					},
+					onMoving(mescroll, rate, downHight) {
+						// 下拉过程中的回调,滑动过程一直在执行;
+						vm.downHight = downHight; // 设置下拉区域的高度 (自定义mescroll组件时,此行不可删)
+						vm.downRate = rate; //下拉比率 (inOffset: rate<1; outOffset: rate>=1)
+					},
+					showLoading(mescroll, downHight) {
+						vm.downLoadType = 3; // 显示下拉刷新进度的回调 (自定义mescroll组件时,此行不可删)
+						vm.downHight = downHight; // 设置下拉区域的高度 (自定义mescroll组件时,此行不可删)
+					},
+					endDownScroll(mescroll) {
+						vm.downLoadType = 4; // 结束下拉 (自定义mescroll组件时,此行不可删)
+						vm.downHight = 0; // 设置下拉区域的高度 (自定义mescroll组件时,此行不可删)
+					},
+					// 派发下拉刷新的回调
+					callback: function(mescroll) {
+						vm.$emit('down', mescroll);
+					}
+				},
+				// 上拉加载的配置
+				up: {
+					// 显示加载中的回调
+					showLoading() {
+						vm.upLoadType = 1;
+					},
+					// 显示无更多数据的回调
+					showNoMore() {
+						vm.upLoadType = 2;
+					},
+					// 隐藏上拉加载的回调
+					hideUpScroll() {
+						vm.upLoadType = 0;
+					},
+					// 空布局
+					empty: {
+						onShow(isShow) {
+							// 显示隐藏的回调
+							vm.isShowEmpty = isShow;
+						}
+					},
+					// 回到顶部
+					toTop: {
+						onShow(isShow) {
+							// 显示隐藏的回调
+							vm.isShowToTop = isShow;
+						}
+					},
+					// 派发上拉加载的回调
+					callback: function(mescroll) {
+						vm.$emit('up', mescroll);
+						// 更新容器的高度 (多mescroll的情况)
+						vm.setClientHeight();
+					}
+				}
+			};
+
+			MeScroll.extend(diyOption, GlobalOption); // 混入全局的配置
+			let myOption = JSON.parse(
+				JSON.stringify({
+					down: vm.down,
+					up: vm.up
+				})
+			); // 深拷贝,避免对props的影响
+			MeScroll.extend(myOption, diyOption); // 混入具体界面的配置
+
+			// 初始化MeScroll对象
+			vm.mescroll = new MeScroll(myOption);
+			vm.mescroll.viewId = vm.viewId; // 附带id
+			// init回调mescroll对象
+			vm.$emit('init', vm.mescroll);
+
+			// 设置高度
+			const sys = uni.getSystemInfoSync();
+			if (sys.windowTop) vm.windowTop = sys.windowTop;
+			if (sys.windowBottom) vm.windowBottom = sys.windowBottom;
+			if (sys.windowHeight) vm.windowHeight = sys.windowHeight;
+			if (sys.statusBarHeight) vm.statusBarHeight = sys.statusBarHeight;
+			// 使down的bottomOffset生效
+			vm.mescroll.setBodyHeight(sys.windowHeight);
+
+			// 因为使用的是scrollview,这里需自定义scrollTo
+			vm.mescroll.resetScrollTo((y, t) => {
+				let curY = vm.mescroll.getScrollTop();
+				vm.scrollAnim = t !== 0; // t为0,则不使用动画过渡
+				if (t === 0 || t === 300) {
+					// 当t使用默认配置的300时,则使用系统自带的动画过渡
+					vm.scrollTop = curY;
+					vm.$nextTick(function() {
+						vm.scrollTop = y;
+					});
+				} else {
+					vm.mescroll.getStep(
+						curY,
+						y,
+						step => {
+							// 此写法可支持配置t
+							vm.scrollTop = step;
+						},
+						t
+					);
+				}
+			});
+
+			// 具体的界面如果不配置up.toTop.safearea,则取本vue的safearea值
+			if (vm.up && vm.up.toTop && vm.up.toTop.safearea != null) {} else {
+				vm.mescroll.optUp.toTop.safearea = vm.safearea;
+			}
+		},
+		mounted() {
+			// 设置容器的高度
+			this.setClientHeight();
+		}
+	};
+</script>
+
+<style>
+	@import './mescroll-uni.css';
+	@import './components/mescroll-down.css';
+	@import './components/mescroll-up.css';
+</style>
\ No newline at end of file
diff --git a/components/mescroll/mixins/mescroll-comp.js b/components/mescroll/mixins/mescroll-comp.js
new file mode 100644
index 0000000..5151dbc
--- /dev/null
+++ b/components/mescroll/mixins/mescroll-comp.js
@@ -0,0 +1,23 @@
+/**
+ * mescroll-body写在子组件时,需通过mescroll的mixins补充子组件缺少的生命周期:
+ * 当一个页面只有一个mescroll-body写在子组件时, 则使用mescroll-comp.js (参考 mescroll-comp 案例)
+ * 当一个页面有多个mescroll-body写在子组件时, 则使用mescroll-more.js (参考 mescroll-more 案例)
+ */
+const MescrollCompMixin = {
+	// 因为子组件无onPageScroll和onReachBottom的页面生命周期，需在页面传递进到子组件
+	onPageScroll(e) {
+		let item = this.$refs["mescrollItem"];
+		if (item && item.mescroll) item.mescroll.onPageScroll(e);
+	},
+	onReachBottom() {
+		let item = this.$refs["mescrollItem"];
+		if (item && item.mescroll) item.mescroll.onReachBottom();
+	},
+	// 当down的native: true时, 还需传递此方法进到子组件
+	onPullDownRefresh() {
+		let item = this.$refs["mescrollItem"];
+		if (item && item.mescroll) item.mescroll.onPullDownRefresh();
+	}
+}
+
+export default MescrollCompMixin;
diff --git a/components/mescroll/mixins/mescroll-more-item.js b/components/mescroll/mixins/mescroll-more-item.js
new file mode 100644
index 0000000..acdd290
--- /dev/null
+++ b/components/mescroll/mixins/mescroll-more-item.js
@@ -0,0 +1,48 @@
+/**
+ * mescroll-more-item的mixins, 仅在多个 mescroll-body 写在子组件时使用 (参考 mescroll-more 案例)
+ */
+const MescrollMoreItemMixin = {
+	props: {
+		i: Number, // 每个tab页的专属下标
+		index: { // 当前tab的下标
+			type: Number,
+			default () {
+				return 0
+			}
+		}
+	},
+	data() {
+		return {
+			downOption: {
+				auto: false // 不自动加载
+			},
+			upOption: {
+				auto: false // 不自动加载
+			},
+			isInit: false // 当前tab是否已初始化
+		}
+	},
+	watch: {
+		// 监听下标的变化
+		index(val) {
+			if (this.i === val && !this.isInit) {
+				this.isInit = true; // 标记为true
+				this.mescroll && this.mescroll.triggerDownScroll();
+			}
+		}
+	},
+	methods: {
+		// mescroll组件初始化的回调,可获取到mescroll对象
+		mescrollInit(mescroll) {
+			this.mescroll = mescroll;
+			this.mescrollInitByRef && this.mescrollInitByRef(); // 兼容字节跳动小程序 (mescroll-mixins.js)
+			// 自动加载当前tab的数据
+			if (this.i === this.index) {
+				this.isInit = true; // 标记为true
+				this.mescroll.triggerDownScroll();
+			}
+		},
+	}
+}
+
+export default MescrollMoreItemMixin;
diff --git a/components/mescroll/mixins/mescroll-more.js b/components/mescroll/mixins/mescroll-more.js
new file mode 100644
index 0000000..8a11d40
--- /dev/null
+++ b/components/mescroll/mixins/mescroll-more.js
@@ -0,0 +1,56 @@
+/**
+ * mescroll-body写在子组件时,需通过mescroll的mixins补充子组件缺少的生命周期:
+ * 当一个页面只有一个mescroll-body写在子组件时, 则使用mescroll-comp.js (参考 mescroll-comp 案例)
+ * 当一个页面有多个mescroll-body写在子组件时, 则使用mescroll-more.js (参考 mescroll-more 案例)
+ */
+const MescrollMoreMixin = {
+	data() {
+		return {
+			tabIndex: 0 // 当前tab下标
+		}
+	},
+	// 因为子组件无onPageScroll和onReachBottom的页面生命周期，需在页面传递进到子组件
+	onPageScroll(e) {
+		let mescroll = this.getMescroll(this.tabIndex);
+		mescroll && mescroll.onPageScroll(e);
+	},
+	onReachBottom() {
+		let mescroll = this.getMescroll(this.tabIndex);
+		mescroll && mescroll.onReachBottom();
+	},
+	// 当down的native: true时, 还需传递此方法进到子组件
+	onPullDownRefresh() {
+		let mescroll = this.getMescroll(this.tabIndex);
+		mescroll && mescroll.onPullDownRefresh();
+	},
+	methods: {
+		// 根据下标获取对应子组件的mescroll
+		getMescroll(i) {
+			if (!this.mescrollItems) this.mescrollItems = [];
+			if (!this.mescrollItems[i]) {
+				// v-for中的refs
+				let vForItem = this.$refs["mescrollItem"];
+				if (vForItem) {
+					this.mescrollItems[i] = vForItem[i]
+				} else {
+					// 普通的refs,不可重复
+					this.mescrollItems[i] = this.$refs["mescrollItem" + i];
+				}
+			}
+			let item = this.mescrollItems[i]
+			return item ? item.mescroll : null
+		},
+		// 切换tab,恢复滚动条位置
+		tabChange(i) {
+			let mescroll = this.getMescroll(i);
+			if (mescroll) {
+				// 延时(比$nextTick靠谱一些),确保元素已渲染
+				setTimeout(() => {
+					mescroll.scrollTo(mescroll.getScrollTop(), 0)
+				}, 30)
+			}
+		}
+	}
+}
+
+export default MescrollMoreMixin;
diff --git a/components/mescroll/my-list-mescroll.vue b/components/mescroll/my-list-mescroll.vue
new file mode 100644
index 0000000..834a950
--- /dev/null
+++ b/components/mescroll/my-list-mescroll.vue
@@ -0,0 +1,113 @@
+<template>
+	<!-- top="xxx"下拉布局往下偏移,防止被悬浮菜单遮住 -->
+	<mescroll
+		v-if="isInit"
+		:top="top"
+		:down="downOption"
+		:fixed="fixed"
+		:topbar="topbar"
+		:background="background"
+		:paddingBoth="paddingBoth"
+		@down="downCallback"
+		:up="upOption"
+		@up="upCallback"
+		@emptyclick="emptyClick"
+		@init="mescrollInit"
+	>
+		<!-- 数据列表 -->
+		<slot name="list"></slot>
+	</mescroll>
+</template>
+
+<script>
+import Mescroll from './mescroll-uni.vue';
+export default {
+	components: {
+		Mescroll
+	},
+	data() {
+		return {
+			mescroll: null, //mescroll实例对象
+			downOption: {
+				auto: false // 不自动加载
+			},
+			upOption: {
+				auto: false, // 不自动加载
+				page: {
+					num: 0, // 当前页码,默认0,回调之前会加1,即callback(page)会从1开始
+					size: 10 // 每页数据的数量
+				},
+				noMoreSize: 2, //如果列表已无数据,可设置列表的总数量要大于半页才显示无更多数据;避免列表数据过少(比如只有一条数据),显示无更多数据会不好看; 默认5
+				empty: {
+					tip: '~ 空空如也 ~', // 提示
+					btnText: '去看看'
+				},
+				onScroll: true
+			},
+			scrollY: 0,
+			isInit: false
+		};
+	},
+	props: {
+		top: [String, Number],
+		size: [String, Number],
+		fixed: {
+			// 是否通过fixed固定mescroll的高度, 默认true
+			type: Boolean,
+			default() {
+				return true;
+			}
+		},
+		background: String,
+		topbar: Boolean,
+		paddingBoth: {
+			type: [String, Number],
+			default() {
+				return 0;
+			}
+		}
+	},
+	created() {
+		if (this.size) this.upOption.page.size = this.size;
+		this.isInit = true;
+	},
+	mounted() {
+		this.mescroll.resetUpScroll();
+		this.listenRefresh();
+	},
+	methods: {
+		// mescroll组件初始化的回调,可获取到mescroll对象
+		mescrollInit(mescroll) {
+			this.mescroll = mescroll;
+		},
+		/*下拉刷新的回调 */
+		downCallback() {
+			// 这里加载你想下拉刷新的数据, 比如刷新轮播数据
+			// loadSwiper();
+			// 下拉刷新的回调,默认重置上拉加载列表为第一页 (自动执行 mescroll.num=1, 再触发upCallback方法 )
+			this.mescroll.resetUpScroll();
+			this.listenRefresh();
+		},
+		/*上拉加载的回调: mescroll携带page的参数, 其中num:当前页 从1开始, size:每页数据条数,默认10 */
+		upCallback() {
+			//联网加载数据
+			this.$emit('getData', this.mescroll);
+		},
+		//点击空布局按钮的回调
+		emptyClick() {
+			this.$emit('emptytap', this.mescroll);
+		},
+		//刷新
+		refresh() {
+			this.mescroll.resetUpScroll();
+			this.listenRefresh();
+		},
+		myScrollTo(y, t) {
+			this.mescroll.myScrollTo(y, t);
+		},
+		listenRefresh() {
+			this.$emit('listenRefresh', true);
+		}
+	}
+};
+</script>
diff --git a/components/ns-adv/ns-adv.vue b/components/ns-adv/ns-adv.vue
new file mode 100644
index 0000000..0d44df7
--- /dev/null
+++ b/components/ns-adv/ns-adv.vue
@@ -0,0 +1,120 @@
+<template>
+	<view v-if="advList.length" :class="['container-box',className]">
+		<swiper :indicator-dots="advList.length > 1" indicator-active-color="#ffffff" :autoplay="true" :interval="3000" :duration="1000" v-if="advList.length > 1" @change="changeSwiper" :current="currentIndex" :style="{ height: swiperHeight + 'px' }" class="item-wrap">
+			<swiper-item v-for="(item, index) in advList" :key="index" @click="jumppage(item.adv_url)">
+				<view class="image-box">
+					<image :src="$util.img(item.adv_image)" mode="widthFix" :id="'content-wrap' + index"/>
+				</view>
+			</swiper-item>
+		</swiper>
+		<view v-else class="container-box item-wrap">
+			<image :src="$util.img(advList[0]['adv_image'])" mode="widthFix" lazy-load="true" @load="imageLoad" @click="jumppage(advList[0].adv_url)"/>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: 'ns-advert',
+		props: {
+			keyword: {
+				type: String
+			},
+			className: {
+				type: String
+			}
+		},
+		data() {
+			return {
+				advList: [],
+				isImage: false,
+				//滑块的高度(单位px)
+				swiperHeight: 150,
+				//当前索引
+				currentIndex: 0,
+			};
+		},
+		created() {
+			this.getAdvList();
+		},
+		methods: {
+			//获取广告位
+			getAdvList() {
+				var item = {
+					adv_image: '',
+					adv_url: ''
+				};
+				this.$api.sendRequest({
+					url: '/api/adv/detail',
+					data: {
+						keyword: this.keyword
+					},
+					success: res => {
+						if (res.code == 0) {
+							var data = res.data.adv_list;
+							for (var index in data) {
+								if (data[index].adv_url) data[index].adv_url = JSON.parse(data[index].adv_url);
+							}
+							this.advList = res.data.adv_list;
+
+							//动态设置swiper的高度
+							this.$nextTick(() => {
+								this.setSwiperHeight();
+							});
+						}
+					}
+				});
+			},
+			jumppage(e) {
+				this.$util.diyRedirectTo(e);
+			},
+			imageLoad(data) {
+				this.isImage = true;
+			},
+			//手动切换题目
+			changeSwiper(e) {
+				this.currentIndex = e.detail.current;
+				//动态设置swiper的高度，使用nextTick延时设置
+				this.$nextTick(() => {
+					this.setSwiperHeight();
+				});
+			},
+			//动态设置swiper的高度
+			setSwiperHeight() {
+				if (this.advList.length > 1) {
+					setTimeout(() => {
+						let element = "#content-wrap" + this.currentIndex;
+						let query = uni.createSelectorQuery().in(this);
+						query.select(element).boundingClientRect();
+						query.exec((res) => {
+							if (res && res[0]) {
+								this.swiperHeight = res[0].height;
+							}
+						});
+					}, 10);
+				}
+			},
+		}
+	};
+</script>
+
+<style lang="scss">
+	.container-box {
+		width: 100%;
+
+		.item-wrap {
+			border-radius: 10rpx;
+
+			.image-box {
+				border-radius: 10rpx;
+			}
+
+			image {
+				width: 100%;
+				height: auto;
+				border-radius: 10rpx;
+				will-change: transform;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/components/ns-birthday-gift/ns-birthday-gift.vue b/components/ns-birthday-gift/ns-birthday-gift.vue
new file mode 100644
index 0000000..e34abb7
--- /dev/null
+++ b/components/ns-birthday-gift/ns-birthday-gift.vue
@@ -0,0 +1,336 @@
+<template>
+	<view>
+		<view @touchmove.prevent.stop v-if="birthday" class="reward-popup">
+			<uni-popup ref="birthdayGift" type="center" :maskClick="false">
+				<view class="reward-wrap">
+					<view class="wrap" :style="{ backgroundImage: 'url(' + $util.img('public/uniapp/birthday_gift/birthday_gift_bg.png') + ')' }">
+						<view class="birthday-title-name" v-if="memberInfo">Dear {{ memberInfo.nickname }}</view>
+						<view class="birthday-title-desc" v-if="birthday.blessing_content">
+							{{ birthday.blessing_content }}
+						</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"/>
+							<view class="font-size-toolbar">生日贺礼</view>
+							<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">
+								<view class="content" v-if="birthday.point > 0">
+									<view class="info">
+										<text class="num">
+											{{ parseFloat(birthday.point) }}
+											<text class="type">积分</text>
+										</text>
+										<view class="desc">用于下单时抵现或兑换商品等</view>
+									</view>
+									<view class="tip" @click="closeRewardPopup('1')">立即查看</view>
+								</view>
+								<view class="content" v-if="birthday.balance_type == 0 && birthday.balance > 0">
+									<view class="info">
+										<text class="num">
+											{{ parseFloat(birthday.balance) }}
+											<text class="type">元红包</text>
+										</text>
+										<view class="desc">不可提现红包</view>
+									</view>
+									<view class="tip" @click="closeRewardPopup('2')">立即查看</view>
+								</view>
+								<view class="content" v-if="birthday.balance_type == 1 && birthday.balance_money > 0">
+									<view class="info">
+										<text class="num">
+											{{ parseFloat(birthday.balance_money) }}
+											<text class="type">元红包</text>
+										</text>
+										<view class="desc">可提现红包</view>
+									</view>
+									<view class="tip" @click="closeRewardPopup('2')">立即查看</view>
+								</view>
+
+								<block v-if="birthday.coupon_list.length > 0">
+									<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>
+												<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 {
+		name: 'ns-birthday-gift',
+		components: {
+			uniPopup
+		},
+		data() {
+			return {
+				birthday: {
+					flag: false,
+					coupon_list: {}
+				}
+			};
+		},
+		computed: {
+			introduction() {
+				let bytesCount = 0;
+				if (this.birthday.blessing_content) {
+					for (let i = 0, n = this.birthday.blessing_content.length; i < n; i++) {
+						let c = this.birthday.blessing_content.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.getBirthdayGift();
+			},
+			cancel() {
+				this.$refs.birthdayGift.close();
+			},
+			/**
+			 * 获取生日礼配置
+			 */
+			getBirthdayGift() {
+				this.$api.sendRequest({
+					url: '/birthdaygift/api/Config/config',
+					success: res => {
+						if (res.code >= 0) {
+							if (res.data) {
+								this.birthday = res.data;
+								this.getReceiveGift();
+							}
+						}
+					}
+				});
+			},
+			// 领取
+			getReceiveGift() {
+				if (this.birthday.flag == true) {
+					this.$refs.birthdayGift.open();
+					this.$api.sendRequest({
+						url: '/birthdaygift/api/Config/receive',
+						data: {
+							id: this.birthday.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 {
+					this.$util.redirectTo('/pages_tool/member/coupon', {});
+				}
+			}
+		}
+	};
+</script>
+<style scoped>
+	.register-box /deep/ .uni-scroll-view {
+		background: unset !important;
+	}
+
+	.register-box {
+		max-height: 300rpx;
+		overflow-y: scroll;
+		/* margin-top:350rpx; */
+	}
+
+	/deep/ .uni-popup__wrapper-box {
+		background-color: transparent !important;
+	}
+
+	/deep/ .birthday-title-hint uni-image {
+		width: 113rpx !important;
+		height: 24rpx !important;
+	}
+</style>
+
+<style lang="scss">
+	.reward-wrap {
+		width: 85vw;
+		height: auto;
+
+		.wrap {
+			width: 100%;
+			height: auto;
+			background-size: 100%;
+			background-repeat: no-repeat;
+			padding-bottom: 40rpx;
+
+			.birthday-title-name {
+				font-size: $font-size-toolbar;
+				font-weight: bold;
+				display: -webkit-box;
+				-webkit-box-orient: vertical;
+				-webkit-line-clamp: 1;
+				overflow: hidden;
+				padding-top: 350rpx;
+				text-align: center;
+				color: #fff;
+				line-height: 1;
+			}
+
+			.birthday-title-desc {
+				font-weight: 500;
+				margin: 30rpx 70rpx 20rpx;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				display: -webkit-box;
+				-webkit-line-clamp: 2;
+				-webkit-box-orient: vertical;
+				text-align: center;
+				color: #fff;
+			}
+
+			.birthday-title-hint {
+				font-size: $font-size-toolbar;
+				font-weight: bold;
+				font-family: BDZongYi-A001;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				margin: 0 0 40rpx;
+				line-height: 1;
+
+				.birthday-img-all {
+					width: 100rpx;
+					height: 20rpx;
+				}
+
+				&>view {
+					margin: 0 20rpx;
+					color: #fff;
+				}
+			}
+		}
+
+		.reward-content {
+			margin: 0 40rpx;
+		}
+
+		.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;
+				display: inline-block;
+				max-width: 300rpx;
+			}
+
+			.type {
+				font-size: $font-size-base;
+				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: 40rpx;
+
+			.btn {
+				font-size: 40rpx;
+				color: #fff;
+				border: 4rpx solid #fff;
+				border-radius: 50%;
+				padding: 10rpx;
+				font-weight: bold;
+				width: 40rpx;
+				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; */
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/components/ns-contact/ns-contact.vue b/components/ns-contact/ns-contact.vue
new file mode 100644
index 0000000..b69bca8
--- /dev/null
+++ b/components/ns-contact/ns-contact.vue
@@ -0,0 +1,171 @@
+<template>
+    <view class="contact-wrap">
+        <slot></slot>
+        <!-- #ifdef MP-ALIPAY -->
+        <view class="contact-button" @click="contactServicer">
+            <contact-button :tnt-inst-id="config.instid" :scene="config.scene" size="1000rpx" v-if="config.type == 'aliapp'"/>
+        </view>
+        <!-- #endif -->
+        <!-- #ifndef MP-ALIPAY -->
+        <button
+            type="default"
+            hover-class="none"
+            :open-type="openType"
+            class="contact-button"
+            @click="contactServicer"
+            :send-message-title="sendMessageTitle"
+            :send-message-path="sendMessagePath"
+            :send-message-img="sendMessageImg"
+            :show-message-card="true"></button>
+        <!-- #endif -->
+        <uni-popup ref="servicePopup" type="center">
+            <view class="service-popup-wrap">
+                <view class="head-wrap" @click="$refs.servicePopup.close()">
+                    <text>联系客服</text>
+                    <text class="iconfont icon-close"></text>
+                </view>
+                <view class="body-wrap">{{ siteInfo.site_tel ? '请联系客服，客服电话是' + siteInfo.site_tel : '抱歉，商家暂无客服，请线下联系' }}</view>
+            </view>
+        </uni-popup>
+    </view>
+</template>
+
+<!-- 客服组件 -->
+<script>
+    export default {
+        name: 'ns-contact',
+        props: {
+            niushop: {
+                type: Object,
+                default: function() {
+                    return {};
+                }
+            },
+            sendMessageTitle: {
+                type: String,
+                default: ''
+            },
+            sendMessagePath: {
+                type: String,
+                default: ''
+            },
+            sendMessageImg: {
+                type: String,
+                default: ''
+            }
+        },
+        data() {
+            return {
+                config: null,
+                openType: ''
+            };
+        },
+        created() {
+            if (this.servicerConfig) {
+                // #ifdef H5
+                this.config = this.servicerConfig.h5;
+                // #endif
+
+                // #ifdef MP-WEIXIN
+                this.config = this.servicerConfig.weapp;
+                if (this.config.type == 'weapp') this.openType = 'contact';
+                // #endif
+
+                // #ifdef MP-ALIPAY
+                this.config = this.servicerConfig.aliapp;
+                if (this.config.type == 'aliapp') this.openType = 'contact';
+                // #endif
+            }
+        },
+        methods: {
+            /**
+             * 联系客服
+             */
+            contactServicer() {
+                if (this.config.type == 'none') {
+                    this.$refs.servicePopup.open();
+                }
+                if (this.openType == 'contact') return;
+
+                switch (this.config.type) {
+                    case 'wxwork':
+                        // #ifdef H5
+                        location.href = this.config.wxwork_url;
+                        // #endif
+                        // #ifdef MP-WEIXIN
+                        wx.openCustomerServiceChat({
+                            extInfo: { url: this.config.wxwork_url },
+                            corpId: this.config.corpid,
+                            showMessageCard: true,
+                            sendMessageTitle: this.sendMessageTitle,
+                            sendMessagePath: this.sendMessagePath,
+                            sendMessageImg: this.sendMessageImg
+                        });
+                        // #endif
+                        break;
+                    case 'third':
+                        location.href = this.config.third_url;
+                        break;
+                    case 'niushop':
+                        this.$util.redirectTo('/pages_tool/chat/room', this.niushop);
+                        break;
+                    default:
+                        this.makePhoneCall();
+                }
+            },
+            /**
+             * 店铺联系方式
+             */
+            makePhoneCall() {
+                this.$api.sendRequest({
+                    url: '/api/site/shopcontact',
+                    success: res => {
+                        if (res.code == 0 && res.data.mobile) uni.makePhoneCall({
+                            phoneNumber: res.data
+                                .mobile
+                        });
+                    }
+                });
+            }
+        }
+    };
+</script>
+
+<style lang="scss">
+    .contact-wrap {
+        width: 100%;
+        height: 100%;
+        position: relative;
+
+        .contact-button {
+            width: 100%;
+            height: 100%;
+            position: absolute;
+            left: 0;
+            top: 0;
+            z-index: 5;
+            padding: 0;
+            margin: 0;
+            opacity: 0;
+            overflow: hidden;
+        }
+    }
+
+    .service-popup-wrap {
+        width: 600rpx;
+
+        .head-wrap {
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            padding: 0 30rpx;
+            height: 90rpx;
+        }
+
+        .body-wrap {
+            text-align: center;
+            padding: 30rpx;
+            height: 100rpx;
+        }
+    }
+</style>
\ No newline at end of file
diff --git a/components/ns-copyright/ns-copyright.vue b/components/ns-copyright/ns-copyright.vue
new file mode 100644
index 0000000..53444af
--- /dev/null
+++ b/components/ns-copyright/ns-copyright.vue
@@ -0,0 +1,142 @@
+<template>
+	<view class="copyrigt-wrap" v-if="copyright && (showLogo || showBeian)">
+	<!-- 	<view class="copyright-info" v-if="showLogo">
+			<view class="copyright-pic" v-if="copyright.logo" @click="link(copyright.copyright_link)">
+				<image :src="$util.img(copyright.logo)" @error="error" mode="widthFix"></image>
+			</view>
+		</view>
+		<view class="record-info" v-if="showBeian">
+			<view class="icp" v-if="copyright && copyright.icp" @click="toHref('https://beian.miit.gov.cn')">备案号：{{ copyright.icp }}
+			</view>
+
+			<view v-if="copyright && copyright.gov_record" class="gov-wrap" @click="toHref(copyright.gov_url)" target="_blank">
+				<image :src="$util.img('public/uniapp/common/gov_record.png')" alt="公安备案" />
+				<text>{{ copyright.gov_record }}</text>
+			</view>
+		</view> -->
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				showLogo: true,
+			};
+		},
+		created() {},
+		computed: {
+			showBeian() {
+				// 如果都为空，则隐藏
+				if (this.copyright && (!this.copyright.icp && !this.copyright.gov_record)) {
+					return false;
+				}
+				return true;
+			}
+		},
+		methods: {
+			link(url) {
+				if (url) {
+					this.$util.redirectTo('/pages_tool/webview/webview', {
+						src: encodeURIComponent(url)
+					});
+				}
+			},
+			toHref(url) {
+				location.href = url;
+			},
+			error() {
+				this.showLogo = false;
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	.copyrigt-wrap {
+		margin-top: 40rpx;
+		margin-bottom: 40rpx;
+
+		>view {
+			font-size: $font-size-tag;
+			color: #666666;
+
+			&:last-child {
+				margin-top: 10rpx;
+			}
+
+			&:first-child {
+				margin-top: 0;
+			}
+		}
+
+		.copyright-info {
+			width: 100%;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			flex-direction: column;
+
+			.copyright-pic {
+				image {
+					width: 160rpx;
+					height: 24rpx;
+				}
+
+			}
+
+			text {
+				font-size: $font-size-goods-tag;
+				height: 100rpx;
+				line-height: 100rpx;
+				color: $color-tip !important;
+			}
+
+			.copyright-desc {
+				color: lighten($color-tip, 30%);
+				font-size: $font-size-goods-tag;
+				text-shadow: 0 0 2rpx lighten($color-tip, 40%);
+			}
+		}
+
+		.record-info {
+			width: 100%;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			flex-direction: column;
+			margin-top: 10rpx;
+
+			text {
+				color: #666666;
+				font-size: $font-size-tag;
+			}
+
+			view {
+				font-size: $font-size-tag;
+				color: #666666;
+
+				&:last-child {
+					margin-top: 10rpx;
+				}
+
+				&:first-child {
+					margin-top: 0;
+				}
+			}
+
+			.gov-wrap {
+				display: flex;
+				justify-content: center;
+				align-items: center;
+
+				image {
+					width: 40rpx;
+					height: 40rpx;
+					margin-right: 10rpx;
+				}
+			}
+
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/components/ns-empty/ns-empty.vue b/components/ns-empty/ns-empty.vue
new file mode 100644
index 0000000..3d46f4a
--- /dev/null
+++ b/components/ns-empty/ns-empty.vue
@@ -0,0 +1,95 @@
+<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>
diff --git a/components/ns-form/ns-form.vue b/components/ns-form/ns-form.vue
new file mode 100644
index 0000000..452c8df
--- /dev/null
+++ b/components/ns-form/ns-form.vue
@@ -0,0 +1,867 @@
+<template>
+    <view class="form-wrap form-component">
+        <block v-for="(item, index) in formData">
+            <view class="order-wrap" v-if="item.controller == 'Text'">
+                <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 class="order-wrap" v-if="item.controller == 'Textarea'">
+                <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>
+
+            <picker mode="selector" :range="item.value.options" v-if="item.controller == 'Select'" @change="pickerChange($event, index)">
+                <view 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">
+                            <text v-if="item.val != ''">{{ item.val }}</text>
+                            <text v-else class="color-tip">请选择</text>
+                        </view>
+                        <text class="iconfont icon-right"></text>
+                    </view>
+                </view>
+            </picker>
+
+            <view class="order-wrap" v-if="item.controller == 'Checkbox'">
+                <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" />
+                                <view class="checkbox">
+                                    <text class="iconfont" :class="{ 'icon-fuxuankuang2': !v.checked, 'icon-fuxuankuang1 color-base-text': v.checked }"></text>
+                                    {{ v.value }}
+                                </view>
+                            </label>
+                        </checkbox-group>
+                    </view>
+                </view>
+            </view>
+
+            <view class="order-wrap" v-if="item.controller == 'Radio'">
+                <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" />
+                                <view class="radio-box">
+                                    <text class="iconfont" :class="{ 'icon-yuan_checkbox': item.val != v.value, 'icon-yuan_checked color-base-text': item.val == v.value }"></text>
+                                    {{ v.value }}
+                                </view>
+                            </label>
+                        </radio-group>
+                    </view>
+                </view>
+            </view>
+
+            <view class="order-wrap" v-if="item.controller == 'Img'">
+                <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 class="img-box" v-for="(v, k) in item.img_lists" :key="k" @click="uploadImg(index)">
+                            <image :src="$util.img(v)" mode="aspectFill"></image>
+                            <text class="iconfont icon-guanbi" @click.stop="delImg(k, index)"></text>
+                        </view>
+                        <view class="img-box" @click="addImg(index)"><text class="iconfont icon-add1"></text></view>
+                    </view>
+                </view>
+            </view>
+
+            <view class="order-wrap" v-if="item.controller == 'Date'">
+                <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" :class="{ 'color-tip': !item.val }">{{ item.val ? item.val : item.value.placeholder }}</view>
+                        </picker>
+                    </view>
+                    <text class="iconfont icon-right"></text>
+                </view>
+            </view>
+
+            <view class="order-wrap" v-if="item.controller == 'Datelimit'">
+                <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" :class="{ 'color-tip': !item.start_date }">{{ 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" :class="{ 'color-tip': !item.end_date }">{{ item.end_date ? item.end_date : item.value.placeholder_end }}</view>
+                                </view>
+                            </picker>
+                        </view>
+                    </view>
+                </view>
+            </view>
+
+            <view class="order-wrap" v-if="item.controller == 'Time'">
+                <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" :class="{ 'color-tip': !item.val }">{{ item.val ? item.val : item.value.placeholder }}</view>
+                        </picker>
+                    </view>
+                    <text class="iconfont icon-right"></text>
+                </view>
+            </view>
+
+            <view class="order-wrap" v-if="item.controller == 'Timelimit'">
+                <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" :class="{ 'color-tip': !item.start_time }">{{ 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" :class="{ 'color-tip': !item.end_time }">{{ item.end_time ? item.end_time : item.value.placeholder_end }}</view>
+                                </view>
+                            </picker>
+                        </view>
+                    </view>
+                </view>
+            </view>
+
+            <view class="order-wrap" v-if="item.controller == 'City'">
+                <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 :default-regions="item.default_regions" :select-arr="item.select_arr" @getRegions="handleGetRegions($event, index)">
+                            <view class="select-address " :class="{ empty: !item.val, 'color-tip': !item.val }">
+                                {{ item.val ? item.val : item.select_arr == '2' ? '请选择省市' : '请选择省市区/县' }}
+                            </view>
+                        </pick-regions>
+                    </view>
+                    <text class="iconfont icon-right"></text>
+                </view>
+            </view>
+        </block>
+    </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: function() {
+                    return {};
+                }
+            }
+        },
+        data() {
+            return {
+                formData: this.data
+            };
+        },
+        created() {
+            this.setFormData();
+        },
+        watch: {
+            data: function() {
+                this.setFormData();
+            }
+        },
+        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((v, k) => {
+                            var obj = {};
+                            obj.value = v;
+                            obj.checked = false;
+                            if (item.controller == 'Radio' && ((!item.val && k == 0) || (item.val &&
+                                    item.val == v))) {
+                                obj.checked = true;
+                                item.val = v;
+                            }
+                            if (item.controller == 'Checkbox' && item.val) {
+                                let val = item.val.split(',');
+                                obj.checked = val.indexOf(v) != -1;
+                            }
+                            item.option_lists.push(obj);
+                        });
+                    }
+
+                    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 date = item.val.split(' - ');
+                            item.start_date = date[0];
+                            item.end_date = date[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 time = item.val.split(' - ');
+                            item.start_time = time[0];
+                            item.end_time = time[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() {
+                let verify = true;
+
+                for (let i = 0; i < this.formData.length; i++) {
+                    let item = this.formData[i];
+                    if (item.controller == 'Text') {
+                        if (item.value.required && !item.val) {
+                            verify = false;
+                            this.$util.showToast({
+                                title: '请输入' + item.value.title
+                            });
+                            break;
+                        }
+
+                        var reg = /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/;
+                        if (item.name == 'ID_CARD' && reg.test(item.val) === false) {
+                            verify = !item.value.required;
+                            if (verify == false) {
+                                this.$util.showToast({
+                                    title: '身份证输入不合法'
+                                });
+                                return false;
+                            }
+                            if (verify == true && item.val != '') {
+                                this.$util.showToast({
+                                    title: '身份证输入不合法'
+                                });
+                                return false;
+                            }
+                        }
+
+                        // 验证手机号
+                        if (item.name == 'MOBILE' && this.$util.verifyMobile(item.val) === false) {
+                        	verify = !item.value.required;
+                        	if (verify == false) {
+                        		this.$util.showToast({
+                        			title: '手机号输入不合法'
+                        		});
+                        		return false;
+                        	}
+                        	if (verify == true && item.val != '') {
+                        		this.$util.showToast({
+                        			title: '手机号输入不合法'
+                        		});
+                        		return false;
+                        	}
+                        }
+                    }
+
+                    if (item.controller == 'Textarea') {
+                        if (item.value.required && !item.val) {
+                            verify = false;
+                            this.$util.showToast({
+                                title: '请输入' + item.value.title
+                            });
+                            break;
+                        }
+                    }
+
+                    if (item.controller == 'Select') {
+                        if (item.value.required && !item.val) {
+                            verify = false;
+                            this.$util.showToast({
+                                title: '请选择' + item.value.title
+                            });
+                            break;
+                        }
+                    }
+
+                    if (item.controller == 'Checkbox') {
+                        if (item.value.required && !item.val) {
+                            verify = false;
+                            this.$util.showToast({
+                                title: '请至少选择一个' + item.value.title
+                            });
+                            break;
+                        }
+                    }
+
+                    if (item.controller == 'Img') {
+                        if (item.value.required && !item.val) {
+                            verify = false;
+                            this.$util.showToast({
+                                title: '请至少上传一张' + item.value.title
+                            });
+                            break;
+                        }
+                    }
+
+                    if (item.controller == 'Date') {
+                        if (item.value.required && !item.val) {
+                            verify = false;
+                            this.$util.showToast({
+                                title: '请选择' + item.value.title
+                            });
+                            break;
+                        }
+                    }
+
+                    if (item.controller == 'Datelimit') {
+                        if (item.value.required && !item.val) {
+                            verify = false;
+                            this.$util.showToast({
+                                title: '请选择' + item.value.title
+                            });
+                            break;
+                        }
+
+                        if (this.$util.timeTurnTimeStamp(item.start_date) > this.$util.timeTurnTimeStamp(item.end_date)) {
+                            verify = false;
+                            this.$util.showToast({
+                                title: '结束日期不能小于开始日期'
+                            });
+                            break;
+                        }
+                    }
+
+                    if (item.controller == 'Time') {
+                        if (item.value.required && !item.val) {
+                            verify = false;
+                            this.$util.showToast({
+                                title: '请选择' + item.value.title
+                            });
+                            break;
+                        }
+                    }
+
+                    if (item.controller == 'Timelimit') {
+                        if (item.value.required && !item.val) {
+                            verify = false;
+                            this.$util.showToast({
+                                title: '请选择' + item.value.title
+                            });
+                            break;
+                        }
+
+                        if (item.start_time >= item.end_time) {
+                            verify = false;
+                            this.$util.showToast({
+                                title: '结束时间必须大于开始时间'
+                            });
+                            break;
+                        }
+                    }
+
+                    if (item.controller == 'City') {
+                        if (item.value.required && !item.val) {
+                            verify = false;
+                            this.$util.showToast({
+                                title: '请选择' + item.value.title
+                            });
+                            break;
+                        }
+                    }
+                }
+
+                if (verify) {
+                    return this.formData;
+                } else return verify;
+            },
+            pickerChange(e, index) {
+                this.formData[index].val = this.data[index].value.options[e.detail.value];
+                this.$forceUpdate();
+            },
+            checkboxChange: function(e, index) {
+                this.formData[index].val = e.detail.value.toString();
+                this.formData[index].option_lists.forEach(item => {
+                    item.checked = e.detail.value.indexOf(item.value) != -1;
+                });
+                this.$forceUpdate();
+            },
+            radioChange: function(e, index) {
+                this.formData[index].val = e.detail.value;
+                this.$forceUpdate();
+            },
+            // 修改图片
+            uploadImg(index) {
+                this.$util.upload(
+                    Number(this.formData[index].value.max_count), {
+                        path: 'evaluateimg'
+                    },
+                    res => {
+                        if (res.length > 0) {
+                            res.forEach(v => {
+                                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;
+                                } else {
+                                    this.formData[index].img_lists.push(v);
+                                }
+                            });
+                        }
+
+                        this.formData[index].val = this.formData[index].img_lists.toString();
+                        this.$forceUpdate();
+                    }
+                );
+            },
+            // 添加图片
+            addImg(index) {
+                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'
+                    },
+                    res => {
+                        if (res.length > 0) {
+                            res.forEach(v => {
+                                this.formData[index].img_lists.push(v);
+                            });
+                        }
+                        this.formData[index].val = this.formData[index].img_lists.toString();
+                        this.$forceUpdate();
+                    }
+                );
+            },
+            // index 当前数据的下标  k 当前图片的下标
+            delImg(k, index) {
+                this.formData[index].img_lists.splice(k, 1);
+                this.formData[index].val = this.formData[index].img_lists.toString();
+                this.$forceUpdate();
+            },
+            getDate() {
+                const 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() {
+                const date = new Date();
+                let hour = date.getHours(); //得到小时
+                let min = date.getMinutes(); //得到分钟
+
+                hour = hour > 9 ? hour : '0' + hour;
+                min = min > 9 ? min : '0' + min;
+                return `${hour}:${min}`;
+            },
+            bindDateChange(e, index) {
+                this.formData[index].val = e.detail.value;
+                this.$forceUpdate();
+            },
+            bindStartDateChange(e, index) {
+                this.$set(this.formData[index], 'start_date', e.detail.value);
+                this.$set(this.formData[index], 'val', this.formData[index].start_date + ' - ' + this.formData[index].end_date);
+                this.$forceUpdate();
+            },
+            bindEndDateChange(e, index) {
+                this.$set(this.formData[index], 'end_date', e.detail.value);
+                this.$set(this.formData[index], 'val', this.formData[index].start_date + ' - ' + this.formData[index].end_date);
+                this.$forceUpdate();
+            },
+            bindTimeChange(e, index) {
+                this.formData[index].val = e.detail.value;
+                this.$forceUpdate();
+            },
+            bindStartTimeChange(e, index) {
+                this.formData[index].start_time = e.detail.value;
+                this.$forceUpdate();
+            },
+            bindEndTimeChange(e, index) {
+                this.formData[index].end_time = e.detail.value;
+                this.formData[index].val = this.formData[index].start_time + ' - ' + this.formData[index].end_time;
+                this.$forceUpdate();
+            },
+            // 获取选择的地区
+            handleGetRegions(e, index) {
+                this.formData[index].val = '';
+                this.formData[index].val += e[0] != undefined ? e[0].label : '';
+                this.formData[index].val += e[1] != undefined ? '-' + e[1].label : '';
+                this.formData[index].val += e[2] != undefined ? '-' + e[2].label : '';
+                this.$forceUpdate();
+            }
+        }
+    };
+</script>
+
+<style lang="scss">
+    .order-wrap {
+        padding: 20rpx 0;
+
+        &:last-child {
+            margin-bottom: 0;
+            border-bottom: 0;
+        }
+    }
+
+    .order-cell {
+        display: flex;
+        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: $font-size-base;
+        }
+
+        .name {
+            width: 160rpx;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+        }
+
+        .tit {
+            text-align: left;
+            font-size: $font-size-base;
+
+            text {
+                font-size: $font-size-base;
+            }
+        }
+
+        .required {
+            color: red;
+            font-size: 28rpx;
+            margin-left: 4rpx;
+            width: 14rpx;
+            text-align: left;
+            display: inline-block;
+        }
+
+        .box {
+            flex: 1;
+            padding: 0 10rpx;
+            line-height: inherit;
+            text-align: left;
+
+            input {
+                font-size: $font-size-base;
+                text-align: left;
+            }
+
+            textarea {
+                font-size: $font-size-base;
+                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 $color-line;
+                border-radius: 4rpx;
+                position: relative;
+
+                .icon-guanbi {
+                    position: absolute;
+                    top: -14rpx;
+                    right: -14rpx;
+                    display: inline-block;
+                    width: 28rpx;
+                    height: 28rpx;
+                    line-height: 28rpx;
+                    color: $color-tip;
+                }
+
+                .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: bold;
+            }
+
+            .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: $color-tip;
+            font-size: $font-size-base;
+        }
+
+        .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-goods-action-button/ns-goods-action-button.vue b/components/ns-goods-action-button/ns-goods-action-button.vue
new file mode 100644
index 0000000..1210943
--- /dev/null
+++ b/components/ns-goods-action-button/ns-goods-action-button.vue
@@ -0,0 +1,96 @@
+<template>
+    <view class="action-buttom-wrap disabled" v-if="disabled" @click="clickEvent">{{ disabledText }}</view>
+    <view class="action-buttom-wrap"
+        :class="[backgroundClass, textPrice ? 'has-second' : '', background ? 'color-join-cart' : 'color-base-bg']"
+        :style="{background:backgroundColor+'!important', 'color':textColor ? textColor : '#ffffff'}" v-else
+        @click="clickEvent">
+        <text class="price-font">{{ textPrice }}</text>
+        <text>{{ text }}</text>
+    </view>
+</template>
+
+<script>
+    export default {
+        name: 'ns-goods-action-button',
+        props: {
+            // 商品底部按钮文字
+            text: {
+                type: String,
+                default: ''
+            },
+            // 商品底部按钮价格文字
+            textPrice: {
+                type: String,
+                default: ''
+            },
+            // 背景色
+            background: {
+                type: String,
+                default: ''
+            },
+            // 背景色样式
+            backgroundClass: {
+                type: String,
+                default: ''
+            },
+            // 
+            backgroundColor: {
+                type: String,
+                default: ''
+            },
+            // 是否禁用
+            disabled: {
+                type: Boolean,
+                default: false
+            },
+            // 禁用文字提示
+            disabledText: {
+                type: String,
+                default: ''
+            },
+            // 文字颜色
+            textColor: {
+                type: String,
+                default: ''
+            },
+        },
+        computed: {},
+        methods: {
+            clickEvent() {
+                this.$emit('click');
+            }
+        }
+    };
+</script>
+
+<style lang="scss">
+    .action-buttom-wrap {
+        flex: 1;
+        height: 70rpx;
+        font-weight: 600;
+        font-size: 30rpx;
+        line-height: 70rpx;
+        border: none;
+        color: #fff;
+        text-align: center;
+        border-radius: 10rpx;
+        margin-right: 20rpx;
+    }
+
+    .action-buttom-wrap.has-second {
+        line-height: 50rpx;
+    }
+
+    .action-buttom-wrap.has-second text {
+        display: block;
+        line-height: 1.2;
+    }
+
+    .action-buttom-wrap:active {
+        opacity: 0.8;
+    }
+
+    .action-buttom-wrap.disabled {
+        background: $color-disabled;
+    }
+</style>
\ No newline at end of file
diff --git a/components/ns-goods-action-icon/ns-goods-action-icon.vue b/components/ns-goods-action-icon/ns-goods-action-icon.vue
new file mode 100644
index 0000000..d88a20e
--- /dev/null
+++ b/components/ns-goods-action-icon/ns-goods-action-icon.vue
@@ -0,0 +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>
diff --git a/components/ns-goods-action/ns-goods-action.vue b/components/ns-goods-action/ns-goods-action.vue
new file mode 100644
index 0000000..e6379c7
--- /dev/null
+++ b/components/ns-goods-action/ns-goods-action.vue
@@ -0,0 +1,33 @@
+<template>
+	<view class="ns-goods-action bottom-safe-area" :class="{ 'bottom-safe-area': safeArea }"><slot></slot></view>
+</template>
+
+<script>
+export default {
+	name: 'ns-goods-action',
+	props: {
+		safeArea: {
+			type: Boolean,
+			default: false
+		}
+	}
+};
+</script>
+
+<style>
+.ns-goods-action {
+	position: fixed;
+	right: 0;
+	bottom: 0;
+	left: 0;
+	display: flex;
+	align-items: center;
+	background-color: #fff;
+	z-index: 9;
+}
+.ns-goods-action.bottom-safe-area {
+	padding-bottom: 0;
+	padding-bottom: constant(safe-area-inset-bottom);
+	padding-bottom: env(safe-area-inset-bottom);
+}
+</style>
diff --git a/components/ns-goods-promotion/ns-goods-promotion.vue b/components/ns-goods-promotion/ns-goods-promotion.vue
new file mode 100644
index 0000000..cbc219e
--- /dev/null
+++ b/components/ns-goods-promotion/ns-goods-promotion.vue
@@ -0,0 +1,125 @@
+<template>
+	<!-- 当前商品参与的营销活动入口 -->
+	<view class="ns-goods-promotion" v-if="goodsPromotion.length">
+		<view v-for="(item, index) in goodsPromotion" v-if="promotion != item.promotion_type" :key="index">
+			<view v-if="item.promotion_type == 'discount'" class="item" @click="redirectTo('/pages/goods/detail', { goods_id: item.goods_id })">
+				<text class="promotion-mark ">限时折扣</text>
+				<text class="title">当前商品正在参加{{ item.promotion_name }}</text>
+				<text class="iconfont icon-right"></text>
+				<!-- <view class="img-wrap"><image :src="$util.img('public/uniapp/goods/detail_more.png')" mode="aspectFit" /></view> -->
+			</view>
+			<view v-else-if="item.promotion_type == 'groupbuy'" class="item" @click="redirectTo('/pages_promotion/groupbuy/detail', { groupbuy_id: item.groupbuy_id })">
+				<!-- <view v-else-if="item.promotion_type == 'groupbuy'" class="item" @click="redirectTo('/pages_promotion/groupbuy/detail', { id: item.groupbuy_id })"> -->
+				<text class="promotion-mark ">团购</text>
+				<text class="title">当前商品正在参加{{ item.promotion_name }}</text>
+				<text class="iconfont icon-right"></text>
+				<!-- <view class="img-wrap"><image :src="$util.img('public/uniapp/goods/detail_more.png')" mode="aspectFit" /></view> -->
+			</view>
+			<view v-else-if="item.promotion_type == 'pintuan'" class="item" @click="redirectTo('/pages_promotion/pintuan/detail', { pintuan_id: item.pintuan_id })">
+				<text class="promotion-mark ">拼团</text>
+				<text class="title">当前商品正在参加{{ item.promotion_name }}</text>
+				<text class="iconfont icon-right"></text>
+				<!-- <view class="img-wrap"><image :src="$util.img('public/uniapp/goods/detail_more.png')" mode="aspectFit" /></view> -->
+			</view>
+			<view v-else-if="item.promotion_type == 'seckill'" class="item" @click="redirectTo('/pages_promotion/seckill/detail', { seckill_id: item.id })">
+				<text class="promotion-mark ">秒杀</text>
+				<text class="title">当前商品正在参加{{ item.promotion_name }}</text>
+				<text class="iconfont icon-right"></text>
+				<!-- <view class="img-wrap"><image :src="$util.img('public/uniapp/goods/detail_more.png')" mode="aspectFit" /></view> -->
+			</view>
+			<view v-else-if="item.promotion_type == 'topic'" class="item" @click="redirectTo('/pages_promotion/topics/goods_detail', { id: item.id })">
+				<text class="promotion-mark ">专题活动</text>
+				<text class="title">当前商品正在参加{{ item.promotion_name }}</text>
+				<text class="iconfont icon-right"></text>
+				<!-- <view class="img-wrap"><image :src="$util.img('public/uniapp/goods/detail_more.png')" mode="aspectFit" /></view> -->
+			</view>
+			<view v-else-if="item.promotion_type == 'bargain'" class="item" @click="redirectTo('/pages_promotion/bargain/detail', { b_id: item.bargain_id })">
+				<text class="promotion-mark ">砍价</text>
+				<text class="title">当前商品正在参加{{ item.promotion_name }}</text>
+				<text class="iconfont icon-right"></text>
+				<!-- <view class="img-wrap"><image :src="$util.img('public/uniapp/goods/detail_more.png')" mode="aspectFit" /></view> -->
+			</view>
+			<view v-else-if="item.promotion_type == 'pinfan'" class="item" @click="redirectTo('/pages_promotion/pinfan/detail', { pinfan_id: item.pintuan_id })">
+				<text class="promotion-mark ">拼团返利</text>
+				<text class="title">当前商品正在参加{{ item.promotion_name }}</text>
+				<text class="iconfont icon-right"></text>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+export default {
+	name: 'ns-goods-promotion',
+	props: {
+		promotion: {
+			type: String,
+			default: ''
+		}
+	},
+	data() {
+		return {
+			goodsPromotion: {
+				type: Array
+			}
+		};
+	},
+	created() {},
+	methods: {
+		refresh(goodsPromotion) {
+			this.goodsPromotion = goodsPromotion;
+		},
+		redirectTo(path, param) {
+			this.$util.redirectTo(path, param);
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+.ns-goods-promotion {
+	background-color: #fff;
+	& > view {
+	}
+	.item {
+		display: flex;
+		font-size: $font-size-base;
+		align-items: center;
+		padding: 20rpx 0;
+		border-bottom: 2rpx solid $color-line;
+		&:last-child {
+			border-bottom: none;
+		}
+
+		.promotion-mark {
+			padding: 12rpx 14rpx;
+			margin-right: 16rpx;
+			line-height: 1;
+			color: var(--main-color);
+			border-radius: 6rpx;
+			font-size: $font-size-tag;
+			font-weight: bold;
+			background-color: var(--main-color-shallow);
+		}
+
+		.title {
+			flex: 1;
+			line-height: 1;
+		}
+
+		.iconfont {
+			color: $color-tip;
+			font-size: $font-size-base;
+		}
+
+		.img-wrap {
+			width: 38rpx;
+			height: 38rpx;
+			image {
+				width: 100%;
+				height: 100%;
+			}
+		}
+	}
+}
+</style>
diff --git a/components/ns-goods-recommend/ns-goods-recommend.vue b/components/ns-goods-recommend/ns-goods-recommend.vue
new file mode 100644
index 0000000..2bec54c
--- /dev/null
+++ b/components/ns-goods-recommend/ns-goods-recommend.vue
@@ -0,0 +1,401 @@
+<template>
+	<view></view>
+</template>
+
+<script>
+	import nsLoading from '@/components/ns-loading/ns-loading.vue';
+	import nsGoodsSkuIndex from '@/components/ns-goods-sku/ns-goods-sku-index.vue';
+
+	// 商品推荐
+	export default {
+		name: 'ns-goods-recommend',
+		components: {
+			nsLoading,
+			nsGoodsSkuIndex
+		},
+		data() {
+			return {
+				list: [],
+				config: {
+					title: '猜你喜欢',
+					sources: 'sort',
+					supportPage: [],
+					goodsIds: [],
+					fontWeight: false,
+					padding: 0,
+					cartEvent: 'detail',
+					text: '购买',
+					textColor: '#FFFFFF',
+					theme: 'default',
+					aroundRadius: 25,
+					control: true,
+					bgColor: '#FF6A00',
+					style: 'button',
+					iconDiy: {
+						iconType: 'icon',
+						icon: '',
+						style: {
+							fontSize: '60',
+							iconBgColor: [],
+							iconBgColorDeg: 0,
+							iconBgImg: '',
+							bgRadius: 0,
+							iconColor: ['#000000'],
+							iconColorDeg: 0
+						}
+					}
+				},
+				page: 1,
+				isAll: true,
+				isClick: true,
+				showLoading: false
+			};
+		},
+		props: {
+			isLike: {
+				type: Boolean,
+				default: true
+			},
+			size: {
+				type: [Number, String],
+				default: 10
+			},
+			auto: {
+				type: Boolean,
+				default: true
+			},
+			load: {
+				type: Boolean,
+				default: true
+			},
+			route: {
+				type: String,
+				default: ''
+			}
+		},
+		mounted() {
+			if (this.auto) {
+				this.getLikeList();
+			}
+		},
+		methods: {
+			init() {
+				this.list = [];
+				this.page = 1;
+			},
+			toDetail(e) {
+				let data = {
+					goods_id: e.goods_id
+				};
+				this.$util.redirectTo('/pages/goods/detail', data);
+			},
+			getLikeList(size) {
+				let that = this;
+				if (!this.isClick) return;
+				if (!this.isAll) return;
+				this.isClick = false;
+				if (this.page > 1) this.showLoading = true;
+				return new Promise((resolve, reject) => {
+					that.$api.sendRequest({
+						url: '/api/goodssku/recommend',
+						data: {
+							page: this.page,
+							page_size: this.auto ? this.size : size,
+							route: this.route
+						},
+						success: res => {
+							this.showLoading = false;
+							this.isClick = true;
+							if (res.code == 0) {
+								if (this.page == 1) {
+									this.list = [];
+								}
+								this.config = res.data.config;
+								this.list = this.list.concat(res.data.list);
+								if (this.list.length == res.data.count) this.isAll = false;
+								this.page += 1;
+								resolve(res.data.list);
+							}
+						}
+					});
+				});
+			},
+			goodsImg(imgStr) {
+				let imgs = imgStr.split(',');
+				return imgs[0] ? this.$util.img(imgs[0], {
+					size: 'mid'
+				}) : this.$util.getDefaultImage().goods;
+			},
+			imgError(index) {
+				this.list[index].goods_image = this.$util.getDefaultImage().goods;
+			},
+			showPrice(data) {
+				let price = data.discount_price;
+				if (data.member_price && parseFloat(data.member_price) < parseFloat(price)) price = data.member_price;
+				return price;
+			},
+			showMarketPrice(item) {
+				if (item.market_price_show) {
+					let price = this.showPrice(item);
+					if (item.market_price > 0) {
+						return item.market_price;
+					} else if (parseFloat(item.price) > parseFloat(price)) {
+						return item.price;
+					}
+				}
+				return '';
+			},
+			goodsTag(data) {
+				return data.label_name || '';
+			},
+			// 监听加入购物车变化
+			cartListChange(e) {
+				if (this.route == 'cart' && this.storeToken) {
+					this.$root.getCartData();
+				}
+			},
+			/**
+			 * 添加购物车回调
+			 */
+			addCart(id) {}
+		}
+	};
+</script>
+
+<style lang="scss">
+	.goods-recommend {
+		margin-top: 74rpx;
+		width: 100vw;
+
+		.goods-recommend-title {
+			text-align: center;
+			margin-bottom: 40rpx;
+
+			.title {
+				font-size: 30rpx;
+				font-weight: 500;
+				position: relative;
+				color: #333;
+
+				&::before,
+				&::after {
+					content: ' ';
+					width: 80rpx;
+					border-top: 2rpx solid #969696;
+					position: absolute;
+					top: 50%;
+					transform: translateY(-50%);
+				}
+
+				&::before {
+					left: 0;
+					transform: translateX(-130%);
+				}
+
+				&::after {
+					right: 0;
+					transform: translateX(130%);
+				}
+			}
+		}
+	}
+
+	.hr-view {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		max-width: 100%;
+		box-sizing: content-box;
+		font-size: $font-size-toolbar;
+	}
+
+	.hr-view .hr {
+		width: 36%;
+		height: 2rpx;
+		background: #e5e5e5;
+	}
+
+	.hr-view .title {
+		padding: 0 $padding;
+	}
+
+	// 商品列表双列样式
+	.goods-list.double-column {
+		display: flex;
+		justify-content: space-between;
+		flex-wrap: wrap;
+		margin: 0 24rpx;
+
+		.goods-item {
+			display: flex;
+			flex-direction: column;
+			position: relative;
+			background-color: #fff;
+			width: calc(50% - 10rpx);
+			margin-bottom: $margin-updown;
+			border-radius: $border-radius;
+
+			&:nth-child(2n) {
+				margin-right: 0;
+			}
+
+			.goods-img {
+				position: relative;
+				overflow: hidden;
+				padding-top: 100%;
+				border-top-left-radius: $border-radius;
+				border-top-right-radius: $border-radius;
+
+				image {
+					width: 100%;
+					position: absolute;
+					// top: 50%;
+					top: 0;
+					bottom: 0;
+					left: 0;
+					right: 0;
+					// transform: translateY(-50%);
+				}
+			}
+
+			.goods-tag {
+				color: #fff;
+				line-height: 1;
+				padding: 8rpx 16rpx;
+				position: absolute;
+				border-bottom-right-radius: $border-radius;
+				top: 0;
+				left: 0;
+				font-size: $font-size-goods-tag;
+			}
+
+			.goods-tag-img {
+				position: absolute;
+				border-top-left-radius: $border-radius;
+				width: 80rpx;
+				height: 80rpx;
+				top: 0;
+				left: 0;
+				z-index: 5;
+				overflow: hidden;
+
+				image {
+					width: 100%;
+					height: 100%;
+				}
+			}
+
+			.info-wrap {
+				padding: 20rpx;
+				display: flex;
+				flex-direction: column;
+				flex: 1;
+			}
+
+			.goods-name {
+				font-size: $font-size-base;
+				line-height: 1.3;
+				margin-top: 20rpx;
+			}
+
+			.lineheight-clear {
+				margin-top: 16rpx;
+			}
+
+			.discount-price {
+				display: inline-block;
+				font-weight: bold;
+				line-height: 1;
+				color: var(--price-color);
+
+				.unit {
+					margin-right: 6rpx;
+				}
+			}
+
+			.pro-info {
+				display: flex;
+				margin-top: auto;
+				align-items: center;
+
+				.block-wrap {
+					flex: 1;
+					line-height: 1;
+					margin-right: 20rpx;
+
+					.sale {
+						font-size: $font-size-tag !important;
+					}
+				}
+
+				.cart-action-wrap {
+					position: relative;
+
+					.shopping-cart-btn {
+						font-size: 36rpx;
+						border: 2rpx solid $base-color;
+						border-radius: 50%;
+						padding: 10rpx;
+						color: $base-color;
+						width: 36rpx;
+						height: 36rpx;
+						text-align: center;
+						line-height: 36rpx;
+					}
+
+					.plus-sign-btn {
+						font-size: 36rpx;
+						border: 2rpx solid $base-color;
+						border-radius: 50%;
+						padding: 10rpx;
+						color: $base-color;
+						width: 36rpx;
+						height: 36rpx;
+						text-align: center;
+						line-height: 36rpx;
+					}
+
+					.buy-btn {
+						background-color: $base-color;
+						color: var(--btn-text-color);
+						border-radius: 50rpx;
+						font-size: $font-size-tag;
+						padding: 12rpx 30rpx;
+						line-height: 1;
+					}
+
+					.icon-diy {
+						font-size: 80rpx;
+					}
+				}
+			}
+
+			.delete-price {
+				display: inline-block;
+				margin-left: 6rpx;
+				float: right;
+				text-decoration: line-through;
+
+				.unit {
+					margin-right: 6rpx;
+				}
+
+				text {
+					line-height: 1;
+					font-size: $font-size-tag !important;
+				}
+			}
+
+			.member-price-tag {
+				display: inline-block;
+				width: 60rpx;
+				line-height: 1;
+				margin-left: 6rpx;
+
+				image {
+					width: 100%;
+				}
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/components/ns-goods-sku/ns-goods-sku-category.vue b/components/ns-goods-sku/ns-goods-sku-category.vue
new file mode 100644
index 0000000..7cc117c
--- /dev/null
+++ b/components/ns-goods-sku/ns-goods-sku-category.vue
@@ -0,0 +1,852 @@
+<template>
+	<view class="goods-sku" @touchmove.prevent.stop>
+		<uni-popup ref="skuPopup" :type="popupType">
+			<view class="sku-layer">
+				<view class="sku-content">
+					<view class="sku-info" :style="{ height: systemInfo.windowHeight * 2 + 'rpx' }">
+						<view class="header">
+							<view class="img-wrap" @click="previewMedia()">
+								<image :src="$util.img(goodsDetail.sku_image, { size: 'mid' })" @error="imageError()" />
+							</view>
+							<view class="main">
+								<view class="goodname">{{ goodsDetail.goods_name }}</view>
+								<view class="other-info">
+									<view class="stock color-tip" v-if="goodsDetail.stock_show">
+										库存{{ goodsDetail.stock }}{{ goodsDetail.unit }}</view>
+									<view class="starting-num" v-if="parseFloat(goodsDetail.min_buy)">
+										起售{{goodsDetail.min_buy}}件
+									</view>
+								</view>
+							</view>
+						</view>
+						<view class="body-item">
+							<scroll-view scroll-y class="wrap">
+								<view class="sku-list-wrap" v-for="(item, index) in goodsDetail.goods_spec_format" :key="index">
+									<text class="title font-size-tag">{{ item.spec_name }}</text>
+									<view class="sku-list_item">
+										<view v-for="(item_value, index_value) in item.value" :key="index_value" :class="{
+                                                selected: item_value['selected'] || skuId == item_value.sku_id,
+                                                disabled: item_value['disabled'] || (!item_value['selected'] && disabled)
+                                            }" class="items color-line-border font-size-tag"
+											@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>
+									</view>
+								</view>
+							</scroll-view>
+						</view>
+						<view class="footer">
+							<view class="sku-name font-size-goods-tag">
+								<template v-if="goodsDetail.sku_spec_format" class="color-tip">
+									已选择：
+									<text class="color-tip" v-for="(item, index) in goodsDetail.sku_spec_format" :key="index">{{ item.spec_value_name }}</text>
+								</template>
+							</view>
+							<view class="footer-bottom">
+								<view class="footer-left">
+									<view class="price-wrap">
+										<text class="price price-font">￥{{ goodsDetail.show_price }}</text>
+									</view>
+								</view>
+								<view class="footer-right">
+									<view class="change_num" v-if="number > 0">
+										<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)" />
+										<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>
+										</view>
+									</view>
+									<view v-else-if="number == 0 && isLoad">
+										<view class="num-action">
+											<button type="primary" v-if="goodsDetail.stock && goodsDetail.stock != 0" @click="confirm($event)">加入购物车</button>
+											<button type="primary" disabled="true" v-else>确定</button>
+											<view class="click-event"></view>
+										</view>
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="sku-close iconfont icon-close-guanbi" @click="closeSkuPopup()"></view>
+		</uni-popup>
+
+		<ns-login ref="login"></ns-login>
+	</view>
+</template>
+
+<script>
+	import uniPopup from '@/components/uni-popup/uni-popup-sku-new.vue';
+	// 商品SKU
+	export default {
+		name: 'ns-goods-sku-category',
+		components: {
+			uniPopup
+		},
+		props: {
+			disabled: {
+				type: Boolean,
+				default: false
+			},
+			pointLimit: {
+				type: [Number, String]
+			},
+			popupType: {
+				type: String,
+				default: "center"
+			}
+		},
+		data() {
+			return {
+				systemInfo: {}, //系统信息
+				number: 0,
+				btnSwitch: false, //提交按钮防止重复提交
+				goodsId: 0,
+				skuId: 0,
+				limitNumber: 0, // 限购
+				goodsDetail: {},
+				goodsSkuList: {}, // 商品规格项集合
+				maxBuy: 0,
+				minBuy: 0,
+				isLoad: false,
+				timeout: null
+			};
+		},
+		created() {
+			this.systemInfo = uni.getSystemInfoSync();
+		},
+		watch: {
+			pointLimit(newNum, oldNum) {
+				this.limitNumber = Number(newNum);
+			},
+			minBuy(newData, oldData) {
+				if (this.minBuy > 1) {
+					this.number = Number(this.minBuy);
+				}
+			}
+		},
+		methods: {
+			show(data) {
+				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.getGoodsSkuList(this.goodsId);
+				this.keyInput(false);
+				if (this.getCurrentCart()) {
+					this.number = this.getCurrentCart().num;
+				}
+				this.$refs.skuPopup.open();
+			},
+			hide() {
+				if(this.$refs.skuPopup) this.$refs.skuPopup.close();
+			},
+			change(skuId, spec_id) {
+				if (this.disabled) return;
+				this.btnSwitch = false;
+				this.skuId = skuId;
+
+				// 清空选择
+				for (var i = 0; i < this.goodsDetail.goods_spec_format.length; i++) {
+					var sku = this.goodsDetail.goods_spec_format[i];
+					for (var j = 0; j < sku.value.length; j++) {
+						// 排除当前点击的规格值
+						if (spec_id == this.goodsDetail.goods_spec_format[i].value[j].spec_id) {
+							this.goodsDetail.goods_spec_format[i].value[j].selected = false;
+						}
+					}
+				}
+
+				this.isLoad = true;
+				if (this.goodsSkuList['sku_' + skuId]) {
+					this.goodsDetail = Object.assign({}, this.goodsDetail, this.goodsSkuList['sku_' + skuId]);
+				}
+
+				if (this.getCurrentCart()) {
+					this.number = this.getCurrentCart().num;
+				} else {
+					this.number = 0;
+				}
+			},
+			//查看规格图片
+			previewMedia() {
+				var paths = [];
+				paths.push(
+					this.$util.img(this.goodsDetail.sku_image, {
+						size: 'big'
+					})
+				);
+				uni.previewImage({
+					current: 1,
+					urls: paths
+				});
+			},
+			// 获取普通商品规格集合
+			getGoodsSkuList(goods_id) {
+				this.$api.sendRequest({
+					url: '/api/goodssku/goodsSkuByCategory',
+					data: {
+						goods_id
+					},
+					success: res => {
+						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);
+
+								// 商品SKU格式
+								if (item.goods_spec_format) item.goods_spec_format = JSON.parse(item.goods_spec_format);
+
+								// 限时折扣
+								if (item.promotion_type == 1) {
+									item.discountTimeMachine = this.$util.countDown(item.end_time - res.timestamp);
+								}
+
+								if (item.promotion_type == 1 && item.discountTimeMachine) {
+									if (item.member_price > 0 && Number(item.member_price) <= Number(item.discount_price)) {
+										item.show_price = item.member_price;
+									} else {
+										item.show_price = item.discount_price;
+									}
+								} else if (item.member_price > 0) {
+									item.show_price = item.member_price;
+								} else {
+									item.show_price = item.price;
+								}
+
+								obj['sku_' + item.sku_id] = item;
+							});
+							this.goodsSkuList = obj;
+						}
+					}
+				});
+			},
+			changeNum(tag, event) {
+				if (this.goodsDetail.stock == 0 || this.btnSwitch) return;
+
+				var stock = this.goodsDetail.stock;
+				var min = 1;
+
+				if (this.goodsDetail.is_limit == 1 && this.maxBuy > 0 && this.maxBuy < stock) stock = this.maxBuy;
+
+				if (this.goodsDetail.is_limit == 1 && this.goodsDetail.limit_type == 2 && this.maxBuy > 0 && this
+					.goodsDetail.purchased_num > 0) {
+					let maxBuy = this.maxBuy - this.goodsDetail.purchased_num;
+					stock = maxBuy < this.goodsDetail.stock ? maxBuy : this.goodsDetail.stock;
+				}
+
+				if (this.minBuy > 1) {
+					min = this.minBuy;
+				}
+				if (tag == '+') {
+					// 加
+					if (this.number < stock) {
+						this.number++;
+					} else {
+						if (this.number >= this.goodsDetail.stock) {
+							this.$util.showToast({
+								title: '库存不足'
+							});
+							return;
+						}
+
+						if (this.goodsDetail.is_limit == 1 && this.maxBuy > 0) {
+							if (this.goodsDetail.limit_type == 1) {
+								this.$util.showToast({
+									title: '该商品每次最多购买' + this.maxBuy + this.goodsDetail.unit
+								});
+								return;
+							}
+
+							if (this.goodsDetail.limit_type == 2) {
+								let message = '该商品每人限购' + this.maxBuy + this.goodsDetail.unit;
+								message += this.goodsDetail.purchased_num > 0 ? '，您已购买了' + this.goodsDetail.purchased_num + this.goodsDetail.unit : '';
+								this.$util.showToast({
+									title: message
+								});
+								return;
+							}
+						}
+					}
+
+					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();
+				} else if (tag == '-') {
+					// 减
+					if (this.number > min) {
+						this.number -= 1;
+					} else {
+						this.number = 0;
+					}
+				}
+				if (this.number > this.limitNumber && this.limitNumber) {
+					this.number = this.limitNumber;
+				}
+				if (this.number) {
+					this.cartNumChange(this.number);
+				} else {
+					this.deleteCart();
+				}
+			},
+			blur() {
+				if (!this.number) {
+					this.number = 1;
+				}
+				if (this.number > this.limitNumber && this.limitNumber) {
+					this.number = this.limitNumber;
+				}
+				if (this.goodsDetail.is_limit && this.maxBuy > 0) {
+					let maxBuy = this.maxBuy - this.goodsDetail.purchased_num;
+					if (this.number > maxBuy) this.number = maxBuy;
+				}
+				if (this.number < this.minBuy && this.minBuy > 0) {
+					this.number = this.minBuy;
+				}
+
+				if (this.number <= 0) {
+					this.number = 1;
+				}
+
+				let newNumber = parseInt(this.number);
+
+				this.isLoad = false;
+				setTimeout(() => {
+					this.number = newNumber;
+					this.cartNumChange(this.number);
+				}, 0);
+			},
+			//输入数量
+			keyInput(flag, callback) {
+				setTimeout(() => {
+					var stock = this.goodsDetail.stock;
+
+					// 库存为0
+					if (this.goodsDetail.stock == 0) {
+						this.number = 0;
+						return;
+					}
+
+					// 防止空
+					if (flag && this.number.length == 0) this.number = 1;
+
+					// 防止输入0和负数、非法输入
+					if (flag && (this.number <= 0 || isNaN(this.number))) this.number = 1;
+
+					if (this.number > stock) {
+						this.number = stock;
+					}
+					// 商品起售数
+					if (this.minBuy > 1 && this.number < this.minBuy) {
+						this.number = this.minBuy;
+					}
+
+					if (flag) this.number = parseInt(this.number);
+
+					if (callback) callback();
+				}, 0);
+			},
+
+			//提交
+			confirm(event) {
+				if (!this.storeToken) {
+					this.$refs.login.open();
+					return;
+				}
+				if (this.goodsDetail.goods_state == 0) {
+					this.$util.showToast({
+						title: '商品已下架'
+					});
+					return;
+				}
+
+				this.number = 1;
+				//纠正数量
+				this.keyInput(true, () => {
+					if (this.goodsDetail.stock == 0) {
+						this.$util.showToast({
+							title: '商品已售罄'
+						});
+						return;
+					}
+
+					if (this.number > this.goodsDetail.stock) {
+						this.$util.showToast({
+							title: '库存不足'
+						});
+						return;
+					}
+
+					if (this.goodsDetail.is_limit == 1 && this.goodsDetail.limit_type == 1 && this.maxBuy > 0 &&
+						this.number > this.maxBuy) {
+						this.$util.showToast({
+							title: '该商品每次最多购买' + this.maxBuy + this.goodsDetail.unit
+						});
+						return;
+					}
+
+					if (this.goodsDetail.is_limit == 1 && this.goodsDetail.limit_type == 2 && this.maxBuy > 0 &&
+						this.number + this.goodsDetail.purchased_num > this.maxBuy) {
+						let message = '该商品每人限购' + this.maxBuy + this.goodsDetail.unit;
+						message += this.goodsDetail.purchased_num > 0 ? '，您已购买了' + this.goodsDetail.purchased_num + this.goodsDetail.unit : '';
+						this.$util.showToast({
+							title: message
+						});
+						return;
+					}
+
+					this.$emit('addCart', event.detail.x, event.detail.y);
+
+					if (this.btnSwitch) return;
+					this.btnSwitch = true;
+
+					this.$api.sendRequest({
+						url: '/api/cart/add',
+						data: {
+							sku_id: this.skuId,
+							num: this.number
+						},
+						success: res => {
+							var data = res.data;
+							if (data > 0) {
+
+								if (this.getCurrentCart()) {
+									this.cartList['goods_' + this.goodsId]['sku_' + this.skuId].num = this.number;
+								} else {
+
+									// 如果商品第一次添加，则初始化数据
+									if (!this.cartList['goods_' + this.goodsId]) {
+										this.cartList['goods_' + this.goodsId] = {};
+									}
+
+									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;
+									}
+
+									this.cartList['goods_' + this.goodsId]['sku_' + this.skuId] = {
+										cart_id: data,
+										goods_id: this.goodsId,
+										sku_id: this.skuId,
+										num: this.number,
+										discount_price
+									};
+								}
+
+								this.$store.dispatch('cartCalculate');
+								this.$emit('refresh');
+								this.$util.showToast({
+									title: '加入购物车成功'
+								});
+							}
+							this.btnSwitch = false;
+						},
+						fail: res => {
+							if(this.$refs.skuPopup) this.$refs.skuPopup.close();
+							this.btnSwitch = false;
+						}
+					});
+				});
+			},
+			closeSkuPopup() {
+				if(this.$refs.skuPopup) this.$refs.skuPopup.close();
+			},
+			imageError() {
+				this.goodsDetail.sku_image = this.$util.getDefaultImage().goods;
+				this.$forceUpdate();
+			},
+			valueImageError(index, index_value) {
+				this.goodsDetail.goods_spec_format[index].value[index_value].image = this.$util.getDefaultImage().goods;
+				this.$forceUpdate();
+			},
+			/**
+			 * 变更购物车数量
+			 * @param {Object} num
+			 */
+			cartNumChange(num) {
+				if (num < 1) num = 1;
+
+				if (this.timeout) clearTimeout(this.timeout);
+
+				this.timeout = setTimeout(() => {
+					this.$api.sendRequest({
+						url: '/api/cart/edit',
+						data: {
+							num,
+							cart_id: this.getCurrentCart().cart_id
+						},
+						success: res => {
+							if (res.code >= 0) {
+								this.cartList['goods_' + this.goodsId]['sku_' + this.skuId].num = num;
+								this.$store.dispatch('cartCalculate');
+								this.$emit('refresh');
+							}
+						}
+					});
+				}, 800)
+			},
+			/**
+			 * 删除购物车
+			 */
+			deleteCart() {
+				if (this.timeout) clearTimeout(this.timeout);
+
+				this.$api.sendRequest({
+					url: '/api/cart/delete',
+					data: {
+						cart_id: this.getCurrentCart().cart_id
+					},
+					success: res => {
+						if (res.code >= 0) {
+							delete this.cartList['goods_' + this.goodsId]['sku_' + this.skuId];
+							if (Object.keys(this.cartList['goods_' + this.goodsId]).length == 2) {
+								delete this.cartList['goods_' + this.goodsId];
+							}
+							this.$store.dispatch('cartCalculate');
+							this.$emit('refresh');
+						}
+					}
+				});
+			},
+			getCurrentCart() {
+				let goods = this.cartList['goods_' + this.goodsId];
+				let cart = null;
+				if (goods && goods['sku_' + this.skuId]) {
+					cart = goods['sku_' + this.skuId];
+				}
+				return cart;
+			}
+		}
+	};
+</script>
+<style lang="scss" scoped>
+	.sku-content {
+		background: #ffffff;
+		border-radius: 20rpx;
+	}
+
+	.sku-close {
+		color: #fff;
+		width: 50rpx;
+		text-align: center;
+		font-size: 60rpx;
+		border-radius: 50%;
+		margin: 40rpx auto 0;
+	}
+
+	.sku-layer .sku-info {
+		width: 600rpx;
+		height: 60vh !important;
+		position: relative;
+		z-index: 999;
+	}
+
+	.sku-layer .sku-info .header {
+		// padding: 30rpx 0 30rpx 300rpx;
+		/* #ifdef MP-ALIPAY */
+		// padding: 50rpx 0 50rpx 300rpx;
+		/* #endif */
+		padding: 30rpx;
+		display: flex;
+		position: relative;
+		border-bottom: 2rpx solid rgba(0, 0, 0, 0.1);
+		z-index: 2;
+	}
+
+	.sku-layer .sku-info .header .img-wrap {
+		width: 114rpx;
+		height: 114rpx;
+		margin-right: 20rpx;
+		// position: absolute;
+		// top: -56rpx;
+		/* #ifdef MP-ALIPAY */
+		// top: 20rpx;
+		/* #endif */
+		// left: 20rpx;
+		border-radius: 8rpx;
+		overflow: hidden;
+		border: 2rpx solid rgba(0, 0, 0, 0.1);
+		padding: 2rpx;
+		background-color: #fff;
+		line-height: 208rpx;
+	}
+
+	.sku-layer .sku-info .header .img-wrap image {
+		width: 100%;
+		height: 100%;
+	}
+
+	.sku-layer .sku-info .main {
+		font-size: 24rpx;
+		line-height: 40rpx;
+		flex: 1;
+		width: 0;
+	}
+
+	.sku-layer .sku-info .main .goodname {
+		word-wrap: break-word;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		-webkit-line-clamp: 2;
+		line-height: 1.3;
+	}
+
+	.sku-layer .sku-info .main .other-info {
+		margin-top: 20rpx;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+	}
+
+	.sku-layer .sku-info .main .starting-num {
+		color: $color-tip;
+		font-size: $font-size-tag;
+	}
+
+	.footer-left .price {
+		word-wrap: break-word;
+		font-size: $font-size-toolbar;
+		color: var(--price-color);
+	}
+
+	.sku-layer .sku-info .main .stock {
+		line-height: 1;
+		font-size: $font-size-tag;
+	}
+
+	.sku-layer .sku-info .main .sku-name {
+		display: -webkit-box;
+		-webkit-line-clamp: 2;
+		-webkit-box-orient: vertical;
+		height: 90rpx;
+		overflow: hidden;
+	}
+
+	.sku-layer .sku-info .main .sku-name text {
+		margin-right: 10rpx;
+	}
+
+	.sku-layer .sku-info .sku-close {
+		position: absolute;
+		top: 20rpx;
+		right: 20rpx;
+		width: 40rpx;
+		height: 80rpx;
+		font-size: 50rpx;
+	}
+
+	.sku-layer .body-item {
+		padding: 0 30rpx 30rpx 30rpx;
+		height: calc(100% - 282rpx);
+		box-sizing: border-box;
+		overflow: scroll;
+	}
+
+	.sku-layer .body-item .wrap {
+		height: calc(100% - 116rpx);
+	}
+
+	.sku-layer .body-item .sku-list-wrap {}
+
+	.sku-layer .body-item .sku-list-wrap .title {
+		font-weight: 400;
+		padding: 20rpx 0;
+		margin: 0;
+		display: block;
+	}
+
+	.sku-layer .body-item .sku-list-wrap .sku-list_item {
+		display: flex;
+		flex-wrap: wrap;
+	}
+
+	.sku-layer .body-item .sku-list-wrap .items {
+		text-align: center;
+		position: relative;
+		display: inline-block;
+		border: 2rpx solid $color-line;
+		padding: 4rpx 30rpx;
+		border-radius: 8rpx;
+		margin: 0 20rpx 20rpx 0;
+		background-color: #fff !important;
+	}
+
+	.sku-layer .body-item .sku-list-wrap .items.disabled {
+		border: 2rpx dashed;
+	}
+
+	.sku-layer .body-item .sku-list-wrap .items image {
+		height: 48rpx;
+		width: 48rpx;
+		border-radius: 4rpx;
+		margin-right: 10rpx;
+		display: inline-block;
+		vertical-align: middle;
+	}
+
+	.sku-layer .body-item .number-wrap .number-line {
+		padding: 20rpx 0;
+		line-height: 72rpx;
+	}
+
+	.sku-layer .body-item .number-wrap .title {
+		font-weight: 400;
+	}
+
+	.sku-layer .body-item .number-wrap .limit-txt {}
+
+	.sku-layer .body-item .number-wrap .number {
+		height: 72rpx;
+		border-radius: 6rpx;
+		float: right;
+	}
+
+	.sku-layer .body-item .number-wrap .number button {
+		display: inline-block;
+		line-height: 64rpx;
+		height: 68rpx;
+		width: 60rpx;
+		font-size: 48rpx;
+		box-sizing: content-box;
+		border: 2rpx solid;
+		padding: 0;
+		margin: 0;
+		border-radius: 0;
+	}
+
+	.sku-layer .body-item .number-wrap .number button.decrease {
+		border-right: 2rpx solid #fff !important;
+	}
+
+	.sku-layer .body-item .number-wrap .number button.increase {
+		border-left: 2rpx solid #fff !important;
+	}
+
+	.sku-layer .body-item .number-wrap .number button:after {
+		border-radius: 0;
+		border: none;
+	}
+
+	.sku-layer .body-item .number-wrap .number input {
+		display: inline-block;
+		line-height: 64rpx;
+		height: 68rpx;
+		width: 72rpx;
+		text-align: center;
+		font-weight: 700;
+		border: 2rpx solid;
+		margin: 0;
+		padding: 0;
+		vertical-align: top;
+	}
+
+	.sku-layer .footer {
+		width: calc(100% - 60rpx);
+		position: absolute;
+		bottom: 26rpx;
+		color: #fff;
+		z-index: 1;
+		border-top: 1rpx solid $color-line;
+		padding: 30rpx 30rpx 0;
+		background-color: #fff;
+
+		// button {
+		// 	width: 100%;
+		// }
+		.sku-name {
+			text {
+				margin-right: 10rpx;
+			}
+		}
+	}
+
+	.sku-layer .footer .footer-bottom {
+		margin-top: 24rpx;
+		display: flex;
+		justify-content: be;
+		align-items: center;
+
+		.footer-left {
+			flex: 1;
+		}
+
+		.footer-right {
+			width: 238rpx;
+			text-align: right;
+		}
+
+		.footer-right button {
+			margin-right: 0;
+			width: 210rpx;
+			height: 60rpx;
+			line-height: 60rpx;
+			font-size: 30rpx;
+		}
+	}
+
+	.position-bottom {
+		bottom: 98rpx !important;
+	}
+
+	// 数量加减样式
+	.change_num {
+		display: flex;
+		align-items: center;
+		justify-content: flex-end;
+	}
+
+	.change_num>text,
+	.change_num .iconfont {
+		font-size: 48rpx;
+	}
+
+	.change_num input {
+		width: 70rpx;
+		height: 36rpx;
+		line-height: 36rpx;
+		text-align: center;
+	}
+
+	.change_num .num-action {
+		position: relative;
+	}
+
+	.change_num .num-action .click-event {
+		position: absolute;
+		width: 2rpx;
+		height: 2rpx;
+		left: 0;
+		top: 0;
+		transform: translate(-50%, -50%);
+		z-index: 5;
+	}
+
+	/deep/ .uni-popup__wrapper {
+		background: transparent !important;
+	}
+
+	/deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+		background: transparent !important;
+	}
+
+	/deep/ .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+		background: transparent !important;
+	}
+</style>
\ No newline at end of file
diff --git a/components/ns-goods-sku/ns-goods-sku-index.vue b/components/ns-goods-sku/ns-goods-sku-index.vue
new file mode 100644
index 0000000..5dcf5f0
--- /dev/null
+++ b/components/ns-goods-sku/ns-goods-sku-index.vue
@@ -0,0 +1,236 @@
+<template>
+	<view class="goods-sku">
+		<ns-login ref="login"></ns-login>
+		<!-- sku选择 -->
+		<ns-goods-sku v-if="goodsDetail.goods_id" ref="goodsSku" :goods-id="goodsDetail.goods_id" :goods-detail="goodsDetail" :max-buy="goodsDetail.max_buy" :min-buy="goodsDetail.min_buy" @refresh="refreshGoodsSkuDetail"></ns-goods-sku>
+	</view>
+</template>
+
+<script>
+	import nsGoodsSku from '@/components/ns-goods-sku/ns-goods-sku.vue';
+	// 商品SKU
+	export default {
+		name: 'ns-goods-sku-index',
+		components: {
+			nsGoodsSku
+		},
+		data() {
+			return {
+				timeout: {},
+				isRepeat: false,
+				goodsDetail: {}
+			};
+		},
+		created() {},
+		methods: {
+			/**
+			 * 添加购物车
+			 * @param {Object} config 购物车事件（detail-详情，cart-加入购物车）
+			 * @param {Object} data 商品项
+			 */
+			addCart(config, data, event) {
+				if (!this.storeToken) {
+					this.$refs.login.open('/pages/index/index')
+					return;
+				}
+				if (config == "detail" || data.is_virtual) {
+					this.$util.redirectTo('/pages/goods/detail', {
+						goods_id: data.goods_id
+					});
+					return false;
+				}
+				// 多规格
+				if (data.goods_spec_format) {
+					this.multiSpecificationGoods(data);
+				} else {
+					this.singleSpecificationGoods(data, event);
+				}
+			},
+			/**
+			 * 单规格
+			 * @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 cartNum = cart ? cart.num : 0;
+				let api = cart && cart.cart_id ? '/api/cart/edit' : '/api/cart/add';
+				let minBuy = data.min_buy > 0 ? data.min_buy : 1;
+				let num = cartNum >= minBuy ? cartNum : minBuy;
+				let _num = num;
+				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({
+						title: '商品库存不足'
+					});
+					return;
+				}
+				if (data.is_limit && data.max_buy && _num > parseInt(data.max_buy)) {
+					this.$util.showToast({
+						title: `该商品每人限购${data.max_buy}${data.unit || '件'}`
+					});
+					return;
+				}
+
+				if (cart) {
+					this.cartList['goods_' + data.goods_id]['sku_' + data.sku_id].num = _num;
+				} else {
+
+					// 如果商品第一次添加，则初始化数据
+					if (!this.cartList['goods_' + data.goods_id]) {
+						this.cartList['goods_' + data.goods_id] = {};
+					}
+
+					let discount_price = data.discount_price;
+					if (data.member_price > 0 && Number(data.member_price) <= Number(data.discount_price)) {
+						discount_price = data.member_price;
+					}
+
+					this.cartList['goods_' + data.goods_id]['sku_' + data.sku_id] = {
+						cart_id,
+						goods_id: data.goods_id,
+						sku_id: data.sku_id,
+						num: _num,
+						discount_price
+					};
+				}
+
+				if (this.isRepeat) return;
+				this.isRepeat = true;
+
+				this.$emit('addCart', event.currentTarget.id);
+
+				this.$api.sendRequest({
+					url: api,
+					data: {
+						cart_id,
+						sku_id: data.sku_id,
+						num: _num
+					},
+					success: res => {
+						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.$util.showToast({
+								title: "商品添加购物车成功"
+							});
+							this.$store.commit('setCartChange');
+							this.$store.dispatch('cartCalculate');
+							this.$emit("cartListChange", this.cartList);
+						} else {
+							this.$util.showToast({
+								title: res.message
+							});
+						}
+					}
+				});
+			},
+			/**
+			 * 多规格
+			 * @param {Object} data 商品项
+			 */
+			multiSpecificationGoods(data) {
+				this.$api.sendRequest({
+					url: '/api/goodssku/getInfoForCategory',
+					data: {
+						sku_id: data.sku_id
+					},
+					success: res => {
+						if (res.code >= 0) {
+							let item = res.data;
+							item.unit = item.unit || '件';
+
+							if (item.sku_images) item.sku_images = item.sku_images.split(',');
+							else item.sku_images = [];
+
+							// 多规格时合并主图
+							if (item.goods_spec_format && item.goods_image) {
+								item.goods_image = item.goods_image.split(',');
+								item.sku_images = item.goods_image.concat(item.sku_images);
+							}
+
+							// 当前商品SKU规格
+							if (item.sku_spec_format) item.sku_spec_format = JSON.parse(item.sku_spec_format);
+
+							// 商品SKU格式
+							if (item.goods_spec_format) item.goods_spec_format = JSON.parse(item.goods_spec_format);
+
+							// 限时折扣
+							if (item.promotion_type == 1) {
+								item.discountTimeMachine = this.$util.countDown(item.end_time - res.timestamp);
+							}
+
+							if (item.promotion_type == 1 && item.discountTimeMachine) {
+								if (item.member_price > 0 && Number(item.member_price) <= Number(item.discount_price)) {
+									item.show_price = item.member_price;
+								} else {
+									item.show_price = item.discount_price;
+								}
+							} else if (item.member_price > 0) {
+								item.show_price = item.member_price;
+							} else {
+								item.show_price = item.price;
+							}
+							this.goodsDetail = item;
+
+							this.$nextTick(() => {
+								if (this.$refs.goodsSku) {
+									this.$refs.goodsSku.show("join_cart", (res) => {
+
+										let goods = this.cartList['goods_' + res.goods_id];
+										let cart = null;
+										if (goods && goods['sku_' + res.sku_id]) {
+											cart = goods['sku_' + res.sku_id];
+										}
+
+										if (cart) {
+											this.cartList['goods_' + res.goods_id]['sku_' + res.sku_id].num = res.num;
+										} else {
+
+											// 如果商品第一次添加，则初始化数据
+											if (!this.cartList['goods_' + res.goods_id]) {
+												this.cartList['goods_' + res.goods_id] = {};
+											}
+
+											this.cartList['goods_' + res.goods_id]['sku_' + res.sku_id] = {
+												cart_id: res.cart_id,
+												goods_id: res.goods_id,
+												sku_id: res.sku_id,
+												num: res.num,
+												discount_price: res.discount_price
+											};
+
+										}
+
+										this.$store.dispatch('cartCalculate');
+										this.$emit("cartListChange", this.cartList);
+
+										// 加入购物车动效
+										setTimeout(() => {
+											this.$store.commit('setCartChange');
+										}, 100);
+
+									});
+								}
+							});
+						}
+					}
+				});
+			},
+			refreshGoodsSkuDetail(data) {
+				this.goodsDetail = Object.assign({}, this.goodsDetail, data);
+			}
+		}
+	};
+</script>
\ No newline at end of file
diff --git a/components/ns-goods-sku/ns-goods-sku.vue b/components/ns-goods-sku/ns-goods-sku.vue
new file mode 100644
index 0000000..993553b
--- /dev/null
+++ b/components/ns-goods-sku/ns-goods-sku.vue
@@ -0,0 +1,1545 @@
+<template>
+	<view class="goods-sku" @touchmove.prevent.stop>
+		<uni-popup ref="skuPopup" type="bottom" class="sku-layer" @change="popclose">
+			<view class="sku-info" :style="{ height: skuHeight }">
+				<view class="header">
+					<block v-if="type == 'point' && goodsDetail.type && goodsDetail.type != 1">
+						<view class="img-wrap" v-if="goodsDetail.type == 2">
+							<image :src="goodsDetail.image ? $util.img(goodsDetail.image) : $util.img('public/uniapp/point/coupon.png')" mode="aspectFit" />
+						</view>
+						<view class="img-wrap" v-if="goodsDetail.type == 3">
+							<image :src="goodsDetail.image ? $util.img(goodsDetail.image) : $util.img('public/uniapp/point/hongbao.png')" mode="aspectFit" />
+						</view>
+					</block>
+					<view v-else class="img-wrap" @click="previewMedia()">
+						<image :src="$util.img(goodsDetail.sku_image, { size: 'mid' })" @error="imageError()" mode="aspectFit" />
+					</view>
+
+					<view class="main">
+						<block v-if="type == 'point'">
+							<block v-if="goodsDetail.type == 1">
+								<view class="price-wrap">
+									<text class="price price-color font-size-toolbar">{{ goodsDetail.point }}积分</text>
+									<block v-if="goodsDetail.exchange_price != '0.00' && goodsDetail.pay_type > 0">
+										<text class="unit price-color font-size-tag">+</text>
+										<text class="price price-color font-size-toolbar price-font">{{ $lang('common.currencySymbol') }}{{ goodsDetail.exchange_price }}</text>
+									</block>
+								</view>
+								<view class="stock" v-if="goodsDetail.stock_show">
+									库存{{ goodsDetail.stock }}{{ goodsDetail.unit }}</view>
+							</block>
+							<block v-else>
+								<view class="price-wrap">
+									<view class="price font-size-toolbar">{{ goodsDetail.name }}</view>
+								</view>
+								<view class="stock" style="height: auto;">
+									积分：
+									<text class="price-color">{{ goodsDetail.point }}</text>
+								</view>
+								<view class="stock">
+									库存：
+									<text class="color-base-text">{{ goodsDetail.stock }}{{ goodsDetail.unit }}</text>
+								</view>
+							</block>
+						</block>
+						<block v-else-if="type == 'presale'">
+							<view class="price-wrap">
+								<text class="unit price-style small">￥</text>
+								<text class="price price-style large">{{ parseFloat(goodsDetail.presale_deposit).toFixed(2).split('.')[0] }}</text>
+								<text class="unit price-style small">.{{ parseFloat(goodsDetail.presale_deposit).toFixed(2).split('.')[1] }}</text>
+								<view class="balance" v-if="balance > 0">
+									<text>尾款</text>
+									<text class="unit price-color font-size-tag price-font">￥</text>
+									<text class="price-color price-font">{{ balance }}</text>
+								</view>
+							</view>
+							<view class="stock presale-stock">
+								<block v-if="goodsDetail.stock_show">库存{{ goodsDetail.stock }}{{ goodsDetail.unit }}
+								</block>
+							</view>
+						</block>
+						<block v-else>
+							<view class="price-wrap" v-if="type == 'pintuan'">
+								<block v-if="goodsDetail.pintuan_type == 'ordinary'">
+									<block v-if="goodsDetail.group_id && goodsDetail.group_id > 0">
+										<text class="unit price-style small">￥</text>
+										<text class="price price-style large">{{ parseFloat(pintuanPrice(goodsDetail)).toFixed(2).split('.')[0] }}</text>
+										<text class="unit price-style small">.{{ parseFloat(pintuanPrice(goodsDetail)).toFixed(2).split('.')[1] }}</text>
+									</block>
+									<block v-else>
+										<text class="unit price-style small">￥</text>
+										<text class="price price-style large">{{ parseFloat(goodsDetail.promotion_price).toFixed(2).split('.')[0] }}</text>
+										<text class="unit price-style small">.{{ parseFloat(goodsDetail.promotion_price).toFixed(2).split('.')[1] }}</text>
+									</block>
+								</block>
+
+								<block v-if="goodsDetail.pintuan_type == 'ladder'">
+									<text class="unit price-style small">￥</text>
+									<text class="price price-style large">{{ parseFloat(pintuanPrice(goodsDetail)).toFixed(2).split('.')[0] }}</text>
+									<text class="unit price-style small">.{{ parseFloat(pintuanPrice(goodsDetail)).toFixed(2).split('.')[1] }}</text>
+								</block>
+							</view>
+							<view class="price-wrap" v-else-if="type == 'groupbuy'">
+								<text class="unit price-style small">￥</text>
+								<text class="price price-style large">{{ parseFloat(goodsDetail.groupbuy_price).toFixed(2).split('.')[0] }}</text>
+								<text class="unit price-style small">.{{ parseFloat(goodsDetail.groupbuy_price).toFixed(2).split('.')[1] }}</text>
+							</view>
+							<view class="price-wrap" v-else-if="type == 'topic'">
+								<text class="unit price-style small">￥</text>
+								<text class="price price-style large">{{ parseFloat(goodsDetail.topic_price).toFixed(2).split('.')[0] }}</text>
+								<text class="unit price-style small">.{{ parseFloat(goodsDetail.topic_price).toFixed(2).split('.')[1] }}</text>
+							</view>
+							<view class="price-wrap" v-else-if="type == 'seckill'">
+								<text class="unit price-style small">￥</text>
+								<text class="price price-style large">{{ parseFloat(goodsDetail.seckill_price).toFixed(2).split('.')[0] }}</text>
+								<text class="unit price-style small">.{{ parseFloat(goodsDetail.seckill_price).toFixed(2).split('.')[1] }}</text>
+							</view>
+							<view class="price-wrap" v-else>
+								<text class="unit price-style small">￥</text>
+								<block v-if="goodsDetail.discount_price > 0">
+									<block v-if="goodsDetail.member_price">
+										<text class="price price-style large" v-if="showPrice(goodsDetail.discount_price) < showPrice(goodsDetail.member_price)">{{ parseFloat(goodsDetail.discount_price).toFixed(2).split('.')[0] }}</text>
+										<text class="price price-style large" v-else>{{ parseFloat(goodsDetail.member_price).toFixed(2).split('.')[0] }}</text>
+										<text class="unit price-style small" v-if="showPrice(goodsDetail.discount_price) < showPrice(goodsDetail.member_price)">.{{ parseFloat(goodsDetail.discount_price).toFixed(2).split('.')[1] }}</text>
+										<text class="unit price-style small" v-else>.{{ parseFloat(goodsDetail.member_price).toFixed(2).split('.')[1] }}</text>
+									</block>
+									<block v-else>
+										<text class="price price-style large" v-if="showPrice(goodsDetail.discount_price) < showPrice(goodsDetail.price)">{{ parseFloat(goodsDetail.discount_price).toFixed(2).split('.')[0] }}</text>
+										<text class="price price-style large" v-else>{{ parseFloat(goodsDetail.price).toFixed(2).split('.')[0] }}</text>
+										<text class="unit price-style small" v-if="showPrice(goodsDetail.discount_price) < showPrice(goodsDetail.price)">.{{ parseFloat(goodsDetail.discount_price).toFixed(2).split('.')[1] }}</text>
+										<text class="unit price-style small" v-else>.{{ parseFloat(goodsDetail.price).toFixed(2).split('.')[1] }}</text>
+									</block>
+								</block>
+								<block v-else>
+									<text class="price price-style large" v-if="goodsDetail.member_price">{{ parseFloat(goodsDetail.member_price).toFixed(2).split('.')[0] }}</text>
+									<text class="price price-style large" v-else>{{ parseFloat(goodsDetail.price).toFixed(2).split('.')[0] }}</text>
+									<text class="unit price-style small" v-if="goodsDetail.member_price">.{{ parseFloat(goodsDetail.member_price).toFixed(2).split('.')[1] }}</text>
+									<text class="unit price-style small" v-else>.{{ parseFloat(goodsDetail.price).toFixed(2).split('.')[1] }}</text>
+								</block>
+							</view>
+							<view class="stock" v-if="goodsDetail.stock_show">库存{{ goodsDetail.stock }}{{ goodsDetail.unit }}</view>
+						</block>
+
+						<view class="sku-name font-size-tag" v-if="goodsDetail.sku_spec_format">
+							<text class="color-tip">已选规格：</text>
+							<text v-for="(item, index) in goodsDetail.sku_spec_format" :key="index" class="spec-value">{{ item.spec_value_name }}</text>
+						</view>
+					</view>
+
+					<view class="sku-close iconfont icon-close" @click="closeSkuPopup()"></view>
+				</view>
+
+				<view class="body-item">
+					<scroll-view scroll-y class="wrap">
+						<!-- 阶梯拼团 -->
+						<view class="sku-list-wrap" v-if="type == 'pintuan' && goodsDetail.pintuan_type == 'ladder' && !goodsDetail.group_id">
+							<text class="title font-size-base">&nbsp;</text>
+							<view class="items" :class="{ selected: pintuan_num_field == 'pintuan_num' }" @click="pintuanChange('pintuan_num')">
+								<text>{{ goodsDetail.pintuan_num }}人团</text>
+							</view>
+							<view class="items" v-if="goodsDetail.pintuan_num_2 > 0" :class="{ selected: pintuan_num_field == 'pintuan_num_2' }" @click="pintuanChange('pintuan_num_2')">
+								<text>{{ goodsDetail.pintuan_num_2 }}人团</text>
+							</view>
+							<view class="items" v-if="goodsDetail.pintuan_num_3 > 0" :class="{ selected: pintuan_num_field == 'pintuan_num_3' }" @click="pintuanChange('pintuan_num_3')">
+								<text>{{ goodsDetail.pintuan_num_3 }}人团</text>
+							</view>
+						</view>
+
+						<view class="sku-list-wrap" v-for="(item, index) in goodsDetail.goods_spec_format" :key="index">
+							<text class="title font-size-base">{{ item.spec_name }}</text>
+							<view v-for="(item_value, index_value) in item.value" :key="index_value" :class="{
+									selected: item_value['selected'] || skuId == item_value.sku_id,
+									disabled: item_value['disabled'] || (!item_value['selected'] && disabled)
+								}" 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>
+						</view>
+
+						<view class="number-wrap">
+							<view class="number-line">
+								<text class="title font-size-base" v-if="type == 'point'">兑换数量</text>
+								<text class="title font-size-base" v-else>购买数量</text>
+								<text class="limit-txt color-base-text" v-if="limitNumber > 0">(每人限购{{ limitNumber }}{{ goodsDetail.unit }})</text>
+								<text v-if="maxBuy > 0 && minBuy > 1" class="limit-txt color-base-text">
+									({{ minBuy }}{{ goodsDetail.unit }}起售，限购{{ maxBuy }}{{ goodsDetail.unit }})
+								</text>
+								<text v-else-if="maxBuy > 0" class="limit-txt color-base-text">(限购{{ maxBuy }}{{ goodsDetail.unit }})</text>
+								<text v-else-if="minBuy > 1" class="limit-txt color-base-text">({{ minBuy }}{{ goodsDetail.unit }}起售)</text>
+								<view class="number">
+									<button type="default" class="decrease color-line-border" :class="{ disabled: decreaseDisabled }" @click="changeNum('-')">-</button>
+									<input type="number" class="uni-input color-line-border font-size-goods-tag" @blur="blur" v-model="number" placeholder="0" @input="keyInput(false)" />
+									<button type="default" class="increase color-line-border" :class="{ disabled: increaseDisabled }" @click="changeNum('+')">+</button>
+								</view>
+							</view>
+						</view>
+
+						<ns-form :data="goodsForm" v-if="goodsForm" ref="form"></ns-form>
+					</scroll-view>
+				</view>
+				<view class="footer" @click="confirm()">
+					<button type="primary" v-if="goodsDetail.stock && goodsDetail.stock != 0 && goodsDetail.is_virtual == 0 && type == 'buy_now'" :style="{ background: themeStyle.goods_detail.goods_btn_color_shallow, color : '#fff' }" @click.stop="confirm(true)">加入购物车</button>
+					<block v-if="type == 'point'">
+						<block v-if="goodsDetail.type == 1">
+							<!-- 兑换商品 -->
+							<button v-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">
+							<!-- 兑换优惠券、红包 -->
+							<button type="primary">兑换</button>
+						</block>
+					</block>
+					<block v-else-if="goodsDetail.goods_state == 1">
+						<button type="primary" v-if="goodsDetail.stock && goodsDetail.stock != 0 && type == 'join_cart'">加入购物车</button>
+						<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">
+								<button type="primary" v-if="goodsDetail.buy_num <= goodsDetail.stock">立即抢购</button>
+								<button type="primary" v-else disabled="true">库存不足</button>
+							</template>
+							<template v-else>
+								<button type="primary">立即抢购</button>
+							</template>
+						</template>
+						<button type="primary" v-else disabled="true">库存不足</button>
+					</block>
+					<button type="primary" v-else disabled="true">该商品已下架</button>
+				</view>
+			</view>
+		</uni-popup>
+		<ns-login ref="login"></ns-login>
+	</view>
+</template>
+
+<script>
+	import uniPopup from '@/components/uni-popup/uni-popup-sku.vue';
+	// 商品SKU
+	export default {
+		name: 'ns-goods-sku',
+		components: {
+			uniPopup
+		},
+		props: {
+			goodsId: {
+				type: [Number, String],
+				default: 0
+			},
+			goodsDetail: {
+				type: Object,
+				default: null
+			},
+			disabled: {
+				type: Boolean,
+				default: false
+			},
+			pointLimit: {
+				type: [Number, String]
+			},
+			maxBuy: {
+				type: Number,
+				default: 0
+			},
+			minBuy: {
+				type: Number,
+				default: 0
+			}
+		},
+		data() {
+			return {
+				isIphoneX: false,
+				systemInfo: {}, //系统信息
+				number: 1,
+				btnSwitch: false, //提交按钮防止重复提交
+				type: '', //join_cart：加入购物车，buy_now：立即购买
+				callback: null, //回调
+				skuId: 0,
+				pintuanId: 0, // 拼团id
+				limitNumber: 0, // 限购
+				minNumber: 0,
+				//是否开启预览，0：不开启，1：开启
+				preview: 0,
+				cartNum: 0, // 购物车中商品存在的数量
+				goodsSkuDetail: {},
+				pintuan_num_field: 'pintuan_num',
+				goodsSkuInfo: null, //所有的商品规格信息
+				goodsForm: null,
+				isLoad: false // 是否首次加载
+			};
+		},
+		created() {
+			this.isIphoneX = this.$util.uniappIsIPhoneX();
+			this.systemInfo = uni.getSystemInfoSync();
+			this.isLoad = true;
+			if (this.goodsId && this.goodsDetail.goods_spec_format) {
+				this.skuId = this.goodsDetail.sku_id;
+				if (this.goodsDetail.pintuan_id) {
+					this.getPintuanGoodsSkuList();
+				} else if (this.goodsDetail.pinfan_id) {
+					this.getPinfanGoodsSkuList();
+				} else if (this.goodsDetail.groupbuy_id) {
+					this.getGroupbuyGoodsSkuList();
+				} else if (this.goodsDetail.bargain_id) {
+					this.getBargainGoodsSkuList();
+				} else if (this.goodsDetail.seckill_id) {
+					this.getSeckillGoodsSkuList();
+				} else if (this.goodsDetail.topic_id) {
+					this.getTopicsGoodsSkuList();
+				} else if (this.goodsDetail.exchange_id) {
+					this.getPointGoodsSkuList();
+				} else if (this.goodsDetail.presale_id) {
+					this.getPresaleGoodsSkuList();
+				} else if (this.goodsDetail.bale_id) {
+					this.getBaleGoodsSkuList();
+				} else {
+					this.getGeneralGoodsSkuList();
+				}
+			} else {
+				this.skuId = this.goodsDetail.sku_id;
+			}
+		},
+		watch: {
+			pointLimit(newNum, oldNum) {
+				this.limitNumber = Number(newNum);
+			},
+			goodsDetail: {
+				handler(newData, oldData) {
+					this.skuId = newData.sku_id;
+					if (this.type == 'pintuan' && newData.pintuan_type == 'ladder') {
+						this.pintuan_num_field = newData.pintuan_num_field;
+					}
+					if (this.goodsDetail.goods_form && !this.goodsForm) this.goodsForm = this.goodsDetail.goods_form;
+
+					// 切换商品，重新赋值
+					if (newData.goods_id != oldData.goods_id) {
+						if (this.goodsDetail.pintuan_id) {
+							this.getPintuanGoodsSkuList();
+						} else if (this.goodsDetail.pinfan_id) {
+							this.getPinfanGoodsSkuList();
+						} else if (this.goodsDetail.groupbuy_id) {
+							this.getGroupbuyGoodsSkuList();
+						} else if (this.goodsDetail.bargain_id) {
+							this.getBargainGoodsSkuList();
+						} else if (this.goodsDetail.seckill_id) {
+							this.getSeckillGoodsSkuList();
+						} else if (this.goodsDetail.topic_id) {
+							this.getTopicsGoodsSkuList();
+						} else if (this.goodsDetail.exchange_id) {
+							this.getPointGoodsSkuList();
+						} else if (this.goodsDetail.presale_id) {
+							this.getPresaleGoodsSkuList();
+						} else if (this.goodsDetail.bale_id) {
+							this.getBaleGoodsSkuList();
+						} else {
+							this.getGeneralGoodsSkuList();
+						}
+					}
+				},
+				deep: true // 深度监听父组件传过来对象变化
+			},
+			minBuy(newData, oldData) {
+				if (this.minBuy > 1) {
+					this.number = Number(this.minBuy);
+				}
+			}
+		},
+		computed: {
+			/**
+			 * 尾款
+			 */
+			balance: function() {
+				let price = this.goodsDetail.member_price && this.goodsDetail.member_price > 0 ? this.goodsDetail.member_price : this.goodsDetail.price;
+				let balance = parseFloat(price) - parseFloat(this.goodsDetail.presale_price);
+				balance = balance < 0 ? 0 : balance;
+				return balance.toFixed(2);
+			},
+			decreaseDisabled: function() {
+				let min = this.minBuy > 0 ? this.minBuy : 1;
+				return this.number <= min;
+			},
+			increaseDisabled: function() {
+				let max = this.maxBuy > 0 && this.maxBuy < this.goodsDetail.stock ? this.maxBuy : this.goodsDetail.stock;
+				return this.number >= max;
+			},
+			skuHeight() {
+				let height = 48;
+				if (this.goodsDetail) {
+					if (this.goodsDetail.goods_spec_format && this.goodsDetail.goods_spec_format.length) {
+						height = 51 + this.goodsDetail.goods_spec_format.length * 9.5;
+					}
+
+					if (this.goodsForm && this.goodsForm.length) {
+						height += this.goodsForm.length * 5;
+					}
+				}
+				height += 'vh';
+				return height;
+			}
+		},
+		methods: {
+			//【普通商品】获取所有规格信息
+			getGeneralGoodsSkuList(callback) {
+				this.$api.sendRequest({
+					url: '/api/goodssku/goodsSku',
+					data: {
+						goods_id: this.goodsId
+					},
+					success: res => {
+						if (res.code >= 0) {
+							let data = res.data,
+								obj = {};
+
+							res.data.forEach((item, index) => {
+								item = this.handleData(item);
+
+								// 限时折扣
+								if (item.promotion_type == 1) {
+									item.discountTimeMachine = this.$util.countDown(item.end_time - res.timestamp);
+								}
+
+								if (item.promotion_type == 1 && item.discountTimeMachine) {
+									if (item.member_price > 0 && Number(item.member_price) <= Number(item.discount_price)) {
+										item.show_price = item.member_price;
+									} else {
+										item.show_price = item.discount_price;
+									}
+								} else if (item.member_price > 0) {
+									item.show_price = item.member_price;
+								} else {
+									item.show_price = item.price;
+								}
+
+								obj['sku_' + item.sku_id] = item;
+							});
+							if (this.skuId == 0) this.skuId = res.data[0].sku_id;
+							this.goodsSkuInfo = obj;
+							this.isLoad = false;
+							if (callback) callback();
+						} else {
+							this.$util.redirectTo('/pages/index/index');
+						}
+					}
+				});
+			},
+			// 【拼团】获取所有规格信息
+			getPintuanGoodsSkuList() {
+				this.$api.sendRequest({
+					url: '/pintuan/api/goods/goodsSku',
+					data: {
+						goods_id: this.goodsId,
+						pintuan_id: this.goodsDetail.pintuan_id,
+						pintuan_num: this.goodsDetail[this.goodsDetail['pintuan_num_field']]
+					},
+					success: res => {
+						if (res.code >= 0) {
+							let obj = {};
+
+							res.data.forEach((item, index) => {
+								item = this.handleData(item);
+								item.show_price = this.goodsDetail.group_id == 0 ? item.promotion_price : item.pintuan_price;
+								item.save_price = item.price - item.show_price > 0 ? (item.price - item.show_price).toFixed(2) : 0;
+								item['pintuan_num_field'] = this.goodsDetail['pintuan_num_field'];
+								obj['sku_' + item.sku_id] = item;
+							});
+							this.skuId = res.data[0].sku_id;
+							this.goodsSkuInfo = obj;
+						} else {
+							this.$util.redirectTo('/pages/index/index');
+						}
+					}
+				});
+			},
+			// 【拼团返利】获取所有规格信息
+			getPinfanGoodsSkuList() {
+				this.$api.sendRequest({
+					url: '/pinfan/api/goods/goodsSku',
+					data: {
+						goods_id: this.goodsId,
+						pintuan_id: this.goodsDetail.pinfan_id
+					},
+					success: res => {
+						if (res.code >= 0) {
+							let obj = {};
+
+							res.data.forEach((item, index) => {
+								item = this.handleData(item);
+								item.show_price = this.goodsDetail.group_id == 0 ? item.promotion_price : item.pintuan_price;
+								item.save_price = item.price - item.show_price > 0 ? (item.price - item.show_price).toFixed(2) : 0;
+								obj['sku_' + item.sku_id] = item;
+							});
+							this.skuId = res.data[0].sku_id;
+							this.goodsSkuInfo = obj;
+						} else {
+							this.$util.redirectTo('/pages/index/index');
+						}
+					}
+				});
+			},
+			// 【团购】获取所有规格信息
+			getGroupbuyGoodsSkuList() {
+				this.$api.sendRequest({
+					url: '/groupbuy/api/goods/goodsSku',
+					data: {
+						goods_id: this.goodsId,
+						groupbuy_id: this.goodsDetail.groupbuy_id
+					},
+					success: res => {
+						if (res.code >= 0) {
+							let data = res.data,
+								obj = {};
+
+							res.data.forEach((item, index) => {
+								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;
+
+								if (data.stock > data.buy_num) {
+									this.number = this.goodsDetail.buy_num;
+									this.minNumber = this.goodsDetail.buy_num;
+								}
+
+								obj['sku_' + item.sku_id] = item;
+							});
+							this.skuId = res.data[0].sku_id;
+							this.goodsSkuInfo = obj;
+						} else {
+							this.$util.redirectTo('/pages/index/index');
+						}
+					}
+				});
+			},
+			// 【砍价】获取所有规格信息
+			getBargainGoodsSkuList() {
+				this.$api.sendRequest({
+					url: '/bargain/api/goods/goodsSku',
+					data: {
+						goods_id: this.goodsId,
+						bargain_id: this.goodsDetail.bargain_id
+					},
+					success: res => {
+						if (res.code >= 0) {
+							let obj = {};
+
+							res.data.forEach((item, index) => {
+								item = this.handleData(item);
+								item.show_price = this.goodsDetail.bargain_id > 0 ? item.floor_price : item.price;
+								item.stock = item.bargain_stock; //砍价库存
+								item.save_price = item.price - item.show_price > 0 ? (item.price - item.show_price).toFixed(2) : 0;
+								obj['sku_' + item.sku_id] = item;
+							});
+							this.skuId = res.data[0].sku_id;
+							this.goodsSkuInfo = obj;
+						} else {
+							this.$util.redirectTo('/pages/index/index');
+						}
+					}
+				});
+			},
+			// 【秒杀】获取所有规格信息
+			getSeckillGoodsSkuList() {
+				this.$api.sendRequest({
+					url: '/seckill/api/seckillgoods/goodsSku',
+					data: {
+						goods_id: this.goodsId,
+						seckill_id: this.goodsDetail.seckill_id
+					},
+					success: res => {
+						if (res.code >= 0) {
+							let obj = {};
+
+							res.data.forEach((item, index) => {
+								item = this.handleData(item);
+								item.show_price = item.seckill_price;
+								item.price - item.show_price > 0 ? (item.price - item.show_price).toFixed(2) : 0;
+								obj['sku_' + item.sku_id] = item;
+							});
+							this.skuId = res.data[0].sku_id;
+							this.goodsSkuInfo = obj;
+						} else {
+							this.$util.redirectTo('/pages/index/index');
+						}
+					}
+				});
+			},
+			// 【专题】获取所有规格信息
+			getTopicsGoodsSkuList() {
+				this.$api.sendRequest({
+					url: '/topic/api/topicgoods/goodsSku',
+					data: {
+						goods_id: this.goodsId,
+						topic_id: this.goodsDetail.topic_id
+					},
+					success: res => {
+						if (res.code >= 0) {
+							let obj = {};
+
+							res.data.forEach((item, index) => {
+								item = this.handleData(item);
+								item.show_price = this.goodsDetail.topic_id > 0 ? item.topic_price : item.price;
+								item.save_price = item.price - item.show_price > 0 ? (item.price - item.show_price).toFixed(2) : 0;
+								obj['sku_' + item.sku_id] = item;
+							});
+							this.skuId = res.data[0].sku_id;
+							this.goodsSkuInfo = obj;
+						} else {
+							this.$util.redirectTo('/pages/index/index');
+						}
+					}
+				});
+			},
+			// 【积分】获取所有规格信息
+			getPointGoodsSkuList() {
+				// 只有兑换商品才查询
+				if (this.goodsDetail.type != 1) return;
+				this.$api.sendRequest({
+					url: '/pointexchange/api/goods/goodsSku',
+					data: {
+						goods_id: this.goodsId,
+						exchange_id: this.goodsDetail.exchange_id,
+						type: this.goodsDetail.type
+					},
+					success: res => {
+						if (res.code >= 0) {
+							let obj = {};
+
+							res.data.forEach((item, index) => {
+								item = this.handleData(item);
+								obj['sku_' + item.sku_id] = item;
+							});
+							this.skuId = res.data[0].sku_id;
+							this.goodsSkuInfo = obj;
+						} else {
+							this.$util.redirectTo('/pages/index/index');
+						}
+					}
+				});
+			},
+			// 【预售】获取所有规格信息
+			getPresaleGoodsSkuList() {
+				this.$api.sendRequest({
+					url: '/presale/api/goods/goodsSku',
+					data: {
+						goods_id: this.goodsId,
+						presale_id: this.goodsDetail.presale_id
+					},
+					success: res => {
+						if (res.code >= 0) {
+							let obj = {};
+
+							res.data.forEach((item, index) => {
+								item = this.handleData(item);
+								obj['sku_' + item.sku_id] = item;
+							});
+							this.skuId = res.data[0].sku_id;
+							this.goodsSkuInfo = obj;
+						} else {
+							this.$util.redirectTo('/pages/index/index');
+						}
+					}
+				});
+			},
+			//【一口价】获取所有规格信息
+			getBaleGoodsSkuList() {
+				let obj = {};
+				this.goodsDetail.sku_list.forEach((item, index) => {
+					item = this.handleData(item);
+					obj['sku_' + item.sku_id] = item;
+				});
+				this.skuId = this.goodsDetail.sku_list[0].sku_id;
+				this.goodsSkuInfo = obj;
+			},
+			handleData(item) {
+				if (item.sku_images) item.sku_images = item.sku_images.split(',');
+				else item.sku_images = [];
+
+				// 多规格时合并主图
+				if (item.goods_spec_format && item.goods_image) {
+					item.goods_image = item.goods_image.split(',');
+					item.sku_images = item.goods_image.concat(item.sku_images);
+				}
+
+				// 当前商品SKU规格
+				if (item.sku_spec_format) item.sku_spec_format = JSON.parse(item.sku_spec_format);
+
+				// 商品SKU格式
+				if (item.goods_spec_format) item.goods_spec_format = JSON.parse(item.goods_spec_format);
+
+				return item;
+			},
+			show(type, callback, data = {}) {
+				this.callback = callback;
+				this.number = 1; //默认为一件
+
+				// 排除购物车切换规格
+				if (this.type != 'confirm') {
+					this.$refs.skuPopup.open();
+				}
+				this.type = type;
+				this.skuId = this.goodsDetail.sku_id;
+				this.preview = this.goodsDetail.preview || 0;
+				if (this.type == 'pintuan' && this.goodsDetail.pintuan_id) {
+					this.limitNumber = this.goodsDetail.buy_num;
+				} else if (this.type == 'pinfan' && this.goodsDetail.pinfan_id) {
+					this.limitNumber = this.goodsDetail.buy_num;
+				} else if (this.type == 'groupbuy' && this.goodsDetail.groupbuy_id) {
+					if (this.goodsDetail.stock > this.goodsDetail.buy_num) {
+						this.number = this.goodsDetail.buy_num;
+						this.minNumber = this.goodsDetail.buy_num;
+					}
+				} else if (this.type == 'bargain' && this.goodsDetail.bargain_id) {
+					this.number = 1;
+					this.minNumber = 1;
+				} else if (this.type == 'confirm') {
+					if (this.isLoad) return;
+
+					// 购物车切换规格
+					this.goodsId = data.goods_id;
+					this.skuId = data.sku_id;
+					this.getGeneralGoodsSkuList(() => {
+						this.$refs.skuPopup.open();
+					});
+				}
+				if (this.type == 'join_cart') this.getCartData();
+				if (this.type == 'point' && this.goodsDetail.stock == -1) {
+					this.goodsDetail.pointCoupon = 1;
+					this.goodsDetail.stock = 99999;
+				}
+				if (this.type == 'bale') {
+					this.number = 1;
+					// 一口价活动
+					if (this.$util.inArray(this.skuId + '', this.goodsDetail.activity_sku_ids) == -1) {
+						this.confirmDisabled = true;
+						this.$util.showToast({
+							title: '该规格未参与打包一口价活动'
+						});
+					} else {
+						this.confirmDisabled = false;
+					}
+				}
+				// 起售
+				if (this.minBuy > 1) {
+					this.number = Number(this.minBuy);
+				}
+				this.$forceUpdate();
+			},
+			hide() {
+				this.$emit('hideSkuPop');
+				if(this.$refs.skuPopup) this.$refs.skuPopup.close();
+			},
+			popclose() {
+				if (this.$refs.skuPopup.showPopup) {
+					this.$emit('hideSkuPop');
+				}
+			},
+			//查看规格图片
+			previewMedia() {
+				var paths = [];
+				paths.push(
+					this.$util.img(this.goodsDetail.sku_image, {
+						size: 'big'
+					})
+				);
+				uni.previewImage({
+					current: 1,
+					urls: paths
+				});
+			},
+			pintuanChange(field) {
+				this.goodsDetail['pintuan_num_field'] = field;
+				this.pintuan_num_field = field;
+			},
+			change(skuId, spec_id) {
+				if (this.goodsSkuInfo == null) return;
+				if (this.disabled) return;
+				this.btnSwitch = false;
+
+				this.skuId = skuId;
+
+				// 清空选择
+				for (var i = 0; i < this.goodsDetail.goods_spec_format.length; i++) {
+					var sku = this.goodsDetail.goods_spec_format[i];
+					for (var j = 0; j < sku.value.length; j++) {
+						// 排除当前点击的规格值
+						if (spec_id == this.goodsDetail.goods_spec_format[i].value[j].spec_id) {
+							this.goodsDetail.goods_spec_format[i].value[j].selected = false;
+						}
+					}
+				}
+
+				this.goodsSkuDetail = this.goodsSkuInfo['sku_' + this.skuId];
+				this.$emit('refresh', this.goodsSkuDetail);
+				this.$emit('getSkuId', this.skuId);
+				if (this.goodsDetail.bale_id) {
+					// 一口价活动
+					if (this.$util.inArray(skuId + '', this.goodsDetail.activity_sku_ids) == -1) {
+						this.confirmDisabled = true;
+						this.$util.showToast({
+							title: '该规格未参与打包一口价活动'
+						});
+					} else {
+						this.confirmDisabled = false;
+					}
+				}
+				this.keyInput(true);
+			},
+			showPrice(price) {
+				return parseFloat(price);
+			},
+			pintuanPrice(data) {
+				if (data.pintuan_type == 'ordinary') {
+					return data.pintuan_price;
+				} else {
+					if (data.pintuan_num_field == 'pintuan_num') return data.pintuan_price;
+					if (data.pintuan_num_field == 'pintuan_num_2') return data.pintuan_price_2;
+					if (data.pintuan_num_field == 'pintuan_num_3') return data.pintuan_price_3;
+				}
+			},
+			changeNum(tag) {
+				if (this.goodsDetail.stock == 0) return;
+				var min = 1;
+				var stock = this.goodsDetail.stock;
+
+				if (this.maxBuy == 1) {
+					stock = 1;
+				}
+
+				if (this.goodsDetail.is_limit == 1 && this.maxBuy > 0 && this.maxBuy < stock) stock = this.maxBuy;
+
+				if (this.goodsDetail.is_limit == 1 && this.goodsDetail.limit_type == 2 && this.maxBuy > 0 && this.goodsDetail.purchased_num > 0) {
+					let maxBuy = this.maxBuy - this.goodsDetail.purchased_num;
+					stock = maxBuy < this.goodsDetail.stock ? maxBuy : this.goodsDetail.stock;
+				}
+
+				if (this.minBuy > 1) {
+					min = this.minBuy;
+				}
+
+				if (this.type == 'pintuan' && this.goodsDetail.pintuan_id) {
+					//限购数量大于库存总数取库存
+					if (this.goodsDetail.buy_num > this.goodsDetail.stock) {
+						stock = this.goodsDetail.stock;
+					} else {
+						stock = this.goodsDetail.buy_num;
+					}
+					// min = stock;
+				} else if (this.type == 'groupbuy' && this.goodsDetail.groupbuy_id) {
+					//限购数量大于库存总数取库存
+					if (this.goodsDetail.buy_num > this.goodsDetail.stock) {
+						stock = this.goodsDetail.stock;
+					} else {
+						stock = this.goodsDetail.stock;
+					}
+					//最低购买数量
+					min = this.goodsDetail.buy_num;
+				} else if (this.type == 'seckill' && this.goodsDetail.seckill_id && this.goodsDetail.num > 0 && this
+					.goodsDetail.num < this.goodsDetail.stock) {
+					//限购数量小于库存总数取库存
+					stock = this.goodsDetail.num;
+				} else if (this.type == 'bargain' && this.goodsDetail.bargain_id) {
+					stock = 1;
+				} else if (this.type == 'presale' && this.goodsDetail.presale_id && this.goodsDetail.presale_num > 0) {
+					//限购数量大于库存总数取库存
+					if (this.goodsDetail.presale_num > this.goodsDetail.stock) {
+						stock = this.goodsDetail.stock;
+					} else {
+						stock = this.goodsDetail.presale_num;
+					}
+				}
+
+				if (tag == '+') {
+					// 加
+					if (this.number < stock) {
+						this.number++;
+					} else {
+						if (this.number >= this.goodsDetail.stock) {
+							this.$util.showToast({
+								title: '库存不足'
+							});
+							return;
+						}
+
+						if (this.goodsDetail.is_limit == 1 && this.maxBuy > 0) {
+							if (this.goodsDetail.limit_type == 1) {
+								this.$util.showToast({
+									title: '该商品每次最多购买' + this.maxBuy + this.goodsDetail.unit
+								});
+								return;
+							}
+
+							if (this.goodsDetail.limit_type == 2) {
+								let message = '该商品每人限购' + this.maxBuy + this.goodsDetail.unit;
+								message += this.goodsDetail.purchased_num > 0 ? '，您已购买了' + this.goodsDetail.purchased_num + this.goodsDetail.unit : '';
+								this.$util.showToast({
+									title: message
+								});
+								return;
+							}
+						}
+
+						if (this.type == 'seckill' && this.goodsDetail.seckill_id && this.goodsDetail.num > 0) {
+							this.$util.showToast({
+								title: '该商品每人限购' + this.goodsDetail.num + this.goodsDetail.unit
+							});
+							return;
+						}
+
+						if (this.type == 'presale' && this.goodsDetail.presale_id && this.goodsDetail.presale_num > 0) {
+							this.$util.showToast({
+								title: '该商品每人限购' + this.goodsDetail.presale_num + this.goodsDetail.unit
+							});
+							return;
+						}
+					}
+				} else if (tag == '-') {
+					// 减
+					if (this.number > min) {
+						this.number -= 1;
+					} else {
+						if (this.minBuy > 1) {
+							this.$util.showToast({
+								title: '该商品' + this.minBuy + this.goodsDetail.unit + '起售'
+							});
+						}
+						return;
+					}
+				}
+				if (this.number > this.limitNumber && this.limitNumber) {
+					this.number = this.limitNumber;
+				}
+			},
+			blur() {
+				if (!this.number) {
+					this.number = 0;
+				}
+				if (this.number > this.limitNumber && this.limitNumber) {
+					this.number = this.limitNumber;
+				}
+				if (this.number < this.minNumber && this.minNumber) {
+					this.number = this.minNumber;
+				}
+
+				if (this.goodsDetail.is_limit == 1 && this.maxBuy > 0 && this.number > this.maxBuy) {
+					this.number = this.maxBuy;
+				}
+
+				if (this.goodsDetail.is_limit == 1 && this.maxBuy > 0 && this.goodsDetail.purchased_num > 0) {
+					let maxBuy = this.maxBuy - this.goodsDetail.purchased_num;
+					if (this.number > maxBuy) this.number = maxBuy;
+				}
+				if (this.number < this.minBuy && this.minBuy > 0) {
+					this.number = this.minBuy;
+				}
+
+				if (this.number <= 0) {
+					this.number = 1;
+				}
+			},
+			//输入数量
+			keyInput(flag, callback) {
+				setTimeout(() => {
+					var stock = this.goodsDetail.stock;
+
+					// 库存为0
+					if (this.goodsDetail.stock == 0) {
+						this.number = 0;
+						return;
+					}
+
+					// 防止空
+					if (flag && this.number.length == 0) this.number = 1;
+
+					// 防止输入0和负数、非法输入
+					if (flag && (this.number <= 0 || isNaN(this.number))) this.number = 1;
+
+					if (this.type == 'pintuan' && this.goodsDetail.pintuan_id && this.number > this.goodsDetail.buy_num) {
+						//限购数量大于库存总数取库存
+						this.number = this.goodsDetail.buy_num;
+					} else if (this.type == 'groupbuy' && this.goodsDetail.groupbuy_id && this.number < this.goodsDetail.buy_num) {
+						//最低购买数量
+						this.number = 1;
+					} else if (this.type == 'seckill' && this.goodsDetail.seckill_id && this.goodsDetail.max_buy > 0 && this.number > this.goodsDetail.max_buy) {
+						//限购数量大于库存总数取库存
+						this.number = this.goodsDetail.max_buy;
+					} else if (this.type == 'bargain' && this.goodsDetail.bargain_id) {
+						// 砍价
+						this.number = 1;
+					} else if (this.type == 'presale' && this.goodsDetail.presale_id && this.goodsDetail.presale_num > 0 && this.number > this.goodsDetail.presale_num) {
+						// 预售
+						this.number = this.goodsDetail.presale_num;
+					} else if (this.number > stock) {
+						this.number = stock;
+					}
+					// 商品起售数
+					if (this.minBuy > 1 && this.number < this.minBuy) {
+						this.number = this.minBuy;
+					}
+
+					if (flag) this.number = parseInt(this.number);
+					if (callback) callback();
+				}, 0);
+			},
+
+			//提交
+			confirm(isJoinCartBtn = false) {
+				// 删除待付款物流方式缓存
+				uni.removeStorageSync('delivery');
+				if (this.preview) {
+					this.$util.showToast({
+						title: '预览商品无法购买'
+					});
+					return;
+				}
+				if (this.goodsDetail.goods_state == 0) return;
+
+				if (!this.storeToken) {
+					this.$refs.login.open();
+					return;
+				}
+
+				//纠正数量
+				this.keyInput(true, () => {
+					if (this.goodsDetail.stock == 0) {
+						this.$util.showToast({
+							title: '商品已售罄'
+						});
+						return;
+					}
+
+					if (this.number.length == 0 || this.number <= 0) {
+						this.$util.showToast({
+							title: '购买数量不能小于等于0'
+						});
+						return;
+					}
+
+					if (this.goodsDetail.buy_num > this.goodsDetail.stock) {
+						this.$util.showToast({
+							title: '库存小于最低购买数量'
+						});
+						return;
+					}
+
+					if (this.number > this.goodsDetail.stock) {
+						this.$util.showToast({
+							title: '库存不足'
+						});
+						return;
+					}
+
+					if (this.goodsDetail.is_limit == 1 && this.goodsDetail.limit_type == 1 && this.maxBuy > 0 && this.number > this.maxBuy) {
+						this.$util.showToast({
+							title: '该商品每次最多购买' + this.maxBuy + this.goodsDetail.unit
+						});
+						return;
+					}
+
+					if (this.goodsDetail.is_limit == 1 && this.goodsDetail.limit_type == 2 && this.maxBuy > 0 &&
+						this.number + this.goodsDetail.purchased_num > this.maxBuy) {
+						let message = '该商品每人限购' + this.maxBuy + this.goodsDetail.unit;
+						message += this.goodsDetail.purchased_num > 0 ? '，您已购买了' + this.goodsDetail.purchased_num + this.goodsDetail.unit : '';
+						this.$util.showToast({
+							title: message
+						});
+						return;
+					}
+
+					if ((this.type == 'join_cart' || isJoinCartBtn) && this.goodsDetail.is_limit == 1 && this.maxBuy > 0 && this.cartNum + this.number > this.maxBuy) {
+						this.$util.showToast({
+							title: '该商品每人限购' + this.maxBuy + this.goodsDetail.unit
+						});
+						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
+						});
+					}
+
+					if (this.btnSwitch) return;
+					this.btnSwitch = true;
+
+					if (this.type == 'join_cart' || isJoinCartBtn) {
+						this.$api.sendRequest({
+							url: '/api/cart/add',
+							data: {
+								sku_id: this.skuId,
+								num: this.number,
+								form_data: this.$refs.form ? JSON.stringify(this.$refs.form.formData) : ''
+							},
+							success: res => {
+								var data = res.data;
+								if (data > 0) {
+									this.$util.showToast({
+										title: '加入购物车成功'
+									});
+									this.cartNum += this.number;
+
+									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;
+									}
+
+									if (this.callback) this.callback({
+										cart_id: data,
+										goods_id: this.goodsDetail.goods_id,
+										sku_id: this.skuId,
+										num: this.cartNum,
+										discount_price
+									});
+								}
+								if(this.$refs.skuPopup) this.$refs.skuPopup.close();
+								this.btnSwitch = false;
+							},
+							fail: res => {
+								if(this.$refs.skuPopup) this.$refs.skuPopup.close();
+								this.btnSwitch = false;
+							}
+						});
+					} else if (this.type == 'buy_now') {
+						var data = {
+							sku_id: this.skuId,
+							num: this.number
+						};
+
+						uni.setStorage({
+							key: 'orderCreateData',
+							data: data,
+							success: () => {
+								this.$util.redirectTo('/pages/order/payment');
+								this.btnSwitch = false;
+							}
+						});
+					} else if (this.type == 'seckill') {
+						// 秒杀
+						var data = {
+							seckill_id: this.goodsDetail.seckill_id,
+							num: this.number,
+							sku_id: this.skuId
+						};
+
+						uni.setStorage({
+							key: 'seckillOrderCreateData',
+							data: data,
+							success: () => {
+								this.$util.redirectTo('/pages_promotion/seckill/payment');
+								this.btnSwitch = false;
+							}
+						});
+					} else if (this.type == 'pintuan') {
+						// 拼团
+						var data = {
+							pintuan_goods_id: this.goodsDetail.id,
+							group_id: this.goodsDetail.group_id,
+							num: this.number
+						};
+						if (this.goodsDetail.pintuan_type == 'ladder' && !data.group_id) {
+							data.extend = JSON.stringify({
+								pintuan_num: this.goodsDetail[this.goodsDetail['pintuan_num_field']]
+							});
+						}
+
+						uni.setStorage({
+							key: 'pintuanOrderCreateData',
+							data: data,
+							success: () => {
+								this.$util.redirectTo('/pages_promotion/pintuan/payment');
+								this.btnSwitch = false;
+							}
+						});
+					} else if (this.type == 'pinfan') {
+						// 拼团
+						var data = {
+							pintuan_goods_id: this.goodsDetail.id,
+							group_id: this.goodsDetail.group_id,
+							num: this.number
+						};
+						uni.setStorage({
+							key: 'pinfanOrderCreateData',
+							data: data,
+							success: () => {
+								this.$util.redirectTo('/pages_promotion/pinfan/payment');
+								this.btnSwitch = false;
+							}
+						});
+					} else if (this.type == 'topic') {
+						// 专题
+						var data = {
+							topic_goods_id: this.goodsDetail.id,
+							num: this.number
+						};
+
+						uni.setStorage({
+							key: 'topicOrderCreateData',
+							data: data,
+							success: () => {
+								this.$util.redirectTo('/pages_promotion/topics/payment');
+								this.btnSwitch = false;
+							}
+						});
+					} else if (this.type == 'groupbuy') {
+						// 团购
+						var data = {
+							groupbuy_id: this.goodsDetail.groupbuy_id,
+							sku_id: this.skuId,
+							num: this.number
+						};
+
+						uni.setStorage({
+							key: 'groupbuyOrderCreateData',
+							data: data,
+							success: () => {
+								this.$util.redirectTo('/pages_promotion/groupbuy/payment');
+								this.btnSwitch = false;
+							}
+						});
+					} else if (this.type == 'presale') {
+						// 预售
+						var data = {
+							presale_id: this.goodsDetail.presale_id,
+							sku_id: this.skuId,
+							num: this.number
+						};
+						uni.setStorage({
+							key: 'presaleOrderCreateData',
+							data: data,
+							success: () => {
+								this.$util.redirectTo('/pages_promotion/presale/payment');
+								this.btnSwitch = false;
+							}
+						});
+					} 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', {
+											b_id: this.goodsDetail.bargain_id,
+											l_id: res.data
+										},
+										'redirectTo'
+									);
+								} else {
+									this.$util.showToast({
+										title: res.message
+									});
+								}
+							}
+						});
+					} else if (this.type == 'point') {
+						// 积分兑换
+						var data = {
+							id: this.goodsDetail.exchange_id,
+							sku_id: this.skuId,
+							num: this.number
+						};
+						uni.setStorage({
+							key: 'exchangeOrderCreateData',
+							data: data,
+							success: () => {
+								this.$util.redirectTo('/pages_promotion/point/payment');
+								this.btnSwitch = false;
+							}
+						});
+					} else if (this.type == 'bale') {
+						if (!this.confirmDisabled) {
+							this.btnSwitch = false;
+							this.$emit('confirm', {
+								detail: this.goodsDetail,
+								goods_id: this.goodsDetail
+									.goods_id,
+								sku_id: this.goodsDetail.sku_id,
+								num: this.number
+							});
+						}
+					} else if (this.type == 'confirm') {
+						this.btnSwitch = false;
+						if(this.$refs.skuPopup) this.$refs.skuPopup.close();
+						if (this.callback) this.callback(this.skuId, this.number);
+					}
+				});
+			},
+			closeSkuPopup() {
+				this.$emit('hideSkuPop');
+				if(this.$refs.skuPopup) this.$refs.skuPopup.close();
+			},
+			imageError() {
+				this.goodsDetail.sku_image = this.$util.getDefaultImage().goods;
+				this.$forceUpdate();
+			},
+			valueImageError(index, index_value) {
+				this.goodsDetail.goods_spec_format[index].value[index_value].image = this.$util.getDefaultImage().goods;
+				this.$forceUpdate();
+			},
+			// 获取购物车数据
+			getCartData() {
+				this.$api.sendRequest({
+					url: '/api/cart/goodsnum',
+					data: {
+						goods_id: this.goodsDetail.goods_id
+					},
+					success: res => {
+						if (res.code >= 0) {
+							this.cartNum = res.data;
+						}
+					}
+				});
+			}
+		}
+	};
+</script>
+<style lang="scss">
+	.sku-info {
+		max-height: 75vh;
+		height: 45vh;
+		position: relative;
+		z-index: 999;
+	}
+
+	.sku-info .header {
+		padding: 30rpx 30rpx 20rpx 210rpx;
+		position: relative;
+		border-bottom: 2rpx solid $color-line;
+		min-height: 170rpx;
+	}
+
+	.sku-info .header .img-wrap {
+		width: 160rpx;
+		height: 160rpx;
+		position: absolute;
+		left: 20rpx;
+		border-radius: $border-radius;
+		overflow: hidden;
+		padding: 2rpx;
+		background-color: #fff;
+		line-height: 208rpx;
+	}
+
+	.sku-info .header .img-wrap image {
+		width: inherit;
+		height: inherit;
+	}
+
+	.sku-info .main {
+		font-size: 24rpx;
+		line-height: 40rpx;
+		padding-right: 40rpx;
+
+		.price-wrap {
+			font-weight: bold;
+
+			.unit {
+				margin-right: 4rpx;
+			}
+		}
+
+		.stock {
+			font-size: $font-size-tag;
+			color: $color-tip;
+			display: -webkit-box;
+			-webkit-line-clamp: 2;
+			-webkit-box-orient: vertical;
+			height: 70rpx;
+			overflow: hidden;
+		}
+	}
+
+	.sku-info .main .price {
+		word-wrap: break-word;
+	}
+
+	.sku-info .main .sku-name {
+		display: -webkit-box;
+		-webkit-line-clamp: 1;
+		-webkit-box-orient: vertical;
+		overflow: hidden;
+		height: 42rpx;
+
+		.spec-value {
+			&::after {
+				content: '/';
+			}
+
+			&:last-child {
+				&::after {
+					content: '';
+				}
+			}
+		}
+	}
+
+	.sku-info .sku-close {
+		position: absolute;
+		top: 20rpx;
+		right: 40rpx;
+		width: 40rpx;
+		height: 80rpx;
+		font-size: 40rpx;
+	}
+
+	.body-item {
+		padding: 0 30rpx;
+		height: calc(100% - 360rpx);
+		box-sizing: border-box;
+		overflow: scroll;
+	}
+
+	.body-item .wrap {
+		height: calc(100% - 60rpx);
+	}
+
+	.body-item .sku-list-wrap {
+		padding-bottom: 0rpx;
+	}
+
+	.body-item .sku-list-wrap .title {
+		padding: 20rpx 0;
+		display: block;
+	}
+
+	.body-item .sku-list-wrap .items {
+		position: relative;
+		display: inline-block;
+		border: 2rpx solid $color-line;
+		padding: 4rpx 30rpx;
+		border-radius: 8rpx;
+		margin: 0 20rpx 20rpx 0;
+		background-color: #fff;
+		font-size: $font-size-tag;
+	}
+
+	.body-item .sku-list-wrap .selected {
+		color: $base-color;
+		border-color: $base-color;
+	}
+
+	.body-item .sku-list-wrap .items.disabled {
+		border: 2rpx dashed;
+	}
+
+	.body-item .sku-list-wrap .items image {
+		height: 44rpx;
+		width: 44rpx;
+		border-radius: $border-radius;
+		margin-right: 10rpx;
+		display: inline-block;
+		vertical-align: middle;
+	}
+
+	.body-item .number-wrap .number-line {
+		padding: 20rpx 0;
+		line-height: 72rpx;
+		display: flex;
+	}
+
+	.body-item .number-wrap .title {
+		font-weight: 400;
+	}
+
+	.body-item .number-wrap .limit-txt {}
+
+	.body-item .number-wrap .number {
+		display: flex;
+		height: 72rpx;
+		border-radius: 6rpx;
+		float: right;
+		justify-content: flex-end;
+		flex: 1;
+	}
+
+	.body-item .number-wrap .number button {
+		display: inline-block;
+		line-height: 64rpx;
+		height: 68rpx;
+		width: 60rpx;
+		font-size: 48rpx;
+		box-sizing: content-box;
+		border: 2rpx solid $color-line;
+		padding: 0;
+		margin: 0;
+		border-radius: 0;
+		background-color: #fff !important;
+
+		&.disabled {
+			background: #f7f7f7 !important;
+		}
+	}
+
+	.body-item .number-wrap .number button.decrease {
+		border-right-width: 0 !important;
+	}
+
+	.body-item .number-wrap .number button.increase {
+		border-left: 0 !important;
+	}
+
+	.body-item .number-wrap .number button:after {
+		border-radius: 0;
+		border: none;
+	}
+
+	.body-item .number-wrap .number input {
+		display: inline-block;
+		line-height: 64rpx;
+		height: 68rpx;
+		min-width: 90rpx;
+		text-align: center;
+		font-weight: 700;
+		border: 2rpx solid;
+		margin: 0;
+		vertical-align: top;
+		background-color: $color-bg !important;
+		flex: 0;
+		padding: 0 5px;
+	}
+
+	.footer {
+		height: 100rpx;
+		width: 100%;
+		position: absolute;
+		bottom: 30rpx;
+		bottom: calc(30rpx + constant(safe-area-inset-bottom));
+		bottom: calc(30rpx + env(safe-area-inset-bottom));
+		color: #fff;
+		z-index: 1;
+		display: flex;
+		justify-content: center;
+		align-items: flex-start;
+
+		button {
+			width: 100%;
+			height: 80rpx;
+			background-color: var(--goods-btn-color);
+			font-weight: bold;
+			border: none;
+		}
+	}
+
+	.presale-stock {
+		height: auto !important;
+	}
+
+	.balance {
+		margin-left: 10rpx;
+		display: inline-block;
+		line-height: 1.3;
+		font-size: $font-size-tag;
+
+		text {
+			font-weight: normal;
+		}
+
+		.unit {
+			margin-right: 0 !important;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/components/ns-loading/ns-loading.vue b/components/ns-loading/ns-loading.vue
new file mode 100644
index 0000000..eb4507c
--- /dev/null
+++ b/components/ns-loading/ns-loading.vue
@@ -0,0 +1,89 @@
+<template>
+	<view class="mescroll-downwarp">
+		<view class="downwarp-content">
+			<view class="downwarp-progress mescroll-rotate" style="transform" v-if="isRotate"></view>
+			<view class="downwarp-tip">{{ downText }}</view>
+		</view>
+	</view>
+</template>
+
+<script>
+export default {
+	name: 'ns-loading',
+	props: {
+		downText: {
+			type: String,
+			default: '加载中'
+		},
+		isRotate: {
+			type: Boolean,
+			default: false
+		}
+	},
+	data() {
+		return {
+			isShow: true
+		};
+	},
+	methods: {
+		show() {
+			this.isShow = true;
+		},
+		hide() {
+			this.isShow = false;
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+/* 下拉刷新区域 */
+.mescroll-downwarp {
+	width: 100%;
+	height: 100%;
+	text-align: center;
+}
+
+/* 下拉刷新--内容区,定位于区域底部 */
+.mescroll-downwarp .downwarp-content {
+	width: 100%;
+	min-height: 60rpx;
+	padding: 20rpx 0;
+	text-align: center;
+}
+
+/* 下拉刷新--提示文本 */
+.mescroll-downwarp .downwarp-tip {
+	display: inline-block;
+	font-size: 28rpx;
+	color: gray;
+	vertical-align: middle;
+	margin-left: 16rpx;
+}
+
+/* 下拉刷新--旋转进度条 */
+.mescroll-downwarp .downwarp-progress {
+	display: inline-block;
+	width: 32rpx;
+	height: 32rpx;
+	border-radius: 50%;
+	border: 2rpx solid gray;
+	border-bottom-color: transparent;
+	vertical-align: middle;
+}
+
+/* 旋转动画 */
+.mescroll-downwarp .mescroll-rotate {
+	animation: mescrollDownRotate 0.6s linear infinite;
+}
+
+@keyframes mescrollDownRotate {
+	0% {
+		transform: rotate(0deg);
+	}
+
+	100% {
+		transform: rotate(360deg);
+	}
+}
+</style>
diff --git a/components/ns-login/ns-login.vue b/components/ns-login/ns-login.vue
new file mode 100644
index 0000000..3d431b6
--- /dev/null
+++ b/components/ns-login/ns-login.vue
@@ -0,0 +1,784 @@
+<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;
+	}
+</style>
\ No newline at end of file
diff --git a/components/ns-navbar/ns-navbar.vue b/components/ns-navbar/ns-navbar.vue
new file mode 100644
index 0000000..6667b50
--- /dev/null
+++ b/components/ns-navbar/ns-navbar.vue
@@ -0,0 +1,404 @@
+<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;
+			}
+		}
+	}
+}
+</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
new file mode 100644
index 0000000..a6553c9
--- /dev/null
+++ b/components/ns-new-gift/ns-new-gift.vue
@@ -0,0 +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;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/components/ns-payment/ns-payment.vue b/components/ns-payment/ns-payment.vue
new file mode 100644
index 0000000..ba31411
--- /dev/null
+++ b/components/ns-payment/ns-payment.vue
@@ -0,0 +1,647 @@
+<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;
+    }
+</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
new file mode 100644
index 0000000..15a5553
--- /dev/null
+++ b/components/ns-select-time/ns-select-time.vue
@@ -0,0 +1,369 @@
+<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>
diff --git a/components/ns-switch/ns-switch.vue b/components/ns-switch/ns-switch.vue
new file mode 100644
index 0000000..8ce894b
--- /dev/null
+++ b/components/ns-switch/ns-switch.vue
@@ -0,0 +1,69 @@
+<template>
+	<view>
+		<view class="weui-switch" :class="{ 'weui-switch-on': checked, 'color-base-border': checked }" @click="change()">
+			<view class="bgview" :class="{ 'color-base-bg': checked }"></view>
+			<view class="spotview"></view>
+		</view>
+	</view>
+</template>
+<script>
+export default {
+	name: 'nsSwitch',
+	props: {
+		checked: {
+			type: Boolean,
+			default: false
+		}
+	},
+	methods: {
+		change() {
+			this.$emit('change');
+		}
+	}
+};
+</script>
+<style>
+.weui-switch {
+	display: block;
+	position: relative;
+	width: 94rpx;
+	height: 45rpx;
+	outline: 0;
+	border-radius: 30rpx;
+	border: 2rpx solid;
+	border-color: #dfdfdf;
+	transition: background-color 0.1s, border 0.1s;
+}
+
+.weui-switch .bgview {
+	content: ' ';
+	position: absolute;
+	top: 0;
+	left: 0;
+	width: 94rpx;
+	height: 45rpx;
+	border-radius: 30rpx;
+	transition: transform 0.35s cubic-bezier(0.45, 1, 0.4, 1);
+}
+.weui-switch .spotview {
+	content: ' ';
+	position: absolute;
+	top: 2rpx;
+	left: 4rpx;
+	width: 40rpx;
+	height: 40rpx;
+	border-radius: 50%;
+	background-color: #ffffff;
+	box-shadow: 0 2rpx 6rpx rgba(0, 0, 0, 0.4);
+	transition: transform 0.35s cubic-bezier(0.4, 0.4, 0.25, 1.35);
+}
+.weui-switch-on {
+	border-color: #6f6f6f;
+}
+.weui-switch-on .bgview {
+	border-color: #1aad19;
+}
+.weui-switch-on .spotview {
+	transform: translateX(48rpx);
+}
+</style>
diff --git a/components/payment/payment.vue b/components/payment/payment.vue
new file mode 100644
index 0000000..4147770
--- /dev/null
+++ b/components/payment/payment.vue
@@ -0,0 +1,654 @@
+<template>
+    <view>
+        <!-- 选择支付方式弹窗 -->
+        <uni-popup ref="choosePaymentPopup" type="center" v-if="payInfo" :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">
+                    <view class="pay-money">
+                        <text class="money">支付金额{{ payMoney|moneyFormat }}元</text>
+                    </view>
+
+                    <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>
+                            <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>
+                        <block v-else>
+                            <view class="empty">平台尚未配置支付方式！</view>
+                        </block>
+                    </block>
+                </scroll-view>
+                <view class="popup-footer">
+                    <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: 'payment',
+        components: {
+            uniPopup,
+            nsSwitch
+        },
+        props: {
+            // 是否可用余额支付
+            balanceUsable: {
+                type: Boolean,
+                default: true
+            }
+        },
+        data() {
+            return {
+                payIndex: 0,
+                // #ifdef H5
+                payTypeList: [{
+                        name: '支付宝支付',
+                        icon: 'icon-zhifubaozhifu-',
+                        type: 'alipay'
+                    },
+                    {
+                        name: '微信支付',
+                        icon: 'icon-weixin1',
+                        type: 'wechatpay'
+                    }
+                ],
+                timer: null,
+                // #endif
+                // #ifdef MP-WEIXIN
+                payTypeList: [{
+                    name: '微信支付',
+                    provider: 'wxpay',
+                    icon: 'icon-weixin1',
+                    type: 'wechatpay'
+                }],
+                // #endif
+                // #ifdef MP-ALIPAY
+                payTypeList: [{
+                    name: '支付宝支付',
+                    icon: 'icon-zhifubaozhifu-',
+                    type: 'alipay',
+                    provider: 'alipay'
+                }],
+                // #endif
+                payInfo: null,
+                balanceConfig: 0,
+                // 预售页面判断
+                sale: true,
+                isBalance: 0,
+                balance: 0
+            };
+        },
+        created(e) {
+            this.getPayType();
+            if (this.balanceUsable) this.getBalanceConfig();
+        },
+        computed: {
+            balanceDeduct() {
+                let money = 0;
+                if (this.payInfo && this.balance) {
+                    money = this.balance > this.payInfo.pay_money ? this.payInfo.pay_money : this.balance;
+                }
+                return money;
+            },
+            payMoney() {
+                let money = 0;
+                if (this.payInfo) {
+                    money = this.payInfo.pay_money;
+                    if (this.balanceDeduct && this.isBalance && this.balanceUsable) {
+                        money = this.payInfo.pay_money - this.balanceDeduct;
+                    }
+                }
+                return money;
+            }
+        },
+        methods: {
+            close() {
+                this.$emit('close');
+                this.$refs.choosePaymentPopup.close();
+            },
+            // 使用余额
+            useBalance() {
+                this.isBalance = this.isBalance ? 0 : 1;
+                this.$emit('useBalance', this.isBalance)
+            },
+            confirm() {
+                if (this.payTypeList.length == 0 && this.payMoney > 0) {
+                    this.$util.showToast({
+                        title: '请选择支付方式！'
+                    });
+                    return;
+                }
+                uni.showLoading({
+                    title: '支付中...',
+                    mask: true
+                });
+                this.pay();
+                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.balanceConfig && this.balanceUsable) this.getMemberBalance();
+                            setTimeout(() => {
+                                this.$refs.choosePaymentPopup.open();
+                            })
+                        } else {
+                            this.$util.showToast({
+                                title: '未获取到支付信息！'
+                            });
+                        }
+                    }
+                });
+            },
+            /**
+             * 获取余额配置
+             */
+            getBalanceConfig() {
+			
+                this.$api.sendRequest({
+                    url: '/api/pay/getBalanceConfig',
+                    data: {},
+                    success: res => {
+                        this.balanceConfig = res.data.balance_show;
+                    }
+                });
+            },
+            /**
+             * 获取用户余额
+             */
+            getMemberBalance() {
+                this.$api.sendRequest({
+                    url: '/api/memberaccount/usablebalance',
+                    success: res => {
+                        if (res.code == 0 && res.data) {
+                            this.balance = parseFloat(res.data.usable_balance);
+							//余额不足以抵扣整个订单时不显示
+							if(parseFloat(this.payMoney) > this.balance){
+								this.balanceConfig = 0
+							}
+                        }
+                    }
+                })
+            },
+            /**
+             * 查询支付方式
+             */
+            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];
+                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 ? payType.type : '',
+                        return_url: encodeURIComponent(this.$config.h5Domain + return_url + this.payInfo
+                            .out_trade_no),
+                        is_balance: this.isBalance
+                    },
+                    success: res => {
+                        uni.hideLoading();
+                        if (res.code >= 0) {
+                            if (res.data.pay_success) {
+                                this.paySuccess();
+                                return;
+                            }
+                            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') {
+                                                            this.paySuccess();
+                                                        } else {
+                                                            this.$util.showToast({
+                                                                title: res.errMsg
+                                                            });
+                                                            setTimeout(() => {
+                                                                this.close();
+                                                            }, 1500)
+                                                        }
+                                                    },
+                                                    res => {
+                                                        this.$util.showToast({
+                                                            title: '您已取消支付'
+                                                        });
+                                                        this.resetpay();
+                                                    }
+                                                );
+                                            }
+                                        });
+                                    } 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.paySuccess();
+                                }
+                            } else {
+                                clearInterval(this.timer);
+                            }
+                        }
+                    });
+                }, 1000);
+            },
+            // #endif
+            // #ifdef MP
+            pay() {
+                var payType = this.payTypeList[this.payIndex];
+                this.$api.sendRequest({
+                    url: '/api/pay/pay',
+                    data: {
+                        out_trade_no: this.payInfo.out_trade_no,
+                        pay_type: payType ? payType.type : '',
+                        scene: uni.getStorageSync('is_test') ? 1175 : wx.getLaunchOptionsSync().scene,
+                        is_balance: this.isBalance
+                    },
+                    success: res => {
+                        uni.hideLoading();
+                        if (res.code >= 0) {
+                            if (res.data.pay_success) {
+                                this.paySuccess();
+                                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 {
+                            this.$util.showToast({
+                                title: res.message
+                            });
+                        }
+                    },
+                    fail: res => {
+                        uni.hideLoading();
+                        this.$util.showToast({
+                            title: 'request:fail'
+                        });
+                    }
+                });
+            },
+            // #endif
+            /**
+             * 支付成功之后跳转
+             */
+            paySuccess() {
+                if (this.payInfo.event == 'BlindboxGoodsOrderPayNotify') {
+                    this.$util.redirectTo('/pages_promotion/blindbox/index', {
+                        outTradeNo: this.payInfo.out_trade_no
+                    }, 'redirectTo');
+                } else if (this.payInfo.return_url) {
+                    if (this.payInfo.return_url.indexOf('http://') != -1 || this.payInfo.return_url.indexOf('https://') != -1) location.replace(this.payInfo.return_url);
+                    else this.$util.redirectTo(this.payInfo.return_url, {}, 'redirectTo');
+                } else {
+                    this.$util.redirectTo('/pages_tool/pay/result', {
+                        code: this.payInfo.out_trade_no
+                    }, 'redirectTo');
+                }
+            },
+            /**
+             * 重置支付单据
+             */
+            resetpay() {
+                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);
+                    }
+                })
+            }
+        },
+        // #ifdef H5
+        deactivated() {
+            clearInterval(this.timer);
+        },
+        // #endif
+    };
+</script>
+
+<style lang="scss" scoped>
+    .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;
+            }
+
+            &.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/pengpai-fadein-out/pengpai-fadein-out.vue b/components/pengpai-fadein-out/pengpai-fadein-out.vue
new file mode 100644
index 0000000..31c32aa
--- /dev/null
+++ b/components/pengpai-fadein-out/pengpai-fadein-out.vue
@@ -0,0 +1,269 @@
+<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/pick-regions/pick-regions.vue b/components/pick-regions/pick-regions.vue
new file mode 100644
index 0000000..e47d1fa
--- /dev/null
+++ b/components/pick-regions/pick-regions.vue
@@ -0,0 +1,305 @@
+<template>
+    <view class="pick-regions">
+        <!-- #ifndef MP-ALIPAY -->
+        <picker mode="multiSelector" :value="multiIndex" :range="multiArray" @change="handleValueChange" @columnchange="handleColumnChange">
+            <slot></slot>
+        </picker>
+        <!-- #endif -->
+
+        <!-- #ifdef MP-ALIPAY -->
+        <view @click="$refs.regionsRef.open()">
+            <slot></slot>
+        </view>
+
+        <uni-popup type="bottom" ref="regionsRef">
+            <view class="regions-picker-container">
+                <view class="picker-header">
+                    <view class="picker-action cancel" @click="$refs.regionsRef.close()">取消</view>
+                    <view class="picker-action confirm" @click="confirmRegions">完成</view>
+                </view>
+                <picker-view :value="multiIndex" @change="pickerViewColumnChange" class="picker-view">
+                    <picker-view-column v-if="multiArray[0]">
+                        <view class="item" v-for="(item,index) in multiArray[0]" :key="index">{{item}}</view>
+                    </picker-view-column>
+                    <picker-view-column v-if="multiArray[1]">
+                        <view class="item" v-for="(item,index) in multiArray[1]" :key="index">{{item}}</view>
+                    </picker-view-column>
+                    <picker-view-column v-if="multiArray[2]">
+                        <view class="item" v-for="(item,index) in multiArray[2]" :key="index">{{item}}</view>
+                    </picker-view-column>
+                </picker-view>
+            </view>
+        </uni-popup>
+        <!-- #endif -->
+    </view>
+</template>
+
+<script>
+    export default {
+        props: {
+            defaultRegions: {
+                type: Array
+            },
+            selectArr: {
+                type: String
+            }
+        },
+        data() {
+            return {
+                pickerValueArray: [],
+                cityArr: [],
+                districtArr: [],
+                multiIndex: [0, 0, 0],
+                isInitMultiArray: false,
+                // 是否加载完默认地区
+                isLoadDefaultAreas: false
+            };
+        },
+        watch: {
+            defaultRegions: {
+                handler(arr, oldArr = []) {
+                    // 避免传的是字面量的时候重复触发
+                    if (arr.length != this.selectArr || arr.join('') === oldArr.join('')) return;
+                    this.isInitMultiArray = false;
+                    this.handleDefaultRegions();
+                },
+                immediate: true
+            }
+        },
+        computed: {
+            multiArray() {
+                if (!this.isLoadDefaultAreas) return;
+                var arr = this.pickedArr.map(arr => arr.map(item => item.label));
+                return arr;
+            },
+            pickedArr() {
+                // 进行初始化
+                if (this.isInitMultiArray) {
+                    if (this.selectArr == '2') {
+                        return [this.pickerValueArray[0], this.pickerValueArray[1]];
+                    } else {
+                        return [this.pickerValueArray[0], this.pickerValueArray[1], this.pickerValueArray[2]];
+                    }
+                }
+
+                if (this.selectArr == '2') {
+                    return [this.pickerValueArray[0], this.cityArr];
+                } else {
+                    return [this.pickerValueArray[0], this.cityArr, this.districtArr];
+                }
+            }
+        },
+        created() {
+            this.getDefaultAreas(0, { level: 0 });
+        },
+        methods: {
+            async pickerViewColumnChange(e) {
+                var value = e.detail.value;
+                if (value[0] != this.multiIndex[0]) {
+                    await this.handleColumnChange({ detail: { column: 0, value: value[0] } })
+                    this.multiIndex[1] = e.detail.value[1] || 0;
+                    await this.handleColumnChange({ detail: { column: 1, value: value[1] } })
+                    this.multiIndex[2] = e.detail.value[2] || 0;
+                } else if (value[1] != this.multiIndex[1]) {
+                    await this.handleColumnChange({ detail: { column: 1, value: value[1] } })
+                    this.multiIndex[2] = e.detail.value[2] || 0;
+                } else {
+                    this.multiIndex = value
+                }
+            },
+            confirmRegions() {
+                this.handleValueChange({ detail: { value: this.multiIndex } })
+                this.$refs.regionsRef.close()
+            },
+            async handleColumnChange(e) {
+                this.isInitMultiArray = false;
+                let col = e.detail.column;
+                let row = e.detail.value;
+                this.multiIndex[col] = row;
+                switch (col) {
+                    case 0:
+                        //选择省，加载市、区县
+                        this.cityArr = await this.getAreasAsync(this.pickerValueArray[0][this.multiIndex[col]].value);
+                        this.districtArr = await this.getAreasAsync(this.cityArr[0].value);
+                        break;
+                    case 1:
+                        //选择市，加载区县
+                        this.districtArr = await this.getAreasAsync(this.cityArr[this.multiIndex[col]].value);
+                        break;
+                    case 2:
+                        if (!this.cityArr.length) this.cityArr = await this.getAreasAsync(this.pickerValueArray[0][0].value)
+                        if (!this.districtArr.length) this.districtArr = await this.getAreasAsync(this.cityArr[0].value);
+                        break;
+                }
+            },
+            handleValueChange(e) {
+                // 结构赋值
+                let [index0, index1, index2] = e.detail.value;
+                let [arr0, arr1, arr2] = this.pickedArr;
+                let address = '';
+                if (this.selectArr == '2') {
+                    address = [arr0[index0], arr1[index1]];
+                } else {
+                    address = [arr0[index0], arr1[index1], arr2[index2]];
+                }
+                this.$emit('getRegions', address);
+            },
+            handleDefaultRegions() {
+                var time = setInterval(() => {
+                    // if (!this.isLoadDefaultAreas) return;
+					// console.log('this.pickerValueArray',this.pickerValueArray)
+                    for (let i = 0; i < this.defaultRegions.length; i++) {
+						if(this.pickerValueArray[i] == null) continue;
+                        for (let j = 0; j < this.pickerValueArray[i].length; j++) {
+                            // 匹配省
+                            if ((this.defaultRegions[i] == this.pickerValueArray[i][j].value || this.defaultRegions[i] == this.pickerValueArray[i][j].label) && this.pickerValueArray[i][j].level == 1) {
+                                // 设置选中省
+                                this.$set(this.multiIndex, i, j);
+
+                                // 查询市
+                                this.getAreas(this.pickerValueArray[i][j].value, data => {
+                                    this.cityArr = data;
+                                    this.$set(this.pickerValueArray, 1, data)
+                                    for (let k = 0; k < this.cityArr.length; k++) {
+                                        if (this.defaultRegions[1] == this.cityArr[k].value || this.defaultRegions[1] == this.cityArr[k].label) {
+                                            // 设置选中市
+                                            this.$set(this.multiIndex, 1, k);
+
+                                            // 查询区县
+                                            this.getAreas(this.cityArr[k].value, data => {
+                                                this.districtArr = data;
+                                                this.$set(this.pickerValueArray, 2, data)
+                                                 
+                                                // 设置选中区县
+                                                for (let u = 0; u < this.districtArr
+                                                    .length; u++) {
+                                                    if (this.defaultRegions[2] == this.districtArr[u].value || this.defaultRegions[2] == this.districtArr[u].label) {
+                                                        this.$set(this.multiIndex, 2, u);
+                                                        this.handleValueChange({
+                                                            detail: {
+                                                                value: [j, k, u]
+                                                            }
+                                                        });
+                                                        break;
+                                                    }
+                                                }
+                                            });
+
+                                            break;
+                                        }
+                                    }
+                                });
+                            }
+                        }
+                    }
+                    if (this.isLoadDefaultAreas) clearInterval(time);
+                }, 100);
+            },
+            getDefaultAreas(pid, obj) {
+                this.$api.sendRequest({
+                    url: '/api/address/lists',
+                    data: { pid: pid },
+                    success: res => {
+                        if (res.code == 0) {
+                            var data = [];
+                            var selected = undefined;
+                            res.data.forEach((item, index) => {
+                                if (obj != undefined) {
+                                    if (obj.level == 0 && obj.province_id != undefined) {
+                                        selected = obj.province_id;
+                                    } else if (obj.level == 1 && obj.city_id != undefined) {
+                                        selected = obj.city_id;
+                                    } else if (obj.level == 2 && obj.district_id != undefined) {
+                                        selected = obj.district_id;
+                                    }
+                                }
+
+                                if (selected == undefined && index == 0) {
+                                    selected = item.id;
+                                }
+                                data.push({
+                                    value: item.id,
+                                    label: item.name,
+                                    level: item.level
+                                });
+                            });
+
+                            this.pickerValueArray[obj.level] = data;
+                            if (obj.level + 1 < 3) {
+                                obj.level++;
+                                this.getDefaultAreas(selected, obj);
+                            } else {
+                                this.isInitMultiArray = true;
+                                this.isLoadDefaultAreas = true;
+                                this.handleDefaultRegions()
+                            }
+                        }
+                    }
+                });
+            },
+            // 同步获取地区
+            async getAreasAsync(pid) {
+                let res = await this.$api.sendRequest({
+                    url: '/api/address/lists',
+                    data: { pid: pid },
+                    async: false
+                });
+                if (res.code == 0) {
+                    var data = [];
+                    res.data.forEach((item, index) => {
+                        data.push({
+                            value: item.id,
+                            label: item.name,
+                            level: item.level
+                        });
+                    });
+                    return data;
+                }
+            },
+            // 异步获取地区
+            getAreas(pid, callback) {
+                this.$api.sendRequest({
+                    url: '/api/address/lists',
+                    data: { pid: pid },
+                    success: res => {
+                        if (res.code == 0) {
+                            var data = [];
+                            res.data.forEach((item, index) => {
+                                data.push({
+                                    value: item.id,
+                                    label: item.name,
+                                    level: item.level
+                                });
+                            });
+                            if (callback) callback(data);
+                        }
+                    }
+                });
+            }
+        }
+    };
+</script>
+
+<style lang="scss" scoped>
+    .regions-picker-container {
+        padding-bottom: constant(safe-area-inset-bottom);
+        padding-bottom: env(safe-area-inset-bottom);
+
+        .picker-header {
+            display: flex;
+            height: 45px;
+            align-items: center;
+            border-bottom: 2rpx solid #f5f5f5;
+            justify-content: space-between;
+
+            .picker-action {
+                padding: 0 28rpx;
+                font-size: 34rpx;
+            }
+
+            .confirm {
+                color: #007aff;
+            }
+        }
+    }
+</style>
\ No newline at end of file
diff --git a/components/register-reward/register-reward.vue b/components/register-reward/register-reward.vue
new file mode 100644
index 0000000..b567b1f
--- /dev/null
+++ b/components/register-reward/register-reward.vue
@@ -0,0 +1,297 @@
+<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%;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/components/toTop/toTop.vue b/components/toTop/toTop.vue
new file mode 100644
index 0000000..0eabd20
--- /dev/null
+++ b/components/toTop/toTop.vue
@@ -0,0 +1,58 @@
+<!-- 回到顶部的按钮 -->
+<template>
+	<image
+		class="mescroll-totop"
+		:class="[value ? 'mescroll-totop-in' : 'mescroll-totop-out']"
+		:src="$util.img('public/uniapp/common/mescroll-totop.png')"
+		mode="widthFix"
+		@click="toTopClick"
+	/>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			value: true
+		};
+	},
+	methods: {
+		toTopClick() {
+			this.$emit('toTop'); // 派发点击事件
+		}
+	}
+};
+</script>
+
+<style>
+/* 回到顶部的按钮 */
+.mescroll-totop {
+	z-index: 99;
+	position: fixed !important; /* 加上important避免编译到H5,在多mescroll中定位失效 */
+	right: 46rpx !important;
+	bottom: 272rpx !important;
+	width: 72rpx;
+	height: 72rpx;
+	border-radius: 50%;
+	opacity: 0;
+	transition: opacity 0.5s; /* 过渡 */
+	margin-bottom: var(--window-bottom); /* css变量 */
+}
+
+/* 适配 iPhoneX */
+.mescroll-safe-bottom {
+	margin-bottom: calc(var(--window-bottom) + constant(safe-area-inset-bottom)); /* window-bottom + 适配 iPhoneX */
+	margin-bottom: calc(var(--window-bottom) + env(safe-area-inset-bottom));
+}
+
+/* 显示 -- 淡入 */
+.mescroll-totop-in {
+	opacity: 1;
+}
+
+/* 隐藏 -- 淡出且不接收事件*/
+.mescroll-totop-out {
+	opacity: 0;
+	pointer-events: none;
+}
+</style>
diff --git a/components/uni-badge/uni-badge.vue b/components/uni-badge/uni-badge.vue
new file mode 100644
index 0000000..a59580e
--- /dev/null
+++ b/components/uni-badge/uni-badge.vue
@@ -0,0 +1,105 @@
+<template>
+	<text
+		v-if="text"
+		:class="inverted ? 'uni-badge-' + type + ' uni-badge--' + size + ' uni-badge-inverted' : 'uni-badge-' + type + ' uni-badge--' + size"
+		class="uni-badge"
+		@click="onClick()"
+	>
+		{{ text }}
+	</text>
+</template>
+
+<script>
+export default {
+	name: 'UniBadge',
+	props: {
+		type: {
+			type: String,
+			default: 'default'
+		},
+		inverted: {
+			type: Boolean,
+			default: false
+		},
+		text: {
+			type: String,
+			default: ''
+		},
+		size: {
+			// small.normal
+			type: String,
+			default: 'normal'
+		}
+	},
+	methods: {
+		onClick() {
+			this.$emit('click');
+		}
+	}
+};
+</script>
+
+<style>
+.uni-badge {
+	font-family: 'Helvetica Neue', Helvetica, sans-serif;
+	box-sizing: border-box;
+	font-size: 24rpx;
+	line-height: 1;
+	display: inline-block;
+	padding: 6rpx 12rpx;
+	color: #333;
+	border-radius: 200rpx;
+	background-color: #e5e5e5;
+}
+
+.uni-badge.uni-badge-inverted {
+	padding: 0 10rpx 0 0;
+	color: #999;
+	background-color: transparent;
+}
+
+.uni-badge-primary {
+	color: #fff;
+	background-color: #007aff;
+}
+
+.uni-badge-primary.uni-badge-inverted {
+	color: #007aff;
+	background-color: transparent;
+}
+
+.uni-badge-success {
+	color: #fff;
+	background-color: #4cd964;
+}
+
+.uni-badge-success.uni-badge-inverted {
+	color: #4cd964;
+	background-color: transparent;
+}
+
+.uni-badge-warning {
+	color: #fff;
+	background-color: #f0ad4e;
+}
+
+.uni-badge-warning.uni-badge-inverted {
+	color: #f0ad4e;
+	background-color: transparent;
+}
+
+.uni-badge-error {
+	color: #fff;
+	background-color: #dd524d;
+}
+
+.uni-badge-error.uni-badge-inverted {
+	color: #dd524d;
+	background-color: transparent;
+}
+
+.uni-badge--small {
+	transform: scale(0.8);
+	transform-origin: center center;
+}
+</style>
diff --git a/components/uni-count-down/uni-count-down.vue b/components/uni-count-down/uni-count-down.vue
new file mode 100644
index 0000000..2bdf21d
--- /dev/null
+++ b/components/uni-count-down/uni-count-down.vue
@@ -0,0 +1,252 @@
+<template>
+	<view class="uni-countdown">
+		<view
+			v-if="showDay && d > 0"
+			:style="{ borderColor: borderColor, color: color, background: backgroundColor }"
+			class="uni-countdown__number "
+			:class="[backgroundColorClass, colorClass, borderColorClass]"
+		>
+			{{ d }}
+		</view>
+		<view v-if="showDay && d > 0" :style="{ color: splitorColor }" class="uni-countdown__splitor day" :class="splitorColorClass">{{ showColon ? '天' : '天' }}</view>
+		<view
+			:style="{ borderColor: borderColor, color: color, background: backgroundColor }"
+			class="uni-countdown__number "
+			:class="[backgroundColorClass, colorClass, borderColorClass]"
+		>
+			{{ h }}
+		</view>
+		<view :style="{ color: splitorColor }" class="uni-countdown__splitor" :class="splitorColorClass">{{ showColon ? ':' : '时' }}</view>
+		<view
+			:style="{ borderColor: borderColor, color: color, background: backgroundColor }"
+			class="uni-countdown__number "
+			:class="[backgroundColorClass, colorClass, borderColorClass]"
+		>
+			{{ i }}
+		</view>
+		<view :style="{ color: splitorColor }" class="uni-countdown__splitor" :class="splitorColorClass">{{ showColon ? ':' : '分' }}</view>
+		<view
+			:style="{ borderColor: borderColor, color: color, background: backgroundColor }"
+			class="uni-countdown__number "
+			:class="[backgroundColorClass, colorClass, borderColorClass]"
+		>
+			{{ s }}
+		</view>
+		<view v-if="!showColon" :style="{ color: splitorColor }" class="uni-countdown__splitor" :class="splitorColorClass">秒</view>
+	</view>
+</template>
+<script>
+export default {
+	name: 'UniCountDown',
+	props: {
+		showDay: {
+			type: Boolean,
+			default: true
+		},
+		showColon: {
+			type: Boolean,
+			default: true
+		},
+		backgroundColor: {
+			type: String,
+			default: '#FFFFFF'
+		},
+		backgroundColorClass: {
+			type: String,
+			default: ''
+		},
+		borderColor: {
+			type: String,
+			default: '#000000'
+		},
+		borderColorClass: {
+			type: String,
+			default: ''
+		},
+		color: {
+			type: String,
+			default: '#000000'
+		},
+		colorClass: {
+			type: String,
+			default: ''
+		},
+		splitorColor: {
+			type: String,
+			default: '#000000'
+		},
+		splitorColorClass: {
+			type: String,
+			default: ''
+		},
+		day: {
+			type: [Number, String],
+			default: 0
+		},
+		hour: {
+			type: [Number, String],
+			default: 0
+		},
+		minute: {
+			type: [Number, String],
+			default: 0
+		},
+		second: {
+			type: [Number, String],
+			default: 0
+		}
+	},
+	data() {
+		return {
+			timer: null,
+			d: '00',
+			h: '00',
+			i: '00',
+			s: '00',
+			leftTime: 0,
+			seconds: 0
+		};
+	},
+	mounted: function(e) {
+		this.seconds = this.toSeconds(this.day, this.hour, this.minute, this.second);
+		this.countDown();
+		this.timer = setInterval(() => {
+			this.seconds--;
+			if (this.seconds < 0) {
+				this.timeUp();
+				return;
+			}
+			this.countDown();
+		}, 1000);
+	},
+	watch: {
+		day: function(newVal) {
+			this.timeUp();
+			this.seconds = this.toSeconds(this.day, this.hour, this.minute, this.second);
+			this.countDown();
+			this.timer = setInterval(() => {
+				this.seconds--;
+				if (this.seconds < 0) {
+					this.timeUp();
+					return;
+				}
+				this.countDown();
+			}, 1000);
+		},
+		hour: function(newVal) {
+			this.timeUp();
+			this.seconds = this.toSeconds(this.day, this.hour, this.minute, this.second);
+			this.countDown();
+			this.timer = setInterval(() => {
+				this.seconds--;
+				if (this.seconds < 0) {
+					this.timeUp();
+					return;
+				}
+				this.countDown();
+			}, 1000);
+		},
+		minute: function(newVal) {
+			this.timeUp();
+			this.seconds = this.toSeconds(this.day, this.hour, this.minute, this.second);
+			this.countDown();
+			this.timer = setInterval(() => {
+				this.seconds--;
+				if (this.seconds < 0) {
+					this.timeUp();
+					return;
+				}
+				this.countDown();
+			}, 1000);
+		},
+		second: function(newVal) {
+			this.timeUp();
+			this.seconds = this.toSeconds(this.day, this.hour, this.minute, this.second);
+			this.countDown();
+			this.timer = setInterval(() => {
+				this.seconds--;
+				if (this.seconds < 0) {
+					this.timeUp();
+					return;
+				}
+				this.countDown();
+			}, 1000);
+		}
+	},
+
+	beforeDestroy() {
+		clearInterval(this.timer);
+	},
+	methods: {
+		toSeconds(day, hours, minutes, seconds) {
+			day = Number(day);
+			hours = Number(hours);
+			minutes = Number(minutes);
+			seconds = Number(seconds);
+			return day * 60 * 60 * 24 + hours * 60 * 60 + minutes * 60 + seconds;
+		},
+		timeUp() {
+			clearInterval(this.timer);
+			this.$emit('timeup');
+		},
+		countDown() {
+			let seconds = this.seconds;
+			let [day, hour, minute, second] = [0, 0, 0, 0];
+			if (seconds > 0) {
+				day = Math.floor(seconds / (60 * 60 * 24));
+				hour = Math.floor(seconds / (60 * 60)) - day * 24;
+				minute = Math.floor(seconds / 60) - day * 24 * 60 - hour * 60;
+				second = Math.floor(seconds) - day * 24 * 60 * 60 - hour * 60 * 60 - minute * 60;
+			} else {
+				this.timeUp();
+			}
+			if (day < 10) {
+				day = '0' + day;
+			}
+			if (hour < 10) {
+				hour = '0' + hour;
+			}
+			if (minute < 10) {
+				minute = '0' + minute;
+			}
+			if (second < 10) {
+				second = '0' + second;
+			}
+			this.d = day;
+			this.h = hour;
+			this.i = minute;
+			this.s = second;
+		}
+	}
+};
+</script>
+<style lang="scss">
+
+.uni-countdown {
+	padding: 2rpx 0;
+	display: inline-flex;
+	flex-wrap: nowrap;
+	justify-content: center;
+}
+
+.uni-countdown__splitor {
+	justify-content: center;
+	line-height: 44rpx;
+	padding: 0 5rpx;
+	font-size: 24rpx;
+}
+.uni-countdown__splitor.day {
+	line-height: 50rpx;
+}
+
+.uni-countdown__number {
+	line-height: 44rpx;
+	justify-content: center;
+	height: 44rpx;
+	border-radius: 6rpx;
+	margin: 0 5rpx;
+	border: 2rpx solid #000;
+	font-size: 24rpx;
+	padding: 0 10rpx;
+}
+</style>
diff --git a/components/uni-drawer/uni-drawer.vue b/components/uni-drawer/uni-drawer.vue
new file mode 100644
index 0000000..65c3e62
--- /dev/null
+++ b/components/uni-drawer/uni-drawer.vue
@@ -0,0 +1,146 @@
+<template>
+	<view v-if="visibleSync" :class="{ 'uni-drawer--visible': showDrawer, 'uni-drawer--right': rightMode }" class="uni-drawer" @touchmove.stop.prevent="moveHandle">
+		<view class="uni-drawer__mask" @tap="close" ></view>
+		<view class="uni-drawer__content" :class="{ 'safe-area': isIphoneX }"><slot /></view>
+	</view>
+</template>
+
+<script>
+export default {
+	name: 'UniDrawer',
+	props: {
+		/**
+		 * 显示状态
+		 */
+		visible: {
+			type: Boolean,
+			default: false
+		},
+		/**
+		 * 显示模式（左、右），只在初始化生效
+		 */
+		mode: {
+			type: String,
+			default: ''
+		},
+		/**
+		 * 蒙层显示状态
+		 */
+		mask: {
+			type: Boolean,
+			default: true
+		}
+	},
+	data() {
+		return {
+			visibleSync: false,
+			showDrawer: false,
+			rightMode: false,
+			closeTimer: null,
+			watchTimer: null,
+			isIphoneX: false
+		};
+	},
+	watch: {
+		visible(val) {
+			clearTimeout(this.watchTimer);
+			setTimeout(() => {
+				this.showDrawer = val;
+			}, 100);
+			if (this.visibleSync) {
+				clearTimeout(this.closeTimer);
+			}
+			if (val) {
+				this.visibleSync = val;
+			} else {
+				this.watchTimer = setTimeout(() => {
+					this.visibleSync = val;
+				}, 300);
+			}
+		}
+	},
+	created() {
+		this.isIphoneX = this.$util.uniappIsIPhoneX();
+		this.visibleSync = this.visible;
+		setTimeout(() => {
+			this.showDrawer = this.visible;
+		}, 100);
+		this.rightMode = this.mode === 'right';
+	},
+	methods: {
+		close() {
+			this.showDrawer = false;
+			this.closeTimer = setTimeout(() => {
+				this.visibleSync = false;
+				this.$emit('close');
+			}, 200);
+		},
+		moveHandle() {}
+	}
+};
+</script>
+
+<style>
+
+.uni-drawer {
+	display: block;
+	position: fixed;
+	top: 0;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	overflow: hidden;
+	visibility: hidden;
+	z-index: 999;
+	height: 100%;
+}
+
+.uni-drawer.uni-drawer--right .uni-drawer__content {
+	left: auto;
+	right: 0;
+	transform: translatex(100%);
+}
+
+.uni-drawer.uni-drawer--visible {
+	visibility: visible;
+}
+
+.uni-drawer.uni-drawer--visible .uni-drawer__content {
+	transform: translatex(0);
+}
+
+.uni-drawer.uni-drawer--visible .uni-drawer__mask {
+	display: block;
+	opacity: 1;
+}
+
+.uni-drawer__mask {
+	display: block;
+	opacity: 0;
+	position: absolute;
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 100%;
+	background: rgba(0, 0, 0, 0.4);
+	transition: opacity 0.3s;
+}
+
+.uni-drawer__content {
+	display: block;
+	position: absolute;
+	top: 0;
+	left: 0;
+	width: 61.8%;
+	height: 100%;
+	background: #fff;
+	transition: all 0.3s ease-out;
+	transform: translatex(-100%);
+}
+
+.safe-area {
+	padding-bottom: 68rpx;
+	padding-top: 44rpx;
+	box-sizing: border-box;
+}
+</style>
diff --git a/components/uni-grid-item/uni-grid-item.vue b/components/uni-grid-item/uni-grid-item.vue
new file mode 100644
index 0000000..44c79dc
--- /dev/null
+++ b/components/uni-grid-item/uni-grid-item.vue
@@ -0,0 +1,223 @@
+<template>
+	<view v-if="width" :style="{ width: width }" class="uni-grid-item">
+		<view
+			:class="{ border: showBorder, 'uni-grid-item__box-square': square, 'border-top': showBorder && index < column, 'uni-highlight': highlight }"
+			:style="{ 'border-color': borderColor }"
+			class="uni-grid-item__box"
+			@click="_onClick"
+		>
+			<view v-if="marker === 'dot'" :style="{ left: top * 2 + 'rpx', top: left * 2 + 'rpx' }" class="uni-grid-item__box-dot" />
+			<view v-if="marker === 'badge'" :style="{ left: top * 2 + 'rpx', top: left * 2 + 'rpx' }" class="uni-grid-item__box-badge">
+				<uni-badge :text="text" :type="type" :size="size" :inverted="inverted" />
+			</view>
+			<view v-if="marker === 'image'" :style="{ left: top * 2 + 'rpx', top: left * 2 + 'rpx' }" class="uni-grid-item__box-image">
+				<image :style="{ width: imgWidth * 2 + 'rpx' }" :src="src" class="box-image" mode="widthFix" />
+			</view>
+			<view class="uni-grid-item__box-item"><slot /></view>
+		</view>
+	</view>
+</template>
+
+<script>
+import uniBadge from '@/components/uni-badge/uni-badge.vue';
+export default {
+	name: 'UniGridItem',
+	components: {
+		uniBadge
+	},
+	props: {
+		// 类型：可选值，dot：圆点；badge：角标；image：图片
+		marker: {
+			type: String,
+			default: ''
+		},
+		// 水平方向
+		hor: {
+			type: Number,
+			default: 0
+		},
+		// 垂直方向
+		ver: {
+			type: Number,
+			default: 0
+		},
+		// badge 下颜色类型，可选值：default（灰色）、primary（蓝色）、success（绿色）、warning(黄色)、error(红色)
+		type: {
+			type: String,
+			default: ''
+		},
+		// badge 下显示内容，汉字最多为1个
+		text: {
+			type: String,
+			default: ''
+		},
+		// badge 下 Badge 大小
+		size: {
+			type: String,
+			default: 'normal'
+		},
+		// badge 下 是否无需背景颜色
+		inverted: {
+			type: Boolean,
+			default: false
+		},
+		// image 下图片路径
+		src: {
+			type: String,
+			default: ''
+		},
+		// image 下图片宽度 ，最大 为 100 。 默认为 30
+		imgWidth: {
+			type: Number,
+			default: 30
+		}
+	},
+	inject: ['grid'],
+	data() {
+		return {
+			column: 0,
+			showBorder: true,
+			square: true,
+			highlight: true,
+			left: 0,
+			top: 0,
+			index: 0,
+			openNum: 2,
+			width: 0,
+			borderColor: '#e5e5e5'
+		};
+	},
+	created() {
+		this.column = this.grid.column;
+		this.showBorder = this.grid.showBorder;
+		this.square = this.grid.square;
+		this.highlight = this.grid.highlight;
+		this.top = this.hor === 0 ? this.grid.hor : this.hor;
+		this.left = this.ver === 0 ? this.grid.ver : this.ver;
+		this.borderColor = this.grid.borderColor;
+		this.index = this.grid.index++;
+	},
+	// #ifdef H5
+	mounted() {
+		this.grid._getSize(width => {
+			this.width = width;
+		});
+	},
+	// #endif
+	// #ifndef H5
+	onReady() {
+		this.grid._getSize(width => {
+			this.width = width;
+		});
+	},
+	// #endif
+	methods: {
+		_onClick() {
+			this.grid.change({
+				detail: {
+					index: this.index
+				}
+			});
+		}
+	}
+};
+</script>
+
+<style>
+.uni-grid-item {
+	box-sizing: border-box;
+}
+
+.uni-grid-item__box {
+	position: relative;
+	width: 100%;
+}
+
+.uni-grid-item__box-item {
+	display: flex;
+	justify-content: center;
+	flex-direction: column;
+	align-items: center;
+	width: 100%;
+	height: 100%;
+	font-size: 32rpx;
+	color: #666;
+	padding: 20rpx 0;
+	box-sizing: border-box;
+}
+
+.uni-grid-item__box-item .image {
+	width: 50rpx;
+	height: 50rpx;
+}
+
+.uni-grid-item__box-item .text {
+	font-size: 26rpx;
+	margin-top: 10rpx;
+}
+
+.uni-grid-item__box.uni-grid-item__box-square {
+	height: 0;
+	padding-top: 100%;
+}
+
+.uni-grid-item__box.uni-grid-item__box-square .uni-grid-item__box-item {
+	position: absolute;
+	top: 0;
+}
+
+.uni-grid-item__box.border {
+	position: relative;
+	box-sizing: border-box;
+	border-bottom: 2rpx #e5e5e5 solid;
+	border-right: 2rpx #e5e5e5 solid;
+}
+
+.uni-grid-item__box.border-top {
+	border-top: 2rpx #e5e5e5 solid;
+}
+
+.uni-grid-item__box.uni-highlight:active {
+	background-color: #eee;
+}
+
+.uni-grid-item__box-badge,
+.uni-grid-item__box-dot,
+.uni-grid-item__box-image {
+	position: absolute;
+	top: 0;
+	right: 0;
+	left: 0;
+	bottom: 0;
+	margin: auto;
+	z-index: 10;
+}
+
+.uni-grid-item__box-dot {
+	width: 20rpx;
+	height: 20rpx;
+	background: #ff5a5f;
+	border-radius: 50%;
+}
+
+.uni-grid-item__box-badge {
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	width: 0;
+	height: 0;
+}
+
+.uni-grid-item__box-image {
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	width: 100rpx;
+	height: 100rpx;
+	overflow: hidden;
+}
+
+.uni-grid-item__box-image .box-image {
+	width: 90rpx;
+}
+</style>
diff --git a/components/uni-grid/uni-grid.vue b/components/uni-grid/uni-grid.vue
new file mode 100644
index 0000000..979e814
--- /dev/null
+++ b/components/uni-grid/uni-grid.vue
@@ -0,0 +1,95 @@
+<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/icons.js b/components/uni-icons/icons.js
new file mode 100644
index 0000000..1f5a778
--- /dev/null
+++ b/components/uni-icons/icons.js
@@ -0,0 +1,96 @@
+export default {
+	'contact': '\ue100',
+	'person': '\ue101',
+	'personadd': '\ue102',
+	'contact-filled': '\ue130',
+	'person-filled': '\ue131',
+	'personadd-filled': '\ue132',
+	'phone': '\ue200',
+	'email': '\ue201',
+	'chatbubble': '\ue202',
+	'chatboxes': '\ue203',
+	'phone-filled': '\ue230',
+	'email-filled': '\ue231',
+	'chatbubble-filled': '\ue232',
+	'chatboxes-filled': '\ue233',
+	'weibo': '\ue260',
+	'weixin': '\ue261',
+	'pengyouquan': '\ue262',
+	'chat': '\ue263',
+	'qq': '\ue264',
+	'videocam': '\ue300',
+	'camera': '\ue301',
+	'mic': '\ue302',
+	'location': '\ue303',
+	'mic-filled': '\ue332',
+	'speech': '\ue332',
+	'location-filled': '\ue333',
+	'micoff': '\ue360',
+	'image': '\ue363',
+	'map': '\ue364',
+	'compose': '\ue400',
+	'trash': '\ue401',
+	'upload': '\ue402',
+	'download': '\ue403',
+	'close': '\ue404',
+	'redo': '\ue405',
+	'undo': '\ue406',
+	'refresh': '\ue407',
+	'star': '\ue408',
+	'plus': '\ue409',
+	'minus': '\ue410',
+	'circle': '\ue411',
+	'checkbox': '\ue411',
+	'close-filled': '\ue434',
+	'clear': '\ue434',
+	'refresh-filled': '\ue437',
+	'star-filled': '\ue438',
+	'plus-filled': '\ue439',
+	'minus-filled': '\ue440',
+	'circle-filled': '\ue441',
+	'checkbox-filled': '\ue442',
+	'closeempty': '\ue460',
+	'refreshempty': '\ue461',
+	'reload': '\ue462',
+	'starhalf': '\ue463',
+	'spinner': '\ue464',
+	'spinner-cycle': '\ue465',
+	'search': '\ue466',
+	'plusempty': '\ue468',
+	'forward': '\ue470',
+	'back': '\ue471',
+	'left-nav': '\ue471',
+	'checkmarkempty': '\ue472',
+	'home': '\ue500',
+	'navigate': '\ue501',
+	'gear': '\ue502',
+	'paperplane': '\ue503',
+	'info': '\ue504',
+	'help': '\ue505',
+	'locked': '\ue506',
+	'more': '\ue507',
+	'flag': '\ue508',
+	'home-filled': '\ue530',
+	'gear-filled': '\ue532',
+	'info-filled': '\ue534',
+	'help-filled': '\ue535',
+	'more-filled': '\ue537',
+	'settings': '\ue560',
+	'list': '\ue562',
+	'bars': '\ue563',
+	'loop': '\ue565',
+	'paperclip': '\ue567',
+	'eye': '\ue568',
+	'arrowup': '\ue580',
+	'arrowdown': '\ue581',
+	'arrowleft': '\ue582',
+	'arrowright': '\ue583',
+	'arrowthinup': '\ue584',
+	'arrowthindown': '\ue585',
+	'arrowthinleft': '\ue586',
+	'arrowthinright': '\ue587',
+	'pulldown': '\ue588',
+	'closefill': '\ue589',
+	'sound': '\ue590',
+	'scan': '\ue612'
+}
diff --git a/components/uni-icons/uni-icons.vue b/components/uni-icons/uni-icons.vue
new file mode 100644
index 0000000..bbf6631
--- /dev/null
+++ b/components/uni-icons/uni-icons.vue
@@ -0,0 +1,63 @@
+<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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PDgtsDEssAAWILAJI0IgICBGI0ewACsjYTgtsDIssAAWsAMlsAIlRyNHI2GwAFRYLiA8IyEbsAIlsAIlRyNHI2EgsAUlsAQlRyNHI2GwBiWwBSVJsAIlYbABRWMjIFhiGyFZY7ABRWJgIy4jICA8ijgjIVktsDMssAAWILAJQyAuRyNHI2EgYLAgYGawgGIjICA8ijgtsDQsIyAuRrACJUZSWCA8WS6xJAEUKy2wNSwjIC5GsAIlRlBYIDxZLrEkARQrLbA2LCMgLkawAiVGUlggPFkjIC5GsAIlRlBYIDxZLrEkARQrLbA3LLAuKyMgLkawAiVGUlggPFkusSQBFCstsDgssC8riiAgPLAEI0KKOCMgLkawAiVGUlggPFkusSQBFCuwBEMusCQrLbA5LLAAFrAEJbAEJiAuRyNHI2GwBkUrIyA8IC4jOLEkARQrLbA6LLEJBCVCsAAWsAQlsAQlIC5HI0cjYSCwBCNCsAZFKyCwYFBYILBAUVizAiADIBuzAiYDGllCQiMgR7AEQ7CAYmAgsAArIIqKYSCwAkNgZCOwA0NhZFBYsAJDYRuwA0NgWbADJbCAYmGwAiVGYTgjIDwjOBshICBGI0ewACsjYTghWbEkARQrLbA7LLAuKy6xJAEUKy2wPCywLyshIyAgPLAEI0IjOLEkARQrsARDLrAkKy2wPSywABUgR7AAI0KyAAEBFRQTLrAqKi2wPiywABUgR7AAI0KyAAEBFRQTLrAqKi2wPyyxAAEUE7ArKi2wQCywLSotsEEssAAWRSMgLiBGiiNhOLEkARQrLbBCLLAJI0KwQSstsEMssgAAOistsEQssgABOistsEUssgEAOistsEYssgEBOistsEcssgAAOystsEgssgABOystsEkssgEAOystsEossgEBOystsEsssgAANystsEwssgABNystsE0ssgEANystsE4ssgEBNystsE8ssgAAOSstsFAssgABOSstsFEssgEAOSstsFIssgEBOSstsFMssgAAPCstsFQssgABPCstsFUssgEAPCstsFYssgEBPCstsFcssgAAOCstsFgssgABOCstsFkssgEAOCstsFossgEBOCstsFsssDArLrEkARQrLbBcLLAwK7A0Ky2wXSywMCuwNSstsF4ssAAWsDArsDYrLbBfLLAxKy6xJAEUKy2wYCywMSuwNCstsGEssDErsDUrLbBiLLAxK7A2Ky2wYyywMisusSQBFCstsGQssDIrsDQrLbBlLLAyK7A1Ky2wZiywMiuwNistsGcssDMrLrEkARQrLbBoLLAzK7A0Ky2waSywMyuwNSstsGossDMrsDYrLbBrLCuwCGWwAyRQeLABFTAtAABLuADIUlixAQGOWbkIAAgAYyCwASNEILADI3CwDkUgIEu4AA5RS7AGU1pYsDQbsChZYGYgilVYsAIlYbABRWMjYrACI0SzCgkFBCuzCgsFBCuzDg8FBCtZsgQoCUVSRLMKDQYEK7EGAUSxJAGIUViwQIhYsQYDRLEmAYhRWLgEAIhYsQYBRFlZWVm4Af+FsASNsQUARAAAAAAAAAAAAAAAAAAAAAAAAAAAMgAyAxj/4QMg/yADGP/hAyD/IAAAACgAKAAoAWQCCgO0BYoGDgaiB4gIgAjICXYJ8Ap6CrQLGAtsDPgN3A50D1wRyhIyEzATnhQaFHIUvBVAFeIXHBd8GEoYkBjWGTIZjBnoGmAaohsCG1QblBvqHCgcehyiHOAdDB1qHaQd6h4IHkYenh7YHzggmiDkIQwhJCE8IVwhviIcJGYkiCT0JYYmACZ4J3YntijEKQ4peim6KsQsECw+LLwtSC3eLfYuDi4mLj4uiC7QLxYvXC94L5owBjCGAAAAAgAiAAABMgKqAAMABwApQCYAAAADAgADVwACAQECSwACAgFPBAEBAgFDAAAHBgUEAAMAAxEFDyszESERJzMRIyIBEO7MzAKq/VYiAmYAAAAFACz/4QO8AxgAFgAwADoAUgBeAXdLsBNQWEBKAgEADQ4NAA5mAAMOAQ4DXgABCAgBXBABCQgKBgleEQEMBgQGDF4ACwQLaQ8BCAAGDAgGWAAKBwUCBAsKBFkSAQ4ODVEADQ0KDkIbS7AXUFhASwIBAA0ODQAOZgADDgEOA14AAQgIAVwQAQkICggJCmYRAQwGBAYMXgALBAtpDwEIAAYMCAZYAAoHBQIECwoEWRIBDg4NUQANDQoOQhtLsBhQWEBMAgEADQ4NAA5mAAMOAQ4DXgABCAgBXBABCQgKCAkKZhEBDAYEBgwEZgALBAtpDwEIAAYMCAZYAAoHBQIECwoEWRIBDg4NUQANDQoOQhtATgIBAA0ODQAOZgADDgEOAwFmAAEIDgEIZBABCQgKCAkKZhEBDAYEBgwEZgALBAtpDwEIAAYMCAZYAAoHBQIECwoEWRIBDg4NUQANDQoOQllZWUAoU1M7OzIxFxdTXlNeW1g7UjtSS0M3NTE6MjoXMBcwURExGBEoFUATFisBBisBIg4CHQEhNTQmNTQuAisBFSEFFRQWFA4CIwYmKwEnIQcrASInIi4CPQEXIgYUFjMyNjQmFwYHDgMeATsGMjYnLgEnJicBNTQ+AjsBMhYdAQEZGxpTEiUcEgOQAQoYJx6F/koCogEVHyMODh8OIC3+SSwdIhQZGSATCHcMEhIMDRISjAgGBQsEAgQPDiVDUVBAJBcWCQUJBQUG/qQFDxoVvB8pAh8BDBknGkwpEBwEDSAbEmGINBc6OiUXCQEBgIABExsgDqc/ERoRERoRfBoWEyQOEA0IGBoNIxETFAF35AsYEwwdJuMAAAIAYP+AA6ACwAAHAFcASEBFSklDOTg2JyYcGRcWDAQDTw8CAQQCQAAEAwEDBAFmAAAFAQIDAAJZAAMEAQNNAAMDAVEAAQMBRQkITEswLQhXCVcTEAYQKwAgBhAWIDYQJTIeAhUUByYnLgE1NDc1Nj8DPgE3Njc2NzYvATUmNzYmJyYnIwYHDgEXFgcUBxUOARceARcWFxYVMBUUBhQPARQjDgEHJjU0PgQCrP6o9PQBWPT+YE2OZjxYUWkEAgEBAQICAgECAg0FEwgHCAEECgQOEyhNI0woFA4ECgQBBAEEBQ4IBA4IAQECASlwHFkbMUdTYwLA9P6o9PQBWNE8Zo5NimohHwEGDgMDBgMDBgYGAwUDHSIWLCMUAgEVORM6GjMFBTMaOhM5FQEBAQoTGhkgCSEeECAIAwUCAQEBDCgMaos0Y1NHMRsAAAAAAwDA/+ADQAJgAAAAUwDAATZLsAtQWEAck5KFAAQBC56alYR6BQABqadzQkA/EQoICgADQBtLsAxQWEAck5KFAAQBC56alYR6BQABqadzQkA/EQoIBwADQBtAHJOShQAEAQuempWEegUAAamnc0JAPxEKCAoAA0BZWUuwC1BYQDUDAQELAAsBAGYEAQAKCwAKZAAKBwsKB2QJCAIHBgsHBmQAAgALAQILWQwBBgYFUAAFBQsFQhtLsAxQWEAvAwEBCwALAQBmBAEABwsAB2QKCQgDBwYLBwZkAAIACwECC1kMAQYGBVAABQULBUIbQDUDAQELAAsBAGYEAQAKCwAKZAAKBwsKB2QJCAIHBgsHBmQAAgALAQILWQwBBgYFUAAFBQsFQllZQB5VVIuKZWRiYV9eXVxUwFXATk05OC8uJyUfHhMSDQ4rCQEuAScmJy4BPwE2Nz4DNTcyPgE3PgE1NC4DIzc+ATc2JiMiDgEVHgEfASIHFBYXHgMXMxYXFh8DBgcOAQcOBAcGFSE0LgMHITY3Njc+ATcyNjI+ATI+ATI3Njc2Jz0CNCY9AycuAScmLwEuAicmJyY+ATc1JicmNzYyFxYHDgIHMQYVHgEHBgcUDgEVBw4CBw4BDwEdAQYdARQGFRQXHgIXFhceARcWFx4CFwGVAUIQRAMeCgMBAQEMBgIEBAMBAgUJAwELAwMDAgEDAgYBAVBGL0YgAQYCAwsBCwECBQQFAQIHBwMFBwMBAQIFGAsGExETEghpAoASFyEU4v7tBQwWIAkZEQEFAwQDBAMEAwIpEAwBAQUDCgMFBwEBCAkBBAQCAgcBCQEBHSByIB0BAQUDAQEBCwMEBQkJAQIEBQEDCgMFAQEMBxwPBwgYERkJIRUEBQUCAY3+uwYLAQYMBCkSExMRBRARDwUFAQwLByYLBQcEAgEJBiwaNlEoPCMaKgkIEwskCQYKBQIBLhEHCQ8FRAsDBQoDAQMDBAQDJUMSIRUUCEQHCBALBAUCAQEBAQEBCRQOMggJBwQFAgMCCAcFEggOKgcEBQQDExIMCAkDDBswKR0hIR0pFSYNAwUGAhINEhMDBAUEBwkWFQQIEAcHCAIDBAkEDAYyDgkOBQECBAIFBAsQAwQFAwAABADA/+ADQAJgAAsADABfAMwBckuwC1BYQByfnpEMBAcEqqahkIYFBge1s39OTEsdFggQBgNAG0uwDFBYQByfnpEMBAcEqqahkIYFBge1s39OTEsdFggNBgNAG0Acn56RDAQHBKqmoZCGBQYHtbN/TkxLHRYIEAYDQFlZS7ALUFhARwkBBwQGBAcGZgoBBhAEBhBkABANBBANZA8OAg0MBA0MZAAIABEBCBFZAgEABQEDBAADVwABAAQHAQRXEgEMDAtQAAsLCwtCG0uwDFBYQEEJAQcEBgQHBmYKAQYNBAYNZBAPDgMNDAQNDGQACAARAQgRWQIBAAUBAwQAA1cAAQAEBwEEVxIBDAwLUAALCwsLQhtARwkBBwQGBAcGZgoBBhAEBhBkABANBBANZA8OAg0MBA0MZAAIABEBCBFZAgEABQEDBAADVwABAAQHAQRXEgEMDAtQAAsLCwtCWVlAJGFgl5ZxcG5ta2ppaGDMYcxaWUVEOzozMSsqHx4RERERERATFCsBIzUjFSMVMxUzNTMFAS4BJyYnLgE/ATY3PgM1NzI+ATc+ATU0LgMjNz4BNzYmIyIOARUeAR8BIgcUFhceAxczFhcWHwMGBw4BBw4EBwYVITQuAwchNjc2Nz4BNzI2Mj4BMj4BMjc2NzYnPQI0Jj0DJy4BJyYvAS4CJyYnJj4BNzUmJyY3NjIXFgcOAgcxBhUeAQcGBxQOARUHDgIHDgEPAR0BBh0BFAYVFBceAhcWFx4BFxYXHgIXA0AyHDIyHDL+VQFCEEQDHgoDAQEBDAYCBAQDAQIFCQMBCwMDAwIBAwIGAQFQRi9GIAEGAgMLAQsBAgUEBQECBwcDBQcDAQECBRgLBhMRExIIaQKAEhchFOL+7QUMFiAJGREBBQMEAwQDBAMCKRAMAQEFAwoDBQcBAQgJAQQEAgIHAQkBAR0gciAdAQEFAwEBAQsDBAUJCQECBAUBAwoDBQEBDAccDwcIGBEZCSEVBAUFAgHuMjIcMjJF/rsGCwEGDAQpEhMTEQUQEQ8FBQEMCwcmCwUHBAIBCQYsGjZRKDwjGioJCBMLJAkGCgUCAS4RBwkPBUQLAwUKAwEDAwQEAyVDEiEVFAhEBwgQCwQFAgEBAQEBAQkUDjIICQcEBQIDAggHBRIIDioHBAUEAxMSDAgJAwwbMCkdISEdKRUmDQMFBgISDRITAwQFBAcJFhUECBAHBwgCAwQJBAwGMg4JDgUBAgQCBQQLEAMEBQMAAAIAYP+AA6ACwAAHAEQAMkAvQRsaCwQCAwFAAAAAAwIAA1kEAQIBAQJNBAECAgFRAAECAUUJCCckCEQJRBMQBRArACAGEBYgNhABIiYnPgE3PgE1NCcmJyYnJj8BNTYmJyY+Ajc2NzMWFx4BBwYXMBceAQcOAQcOBRUUFhcWFw4CAqz+qPT0AVj0/mBWmTUccCgEAggOBBMJBwgBAgQEAgIGDgooTCNNKBQOBAoEAQQBBAUPBwIGBwgFBAIDaVEjWm0CwPT+qPT0AVj910hADCgMAQYOIBAeIRUtIxQBAgcxFgcZGh8OMwUFMxo6EzkVAwoTGhkgCQsYFBAOEQgOBgEfISs9IQAAAAEAwP/gA0ACYABSADdANEE/PhAJBQUAAUADAQECAAIBAGYEAQAFAgAFZAACAgVPAAUFCwVCTUw4Ny4tJiQeHRIRBg4rJS4BJyYnLgE/ATY3PgM1NzI+ATc+ATU0LgMjNz4BNzYmIyIOARUeAR8BIgcUFhceAxczFhcWHwMGBw4BBw4EBwYVITQuAwLXEEQDHgoDAQEBDAYCBAQDAQIFCQMBCwMDAwIBAwIGAQFQRi9GIAEGAgMLAQsBAgUEBQECBwcDBQcDAQECBRgLBhMRExIIaQKAEhchFEgGCwEGDAQpEhMTEQUQEQ8FBQEMCwcmCwUHBAIBCQYsGjZRKDwjGioJCBMLJAkGCgUCAS4RBwkPBUQLAwUKAwEDAwQEAyVDEiEVFAgAAAAAAgDA/+ADQAJgAAsAXgDAQApNS0ocFQULBgFAS7ALUFhALgAIAQAIXAkBBwQGAAdeCgEGCwQGC2QCAQAFAQMEAANYAAEABAcBBFcACwsLC0IbS7AMUFhALQAIAQhoCQEHBAYAB14KAQYLBAYLZAIBAAUBAwQAA1gAAQAEBwEEVwALCwsLQhtALgAIAQhoCQEHBAYEBwZmCgEGCwQGC2QCAQAFAQMEAANYAAEABAcBBFcACwsLC0JZWUAUWVhEQzo5MjAqKR4dEREREREQDBQrASM1IxUjFTMVMzUzAy4BJyYnLgE/ATY3PgM1NzI+ATc+ATU0LgMjNz4BNzYmIyIOARUeAR8BIgcUFhceAxczFhcWHwMGBw4BBw4EBwYVITQuAwNAMhwyMhwyaRBEAx4KAwEBAQwGAgQEAwECBQkDAQsDAwMCAQMCBgEBUEYvRiABBgIDCwELAQIFBAUBAgcHAwUHAwEBAgUYCwYTERMSCGkCgBIXIRQB7jIyHDIy/nYGCwEGDAQpEhMTEQUQEQ8FBQEMCwcmCwUHBAIBCQYsGjZRKDwjGioJCBMLJAkGCgUCAS4RBwkPBUQLAwUKAwEDAwQEAyVDEiEVFAgAAAIAoP/AA3cCgABJAIwAXEBZYgEGB3l3EhAEAAYCQAADAgcCAwdmAAYHAAcGAGYAAgAHBgIHWQAAAAkBAAlZAAEACAUBCFkABQQEBU0ABQUEUQAEBQRFhYOAfmVjYWBPTUJALSwqKCQiChArJS4BIyIOAQcGIyImLwEmLwEmLwEuAy8BLgI1ND4CNzYnJi8BJiMiBwYjBw4CBw4BFB4BFx4BFx4BFx4BMzI+Ajc2JyYHBgcGIyInLgEnLgY2NzY3MDcyNTYzMhYfAR4BBwYXHgIfAR4BFxYXFh8BFh8BFjMyNjc2MzIeAhcWBwYDQBtnJQYMCgQwCgQKCwIlFgQBAgQGBg0QDAEKCAgCBgkHIR4QMQIdJhwkAQEBDhcPBAQECBQQI0gzLDo2NWEkFhYjIBI2KwYdJCYKFUBoNDkrGSglISMTBAMECSECAR0TDBULAi4jFSACAQoLDAEXFQsBAgMBAxYnAhwRDR8fBgoPKykjChsGBIEbOwIEAh8HCgIfGAMCAwMGBw0TDQELCgwEAwgLDgksPyE7AyQXAQEJFhgMDRYiJDMdQGE1LjAnJioCChoWQTcGaSsEAUomLy0ZLzI1PzMmGA4cFQEBEgwNAjlKHCwYCRMODgEZFwsBAwIBBBciAhgPFAQRGBoKGxYRAAADAIAAIAOAAiAAAwAGABMAPEA5EhEODQwJCAQIAwIBQAQBAQACAwECVwUBAwAAA0sFAQMDAE8AAAMAQwcHAAAHEwcTBgUAAwADEQYPKxMRIREBJSEBERcHFzcXNxc3JzcRgAMA/oD+ugKM/VrmiASeYGCeBIjmAiD+AAIA/uj4/kABrK+bBItJSYsEm6/+VAACAID/4AOAAmAAJwBVAGpAZzQyIQMEABQBAQJKAQgBThgCDAk/AQcMBUAABAACAAQCZgUDAgIBAAIBZAsKAggBCQEICWYACQwBCQxkAAYAAAQGAFkAAQAMBwEMWQAHBwsHQlFPTUtJSEZFRUQ+PCkoERIRISYQDRQrADIeARUUBwYjIiciIycjJiciByMHDgEPAT4DNTQnJicmJyY1NDYkIg4BFRQXHgIXJjUxFhUUBwYWFzMyPwI2PwEzIzY3MhcVMzIVFjMyPgE0JgGhvqNeY2WWVDcBAgECDw4REAEEBQsCTwsLBQENAgEDATVeAWrQsWc9AQMCAQIHJAIJCAYDBANlAQoJAQELCwsKAgE9WmiwZmcCQEqAS29MTxMBBAEGAgEEASMhJBMFAhYTAwEEAUNPS39qU45UWkwBBAQBAwELDAJyBgwCAQEsAQMEAwEDAQEUTYqnjgAAAAADAGD/gAOgAsAACQARABgAnrUUAQYFAUBLsApQWEA6AAEACAABCGYABgUFBl0AAgAAAQIAVwwBCAALBAgLVwAEAAMJBANXCgEJBQUJSwoBCQkFTwcBBQkFQxtAOQABAAgAAQhmAAYFBmkAAgAAAQIAVwwBCAALBAgLVwAEAAMJBANXCgEJBQUJSwoBCQkFTwcBBQkFQ1lAFgoKGBcWFRMSChEKEREREhEREREQDRYrEyEVMzUhETM1IzcRIRczNTMRAyMVJyERIYACACD9wODA4AFFgBtgIGBu/s4CAAKgwOD+QCCg/kCAgAHA/mBtbQGAAAAAAQCg/8ADdwKAAEkANkAzEhACAAMBQAACAwJoAAMAA2gAAQAEAAEEZgAAAQQATQAAAARRAAQABEVCQC0sKigkIgUQKyUuASMiDgEHBiMiJi8BJi8BJi8BLgMvAS4CNTQ+Ajc2JyYvASYjIgcGIwcOAgcOARQeARceARceARceATMyPgI3NicmA0AbZyUGDAoEMAoECgsCJRYEAQIEBgYNEAwBCggIAgYJByEeEDECHSYcJAEBAQ4XDwQEBAgUECNIMyw6NjVhJBYWIyASNisGgRs7AgQCHwcKAh8YAwIDAwYHDRMNAQsKDAQDCAsOCSw/ITsDJBcBAQkWGAwNFiIkMx1AYTUuMCcmKgIKGhZBNwYAAAAAAgCAACADgAIgAAwADwArQCgPCwoHBgUCAQgAAQFAAAEAAAFLAAEBAE8CAQABAEMAAA4NAAwADAMOKyURBRcHJwcnByc3JREBIQEDgP76iASeYGCeBIj++gLv/SEBcCAB5MebBItJSYsEm8f+HAIA/ugAAAABAID/4AOAAmAALQBBQD4iDAoDAgAmAQYDFwEBBgNABQQCAgADAAIDZgADBgADBmQAAAAGAQAGWQABAQsBQiknJSMhIB4dHRwWFBAHDysAIg4BFRQXHgIXJjUxFhUUBwYWFzMyPwI2PwEzIzY3MhcVMzIVFjMyPgE0JgJo0LFnPQEDAgECByQCCQgGAwQDZQEKCQEBCwsLCgIBPVposGZnAmBTjlRaTAEEBAEDAQsMAnIGDAIBASwBAwQDAQMBARRNiqeOAAAAAAIAYP+AA6ACwAAFAA0AbUuwClBYQCkAAQYDBgEDZgAEAwMEXQAAAAIGAAJXBwEGAQMGSwcBBgYDTwUBAwYDQxtAKAABBgMGAQNmAAQDBGkAAAACBgACVwcBBgEDBksHAQYGA08FAQMGA0NZQA4GBgYNBg0RERIRERAIFCsBIREzNSEFESEXMzUzEQKg/cDgAWD+wAFFgBtgAsD+QOAg/kCAgAHAAAAAAAcAs//hAygCZwA3AEYAWABmAHEAjwC7AQBAIZkBCwkZFBMDAAd2AQQABQEMA0wpAgIMBUB+AQUlAQ0CP0uwC1BYQFQACQgLCAkLZgAKCwELCgFmAAAHBAEAXg8BBA0HBA1kAA0DBw0DZAAMAwIDDAJmDgECAmcACAALCggLWQABBQMBTQYBBQAHAAUHWQABAQNRAAMBA0UbQFUACQgLCAkLZgAKCwELCgFmAAAHBAcABGYPAQQNBwQNZAANAwcNA2QADAMCAwwCZg4BAgJnAAgACwoIC1kAAQUDAU0GAQUABwAFB1kAAQEDUQADAQNFWUAmc3I5OLW0srGko6CfmJeUkoSDgH99fHKPc49BPzhGOUYeHREQEA4rAS4CNj8BNicuAQ4BDwEOASImJzUmPgI3NC4CBgcOBBUOAR0BHgQXFj4CNzYnJgMGLgI1NDY3NhYVFAcGJw4DFxUUHgEXFjY3PgEuAQcGJjU0Njc2HgIVFAY3BiYnJjY3NhYXFjcyPgE3NTYuBA8BIgYVFDM2HgMOARUUFxYnLgEGIg4BByMPAQYVFB4BMzY3NjIeAxcWBw4CFRQWMjY3Mz4BLgMChQcIAQEBARgdCiAgHQkKBQgGAwEBAQECAQMMFSUZGTMnIBAXFwQiLz86ISdXT0IPJEAQ6yVFMh5tTU9sQjVYHSgQCAEBDg0vUhoMAhIzPg8UEw4IDgkGFS8FCwIDAgUGCwIG9AQHBQECBxAVFhIFBgcKERAWDgYDAQEOAgsJExEODwYFAQEBEgcLBwEVAw4VGRkZCRMLAQEDDhUMAQEJARAZISIBLgEGBgYCAjIlDAkHCgUFAgIBAwQDCAcMBA4XGg4BCwsrLywbAShPFBQsRSsfDgMEEidCKmM0Df7mAhUnOSFBXwUETEFKNyv7BSAnJg0NBQ4gCB4YKRQ8NyK0AhMPEBsCAQUJDQgQGUEFAQYFEAQFAQYNtAUIBgIeLRkRBAEBAQwJFgYHCRYPFAcCEwIB/gMDAQMCAQEBBhgJDgkBBgECCxAeEzcyAgYQBw0PChAqSjcuHxQAAAYAQP+kA8ACmwAOABkAPABHAE8AcwCJQIZSAQQLZl4CDQBfOjEDBg0DQDk0AgY9CgEHCAsIBwtmEQELBAgLBGQQAg8DAAENAQANZg4BDQYBDQZkAAYGZwAMCQEIBwwIWQUBBAEBBE0FAQQEAVEDAQEEAUVRUBAPAQBtamloVlRQc1FzTUxJSENBPj0wLiIfHh0WFQ8ZEBkGBAAOAQ4SDislIiY0NjMyHgMVFA4BIyIuATU0NjIWFAYFNC4BJyYrASIOBhUUFx4BMzI3FzAXHgE+ATUnPgEAIiY0NjMyHgEVFDYyFhQGIiY0FzIXLgEjIg4DFRQWFwcUBhQeAT8BHgEzMDsCLgE1ND4BAw4QFxcQBgwKBwQLEdMKEgsXIBcXAWpEdUcGBQkdNjIsJh4VCwgXlWFBOj4BAgUEAxIsMv1UIBcXEAsSCr0hFhYhFtoGCxG0dzVhTzshPTYYAQUJClgcOyADBAMEBFCI4RchFwQICQwHChILCxIKERcXIRc4P2tCBAEKEhohJyowGR0dT2gZKgEBAQEHBkIiXgFEFyAXChILEDcXIBcXIEEBZogcM0VVLUBvJ1kBBAoDAwQ9CgoPHQ9HeEYAAAgAQP9hA8EC4gAHABAAFAAYAB0AJgAvADcAZkBjMCATAwIENiECAQI3HQwBBAABLRwCAwAsJxoXBAUDBUAAAQIAAgEAZgAAAwIAA2QIAQQGAQIBBAJXBwEDBQUDSwcBAwMFUQAFAwVFHx4VFRERKigeJh8mFRgVGBEUERQSFQkQKyUBBhUUFyEmASEWFwE+ATU0JyYnBwEWFz8BETY3JwMiBxEBLgMDFjMyNjcRBgcBDgQHFwFd/vcUGAEPBgJI/vEFBQEJCgo1RIK//m5EgL/bf0C/00pGARMQHyEilEBDJkgiBQX+pxguKSQfDL6cAQlAREpGBgEbBQb+9x9CIkuIgEDA/lp/P77E/oNEgb8ByRj+8QETBQcFA/yTFAwMAQ4FBAIvDSAmKi8ZvgAAAAAFAAX/QgP7AwAAIQA0AEAAUABgAMFADggBAgUWAQECAkAQAQE9S7ALUFhAKQoBAAADBAADWQ0IDAYEBAkHAgUCBAVZCwECAQECTQsBAgIBUQABAgFFG0uwFlBYQCINCAwGBAQJBwIFAgQFWQsBAgABAgFVAAMDAFEKAQAACgNCG0ApCgEAAAMEAANZDQgMBgQECQcCBQIEBVkLAQIBAQJNCwECAgFRAAECAUVZWUAmUlFCQSMiAQBbWVFgUmBKSEFQQlA8OzY1LSsiNCM0GhgAIQEhDg4rASIOAhUUFhcWDgQPAT4ENx4BMzI+AjU0LgEDIi4BNTQ+AzMyHgIVFA4BAiIGFRQeATI+ATU0JSIOAhUUFjMyPgI1NCYhIgYVFB4DMzI+ATQuAQIFZ72KUmlbAQgOExIQBQUIHVBGUBgaNxxnuoZPhueKdMF0K1BogkRVm29CcL5PPSoUISciFP7ODxoTDCoeDxsUDCsBsR8pBw0SFgwUIRQUIQMARHSgWGWyPBctJCEYEQUEAQYTFiQUBQVEdKBYdchz/PRTm2E6bllDJTphhUlhmlQBpycfFSMVFSMVHycKEhsPIC0MFRwQHycnHw0XEw4IFSMqIBEAAAEAV/9uA6kC0QF5AaJBjQFiAIYAdAByAHEAbgBtAGwAawBqAGkAYAAhABQAEwASABEAEAAMAAsACgAFAAQAAwACAAEAAAAbAAsAAAFHAUYBRQADAAIACwFgAV0BXAFbAVoBWQFYAUoAqACnAJ0AkACPAI4AjQCMABAADQACAJsAmgCZAJQAkwCSAAYAAQANAS4BLQEqALUAtACzAAYACQABAScBJgElASQBIwEiASEBIAEfAR4BHQEcARsBGgEZARgBFgEVARQBEwESAREBEAEPAQ4BDQEMAO0AzADLAMkAyADHAMYAxADDAMIAwQDAAL8AvgC9ALwAKwAFAAkBCgDoAOcA0wAEAAMABQAHAEABRACHAAIACwCcAJEAAgANAQsAAQAFAAMAP0BFDAELAAIACwJmAAINAAINZAANAQANAWQAAQkAAQlkCgEJBQAJBWQEAQMFBwUDB2YIAQcHZwAACwUASwAAAAVPBgEFAAVDQR4BVwFUAUMBQgFBAT8BLAErASkBKAD9APoA+AD3AOwA6wDqAOkA2wDaANkA2ACmAKUAmACVADkANwAOAA4rEy8CNT8FNT8HNT8iOwEfMRUHFQ8DHQEfERUPDSsCLwwjDwwfDRUXBx0BBxUPDyMHIy8NIycjJw8JIw8BKwIvFDU3NTc9AT8PMz8BMzUvESsBNSMPARUPDSsCLwg1PxfRAgEBAgEDAgQFAQECAgICAgMBAgMEAgMDBAQEBQYDAwcHBwkJCQsICAkKCQsLCwsMCw0NGQ0nDQ0ODA0NDQ0MDAwLCwkFBAkIBwcGBwUFBgQHBAMDAgICBAMCAQIBAgUDAgQDAgICAQEBAQMCAgMMCQQGBQYGBwQDAwMCAwIDAQEBAgQBAgICAwIDAgQDAgMDBAICAwIEBAQDBAUFAQECAgIEBQcGBgcHAwUKAQEFFgkJCQgEAgMDAQIBAQICBAMDAwYGBwgJBAQKCgsLDAslDgwNDQ4ODQ0ODQcGBAQLDAcIBQcKCwcGEAgIDAgICAonFhYLCwoKCgkJCAgGBwIDAgICAQIBAQEBAgEDAgEEAwQCBQMFBQUGBgcHAgEBBAoGCAcICQQEBAMFAwQDAwIBAQEDAQEBBQIEAwUEBQUGBgUHBwECAQICAgIBAQIBAQECAQMDAwMEBQUFBwcHBgcIBAUGBwsIAUsFBwQOBgYHBwgHBQUHBwkDBAQCEwoLDQ4HCQcICggJCQUECgoJCgkKCgcGBwUFBQUEAwQDAgIEAQIBAwMDBAQFBgUHBwYEAwcIBwgICAkICQgRCQgJCAcJDw0MChACAwgFBgYHCAgIBAYEBAYFCgUGAgEFEQ0ICgoLDA4JCAkICQgPEA4TBwwLCgQEBAQCBAMCAQIDAQEDAgQGBgUGCgsBAgMDCw8RCQoKCgUFCgEBAwsFBQcGAwQEBAQEBAQDAwMDAgMFBQMCBQMEAwQBAQMCAgICAQECAQIEAgQFBAICAgEBAQUEBQYDAwYCAgMBAQICAgECAwIEAwQEBQIDAgMDAwYDAwMEBAMHBAUEBQIDBQICAwECAgICAQEBAQECAggFBwcKCgYGBwcHCAkJCAsBAQICAgMIBQQFBgQFBQMEAgIDAQYEBAUFCwcWEAgJCQgKCgkKCQsJCwkKCAgIBAUGBQoGAAAABABeACADogIgABMAKAAsADEAN0A0MTAvLiwrKikIAgMBQAQBAAADAgADWQACAQECTQACAgFRAAECAUUCACYjGRYLCAATAhMFDisBISIOARURFBYzITI2NRE0LgMTFAYjISIuBTURNDYzBTIWFRcVFxEHESc1NwJf/kYSIRQrHAG6HCcHDBAUFRMO/kYECAcHBQQCFg8Bug4TXsQigIACIBEeEv6IHCsqHQF4CxQQDAb+Rw8WAgQFBwcIBAF4DRIBEQ1pq2sBgDz+90OEQwAAAAYAgAAAA4ACQAAfAEkAUQBZAF0AZQDfS7AoUFhAUgAPCw4HD14AEA4SDhASZgABCQEIAwEIWQADAAcDSwQCEwMACgEHCwAHWQALAA4QCw5ZABIAEQ0SEVkADQAMBg0MWQAGBQUGTQAGBgVSAAUGBUYbQFMADwsOCw8OZgAQDhIOEBJmAAEJAQgDAQhZAAMABwNLBAITAwAKAQcLAAdZAAsADhALDlkAEgARDRIRWQANAAwGDQxZAAYFBQZNAAYGBVIABQYFRllALAEAZWRhYF1cW1pXVlNST05LSkZEOjg3Ni8tJiMaFxIQDw4NDAgFAB8BHxQOKwEjJicuASsBIgYHBgcjNSMVIyIGFREUFjMhMjY1ETQmExQOASMhIiY1ETQ+AjsBNz4BNzY/ATMwOwEeAhceAx8BMzIeARUkIgYUFjI2NAYiJjQ2MhYUNzMVIwQUFjI2NCYiA0N7AwYwJBCxECMuCAQbRBsbKCkaAoAaIyMDBw4I/YANFgYJDQeICQQPAyYNDLEBAQEDBQMFDxgSCgmKCQ0H/ueOZGSOZHF0UVF0UTUiIv8AJTYlJTYB4AMHNSEfNAgFICAkGf6gGygoGwFgGiP+YwoPChYNAWAGCwcFBgUTBCoMCAECAwMFERwUCwYHDggCZI5kZI7SUXRRUXTgImk2JSU2JQADAQD/YAMAAuAACwAXADEATUBKDAsCBQMCAwUCZgAAAAMFAANZAAIAAQQCAVkABAoBBgcEBlkJAQcICAdLCQEHBwhPAAgHCEMYGBgxGDEuLSwrERETEycVFxUQDRcrACIGFREUFjI2NRE0AxQGIiY1ETQ2MhYVFxUUDgEjIiY9ASMVFBYXFSMVITUjNT4BPQECQYJdXYJdIEpoSkpoSmA7ZjtagiaLZZIBQopjhwLgYkX+y0ViYkUBNUX+hjhPTzgBNThPTziZnzxkO4Bbn59lkwd+JCR+B5NlnwAABAD0/2ADDALgABIAJAAsADkARkBDFhQTDAoGBgMEAUAYCAIDPQAAAAECAAFZAAIABQQCBVkGAQQDAwRNBgEEBANRAAMEA0UuLTQzLTkuOSopJiUhIBAHDysAIgYVFB8CGwE3Nj8BPgI1NAcVBg8BCwEmJy4BNTQ2MhYVFCYiBhQWMjY0ByImNTQ+ATIeARQOAQJv3p0TAQP19QEBAQEGCQQyAQEC1tgBAQgKisSKt2pLS2pLgCc3GSwyLBkZLALgm24zMgMG/fcCCQIDAQMQISIRb8gBAQME/jkBywMBFi4XYYiIYS63S2pLS2qTNycZLBkZLDIsGQACAQD/YAMAAuAACwAlAEFAPgoJAgMBAAEDAGYAAQAAAgEAWQACCAEEBQIEWQcBBQYGBUsHAQUFBk8ABgUGQwwMDCUMJRERERETEykVEAsXKyQyNjURNCYiBhURFCUVFA4BIyImPQEjFRQWFxUjFSE1IzU+AT0BAb+CXV2CXQF8O2Y7WoImi2WSAUKKY4ddYkUBNUViYkX+y0XhnzxkO4Bbn59lkwd+JCR+B5NlnwAAAAIA9P9gAwwC4AASAB8AK0AoDAoIBgQBPQMBAQIBaQAAAgIATQAAAAJRAAIAAkUUExoZEx8UHxAEDysAIgYVFB8CGwE3Nj8BPgI1NAUiJjU0PgEyHgEUDgECb96dEwED9fUBAQEBBgkE/vQnNxksMiwZGSwC4JtuMzIDBv33AgkCAwEDECEiEW/DNycZLBkZLDIsGQAFAQD/YAMwAuAAAwAKABUAHQA1AF9AXAcBAgEcGxQGBAACIQEEACABAwQEQAUBAgEAAQIAZgABCgEABAEAWQAEBgEDBwQDWQkBBwgIB0sJAQcHCE8ACAcIQwUENTQzMjEwLy4rKiQiHx4YFxAOBAoFCgsOKwE3AQclMjcDFRQWNxE0JiMiDgEHATY3NSMVFAcXNgc2NycGIyIuAz0BIxUUFhcVIxUhNSMBERwCAxz+7CUg413fXEIZLyYPARIJYiIiFDDqMi0TLTMjQzYpFyaLZZIBQooC0BD8kBD9EQGB60VipwE1RWIQHRP+LRoan59ANSJDqwMXIBYWKTVDI6CfZZMHfiQkAAADAED/oAPAAqAABwAXADoAkEALMQEBBzowAgMFAkBLsBhQWEAwAAYBAAEGAGYABAAFBQReCAECAAcBAgdZAAEAAAQBAFkABQMDBU0ABQUDUgADBQNGG0AxAAYBAAEGAGYABAAFAAQFZggBAgAHAQIHWQABAAAEAQBZAAUDAwVNAAUFA1IAAwUDRllAFAoINjMuLCUjGxkSDwgXChcTEAkQKwAyNjQmIgYUASEiBhURFBYzITI2NRE0JgMmIyIGDwEOBCMiJy4CLwEmIyIHAxE+ATMhMh4BFRMCuFA4OFA4AQj88BchIRcDEBchIeULDwcLByYCBAUEBQMNCQEDAwFsDRQUDv0CDgoCzAYMBwEBYDhQODhQAQghGP1yGCEhGAKOGCH+dQwGBSACAgMBAQgBAgQBdA8P/s8CCQoNBgsH/fcAAAAIAFb/PQO3AskAKQA2AFUAYwBxAIAAkQCdALJAr3IBBwxNAQYHcAELCTg3IBMEAgVMRUQZBAACKgEBAAZAVVROAwQMPgAGBwkHBglmAAUOAg4FAmYAAgAOAgBkAAABDgABZAABAWcADAALBAwLWQAJAAoDCQpZAAQAAw0EA1kSAQ0AEAgNEFkRAQcACA8HCFkADw4OD00ADw8OUQAODw5FgoFXVpiWk5KKiIGRgpF/fnd2bWxlZF1cVmNXY1FQSUhAPjIwIyIdHBcVEw4rAScPAScmDwEOARURFB4DNj8BFxYzMj8BFhcWMjc2NxcWMjY3NjURNAEuATU0PgEzMhYVFAY3Jz4BNTQuASMiBhUUFwcnLgEjBg8BETcXFjI2PwEXBSIGFREUFjI2NRE0LgEXIg4CHQEUFjI2PQEmNxUUHgEyPgE9ATQuASMGAyIOAhUUFjMyPgI1NC4BBiImNDYzMh4CFRQDqbcL28kHB9MGBgIEBAYGA83KAwQEAx4vQwUUBWQsTgMGBQIH/vw2XCdDKD1WXakzBgUxVDJMayYWyQIDAgQDusHKAgUFAtyi/aoICwsPCwUIzAQHBQMLDwsDxAUICgkFBQkFDzAOGRILKBwOGRMLEx8GGhMTDQcLCQUCnyoBZFQDA1ICCQb9vAMGBQMCAQFQVQECDV5mCAiXbhIBAgIGCAJFDvzVVbUqJ0QnVjwqtZoMERwMMVUxbEspUgpUAQEBAUgCHExVAQEBZCU1Cwf+kAgLCwgBcAUIBUcDBQcDjQcLCweND1K6BQkEBAkFugUIBQP+nQsSGQ4cKAoTGQ4SIBJkExoTBQkMBg0AAAAAAwCg/+ADgAKgAAkAEgAjAEFAPh4SEQ0MBQIGDgkIAwQBAkAABQYFaAAGAgZoAAQBAAEEAGYAAgABBAIBVwAAAANPAAMDCwNCEicYEREREAcVKykBESE3IREhEQcFJwEnARUzASc3Jy4CIyIPATMfATc+ATU0AuD94AGgIP4gAmAg/vsTAVYW/phAAWkXRhkCBwcECwgZARYqGAQEAgAg/cABwCCYEwFXF/6YQQFoF0AZAwMCCBgXKhkECgUMAAAABgDg/6ADIAKgACAALwBCAEYASgBOALhAC0A5ODAeEAYICwFAS7AUUFhAQQAKAwwDCl4OAQwNAwwNZA8BDQsDDQtkAAsICAtcAAEABgABBlkHAgIACQUCAwoAA1cACAQECE0ACAgEUgAECARGG0BDAAoDDAMKDGYOAQwNAwwNZA8BDQsDDQtkAAsIAwsIZAABAAYAAQZZBwICAAkFAgMKAANXAAgEBAhNAAgIBFIABAgERllAGU5NTEtKSUhHRkVEQ0JBNBY1GjMRFTMQEBcrASM1NCYrASIOAh0BIxUzExQWMyEyPgc1EzMlND4COwEyHgMdASMBFRQGIyEiJi8BLgQ9AQMhBzMRIxMjAzMDIxMzAyCgIhmLCxYQCaAqLyMYARoFCwkJCAYFBAIuKf59BQgLBYsFCQcGA8YBDhEM/uYDBgMEAwQDAgEwAbPoHByOHRYezh0VHgI9KBkiCRAWDCgd/bsZIgIDBgYICAoKBgJFRQYLCAUDBgcJBSj9nwENEQECAgIEBQUGAwECRED+HgHi/h4B4v4eAAAAAAIAwP+gA0AC4AALABQAP0A8FBEQDw4NDAcDPgAGAAEABgFmBwUCAwIBAAYDAFcAAQQEAUsAAQEEUAAEAQREAAATEgALAAsREREREQgTKwEVMxEhETM1IREhESUnNxcHJxEjEQJA4P3A4P8AAoD+QheVlRduIAIAIP3gAiAg/aACYDQXlZUXbf4aAeYAAgDA/6ADQAKgAAsAFAA+QDsUERAPDg0MBwEAAUAABgMGaAcFAgMCAQABAwBXAAEEBAFLAAEBBFAABAEERAAAExIACwALEREREREIEysBFTMRIREzNSERIREFBxc3JwcRIxECQOD9wOD/AAKA/kIXlZUXbiACACD94AIgIP2gAmDZF5WVF20B5v4aAAADAFH/cQOvAsAADgAdACkAJ0AkKSgnJiUkIyIhIB8eDAE9AAABAQBNAAAAAVEAAQABRRkYEgIPKwEuASIGBw4BHgI+AiYDDgEuAjY3PgEyFhcWEAMHJwcXBxc3FzcnNwMmPJuemzxQOTmg1tagOTloScXFkjQ0STePkI83b9WoqBioqBioqBipqQJGPD4+PFDW1qA5OaDW1v4cSTQ0ksXFSTY5OTZw/sQBXqinF6ioF6eoGKioAAAAAgB+AAADgAJgABMAIgBBQD4WCgIDBBsXEhAJBQABAkAVCwICPgAAAQBpAAIFAQQDAgRZAAMBAQNNAAMDAVEAAQMBRRQUFCIUIhsUFhAGEis7ATc2Nz4CNxUJARUGBwYXMBUwATUNATUiBgcmPgWAFSZKThwrQCYBgP6At2hjAgGgASj+2IyvRQEBDBg4T4M+dyMMDwwBoAEAAQChCGhkpQYBYIHBwoJcdwcZRkBOOCcAAAAAAgCAAAADgAJgAB8AKgA6QDclDAIDBCQgDQAEAgECQCYLAgA+AAIBAmkAAAAEAwAEWQADAQEDTQADAwFRAAEDAUUUHBYUGQUTKyUwNTQuAicuASc1CQE1HgEXHgEfATMwPQcnLgEjFS0BFSAXFgOAAxAsIzWLXv6AAYA3TCorSiMmFSBFr4z+2AEoAQRZI0AGGipRUSM1NwSh/wD/AKACExMUTjg+BwcIBwcIBggTd1yCwsGBtEkAAAMAYP+AA6ACwAAVAB0ALgBdQFoNAQIICwEEAQJADAEBAT8JAQQBAAEEAGYABQAIAgUIWQACAAEEAgFZAAAAAwcAA1kKAQcGBgdNCgEHBwZRAAYHBkUfHgAAJyYeLh8uGxoXFgAVABUTFBUiCxIrARQGIyIuATQ+ATMVNycVIgYUFjI2NQIgBhAWIDYQASIuATU0PgIyHgIUDgIC2H5aO2M6OmM7wMBqlpbUllT+qPT0AVj0/mBnsGY8Zo6ajmY8PGaOASBafjpjdmM6b2+AWJbUlpVrAaD0/qj09AFY/ddmsGdNjmY8PGaOmo5mPAAAAAIAQP+AA8ACwAAJABMALkArEAICAD4TDQwLCgkIBwYFCgI9AQEAAgIASwEBAAACTwMBAgACQxIaEhAEEisBIQsBIQUDJQUDFycHNychNxchBwPA/qlpaf6pARhtARUBFW4u1dVV2AEGUlIBBtgBggE+/sLE/sLFxQE+6JiY9ZX395UAAAMAYP+AA6ACwAAHABoAJgBHQEQAAAADBAADWQkBBQgBBgcFBlcABAAHAgQHVwoBAgEBAk0KAQICAVEAAQIBRQkIJiUkIyIhIB8eHRwbEA4IGgkaExALECsAIAYQFiA2EAEiLgE0PgEzMh4EFRQOAgMjFSMVMxUzNTM1IwKs/qj09AFY9P5gZ7BmZrBnNGNTRzEbPGaOPSHv7yHw8ALA9P6o9PQBWP3XZrDOsGYbMUdTYzRNjmY8An3wIe/vIQAAAAMAYP+AA6ACwAAHABgAHAA8QDkABAMFAwQFZgAFAgMFAmQAAAADBAADWQYBAgEBAk0GAQICAVIAAQIBRgkIHBsaGREQCBgJGBMQBxArACAGEBYgNhABIi4BNTQ+AjIeAhQOAgEhFSECrP6o9PQBWPT+YGewZjxmjpqOZjw8Zo7+swIA/gACwPT+qPT0AVj912awZ02OZjw8Zo6ajmY8AY0iAAAAAgBg/4ADoALAAAcAGAApQCYAAAADAgADWQQBAgEBAk0EAQICAVEAAQIBRQkIERAIGAkYExAFECsAIAYQFiA2EAEiLgE1ND4CMh4CFA4CAqz+qPT0AVj0/mBnsGY8Zo6ajmY8PGaOAsD0/qj09AFY/ddmsGdNjmY8PGaOmo5mPAACAD7/XgPCAuIAEQArACpAJwQBAAADAgADWQACAQECTQACAgFRAAECAUUCACYjGRYMCQARAhEFDisBISIOAhURFBYzITI2NRE0JhMUDgIjISIuBTURNDYzITIeAxUDW/1KFSYcEDwrArYrPDwPCA4TCv08BgsKCQcFAx4VAsQIEAwKBQLiEBwmFf1KKzw8KwK2Kzz83AoTDggDBQcJCgsGAsQVHgUKDBAIAAAAAgBR/3EDrwLAAA4AGgAZQBYaGRgXFhUUExIREA8MAD0AAABfEgEPKwEuASIGBw4BHgI+AiYDBycHJzcnNxc3FwcDJjybnps8UDk5oNbWoDk5thioqBioqBioqBipAkY8Pj48UNbWoDk5oNbW/oIYqKcXqKgXp6gYqAAAAAIAYP+AA6ACwAAHABwAQ0BADgEDABABBgQCQA8BBAE/AAYEBQQGBWYAAAADBAADWQAEAAUCBAVZAAIBAQJNAAICAVEAAQIBRRIVFBMTExAHFSsAIAYQFiA2EAAiJjQ2MzUXBzUiDgEVFBYyNjUzFAKs/qj09AFY9P7K1JaWasDAO2M6f7N+KALA9P6o9PQBWP5UltSWWIBvbzpjO1l/flpqAAAAAQBA/4ADwALAAAkAGEAVAgEAPgkIBwYFBQA9AQEAAF8SEAIQKwEhCwEhBQMlBQMDwP6paWn+qQEYbQEVARVuAYIBPv7CxP7CxcUBPgAAAAACAGD/gAOgAsAABwATADZAMwcBBQYCBgUCZgQBAgMGAgNkAAAABgUABlcAAwEBA0sAAwMBUgABAwFGERERERETExAIFisAIAYQFiA2EAcjFSM1IzUzNTMVMwKs/qj09AFY9KDwIu7uIvACwPT+qPT0AVi+7u4i8PAAAAAAAgBg/4ADoALAAAcACwAhQB4AAAADAgADVwACAQECSwACAgFRAAECAUURExMQBBIrACAGEBYgNhAHITUhAqz+qPT0AVj0oP4AAgACwPT+qPT0AVi+IgAAAAMANP9TA80C7AAHABgAKgA5QDYAAQQABAEAZgAABQQABWQAAwYBBAEDBFkABQICBU0ABQUCUgACBQJGGhkjIRkqGioXFRMSBxIrABQWMjY0JiIFFA4CIi4CND4CMh4CASIOAhUUHgEzMj4CNTQuAQEufK57e64CI0h8qryre0lJe6u8qnxI/jRRlGtAa7htUZRrP2u4AXeve3uve9Ndq3tJSXuru6t7SUl7qwEyQGqUUmy4az9rlFFtuGsAAgBg/4ADoALAAAcAEgAnQCQSERAPDgUCAAFAAAACAGgAAgEBAk0AAgIBUgABAgFGJBMQAxErACAGEBYgNhABBiMiJi8BNxc3FwKs/qj09AFY9P4gCQkECgRwJF76IwLA9P6o9PQBWP7BCQUEcCNe+yQAAAACAD7/XgPCAuIAFAAcACpAJxwbGhkYFgYBAAFAAgEAAQEATQIBAAABUQABAAFFAgAKBwAUAhQDDisBISIGFREUFjMhMjY1ETQuBQEnByc3FwEXA1v9Sis8PCsCtis8BQsOEhQX/kQFBcogrwFjIALiPCv9Sis8PCsCtgwXFREOCwX9bwUFyiCvAWMgAAEBQABgAsAB4AALAAazCAABJisBBycHFwcXNxc3JzcCqKioGKioGKioGKmpAeCpqBeoqBenqBepqAAAAAEBAAAgAwACeAAUADlANggBBAIBQAcBAgE/BgEBPgAEAgMCBANmAAEAAgQBAlkAAwAAA00AAwMAUQAAAwBFEhUUExAFEyskIiY0NjM1Fwc1Ig4BFRQWMjY1MxQCatSWlmrAwDtjOn+zfiggltSWWIBvbzpjO1l/flpqAAABAID/oAQAAqAAJgA4QDUbGgoJCAcGBQQJAgEBQAQBAAABAgABWQACAwMCTQACAgNRAAMCA0UBAB8dFxUQDgAmASYFDisBMh4BFTcXByc3FzQuAiMiDgEUHgEzMj4BNxcOASMiLgE1ND4CAgBosWduEo2FEmY5YIRJYaVgYKVhTYtjGBknyH1osWc9Z44CoGaxaGkSiIgSaUmEYDhgpcKlYD5uRwd0kmexaE6OZz0AAAIAQP+AA8ACwAAJAA8AKkAnCgcCAD4PDg0EAwIBAAgCPQEBAAICAEsBAQAAAk8AAgACQxISFQMRKyUDJQUDJSELASElFyEHFycBWG0BFQEVbQEY/qlpaf6pAcBSAQbYVdW+/sLFxQE+xAE+/sLU9pX1lwAAAgAA/yAEAAMgABQAKwA8QDkABQECAQUCZgACBAECBGQABAcBAwQDVQABAQBRBgEAAAoBQhYVAQAmJSEfFSsWKw8OCggAFAEUCA4rASIOAgc+AjMyEhUUFjI2NTQuAQMyPgM3DgMjIgI1NCYiBhUUHgECAGe7iVIDA3C+b6z0OFA4ieyLUpt8XzYCAkRvmFOs9DhQOInsAyBPhrlmd8l0/vq6KDg4KIvsifwAMl16mVJZonRFAQa6KDg4KIvsiQAADAAl/0QD2wL6AA8AHQAuADwATgBfAHAAgACVAKcAtADDAG1AapWBcAMBAE49AgYBLh4CBQa1AQkKlgECCQVAAAoFCQUKCWYACQIFCQJkCwEAAAEGAAFZCAEGBwEFCgYFWQQBAgMDAk0EAQICA1EAAwIDRQEAuLeYlzs4NDErKCMgHRwXFhEQCgkADwEPDA4rATIeAx0BFAYiJj0BNDYTMhYdARQGIiY9ATQ2MwEUBisBIi4BNTQ2OwEyHgEVIRQGKwEiJjU0NjsBMhYlFhQGDwEGJicmNj8BPgEeARcBFgYPAQ4BLgEnJjY/ATYWFwEeAQ8BDgEnLgE/AT4CFhcBHgEPAQ4BJy4BNj8BPgEXAz4BHgEfARYGBwYmLwEuAT4DNwE2MhYfARYGBw4BLgEvASY2NwE+AR8BHgEOAS8BLgEBPgEyHwEeAQ4BLwEuATcCAAUJBwYDEhgSEgwMEhIYEhIMAdsSDH4IDggSDH4IDgj9BBIMfgwSEgx+DBICvAQIB20KGAcGBwptBgwKCgP9agYGC20FDAsJAwcHC2wLGAYB6AsGBj8GGAoLBwc/AwkLDAX+ggsGBj8GGAsHCAEDPwcYCl0GDAsJAz8GBgsKGAc/AgIBAgMGAwF/Bw8OBD8GBgsFDAsJAz8HBwv91AYYCm0LBgwYC2wLBwKcBQ4PB20LBgwYC20KBwYC+gMFCAkFfQ0REQ19DRH9BBENfgwSEgx+DREBIQwRCA0IDREIDQkMEREMDRER4QgPDgQ/BgYLCxgGPwMBAwcF/oILGAY/AwEDBwULGAY/BgcKAiwGGAttCwYGBhgLbQUHAwED/WoGGAttCwYGBA4QB20LBgYClgMBAwcFbQsYBgYGC20DCAgHBwYC/WoECAdtCxgGAwEDBwVtCxgGAegLBgY/BhgWBgY/Bhj+jQcIBD8GGBYGBj8GGAsAAgCB/6ADgQKgAA8AIAAtQCoOAQIDAgFADwACAT0AAAACAwACWQADAQEDTQADAwFRAAEDAUUoGCMmBBIrBSc2NTQuASMiBhQWMzI3FwEuATU0NjIWFRQOBCMiA4HjQ1KMUn6ysn5rVOL9niYpn+GgEyM0PUUkcTHiVGtSjVGy/LNE4wEPJmQ2caCfcSVFPTQjEwAAAAEBAAAgAwACIAALACVAIgAEAwEESwUBAwIBAAEDAFcABAQBTwABBAFDEREREREQBhQrASMVIzUjNTM1MxUzAwDwIu7uIvABDu7uIvDwAAAAAQFA/+ACwAJgAAUABrMDAQEmKwE3CQEnAQFAQQE//sFBAP8CH0H+wP7AQQD/AAAAAQFA/+ACwAJgAAUABrMDAQEmKwEnCQE3AwLAQf7BAT9B/wIfQf7A/sBBAP8AAAAAAQEsAIQCywG9AAoAEkAPCgkIBwYFAD4AAABfIQEPKyUGIyImLwE3FzcXAcAJCQQKBHAkXvojjQkFBHAjXvskAAQAgP+gA4ACoAAIABEAGwAfAExASR0cGxoYFxYTERAPCAENBAcBQAABBwE/GRICBj4ABgAHBAYHVwAEAAEDBAFXBQEDAAADSwUBAwMATwIBAAMAQxkWERESERESCBYrCQERMxEzETMRAyMRIREjESUFAQc1IxUHFQkBNSUHNTMCAP7A4MDgIKD/AKABIAEg/uDAgEABgAGA/aBAQAJA/wD+YAEA/wABoP6AAQD/AAFx5uYBb5pawDMpATP+zSmAM4YAAAADAGD/gAOgAsAAGQAhACUAPkA7IgEEACUBAQQCQAAEAAEABAFmAAIFAQAEAgBZAAEDAwFNAAEBA1EAAwEDRQEAJCMfHhsaEA4AGQEZBg4rATIeARceARQGBw4EIyIuAScuATQ+AyAGEBYgNhAnBSERAgAzYVckNjo6NhYxNTk7HzNhVyQ2Ojpti/n+qPT0AVj04P5BAP8CnxoyJDeLmos3FSQbEwkaMiQ3i5qMbDoh9P6o9PQBWBTA/wAAAAQAgP+gA4ACoAASAB4ApgE3AW5LsCZQWEBhAAcAHQUHHVkJAQUfGwIaBgUaWQgBBh4BHAAGHFkhAQAAAwQAA1kKIgIEIAEZEgQZWRgBEhEBCwISC1kAAgABFAIBWRYBFA8BDRMUDVkAFQAOFQ5VFwETEwxREAEMDAsMQhtAZwAHAB0FBx1ZCQEFHxsCGgYFGlkIAQYeARwABhxZIQEAAAMEAANZCiICBCABGRIEGVkYARIRAQsCEgtZAAIAARQCAVkWARQPAQ0TFA1ZFwETEAEMFRMMWQAVDg4VTQAVFQ5RAA4VDkVZQUwAIQAfAAEAAAE2ATMBIwEiAR4BHAEQAQ0BBgEEAP8A/QD8APsA7wDsAOcA5ADZANcA0wDRAMsAyADBAL8AvAC6AKwAqQCfAJwAkgCRAI4AjACHAIQAfwB9AHkAdwBqAGcAWgBXAEwASgBGAEQAPAA5ADQAMgAtACsAHwCmACEApgAaABkAFAATAA0ADAAAABIAAQASACMADisBIg4CBwYVFB4BFxYyNjU0JyYCIiY1ND4BMh4BFRQ3IyImNTQ/ATY0LwEmIyIPAQ4CIyImPQE0JisBIgYdARQOAyMiJi8BJiMiDwEGFB8BFhUUDgErASIOAg8BDgMdARQWOwEyHgEVFA4BDwEGFB8BFjMyPwE+ATMyFh0BFBY7ATI2PQE0NjMyHwEWMj8BNjQvASY1NDY7ATI2PQI0LgEXFRQrASIHDgIVFB4BHwEWDwEGIyIvASYjIgYdARQOAisBIiY9ATQnJiMiBg8BBiMiLwEmND8BNjU0JyYrASImPQE0NjsBMjc2NTQmLwEmND8BNjMwMzIeAR8BFjMyPgE3Nj0BNDsBMh4BHQEUHwEeBDMyPwE+ATIWHwEeARUUDwEGFRQeARcWOwEyFQICFCUiIA04DRkSOJ9xOTgNhV0qSldKK68eExsPFA4OLQ4VFQ4TBAsNBhMdHBQ8FR0FCAwOCAkRBxMOFRUOLQ4OEw8MFQwfBAkICAMGAwQDAh4UHwwVDAMHBRMODi0NFhQPEwYRChMcHRQ9FB4bExQOEw4qDi0ODhQPGxMeFBsMFgIPHiAXBwoGBgsIEw0NLAUICAQTGCEfLwMFBgQ8BwsXGB8QHgsSBQgIBC0FBRIaFxYhHwcLCwcfIBcWDQwSBQUsBQgDAgMDARMXIQsTEgcYET0ECAQYCAQJCQoKBiEYEgIHBwcCLQIDBRMZBQoIFiEeDwHgBw8VDThQGjAsEjhwUE85OP6gXkIrSisrSitCkhsTFA0TDykOLA4OEgUHBBsTHhQeHhQfBw4LCAUIBxMODiwOKQ8SDhQMFgwCAwQDBgMHCAkFPBUdDBYMBwwKBRIPKQ4sDg4TBwgbEx4VHR0VHhMbEBMODi0OKQ8TDRQTHBwUHx4OFw1QHhAYBxIUCwoVEgcTDAwtBQUSGi0hHgQHBAMKCB4gFxcNDBMFBS0FDgUSGCEgFxcLBj0HCxcXIBAeCxIFDgUtBAECARMZBQoHFyAfEgUIBR8fGAYDBQQDARkSAwICAi0CBgQHBRMXIQsTEQgXEgAAAwDA/+ADQAJgAAMABgAJAAq3CAcGBQMCAyYrEx8BCQIDEwEnwOlzAST+iAE45uL+tqYBLWfmAoD+bwFM/g8B9f7GSQAEAGD/gAOgAsAABwARABkAKgBRQE4ABwAKAQcKWQABAAACAQBZAAIAAwQCA1cLBgIEAAUJBAVXDAEJCAgJTQwBCQkIUQAICQhFGxoICCMiGiobKhcWExIIEQgREREREhMSDRQrABQWMjY0JiITESMVMxUjFTM1EiAGEBYgNhABIi4BNTQ+AjIeAhQOAgHPFyIXFyI6YCAggGz+qPT0AVj0/mBnsGY8Zo6ajmY8PGaOAdkiFxciF/6AAQAQ8BAQAlD0/qj09AFY/ddmsGdNjmY8PGaOmo5mPAAEAGD/gAOgAsAABwAYADMAQABeQFsABQYHBgUHZgAHCAYHCGQAAAADBAADWQsBBAAGBQQGWQwBCAAJAggJWQoBAgEBAk0KAQICAVEAAQIBRTU0GhkJCDk4NEA1QCsqIR8eHRkzGjMREAgYCRgTEA0QKwAgBhAWIDYQASIuATU0PgIyHgIUDgIDIg4BFTMmMzIWFRQGBw4CBzM+ATc+ATU0JgMiBhQWMjY1NC4DAqz+qPT0AVj0/mBnsGY8Zo6ajmY8PGaORis8ICYCYSQyFRIXGQsBJgENIBoaRjEPExQcFAQGCAsCwPT+qPT0AVj912awZ02OZjw8Zo6ajmY8AlkbOCldLSMWJREVJikdKiEfGC4fMjv+ixMcFBQOBQsIBgMAAAAABQDA/4ADQALAAAsAEwAXACkAMQBYQFUnIAIJCgFAAAAABAEABFkFDAMDAQAHCAEHVwAIAAsKCAtZAAoACQYKCVkABgICBksABgYCTwACBgJDAAAvLisqJCMbGhcWFRQTEg8OAAsACxETEw0RKwE1NCYiBh0BIxEhESU0NjIWHQEhASERIQc0JiIGFRQWFxUUFjI2PQE+AQYiJjQ2MhYUAtB6rHpwAoD+EGeSZ/6gAdD9wAJA4CU2JRsVCQ4JFRszGhMTGhMBYJBWenpWkP4gAeCQSWdnSZD+QAGgoBslJRsWIwVSBwkJB1IFIwoTGhMTGgAAAAYAwQDgA0ABYAAHAA8AHgAnAC8ANwBFQEIKDQYDAggMBAMAAQIAWQkFAgEDAwFNCQUCAQEDUQsHAgMBA0UgHxEQNTQxMC0sKSgkIx8nICcYFhAeER4TExMQDhIrADIWFAYiJjQ2IgYUFjI2NCUyHgEVFAYjIi4CNTQ2NyIGFBYyNjQmBDIWFAYiJjQ2IgYUFjI2NAHxHhUVHhU/NiUlNiX+wQoQChUPBw4JBhUPGyUlNSYmAdYeFRUeFT82JSU2JQFEFR4VFR4xJTYlJTYJChAKDxUGCQ4HDxUcJTYlJTYlHBUeFRUeMSU2JSU2AAAAAAIBAP/gAwACYAAwAEsBIUuwC1BYQB4vFwIJA0s+AgoBPQEFCDEBBwUtKgIGBwVAGwEHAT8bS7AMUFhAHi8XAgkDSz4CCgI9AQUIMQEHBS0qAgYHBUAbAQcBPxtAHi8XAgkDSz4CCgE9AQUIMQEHBS0qAgYHBUAbAQcBP1lZS7ALUFhALwAACQEJAAFmAAMACQADCVkCAQEACggBClkACAAFBwgFWQAHAAYEBwZZAAQECwRCG0uwDFBYQC8BAQAJAgkAAmYAAwAJAAMJWQACAAoIAgpZAAgABQcIBVkABwAGBAcGWQAEBAsEQhtALwAACQEJAAFmAAMACQADCVkCAQEACggBClkACAAFBwgFWQAHAAYEBwZZAAQECwRCWVlAD0pIQkAkLDQjFikxEhALFysBIg4EIyIuAS8BJicuAiMiDgEPARkBMxE+ATMyHgEXFjMyPgM3PgE3ETUGAwYjIicuAiMiDgEHET4BMzIXHgQzMjcC4AISCBEMDwcOGh4JGxIHHCEzFipAEgUHIA0zKBMqNQ5aMQgREgsUAwoPBwwUNxYuVw03LRUYKhsLDTMoLVMGJxIgHA4XOAJAAwEBAQECBQIGBAEGBwYLCAMF/rf+5AEfBQgIDwMTAQIBAgEBAgEBOiEC/sMHEgMPCQQFAwETBQgSAQkDBgIHAAACAID/oAOAAqAACAASADVAMhIRDw4NCggBAAkBAwFAEAkCAz4AAQMAAwEAZgADAQADSwADAwBPAgEAAwBDFBEREgQSKwkBETMRMxEzEQEHNSMVBxUJATUCAP7A4MDg/sDAgEABgAGAAkD/AP5gAQD/AAGgAWCaWsAzKQEz/s0pAAIAgP+gA4ACoACBAI4ApLaIhwIHAAFAS7AmUFhAMQADAA8AAw9ZBhACAA0BBw4AB1kEAQILAQkIAglZAA4ACg4KVQUBAQEIUQwBCAgLCEIbQDcAAwAPAAMPWQYQAgANAQcOAAdZAA4JCg5NBAECCwEJCAIJWQUBAQwBCAoBCFkADg4KUQAKDgpFWUAmAgCMi4WEe3hramdlX1xXVVFPRUI8OSwqJSMbGBMRDQwAgQKBEQ4rASMiJjU0PwE2NC8BJiIPAQ4BIyImPQE0JisBIg4BHQEUDgIjIi4BLwEmIyIPAQYUHwEeAxUUBisBIg4BHQEUFjsBMhYVFA8BBhQfARYzMj8BPgEzMhYdARQWOwEyNj0BND4BMzIfARYyPwE+ATQmLwEmNTQ+ATsBMjY9AjYmBxQGIiY1MTQ+ATIeAQNRHhMbDxQODi0OKg4TBxEKExwdFD0NFg0IDREJBwwKBRMOFRUOLQ4OEwQFBAIbEh8NFw4eFB8SGw8TDg4tDRYUDxMGEgkTHB0UPRQdDRUNEw8TDikPLAcICAcTDwwVDB8UGgEbw16FXSpKV0orAW8cExMOEw4pDywODhMHCBsSHxQeDhcNHwkQDQcDBwUTDg4sDikPEgQICAkFExwNFg48FRwcExQOEg8pDiwODhMHCBsTHhQeHRUeDBUNEBIODiwHExITBxMNFA0VDRwUHx4VHE9CXl5CK0orK0oAAAMAYP+AA6ACwAAHABEAGwA3QDQAAAACAwACWQADAAcGAwdXAAYIAQUEBgVXAAQBAQRLAAQEAVEAAQQBRREREREUFBMTEAkXKwAgBhAWIDYQJDIWFRQGIiY1NBMjNTM1IzUzETMCrP6o9PQBWPT+RiIXFyIXcYAgIGAgAsD0/qj09AFYJBcREBgYEBH+hxDwEP8AAAADAGD/gAOgAsAABwAUAC4ASEBFAAUHBgcFBmYABgQHBgRkAAAABwUAB1kABAADAgQDWggBAgEBAk0IAQICAVIAAQIBRgkIKignJiUjGRgNDAgUCRQTEAkQKwAgBhAWIDYQASImNDYyFhUUDgM3DgEHIzQ+Ajc+ATU0JiMiFyM2MzIWFRQGAqz+qPT0AVj0/mkPExMdFAQGCAs+IA0BJgcOFhESFTIkYQImAYYzRhoCwPT+qPT0AVj+eBQcExMOBgoIBwPnICEqFiEfGxARJhUjLV18OzIeLwADAMEA4ANAAWAABwAQABgAK0AoBAYCAwABAQBNBAYCAwAAAVEFAwIBAAFFCQgWFRIRDQwIEAkQExAHECsAIgYUFjI2NCUiBhQWMjY0JiAiBhQWMjY0Ahs2JSU2Jf7BGyUlNSYmAgA2JSU2JQFgJTYlJTYlJTYlJTYlJTYlJTYAAAwAQP/QA8ACcAAHAA8AFwAfACcALwA1ADsAQwBLAFMAWwEES7AhUFhAYgACAAJoAAMBCgEDCmYACggBCghkAAsJBgkLBmYABgQJBgRkAAcFB2kYFwIUFgEVARQVVwAAAAEDAAFZDwEMDgENCQwNWAAIAAkLCAlZEwEQEgERBRARWAAEBAVRAAUFCwVCG0BnAAIAAmgAAwEKAQMKZgAKCAEKCGQACwkGCQsGZgAGBAkGBGQABwUHaRgXAhQWARUBFBVXAAAAAQMAAVkPAQwOAQ0JDA1YAAgACQsICVkABBAFBE0TARASAREFEBFYAAQEBVEABQQFRVlALVRUVFtUW1pZT05NTEpJSEc/Pj08Ozo5ODMyMTAtLCkoJSQTExMTExMTExAZFysAMhYUBiImNDYiBhQWMjY0AjIWFAYiJjQ2IgYUFjI2NAAyFhQGIiY0NiIGFBYyNjQXIRUhNjQiFBcjNTMBMxUjNjU0JgcUFhUhNSEGEzMVIzY1NCYnBhUUFhUhNQKzGhMTGhM6NCYmNCZNGhMTGhM6NCYmNCb+MxoTExoTOjQmJjQmHwIh/d8BwAGhoQI+oaEBAb8B/d8CIQG/oaEBAb4BAf3fAlATGhMTGjMmNCYmNP3mExoTExozJjQmJjQBFhMaExMaMyY0JiY0CiAIEBAIIP7wIAgIBAgMBAgEIAgCKCAICAQIBAgIBAgEIAAJAEQAIAO8AssAFQAnADMARABQAF0AcQB+AIwBEkuwClBYQF4XAQwLAwoMXgANAgoLDV4ABwAIAQcIWQABEgEACQEAWQAJFQEGCwkGWQADEwECDQMCWQALFgEKDwsKWQAPGQEQBQ8QWQAFFAEEEQUEWQARDg4RTQAREQ5RGAEOEQ5FG0BgFwEMCwMLDANmAA0CCgINCmYABwAIAQcIWQABEgEACQEAWQAJFQEGCwkGWQADEwECDQMCWQALFgEKDwsKWQAPGQEQBQ8QWQAFFAEEEQUEWQARDg4RTQAREQ5RGAEOEQ5FWUBGgH9zcl9eUlE1NCooGBYCAISDf4yAjHl4cn5zfmlnXnFfcVhXUV1SXUxLRkU9OzRENUQwLSgzKjMhHhYnGCcOCwAVAhUaDisBISIuBTU0NjMhMh4DFRQGByEiLgI1NDYzITIeAhUUBgchIiY0NjMhMhYUBgEiJjU0PgIzMh4BFRQOAiYiDgEUHgEyPgE0JgMiJjU0PgEyHgEUDgEnIg4BFRQeAzMyPgE1NC4DAyImNTQ+ATIeARQOASciBhQWMjY1NC4EA5r93QQHBwYFAwIUDgIjBQsIBgQUDv3dBg0JBhQOAiMHDAkGFA793Q4UFA4CIw4UFP0DKzwRGyYVGzAbEBwmCxMPCQkPExAJCRkrPBwvNzAbGzAbCg8JAwYJCgYJEAkEBggLBSs8HC83MBsbMBsOFBQcFAMEBggJAkICAwUGBwcEDhQDBgkKBg4U7wYJDAcOFAUJDQcOFO8UHRQUHRQBmjwqFSYbERwvHBUlHBCICQ8TEAkJEBMP/pI8KhwvHBwvNzAbiAkPCgULCAYECRAJBgoJBgP+iTwqHC8cHC83MBuJFB0UFA4FCQcHBAMAAwBA/+EDvwJnAAMABwALACZAIwACAAMAAgNXAAAAAQQAAVcABAQFTwAFBQsFQhEREREREAYUKxMhFSERIRUhESEVIUADf/yBA3/8gQN//IEBPDABWzD92S8AAAAEABf/iAPpArgABQAiADkAPwA9QDo/Pj08Ozo5LSwjIiEfHhQTBgUEAwIBABcCAQFAAAAAAQIAAVkAAgMDAk0AAgIDUQADAgNFLx4XLQQSKwEHJwcXNycwPQEuAyMiDgIHFz4BMh4BFxUUBgcXNjUxBw4BIi4BNTQ2NycGHQMeAjMyNjcBBxc3FzcD01NVFWppUQFBbZdSN2lcTRscMrDMrGUBAQEgAlAysMytZQEBIAICb7ptbsA2/RxpFlNTFgEgU1MWamkYAQJTlWxAHTZNMBBZZ2SsZg4GDgcEFRa4WWdkrWYKFAoEFRYCBANsuGtwYAFIaRdTUxcAAAABAV//nwKgAqAASQBLQEg6AQAFRx8KAwIDAkAABQAFaAcBAAMAaAADAgNoAAIABAECBFkAAQYGAU0AAQEGUgAGAQZGAQBDQTc2LSslIx0bCAcASQFJCA4rASIOARURFAYiJjcwETQ2NzYXHgEVERQOAgcGIyImNTARNCYjIg4BFQMUFjMWNz4CNRM0JyYiBwYHMB0DBhYzFjc2NRE2JgKJBgsGRVtFARIQIyMQEQICBAIGCAkNDQkHCgYBKRwdFAYJBAE4Gz8aOAEBYEBDLi8BDQHqBgsG/no9QUM9AdYXIwkVFQojF/4/BgoICAMHFhMBWgoNBgsG/qcqLwEZCBQXDQHBSyIQDyFLeI19VFFeAS8wTwGFCg4AAwAT//YD7QJJABcAIwAxAJpLsA9QWEAiBwEEAgUCBF4ABQMDBVwAAQYBAgQBAlkAAwMAUgAAAAsAQhtLsBhQWEAkBwEEAgUCBAVmAAUDAgUDZAABBgECBAECWQADAwBSAAAACwBCG0ApBwEEAgUCBAVmAAUDAgUDZAABBgECBAECWQADAAADTQADAwBSAAADAEZZWUAUJSQZGCsqJDElMSAfGCMZIykmCBArARQOBCMiLgM0PgMzMhcWFxYlIg4CFRQWMjY0JgciDgEVFBYyNjU0LgID7SE8WmqGRlGddVsvL1t2nFHInWMdCP4TMFhAJYvFi4tjKUYoWH5YGCg4ASAYPkM/Mx8rRFBNPE1QRCpwR0sW4iZCWjFljo7KjlgpSCpAW1tAIDkqGAAAAQDAAGADQAHgAAUABrMCAAEmKyU3CQEXAQMZJ/7A/sAnARlgKQFX/qkpAS0AAAAAAQDAAGADQAHgAAUABrMCAAEmKwEXCQE3AQMZJ/7A/sAnARkB4Cn+qQFXKf7TAAAAAQFA/+ACwAJgAAUABrMDAQEmKwEnCQE3AQLAKf6pAVcp/tMCOSf+wP7AJwEZAAAAAQFA/+ACwAJgAAUABrMDAQEmKwE3CQEnAQFAKQFX/qkpAS0COSf+wP7AJwEZAAAAAQFA/+ACwAJgACEAJUAiGRgTCwQFAAIBQAAAAgECAAFmAAICAVEAAQELAUIsFREDESsBBiIvAREUBiImNREHBicmNDc2NzYzMhYfAR4BHwEeARUUArsEDQWVCQ4JlQwKBQWuAgYFAwUBAgFYLCsDAgGkBASF/ccHCQkHAjmECwoFDgSfAQUCAQIBUCgnAgYDBwAAAAEBQP/gAsACYAAgACRAIRgTCwQEAgABQAAAAQIBAAJmAAEBAlEAAgILAkIsFREDESslJiIPARE0JiIGFREnJgcGFBcWFxYzMjY3PgE/AT4BNTQCuwQNBZUJDgmVDAoFBa4CBgUEBgEBWCwrAwKcBASFAjkHCQkH/ceECwoFDgSfAQUDAgFQKCcCBgMHAAAAAAEAwABgA0AB4AAdACpAJxYSAgABAUAAAgECaAADAANpAAEAAAFNAAEBAFIAAAEARhwUIyMEEislNi8BITI2NCYjITc2JyYiBwYHBhUUFx4BHwEWMzYBfAoKhQI5BwkJB/3HhAsKBQ4EnwEFBQFQKCcEBwdlCgyVCQ4JlQwKBQWuAgYFBwQBWCwrBQEAAQDAAGADQAHhAB4AJUAiFxMCAAEBQAACAAJpAAEAAAFNAAEBAFEAAAEARR0cIyMDECslJj8BISImNDYzIScmNz4BFhcWFxYVFAcOAQ8BBiMmAoQKCoX9xwcJCQcCOYQLCgMJCAOfAQUFAVAoJwQHB2UKDJUJDgmVDAoDAwIErgIGBQcEAVgsKwUBAAABAR7/pwLaAn8ABgAWQBMAAQA9AAEAAWgCAQAAXxEREQMRKwUTIxEjESMB/N6Rm5BZASgBsP5QAAEAX/97A6ECvQALAAAJAgcJARcJATcJAQNt/pL+lDQBbf6TNAFsAW40/pEBbwK9/pIBbDP+lP6UMwFs/pIzAW4BbQAABABV/3EDqgLIABMAJwA+AEQAAAUGLgE0Nz4BNCYnJjQ+ARceARQGJw4BJjQ3PgE0JicmNDYWFx4BFAYDJyMiJicRPgE3Mzc+AR4BFREUDgEmJzcRByMRMwMwCBgQCTI2NTIJEBgJOj4/rAgYEQgYGRgXCBEYCB8gIuHIpxchAQEhF6fFDh8eEBAbHw4f1Lq4FAkBEhgJNIaXhTQJGBIBCTycsJxSCAESFwkZPkU+GQkXEQEIIVNcU/7ggiEYAbkXIQGTCgMPGxD9HBAaDwEIMALkn/5HAAAABQBA/3wDwAK8AAsAHwAzAEgAXQAAJSEiJjQ2MyEyFhQGAyMiJjQ2OwEyNj0BNDYyFh0BDgEFIy4BJzU0NjIWHQEUFjsBMhYUBgMiJj0BPgE3MzIWFAYrASIGHQEUBiEiJj0BNCYrASImNDY7AR4BFxUUBgOg/MAOEhIOA0AOEhJuwA4SEg7ADhISHBIBNv33oCk2ARIcEhIOoA4SEu4OEgE2KaAOEhIOoA4SEgLyDhISDsAOEhIOwCk2ARL8EhwSEhwS/oASHBISDqAOEhIOoCk2AQE2KaAOEhIOoA4SEhwSAiASDqApNgESHBISDqAOEhIOoA4SEhwSATYpoA4SAAAADACWAAEAAAAAAAEACAASAAEAAAAAAAIAAAAhAAEAAAAAAAMAFgBUAAEAAAAAAAQACQCDAAEAAAAAAAUAMADvAAEAAAAAAAYACQE0AAMAAQQJAAEAEAAAAAMAAQQJAAIABAAbAAMAAQQJAAMAMAAiAAMAAQQJAAQAFgBrAAMAAQQJAAUAYACNAAMAAQQJAAYAEgEgAHUAbgBpAGkAYwBvAG4AcwAAdW5paWNvbnMAXjiJxAAAAAB1AG4AaQBpAGMAbwBuAHMAIF44icQAOgBWAGUAcgBzAGkAbwBuACAAMQAuADAAMAAAdW5paWNvbnMgOlZlcnNpb24gMS4wMAAAdQBuAGkAaQBjAG8AbgBzACBeOInEAAB1bmlpY29ucyAAAFYAZQByAHMAaQBvAG4AIAAxAC4AMAAwACAAUwBlAHAAdABlAG0AYgBlAHIAIAAyADAALAAgADIAMAAxADkALAAgAGkAbgBpAHQAaQBhAGwAIAByAGUAbABlAGEAcwBlAABWZXJzaW9uIDEuMDAgU2VwdGVtYmVyIDIwLCAyMDE5LCBpbml0aWFsIHJlbGVhc2UAAHUAbgBpAGkAYwBvAG4AcwAtAAB1bmlpY29ucy0AAAIAAAAAAAD/HwAyAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAEAAgBbAQIBAwEEAQUBBgEHAQgBCQEKAQsBDAENAQ4BDwEQAREBEgETARQBFQEWARcBGAEZARoBGwEcAR0BHgEfASABIQEiASMBJAElASYBJwEoASkBKgErASwBLQEuAS8BMAExATIBMwE0ATUBNgE3ATgBOQE6ATsBPAE9AT4BPwFAAUEBQgFDAUQBRQFGAUcBSAFJAUoBSwFMAU0BTgFPAVABUQFSAVMBVAFVAVYBVwFYAVkBWgFbAVwBXQd1bmlFMTAwB3VuaUUxMDEHdW5pRTEwMgd1bmlFMTMwB3VuaUUxMzEHdW5pRTEzMgd1bmlFMjAwB3VuaUUyMDEHdW5pRTIwMgd1bmlFMjAzB3VuaUUyMzAHdW5pRTIzMQd1bmlFMjMyB3VuaUUyMzMHdW5pRTI2MAd1bmlFMjYxB3VuaUUyNjIHdW5pRTI2Mwd1bmlFMjY0B3VuaUUzMDAHdW5pRTMwMQd1bmlFMzAyB3VuaUUzMDMHdW5pRTMzMgd1bmlFMzMzB3VuaUUzNjAHdW5pRTM2Mwd1bmlFMzY0B3VuaUU0MDAHdW5pRTQwMQd1bmlFNDAyB3VuaUU0MDMHdW5pRTQwNAd1bmlFNDA1B3VuaUU0MDYHdW5pRTQwNwd1bmlFNDA4B3VuaUU0MDkHdW5pRTQxMAd1bmlFNDExB3VuaUU0MTMHdW5pRTQzNAd1bmlFNDM3B3VuaUU0MzgHdW5pRTQzOQd1bmlFNDQwB3VuaUU0NDEHdW5pRTQ0Mgd1bmlFNDQzB3VuaUU0NjAHdW5pRTQ2MQd1bmlFNDYyB3VuaUU0NjMHdW5pRTQ2NAd1bmlFNDY1B3VuaUU0NjYHdW5pRTQ2OAd1bmlFNDcwB3VuaUU0NzEHdW5pRTQ3Mgd1bmlFNTAwB3VuaUU1MDEHdW5pRTUwMgd1bmlFNTAzB3VuaUU1MDQHdW5pRTUwNQd1bmlFNTA2B3VuaUU1MDcHdW5pRTUwOAd1bmlFNTMwB3VuaUU1MzIHdW5pRTUzNAd1bmlFNTM1B3VuaUU1MzcHdW5pRTU2MAd1bmlFNTYyB3VuaUU1NjMHdW5pRTU2NQd1bmlFNTY3B3VuaUU1NjgHdW5pRTU4MAd1bmlFNTgxB3VuaUU1ODIHdW5pRTU4Mwd1bmlFNTg0B3VuaUU1ODUHdW5pRTU4Ngd1bmlFNTg3B3VuaUU1ODgHdW5pRTU4OQRFdXJvB3VuaUU2MTIAAAEAAf//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
new file mode 100644
index 0000000..d2c61c1
--- /dev/null
+++ b/components/uni-number-box/uni-number-box.vue
@@ -0,0 +1,261 @@
+<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;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/components/uni-popup/uni-popup-sku-new.vue b/components/uni-popup/uni-popup-sku-new.vue
new file mode 100644
index 0000000..eeb4e29
--- /dev/null
+++ b/components/uni-popup/uni-popup-sku-new.vue
@@ -0,0 +1,221 @@
+<template>
+	<view v-if="showPopup" class="uni-popup">
+		<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
+		}
+	},
+	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%);
+}
+
+.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;
+}
+
+.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);
+}
+</style>
diff --git a/components/uni-popup/uni-popup-sku.vue b/components/uni-popup/uni-popup-sku.vue
new file mode 100644
index 0000000..409f66e
--- /dev/null
+++ b/components/uni-popup/uni-popup-sku.vue
@@ -0,0 +1,222 @@
+<template>
+	<view v-if="showPopup" class="uni-popup">
+		<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 safe-area" @click="close(true)" v-if="isIphoneX">
+			<view class="uni-popup__wrapper-box" @click.stop="clear"><slot /></view>
+		</view>
+		<view :class="[type, ani, animation ? 'ani' : '', !custom ? 'uni-custom' : '']" class="uni-popup__wrapper" @click="close(true)" v-else>
+			<view class="uni-popup__wrapper-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
+		}
+	},
+	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%);
+}
+
+.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;
+}
+
+.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);
+}
+</style>
diff --git a/components/uni-popup/uni-popup.vue b/components/uni-popup/uni-popup.vue
new file mode 100644
index 0000000..f4fa592
--- /dev/null
+++ b/components/uni-popup/uni-popup.vue
@@ -0,0 +1,244 @@
+<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;
+    }
+</style>
\ No newline at end of file
diff --git a/components/uni-tag/uni-tag.vue b/components/uni-tag/uni-tag.vue
new file mode 100644
index 0000000..8702b41
--- /dev/null
+++ b/components/uni-tag/uni-tag.vue
@@ -0,0 +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>
diff --git a/components/wx-privacy-popup/privacy-popup.vue b/components/wx-privacy-popup/privacy-popup.vue
new file mode 100644
index 0000000..916e360
--- /dev/null
+++ b/components/wx-privacy-popup/privacy-popup.vue
@@ -0,0 +1,232 @@
+<template>
+	<view v-if="showPop">
+		<view class="privacy-mask">
+			<view class="privacy-wrap">
+				<view class="privacy-title">用户隐私保护提示</view>
+				<view class="privacy-desc">
+					感谢您使用本小程序，在使用前您应当阅读并同意
+					<text class="privacy-link" @tap="openPrivacyContract">{{privacyContractName}}</text>，
+					当点击同意并继续时，即表示您已理解并同意该条款内容，该条款将对您产生法律约束力；如您不同意，将无法继续使用小程序相关功能。
+				</view>
+				<view class="privacy-button-flex">
+					<button class="privacy-button-btn bg-disagree" @tap="handleDisagree">不同意</button>
+					<button id="agree-btn" class="privacy-button-btn bg-agree" open-type="agreePrivacyAuthorization" @agreeprivacyauthorization="handleAgree">同意并继续</button>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				agree: false,
+				showPop: false,
+				privacyAuthorization: null,
+				privacyResolves: new Set(),
+				closeOtherPagePopUpHooks: new Set(),
+				privacyContractName: '用户隐私保护指引'
+			}
+		},
+		mounted() {
+			this.init()
+			this.curPageShow()
+		},
+		created() {
+			let that = this
+			//查询微信侧记录的用户是否有待同意的隐私政策信息
+			try {
+				wx.getPrivacySetting({
+					success(res) {
+						// console.log('隐私政策信息', res);
+						// console.log(res.privacyContractName);
+						that.privacyContractName = res.privacyContractName
+					}
+				});
+			} catch (e) {
+				// console.log("=========低版本基础库==========")
+			}
+		},
+		methods: {
+			// 监听何时需要提示用户阅读隐私政策
+			init() {
+				let that = this;
+				if (wx.onNeedPrivacyAuthorization) {
+					wx.onNeedPrivacyAuthorization((resolve) => {
+						if (typeof that.privacyAuthorization === 'function') {
+							that.privacyAuthorization(resolve)
+						}
+					})
+				}
+			},
+			proactive() {
+				let that = this
+				if (wx.getPrivacySetting) {
+					wx.getPrivacySetting({
+						success: (res) => {
+							// console.log(res)
+							if (res.needAuthorization) {
+								that.popUp()
+								// 额外逻辑：当前页面的隐私弹窗弹起的时候，关掉其他页面的隐私弹窗
+								this.closeOtherPagePopUp(this.disPopUp)
+							} else {
+								this.$emit('agree')
+							}
+						},
+					});
+				} else {
+					this.$emit('agree')
+				}
+			},
+			//初始化监听程序
+			curPageShow() {
+				this.privacyAuthorization = resolve => {
+					this.privacyResolves.add(resolve)
+					//打开弹窗
+					this.popUp()
+					// 额外逻辑：当前页面的隐私弹窗弹起的时候，关掉其他页面的隐私弹窗
+					this.closeOtherPagePopUp(this.disPopUp)
+				}
+				this.closeOtherPagePopUpHooks.add(this.disPopUp)
+			},
+			// 额外逻辑：当前页面的隐私弹窗弹起的时候，关掉其他页面的隐私弹窗
+			closeOtherPagePopUp(closePopUp) {
+				this.closeOtherPagePopUpHooks.forEach(hook => {
+					if (closePopUp !== hook) {
+						hook()
+					}
+				})
+			},
+			//打开隐私协议
+			openPrivacyContract() {
+				wx.openPrivacyContract({
+					success(res) {
+						// console.log('打开隐私协议', res);
+					},
+					fail(err) {
+						// console.error('打开隐私协议失败', err)
+					}
+				});
+			},
+			// 不同意
+			handleDisagree() {
+				this.privacyResolves.forEach(resolve => {
+					resolve({
+						event: 'disagree',
+					})
+				})
+				this.privacyResolves.clear()
+				//关闭弹窗
+				this.disPopUp()
+				//退出小程序
+				uni.showModal({
+					content: '未同意隐私协议，无法使用相关功能',
+					success: () => {
+						this.$emit('disagree')
+					}
+				})
+			},
+			// 同意并继续
+			handleAgree() {
+				this.privacyResolves.forEach(resolve => {
+					resolve({
+						event: 'agree',
+						buttonId: 'agree-btn'
+					})
+				})
+				this.privacyResolves.clear()
+				//关闭弹窗
+				this.disPopUp()
+				this.$emit('agree')
+			},
+			//打开弹窗
+			popUp() {
+				if (this.showPop === false) {
+					this.showPop = true
+				}
+			},
+			//关闭弹窗
+			disPopUp() {
+				if (this.showPop === true) {
+					this.showPop = false
+				}
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.privacy-mask {
+		position: fixed;
+		z-index: 5000;
+		top: 0;
+		right: 0;
+		left: 0;
+		bottom: 0;
+		background: rgba(0, 0, 0, 0.2);
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.privacy-wrap {
+		width: 632rpx;
+		padding: 48rpx 30rpx;
+		box-sizing: border-box;
+		background: #fff;
+		border-radius: 16rpx;
+	}
+
+	.privacy-title {
+		padding: 0rpx 30rpx 40rpx 30rpx;
+		font-weight: 700;
+		font-size: 36rpx;
+		text-align: center;
+	}
+
+	.privacy-desc {
+		font-size: 30rpx;
+		color: #555;
+		line-height: 2;
+		text-align: left;
+		padding: 0 40rpx;
+	}
+
+	.privacy-link {
+		color: #2f80ed;
+	}
+
+	.privacy-button-flex {
+		display: flex;
+		padding: 20rpx 40rpx;
+	}
+
+	.privacy-button-btn {
+		color: #FFF;
+		font-size: 30rpx;
+		font-weight: 500;
+		line-height: 100rpx;
+		text-align: center;
+		height: 100rpx;
+		border-radius: 20rpx;
+		border: none;
+		background: #07c160;
+		flex: 1;
+		margin-right: 30rpx;
+		justify-content: center;
+	}
+
+	.privacy-button-btn::after {
+		border: none;
+	}
+
+	.bg-disagree {
+		color: #07c160;
+		background: #f2f2f2;
+	}
+
+	.bg-agree {
+		margin-right: 0rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/components/xiao-star-component/xiao-star-component.vue b/components/xiao-star-component/xiao-star-component.vue
new file mode 100644
index 0000000..cce3844
--- /dev/null
+++ b/components/xiao-star-component/xiao-star-component.vue
@@ -0,0 +1,234 @@
+<template>
+	<view class="star-container">
+		<view class="star-view star-view" style="display: flex;align-items: center;height: 36rpx; overflow: hidden;margin-top:2rpx;">
+			<view class="star-icon-con">
+				<view @tap="evaluateTap(item, index)" :class="item == 3 ? 'iconfont star-icon-item-font iconai65' : item == 1 ? 'iconfont star-icon-item-font iconwujiaoxing1' : ''" v-for="(item, index) in starArr" :key="index"></view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+/**
+ *  starArr 数据说明
+ *
+ *  1  	实星
+ *  2	空星
+ * 	3	半空星
+ */
+export default {
+	data() {
+		return {
+			starArr: [],
+			star_count: 0,
+			isTapZuihou: false
+		};
+	},
+	props: {
+		// 星评数量
+		starCount: {
+			type: Number,
+			default: 0
+		},
+		// 是否开启手动评价
+		isEvaluate: {
+			type: Boolean,
+			default: false
+		}
+	},
+	watch: {
+		starCount(newVal, oldVal) {
+			this.star_count = JSON.parse(JSON.stringify(newVal));
+		}
+	},
+	mounted() {
+		this.star_count = JSON.parse(JSON.stringify(this.starCount));
+		var star_count = this.star_count / 2;
+		if (String(this.starCount).indexOf('.') != -1) {
+			// 小数
+			var decimalsSatr = parseInt(star_count);
+			this.starPushFn(false, decimalsSatr);
+		} else {
+			// 整数
+			var intSatr = parseInt(star_count);
+			this.starPushFn(true, intSatr);
+		}
+	},
+	methods: {
+		/**
+		 *  手动评价
+		 *
+		 * @param {*} item  	点击的item
+		 * @param {*} index		点击的index
+		 */
+		evaluateTap(item, index) {
+			if (!this.isEvaluate) {
+				return;
+			}
+			var sliceArr = this.starArr.slice(index);
+			var starNewArr = this.starArr.slice(0, index);
+			var optIndex = index + 1;
+			if (item == 1) {
+				let sliceNewArr = [];
+				sliceArr.forEach((slItem, slIndex) => {
+					sliceNewArr.push(2);
+				});
+				if (starNewArr.length <= 0 && this.isTapZuihou) {
+					this.starArr = [];
+					this.starFor(i => {
+						this.starArr.push(2);
+					});
+					this.isTapZuihou = false;
+					this.star_count = 0;
+
+					return;
+				}
+				if (starNewArr.length <= 0) {
+					this.isTapZuihou = true;
+				}
+				if (starNewArr.length == 3) {
+					this.star_count = 8;
+				} else if (starNewArr.length == 2) {
+					this.star_count = 6;
+				} else if (starNewArr.length == 1) {
+					this.star_count = 4;
+				} else if (starNewArr.length == 0) {
+					this.star_count = 2;
+				}
+				// if(starNewArr)
+				this.$emit('evaluateChange', this.star_count);
+				this.starArr = [...starNewArr, ...sliceNewArr];
+			} else {
+				if (index == 4) {
+					this.star_count = 10;
+				} else if (index == 3) {
+					this.star_count = 8;
+				} else if (index == 2) {
+					this.star_count = 6;
+				} else if (index == 1) {
+					this.star_count = 4;
+				} else if (index == 0) {
+					this.star_count = 2;
+				}
+			}
+
+			this.starFor(i => {
+				if (i < optIndex) {
+					if (this.starArr[i] == 2) {
+						this.starArr[i] = 1;
+					}
+
+					this.starArr = Object.assign([], this.starArr);
+				}
+			});
+
+			this.$emit('evaluateChange', this.star_count);
+		},
+		/**
+		 *  星数量循环
+		 *
+		 * @param {*} slotcallback
+		 */
+		starFor(slotcallback) {
+			for (let i = 0; i < 5; i++) {
+				slotcallback(i);
+			}
+		},
+		/**
+		 *  星数推送
+		 *
+		 * @param {*} isInt  		是否是整数
+		 * @param {*} satrCount		星数量
+		 */
+		starPushFn(isInt, satrCount) {
+			if (isInt) {
+				this.starFor(i => {
+					if (i < satrCount) {
+						this.starArr.push(1);
+					} else {
+						this.starArr.push(2);
+					}
+				});
+				return;
+			}
+			this.starFor(i => {
+				if (i < satrCount) {
+					this.starArr.push(1);
+				} else if (i <= satrCount) {
+					this.starArr.push(3);
+				} else {
+					this.starArr.push(2);
+				}
+			});
+		}
+	}
+};
+</script>
+
+<style scoped lang="scss">
+.uni-view {
+	color: none !important;
+}
+
+@font-face {
+	font-family: 'iconfont';
+	src: url('//at.alicdn.com/t/font_2188799_iwu9ledxvl.eot?t=1611736513810'); /* IE9 */
+	src: url('//at.alicdn.com/t/font_2188799_iwu9ledxvl.eot?t=1611736513810#iefix') format('embedded-opentype'),
+		/* IE6-IE8 */
+			url('data:application/x-font-woff2;charset=utf-8;base64,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')
+			format('woff2'),
+		url('//at.alicdn.com/t/font_2188799_iwu9ledxvl.woff?t=1611736513810') format('woff'),
+		url('//at.alicdn.com/t/font_2188799_iwu9ledxvl.ttf?t=1611736513810') format('truetype'),
+		/* chrome, firefox, opera, Safari, Android, iOS 4.2+ */ url('//at.alicdn.com/t/font_2188799_iwu9ledxvl.svg?t=1611736513810#iconfont') format('svg'); /* iOS 4.1- */
+}
+
+.iconfont {
+	font-family: 'iconfont' !important;
+	font-size: 16px;
+	font-style: normal;
+	-webkit-font-smoothing: antialiased;
+	-moz-osx-font-smoothing: grayscale;
+}
+
+.iconwujiaoxing1:before {
+	content: '\e623';
+}
+
+.iconwujiaoxing3:before {
+	content: '\e712';
+}
+
+.iconai65:before {
+	content: '\e6b7';
+}
+
+.star-container {
+	.star-view {
+		color: rgb(244, 209, 119) !important;
+		display: flex;
+		align-items: center;
+		box-sizing: border-box;
+		.star-count {
+			margin-right: 20rpx;
+			font-weight: 600;
+			font-size: 33rpx;
+			// font-weight-600 font-33 d-flex a-center
+		}
+		.star-icon-con {
+			font-weight: 600;
+			font-size: 33rpx;
+			display: flex;
+			align-items: center;
+			height: 36rpx;
+			.star-icon-item-font {
+				font-size: 32rpx;
+				color: rgb(244, 209, 119) !important;
+				margin-left: -4rpx;
+			}
+		}
+		.iconwujiaoxing3 {
+			color: rgb(244, 209, 119) !important;
+		}
+	}
+}
+</style>
diff --git a/lang/en-us/common.js b/lang/en-us/common.js
new file mode 100644
index 0000000..f9e4173
--- /dev/null
+++ b/lang/en-us/common.js
@@ -0,0 +1,21 @@
+export const lang = {
+
+	// 底部选项卡
+	tabBar: {
+		home: 'index',
+		category: 'category',
+		cart: 'cart',
+		member: 'member',
+	},
+
+	//公共
+	common: {
+		//语言包名称
+		name: '英文',
+		mescrollTextInOffset: 'pull to refresh',
+		mescrollTextOutOffset: 'Loading...',
+		mescrollEmpty: "No data available",
+		goodsRecommendTitle: 'Guess you like',
+		currencySymbol: '¥'
+	}
+}
diff --git a/lang/en-us/contact/contact.js b/lang/en-us/contact/contact.js
new file mode 100644
index 0000000..6ade10d
--- /dev/null
+++ b/lang/en-us/contact/contact.js
@@ -0,0 +1,4 @@
+export const lang = {
+	//title为每个页面的标题
+	title: 'Electronic Card'
+}
diff --git a/lang/en-us/goods/category.js b/lang/en-us/goods/category.js
new file mode 100644
index 0000000..0c94fbb
--- /dev/null
+++ b/lang/en-us/goods/category.js
@@ -0,0 +1,6 @@
+export const lang = {
+	//title为每个页面的标题
+	title: 'Category',
+	search: 'Search',
+	seeMore : '查看更多'
+}
diff --git a/lang/en-us/goods/detail.js b/lang/en-us/goods/detail.js
new file mode 100644
index 0000000..a48ea63
--- /dev/null
+++ b/lang/en-us/goods/detail.js
@@ -0,0 +1,37 @@
+export const lang = {
+	//title为每个页面的标题
+	title: 'Goods dtails',
+	details:'Details',
+	home:'Home',
+	cart:'Cart',
+	
+	leave:'leave a message',
+	make:'make an appointment',
+	makebtn:'make',
+	
+	sales:'sales',
+	stock:'stock',
+	send:'send',
+	express:'Express Delivery',
+	commission:'Commission Details',
+	
+	express:'Express Delivery',
+	addcart:'Add Cart',
+	buynow:'Buy Now',
+	status:'Goods Off',
+	sellout:'Sell Out',
+	max:'Maximum',
+	
+	 
+	select: '选择',
+	params: '参数',
+	service: '商品服务',
+	allGoods: '全部商品',
+	image: '图片',
+	video: '视频',
+	
+	kefu:'Contact',
+	follow:'Follow',
+	
+	spec:'Spec'
+} 
diff --git a/lang/en-us/member/index.js b/lang/en-us/member/index.js
new file mode 100644
index 0000000..887d37f
--- /dev/null
+++ b/lang/en-us/member/index.js
@@ -0,0 +1,48 @@
+export const lang = {
+	//title为每个页面的标题
+	title: 'member',
+	login: 'Login',
+	loginTpis: 'Login experience',
+	memberLevel: '会员等级',
+	moreAuthority: '更多权限',
+	allOrders: '全部订单',
+	seeAllOrders: '查看全部订单',
+	waitPay: '待付款',
+	readyDelivery: '待发货',
+	waitDelivery: '待收货',
+	refunding: '退款',
+	// 会员中心入口
+	sign: '签到',
+	personInfo: '个人资料',
+	receivingAddress: '收货地址',
+	accountList: '账户列表',
+	couponList: '优惠券',
+	mySpellList: '我的拼单',
+	myBargain: '我的砍价',
+	virtualCode: '虚拟码',
+	winningRecord: '我的礼品',
+	myCollection: '我的关注',
+	myTracks: '我的足迹',
+	pintuanOrder: '拼团订单',
+	yushouOrder: '预售订单',
+	verification: '核销台',
+	message: '我的消息',
+	exchangeOrder: '积分兑换',
+	// 推广中心
+	balance: 'Balance',
+	point: 'Point',
+	coupon: 'Coupon',
+	memberRecommend: '邀请有礼',
+	myPresale: '我的预售',
+	myGiftcard: '我的礼品卡',
+	myDivideticket: '我的瓜分券',
+	myRebate:'拼团返利',
+	myHongbao:'我的红包列表',
+	myBlindBox:'我的盲盒',
+	
+	waitpay:'Waitpay',
+	waitsend:'Waitsend',
+	waitconfirm:'Waitconfirm',
+	activist:'Activist',
+	completed:'Completed',
+}
diff --git a/lang/zh-cn/article/detail.js b/lang/zh-cn/article/detail.js
new file mode 100644
index 0000000..2d9ca88
--- /dev/null
+++ b/lang/zh-cn/article/detail.js
@@ -0,0 +1,4 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '文章详情'
+}
diff --git a/lang/zh-cn/article/list.js b/lang/zh-cn/article/list.js
new file mode 100644
index 0000000..129277a
--- /dev/null
+++ b/lang/zh-cn/article/list.js
@@ -0,0 +1,5 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '文章列表',
+	emptyText:"当前暂无文章信息"
+}
diff --git a/lang/zh-cn/bale/detail.js b/lang/zh-cn/bale/detail.js
new file mode 100644
index 0000000..02a0bea
--- /dev/null
+++ b/lang/zh-cn/bale/detail.js
@@ -0,0 +1,4 @@
+export const lang = {
+	//title为每个页面的标题
+	title: ''
+}
diff --git a/lang/zh-cn/bale/payment.js b/lang/zh-cn/bale/payment.js
new file mode 100644
index 0000000..a6fa0ed
--- /dev/null
+++ b/lang/zh-cn/bale/payment.js
@@ -0,0 +1,4 @@
+export const lang = {
+    //title为每个页面的标题
+    title: '待付款订单'
+}
\ No newline at end of file
diff --git a/lang/zh-cn/bargain/detail.js b/lang/zh-cn/bargain/detail.js
new file mode 100644
index 0000000..c3c6999
--- /dev/null
+++ b/lang/zh-cn/bargain/detail.js
@@ -0,0 +1,10 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '',
+	select: '选择',
+	params: '参数',
+	service: '商品服务',
+	allGoods: '全部商品',
+	image: '图片',
+	video: '视频',
+}
diff --git a/lang/zh-cn/bargain/launch.js b/lang/zh-cn/bargain/launch.js
new file mode 100644
index 0000000..4a271f2
--- /dev/null
+++ b/lang/zh-cn/bargain/launch.js
@@ -0,0 +1,4 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '砍价详情'
+}
diff --git a/lang/zh-cn/bargain/list.js b/lang/zh-cn/bargain/list.js
new file mode 100644
index 0000000..efbd47b
--- /dev/null
+++ b/lang/zh-cn/bargain/list.js
@@ -0,0 +1,4 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '砍价专区'
+}
diff --git a/lang/zh-cn/bargain/my_bargain.js b/lang/zh-cn/bargain/my_bargain.js
new file mode 100644
index 0000000..bb9b398
--- /dev/null
+++ b/lang/zh-cn/bargain/my_bargain.js
@@ -0,0 +1,4 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '我的砍价'
+}
diff --git a/lang/zh-cn/bargain/payment.js b/lang/zh-cn/bargain/payment.js
new file mode 100644
index 0000000..88657dd
--- /dev/null
+++ b/lang/zh-cn/bargain/payment.js
@@ -0,0 +1,4 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '待付款订单'
+}
diff --git a/lang/zh-cn/combo/detail.js b/lang/zh-cn/combo/detail.js
new file mode 100644
index 0000000..e67f6f4
--- /dev/null
+++ b/lang/zh-cn/combo/detail.js
@@ -0,0 +1,4 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '组合套餐'
+}
diff --git a/lang/zh-cn/combo/payment.js b/lang/zh-cn/combo/payment.js
new file mode 100644
index 0000000..88657dd
--- /dev/null
+++ b/lang/zh-cn/combo/payment.js
@@ -0,0 +1,4 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '待付款订单'
+}
diff --git a/lang/zh-cn/common.js b/lang/zh-cn/common.js
new file mode 100644
index 0000000..f486d80
--- /dev/null
+++ b/lang/zh-cn/common.js
@@ -0,0 +1,22 @@
+export const lang = {
+
+	// 底部选项卡
+	tabBar: {
+		home: '首页',
+		category: '分类',
+		cart: '购物车',
+		member: '个人中心'
+	},
+
+	//公共
+	common: {
+		//语言包名称
+		name: '中文',
+		mescrollTextInOffset: '下拉刷新',
+		mescrollTextOutOffset: '释放更新',
+		mescrollEmpty: "暂无相关数据",
+		goodsRecommendTitle: '猜你喜欢',
+		currencySymbol: '¥',
+		submit: '提交'
+	}
+}
diff --git a/lang/zh-cn/contact/contact.js b/lang/zh-cn/contact/contact.js
new file mode 100644
index 0000000..d2c2592
--- /dev/null
+++ b/lang/zh-cn/contact/contact.js
@@ -0,0 +1,4 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '电子名片'
+}
diff --git a/lang/zh-cn/diy/diy.js b/lang/zh-cn/diy/diy.js
new file mode 100644
index 0000000..74eb5f5
--- /dev/null
+++ b/lang/zh-cn/diy/diy.js
@@ -0,0 +1,4 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '',
+}
diff --git a/lang/zh-cn/fenxiao/apply.js b/lang/zh-cn/fenxiao/apply.js
new file mode 100644
index 0000000..46bed58
--- /dev/null
+++ b/lang/zh-cn/fenxiao/apply.js
@@ -0,0 +1,5 @@
+export const lang = {
+	//title为每个页面的标题
+	// title: '分销商申请'
+	title: ''
+}
diff --git a/lang/zh-cn/fenxiao/bill.js b/lang/zh-cn/fenxiao/bill.js
new file mode 100644
index 0000000..5deadae
--- /dev/null
+++ b/lang/zh-cn/fenxiao/bill.js
@@ -0,0 +1,4 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '账单'
+}
diff --git a/lang/zh-cn/fenxiao/follow.js b/lang/zh-cn/fenxiao/follow.js
new file mode 100644
index 0000000..7ba4f3f
--- /dev/null
+++ b/lang/zh-cn/fenxiao/follow.js
@@ -0,0 +1,4 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '我的关注'
+}
diff --git a/lang/zh-cn/fenxiao/goods_list.js b/lang/zh-cn/fenxiao/goods_list.js
new file mode 100644
index 0000000..2c765c5
--- /dev/null
+++ b/lang/zh-cn/fenxiao/goods_list.js
@@ -0,0 +1,5 @@
+export const lang = {
+	//title为每个页面的标题
+	// title: '分销商品列表',
+	title: ''
+}
diff --git a/lang/zh-cn/fenxiao/index.js b/lang/zh-cn/fenxiao/index.js
new file mode 100644
index 0000000..3f940bb
--- /dev/null
+++ b/lang/zh-cn/fenxiao/index.js
@@ -0,0 +1,5 @@
+export const lang = {
+	//title为每个页面的标题
+	// title: '分销中心',
+	title: ''
+}
diff --git a/lang/zh-cn/fenxiao/level.js b/lang/zh-cn/fenxiao/level.js
new file mode 100644
index 0000000..a504074
--- /dev/null
+++ b/lang/zh-cn/fenxiao/level.js
@@ -0,0 +1,5 @@
+export const lang = {
+	//title为每个页面的标题
+	// title: '分销商等级',
+	title: ''
+}
diff --git a/lang/zh-cn/fenxiao/order.js b/lang/zh-cn/fenxiao/order.js
new file mode 100644
index 0000000..7db8bb1
--- /dev/null
+++ b/lang/zh-cn/fenxiao/order.js
@@ -0,0 +1,5 @@
+export const lang = {
+	//title为每个页面的标题
+	// title: '分销订单',
+	title: ''
+}
diff --git a/lang/zh-cn/fenxiao/order_detail.js b/lang/zh-cn/fenxiao/order_detail.js
new file mode 100644
index 0000000..6c02235
--- /dev/null
+++ b/lang/zh-cn/fenxiao/order_detail.js
@@ -0,0 +1,4 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '订单详情'
+}
diff --git a/lang/zh-cn/fenxiao/promote_code.js b/lang/zh-cn/fenxiao/promote_code.js
new file mode 100644
index 0000000..e462f20
--- /dev/null
+++ b/lang/zh-cn/fenxiao/promote_code.js
@@ -0,0 +1,4 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '推广海报'
+}
diff --git a/lang/zh-cn/fenxiao/team.js b/lang/zh-cn/fenxiao/team.js
new file mode 100644
index 0000000..26c1595
--- /dev/null
+++ b/lang/zh-cn/fenxiao/team.js
@@ -0,0 +1,5 @@
+export const lang = {
+	//title为每个页面的标题
+	// title: '我的团队'
+	title: ''
+}
diff --git a/lang/zh-cn/fenxiao/withdraw_apply.js b/lang/zh-cn/fenxiao/withdraw_apply.js
new file mode 100644
index 0000000..5ed3079
--- /dev/null
+++ b/lang/zh-cn/fenxiao/withdraw_apply.js
@@ -0,0 +1,5 @@
+export const lang = {
+	//title为每个页面的标题
+	// title: '提现申请'
+	title: ''
+}
diff --git a/lang/zh-cn/fenxiao/withdraw_list.js b/lang/zh-cn/fenxiao/withdraw_list.js
new file mode 100644
index 0000000..6b4a6ae
--- /dev/null
+++ b/lang/zh-cn/fenxiao/withdraw_list.js
@@ -0,0 +1,5 @@
+export const lang = {
+	//title为每个页面的标题
+	// title: '提现记录'
+	title: ''
+}
diff --git a/lang/zh-cn/game/cards.js b/lang/zh-cn/game/cards.js
new file mode 100644
index 0000000..ce82d23
--- /dev/null
+++ b/lang/zh-cn/game/cards.js
@@ -0,0 +1,4 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '刮刮乐'
+}
diff --git a/lang/zh-cn/game/record.js b/lang/zh-cn/game/record.js
new file mode 100644
index 0000000..de9a180
--- /dev/null
+++ b/lang/zh-cn/game/record.js
@@ -0,0 +1,4 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '中奖纪录'
+}
diff --git a/lang/zh-cn/game/smash_eggs.js b/lang/zh-cn/game/smash_eggs.js
new file mode 100644
index 0000000..4acf085
--- /dev/null
+++ b/lang/zh-cn/game/smash_eggs.js
@@ -0,0 +1,4 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '砸金蛋'
+}
diff --git a/lang/zh-cn/game/turntable.js b/lang/zh-cn/game/turntable.js
new file mode 100644
index 0000000..3ebe1ec
--- /dev/null
+++ b/lang/zh-cn/game/turntable.js
@@ -0,0 +1,4 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '大转盘'
+}
diff --git a/lang/zh-cn/goods/brand.js b/lang/zh-cn/goods/brand.js
new file mode 100644
index 0000000..68694de
--- /dev/null
+++ b/lang/zh-cn/goods/brand.js
@@ -0,0 +1,4 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '品牌专区'
+}
diff --git a/lang/zh-cn/goods/cart.js b/lang/zh-cn/goods/cart.js
new file mode 100644
index 0000000..85f4341
--- /dev/null
+++ b/lang/zh-cn/goods/cart.js
@@ -0,0 +1,13 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '购物车',
+	complete: '完成',
+	edit: '管理',
+	allElection: '全选',
+	total: '合计',
+	settlement: '结算',
+	emptyTips: '暂无商品',
+	goForStroll: '去逛逛',
+	del: '删除',
+	login: '去登录'
+}
diff --git a/lang/zh-cn/goods/category.js b/lang/zh-cn/goods/category.js
new file mode 100644
index 0000000..321a563
--- /dev/null
+++ b/lang/zh-cn/goods/category.js
@@ -0,0 +1,6 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '商品分类',
+	search:'商品搜索',
+	seeMore : '查看更多'
+}
diff --git a/lang/zh-cn/goods/consult.js b/lang/zh-cn/goods/consult.js
new file mode 100644
index 0000000..89b8e55
--- /dev/null
+++ b/lang/zh-cn/goods/consult.js
@@ -0,0 +1,4 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '商品咨询'
+}
diff --git a/lang/zh-cn/goods/consult_edit.js b/lang/zh-cn/goods/consult_edit.js
new file mode 100644
index 0000000..c27770a
--- /dev/null
+++ b/lang/zh-cn/goods/consult_edit.js
@@ -0,0 +1,4 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '我要咨询'
+}
diff --git a/lang/zh-cn/goods/coupon.js b/lang/zh-cn/goods/coupon.js
new file mode 100644
index 0000000..0e6b51a
--- /dev/null
+++ b/lang/zh-cn/goods/coupon.js
@@ -0,0 +1,4 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '优惠券领取'
+}
diff --git a/lang/zh-cn/goods/coupon_receive.js b/lang/zh-cn/goods/coupon_receive.js
new file mode 100644
index 0000000..2bbf131
--- /dev/null
+++ b/lang/zh-cn/goods/coupon_receive.js
@@ -0,0 +1,4 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '领取优惠券'
+}
diff --git a/lang/zh-cn/goods/detail.js b/lang/zh-cn/goods/detail.js
new file mode 100644
index 0000000..116d3c1
--- /dev/null
+++ b/lang/zh-cn/goods/detail.js
@@ -0,0 +1,31 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '',
+	select: '选择',
+	details:'商品详情',
+	params: '参数',
+	service: '商品服务',
+	allGoods: '全部商品',
+	image: '图片',
+	video: '视频',
+	home:'首页',
+	cart:'购物车',
+	leave:'立即留言',
+	make:'立即咨询',
+	
+	send:'配送',
+	express:'快递发货',
+	commission:'佣金详情',
+	commissiontext:'佣金',
+	addcart:'添加购物车',
+	buynow:'立即购买',
+	status:'该商品已下架',
+	sellout:'库存不足',
+	max:'已达最大限购数量',
+	makebtn:'咨询',
+	sales:'销量',
+	stock:'库存',
+	kefu:'客服',
+	follow:'收藏',
+	spec:'规格',
+}
diff --git a/lang/zh-cn/goods/evaluate.js b/lang/zh-cn/goods/evaluate.js
new file mode 100644
index 0000000..3694418
--- /dev/null
+++ b/lang/zh-cn/goods/evaluate.js
@@ -0,0 +1,4 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '商品评价'
+}
diff --git a/lang/zh-cn/goods/list.js b/lang/zh-cn/goods/list.js
new file mode 100644
index 0000000..653aaed
--- /dev/null
+++ b/lang/zh-cn/goods/list.js
@@ -0,0 +1,11 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '商品列表',
+	Random:'综合',
+	Sales:'销量',
+	Price:'价格',
+	Filter:'筛选',
+	Search:'请输入您要搜索的商品',
+	Make:'咨询',
+	
+}
diff --git a/lang/zh-cn/goods/not_exist.js b/lang/zh-cn/goods/not_exist.js
new file mode 100644
index 0000000..7690bf6
--- /dev/null
+++ b/lang/zh-cn/goods/not_exist.js
@@ -0,0 +1,4 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '商品找不到',
+}
diff --git a/lang/zh-cn/goods/point.js b/lang/zh-cn/goods/point.js
new file mode 100644
index 0000000..4c12e0b
--- /dev/null
+++ b/lang/zh-cn/goods/point.js
@@ -0,0 +1,4 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '积分中心'
+}
diff --git a/lang/zh-cn/goods/search.js b/lang/zh-cn/goods/search.js
new file mode 100644
index 0000000..70059c1
--- /dev/null
+++ b/lang/zh-cn/goods/search.js
@@ -0,0 +1,9 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '搜索',
+	history: '历史搜索',
+	hot: '热门搜索',
+	find: '搜索发现',
+	hidefind: '当前搜索发现已隐藏',
+	inputPlaceholder: '搜索商品'
+}
diff --git a/lang/zh-cn/groupbuy/detail.js b/lang/zh-cn/groupbuy/detail.js
new file mode 100644
index 0000000..aa08c12
--- /dev/null
+++ b/lang/zh-cn/groupbuy/detail.js
@@ -0,0 +1,10 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '',
+	select: '选择',
+	params: '参数',
+	service: '商品服务',
+	allGoods: '全部商品',
+	image: '图片',
+	video: '视频'
+}
diff --git a/lang/zh-cn/groupbuy/list.js b/lang/zh-cn/groupbuy/list.js
new file mode 100644
index 0000000..98b8fd7
--- /dev/null
+++ b/lang/zh-cn/groupbuy/list.js
@@ -0,0 +1,4 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '团购专区'
+}
diff --git a/lang/zh-cn/groupbuy/payment.js b/lang/zh-cn/groupbuy/payment.js
new file mode 100644
index 0000000..88657dd
--- /dev/null
+++ b/lang/zh-cn/groupbuy/payment.js
@@ -0,0 +1,4 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '待付款订单'
+}
diff --git a/lang/zh-cn/help/detail.js b/lang/zh-cn/help/detail.js
new file mode 100644
index 0000000..f872d86
--- /dev/null
+++ b/lang/zh-cn/help/detail.js
@@ -0,0 +1,4 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '帮助详情'
+}
diff --git a/lang/zh-cn/help/list.js b/lang/zh-cn/help/list.js
new file mode 100644
index 0000000..34c12e0
--- /dev/null
+++ b/lang/zh-cn/help/list.js
@@ -0,0 +1,5 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '帮助中心',
+	emptyText:"当前暂无帮助信息"
+}
diff --git a/lang/zh-cn/hongbao/list.js b/lang/zh-cn/hongbao/list.js
new file mode 100644
index 0000000..94882b2
--- /dev/null
+++ b/lang/zh-cn/hongbao/list.js
@@ -0,0 +1,4 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '瓜分红包列表'
+}
diff --git a/lang/zh-cn/hongbao/my_hongbao.js b/lang/zh-cn/hongbao/my_hongbao.js
new file mode 100644
index 0000000..e541b7e
--- /dev/null
+++ b/lang/zh-cn/hongbao/my_hongbao.js
@@ -0,0 +1,4 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '我的红包列表'
+}
diff --git a/lang/zh-cn/index/index.js b/lang/zh-cn/index/index.js
new file mode 100644
index 0000000..74eb5f5
--- /dev/null
+++ b/lang/zh-cn/index/index.js
@@ -0,0 +1,4 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '',
+}
diff --git a/lang/zh-cn/live/list.js b/lang/zh-cn/live/list.js
new file mode 100644
index 0000000..69c6591
--- /dev/null
+++ b/lang/zh-cn/live/list.js
@@ -0,0 +1,4 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '直播',
+}
diff --git a/lang/zh-cn/login/find.js b/lang/zh-cn/login/find.js
new file mode 100644
index 0000000..6cd27dd
--- /dev/null
+++ b/lang/zh-cn/login/find.js
@@ -0,0 +1,12 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '找回密码',
+	findPassword: '找回密码',
+	accountPlaceholder: '请输入手机号',
+	captchaPlaceholder: "请输入验证码",
+	dynacodePlaceholder: '请输入动态码',
+	passwordPlaceholder: '请输入新密码',
+	rePasswordPlaceholder: '请确认新密码',
+	next: '下一步',
+	save: '确认修改'
+}
diff --git a/lang/zh-cn/login/login.js b/lang/zh-cn/login/login.js
new file mode 100644
index 0000000..14e5f68
--- /dev/null
+++ b/lang/zh-cn/login/login.js
@@ -0,0 +1,20 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '登录',
+	mobileLogin: '手机号登录',
+	accountLogin: '账号登录',
+	autoLogin: '一键授权登录',
+	login: '登录',
+	mobilePlaceholder: '手机号登录仅限中国大陆用户',
+	dynacodePlaceholder: '请输入动态码',
+	captchaPlaceholder: '请输入验证码',
+	accountPlaceholder: '请输入账号',
+	passwordPlaceholder: '请输入密码',
+	rePasswordPlaceholder: '请确认密码',
+	forgetPassword: '忘记密码',
+	register: '注册',
+	registerTips: '没有账号的用户快来',
+	registerTips1: '注册',
+	registerTips2: '吧',
+	newUserRegister: '新用户注册'
+}
diff --git a/lang/zh-cn/login/register.js b/lang/zh-cn/login/register.js
new file mode 100644
index 0000000..503e921
--- /dev/null
+++ b/lang/zh-cn/login/register.js
@@ -0,0 +1,17 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '注册',
+	mobileRegister: '手机号注册',
+	accountRegister: '账号注册',
+	mobilePlaceholder: '手机号登录仅限中国大陆用户',
+	dynacodePlaceholder: '请输入动态码',
+	captchaPlaceholder: '请输入验证码',
+	accountPlaceholder: '请输入用户名',
+	passwordPlaceholder: '请输入密码',
+	rePasswordPlaceholder: '请确认密码',
+	completeRegister: '完成注册，并登录',
+	registerTips: '点击注册即代表您已同意',
+	registerAgreement: '注册协议',
+	next: '下一步',
+	save: '保存'
+}
diff --git a/lang/zh-cn/member/account.js b/lang/zh-cn/member/account.js
new file mode 100644
index 0000000..79dde87
--- /dev/null
+++ b/lang/zh-cn/member/account.js
@@ -0,0 +1,13 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '账户列表',
+	name: '姓名',
+	accountType: '账号类型',
+	mobilePhone: '手机号码',
+	withdrawalAccount: '提现账号',
+	bankInfo: '支行信息',
+	newAddAccount: '新增账户',
+	del: '删除',
+	update: "修改",
+	emptyText:"当前暂无账户"
+}
diff --git a/lang/zh-cn/member/account_edit.js b/lang/zh-cn/member/account_edit.js
new file mode 100644
index 0000000..5088b38
--- /dev/null
+++ b/lang/zh-cn/member/account_edit.js
@@ -0,0 +1,14 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '编辑账户',
+	name: '姓名',
+	namePlaceholder: '请输入真实姓名',
+	mobilePhone: '手机号码',
+	mobilePhonePlaceholder: '请输入手机号',
+	accountType: '账号类型',
+	bankInfo: '支行信息',
+	bankInfoPlaceholder: '请输入支行信息',
+	withdrawalAccount: '提现账号',
+	withdrawalAccountPlaceholder: '请输入提现账号',
+	save: '保存'
+}
diff --git a/lang/zh-cn/member/address.js b/lang/zh-cn/member/address.js
new file mode 100644
index 0000000..08a97e8
--- /dev/null
+++ b/lang/zh-cn/member/address.js
@@ -0,0 +1,9 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '收货地址',
+	newAddAddress: '添加收货地址',
+	getAddress: '一键获取地址',
+	is_default: '默认',
+	modify: '编辑',
+	del: '删除'
+}
diff --git a/lang/zh-cn/member/address_edit.js b/lang/zh-cn/member/address_edit.js
new file mode 100644
index 0000000..e93f405
--- /dev/null
+++ b/lang/zh-cn/member/address_edit.js
@@ -0,0 +1,14 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '编辑收货地址',
+	consignee: '姓名',
+	consigneePlaceholder: '收货人姓名',
+	mobile: '手机',
+	mobilePlaceholder: '收货人手机号',
+	telephone: '电话',
+	telephonePlaceholder: '收货人固定电话（选填）',
+	receivingCity: '地区',
+	address: '详细地址',
+	addressPlaceholder: '小区、街道、写字楼',
+	save: '保存'
+}
diff --git a/lang/zh-cn/member/apply_withdrawal.js b/lang/zh-cn/member/apply_withdrawal.js
new file mode 100644
index 0000000..d2f5f7a
--- /dev/null
+++ b/lang/zh-cn/member/apply_withdrawal.js
@@ -0,0 +1,4 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '申请提现'
+}
diff --git a/lang/zh-cn/member/assets.js b/lang/zh-cn/member/assets.js
new file mode 100644
index 0000000..1702e20
--- /dev/null
+++ b/lang/zh-cn/member/assets.js
@@ -0,0 +1,3 @@
+export const lang = {
+	title: '账号注销',
+}
\ No newline at end of file
diff --git a/lang/zh-cn/member/balance.js b/lang/zh-cn/member/balance.js
new file mode 100644
index 0000000..49fb93d
--- /dev/null
+++ b/lang/zh-cn/member/balance.js
@@ -0,0 +1,13 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '我的余额',
+	accountBalance: '账户余额 ',
+	money:' (元)',
+	recharge: '充值',
+	withdrawal: '提现',
+	balanceDetailed: '余额明细',
+	emptyTips: '暂无余额记录',
+	rechargeRecord:'充值记录',
+	ableAccountBalance:'现金余额 ',
+	noAccountBalance:'储值余额 ',
+}
diff --git a/lang/zh-cn/member/balance_detail.js b/lang/zh-cn/member/balance_detail.js
new file mode 100644
index 0000000..538ab54
--- /dev/null
+++ b/lang/zh-cn/member/balance_detail.js
@@ -0,0 +1,4 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '余额明细'
+}
diff --git a/lang/zh-cn/member/cancellation.js b/lang/zh-cn/member/cancellation.js
new file mode 100644
index 0000000..1702e20
--- /dev/null
+++ b/lang/zh-cn/member/cancellation.js
@@ -0,0 +1,3 @@
+export const lang = {
+	title: '账号注销',
+}
\ No newline at end of file
diff --git a/lang/zh-cn/member/cancelrefuse.js b/lang/zh-cn/member/cancelrefuse.js
new file mode 100644
index 0000000..1702e20
--- /dev/null
+++ b/lang/zh-cn/member/cancelrefuse.js
@@ -0,0 +1,3 @@
+export const lang = {
+	title: '账号注销',
+}
\ No newline at end of file
diff --git a/lang/zh-cn/member/cancelstatus.js b/lang/zh-cn/member/cancelstatus.js
new file mode 100644
index 0000000..1702e20
--- /dev/null
+++ b/lang/zh-cn/member/cancelstatus.js
@@ -0,0 +1,3 @@
+export const lang = {
+	title: '账号注销',
+}
\ No newline at end of file
diff --git a/lang/zh-cn/member/cancelsuccess.js b/lang/zh-cn/member/cancelsuccess.js
new file mode 100644
index 0000000..1702e20
--- /dev/null
+++ b/lang/zh-cn/member/cancelsuccess.js
@@ -0,0 +1,3 @@
+export const lang = {
+	title: '账号注销',
+}
\ No newline at end of file
diff --git a/lang/zh-cn/member/card.js b/lang/zh-cn/member/card.js
new file mode 100644
index 0000000..1aab742
--- /dev/null
+++ b/lang/zh-cn/member/card.js
@@ -0,0 +1,4 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '会员卡'
+}
diff --git a/lang/zh-cn/member/card_buy.js b/lang/zh-cn/member/card_buy.js
new file mode 100644
index 0000000..1aab742
--- /dev/null
+++ b/lang/zh-cn/member/card_buy.js
@@ -0,0 +1,4 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '会员卡'
+}
diff --git a/lang/zh-cn/member/collection.js b/lang/zh-cn/member/collection.js
new file mode 100644
index 0000000..7ba4f3f
--- /dev/null
+++ b/lang/zh-cn/member/collection.js
@@ -0,0 +1,4 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '我的关注'
+}
diff --git a/lang/zh-cn/member/contact.js b/lang/zh-cn/member/contact.js
new file mode 100644
index 0000000..ff0307c
--- /dev/null
+++ b/lang/zh-cn/member/contact.js
@@ -0,0 +1,4 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '客服',
+}
diff --git a/lang/zh-cn/member/coupon.js b/lang/zh-cn/member/coupon.js
new file mode 100644
index 0000000..3b4a64d
--- /dev/null
+++ b/lang/zh-cn/member/coupon.js
@@ -0,0 +1,4 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '我的优惠券'
+}
diff --git a/lang/zh-cn/member/footprint.js b/lang/zh-cn/member/footprint.js
new file mode 100644
index 0000000..2809ba2
--- /dev/null
+++ b/lang/zh-cn/member/footprint.js
@@ -0,0 +1,5 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '我的足迹',
+	emptyTpis: '您还未浏览过任何商品！'
+}
diff --git a/lang/zh-cn/member/gift.js b/lang/zh-cn/member/gift.js
new file mode 100644
index 0000000..ebdcbda
--- /dev/null
+++ b/lang/zh-cn/member/gift.js
@@ -0,0 +1,5 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '我的礼品',
+	emptyTips: '暂无礼品'
+}
diff --git a/lang/zh-cn/member/gift_detail.js b/lang/zh-cn/member/gift_detail.js
new file mode 100644
index 0000000..492e1ae
--- /dev/null
+++ b/lang/zh-cn/member/gift_detail.js
@@ -0,0 +1,4 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '礼品订单',
+}
diff --git a/lang/zh-cn/member/index.js b/lang/zh-cn/member/index.js
new file mode 100644
index 0000000..f6250cc
--- /dev/null
+++ b/lang/zh-cn/member/index.js
@@ -0,0 +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:'我的盲盒',
+	
+	
+}
diff --git a/lang/zh-cn/member/info.js b/lang/zh-cn/member/info.js
new file mode 100644
index 0000000..52b220a
--- /dev/null
+++ b/lang/zh-cn/member/info.js
@@ -0,0 +1,56 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '个人资料',
+	headImg: '头像',
+	account: '账号',
+	nickname: '昵称',
+	realName: '真实姓名',
+	sex: '性别',
+	birthday: '生日',
+	password: '密码',
+	paypassword: '支付密码',
+	mobilePhone: '手机',
+	bindMobile: '绑定手机',
+	cancellation: '注销账号',
+	lang: "语言",
+	logout: '退出登录',
+	save: "保存",
+	noset: '未设置',
+
+	nickPlaceholder: "请输入新昵称",
+	pleaseRealName:"请输入真实姓名",
+
+	nowPassword: "当前密码",
+	newPassword: "新密码",
+	confirmPassword: "确认新密码",
+
+	phoneNumber: "手机号",
+
+	confirmCode: "验证码",
+	confirmCodeInput: "请输入验证码",
+	confirmCodeInputerror: "验证码错误",
+	findanimateCode: "获取动态码",
+	animateCode: "动态码",
+	animateCodeInput: "请输入动态码",
+
+	modifyNickname: "修改昵称",
+	modifyPassword: "修改密码",
+	bindPhone: "绑定手机",
+
+	alikeNickname: "与原昵称一致，无需修改",
+	noEmityNickname: "昵称不能为空",
+
+	updateSuccess: "修改成功",
+
+	pleaseInputOldPassword: "请输入原始密码",
+	pleaseInputNewPassword: "请输入新密码",
+	passwordLength: "密码长度不能小于6位",
+	alikePassword: "两次密码不一致",
+
+	samePassword: "新密码不能与原密码相同",
+
+	surePhoneNumber: "请输入正确的手机号",
+
+	alikePhone: "与原手机号一致，无需修改",
+	modify: '修改'
+}
diff --git a/lang/zh-cn/member/info_edit.js b/lang/zh-cn/member/info_edit.js
new file mode 100644
index 0000000..9220f03
--- /dev/null
+++ b/lang/zh-cn/member/info_edit.js
@@ -0,0 +1,61 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '个人资料',
+	headImg: '头像',
+	account: '账号',
+	username: '用户名',
+	nickname: '昵称',
+	realName: '真实姓名',
+	sex: '性别',
+	birthday: '生日',
+	password: '密码',
+	paypassword: '支付密码',
+	mobilePhone: '手机',
+	bindMobile: '绑定手机',
+	cancellation: '注销账号',
+	lang: "语言",
+	logout: '退出登录',
+	save: "保存",
+	noset: '未设置',
+	
+	usernamePlaceholder: "请输入新用户名",
+	nickPlaceholder: "请输入新昵称",
+	pleaseRealName:"请输入真实姓名",
+
+	nowPassword: "当前密码",
+	newPassword: "新密码",
+	confirmPassword: "确认新密码",
+
+	phoneNumber: "手机号",
+
+	confirmCode: "验证码",
+	confirmCodeInput: "请输入验证码",
+	confirmCodeInputerror: "验证码错误",
+	findanimateCode: "获取动态码",
+	animateCode: "动态码",
+	animateCodeInput: "请输入动态码",
+
+	modifyNickname: "修改昵称",
+	modifyPassword: "修改密码",
+	bindPhone: "绑定手机",
+	
+	alikeusername: "与原用户名一致，无需修改",
+	noEmityUsername: "用户名不能为空",
+	
+	alikeNickname: "与原昵称一致，无需修改",
+	noEmityNickname: "昵称不能为空",
+
+	updateSuccess: "修改成功",
+
+	pleaseInputOldPassword: "请输入原始密码",
+	pleaseInputNewPassword: "请输入新密码",
+	passwordLength: "密码长度不能小于6位",
+	alikePassword: "两次密码不一致",
+
+	samePassword: "新密码不能与原密码相同",
+
+	surePhoneNumber: "请输入正确的手机号",
+
+	alikePhone: "与原手机号一致，无需修改",
+	modify: '修改'
+}
diff --git a/lang/zh-cn/member/invite_friends.js b/lang/zh-cn/member/invite_friends.js
new file mode 100644
index 0000000..5456928
--- /dev/null
+++ b/lang/zh-cn/member/invite_friends.js
@@ -0,0 +1,3 @@
+export const lang = {
+	title: '邀请好友',
+}
\ No newline at end of file
diff --git a/lang/zh-cn/member/level.js b/lang/zh-cn/member/level.js
new file mode 100644
index 0000000..a4a0e8d
--- /dev/null
+++ b/lang/zh-cn/member/level.js
@@ -0,0 +1,17 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '会员等级',
+	defaultLevelTips: '您已经是最高级别的会员了！',
+	tag: '专属标签',
+	tagDesc: '标签达人',
+	discount: '专享折扣',
+	discountDesc: '专享{0}折',
+	service: '优质服务',
+	serviceDesc: '360度全方位',
+	memberLevel: '会员等级',
+	condition: '条件',
+	equity: '权益',
+	giftPackage: '升级礼包',
+	levelExplain: '等级说明',
+	upgradeTips: '升级会员，享专属权益'
+}
diff --git a/lang/zh-cn/member/message.js b/lang/zh-cn/member/message.js
new file mode 100644
index 0000000..c970ecb
--- /dev/null
+++ b/lang/zh-cn/member/message.js
@@ -0,0 +1,4 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '我的消息'
+}
diff --git a/lang/zh-cn/member/modify_face.js b/lang/zh-cn/member/modify_face.js
new file mode 100644
index 0000000..cb7f76f
--- /dev/null
+++ b/lang/zh-cn/member/modify_face.js
@@ -0,0 +1,4 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '修改头像'
+}
diff --git a/lang/zh-cn/member/pay_password.js b/lang/zh-cn/member/pay_password.js
new file mode 100644
index 0000000..f699e06
--- /dev/null
+++ b/lang/zh-cn/member/pay_password.js
@@ -0,0 +1,3 @@
+export const lang = {
+	title: '支付密码',
+}
\ No newline at end of file
diff --git a/lang/zh-cn/member/point.js b/lang/zh-cn/member/point.js
new file mode 100644
index 0000000..bd74dd9
--- /dev/null
+++ b/lang/zh-cn/member/point.js
@@ -0,0 +1,4 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '我的积分'
+}
diff --git a/lang/zh-cn/member/point_detail.js b/lang/zh-cn/member/point_detail.js
new file mode 100644
index 0000000..5c33ed8
--- /dev/null
+++ b/lang/zh-cn/member/point_detail.js
@@ -0,0 +1,6 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '积分明细',
+	emptyTpis: '您暂时还没有积分记录哦!',
+	pointExplain: '积分说明'
+}
diff --git a/lang/zh-cn/member/signin.js b/lang/zh-cn/member/signin.js
new file mode 100644
index 0000000..00003a9
--- /dev/null
+++ b/lang/zh-cn/member/signin.js
@@ -0,0 +1,4 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '签到有礼'
+}
diff --git a/lang/zh-cn/member/withdrawal.js b/lang/zh-cn/member/withdrawal.js
new file mode 100644
index 0000000..9b99202
--- /dev/null
+++ b/lang/zh-cn/member/withdrawal.js
@@ -0,0 +1,4 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '提现记录'
+}
diff --git a/lang/zh-cn/member/withdrawal_detail.js b/lang/zh-cn/member/withdrawal_detail.js
new file mode 100644
index 0000000..8b822bb
--- /dev/null
+++ b/lang/zh-cn/member/withdrawal_detail.js
@@ -0,0 +1,4 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '提现详情'
+}
diff --git a/lang/zh-cn/notice/detail.js b/lang/zh-cn/notice/detail.js
new file mode 100644
index 0000000..d2d77c9
--- /dev/null
+++ b/lang/zh-cn/notice/detail.js
@@ -0,0 +1,4 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '公告详情'
+}
diff --git a/lang/zh-cn/notice/list.js b/lang/zh-cn/notice/list.js
new file mode 100644
index 0000000..e2c2d7c
--- /dev/null
+++ b/lang/zh-cn/notice/list.js
@@ -0,0 +1,6 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '公告列表',
+	emptyText:"当前暂无更多信息",
+	contentTitle:'升级公告'
+}
diff --git a/lang/zh-cn/order/activist.js b/lang/zh-cn/order/activist.js
new file mode 100644
index 0000000..3113f05
--- /dev/null
+++ b/lang/zh-cn/order/activist.js
@@ -0,0 +1,6 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '退款',
+	checkDetail: '查看详情',
+	emptyTips: '暂无退款记录'
+}
diff --git a/lang/zh-cn/order/detail.js b/lang/zh-cn/order/detail.js
new file mode 100644
index 0000000..6c02235
--- /dev/null
+++ b/lang/zh-cn/order/detail.js
@@ -0,0 +1,4 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '订单详情'
+}
diff --git a/lang/zh-cn/order/detail_local_delivery.js b/lang/zh-cn/order/detail_local_delivery.js
new file mode 100644
index 0000000..6c02235
--- /dev/null
+++ b/lang/zh-cn/order/detail_local_delivery.js
@@ -0,0 +1,4 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '订单详情'
+}
diff --git a/lang/zh-cn/order/detail_pickup.js b/lang/zh-cn/order/detail_pickup.js
new file mode 100644
index 0000000..6c02235
--- /dev/null
+++ b/lang/zh-cn/order/detail_pickup.js
@@ -0,0 +1,4 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '订单详情'
+}
diff --git a/lang/zh-cn/order/detail_point.js b/lang/zh-cn/order/detail_point.js
new file mode 100644
index 0000000..6c02235
--- /dev/null
+++ b/lang/zh-cn/order/detail_point.js
@@ -0,0 +1,4 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '订单详情'
+}
diff --git a/lang/zh-cn/order/detail_virtual.js b/lang/zh-cn/order/detail_virtual.js
new file mode 100644
index 0000000..6c02235
--- /dev/null
+++ b/lang/zh-cn/order/detail_virtual.js
@@ -0,0 +1,4 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '订单详情'
+}
diff --git a/lang/zh-cn/order/evaluate.js b/lang/zh-cn/order/evaluate.js
new file mode 100644
index 0000000..73d6c04
--- /dev/null
+++ b/lang/zh-cn/order/evaluate.js
@@ -0,0 +1,4 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '我要评价'
+}
diff --git a/lang/zh-cn/order/list.js b/lang/zh-cn/order/list.js
new file mode 100644
index 0000000..1160a28
--- /dev/null
+++ b/lang/zh-cn/order/list.js
@@ -0,0 +1,13 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '订单列表',
+	emptyTips: '暂无相关订单',
+	all: '全部',
+	waitPay: '待付款',
+	readyDelivery: '待发货',
+	waitDelivery: '待收货',
+	waitEvaluate: '待评价',
+	waitUse: '待使用',
+	update: "释放刷新",
+	updateIng: "加载中..."
+}
diff --git a/lang/zh-cn/order/logistics.js b/lang/zh-cn/order/logistics.js
new file mode 100644
index 0000000..3736635
--- /dev/null
+++ b/lang/zh-cn/order/logistics.js
@@ -0,0 +1,4 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '物流信息'
+}
diff --git a/lang/zh-cn/order/payment.js b/lang/zh-cn/order/payment.js
new file mode 100644
index 0000000..88657dd
--- /dev/null
+++ b/lang/zh-cn/order/payment.js
@@ -0,0 +1,4 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '待付款订单'
+}
diff --git a/lang/zh-cn/order/refund.js b/lang/zh-cn/order/refund.js
new file mode 100644
index 0000000..d1b3c1d
--- /dev/null
+++ b/lang/zh-cn/order/refund.js
@@ -0,0 +1,4 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '申请退款',
+}
diff --git a/lang/zh-cn/order/refund_batch.js b/lang/zh-cn/order/refund_batch.js
new file mode 100644
index 0000000..d1b3c1d
--- /dev/null
+++ b/lang/zh-cn/order/refund_batch.js
@@ -0,0 +1,4 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '申请退款',
+}
diff --git a/lang/zh-cn/order/refund_detail.js b/lang/zh-cn/order/refund_detail.js
new file mode 100644
index 0000000..f931c6b
--- /dev/null
+++ b/lang/zh-cn/order/refund_detail.js
@@ -0,0 +1,4 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '退款详情',
+}
diff --git a/lang/zh-cn/pay/index.js b/lang/zh-cn/pay/index.js
new file mode 100644
index 0000000..60ddcaf
--- /dev/null
+++ b/lang/zh-cn/pay/index.js
@@ -0,0 +1,7 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '支付方式',
+	paymentAmount: '支付金额',
+	confirmPayment: '确认支付',
+	seeOrder: '查看订单'
+}
diff --git a/lang/zh-cn/pay/result.js b/lang/zh-cn/pay/result.js
new file mode 100644
index 0000000..294c202
--- /dev/null
+++ b/lang/zh-cn/pay/result.js
@@ -0,0 +1,10 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '支付结果',
+	paymentSuccess: '支付成功',
+	paymentFail: '支付失败',
+	goHome: '回到首页',
+	memberCenter: '会员中心',
+	payMoney: '支付金额',
+	unit: '元'
+}
diff --git a/lang/zh-cn/pintuan/detail.js b/lang/zh-cn/pintuan/detail.js
new file mode 100644
index 0000000..aa08c12
--- /dev/null
+++ b/lang/zh-cn/pintuan/detail.js
@@ -0,0 +1,10 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '',
+	select: '选择',
+	params: '参数',
+	service: '商品服务',
+	allGoods: '全部商品',
+	image: '图片',
+	video: '视频'
+}
diff --git a/lang/zh-cn/pintuan/list.js b/lang/zh-cn/pintuan/list.js
new file mode 100644
index 0000000..c9e868c
--- /dev/null
+++ b/lang/zh-cn/pintuan/list.js
@@ -0,0 +1,4 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '拼团专区'
+}
diff --git a/lang/zh-cn/pintuan/my_spell.js b/lang/zh-cn/pintuan/my_spell.js
new file mode 100644
index 0000000..ffb8d0f
--- /dev/null
+++ b/lang/zh-cn/pintuan/my_spell.js
@@ -0,0 +1,4 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '我的拼单'
+}
diff --git a/lang/zh-cn/pintuan/payment.js b/lang/zh-cn/pintuan/payment.js
new file mode 100644
index 0000000..88657dd
--- /dev/null
+++ b/lang/zh-cn/pintuan/payment.js
@@ -0,0 +1,4 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '待付款订单'
+}
diff --git a/lang/zh-cn/pintuan/share.js b/lang/zh-cn/pintuan/share.js
new file mode 100644
index 0000000..9b25eb4
--- /dev/null
+++ b/lang/zh-cn/pintuan/share.js
@@ -0,0 +1,4 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '拼团分享'
+}
diff --git a/lang/zh-cn/point/detail.js b/lang/zh-cn/point/detail.js
new file mode 100644
index 0000000..17ad9f1
--- /dev/null
+++ b/lang/zh-cn/point/detail.js
@@ -0,0 +1,4 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '兑换'
+}
diff --git a/lang/zh-cn/point/goods_detail.js b/lang/zh-cn/point/goods_detail.js
new file mode 100644
index 0000000..7c5e6bf
--- /dev/null
+++ b/lang/zh-cn/point/goods_detail.js
@@ -0,0 +1,4 @@
+export const lang = {
+	//title为每个页面的标题
+	// title: '兑换'
+}
\ No newline at end of file
diff --git a/lang/zh-cn/point/list.js b/lang/zh-cn/point/list.js
new file mode 100644
index 0000000..35fa006
--- /dev/null
+++ b/lang/zh-cn/point/list.js
@@ -0,0 +1,4 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '积分商城'
+}
diff --git a/lang/zh-cn/point/order_detail.js b/lang/zh-cn/point/order_detail.js
new file mode 100644
index 0000000..02b134b
--- /dev/null
+++ b/lang/zh-cn/point/order_detail.js
@@ -0,0 +1,4 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '积分兑换订单详情'
+}
diff --git a/lang/zh-cn/point/order_list.js b/lang/zh-cn/point/order_list.js
new file mode 100644
index 0000000..5139a9a
--- /dev/null
+++ b/lang/zh-cn/point/order_list.js
@@ -0,0 +1,5 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '积分兑换',
+	emptyTips: '暂无更多数据了'
+}
diff --git a/lang/zh-cn/point/payment.js b/lang/zh-cn/point/payment.js
new file mode 100644
index 0000000..88657dd
--- /dev/null
+++ b/lang/zh-cn/point/payment.js
@@ -0,0 +1,4 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '待付款订单'
+}
diff --git a/lang/zh-cn/point/result.js b/lang/zh-cn/point/result.js
new file mode 100644
index 0000000..fb9a581
--- /dev/null
+++ b/lang/zh-cn/point/result.js
@@ -0,0 +1,7 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '兑换结果',
+	exchangeSuccess: '兑换成功',
+	see: '查看兑换记录',
+	goHome: '回到首页'
+}
diff --git a/lang/zh-cn/presale/detail.js b/lang/zh-cn/presale/detail.js
new file mode 100644
index 0000000..aa08c12
--- /dev/null
+++ b/lang/zh-cn/presale/detail.js
@@ -0,0 +1,10 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '',
+	select: '选择',
+	params: '参数',
+	service: '商品服务',
+	allGoods: '全部商品',
+	image: '图片',
+	video: '视频'
+}
diff --git a/lang/zh-cn/presale/list.js b/lang/zh-cn/presale/list.js
new file mode 100644
index 0000000..6062102
--- /dev/null
+++ b/lang/zh-cn/presale/list.js
@@ -0,0 +1,4 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '预售专区'
+}
diff --git a/lang/zh-cn/presale/order_detail.js b/lang/zh-cn/presale/order_detail.js
new file mode 100644
index 0000000..6c02235
--- /dev/null
+++ b/lang/zh-cn/presale/order_detail.js
@@ -0,0 +1,4 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '订单详情'
+}
diff --git a/lang/zh-cn/presale/order_list.js b/lang/zh-cn/presale/order_list.js
new file mode 100644
index 0000000..33e46b3
--- /dev/null
+++ b/lang/zh-cn/presale/order_list.js
@@ -0,0 +1,7 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '我的预售',
+	emptyTips: '暂无相关预售订单',
+	update: "释放刷新",
+	updateIng: "加载中..."
+}
diff --git a/lang/zh-cn/presale/payment.js b/lang/zh-cn/presale/payment.js
new file mode 100644
index 0000000..88657dd
--- /dev/null
+++ b/lang/zh-cn/presale/payment.js
@@ -0,0 +1,4 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '待付款订单'
+}
diff --git a/lang/zh-cn/recharge/detail.js b/lang/zh-cn/recharge/detail.js
new file mode 100644
index 0000000..7f56b11
--- /dev/null
+++ b/lang/zh-cn/recharge/detail.js
@@ -0,0 +1,4 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '充值详情'
+}
diff --git a/lang/zh-cn/recharge/list.js b/lang/zh-cn/recharge/list.js
new file mode 100644
index 0000000..0247946
--- /dev/null
+++ b/lang/zh-cn/recharge/list.js
@@ -0,0 +1,4 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '充值列表'
+}
diff --git a/lang/zh-cn/recharge/order_list.js b/lang/zh-cn/recharge/order_list.js
new file mode 100644
index 0000000..ccae5ec
--- /dev/null
+++ b/lang/zh-cn/recharge/order_list.js
@@ -0,0 +1,4 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '充值记录',
+}
diff --git a/lang/zh-cn/seckill/detail.js b/lang/zh-cn/seckill/detail.js
new file mode 100644
index 0000000..aa08c12
--- /dev/null
+++ b/lang/zh-cn/seckill/detail.js
@@ -0,0 +1,10 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '',
+	select: '选择',
+	params: '参数',
+	service: '商品服务',
+	allGoods: '全部商品',
+	image: '图片',
+	video: '视频'
+}
diff --git a/lang/zh-cn/seckill/list.js b/lang/zh-cn/seckill/list.js
new file mode 100644
index 0000000..d546477
--- /dev/null
+++ b/lang/zh-cn/seckill/list.js
@@ -0,0 +1,4 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '秒杀专区'
+}
diff --git a/lang/zh-cn/seckill/payment.js b/lang/zh-cn/seckill/payment.js
new file mode 100644
index 0000000..88657dd
--- /dev/null
+++ b/lang/zh-cn/seckill/payment.js
@@ -0,0 +1,4 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '待付款订单'
+}
diff --git a/lang/zh-cn/store_notes/note_detail.js b/lang/zh-cn/store_notes/note_detail.js
new file mode 100644
index 0000000..f776d19
--- /dev/null
+++ b/lang/zh-cn/store_notes/note_detail.js
@@ -0,0 +1,4 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '笔记详情'
+}
\ No newline at end of file
diff --git a/lang/zh-cn/store_notes/note_list.js b/lang/zh-cn/store_notes/note_list.js
new file mode 100644
index 0000000..daf0791
--- /dev/null
+++ b/lang/zh-cn/store_notes/note_list.js
@@ -0,0 +1,4 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '店铺笔记'
+}
\ No newline at end of file
diff --git a/lang/zh-cn/storeclose/storeclose.js b/lang/zh-cn/storeclose/storeclose.js
new file mode 100644
index 0000000..af147fc
--- /dev/null
+++ b/lang/zh-cn/storeclose/storeclose.js
@@ -0,0 +1,4 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '店铺打烊'
+}
diff --git a/lang/zh-cn/topics/detail.js b/lang/zh-cn/topics/detail.js
new file mode 100644
index 0000000..37300ef
--- /dev/null
+++ b/lang/zh-cn/topics/detail.js
@@ -0,0 +1,4 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '专题活动详情'
+}
diff --git a/lang/zh-cn/topics/goods_detail.js b/lang/zh-cn/topics/goods_detail.js
new file mode 100644
index 0000000..aa08c12
--- /dev/null
+++ b/lang/zh-cn/topics/goods_detail.js
@@ -0,0 +1,10 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '',
+	select: '选择',
+	params: '参数',
+	service: '商品服务',
+	allGoods: '全部商品',
+	image: '图片',
+	video: '视频'
+}
diff --git a/lang/zh-cn/topics/list.js b/lang/zh-cn/topics/list.js
new file mode 100644
index 0000000..88fad9a
--- /dev/null
+++ b/lang/zh-cn/topics/list.js
@@ -0,0 +1,4 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '专题活动列表'
+}
diff --git a/lang/zh-cn/topics/payment.js b/lang/zh-cn/topics/payment.js
new file mode 100644
index 0000000..88657dd
--- /dev/null
+++ b/lang/zh-cn/topics/payment.js
@@ -0,0 +1,4 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '待付款订单'
+}
diff --git a/lang/zh-cn/verification/detail.js b/lang/zh-cn/verification/detail.js
new file mode 100644
index 0000000..d363d70
--- /dev/null
+++ b/lang/zh-cn/verification/detail.js
@@ -0,0 +1,4 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '核销明细'
+}
diff --git a/lang/zh-cn/verification/index.js b/lang/zh-cn/verification/index.js
new file mode 100644
index 0000000..e03614d
--- /dev/null
+++ b/lang/zh-cn/verification/index.js
@@ -0,0 +1,4 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '核销台'
+}
diff --git a/lang/zh-cn/verification/list.js b/lang/zh-cn/verification/list.js
new file mode 100644
index 0000000..0280f33
--- /dev/null
+++ b/lang/zh-cn/verification/list.js
@@ -0,0 +1,5 @@
+export const lang = {
+	//title为每个页面的标题
+	title: '核销记录',
+	emptyTips: '暂无记录'
+}
diff --git a/main.js b/main.js
new file mode 100644
index 0000000..3354500
--- /dev/null
+++ b/main.js
@@ -0,0 +1,59 @@
+// #ifdef H5
+import './common/js/pc'
+// #endif
+import Vue from 'vue'
+import App from './App'
+import store from './store'
+import Util from './common/js/util.js'
+import Http from './common/js/http.js'
+import Lang from './common/js/lang.js'
+import Config from './common/js/config.js'
+import globalConfig from './common/js/golbalConfig.js';
+import {
+	uniStorage
+} from './common/js/storage.js'
+
+Vue.prototype.$store = store //挂在vue
+
+Vue.config.productionTip = false
+
+Vue.prototype.$util = Util;
+Vue.prototype.$api = Http;
+
+Vue.prototype.$langConfig = Lang; //语言包对象
+Vue.prototype.$lang = Lang.lang; //解析语言包
+
+Vue.prototype.$config = Config;
+
+Vue.mixin(globalConfig);
+
+App.mpType = 'app';
+
+// 重写存储，增加前缀
+uniStorage();
+
+//常用组件
+import loadingCover from '@/components/loading-cover/loading-cover.vue';
+Vue.component('loading-cover', loadingCover);
+
+import nsEmpty from '@/components/ns-empty/ns-empty.vue';
+Vue.component('ns-empty', nsEmpty);
+
+import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
+Vue.component("mescroll-uni", MescrollUni); //上拉加载,下拉刷新组件
+
+import MescrollBody from "@/components/mescroll/mescroll-body.vue"
+Vue.component('mescroll-body', MescrollBody);
+
+import NsLogin from "@/components/ns-login/ns-login.vue"
+Vue.component('ns-login', NsLogin);
+
+import PrivacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
+Vue.component('privacy-popup', PrivacyPopup)
+
+const app = new Vue({
+	...App,
+	store
+})
+
+app.$mount()
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
new file mode 100644
index 0000000..1a7fa82
--- /dev/null
+++ b/manifest.json
@@ -0,0 +1,130 @@
+{
+    "name" : "lucky_weapp",
+    "appid" : "__UNI__FB025B5",
+    "description" : "",
+    "versionName" : "1.0.0",
+    "versionCode" : "100",
+    "transformPx" : false,
+    /* 5+App特有相关 */
+    "app-plus" : {
+        "usingComponents" : true,
+        "nvueCompiler" : "uni-app",
+        "splashscreen" : {
+            "alwaysShowBeforeRender" : true,
+            "waiting" : true,
+            "autoclose" : true,
+            "delay" : 0
+        },
+        /* 模块配置 */
+        "modules" : {},
+        /* 应用发布信息 */
+        "distribute" : {
+            /* android打包配置 */
+            "android" : {
+                "permissions" : [
+                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>",
+                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+                    "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
+                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+                    "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+                    "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
+                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+                ]
+            },
+            /* ios打包配置 */
+            "ios" : {},
+            /* SDK配置 */
+            "sdkConfigs" : {
+                "ad" : {}
+            }
+        }
+    },
+    /* 快应用特有相关 */
+    "quickapp" : {},
+    /* 小程序特有相关 */
+    "mp-weixin" : {
+        "appid" : "wxd0d197d489e31428",
+        "setting" : {
+            "urlCheck" : false,
+            "postcss" : false,
+            "es6" : true,
+            "minified" : true
+        },
+        "usingComponents" : true,
+        "permission" : {
+            "scope.userLocation" : {
+                "desc" : "为了更好地为您提供服务"
+            },
+            "scope.writePhotosAlbum" : {
+                "desc" : "为了更好地为您提供服务"
+            }
+        },
+        "requiredPrivateInfos" : [ "chooseLocation", "getLocation", "chooseAddress" ],
+        "__usePrivacyCheck__" : true,
+        "optimization" : {
+            "subPackages" : true
+        }
+    },
+    "mp-alipay" : {
+        "usingComponents" : true,
+        "appid" : ""
+    },
+    "mp-baidu" : {
+        "usingComponents" : true
+    },
+    "mp-toutiao" : {
+        "usingComponents" : true
+    },
+    "h5" : {
+        "sdkConfigs" : {
+            "maps" : {
+                "qqmap" : {
+                    "key" : "TUHBZ-CNWKU-UHAVP-GZQ26-HNZFO-3YBF4"
+                }
+            }
+        },
+        "router" : {
+            "mode" : "history",
+            "base" : "/hwapp/"
+        },
+        "title" : " ",
+        "devServer" : {
+            "https" : false
+        },
+        "optimization" : {
+            "treeShaking" : {
+                "enable" : false
+            }
+        },
+        "domain" : " ",
+        "unipush" : {
+            "enable" : false
+        },
+        "async" : {
+            "loading" : "",
+            "error" : "",
+            "delay" : 0,
+            "timeout" : 3000
+        },
+        "template" : ""
+    },
+    "uniStatistics" : {
+        "version" : "2"
+    },
+	"sassImplementationName": "node-sass"
+}
diff --git a/node_modules/jweixin-module/README.md b/node_modules/jweixin-module/README.md
new file mode 100644
index 0000000..f4e08bd
--- /dev/null
+++ b/node_modules/jweixin-module/README.md
@@ -0,0 +1,30 @@
+# jweixin-module
+
+微信JS-SDK
+
+## 安装
+
+### NPM
+
+```shell
+npm install jweixin-module --save
+```
+
+### UMD
+
+```http
+https://unpkg.com/jweixin-module/out/index.js
+```
+
+## 使用
+
+```js
+var wx = require('jweixin-module')
+wx.ready(function(){
+    // TODO
+});
+```
+
+## 完整API
+
+>[微信JS-SDK说明文档](https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421141115)
diff --git a/node_modules/jweixin-module/out/index.js b/node_modules/jweixin-module/out/index.js
new file mode 100644
index 0000000..807ab6a
--- /dev/null
+++ b/node_modules/jweixin-module/out/index.js
@@ -0,0 +1 @@
+!function(e,n){"object"==typeof exports&&"object"==typeof module?module.exports=n(e):"function"==typeof define&&(define.amd||define.cmd)?define(function(){return n(e)}):n(e,!0)}(window,function(o,e){function c(n,e,i){o.WeixinJSBridge?WeixinJSBridge.invoke(n,r(e),function(e){a(n,e,i)}):d(n,i)}function i(n,i,t){o.WeixinJSBridge?WeixinJSBridge.on(n,function(e){t&&t.trigger&&t.trigger(e),a(n,e,i)}):d(n,t||i)}function r(e){return(e=e||{}).appId=M.appId,e.verifyAppId=M.appId,e.verifySignType="sha1",e.verifyTimestamp=M.timestamp+"",e.verifyNonceStr=M.nonceStr,e.verifySignature=M.signature,e}function n(e){return{timeStamp:e.timestamp+"",nonceStr:e.nonceStr,package:e.package,paySign:e.paySign,signType:e.signType||"SHA1"}}function a(e,n,i){"openEnterpriseChat"==e&&(n.errCode=n.err_code),delete n.err_code,delete n.err_desc,delete n.err_detail;var t=n.errMsg;t||(t=n.err_msg,delete n.err_msg,t=function(e,n){var i=e,t=f[i];t&&(i=t);var o="ok";if(n){var r=n.indexOf(":");"confirm"==(o=n.substring(r+1))&&(o="ok"),"failed"==o&&(o="fail"),-1!=o.indexOf("failed_")&&(o=o.substring(7)),-1!=o.indexOf("fail_")&&(o=o.substring(5)),"access denied"!=(o=(o=o.replace(/_/g," ")).toLowerCase())&&"no permission to execute"!=o||(o="permission denied"),"config"==i&&"function not exist"==o&&(o="ok"),""==o&&(o="fail")}return n=i+":"+o}(e,t),n.errMsg=t),(i=i||{})._complete&&(i._complete(n),delete i._complete),t=n.errMsg||"",M.debug&&!i.isInnerInvoke&&alert(JSON.stringify(n));var o=t.indexOf(":");switch(t.substring(o+1)){case"ok":i.success&&i.success(n);break;case"cancel":i.cancel&&i.cancel(n);break;default:i.fail&&i.fail(n)}i.complete&&i.complete(n)}function s(e){if(e){for(var n=0,i=e.length;n<i;++n){var t=e[n],o=p[t];o&&(e[n]=o)}return e}}function d(e,n){if(!(!M.debug||n&&n.isInnerInvoke)){var i=f[e];i&&(e=i),n&&n._complete&&delete n._complete,console.log('"'+e+'",',n||"")}}function l(){return(new Date).getTime()}function u(e){I&&(o.WeixinJSBridge?e():t.addEventListener&&t.addEventListener("WeixinJSBridgeReady",e,!1))}if(!o.jWeixin){var p={config:"preVerifyJSAPI",onMenuShareTimeline:"menu:share:timeline",onMenuShareAppMessage:"menu:share:appmessage",onMenuShareQQ:"menu:share:qq",onMenuShareWeibo:"menu:share:weiboApp",onMenuShareQZone:"menu:share:QZone",previewImage:"imagePreview",getLocation:"geoLocation",openProductSpecificView:"openProductViewWithPid",addCard:"batchAddCard",openCard:"batchViewCard",chooseWXPay:"getBrandWCPayRequest",openEnterpriseRedPacket:"getRecevieBizHongBaoRequest",startSearchBeacons:"startMonitoringBeacons",stopSearchBeacons:"stopMonitoringBeacons",onSearchBeacons:"onBeaconsInRange",consumeAndShareCard:"consumedShareCard",openAddress:"editAddress"},f=function(){var e={};for(var n in p)e[p[n]]=n;return e}(),t=o.document,m=t.title,g=navigator.userAgent.toLowerCase(),h=navigator.platform.toLowerCase(),v=!(!h.match("mac")&&!h.match("win")),S=-1!=g.indexOf("wxdebugger"),I=-1!=g.indexOf("micromessenger"),y=-1!=g.indexOf("android"),_=-1!=g.indexOf("iphone")||-1!=g.indexOf("ipad"),w=(O=g.match(/micromessenger\/(\d+\.\d+\.\d+)/)||g.match(/micromessenger\/(\d+\.\d+)/))?O[1]:"",k={initStartTime:l(),initEndTime:0,preVerifyStartTime:0,preVerifyEndTime:0},T={version:1,appId:"",initTime:0,preVerifyTime:0,networkType:"",isPreVerifyOk:1,systemType:_?1:y?2:-1,clientVersion:w,url:encodeURIComponent(location.href)},M={},P={_completes:[]},x={state:0,data:{}};u(function(){k.initEndTime=l()});var A=!1,V=[],C={config:function(e){d("config",M=e);var t=!1!==M.check;u(function(){if(t)c(p.config,{verifyJsApiList:s(M.jsApiList)},function(){P._complete=function(e){k.preVerifyEndTime=l(),x.state=1,x.data=e},P.success=function(e){T.isPreVerifyOk=0},P.fail=function(e){P._fail?P._fail(e):x.state=-1};var t=P._completes;return t.push(function(){!function(e){if(!(v||S||M.debug||w<"6.0.2"||T.systemType<0)){var i=new Image;T.appId=M.appId,T.initTime=k.initEndTime-k.initStartTime,T.preVerifyTime=k.preVerifyEndTime-k.preVerifyStartTime,C.getNetworkType({isInnerInvoke:!0,success:function(e){T.networkType=e.networkType;var n="https://open.weixin.qq.com/sdk/report?v="+T.version+"&o="+T.isPreVerifyOk+"&s="+T.systemType+"&c="+T.clientVersion+"&a="+T.appId+"&n="+T.networkType+"&i="+T.initTime+"&p="+T.preVerifyTime+"&u="+T.url;i.src=n}})}}()}),P.complete=function(e){for(var n=0,i=t.length;n<i;++n)t[n]();P._completes=[]},P}()),k.preVerifyStartTime=l();else{x.state=1;for(var e=P._completes,n=0,i=e.length;n<i;++n)e[n]();P._completes=[]}}),C.invoke||(C.invoke=function(e,n,i){o.WeixinJSBridge&&WeixinJSBridge.invoke(e,r(n),i)},C.on=function(e,n){o.WeixinJSBridge&&WeixinJSBridge.on(e,n)})},ready:function(e){0!=x.state?e():(P._completes.push(e),!I&&M.debug&&e())},error:function(e){w<"6.0.2"||(-1==x.state?e(x.data):P._fail=e)},checkJsApi:function(e){c("checkJsApi",{jsApiList:s(e.jsApiList)},(e._complete=function(e){if(y){var n=e.checkResult;n&&(e.checkResult=JSON.parse(n))}e=function(e){var n=e.checkResult;for(var i in n){var t=f[i];t&&(n[t]=n[i],delete n[i])}return e}(e)},e))},onMenuShareTimeline:function(e){i(p.onMenuShareTimeline,{complete:function(){c("shareTimeline",{title:e.title||m,desc:e.title||m,img_url:e.imgUrl||"",link:e.link||location.href,type:e.type||"link",data_url:e.dataUrl||""},e)}},e)},onMenuShareAppMessage:function(n){i(p.onMenuShareAppMessage,{complete:function(e){"favorite"===e.scene?c("sendAppMessage",{title:n.title||m,desc:n.desc||"",link:n.link||location.href,img_url:n.imgUrl||"",type:n.type||"link",data_url:n.dataUrl||""}):c("sendAppMessage",{title:n.title||m,desc:n.desc||"",link:n.link||location.href,img_url:n.imgUrl||"",type:n.type||"link",data_url:n.dataUrl||""},n)}},n)},onMenuShareQQ:function(e){i(p.onMenuShareQQ,{complete:function(){c("shareQQ",{title:e.title||m,desc:e.desc||"",img_url:e.imgUrl||"",link:e.link||location.href},e)}},e)},onMenuShareWeibo:function(e){i(p.onMenuShareWeibo,{complete:function(){c("shareWeiboApp",{title:e.title||m,desc:e.desc||"",img_url:e.imgUrl||"",link:e.link||location.href},e)}},e)},onMenuShareQZone:function(e){i(p.onMenuShareQZone,{complete:function(){c("shareQZone",{title:e.title||m,desc:e.desc||"",img_url:e.imgUrl||"",link:e.link||location.href},e)}},e)},updateTimelineShareData:function(e){c("updateTimelineShareData",{title:e.title,link:e.link,imgUrl:e.imgUrl},e)},updateAppMessageShareData:function(e){c("updateAppMessageShareData",{title:e.title,desc:e.desc,link:e.link,imgUrl:e.imgUrl},e)},startRecord:function(e){c("startRecord",{},e)},stopRecord:function(e){c("stopRecord",{},e)},onVoiceRecordEnd:function(e){i("onVoiceRecordEnd",e)},playVoice:function(e){c("playVoice",{localId:e.localId},e)},pauseVoice:function(e){c("pauseVoice",{localId:e.localId},e)},stopVoice:function(e){c("stopVoice",{localId:e.localId},e)},onVoicePlayEnd:function(e){i("onVoicePlayEnd",e)},uploadVoice:function(e){c("uploadVoice",{localId:e.localId,isShowProgressTips:0==e.isShowProgressTips?0:1},e)},downloadVoice:function(e){c("downloadVoice",{serverId:e.serverId,isShowProgressTips:0==e.isShowProgressTips?0:1},e)},translateVoice:function(e){c("translateVoice",{localId:e.localId,isShowProgressTips:0==e.isShowProgressTips?0:1},e)},chooseImage:function(e){c("chooseImage",{scene:"1|2",count:e.count||9,sizeType:e.sizeType||["original","compressed"],sourceType:e.sourceType||["album","camera"]},(e._complete=function(e){if(y){var n=e.localIds;try{n&&(e.localIds=JSON.parse(n))}catch(e){}}},e))},getLocation:function(e){},previewImage:function(e){c(p.previewImage,{current:e.current,urls:e.urls},e)},uploadImage:function(e){c("uploadImage",{localId:e.localId,isShowProgressTips:0==e.isShowProgressTips?0:1},e)},downloadImage:function(e){c("downloadImage",{serverId:e.serverId,isShowProgressTips:0==e.isShowProgressTips?0:1},e)},getLocalImgData:function(e){!1===A?(A=!0,c("getLocalImgData",{localId:e.localId},(e._complete=function(e){if(A=!1,0<V.length){var n=V.shift();wx.getLocalImgData(n)}},e))):V.push(e)},getNetworkType:function(e){c("getNetworkType",{},(e._complete=function(e){e=function(e){var n=e.errMsg;e.errMsg="getNetworkType:ok";var i=e.subtype;if(delete e.subtype,i)e.networkType=i;else{var t=n.indexOf(":"),o=n.substring(t+1);switch(o){case"wifi":case"edge":case"wwan":e.networkType=o;break;default:e.errMsg="getNetworkType:fail"}}return e}(e)},e))},openLocation:function(e){c("openLocation",{latitude:e.latitude,longitude:e.longitude,name:e.name||"",address:e.address||"",scale:e.scale||28,infoUrl:e.infoUrl||""},e)},getLocation:function(e){c(p.getLocation,{type:(e=e||{}).type||"wgs84"},(e._complete=function(e){delete e.type},e))},hideOptionMenu:function(e){c("hideOptionMenu",{},e)},showOptionMenu:function(e){c("showOptionMenu",{},e)},closeWindow:function(e){c("closeWindow",{},e=e||{})},hideMenuItems:function(e){c("hideMenuItems",{menuList:e.menuList},e)},showMenuItems:function(e){c("showMenuItems",{menuList:e.menuList},e)},hideAllNonBaseMenuItem:function(e){c("hideAllNonBaseMenuItem",{},e)},showAllNonBaseMenuItem:function(e){c("showAllNonBaseMenuItem",{},e)},scanQRCode:function(e){c("scanQRCode",{needResult:(e=e||{}).needResult||0,scanType:e.scanType||["qrCode","barCode"]},(e._complete=function(e){if(_){var n=e.resultStr;if(n){var i=JSON.parse(n);e.resultStr=i&&i.scan_code&&i.scan_code.scan_result}}},e))},openAddress:function(e){c(p.openAddress,{},(e._complete=function(e){var n;(n=e).postalCode=n.addressPostalCode,delete n.addressPostalCode,n.provinceName=n.proviceFirstStageName,delete n.proviceFirstStageName,n.cityName=n.addressCitySecondStageName,delete n.addressCitySecondStageName,n.countryName=n.addressCountiesThirdStageName,delete n.addressCountiesThirdStageName,n.detailInfo=n.addressDetailInfo,delete n.addressDetailInfo,e=n},e))},openProductSpecificView:function(e){c(p.openProductSpecificView,{pid:e.productId,view_type:e.viewType||0,ext_info:e.extInfo},e)},addCard:function(e){for(var n=e.cardList,i=[],t=0,o=n.length;t<o;++t){var r=n[t],a={card_id:r.cardId,card_ext:r.cardExt};i.push(a)}c(p.addCard,{card_list:i},(e._complete=function(e){var n=e.card_list;if(n){for(var i=0,t=(n=JSON.parse(n)).length;i<t;++i){var o=n[i];o.cardId=o.card_id,o.cardExt=o.card_ext,o.isSuccess=!!o.is_succ,delete o.card_id,delete o.card_ext,delete o.is_succ}e.cardList=n,delete e.card_list}},e))},chooseCard:function(e){c("chooseCard",{app_id:M.appId,location_id:e.shopId||"",sign_type:e.signType||"SHA1",card_id:e.cardId||"",card_type:e.cardType||"",card_sign:e.cardSign,time_stamp:e.timestamp+"",nonce_str:e.nonceStr},(e._complete=function(e){e.cardList=e.choose_card_info,delete e.choose_card_info},e))},openCard:function(e){for(var n=e.cardList,i=[],t=0,o=n.length;t<o;++t){var r=n[t],a={card_id:r.cardId,code:r.code};i.push(a)}c(p.openCard,{card_list:i},e)},consumeAndShareCard:function(e){c(p.consumeAndShareCard,{consumedCardId:e.cardId,consumedCode:e.code},e)},chooseWXPay:function(e){c(p.chooseWXPay,n(e),e)},openEnterpriseRedPacket:function(e){c(p.openEnterpriseRedPacket,n(e),e)},startSearchBeacons:function(e){c(p.startSearchBeacons,{ticket:e.ticket},e)},stopSearchBeacons:function(e){c(p.stopSearchBeacons,{},e)},onSearchBeacons:function(e){i(p.onSearchBeacons,e)},openEnterpriseChat:function(e){c("openEnterpriseChat",{useridlist:e.userIds,chatname:e.groupName},e)},launchMiniProgram:function(e){c("launchMiniProgram",{targetAppId:e.targetAppId,path:function(e){if("string"==typeof e&&0<e.length){var n=e.split("?")[0],i=e.split("?")[1];return n+=".html",void 0!==i?n+"?"+i:n}}(e.path),envVersion:e.envVersion},e)},miniProgram:{navigateBack:function(e){e=e||{},u(function(){c("invokeMiniProgramAPI",{name:"navigateBack",arg:{delta:e.delta||1}},e)})},navigateTo:function(e){u(function(){c("invokeMiniProgramAPI",{name:"navigateTo",arg:{url:e.url}},e)})},redirectTo:function(e){u(function(){c("invokeMiniProgramAPI",{name:"redirectTo",arg:{url:e.url}},e)})},switchTab:function(e){u(function(){c("invokeMiniProgramAPI",{name:"switchTab",arg:{url:e.url}},e)})},reLaunch:function(e){u(function(){c("invokeMiniProgramAPI",{name:"reLaunch",arg:{url:e.url}},e)})},postMessage:function(e){u(function(){c("invokeMiniProgramAPI",{name:"postMessage",arg:e.data||{}},e)})},getEnv:function(e){u(function(){e({miniprogram:"miniprogram"===o.__wxjs_environment})})}}},L=1,B={};return t.addEventListener("error",function(e){if(!y){var n=e.target,i=n.tagName,t=n.src;if(("IMG"==i||"VIDEO"==i||"AUDIO"==i||"SOURCE"==i)&&-1!=t.indexOf("wxlocalresource://")){e.preventDefault(),e.stopPropagation();var o=n["wx-id"];if(o||(o=L++,n["wx-id"]=o),B[o])return;B[o]=!0,wx.ready(function(){wx.getLocalImgData({localId:t,success:function(e){n.src=e.localData}})})}}},!0),t.addEventListener("load",function(e){if(!y){var n=e.target,i=n.tagName;if(n.src,"IMG"==i||"VIDEO"==i||"AUDIO"==i||"SOURCE"==i){var t=n["wx-id"];t&&(B[t]=!1)}}},!0),e&&(o.wx=o.jWeixin=C),C}var O});
\ No newline at end of file
diff --git a/node_modules/jweixin-module/package.json b/node_modules/jweixin-module/package.json
new file mode 100644
index 0000000..4f3cd45
--- /dev/null
+++ b/node_modules/jweixin-module/package.json
@@ -0,0 +1,60 @@
+{
+  "_from": "jweixin-module",
+  "_id": "jweixin-module@1.4.1",
+  "_inBundle": false,
+  "_integrity": "sha512-2R2oa1lYhAsclfjKSf3DP4ZiP1dcrQUbM7aklbeJA+UAg/LS7MqoA6UbTy1cs4sbB34z62K4bKW0Z9iazD8ejg==",
+  "_location": "/jweixin-module",
+  "_phantomChildren": {},
+  "_requested": {
+    "type": "tag",
+    "registry": true,
+    "raw": "jweixin-module",
+    "name": "jweixin-module",
+    "escapedName": "jweixin-module",
+    "rawSpec": "",
+    "saveSpec": null,
+    "fetchSpec": "latest"
+  },
+  "_requiredBy": [
+    "#USER",
+    "/"
+  ],
+  "_resolved": "https://registry.npmjs.org/jweixin-module/-/jweixin-module-1.4.1.tgz",
+  "_shasum": "1fc8fa42622243f6c35651d272cd587debf56cd1",
+  "_spec": "jweixin-module",
+  "_where": "E:\\demo\\niushop_uniapp",
+  "author": {
+    "name": "Shengqiang Guo"
+  },
+  "bugs": {
+    "url": "https://github.com/zhetengbiji/jweixin-module/issues"
+  },
+  "bundleDependencies": false,
+  "deprecated": false,
+  "description": "微信JS-SDK",
+  "devDependencies": {
+    "textfile": "^1.2.0",
+    "uglify-js": "^3.4.9"
+  },
+  "homepage": "https://github.com/zhetengbiji/jweixin-module#readme",
+  "keywords": [
+    "wxjssdk",
+    "weixin",
+    "jweixin",
+    "wechat",
+    "jssdk",
+    "wx"
+  ],
+  "license": "ISC",
+  "main": "out/index.js",
+  "name": "jweixin-module",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/zhetengbiji/jweixin-module.git"
+  },
+  "scripts": {
+    "build": "node build",
+    "prepublish": "npm run build"
+  },
+  "version": "1.4.1"
+}
diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 0000000..eb761f5
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,1686 @@
+{
+  "name": "uniappsaas",
+  "lockfileVersion": 2,
+  "requires": true,
+  "packages": {
+    "": {
+      "devDependencies": {
+        "terser-webpack-plugin": "^5.3.10"
+      }
+    },
+    "node_modules/@jridgewell/gen-mapping": {
+      "version": "0.3.5",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
+      "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/set-array": "^1.2.1",
+        "@jridgewell/sourcemap-codec": "^1.4.10",
+        "@jridgewell/trace-mapping": "^0.3.24"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/resolve-uri": {
+      "version": "3.1.2",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
+      "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/set-array": {
+      "version": "1.2.1",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/@jridgewell/set-array/-/set-array-1.2.1.tgz",
+      "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/source-map": {
+      "version": "0.3.6",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/@jridgewell/source-map/-/source-map-0.3.6.tgz",
+      "integrity": "sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.25"
+      }
+    },
+    "node_modules/@jridgewell/sourcemap-codec": {
+      "version": "1.5.0",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
+      "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@jridgewell/trace-mapping": {
+      "version": "0.3.25",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
+      "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/resolve-uri": "^3.1.0",
+        "@jridgewell/sourcemap-codec": "^1.4.14"
+      }
+    },
+    "node_modules/@types/eslint": {
+      "version": "9.6.0",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/@types/eslint/-/eslint-9.6.0.tgz",
+      "integrity": "sha512-gi6WQJ7cHRgZxtkQEoyHMppPjq9Kxo5Tjn2prSKDSmZrCz8TZ3jSRCeTJm+WoM+oB0WG37bRqLzaaU3q7JypGg==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@types/estree": "*",
+        "@types/json-schema": "*"
+      }
+    },
+    "node_modules/@types/eslint-scope": {
+      "version": "3.7.7",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/@types/eslint-scope/-/eslint-scope-3.7.7.tgz",
+      "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@types/eslint": "*",
+        "@types/estree": "*"
+      }
+    },
+    "node_modules/@types/estree": {
+      "version": "1.0.5",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/@types/estree/-/estree-1.0.5.tgz",
+      "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true
+    },
+    "node_modules/@types/json-schema": {
+      "version": "7.0.15",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/@types/json-schema/-/json-schema-7.0.15.tgz",
+      "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/node": {
+      "version": "22.1.0",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/@types/node/-/node-22.1.0.tgz",
+      "integrity": "sha512-AOmuRF0R2/5j1knA3c6G3HOk523Ga+l+ZXltX8SF1+5oqcXijjfTd8fY3XRZqSihEu9XhtQnKYLmkFaoxgsJHw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "undici-types": "~6.13.0"
+      }
+    },
+    "node_modules/@webassemblyjs/ast": {
+      "version": "1.12.1",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/@webassemblyjs/ast/-/ast-1.12.1.tgz",
+      "integrity": "sha512-EKfMUOPRRUTy5UII4qJDGPpqfwjOmZ5jeGFwid9mnoqIFK+e0vqoi1qH56JpmZSzEL53jKnNzScdmftJyG5xWg==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@webassemblyjs/helper-numbers": "1.11.6",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6"
+      }
+    },
+    "node_modules/@webassemblyjs/floating-point-hex-parser": {
+      "version": "1.11.6",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz",
+      "integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true
+    },
+    "node_modules/@webassemblyjs/helper-api-error": {
+      "version": "1.11.6",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz",
+      "integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true
+    },
+    "node_modules/@webassemblyjs/helper-buffer": {
+      "version": "1.12.1",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/@webassemblyjs/helper-buffer/-/helper-buffer-1.12.1.tgz",
+      "integrity": "sha512-nzJwQw99DNDKr9BVCOZcLuJJUlqkJh+kVzVl6Fmq/tI5ZtEyWT1KZMyOXltXLZJmDtvLCDgwsyrkohEtopTXCw==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true
+    },
+    "node_modules/@webassemblyjs/helper-numbers": {
+      "version": "1.11.6",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz",
+      "integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@webassemblyjs/floating-point-hex-parser": "1.11.6",
+        "@webassemblyjs/helper-api-error": "1.11.6",
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "node_modules/@webassemblyjs/helper-wasm-bytecode": {
+      "version": "1.11.6",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz",
+      "integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true
+    },
+    "node_modules/@webassemblyjs/helper-wasm-section": {
+      "version": "1.12.1",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.12.1.tgz",
+      "integrity": "sha512-Jif4vfB6FJlUlSbgEMHUyk1j234GTNG9dBJ4XJdOySoj518Xj0oGsNi59cUQF4RRMS9ouBUxDDdyBVfPTypa5g==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@webassemblyjs/ast": "1.12.1",
+        "@webassemblyjs/helper-buffer": "1.12.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+        "@webassemblyjs/wasm-gen": "1.12.1"
+      }
+    },
+    "node_modules/@webassemblyjs/ieee754": {
+      "version": "1.11.6",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz",
+      "integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@xtuc/ieee754": "^1.2.0"
+      }
+    },
+    "node_modules/@webassemblyjs/leb128": {
+      "version": "1.11.6",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/@webassemblyjs/leb128/-/leb128-1.11.6.tgz",
+      "integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "peer": true,
+      "dependencies": {
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "node_modules/@webassemblyjs/utf8": {
+      "version": "1.11.6",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/@webassemblyjs/utf8/-/utf8-1.11.6.tgz",
+      "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true
+    },
+    "node_modules/@webassemblyjs/wasm-edit": {
+      "version": "1.12.1",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/@webassemblyjs/wasm-edit/-/wasm-edit-1.12.1.tgz",
+      "integrity": "sha512-1DuwbVvADvS5mGnXbE+c9NfA8QRcZ6iKquqjjmR10k6o+zzsRVesil54DKexiowcFCPdr/Q0qaMgB01+SQ1u6g==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@webassemblyjs/ast": "1.12.1",
+        "@webassemblyjs/helper-buffer": "1.12.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+        "@webassemblyjs/helper-wasm-section": "1.12.1",
+        "@webassemblyjs/wasm-gen": "1.12.1",
+        "@webassemblyjs/wasm-opt": "1.12.1",
+        "@webassemblyjs/wasm-parser": "1.12.1",
+        "@webassemblyjs/wast-printer": "1.12.1"
+      }
+    },
+    "node_modules/@webassemblyjs/wasm-gen": {
+      "version": "1.12.1",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/@webassemblyjs/wasm-gen/-/wasm-gen-1.12.1.tgz",
+      "integrity": "sha512-TDq4Ojh9fcohAw6OIMXqiIcTq5KUXTGRkVxbSo1hQnSy6lAM5GSdfwWeSxpAo0YzgsgF182E/U0mDNhuA0tW7w==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@webassemblyjs/ast": "1.12.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+        "@webassemblyjs/ieee754": "1.11.6",
+        "@webassemblyjs/leb128": "1.11.6",
+        "@webassemblyjs/utf8": "1.11.6"
+      }
+    },
+    "node_modules/@webassemblyjs/wasm-opt": {
+      "version": "1.12.1",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/@webassemblyjs/wasm-opt/-/wasm-opt-1.12.1.tgz",
+      "integrity": "sha512-Jg99j/2gG2iaz3hijw857AVYekZe2SAskcqlWIZXjji5WStnOpVoat3gQfT/Q5tb2djnCjBtMocY/Su1GfxPBg==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@webassemblyjs/ast": "1.12.1",
+        "@webassemblyjs/helper-buffer": "1.12.1",
+        "@webassemblyjs/wasm-gen": "1.12.1",
+        "@webassemblyjs/wasm-parser": "1.12.1"
+      }
+    },
+    "node_modules/@webassemblyjs/wasm-parser": {
+      "version": "1.12.1",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/@webassemblyjs/wasm-parser/-/wasm-parser-1.12.1.tgz",
+      "integrity": "sha512-xikIi7c2FHXysxXe3COrVUPSheuBtpcfhbpFj4gmu7KRLYOzANztwUU0IbsqvMqzuNK2+glRGWCEqZo1WCLyAQ==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@webassemblyjs/ast": "1.12.1",
+        "@webassemblyjs/helper-api-error": "1.11.6",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+        "@webassemblyjs/ieee754": "1.11.6",
+        "@webassemblyjs/leb128": "1.11.6",
+        "@webassemblyjs/utf8": "1.11.6"
+      }
+    },
+    "node_modules/@webassemblyjs/wast-printer": {
+      "version": "1.12.1",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/@webassemblyjs/wast-printer/-/wast-printer-1.12.1.tgz",
+      "integrity": "sha512-+X4WAlOisVWQMikjbcvY2e0rwPsKQ9F688lksZhBcPycBBuii3O7m8FACbDMWDojpAqvjIncrG8J0XHKyQfVeA==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@webassemblyjs/ast": "1.12.1",
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "node_modules/@xtuc/ieee754": {
+      "version": "1.2.0",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
+      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "peer": true
+    },
+    "node_modules/@xtuc/long": {
+      "version": "4.2.2",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/@xtuc/long/-/long-4.2.2.tgz",
+      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "peer": true
+    },
+    "node_modules/acorn": {
+      "version": "8.12.1",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/acorn/-/acorn-8.12.1.tgz",
+      "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/acorn-import-attributes": {
+      "version": "1.9.5",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz",
+      "integrity": "sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "peerDependencies": {
+        "acorn": "^8"
+      }
+    },
+    "node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/ajv-keywords": {
+      "version": "3.5.2",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+      "dev": true,
+      "license": "MIT",
+      "peerDependencies": {
+        "ajv": "^6.9.1"
+      }
+    },
+    "node_modules/browserslist": {
+      "version": "4.23.3",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/browserslist/-/browserslist-4.23.3.tgz",
+      "integrity": "sha512-btwCFJVjI4YWDNfau8RhZ+B1Q/VLoUITrm3RlP6y1tYGWIOa+InuYiRGXUBXo8nA1qKmHMyLB/iVQg5TT4eFoA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/browserslist"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "caniuse-lite": "^1.0.30001646",
+        "electron-to-chromium": "^1.5.4",
+        "node-releases": "^2.0.18",
+        "update-browserslist-db": "^1.1.0"
+      },
+      "bin": {
+        "browserslist": "cli.js"
+      },
+      "engines": {
+        "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
+      }
+    },
+    "node_modules/buffer-from": {
+      "version": "1.1.2",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/buffer-from/-/buffer-from-1.1.2.tgz",
+      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/caniuse-lite": {
+      "version": "1.0.30001649",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/caniuse-lite/-/caniuse-lite-1.0.30001649.tgz",
+      "integrity": "sha512-fJegqZZ0ZX8HOWr6rcafGr72+xcgJKI9oWfDW5DrD7ExUtgZC7a7R7ZYmZqplh7XDocFdGeIFn7roAxhOeYrPQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "CC-BY-4.0",
+      "peer": true
+    },
+    "node_modules/chrome-trace-event": {
+      "version": "1.0.4",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/chrome-trace-event/-/chrome-trace-event-1.0.4.tgz",
+      "integrity": "sha512-rNjApaLzuwaOTjCiT8lSDdGN1APCiqkChLMJxJPWLunPAt5fy8xgU9/jNOchV84wfIxrA0lRQB7oCT8jrn/wrQ==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "engines": {
+        "node": ">=6.0"
+      }
+    },
+    "node_modules/commander": {
+      "version": "2.20.3",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/commander/-/commander-2.20.3.tgz",
+      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/electron-to-chromium": {
+      "version": "1.5.4",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/electron-to-chromium/-/electron-to-chromium-1.5.4.tgz",
+      "integrity": "sha512-orzA81VqLyIGUEA77YkVA1D+N+nNfl2isJVjjmOyrlxuooZ19ynb+dOlaDTqd/idKRS9lDCSBmtzM+kyCsMnkA==",
+      "dev": true,
+      "license": "ISC",
+      "peer": true
+    },
+    "node_modules/enhanced-resolve": {
+      "version": "5.17.1",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz",
+      "integrity": "sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "graceful-fs": "^4.2.4",
+        "tapable": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/es-module-lexer": {
+      "version": "1.5.4",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/es-module-lexer/-/es-module-lexer-1.5.4.tgz",
+      "integrity": "sha512-MVNK56NiMrOwitFB7cqDwq0CQutbw+0BvLshJSse0MUNU+y1FC3bUS/AQg7oUng+/wKrrki7JfmwtVHkVfPLlw==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true
+    },
+    "node_modules/escalade": {
+      "version": "3.1.2",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/escalade/-/escalade-3.1.2.tgz",
+      "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/eslint-scope": {
+      "version": "5.1.1",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/eslint-scope/-/eslint-scope-5.1.1.tgz",
+      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "peer": true,
+      "dependencies": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^4.1.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/esrecurse": {
+      "version": "4.3.0",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/esrecurse/-/esrecurse-4.3.0.tgz",
+      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "peer": true,
+      "dependencies": {
+        "estraverse": "^5.2.0"
+      },
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/esrecurse/node_modules/estraverse": {
+      "version": "5.3.0",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/estraverse/-/estraverse-5.3.0.tgz",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "peer": true,
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/estraverse": {
+      "version": "4.3.0",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/estraverse/-/estraverse-4.3.0.tgz",
+      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "peer": true,
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/events": {
+      "version": "3.3.0",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/events/-/events-3.3.0.tgz",
+      "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "engines": {
+        "node": ">=0.8.x"
+      }
+    },
+    "node_modules/fast-deep-equal": {
+      "version": "3.1.3",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/fast-json-stable-stringify": {
+      "version": "2.1.0",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/glob-to-regexp": {
+      "version": "0.4.1",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
+      "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "peer": true
+    },
+    "node_modules/graceful-fs": {
+      "version": "4.2.11",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/graceful-fs/-/graceful-fs-4.2.11.tgz",
+      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
+      "dev": true,
+      "license": "ISC",
+      "peer": true
+    },
+    "node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-worker": {
+      "version": "27.5.1",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/jest-worker/-/jest-worker-27.5.1.tgz",
+      "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*",
+        "merge-stream": "^2.0.0",
+        "supports-color": "^8.0.0"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      }
+    },
+    "node_modules/json-parse-even-better-errors": {
+      "version": "2.3.1",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true
+    },
+    "node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/loader-runner": {
+      "version": "4.3.0",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/loader-runner/-/loader-runner-4.3.0.tgz",
+      "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "engines": {
+        "node": ">=6.11.5"
+      }
+    },
+    "node_modules/merge-stream": {
+      "version": "2.0.0",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/merge-stream/-/merge-stream-2.0.0.tgz",
+      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/mime-db": {
+      "version": "1.52.0",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/mime-types": {
+      "version": "2.1.35",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/mime-types/-/mime-types-2.1.35.tgz",
+      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "mime-db": "1.52.0"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/neo-async": {
+      "version": "2.6.2",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/neo-async/-/neo-async-2.6.2.tgz",
+      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true
+    },
+    "node_modules/node-releases": {
+      "version": "2.0.18",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/node-releases/-/node-releases-2.0.18.tgz",
+      "integrity": "sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true
+    },
+    "node_modules/picocolors": {
+      "version": "1.0.1",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/picocolors/-/picocolors-1.0.1.tgz",
+      "integrity": "sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==",
+      "dev": true,
+      "license": "ISC",
+      "peer": true
+    },
+    "node_modules/punycode": {
+      "version": "2.3.1",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/punycode/-/punycode-2.3.1.tgz",
+      "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/randombytes": {
+      "version": "2.1.0",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/randombytes/-/randombytes-2.1.0.tgz",
+      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "safe-buffer": "^5.1.0"
+      }
+    },
+    "node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/schema-utils": {
+      "version": "3.3.0",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/schema-utils/-/schema-utils-3.3.0.tgz",
+      "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/json-schema": "^7.0.8",
+        "ajv": "^6.12.5",
+        "ajv-keywords": "^3.5.2"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
+    "node_modules/serialize-javascript": {
+      "version": "6.0.2",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/serialize-javascript/-/serialize-javascript-6.0.2.tgz",
+      "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "randombytes": "^2.1.0"
+      }
+    },
+    "node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/source-map-support": {
+      "version": "0.5.21",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/source-map-support/-/source-map-support-0.5.21.tgz",
+      "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "buffer-from": "^1.0.0",
+        "source-map": "^0.6.0"
+      }
+    },
+    "node_modules/supports-color": {
+      "version": "8.1.1",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/supports-color/-/supports-color-8.1.1.tgz",
+      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/supports-color?sponsor=1"
+      }
+    },
+    "node_modules/tapable": {
+      "version": "2.2.1",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/tapable/-/tapable-2.2.1.tgz",
+      "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/terser": {
+      "version": "5.31.3",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/terser/-/terser-5.31.3.tgz",
+      "integrity": "sha512-pAfYn3NIZLyZpa83ZKigvj6Rn9c/vd5KfYGX7cN1mnzqgDcxWvrU5ZtAfIKhEXz9nRecw4z3LXkjaq96/qZqAA==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "@jridgewell/source-map": "^0.3.3",
+        "acorn": "^8.8.2",
+        "commander": "^2.20.0",
+        "source-map-support": "~0.5.20"
+      },
+      "bin": {
+        "terser": "bin/terser"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/terser-webpack-plugin": {
+      "version": "5.3.10",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/terser-webpack-plugin/-/terser-webpack-plugin-5.3.10.tgz",
+      "integrity": "sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/trace-mapping": "^0.3.20",
+        "jest-worker": "^27.4.5",
+        "schema-utils": "^3.1.1",
+        "serialize-javascript": "^6.0.1",
+        "terser": "^5.26.0"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^5.1.0"
+      },
+      "peerDependenciesMeta": {
+        "@swc/core": {
+          "optional": true
+        },
+        "esbuild": {
+          "optional": true
+        },
+        "uglify-js": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/undici-types": {
+      "version": "6.13.0",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/undici-types/-/undici-types-6.13.0.tgz",
+      "integrity": "sha512-xtFJHudx8S2DSoujjMd1WeWvn7KKWFRESZTMeL1RptAYERu29D6jphMjjY+vn96jvN3kVPDNxU/E13VTaXj6jg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/update-browserslist-db": {
+      "version": "1.1.0",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/update-browserslist-db/-/update-browserslist-db-1.1.0.tgz",
+      "integrity": "sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/browserslist"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "escalade": "^3.1.2",
+        "picocolors": "^1.0.1"
+      },
+      "bin": {
+        "update-browserslist-db": "cli.js"
+      },
+      "peerDependencies": {
+        "browserslist": ">= 4.21.0"
+      }
+    },
+    "node_modules/uri-js": {
+      "version": "4.4.1",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/uri-js/-/uri-js-4.4.1.tgz",
+      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "punycode": "^2.1.0"
+      }
+    },
+    "node_modules/watchpack": {
+      "version": "2.4.1",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/watchpack/-/watchpack-2.4.1.tgz",
+      "integrity": "sha512-8wrBCMtVhqcXP2Sup1ctSkga6uc2Bx0IIvKyT7yTFier5AXHooSI+QyQQAtTb7+E0IUCCKyTFmXqdqgum2XWGg==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "glob-to-regexp": "^0.4.1",
+        "graceful-fs": "^4.1.2"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/webpack": {
+      "version": "5.93.0",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/webpack/-/webpack-5.93.0.tgz",
+      "integrity": "sha512-Y0m5oEY1LRuwly578VqluorkXbvXKh7U3rLoQCEO04M97ScRr44afGVkI0FQFsXzysk5OgFAxjZAb9rsGQVihA==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@types/eslint-scope": "^3.7.3",
+        "@types/estree": "^1.0.5",
+        "@webassemblyjs/ast": "^1.12.1",
+        "@webassemblyjs/wasm-edit": "^1.12.1",
+        "@webassemblyjs/wasm-parser": "^1.12.1",
+        "acorn": "^8.7.1",
+        "acorn-import-attributes": "^1.9.5",
+        "browserslist": "^4.21.10",
+        "chrome-trace-event": "^1.0.2",
+        "enhanced-resolve": "^5.17.0",
+        "es-module-lexer": "^1.2.1",
+        "eslint-scope": "5.1.1",
+        "events": "^3.2.0",
+        "glob-to-regexp": "^0.4.1",
+        "graceful-fs": "^4.2.11",
+        "json-parse-even-better-errors": "^2.3.1",
+        "loader-runner": "^4.2.0",
+        "mime-types": "^2.1.27",
+        "neo-async": "^2.6.2",
+        "schema-utils": "^3.2.0",
+        "tapable": "^2.1.1",
+        "terser-webpack-plugin": "^5.3.10",
+        "watchpack": "^2.4.1",
+        "webpack-sources": "^3.2.3"
+      },
+      "bin": {
+        "webpack": "bin/webpack.js"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependenciesMeta": {
+        "webpack-cli": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/webpack-sources": {
+      "version": "3.2.3",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/webpack-sources/-/webpack-sources-3.2.3.tgz",
+      "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    }
+  },
+  "dependencies": {
+    "@jridgewell/gen-mapping": {
+      "version": "0.3.5",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
+      "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==",
+      "dev": true,
+      "requires": {
+        "@jridgewell/set-array": "^1.2.1",
+        "@jridgewell/sourcemap-codec": "^1.4.10",
+        "@jridgewell/trace-mapping": "^0.3.24"
+      }
+    },
+    "@jridgewell/resolve-uri": {
+      "version": "3.1.2",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
+      "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
+      "dev": true
+    },
+    "@jridgewell/set-array": {
+      "version": "1.2.1",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/@jridgewell/set-array/-/set-array-1.2.1.tgz",
+      "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
+      "dev": true
+    },
+    "@jridgewell/source-map": {
+      "version": "0.3.6",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/@jridgewell/source-map/-/source-map-0.3.6.tgz",
+      "integrity": "sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==",
+      "dev": true,
+      "requires": {
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.25"
+      }
+    },
+    "@jridgewell/sourcemap-codec": {
+      "version": "1.5.0",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
+      "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==",
+      "dev": true
+    },
+    "@jridgewell/trace-mapping": {
+      "version": "0.3.25",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
+      "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
+      "dev": true,
+      "requires": {
+        "@jridgewell/resolve-uri": "^3.1.0",
+        "@jridgewell/sourcemap-codec": "^1.4.14"
+      }
+    },
+    "@types/eslint": {
+      "version": "9.6.0",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/@types/eslint/-/eslint-9.6.0.tgz",
+      "integrity": "sha512-gi6WQJ7cHRgZxtkQEoyHMppPjq9Kxo5Tjn2prSKDSmZrCz8TZ3jSRCeTJm+WoM+oB0WG37bRqLzaaU3q7JypGg==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "@types/estree": "*",
+        "@types/json-schema": "*"
+      }
+    },
+    "@types/eslint-scope": {
+      "version": "3.7.7",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/@types/eslint-scope/-/eslint-scope-3.7.7.tgz",
+      "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "@types/eslint": "*",
+        "@types/estree": "*"
+      }
+    },
+    "@types/estree": {
+      "version": "1.0.5",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/@types/estree/-/estree-1.0.5.tgz",
+      "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==",
+      "dev": true,
+      "peer": true
+    },
+    "@types/json-schema": {
+      "version": "7.0.15",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/@types/json-schema/-/json-schema-7.0.15.tgz",
+      "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
+      "dev": true
+    },
+    "@types/node": {
+      "version": "22.1.0",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/@types/node/-/node-22.1.0.tgz",
+      "integrity": "sha512-AOmuRF0R2/5j1knA3c6G3HOk523Ga+l+ZXltX8SF1+5oqcXijjfTd8fY3XRZqSihEu9XhtQnKYLmkFaoxgsJHw==",
+      "dev": true,
+      "requires": {
+        "undici-types": "~6.13.0"
+      }
+    },
+    "@webassemblyjs/ast": {
+      "version": "1.12.1",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/@webassemblyjs/ast/-/ast-1.12.1.tgz",
+      "integrity": "sha512-EKfMUOPRRUTy5UII4qJDGPpqfwjOmZ5jeGFwid9mnoqIFK+e0vqoi1qH56JpmZSzEL53jKnNzScdmftJyG5xWg==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "@webassemblyjs/helper-numbers": "1.11.6",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6"
+      }
+    },
+    "@webassemblyjs/floating-point-hex-parser": {
+      "version": "1.11.6",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz",
+      "integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==",
+      "dev": true,
+      "peer": true
+    },
+    "@webassemblyjs/helper-api-error": {
+      "version": "1.11.6",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz",
+      "integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==",
+      "dev": true,
+      "peer": true
+    },
+    "@webassemblyjs/helper-buffer": {
+      "version": "1.12.1",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/@webassemblyjs/helper-buffer/-/helper-buffer-1.12.1.tgz",
+      "integrity": "sha512-nzJwQw99DNDKr9BVCOZcLuJJUlqkJh+kVzVl6Fmq/tI5ZtEyWT1KZMyOXltXLZJmDtvLCDgwsyrkohEtopTXCw==",
+      "dev": true,
+      "peer": true
+    },
+    "@webassemblyjs/helper-numbers": {
+      "version": "1.11.6",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz",
+      "integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "@webassemblyjs/floating-point-hex-parser": "1.11.6",
+        "@webassemblyjs/helper-api-error": "1.11.6",
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "@webassemblyjs/helper-wasm-bytecode": {
+      "version": "1.11.6",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz",
+      "integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==",
+      "dev": true,
+      "peer": true
+    },
+    "@webassemblyjs/helper-wasm-section": {
+      "version": "1.12.1",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.12.1.tgz",
+      "integrity": "sha512-Jif4vfB6FJlUlSbgEMHUyk1j234GTNG9dBJ4XJdOySoj518Xj0oGsNi59cUQF4RRMS9ouBUxDDdyBVfPTypa5g==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.12.1",
+        "@webassemblyjs/helper-buffer": "1.12.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+        "@webassemblyjs/wasm-gen": "1.12.1"
+      }
+    },
+    "@webassemblyjs/ieee754": {
+      "version": "1.11.6",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz",
+      "integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "@xtuc/ieee754": "^1.2.0"
+      }
+    },
+    "@webassemblyjs/leb128": {
+      "version": "1.11.6",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/@webassemblyjs/leb128/-/leb128-1.11.6.tgz",
+      "integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "@webassemblyjs/utf8": {
+      "version": "1.11.6",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/@webassemblyjs/utf8/-/utf8-1.11.6.tgz",
+      "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==",
+      "dev": true,
+      "peer": true
+    },
+    "@webassemblyjs/wasm-edit": {
+      "version": "1.12.1",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/@webassemblyjs/wasm-edit/-/wasm-edit-1.12.1.tgz",
+      "integrity": "sha512-1DuwbVvADvS5mGnXbE+c9NfA8QRcZ6iKquqjjmR10k6o+zzsRVesil54DKexiowcFCPdr/Q0qaMgB01+SQ1u6g==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.12.1",
+        "@webassemblyjs/helper-buffer": "1.12.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+        "@webassemblyjs/helper-wasm-section": "1.12.1",
+        "@webassemblyjs/wasm-gen": "1.12.1",
+        "@webassemblyjs/wasm-opt": "1.12.1",
+        "@webassemblyjs/wasm-parser": "1.12.1",
+        "@webassemblyjs/wast-printer": "1.12.1"
+      }
+    },
+    "@webassemblyjs/wasm-gen": {
+      "version": "1.12.1",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/@webassemblyjs/wasm-gen/-/wasm-gen-1.12.1.tgz",
+      "integrity": "sha512-TDq4Ojh9fcohAw6OIMXqiIcTq5KUXTGRkVxbSo1hQnSy6lAM5GSdfwWeSxpAo0YzgsgF182E/U0mDNhuA0tW7w==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.12.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+        "@webassemblyjs/ieee754": "1.11.6",
+        "@webassemblyjs/leb128": "1.11.6",
+        "@webassemblyjs/utf8": "1.11.6"
+      }
+    },
+    "@webassemblyjs/wasm-opt": {
+      "version": "1.12.1",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/@webassemblyjs/wasm-opt/-/wasm-opt-1.12.1.tgz",
+      "integrity": "sha512-Jg99j/2gG2iaz3hijw857AVYekZe2SAskcqlWIZXjji5WStnOpVoat3gQfT/Q5tb2djnCjBtMocY/Su1GfxPBg==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.12.1",
+        "@webassemblyjs/helper-buffer": "1.12.1",
+        "@webassemblyjs/wasm-gen": "1.12.1",
+        "@webassemblyjs/wasm-parser": "1.12.1"
+      }
+    },
+    "@webassemblyjs/wasm-parser": {
+      "version": "1.12.1",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/@webassemblyjs/wasm-parser/-/wasm-parser-1.12.1.tgz",
+      "integrity": "sha512-xikIi7c2FHXysxXe3COrVUPSheuBtpcfhbpFj4gmu7KRLYOzANztwUU0IbsqvMqzuNK2+glRGWCEqZo1WCLyAQ==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.12.1",
+        "@webassemblyjs/helper-api-error": "1.11.6",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+        "@webassemblyjs/ieee754": "1.11.6",
+        "@webassemblyjs/leb128": "1.11.6",
+        "@webassemblyjs/utf8": "1.11.6"
+      }
+    },
+    "@webassemblyjs/wast-printer": {
+      "version": "1.12.1",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/@webassemblyjs/wast-printer/-/wast-printer-1.12.1.tgz",
+      "integrity": "sha512-+X4WAlOisVWQMikjbcvY2e0rwPsKQ9F688lksZhBcPycBBuii3O7m8FACbDMWDojpAqvjIncrG8J0XHKyQfVeA==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.12.1",
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "@xtuc/ieee754": {
+      "version": "1.2.0",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
+      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
+      "dev": true,
+      "peer": true
+    },
+    "@xtuc/long": {
+      "version": "4.2.2",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/@xtuc/long/-/long-4.2.2.tgz",
+      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
+      "dev": true,
+      "peer": true
+    },
+    "acorn": {
+      "version": "8.12.1",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/acorn/-/acorn-8.12.1.tgz",
+      "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==",
+      "dev": true
+    },
+    "acorn-import-attributes": {
+      "version": "1.9.5",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz",
+      "integrity": "sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==",
+      "dev": true,
+      "peer": true,
+      "requires": {}
+    },
+    "ajv": {
+      "version": "6.12.6",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
+      "requires": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      }
+    },
+    "ajv-keywords": {
+      "version": "3.5.2",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+      "dev": true,
+      "requires": {}
+    },
+    "browserslist": {
+      "version": "4.23.3",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/browserslist/-/browserslist-4.23.3.tgz",
+      "integrity": "sha512-btwCFJVjI4YWDNfau8RhZ+B1Q/VLoUITrm3RlP6y1tYGWIOa+InuYiRGXUBXo8nA1qKmHMyLB/iVQg5TT4eFoA==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "caniuse-lite": "^1.0.30001646",
+        "electron-to-chromium": "^1.5.4",
+        "node-releases": "^2.0.18",
+        "update-browserslist-db": "^1.1.0"
+      }
+    },
+    "buffer-from": {
+      "version": "1.1.2",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/buffer-from/-/buffer-from-1.1.2.tgz",
+      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
+      "dev": true
+    },
+    "caniuse-lite": {
+      "version": "1.0.30001649",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/caniuse-lite/-/caniuse-lite-1.0.30001649.tgz",
+      "integrity": "sha512-fJegqZZ0ZX8HOWr6rcafGr72+xcgJKI9oWfDW5DrD7ExUtgZC7a7R7ZYmZqplh7XDocFdGeIFn7roAxhOeYrPQ==",
+      "dev": true,
+      "peer": true
+    },
+    "chrome-trace-event": {
+      "version": "1.0.4",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/chrome-trace-event/-/chrome-trace-event-1.0.4.tgz",
+      "integrity": "sha512-rNjApaLzuwaOTjCiT8lSDdGN1APCiqkChLMJxJPWLunPAt5fy8xgU9/jNOchV84wfIxrA0lRQB7oCT8jrn/wrQ==",
+      "dev": true,
+      "peer": true
+    },
+    "commander": {
+      "version": "2.20.3",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/commander/-/commander-2.20.3.tgz",
+      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+      "dev": true
+    },
+    "electron-to-chromium": {
+      "version": "1.5.4",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/electron-to-chromium/-/electron-to-chromium-1.5.4.tgz",
+      "integrity": "sha512-orzA81VqLyIGUEA77YkVA1D+N+nNfl2isJVjjmOyrlxuooZ19ynb+dOlaDTqd/idKRS9lDCSBmtzM+kyCsMnkA==",
+      "dev": true,
+      "peer": true
+    },
+    "enhanced-resolve": {
+      "version": "5.17.1",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz",
+      "integrity": "sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "graceful-fs": "^4.2.4",
+        "tapable": "^2.2.0"
+      }
+    },
+    "es-module-lexer": {
+      "version": "1.5.4",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/es-module-lexer/-/es-module-lexer-1.5.4.tgz",
+      "integrity": "sha512-MVNK56NiMrOwitFB7cqDwq0CQutbw+0BvLshJSse0MUNU+y1FC3bUS/AQg7oUng+/wKrrki7JfmwtVHkVfPLlw==",
+      "dev": true,
+      "peer": true
+    },
+    "escalade": {
+      "version": "3.1.2",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/escalade/-/escalade-3.1.2.tgz",
+      "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==",
+      "dev": true,
+      "peer": true
+    },
+    "eslint-scope": {
+      "version": "5.1.1",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/eslint-scope/-/eslint-scope-5.1.1.tgz",
+      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^4.1.1"
+      }
+    },
+    "esrecurse": {
+      "version": "4.3.0",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/esrecurse/-/esrecurse-4.3.0.tgz",
+      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "estraverse": "^5.2.0"
+      },
+      "dependencies": {
+        "estraverse": {
+          "version": "5.3.0",
+          "resolved": "https://repo.huaweicloud.com/repository/npm/estraverse/-/estraverse-5.3.0.tgz",
+          "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+          "dev": true,
+          "peer": true
+        }
+      }
+    },
+    "estraverse": {
+      "version": "4.3.0",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/estraverse/-/estraverse-4.3.0.tgz",
+      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+      "dev": true,
+      "peer": true
+    },
+    "events": {
+      "version": "3.3.0",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/events/-/events-3.3.0.tgz",
+      "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
+      "dev": true,
+      "peer": true
+    },
+    "fast-deep-equal": {
+      "version": "3.1.3",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+      "dev": true
+    },
+    "fast-json-stable-stringify": {
+      "version": "2.1.0",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+      "dev": true
+    },
+    "glob-to-regexp": {
+      "version": "0.4.1",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
+      "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
+      "dev": true,
+      "peer": true
+    },
+    "graceful-fs": {
+      "version": "4.2.11",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/graceful-fs/-/graceful-fs-4.2.11.tgz",
+      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
+      "dev": true,
+      "peer": true
+    },
+    "has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true
+    },
+    "jest-worker": {
+      "version": "27.5.1",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/jest-worker/-/jest-worker-27.5.1.tgz",
+      "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
+      "dev": true,
+      "requires": {
+        "@types/node": "*",
+        "merge-stream": "^2.0.0",
+        "supports-color": "^8.0.0"
+      }
+    },
+    "json-parse-even-better-errors": {
+      "version": "2.3.1",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
+      "dev": true,
+      "peer": true
+    },
+    "json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
+    },
+    "loader-runner": {
+      "version": "4.3.0",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/loader-runner/-/loader-runner-4.3.0.tgz",
+      "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==",
+      "dev": true,
+      "peer": true
+    },
+    "merge-stream": {
+      "version": "2.0.0",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/merge-stream/-/merge-stream-2.0.0.tgz",
+      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
+      "dev": true
+    },
+    "mime-db": {
+      "version": "1.52.0",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+      "dev": true,
+      "peer": true
+    },
+    "mime-types": {
+      "version": "2.1.35",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/mime-types/-/mime-types-2.1.35.tgz",
+      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "mime-db": "1.52.0"
+      }
+    },
+    "neo-async": {
+      "version": "2.6.2",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/neo-async/-/neo-async-2.6.2.tgz",
+      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
+      "dev": true,
+      "peer": true
+    },
+    "node-releases": {
+      "version": "2.0.18",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/node-releases/-/node-releases-2.0.18.tgz",
+      "integrity": "sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==",
+      "dev": true,
+      "peer": true
+    },
+    "picocolors": {
+      "version": "1.0.1",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/picocolors/-/picocolors-1.0.1.tgz",
+      "integrity": "sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==",
+      "dev": true,
+      "peer": true
+    },
+    "punycode": {
+      "version": "2.3.1",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/punycode/-/punycode-2.3.1.tgz",
+      "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
+      "dev": true
+    },
+    "randombytes": {
+      "version": "2.1.0",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/randombytes/-/randombytes-2.1.0.tgz",
+      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "^5.1.0"
+      }
+    },
+    "safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "dev": true
+    },
+    "schema-utils": {
+      "version": "3.3.0",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/schema-utils/-/schema-utils-3.3.0.tgz",
+      "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
+      "dev": true,
+      "requires": {
+        "@types/json-schema": "^7.0.8",
+        "ajv": "^6.12.5",
+        "ajv-keywords": "^3.5.2"
+      }
+    },
+    "serialize-javascript": {
+      "version": "6.0.2",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/serialize-javascript/-/serialize-javascript-6.0.2.tgz",
+      "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==",
+      "dev": true,
+      "requires": {
+        "randombytes": "^2.1.0"
+      }
+    },
+    "source-map": {
+      "version": "0.6.1",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true
+    },
+    "source-map-support": {
+      "version": "0.5.21",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/source-map-support/-/source-map-support-0.5.21.tgz",
+      "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
+      "dev": true,
+      "requires": {
+        "buffer-from": "^1.0.0",
+        "source-map": "^0.6.0"
+      }
+    },
+    "supports-color": {
+      "version": "8.1.1",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/supports-color/-/supports-color-8.1.1.tgz",
+      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+      "dev": true,
+      "requires": {
+        "has-flag": "^4.0.0"
+      }
+    },
+    "tapable": {
+      "version": "2.2.1",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/tapable/-/tapable-2.2.1.tgz",
+      "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
+      "dev": true,
+      "peer": true
+    },
+    "terser": {
+      "version": "5.31.3",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/terser/-/terser-5.31.3.tgz",
+      "integrity": "sha512-pAfYn3NIZLyZpa83ZKigvj6Rn9c/vd5KfYGX7cN1mnzqgDcxWvrU5ZtAfIKhEXz9nRecw4z3LXkjaq96/qZqAA==",
+      "dev": true,
+      "requires": {
+        "@jridgewell/source-map": "^0.3.3",
+        "acorn": "^8.8.2",
+        "commander": "^2.20.0",
+        "source-map-support": "~0.5.20"
+      }
+    },
+    "terser-webpack-plugin": {
+      "version": "5.3.10",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/terser-webpack-plugin/-/terser-webpack-plugin-5.3.10.tgz",
+      "integrity": "sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w==",
+      "dev": true,
+      "requires": {
+        "@jridgewell/trace-mapping": "^0.3.20",
+        "jest-worker": "^27.4.5",
+        "schema-utils": "^3.1.1",
+        "serialize-javascript": "^6.0.1",
+        "terser": "^5.26.0"
+      }
+    },
+    "undici-types": {
+      "version": "6.13.0",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/undici-types/-/undici-types-6.13.0.tgz",
+      "integrity": "sha512-xtFJHudx8S2DSoujjMd1WeWvn7KKWFRESZTMeL1RptAYERu29D6jphMjjY+vn96jvN3kVPDNxU/E13VTaXj6jg==",
+      "dev": true
+    },
+    "update-browserslist-db": {
+      "version": "1.1.0",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/update-browserslist-db/-/update-browserslist-db-1.1.0.tgz",
+      "integrity": "sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "escalade": "^3.1.2",
+        "picocolors": "^1.0.1"
+      }
+    },
+    "uri-js": {
+      "version": "4.4.1",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/uri-js/-/uri-js-4.4.1.tgz",
+      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+      "dev": true,
+      "requires": {
+        "punycode": "^2.1.0"
+      }
+    },
+    "watchpack": {
+      "version": "2.4.1",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/watchpack/-/watchpack-2.4.1.tgz",
+      "integrity": "sha512-8wrBCMtVhqcXP2Sup1ctSkga6uc2Bx0IIvKyT7yTFier5AXHooSI+QyQQAtTb7+E0IUCCKyTFmXqdqgum2XWGg==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "glob-to-regexp": "^0.4.1",
+        "graceful-fs": "^4.1.2"
+      }
+    },
+    "webpack": {
+      "version": "5.93.0",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/webpack/-/webpack-5.93.0.tgz",
+      "integrity": "sha512-Y0m5oEY1LRuwly578VqluorkXbvXKh7U3rLoQCEO04M97ScRr44afGVkI0FQFsXzysk5OgFAxjZAb9rsGQVihA==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "@types/eslint-scope": "^3.7.3",
+        "@types/estree": "^1.0.5",
+        "@webassemblyjs/ast": "^1.12.1",
+        "@webassemblyjs/wasm-edit": "^1.12.1",
+        "@webassemblyjs/wasm-parser": "^1.12.1",
+        "acorn": "^8.7.1",
+        "acorn-import-attributes": "^1.9.5",
+        "browserslist": "^4.21.10",
+        "chrome-trace-event": "^1.0.2",
+        "enhanced-resolve": "^5.17.0",
+        "es-module-lexer": "^1.2.1",
+        "eslint-scope": "5.1.1",
+        "events": "^3.2.0",
+        "glob-to-regexp": "^0.4.1",
+        "graceful-fs": "^4.2.11",
+        "json-parse-even-better-errors": "^2.3.1",
+        "loader-runner": "^4.2.0",
+        "mime-types": "^2.1.27",
+        "neo-async": "^2.6.2",
+        "schema-utils": "^3.2.0",
+        "tapable": "^2.1.1",
+        "terser-webpack-plugin": "^5.3.10",
+        "watchpack": "^2.4.1",
+        "webpack-sources": "^3.2.3"
+      }
+    },
+    "webpack-sources": {
+      "version": "3.2.3",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/webpack-sources/-/webpack-sources-3.2.3.tgz",
+      "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
+      "dev": true,
+      "peer": true
+    }
+  }
+}
diff --git a/package.json b/package.json
new file mode 100644
index 0000000..3ecf82a
--- /dev/null
+++ b/package.json
@@ -0,0 +1,5 @@
+{
+  "devDependencies": {
+    "terser-webpack-plugin": "^5.3.10"
+  }
+}
diff --git a/pages.json b/pages.json
new file mode 100644
index 0000000..d83912d
--- /dev/null
+++ b/pages.json
@@ -0,0 +1,891 @@
+{
+	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
+		{
+			"path": "pages/index/index",
+			"style": {
+				// "navigationStyle": "custom",
+				"enablePullDownRefresh": true
+			}
+		},
+		
+		{
+			"path": "pages/contact/contact",
+			"style": {
+				"navigationBarTitleText": "电子名片"
+			}
+		},
+		//******************商品模块（11）******************
+		{
+			"path": "pages/goods/cart",
+			"style": {
+				// #ifdef APP-PLUS
+				"navigationStyle": "custom",
+				// #endif
+				"navigationBarTitleText": "购物车"
+			}
+		},
+		{
+			"path": "pages/goods/category",
+			"style": {
+				"disableScroll": true,
+				"navigationBarTitleText": "商品分类",
+				"enablePullDownRefresh": true
+			}
+		},
+
+		// 商品详情
+		{
+			"path": "pages/goods/detail",
+			"style": {
+				"navigationBarTitleText": "商品详情"
+			}
+		},
+		{
+			"path": "pages/goods/list",
+			"style": {
+				// #ifdef APP-PLUS
+				"navigationStyle": "custom",
+				// #endif
+				"navigationBarTitleText": "商品列表"
+			}
+		},
+
+		//******************会员模块（20）******************
+		{
+			"path": "pages/member/index",
+			"style": {
+				"enablePullDownRefresh": true
+			}
+		},
+		//******************订单模块（12）******************
+		{
+			"path": "pages/order/payment",
+			"style": {
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/order/list",
+			"style": {
+				// #ifdef APP-PLUS
+				"navigationStyle": "custom"
+				// #endif
+			}
+		},
+		{
+			"path": "pages/order/detail",
+			"style": {
+				// #ifdef APP-PLUS
+				"navigationStyle": "custom"
+				// #endif
+			}
+		},
+		{
+			"path": "pages/order/detail_local_delivery",
+			"style": {
+				// #ifdef APP-PLUS
+				"navigationStyle": "custom"
+				// #endif
+			}
+		},
+		{
+			"path": "pages/order/detail_pickup",
+			"style": {
+				// #ifdef APP-PLUS
+				"navigationStyle": "custom"
+				// #endif
+			}
+		},
+		//积分订单详情
+		{
+			"path": "pages/order/detail_point",
+			"style": {
+				// #ifdef APP-PLUS
+				"navigationStyle": "custom"
+				// #endif
+			}
+		}
+	],
+	"subPackages": [{
+
+			//******************营销活动模块（26）******************
+			"root": "pages_promotion",
+			"pages": [
+			
+				//----------积分模块（2）----------
+				{
+					"path": "point/list",
+					"style": {
+						"navigationStyle": "custom"
+					}
+				}, {
+					"path": "point/goods_list",
+					"style": {
+						// #ifdef APP-PLUS
+						"navigationStyle": "custom"
+						// #endif
+					}
+				},
+				{
+					"path": "point/detail",
+					"style": {
+						// #ifdef APP-PLUS
+						"navigationStyle": "custom"
+						// #endif
+					}
+				},
+				{
+					"path": "point/payment",
+					"style": {
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "point/order_list",
+					"style": {
+						// #ifdef APP-PLUS
+						"navigationStyle": "custom"
+						// #endif
+					}
+				},
+				{
+					"path": "point/result",
+					"style": {
+						// #ifdef APP-PLUS
+						"navigationStyle": "custom"
+						// #endif
+					}
+				},
+				
+				//****************** 商户 ******************
+				{
+					"path": "merch/merchcategory",
+					"style": {
+						// #ifdef APP-PLUS
+						"navigationStyle": "custom",
+						// #endif
+						"navigationBarTitleText": "入驻商户"
+					}
+				},
+				{
+					"path": "merch/detail",
+					"style": {
+						// #ifdef APP-PLUS
+						"navigationStyle": "custom",
+						// #endif
+						"navigationBarTitleText": "商户首页"
+					}
+				},
+				//****************** 分销 ******************
+				{
+					"path": "fenxiao/index",
+					"style": {
+						// #ifdef APP-PLUS
+						"navigationStyle": "custom"
+						// #endif
+					}
+				},
+				{
+					"path": "fenxiao/promote",
+					"style": {
+						// #ifdef APP-PLUS
+						"navigationStyle": "custom"
+						// #endif
+					}
+				},
+				{
+					"path": "fenxiao/apply",
+					"style": {
+						// #ifdef APP-PLUS
+						"navigationStyle": "custom"
+						// #endif
+					}
+				},
+				{
+					"path": "fenxiao/order",
+					"style": {
+						// #ifdef APP-PLUS
+						"navigationStyle": "custom"
+						// #endif
+					}
+				},
+				{
+					"path": "fenxiao/relation",
+					"style": {
+						// #ifdef APP-PLUS
+						"navigationStyle": "custom"
+						// #endif
+					}
+				},
+				{
+					"path": "fenxiao/order_detail",
+					"style": {
+						// #ifdef APP-PLUS
+						"navigationStyle": "custom"
+						// #endif
+					}
+				},
+				{
+					"path": "fenxiao/team",
+					"style": {
+						// #ifdef APP-PLUS
+						"navigationStyle": "custom"
+						// #endif
+					}
+				},
+				{
+					"path": "fenxiao/withdraw_apply",
+					"style": {
+						// #ifdef APP-PLUS
+						"navigationStyle": "custom"
+						// #endif
+					}
+				},
+				{
+					"path": "fenxiao/withdraw_list",
+					"style": {
+						// #ifdef APP-PLUS
+						"navigationStyle": "custom"
+						// #endif
+					}
+				},
+				{
+					"path": "fenxiao/withdrawal_detail",
+					"style": {
+						// #ifdef APP-PLUS
+						"navigationStyle": "custom"
+						// #endif
+					}
+				},
+				{
+					"path": "fenxiao/promote_code",
+					"style": {
+						// #ifdef APP-PLUS
+						"navigationStyle": "custom"
+						// #endif
+					}
+				},
+				{
+					"path": "fenxiao/level",
+					"style": {
+						// #ifdef APP-PLUS
+						"navigationStyle": "custom"
+						// #endif
+					}
+				},
+				{
+					"path": "fenxiao/goods_list",
+					"style": {
+						// #ifdef APP-PLUS
+						"navigationStyle": "custom"
+						// #endif
+					}
+				},
+				{
+					"path": "fenxiao/bill",
+					"style": {
+						// #ifdef APP-PLUS
+						"navigationStyle": "custom"
+						// #endif
+					}
+				},
+				{
+					"path": "fenxiao/ranking_list",
+					"style": {
+						// #ifdef APP-PLUS
+						"navigationStyle": "custom",
+						// #endif
+						"navigationBarTitleText": "排行榜"
+					}
+				},
+				{
+					"path": "fenxiao/child_fenxiao",
+					"style": {
+						// #ifdef APP-PLUS
+						"navigationStyle": "custom",
+						// #endif
+						"navigationBarTitleText": "分销商"
+					}
+				}
+			]
+		},
+		{
+			//*****************其他模块（26）******************
+			"root": "pages_tool",
+			"pages": [
+				{
+					"path": "agreement/contenr",
+					"style": {
+						"navigationBarTitleText": ""
+					}
+				},
+				{
+					"path": "vr/index",
+					"style": {
+						"navigationBarTitleText": ""
+					}
+				},
+				{
+					"path": "webview/webview",
+					"style": {
+						// #ifdef APP-PLUS
+						"navigationStyle": "custom"
+						// #endif
+					}
+				},
+				{
+					"path": "index/diy",
+					"style": {
+						// #ifdef  MP-WEIXIN
+						 // "navigationStyle": "custom",
+						// #endif
+						"enablePullDownRefresh": true
+					}
+				},
+				//******************会员模块（20）******************
+				{
+					"path": "member/modify_face",
+					"style": {
+						// #ifdef APP-PLUS
+						"navigationStyle": "custom"
+						// #endif
+					}
+				},
+				{
+					"path": "member/account",
+					"style": {
+						// #ifdef APP-PLUS
+						"navigationStyle": "custom"
+						// #endif
+					}
+				},
+				{
+					"path": "member/account_edit",
+					"style": {
+						// #ifdef APP-PLUS
+						"navigationStyle": "custom"
+						// #endif
+					}
+				},
+				{
+					"path": "member/apply_withdrawal",
+					"style": {
+						// #ifdef APP-PLUS
+						"navigationStyle": "custom"
+						// #endif
+					}
+				},
+				{
+					"path": "member/balance",
+					"style": {
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "member/balance_detail",
+					"style": {
+						// #ifdef APP-PLUS
+						"navigationStyle": "custom"
+						// #endif
+					}
+				},
+				{
+					"path": "member/collection",
+					"style": {
+						// #ifdef APP-PLUS
+						"navigationStyle": "custom"
+						// #endif
+					}
+				},
+				{
+					"path": "member/coupon",
+					"style": {
+						// #ifdef APP-PLUS
+						"navigationStyle": "custom",
+						// #endif
+						"disableScroll": true
+					}
+				},
+				{
+					"path": "member/contact",
+					"style": {
+						"navigationStyle": "custom",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "member/footprint",
+					"style": {
+						// #ifdef APP-PLUS
+						"navigationStyle": "custom"
+						// #endif
+					}
+				},
+				{
+					"path": "member/level",
+					"style": {
+						// #ifdef APP-PLUS
+						"navigationStyle": "custom"
+						// #endif
+					}
+				},
+				{
+					"path": "member/card",
+					"style": {
+						// #ifdef APP-PLUS
+						"navigationStyle": "custom"
+						// #endif
+					}
+				},
+				{
+					"path": "member/card_buy",
+					"style": {
+						// #ifdef APP-PLUS
+						"navigationStyle": "custom"
+						// #endif
+					}
+				},
+				{
+					"path": "member/card_agreement",
+					"style": {
+						// #ifdef APP-PLUS
+						"navigationStyle": "custom"
+						// #endif
+					}
+				},
+				{
+					"path": "member/level_growth_rules",
+					"style": {
+						// #ifdef APP-PLUS
+						"navigationStyle": "custom"
+						// #endif
+					}
+				},
+				{
+					"path": "member/point",
+					"style": {
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "member/point_detail",
+					"style": {
+						// #ifdef APP-PLUS
+						"navigationStyle": "custom"
+						// #endif
+					}
+				},
+				{
+					"path": "member/withdrawal",
+					"style": {
+						// #ifdef APP-PLUS
+						"navigationStyle": "custom"
+						// #endif
+					}
+				},
+				{
+					"path": "member/withdrawal_detail",
+					"style": {
+						// #ifdef APP-PLUS
+						"navigationStyle": "custom"
+						// #endif
+					}
+				},
+				{
+					"path": "member/address",
+					"style": {
+						// #ifdef APP-PLUS
+						"navigationStyle": "custom"
+						// #endif
+					}
+				},
+				{
+					"path": "member/address_edit",
+					"style": {
+						// #ifdef APP-PLUS
+						"navigationStyle": "custom"
+						// #endif
+					}
+				},
+				{
+					"path": "member/pay_password",
+					"style": {
+						// #ifdef APP-PLUS
+						"navigationStyle": "custom"
+						// #endif
+					}
+				},
+				{
+					"path": "member/cancellation",
+					"style": {
+						// #ifdef APP-PLUS
+						"navigationStyle": "custom"
+						// #endif
+					}
+				},
+				{
+					"path": "member/assets",
+					"style": {
+						// #ifdef APP-PLUS
+						"navigationStyle": "custom"
+						// #endif
+					}
+				},
+				{
+					"path": "member/cancelstatus",
+					"style": {
+						// #ifdef APP-PLUS
+						"navigationStyle": "custom"
+						// #endif
+					}
+				},
+				{
+					"path": "member/cancelsuccess",
+					"style": {
+						// #ifdef APP-PLUS
+						"navigationStyle": "custom"
+						// #endif
+					}
+				},
+				{
+					"path": "member/cancelrefuse",
+					"style": {
+						// #ifdef APP-PLUS
+						"navigationStyle": "custom"
+						// #endif
+					}
+				},
+				{
+					"path": "member/info",
+					"style": {
+						// #ifdef APP-PLUS
+						"navigationStyle": "custom",
+						// #endif
+						"navigationBarTitleText": "个人资料"
+					}
+				},
+				{
+					"path": "member/info_edit",
+					"style": {
+						// #ifdef APP-PLUS
+						"navigationStyle": "custom"
+						// #endif
+					}
+				},
+				//******************登录模块******************
+				{
+					"path": "login/find",
+					"style": {
+						// #ifdef APP-PLUS
+						"navigationStyle": "custom"
+						// #endif
+					}
+				},
+
+				//******************商品模块******************
+				{
+					"path": "goods/coupon",
+					"style": {
+						// #ifdef APP-PLUS
+						"navigationStyle": "custom"
+						// #endif
+					}
+				},
+				{
+					"path": "goods/coupon_receive",
+					"style": {
+						// #ifdef APP-PLUS
+						"navigationStyle": "custom"
+						// #endif
+					}
+				},
+				{
+					"path": "goods/evaluate",
+					"style": {
+						// #ifdef APP-PLUS
+						"navigationStyle": "custom"
+						// #endif
+					}
+				},
+				{
+					"path": "goods/search",
+					"style": {
+						// #ifdef APP-PLUS
+						"navigationStyle": "custom"
+						// #endif
+					}
+				},
+				{
+					"path": "goods/brand",
+					"style": {
+						// #ifdef APP-PLUS
+						"navigationStyle": "custom"
+						// #endif
+					}
+				},
+				{
+					"path": "goods/not_exist",
+					"style": {
+						// #ifdef APP-PLUS
+						"navigationStyle": "custom"
+						// #endif
+					}
+				},
+
+
+				//******************CMS模块（6）******************
+				{
+					"path": "help/list",
+					"style": {
+						// #ifdef APP-PLUS
+						"navigationStyle": "custom"
+						// #endif
+					}
+				},
+				{
+					"path": "help/detail",
+					"style": {
+						// #ifdef APP-PLUS
+						"navigationStyle": "custom"
+						// #endif
+					}
+				},
+				{
+					"path": "notice/list",
+					"style": {
+						// #ifdef APP-PLUS
+						"navigationStyle": "custom"
+						// #endif
+					}
+				},
+				{
+					"path": "notice/detail",
+					"style": {
+						// #ifdef APP-PLUS
+						"navigationStyle": "custom"
+						// #endif
+					}
+				},
+				{
+					"path": "article/list",
+					"style": {
+						// #ifdef APP-PLUS
+						"navigationStyle": "custom"
+						// #endif
+					}
+				},
+				{
+					"path": "article/detail",
+					"style": {
+						// #ifdef APP-PLUS
+						"navigationStyle": "custom"
+						// #endif
+					}
+				},
+				//******************会员充值（4）******************
+				{
+					"path": "recharge/list",
+					"style": {
+						// #ifdef APP-PLUS
+						"navigationStyle": "custom",
+						// #endif
+						"scrollEnabled": true // 禁止页面滚动
+					}
+				},
+				{
+					"path": "recharge/order_list",
+					"style": {
+						// #ifdef APP-PLUS
+						"navigationStyle": "custom"
+						// #endif
+					}
+				},
+				//******************邀请******************
+				{
+					"path": "member/invite_friends",
+					"style": {
+						// #ifdef APP-PLUS
+						"navigationStyle": "custom"
+						// #endif
+					}
+				},
+				//******************支付模块（2）******************
+				{
+					"path": "pay/index",
+					"style": {
+						// #ifdef APP-PLUS
+						"navigationStyle": "custom"
+						// #endif
+					}
+				},
+				{
+					"path": "pay/wx_pay",
+					"style": {
+						// #ifdef APP-PLUS
+						"navigationStyle": "custom"
+						// #endif
+					}
+				},
+				{
+					"path": "pay/result",
+					"style": {
+						// #ifdef APP-PLUS
+						"navigationStyle": "custom"
+						// #endif
+					}
+				},
+				{
+					"path": "pay/cashier",
+					"style": {
+						// #ifdef APP-PLUS
+						"navigationStyle": "custom"
+						// #endif
+					}
+				},
+				{
+					"path": "storeclose/storeclose",
+					"style": {
+						// #ifdef APP-PLUS
+						"navigationStyle": "custom"
+						// #endif
+					}
+				},
+				//******************订单模块（2）******************
+				{
+					"path": "order/logistics",
+					"style": {
+						// #ifdef APP-PLUS
+						"navigationStyle": "custom"
+						// #endif
+					}
+				},
+				{
+					"path": "order/evaluate",
+					"style": {
+						// #ifdef APP-PLUS
+						"navigationStyle": "custom"
+						// #endif
+					}
+				},
+				{
+					"path": "order/refund",
+					"style": {
+						// #ifdef APP-PLUS
+						"navigationStyle": "custom"
+						// #endif
+					}
+				},
+				{
+					"path": "order/refund_goods_select",
+					"style": {
+						// #ifdef APP-PLUS
+						"navigationStyle": "custom"
+						// #endif
+					}
+				},
+				{
+					"path": "order/refund_type_select",
+					"style": {
+						// #ifdef APP-PLUS
+						"navigationStyle": "custom"
+						// #endif
+					}
+				},
+				{
+					"path": "order/refund_batch",
+					"style": {
+						// #ifdef APP-PLUS
+						"navigationStyle": "custom"
+						// #endif
+					}
+				},
+				{
+					"path": "order/refund_detail",
+					"style": {
+						// #ifdef APP-PLUS
+						"navigationStyle": "custom"
+						// #endif
+					}
+				},
+				{
+					"path": "order/activist",
+					"style": {
+						// #ifdef APP-PLUS
+						"navigationStyle": "custom",
+						// #endif
+						"navigationBarTitleText": "退款"
+					}
+				},
+				{
+					"path": "order/detail_virtual",
+					"style": {
+						// #ifdef APP-PLUS
+						"navigationStyle": "custom"
+						// #endif
+					}
+				},
+				//******************登录模块（3）******************
+				{
+					"path": "login/login",
+					"style": {
+						// #ifdef APP-PLUS
+						"navigationStyle": "custom",
+						// #endif
+						"navigationBarTitleText": "登录"
+					}
+				},
+				{
+					"path": "form/form",
+					"style": {
+						// #ifdef APP-PLUS
+						"navigationStyle": "custom"
+						// #endif
+					}
+				}
+			]
+		}
+	],
+	"globalStyle": {
+		"navigationBarTextStyle": "black",
+		"navigationBarTitleText": "",
+		"navigationBarBackgroundColor": "#ffffff",
+		"backgroundColor": "#F7f7f7",
+		"backgroundColorTop": "#f7f7f7",
+		"backgroundColorBottom": "#f7f7f7"
+	},
+	"tabBar": {
+		// #ifdef H5
+		"custom": true,
+		// #endif
+		"color": "#333",
+		"selectedColor": "#FF0036",
+		"backgroundColor": "#fff",
+		"borderStyle": "white",
+		"list": [{
+				"pagePath": "pages/index/index",
+				"text": ""
+			},
+			{
+				"pagePath": "pages/goods/category",
+				"text": ""
+			},
+			{
+				"pagePath": "pages/contact/contact",
+				"text": ""
+			},
+			{
+				"pagePath": "pages/member/index",
+				"text": ""
+			}
+		]
+	},
+	"easycom": {
+		"diy-*(\\W.*)": "@/components/diy-components/diy$1.vue"
+	},
+	"preloadRule": {
+		"pages/index/index": {
+			"network": "all",
+			"packages": ["pages_tool"]
+		}
+	}
+}
\ No newline at end of file
diff --git a/pages/contact/contact.vue b/pages/contact/contact.vue
new file mode 100644
index 0000000..62984d6
--- /dev/null
+++ b/pages/contact/contact.vue
@@ -0,0 +1,511 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view>
+		<view class="about w100">
+		    <view class="bg border-top"></view>
+		    <view class="list_cotact padding-top">
+		        <view class="container"> 
+					<!-- #ifdef H5 -->
+		            <view class="view_ul view_ul_one clearfix">
+		                <view @click="tapMessage" class="view_li w50_li  text-center" style="background: #1daa39;width: 100%;border-radius: 10rpx;">
+		                    <view class="bl bor" style="box-sizing: border-box;">
+		                        <image mode="heightFix" :src="$util.img('public/static/img/liuyan.png')"></image>
+		                        <view class="name bl line1" style="margin-top: 6rpx;">在线留言</view>
+		                    </view>
+		                </view>
+		            </view>
+					<!-- <view @click="test()">Test</view> -->
+					<!-- #endif -->
+					<!-- #ifdef MP-WEIXIN -->
+					<view class="view_ul view_ul_one clearfix">
+					    <view class="view_li w50_li  text-center">
+					        <button class="bl bor" hoverClass="none" openType="contact" sessionFrom="weapp" showMessageCard="true" style="margin: 0;">
+					            <image mode="heightFix" :src="$util.img('public/static/img/kefu.png')"></image>
+					            <view class="name bl line1">专属客服</view>
+					        </button>
+					    </view>
+					    <view @click="tapMessage" class="view_li w50_li  text-center">
+					        <view class="bl bor" style="box-sizing: border-box;">
+					            <image mode="heightFix" :src="$util.img('public/static/img/liuyan.png')"></image>
+					            <view class="name bl line1" style="margin-top: 6rpx;">在线留言</view>
+					        </view>
+					    </view>
+					</view>
+					<!-- #endif -->
+					
+		            <view class="view_ul_100"  v-for="(item,index)  in dataList" style="margin-bottom: 20rpx;">
+						
+		                <view class="bl clearfix bor bg-white" :style="{backgroundImage:' url('+$util.img(personnel_bg)+')',backgroundSize:'100% 100%'}">
+		                    <view class="fr">
+		                       
+		                        <view class="text" style="font-size: 40rpx;font-weight: 600;color:#333">{{item.realname}}</view>
+								 <view class="text">{{item.position}}</view>
+		                     <!--   <view class="text">{{item.mobile_text}}：{{item.mobile}}</view> -->
+		                        <view class="text" style="padding-bottom:20rpx;color:#0054a5">{{item.address}}</view>
+		                        <view class="contact_name" style="padding-top:30rpx;padding-bottom:0rpx;border-top: solid 1px #eee;font-size:28rpx;display: flex;">
+		                            <image mode="widthFix" :src="$util.img('public/static/img/boda.png')" style="margin-top: 8rpx;margin-right: 10rpx;"></image> 
+									<view style="flex: 1;">{{item.mobile}}</view>
+									<view style="margin-top: 0rpx;margin-left: 10rpx;font-size: 26rpx;color:rgba(71,71,71,.79)" @click="Tel(item.mobile)"><span style="background: #0054a5;color:#fff;padding: 10rpx 30rpx;font-size: 24rpx;border-radius: 50rpx;">一键拨打</span></view>
+								</view>
+								<view class="contact_name" style="padding-top:20rpx;padding-bottom:20rpx;font-size:28rpx;display: flex;">
+								    <image mode="widthFix" :src="$util.img('public/static/img/emall.png')" style="margin-top: 8rpx;margin-right: 10rpx;"></image> 
+									<view style="flex: 1;">{{item.email}}</view>
+									<view style="margin-top: 0rpx;margin-left: 10rpx;font-size: 26rpx;color:rgba(71,71,71,.79)" @click="tomap()"><span style="background: #888;color:#fff;padding: 10rpx 30rpx;font-size: 24rpx;border-radius: 50rpx;">立即导航</span></view>
+								</view>
+		                    </view>
+		                </view>
+		            </view>
+		         <!--   <view class="view_ul view_ul_two clearfix " v-if="dataList.length > 3" >
+		                <view @click="Tel(item.mobile)" class="view_li w50_li" v-for="(item,index)  in dataList" >
+		                    <view class="bl bor" hoverClass="none" url="" style="box-shadow: 5rpx 5rpx 10rpx #dcdcdc;height: 230rpx;position: relative;">
+		                        <view class="contact_name"  v-if="item.position">{{item.position_text}}：{{item.position}}</view>
+		                        <view class="contact_name">{{item.title_text}}：{{item.realname}}</view>
+		                        <view class="contact_name">{{item.mobile_text}}：{{item.mobile}}</view>
+		                        <view class="contact_name" style="padding-bottom:10rpx;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;">{{item.address_text}}：{{item.address}}</view>
+		                        <view class="contact_name" style="padding-top:10rpx;padding-bottom:0rpx;border-top: solid 1px #eee;position: absolute;bottom: 0;display: flex">
+									<image mode="widthFix":src="$util.img('public/static/img/boda.png')"></image>
+									<view style="margin-top: -6rpx;margin-left: 10rpx;font-size: 24rpx;color:rgba(71,71,71,.79)">点击拨打电话</view>
+								</view>
+		                    </view>
+		                </view>
+		            </view> -->
+		          <map
+						v-if="shop.longitude>0 && shop.latitude >0 && ismessage == 0"
+						id="map"
+						style="width: 100%; height:400rpx"
+						scale="12"
+						:markers="markers"
+						bindupdated="bindupdated"
+						:longitude="shop.longitude"
+						:latitude="shop.latitude"
+						show-location>
+						<cover-view style="position:absolute;right:10px;bottom:30rpx;z-index:9;background:#4d83ff;padding:5px 10px;wxcs_style_padding:10rpx 20rpx;border-radius:8rpx;color: #fff;" @click="tomap" ><cover-view style="font-size:24rpx">一键导航</cover-view>
+						</cover-view>    
+		            </map>
+		        </view>
+		
+		    </view>
+		
+		  <!--  <view wx:if="landline !=0">
+		        <button bindtap="contact">
+		            <view class="message">
+		                <image mode="widthFix" src="{{contactbg}}"></image>
+		            </view>
+		        </button>
+		    </view> -->
+		</view>
+		<!--留言弹窗--> 
+		<view class="goods-sku">
+			<uni-popup ref="informationPopup" type="bottom" @change="change">
+				<view class="liuyan-popup-layer popup-layer" >
+					<view class="head-wrap" @click="closeinformationPopup()">
+						<text>在线留言</text>
+						<text class="iconfont icon-close"></text>
+					</view>
+					<scroll-view scroll-y class="liuyan-body" >
+						<view style="padding: 0 30rpx;">
+							<view class="fui-cell-group">
+								<view class="fui-cell  ">
+									<view class="fui-cell-label ">姓名</view>
+									<view class="fui-cell-info">
+										<input v-model="Form.realname" class="fui-input" placeholder="请输入您的姓名" value=""></input>
+									</view>
+								</view>
+								<view class="fui-cell ">
+									<view class="fui-cell-label">联系方式</view>
+									<view class="fui-cell-info">
+										<input v-model="Form.mobile" class="fui-input" maxlength="11" placeholder="请输入您的手机号" type="number" ></input>
+									</view>
+								</view>
+								<view class="fui-cell ">
+									<view class="fui-cell-label" style="position: absolute;top:10px">留言内容</view>
+									<view class="fui-cell-info" style="margin-left: 160rpx;border: solid 2rpx #eee;">
+										<!-- <input v-model="Form.mailbox"  class="fui-input" placeholder="请输入您的邮箱" type="text" ></input> -->
+										<textarea class="textarea" v-model="Form.remark" placeholder="请输入留言内容" style="font-size: 28rpx;padding: 10rpx;"></textarea>
+									</view>
+								</view>
+							</view>
+						</view>
+					</scroll-view>
+					<view class="button-box"><button type="primary" @click="save()">提交</button></view>
+				</view>
+			</uni-popup>
+		</view>
+	</view>
+	<hover-nav></hover-nav>
+	<diy-bottom-nav></diy-bottom-nav>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			dataList: [],
+			ismessage:0,
+			Form:{
+				realname:'',
+				mobile:'',
+				remark:''
+				
+			},
+			markers:[
+				{
+					id:1,
+				/*	width:20, //宽度
+					height:20, //高度*/
+				//	iconPath: '../../static/goal_weizhi.png', //目标位置图标路径
+					//这里的经纬度是 目的地 的经纬度
+					latitude:0,
+					longitude:0,
+					callout:{
+					/* 	title:123,
+						content:'123' */
+					}
+				}
+			],
+			landline:0,
+			shop:{
+				latitude:0,
+				longitude:0,
+			},
+			personnel_bg:''
+		};
+	},
+	onLoad(option) {
+		//刷新多语言
+		this.$langConfig.refresh();
+		this.$api.sendRequest({
+			url: '/api/member/personnel',
+			success: res => {
+				if (res.code == 0) {
+					this.dataList = res.data
+					this.shop = res.shop
+					this.personnel_bg = res.set.personnel_bg?res.set.personnel_bg:'public/static/img/diy_view/member_info_bg.png'
+					this.markers = [{
+						id:1,
+						//iconPath:'http://saas.cn//public/static/img/kefu.png',
+						latitude:this.shop.latitude,
+						longitude:this.shop.longitude
+					}]
+				}
+			},
+			fail: res => {
+			}
+		});
+	},
+	methods: {
+		test(){ 
+				//     channelReady(function(bAvailable) {
+				//         alert('是否存在框架服务：' + bAvailable)
+				//       })
+				// window.location.href = 'https://hapjs.org/app//[path][?key=value] hap://app//[path][?key=value] '
+				//参数说明： package: 应用包名，必选 path: 应用内页面的 path，可选，默认为首页 key-value: 希望传给页面的参数，可选，可以有多个
+
+			   // const isQuickAppEnv = navigator.userAgent.includes('HuaweiQuickApp');
+			   // let quickAppBridge;
+			   // console.log(window.quickapp)
+			   // if (isQuickAppEnv) {
+			   //   quickAppBridge = window.quickapp;
+			   // }
+			   // quickAppBridge.invoke('startQuickAppPage', { page: '/NativePage' });
+		   // window.postMessage({ action: 'someAction', data: 'some data' }, '*');
+		   // window.open('https://xcx10.5g-quickapp.com/test.php')
+		},
+		save(){
+			this.$api.sendRequest({
+				url: '/api/member/message',
+				data:this.Form,
+				success: res => {
+					this.$refs.informationPopup.close();
+					this.$util.showToast({
+						title: res.message
+					});
+				},
+				fail: res => {
+				}
+			});
+		},
+		change(e){
+			console.log(e)
+			this.ismessage = e.show?1:0
+		},
+		//留言打开
+		tapMessage(){
+			this.ismessage = 1
+			this.$refs.informationPopup.open();
+		},
+		//留言关闭
+		closeinformationPopup(){
+			this.ismessage = 0
+			this.$refs.informationPopup.close();
+		},
+		Tel(m){
+			uni.makePhoneCall({
+				phoneNumber:m+'',
+				success(e) {
+					console.log(e)
+				}
+			})
+		},
+		copy(text){
+			  uni.setClipboardData({
+			    data: text,
+			    success: function () {
+			      console.log('复制成功');
+			      // 可以添加用户友好的提示，例如使用uni.showToast提示复制成功
+			      uni.showToast({
+			        title: '复制成功',
+			        icon: 'success',
+			        duration: 2000
+			      });
+			    },
+			    fail: function () {
+			      console.log('复制失败');
+			      // 可以添加错误处理或用户友好的提示
+			    }
+			  });
+		},
+		tomap(){
+			  uni.openLocation({
+				latitude: parseFloat(this.shop.latitude),
+				longitude: parseFloat(this.shop.longitude),
+				name:"一键导航",
+			  })
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+// 留言
+.liuyan-popup-layer {
+	height: 660rpx;
+	.free-tip {
+		min-width: 72rpx;
+		height: 36rpx;
+		line-height: 36rpx;
+		text-align: center;
+		border: none;
+		padding: 8rpx 8rpx;
+		border-radius: $border-radius;
+		margin-right: 20rpx;
+		font-size: $font-size-activity-tag;
+		display: inline-block;
+		font-weight: bold;
+		color: var(--main-color);
+		background-color: var(--main-color-shallow);
+	}
+	.liuyan-body {
+		position: absolute;
+		left: 0;
+		right: 0;
+		height: 60%;
+		.item {
+			padding: $padding 0;
+			margin: 0 30rpx;
+			border-bottom: 1px solid $color-line;
+			.value {
+				margin-left: 20rpx;
+			}
+			&:last-child {
+				border-bottom: 0;
+			}
+		}
+	}
+}
+.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);
+		}
+	}
+}
+button, image, input, label, navigator, scroll-view, swiper, textarea, view {
+    box-sizing: border-box;
+}
+.w100 {
+    width: 100%;
+	padding-bottom: 60rpx;
+}
+.bg {
+   /* background: #5dc2d0;*/
+}
+.border-top {
+    border-top: 1px solid rgba(78,78,78,.1);
+}
+.padding-top {
+    padding-top: 30rpx;
+}
+.container {
+    align-items: center;
+    box-sizing: border-box;
+    flex-direction: column;
+    height: 100%;
+    justify-content: space-between;
+    padding: 0 30rpx;
+    width: 100%!important;
+}
+.clearfix {
+    zoom: 1;
+    overflow: hidden;
+}
+.text-center {
+    text-align: center;
+}
+.w50_li {
+    float: left;
+    margin-bottom: 20rpx;
+    width: 50%;
+}
+.w50_li:nth-child(odd) {
+    padding-right: 20rpx;
+}
+.bl {
+    display: block;
+}
+.bor {
+    border-radius: 10rpx;
+}
+image {
+    display: inline-block;
+    max-width: 100%;
+    position: relative;
+    z-index: 0;
+}
+image {
+    max-width: 100%;
+}
+.bl {
+    display: block;
+}
+.line1 {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
+
+/*--当前页面css--*/
+
+.list_cotact .view_ul_one .bor {
+    padding: 40rpx;
+}
+
+.list_cotact .bor image {
+    height: 60rpx;
+}
+
+.list_cotact .bor .name,.view_ul_100 .name {
+    font-size: 32rpx;
+    line-height: 44rpx;
+    margin-top: 20rpx;
+    color:#fff
+}
+
+.list_cotact .view_ul_one .view_li:nth-child(1)>button {
+    background: #0054a5;
+    height: 200rpx;
+    line-height: 20rpx;
+}
+
+.list_cotact .view_ul_one .view_li:nth-child(2) {
+    background: #1daa39;
+    height: 200rpx;
+    line-height: 20rpx;
+	border-radius: 10rpx;
+}
+
+.view_ul_100 .fl {
+    width: 10%;
+}
+
+.view_ul_100 .fr {
+  /*  padding-left: 30rpx;*/
+    width: 100%;
+}
+
+.view_ul_100>view {
+    background: #fff;
+    // box-shadow: 5rpx 5rpx 10rpx #dcdcdc;
+}
+
+.view_ul_100 .text {
+    color: rgba(71,71,71,.79);
+    font-size: 24rpx;
+    margin-top: 10rpx;
+}
+
+.list_cotact .view_ul_100 .name {
+    margin-top: 0;
+}
+
+.list_cotact .view_ul_100>view {
+    padding: 20rpx 30rpx 0rpx 30rpx;
+}
+
+.list_cotact .view_ul_two .view_li>view {
+    background-color: #fff;
+    padding: 20rpx 30rpx 0rpx 30rpx;
+}
+
+.list_cotact .view_ul_two .view_li>view .address {
+    background-color: #5dc2d0;
+    color: #fff;
+    display: inline-block;
+    font-size: 28rpx;
+    line-height: 48rpx;
+    margin-bottom: 30rpx;
+    padding: 0 30rpx;
+    width: auto;
+}
+
+.view_ul_two {
+    margin-top: 20rpx;
+}
+
+.contact_name {
+    color: rgba(71,71,71,.79);
+    font-size: 24rpx;
+    line-height: 36rpx;
+    padding-left: 0rpx;
+}
+
+.contact_name image {
+    opacity: .79;
+    width: 30rpx;
+}
+
+
+
+.message {
+    /* background-color: rgba(0,0,0,.8); */
+    border-radius: 50%;
+    bottom: 50%;
+    height: 90rpx;
+    line-height: 74rpx;
+    position: fixed;
+    right: 30rpx;
+    text-align: center;
+    width: 90rpx;
+    z-index: 9999;
+}
+</style>
diff --git a/pages/goods/cart.vue b/pages/goods/cart.vue
new file mode 100644
index 0000000..b9c1971
--- /dev/null
+++ b/pages/goods/cart.vue
@@ -0,0 +1,347 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view>
+		<view class="container">
+			<scroll-view class="scroll-view" :scroll-y="true" :show-scrollbar="false" :refresher-enabled="true" :refresher-triggered="refresherTriggered" @refresherrefresh="onRefresh">
+				<block v-if="hasData">
+					<view class="cart-header" v-if="cartData.length">
+						<view class="num-wrap">共{{ cartData[0].cartList.length }}种商品</view>
+						<view class="cart-action" @click="changeAction">
+							{{ isAction ? $lang('complete') : $lang('edit') }}
+						</view>
+					</view>
+					<view class="cart-wrap" v-for="(siteItem, siteIndex) in cartData" :key="siteIndex">
+						<view class="coupon-use-tips" v-if="discount.coupon_info">
+							<view>
+								<text class="title color-base-text">优惠券</text>
+								<text class="desc">领券结算最高可减{{ discount.coupon_info.coupon_money | moneyFormat }}元</text>
+							</view>
+							<view class="color-base-text" @click="$refs.couponPopup.open()">
+								点击{{ discount.coupon_info.receive_type == 'wait' ? '领取' : '查看' }}
+								<text class="iconfont icon-right"></text>
+							</view>
+						</view>
+						<view class="store-wrap" v-if="globalStoreConfig && globalStoreConfig.store_business == 'store' && globalStoreInfo">
+							<text class="iconfont icon-dianpu"></text>
+							<text class="name">{{globalStoreInfo.store_name}}</text>
+						</view>
+						<block v-for="(item, cartIndex) in siteItem.cartList" :key="cartIndex">
+							<view class="cart-goods" @touchstart="touchS($event)" @touchend="touchE($event, item)">
+								<view class="goods-wrap" :class="{ edit: item.edit }">
+									<view class="iconfont" :class="item.checked ? 'icon-yuan_checked color-base-text' : 'icon-yuan_checkbox'" @click="singleElection(siteIndex, cartIndex)"></view>
+									<view @click="toGoodsDetail(item)" class="goods-img">
+										<image :src="$util.img(item.sku_image, { size: 'mid' })" @error="imageError(siteIndex, cartIndex)" mode="aspectFill"/>
+									</view>
+									<view class="goods-info">
+										<view>
+											<view @click="toGoodsDetail(item)" class="goods-name">{{ item.goods_name }}</view>
+											<view class="sku-wrap">
+												<view class="sku">
+													<view class="goods-spec" v-if="item.sku_spec_format.length" @click="selectSku(item)">
+														<block v-for="(x, i) in item.sku_spec_format" :key="i">
+															{{ x.spec_name }}:{{ x.spec_value_name }}
+															{{ i < item.sku_spec_format.length - 1 ? ';' : '' }}
+														</block>
+													</view>
+													<text class="iconfont icon-unfold" v-if="item.sku_spec_format.length"></text>
+												</view>
+											</view>
+										</view>
+										<view class="goods-sub-section">
+											<block v-if="item.promotion_type == 1">
+												<block v-if="Number(item.member_price) > 0 && Number(item.member_price) < Number(item.discount_price)">
+													<view class="goods-price ">
+														<view class="bottom-price price-style large">
+															<text class="unit price-style small">{{ $lang('common.currencySymbol') }}</text>
+															{{ parseFloat(item.member_price).toFixed(2).split('.')[0] }}
+															<text class="unit price-style small">.{{ parseFloat(item.member_price).toFixed(2).split('.')[1] }}</text>
+															<image :src="$util.img('public/uniapp/index/VIP.png')"/>
+														</view>
+													</view>
+												</block>
+												<block v-else>
+													<view class="goods-price ">
+														<view class="bottom-price price-style large">
+															<text class="unit price-style small">{{ $lang('common.currencySymbol') }}</text>
+															{{ parseFloat(item.discount_price).toFixed(2).split('.')[0] }}
+															<text class="unit price-style small">.{{ parseFloat(item.discount_price).toFixed(2).split('.')[1] }}</text>
+															<image :src="$util.img('public/uniapp/index/discount.png')"/>
+														</view>
+													</view>
+												</block>
+											</block>
+											<block v-else>
+												<block v-if="Number(item.member_price) > 0">
+													<view class="goods-price">
+														<view class="bottom-price price-style large">
+															<text class="unit price-style small">{{ $lang('common.currencySymbol') }}</text>
+															{{ parseFloat(item.member_price).toFixed(2).split('.')[0] }}
+															<text class="unit price-style small">.{{ parseFloat(item.member_price).toFixed(2).split('.')[1] }}</text>
+															<image :src="$util.img('public/uniapp/index/VIP.png')"/>
+														</view>
+													</view>
+												</block>
+												<block v-else>
+													<view class="goods-price">
+														<view class="bottom-price price-style large">
+															<text class="unit price-style small">{{ $lang('common.currencySymbol') }}</text>
+															{{ parseFloat(item.price).toFixed(2).split('.')[0] }}
+															<text class="unit price-style small">.{{ parseFloat(item.price).toFixed(2).split('.')[1] }}</text>
+														</view>
+													</view>
+												</block>
+											</block>
+											<uni-number-box :min="item.min_buy > 1 ? item.min_buy : 1"
+												:max="item.max_buy > 0 && item.max_buy < item.stock ? item.max_buy : item.stock"
+												size="small" :value="initNum(item)" :index="item.cart_id"
+												@change="cartNumChange($event, { siteIndex, cartIndex })"
+												@limit="goodsLimit($event, { siteIndex, cartIndex })" />
+										</view>
+										<view class="discount-wrap" v-if="manjian && manjian['sku_' + item.sku_id]">
+											<text class="discount-tag">满减</text>
+											<scroll-view scroll-x="true" class="scroll-view">
+												<block v-for="(mitem, key) in manjian['sku_' + item.sku_id]" :key="key">
+													<text v-if="mitem.discount_money">{{ Number(mitem.limit) }}减{{ mitem.discount_money }}</text>
+													<text class="interval" v-if="mitem.discount_money"></text>
+												</block>
+											</scroll-view>
+										</view>
+									</view>
+								</view>
+								<view class="item-del color-base-bg" :class="{ show: item.edit }" @click="deleteCart('single', siteIndex, cartIndex)">{{ $lang('del') }}</view>
+							</view>
+						</block>
+					</view>
+
+					<view class="cart-wrap invalid" v-if="invalidGoods.length">
+						<view class="cart-header">
+							<view class="num-wrap">
+								<text class="font-size-base">失效商品{{ invalidGoods.length }}件</text>
+							</view>
+							<view class="cart-action color-base-text" @click="clearInvalidGoods">清空</view>
+						</view>
+						<block v-for="(goodsItem, goodsIndex) in invalidGoods" :key="goodsIndex">
+							<view class="cart-goods invalid-goods">
+								<view class="goods-wrap">
+									<view class="iconfont icon-yuan_checked color-tip"></view>
+									<view class="goods-img">
+										<image :src="$util.img(goodsItem.sku_image, { size: 'mid' })" mode="aspectFill"/>
+									</view>
+									<view class="goods-info">
+										<view class="goods-name">{{ goodsItem.sku_name }}</view>
+										<view>
+											<view class="sku">
+												<view class="goods-spec" v-if="goodsItem.sku_spec_format.length">
+													<block v-for="(x, i) in goodsItem.sku_spec_format" :key="i">
+														{{ x.spec_name }}:{{ x.spec_value_name }}
+														{{ i < goodsItem.sku_spec_format.length - 1 ? '; ' : '' }}
+													</block>
+												</view>
+											</view>
+										</view>
+										<view class="goods-sub-section">
+											<view class="goods-price">
+												<text class="bottom-price price-style large">
+													<template v-if="goodsItem.member_price > 0 && goodsItem.member_price < goodsItem.discount_price">
+														<text class="unit price-style small">{{ $lang('common.currencySymbol') }}</text>
+														{{ parseFloat(goodsItem.member_price).toFixed(2).split('.')[0] }}
+														<text class="unit price-style small">.{{ parseFloat(goodsItem.member_price).toFixed(2).split('.')[1] }}</text>
+														<image :src="$util.img('public/uniapp/index/VIP.png')"/>
+													</template>
+													<template v-else>
+														<text class="unit price-style small">{{ $lang('common.currencySymbol') }}</text>
+														{{ parseFloat(goodsItem.discount_price).toFixed(2).split('.')[0] }}
+														<text class="unit price-style small">.{{ parseFloat(goodsItem.discount_price).toFixed(2).split('.')[1] }}</text>
+													</template>
+												</text>
+											</view>
+											<text class="invalid-mark">已失效</text>
+										</view>
+									</view>
+								</view>
+							</view>
+						</block>
+					</view>
+				</block>
+				<block v-else>
+					<view class="cart-empty">
+						<ns-empty text="购物车为空" subText="赶紧去逛逛, 购买心仪的商品吧" :isIndex="Boolean(storeToken)"></ns-empty>
+						<button type="primary" size="mini" class="button mini" v-if="!storeToken" @click="toLogin">去登录</button>
+					</view>
+				</block>
+				<ns-goods-recommend ref="goodrecommend" route="cart"></ns-goods-recommend>
+
+				<view class="cart-bottom-block"></view>
+
+				<!-- 底部tabBar占位 -->
+				<view class="page-bottom" :style="{ height: tabBarHeight }"></view>
+			</scroll-view>
+
+			<uni-popup ref="discountPopup" custom-class="uni-popup-discount" type="bottom">
+				<view class="discount-popup popup" v-if="Object.keys(discount).length">
+					<view class="popup-header">
+						<text class="tit">优惠明细</text>
+						<text class="iconfont icon-close" @click="toggleDiscountPopup"></text>
+					</view>
+					<view class="popup-body" :class="{ 'safe-area': isIphoneX }" @click="toggleDiscountPopup">
+						<view class="detail-item">
+							<view class="title">商品总额</view>
+							<view class="money price-font">￥{{ discount.goods_money | moneyFormat }}</view>
+						</view>
+						<view class="detail-item" v-if="discount.coupon_money > 0">
+							<view class="title">优惠券</view>
+							<view class="money price-font reduce">-￥{{ discount.coupon_money | moneyFormat }}</view>
+						</view>
+						<view class="detail-item" v-if="discount.promotion_money > 0">
+							<view class="title">满减</view>
+							<view class="money reduce price-font">-￥{{ discount.promotion_money | moneyFormat }}
+							</view>
+						</view>
+						<view class="detail-item total">
+							<view class="title">合计</view>
+							<view class="money price-font ">￥{{ discount.order_money | moneyFormat }}</view>
+						</view>
+					</view>
+					<view :style="{height: tabBarHeight}"></view>
+				</view>
+			</uni-popup>
+
+			<uni-popup ref="couponPopup" custom-class="uni-popup-discount" type="bottom" v-if="discount.coupon_info">
+				<view class="coupon-popup popup">
+					<view class="popup-header">
+						<text class="tit">优惠券</text>
+						<text class="iconfont icon-close" @click="$refs.couponPopup.close()"></text>
+					</view>
+					<view class="popup-body" :class="{ 'safe-area': isIphoneX }" @click="$refs.couponPopup.close()">
+						<view class="coupon-item">
+							<view class="coupon-info" :style="{ backgroundColor: discount.coupon_info.receive_type != 'wait' ? '#F2F2F2' : '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="discount.coupon_info.type == 'reward'">
+											<text class="unit">{{ $lang('common.currencySymbol') }}</text>
+											<text class="money">{{ parseFloat(discount.coupon_info.money) }}</text>
+										</template>
+										<template v-else-if="discount.coupon_info.type == 'discount'">
+											<text class="money">{{ parseFloat(discount.coupon_info.discount) }}</text>
+											<text class="unit">折</text>
+										</template>
+										<view class="at-least">
+											<template v-if="discount.coupon_info.at_least > 0">
+												满{{ discount.coupon_info.at_least }}可用
+											</template>
+											<template v-else>
+												无门槛
+											</template>
+										</view>
+									</view>
+								</view>
+								<view class="desc-wrap">
+									<view class="coupon-name">{{ discount.coupon_info.coupon_name }}</view>
+									<view v-if="discount.coupon_info.type == 'discount' && discount.coupon_info.discount_limit > 0" class="limit">
+										最多可抵￥{{ discount.coupon_info.discount_limit }}
+									</view>
+									<view class="time font-size-goods-tag" v-if="discount.coupon_info.validity_type == 0">
+										有效期：{{ $util.timeStampTurnTime(discount.coupon_info.end_time) }}
+									</view>
+									<view class="time font-size-goods-tag" v-else-if="discount.coupon_info.validity_type == 1">
+										有效期：领取之日起{{ discount.coupon_info.fixed_term }}天内有效
+									</view>
+									<view class="time font-size-goods-tag" v-else>有效期：长期有效</view>
+								</view>
+
+								<button type="primary" v-if="discount.coupon_info.receive_type != 'wait'" disabled>已领取</button>
+								<button type="primary" v-else @click.stop="receiveCoupon(discount.coupon_info.coupon_type_id)">领取</button>
+							</view>
+						</view>
+					</view>
+					<view :style="{height: tabBarHeight}"></view>
+					<view class="cart-bottom-block"></view>
+				</view>
+			</uni-popup>
+		</view>
+
+		<view class="cart-bottom" :style="{ bottom: tabBarHeight }" :class="{ active: isIphoneX }" v-if="hasData">
+			<view class="all-election" @click="allElection">
+				<view class="iconfont" :class="checkAll ? 'icon-yuan_checked color-base-text' : 'icon-yuan_checkbox'"></view>
+				<text>{{ $lang('allElection') }}</text>
+			</view>
+			<view class="settlement-info" :style="{ visibility: isAction ? 'hidden' : 'visible' }">
+				<view class="money">
+					{{ $lang('total') }}：
+					<text class="unit price-font">{{ $lang('common.currencySymbol') }}</text>
+					<block v-if="Object.keys(discount).length">
+						<text class="value price-font">{{ parseFloat(discount.order_money).toFixed(2).split('.')[0] }}</text>
+						<text class="unit price-font">.{{ parseFloat(discount.order_money).toFixed(2).split('.')[1] }}</text>
+					</block>
+					<block v-else>
+						<text class="value price-font">{{ parseFloat(totalPrice).toFixed(2).split('.')[0] }}</text>
+						<text class="unit price-font">.{{ parseFloat(totalPrice).toFixed(2).split('.')[1] }}</text>
+					</block>
+				</view>
+				<view class="detail" @click="toggleDiscountPopup" v-if="Object.keys(discount).length">
+					优惠明细
+					<text class="iconfont icon-unfold" :class="{ open: !discountPopupShow }"></text>
+				</view>
+			</view>
+			<view class="action-btn" v-if="isAction">
+				<button type="primary" size="mini" class="mini" @click="deleteCart('all')">{{ $lang('del') }}</button>
+			</view>
+			<view class="action-btn" v-else>
+				<button type="primary" size="mini" class="mini" @click="settlement" v-if="totalCount != 0">
+					{{ discount.coupon_info && discount.coupon_info.receive_type == 'wait' ? '领券' : '立即' }}结算({{ totalCount }})
+				</button>
+				<button type="primary" size="mini" class="mini" @click="settlement" disabled
+					v-else>{{ $lang('settlement') }}({{ totalCount }})</button>
+			</view>
+		</view>
+
+		<diy-bottom-nav></diy-bottom-nav>
+
+		<ns-goods-sku ref="selectSku" v-if="goodsSkuDetail" :goods-detail="goodsSkuDetail" :goods-id="goodsSkuDetail.goods_id" :max-buy="goodsSkuDetail.max_buy" :min-buy="goodsSkuDetail.min_buy" @refresh="refreshSkuDetail"></ns-goods-sku>
+
+		<!-- 加载动画 -->
+		<loading-cover ref="loadingCover"></loading-cover>
+
+		<!-- 返回顶部 -->
+		<to-top v-if="showTop" @toTop="scrollToTopNative()"></to-top>
+
+		<ns-login ref="login"></ns-login>
+
+		<!-- #ifdef MP-WEIXIN -->
+		<!-- 小程序隐私协议 -->
+		<privacy-popup ref="privacyPopup"></privacy-popup>
+		<!-- #endif -->
+	</view>
+</template>
+
+<script>
+	import nsGoodsRecommend from '@/components/ns-goods-recommend/ns-goods-recommend.vue';
+	import uniNumberBox from '@/components/uni-number-box/uni-number-box.vue';
+	import toTop from '@/components/toTop/toTop.vue';
+	import scroll from '@/common/js/scroll-view.js';
+	import cart from './public/js/cart.js';
+
+	export default {
+		components: {
+			nsGoodsRecommend,
+			uniNumberBox,
+			toTop
+		},
+		mixins: [scroll, cart]
+	};
+</script>
+
+<style 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;
+	}
+
+	@import './public/css/cart.scss';
+</style>
\ No newline at end of file
diff --git a/pages/goods/category.vue b/pages/goods/category.vue
new file mode 100644
index 0000000..702267e
--- /dev/null
+++ b/pages/goods/category.vue
@@ -0,0 +1,113 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view>
+		<block v-if="diyData">
+			<block v-for="(item, index) in diyData.value" :key="index">
+				<view v-if="item.componentName == 'GoodsCategory'">
+					<diy-category @tologin="toLogin" ref="category" :value="item"></diy-category>
+				</view>
+			</block>
+		</block>
+
+		<ns-login ref="login"></ns-login>
+
+		<loading-cover ref="loadingCover"></loading-cover>
+
+		<!-- #ifdef MP-WEIXIN -->
+		<!-- 小程序隐私协议 -->
+		<privacy-popup ref="privacyPopup"></privacy-popup>
+		<!-- #endif -->
+
+		<!-- 底部tabBar -->
+		<view id="tab-bar">
+			<diy-bottom-nav></diy-bottom-nav>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		components: {},
+		data() {
+			return {
+				diyData: null
+			};
+		},
+		onLoad() {
+			//刷新多语言
+			this.$langConfig.refresh();
+			uni.hideTabBar();
+			this.getDiyInfo();
+		},
+		onShow() {
+			if (this.$refs.category) this.$refs.category[0].pageShow();
+		},
+		onUnload() {
+			if (!this.storeToken && this.$refs.login) this.$refs.login.cancelCompleteInfo();
+		},
+		methods: {
+			getDiyInfo() {
+				this.$api.sendRequest({
+					url: '/api/diyview/info',
+					data: {
+						name: 'DIY_VIEW_GOODS_CATEGORY'
+					},
+					success: res => {
+						if (res.code == 0 && res.data) {
+							this.diyData = res.data;
+							if (this.diyData.value) {
+								this.diyData = JSON.parse(this.diyData.value);
+								if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+							}
+							uni.stopPullDownRefresh();
+						}
+					}
+				});
+			},
+			toLogin() {
+				this.$refs.login.open('/pages/goods/category')
+			}
+		},
+		onPullDownRefresh() {
+			uni.hideTabBar();
+			this.getDiyInfo();
+		}
+	};
+</script>
+
+<style lang="scss">
+	/deep/ .uni-popup__wrapper.uni-center {
+		background: rgba(0, 0, 0, 0.6);
+	}
+
+	/deep/ .uni-popup__wrapper-box {
+		border-radius: 0 !important;
+	}
+
+	/deep/ .uni-popup__wrapper.uni-custom.center .uni-popup__wrapper-box {
+		overflow-y: visible;
+	}
+
+	/deep/ .loading-layer {
+		background: #fff !important;
+	}
+
+	// 分类四一级展开
+	/deep/ .category-template-4 .template-four .uni-popup__wrapper-box {
+		border-radius: 0px 0px 14px 14px !important;
+		overflow: hidden;
+	}
+
+	/deep/ .category-template-4 .content-wrap .categoty-goods-wrap .goods-list {
+		margin-top: 30rpx;
+	}
+
+	/deep/ .category-template-4 .content-wrap .goods-list .goods-item .footer-wrap .right-wrap .num-action {
+		width: 46rpx;
+		height: 46rpx;
+	}
+
+	/deep/ .uni-page-refresh-inner .uni-page-refresh__path {
+		stroke: rgb(1, 1, 1) !important;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/goods/detail.vue b/pages/goods/detail.vue
new file mode 100644
index 0000000..f970686
--- /dev/null
+++ b/pages/goods/detail.vue
@@ -0,0 +1,659 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view>
+		<!-- #ifndef H5 -->
+	<!-- 	<view class="page-header" v-if="goodsSkuDetail && goodsSkuDetail.config && goodsSkuDetail.config.nav_bar_switch == 0">
+			<ns-navbar :data="navbarData" :isBack="true"></ns-navbar>
+		</view> -->
+		<!-- #endif -->
+
+		<goods-detail-view :goodsSkuDetail="goodsSkuDetail" ref="goodsDetailView">
+			<!-- 价格区域 -->
+			<template v-slot:price>
+				<!-- 限时折扣 -->
+				<view v-if="showDiscount && goodsSkuDetail.discountTimeMachine" class="goods-promotion">
+					<view class="price-info">
+						<view class="icon-box"><text class="iconfont icon-tutechan"></text></view>
+						<view class="price-box">
+							<view class="promotion-text">限时折扣</view>
+							<view class="sale-num" v-if="goodsSkuDetail.sale_show">已售{{ goodsSkuDetail.sale_num }}{{ goodsSkuDetail.unit }}</view>
+						</view>
+					</view>
+
+					<view class="countdown">
+						<view class="txt">距结束仅剩</view>
+						<view class="clockrun">
+							<uni-count-down
+								:day="goodsSkuDetail.discountTimeMachine.d"
+								:hour="goodsSkuDetail.discountTimeMachine.h"
+								:minute="goodsSkuDetail.discountTimeMachine.i"
+								:second="goodsSkuDetail.discountTimeMachine.s"
+								splitorColor="#ffffff"
+								backgroundColor="#ffffff"
+							/>
+						</view>
+					</view>
+				</view>
+
+				<view class="group-wrap padding-top">
+					<view class="goods-module-wrap">
+
+						<block v-if="goodsSkuDetail.isinformation == 0">
+							<template v-if="showDiscount">
+								<text class="price-symbol price-font">{{ $lang('common.currencySymbol') }}</text>
+								<text class="price price-font">{{ parseFloat(goodsSkuDetail.discount_price).toFixed(2).split('.')[0] }}</text>
+								<text class="price-symbol price-font">.{{ parseFloat(goodsSkuDetail.discount_price).toFixed(2).split('.')[1] }}</text>
+							</template>
+							<template v-else>
+								<template v-if="goodsSkuDetail.member_price > 0">
+									<text class="price-symbol price-font">{{ $lang('common.currencySymbol') }}</text>
+									<text class="price price-font">{{ parseFloat(goodsSkuDetail.member_price).toFixed(2).split('.')[0] }}</text>
+									<text class="price-symbol price-font">.{{ parseFloat(goodsSkuDetail.member_price).toFixed(2).split('.')[1] }}</text>
+									<view class="member-vip-wrap">
+										<image :src="$util.img('public/uniapp/goods/member_vip.png')" mode="aspectFit"/>
+									</view>
+									<view class="member-price-wrap" v-if="!goodsSkuDetail.market_price_show">
+										<text class="unit price-font">原价</text>
+										<text class="unit price-font">{{ $lang('common.currencySymbol') }}</text>
+										<text class="money price-font">{{ goodsSkuDetail.price }}</text>
+									</view>
+								</template>
+								<template v-else>
+									<text class="price-symbol price-font">{{ $lang('common.currencySymbol') }}</text>
+									<text class="price price-font">{{ parseFloat(goodsSkuDetail.price).toFixed(2).split('.')[0] }}</text>
+									<text class="price-symbol price-font">.{{ parseFloat(goodsSkuDetail.price).toFixed(2).split('.')[1] }}</text>
+								</template>
+							</template>
+							<view class="market-price-wrap" v-if="goodsSkuDetail.market_price_show">
+								<text class="unit price-font" v-if="(showDiscount && goodsSkuDetail.price > 0) || goodsSkuDetail.market_price > 0">
+									{{ $lang('common.currencySymbol') }}
+								</text>
+								<text class="money price-font" v-if="showDiscount && goodsSkuDetail.price > 0">{{ goodsSkuDetail.price }}</text>
+								<text class="money price-font" v-else-if="goodsSkuDetail.market_price > 0">{{ goodsSkuDetail.market_price }}</text>
+							</view>
+							<view class="follow-and-share">
+								<text class="follow iconfont icon-share" @click="openSharePopup()"></text>
+								<text class="share iconfont" @click="editCollection()" :class="whetherCollection == 1 ? 'icon-likefill color-base-text' : 'icon-guanzhu'"></text>
+							</view>
+						</block>
+						<block v-else>
+							<template>
+								<text class="price price-font" style="font-weight: 600;">{{$lang('makebtn')}}</text>
+							</template>
+						</block>
+					</view>
+					
+					<view class="goods-module-wrap info">
+						<text class="sku-name-wrap">{{ goodsSkuDetail.goods_name }}</text>
+						<text class="introduction" v-if="goodsSkuDetail.introduction" :style="{ color: goodsSkuDetail.config ? goodsSkuDetail.config.introduction_color : '' }">
+							{{ goodsSkuDetail.introduction }}
+						</text>
+						<view class="goods-tag-list" v-if="goodsSkuDetail.label_name">
+							<text class="tag-item">{{ goodsSkuDetail.label_name }}</text>
+						</view>
+						<view class="logistics-wrap">
+							<text v-if="goodsSkuDetail.stock_show">{{$lang('stock')}}: {{ goodsSkuDetail.stock +goodsSkuDetail.unit}}</text>
+							<text v-if="goodsSkuDetail.sale_show">{{$lang('sales')}}: {{ goodsSkuDetail.sale_num+goodsSkuDetail.unit }}</text>
+						</view>
+						<!-- 会员卡 -->
+					<!-- 	<view class="member-card-wrap" @click="$util.redirectTo('/pages_tool/member/card_buy')" v-if="membercard">
+							<text class="iconfont icon-huiyuan"></text>
+							<view class="info">开通{{ membercard.level_name }}仅需{{ membercard.member_price }}元</view>
+							<text class="btn">立即开通</text>
+						</view> -->
+					</view>
+				</view>
+
+				<!-- 当前商品参与的营销活动入口 -->
+				<view class="group-wrap"><ns-goods-promotion ref="goodsPromotion" promotion="discount"></ns-goods-promotion></view>
+
+				<view class="group-wrap fenxiao-detail"
+					v-if="
+						goodsSkuDetail.fenxiao_detail &&
+							goodsSkuDetail.fenxiao_detail.words_account &&
+							goodsSkuDetail.fenxiao_detail.commission_money > 0 &&
+							goodsSkuDetail.fenxiao_detail.is_commission_money == 1
+					">
+					<view class="title color-base-text">{{$lang('commission')}}</view>
+					<view class="commission-ratio">
+						<view class="item">
+							<view>One {{$lang('commissiontext')}}</view>
+							<view class="price-color">
+								<text class="unit">￥</text>
+								<text class="money">{{ parseFloat(goodsSkuDetail.fenxiao_detail.commission_money).toFixed(2).split('.')[0] }}</text>
+								<text class="unit">.{{ parseFloat(goodsSkuDetail.fenxiao_detail.commission_money).toFixed(2).split('.')[1] }}</text>
+							</view>
+						</view>
+					</view>
+				</view>
+
+			<!-- 	<view class="group-wrap card-info" v-if="goodsSkuDetail.goods_class == 5 && goodsSkuDetail.card_info && goodsSkuDetail.card_info.relation_goods.length">
+					<view class="card-title">- 套餐包含以下的服务及商品 -</view>
+					<view class="card-desc" v-if="goodsSkuDetail.card_info.card_type == 'timecard' || goodsSkuDetail.card_info.card_type == 'commoncard'">
+						{{ goodsSkuDetail.card_info.card_type == 'commoncard' ? '卡项内项目/商品总的可用次数为' + goodsSkuDetail.card_info.common_num + ' ,' : '' }}
+						{{ goodsSkuDetail.card_info.card_type == 'timecard' ? '次数不限 ,' : '' }} 有效期为{{
+							(goodsSkuDetail.card_info.validity_type == 0 && '永久') ||
+								(goodsSkuDetail.card_info.validity_type == 1 && goodsSkuDetail.card_info.validity_day + '天') ||
+								(goodsSkuDetail.card_info.validity_type == 2 && $util.timeStampTurnTime(goodsSkuDetail.card_info.validity_time))
+						}}
+					</view>
+					<view class="card-content" :style="{ height: [cardOff ? 'auto' : '198rpx'] }">
+						<view class="card-item"
+							v-for="(item, index) in goodsSkuDetail.card_info.relation_goods"
+							@click="$util.redirectTo('/pages/goods/detail', { goods_id: item.goods_id })"
+						>
+							<image :src="$util.img(item.sku_image)" mode="aspectFill"/>
+							<view class="content">
+								<view class="name multi-hidden">{{ item.sku_name }}</view>
+								<view class="price">￥{{ item.price }}</view>
+								<text class="num" v-if="goodsSkuDetail.card_info.card_type == 'oncecard'">x{{ item.num }}</text>
+							</view>
+						</view>
+					</view>
+					<view class="card-off" @click="cardOff = !cardOff" v-if="goodsSkuDetail.card_info.relation_goods.length > 1">
+						<text>{{ cardOff ? '收起' : '展开' }}</text>
+						<text class="icondiy" :class="[cardOff ? 'icon-system-jiantoushang' : 'icon-system-jiantouxia']"></text>
+					</view>
+				</view> -->
+			</template>
+			<!--多规格-->
+			<template v-slot:skuspec>
+				<view class="item selected-sku-spec" @click="buyNow()">
+					<view class="label">{{$lang('spec')}}</view>
+					<view class="box">
+						<text v-for="(item, index) in goodsSkuDetail.sku_spec_format" :key="index">{{ item.spec_name }}/{{ item.spec_value_name }}</text>
+					</view>
+					<text class="iconfont iconright"></text>
+				</view>
+			</template>
+			<!-- 入口区域 -->
+		<!-- 	<template v-slot:entrance>
+				<view class="item coupon" v-if="couponList.length && couponList[0]['useState'] != 2" @click="openCouponPopup()">
+					<view class="label">领券</view>
+					<view class="coupon-list">
+						<view class="coupon-item" v-for="(item, index) in couponList" :key="index" v-if="index < 3 && item.useState != 2">
+							<view v-if="item.type == 'reward'">
+								{{
+									parseFloat(item.at_least) > 0
+										? '满' + decimalPointFormat(item.at_least) + '减' + decimalPointFormat(item.money)
+										: '无门槛使用' + decimalPointFormat(item.money)
+								}}
+							</view>
+							<view v-else-if="item.type == 'discount'">{{ '满' + decimalPointFormat(item.at_least) + '打' + parseFloat(item.discount)+'折' }}</view>
+						</view>
+					</view>
+					<text class="iconfont icon-right"></text>
+				</view>
+		
+				<view class="item selected-sku-spec" v-if="goodsSkuDetail.sku_spec_format" @click="choiceSku">
+					<view class="label">选择</view>
+					<view class="box">
+						<text v-for="(item, index) in goodsSkuDetail.sku_spec_format" :key="index">{{ item.spec_name }}/{{ item.spec_value_name }}</text>
+					</view>
+					<text class="iconfont icon-right"></text>
+				</view>
+				<view class="item free" v-if="manjian.rule_json !== null && addonIsExist.manjian" @click="openManjianPopup()">
+					<view class="label">促销</view>
+					<text class="free-tip color-base-text">满减</text>
+					<text class="font-size-base value">{{ manjian.manjian_name }}</text>
+					<text class="iconfont icon-right"></text>
+				</view>
+			</template> -->
+
+			<!-- 业务区域 -->
+			<template v-slot:business>
+				<!-- SKU选择 -->
+				<ns-goods-sku
+					v-if="goodsSkuDetail.goods_id"
+					ref="goodsSku"
+					@refresh="refreshGoodsSkuDetail"
+					:goods-id="goodsSkuDetail.goods_id"
+					:goods-detail="goodsSkuDetail"
+					:max-buy="goodsSkuDetail.max_buy"
+					:min-buy="goodsSkuDetail.min_buy"
+					@getSkuId="setSkuId"
+				></ns-goods-sku>
+
+				<!-- 组合套餐 -->
+				<view v-if="bundling.length && bundling[0].bl_name && addonIsExist.bundling">
+					<view class="group-wrap" @click="openBundlingPopup()">
+						<view class="goods-cell" @click="openBundlingPopup()">
+							<view class="box">
+								<text class="tit">组合套餐</text>
+								<text>{{ bundling[0].bl_name }}</text>
+							</view>
+							<text class="iconfont icon-right"></text>
+							<!-- <view class="more-img-wrap"><image :src="$util.img('public/uniapp/goods/detail_more.png')" mode="aspectFit" /></view> -->
+						</view>
+						<scroll-view class="combo-goods-wrap color-tip" scroll-x="true">
+							<view class="goods-wrap">
+								<view class="goods-item" @click="toGoodsDetail(skuId)" v-if="bundlingType == true">
+									<view class="combo-img">
+										<image :src="$util.img(goodsSkuDetail.sku_image, { size: 'mid' })" @error="imageError()" />
+										<view class="price-wrap">
+											<text class="unit price-font">{{ $lang('common.currencySymbol') }}</text>
+											<text class="price price-font">{{ goodsSkuDetail.price }}</text>
+										</view>
+									</view>
+									<text class="name">{{ goodsSkuDetail.goods_name }}</text>
+								</view>
+								<block v-for="(item, index) in bundling[0].bundling_goods" :key="index">
+									<template v-if="index < 3">
+										<view class="goods-item" @click="toGoodsDetail(item.sku_id)">
+											<view class="combo-img">
+												<image :src="$util.img(item.sku_image, { size: 'mid' })" @error="bundlingImageError(0, index)" />
+												<view class="price-wrap">
+													<text class="unit price-font">{{ $lang('common.currencySymbol') }}</text>
+													<text class="price price-font">{{ item.price }}</text>
+												</view>
+											</view>
+											<text class="name">{{ item.sku_name }}</text>
+										</view>
+									</template>
+								</block>
+							</view>
+						</scroll-view>
+					</view>
+
+					<view @touchmove.prevent.stop>
+						<uni-popup ref="bundlingPopup" type="bottom">
+							<view class="bundling-popup-layer popup-layer">
+								<view class="head-wrap" @click="closeBundlingPopup()">
+									<text>组合套餐</text>
+									<text class="iconfont icon-close"></text>
+								</view>
+								<scroll-view scroll-y class="bundling-body">
+									<view class="bundling-view">
+										<block v-for="(item, index) in bundling" :key="index">
+											<view class="bundling-item">
+												<view class="title" @click="toComoDetail(item.bl_id)">
+													<text>{{ item.bl_name }}</text>
+													<text class="iconfont icon-right"></text>
+												</view>
+												<scroll-view scroll-x>
+													<view class="goods-wrap">
+														<view class="goods-item" @click="toGoodsDetail(skuId)">
+															<view class="combo-img">
+																<image :src="$util.img(goodsSkuDetail.sku_image, { size: 'mid' })" @error="imageError()" />
+																<view class="price-wrap">
+																	<text class="unit price-font">{{ $lang('common.currencySymbol') }}</text>
+																	<text class="price price-font">{{ goodsSkuDetail.price }}</text>
+																</view>
+															</view>
+															<text class="name">{{ goodsSkuDetail.goods_name }}</text>
+														</view>
+														<block v-for="(goods, goods_index) in item.bundling_goods" :key="goods_index">
+															<template v-if="goods_index < 3">
+																<view class="goods-item" @click="toGoodsDetail(goods.sku_id)">
+																	<view class="combo-img">
+																		<image :src="$util.img(goods.sku_image, { size: 'mid' })" @error="bundlingImageError(index, goods_index)" />
+																		<view class="price-wrap">
+																			<text class="unit price-font">{{ $lang('common.currencySymbol') }}</text>
+																			<text class="price price-font">{{ goods.price }}</text>
+																		</view>
+																	</view>
+																	<text class="name">{{ goods.sku_name }}</text>
+																</view>
+															</template>
+														</block>
+													</view>
+												</scroll-view>
+												<view class="bundling-price-wrap">
+													<text class="label">套餐价</text>
+													<text class="unit price-color">{{ $lang('common.currencySymbol') }}</text>
+													<text class="price price-color">{{ item.bl_price }}</text>
+													<button type="primary" size="mini" class="mini" @click="toComoDetail(item.bl_id)">立即购买</button>
+												</view>
+											</view>
+										</block>
+									</view>
+								</scroll-view>
+							</view>
+						</uni-popup>
+					</view>
+				</view>
+
+				<!-- 优惠券 -->
+				<view @touchmove.prevent.stop>
+					<uni-popup ref="couponPopup" type="bottom">
+						<view class="goods-coupon-popup-layer popup-layer">
+							<view class="head-wrap" @click="closeCouponPopup()">
+								<text>优惠券</text>
+								<text class="iconfont icon-close"></text>
+							</view>
+							<scroll-view class="coupon-body" scroll-y>
+								<view class="coupon-item ns-gradient-diy-goods-list" v-for="(item, index) in couponList" :key="index" v-if="hackReset">
+									<view class="coupon-info" :style="{ backgroundColor: item.useState == 2 ? '#F2F2F2' : 'var(--main-color-shallow)' }">
+										<view class="info-wrap" :class="{ disabled: item.useState == 2 }">
+											<image class="coupon-line" mode="heightFix" :src="$util.img('public/uniapp/coupon/coupon_line.png')"></image>
+											<view class="coupon-money">
+												<template v-if="item.type == 'reward'">
+													<text class="unit">{{ $lang('common.currencySymbol') }}</text>
+													<text class="money">{{ parseFloat(item.money) }}</text>
+												</template>
+												<template v-else-if="item.type == 'discount'">
+													<text class="money">{{ parseFloat(item.discount) }}</text>
+													<text class="unit">折</text>
+												</template>
+												<view class="at-least">
+													<template v-if="item.at_least > 0">
+														满{{ item.at_least }}可用
+													</template>
+													<template v-else>
+														无门槛
+													</template>
+												</view>
+											</view>
+										</view>
+										<view class="desc-wrap">
+											<view class="coupon-name">{{ item.coupon_name }}</view>
+											<view v-if="item.type == 'discount' && item.discount_limit > 0" class="limit">最多可抵￥{{ item.discount_limit }}</view>
+											<view class="time font-size-goods-tag" v-if="item.validity_type == 0">有效期：{{ $util.timeStampTurnTime(item.end_time) }}</view>
+											<view class="time font-size-goods-tag" v-else-if="item.validity_type == 1">有效期：领取之日起{{ item.fixed_term }}天内有效</view>
+											<view class="time font-size-goods-tag" v-else>有效期：长期有效</view>
+										</view>
+
+										<button type="primary" v-if="item.useState == 2" disabled>已抢光</button>
+										<button type="primary" v-else-if="item.useState == 1" disabled>已领取</button>
+										<button type="primary" v-else @click="receiveCoupon(item)">领取</button>
+									</view>
+								</view>
+							</scroll-view>
+							<view class="button-box"><button type="primary" @click="closeCouponPopup()">确定</button></view>
+						</view>
+					</uni-popup>
+				</view>
+
+				<!-- 促销 -->
+				<view @touchmove.prevent.stop v-if="addonIsExist.manjian">
+					<uni-popup ref="manjianPopup" type="bottom">
+						<view class="manjian-popup-layer popup-layer">
+							<view class="head-wrap" @click="closeManjianPopup()">
+								<text>促销</text>
+								<text class="iconfont icon-close"></text>
+							</view>
+							<scroll-view scroll-y class="manjian-body">
+								<view class="item" v-if="manjian.manjian != undefined" style="display: flex;">
+									<view class="free-tip color-base-text color-base-border">满减</view>
+									<text class="font-size-base">{{ manjian.manjian }}</text>
+								</view>
+								<view class="item" v-if="manjian.mansong != undefined">
+									<text class="free-tip color-base-text color-base-border">满送</text>
+									<text class="font-size-base">{{ manjian.mansong }}</text>
+								</view>
+								<view class="item" v-if="manjian.free_shipping != undefined" style="display: flex;">
+									<view class="free-tip color-base-text color-base-border">包邮</view>
+									<text class="font-size-base">{{ manjian.free_shipping }}</text>
+								</view>
+							</scroll-view>
+							<view class="button-box"><button type="primary" @click="closeManjianPopup()">确定</button></view>
+						</view>
+					</uni-popup>
+				</view>
+				<!--商品留言弹窗-->
+				<view class="goods-sku" @touchmove.prevent.stop>
+					<uni-popup ref="informationPopup" type="bottom">
+						<view class="manjian-popup-layer popup-layer" :style="{ height: FormHeight }">
+							<view class="head-wrap" @click="closeinformationPopup()">
+								<text>商品留言</text>
+								<text class="iconfont icon-close"></text>
+							</view>
+							<scroll-view scroll-y class="manjian-body" >
+							<!-- 	<view class="item" v-if="manjian.manjian != undefined" style="display: flex;">
+									<view class="free-tip color-base-text color-base-border">满减</view>
+									<text class="font-size-base">{{ manjian.manjian }}</text>
+								</view>
+								<view class="item" v-if="manjian.mansong != undefined">
+									<text class="free-tip color-base-text color-base-border">满送</text>
+									<text class="font-size-base">{{ manjian.mansong }}</text>
+								</view>
+								<view class="item" v-if="manjian.free_shipping != undefined" style="display: flex;">
+									<view class="free-tip color-base-text color-base-border">包邮</view>
+									<text class="font-size-base">{{ manjian.free_shipping }}</text>
+								</view> -->
+								<!-- v-if="goodsSkuDetail.goodsForm" -->
+								<view style="padding: 0 30rpx;">
+									<ns-form :data="informationform"  ref="form"></ns-form>
+								</view>
+							</scroll-view>
+							<view class="button-box"><button type="primary" @click="saveubfirnation()">确定</button></view>
+						</view>
+					</uni-popup>
+					<!-- <uni-popup ref="informationPopup" type="bottom" class="sku-layer" @change="popclose">
+						<view class="sku-info">
+							<view class="body-item">
+								<scroll-view scroll-y class="wrap">
+									<ns-form :data="goodsSkuDetail.goodsForm" v-if="goodsSkuDetail.goodsForm" ref="form"></ns-form>
+								</scroll-view>
+							</view>
+						</view>
+					</uni-popup> -->
+				</view>
+				<!---->
+			</template>
+
+			<!-- 操作区域 -->
+			<template v-slot:action>
+				<!-- 商品底部导航 -->
+				<ns-goods-action :safeArea="isIphoneX">
+					
+					<template v-if="goodsSkuDetail.goods_state == 1">
+						
+							<ns-goods-action-button
+								class="goods-action-button active3"
+								:disabled-text="$lang('status')"
+								:disabled="true"
+								v-if="goodsSkuDetail.store_goods_status != undefined && goodsSkuDetail.store_goods_status != 1"
+							/>
+							<block v-else>
+								<ns-goods-action-icon :text="$lang('home')" icon="icon-shouye1" @click="goHome" />
+								
+								<!-- #ifdef MP-WEIXIN -->
+								<ns-goods-action-icon
+									:text="$lang('cart')"
+									:cornerMarkBg="themeStyle.goods_detail.goods_cart_num_corner"
+									icon="icon-gouwuche2"
+									:corner-mark="cartNumber > 0 ? cartNumber + '' : ''"
+									@click="goCart"
+								/>
+								<ns-goods-action-icon :text="$lang('kefu')" icon="icox icox-kefu" :send-data="contactData" :chatParam="chatRoomParams" />
+								<!-- #endif -->
+								<!-- #ifdef H5 -->
+								<ns-goods-action-icon :text="$lang('follow')" :icon="whetherCollection == 1 ? 'icon-likefill color-base-text' : 'icon-guanzhu'"  @click="editCollection" />
+								<!-- #endif -->
+								<block v-if="goodsSkuDetail.isinformation >= 1">
+								
+									<ns-goods-action-button v-if="goodsSkuDetail.isinformation == 1" class="goods-action-button active3" disabled-text="" backgroundColor="#54c952" @click="phoneClick(goodsSkuDetail.goods_mobile)" :text="$lang('make')" :disabled="false" />
+									<ns-goods-action-button v-if="goodsSkuDetail.isinformation == 2" class="goods-action-button active3" disabled-text="" backgroundColor="#54c952" @click="showinformation" :text="$lang('leave')" :disabled="false" />
+							<!-- 		<ns-goods-action-button v-if="goodsSkuDetail.isinformation == 2" class="goods-action-button active3" disabled-text="" backgroundColor="#54c952" @click="buyNow" text="商品留言" :disabled="false" /> -->
+							
+								</block>
+								<block v-else>
+									<block v-if="goodsSkuDetail.stock == 0 && !goodsSkuDetail.sku_spec_format">
+										<ns-goods-action-button class="goods-action-button active3" :disabled-text="$lang('sellout')" :disabled="true" />
+									</block>
+									<block v-else-if="
+											goodsSkuDetail.is_limit == 1 &&
+												goodsSkuDetail.limit_type == 2 &&
+												goodsSkuDetail.max_buy != 0 &&
+												goodsSkuDetail.purchased_num >= goodsSkuDetail.max_buy
+										">
+										<ns-goods-action-button class="goods-action-button active3" :disabled-text="$lang('max')" :disabled="true" />
+									</block>
+									<block v-else>
+										<ns-goods-action-button
+											class="goods-action-button"
+											:text="$lang('addcart')"
+											:backgroundColor="themeStyle.goods_detail.goods_btn_color_shallow"
+											@click="joinCart"
+											v-if="goodsSkuDetail.is_virtual == 0"
+										/>
+										<ns-goods-action-button
+											class="goods-action-button"
+											:backgroundColor="themeStyle.goods_detail.goods_btn_color"
+											:textColor="themeStyle.btn_text_color"
+											:text="$lang('buynow')"
+											@click="buyNow"
+										/>
+								</block>
+								
+								</block>
+							</block>
+						
+					</template>
+					<template v-else>
+						<ns-goods-action-button class="goods-action-button active3" :disabled-text="$lang('status')" :disabled="true" />
+					</template>
+					
+					
+					
+				</ns-goods-action>
+			</template>
+		</goods-detail-view>
+		<to-top v-if="showTop" @toTop="scrollToTopNative()"></to-top>
+		<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 nsGoodsAction from '@/components/ns-goods-action/ns-goods-action.vue';
+import nsGoodsActionIcon from '@/components/ns-goods-action-icon/ns-goods-action-icon.vue';
+import nsGoodsActionButton from '@/components/ns-goods-action-button/ns-goods-action-button.vue';
+import uniPopup from '@/components/uni-popup/uni-popup.vue';
+import nsGoodsSku from '@/components/ns-goods-sku/ns-goods-sku.vue';
+import uniCountDown from '@/components/uni-count-down/uni-count-down.vue';
+import detail from './public/js/detail.js';
+import scroll from '@/common/js/scroll-view.js';
+import toTop from '@/components/toTop/toTop.vue';
+import nsGoodsPromotion from '@/components/ns-goods-promotion/ns-goods-promotion.vue';
+import goodsDetailBase from '@/common/js/goods_detail_base.js';
+import goodsDetailView from '@/components/goods-detail-view/goods-detail-view.vue';
+
+export default {
+	components: {
+		nsGoodsAction,
+		nsGoodsActionIcon,
+		nsGoodsActionButton,
+		uniPopup,
+		nsGoodsSku,
+		uniCountDown,
+		nsGoodsPromotion,
+		goodsDetailView,
+		toTop
+	},
+	mixins: [goodsDetailBase, detail, scroll]
+};
+</script>
+<style lang="scss">
+@import '@/common/css/goods_detail.scss';
+@import './public/css/detail.scss';
+
+.sku-info {
+	max-height: 75vh;
+	height: 45vh;
+	position: relative;
+	z-index: 999;
+}
+
+</style>
+<style scoped>
+/deep/ .action-icon-wrap .iconfont.icon-shouye1 {
+	font-size: 40rpx;
+}
+/deep/ .uni-video-cover {
+	background: none;
+}
+
+/deep/ .uni-video-cover-duration {
+	display: none;
+}
+
+/deep/ .uni-video-cover-play-button {
+	border-radius: 50%;
+	border: 4rpx solid #fff;
+	width: 120rpx;
+	height: 120rpx;
+	background-size: 30%;
+}
+
+.poster-layer >>> .uni-popup__wrapper-box {
+	max-height: initial !important;
+}
+
+/deep/ .sku-layer .uni-popup__wrapper-box {
+	overflow-y: initial !important;
+}
+
+.goods-promotion .countdown .clockrun >>> .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;
+}
+
+.goods-promotion .countdown .clockrun >>> .uni-countdown__splitor {
+	width: 10rpx;
+	height: 32rpx;
+	line-height: 36rpx;
+	text-align: center;
+}
+
+.goods-promotion .countdown .clockrun >>> .uni-countdown__splitor.day {
+	width: initial;
+}
+
+/deep/ .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+	max-height: unset !important;
+}
+
+/deep/ .goods-action-button.active1 {
+	padding-left: 10px;
+}
+
+/deep/ .goods-action-button.active2 {
+	padding-right: 10px;
+}
+
+/deep/ .goods-action-button.active3 {
+	padding: 0 10px;
+}
+
+/deep/ .goods-action-button.active4 {
+	padding: 0 10px;
+}
+/deep/ .uni-popup__wrapper.bottom {
+	border-radius: 24rpx 24rpx 0 0;
+}
+
+/deep/ .goods-action-button.active1 .action-buttom-wrap {
+	height: 72rpx;
+	line-height: 72rpx;
+}
+
+/deep/ .goods-action-button.active2 .action-buttom-wrap {
+	height: 72rpx;
+	line-height: 72rpx;
+}
+
+/deep/ .goods-action-button.active3 .action-buttom-wrap {
+	height: 72rpx;
+	line-height: 72rpx;
+	margin: 20rpx 0;
+}
+
+/deep/ .goods-action-button.active4 .action-buttom-wrap {
+	height: 72rpx;
+	line-height: 72rpx;
+}
+</style>
diff --git a/pages/goods/list.vue b/pages/goods/list.vue
new file mode 100644
index 0000000..4ab611b
--- /dev/null
+++ b/pages/goods/list.vue
@@ -0,0 +1,317 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view class="content"> 
+		<view class="head-wrap">
+			<!-- 搜索区域 -->
+			<view class="search-wrap uni-flex uni-row">
+				<view class="flex-item input-wrap">
+					<input class="uni-input" maxlength="50" v-model="keyword" @confirm="search()" :placeholder="langstatus?$lang('Search'):'请输入您要搜索的商品'" />
+					<text class="iconfont icon-sousuo3" @click.stop="search()"></text>
+				</view>
+				<view class="iconfont" :class="{ 'icon-apps': isList, 'icon-list': !isList }" @click="changeListStyle()"></view>
+			</view>
+
+			<!-- 排序 -->
+			<view class="sort-wrap">
+				<view class="comprehensive-wrap" :class="{ 'color-base-text': orderType === '' }" @click="sortTabClick('')">
+					<text :class="{ 'color-base-text': orderType === '' }">{{langstatus?$lang('Random'):'综合'}}</text>
+				</view>
+
+				<view :class="{ 'color-base-text': orderType === 'sale_num' }" @click="sortTabClick('sale_num')">{{langstatus?$lang('Sales'):'销量'}}
+				</view>
+
+				<view class="price-wrap" @click="sortTabClick('discount_price')">
+					<text :class="{ 'color-base-text': orderType === 'discount_price' }">{{langstatus?$lang('Price'):'价格'}}</text>
+					<view class="iconfont-wrap">
+						<view class="iconfont icon-iconangledown-copy asc" :class="{ 'color-base-text': priceOrder === 'asc' && orderType === 'discount_price' }"></view>
+						<view class="iconfont icon-iconangledown desc" :class="{ 'color-base-text': priceOrder === 'desc' && orderType === 'discount_price' }"></view>
+					</view>
+				</view>
+
+				<view :class="{ 'color-base-text': orderType === 'screen' }" class="screen-wrap">
+					<text @click="sortTabClick('screen')">{{langstatus?$lang('Filter'):'筛选'}}</text>
+					<view @click="sortTabClick('screen')" class="iconfont-wrap">
+						<view class="iconfont icon-shaixuan color-tip"></view>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<mescroll-uni top="180" ref="mescroll" @getData="getGoodsList">
+			<block slot="list">
+				<view class="goods-list single-column" :class="{ show: isList }">
+					<view class="goods-item margin-bottom" v-for="(item, index) in goodsList" :key="index" @click="toDetail(item)">
+						<view class="goods-img">
+							<image :src="goodsImg(item.goods_image)" mode="widthFix" @error="imgError(index)"></image>
+							<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="name-wrap">
+								<view class="goods-name" :class="[{ 'using-hidden': config.nameLineMode == 'single' }, { 'multi-hidden': config.nameLineMode == 'multiple' }]">
+									
+									<block v-if="langstatus">
+										<block v-if="lang == 'en-us'">
+											{{ item.en_goods_name }}
+										</block>
+										<block v-else>
+											{{ item.goods_name }}
+										</block>
+									</block>
+									<block v-else>
+										{{ item.goods_name }}
+									</block>
+								</view>
+							</view>
+
+							<view class="lineheight-clear">
+								<view class="discount-price" v-if="item.isinformation == 0">
+									<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="discount-price" v-else>
+									<text class="price price-style large">{{langstatus?$lang('Make'):'咨询'}}</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"></image>
+								</view>
+								<view class="member-price-tag" v-else-if="item.promotion_type == 1">
+									<image :src="$util.img('public/uniapp/index/discount.png')" mode="widthFix"></image>
+								</view>
+							</view>
+							<view class="pro-info" v-if="item.isinformation == 0">
+								<view class="delete-price color-tip price-font" v-if="showMarketPrice(item)">
+									<text class="unit">{{ $lang('common.currencySymbol') }}</text>
+									<text>{{ showMarketPrice(item) }}</text>
+								</view>
+								<view class="block-wrap">
+									<view class="sale 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="goods-list double-column" :class="{ show: !isList }">
+					<view class="goods-item margin-bottom" v-for="(item, index) in goodsList" :key="index"
+						@click="toDetail(item)" :style="{ left: listPosition[index] ? listPosition[index].left : '', top: listPosition[index] ? listPosition[index].top : '' }">
+						<view class="goods-img">
+							<image :src="goodsImg(item.goods_image)" mode="widthFix" @error="imgError(index)"></image>
+							<view class="color-base-bg goods-tag" v-if="goodsTag(item) != ''">{{ goodsTag(item) }}</view>
+							<view class="sell-out" v-if="item.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" v-if="item.isinformation == 0">
+									<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="discount-price" v-else>
+									<text class="price price-style large">{{langstatus?$lang('Make'):'咨询'}}</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"></image>
+								</view>
+								<view class="member-price-tag" v-else-if="item.promotion_type == 1">
+									<image :src="$util.img('public/uniapp/index/discount.png')" mode="widthFix"></image>
+								</view>
+								<view class="delete-price 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"  v-if="item.isinformation == 0">
+								<view class="block-wrap" >
+									<view class="sale 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 v-if="goodsList.length == 0 && emptyShow"><ns-empty text="暂无商品"></ns-empty></view>
+			</block>
+		</mescroll-uni>
+
+		<ns-goods-sku-index ref="goodsSkuIndex" @addCart="addCart"></ns-goods-sku-index>
+
+		<!-- 筛选弹出框 -->
+		<uni-drawer :visible="showScreen" mode="right" @close="showScreen = false" class="screen-wrap">
+			<view class="title color-tip">筛选</view>
+			<scroll-view scroll-y>
+				<!-- 包邮 -->
+			<!-- 	<view class="item-wrap">
+					<view class="label"><text>是否包邮</text></view>
+					<view class="list">
+						<uni-tag :inverted="true" text="包邮" :type="isFreeShipping ? 'primary' : 'default'" @click="isFreeShipping = !isFreeShipping" />
+					</view>
+				</view> -->
+
+				<!-- 价格筛选项 -->
+			<!-- 	<view class="item-wrap">
+					<view class="label"><text>价格区间(元)</text></view>
+					<view class="price-wrap">
+						<input class="uni-input" type="digit" v-model="minPrice" placeholder="最低价" />
+						<view class="h-line"></view>
+						<input class="uni-input" type="digit" v-model="maxPrice" placeholder="最高价" />
+					</view>
+				</view> -->
+
+				<!-- 品牌筛选项 -->
+		<!-- 		<view class="item-wrap" v-if="brandList.length > 0">
+					<view class="label"><text>品牌</text></view>
+					<view class="list">
+						<view v-for="(item, index) in brandList" :key="index">
+							<uni-tag :inverted="true" :text="item.brand_name" :type="item.brand_id == brandId ? 'primary' : 'default'" @click="brandId == item.brand_id ? (brandId = 0) : (brandId = item.brand_id)" />
+						</view>
+					</view>
+				</view> -->
+
+				<!-- 分类筛选项 -->
+				<view class="category-list-wrap">
+					<text class="first">全部分类</text>
+					<view class="class-box">
+						<view @click="selectedCategory('')" class="list-wrap">
+							<text :class="{ selected: !categoryId, 'color-base-text': !categoryId }">全部</text>
+						</view>
+						<view @click="selectedCategory(item.category_id)" v-for="(item, index) in categoryList" :key="index" class="list-wrap">
+							<text :class="{ selected: item.category_id == categoryId, 'color-base-text': item.category_id == categoryId }">{{ item.category_name }}</text>
+						</view>
+					</view>
+				</view>
+			</scroll-view>
+			<view class="footer" :class="{ 'safe-area': isIphoneX }">
+				<button type="default" class="footer-box" @click="resetData">重置</button>
+				<button type="primary" class="footer-box1" @click="screenData">确定</button>
+			</view>
+		</uni-drawer>
+		<loading-cover ref="loadingCover"></loading-cover>
+
+		<!-- #ifdef MP-WEIXIN -->
+		<!-- 小程序隐私协议 -->
+		<privacy-popup ref="privacyPopup"></privacy-popup>
+		<!-- #endif -->
+	</view>
+</template>
+
+<script>
+	import uniDrawer from '@/components/uni-drawer/uni-drawer.vue';
+	import uniTag from '@/components/uni-tag/uni-tag.vue';
+	import nsGoodsSkuIndex from '@/components/ns-goods-sku/ns-goods-sku-index.vue';
+	import list from './public/js/list.js';
+
+	export default {
+		components: {
+			uniDrawer,
+			uniTag,
+			nsGoodsSkuIndex
+		},
+		data() {
+			return {};
+		},
+		mixins: [list]
+	};
+</script>
+
+<style lang="scss">
+	@import './public/css/list.scss';
+</style>
+<style scoped>
+	>>>.uni-tag--primary.uni-tag--inverted {
+		background-color: #f5f5f5 !important;
+	}
+
+	/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/goods/public/css/cart.scss b/pages/goods/public/css/cart.scss
new file mode 100644
index 0000000..514e550
--- /dev/null
+++ b/pages/goods/public/css/cart.scss
@@ -0,0 +1,647 @@
+.container {
+	width: 100vw;
+	height: 100vh;;
+	display: flex;
+	flex-direction: column;
+}
+.scroll-view {
+	flex: 1;
+	height: 0;
+	transform: translateX(0);
+}
+.cart-header {
+	padding: 20rpx 0;
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	line-height: 36rpx;
+	background: #f7f7f7;
+
+	.num-wrap {
+		margin-left: $margin-both;
+		color: #666666;
+		font-size: 26rpx;
+	}
+
+	.cart-action {
+		line-height: inherit;
+		margin-right: $margin-both;
+		color: #666666;
+		font-size: 26rpx;
+	}
+
+	&.invalid {
+		margin-left: $margin-both;
+		margin-top: $margin-updown;
+		flex: 1;
+		line-height: inherit;
+	}
+}
+
+.cart-wrap {
+	margin: 0 24rpx 24rpx;
+	border-radius: 16rpx;
+	overflow: hidden;
+
+	.fixed-wrap {
+		height: 116rpx;
+	}
+
+	.cart-goods {
+		background: #fff;
+		box-sizing: border-box;
+		position: relative;
+		padding: 30rpx 0 30rpx 30rpx;
+		&::after {
+			content: '';
+			position: absolute;
+			left: 20rpx;
+			right: 20rpx;
+			height: 2rpx;
+			bottom: 0;
+			background-color: #f2f2f2;
+		}
+		&:last-of-type::after {
+			height: 0;
+		}
+
+		.goods-wrap {
+			display: flex;
+			position: relative;
+			padding-left: 64rpx;
+			transition: all 0.1s;
+			& > .iconfont {
+				font-size: 40rpx;
+				position: absolute;
+				top: 50%;
+				left: 0;
+				transform: translateY(-50%);
+				transition: all 0.2s;
+			}
+			& > .icon-yuan_checkbox {
+				color: $color-disabled;
+			}
+
+			&.edit {
+				transform: translateX(-70rpx);
+				> .iconfont {
+					opacity: 0;
+				}
+			}
+
+			.goods-img {
+				width: 180rpx;
+				height: 180rpx;
+
+				image {
+					width: 100%;
+					height: 100%;
+					border-radius: 8rpx;
+				}
+			}
+
+			.goods-info {
+				flex: 1;
+				width: 0;
+				padding: 0 30rpx;
+				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;
+				}
+
+				.sku-wrap {
+					white-space: nowrap;
+					text-overflow: ellipsis;
+					overflow: hidden;
+					width: 100%;
+
+					.sku {
+						line-height: 1;
+						margin: 10rpx 0 18rpx 0;
+						display: inline-flex;
+						align-items: center;
+						background: #f4f4f4;
+						border-radius: 8rpx;
+						padding: 0 10rpx 0 20rpx;
+
+						.goods-spec {
+							color: #666666;
+							font-size: 24rpx;
+							white-space: nowrap;
+							overflow: hidden;
+							text-overflow: ellipsis;
+						}
+
+						.iconfont {
+							font-size: 28rpx;
+							padding-left: 10rpx;
+							color: #666666;
+						}
+					}
+				}
+
+				.goods-sub-section {
+					display: flex;
+					justify-content: space-between;
+					width: 100%;
+					align-items: center;
+
+					.unit {
+						font-size: $font-size-tag;
+						margin-right: 4rpx;
+					}
+
+					.goods-price {
+						display: flex;
+						flex-direction: row;
+						font-weight: bold;
+						color: var(--price-color);
+						.bottom-price {
+							width: 100%;
+							font-size: $font-size-toolbar;
+							line-height: 1;
+							color: var(--price-color);
+							image {
+								width: 56rpx;
+								height: 22rpx;
+								margin-left: 6rpx;
+							}
+						}
+					}
+
+					/deep/ .decrease {
+						width: 52rpx;
+						height: 52rpx;
+						line-height: 48rpx;
+						font-size: 40rpx;
+						border-radius: 10rpx 0px 0px 10rpx;
+					}
+					/deep/ input {
+						height: 52rpx;
+						line-height: 52rpx;
+					}
+					/deep/ .increase {
+						width: 52rpx;
+						height: 52rpx;
+						line-height: 48rpx;
+						font-size: 40rpx;
+						border-radius: 0px 10rpx 10rpx 0px;
+					}
+				}
+			}
+		}
+
+		.item-del {
+			position: absolute;
+			width: 0;
+			height: 99%;
+			color: #fff;
+			right: 0;
+			top: 0;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			transition: all 0.3s;
+			overflow: hidden;
+			white-space: nowrap;
+			font-size: $font-size-tag;
+			&.show {
+				width: 90rpx;
+			}
+		}
+		
+		&:first-child {
+			padding-top: 30rpx;
+		}
+		&:last-child {
+			.goods-info {
+				border-bottom: none;
+				padding-bottom: 0;
+			}
+		}
+
+		.discount-wrap {
+			line-height: 1.5;
+			font-size: 24rpx;
+			margin-top: 20rpx;
+			display: flex;
+
+			.discount-tag {
+				color: $base-color;
+				line-height: 1;
+				padding: 0 10rpx;
+				border-radius: $border-radius;
+				border: 1.5px solid $base-color;
+				margin-right: 10rpx;
+				white-space: nowrap;
+				line-height: 32rpx;
+				background: var(--main-color-shallow);
+			}
+			.interval {
+				height: 20rpx;
+				margin: 0 10rpx;
+				border-left: 2rpx solid #ddd;
+				white-space: nowrap;
+				margin-top: 10rpx;
+				&:last-child {
+					display: none;
+				}
+			}
+			.scroll-view {
+				flex: 1;
+				width: 0;
+				height: 100%;
+				white-space: nowrap;
+			}
+		}
+	}
+
+	.invalid-goods {
+		.invalid-mark {
+			color: $color-tip;
+			padding: 6rpx 16rpx;
+			display: inline-block;
+			font-size: $font-size-goods-tag;
+		}
+	}
+}
+
+.invalid .cart-header {
+	padding-top: 0;
+}
+.invalid .cart-header + .cart-goods {
+	padding-top: 30rpx;
+}
+
+.cart-bottom-block {
+    height: 100rpx;
+    margin-top: 20rpx;
+}
+.cart-bottom {
+	width: 100vw;
+	height: 100rpx;
+    position: fixed;
+    left: 0;
+    bottom: var(--tab-bar-height, 0);
+	background: #fff;
+	overflow: hidden;
+	display: flex;
+	z-index: 9;
+	.all-election {
+		height: 100rpx;
+		position: relative;
+		display: inline-block;
+
+		& > .iconfont {
+			font-size: 40rpx;
+			position: absolute;
+			top: 50%;
+			left: 30rpx;
+			transform: translateY(-50%);
+		}
+		& > .icon-yuan_checkbox {
+			color: $color-disabled;
+		}
+
+		& > text {
+			margin-left: 56rpx;
+			line-height: 100rpx;
+			padding-left: 30rpx;
+		}
+	}
+
+	.settlement-info {
+		flex: 1;
+		width: 0;
+		padding-right: 10rpx;
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		text-align: right;
+
+		.money {
+			line-height: 1;
+			font-size: 32rpx;
+
+			.value {
+				font-weight: bold;
+				color: var(--price-color);
+			}
+
+			.unit {
+				font-size: $font-size-tag;
+				margin-right: 4rpx;
+				color: var(--price-color);
+				font-weight: bold;
+			}
+		}
+		.detail {
+			line-height: 1;
+			font-size: 22rpx;
+			color: #666666;
+			margin-top: 10rpx;
+
+			.iconfont {
+				font-size: 28rpx;
+				margin-left: 6rpx;
+				transition: all 0.1s;
+				display: inline-block;
+				&.open {
+					transform: rotate(180deg);
+				}
+			}
+		}
+	}
+
+	.action-btn {
+		// width: 200rpx;
+		height: 100rpx;
+		line-height: 100rpx;
+		border-radius: 0;
+		margin: 0;
+		display: flex;
+		justify-content: flex-end;
+		align-items: center;
+		margin-right: 30rpx;
+		white-space: nowrap;
+
+		button {
+			padding: 0 30rpx;
+			height: 70rpx;
+			line-height: 70rpx;
+			font-size: $font-size-base;
+			font-weight: bold;
+			border-radius: 50rpx;
+			&.delete {
+				height: 50rpx;
+				line-height: 46rpx;
+			}
+		}
+	}
+}
+.cart-bottom.active {
+	bottom: calc(constant(safe-area-inset-bottom) + 110rpx) !important;
+	bottom: calc(env(safe-area-inset-bottom) + 110rpx) !important;
+}
+.cart-empty {
+	text-align: center;
+	padding: 140rpx $padding 80rpx $padding;
+
+	image {
+		width: 380rpx;
+	}
+
+	button {
+		min-width: 300rpx;
+		margin-top: 100rpx;
+		height: 70rpx;
+		line-height: 70rpx !important;
+		font-size: $font-size-base;
+		border-radius: 50rpx;
+		&.visit-the {
+			font-weight: bold;
+		}
+	}
+}
+
+.popup {
+	width: 100vw;
+	background: #fff;
+	border-top-left-radius: 24rpx;
+	border-top-right-radius: 24rpx;
+
+	.popup-header {
+		display: flex;
+		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 {
+	}
+}
+
+.discount-popup {
+	.popup-body {
+		min-height: 300rpx;
+	}
+
+	.detail-item {
+		height: 60rpx;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding: 0 30rpx;
+
+		.money {
+			font-weight: bold;
+		}
+
+		.reduce {
+			color: var(--price-color);
+		}
+	}
+
+	.total {
+		margin-top: 20rpx;
+
+		.title {
+			font-size: 36rpx;
+			font-weight: bold;
+		}
+	}
+}
+
+.coupon-use-tips {
+	padding: 30rpx;
+	line-height: 1;
+	background: #fff;
+	border-bottom: 2rpx solid #eee;
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+
+	& view {
+		line-height: 1;
+	}
+
+	.iconfont {
+		font-size: 28rpx;
+		margin-left: 4rpx;
+	}
+	.title {
+		font-size: 28rpx;
+		font-weight: 600;
+	}
+	.desc {
+		font-size: 26rpx;
+		margin-left: 24rpx;
+	}
+}
+
+.coupon-item {
+	margin: $margin-updown $margin-both;
+	border-radius: 4rpx;
+	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%;
+			background: linear-gradient(to left, var(--bg-color), var(--bg-color-shallow));
+			position: relative;
+			.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% - 400rpx);
+
+			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;
+			}
+		}
+
+		button {
+			font-size: $font-size-tag;
+			position: absolute;
+			top: 50%;
+			right: 20rpx;
+			transform: translate(0, -50%);
+			margin: 0;
+			height: 50rpx;
+			line-height: 50rpx;
+			width: 100rpx;
+			padding: 0;
+			&[disabled] {
+				background-color: #dedede !important;
+			}
+		}
+	}
+
+	&.disabled {
+		background-color: #f2f2f2;
+		.coupon-money {
+			color: $color-tip !important;
+		}
+		.at-least {
+			color: $color-tip !important;
+		}
+	}
+}
+
+.uni-popup-discount {
+    z-index: 5;
+}
+
+.store-wrap {
+	display: flex;
+	align-items: center;
+	background-color: #fff;
+	padding: 26rpx 30rpx 0;
+	font-weight: bold;
+	line-height: 1;
+
+	.name {
+		font-size: $font-size-base;
+		margin-left: 10rpx;
+	}
+}
\ No newline at end of file
diff --git a/pages/goods/public/css/detail.scss b/pages/goods/public/css/detail.scss
new file mode 100644
index 0000000..2161abc
--- /dev/null
+++ b/pages/goods/public/css/detail.scss
@@ -0,0 +1,585 @@
+// 优惠券弹出层
+.goods-coupon-popup-layer {
+	height: 800rpx;
+	.coupon-body {
+		position: absolute;
+		left: 0;
+		right: 0;
+		height: 65%;
+
+		.coupon-item {
+			margin: $margin-updown $margin-both;
+			border-radius: 4rpx;
+			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%;
+					background: linear-gradient(to left, var(--bg-color), var(--bg-color-shallow));
+					position: relative;
+					&.disabled {
+						background: #dedede;
+					}
+					.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% - 400rpx);
+					position: relative;
+
+					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 {
+						width: 100%;
+						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;
+					}
+				}
+
+				button {
+					font-size: $font-size-tag;
+					position: absolute;
+					top: 50%;
+					right: 20rpx;
+					transform: translate(0, -50%);
+					margin: 0;
+					height: 50rpx;
+					line-height: 50rpx;
+					width: 100rpx;
+					padding: 0;
+					&[disabled] {
+						background-color: #dedede !important;
+					}
+				}
+			}
+
+			&.disabled {
+				background-color: #f2f2f2;
+				.coupon-money {
+					color: $color-tip !important;
+				}
+				.at-least {
+					color: $color-tip !important;
+				}
+			}
+		}
+	}
+}
+
+// 满减
+.manjian-popup-layer {
+	height: 660rpx;
+	.free-tip {
+		min-width: 72rpx;
+		height: 36rpx;
+		line-height: 36rpx;
+		text-align: center;
+		border: none;
+		padding: 8rpx 8rpx;
+		border-radius: $border-radius;
+		margin-right: 20rpx;
+		font-size: $font-size-activity-tag;
+		display: inline-block;
+		font-weight: bold;
+		color: var(--main-color);
+		background-color: var(--main-color-shallow);
+	}
+	.manjian-body {
+		position: absolute;
+		left: 0;
+		right: 0;
+		height: 60%;
+		.item {
+			padding: $padding 0;
+			margin: 0 30rpx;
+			border-bottom: 1px solid $color-line;
+			.value {
+				margin-left: 20rpx;
+			}
+			&:last-child {
+				border-bottom: 0;
+			}
+		}
+	}
+}
+
+// 组合套餐
+.combo-goods-wrap {
+	display: flex;
+	// width: calc(100% - 40rpx);
+	white-space: nowrap;
+	align-items: center;
+	padding: 20rpx 0;
+
+	.goods-wrap {
+		display: flex;
+		align-items: center;
+
+		.goods-item {
+			width: 25%;
+			display: inline-block;
+			margin-right: 30rpx;
+			position: relative;
+			vertical-align: middle;
+			.combo-img {
+				height: 160rpx;
+				width: 160rpx;
+				overflow: hidden;
+				border-radius: $border-radius;
+				position: relative;
+
+				image {
+					width: 100%;
+					height: 100%;
+				}
+				.price-wrap {
+					position: absolute;
+					bottom: 0;
+					background: rgba(0, 0, 0, 0.4);
+					color: #fff;
+					left: 0;
+					width: 100%;
+					font-weight: bold;
+					.unit {
+						font-size: $font-size-tag;
+						margin-left: 10rpx;
+					}
+					.price {
+						font-size: $font-size-base;
+					}
+				}
+			}
+
+			.name {
+				display: block;
+				height: 40rpx;
+				line-height: 40rpx;
+				font-size: $font-size-tag;
+				margin-top: 10rpx;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				white-space: nowrap;
+			}
+		}
+	}
+}
+
+// 组合套餐
+.bundling-popup-layer {
+	height: 600rpx;
+	.bundling-body {
+		position: absolute;
+		left: 0;
+		right: 0;
+		height: 83%;
+		background-color: $color-bg;
+
+		.bundling-view {
+			margin: 20rpx 30rpx;
+			border-radius: $border-radius;
+
+			.bundling-item {
+				padding: $padding 30rpx;
+				background-color: #fff;
+				margin-bottom: 20rpx;
+				.title {
+					margin-bottom: 20rpx;
+					display: flex;
+					justify-content: space-between;
+					align-items: center;
+					.icon-right {
+						position: initial;
+					}
+				}
+				&:last-child {
+					margin-bottom: 0;
+				}
+				scroll-view {
+					width: 100%;
+					white-space: nowrap;
+					box-sizing: border-box;
+					.goods-wrap {
+						display: flex;
+						align-items: center;
+
+						.goods-item {
+							width: 25%;
+							display: inline-block;
+							margin-right: 30rpx;
+							position: relative;
+							vertical-align: middle;
+							.combo-img {
+								height: 160rpx;
+								width: 160rpx;
+								overflow: hidden;
+								border-radius: $border-radius;
+								position: relative;
+
+								image {
+									width: 100%;
+									height: 100%;
+								}
+								.price-wrap {
+									position: absolute;
+									bottom: 0;
+									background: rgba(0, 0, 0, 0.4);
+									color: #fff;
+									left: 0;
+									width: 100%;
+									font-weight: bold;
+									.unit {
+										font-size: $font-size-tag;
+										margin-left: 10rpx;
+									}
+									.price {
+										font-size: $font-size-base;
+									}
+								}
+							}
+
+							.name {
+								display: block;
+								height: 40rpx;
+								line-height: 40rpx;
+								font-size: $font-size-tag;
+								margin-top: 10rpx;
+								overflow: hidden;
+								text-overflow: ellipsis;
+								white-space: nowrap;
+							}
+						}
+					}
+				}
+				.bundling-price-wrap {
+					text-align: right;
+					margin-top: 20rpx;
+					.label {
+						font-size: $font-size-base;
+						vertical-align: middle;
+						margin-right: 20rpx;
+					}
+					.unit {
+						font-size: $font-size-tag;
+						vertical-align: middle;
+						margin-right: 4rpx;
+						font-weight: bold;
+					}
+					.price {
+						font-size: $font-size-toolbar;
+						vertical-align: middle;
+						font-weight: bold;
+						margin-right: 20rpx;
+					}
+					button {
+						vertical-align: middle;
+						background-color: var(--goods-btn-color);
+					}
+				}
+			}
+		}
+	}
+}
+
+.newdetail {
+	.item {
+		&.coupon {
+			.coupon-list {
+				flex: 1;
+				overflow: hidden;
+				line-height: 1;
+				height: 60rpx;
+				// line-height: 40rpx;
+				max-width: 84%;
+				box-sizing: border-box;
+			}
+			.coupon-item {
+				margin-top: 8rpx;
+				margin-bottom: 10rpx;
+				padding: 3rpx 16rpx;
+				margin-right: 20rpx;
+				position: relative;
+				border: 1.5px solid;
+				background-size: cover;
+				border-radius: 6rpx;
+				display: inline-block;
+				// height: 40rpx;
+				// line-height: 34rpx;
+				box-sizing: border-box;
+				// &:nth-child(2) {
+				// 	margin-left: 0;
+				// }
+				border-color: var(--goods-coupon);
+				&::after,
+				&::before {
+					content: '';
+					width: 12rpx;
+					height: 12rpx;
+					position: absolute;
+					top: 50%;
+					border-radius: $border-radius;
+					background: #fff;
+					border: 1px solid var(--goods-coupon) !important;
+				}
+				&::after {
+					left: -10rpx;
+					transform: translateY(-50%) rotate(-45deg);
+					border-top-color: transparent !important;
+					border-left-color: transparent !important;
+				}
+				&::before {
+					right: -10rpx;
+					transform: translateY(-50%) rotate(-45deg);
+					border-bottom-color: transparent !important;
+					border-right-color: transparent !important;
+				}
+				&:first-child {
+					margin-left: 0;
+				}
+				&:last-child {
+					margin-right: 0;
+				}
+				view {
+					overflow: hidden;
+					text-overflow: ellipsis;
+					white-space: nowrap;
+					font-size: 24rpx;
+					text-align: center;
+					line-height: 1.5;
+					// height: 36rpx;
+					// height: 36rpx;
+					// line-height: 34rpx;
+					color: var(--goods-coupon);
+					font-weight: bold;
+				}
+			}
+		}
+	}
+}
+
+.more-img-wrap {
+	width: 38rpx;
+	height: 38rpx;
+	position: absolute;
+	right: 30rpx;
+	image {
+		width: 100%;
+		height: 100%;
+	}
+}
+
+// 会员卡
+.member-card-wrap {
+	margin-top: 20rpx;
+	height: 80rpx;
+	border-radius: 10rpx;
+	background: linear-gradient(to right, var(--goods-card-bg), var(--goods-card-bg-shallow));
+	display: flex;
+	align-items: center;
+	padding: 0 20rpx;
+	color: var(--goods-card-color);
+
+	.icon-huiyuan {
+		margin-right: 10rpx;
+		line-height: 1;
+		font-size: 32rpx;
+	}
+
+	.info {
+		flex: 1;
+		color: #e5ce75;
+		font-size: $font-size-tag;
+	}
+
+	.btn {
+		text-align: center;
+		line-height: 50rpx;
+		height: 50rpx;
+		border-radius: 6rpx;
+		width: 160rpx;
+		font-size: $font-size-tag;
+		color: #222;
+		font-weight: bold;
+		background: var(--goods-card-color);
+	}
+}
+
+.goods-promotion {
+	background: var(--promotion-color);
+	height: 75px;
+	.price-info {
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: flex-start;
+		.icon-box {
+			margin-right: 20rpx;
+			.iconfont {
+				font-size: 60rpx;
+				color: #ffffff;
+			}
+		}
+		.price-box {
+			display: flex;
+			align-items: flex-start;
+			flex-direction: column;
+			height: 100%;
+			justify-content: center;
+			.promotion-text {
+				font-size: 36rpx;
+				color: #fff;
+				line-height: 1;
+			}
+			.sale-num {
+				display: flex;
+				align-items: center;
+				margin-top: 18rpx;
+				view {
+					color: #ffffff;
+					line-height: 1;
+				}
+			}
+		}
+	}
+}
+.countdown {
+	width: 220rpx;
+	background: var(--promotion-aux-color);
+	.txt {
+		color: #ffffff !important;
+		font-size: 28rpx !important;
+	}
+	.clockrun {
+		margin-top: 16rpx !important;
+	}
+	&:after {
+		position: absolute;
+		content: '';
+		top: calc(50% - 15rpx);
+		z-index: 5;
+		left: -15rpx;
+		width: 0;
+		height: 0;
+		border-style: solid;
+		border-width: 15rpx 15rpx 15rpx 0;
+		border-color: transparent var(--promotion-aux-color) transparent transparent;
+	}
+}
+
+.fenxiao-detail {
+	padding-top: 20rpx;
+
+	.title {
+		font-weight: 600;
+		font-size: $font-size-base;
+	}
+
+	.commission-ratio {
+		margin-top: 10rpx;
+		border-radius: $border-radius;
+
+		.item {
+			display: flex;
+			border-bottom: 2rpx solid $color-line;
+			height: 80rpx;
+			align-items: center;
+
+			&:last-child {
+				border-bottom: none;
+			}
+
+			view {
+				flex: 1;
+
+				&:first-child {
+					font-size: $font-size-base;
+				}
+
+				&:last-child {
+					text-align: right;
+					font-weight: bold;
+					.unit {
+						font-size: $font-size-tag;
+						margin-right: 4rpx;
+					}
+					.money {
+						font-size: $font-size-base;
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/pages/goods/public/css/list.scss b/pages/goods/public/css/list.scss
new file mode 100644
index 0000000..2e40653
--- /dev/null
+++ b/pages/goods/public/css/list.scss
@@ -0,0 +1,647 @@
+.head-wrap {
+	background: #fff;
+	position: fixed;
+	width: 100%;
+	left: 0;
+	z-index: 1;
+
+	.search-wrap {
+		flex: 0.5;
+		padding: 30rpx 30rpx 0;
+		font-size: $font-size-tag;
+		display: flex;
+		align-items: center;
+		.iconfont {
+			margin-left: 16rpx;
+			font-size: 36rpx;
+		}
+		.input-wrap {
+			flex: 1;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			background: $color-bg;
+			height: 64rpx;
+			padding-left: 10rpx;
+			border-radius: 70rpx;
+			input {
+				width: 90%;
+				background: $color-bg;
+				font-size: $font-size-tag;
+				height: 100%;
+				padding: 0 25rpx 0 40rpx;
+				line-height: 50rpx;
+				border-radius: 40rpx;
+			}
+			text {
+				font-size: $font-size-toolbar;
+				color: $color-tip;
+				width: 80rpx;
+				text-align: center;
+				margin-right: 20rpx;
+			}
+		}
+		.category-wrap,
+		.list-style {
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			.iconfont {
+				font-size: 50rpx;
+				color: $color-tip;
+			}
+			text {
+				display: block;
+				margin-top: 60rpx;
+			}
+		}
+	}
+
+	.sort-wrap {
+		display: flex;
+		padding: 10rpx 20rpx 10rpx 0;
+		> view {
+			flex: 1;
+			text-align: center;
+			font-size: $font-size-base;
+			height: 60rpx;
+			line-height: 60rpx;
+			font-weight: bold;
+		}
+		.comprehensive-wrap {
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			.iconfont-wrap {
+				display: inline-block;
+				margin-left: 10rpx;
+				width: 40rpx;
+				.iconfont {
+					font-size: $font-size-toolbar;
+					line-height: 1;
+					margin-bottom: 5rpx;
+				}
+			}
+		}
+		.price-wrap {
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			.iconfont-wrap {
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				flex-direction: column;
+				width: 40rpx;
+				.iconfont {
+					position: relative;
+					float: left;
+					font-size: 32rpx;
+					line-height: 1;
+					height: 20rpx;
+					color: #909399;
+					&.asc {
+						top: -2rpx;
+					}
+					&.desc {
+						top: -6rpx;
+					}
+				}
+			}
+		}
+		.screen-wrap {
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			.iconfont-wrap {
+				display: inline-block;
+				margin-left: 10rpx;
+				width: 40rpx;
+				.iconfont {
+					font-size: $font-size-toolbar;
+					line-height: 1;
+				}
+			}
+		}
+	}
+}
+
+.category-list-wrap {
+	height: 100%;
+	.class-box {
+		display: flex;
+		flex-wrap: wrap;
+		padding: 0 $padding;
+		view {
+			width: calc((100% - 60rpx) / 3);
+			font-size: $font-size-goods-tag;
+			margin-right: 20rpx;
+			height: 60rpx;
+			line-height: 60rpx;
+			text-align: center;
+			margin-bottom: 12rpx;
+			flex-shrink: 0;
+			overflow: hidden;
+			text-overflow: ellipsis;
+			white-space: nowrap;
+			background: rgba(245, 245, 245, 1);
+			border-radius: 5rpx;
+			&:nth-of-type(3n) {
+				margin-right: 0;
+			}
+		}
+	}
+	.first {
+		font-size: $font-size-tag;
+		display: block;
+		// background: $page-color-base;
+		padding: 20rpx;
+	}
+	.second {
+		border-bottom: 2rpx solid $color-line;
+		padding: 20rpx;
+		display: block;
+		font-size: $font-size-tag;
+	}
+	.third {
+		padding: 0 20rpx 20rpx;
+		overflow: hidden;
+		font-size: $font-size-tag;
+		> view {
+			display: inline-block;
+			margin-right: 20rpx;
+			margin-top: 20rpx;
+		}
+		.uni-tag {
+			padding: 0 20rpx;
+		}
+	}
+}
+
+.screen-wrap {
+	.title {
+		font-size: $font-size-tag;
+		padding: $padding;
+		background: #f6f4f5;
+	}
+	scroll-view {
+		height: 85%;
+		.item-wrap {
+			border-bottom: 1px solid #f0f0f0;
+			.label {
+				font-size: $font-size-tag;
+				padding: $padding;
+				view {
+					display: inline-block;
+					font-size: 60rpx;
+					height: 40rpx;
+					vertical-align: middle;
+					line-height: 40rpx;
+				}
+			}
+
+			.list {
+				margin: $margin-updown $margin-both;
+				overflow: hidden;
+				> view {
+					display: inline-block;
+					margin-right: 25rpx;
+					margin-bottom: 25rpx;
+				}
+				.uni-tag {
+					padding: 0 $padding;
+					font-size: $font-size-goods-tag;
+					background: #f5f5f5;
+					height: 52rpx;
+					line-height: 52rpx;
+					border: 0;
+				}
+			}
+			.price-wrap {
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				padding: $padding;
+				input {
+					flex: 1;
+					background: #f5f5f5;
+					height: 52rpx;
+					width: 182rpx;
+					line-height: 50rpx;
+					font-size: $font-size-goods-tag;
+					border-radius: 50rpx;
+					text-align: center;
+					&:first-child {
+						margin-right: 10rpx;
+					}
+					&:last-child {
+						margin-left: 10rpx;
+					}
+				}
+			}
+		}
+	}
+	.footer {
+		height: 90rpx;
+		display: flex;
+		justify-content: center;
+		align-items: flex-start;
+		display: flex;
+		//position: absolute;
+		bottom: 0;
+		width: 100%;
+		.footer-box {
+			border-top-right-radius: 0;
+			border-bottom-right-radius: 0;
+			margin: 0;
+			width: 40%;
+		}
+		.footer-box1 {
+			border-top-left-radius: 0;
+			border-bottom-left-radius: 0;
+			margin: 0;
+			width: 40%;
+		}
+	}
+}
+.safe-area {
+	bottom: 68rpx !important;
+}
+.empty {
+	margin-top: 100rpx;
+}
+.buy-num {
+	font-size: $font-size-activity-tag;
+}
+.icon {
+	width: 34rpx;
+	height: 30rpx;
+}
+.list-style-new {
+	display: flex;
+	align-items: center;
+	.line {
+		width: 4rpx;
+		height: 28rpx;
+		background-color: rgba(227, 227, 227, 1);
+		margin-right: 60rpx;
+	}
+}
+.h-line {
+	width: 37rpx;
+	height: 2rpx;
+	background-color: $color-tip;
+}
+
+.lineheight-clear {
+}
+
+// 商品列表单列样式
+.goods-list.single-column {
+	display: none;
+
+	&.show {
+		display: block;
+	}
+
+	.goods-item {
+		padding: 26rpx;
+		background: #fff;
+		margin: $margin-updown $margin-both;
+		border-radius: $border-radius;
+		display: flex;
+		position: relative;
+
+		.goods-img {
+			position: relative;
+			width: 200rpx;
+			height: 200rpx;
+			// overflow: hidden;
+			border-radius: $border-radius;
+			margin-right: 20rpx;
+			overflow: hidden;
+
+			image {
+				width: 200rpx;
+				height: 200rpx;
+			}
+		}
+
+		.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: 0;
+			left: 0;
+			font-size: $font-size-goods-tag;
+		}
+
+		.goods-tag-img {
+			position: absolute;
+			border-top-left-radius: $border-radius;
+			width: 80rpx;
+			height: 80rpx;
+			top: 26rpx;
+			left: 26rpx;
+			z-index: 5;
+			overflow: hidden;
+
+			image {
+				width: 100%;
+				height: 100%;
+			}
+		}
+
+		.info-wrap {
+			flex: 1;
+			display: flex;
+			flex-direction: column;
+		}
+
+		.name-wrap {
+			flex: 1;
+		}
+
+		.goods-name {
+			font-size: $font-size-base;
+			line-height: 1.3;
+			overflow: hidden;
+			text-overflow: ellipsis;
+			display: -webkit-box;
+			-webkit-line-clamp: 2;
+			-webkit-box-orient: vertical;
+		}
+
+		.introduction {
+			line-height: 1;
+			margin-top: 10rpx;
+		}
+
+		.discount-price {
+			display: inline-block;
+			font-weight: bold;
+			line-height: 1;
+			margin-top: 16rpx;
+
+			.unit {
+				margin-right: 6rpx;
+				color: var(--price-color);
+			}
+			.price {
+				color: var(--price-color);
+			}
+		}
+
+		.pro-info {
+			display: flex;
+			margin-top: auto;
+			align-items: center;
+			position: relative;
+
+			.delete-price {
+				text-decoration: line-through;
+				font-size: $font-size-tag !important;
+				flex: 1;
+
+				.unit {
+					margin-right: 0;
+				}
+			}
+			.block-wrap {
+				flex: 1;
+				line-height: 1;
+				margin-right: 20rpx;
+				.sale {
+					font-size: $font-size-tag !important;
+				}
+			}
+		}
+
+		.member-price-tag {
+			display: inline-block;
+			width: 60rpx;
+			line-height: 1;
+			margin-left: 6rpx;
+
+			image {
+				width: 100%;
+				display: flex;
+				max-height: 30rpx;
+			}
+		}
+		.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: 150rpx;
+			}
+		}
+	}
+}
+// 商品列表双列样式
+.goods-list.double-column {
+	display: none;
+	margin: 0 24rpx;
+	padding-top: $margin-updown;
+	position: relative;
+	flex-wrap: wrap;
+	justify-content: space-between;
+
+	&.show {
+		display: flex;
+	}
+
+	.goods-item {
+		display: flex;
+		flex-direction: column;
+		width: calc(50% - 10rpx);
+		border-radius: $border-radius;
+		overflow: hidden;
+		background-color: #fff;
+
+		&:nth-child(2n + 2) {
+			margin-right: 0;
+		}
+
+		.goods-img {
+			position: relative;
+			overflow: hidden;
+			padding-top: 100%;
+			border-top-left-radius: $border-radius;
+			border-top-right-radius: $border-radius;
+
+			image {
+				width: 100%;
+				position: absolute !important;
+				top: 50%;
+				left: 0;
+				transform: translateY(-50%);
+			}
+		}
+
+		.goods-tag {
+			color: #fff;
+			line-height: 1;
+			padding: 8rpx 16rpx;
+			position: absolute;
+			border-bottom-right-radius: $border-radius;
+			top: 0;
+			left: 0;
+			font-size: $font-size-goods-tag;
+		}
+
+		.goods-tag-img {
+			position: absolute;
+			border-top-left-radius: $border-radius;
+			width: 80rpx;
+			height: 80rpx;
+			top: 0;
+			left: 0;
+			z-index: 5;
+			overflow: hidden;
+
+			image {
+				width: 100%;
+				height: 100%;
+			}
+		}
+
+		.info-wrap {
+			padding: 20rpx;
+			display: flex;
+			flex-direction: column;
+			flex: 1;
+		}
+
+		.goods-name {
+			font-size: $font-size-base;
+			line-height: 1.3;
+			margin-top: 20rpx;
+		}
+
+		.lineheight-clear {
+			margin-top: 16rpx;
+		}
+
+		.discount-price {
+			display: inline-block;
+			font-weight: bold;
+			line-height: 1;
+
+			.unit {
+				margin-right: 6rpx;
+				color: var(--price-color);
+			}
+			.price {
+				color: var(--price-color);
+			}
+		}
+
+		.pro-info {
+			display: flex;
+			margin-top: auto;
+			align-items: center;
+
+			.block-wrap {
+				flex: 1;
+				line-height: 1;
+				margin-right: 20rpx;
+				.sale {
+					font-size: $font-size-tag !important;
+				}
+			}
+		}
+
+		.delete-price {
+			// display: inline-block;
+			// margin-left: 6rpx;
+			// float: right;
+			.unit {
+				margin-right: 6rpx;
+			}
+			text {
+				line-height: 1;
+				font-size: $font-size-tag !important;
+			}
+		}
+
+		.member-price-tag {
+			display: inline-block;
+			width: 60rpx;
+			line-height: 1;
+			margin-left: 6rpx;
+
+			image {
+				width: 100%;
+			}
+		}
+		.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: 250rpx;
+			}
+		}
+	}
+}
+
+.cart-action-wrap {
+	position: relative;
+
+	.shopping-cart-btn {
+		font-size: 36rpx;
+		border: 2rpx solid $base-color;
+		border-radius: 50%;
+		padding: 10rpx;
+		color: $base-color;
+		width: 36rpx;
+		height: 36rpx;
+		text-align: center;
+		line-height: 36rpx;
+	}
+
+	.plus-sign-btn {
+		font-size: 36rpx;
+		border: 2rpx solid $base-color;
+		border-radius: 50%;
+		padding: 10rpx;
+		color: $base-color;
+		width: 36rpx;
+		height: 36rpx;
+		text-align: center;
+		line-height: 36rpx;
+	}
+
+	.buy-btn {
+		background-color: $base-color;
+		color: var(--btn-text-color);
+		border-radius: 50rpx;
+		font-size: $font-size-tag;
+		padding: 12rpx 30rpx;
+		line-height: 1;
+	}
+	.icon-diy {
+		font-size: 80rpx;
+	}
+}
diff --git a/pages/goods/public/js/cart.js b/pages/goods/public/js/cart.js
new file mode 100644
index 0000000..a9fbaf2
--- /dev/null
+++ b/pages/goods/public/js/cart.js
@@ -0,0 +1,599 @@
+export default {
+	data() {
+		return {
+			cartData: [], // 购物车
+			checkAll: true,
+			totalPrice: '0.00',
+			totalCount: 0,
+			isSub: false,
+			invalidGoods: [], // 失效商品集合
+			isIphoneX: false, //判断手机是否是iphoneX以上,
+			isAction: false, // 是否操作删除
+			goodsSkuDetail: null,
+			discount: {},
+			manjian: {},
+			receiveSub: false,
+			discountPopupShow: false,
+			startX: '', // 触摸开始位置
+			endX: '', // 触摸结束位置
+			refresherTriggered: false, // 设置当前下拉刷新状态，true 表示下拉刷新已经被触发，false 表示下拉刷新未被触发
+			timeout: {}
+		};
+	},
+	onLoad() {
+		uni.hideTabBar();
+		this.isIphoneX = this.$util.uniappIsIPhoneX();
+	},
+	onShow() {
+		if (this.storeToken) {
+			this.getCartData();
+		} else {
+			this.cartData = [];
+			this.invalidGoods = [];
+			this.calculationTotalPrice();
+		}
+	},
+	onHide() {
+		this.isAction = false;
+	},
+	onUnload() {
+		if (!this.storeToken && this.$refs.login) this.$refs.login.cancelCompleteInfo();
+	},
+	onReady() {
+		if (!this.storeToken) {
+			if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+		}
+	},
+	computed: {
+		hasData() {
+			return this.cartData.length > 0 || this.invalidGoods.length > 0;
+		}
+	},
+	methods: {
+		initNum(item) {
+			let max_buy = item.max_buy > 0 && item.max_buy < item.stock ? item.max_buy : item.stock;
+			max_buy = max_buy == 0 ? 1 : max_buy;
+			if (item.num > max_buy) return max_buy;
+			return item.num;
+		},
+		/**
+		 * 获取购物车数据
+		 */
+		getCartData() {
+			this.$api.sendRequest({
+				url: '/api/cart/goodslists',
+				success: res => {
+					if (res.code >= 0) {
+						if (res.data.length) this.handleCartData(res.data);
+						else this.cartData = [];
+					}
+					this.refresherTriggered = false;
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				},
+				fail: res => {
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				}
+			});
+		},
+		/**
+		 * 处理购物车数据结构
+		 */
+		handleCartData(data) {
+			this.invalidGoods = [];
+			this.cartData = [];
+			var temp = {};
+			data.forEach((item, index) => {
+				if (item.goods_state == 1) {
+					if (item.store_goods_status != undefined && item.store_goods_status != 1) {
+						this.invalidGoods.push(item);
+					} else if (item.min_buy > 0 && item.min_buy > item.stock) {
+						// 如果最小限购超出库存则该商品失效
+						this.invalidGoods.push(item);
+					} else {
+						item.checked = true;
+						item.edit = false;
+						if (temp['site_' + item.site_id] != undefined) {
+							temp['site_' + item.site_id].cartList.push(item);
+						} else {
+							temp['site_' + item.site_id] = {
+								siteId: item.site_id,
+								siteName: item.site_name,
+								edit: false,
+								checked: true,
+								cartList: [item]
+							};
+						}
+					}
+				} else {
+					this.invalidGoods.push(item);
+				}
+			});
+
+			this.cartData = [];
+			Object.keys(temp).forEach(key => {
+				this.cartData.push(temp[key]);
+			});
+			this.calculationTotalPrice();
+			if (this.cartData.length) {
+				this.cartData[0].cartList.forEach(v => {
+					if (v.sku_spec_format) {
+						v.sku_spec_format = JSON.parse(v.sku_spec_format);
+					} else {
+						v.sku_spec_format = [];
+					}
+				});
+			}
+			if (this.invalidGoods.length) {
+				this.invalidGoods.forEach(v => {
+					if (v.sku_spec_format) {
+						v.sku_spec_format = JSON.parse(v.sku_spec_format);
+					} else {
+						v.sku_spec_format = [];
+					}
+				});
+			}
+		},
+		/**
+		 * 单选
+		 * @param siteIndex
+		 * @param index
+		 */
+		singleElection(siteIndex, index) {
+			this.cartData[siteIndex].cartList[index].checked = !this.cartData[siteIndex].cartList[index].checked;
+			this.calculationTotalPrice();
+		},
+		/**
+		 * 店铺全选
+		 * @param checked
+		 * @param index
+		 */
+		siteAllElection(checked, index) {
+			this.cartData[index].checked = checked;
+			this.cartData[index].cartList.forEach(item => {
+				item.checked = checked;
+			});
+			this.calculationTotalPrice();
+		},
+		/**
+		 * 全选
+		 */
+		allElection(checked) {
+			if (typeof checked == 'boolean') {
+				this.checkAll = checked;
+			} else {
+				this.checkAll = !this.checkAll;
+			}
+			if (this.cartData.length) {
+				this.cartData.forEach(siteItem => {
+					siteItem.checked = this.checkAll;
+					siteItem.cartList.forEach(item => {
+						item.checked = this.checkAll;
+					});
+				});
+			}
+			this.calculationTotalPrice();
+		},
+		/**
+		 * 计算购物车总价
+		 */
+		calculationTotalPrice() {
+			if (this.cartData.length) {
+				let totalPrice = 0,
+					totalCount = 0,
+					siteAllElectionCount = 0;
+
+				this.cartData.forEach(siteItem => {
+					let siteGoodsCount = 0;
+					siteItem.cartList.forEach(item => {
+						if (item.checked) {
+							siteGoodsCount += 1;
+							totalCount += parseInt(item.num);
+							if (Number(item.member_price) > 0 && Number(item.member_price) < Number(item.discount_price)) {
+								totalPrice += item.member_price * item.num;
+							} else {
+								totalPrice += item.discount_price * item.num;
+							}
+						}
+					});
+					if (siteItem.cartList.length == siteGoodsCount) {
+						siteItem.checked = true;
+						siteAllElectionCount += 1;
+					} else {
+						siteItem.checked = false;
+					}
+				});
+				this.totalPrice = totalPrice.toFixed(2);
+				this.totalCount = totalCount;
+				this.checkAll = this.cartData.length == siteAllElectionCount;
+			} else {
+				this.totalPrice = '0.00';
+				this.totalCount = 0;
+			}
+			this.discountCalculate();
+		},
+		/**
+		 * 删除购物车
+		 * @param tag
+		 * @param siteIndex
+		 * @param cartIndex
+		 */
+		deleteCart(tag, siteIndex, cartIndex) {
+			var cart_id = [];
+			if (tag == 'all') {
+				for (let i = 0; i < this.cartData.length; i++) {
+					for (let j = 0; j < this.cartData[i].cartList.length; j++) {
+						if (this.cartData[i].cartList[j].checked) cart_id.push(this.cartData[i].cartList[j].cart_id);
+					}
+				}
+			} else {
+				cart_id.push(this.cartData[siteIndex].cartList[cartIndex].cart_id);
+			}
+			if (cart_id.length == 0) {
+				this.$util.showToast({
+					title: '请选择要删除的商品'
+				});
+				return;
+			}
+
+			uni.showModal({
+				title: '提示',
+				content: cart_id.length > 1 ? '确定要删除这些商品吗？' : '确定要删除该商品吗？',
+				success: res => {
+					if (res.confirm) {
+						cart_id = cart_id.toString();
+
+						this.$api.sendRequest({
+							url: '/api/cart/delete',
+							data: {
+								cart_id
+							},
+							success: res => {
+								if (res.code >= 0) {
+
+									if (tag == 'all') {
+										// 全选
+										for (var i = 0; i < this.cartData.length; i++) {
+											for (var j = 0; j < this.cartData[i].cartList.length; j++) {
+												var item = this.cartData[i].cartList[j];
+												if (item.checked) {
+													this.cartData[i].cartList.splice(j, 1);
+													j = -1;
+												}
+											}
+											if (this.cartData[i].cartList.length == 0) {
+												this.cartData.splice(i, 1);
+												i = -1;
+											}
+										}
+
+										this.$store.dispatch('emptyCart');
+									} else {
+										let item = this.cartData[siteIndex].cartList;
+										let goods_id = item[cartIndex].goods_id;
+										let sku_id = item[cartIndex].sku_id;
+
+										delete this.cartList['goods_' + goods_id]['sku_' + sku_id];
+										if (Object.keys(this.cartList['goods_' + goods_id]).length == 2) {
+											delete this.cartList['goods_' + goods_id];
+										}
+										this.$store.dispatch('cartCalculate');
+
+										item.splice(cartIndex, 1);
+										if (item.length == 0) this.cartData.splice(siteIndex, 1);
+
+									}
+
+									this.resetEditStatus();
+									this.calculationTotalPrice();
+								} else {
+									this.$util.showToast({
+										title: res.message
+									});
+								}
+							}
+						});
+					}
+				}
+			});
+		},
+		/**
+		 * 变更购物车数量
+		 * @param {Object} params
+		 */
+		cartNumChange(num, params) {
+			if (isNaN(num)) return;
+			let data = this.cartData[params.siteIndex].cartList[params.cartIndex],
+				max_buy = data.is_limit && data.max_buy > 0 && data.max_buy < data.stock ? data.max_buy : data.stock,
+				min_buy = data.min_buy > 0 ? data.min_buy : 1;
+			if (num > max_buy) num = max_buy;
+			if (num < min_buy) num = min_buy;
+
+			let cartId = this.cartData[params.siteIndex].cartList[params.cartIndex].cart_id
+
+			if (this.timeout[cartId]) clearTimeout(this.timeout[cartId])
+
+			this.timeout[cartId] = setTimeout(() => {
+				this.$api.sendRequest({
+					url: '/api/cart/edit',
+					data: {
+						num,
+						cart_id: cartId
+					},
+					success: res => {
+						if (res.code >= 0) {
+							let item = this.cartData[params.siteIndex].cartList[params.cartIndex];
+							let goods_id = item.goods_id;
+							let sku_id = item.sku_id;
+							item.num = num;
+
+							this.cartList['goods_' + goods_id]['sku_' + sku_id].num = num;
+							this.$store.dispatch('cartCalculate');
+							this.resetEditStatus();
+
+							this.calculationTotalPrice();
+						} else {
+							this.$util.showToast({
+								title: res.message
+							});
+						}
+					}
+				});
+			}, 800)
+		},
+		/**
+		 * 结算
+		 */
+		settlement() {
+			if (this.totalCount > 0) {
+				let cart_ids = [];
+				this.cartData.forEach(siteItem => {
+					siteItem.cartList.forEach(item => {
+						if (item.checked) {
+							cart_ids.push(item.cart_id);
+						}
+					});
+				});
+
+				if (this.discount.coupon_info && this.discount.coupon_info.receive_type == 'wait') this.receiveCoupon(
+					this.discount.coupon_info.coupon_type_id, false);
+
+				if (this.isSub) return;
+				this.isSub = true;
+
+				uni.removeStorageSync('delivery');
+				uni.setStorage({
+					key: 'orderCreateData',
+					data: {
+						cart_ids: cart_ids.toString()
+					},
+					success: () => {
+						this.$util.redirectTo('/pages/order/payment');
+						this.isSub = false;
+					}
+				});
+			}
+		},
+		/**
+		 * 清空失效商品
+		 */
+		clearInvalidGoods() {
+			uni.showModal({
+				title: '提示',
+				content: '确定要清空这些商品吗？',
+				success: res => {
+					if (res.confirm) {
+						var cart_ids = [];
+						this.invalidGoods.forEach(goodsItem => {
+							cart_ids.push(goodsItem.cart_id);
+						});
+						if (cart_ids.length) {
+							this.$api.sendRequest({
+								url: '/api/cart/delete',
+								data: {
+									cart_id: cart_ids.toString()
+								},
+								success: res => {
+									if (res.code >= 0) {
+										this.invalidGoods = [];
+										this.refreshCartNumber();
+									} else {
+										this.$util.showToast({
+											title: res.message
+										});
+									}
+								}
+							});
+						}
+					}
+				}
+			});
+		},
+		imageError(siteIndex, cartIndex) {
+			this.cartData[siteIndex].cartList[cartIndex].sku_image = this.$util.getDefaultImage().goods;
+			this.$forceUpdate();
+		},
+		toGoodsDetail(item) {
+			this.$util.redirectTo('/pages/goods/detail', {
+				sku_id: item.sku_id
+			});
+		},
+		// 购物车数量
+		refreshCartNumber() {
+			if (this.storeToken) {
+				this.$store.dispatch('getCartNumber');
+				this.resetEditStatus();
+			}
+		},
+		goodsLimit(event, params) {
+			let data = this.cartData[params.siteIndex].cartList[params.cartIndex];
+			if (event.type == 'plus') {
+				if (data.max_buy > 0 && data.max_buy < data.stock) {
+					this.$util.showToast({
+						title: '该商品每人限购' + data.max_buy + '件'
+					});
+				} else {
+					this.$util.showToast({
+						title: '库存不足'
+					});
+				}
+			} else {
+				// 数量减至最少时，则删除商品
+				this.deleteCart('single', params.siteIndex, params.cartIndex);
+				// this.$util.showToast({
+				//     title: '最少购买' + event.value + '件'
+				// });
+			}
+		},
+		toLogin() {
+			this.$refs.login.open();
+		},
+		// 重置编辑状态
+		resetEditStatus() {
+			if (this.cartData.length) {
+				for (var i = 0; i < this.cartData[0].cartList.length; i++) {
+					this.cartData[0].cartList[i].edit = false;
+				}
+				this.$forceUpdate();
+			}
+		},
+		changeAction() {
+			this.isAction = !this.isAction;
+			this.resetEditStatus();
+		},
+		selectSku(data) {
+			let goodsSkuDetail = this.$util.deepClone(data);
+			if (goodsSkuDetail.goods_spec_format) goodsSkuDetail.goods_spec_format = JSON.parse(goodsSkuDetail.goods_spec_format);
+			this.goodsSkuDetail = goodsSkuDetail;
+
+			this.$nextTick(() => {
+				this.$refs.selectSku.show('confirm', (sku_id, num) => {
+					this.$api.sendRequest({
+						url: '/api/cart/editcartsku',
+						data: {
+							cart_id: data.cart_id,
+							sku_id: sku_id,
+							num: num
+						},
+						success: res => {
+							if (res.code >= 0) {
+								this.invalidGoods = [];
+								this.getCartData();
+								this.refreshCartNumber();
+							} else {
+								this.$util.showToast({
+									title: res.message
+								});
+							}
+						}
+					});
+				}, this.goodsSkuDetail);
+			})
+		},
+		toggleDiscountPopup() {
+			if (this.$refs.discountPopup.showPopup) this.$refs.discountPopup.close();
+			else this.$refs.discountPopup.open();
+			this.discountPopupShow = !this.discountPopupShow;
+		},
+		/**
+		 * 优惠信息计算
+		 */
+		discountCalculate() {
+			if (this.cartData.length == 0) return;
+			let skuIds = [];
+			this.cartData.forEach(siteItem => {
+				siteItem.cartList.forEach(item => {
+					if (item.checked) {
+						skuIds.push({
+							sku_id: item.sku_id,
+							num: item.num
+						});
+					}
+				});
+			});
+			if (skuIds.length == 0) {
+				this.discount = {};
+				return;
+			}
+
+			this.$api.sendRequest({
+				url: '/api/cartcalculate/calculate',
+				data: {
+					sku_ids: JSON.stringify(skuIds)
+				},
+				success: res => {
+					if (res.code >= 0 && res.data && (res.data.coupon_money > 0 || res.data.promotion_money > 0)) {
+						this.discount = res.data;
+						let manjian = {};
+						res.data.goods_list.forEach(item => {
+							if (item.promotion && item.promotion.manjian) {
+								manjian['sku_' + item.sku_id] = JSON.parse(item.promotion.manjian.rule_json);
+							}
+						})
+						Object.assign(this.manjian, manjian);
+						this.refresherTriggered = false;
+					} else {
+						this.discount = {};
+					}
+				}
+			})
+		},
+		/**
+		 * 领取优惠券
+		 * tips 失败时是否提示
+		 * @param {Object} couponTypeId
+		 */
+		receiveCoupon(couponTypeId, tips = true) {
+			if (this.receiveSub) return;
+			this.receiveSub = true;
+			this.$api.sendRequest({
+				url: '/coupon/api/coupon/receive',
+				data: {
+					coupon_type_id: couponTypeId,
+					get_type: 2 //获取方式:1订单2.直接领取3.活动领取
+				},
+				success: res => {
+					if (res.code == 0) {
+						this.$set(this.discount.coupon_info, 'receive_type', '');
+					} else {
+						if (tips) this.$util.showToast({
+							title: res.message
+						});
+						this.receiveSub = false;
+					}
+				}
+			});
+		},
+		// 手指触摸事件 用于菜单左滑
+		touchS(e) {
+			this.startX = e.touches[0].clientX;
+			// console.log('开始' + e.touches[0].clientX);
+		},
+		touchE(e, cartIndex) {
+			this.endX = e.changedTouches[0].clientX;
+			// 触摸开始到停止的差值，小于0左滑，大于0右滑
+			var disX = this.startX - this.endX;
+			// cartIndex.edit = disX > 50;
+			if (disX > 50) cartIndex.edit = true;
+			else if (disX < 0) cartIndex.edit = false;
+			this.$forceUpdate();
+		},
+		moneyFormat(money) {
+			if (isNaN(parseFloat(money))) return money;
+			return parseFloat(money).toFixed(2);
+		},
+		refreshSkuDetail(goodsSkuDetail) {
+			this.goodsSkuDetail = goodsSkuDetail;
+		},
+		onRefresh(e) {
+			this.refresherTriggered = true;
+			if (this.storeToken) {
+				this.getCartData();
+				this.refreshCartNumber();
+			} else {
+				this.cartData = [];
+				this.invalidGoods = [];
+				this.calculationTotalPrice();
+			}
+		}
+	},
+}
\ No newline at end of file
diff --git a/pages/goods/public/js/detail.js b/pages/goods/public/js/detail.js
new file mode 100644
index 0000000..f010ccb
--- /dev/null
+++ b/pages/goods/public/js/detail.js
@@ -0,0 +1,525 @@
+export default {
+	data() {
+		return {
+			goodsRoute: '/pages/goods/detail',
+			couponList: [], //优惠券列表
+			couponBtnSwitch: false, //获取优惠券防止重复提交
+			
+			posterApi: '/api/goods/poster',
+
+			//满减活动
+			manjian: {
+				type: 0,
+				manjian_name: "",
+				rule_json: null
+			},
+			//组合套餐
+			bundlingType: false,
+			bundling: [{
+				bundling_goods: {
+					bl_name: '',
+					sku_image: ''
+				}
+			}],
+
+			membercard: null, // 会员卡信息
+			hackReset: true,
+			cardOff: false,
+			informationform:[]//留言表单
+			
+		}
+	},
+	computed: {
+		showDiscount() {
+			var flag = false;
+			if (
+				this.preview == 0 &&
+				this.addonIsExist.discount &&
+				this.goodsSkuDetail.promotion_type == 1 &&
+				this.goodsSkuDetail.discountTimeMachine &&
+				(!this.goodsSkuDetail.member_price || (this.goodsSkuDetail.member_price > 0 && Number(this.goodsSkuDetail.member_price) > Number(this.goodsSkuDetail.discount_price))
+				)
+			) {
+				flag = true;
+			}
+			return flag;
+		},
+		memberCardDiscount() {
+			let discount = 0,
+				showPrice = this.goodsSkuDetail.member_price > 0 && Number(this.goodsSkuDetail.member_price) < Number(this.goodsSkuDetail.discount_price) ? this.goodsSkuDetail.member_price : this.goodsSkuDetail.discount_price;
+			if (this.membercard && this.membercard.member_price > 0 && (parseFloat(showPrice) > parseFloat(this.membercard.member_price))) {
+				discount = parseFloat(showPrice) - parseFloat(this.membercard.member_price);
+			}
+			return discount.toFixed(2);
+		},
+		//表单高度
+		FormHeight(){
+			let height = 48;
+			if (this.goodsForm && this.goodsForm.length) {
+				height += this.goodsForm.length * 5;
+			}
+			height += 'vh';
+			return height;
+		}
+	},
+	onLoad(data) {
+		
+		// #ifdef MP-ALIPAY
+		let options = my.getLaunchOptionsSync();
+		options.query && Object.assign(data, options.query)
+		// #endif
+
+		this.skuId = data.sku_id || 0;
+		this.goodsId = data.goods_id || 0;
+
+		// 小程序扫码进入
+		if (data.scene) {
+			var sceneParams = decodeURIComponent(data.scene);
+			sceneParams = sceneParams.split('&');
+			if (sceneParams.length) {
+				sceneParams.forEach(item => {
+					if (item.indexOf('goods_id') != -1) this.goodsId = item.split('-')[1];
+				});
+			}
+		}
+
+		// #ifdef MP-WEIXIN
+		this.getShareImg();
+		// #endif
+	},
+	async onShow() {
+		//同步获取商品详情
+		await this.getGoodsSkuDetail();
+	},
+	onHide() {
+		this.couponBtnSwitch = false;
+	},
+	methods: {
+		//拨打电话
+		phoneClick(mobile){
+		  uni.makePhoneCall({
+			phoneNumber: mobile+'',
+			success(){},
+			fail(){}
+		  })
+		},
+		setSkuId(val) {
+			if (val) {
+				this.skuId = val;
+				this.getBundling();
+			}
+		},
+		// 获取商品详情
+		async getGoodsSkuDetail() {
+			let res = await this.$api.sendRequest({
+				url: '/api/goodssku/detail',
+				async: false,
+				data: {
+					sku_id: this.skuId,
+					goods_id: this.goodsId,
+				}
+			});
+			let data = res.data;
+			if (data.goods_sku_detail != null) {
+				if (data.goods_sku_detail.promotion_type == 'presale' && data.goods_sku_detail.presale_id) {
+					this.$util.redirectTo('/pages_promotion/presale/detail', {
+						id: data.goods_sku_detail.presale_id,
+						sku_id: this.skuId
+					}, 'reLaunch');
+					return;
+				}
+				if(uni.getStorageSync('lang') == 'en-us') data.goods_sku_detail.goods_name = data.goods_sku_detail.en_goods_name
+		
+				this.goodsSkuDetail = data.goods_sku_detail;
+				if (!this.skuId) this.skuId = this.goodsSkuDetail.sku_id;
+				if (!this.goodsId) this.goodsId = this.goodsSkuDetail.goods_id;
+				// 分享参数、链接
+				this.shareQuery = 'goods_id=' + this.goodsSkuDetail.goods_id;
+				this.shareUrl = this.goodsRoute + '?' + this.shareQuery;
+
+				// 在线客服聊天参数
+				this.chatRoomParams = {
+					sku_id: this.goodsSkuDetail.sku_id
+				};
+				let typeId = this.goodsSkuDetail.goods_promotion[0];
+				if (typeId) {
+					// 限时折扣
+					if (typeId.discount_id) {
+						this.chatRoomParams.type = 'discount'
+						this.chatRoomParams.type_id = typeId.discount_id
+					}
+				}
+
+				// 海报参数
+				this.posterParams = {
+					goods_id: this.goodsId
+				};
+
+				// 处理商品数据
+				this.handleGoodsSkuData();
+
+				// 限时折扣
+				if (this.goodsSkuDetail.promotion_type == 1 && this.addonIsExist.discount) {
+					//检测倒计时
+					if ((this.goodsSkuDetail.end_time - res.timestamp) > 0) {
+						this.goodsSkuDetail.discountTimeMachine = this.$util.countDown(this.goodsSkuDetail.end_time - res.timestamp);
+					} else {
+						this.goodsSkuDetail.promotion_type = 0;
+					}
+				}
+				if (this.goodsSkuDetail.promotion_type == 1 && this.goodsSkuDetail.discountTimeMachine) {
+					if (this.goodsSkuDetail.member_price > 0 && Number(this.goodsSkuDetail.member_price) <= Number(this.goodsSkuDetail.discount_price)) {
+						this.goodsSkuDetail.show_price = this.goodsSkuDetail.member_price;
+					} else {
+						this.goodsSkuDetail.show_price = this.goodsSkuDetail.discount_price;
+					}
+				} else {
+					if (this.goodsSkuDetail.member_price > 0) {
+						this.goodsSkuDetail.show_price = this.goodsSkuDetail.member_price;
+					} else {
+						this.goodsSkuDetail.show_price = this.goodsSkuDetail.price;
+					}
+				}
+
+				// 满减
+				if (this.goodsSkuDetail.manjian) {
+					this.getManjian(this.goodsSkuDetail.manjian);
+				}
+
+				// 会员卡
+				if (this.goodsSkuDetail.membercard) {
+					this.membercard = this.goodsSkuDetail.membercard;
+				}
+
+				// 优惠券
+				if (this.goodsSkuDetail.coupon_list) {
+					this.couponList = this.goodsSkuDetail.coupon_list;
+					this.couponList.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;
+					});
+					this.couponList = this.couponList.sort(this.sortBy('useState'))
+				}
+
+				// 组合套餐
+				// if (this.goodsSkuDetail.bundling_list) {
+				// 	this.handleBundlingData(this.goodsSkuDetail.bundling_list);
+				// }
+
+				if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+
+			} else {
+				this.$util.redirectTo('/pages_tool/goods/not_exist', {}, 'redirectTo');
+			}
+		},
+		choiceSku() {
+			this.$refs.goodsSku.show("buy_now", () => {
+				this.$store.dispatch('getCartNumber');
+			});
+		},
+		
+		//商品留言打开
+		showinformation(){
+			this.informationform = this.goodsSkuDetail.goods_form
+			this.$refs.informationPopup.open();
+		},
+		//商品留言关闭
+		closeinformationPopup(){
+			this.$refs.informationPopup.close();
+		},
+		//保存商品留言
+		saveubfirnation(){
+			//缺少
+			if (!this.$refs.form.verify()) return;
+			
+			// uni.setStorageSync('goodFormData', {
+			// 	goods_id: this.goodsSkuDetail.goods_id,
+			// 	form_data: this.$refs.form.formData
+			// });
+			this.$api.sendRequest({
+				url: '/api/goods/information',
+				data: {
+					goods_id: this.goodsSkuDetail.goods_id,
+					form_data: JSON.stringify(this.$refs.form.formData)
+				},
+				success: res => {
+					var data = res.data;
+					if (res.code == 0) {
+						
+					}else{
+						this.$util.showToast({
+							title: res.msg
+						});
+					}
+				
+
+				},
+			});
+		},
+		// 加入购物车
+		joinCart() {
+			if (!this.storeToken && this.preview == 0) {
+				this.$refs.login.open(this.shareUrl);
+				return;
+			}
+			if (this.goodsSkuDetail.is_virtual == 1) {
+				this.$refs.goodsSku.show("buy_now", () => {
+					this.$store.dispatch('getCartNumber');
+				});
+			} else {
+				this.$refs.goodsSku.show("join_cart", () => {
+					this.$store.dispatch('getCartNumber');
+				});
+			}
+		},
+		// 立即购买
+		buyNow() { 
+			if (!this.storeToken && this.preview == 0) {
+				this.$refs.login.open(this.shareUrl);
+				return;
+			}
+			this.$refs.goodsSku.show("buy_now", () => {
+			});
+		},
+
+		sortBy(field) {
+			//根据传过来的字段进行排序,y-x 得分从高到低，x-y 从低到高
+			return (y, x) => {
+				return y[field] - x[field]
+			}
+		},
+
+		// 打开优惠券弹出层
+		openCouponPopup() {
+			this.$refs.couponPopup.open();
+		},
+		// 关闭优惠券弹出层
+		closeCouponPopup() {
+			this.$refs.couponPopup.close();
+		},
+		// 领取优惠券
+		receiveCoupon(item) {
+			let that = this;
+			if (this.preview) return; // 开启预览，禁止任何操作和跳转
+			if (this.couponBtnSwitch) return;
+			this.couponBtnSwitch = true;
+			if (this.storeToken) {
+				this.$api.sendRequest({
+					url: '/coupon/api/coupon/receive',
+					data: {
+						coupon_type_id: item.coupon_type_id,
+						get_type: 2 //获取方式:1订单2.直接领取3.活动领取
+					},
+					success: res => {
+						var data = res.data;
+
+						let msg = '';
+
+						let list = this.couponList;
+						if (res.data.is_exist == 1 && res.code < 0) {
+							msg = '您已领取过该优惠券，快去使用吧';
+						} else if (res.code == 0) {
+							msg = '领取成功，快去使用吧';
+						} else {
+							msg = res.message;
+						}
+						if (res.data.is_exist == 1) {
+							for (let i = 0; i < list.length; i++) {
+								if (list[i].coupon_type_id == item.coupon_type_id) {
+									that.$set(that.couponList[i], 'useState', 1);
+								}
+							}
+						} else {
+							for (let i = 0; i < list.length; i++) {
+								if (list[i].coupon_type_id == item.coupon_type_id) {
+									that.$set(that.couponList[i], 'useState', 2);
+
+								}
+
+							}
+						}
+						this.$util.showToast({
+							title: msg
+						});
+						that.$forceUpdate()
+						this.hackReset = false;
+						this.$nextTick(() => {
+							this.hackReset = true;
+						})
+
+						this.couponBtnSwitch = false;
+					},
+				});
+			} else {
+				this.$refs.login.open(this.shareUrl);
+				this.couponBtnSwitch = false;
+			}
+		},
+
+		//-------------------------------------满减-------------------------------------
+
+		//获取满减信息
+		getManjian(data) {
+			this.manjian = data;
+			let limit = data.type == 0 ? '元' : '件';
+			Object.keys(data.rule_json).forEach((key) => {
+				var item = data.rule_json[key];
+				if (item.coupon_data) {
+					for (var i = 0; i < item.coupon_data.length; i++) {
+						item.coupon_data[i].coupon_num = item.coupon_num[i]
+					}
+				}
+				item.limit = data.type == 0 ? parseFloat(item.limit).toFixed(2) : parseInt(item.limit);
+				// 满减
+				if (item.discount_money != undefined) {
+					if (this.manjian.manjian == undefined) {
+						this.manjian.manjian = '满' + item.limit + limit + '减' + item.discount_money + '元';
+					} else {
+						this.manjian.manjian += '；满' + item.limit + limit + '减' + item.discount_money + '元';
+					}
+				}
+				// 满送
+				if (item.point != undefined || item.coupon != undefined) {
+					let text = '';
+					if (item.point != undefined) {
+						text = '送' + item.point + '积分';
+					}
+					if (item.coupon != undefined && item.coupon_data != undefined) {
+						item.coupon_data.forEach((couponItem, couponIndex) => {
+							if (couponItem.type == 'discount') {
+								if (text == '') text = '送' + item.coupon_num[couponIndex] + '张' + parseFloat(couponItem.discount) + '折优惠券';
+								else text += '、送' + item.coupon_num[couponIndex] + '张' + parseFloat(couponItem.discount) + '折优惠券';
+							} else {
+								if (text == '') text = '送' + item.coupon_num[couponIndex] + '张' + parseFloat(couponItem.money) + '元优惠券';
+								else text += '、送' + item.coupon_num[couponIndex] + '张' + parseFloat(couponItem.money) + '元优惠券';
+							}
+						})
+					}
+					if (this.manjian.mansong == undefined) {
+						this.manjian.mansong = '满' + item.limit + limit + text;
+					} else {
+						this.manjian.mansong += '；' + '满' + item.limit + limit + text;
+					}
+				}
+				// 包邮
+				if (item.free_shipping != undefined) {
+					if (this.manjian.free_shipping == undefined) {
+						this.manjian.free_shipping = '满' + item.limit + limit + '包邮';
+					} else {
+						this.manjian.free_shipping += '；满' + item.limit + limit + '包邮';
+					}
+				}
+			});
+		},
+		openManjianPopup() {
+			this.$refs.manjianPopup.open();
+		},
+		closeManjianPopup() {
+			this.$refs.manjianPopup.close();
+		},
+
+		//-------------------------------------组合套餐-------------------------------------
+
+		//获取当前商品关联的组合套餐
+		getBundling() {
+			// 连锁门店没有营销活动
+			if (this.globalStoreConfig && this.globalStoreConfig.store_business == 'store') return;
+
+			this.$api.sendRequest({
+				url: "/bundling/api/bundling/lists",
+				data: {
+					sku_id: this.skuId
+				},
+				success: res => {
+					// this.handleBundlingData(res.data);
+				}
+			});
+		},
+		handleBundlingData(data) {
+			this.bundling = data;
+			if (this.bundling.length) {
+
+				for (var i = 0; i < this.bundling[0].bundling_goods.length; i++) {
+					if (this.bundling[0].bundling_goods[i].sku_id == this.skuId) {
+						this.bundlingType = true;
+						break;
+					} else {
+						this.bundlingType = false;
+					}
+				}
+
+				for (var i = 0; i < this.bundling.length; i++) {
+					for (var j = 0; j < this.bundling[i].bundling_goods.length; j++) {
+						if (this.bundling[i].bundling_goods[j].sku_id == this.skuId) {
+							this.bundling[i].bundling_goods.splice(j, 1);
+						}
+					}
+				}
+			}
+		},
+		// 打开组合套餐弹出层
+		openBundlingPopup() {
+			this.$refs.bundlingPopup.open();
+		},
+		// 关闭组合套餐弹出层
+		closeBundlingPopup() {
+			this.$refs.bundlingPopup.close();
+		},
+		imageError() {
+			this.goodsSkuDetail.sku_image = this.$util.getDefaultImage().goods;
+			this.$forceUpdate();
+		},
+		bundlingImageError(index, goods_index) {
+			this.bundling[index].bundling_goods[goods_index].sku_image = this.$util.getDefaultImage().goods;
+			this.$forceUpdate();
+		},
+		fenxiao() {
+			this.$refs.fenxiaoPopup.show()
+		},
+		toGoodsDetail(item) {
+			this.$util.redirectTo(this.goodsRoute, {
+				sku_id: item
+			});
+		},
+		toComoDetail(id) {
+			this.$util.redirectTo('/pages_promotion/bundling/detail', {
+				bl_id: id
+			});
+		},
+		/**
+		 * 获取分享图
+		 */
+		getShareImg() {
+			let posterParams = {
+				goods_id: this.goodsId
+			};
+			this.$api.sendRequest({
+				url: '/api/goods/shareimg',
+				data: {
+					qrcode_param: JSON.stringify(posterParams)
+				},
+				success: res => {
+					if (res.code == 0) this.shareImg = res.data.path + '?no=' + parseInt((new Date()).getTime() / 1000);
+				}
+			})
+		},
+		/**
+		 * 金额格式化输出
+		 * @param {Object} money
+		 */
+		decimalPointFormat(money) {
+			if (isNaN(parseFloat(money))) return money;
+			let arr = money.toString().split(".");
+			let arr1 = arr[1].split("").reverse();
+			let arr2 = [];
+			arr1.forEach((item, index) => {
+				if (item > 1) {
+					arr2 = arr1.splice(index);
+				}
+			});
+			let str = arr2.length ? (arr[0] + "." + arr2.reverse().join("")) : arr[0];
+			return str;
+		}
+	}
+}
\ No newline at end of file
diff --git a/pages/goods/public/js/list.js b/pages/goods/public/js/list.js
new file mode 100644
index 0000000..e861076
--- /dev/null
+++ b/pages/goods/public/js/list.js
@@ -0,0 +1,467 @@
+export default {
+	data() {
+		return {
+			listStyle: '',
+			loadingType: 'loading', //加载更多状态
+			orderType: '',
+			priceOrder: 'desc', //1 价格从低到高 2价格从高到低
+			categoryList: [], //排序类型
+			goodsList: [],
+			order: '',
+			sort: 'desc',
+			showScreen: false,
+			keyword: '',
+			categoryId: 0,
+			minPrice: '',
+			maxPrice: '',
+			isFreeShipping: false, //是否免邮
+			isIphoneX: false,
+			coupon: 0,
+			emptyShow: false,
+			isList: true, //列表样式
+			//分享所需标题
+			share_title: '',
+			//搜索到多少件商品
+			count: 0,
+			//当前分类名称
+			category_title: '',
+			//优惠券数据
+			coupon_name: '',
+			//列表瀑布流数据
+			listHeight: [],
+			listPosition: [],
+			debounce: null,
+			brandId: 0,
+			brandList: [], //品牌筛选项
+			config: {
+				fontWeight: false,
+				padding: 0,
+				cartEvent: "detail",
+				text: "购买",
+				textColor: "#FFFFFF",
+				theme: "default",
+				aroundRadius: 25,
+				control: true,
+				bgColor: "#FF6A00",
+				style: "button",
+				iconDiy: {
+					iconType: "icon",
+					icon: "",
+					style: {
+						fontSize: "60",
+						iconBgColor: [],
+						iconBgColorDeg: 0,
+						iconBgImg: "",
+						bgRadius: 0,
+						iconColor: [
+							"#000000"
+						],
+						iconColorDeg: 0
+					}
+				}
+			}, 
+			
+			langstatus:0,
+			lang:uni.getStorageSync('lang')
+		}
+	},
+
+	onLoad(options) {
+		
+		this.$api.sendRequest({
+			url: '/api/lucky/status',
+			data: {},
+			success: res => {
+				console.log(res)
+				this.langstatus = res.status
+				if(this.langstatus == 1){
+					// this.$langConfig.refresh();
+					uni.setNavigationBarTitle({
+						title:uni.getStorageSync('lang') == 'en-us'?'Goods List':'商品列表'
+					})
+				}
+			}
+		});
+		
+		this.categoryId = options.category_id || 0;
+		this.keyword = options.keyword || '';
+		this.coupon = options.coupon || 0;
+		this.goods_id_arr = options.goods_id_arr || 0;
+		this.brandId = options.brand_id || 0;
+
+		this.loadCategoryList(this.categoryId);
+		this.getBrandList();
+		this.isIphoneX = this.$util.uniappIsIPhoneX();
+
+		//小程序分享接收source_member
+		if (options.source_member) {
+			uni.setStorageSync('source_member', options.source_member);
+		}
+		// 小程序扫码进入，接收source_member
+		if (options.scene) {
+			var sceneParams = decodeURIComponent(options.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);
+				});
+			}
+		}
+
+		uni.onWindowResize(res => {
+			if (this.debounce) clearTimeout(this.debounce);
+			this.waterfallflow(0);
+		})
+	},
+	onShow() {
+		//记录分享关系
+		if (this.storeToken && uni.getStorageSync('source_member')) {
+			this.$util.onSourceMember(uni.getStorageSync('source_member'));
+		}
+	},
+	/**
+	 * 转发分享
+	 */
+	onShareAppMessage(res) {
+		var title = '搜索到' + this.count + '件“' + this.keyword + this.category_title + this.coupon_name + '”相关的优质商品';
+		let route = this.$util.getCurrentShareRoute(this.memberInfo ? this.memberInfo.member_id : 0);
+		var path = route.path;
+		return {
+			title: title,
+			path: path,
+			success: res => {
+			},
+			fail: res => {
+			}
+		};
+	},
+	// 分享到微信朋友圈
+	onShareTimeline() {
+		var title = '搜索到' + this.count + '件“' + this.keyword + this.category_title + this.coupon_name + '”相关的优质商品';
+		let route = this.$util.getCurrentShareRoute(this.memberInfo ? this.memberInfo.member_id : 0);
+		var query = route.query;
+		return {
+			title: title,
+			query: query,
+			imageUrl: ''
+		};
+	},
+	methods: {
+		/**
+		 * 获取优惠券数据
+		 */
+		couponInfo(id) {
+			return new Promise(resolve => {
+				this.$api.sendRequest({
+					url: '/coupon/api/coupon/typeinfo',
+					data: {
+						coupon_type_id: id
+					},
+					success: res => {
+						if (res.code >= 0) {
+							resolve(res.data.coupon_name);
+						}
+					}
+				});
+			})
+		},
+		/**
+		 *  获取分类名称
+		 */
+		share_select(data, id) {
+			return new Promise((resolve) => {
+				data.forEach((item) => {
+					if (item.category_id == id) {
+						resolve(item.category_name)
+					}
+					if (item.child_list && item.child_list.length > 0) {
+						item.child_list.forEach((v) => {
+							if (v.category_id == id) {
+								resolve(v.category_name)
+							}
+							if (v.child_list && v.child_list.length > 0) {
+								v.forEach((m) => {
+									if (m.category_id == id) {
+										resolve(m.category_name)
+									}
+								})
+
+							}
+						})
+					}
+				})
+			})
+		},
+		//加载分类
+		loadCategoryList(fid, sid) {
+			this.$api.sendRequest({
+				url: '/api/goodscategory/tree',
+				data: {},
+				success: res => {
+					if (res.data != null) {
+						this.categoryList = res.data
+					}
+				}
+			});
+		},
+		getGoodsList(mescroll) {
+			this.$api.sendRequest({
+				url: '/api/goodssku/page',
+				data: {
+					page: mescroll.num,
+					page_size: mescroll.size,
+					keyword: this.keyword,
+					category_id: this.categoryId,
+					brand_id: this.brandId,
+					min_price: this.minPrice,
+					max_price: this.maxPrice,
+					is_free_shipping: (this.isFreeShipping ? 1 : 0),
+					order: this.order,
+					sort: this.sort,
+					coupon: this.coupon,
+					goods_id_arr: this.goods_id_arr
+				},
+				success: res => {
+					let newArr = []
+					let msg = res.message;
+					if (res.code == 0 && res.data) {
+						this.count = res.data.count;
+						if (res.data.page_count == 0) {
+							this.emptyShow = true
+						}
+						newArr = res.data.list;
+						newArr = newArr.map(item => {
+							item.id = this.genNonDuplicate();
+							return item;
+						});
+					} else {
+						this.$util.showToast({
+							title: msg
+						})
+					}
+					this.category_title = '';
+					this.coupon_name = '';
+					if (res.data.config) this.config = res.data.config;
+					if (this.categoryId) {
+						this.share_select(this.categoryList, this.categoryId).then(resolve => {
+							this.category_title = resolve
+						});
+					}
+					if (this.coupon) {
+						this.couponInfo(this.coupon).then(resolve => {
+							this.coupon_name = resolve
+						});
+					}
+					mescroll.endSuccess(newArr.length);
+					//设置列表数据
+					if (mescroll.num == 1) this.goodsList = []; //如果是第一页需手动制空列表
+					this.goodsList = this.goodsList.concat(newArr); //追加新数据
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+
+					this.waterfallflow((mescroll.num - 1) * 10);
+				},
+				fail: res => {
+					//联网失败的回调
+					mescroll.endErr();
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				}
+			});
+		},
+		changeListStyle() {
+			this.isList = !this.isList;
+			this.waterfallflow(0);
+		},
+		//筛选点击
+		sortTabClick(tag) {
+			if (tag == 'sale_num') {
+				this.order = 'sale_num';
+				this.sort = 'desc';
+			} else if (tag == 'discount_price') {
+				this.order = 'discount_price';
+				this.sort = 'desc';
+			} else if (tag == 'screen') {
+				//筛选
+				this.showScreen = true;
+				return;
+			} else {
+				this.order = '';
+				this.sort = '';
+			}
+
+			if (this.orderType === tag && tag !== 'discount_price') return;
+
+			this.orderType = tag;
+			if (tag === 'discount_price') {
+				this.priceOrder = this.priceOrder === 'asc' ? 'desc' : 'asc';
+				this.sort = this.priceOrder;
+			} else {
+				this.priceOrder = '';
+			}
+			this.emptyShow = false;
+			this.goodsList = [];
+			this.$refs.mescroll.refresh();
+		},
+		//商品详情
+		toDetail(item) {
+			this.$util.redirectTo('/pages/goods/detail', {
+				goods_id: item.goods_id
+			});
+		},
+		search() {
+			this.emptyShow = false;
+			this.goodsList = [];
+			this.$refs.mescroll.refresh();
+		},
+		selectedCategory(categoryId) {
+			this.categoryId = categoryId;
+		},
+		screenData() {
+			if (this.minPrice != '' || this.maxPrice != '') {
+				// if (!Number(this.minPrice) && this.minPrice) {
+				// 	this.$util.showToast({
+				// 		title: '请输入最低价'
+				// 	});
+				// 	return;
+				// }
+				if (!Number(this.maxPrice) && this.maxPrice) {
+					this.$util.showToast({
+						title: '请输入最高价'
+					});
+					return;
+				}
+				if (Number(this.minPrice) < 0 || Number(this.maxPrice) < 0) {
+					this.$util.showToast({
+						title: '筛选价格不能小于0'
+					});
+					return;
+				}
+				if (this.minPrice != '' && Number(this.minPrice) > Number(this.maxPrice) && this.maxPrice) {
+
+					this.$util.showToast({
+						title: '最低价不能大于最高价'
+					});
+					return;
+				}
+				if (this.maxPrice != '' && Number(this.maxPrice) < Number(this.minPrice)) {
+					this.$util.showToast({
+						title: '最高价不能小于最低价'
+					});
+					return;
+				}
+			}
+			this.emptyShow = false;
+			this.goodsList = [];
+			this.$refs.mescroll.refresh();
+			this.showScreen = false;
+		},
+		//重置数据
+		resetData() {
+			this.categoryId = 0
+			this.minPrice = ''
+			this.maxPrice = ''
+			this.isFreeShipping = false
+		},
+		goodsImg(imgStr) {
+			let imgs = imgStr.split(',');
+			return imgs[0] ? this.$util.img(imgs[0], {
+				size: 'mid'
+			}) : this.$util.getDefaultImage().goods;
+		},
+		imgError(index) {
+			this.goodsList[index].goods_image = this.$util.getDefaultImage().goods;
+		},
+		showPrice(data) {
+			let price = data.discount_price;
+			if (data.member_price && parseFloat(data.member_price) < parseFloat(price)) price = data.member_price;
+			return price;
+		},
+		showMarketPrice(item) {
+			if (item.market_price_show) {
+				let price = this.showPrice(item);
+				if (item.market_price > 0) {
+					return item.market_price;
+				} else if (parseFloat(item.price) > parseFloat(price)) {
+					return item.price;
+				}
+			}
+			return '';
+		},
+		goodsTag(data) {
+			return data.label_name || '';
+		},
+		/**
+		 * 瀑布流
+		 */
+		waterfallflow(start = 0) {
+			if (!this.isList) {
+				//页面渲染完成后的事件
+				this.$nextTick(() => {
+					setTimeout(() => {
+						let listHeight = [];
+						let listPosition = [];
+						if (start != 0) {
+							listHeight = this.listHeight;
+							listPosition = this.listPosition;
+						}
+						let column = 2;
+						const query = uni.createSelectorQuery().in(this);
+						query.selectAll('.double-column .goods-item').boundingClientRect(data => {
+							for (let i = start; i < data.length; i++) {
+								if (i < column) {
+									let position = {};
+									position.top = uni.upx2px(20) + 'px';
+									if (i % column == 0) {
+										position.left = data[i].width * i + "px";
+									} else {
+										position.left = data[i].width * i + (i % column * uni
+											.upx2px(30)) + "px";
+									}
+									listPosition[i] = position;
+									listHeight[i] = data[i].height + uni.upx2px(20);
+								} else {
+									let minHeight = Math.min(...listHeight); //  找到第一列的最小高度
+									let minIndex = listHeight.findIndex(item => item === minHeight) // 找到最小高度的索引
+									//设置当前子元素项的位置
+									let position = {};
+									position.top = minHeight + uni.upx2px(20) + "px";
+									position.left = listPosition[minIndex].left;
+									listPosition[i] = position;
+									//重新定义数组最小项的高度 进行累加
+									listHeight[minIndex] += data[i].height + uni.upx2px(20);
+								}
+							}
+							this.listHeight = listHeight;
+							this.listPosition = listPosition;
+						}).exec();
+					}, 50)
+				})
+			}
+		},
+		getBrandList() {
+			var data = {
+				page: 1,
+				page_size: 0
+			};
+			this.$api.sendRequest({
+				url: '/api/goodsbrand/page',
+				data: data,
+				success: res => {
+					if (res.code == 0 && res.data) {
+						let data = res.data;
+						this.brandList = data.list;
+					}
+				}
+			});
+		},
+		/**
+		 * 添加购物车回调
+		 */
+		addCart(id) {
+		},
+		genNonDuplicate(len = 6) {
+			return Number(Math.random().toString().substr(3, len) + Date.now()).toString(36);
+		}
+	}
+}
\ No newline at end of file
diff --git a/pages/index/index.vue b/pages/index/index.vue
new file mode 100644
index 0000000..88f5589
--- /dev/null
+++ b/pages/index/index.vue
@@ -0,0 +1,226 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view :style="{ backgroundColor: bgColor, minHeight: openBottomNav ? 'calc(100vh - 55px)' : '' }" class="page-img">
+		<view class="site-info-box" v-if="$util.isWeiXin() && followOfficialAccount && followOfficialAccount.isShow && wechatQrcode">
+			<view class="site-info">
+				<view class="img-box" v-if="siteInfo.logo_square">
+					<image :src="$util.img(siteInfo.logo_square)" mode="aspectFill"></image>
+				</view>
+				<view class="info-box" :style="{ color: '#ffffff' }">
+					<text class="font-size-base">{{ siteInfo.site_name }}</text>
+					<text>{{ followOfficialAccount.welcomeMsg }}</text>
+				</view>
+			</view>
+			<view class="dite-button" @click="officialAccountsOpen">关注公众号</view>
+		</view>
+
+	<!-- 	<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">
+			<template v-slot:components>
+				<diy-group ref="diyGroup" v-if="diyData.value" :diyData="diyData" :scrollTop="scrollTop" :haveTopCategory="true" :followOfficialAccount="followOfficialAccount"/>
+			</template>
+			<template v-slot:default>
+				<ns-copyright v-show="isShowCopyRight"/>
+			</template>
+		</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" :followOfficialAccount="followOfficialAccount"/>
+			<ns-copyright v-show="isShowCopyRight"/>
+		</view>
+
+		<template v-if="adv.advshow != -1">
+			<view @touchmove.prevent.stop>
+				<uni-popup ref="uniPopupWindow" type="center" class="wap-floating" :maskClick="false">
+					 <view class="small-bot">
+					<!-- 	<view class="adver-time" wx:if="{{startadv.params.style=='default'&&startadv.params.canclose==1}}">
+							<view bindtap="adverclose">跳过</view>
+							<view class="time">{{clock}}s</view>
+						</view>
+						<view class="adver-time" wx:if="{{startadv.params.style=='default'&&startadv.params.canclose==0}}">
+							<view class="time" style="line-height: 64rpx;">{{clock}}s</view>
+						</view> -->
+						<swiper autoplay="true" :circular="true" indicator-active-color="#fff" indicator-color="rgba(255,255,255,0.6)" :indicator-dots="true" interval="3000">
+							<swiper-item v-for="(item, index) in adv.list" :key="index">
+								<image class="slide-image"  @click="$util.diyRedirectTo(item.link)" height="100%" :src="$util.img(item.imageUrl)" width="100%"></image>
+							<!-- 	<image bindtap="adverclose" class="slide-image" height="100%" src="{{item.imgurl}}" width="100%" wx:if="{{item.click==1}}"></image> -->
+							</swiper-item>
+						</swiper>
+						<view bindtap="adverclose" class="small-bot-close" @click="closePopupWindow">
+							<i class="iconfont icon-round-close" style="color:#fff"></i>
+						</view>
+					</view>
+				<!-- 	<view class="image-wrap">
+						<swiper class="swiper" style="width:100%;height: 1200rpx;" :autoplay="true"  interval="3000" circular="true" :indicator-dots="true" indicator-color="#000" indicator-active-color="red">
+							<swiper-item class="swiper-item" v-for="(item, index) in adv.list" :key="index" v-if="item.imageUrl" @click="$util.diyRedirectTo(item.link)">
+								<view class="item">
+									<image :src="$util.img(item.imageUrl)" mode="aspectFit" :show-menu-by-longpress="true"/>
+								</view>
+							</swiper-item>
+						</swiper>
+					</view>
+					<text class="iconfont icon-round-close" @click="closePopupWindow"></text> -->
+				</uni-popup>
+			</view>
+		</template>
+
+		<!-- 底部tabBar -->
+		<view class="page-bottom" v-if="openBottomNav">
+			<diy-bottom-nav @callback="callback" :name="name"/>
+		</view>
+
+		<!-- 关注公众号弹窗 -->
+		<view @touchmove.prevent class="official-accounts-inner" v-if="wechatQrcode">
+			<uni-popup ref="officialAccountsPopup" type="center">
+				<view class="official-accounts-wrap">
+					<image class="content" :src="$util.img(wechatQrcode)" mode="aspectFit"></image>
+					<text class="desc">关注了解更多</text>
+					<text class="close iconfont icon-round-close" @click="officialAccountsClose"></text>
+				</view>
+			</uni-popup>
+		</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>
+
+		<!-- 选择门店弹出框，定位当前位置，展示最近的一个门店 -->
+		<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="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="iconfont icon-dingwei"></text>
+							<text>重新定位</text>
+						</view>
+					</view>
+					<view class="store-wrap" v-if="nearestStore">
+						<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">
+							<text class="iconfont icon-dizhi"></text>
+							<text>{{ nearestStore.distance > 1 ? nearestStore.distance + 'km' : nearestStore.distance * 1000 + 'm' }}</text>
+						</view>
+					</view>
+					<button type="primary" @click="enterStore">确认进入</button>
+					<view class="other-store" @click="chooseOtherStore" v-if="globalStoreConfig && globalStoreConfig.is_allow_change == 1">
+						<text>选择其他门店</text>
+						<text class="iconfont icon-right"></text>
+					</view>
+				</view>
+			</uni-popup>
+		</view>
+		<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]
+	};
+</script>
+
+<style lang="scss">
+	@import '@/common/css/diy.scss';
+	@import './public/css/index.scss';
+	
+	
+	
+	.small-bot {
+	    width: 100%;
+	    height: 100%;
+	    position: fixed;
+	    top: 0;
+	    bottom: 0;
+	    left: 0;
+	    right: 0;
+	    z-index: 122;
+	}
+	
+	.small-bot swiper {
+	    width: 560rpx;
+	    height: 784rpx;
+	    margin: 120rpx auto 0;
+	    border-radius: 10rpx;
+	    overflow: hidden;
+	}
+	
+	.small-bot swiper .slide-image {
+	    width: 100%;
+	    height: 100%;
+	}
+	
+	.small-bot-close {
+	    width: 66rpx;
+	    height: 66rpx;
+	    border-radius: 50%;
+	    text-align: center;
+	    line-height: 64rpx;
+	    font-size: 64rpx;
+	    color: #fff;
+	    margin: 30rpx auto 0;
+	}
+	
+	.small-bot-close i {
+	    font-size: 60rpx;
+	}
+	
+	
+</style>
+<style scoped>
+	.swiper /deep/ .uni-swiper-dots-horizontal {
+		left: 40%;
+		bottom:40px
+	}
+	.wap-floating>>>.uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+		background: none !important;
+	}
+
+	.choose-store>>>.goodslist-uni-popup-box {
+		width: 80%;
+	}
+
+	/deep/.diy-index-page .uni-popup .uni-popup__wrapper-box {
+		border-radius: 0;
+	}
+
+	/deep/ .placeholder {
+		height: 0;
+	}
+
+	/deep/::-webkit-scrollbar {
+		width: 0;
+		height: 0;
+		background-color: transparent;
+		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/index/public/css/index.scss b/pages/index/public/css/index.scss
new file mode 100644
index 0000000..1a9f437
--- /dev/null
+++ b/pages/index/public/css/index.scss
@@ -0,0 +1,88 @@
+.site-info-box {
+	padding: 20rpx 20rpx;
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	background-color: rgba(0, 0, 0, 0.6);
+	position: fixed;
+	width: calc(100% - 40rpx);
+	z-index: 999;
+	.site-info {
+		display: flex;
+		align-items: center;
+		.img-box {
+			width: 70rpx;
+			height: 70rpx;
+			line-height: 70rpx;
+			border-radius: 50%;
+			overflow: hidden;
+			image {
+				width: 100%;
+				height: 100%;
+			}
+		}
+		.info-box {
+			display: flex;
+			flex-direction: column;
+			color: #fff;
+			justify-content: space-between;
+			margin-left: 20rpx;
+			text-align: left;
+			width: 400rpx;
+			text {
+				display: -webkit-box;
+				font-size: $font-size-tag;
+				overflow: hidden;
+				opacity: 0.8;
+				white-space: normal;
+				text-overflow: ellipsis;
+				-webkit-line-clamp: 1;
+				-webkit-box-orient: vertical;
+				line-height: 1.4;
+				&:nth-child(1) {
+					width: 300rpx;
+					font-weight: bold;
+					opacity: 1;
+				}
+			}
+		}
+	}
+	.dite-button {
+		background-color: #fff;
+		width: 180rpx;
+		height: 56rpx;
+		line-height: 56rpx;
+		text-align: center;
+		border-radius: 66rpx;
+		color: $base-color;
+		font-size: $font-size-tag;
+	}
+}
+
+.official-accounts-inner /deep/ .uni-popup__wrapper.uni-custom.center .uni-popup__wrapper-box {
+	overflow: inherit;
+}
+.official-accounts-wrap {
+	display: flex;
+	align-items: center;
+	flex-direction: column;
+	padding: 30rpx;
+	.content {
+		width: 300rpx;
+		height: 300rpx;
+	}
+	.desc {
+		margin-top: 10rpx;
+		font-size: $font-size-tag;
+		color: $color-tip;
+	}
+	.close {
+		position: absolute;
+		left: 50%;
+		bottom: -130rpx;
+		transform: translateX(-50%);
+		z-index: 99;
+		color: #fff;
+		font-size: 70rpx;
+	}
+}
\ No newline at end of file
diff --git a/pages/index/public/js/index.js b/pages/index/public/js/index.js
new file mode 100644
index 0000000..8432be7
--- /dev/null
+++ b/pages/index/public/js/index.js
@@ -0,0 +1,41 @@
+export default {
+	data() {
+		return {
+			wechatQrcode: '', // 公众号二维码
+			diyRoute: '/pages/index/index'
+		};
+	},
+	onLoad(option) {
+		// #ifdef H5
+		// H5地图选择位置回调数据
+		if (option.module && option.module == 'locationPicker') {
+			option.name = ''; // 清空地址
+		}
+		// #endif
+		this.name = option.name || 'DIY_VIEW_INDEX'; // 根据店铺运营模式，打开平台（shop）或者连锁门店（stroe）页面，接口会自行判断
+
+	},
+	onShow() {
+		this.getFollowQrcode();
+	},
+	methods: {
+		// 关注公众号
+		getFollowQrcode() {
+			if (!this.$util.isWeiXin()) return;
+			this.$api.sendRequest({
+				url: '/wechat/api/wechat/followqrcode',
+				success: res => {
+					if (res.code >= 0 && res.data) {
+						this.wechatQrcode = res.data.qrcode;
+					}
+				}
+			});
+		},
+		officialAccountsOpen() {
+			this.$refs.officialAccountsPopup.open();
+		},
+		officialAccountsClose() {
+			this.$refs.officialAccountsPopup.close();
+		},
+	}
+}
\ No newline at end of file
diff --git a/pages/member/index.vue b/pages/member/index.vue
new file mode 100644
index 0000000..9a1531c
--- /dev/null
+++ b/pages/member/index.vue
@@ -0,0 +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;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/member/public/js/index.js b/pages/member/public/js/index.js
new file mode 100644
index 0000000..44f9916
--- /dev/null
+++ b/pages/member/public/js/index.js
@@ -0,0 +1,95 @@
+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);
+					}
+				}
+			});
+		},
+	},
+};
\ No newline at end of file
diff --git a/pages/order/detail.vue b/pages/order/detail.vue
new file mode 100644
index 0000000..ec9f273
--- /dev/null
+++ b/pages/order/detail.vue
@@ -0,0 +1,824 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view class="detail-container" :class="{ 'safe-area': isIphoneX }">
+		<!-- 订单状态 -->
+		<view class="status-wrap color-base-bg" :style="{ backgroundImage: 'url(' + $util.img('public/uniapp/order/status-wrap-bg.png') + ')' }">
+			<view class="order-status-left">
+				<image :src="$util.img(action.icon)"></image>
+				<view class="status-name">
+					<view class="name">
+						{{ orderData.order_status_name }}
+						<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) }}日后发货
+					</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">
+				剩余时间：
+				<uni-count-down :day="orderData.closeTimeMachine.d" :hour="orderData.closeTimeMachine.h"
+					:minute="orderData.closeTimeMachine.i" :second="orderData.closeTimeMachine.s" color="#fff"
+					splitorColor="#fff" />
+			</view>
+		</view>
+
+		<!-- 地址信息 -->
+		<view class="address-wrap" v-if="orderData.order_type == 1 || orderData.order_type == 3">
+			<view class="icon">
+				<view class="iconfont icon-location"></view>
+			</view>
+			<view class="address-info">
+				<view class="info">
+					<text class="font-size-base">{{ orderData.name }}&nbsp;{{ orderData.mobile }}</text>
+				</view>
+				<view class="detail">
+					<text class="font-size-base">收货地址：{{ orderData.full_address }} {{ orderData.address }}</text>
+				</view>
+			</view>
+			<template v-if="orderData.order_type == 3">
+				<view class="pick-block first-pick-block">
+					<view class="font-size-base">送达时间：</view>
+					<view class="last-child">{{ orderData.buyer_ask_delivery_time }}</view>
+				</view>
+				<block v-if="orderData.package_list">
+					<view class="pick-block">
+						<view>配送员：</view>
+						<view class="last-child">{{ orderData.package_list.deliverer }}</view>
+					</view>
+					<view class="pick-block">
+						<view>外卖电话：</view>
+						<view class="last-child">{{ orderData.package_list.deliverer_mobile }}</view>
+					</view>
+				</block>
+			</template>
+		</view>
+
+		<template v-if="orderData.order_type == 2">
+			<!-- 门店信息 -->
+			<view class="store-wrap">
+				<view>
+					<view class="store-info" v-if="orderData.delivery_store_info">
+						<view class="icon">
+							<view class="iconfont icon-mendian"></view>
+						</view>
+						<view class="store-info-detail">
+							<view class="store-name" @click="
+									$util.redirectTo('/pages_tool/store/detail', {
+										store_id: orderData.delivery_store_id
+									})
+								">
+								<text class="name font-size-base">{{ orderData.delivery_store_name }}</text>
+								<text class="iconfont icon-right font-size-base"></text>
+							</view>
+							<view class="detail store-detail">
+								<view class="color-tip" v-if="orderData.delivery_store_info.open_date">
+									营业时间：{{ orderData.delivery_store_info.open_date }}</view>
+								<view class="color-tip">地址：{{ orderData.delivery_store_info.full_address }}</view>
+							</view>
+						</view>
+					</view>
+					<view v-else>
+						<view class="address-empty">
+							<view class="color-base-text">当前无自提门店</view>
+						</view>
+					</view>
+				</view>
+				<view class="pick-block first-pick-block">
+					<view class="font-size-base">姓名</view>
+					<input class="last-child" type="text" disabled :value="orderData.name" />
+				</view>
+				<view class="pick-block first-pick-block">
+					<view class="font-size-base">预留手机</view>
+					<input class="last-child" type="number" disabled :value="orderData.mobile" />
+				</view>
+				<view class="pick-block first-pick-block">
+					<view class="font-size-base">提货时间</view>
+					<input class="last-child" disabled :value="orderData.buyer_ask_delivery_time" />
+				</view>
+			</view>
+
+			<view class="pickup-info" v-if="orderData.pay_status">
+				<view class="pickup-code-info">
+					<view class="info">
+						<text class="font-size-base">
+							<text class="color-tip font-size-base">提货码：</text>
+							{{ orderData.delivery_code }}
+						</text>
+						<text class="copy" @click="$util.copy(orderData.delivery_code)">复制</text>
+					</view>
+					<view class="code">
+						<image :src="$util.img(orderData.pickup_barcode)" @click="previewMedia($util.img(orderData.pickup_barcode))" class="barcode" mode="widthFix"/>
+						<image :src="$util.img(orderData.pickup)" @click="previewMedia($util.img(orderData.pickup))" class="qrcode" mode="widthFix"/>
+					</view>
+				</view>
+			</view>
+		</template>
+
+		<!-- 店铺 -->
+		<view class="site-wrap" :style="orderData.order_type == 4 ? 'margin-top: -69rpx;' : ''">
+			<view class="site-body">
+				<view v-for="(goodsItem, goodsIndex) in orderData.order_goods" :key="goodsIndex" class="goods-item">
+					<view class="goods-wrap">
+						<view class="goods-img" @click="goDetail(goodsItem)">
+							<image :src="$util.img(goodsItem.sku_image, { size: 'mid' })" @error="imageError(goodsIndex)" mode="aspectFill"/>
+						</view>
+						<view class="goods-info" @click="goDetail(goodsItem)">
+							<view 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">
+										{{ x.spec_value_name }}
+										{{ i < goodsItem.sku_spec_format.length - 1 ? '; ' : '' }}
+									</block>
+								</view>
+							</view>
+							<view class="goods-sub-section">
+								<view>
+									<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>
+								</view>
+								<view>
+									<text class="font-size-base">
+										<text class="iconfont icon-close"></text>
+										{{ goodsItem.num }}
+									</text>
+								</view>
+							</view>
+							<view v-if="goodsItem.card_item_id" class="goods-card">
+								次卡抵扣
+								<text class="goods-price ">
+									<text class="unit price-style small">-{{ $lang('common.currencySymbol') }}</text>
+									<text class="price-style large">{{ parseFloat(goodsItem.card_promotion_money).toFixed(2).split('.')[0] }}</text>
+									<text class="unit price-style small">.{{ parseFloat(goodsItem.card_promotion_money).toFixed(2).split('.')[1] }}</text>
+								</text>
+							</view>
+						</view>
+					</view>
+
+					<view class="goods-form" v-if="goodsItem.form">
+						<view class="order-cell" v-for="(item, index) in goodsItem.form" :key="index">
+							<text class="tit">{{ item.value.title }}：</text>
+							<view class="box img-box" v-if="item.controller == 'Img'">
+								<view class="img" v-for="(img, imgIndex) in item.img_lists" :key="imgIndex">
+									<image :src="$util.img(img)" mode="widthFix" @click="previewMedia($util.img(img))"/>
+								</view>
+							</view>
+							<view class="box" v-else>
+								<text class="color-title">{{ item.val }}</text>
+								<text class="copy" @click="$util.copy(item.val)">复制</text>
+							</view>
+						</view>
+					</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>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<!-- 订单概况 -->
+		<view class="order-summary">
+			<view class="order-cell">
+				<text class="tit">订单类型：</text>
+				<view class="box">
+					<text class="color-title">{{ orderData.order_type_name }}</text>
+				</view>
+			</view>
+			<view class="order-cell">
+				<text class="tit">订单编号：</text>
+				<view class="box">
+					<text class="color-title">{{ orderData.order_no }}</text>
+					<view class="copy" @click="$util.copy(orderData.order_no)">复制</view>
+				</view>
+			</view>
+			<view class="order-cell">
+				<text class="tit">订单交易号：</text>
+				<view class="box">
+					<text class="color-title">{{ orderData.out_trade_no }}</text>
+				</view>
+			</view>
+			<view class="order-cell">
+				<text class="tit">创建时间：</text>
+				<view class="box">
+					<text class="color-title">{{ $util.timeStampTurnTime(orderData.create_time) }}</text>
+				</view>
+			</view>
+			<view class="order-cell" v-if="orderData.close_time > 0">
+				<text class="tit">关闭时间：</text>
+				<view class="box">
+					<text class="color-title">{{ $util.timeStampTurnTime(orderData.close_time) }}</text>
+				</view>
+			</view>
+			<block v-if="orderData.pay_status > 0">
+				<view class="hr"></view>
+				<view class="order-cell">
+					<text class="tit">支付方式：</text>
+					<view class="box">
+						<text class="color-title">{{ orderData.pay_type_name }}</text>
+					</view>
+				</view>
+				<view class="order-cell">
+					<text class="tit">支付时间：</text>
+					<view class="box">
+						<text class="color-title">{{ $util.timeStampTurnTime(orderData.pay_time) }}</text>
+					</view>
+				</view>
+			</block>
+			<view class="order-cell" v-if="orderData.delivery_type_name">
+				<text class="tit">配送方式：</text>
+				<view class="box">
+					<text class="color-title">{{ orderData.delivery_type_name }}</text>
+				</view>
+			</view>
+			<view class="order-cell" v-if="orderData.buyer_message != ''">
+				<text class="tit">买家留言：</text>
+				<view class="box">
+					<text class="color-title">{{ orderData.buyer_message }}</text>
+				</view>
+			</view>
+			<view class="order-cell" v-if="orderData.promotion_type_name != ''">
+				<text class="tit">活动优惠：</text>
+				<view class="box">
+					<text class="color-title">{{ orderData.promotion_type_name }}</text>
+				</view>
+			</view>
+			<block v-if="orderData.is_invoice > 0">
+				<view class="hr"></view>
+				<view class="order-cell">
+					<text class="tit">发票类型：</text>
+					<view class="box">
+						<text class="color-title">{{ orderData.invoice_type == 1 ? '纸质发票' : '电子发票' }}</text>
+					</view>
+				</view>
+				<view class="order-cell">
+					<text class="tit">发票抬头类型：</text>
+					<view class="box">
+						<text class="color-title">{{ orderData.invoice_title_type == 1 ? '个人' : '企业' }}</text>
+					</view>
+				</view>
+				<view class="order-cell">
+					<text class="tit">发票抬头：</text>
+					<view class="box">
+						<text class="color-title">{{ orderData.invoice_title }}</text>
+					</view>
+				</view>
+
+				<view class="order-cell">
+					<text class="tit">发票内容：</text>
+					<view class="box">
+						<text class="color-title">{{ orderData.invoice_content }}</text>
+					</view>
+				</view>
+				<view class="order-cell" v-if="orderData.invoice_type == 1">
+					<text class="tit">发票邮寄地址：</text>
+					<view class="box">
+						<text class="color-title">{{ orderData.invoice_full_address }}</text>
+					</view>
+				</view>
+				<view class="order-cell" v-else>
+					<text class="tit">发票接收邮件：</text>
+					<view class="box">
+						<text class="color-title">{{ orderData.invoice_email }}</text>
+					</view>
+				</view>
+			</block>
+			<block v-if="orderData.form">
+				<view class="hr"></view>
+				<view class="order-cell order-form" v-for="(item, index) in orderData.form" :key="index">
+					<text class="tit">{{ item.value.title }}：</text>
+					<view class="box img-box" v-if="item.controller == 'Img'">
+						<view class="img" v-for="(img, imgIndex) in item.img_lists" :key="imgIndex">
+							<image :src="$util.img(img)" mode="widthFix" @click="previewMedia($util.img(img))"></image>
+						</view>
+					</view>
+					<view class="box" v-else>
+						<text class="color-title">{{ item.val }}</text>
+						<text class="copy" @click="$util.copy(item.val)">复制</text>
+					</view>
+				</view>
+			</block>
+
+			<block v-if="orderData.goods_class == 5">
+				<view class="order-cell">
+					<text class="tit">我的卡包：</text>
+					<view class="box"><text class="color-base-text" @click="$util.redirectTo('/pages_promotion/cardservice/card/my_card')">查看</text></view>
+				</view>
+			</block>
+			<!-- 联系客服 -->
+	<!-- 		<ns-contact :niushop="{ order_id: orderData.order_id }">
+				<view class="kefu">
+					<view>
+						<text class="iconfont icon-ziyuan"></text>
+						<text>联系客服</text>
+					</view>
+				</view>
+			</ns-contact> -->
+		</view>
+
+		<block v-if="orderData.virtual_goods && orderData.goods_class == 2 && orderData.virtual_goods.is_veirfy == 0">
+			<view class="verify-code-wrap">
+				<view class="code">
+					<image :src="$util.img(orderData.virtualgoods_barcode)" class="barcode" mode="widthFix"></image>
+					<image :src="$util.img(orderData.virtualgoods)" class="qrcode" mode="widthFix"></image>
+					<text>请将条形码或二维码出示给核销员</text>
+				</view>
+				<view class="hr"></view>
+				<view class="wrap">
+					<text class="font-size-base virtual-code">{{ orderData.virtual_code }}</text>
+					<view class="copy" @click="$util.copy(orderData.virtual_code)">复制</view>
+				</view>
+			</view>
+
+			<view class="verify-info-wrap">
+				<view class="head">核销信息</view>
+				<view class="order-cell">
+					<text class="tit">核销次数</text>
+					<view class="box align-right">
+						<text class="color-title">
+							剩余{{ orderData.virtual_goods.verify_total_count - orderData.virtual_goods.verify_use_num }}次/共{{ orderData.virtual_goods.verify_total_count }}次
+						</text>
+					</view>
+				</view>
+				<view class="order-cell">
+					<text class="tit">有效期</text>
+					<view class="box align-right">
+						<text class="color-title" v-if="orderData.virtual_goods.expire_time > 0">{{ $util.timeStampTurnTime(orderData.virtual_goods.expire_time) }}</text>
+						<text v-else>永久有效</text>
+					</view>
+				</view>
+			</view>
+ 
+			<view class="verify-info-wrap">
+				<view class="head">核销记录</view>
+				<view v-if="orderData.virtual_goods.verify_record.length">
+					<view v-for="(item, index) in orderData.virtual_goods.verify_record" :key="index" class="record-item">
+						<view class="order-cell">
+							<text class="tit">核销人</text>
+							<view class="box align-right">
+								<text class="color-title">{{ item.verifier_name }}</text>
+							</view>
+						</view>
+						<view class="order-cell">
+							<text class="tit">核销时间</text>
+							<view class="box align-right">
+								<text class="color-title">{{ $util.timeStampTurnTime(item.verify_time) }}</text>
+							</view>
+						</view>
+					</view>
+				</view>
+				<view class="record-empty" v-else>暂无核销记录</view>
+			</view>
+		</block>
+
+		<block v-if="orderData.virtual_goods && orderData.goods_class == 3">
+			<view class="verify-info-wrap carmichael">
+				<view class="head">卡密信息</view>
+				<view v-for="(item, index) in orderData.virtual_goods" :key="index" class="record-item">
+					<view class="order-cell">
+						<text class="tit">卡号：</text>
+						<view class="box">
+							<text class="color-title">{{ item.card_info.cardno }}</text>
+							<view class="copy" @click="$util.copy(item.card_info.cardno)">复制</view>
+						</view>
+					</view>
+					<view class="order-cell">
+						<text class="tit">密码：</text>
+						<view class="box">
+							<text class="color-title">{{ item.card_info.password }}</text>
+							<view class="copy" @click="$util.copy(item.card_info.password)">复制</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</block>
+
+		<block v-if="orderData.virtual_goods && orderData.goods_class == 4">
+			<view class="verify-code-wrap" v-if="orderData.virtual_goods.is_veirfy == 0">
+				<view class="code">
+					<image :src="$util.img(orderData.virtualgoods_barcode)" class="barcode" mode="widthFix"></image>
+					<image :src="$util.img(orderData.virtualgoods)" class="qrcode" mode="widthFix"></image>
+					<text>请将条形码或二维码出示给核销员</text>
+				</view>
+				<view class="hr"></view>
+				<view class="wrap">
+					<text class="font-size-base virtual-code">{{ orderData.virtual_code }}</text>
+					<view class="copy" @click="$util.copy(orderData.virtual_code)">复制</view>
+				</view>
+			</view>
+
+			<view class="verify-info-wrap">
+				<view class="head">核销信息</view>
+				<view class="order-cell">
+					<text class="tit">核销次数</text>
+					<view class="box align-right">
+						<text class="color-title">
+							剩余{{ orderData.virtual_goods.verify_total_count - orderData.virtual_goods.verify_use_num }}次/共{{ orderData.virtual_goods.verify_total_count }}次
+						</text>
+					</view>
+				</view>
+				<view class="order-cell">
+					<text class="tit">有效期</text>
+					<view class="box align-right">
+						<text class="color-title" v-if="orderData.virtual_goods.expire_time > 0">{{ $util.timeStampTurnTime(orderData.virtual_goods.expire_time) }}</text>
+						<text v-else>永久有效</text>
+					</view>
+				</view>
+			</view>
+
+			<view class="verify-info-wrap">
+				<view class="head">核销记录</view>
+				<view v-if="orderData.virtual_goods.verify_record.length">
+					<view v-for="(item, index) in orderData.virtual_goods.verify_record" :key="index" class="record-item">
+						<view class="order-cell">
+							<text class="tit">核销人</text>
+							<view class="box align-right">
+								<text class="color-title">{{ item.verifier_name }}</text>
+							</view>
+						</view>
+						<view class="order-cell">
+							<text class="tit">核销时间</text>
+							<view class="box align-right">
+								<text class="color-title">{{ $util.timeStampTurnTime(item.verify_time) }}</text>
+							</view>
+						</view>
+					</view>
+				</view>
+				<view class="record-empty" v-else>暂无核销记录</view>
+			</view>
+		</block>
+		<!-- 订单金额 -->
+		<view class="order-money">
+			<view class="order-cell">
+				<text class="tit">商品金额</text>
+				<view class="box align-right">
+					<text class="color-title price-font">
+						<text class="font-size-goods-tag">{{ $lang('common.currencySymbol') }}</text>
+						{{ orderData.goods_money }}
+					</text>
+				</view>
+			</view>
+			<view class="order-cell" v-if="orderData.order_type != 4">
+				<text class="tit">运费</text>
+				<view class="box align-right">
+					<text class="color-base-text price-font">
+						<text class="font-size-goods-tag">{{ $lang('common.currencySymbol') }}</text>
+						<text>{{ orderData.delivery_money }}</text>
+					</text>
+				</view>
+			</view>
+			<view class="order-cell" v-if="orderData.member_card_money > 0">
+				<text class="tit">会员卡</text>
+				<view class="box align-right">
+					<text class="color-base-text price-font">
+						<text class="font-size-goods-tag">{{ $lang('common.currencySymbol') }}</text>
+						<text>{{ orderData.member_card_money }}</text>
+					</text>
+				</view>
+			</view>
+			<view class="order-cell" v-if="orderData.invoice_money > 0">
+				<text class="tit">
+					税费
+					<text class="color-base-text">({{ orderData.invoice_rate }}%)</text>
+				</text>
+				<view class="box align-right">
+					<text class="color-base-text price-font">
+						<text class="operator">+</text>
+						<text class="font-size-goods-tag">{{ $lang('common.currencySymbol') }}</text>
+						<text>{{ orderData.invoice_money }}</text>
+					</text>
+				</view>
+			</view>
+			<view class="order-cell" v-if="orderData.invoice_delivery_money > 0">
+				<text class="tit">发票邮寄费</text>
+				<view class="box align-right">
+					<text class="color-base-text price-font">
+						<text class="operator">+</text>
+						<text class="font-size-goods-tag">{{ $lang('common.currencySymbol') }}</text>
+						<text>{{ orderData.invoice_delivery_money }}</text>
+					</text>
+				</view>
+			</view>
+			<view class="order-cell" v-if="orderData.adjust_money != 0">
+				<text class="tit">订单调整</text>
+				<view class="box align-right">
+					<text class="color-base-text price-font">
+						<text class="operator" v-if="orderData.adjust_money < 0">-</text>
+						<text class="operator" v-else>+</text>
+						<text class="font-size-goods-tag">{{ $lang('common.currencySymbol') }}</text>
+						<text>{{ orderData.adjust_money | abs }}</text>
+					</text>
+				</view>
+			</view>
+			<view class="order-cell" v-if="orderData.promotion_money > 0">
+				<text class="tit">优惠</text>
+				<view class="box align-right">
+					<text class="color-base-text price-font">
+						<text class="operator">-</text>
+						<text class="font-size-goods-tag">{{ $lang('common.currencySymbol') }}</text>
+						<text>{{ orderData.promotion_money }}</text>
+					</text>
+				</view>
+			</view>
+			<view class="order-cell" v-if="orderData.coupon_money > 0">
+				<text class="tit">优惠券</text>
+				<view class="box align-right">
+					<text class="color-base-text price-font">
+						<text class="operator">-</text>
+						<text class="font-size-goods-tag">{{ $lang('common.currencySymbol') }}</text>
+						<text>{{ orderData.coupon_money }}</text>
+					</text>
+				</view>
+			</view>
+			<view class="order-cell" v-if="orderData.balance_money > 0">
+				<text class="tit">使用余额</text>
+				<view class="box align-right">
+					<text class="color-base-text price-font">
+						<text class="operator">-</text>
+						<text class="font-size-goods-tag">{{ $lang('common.currencySymbol') }}</text>
+						<text>{{ orderData.balance_money }}</text>
+					</text>
+				</view>
+			</view>
+			<view class="order-cell" v-if="orderData.point_money > 0">
+				<text class="tit">积分抵扣</text>
+				<view class="box align-right">
+					<text class="color-base-text price-font">
+						<text class="operator">-</text>
+						<text class="font-size-goods-tag">{{ $lang('common.currencySymbol') }}</text>
+						<text>{{ orderData.point_money }}</text>
+					</text>
+				</view>
+			</view>
+			<view class="order-cell">
+				<view class="box align-right">
+					<text>实付金额：</text>
+					<text class="color-base-text price-font">
+						<text class="font-size-goods-tag">{{ $lang('common.currencySymbol') }}</text>
+						<text class="font-size-base">{{ orderData.order_money }}</text>
+					</text>
+				</view>
+			</view>
+
+			<view class="order-action fixed-bottom bottom-safe-area" v-if="orderData.action.length > 0">
+				<view class="order-box-btn white" v-if="evaluateConfig.evaluate_status == 1 && orderData.is_evaluate == 1" @click="operation('memberOrderEvaluation')">
+					<text v-if="orderData.evaluate_status == 0">评价</text>
+					<text v-else-if="orderData.evaluate_status == 1">追评</text>
+				</view>
+				<block v-if="orderData.order_scene == 'online'">
+					<view class="order-box-btn"
+						:class="{ 'color-base-border color-base-bg': operationItem.action == 'orderPay' }"
+						v-for="(operationItem, operationIndex) in orderData.action" :key="operationIndex"
+						@click="operation(operationItem.action)">
+						{{ operationItem.title }}
+					</view>
+				</block>
+			</view>
+
+			<view class="order-action fixed-bottom bottom-safe-area" v-else-if="orderData.action.length == 0 && orderData.is_evaluate == 1 && evaluateConfig.evaluate_status == 1">
+				<view class="order-box-btn white" @click="operation('memberOrderEvaluation')">
+					<text v-if="orderData.evaluate_status == 0">评价</text>
+					<text v-else-if="orderData.evaluate_status == 1">追评</text>
+				</view>
+			</view>
+		</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>
+		<!-- 选择支付方式弹窗 -->
+		<ns-payment ref="choosePaymentPopup"></ns-payment>
+		<loading-cover ref="loadingCover"></loading-cover>
+	</view>
+</template>
+
+<script>
+	import nsGoodsRecommend from '@/components/ns-goods-recommend/ns-goods-recommend.vue';
+	import orderMethod from './public/js/orderMethod.js';
+	import nsPayment from '@/components/payment/payment.vue';
+	import nsContact from '@/components/ns-contact/ns-contact.vue';
+	export default {
+		data() {
+			return {
+				isIphoneX: false,
+				orderId: 0,
+				merchantTradeNo: '',
+				orderData: {
+					action: [],
+					virtual_goods: {
+						is_veirfy: 0,
+						verify_record: []
+					}
+				},
+				action: {
+					icon: ''
+				},
+				evaluateConfig: {
+					evaluate_audit: 1,
+					evaluate_show: 0,
+					evaluate_status: 1
+				}
+			};
+		},
+		mixins: [orderMethod],
+		components: {
+			nsGoodsRecommend,
+			nsPayment,
+			nsContact
+		},
+		onLoad(option) {
+			if (option.order_id) this.orderId = option.order_id;
+			if (option.merchant_trade_no) this.merchantTradeNo = option.merchant_trade_no;
+		},
+		onShow() {
+			this.isIphoneX = this.$util.uniappIsIPhoneX();
+
+			if (this.storeToken) {
+				this.getEvaluateConfig();
+				this.getOrderData();
+			} else {
+				this.$util.redirectTo('/pages_tool/login/login', {
+					back: '/pages/order/detail?order_id=' + this.orderId + '&merchant_trade_no=' + this.merchantTradeNo
+				});
+			}
+		},
+		methods: {
+			goDetail(e) {
+				this.$util.redirectTo('/pages/goods/detail', {
+					goods_id: e.goods_id
+				});
+			},
+			goRefund(id) {
+				this.$util.redirectTo('/pages_tool/order/refund', {
+					order_goods_id: id
+				});
+			},
+			goRefundDetail(id) {
+				this.$util.redirectTo('/pages_tool/order/refund_detail', {
+					order_goods_id: id
+				});
+			},
+			getOrderData() {
+				this.$api.sendRequest({
+					url: '/api/order/detail',
+					data: {
+						order_id: this.orderId,
+						merchant_trade_no: this.merchantTradeNo
+					},
+					success: res => {
+						if (res.code >= 0) {
+							if (res.data.order_status == 0) {
+								let date = Date.parse(new Date()) / 1000;
+								res.data.closeTimeMachine = this.$util.countDown(res.data.create_time + res.data.auto_close - date);
+							}
+							let num = 0;
+							this.orderData = res.data;
+							this.orderId = this.orderData.order_id;
+							let refund_order_goods_ids = [];
+							this.orderData.order_goods.forEach(v => {
+								if (v.sku_spec_format) {
+									v.sku_spec_format = JSON.parse(v.sku_spec_format);
+								} else {
+									v.sku_spec_format = [];
+								}
+
+								if (v.refund_status == 0 || v.refund_status == -1) {
+									num += 1;
+									refund_order_goods_ids.push(v.order_goods_id);
+								}
+							});
+							this.action = JSON.parse(res.data.order_status_action);
+
+							//判断在可退款商品数量大于1时出现批量删除按钮
+							if (num > 1) {
+								this.orderData.refund_batch_status = true;
+								this.orderData.refund_order_goods_ids = refund_order_goods_ids;
+							} else {
+								this.orderData.refund_batch_status = false;
+							}
+
+							if (this.orderData.delivery_store_info != '') this.orderData.delivery_store_info = JSON.parse(this.orderData.delivery_store_info);
+
+							if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+						} else {
+							this.$util.showToast({
+								title: '未获取到订单信息！'
+							});
+							setTimeout(() => {
+								this.$util.redirectTo('/pages/order/list');
+							}, 1500);
+						}
+					},
+					fail: res => {
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					}
+				});
+			},
+			/**
+			 * 下拉刷新
+			 */
+			onPullDownRefresh() {
+				this.getOrderData();
+			},
+			operation(action) {
+				switch (action) {
+					case 'orderPay': // 支付
+						this.orderPay(this.orderData);
+						break;
+					case 'orderClose': //关闭
+						this.orderClose(this.orderData.order_id, () => {
+							this.getOrderData();
+						});
+						break;
+					case 'memberTakeDelivery': //收货
+						this.orderDelivery(this.orderData, () => {
+							this.getOrderData();
+						});
+						break;
+					case 'trace': //查看物流
+						this.$util.redirectTo('/pages_tool/order/logistics', {
+							order_id: this.orderData.order_id
+						});
+						break;
+					case 'memberOrderEvaluation': //评价
+						this.$util.redirectTo('/pages_tool/order/evaluate', {
+							order_id: this.orderData.order_id
+						});
+						break;
+						//批量退款
+					case 'memberBatchRefund':
+						this.$util.redirectTo('/pages_tool/order/refund_type_select', {
+							order_id: this.orderId
+						});
+						break;
+					case 'memberVirtualTakeDelivery':
+						this.orderVirtualDelivery(this.orderData, () => {
+							this.getOrderData();
+						});
+						break;
+				}
+			},
+			imageError(index) {
+				this.orderData.order_goods[index].sku_image = this.$util.getDefaultImage().goods;
+				this.$forceUpdate();
+			},
+			getEvaluateConfig() {
+				this.$api.sendRequest({
+					url: '/api/goodsevaluate/config',
+					success: res => {
+						if (res.code == 0) {
+							var data = res.data;
+							this.evaluateConfig = data;
+						}
+					}
+				});
+			},
+			// 显示选择支付方式弹框
+			openChoosePayment() {
+				this.$refs.choosePaymentPopup.open();
+			},
+			// 预览图片
+			previewMedia(pickup) {
+				var paths = [];
+				paths.push(pickup);
+
+				uni.previewImage({
+					urls: paths
+				});
+			}
+		},
+		filters: {
+			abs(value) {
+				return Math.abs(parseFloat(value)).toFixed(2);
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	@import './public/css/detail.scss';
+</style>
+<style scoped>
+	.pickup-code-info .code img:nth-child(1) {
+		margin-bottom: 30rpx;
+	}
+	/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/order/detail_local_delivery.vue b/pages/order/detail_local_delivery.vue
new file mode 100644
index 0000000..005f434
--- /dev/null
+++ b/pages/order/detail_local_delivery.vue
@@ -0,0 +1,22 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view>
+		<loading-cover ref="loadingCover"></loading-cover>
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {};
+	},
+	onLoad(option) {
+		if (option.order_id) {
+			this.$util.redirectTo('/pages/order/detail', {order_id: option.order_id}, 'redirectTo');
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+</style>
diff --git a/pages/order/detail_pickup.vue b/pages/order/detail_pickup.vue
new file mode 100644
index 0000000..005f434
--- /dev/null
+++ b/pages/order/detail_pickup.vue
@@ -0,0 +1,22 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view>
+		<loading-cover ref="loadingCover"></loading-cover>
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {};
+	},
+	onLoad(option) {
+		if (option.order_id) {
+			this.$util.redirectTo('/pages/order/detail', {order_id: option.order_id}, 'redirectTo');
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+</style>
diff --git a/pages/order/detail_point.vue b/pages/order/detail_point.vue
new file mode 100644
index 0000000..75b21f1
--- /dev/null
+++ b/pages/order/detail_point.vue
@@ -0,0 +1,304 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view class="detail-container" :class="{ 'safe-area': isIphoneX }">
+		<!-- 订单状态 -->
+		<view class="status-wrap color-base-bg" :style="{ backgroundImage: 'url(' + $util.img('public/uniapp/order/status-wrap-bg.png') + ')' }">
+			<view class="order-status-left">
+				<image v-if="orderData.order_status == 0" :src="$util.img('public/uniapp/order/order-icon.png')"/>
+				<image v-if="orderData.order_status == 1" :src="$util.img('public/uniapp/order/order-icon-received.png')"/>
+				<image v-if="orderData.order_status == -1" :src="$util.img('public/uniapp/order/order-icon-close.png')"/>
+				<view class="status-name">
+					<view class="status-name">
+						{{ orderData.order_status == 0 ? '待支付' : orderData.order_status == 1 ? '已完成' : orderData.order_status == -1 ? '已关闭' : '' }}
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<!-- 店铺 -->
+		<view class="site-wrap" style="margin-top: -69rpx">
+			<view class="site-body">
+				<view class="goods-item">
+					<view class="goods-wrap">
+						<view @click="goDetail(orderData.exchange_goods_id)" class="goods-img">
+							<image :src="exchangeImage(orderData)" @error="imageError()" mode="aspectFill"></image>
+						</view>
+						<view class="goods-info" @click="goDetail(orderData.exchange_goods_id)">
+							<view class="goods-name">{{ orderData.exchange_name }}</view>
+							<view class="goods-sub-section">
+								<view>
+									<text class="goods-price color-base-text">
+										<text>
+											<text>{{ orderData.point }}积分</text>
+											<text v-if="orderData.price > 0" class="price-color">
+												+
+												<text class="unit">{{ $lang('common.currencySymbol') }}</text>
+												{{ orderData.price }}
+											</text>
+										</text>
+									</text>
+								</view>
+								<view>
+									<text>
+										<text class="iconfont icon-close"></text>
+										{{ orderData.num }}
+									</text>
+								</view>
+							</view>
+						</view>
+					</view>
+					<view class="goods-action"></view>
+				</view>
+			</view>
+		</view>
+
+		<!-- 订单概况 -->
+		<view class="order-summary">
+			<view class="order-cell">
+				<text class="tit">订单编号：</text>
+				<view class="box">
+					<text class="color-title">{{ orderData.order_no }}</text>
+					<view class="copy" @click="$util.copy(orderData.order_no)">复制</view>
+				</view>
+			</view>
+			<view class="order-cell">
+				<text class="tit">订单交易号：</text>
+				<view class="box">
+					<text class="color-title">{{ orderData.out_trade_no }}</text>
+				</view>
+			</view>
+			<view class="order-cell">
+				<text class="tit">创建时间：</text>
+				<view class="box">
+					<text class="color-title">{{ $util.timeStampTurnTime(orderData.create_time) }}</text>
+				</view>
+			</view>
+			<view class="order-cell" v-if="orderData.close_time > 0">
+				<text class="tit">关闭时间：</text>
+				<view class="box">
+					<text class="color-title">{{ $util.timeStampTurnTime(orderData.close_time) }}</text>
+				</view>
+			</view>
+			<!-- 联系客服 -->
+	<!-- 		<ns-contact :niushop="{ order_id: orderData.order_id }">
+				<view class="kefu">
+					<view>
+						<text class="iconfont icon-ziyuan"></text>
+						<text>联系客服</text>
+					</view>
+				</view>
+			</ns-contact> -->
+		</view>
+
+		<!-- 订单金额 -->
+		<view class="order-money">
+			<view class="order-cell" v-if="orderData.point > 0">
+				<text class="tit">使用积分</text>
+				<view class="box align-right">
+					<text class="color-base-text price-font">
+						<text>{{ orderData.point }}</text>
+					</text>
+				</view>
+			</view>
+			<view class="order-cell" v-if="orderData.delivery_price > 0">
+				<text class="tit">运费</text>
+				<view class="box align-right">
+					<text class="color-base-text price-font">
+						<text class="unit font-size-tag">{{ $lang('common.currencySymbol') }}</text>
+						<text>{{ orderData.delivery_price }}</text>
+					</text>
+				</view>
+			</view>
+			<view class="order-cell" v-if="orderData.order_money > 0">
+				<view class="box align-right">
+					<text>实付金额：</text>
+					<text class="color-base-text price-font">
+						<text class="font-size-goods-tag">{{ $lang('common.currencySymbol') }}</text>
+						<text class="font-size-base">{{ orderData.order_money }}</text>
+					</text>
+				</view>
+			</view>
+
+			<view class="order-action" v-if="orderData.order_status == 0 && orderData.type == 1">
+				<view class="order-box-btn" @click="orderClose()">关闭</view>
+				<view class="order-box-btn color-base-bg color-base-border color-text-white" @click="openChoosePayment()">支付</view>
+			</view>
+		</view>
+
+		<ns-goods-recommend ref="goodrecommend" route="order_detail"></ns-goods-recommend>
+		<!-- 选择支付方式弹窗 -->
+		<ns-payment ref="choosePaymentPopup" :payMoney="orderData.order_money"
+			@confirm="orderPay(orderData)"></ns-payment>
+		<loading-cover ref="loadingCover"></loading-cover>
+	</view>
+</template>
+
+<script>
+	import nsGoodsRecommend from '@/components/ns-goods-recommend/ns-goods-recommend.vue';
+	import nsContact from '@/components/ns-contact/ns-contact.vue';
+	export default {
+		components: {
+			nsGoodsRecommend,
+			nsContact
+		},
+		data() {
+			return {
+				isIphoneX: false,
+				orderId: 0,
+				orderData: {
+					action: []
+				},
+				action: {
+					icon: ''
+				},
+				storeDetail: {}
+			};
+		},
+		onLoad(option) {
+			if (option.order_id) this.orderId = option.order_id;
+		},
+		onShow() {
+			this.isIphoneX = this.$util.uniappIsIPhoneX();
+
+			if (this.storeToken) {
+				this.getOrderData();
+			} else {
+				this.$util.redirectTo('/pages_tool/login/login', {
+					back: '/pages/order/detail_point?order_id=' + this.orderId
+				});
+			}
+		},
+		methods: {
+			goRefund(id) {
+				this.$util.redirectTo('/pages_tool/order/refund', {
+					order_goods_id: id
+				});
+			},
+			goRefundDetail(id) {
+				this.$util.redirectTo('/pages_tool/order/refund_detail', {
+					order_goods_id: id
+				});
+			},
+			goDetail(id) {
+				this.$util.redirectTo('/pages_promotion/point/detail', {
+					id: id
+				});
+			},
+			navigateBack() {
+				this.$util.goBack();
+			},
+			getOrderData() {
+				this.$api.sendRequest({
+					url: '/pointexchange/api/order/info',
+					data: {
+						order_id: this.orderId
+					},
+					success: res => {
+						uni.stopPullDownRefresh();
+						if (res.code >= 0) {
+							if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+							this.orderData = res.data;
+							if (this.orderData.delivery_store_info != '') this.orderData.delivery_store_info =
+								JSON.parse(this.orderData.delivery_store_info);
+						} else {
+							this.$util.showToast({
+								title: '未获取到订单信息！'
+							});
+							setTimeout(() => {
+								this.$util.redirectTo('/pages/order/list');
+							}, 1500);
+						}
+					},
+					fail: res => {
+						uni.stopPullDownRefresh();
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					}
+				});
+			},
+			/**
+			 * 下拉刷新
+			 */
+			onPullDownRefresh() {
+				this.getOrderData();
+			},
+			orderClose() {
+				uni.showModal({
+					title: '提示',
+					content: '确定关闭此次兑换？',
+					success: res => {
+						if (res.confirm) {
+							this.$api.sendRequest({
+								url: '/pointexchange/api/order/close',
+								data: {
+									order_id: this.orderData.order_id
+								},
+								success: res => {
+									if (res.code >= 0) {
+										this.$util.showToast({
+											title: '关闭成功'
+										});
+										this.getOrderData();
+									}
+								}
+							});
+						}
+					}
+				});
+			},
+			// 显示选择支付方式弹框
+			openChoosePayment() {
+				this.$refs.choosePaymentPopup.open();
+			},
+			orderPay() {
+				uni.setStorageSync('paySource', 'pointexchange');
+				this.$refs.choosePaymentPopup.getPayInfo(this.orderData.out_trade_no);
+			},
+			exchangeImage(data) {
+				let img = '';
+				switch (data.type) {
+					case 1:
+						img = this.$util.img(data.exchange_image, {
+							size: 'mid'
+						});
+						break;
+					case 2:
+						img = data.exchange_image ? this.$util.img(data.exchange_image) : this.$util.img(
+							'public/uniapp/point/coupon.png');
+						break;
+					case 3:
+						img = data.exchange_image ? this.$util.img(data.exchange_image) : this.$util.img(
+							'public/uniapp/point/hongbao.png');
+						break;
+				}
+				return img;
+			},
+			imageError() {
+				switch (this.orderData.type) {
+					case 2:
+						this.orderData.exchange_image = this.$util.img('public/uniapp/point/coupon.png');
+						break;
+					case 3:
+						this.orderData.exchange_image = this.$util.img('public/uniapp/point/hongbao.png');
+						break;
+					default:
+						this.orderData.exchange_image = this.$util.getDefaultImage().goods;
+				}
+				this.$forceUpdate();
+			},
+		},
+		filters: {
+			abs(value) {
+				return Math.abs(parseFloat(value)).toFixed(2);
+			}
+		}
+	};
+</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;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/order/list.vue b/pages/order/list.vue
new file mode 100644
index 0000000..db0ca2f
--- /dev/null
+++ b/pages/order/list.vue
@@ -0,0 +1,453 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view class="order-container">
+		<view class="cate-search">
+			<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>
+			</view>
+		</view>
+		<view class="order-nav" v-if="storeToken">
+			<view v-for="(statusItem, statusIndex) in statusList" :key="statusIndex" class="uni-tab-item" :id="statusItem.id" :data-current="statusIndex" @click="ontabtap">
+				<text class="uni-tab-item-title" :class="statusItem.status == orderStatus ? 'uni-tab-item-title-active color-base-text' : ''">
+					{{ statusItem.name }}
+				</text>
+			</view>
+		</view>
+
+		<!-- #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>
+												</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>
+										</text>
+									</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 }}
+									</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>
+					<view v-else><ns-empty :isIndex="false" :text="$lang('emptyTips')"></ns-empty></view>
+				</block>
+			</mescroll-uni>
+
+			<!-- <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> -->
+
+			<!-- 选择支付方式弹窗 -->
+			<ns-payment ref="choosePaymentPopup"></ns-payment>
+			<ns-payment ref="choosePaymentMergePopup"></ns-payment>
+
+			<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';
+
+	export default {
+		data() {
+			return {
+				scrollInto: '',
+				orderStatus: 'all',
+				statusList: [],
+				orderList: [],
+				contentText: {},
+				mergePayOrder: [],
+				isIphoneX: false,
+				evaluateConfig: {
+					evaluate_audit: 1,
+					evaluate_show: 0,
+					evaluate_status: 1
+				},
+				orderData: {},
+				payMoney: 0,
+				payMoneyMerge: 0,
+				order_id: 0,
+				searchText: "",
+				pageText: "",
+				payConfig: null,
+				isTradeManaged: false // 检测微信小程序是否已开通发货信息管理服务
+			};
+		},
+		components: {
+			nsPayment
+		},
+		mixins: [orderMethod],
+		onLoad(option) {
+			if (option.status) this.orderStatus = option.status;
+			if (option.order_id) this.order_id = option.order_id;
+		},
+		onShow() {
+			this.isIphoneX = this.$util.uniappIsIPhoneX();
+			this.getEvaluateConfig();
+			this.getOrderStatus();
+
+			if (this.storeToken) {
+				if (this.$refs.mescroll) this.$refs.mescroll.refresh();
+			} else {
+				this.$nextTick(() => {
+					this.$refs.login.open('/pages/order/list?status=' + this.orderStatus);
+				})
+			}
+		},
+		onUnload() {
+			if (!this.storeToken && this.$refs.login) this.$refs.login.cancelCompleteInfo();
+		},
+		methods: {
+			ontabtap(e) {
+				let index = e.target.dataset.current || e.currentTarget.dataset.current;
+				this.orderStatus = this.statusList[index].status;
+				if (this.orderStatus == '') this.mergePayOrder = [];
+				this.$refs.loadingCover.show();
+				this.$refs.mescroll.refresh();
+			},
+			getListData(mescroll) {
+				
+				this.$api.sendRequest({
+					url: '/api/order/lists',
+					data: {
+						page: mescroll.num,
+						page_size: mescroll.size,
+						order_status: this.orderStatus,
+						order_id: this.order_id,
+						searchText: this.pageText
+					},
+					success: res => {
+						let newArr = [];
+						let msg = res.message;
+						let auto_close = 0
+						if (res.code == 0 && res.data) {
+							newArr = res.data.list;
+							auto_close = res.data.auto_close;
+							this.payConfig = res.data.pay_config;
+							this.isTradeManaged = res.data.is_trade_managed;
+						} else {
+							this.$util.showToast({
+								title: msg
+							});
+						}
+						mescroll.endSuccess(newArr.length);
+						//设置列表数据
+						if (mescroll.num == 1) {
+							this.orderList = []; //如果是第一页需手动制空列表
+							this.order_id = 0
+						}
+						this.orderList = this.orderList.concat(newArr); //追加新数据
+						let date = (Date.parse(new Date())) / 1000
+						this.orderList.forEach(v => {
+							v.discountTimeMachine = this.$util.countDown((v.create_time + auto_close) - date);
+							v.order_goods.forEach(vo => {
+								if (vo.sku_spec_format) {
+									try {
+										vo.sku_spec_format = JSON.parse(vo.sku_spec_format);
+									} catch (e) {
+										vo.sku_spec_format = vo.sku_spec_format;
+									}
+								} else {
+									vo.sku_spec_format = [];
+								}
+							});
+						});
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					},
+					fail: res => {
+						mescroll.endErr();
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					}
+				});
+			},
+			/**
+			 * 获取订单状态
+			 */
+			getOrderStatus() {
+				this.statusList = [{
+						status: 'all',
+						name:'全部', 
+						id: 'status_0'
+					},
+					{
+						status: 'waitpay',
+						name: '待付款',
+						id: 'status_1'
+					},
+					{
+						status: 'waitsend',
+						name: '待发货',
+						id: 'status_2'
+					},
+					{
+						status: 'waitconfirm',
+						name: '待收货',
+						id: 'status_3'
+					},
+					{
+						status: 'waitrate',
+						name: '已完成',
+						id: 'status_4'
+					},
+					/*{
+						status: 'wait_use',
+						name: '待使用',
+						id: 'status_4'
+					}*/
+				];
+			},
+			operation(action, orderData) {
+				let index = this.status;
+				switch (action) {
+					case 'orderPay': // 支付
+						this.orderData = orderData;
+						this.payMoney = parseFloat(orderData.pay_money);
+						this.orderPay(orderData);
+						break;
+					case 'orderClose': //关闭
+						this.orderClose(orderData.order_id, () => {
+							this.$refs.mescroll.refresh();
+						});
+						break;
+					case 'memberTakeDelivery': //收货
+						this.orderData = orderData;
+						this.orderData.pay_config = {};
+						this.orderData.pay_config.mch_id = this.payConfig.mch_id;
+						this.orderData.is_trade_managed = this.isTradeManaged;
+						this.orderDelivery(this.orderData, () => {
+							this.$refs.mescroll.refresh();
+						});
+						break;
+					case 'trace': //查看物流
+						this.$util.redirectTo('/pages_tool/order/logistics', {
+							order_id: orderData.order_id
+						});
+						break;
+					case 'memberOrderEvaluation': //评价
+						this.$util.redirectTo('/pages_tool/order/evaluate', {
+							order_id: orderData.order_id
+						});
+						break;
+					case 'memberVirtualTakeDelivery':
+						this.orderData = orderData;
+						this.orderData.pay_config = {};
+						this.orderData.pay_config.mch_id = this.payConfig.mch_id;
+						this.orderData.is_trade_managed = this.isTradeManaged;
+						this.orderVirtualDelivery(this.orderData, () => {
+							this.$refs.mescroll.refresh();
+						});
+						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;
+				}
+			},
+			/**
+			 * 选择订单
+			 * @param {Object} orderId
+			 */
+			selectOrder(orderId, pay_money) {
+				if (this.$util.inArray(orderId, this.mergePayOrder) != -1) {
+					this.mergePayOrder.splice(this.$util.inArray(orderId, this.mergePayOrder), 1);
+					this.payMoneyMerge -= parseFloat(pay_money);
+				} else {
+					this.payMoneyMerge += parseFloat(pay_money);
+					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();
+			},
+			getEvaluateConfig() {
+				this.$api.sendRequest({
+					url: '/api/goodsevaluate/config',
+					success: res => {
+						if (res.code == 0) {
+							var data = res.data;
+							this.evaluateConfig = data;
+						}
+					}
+				});
+			},
+			search() {
+				this.pageText = this.searchText;
+				this.$refs.mescroll.refresh();
+			}
+		},
+		computed: {
+			mpOrderList() {
+				if (!this.orderList[this.status]) return;
+				return this.orderList[this.status].list || [];
+			}
+		},
+		watch: {
+			storeToken: function(nVal, oVal) {
+				if (nVal) {
+					this.$refs.mescroll.refresh();
+				}
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	@import './public/css/list.scss';
+</style>
+<style scoped>
+	/deep/ .uni-page {
+		overflow: hidden;
+	}
+
+	/deep/ .mescroll-upwarp {
+		padding-bottom: 100rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/order/payment.vue b/pages/order/payment.vue
new file mode 100644
index 0000000..d4610f4
--- /dev/null
+++ b/pages/order/payment.vue
@@ -0,0 +1,105 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view>
+		<common-payment :api="api" create-data-key="orderCreateData" ref="payment"></common-payment>
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			api: {
+				payment: '/api/ordercreate/payment',
+				calculate: '/api/ordercreate/calculate',
+				create: '/api/ordercreate/create',
+			}
+		}
+	},
+	provide() {
+	    return {
+			promotion: this.promotion.bind(this)
+	    }
+	},
+	onShow() {
+		if (this.$refs.payment) this.$refs.payment.pageShow();
+	},
+	methods: {
+		/**
+		 * 处理活动信息 如不需要则定义为空方法
+		 */
+		promotion(data){
+			if (data.promotion && data.promotion.manjian && data.promotion.manjian.length) {
+				let promotionStr = {title: `满减送`, content: ''}
+				data.promotion.manjian.forEach((mItem,mIndex)=>{
+					let promotion = '';
+					let content = {};
+					let limit = mItem.type == 0 ? '元' : '件';
+					if(mItem.rule){
+						var item = mItem.discount_array.rule;
+						item.limit = mItem.type == 0 ? parseFloat(item.limit).toFixed(2) : parseInt(item.limit);
+						// 满减
+						if (item.discount_money != undefined) {
+							if (content.manjian == undefined) {
+								content.manjian = '购买可享受满' + item.limit + limit + '减' + item.discount_money + '元';
+							} else {
+								content.manjian += '；满' + item.limit + limit + '减' + item.discount_money + '元';
+							}
+						}
+						// 满送优惠券
+						if (item.coupon && item.coupon_list) {
+							let text = '';
+							item.coupon_list.forEach((couponItem, couponIndex) => {
+								if (couponItem.type == 'discount') {
+									if (text == '') text = '送'+ couponItem.give_num +'张' + parseFloat(couponItem.discount) + '折优惠券';
+									else text += '、送'+ couponItem.give_num +'张' + parseFloat(couponItem.discount) + '折优惠券';
+								} else {
+									if (text == '') text = '送'+ couponItem.give_num +'张' + parseFloat(couponItem.money) + '元优惠券';
+									else text += '、送'+ couponItem.give_num +'张' + parseFloat(couponItem.money) + '元优惠券';
+								}
+							})
+							if (content.mansong == undefined) {
+								content.mansong = '购物满' + item.limit + limit + text;
+							} else {
+								content.mansong += '；' + '满' + item.limit + limit + text;
+							}
+						}
+						// 满送积分
+						if (item.point) {
+							let point_text = '可得' + item.point + '积分';
+							if(content.point_text == undefined) {
+								content.point_text = '购物满' + item.limit + limit + point_text
+							}else {
+								content.point_text += '；' + '满' + item.limit + limit + point_text;
+							}
+						}
+						// 包邮
+						if (item.free_shipping != undefined) {
+							if (content.free_shipping == undefined) {
+								content.free_shipping = '购物满' + item.limit + limit + '包邮';
+							}
+						}
+					}
+					promotion = Object.values(content).join('\n');
+					promotionStr.content = promotionStr.content + promotion + '\n';
+				})
+				return (promotionStr.content ? promotionStr : null);
+			} 
+		}
+	}
+};
+</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/order/public/css/detail.scss b/pages/order/public/css/detail.scss
new file mode 100644
index 0000000..a1b1c06
--- /dev/null
+++ b/pages/order/public/css/detail.scss
@@ -0,0 +1,871 @@
+@mixin flex-row-center {
+	display: flex;
+	justify-content: center;
+	align-items: center;
+}
+
+@mixin wrap {
+	margin: $margin-updown 24rpx;
+	padding: 30rpx;
+	border-radius: 16rpx;
+	background: #fff;
+	position: relative;
+}
+text,
+view {
+	font-size: $font-size-tag;
+}
+.bottom-safe-area {
+	padding-bottom: calc(constant(safe-area-inset-bottom) + 10rpx) !important;
+	padding-bottom: calc(env(safe-area-inset-bottom) + 10rpx) !important;
+}
+
+.align-right {
+	text-align: right;
+}
+
+.color-text-white {
+	color: #fff;
+}
+
+.detail-container {
+	// height: 100vh;
+	.height-box {
+		display: block;
+		padding-bottom: 100rpx;
+	}
+
+	&.safe-area {
+		.height-box {
+			display: block;
+			padding-bottom: 168rpx;
+		}
+	}
+}
+
+.status-wrap {
+	background-size: 100% 100%;
+	padding: 40rpx;
+	height: 180rpx;
+	position: relative;
+
+	image {
+		width: 104rpx;
+		height: 86rpx;
+		margin-right: 20rpx;
+		margin-top: 20rpx;
+	}
+
+	.order-status-left {
+		display: flex;
+	}
+
+	.order-time {
+		position: absolute;
+		top: 70rpx;
+		right: 30rpx;
+		display: flex;
+		align-items: center;
+		font-size: 10px;
+		color: #fff;
+
+		image {
+			width: 26rpx;
+			height: 26rpx;
+			margin-right: 6rpx;
+		}
+	}
+
+	& > view {
+		text-align: center;
+		color: #fff;
+	}
+
+	.desc {
+		margin-left: 20rpx;
+	}
+
+	.price {
+		font-weight: 600;
+	}
+
+	.action-group {
+		text-align: center;
+		padding-top: 20rpx;
+
+		.action-btn {
+			line-height: 1;
+			padding: 16rpx 50rpx;
+			display: inline-block;
+			border-radius: $border-radius;
+			background: #fff;
+			box-shadow: 0 0 14rpx rgba(158, 158, 158, 0.6);
+		}
+	}
+}
+
+/deep/ #action-date .uni-countdown .uni-countdown__number {
+	border: none !important;
+	padding: 0 !important;
+	margin: 0 !important;
+	background: rgba(0, 0, 0, 0) !important;
+}
+
+.address-wrap {
+	@include wrap;
+	min-height: 100rpx;
+	margin-top: -69rpx;
+
+	.icon {
+		position: absolute;
+		top: 20rpx;
+		margin-right: 20rpx;
+
+		image {
+			width: 60rpx;
+			height: 60rpx;
+		}
+
+		.iconfont {
+			line-height: 50rpx;
+			font-size: $font-size-base;
+		}
+		.icon-mendian {
+			font-size: $font-size-toolbar;
+		}
+	}
+
+	.address-info {
+		padding-left: 40rpx;
+
+		.info {
+			display: flex;
+			line-height: 1;
+			color: #333;
+		}
+
+		.detail {
+			line-height: 1.3;
+			color: #333;
+			margin-top: 20rpx;
+		}
+	}
+
+	.store-info {
+		padding-left: 100rpx;
+	}
+
+	.cell-more {
+		position: absolute;
+		top: 50%;
+		transform: translateY(-50%);
+		right: 10rpx;
+
+		.iconfont {
+			color: #999;
+		}
+	}
+}
+
+.pickup-info {
+	@include wrap;
+
+	.pickup-point-info {
+		.name {
+			display: flex;
+			height: 50rpx;
+			align-items: flex-end;
+			margin-bottom: 10px;
+
+			text {
+				line-height: 1;
+				&.mark {
+					font-size: $font-size-activity-tag;
+					padding: 1px 10rpx;
+					border: 0.5px solid #ffffff;
+					border-radius: 4rpx;
+					margin-left: 10rpx;
+				}
+			}
+		}
+
+		.address,
+		.time,
+		.contact {
+			font-size: $font-size-tag;
+			line-height: 1;
+			margin-top: 16rpx;
+
+			.iconfont {
+				color: #999;
+				font-size: $font-size-tag;
+				line-height: 1;
+				margin-right: 10rpx;
+			}
+		}
+	}
+	.hr {
+		border-top: 1px dashed #e5e5e5;
+		margin: 20rpx 0;
+	}
+
+	.pickup-code-info {
+		.info {
+			text-align: center;
+		}
+
+		.code {
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			image.barcode {
+				width: 360rpx;
+				height: auto;
+				will-change: transform;
+				margin-top: 20rpx;
+			}
+			image.qrcode {
+				width: 240rpx;
+				height: auto;
+				will-change: transform;
+				margin-top: 50rpx;
+			}
+		}
+
+		.copy {
+			font-size: $font-size-tag;
+			display: inline-block;
+			color: #666;
+			background: #f7f7f7;
+			line-height: 1;
+			padding: 6rpx 14rpx;
+			margin-left: 10rpx;
+			border-radius: $border-radius;
+			border: 0.5px solid #666;
+		}
+	}
+}
+
+.virtual-mobile-wrap {
+	@include wrap;
+	margin-top: -69rpx;
+	display: flex;
+
+	view:nth-child(2) {
+		flex: 1;
+		text-align: right;
+	}
+}
+
+.verify-code-wrap {
+	@include wrap;
+
+	.wrap {
+		text-align: center;
+		line-height: 2;
+
+		.copy {
+			font-size: $font-size-tag;
+			display: inline-block;
+			color: #666;
+			background: #f7f7f7;
+			line-height: 1;
+			padding: 6rpx 14rpx;
+			margin-left: 10rpx;
+			border-radius: $border-radius;
+			border: 0.5px solid #666;
+		}
+
+		.virtual-code {
+			font-weight: bold;
+		}
+	}
+
+	.hr {
+		border-top: 1px dashed #e5e5e5;
+		margin: 20rpx 0;
+	}
+
+	.code {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		text-align: center;
+
+		image.barcode {
+			width: 400rpx;
+			margin-top: 10rpx;
+		}
+		image.qrcode {
+			width: 300rpx;
+			margin-top: 50rpx;
+		}
+
+		text {
+			margin-top: 20rpx;
+		}
+	}
+}
+
+.verify-info-wrap {
+	@include wrap;
+
+	.head {
+		font-size: $font-size-base;
+		border-bottom: 1px dashed #f7f7f7;
+		line-height: 1;
+		padding: 10rpx 0 30rpx 0;
+	}
+
+	.order-cell {
+		.tit {
+			font-size: $font-size-base;
+		}
+
+		.box text {
+			font-size: $font-size-base;
+			font-weight: bold;
+		}
+	}
+
+	.record-empty {
+		text-align: center;
+		padding-top: 30rpx;
+	}
+
+	.record-item {
+		margin-bottom: 40rpx;
+
+		&:last-child {
+			margin-bottom: 0;
+		}
+	}
+}
+
+.carmichael {
+	.order-cell {
+		.tit {
+			font-size: $font-size-base;
+		}
+
+		.box text {
+			font-size: $font-size-base;
+			font-weight: normal;
+		}
+
+		.copy {
+			font-size: $font-size-activity-tag;
+			display: inline-block;
+			background: #f7f7f7;
+			line-height: 1;
+			padding: 6rpx 10rpx;
+			margin-left: 10rpx;
+			border-radius: $border-radius;
+			border: 2rpx solid #d2d2d2;
+		}
+	}
+}
+
+.site-wrap {
+	@include wrap;
+	padding: 10rpx 30rpx;
+
+	.site-header {
+		display: flex;
+		align-items: center;
+
+		.icon-dianpu {
+			display: inline-block;
+			line-height: 1;
+			margin-right: 12rpx;
+			font-size: $font-size-base;
+		}
+	}
+
+	.site-body {
+		.goods-item {
+			padding-top: 20rpx;
+			border-bottom: 2rpx solid #f7f7f7;
+			&:last-child {
+				border-bottom: 0;
+			}
+		}
+
+		.goods-wrap {
+			margin-bottom: 20rpx;
+			display: flex;
+			position: relative;
+
+			&:last-of-type {
+				margin-bottom: 0;
+			}
+
+			.goods-img {
+				width: 160rpx;
+				height: 160rpx;
+				margin-right: 20rpx;
+
+				image {
+					width: 100%;
+					height: 100%;
+					border-radius: $border-radius;
+				}
+			}
+
+			.goods-info {
+				flex: 1;
+				position: relative;
+				display: flex;
+				flex-direction: column;
+				justify-content: space-between;
+				max-width: calc(100% - 180rpx);
+
+				.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;
+				}
+
+				.goods-sub-section {
+					width: 100%;
+					line-height: 1.3;
+					display: flex;
+					margin-top: 20rpx;
+
+					.goods-price {
+						font-weight: 700;
+						font-size: $font-size-activity-tag;
+						color: var(--price-color);
+					}
+
+					.unit {
+						font-weight: 700;
+						font-size: $font-size-tag;
+						margin-right: 2rpx;
+					}
+
+					view {
+						flex: 1;
+						line-height: 1.3;
+						&:last-of-type {
+							text-align: right;
+							font-weight: bold;
+
+							.iconfont {
+								line-height: 1;
+								font-size: $font-size-tag;
+							}
+						}
+					}
+				}
+
+				.goods-card {
+					text-align: right;
+				}
+			}
+		}
+
+		.goods-form {
+			.tit {
+				font-size: $font-size-base;
+				width: 190rpx;
+			}
+
+			.box {
+				padding-right: 0;
+
+				text {
+					font-size: $font-size-base;
+					word-wrap: break-word;
+					word-break: break-all;
+				}
+				.copy {
+					font-size: $font-size-activity-tag !important;
+					display: inline-block;
+					background: #f7f7f7;
+					line-height: 1;
+					padding: 6rpx 10rpx;
+					margin-left: 20rpx;
+					border-radius: $border-radius;
+					border: 2rpx solid #d2d2d2;
+					float: right;
+				}
+			}
+		}
+
+		.goods-action {
+			text-align: right;
+			margin: 20rpx 0;
+
+			navigator {
+				display: inline-block;
+			}
+
+			.order-box-btn {
+				height: 48rpx !important;
+				line-height: 48rpx !important;
+				font-size: $font-size-tag !important;
+				display: inline-block;
+				background: #fff;
+				border: 2rpx solid #999;
+				margin-left: 10rpx;
+				box-sizing: content-box;
+			}
+		}
+	}
+}
+
+.order-cell {
+	display: flex;
+	margin: 20rpx 0;
+	align-items: center;
+	background: #fff;
+	line-height: 40rpx;
+
+	.tit {
+		text-align: left;
+	}
+
+	.box {
+		flex: 1;
+		padding: 0 20rpx;
+		line-height: inherit;
+
+		.textarea {
+			height: 40rpx;
+		}
+	}
+
+	.img-box {
+		display: flex;
+		flex-wrap: wrap;
+
+		.img {
+			width: 100rpx;
+			height: 100rpx;
+			display: flex;
+			flex-direction: column;
+			justify-content: center;
+			align-items: center;
+			margin-right: 30rpx;
+			margin-bottom: 30rpx;
+			position: relative;
+			border-radius: $border-radius;
+			line-height: 1;
+			overflow: hidden;
+
+			image {
+				width: 100%;
+			}
+		}
+	}
+
+	.iconfont {
+		color: #bbb;
+		font-size: $font-size-base;
+	}
+
+	.order-pay {
+		padding: 0;
+
+		text {
+			display: inline-block;
+			margin-left: 6rpx;
+		}
+	}
+}
+
+.order-summary {
+	@include wrap;
+
+	.order-cell {
+		&:first-child {
+			margin-top: 0;
+		}
+
+		.tit {
+			font-size: $font-size-base;
+			width: 190rpx;
+		}
+
+		.box {
+			display: flex;
+			align-items: center;
+
+			text {
+				font-size: $font-size-base;
+				word-wrap: break-word;
+				word-break: break-all;
+			}
+		}
+
+		.copy {
+			white-space: nowrap;
+			font-size: $font-size-activity-tag !important;
+			display: inline-block;
+			background: #f7f7f7;
+			line-height: 1;
+			padding: 6rpx 10rpx;
+			margin-left: 10rpx;
+			border-radius: $border-radius;
+			border: 2rpx solid #d2d2d2;
+		}
+	}
+
+	.hr {
+		// width: calc(100% - 190rpx);
+		width: 100%;
+		height: 2rpx;
+		background: #f7f7f7;
+		margin-bottom: 20rpx;
+	}
+}
+
+.order-money {
+	@include wrap;
+
+	.order-cell {
+		.tit {
+			font-size: $font-size-base;
+		}
+
+		.box {
+			font-weight: 600;
+			padding: 0;
+            text-align: right;
+
+			text {
+				font-size: $font-size-base;
+				font-weight: bold;
+			}
+			> text.color-text {
+				color: var(--price-color);
+			}
+
+			.operator {
+				font-size: $font-size-tag;
+				margin-right: 6rpx;
+			}
+			&.align-right {
+				.color-base-text {
+					text {
+						color: var(--price-color);
+					}
+				}
+			}
+		}
+	}
+}
+
+.kefu {
+	@include wrap;
+	margin: 30rpx 0 10rpx;
+	border-top: 2rpx solid #f7f7f7;
+	padding-bottom: 0;
+	padding-top: 30rpx;
+	& > view {
+		@include flex-row-center;
+
+		.iconfont {
+			font-weight: bold;
+			margin-right: 10rpx;
+			font-size: $font-size-base;
+			line-height: 1;
+		}
+	}
+
+	button {
+		width: 100%;
+		// position: absolute;
+		border: none;
+		z-index: 1;
+		padding: 0;
+		margin: 0;
+		background: none;
+		height: 50rpx;
+		line-height: 50rpx;
+		display: flex;
+		justify-content: center;
+		&::after {
+			border: none !important;
+		}
+		.iconfont {
+			margin-right: 10rpx;
+		}
+	}
+}
+
+.fixed-bottom-box {
+	height: 80rpx;
+}
+.order-action {
+	text-align: right;
+
+	.order-box-btn {
+		margin-right: $margin-both;
+		margin-left: 0;
+		font-size: $font-size-tag;
+		height: 60rpx;
+		line-height: 60rpx;
+		box-sizing: content-box;
+		min-width: 60rpx;
+		text-align: center;
+
+		&.color-base-bg {
+			color: var(--btn-text-color);
+		}
+
+		&:last-child {
+			margin-right: 0;
+		}
+	}
+}
+.status-name {
+	view,
+	text {
+		font-size: $font-size-toolbar;
+		color: #fff;
+		line-height: 1;
+		margin-top: 40rpx;
+		text-align: left;
+	}
+
+	.desc {
+		font-size: $font-size-tag;
+		margin: 10rpx 0 0 0;
+	}
+}
+
+.head-nav {
+	width: 100%;
+	height: var(--status-bar-height);
+}
+
+.head-nav.active {
+	padding-top: 40rpx;
+}
+
+.head-return {
+	height: 90rpx;
+	line-height: 90rpx;
+	color: #fff;
+	font-weight: 600;
+	font-size: $font-size-toolbar;
+	position: relative;
+	text-align: center;
+	text {
+		position: absolute;
+		top: 50%;
+		transform: translateY(-50%);
+		left: 20rpx;
+		display: inline-block;
+		margin-right: 10rpx;
+		font-size: $font-size-toolbar;
+	}
+}
+
+.store-detail view {
+	font-size: $font-size-activity-tag;
+}
+
+.store-wrap {
+	@include wrap;
+	margin-top: -76rpx;
+
+	.store-info {
+		display: flex;
+		align-items: center;
+		padding-left: 50rpx;
+		position: relative;
+
+		.icon {
+			left: 0;
+			position: absolute;
+			top: 4rpx;
+
+			.iconfont {
+				line-height: 50rpx;
+				font-size: $font-size-base;
+			}
+			.icon-mendian {
+				font-size: $font-size-toolbar;
+			}
+		}
+
+		.store-name {
+			display: flex;
+
+			.name {
+				flex: 1;
+			}
+		}
+
+		.store-info-detail {
+			flex: 1;
+			.store-detail view {
+				font-size: $font-size-goods-tag + 2rpx;
+			}
+			& > view:first-of-type {
+				font-size: $font-size-tag + 2rpx;
+			}
+		}
+		.cell-more {
+			margin-left: 50rpx;
+		}
+	}
+}
+.pick-block {
+	&.first-pick-block {
+		border-top: 2rpx solid #f1f1f1;
+	}
+	display: flex;
+	align-items: center;
+	margin-top: 20rpx;
+	padding-top: 20rpx;
+	input,
+	.last-child {
+		flex: 1;
+		text-align: right;
+		font-size: $font-size-tag;
+	}
+}
+.sku {
+	display: flex;
+	line-height: 1;
+	margin-top: 10rpx;
+	margin-bottom: 10rpx;
+}
+.goods-spec {
+	color: #838383;
+	font-size: $font-size-goods-tag;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+	flex: 1;
+}
+
+.fixed-bottom {
+	width: 100%;
+	position: fixed;
+	left: 0;
+	bottom: 0;
+	padding: 10rpx 30rpx;
+	box-sizing: border-box;
+	background: #ffffff;
+	z-index: 5;
+}
+
+.order-cell.order-form {
+	.box {
+		display: block;
+		padding-right: 0;
+		.copy {
+			margin-left: 20rpx;
+			float: right;
+		}
+	}
+}
diff --git a/pages/order/public/css/list.scss b/pages/order/public/css/list.scss
new file mode 100644
index 0000000..f90c89f
--- /dev/null
+++ b/pages/order/public/css/list.scss
@@ -0,0 +1,410 @@
+$margin-both: 24rpx;
+
+.order-container {
+	width: 100vw;
+}
+
+.align-right {
+	text-align: right;
+}
+
+.cate-search {
+	width: calc(100% - 48rpx);
+	background: #ffffff;
+	padding: 10rpx 24rpx 0 24rpx;
+	/* #ifdef H5 */
+	padding-top: 30rpx;
+	/* #endif */
+	position: relative;
+	z-index: 998;
+
+	input {
+		font-size: $font-size-base;
+		height: 76rpx;
+		padding: 0 25rpx 0 30rpx;
+		line-height: 60rpx;
+		width: calc(100% - 120rpx);
+		background: none;
+	}
+
+	text {
+		font-size: 32rpx;
+		color: $color-tip;
+		width: 120rpx;
+		text-align: center;
+	}
+
+	.search-box {
+		width: 100%;
+		background: $color-bg;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		border-radius: 100rpx;
+	}
+}
+
+.order-nav {
+	width: 100vw;
+	height: 80rpx;
+	flex-direction: row;
+	/* #ifndef APP-PLUS */
+	white-space: nowrap;
+	/* #endif */
+	background: #fff;
+	display: flex;
+	position: fixed;
+	left: 0;
+	z-index: 998;
+	justify-content: space-around;
+	border-radius: 0px 0px 24rpx 24rpx;
+
+	.uni-tab-item {
+		width: 120rpx;
+		text-align: center;
+	}
+
+	.uni-tab-item-title {
+		display: inline-block;
+		height: 80rpx;
+		line-height: 80rpx;
+		border-bottom: 1px solid #fff;
+		flex-wrap: nowrap;
+		/* #ifndef APP-PLUS */
+		white-space: nowrap;
+		/* #endif */
+		text-align: center;
+		font-size: 30rpx;
+		position: relative;
+	}
+
+	.uni-tab-item-title-active::after {
+		content: ' ';
+		display: block;
+		position: absolute;
+		left: 0;
+		bottom: 0;
+		width: 100%;
+		height: 6rpx;
+		background: linear-gradient(270deg, var(--base-color-light-9) 0%, var(--base-color) 100%);
+	}
+
+	::-webkit-scrollbar {
+		width: 0;
+		height: 0;
+		color: transparent;
+	}
+}
+
+.order-item {
+	margin: $margin-updown $margin-both;
+	border-radius: 12rpx;
+	background: #fff;
+	position: relative;
+
+	.order-header {
+		display: flex;
+		align-items: center;
+		position: relative;
+		padding: $padding 24rpx 26rpx 24rpx;
+
+		&.waitpay {
+			padding-left: 70rpx;
+
+			.icon-yuan_checked,
+			.icon-yuan_checkbox {
+				font-size: $font-size-toolbar;
+				position: absolute;
+				top: 48%;
+				left: 20rpx;
+				transform: translateY(-50%);
+			}
+			.icon-yuan_checkbox {
+				color: $color-tip;
+			}
+		}
+
+		.icon-dianpu {
+			display: inline-block;
+			line-height: 1;
+			margin-right: 12rpx;
+			font-size: $font-size-base;
+		}
+
+		.order-no {
+			font-size: 26rpx;
+		}
+		.order-type-name {
+			font-size: 26rpx;
+			margin-left: 10rpx;
+		}
+
+		.status-name {
+			flex: 1;
+			text-align: right;
+			font-size: 26rpx;
+			font-weight: 600;
+		}
+	}
+
+	.order-body {
+		.goods-wrap {
+			display: flex;
+			position: relative;
+			padding: 0 24rpx 30rpx 24rpx;
+
+			&:last-of-type {
+				margin-bottom: 0;
+			}
+
+			.goods-img {
+				width: 160rpx;
+				height: 160rpx;
+				margin-right: 20rpx;
+
+				image {
+					width: 100%;
+					height: 100%;
+					border-radius: $border-radius;
+				}
+			}
+
+			.goods-info {
+				flex: 1;
+				position: relative;
+				max-width: calc(100% - 180rpx);
+				display: flex;
+				flex-direction: column;
+
+				.pro-info {
+					flex: 1;
+				}
+
+				.goods-name {
+					display: -webkit-box;
+					-webkit-box-orient: vertical;
+					-webkit-line-clamp: 2;
+					overflow: hidden;
+					line-height: 1.5;
+					font-size: $font-size-base;
+					color: $color-title;
+				}
+
+				.goods-sub-section {
+					width: 100%;
+					line-height: 1.3;
+					display: flex;
+					margin-top: 14rpx;
+
+					.goods-price {
+						font-size: $font-size-tag;
+						color: var(--price-color);
+						flex: 1;
+						font-weight: bold;
+					}
+					.goods-num {
+						font-size: $font-size-tag;
+						color: $color-tip;
+						flex: 1;
+						text-align: right;
+						line-height: 1;
+
+						.iconfont {
+							font-size: $font-size-tag;
+						}
+					}
+					.goods-type {
+						font-size: $font-size-tag;
+					}
+
+					.unit {
+						font-size: $font-size-tag;
+						margin-right: 2rpx;
+					}
+
+					view {
+						flex: 1;
+						line-height: 1.3;
+						display: flex;
+						flex-direction: column;
+
+						&:last-of-type {
+							text-align: right;
+
+							.iconfont {
+								line-height: 1;
+								font-size: $font-size-tag;
+							}
+						}
+					}
+				}
+
+				.goods-action {
+					text-align: right;
+
+					.action-btn {
+						line-height: 1;
+						padding: 14rpx 20rpx;
+						color: $color-title;
+						display: inline-block;
+						border-radius: $border-radius;
+						background: #fff;
+						border: 2rpx solid #999;
+						font-size: $font-size-tag;
+						margin-left: 10rpx;
+					}
+				}
+			}
+		}
+
+		.multi-order-goods {
+			width: calc(100vw - 96rpx);
+			white-space: nowrap;
+			margin: 0 24rpx 30rpx 24rpx !important;
+			position: relative;
+
+			.scroll-view {
+				width: 100%;
+			}
+
+			.goods-wrap {
+				padding: 0;
+			}
+
+			.goods-img {
+				min-width: 160rpx;
+			}
+
+			.shade {
+				position: absolute;
+				z-index: 5;
+				height: 100%;
+				width: 44rpx;
+				right: 0;
+				top: 0;
+
+				image {
+					width: 100%;
+					height: 100%;
+				}
+			}
+		}
+	}
+
+	.order-footer {
+		.order-base-info {
+			.total {
+				padding: $padding;
+				font-size: $font-size-tag;
+				background: rgba(248, 248, 248, 0.5);
+				display: flex;
+				margin: 0 24rpx;
+
+				& > text {
+					flex: 1;
+					line-height: 1;
+					margin-left: 10rpx;
+				}
+			}
+
+			.order-type {
+				padding-top: 20rpx;
+				flex: 0.5;
+
+				& > text {
+					line-height: 1;
+				}
+			}
+		}
+
+		.order-action {
+			text-align: right;
+			padding: 30rpx 24rpx;
+			position: relative;
+
+			.order-time {
+				position: absolute;
+				top: 35rpx;
+				left: 30rpx;
+				display: flex;
+				align-items: center;
+				font-size: 10px;
+				color: #b5b6b9;
+
+				image {
+					width: 26rpx;
+					height: 26rpx;
+					margin-right: 6rpx;
+				}
+			}
+
+			.action-btn {
+				line-height: 1;
+				padding: 20rpx 26rpx;
+				color: #333;
+				display: inline-block;
+				border-radius: $border-radius;
+				background: #fff;
+				border: 2rpx solid #999;
+				font-size: $font-size-tag;
+				margin-left: 10rpx;
+			}
+		}
+	}
+}
+
+/deep/ #action-date .uni-countdown .uni-countdown__number {
+	border: none !important;
+	padding: 0 !important;
+	margin: 0 !important;
+}
+
+.order-batch-action {
+	position: fixed;
+	z-index: 5;
+	left: 0;
+	bottom: 0;
+	width: 100vw;
+	height: 100rpx;
+	background: #fff;
+	box-shadow: 0 0px 10px rgba(0, 0, 0, 0.1);
+	text-align: right;
+
+	&.bottom-safe-area {
+		padding-bottom: constant(safe-area-inset-bottom);
+		padding-bottom: env(safe-area-inset-bottom);
+	}
+
+	.action-btn {
+		height: 68rpx;
+		line-height: 68rpx;
+		background: #fff;
+		padding: 0 40rpx;
+		display: inline-block;
+		text-align: center;
+		margin: 16rpx 20rpx 16rpx 0;
+		border-radius: $border-radius;
+		border: 1px solid #ffffff;
+
+		&.white {
+			height: 68rpx;
+			line-height: 68rpx;
+			color: #333;
+			border: 1px solid #999;
+			background: #fff;
+		}
+	}
+}
+.sku {
+	display: flex;
+	line-height: 1;
+	margin-top: 10rpx;
+}
+.goods-spec {
+	color: $color-tip;
+	font-size: $font-size-goods-tag;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+	flex: 1;
+}
diff --git a/pages/order/public/js/orderMethod.js b/pages/order/public/js/orderMethod.js
new file mode 100644
index 0000000..b741e30
--- /dev/null
+++ b/pages/order/public/js/orderMethod.js
@@ -0,0 +1,262 @@
+export default {
+	methods: {
+		/**
+		 * 订单支付
+		 * @param {Object} orderData
+		 */
+		orderPay(orderData) {
+			if (orderData.adjust_money == 0) {
+				this.pay();
+			} else {
+				uni.showModal({
+					title: '提示',
+					content: '商家已将支付金额调整为' + orderData.pay_money + '元，是否继续支付？',
+					success: res => {
+						if (res.confirm) {
+							this.pay();
+						}
+					}
+				})
+			}
+		},
+		pay() {
+			this.$api.sendRequest({
+				url: '/api/order/pay',
+				data: {
+					order_ids: this.orderData.order_id
+				},
+				success: res => {
+					if (res.code >= 0) {
+						this.$refs.choosePaymentPopup.getPayInfo(res.data);
+					} else {
+						this.$util.showToast({
+							title: res.message
+						});
+					}
+				}
+			})
+		},
+		/**
+		 * 关闭订单
+		 * @param order_id
+		 * @param callback
+		 */
+		orderClose(order_id, callback) {
+			uni.showModal({
+				title: '提示',
+				content: '您确定要关闭该订单吗？',
+				success: res => {
+					if (res.confirm) {
+						this.$api.sendRequest({
+							url: '/api/order/close',
+							data: {
+								order_id
+							},
+							success: res => {
+								if (res.code >= 0) {
+									typeof callback == 'function' && callback();
+								} else {
+									this.$util.showToast({
+										title: '当前订单可能存在拼团，维权等操作，' + res.message +
+											'不可以关闭哦!',
+										duration: 2000
+									})
+								}
+							}
+						})
+					}
+				}
+			})
+		},
+		/**
+		 * 订单收货
+		 * @param orderData
+		 * @param callback
+		 */
+		orderDelivery(orderData, callback) {
+			// 如果不在微信小程序中
+			// #ifndef MP-WEIXIN
+			uni.showModal({
+				title: '提示',
+				content: '您确定已经收到货物了吗？',
+				success: res => {
+					if (res.confirm) {
+						this.$api.sendRequest({
+							url: '/api/order/takedelivery',
+							data: {
+								order_id: orderData.order_id
+							},
+							success: res => {
+								this.$util.showToast({
+									title: res.message
+								})
+								typeof callback == 'function' && callback();
+							}
+						})
+					}
+				}
+			})
+			// #endif
+
+			// #ifdef MP-WEIXIN
+			// 检测微信小程序是否已开通发货信息管理服务
+			if (orderData.pay_type == 'wechatpay' && wx.openBusinessView && orderData.is_trade_managed) {
+				wx.openBusinessView({
+					businessType: 'weappOrderConfirm',
+					extraData: {
+						merchant_id: orderData.pay_config.mch_id,
+						merchant_trade_no: orderData.out_trade_no
+					},
+					success: res => {
+						if (res.extraData.status == 'success') {
+							this.$api.sendRequest({
+								url: '/api/order/takedelivery',
+								data: {
+									order_id: orderData.order_id
+								},
+								success: res => {
+									this.$util.showToast({
+										title: res.message
+									})
+									typeof callback == 'function' && callback();
+								}
+							})
+						} else {
+							this.$api.sendRequest({
+								url: '/api/order/takedelivery',
+								data: {
+									order_id: orderData.order_id
+								},
+								success: res => {
+									this.$util.showToast({
+										title: res.message
+									})
+									typeof callback == 'function' && callback();
+								}
+							})
+						}
+					},
+					fail: function(res) {
+						console.log('fail', res);
+					}
+				})
+			} else {
+				uni.showModal({
+					title: '提示',
+					content: '您确定已经收到货物了吗？',
+					success: res => {
+						if (res.confirm) {
+							this.$api.sendRequest({
+								url: '/api/order/takedelivery',
+								data: {
+									order_id: orderData.order_id
+								},
+								success: res => {
+									this.$util.showToast({
+										title: res.message
+									})
+									typeof callback == 'function' && callback();
+								}
+							})
+						}
+					}
+				})
+			}
+			// #endif
+		},
+		/**
+		 * 订单虚拟商品收货
+		 * @param orderData
+		 * @param callback
+		 */
+		orderVirtualDelivery(orderData, callback) {
+			// 如果不在微信小程序中
+			// #ifndef MP-WEIXIN
+			uni.showModal({
+				title: '提示',
+				content: '您确定要进行收货吗？',
+				success: res => {
+					if (res.confirm) {
+						this.$api.sendRequest({
+							url: '/api/order/membervirtualtakedelivery',
+							data: {
+								order_id: orderData.order_id
+							},
+							success: res => {
+								this.$util.showToast({
+									title: res.message
+								})
+								typeof callback == 'function' && callback();
+							}
+						})
+					}
+				},
+			})
+			// #endif
+
+			// #ifdef MP-WEIXIN
+			// 检测微信小程序是否已开通发货信息管理服务
+			if (orderData.pay_type == 'wechatpay' && wx.openBusinessView && orderData.is_trade_managed) {
+				wx.openBusinessView({
+					businessType: 'weappOrderConfirm',
+					extraData: {
+						merchant_id: orderData.pay_config.mch_id,
+						merchant_trade_no: orderData.out_trade_no
+					},
+					success: res => {
+						if (res.extraData.status == 'success') {
+							this.$api.sendRequest({
+								url: '/api/order/membervirtualtakedelivery',
+								data: {
+									order_id: orderData.order_id
+								},
+								success: res => {
+									this.$util.showToast({
+										title: res.message
+									})
+									typeof callback == 'function' && callback();
+								}
+							})
+						} else {
+							this.$api.sendRequest({
+								url: '/api/order/membervirtualtakedelivery',
+								data: {
+									order_id: orderData.order_id
+								},
+								success: res => {
+									this.$util.showToast({
+										title: res.message
+									})
+									typeof callback == 'function' && callback();
+								}
+							})
+						}
+					},
+					fail: function(res) {}
+				})
+			} else {
+				uni.showModal({
+					title: '提示',
+					content: '您确定要进行收货吗？',
+					success: res => {
+						if (res.confirm) {
+							this.$api.sendRequest({
+								url: '/api/order/membervirtualtakedelivery',
+								data: {
+									order_id: orderData.order_id
+								},
+								success: res => {
+									this.$util.showToast({
+										title: res.message
+									})
+									typeof callback == 'function' && callback();
+								}
+							})
+						}
+					},
+				})
+			}
+			// #endif
+		},
+	}
+}
\ No newline at end of file
diff --git a/pages/order/public/js/refundMethod.js b/pages/order/public/js/refundMethod.js
new file mode 100644
index 0000000..2feb464
--- /dev/null
+++ b/pages/order/public/js/refundMethod.js
@@ -0,0 +1,30 @@
+export default {
+	methods: {
+		/**
+		 * 撤销退款申请
+		 * @param {Object} order_goods_id
+		 * @param {Object} callback
+		 */
+		cancleRefund(order_goods_id, callback) {
+			uni.showModal({
+				content: '撤销之后本次申请将会关闭,如后续仍有问题可再次发起申请。',
+				cancelText: '暂不撤销',
+				cancelColor: '#898989',
+				success: res => {
+					if (res.confirm) {
+						this.$api.sendRequest({
+							url: '/api/orderrefund/cancel',
+							data: {
+								order_goods_id
+							},
+							success: res => {
+								typeof callback == 'function' && callback(res);
+							}
+						})
+					}
+				}
+			})
+		},
+
+	}
+}
diff --git a/pages_promotion/components/l-time/l-time.vue b/pages_promotion/components/l-time/l-time.vue
new file mode 100644
index 0000000..4ba8dee
--- /dev/null
+++ b/pages_promotion/components/l-time/l-time.vue
@@ -0,0 +1,56 @@
+<template>
+	<text>{{ temp }}</text>
+</template>
+
+<script>
+import _time_ from './time.js';
+export default {
+	name: 'l-time',
+	props: {
+		//日期字符串
+		text: {
+			type: [String, Number, Date],
+			default: ''
+		},
+		//是否显示大于当前时间日期，默认false：大于显示刚刚
+		maxDate: {
+			type: Boolean,
+			default: false
+		}
+	},
+	data() {
+		return {
+			textVal: this.text
+		};
+	},
+	watch: {
+		text() {
+			this.textVal = this.text;
+		}
+	},
+	computed: {
+		temp() {
+			return this.getText();
+		}
+	},
+	methods: {
+		getText() {
+			let self = this;
+			let timeVal = _time_.getFormatTime(self.textVal, self.maxDate);
+			if (timeVal && (timeVal.endsWith('刚刚') || timeVal.endsWith('分钟前'))) {
+				setTimeout(() => {
+					let temp = self.textVal;
+					self.textVal = '';
+					self.textVal = temp;
+				}, 60000);
+			}
+			return this.textVal ? timeVal : '';
+		},
+		onClick() {
+			this.$emit('on-tap', this.textVal);
+		}
+	}
+};
+</script>
+
+<style></style>
diff --git a/pages_promotion/components/l-time/time.js b/pages_promotion/components/l-time/time.js
new file mode 100644
index 0000000..76c5f4b
--- /dev/null
+++ b/pages_promotion/components/l-time/time.js
@@ -0,0 +1,161 @@
+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_;
diff --git a/pages_promotion/components/yuyue-date/yuyue-date.js b/pages_promotion/components/yuyue-date/yuyue-date.js
new file mode 100644
index 0000000..bfe777e
--- /dev/null
+++ b/pages_promotion/components/yuyue-date/yuyue-date.js
@@ -0,0 +1,98 @@
+//字符串拼接
+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/components/yuyue-date/yuyue-date.scss b/pages_promotion/components/yuyue-date/yuyue-date.scss
new file mode 100644
index 0000000..7e37727
--- /dev/null
+++ b/pages_promotion/components/yuyue-date/yuyue-date.scss
@@ -0,0 +1,158 @@
+.content {
+	text-align: center;
+	height: 100%;
+	.head {
+		position: relative;
+		font-weight: bold;
+		padding: 32rpx 0 24rpx;
+		font-size: $font-size-toolbar;
+		.iconfont {
+			position: absolute;
+			right: 20rpx;
+		}
+	}
+
+	.container {
+		view,
+		text,
+		image {
+			box-sizing: border-box;
+		}
+		.date-list-wrap {
+			display: flex;
+			align-items: center;
+			border-bottom: 2rpx solid #e6e6e6;
+			scroll-view {
+				width: 80%;
+				white-space: nowrap;
+				height: 100rpx;
+				line-height: 100rpx;
+				background-color: #fff;
+				position: relative;
+				.flex-box {
+					display: inline-block;
+					width: 25%;
+
+					&.active {
+						.date-box {
+							border: none;
+							.days {
+								font-weight: bold;
+								color: #818181;
+							}
+							.date {
+								font-weight: bold;
+								color: #818181;
+							}
+						}
+					}
+					.date-box {
+						color: #909399;
+						text {
+							font-size: $font-size-tag;
+						}
+					}
+				}
+			}
+			.appointed-day {
+				flex: 1;
+				border-left: 2rpx solid #e6e6e6;
+				.day-box,
+				.iconfont {
+					font-size: $font-size-tag;
+					color: #909399;
+				}
+				.iconfont {
+					margin-left: 4rpx;
+				}
+			}
+		}
+		.time-box {
+			padding: 0 12rpx;
+			display: flex;
+			flex-wrap: wrap;
+			overflow: scroll;
+			background-color: #fff;
+			height: auto;
+			.item {
+				width: 25%;
+				padding: 0 8rpx;
+				margin-top: 30rpx;
+				&-box {
+					width: 100%;
+					height: 140rpx;
+					padding: 0 40rpx;
+					background: #fff;
+					color: #333;
+					border: 2rpx solid #eeeeee;
+					font-size: $font-size-base;
+					border-radius: 10rpx;
+					display: flex;
+					flex-direction: column;
+					align-items: center;
+					justify-content: center;
+					&.disable {
+						background: #f1f3f6 !important;
+						color: #999 !important;
+					}
+					&.active {
+						background: $base-color;
+						color:#fff;
+						// background: #0094D7;
+						border: 2rpx solid $base-color;
+						font-weight: bold;
+					}
+					.all {
+						font-size: $font-size-tag;
+						padding-top: 10rpx;
+					}
+					//  自定义样式
+					&.diy{
+						height: 60rpx;
+						border-radius: 40rpx;
+						.all{
+							display: none;
+						}
+					}
+				}
+			}
+		}
+	}
+
+	.bottom {
+		display: flex;
+		flex-direction: row;
+		position: fixed;
+		align-items: center;
+		bottom: 0;
+		top: auto;
+		left: 0;
+		width: 100%;
+		background-color: #fff;
+		box-shadow: 0 -2rpx 20rpx #bcbcbc;
+
+		.show-time {
+			width: 66%;
+			height: 100rpx;
+			line-height: 100rpx;
+			font-size: $font-size-base;
+			text-align: left;
+			margin-left: 40rpx;
+		}
+
+		.submit-btn {
+			width: 25%;
+			height: 70rpx;
+			line-height: 70rpx;
+			font-size: $font-size-base;
+		}
+	}
+}
+
+.yuyue-date-desc{
+	padding-top: 2rpx;
+	padding-bottom: 4rpx;
+	font-size: $font-size-tag;
+	color: $color-sub;
+	text-align: center;
+}
diff --git a/pages_promotion/components/yuyue-date/yuyue-date.vue b/pages_promotion/components/yuyue-date/yuyue-date.vue
new file mode 100644
index 0000000..7bc855e
--- /dev/null
+++ b/pages_promotion/components/yuyue-date/yuyue-date.vue
@@ -0,0 +1,414 @@
+<template>
+	<view>
+		<!-- <uni-popup ref="timePopup" type="bottom"> -->
+		<view class="content">
+			<!-- <view class="head">
+					<text class="title">选择时间</text>
+					<text class="iconfont iconclose" @click="close()"></text>
+				</view> -->
+			<view class="container">
+				<view class="date-list-wrap">
+					<!-- 日期列表 -->
+					<scroll-view scroll-x>
+						<block v-for="(item, index) in dateArr" :key="index">
+							<div class="flex-box" @click="selectDateEvent(index, item)">
+								<view class="date-box" :style="{ color: index == dateActive ? selectedTabColor : '#909399' }">
+									<text>{{ item.week }} {{ item.date }}</text>
+								</view>
+							</div>
+						</block>
+					</scroll-view>
+					<div class="appointed-day">
+						<uni-datetime-picker type="date" :start="pickerStartDay" :end="pickerEndDay" @change="change">
+							<text class="day-box">指定日期</text>
+							<text class="iconfont iconyoujiantou"></text>
+						</uni-datetime-picker>
+					</div>
+				</view>
+
+				<!-- 时间选项 -->
+				<view class="time-box" v-if="!isSection">
+					<block v-for="(item, _index) in timeArr" :key="_index">
+						<view class="item">
+							<view class="item-box diy" :class="{ disable: item.disable, active: isMultiple ? item.isActive : _index == timeActive }" @click="selectTimeEvent(_index, item)">
+								<!-- :style="{ color: isMultiple ? (item.isActive ? selectedItemColor : '#333') : _index == timeActive ? selectedItemColor : '#333' }" -->
+								<text>{{ item.time }}</text>
+								<!-- <text class="all">{{ item.disable ? disableText : undisableText }}</text> -->
+							</view>
+						</view>
+					</block>
+				</view>
+
+				<!-- 预约时间段 -->
+				<view class="time-box" v-else>
+					<block v-for="(item, _index) in timeArr" :key="_index">
+						<view class="item">
+							<view class="item-box" :class="{ disable: item.disable || item.isInclude, active: item.time == timeQuanBegin || item.time == timeQuanEnd }" @click="handleSelectQuantum(_index, item)">
+								<!-- :style="{ color: item.time == timeQuanBegin || item.time == timeQuanEnd ? selectedItemColor : '#333' }" -->
+								<text>{{ item.time }}</text>
+								<text class="all">{{ item.disable ? disableText : undisableText }}</text>
+							</view>
+						</view>
+					</block>
+				</view>
+			</view>
+			<!-- <view class="bottom">
+					<view class="show-time" v-if="!isMultiple && !isSection">
+						<text>预约时间：</text>
+						<text class="color-base-text">{{ orderDateTime }}</text>
+					</view>
+					<button form-type="submit" type="primary" size="mini" class="submit-btn" @click="handleSubmit">确认预约</button>
+				</view> -->
+		</view>
+		<!-- <view class="yuyue-date-desc">如不想线上预约，可致电商家电话预约</view> -->
+		<!-- </uni-popup> -->
+	</view>
+</template>
+
+<script>
+	// 插件地址：https://ext.dcloud.net.cn/plugin?id=3593
+	import {
+		initData,
+		initTime,
+		timeStamp,
+		currentTime,
+		strFormat,
+		weekDate
+	} from './yuyue-date.js';
+	export default {
+		name: 'times',
+		model: {
+			prop: 'showPop',
+			event: 'change'
+		},
+		props: {
+			isMultiple: {
+				//是否多选
+				type: Boolean,
+				default: false
+			},
+			isSection: {
+				//预约时间段
+				type: Boolean,
+				default: false
+			},
+			advanceTime: {
+				//提前预约时间
+				type: [String, Number],
+				default: "0"
+			},
+			disableText: {
+				//禁用显示的文本
+				type: String,
+				default: '已约满'
+			},
+			undisableText: {
+				//未禁用显示的文本
+				type: String,
+				default: '可预约'
+			},
+			timeInterval: {
+				// 时间间隔，小时为单位
+				type: String,
+				default: "1"
+			},
+			selectedTabColor: {
+				// 日期栏选中的颜色
+				type: String,
+				default: '#303133'
+			},
+			selectedItemColor: {
+				// 时间选中的颜色
+				type: String,
+				default: '#D50AEF'
+			},
+			beginTime: {
+				type: String,
+				default: '09:00'
+			},
+			endTime: {
+				type: String,
+				default: '19:00'
+			},
+			appointTime: {
+				// 预约的时间
+				type: Array,
+				default () {
+					return [];
+				}
+			},
+			disableTimeSlot: {
+				// 预约开始和结束时间，来禁用时间段
+				type: Object,
+				default () {
+					return {};
+				}
+			},
+			disableWeek: {
+				// 限制周几不可以预约
+				type: Array,
+				default () {
+					return [];
+				}
+			}
+		},
+		watch: {
+			appointTime: {
+				handler(val) {
+					if (val && val.length) {
+						this.initOnload();
+					}
+				}
+			},
+			beginTime: function(nVal, oVal) {
+				this.initOnload();
+				this.handleSubmit();
+			},
+			endTime: function(nVal, oVal) {
+				this.initOnload();
+				this.handleSubmit();
+			},
+		},
+		data() {
+			return {
+				pickerStartDay: '', // 指定开始日期
+				pickerEndDay: '', // 指定结束日期
+				orderDateTime: '暂无选择', // 选中时间
+				orderTimeArr: {}, //多选的时间
+				dateArr: [], //日期数据
+				timeArr: [], //时间数据
+				nowDate: '', // 当前日期
+				dateActive: 0, //选中的日期索引
+				timeActive: 0, //选中的时间索引
+				timeQuanBeginIndex: 0, //时间段开始的下标
+				selectDate: '', //选择的日期
+				selectTime: '', //选择的时间
+				timeQuanBegin: '', //时间段开始时间
+				timeQuanEnd: '' //时间段结束时间
+			};
+		},
+		created(props) {
+			this.selectDate = this.nowDate = currentTime().date;
+			this.pickerStartDay = currentTime().year + '-' + currentTime().date;
+			const now = new Date(this.pickerStartDay).getTime(); //获取当前日期的时间戳
+			let timeStr = 3600 * 24 * 1000; //一天的时间戳
+			let day = 90; // 未来3个月
+			this.pickerEndDay = timeStamp(now + timeStr * day).allDate;
+			this.initOnload();
+			this.dateArr = initData(); // 日期栏初始化
+		},
+		methods: {
+			open() {
+				this.$refs.timePopup.open();
+			},
+			close() {
+				this.$refs.timePopup.close();
+			},
+			// 指定时间
+			change(e) {
+				let date = e.split("-");
+				date = date[1] + "-" + date[2];
+				if (this.disableWeek.length && date >= weekDate()[0] && date <= weekDate()[1]) {
+					let weekBox = ['周日', '周一', '周二', '周三', '周四', '周五', '周六'];
+					let index = new Date(e).getDay();
+					if (this.disableWeek.indexOf(weekBox[index]) != -1) {
+						uni.showToast({
+							title: weekBox[index] + '不可以预约',
+							icon: 'none'
+						})
+						return false;
+					}
+				}
+				this.initOnload(e);
+				this.dateArr = initData(e); // 日期栏初始化
+				this.selectDateEvent(0, this.dateArr[0]);
+			},
+			initOnload(appointedDay) {
+				this.timeArr = initTime(this.beginTime, this.endTime, parseFloat(this.timeInterval)); //时间选项初始化
+				this.timeQuanBegin = this.timeQuanEnd = '';
+				let isFullTime = true;
+				this.timeArr.forEach((item, index) => {
+					// 判断默认是不能选择的周，则都禁止选中
+					if (this.disableWeek.length && this.selectDate >= weekDate()[0] && this.selectDate <=
+						weekDate()[1]) {
+						let weekBox = ['周日', '周一', '周二', '周三', '周四', '周五', '周六'];
+						let date = currentTime().year + '-' + this.selectDate;
+						let index = new Date(date).getDay();
+						if (this.disableWeek.indexOf(weekBox[index]) != -1) {
+							item.disable = true;
+						}
+					}
+
+					//判断是当前这一天，选中时间小于当前时间则禁用
+					if (this.selectDate == this.nowDate && currentTime().time > item.time) {
+						item.disable = true;
+					}
+
+					// 将提前预约的时间禁用 advanceTime
+					var advTime = new Date(new Date().setMinutes(new Date().getMinutes() + parseInt(this.advanceTime) * 60));
+					var advTimeStr = strFormat(advTime.getHours()) + ":" + strFormat(advTime.getMinutes()) + ":" + strFormat(advTime.getSeconds());
+					var advTimeStr1 = strFormat(advTime.getMonth() + 1) + "-" + strFormat(advTime.getDate());
+					if (this.selectDate == advTimeStr1 && advTimeStr > item.time || advTimeStr1 > this.selectDate) {
+						item.disable = true;
+					}
+
+					// 将预约的时间禁用
+					this.appointTime.forEach(t => {
+						let [date, time] = t.split(' ');
+						time = time.slice(0, -3);
+
+						if (date == currentTime().year + '-' + this.selectDate && item.time == time ||
+							date == currentTime().year + '-' + advTimeStr1 && item.time == time) {
+							item.disable = true;
+						}
+					});
+
+					// 禁用时间段
+					const cur_time = `${this.selectDate} ${item.time}`;
+					const {
+						begin_time,
+						end_time
+					} = this.disableTimeSlot;
+					if (begin_time && end_time && (begin_time <= cur_time && cur_time <= end_time)) {
+						item.disable = true;
+					}
+
+					// 判断是否当前日期时间都被预约
+					if (!item.disable) {
+						isFullTime = false;
+					}
+					this.isSection && (item.isInclude = false);
+				});
+
+				this.orderDateTime = isFullTime ? '暂无选择' : this.selectDate;
+				this.timeActive = -1;
+				for (let i = 0, len = this.timeArr.length; i < len; i++) {
+					if (!this.timeArr[i].disable) {
+						this.orderDateTime = {
+							data: `${this.selectDate}`,
+							time: `${this.timeArr[i].time}`
+						};
+						this.timeActive = i;
+						return;
+					}
+				}
+			},
+
+			// 日期选择事件
+			selectDateEvent(index, item) {
+				if (this.disableWeek.length && item.date >= weekDate()[0] && item.date <= weekDate()[1]) {
+					let weekBox = ['周日', '周一', '周二', '周三', '周四', '周五', '周六'];
+					let index = new Date(item.timeStamp).getDay();
+					if (this.disableWeek.indexOf(weekBox[index]) != -1) {
+						uni.showToast({
+							title: weekBox[index] + '不可以预约',
+							icon: 'none'
+						})
+						return false;
+					}
+				}
+
+				this.dateActive = index;
+				this.selectDate = item.date;
+				this.initOnload();
+				this.handleSubmit();
+			},
+
+			// 时间选择事件
+			selectTimeEvent(index, item) {
+				if (item.disable) return;
+				if (this.isMultiple) {
+					item.isActive = !item.isActive;
+					this.timeArr = this.timeArr.slice();
+					this.orderTimeArr[this.selectDate] = this.timeArr.reduce((prev, cur) => {
+						cur.isActive && prev.push(cur.time);
+						return prev;
+					}, []);
+				} else {
+					this.timeActive = index;
+					this.selectTime = item.time;
+					this.orderDateTime = {
+						data: `${this.selectDate}`,
+						time: `${item.time}`
+					};
+				}
+				this.handleSubmit();
+			},
+
+			// 选择时间段
+			handleSelectQuantum(index, item) {
+				if (item.disable) return;
+
+				function clearTime() {
+					this.timeQuanBeginIndex = index;
+					this.timeQuanBegin = item.time;
+					this.timeQuanEnd = '';
+				}
+
+				if (!this.timeQuanBegin) {
+					clearTime.call(this);
+					return;
+				}
+				if (!this.timeQuanEnd && this.timeQuanBegin) {
+					let isDisble = false;
+					let start = this.timeQuanBeginIndex;
+					let end = index;
+					start > end && ([start, end] = [end, start]);
+					for (let i = start + 1; i < end; i++) {
+						if (this.timeArr[i].disable) {
+							isDisble = true;
+							clearTime.call(this);
+							return;
+						}
+					}
+					if (!isDisble) {
+						for (let i = start + 1; i < end; i++) {
+							this.timeArr[i].isInclude = true;
+						}
+					}
+					this.timeQuanEnd = item.time;
+					return;
+				}
+
+				if (this.timeQuanBegin && this.timeQuanEnd) {
+					this.timeArr.forEach(t => {
+						t.isInclude = false;
+					});
+					clearTime.call(this);
+				}
+			},
+			handleChange() {
+				this.timeQuanBegin > this.timeQuanEnd && ([this.timeQuanBegin, this.timeQuanEnd] = [this.timeQuanEnd, this.timeQuanBegin]);
+			},
+			handleSubmit() {
+				if (this.isSection) {
+					this.handleChange();
+					this.$emit('change', {
+						beginTime: `${this.selectDate} ${this.timeQuanBegin}`,
+						endTime: `${this.selectDate} ${this.timeQuanEnd}`
+					});
+					return;
+				}
+
+				if (this.isMultiple) {
+					let time = [];
+					for (let date in this.orderTimeArr) {
+						this.orderTimeArr[date].forEach(item => {
+							time.push(`${date} ${item}`);
+						});
+					}
+					this.$emit('change', time);
+				} else {
+					// this.$emit('change', currentTime().year + '-' + this.orderDateTime);
+					this.$emit('change', {
+						date: currentTime().year + '-' + this.orderDateTime.data,
+						time: this.orderDateTime.time
+					});
+				}
+			}
+		}
+	};
+</script>
+<style lang="scss" scoped>
+	@import './yuyue-date.scss';
+</style>
\ No newline at end of file
diff --git a/pages_promotion/fenxiao/apply.vue b/pages_promotion/fenxiao/apply.vue
new file mode 100644
index 0000000..b7cc509
--- /dev/null
+++ b/pages_promotion/fenxiao/apply.vue
@@ -0,0 +1,813 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view class="apply">
+		<!-- 导航栏 -->
+		<!-- #ifdef H5 -->
+		<view class="head-nav color-base-bg"></view>
+		<!-- #endif -->
+		<!-- #ifndef H5 -->
+		<!-- <view class="head-nav color-base-bg" :class="{ active: isIphoneX }"></view> -->
+		<!-- #endif -->
+
+		<view v-if="status === ''">
+			<block v-if="basicsConfig.is_apply == 1">
+				<view class="image" :class="fenXiaoAgreement.agreement.img ? '' : 'color-base-bg'">
+					<image v-if="fenXiaoAgreement.agreement.img" class="apply-adv" :src="$util.img(fenXiaoAgreement.agreement.img)" mode="widthFix" style="width: 100%;"/>
+					<view class="bg ns-gradient-otherpages-fenxiao-apply-apply-bg" v-else>
+						<view class="bg-title"><text>请填写申请信息</text></view>
+						<view class="bg-img">
+							<image :src="$util.img('public/uniapp/fenxiao/apply/edit.png')" mode="scaleToFill"></image>
+						</view>
+					</view>
+				</view>
+
+				<view class="apply-wrap">
+					<view class="app-info">
+						<view class="info">
+							<view class="apply-item">
+								<view class="title">邀请人</view>
+								<text class="shuru">{{ sourceMemberInfo.fenxiao_name }}</text>
+							</view>
+							<view class="apply-item">
+								<view class="title">{{ fenxiaoWords.fenxiao_name }}名称</view>
+								<input class="input" type="text" maxlength="30" :placeholder="'请输入' + fenxiaoWords.fenxiao_name + '名称'" v-model="formData.fenXiaoName" placeholder-class="pla-cla" />
+							</view>
+							<view class="apply-item">
+								<view class="title">手机号</view>
+								<input class="input" type="number" placeholder="请输入手机号" maxlength="11" v-model="formData.mobile" placeholder-class="pla-cla" />
+							</view>
+							<view class="apply-xy" v-if="isAgreement" @click="ckeckedRuler()">
+								<view class="iconfont" :class="isChecked ? 'icon-yuan_checked color-base-text' : 'icon-yuan_checkbox'">
+								</view>
+								我已阅读并了解
+								<text class="color-base-text" @click.stop="openPopup">【{{ fenxiaoWords.fenxiao_name }}申请协议】</text>
+							</view>
+							<view class="apply-btn">
+								<button @click="applyFenXiao" class="color-base-bg">申请成为{{ fenxiaoWords.fenxiao_name }}</button>
+							</view>
+						</view>
+					</view>
+
+					<view class="apply-message-wrap" v-if="fenxiaoConfig.fenxiao_condition == 2 || fenxiaoConfig.fenxiao_condition == 3">
+						<view class="apply-message">
+							<view class="apply-message-title color-base-bg-before">分销商申请条件</view>
+							<text class="apply-message-info font-size-goods-tag" v-if="fenxiaoConfig.fenxiao_condition == 2">
+								申请成为{{ fenxiaoWords.fenxiao_name }},需要您的消费次数需要达到{{ fenxiaoConfig.consume_count }}次
+							</text>
+							<text class="apply-message-info font-size-goods-tag" v-if="fenxiaoConfig.fenxiao_condition == 3">
+								申请成为{{ fenxiaoWords.fenxiao_name }},需要您的消费金额需要达到{{ fenxiaoConfig.consume_money }}元
+							</text>
+						</view>
+					</view>
+					<view class="app-info-list" v-if="fenxiaoConfig.fenxiao_condition == 4">
+						<view class="apply-message">
+							<view class="apply-message-title color-base-bg-before">分销商申请条件</view>
+							<text class="apply-message-info font-size-goods-tag">申请成为{{ fenxiaoWords.fenxiao_name }},需要购买以下指定商品(任选其一)</text>
+						</view>
+						<view class="goods-list" v-for="(item, index) in goodsList" :key="index" @click="toDetail(item)">
+							<view class="goods-img">
+								<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="goods-content">
+								<view class="content-name">{{ item.goods_name }}</view>
+								<view class="delete-price font-size-activity-tag color-tip content-price">
+									<block>
+										<text class="unit">{{ $lang('common.currencySymbol') }}</text>
+										{{ item.market_price > 0 ? item.market_price : item.price }}
+									</block>
+								</view>
+							</view>
+						</view>
+						<view class="content-lists" v-if="isShow" @click="onOpen()">
+							{{ isOpen ? '展开更多' : '收起' }}
+							<text class="iconfont icon-unfold" style="font-weight: bold;" v-if="isOpen"></text>
+							<text class="iconfont icon-fold" v-else></text>
+						</view>
+					</view>
+				</view>
+			</block>
+			<view class="empty" v-else-if="basicsConfig.is_apply == 0" style="margin-top:40rpx;">
+				<block v-if="fenxiaoConfig.fenxiao_condition == 2 || fenxiaoConfig.fenxiao_condition == 3">
+					<image :src="$util.img('public/uniapp/fenxiao/index/no-fenxiao.png')" mode="widthFix"></image>
+					<text v-if="fenxiaoConfig.fenxiao_condition == 2">申请成为{{ fenxiaoWords.fenxiao_name }},需要您的消费次数需要达到{{ fenxiaoConfig.consume_count }}次</text>
+					<text v-if="fenxiaoConfig.fenxiao_condition == 3">
+						申请成为{{ fenxiaoWords.fenxiao_name }},需要您的消费金额需要达到{{ fenxiaoConfig.consume_money | moneyFormat }}元
+					</text>
+				</block>
+				<view class="apply-wrap" v-if="fenxiaoConfig.fenxiao_condition == 4">
+					<view class="app-info-list">
+						<view class="apply-message">
+							<view class="apply-message-title color-base-bg-before">成为分销商的条件</view>
+							<text class="apply-message-info font-size-goods-tag">成为{{ fenxiaoWords.fenxiao_name }},需要购买以下指定商品(任选其一)</text>
+						</view>
+						<view class="goods-list" v-for="(item, index) in goodsList" :key="index" @click="toDetail(item)">
+							<view class="goods-img">
+								<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="goods-content">
+								<view class="content-name">{{ item.goods_name }}</view>
+								<view class="delete-price font-size-activity-tag color-tip content-price">
+									<text class="unit">{{ $lang('common.currencySymbol') }}</text>
+									<text>{{ item.market_price > 0 ? item.market_price : item.price }}</text>
+								</view>
+							</view>
+						</view>
+						<view class="content-lists" v-if="isShow" @click="onOpen()">
+							{{ isOpen ? '展开更多' : '收起' }}
+							<text class="iconfont icon-unfold" style="font-weight: bold;" v-if="isOpen"></text>
+							<text class="iconfont icon-fold" v-else></text>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="empty" v-else>
+				<image :src="$util.img('public/uniapp/fenxiao/index/no-fenxiao.png')" mode="widthFix"></image>
+				<text>您还不是分销商</text>
+			</view>
+		</view>
+		<view class="empty" v-else>
+			<image :src="$util.img('public/uniapp/fenxiao/index/no-fenxiao.png')" mode="widthFix"></image>
+			<text v-if="status == 1">您已提交{{ fenxiaoWords.fenxiao_name }}申请，等待平台审核</text>
+			<block v-else-if="status == -1">
+				<text>您提交的{{ fenxiaoWords.fenxiao_name }}申请，已被拒绝，请再接再厉</text>
+				<view class="again-btn color-base-bg" @click="againApply">重新申请</view>
+			</block>
+		</view>
+		<view @touchmove.prevent v-if="fenXiaoAgreement.document">
+			<uni-popup ref="applyPopup" type="center" class="wap-floating">
+				<view class="conten-box">
+					<text class="iconfont icon-close" @click="toClose"></text>
+					<view class="title">{{ fenXiaoAgreement.document.title }}</view>
+					<view class="content-con">
+						<scroll-view scroll-y="true" class="con" show-scrollbar="true">
+							<rich-text :nodes="fenXiaoAgreement.document.content"></rich-text>
+						</scroll-view>
+					</view>
+				</view>
+			</uni-popup>
+		</view>
+		<loading-cover ref="loadingCover"></loading-cover>
+	</view>
+</template>
+
+<script>
+	import validate from 'common/js/validate.js';
+	import uniPopup from '@/components/uni-popup/uni-popup.vue';
+	import fenxiaoWords from 'common/js/fenxiao-words.js';
+	import htmlParser from '@/common/js/html-parser';
+	export default {
+		data() {
+			return {
+				isChecked: false,
+				isShow: true,
+				isIphoneX: false,
+				// 推荐人信息
+				sourceMemberInfo: {
+					fenxiao_name: '无'
+				},
+				formData: {
+					fenXiaoName: '',
+					mobile: ''
+				},
+				fenXiaoAgreement: {
+					agreement: {},
+					document: {}
+				},
+				isAgreement: false,
+				back: '',
+				isAbled: false,
+				status: '',
+				isSub: false,
+				fenxiaoConfig: {
+					fenxiao_condition: 0
+				},
+				basicsConfig: {},
+				goodsList: [],
+				isOpen: false
+			};
+		},
+		components: {
+			uniPopup
+		},
+		mixins: [fenxiaoWords],
+		onLoad(option) {
+			setTimeout( () => {
+				if (!this.addonIsExist.fenxiao) {
+					this.$util.showToast({
+						title: '商家未开启分销',
+						mask: true,
+						duration: 2000
+					});
+					setTimeout(() => {
+						this.$util.redirectTo('/pages/index/index');
+					}, 2000);
+				}
+			},1000);
+			this.onOpen();
+			this.getAgreement();
+			if (option.back) this.back = option.back;
+		},
+		async onShow() {
+			this.isIphoneX = this.$util.uniappIsIPhoneX();
+
+			if (this.fenxiaoWords && this.fenxiaoWords.fenxiao_name) this.$langConfig.title(this.fenxiaoWords.fenxiao_name + '申请');
+
+			if (this.storeToken) {
+				this.applyStatus();
+				this.getSourceMemberInfo();
+			} else {
+				this.$util.redirectTo('/pages_tool/login/login', {
+					back: '/pages_promotion/fenxiao/apply'
+				}, 'redirectTo');
+			}
+
+			this.getFenxiaoConfig();
+			this.getFenxiaoBasicsConfig();
+		},
+		methods: {
+			toClose() {
+				this.$refs.applyPopup.close();
+			},
+			ckeckedRuler() {
+				this.isChecked = !this.isChecked;
+			},
+			goodsImg(imgStr) {
+				let imgs = imgStr.split(',');
+				return imgs[0] ?
+					this.$util.img(imgs[0], {
+						size: 'mid'
+					}) :
+					this.$util.getDefaultImage().goods;
+			},
+			imgError(index) {
+				this.goodsList[index].goods_image = this.$util.getDefaultImage().goods;
+			},
+			onOpen() {
+				this.isOpen = this.isOpen ? false : true;
+				this.getFenxiaoConfig();
+			},
+			goodsTag(data) {
+				return data.label_name || '';
+			},
+			//商品详情
+			toDetail(item) {
+				this.$util.redirectTo('/pages/goods/detail', {
+					goods_id: item.goods_id
+				});
+			},
+			applyStatus() {
+				this.$api.sendRequest({
+					url: '/fenxiao/api/apply/status',
+					data: {},
+					success: res => {
+						if (res.code >= 0 && res.data) {
+							this.status = res.data.status;
+							this.isSub = false;
+							if (this.status == 2) {
+								this.$util.redirectTo('/pages/member/index');
+							}
+						}
+						this.$refs.loadingCover.hide();
+					}
+				});
+			},
+			navigateBack() {
+				this.$util.goBack();
+			},
+			applyFenXiao() {
+				if (!this.fenXiaoValidata()) return;
+				if (this.isAgreement && !this.isChecked) {
+					this.$util.showToast({
+						title: '请仔细阅读协议，并勾选'
+					});
+					return;
+				}
+
+				if (this.isSub) return;
+				this.isSub = true;
+				this.$api.sendRequest({
+					url: '/fenxiao/api/apply/applyfenxiao',
+					data: {
+						fenxiao_name: this.formData.fenXiaoName,
+						mobile: this.formData.mobile
+					},
+					success: res => {
+						if (res.code >= 0 && res.data) {
+							if (this.basicsConfig.is_examine == 1) {
+								this.applyStatus();
+							} else {
+								this.$util.redirectTo('/pages_promotion/fenxiao/index');
+							}
+						} else {
+							this.isSub = false;
+							this.$util.showToast({
+								title: res.message
+							});
+						}
+					}
+				});
+			},
+			// 申请协议
+			getAgreement() {
+				this.$api.sendRequest({
+					url: '/fenxiao/api/config/agreement',
+					success: res => {
+						if (res.code === 0) {
+							this.fenXiaoAgreement = res.data;
+							if (this.fenXiaoAgreement.agreement.is_agreement === '1') {
+								if (this.fenXiaoAgreement.document.content) this.fenXiaoAgreement.document
+									.content = htmlParser(this.fenXiaoAgreement.document.content);
+								this.isAgreement = true;
+							}
+						}
+					}
+				});
+			},
+			openPopup() {
+				if (this.isAgreement) this.$refs.applyPopup.open();
+			},
+			closePopup() {
+				this.$refs.applyPopup.close();
+			},
+			fenXiaoValidata() {
+				let rule = [{
+						name: 'fenXiaoName',
+						checkType: 'required',
+						errorMsg: '请输入' + this.fenxiaoWords.fenxiao_name + '名称'
+					},
+					{
+						name: 'mobile',
+						checkType: 'required',
+						errorMsg: '请输入手机号'
+					},
+					{
+						name: 'mobile',
+						checkType: 'phoneno',
+						errorMsg: '请输入正确的手机号'
+					}
+				];
+				var checkRes = validate.check(this.formData, rule);
+				if (checkRes) {
+					return true;
+				} else {
+					this.$util.showToast({
+						title: validate.error
+					});
+					return false;
+				}
+			},
+			// 获取推广人信息
+			getSourceMemberInfo() {
+				this.$api.sendRequest({
+					url: '/fenxiao/api/fenxiao/sourceinfo',
+					success: res => {
+						if (res.code == 0 && res.data) {
+							this.sourceMemberInfo = res.data;
+						}
+					}
+				});
+			},
+			/**
+			 * 重新申请
+			 */
+			againApply() {
+				this.status = '';
+			},
+			/**
+			 * 获取申请条件
+			 */
+			getFenxiaoConfig() {
+				this.$api.sendRequest({
+					url: '/fenxiao/api/config/fenxiao',
+					data: {},
+					success: res => {
+						if (res.code >= 0 && res.data) {
+							this.fenxiaoConfig = res.data;
+							this.goodsList = res.data.goods_list;
+							if (this.goodsList.length <= 3) {
+								this.isShow = false;
+							} else if (this.goodsList.length > 3 && this.isOpen == true) {
+								this.isShow = true;
+								this.goodsList = res.data.goods_list.slice(0, 3);
+							}
+						}
+					}
+				});
+			},
+			/**
+			 * 获取分销基本配置
+			 */
+			getFenxiaoBasicsConfig() {
+				this.$api.sendRequest({
+					url: '/fenxiao/api/config/basics',
+					data: {},
+					success: res => {
+						if (res.code >= 0 && res.data) {
+							this.basicsConfig = res.data;
+						}
+					}
+				});
+			}
+		},
+		onBackPress(options) {
+			if (options.from === 'navigateBack') {
+				return false;
+			}
+			this.$util.redirectTo('/pages/member/index');
+			return true;
+		}
+	};
+</script>
+
+<style lang="scss">
+	.image {
+		width: 100%;
+	}
+
+	/deep/.uni-scroll-view {
+		background-color: #fff;
+	}
+
+	/deep/.uni-scroll-view::-webkit-scrollbar {
+		/* 隐藏滚动条，但依旧具备可以滚动的功能 */
+		display: none;
+	}
+
+	.head-nav {
+		width: 100%;
+		height: var(--status-bar-height);
+	}
+
+	.head-nav.active {
+		padding-top: 40rpx;
+	}
+
+	.head-return {
+		height: 90rpx;
+		line-height: 90rpx;
+		color: #fff;
+		font-weight: 600;
+		font-size: $font-size-base;
+		position: relative;
+		text-align: center;
+
+		text {
+			position: absolute;
+			top: 50%;
+			transform: translateY(-50%);
+			left: 20rpx;
+			display: inline-block;
+			margin-right: 10rpx;
+			font-size: 32rpx;
+		}
+	}
+
+	input::placeholder {
+		text-align: right;
+	}
+
+	.apply {
+		.bg {
+			height: 160rpx;
+			display: flex;
+			justify-content: space-between;
+			padding: 30rpx 80rpx 44rpx 80rpx;
+			align-items: center;
+
+			.bg-title {
+				color: #ffffff;
+				font-size: 36rpx;
+			}
+
+			.bg-img {
+				width: 150rpx;
+				height: 150rpx;
+
+				image {
+					width: 100%;
+					height: 100%;
+				}
+			}
+		}
+
+		.apply-adv {
+			width: 100%;
+		}
+
+		.apply-wrap {
+			padding-bottom: 100rpx;
+
+			.app-info {
+				position: relative;
+				top: -28rpx;
+				width: 692rpx;
+				margin: 0 auto;
+				border-radius: 10rpx;
+				background-color: #ffffff;
+
+				.info {
+					display: flex;
+					flex-direction: column;
+					justify-content: center;
+					align-items: center;
+
+					.apply-item {
+						display: flex;
+						align-items: center;
+						justify-content: space-between;
+						width: calc(100% - 100rpx);
+						padding: 20rpx 10rpx;
+						margin: 4rpx 10rpx;
+						background-color: #ffffff;
+						border-bottom: 1rpx solid #f1f1f1;
+
+						.title {
+							color: #000;
+							font-size: 28rpx;
+						}
+
+						.input {
+							width: 70%;
+							text-align: right;
+							height: 40rpx;
+							padding-left: 30rpx;
+							font-size: $font-size-tag;
+							color: #a7a7a7;
+						}
+
+						.pla-cla {
+							color: #babbc1;
+						}
+
+						.shuru {
+							padding-left: 30rpx;
+						}
+					}
+
+					.apply-xy {
+						display: flex;
+						margin-top: 30rpx;
+						color: #838383;
+						align-items: center;
+						font-size: 26rpx;
+
+						text {
+							color: #a7a7a7;
+						}
+
+						.icon-yuan_checkbox {
+							font-size: 36rpx;
+							color: #838383;
+							margin-right: 14rpx;
+							line-height: 1;
+						}
+
+						.icon-yuan_checked {
+							font-size: 36rpx;
+							margin-right: 14rpx;
+							line-height: 1;
+						}
+					}
+				}
+			}
+
+			.app-info-list {
+				margin: 0 30rpx 20rpx;
+				padding: 30rpx;
+				border-radius: 10rpx;
+				background-color: #ffffff;
+
+				.apply-message-title {
+					line-height: 1;
+					font-size: 28rpx;
+					font-weight: bold;
+					position: relative;
+					padding-left: $padding;
+					box-sizing: border-box;
+				}
+
+				.apply-message-title::before {
+					content: '';
+					display: block;
+					position: absolute;
+					width: 6rpx;
+					height: 100%;
+					left: 0;
+					top: 0;
+					border-radius: 6rpx;
+				}
+
+				.apply-message-info {
+					display: inline-block;
+					line-height: 1.2;
+					color: #333;
+					background: #f9f9f9;
+					position: relative;
+					top: 20rpx;
+					width: 586rpx;
+					padding: 20rpx 20rpx;
+					border-radius: 10rpx;
+					margin-bottom: 40rpx;
+				}
+
+				.goods-list {
+					padding: 30rpx 0;
+					// margin-top: 50rpx;
+					display: flex;
+					border-bottom: 2rpx solid #f6f5f5;
+
+					.goods-img {
+						width: 130rpx;
+						height: 130rpx;
+						margin-right: 20rpx;
+						border-radius: 10rpx;
+
+						image {
+							width: 100%;
+							height: 100%;
+						}
+					}
+
+					.goods-content {
+						display: flex;
+						flex-direction: column;
+						justify-content: space-between;
+
+						.content-name {
+							font-size: 28rpx;
+							color: #303133;
+							width: 460rpx;
+							display: -webkit-box;
+							line-clamp: 2;
+							-webkit-line-clamp: 2;
+							overflow: hidden;
+							text-overflow: ellipsis;
+							-webkit-box-orient: vertical;
+						}
+
+						.content-price {
+							font-size: 28rpx !important;
+							font-weight: 600;
+							color: #ff4a01 !important;
+						}
+					}
+				}
+
+				.content-lists {
+					margin: 20rpx auto 0;
+					text-align: center;
+					color: #a1a3a8;
+
+					text {
+						padding-left: 10rpx;
+					}
+				}
+			}
+
+			.apply-btn {
+				margin: 50rpx auto 70rpx auto;
+				border-radius: $border-radius;
+				width: 90%;
+
+				button {
+					color: #ffffff;
+					width: 100%;
+					margin: 0;
+				}
+			}
+
+			.apply-message-wrap {
+				margin-bottom: 100rpx;
+				width: 100%;
+				padding: 10rpx;
+				display: flex;
+				justify-content: center;
+
+				.apply-message {
+					width: 85%;
+					display: flex;
+					flex-direction: column;
+
+					.apply-message-title {
+						line-height: 1;
+						font-size: $font-size-tag;
+						position: relative;
+						padding-left: $padding;
+						box-sizing: border-box;
+					}
+
+					.apply-message-title::before {
+						content: '';
+						display: block;
+						position: absolute;
+						width: 6rpx;
+						height: 100%;
+						left: 0;
+						top: 0;
+						border-radius: 6rpx;
+					}
+
+					.apply-message-info {
+						padding-top: $padding;
+						line-height: 1.2;
+						color: $color-tip;
+					}
+				}
+			}
+		}
+
+		.again-btn {
+			display: flex;
+			justify-content: center;
+			width: auto;
+			border-radius: $border-radius;
+			margin-top: 20rpx;
+			color: #ffffff;
+			align-items: center;
+			padding: 10rpx 60rpx;
+			box-sizing: border-box;
+		}
+
+		.conten-box {
+			padding: 0 30rpx;
+			box-sizing: border-box;
+			height: 812rpx;
+			width: 580rpx;
+			border-radius: 10rpx;
+
+			text {
+				margin-top: 25rpx;
+				float: right;
+				line-height: 1;
+			}
+
+			.title {
+				width: 100%;
+				font-size: 36rpx;
+				font-weight: bold;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				border-bottom: 2rpx solid #e0e0e0;
+				line-height: 1;
+				padding-bottom: 28rpx;
+			}
+
+			.content-con {
+				width: 100%;
+				height: 680rpx;
+				box-sizing: border-box;
+			}
+
+			.con {
+				width: 100%;
+				height: 100%;
+			}
+
+			.sure {
+				width: 100%;
+				height: 100rpx;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+
+				.sure-btn {
+					width: 100%;
+					height: 60rpx;
+					border-radius: $border-radius;
+					color: #ffffff;
+					text-align: center;
+					line-height: 60rpx;
+				}
+			}
+		}
+
+		.empty {
+			width: 100%;
+			margin-top: 200rpx;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			justify-content: center;
+
+			image {
+				width: 300rpx;
+				height: 176rpx;
+				margin-bottom: 50rpx;
+			}
+
+			text {
+				font-size: $font-size-goods-tag;
+				font-weight: 600;
+			}
+		}
+	}
+</style>
+
+<style>
+	/deep/ .uni-popup__wrapper-box {
+		border-radius: 20rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/pages_promotion/fenxiao/bill.vue b/pages_promotion/fenxiao/bill.vue
new file mode 100644
index 0000000..ebdb423
--- /dev/null
+++ b/pages_promotion/fenxiao/bill.vue
@@ -0,0 +1,147 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view class="bill" >
+		<mescroll-uni ref="mescroll" @getData="getData" class="member-point" :size="8">
+			<block slot="list">
+				<view class="balances" v-if="accountList.length" v-for="item in accountList" :key="item.id">
+					<image v-if="item.type == 'order'" :src="$util.img('public/uniapp/fenxiao/bill/jiesuan.png')" mode="widthFix"></image>
+					<image v-else :src="$util.img('public/uniapp/fenxiao/bill/withdraw.png')" mode="widthFix"></image>
+					<view class="balances-info">
+						<text>{{ item.type_name }}</text>
+						<text>账单编号: {{ item.account_no }}</text>
+						<text>{{ $util.timeStampTurnTime(item.create_time) }}</text>
+					</view>
+					<view class="balances-num">
+						<text :class="item.money > 0 ? 'color-base-text' : ''">{{ item.money > 0 ? '+' + item.money : item.money }}</text>
+					</view>
+				</view>
+				<ns-empty v-if="!accountList.length && showEmpty" text="暂无账单信息" :isIndex="false"></ns-empty>
+			</block>
+			<loading-cover ref="loadingCover"></loading-cover>
+		</mescroll-uni>
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			accountList: {},
+			showEmpty: true
+		};
+	},
+	onShow() {
+		setTimeout( () => {
+			if (!this.addonIsExist.fenxiao) {
+				this.$util.showToast({
+					title: '商家未开启分销',
+					mask: true,
+					duration: 2000
+				});
+				setTimeout(() => {
+					this.$util.redirectTo('/pages/index/index');
+				}, 2000);
+			}
+		},1000);
+	},
+	methods: {
+		getData(mescroll) {
+			if (mescroll.num == 1) {
+				this.accountList = [];
+			}
+			this.$api.sendRequest({
+				url: '/fenxiao/api/account/page',
+				data: {
+					page: mescroll.num,
+					page_size: mescroll.size
+				},
+				success: res => {
+					let newArr = [];
+					let msg = res.message;
+					if (res.code == 0 && res.data && res.data.list) {
+						newArr = res.data.list;
+					} else {
+						this.$util.showToast({
+							title: msg
+						});
+					}
+					mescroll.endSuccess(newArr.length);
+					//设置列表数据
+					if (mescroll.num == 1) this.accountList = []; //如果是第一页需手动制空列表
+					this.accountList = this.accountList.concat(newArr); //追加新数据
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				},
+				fail: res => {
+					this.showEmpty = true;
+					mescroll.endErr();
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				}
+			});
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+/deep/ .empty {
+	margin-top: 0 !important;
+}
+
+/deep/ .member-point .mescroll-uni-content {
+	overflow: hidden;
+}
+
+.balances {
+	width: calc(100% - 60rpx);
+	border-radius: 10rpx;
+	margin: 0 auto;
+	padding: 27rpx 27rpx;
+	box-sizing: border-box;
+	display: flex;
+	align-items: flex-start;
+	background: #fff;
+	margin-bottom: 18rpx;
+	margin-top: 18rpx;
+
+	image {
+		width: 54rpx;
+		height: 54rpx;
+		border-radius: 50%;
+	}
+
+	.balances-info {
+		flex: 1;
+		margin-left: 16rpx;
+		display: flex;
+		flex-direction: column;
+
+		text {
+			line-height: 1;
+
+			&:last-child {
+				font-size: $font-size-base;
+			}
+
+			&:nth-child(2) {
+				margin-top: 18rpx;
+				font-size: $font-size-tag;
+				color: $color-tip;
+			}
+
+			&:nth-child(3) {
+				font-size: $font-size-tag;
+				margin-top: 19rpx;
+				color: $color-tip;
+			}
+		}
+	}
+
+	.balances-num {
+		text {
+			line-height: 1;
+			font-size: $font-size-toolbar;
+			color: #000;
+		}
+	}
+}
+</style>
diff --git a/pages_promotion/fenxiao/child_fenxiao.vue b/pages_promotion/fenxiao/child_fenxiao.vue
new file mode 100644
index 0000000..4fcf443
--- /dev/null
+++ b/pages_promotion/fenxiao/child_fenxiao.vue
@@ -0,0 +1,289 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view>
+		<mescroll-uni ref="mescroll" @getData="getData" top="0" class="member-point" :size="8" v-if="storeToken">
+			<block slot="list">
+				<view class="team-li" v-for="(item, index) in teamList" :key="index" v-if="teamList.length != 0" @click="toFenxiaoOrder(item)">
+					<view class="li-box" :class="{ active: index + 1 == teamList.length }">
+						<image v-if="item.headimg" :src="$util.img(item.headimg)" @error="imageError(index)" mode="aspectFill"></image>
+						<image v-else :src="$util.getDefaultImage().head"></image>
+						<view class="member-info">
+							<view class="member-name">
+								<view class="left">
+									<view class="flex-box">
+										<view class="name">{{ item.nickname }}</view>
+										<view v-if="item.level_name" class="title  color-base-border color-base-text">{{ item.level_name }}</view>
+									</view>
+									<view class="color-tip font-size-goods-tag">加入时间：{{ $util.timeStampTurnTime(item.bind_fenxiao_time).substring(0, 10) }}</view>
+								</view>
+								<view class="consume-info">
+									<view><text>{{ item.one_child_fenxiao_num + item.one_child_num }}</text> 人</view>
+									<view><text>{{ item.order_num }}</text> 单</view>
+									<view><text>{{ item.order_money|moneyFormat }}</text> 元</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+				<block v-if="teamList.length == 0 && emptyShow">
+					<ns-empty text="暂无数据" :isIndex="false"></ns-empty>
+				</block>
+			</block>
+		</mescroll-uni>
+
+		<ns-login ref="login"></ns-login>
+		<loading-cover ref="loadingCover"></loading-cover>
+	</view>
+</template>
+
+<script>
+import fenxiaoWords from 'common/js/fenxiao-words.js';
+
+export default {
+	data() {
+		return {
+			teamList: [],
+			emptyShow: false,
+		};
+	},
+	mixins: [fenxiaoWords],
+	onShow() {
+		setTimeout( () => {
+			if (!this.addonIsExist.fenxiao) {
+				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/fenxiao/childfenxiao');
+			});
+		}
+	},
+	methods: {
+		getData(mescroll) {
+			this.emptyShow = false;
+			if (mescroll.num == 1) {
+				this.teamList = [];
+			}
+			this.$api.sendRequest({
+				url: '/fenxiao/api/fenxiao/childfenxiao',
+				data: {
+					page_size: mescroll.size,
+					page: mescroll.num
+				},
+				success: res => {
+					this.emptyShow = true;
+					let newArr = [];
+					let msg = res.message;
+					if (res.code == 0 && res.data) {
+						newArr = res.data.list;
+					} else {
+						this.$util.showToast({
+							title: msg
+						});
+					}
+					mescroll.endSuccess(newArr.length);
+					//设置列表数据
+					if (mescroll.num == 1) this.teamList = []; //如果是第一页需手动制空列表
+					this.teamList = this.teamList.concat(newArr); //追加新数据
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				},
+				fail: res => {
+					mescroll.endErr();
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				}
+			});
+		},
+		imageError(e) {
+			this.teamList[e].headimg = this.$util.getDefaultImage().head;
+			this.$forceUpdate();
+		},
+		toFenxiaoOrder(item) {
+			if (item.fenxiao_id) {
+				this.$util.redirectTo('/pages_promotion/fenxiao/relation', { fenxiao_id: item.fenxiao_id });
+			} else {
+				this.$util.redirectTo('/pages_promotion/fenxiao/relation', { sub_member_id: item.member_id });
+			}
+		}
+	},
+	watch: {
+		storeToken: function(nVal, oVal) {
+			if (nVal) {
+				this.$refs.mescroll.refresh();
+			}
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+.team-cate {
+	padding: 0 30rpx;
+	width: calc(100%);
+	height: 90rpx;
+	display: flex;
+	box-sizing: border-box;
+	background: #ffffff;
+	position: fixed;
+	left: 0;
+	top: var(--window-top);
+
+	.cate-li {
+		flex: 1;
+		justify-content: center;
+		text-align: center;
+		align-items: center;
+		display: inline-block;
+		line-height: 90rpx;
+		height: 100%;
+		font-size: 30rpx;
+
+		&.active {
+			box-sizing: border-box;
+			border-bottom: 4rpx solid;
+		}
+	}
+}
+
+.team-member {
+	width: 100%;
+	height: 70rpx;
+	line-height: 70rpx;
+	color: $color-tip;
+	padding: 0 $padding;
+	box-sizing: border-box;
+}
+
+.team-li {
+	margin: $margin-updown $margin-both;
+	padding: $margin-both;
+	box-sizing: border-box;
+	background: #fff;
+	margin-bottom: 20rpx;
+	border-radius: 10rpx;
+
+	.li-box {
+		display: flex;
+		box-sizing: border-box;
+		align-items: center;
+
+		image {
+			width: 90rpx;
+			height: 90rpx;
+			border-radius: 50%;
+		}
+		
+		.member-info {
+			flex: 1;
+			padding-left: $padding;
+			box-sizing: border-box;
+			display: flex;
+			flex-direction: column;
+			justify-content: center;
+
+			.member-name {
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				font-size: $font-size-base;
+
+				.left {
+					width: 0;
+					flex: 1;
+					
+					.flex-box {
+						display: flex;
+						align-items: center;
+						margin-bottom: 6rpx;
+					}
+
+					.name {
+						overflow: hidden;
+						text-overflow: ellipsis;
+						white-space: nowrap;
+						line-height: 1;
+					}
+
+					.title {
+						padding: 4rpx 16rpx;
+						justify-content: center;
+						align-items: center;
+						text-align: center;
+						font-size: $font-size-activity-tag;
+						border-radius: 4rpx;
+						margin-left: 10rpx;
+						line-height: 1;
+						border: 2rpx solid;
+						color: #fff;
+					}
+				}
+				
+				.consume-info {
+					text-align: right;
+					
+					text {
+						margin-right: 6rpx;
+					}
+					
+					view {
+						line-height: 1.5;
+						font-size: 24rpx;
+					}
+				}
+			}
+
+			.member-date {
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				margin-top: $padding;
+
+				view {
+					width: 50%;
+					height: 100%;
+					text-align: left;
+					line-height: 1;
+
+					text {
+						font-size: $font-size-tag;
+						color: $color-tip;
+					}
+
+					.tit {
+						color: $color-tip;
+					}
+				}
+			}
+		}
+
+		.btn-see {
+			display: flex;
+			flex-direction: row-reverse;
+		}
+	}
+	.order-box-btn {
+		display: inline-block;
+		line-height: 56rpx;
+		padding: 0 30rpx;
+		font-size: 26rpx;
+		color: #303133;
+		border: 2rpx solid #999;
+		-webkit-box-sizing: border-box;
+		box-sizing: border-box;
+		-webkit-border-radius: $border-radius;
+		border-radius: $border-radius;
+		margin-top: 30rpx;
+	}
+	.li-box.active {
+		border: none;
+	}
+}
+</style>
diff --git a/pages_promotion/fenxiao/goods_list.vue b/pages_promotion/fenxiao/goods_list.vue
new file mode 100644
index 0000000..a3eac56
--- /dev/null
+++ b/pages_promotion/fenxiao/goods_list.vue
@@ -0,0 +1,413 @@
+<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>
diff --git a/pages_promotion/fenxiao/index.vue b/pages_promotion/fenxiao/index.vue
new file mode 100644
index 0000000..370447d
--- /dev/null
+++ b/pages_promotion/fenxiao/index.vue
@@ -0,0 +1,587 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view class="fenxiao-index" :style="{ background: 'url(' + $util.img('public/uniapp/fenxiao/index/commissionFission-background.png') + ')',backgroundRepeat: 'no-repeat',backgroundSize:'100%' }">
+		<block v-if="info.fenxiao_id > 0">
+			<!-- 头部 -->
+			<view class="fenxiao-index-header" :class="{ 'not-level': !levelList.length }" >
+				<view class="member">
+					<view class="member-pic">
+						<image :src="info.headimg ? $util.img(info.headimg) : $util.getDefaultImage().head" @error="info.headimg = $util.getDefaultImage().head" mode="aspectFill"/>
+						<!-- <text class="level-name ">{{ info.level_name }}</text> -->
+					</view>
+					<view class="member-info">
+						<view class="member-info-box">
+							<text class="name">{{ info.fenxiao_name }}</text>
+							<p class="level"  v-if="info.level_num > 0"><img :src="$util.img('public/uniapp/fenxiao/index/commissionFission-level.png')" alt="" class="level-icon">{{ info.level_name }}</p>
+						</view>
+						<view class="recommend">上级代理商：{{ info.parent_name?info.parent_name:'总店' }}</view>
+						<view class="recommend">已邀请成功：{{ teamNum.num }}人<text class="iconfont icon-right" style="font-size: 24rpx;"></text></view>
+					</view>
+				<!-- 	<view class="promote-rules font-size-tag" @click="$util.redirectTo('/pages_promotion/fenxiao/promote')">
+						<text class="iconfont icon-wenhao font-size-tag"></text>
+						推广规则
+					</view> -->
+				</view>
+			<!-- 	<view class="fenxiao-level-wrap" v-if="levelList.length">
+					<image :src="$util.img('public/uniapp/fenxiao/index/level_icon.png')" mode="widthFix" class="level-icon"/>
+					<view class="level-wrap" @click="$util.redirectTo('/pages_promotion/fenxiao/level')">
+						<view class="title">{{ info.level_num > 0 ? info.level_name : '等级未解锁' }}</view>
+						<view class="desc">下单、邀请好友均可提升等级</view>
+					</view>
+					<view class="btn" @click="$refs.taskPopup.open()" v-if="info.condition.last_level">做任务</view>
+				</view> -->
+			</view>
+
+			<view class="fenxiao-index-allmoney">
+				<view class="allmoney-top-money">
+					<view class="allmoney-top">
+						<view class="font-size-sub">可{{ fenxiaoWords.withdraw }}（元）</view>
+						<view class="withdrawal-record" @click="$util.redirectTo('/pages_promotion/fenxiao/withdraw_list')">
+							提现明细
+							<text class="iconfont icon-right"></text>
+						</view>
+					</view>
+					<view class="total-commission price-font">{{ info.account }}</view>
+				</view>
+
+				<view class="allmoney-bottom">
+			<!-- 		<view class="allmoney-all-wrap" @click="$util.redirectTo('/pages_promotion/fenxiao/bill')">
+						<view class="title">总{{ fenxiaoWords.account }}</view>
+						<view class="money price-font">{{ info.total_commission | moneyFormat }}</view>
+					</view>
+					<view class="allmoney-all-wrap" @click="$util.redirectTo('/pages_promotion/fenxiao/withdraw_list')">
+						<view class="title">已提现{{ fenxiaoWords.account }}</view>
+						<view class="money price-font">{{ info.account_withdraw | moneyFormat }}</view>
+					</view> -->
+					<view class="allmoney-all-wrap" @click="$util.redirectTo('/pages_promotion/fenxiao/withdraw_list')">
+						<view class="title">提现中(元)<text class="iconfont icon-right" style="font-size: 24rpx;"></text></view>
+						<view class="money price-font">{{ info.account_withdraw_apply | moneyFormat }}</view>
+					</view>
+					<view class="allmoney-all-wrap" @click="$util.redirectTo('/pages_promotion/fenxiao/order', { type: 1 })">
+						<view class="title">待入账(元)<text class="iconfont icon-right" style="font-size: 24rpx;"></text></view>
+						<view class="money price-font">{{ info.in_progress_money | moneyFormat }}</view>
+					</view>
+				</view>
+				<view class="withdraw-btn" @click="$util.redirectTo('/pages_promotion/fenxiao/withdraw_apply')">提现
+				</view>
+			</view>
+			
+			<view class="fenxiao-index-allmoney" style="padding: 0;border-radius:24rpx;margin-top: 0;" @click="toPoster()">
+				<image :src="$util.img('public/uniapp/fenxiao/index/commissionFission-qrcode1.png')" mode="widthFix" style="width: 100%;border-radius:24rpx" />
+			</view>
+
+			<!-- 功能列表 -->
+			<view class="fenxiao-menu-list">
+				<view class="menu-item" @click="$util.redirectTo('/pages_promotion/fenxiao/team')">
+					<view class="icon-wrap">
+						<image :src="$util.img('public/uniapp/fenxiao/index/down-line.png')" mode="widthFix"></image>
+					</view>
+					<view class="info">
+						<view class="title">我的粉丝</view>
+						<view class="desc">邀请的用户</view>
+					</view>
+				</view>
+				<view class="menu-item" @click="$util.redirectTo('/pages_promotion/fenxiao/withdraw_list')">
+					<view class="icon-wrap">
+						<image :src="$util.img('public/uniapp/fenxiao/index/jifenjiangli.png')" mode="widthFix"></image>
+					</view>
+					<view class="info">
+						<view class="title">{{ fenxiaoWords.withdraw }}明细</view>
+						<view class="desc">累计{{ fenxiaoWords.account }}￥{{ info.total_commission | moneyFormat }}</view>
+					</view>
+				</view>
+				<view class="menu-item" @click="$util.redirectTo('/pages_promotion/fenxiao/order')">
+					<view class="icon-wrap">
+						<image :src="$util.img('public/uniapp/fenxiao/index/fenxiaodingdan.png')" mode="widthFix"></image>
+					</view>
+					<view class="info">
+						<view class="title">{{ fenxiaoWords.concept + '订单' }}</view>
+						<view class="desc">{{ fenxiaoWords.concept + '订单' }}明细</view>
+					</view>
+				</view>
+				
+				<view class="menu-item" @click="toPoster()">
+					<view class="icon-wrap">
+						<image :src="$util.img('public/uniapp/fenxiao/index/friend.png')" mode="widthFix"></image>
+					</view>
+					<view class="info">
+						<view class="title">我的邀请码</view>
+						<view class="desc">邀好友赚好礼</view>
+					</view>
+				</view>
+			<!-- 	<view class="menu-item" @click="$util.redirectTo('/pages_promotion/fenxiao/promote')">
+					<view class="icon-wrap">
+						<image :src="$util.img('public/uniapp/fenxiao/index/code.png')" mode="widthFix"></image>
+					</view>
+					<view class="info">
+						<view class="title">邀请好友</view>
+						<view class="desc">邀好友赚好礼</view>
+					</view>
+				</view> -->
+			<!-- 	<view class="menu-item" @click="$util.redirectTo('/pages_promotion/fenxiao/bill')">
+					<view class="icon-wrap">
+						<image :src="$util.img('public/uniapp/fenxiao/index/bill.png')" mode="widthFix"></image>
+					</view>
+					<view class="info">
+						<view class="title">账单报表</view>
+						<view class="desc">{{ fenxiaoWords.account }}变更明细</view>
+					</view>
+				</view>
+				<view class="menu-item" @click="$util.redirectTo('/pages_promotion/fenxiao/goods_list', { templateId: templateId })">
+					<view class="icon-wrap">
+						<image :src="$util.img('public/uniapp/fenxiao/index/market.png')" mode="widthFix"></image>
+					</view>
+					<view class="info">
+						<view class="title">{{ fenxiaoWords.concept }}商品</view>
+						<view class="desc">{{ fenxiaoWords.concept }}商品</view>
+					</view>
+				</view> -->
+		<!-- 		<view class="menu-item" @click="$util.redirectTo('/pages_promotion/fenxiao/ranking_list', { type: 'profit' })">
+					<view class="icon-wrap">
+						<image :src="$util.img('public/uniapp/fenxiao/index/commission_rank.png')" mode="widthFix">
+						</image>
+					</view>
+					<view class="info">
+						<view class="title">{{ fenxiaoWords.account }}排行</view>
+						<view class="desc">您的排名为第{{ profitRanking }}位</view>
+					</view>
+				</view> -->
+			<!-- 	<view class="menu-item" @click="$util.redirectTo('/pages_promotion/fenxiao/ranking_list', { type: 'invited_num' })">
+					<view class="icon-wrap">
+						<image :src="$util.img('public/uniapp/fenxiao/index/promoter_rank.png')" mode="widthFix">
+						</image>
+					</view>
+					<view class="info">
+						<view class="title">推广人排行</view>
+						<view class="desc">您的排名为{{ invitedNumRanking }}位</view>
+					</view>
+				</view> -->
+			<!-- 	<view class="menu-item" @click="$util.redirectTo('/pages_promotion/fenxiao/level')" v-if="levelList.length">
+					<view class="icon-wrap">
+						<image :src="$util.img('public/uniapp/fenxiao/index/team_reward.png')" mode="widthFix"></image>
+					</view>
+					<view class="info">
+						<view class="title">等级说明</view>
+						<view class="desc">{{ fenxiaoWords.concept }}等级说明</view>
+					</view>
+				</view> -->
+			</view>
+			
+		<!-- 	<view class="fenxiao-team">
+				<view class="fenxiao-index-other">
+					<view @click="$util.redirectTo('/pages_promotion/fenxiao/team')" class="all-money-item">
+						<view class="img-wrap">
+							<image :src="$util.img('public/uniapp/fenxiao/index/down-line.png')" mode="aspectFill"></image>
+						</view>
+						<view class="all-money-tit-wrap">
+							<text class="all-money-tit">我的粉丝</text>
+							<text class="all-money-num">{{ teamNum.num }}人</text>
+						</view>
+					</view>
+				</view>
+				<view class="fenxiao-index-other">
+					<view @click="$util.redirectTo('/pages_promotion/fenxiao/child_fenxiao')" class="all-money-item">
+						<view class="img-wrap">
+							<image :src="$util.img('public/uniapp/fenxiao/index/yejikaohe.png')" mode="aspectFill"></image>
+						</view>
+						<view class="all-money-tit-wrap">
+							<text class="all-money-tit">{{ fenxiaoWords.fenxiao_name }}</text>
+							<text class="all-money-num">{{ teamNum.fenxiao_num }}人</text>
+						</view>
+					</view>
+				</view>
+			</view> -->
+		</block>
+		<ns-copyright></ns-copyright>
+		<view class="empty" v-if="!info.fenxiao_id > 0 && showEmpty">
+			<image :src="$util.img('public/uniapp/fenxiao/index/no-fenxiao.png')" mode="widthFix"></image>
+			<text>您还不是{{ fenxiaoWords.fenxiao_name }}，请先提交申请</text>
+			<view @click="$util.redirectTo('/pages_promotion/fenxiao/apply')" class="color-base-bg">立即加入</view>
+		</view>
+		<loading-cover ref="loadingCover"></loading-cover>
+		<ns-login ref="login"></ns-login>
+
+		<uni-popup ref="taskPopup" type="bottom">
+			<view class="task-popup popup-layer" v-if="levelInfo">
+				<view class="head-wrap">
+					<text>快速升级技巧</text>
+					<text class="iconfont icon-close" @click="$refs.taskPopup.close()"></text>
+				</view>
+				<view class="body-wrap">
+					<view class="equity-content" v-for="(item, index) in levelInfo.task" :key="index">
+						<text class="subordinate-consumption">
+							{{ item.title }}
+							<text class="iconfont icon-wenhao" @click="openTips(item)"></text>
+							<text class="incomplete">{{ item.progress == 100 ? '已完成' : '未完成' }}</text>
+						</text>
+						<view class="circle">
+							<progress :percent="item.progress" activeColor="#E7B667" stroke-width="4" />
+						</view>
+						<text class="zero">{{ item.value }}</text>
+						<text>/{{ item.condition }}</text>
+						<text class="to-complete-box" @click="$util.redirectTo('/pages_promotion/fenxiao/promote')">
+							<text class="to-complete">{{ item.progress == 100 ? '已完成' : '去完成' }}</text>
+						</text>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+
+		<uni-popup type="bottom" ref="tips">
+			<view class="popup">
+				<view class="popup-header">
+					<text class="tit">提示</text>
+					<text class="iconfont icon-close" @click="$refs.tips.close()"></text>
+				</view>
+				<view class="popup-body">
+					<view>{{ tips }}</view>
+					<view v-if="levelInfo">{{ levelInfo.upgrade_type == 1 ? '满足任意一条件即可升级' : '满足全部条件才能进行升级' }}</view>
+				</view>
+			</view>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import fenxiaoWords from '@/common/js/fenxiao-words.js';
+	import uniPopup from '@/components/uni-popup/uni-popup.vue';
+
+	export default {
+		components: {
+			uniPopup
+		},
+		data() {
+			return {
+				info: {
+					fenxiao_name: '',
+					fenxiao_id: 0
+				},
+				showEmpty: false,
+				teamNum: {
+					fenxiao_num: 0,
+					member_num: 0
+				},
+				//初始化获取到的模板id
+				templateId: '',
+				tips: '',
+				profitRanking: 0,
+				invitedNumRanking: 0,
+				levelList: [],
+				poster:''
+			};
+		},
+		mixins: [fenxiaoWords],
+		onShow() {
+			if (this.fenxiaoWords && this.fenxiaoWords.concept) this.$langConfig.title(this.fenxiaoWords.concept + '中心');
+
+			if (this.storeToken) {
+				this.checkFenxiaoIsStart();
+			} else {
+				this.$nextTick(() => {
+					this.$refs.login.open('/pages_promotion/fenxiao/index');
+				});
+			}
+
+			this.getTemplateId();
+			this.getPoster();
+		},
+		onLoad() {
+			setTimeout( () => {
+				if (!this.addonIsExist.fenxiao) {
+					this.$util.showToast({
+						title: '商家未开启分销',
+						mask: true,
+						duration: 2000
+					});
+					setTimeout(() => {
+						this.$util.redirectTo('/pages/index/index', {}, 'redirectTo');
+					}, 2000);
+				}
+			},1000);
+			this.getFenxiaoLevel();
+		},
+		methods: {
+			toPoster(){
+				this.$util.redirectTo('/pages_promotion/fenxiao/promote_code', { poster: this.poster,templateId:this.templateId })
+			},
+			/**
+			 * 获取分享海报
+			 */
+			getPoster() {
+				this.$api.sendRequest({
+					url: '/fenxiao/api/fenxiao/posterList',
+					success: res => {
+						if (res.code >= 0) {
+							this.poster = res.data.toString();
+							this.poster = encodeURIComponent(this.poster);
+						}
+					}
+				});
+			},
+			/**
+			 * 检测分销是否开启
+			 */
+			checkFenxiaoIsStart() {
+				this.$api.sendRequest({
+					url: '/fenxiao/api/config/basics',
+					success: res => {
+						if (res.code == 0 && res.data) {
+							if (res.data.level > 0) {
+								this.getFenxiaoDetail();
+							} else {
+								this.$util.showToast({
+									title: '商家未开启分销',
+									mask: true,
+									duration: 2000
+								});
+								setTimeout(() => {
+									this.$util.redirectTo('/pages/member/index');
+								}, 2000);
+							}
+						}
+					}
+				});
+			},
+			// 获取分销商信息
+			getFenxiaoDetail() {
+				this.$api.sendRequest({
+					url: '/fenxiao/api/fenxiao/detail',
+					success: res => {
+						console.log(res)
+						if (res.data) {
+							if (res.data.status == -1) {
+								this.$util.showToast({
+									title: '当前分销商已冻结'
+								});
+								setTimeout(() => {
+									this.$util.redirectTo('/pages/member/index');
+								}, 2000);
+								return;
+							}
+							if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+							this.info = res.data;
+							this.getTeamNum();
+							this.getRanking('invited_num');
+							this.getRanking('profit');
+							this.showEmpty = true;
+						} else {
+							this.$util.redirectTo('/pages_promotion/fenxiao/apply', {}, 'redirectTo');
+						}
+					},
+					fail: res => {
+						this.showEmpty = true;
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					}
+				});
+			},
+			//去提现
+			goTixian() {
+				this.$util.redirectTo('/pages_promotion/fenxiao/withdraw_apply');
+			},
+			toLevel() {
+				this.$util.redirectTo('/pages_promotion/fenxiao/level');
+			},
+			close() {
+				this.$refs.taskPopup.close();
+			},
+			getTeamNum() {
+				this.$api.sendRequest({
+					url: '/fenxiao/api/fenxiao/teamnum',
+					success: res => {
+						if (res.code >= 0) {
+							this.teamNum = res.data;
+						}
+					}
+				});
+			},
+			/**
+			 * 获取分享海报模板id
+			 */
+			getTemplateId() {
+				this.$api.sendRequest({
+					url: '/fenxiao/api/fenxiao/posterTemplateIds',
+					success: res => {
+						if (res.code >= 0) {
+							this.templateId = [...res.data].join();
+						}
+					}
+				});
+			},
+			moneyFormat(money) {
+				if (isNaN(parseFloat(money))) return money;
+				return parseFloat(money).toFixed(2);
+			},
+			openTips(data) {
+				this.tips = data.tips;
+				this.$refs.tips.open();
+			},
+			getRanking(type) {
+				this.$api.sendRequest({
+					url: '/fenxiao/api/fenxiao/ranking',
+					data: {
+						type: type
+					},
+					success: res => {
+						if (res.code >= 0) {
+							if (type == 'profit') this.profitRanking = res.data;
+							if (type == 'invited_num') this.invitedNumRanking = res.data;
+						}
+					}
+				});
+			},
+			getFenxiaoLevel() {
+				this.$api.sendRequest({
+					url: '/fenxiao/api/Level/lists',
+					success: res => {
+						if (res.code == 0 && res.data) {
+							this.levelList = res.data;
+						}
+					}
+				});
+			}
+		},
+		onBackPress(options) {
+			if (options.from === 'navigateBack') {
+				return false;
+			}
+			this.$util.redirectTo('/pages/member/index', {}, 'reLaunch');
+			return true;
+		},
+		watch: {
+			storeToken: function(nVal, oVal) {
+				if (nVal) {
+					this.checkFenxiaoIsStart();
+				}
+			}
+		},
+		computed: {
+			levelInfo() {
+				if (this.info && this.info.condition && this.info.condition.last_level) {
+					let level = this.info.condition.last_level;
+					level.task = [];
+					level.complete = 0;
+
+					if (level.one_fenxiao_order_num > 0) {
+						let task = {
+							title: '下级消费',
+							desc: '下级消费单数满' + level.one_fenxiao_order_num + '单',
+							tips: '分销商自己购买和自己推荐的直属会员购买的订单次数',
+							condition: level.one_fenxiao_order_num,
+							value: this.info.one_fenxiao_order_num,
+							progress: parseFloat(this.info.one_fenxiao_order_num) > parseFloat(level.one_fenxiao_order_num) ?
+								100 :
+								((parseFloat(this.info.one_fenxiao_order_num) / parseFloat(level.one_fenxiao_order_num)) * 100).toFixed(2)
+						};
+						if (task.progress == 100) level.complete += 1;
+						level.task.push(task);
+					}
+					if (level.one_fenxiao_total_order > 0) {
+						let task = {
+							title: '下级消费',
+							desc: '下级消费金额满' + this.moneyFormat(level.one_fenxiao_total_order) + '元',
+							tips: '分销商自己购买和推荐的直属会员购买的订单的总额',
+							condition: this.moneyFormat(level.one_fenxiao_total_order),
+							value: this.info.one_fenxiao_total_order,
+							progress: parseFloat(this.info.one_fenxiao_total_order) > parseFloat(level.one_fenxiao_total_order) ?
+								100 :
+								((parseFloat(this.info.one_fenxiao_total_order) / parseFloat(level.one_fenxiao_total_order)) * 100).toFixed(2)
+						};
+						if (task.progress == 100) level.complete += 1;
+						level.task.push(task);
+					}
+					if (level.one_fenxiao_order_money > 0) {
+						let task = {
+							title: '下级消费',
+							desc: '下级消费产生' + this.fenxiaoWords.account + '总额满' + this.moneyFormat(level
+								.one_fenxiao_order_money) + '元',
+							tips: '分销商自己购买和自己推荐的直属会员购买的订单' + this.fenxiaoWords.account + '总额',
+							condition: this.moneyFormat(level.one_fenxiao_order_money),
+							value: this.info.one_fenxiao_order_money,
+							progress: parseFloat(this.info.one_fenxiao_order_money) > parseFloat(level.one_fenxiao_order_money) ?
+								100 :
+								((parseFloat(this.info.one_fenxiao_order_money) / parseFloat(level.one_fenxiao_order_money)) * 100).toFixed(2)
+						};
+						if (task.progress == 100) level.complete += 1;
+						level.task.push(task);
+					}
+					if (level.order_num > 0) {
+						let task = {
+							title: '自身消费',
+							desc: '自身消费单数满' + level.order_num + '单',
+							tips: '分销商自己购买的订单次数',
+							condition: level.order_num,
+							value: this.info.order_num,
+							progress: parseFloat(this.info.order_num) > parseFloat(level.order_num) ? 100 : ((parseFloat(this.info.order_num) / parseFloat(level.order_num)) * 100).toFixed(2)
+						};
+						if (task.progress == 100) level.complete += 1;
+						level.task.push(task);
+					}
+					if (level.order_money > 0) {
+						let task = {
+							title: '自身消费',
+							desc: '自身消费金额满' + this.moneyFormat(level.order_money) + '元',
+							tips: '分销商自己购买的订单总额',
+							condition: this.moneyFormat(level.order_money),
+							value: this.info.order_money,
+							progress: parseFloat(this.info.order_money) > parseFloat(level.order_money) ?
+								100 :
+								((parseFloat(this.info.order_money) / parseFloat(level.order_money)) * 100).toFixed(2)
+						};
+						if (task.progress == 100) level.complete += 1;
+						level.task.push(task);
+					}
+					if (level.one_child_num > 0) {
+						let task = {
+							title: '邀请好友',
+							desc: '邀请好友人数达到' + level.one_child_num + '人',
+							tips: '分销商的直属下级会员人数（包含已经申请成为分销商的）',
+							condition: level.one_child_num,
+							value: this.info.one_child_num,
+							progress: parseFloat(this.info.one_child_num) > parseFloat(level.one_child_num) ?
+								100 :
+								((parseFloat(this.info.one_child_num) / parseFloat(level.one_child_num)) * 100).toFixed(2)
+						};
+						if (task.progress == 100) level.complete += 1;
+						level.task.push(task);
+					}
+					if (level.one_child_fenxiao_num > 0) {
+						let task = {
+							title: '邀请好友',
+							desc: '邀请好友成为分销商人数达到' + level.one_child_fenxiao_num + '人',
+							tips: '分销商的直属下级分销商人数',
+							condition: level.one_child_fenxiao_num,
+							value: this.info.one_child_fenxiao_num,
+							progress: parseFloat(this.info.one_child_fenxiao_num) > parseFloat(level.one_child_fenxiao_num) ?
+								100 :
+								((parseFloat(this.info.one_child_fenxiao_num) / parseFloat(level.one_child_fenxiao_num)) * 100).toFixed(2)
+						};
+						if (task.progress == 100) level.complete += 1;
+						level.task.push(task);
+					}
+					level.task_num = level.upgrade_type == 1 ? 1 : level.task.length;
+					return level;
+				}
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	@import './public/css/index.scss';
+</style>
+<style scoped lang="scss">
+	/deep/ .uni-popup__wrapper {
+		height: auto;
+	}
+
+	/deep/ .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box,
+	.uni-popup__wrapper.uni-custom.bottom .uni-popup__wrapper-box {
+		background: none;
+		max-height: unset !important;
+		overflow-y: hidden !important;
+	}
+
+	/deep/ .uni-popup__wrapper {
+		border-radius: 20rpx 20rpx 0 0;
+	}
+</style>
\ No newline at end of file
diff --git a/pages_promotion/fenxiao/level.vue b/pages_promotion/fenxiao/level.vue
new file mode 100644
index 0000000..5a5f0d5
--- /dev/null
+++ b/pages_promotion/fenxiao/level.vue
@@ -0,0 +1,320 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view class="container">
+		<view class="level-top">
+			<image :src="$util.img('public/uniapp/level/level-top-bg.png')"></image>
+		</view>
+
+		<swiper :autoplay="false" :duration="500" class="level-swiper" previous-margin="50rpx" next-margin="50rpx" @change="swiperChange" :current="curr">
+			<swiper-item v-for="(item, index) in levelList" :key="index">
+				<view class="level-item" :class="{'curr': index == curr}">
+					<view class="level-wrap">
+						<view class="member-info">
+							<view class="head-img">
+								<image :src="fenxiaoInfo.headimg ? $util.img(fenxiaoInfo.headimg) : $util.getDefaultImage().head" @error="fenxiaoInfo.headimg = $util.getDefaultImage().head" mode="aspectFill"/>
+							</view>
+							<view class="nickname">{{ fenxiaoInfo.nickname }}</view>
+							<view class="level-name">{{ item.level_name }}</view>
+						</view>
+						<view class="level-rate">
+							<view class="rate-item" v-if="config.level > 0">
+								<view class="title">一级分佣比率</view>
+								<view class="rate">{{ item.one_rate }}<text class="percentage">%</text></view>
+							</view>
+							<view class="rate-item" v-if="config.level > 1">
+								<view class="title">二级分佣比率</view>
+								<view class="rate">{{ item.two_rate }}<text class="percentage">%</text></view>
+							</view>
+							<view class="rate-item" v-if="config.level > 2">
+								<view class="title">三级分佣比率</view>
+								<view class="rate">{{ item.three_rate }}<text class="percentage">%</text></view>
+							</view>
+						</view>
+
+						<view class="not-unlocked" v-if="item.level_num > fenxiaoInfo.level_num">
+							<text class="iconfont icon-suoding"></text>
+						</view>
+					</view>
+				</view>
+			</swiper-item>
+		</swiper>
+
+		<view class="level-condition" v-if="levelInfo">
+			<view class="condition-title">
+				<view class="title">快速升级技巧</view>
+				<view class="rate price-font">
+					<text class="complete">{{ levelInfo.complete > levelInfo.task_num ? levelInfo.task_num : levelInfo.complete }}</text>
+					<text class="num">/{{ levelInfo.task_num }}</text>
+				</view>
+			</view>
+			<view class="task">
+				<view class="task-item" v-for="(item, index) in levelInfo.task" :key="index">
+					<view class="flex-box">
+						<view class="title">
+							{{item.title}}
+							<text class="iconfont icon-wenxiao" @click="openTips(item)"></text>
+						</view>
+						<view class="status" :class="{'complete': item.progress == 100}">
+							{{ item.progress == 100 ? '已完成' : '未完成' }}</view>
+					</view>
+					<view class="progress">
+						<progress :percent="item.progress" activeColor="#E7B667" stroke-width="4" />
+					</view>
+					<view class="flex-box">
+						<view class="desc">{{item.desc}}</view>
+						<view class="rate price-font">
+							<text class="complete">{{ item.value }}</text>
+							<text class="num">/{{ item.condition }}</text>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<uni-popup type="bottom" ref="tips">
+			<view class="popup">
+				<view class="popup-header">
+					<text class="tit">提示</text>
+					<text class="iconfont icon-close" @click="$refs.tips.close()"></text>
+				</view>
+				<view class="popup-body">
+					<view>{{ tips }}</view>
+					<view v-if="levelInfo">{{ levelInfo.upgrade_type == 1 ? '满足任意一条件即可升级' : '满足全部条件才能进行升级' }}</view>
+				</view>
+			</view>
+		</uni-popup>
+
+		<ns-goods-recommend route="fenxiao_level"></ns-goods-recommend>
+		<loading-cover ref="loadingCover"></loading-cover>
+	</view>
+</template>
+
+<script>
+	import fenxiaoWords from 'common/js/fenxiao-words.js';
+	export default {
+		data() {
+			return {
+				fenxiaoInfo: {
+					condition: {
+						last_level: null
+					}
+				},
+				config: {},
+				levelList: [],
+				curr: 0,
+				tips: ''
+			};
+		},
+		mixins: [fenxiaoWords],
+		computed: {
+			levelInfo() {
+				if (this.levelList.length) {
+					let level = this.levelList[this.curr];
+					level.task = [];
+					level.complete = 0;
+
+					if (level.one_fenxiao_order_num > 0) {
+						let task = {
+							title: '下级消费',
+							desc: '下级消费单数满' + level.one_fenxiao_order_num + '单',
+							tips: '分销商自己购买和自己推荐的直属会员购买的订单次数达到'+ level.one_fenxiao_order_num + '单',
+							condition: level.one_fenxiao_order_num,
+							value: this.fenxiaoInfo.one_fenxiao_order_num,
+							progress: parseFloat(this.fenxiaoInfo.one_fenxiao_order_num) > parseFloat(level.one_fenxiao_order_num) ? 100 : (parseFloat(this.fenxiaoInfo.one_fenxiao_order_num) / parseFloat(level.one_fenxiao_order_num) * 100).toFixed(2)
+						}
+						if (task.progress == 100) level.complete += 1;
+						level.task.push(task);
+					}
+					if (level.one_fenxiao_total_order > 0) {
+						let task = {
+							title: '下级消费',
+							desc: '下级消费金额满' + this.moneyFormat(level.one_fenxiao_total_order) + '元',
+							tips: '分销商自己购买和推荐的直属会员购买的订单的总额达到'+ this.moneyFormat(level.one_fenxiao_total_order) + '元',
+							condition: this.moneyFormat(level.one_fenxiao_total_order),
+							value: this.fenxiaoInfo.one_fenxiao_total_order,
+							progress: parseFloat(this.fenxiaoInfo.one_fenxiao_total_order) > parseFloat(level.one_fenxiao_total_order) ? 100 : (parseFloat(this.fenxiaoInfo.one_fenxiao_total_order) / parseFloat(level.one_fenxiao_total_order) * 100)
+								.toFixed(2)
+						}
+						if (task.progress == 100) level.complete += 1;
+						level.task.push(task);
+					}
+					if (level.one_fenxiao_order_money > 0) {
+						let task = {
+							title: '下级消费',
+							desc: '下级消费产生佣金总额满' + this.moneyFormat(level.one_fenxiao_order_money) + '元',
+							tips: '分销商自己购买和自己推荐的直属会员购买的订单佣金总额达到'+ this.moneyFormat(level.one_fenxiao_order_money) + '元',
+							condition: this.moneyFormat(level.one_fenxiao_order_money),
+							value: this.fenxiaoInfo.one_fenxiao_order_money,
+							progress: parseFloat(this.fenxiaoInfo.one_fenxiao_order_money) > parseFloat(level.one_fenxiao_order_money) ? 100 : (parseFloat(this.fenxiaoInfo.one_fenxiao_order_money) / parseFloat(level.one_fenxiao_order_money) * 100)
+								.toFixed(2)
+						}
+						if (task.progress == 100) level.complete += 1;
+						level.task.push(task);
+					}
+					if (level.order_num > 0) {
+						let task = {
+							title: '自身消费',
+							desc: '自身消费单数满' + level.order_num + '单',
+							tips: '分销商自己购买的订单次数达到'+ level.order_num + '单',
+							condition: level.order_num,
+							value: this.fenxiaoInfo.order_num,
+							progress: parseFloat(this.fenxiaoInfo.order_num) > parseFloat(level.order_num) ? 100 : (parseFloat(this.fenxiaoInfo.order_num) / parseFloat(level.order_num) * 100).toFixed(2)
+						}
+						if (task.progress == 100) level.complete += 1;
+						level.task.push(task);
+					}
+					if (level.order_money > 0) {
+						let task = {
+							title: '自身消费',
+							desc: '自身消费金额满' + this.moneyFormat(level.order_money) + '元',
+							tips: '分销商自己购买的订单总额满足'+ this.moneyFormat(level.order_money) + '元',
+							condition: this.moneyFormat(level.order_money),
+							value: this.fenxiaoInfo.order_money,
+							progress: parseFloat(this.fenxiaoInfo.order_money) > parseFloat(level.order_money) ? 100 : (parseFloat(this.fenxiaoInfo.order_money) / parseFloat(level.order_money) * 100).toFixed(2)
+						}
+						if (task.progress == 100) level.complete += 1;
+						level.task.push(task);
+					}
+					if (level.one_child_num > 0) {
+						let task = {
+							title: '邀请好友',
+							desc: '邀请好友人数达到' + level.one_child_num + '人',
+							tips: '分销商的直属下级会员人数达到'+level.one_child_num+'人（包含已经申请成为分销商的）',
+							condition: level.one_child_num,
+							value: this.fenxiaoInfo.one_child_num,
+							progress: parseFloat(this.fenxiaoInfo.one_child_num) > parseFloat(level.one_child_num) ? 100 : (parseFloat(this.fenxiaoInfo.one_child_num) / parseFloat(level.one_child_num) * 100).toFixed(2)
+						}
+						if (task.progress == 100) level.complete += 1;
+						level.task.push(task);
+					}
+					if (level.one_child_fenxiao_num > 0) {
+						let task = {
+							title: '邀请好友',
+							desc: '邀请好友成为分销商人数达到' + level.one_child_fenxiao_num + '人',
+							tips: '分销商的直属下级分销商人数达到'+ level.one_child_fenxiao_num + '人',
+							condition: level.one_child_fenxiao_num,
+							value: this.fenxiaoInfo.one_child_fenxiao_num,
+							progress: parseFloat(this.fenxiaoInfo.one_child_fenxiao_num) > parseFloat(level.one_child_fenxiao_num) ? 100 : (parseFloat(this.fenxiaoInfo.one_child_fenxiao_num) / parseFloat(level.one_child_fenxiao_num) * 100).toFixed(2)
+						}
+						if (task.progress == 100) level.complete += 1;
+						level.task.push(task);
+					}
+					level.task_num = level.upgrade_type == 1 ? 1 : level.task.length;
+					return level;
+				}
+			}
+		},
+		onLoad() {},
+		onShow() {
+			setTimeout( () => {
+				if (!this.addonIsExist.fenxiao) {
+					this.$util.showToast({
+						title: '商家未开启分销',
+						mask: true,
+						duration: 2000
+					});
+					setTimeout(() => {
+						this.$util.redirectTo('/pages/index/index');
+					}, 2000);
+				}
+			},1000);
+
+			if (this.fenxiaoWords && this.fenxiaoWords.fenxiao_name) this.$langConfig.title(this.fenxiaoWords.fenxiao_name + '等级');
+
+			if (this.storeToken) {
+				this.getFenxiaoInfo();
+				this.getBasicsConfig();
+			} else {
+				this.$util.redirectTo('/pages_tool/login/login', {
+					back: '/pages_promotion/fenxiao/level'
+				});
+			}
+		},
+		methods: {
+			/**
+			 * 获取分销等级信息
+			 */
+			getFenxiaoLevel() {
+				this.$api.sendRequest({
+					url: '/fenxiao/api/Level/lists',
+					success: res => {
+						if (res.code == 0 && res.data) {
+							this.levelList = res.data;
+							this.levelList.forEach((item, index) => {
+								if (item.level_id == this.fenxiaoInfo.level_id) this.curr = index;
+							})
+						}
+					}
+				});
+			},
+			/**
+			 * 获取分销商信息
+			 */
+			getFenxiaoInfo() {
+				this.$api.sendRequest({
+					url: '/fenxiao/api/fenxiao/detail',
+					success: res => {
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+						if (res.code >= 0 && res.data) {
+							this.fenxiaoInfo = res.data;
+							this.curr = this.fenxiaoInfo.level_num;
+							this.getFenxiaoLevel();
+						} else {
+							this.$util.redirectTo('/pages_promotion/fenxiao/apply');
+						}
+					},
+					fail: () => {
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					}
+				});
+			},
+			/**
+			 * 获取分销基本配置
+			 */
+			getBasicsConfig() {
+				this.$api.sendRequest({
+					url: '/fenxiao/api/config/basics',
+					success: res => {
+						if (res.code >= 0) {
+							this.config = res.data;
+						}
+					}
+				});
+			},
+			swiperChange(e) {
+				this.curr = e.detail.current;
+			},
+			moneyFormat(money) {
+				if (isNaN(parseFloat(money))) return money;
+				return parseFloat(money).toFixed(2);
+			},
+			openTips(data) {
+				this.tips = data.tips;
+				this.$refs.tips.open();
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	@import './public/css/level.scss';
+</style>
+<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;
+	}
+
+	/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_promotion/fenxiao/order.vue b/pages_promotion/fenxiao/order.vue
new file mode 100644
index 0000000..589d0c2
--- /dev/null
+++ b/pages_promotion/fenxiao/order.vue
@@ -0,0 +1,203 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view>
+		<view class="withdraw-cate">
+			<block v-for="(item, index) in category" :key="index">
+				<view @click="selectCate(item.id)" class="cate-li" :class="{ 'active color-base-text color-base-bg-before': selectId == item.id }">{{ item.name }}</view>
+			</block>
+		</view>
+		<mescroll-uni ref="mescroll" @getData="getData" top="90" class="member-point" :size="8" v-if="storeToken">
+			<view class="goods_list" slot="list">
+				<view class="order-list">
+					<view class="order-item" v-for="(orderItem, orderIndex) in orderList" :key="orderIndex" @click="toDetail(orderItem.fenxiao_order_id)">
+						<view class="order-header">
+							<text class="site-name font-size-base">{{ orderItem.order_no }}</text>
+							<text class="status-name color-base-text" v-if="orderItem.is_refund == 1">已退款</text>
+							<text class="status-name color-text-green" v-else-if="orderItem.is_settlement == 1">已结算</text>
+							<text class="status-name color-text-orange" v-else>待结算</text>
+						</view>
+
+						<view class="order-body">
+							<view class="goods-wrap">
+								<view class="goods-img">
+									<image :src="$util.img(orderItem.sku_image, { size: 'mid' })" @error="imageError(orderIndex)" mode="aspectFill" :lazy-load="true"></image>
+								</view>
+								<view class="goods-info">
+									<view class="top-wrap">
+										<view class="goods-name font-size-base">{{ orderItem.sku_name }}</view>
+										<view>
+											<text class="color-tip">返{{ fenxiaoWords.account }}</text>
+											<text class="price-color  price-style small">{{ $lang('common.currencySymbol') }}</text>
+											<text class="price-color price-style large" >{{ parseFloat(orderItem.commission).toFixed(2).split(".")[0] }}</text>
+											<text class="price-color price-style small">.{{ parseFloat(orderItem.commission).toFixed(2).split(".")[1] }}</text>
+										</view>
+									</view>
+									<view class="goods-sub-section">
+										<view class="goods-price">
+											<text class="unit price-style small">{{ $lang('common.currencySymbol') }}</text>
+											<text class="price-color price-style large" >{{ parseFloat(orderItem.price).toFixed(2).split(".")[0] }}</text>
+										    <text class="unit price-style small">.{{ parseFloat(orderItem.price).toFixed(2).split(".")[1] }}</text>
+										</view>
+										<view>
+											<text>
+												<text class="iconfont icon-close"></text>
+												{{ orderItem.num }}
+											</text>
+										</view>
+									</view>
+								</view>
+							</view>
+						</view>
+						<view class="order-footer">
+							<view class="order-base-info active">
+								<view class="order-type ">
+									<text class="color-tip">{{ $util.timeStampTurnTime(orderItem.create_time) }}</text>
+									<!-- <text>返{{ fenxiaoWords.account }}金额：</text>
+									<text class="color-base-text">{{ $lang('common.currencySymbol') }}{{ orderItem.commission }}</text> -->
+								</view>
+								<view class="total">
+									<text>合计：</text>
+									<text class="price-color">{{ $lang('common.currencySymbol') }}</text>
+									<text class="price-color font-size-toolbar" >{{ parseFloat(orderItem.real_goods_money).toFixed(2).split(".")[0] }}</text>
+									<text class="price-color">.{{ parseFloat(orderItem.real_goods_money).toFixed(2).split(".")[1] }}</text>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+				<view class="cart-empty">
+					<ns-empty text="暂无订单" :isIndex="false" v-if="selectId == 0 && orderList.length == 0 && emptyShow"></ns-empty>
+					<ns-empty text="暂无待结算订单" :isIndex="false" v-if="selectId == 1 && orderList.length == 0 && emptyShow"></ns-empty>
+					<ns-empty text="暂无已结算订单" :isIndex="false" v-if="selectId == 2 && orderList.length == 0 && emptyShow"></ns-empty>
+					<ns-empty text="暂无已退款订单" :isIndex="false" v-if="selectId == 3 && orderList.length == 0 && emptyShow"></ns-empty>
+				</view>
+			</view>
+		</mescroll-uni>
+
+		<ns-login ref="login"></ns-login>
+		<loading-cover ref="loadingCover"></loading-cover>
+	</view>
+</template>
+
+<script>
+import fenxiaoWords from 'common/js/fenxiao-words.js';
+export default {
+	data() {
+		return {
+			category: [
+				{
+					id: 0,
+					name: '全部',
+					number: 2
+				},
+				{
+					id: 1,
+					name: '待结算',
+					number: 0
+				},
+				{
+					id: 2,
+					name: '已结算',
+					number: 0
+				},
+				{
+					id: 3,
+					name: '已退款',
+					number: 0
+				}
+			],
+			selectId: 0,
+			orderList: [],
+			emptyShow: false,
+			fenxiaoId: '',
+			subMemberId: ''
+		};
+	},
+	mixins: [fenxiaoWords],
+	onLoad(option) {
+		if (option.type != undefined) this.selectId = option.type;
+	},
+	onShow() {
+		setTimeout( () => {
+			if (!this.addonIsExist.fenxiao) {
+				this.$util.showToast({
+					title: '商家未开启分销',
+					mask: true,
+					duration: 2000
+				});
+				setTimeout(() => {
+					this.$util.redirectTo('/pages/index/index');
+				}, 2000);
+			}
+		},1000);
+
+		if(this.fenxiaoWords && this.fenxiaoWords.concept)this.$langConfig.title(this.fenxiaoWords.concept + '订单');
+
+		if (!this.storeToken) {
+			this.$nextTick(() => {
+				this.$refs.login.open('/pages_promotion/fenxiao/order');
+			});
+		}
+	},
+	methods: {
+		//获得列表数据
+		getData(mescroll) {
+			this.emptyShow = false;
+			if (mescroll.num == 1) {
+				this.orderList = [];
+			}
+			this.$api.sendRequest({
+				url: '/fenxiao/api/order/page',
+				data: {
+					page: mescroll.num,
+					page_size: mescroll.size,
+					is_settlement: this.selectId
+				},
+				success: res => {
+					this.emptyShow = true;
+					let newArr = [];
+					let msg = res.message;
+					if (res.code == 0 && res.data && res.data.list) {
+						newArr = res.data.list;
+					} else {
+						this.$util.showToast({ title: res.message });
+					}
+					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();
+				}
+			});
+		},
+		selectCate(e) {
+			this.selectId = e;
+			this.$refs.mescroll.refresh();
+		},
+		toDetail(e) {
+			this.$util.redirectTo('/pages_promotion/fenxiao/order_detail', {
+				id: e
+			});
+		},
+		imageError(index) {
+			this.orderList[index].sku_image = this.$util.getDefaultImage().goods;
+			this.$forceUpdate();
+		}
+	},
+	watch: {
+		storeToken: function(nVal, oVal) {
+			if (nVal) {
+				this.$refs.mescroll.refresh();
+			}
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+@import './public/css/order.scss';
+</style>
diff --git a/pages_promotion/fenxiao/order_detail.vue b/pages_promotion/fenxiao/order_detail.vue
new file mode 100644
index 0000000..64b1888
--- /dev/null
+++ b/pages_promotion/fenxiao/order_detail.vue
@@ -0,0 +1,378 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view>
+		<view class="order-detail">
+			<view class="order-detail-box">
+				<view class="header">
+					<view class="title">
+						<text>共{{ orderData.num }}件商品</text>
+					</view>
+					<text class="color-base-text font-size-tag" v-if="orderData.is_refund == 1">已退款</text>
+					<text class="color-base-text font-size-tag" v-else-if="orderData.is_settlement == 1">已结算</text>
+					<text class="color-base-text font-size-tag" v-else>待结算</text>
+				</view>
+				<view class="detail-body">
+					<view class="detail-body-box">
+						<view class="goods-image"><image :src="$util.img(orderData.sku_image, { size: 'mid' })" @error="imageError()" mode="aspectFill"></image></view>
+						<view class="order-info">
+							<view class="goods-name">{{ orderData.sku_name }}</view>
+							<view class="goods-sub-section margin-top">
+								<view>
+									<text class="goods-price">
+										<text class="unit price-color">￥</text>
+										<text class="price-color font-size-toolbar" >{{ parseFloat(orderData.price).toFixed(2).split(".")[0] }}</text>
+										<text class="unit price-color">.{{ parseFloat(orderData.price).toFixed(2).split(".")[1] }}</text>
+									</text>
+								</view>
+								<view>
+									<text>
+										<text class="iconfont icon-close"></text>
+										{{ orderData.num }}
+									</text>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+
+				<view class="detail-footer">
+					<text></text>
+					<text>
+						<text>合计：</text>
+						<text class="price-color total">￥{{ orderData.real_goods_money }}</text>
+					</text>
+				</view>
+			</view>
+			<view class="order-detail-box commission">
+				<view class="header">
+					<view class="title color-base-bg-before"><text>返佣详情</text></view>
+					<text class="color-base-text">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</text>
+				</view>
+				<view class="detail-content">
+					<view class="order-info-item">
+						<text class="tit">订单编号：</text>
+						<text>{{ orderData.order_no }}</text>
+					</view>
+					<view class="order-info-item">
+						<text class="tit">分佣层级：</text>
+						<text>{{ orderData.commission_level }}级</text>
+					</view>
+					<view class="order-info-item">
+						<text class="tit">返佣金额：</text>
+						<text class="price-color font-size-toolbar">
+							<text class="font-size-goods-tag">￥</text>
+							{{ parseFloat(orderData.commission).toFixed(2).split(".")[0] }}
+							<text class="font-size-goods-tag">.{{ parseFloat(orderData.commission).toFixed(2).split(".")[1] }}</text>
+						</text>
+						
+					</view>
+				</view>
+			</view>
+		</view>
+		<ns-login ref="login"></ns-login>
+		<loading-cover ref="loadingCover"></loading-cover>
+	</view>
+</template>
+
+<script>
+import fenxiaoWords from 'common/js/fenxiao-words.js';
+export default {
+	data() {
+		return {
+			isIphoneX: false,
+			orderId: 0,
+			orderData: {
+				action: []
+			}
+		};
+	},
+	components: {},
+	onLoad(option) {
+		if (option.id) {
+			this.orderId = option.id;
+		} else {
+			uni.navigateBack({
+				delta: 1
+			});
+		}
+	},
+	mixins: [fenxiaoWords],
+	onShow() {
+		setTimeout( () => {
+			if (!this.addonIsExist.fenxiao) {
+				this.$util.showToast({
+					title: '商家未开启分销',
+					mask: true,
+					duration: 2000
+				});
+				setTimeout(() => {
+					this.$util.redirectTo('/pages/index/index');
+				}, 2000);
+			}
+		},1000);
+
+		this.isIphoneX = this.$util.uniappIsIPhoneX();
+
+		if (this.storeToken) {
+			this.getOrderData();
+		} else {
+			this.$nextTick(() => {
+				this.$refs.login.open('/pages_promotion/fenxiao/order_detail?id=' + this.orderId);
+			});
+		}
+	},
+	methods: {
+		getOrderData() {
+			this.$api.sendRequest({
+				url: '/fenxiao/api/order/info',
+				data: {
+					fenxiao_order_id: this.orderId
+				},
+				success: res => {
+					if (res.code >= 0) {
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+						this.orderData = res.data;
+					} else {
+						this.$util.showToast({
+							title: '未获取到订单信息！'
+						});
+						setTimeout(() => {
+							this.$util.redirectTo('/pages_promotion/fenxiao/order', {}, 'redirectTo');
+						}, 1500);
+					}
+				},
+				fail: res => {
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				}
+			});
+		},
+		imageError() {
+			this.orderData.sku_image = this.$util.getDefaultImage().goods;
+			this.$forceUpdate();
+		}
+	},
+	watch: {
+		storeToken: function(nVal, oVal) {
+			if (nVal) {
+				this.getOrderData();
+			}
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+.order-detail {
+	width: 100%;
+	padding: 0 $padding;
+	box-sizing: border-box;
+	margin-top: $margin-updown;
+	.order-detail-box {
+		width: 100%;
+		height: 100%;
+		box-sizing: border-box;
+		background: #ffffff;
+		border-radius: $border-radius;
+		.header {
+			width: 100%;
+			padding: 30rpx;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			box-sizing: border-box;
+			.title {
+				display: inline-block;
+				position: relative;
+				line-height: 1;
+			}
+		}
+		.detail-body {
+			width: 100%;
+			padding: 0 30rpx 30rpx 30rpx;
+			box-sizing: border-box;
+
+			.detail-body-box {
+				width: 100%;
+				height: 100%;
+				display: flex;
+				.goods-image {
+					width: 180rpx;
+					height: 180rpx;
+					border-radius: $border-radius;
+					image {
+						width: 100%;
+						height: 100%;
+						border: 1rpx solid $color-line;
+						border-radius: $border-radius;
+					}
+				}
+				.order-info {
+					width: calc(100% - 200rpx);
+					height: 180rpx;
+					padding-left: $padding;
+					box-sizing: border-box;
+					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;
+					}
+
+					.goods-sub-section {
+						width: 100%;
+						line-height: 1.3;
+						display: flex;
+
+						.goods-price {
+							font-size: $font-size-base;
+						}
+
+						.unit {
+							font-weight: normal;
+							font-size: $font-size-tag;
+							margin-right: 2rpx;
+						}
+
+						view {
+							flex: 1;
+							line-height: 1.3;
+							&:last-of-type {
+								text-align: right;
+
+								.iconfont {
+									line-height: 1;
+									font-size: $font-size-base;
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+		.detail-content {
+			width: 100%;
+			padding: 0 30rpx 30rpx 30rpx;
+			box-sizing: border-box;
+			border-bottom: 1rpx solid $color-line;
+			text {
+				font-size: $font-size-base;
+			}
+			.order-info-item .tit {
+				display: inline-block;
+			}
+		}
+		.detail-footer {
+			width: 100%;
+			height: 100rpx;
+			padding: $padding;
+			box-sizing: border-box;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+
+			.total {
+				font-weight: 600;
+			}
+		}
+	}
+}
+.commission {
+	margin-top: 20rpx;
+	.detail-content {
+		border: 0 !important;
+	}
+}
+.order-money-detail {
+	width: 100%;
+	padding: 0 $padding;
+	box-sizing: border-box;
+	margin-top: $margin-updown;
+	.order-money-detail-box {
+		width: 100%;
+		height: 100%;
+		padding-top: $padding;
+		box-sizing: border-box;
+		background: #ffffff;
+		border-radius: $border-radius;
+		.header {
+			width: 100%;
+			height: 70rpx;
+			padding: 0 $padding;
+			border-bottom: 1rpx solid $color-line;
+			display: flex;
+			align-items: center;
+			box-sizing: border-box;
+			.title {
+				padding-left: 20rpx;
+				display: inline-block;
+				position: relative;
+				line-height: 1;
+				font-weight: 600;
+			}
+			.title::before {
+				content: '';
+				display: block;
+				width: 4rpx;
+				height: 100%;
+				position: absolute;
+				left: 0;
+				top: 0;
+				border-radius: 6rpx;
+			}
+		}
+		.money-detail-body {
+			width: 100%;
+			padding: $padding;
+			box-sizing: border-box;
+			.order-cell {
+				display: flex;
+				margin: 10rpx 0;
+				align-items: center;
+				background: #fff;
+				line-height: 40rpx;
+
+				.tit {
+					text-align: left;
+					display: inline-block;
+					width: 200rpx;
+				}
+
+				.box {
+					flex: 1;
+					line-height: inherit;
+
+					.textarea {
+						height: 40rpx;
+					}
+				}
+
+				.iconfont {
+					color: #bbb;
+					font-size: $font-size-base;
+				}
+
+				.order-pay {
+					padding: 0;
+
+					text {
+						display: inline-block;
+						margin-left: 6rpx;
+					}
+				}
+				text {
+					color: $color-tip;
+					font-size: $font-size-tag;
+				}
+			}
+		}
+	}
+}
+.price-color{
+	color: var(--price-color);
+}
+</style>
diff --git a/pages_promotion/fenxiao/promote.vue b/pages_promotion/fenxiao/promote.vue
new file mode 100644
index 0000000..e234f96
--- /dev/null
+++ b/pages_promotion/fenxiao/promote.vue
@@ -0,0 +1,363 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view class="fenxiao-promote" :style="{ backgroundImage: 'url(' + $util.img('public/uniapp/fenxiao/promote/promote_bg.png') + ')' }">
+		<view class="my-earnings">
+			<view class="earnings-head-wrap">
+				<view class="earnings-head">
+					<image class="name" :src="$util.img('public/uniapp/fenxiao/promote/my_earnings.png')" mode="aspectFit"></image>
+					<image class="money-bg" :src="$util.img('public/uniapp/fenxiao/promote/money.png')" mode="aspectFill"></image>
+					<view class="content">
+						累计收益
+						<text class="money-text">{{ detailData.total_commission }}</text>
+						元
+					</view>
+				</view>
+			</view>
+			<view class="earnings-body">
+				<view class="earnings-tab">
+					<text :class="{ active: tabIndex == 0 }" @click="tabCut(0)">已邀请好友</text>
+					<text :class="{ active: tabIndex == 1 }" @click="tabCut(1)">已下单好友</text>
+				</view>
+				<scroll-view scroll-y="true" class="earnings-content-wrap" @scrolltolower="getTeam()">
+					<view class="earnings-list" v-if="promote.list.length">
+						<view class="earnings-item" v-for="(item, index) in promote.list" :key="index">
+							<image
+								class="item-img"
+								:src="item.headimg ? $util.img(item.headimg) : $util.getDefaultImage().head"
+								@error="item.headimg = $util.getDefaultImage().head"
+								mode="aspectFill"
+							></image>
+							<view class="item-content">
+								<view class="item-name multi-hidden">{{ item.nickname }}</view>
+							</view>
+						</view>
+					</view>
+					<view class="earnings-empty" v-else>暂无已邀请好友，快去邀请吧</view>
+				</scroll-view>
+			</view>
+		</view>
+		<view class="activity-rules">
+			<image class="rules-name" :src="$util.img('public/uniapp/fenxiao/promote/activity_rules.png')" mode="aspectFit"></image>
+			<view class="content" v-if="promoteContent.content"><rich-text :nodes="promoteContent.content"></rich-text></view>
+			<view class="rules-empty" v-else>暂无活动规则</view>
+		</view>
+		<view class="active-btn"><button type="primary" @click="toPoster()">邀请好友</button></view>
+		<ns-copyright></ns-copyright>
+		<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 htmlParser from '@/common/js/html-parser';
+export default {
+	data() {
+		return {
+			tabIndex: 0,
+			promoteContent: {},
+			promote: {
+				page: 0,
+				page_size: 5,
+				page_count: 0,
+				list: []
+			},
+			isPay: 0,
+			detailData: {},
+			templateId: '',
+			poster:'',
+		};
+	},
+	onShow() {
+		setTimeout( () => {
+			if (!this.addonIsExist.fenxiao) {
+				this.$util.showToast({
+					title: '商家未开启分销',
+					mask: true,
+					duration: 2000
+				});
+				setTimeout(() => {
+					this.$util.redirectTo('/pages/index/index');
+				}, 2000);
+			}
+		},1000);
+
+		if (this.storeToken) {
+			this.getTeam();
+			this.getPromoteRule();
+			this.getFenxiaoDetail();
+		} else {
+			this.$nextTick(() => {
+				this.$refs.login.open('/pages_promotion/fenxiao/promote_code');
+			});
+		}
+	},
+	onLoad() {
+		this.getTemplateId();
+		this.getPoster();
+	},
+	methods: {
+		toPoster(){
+			this.$util.redirectTo('/pages_promotion/fenxiao/promote_code', { poster: this.poster,templateId:this.templateId })
+		},
+		tabCut(index) {
+			this.tabIndex = index;
+			this.isPay = index;
+
+			this.promote.page_count = 0;
+			this.promote.page = 0;
+			this.promote.page_size = 5;
+			this.getTeam();
+		},
+		getTeam() {
+			if (this.promote.page_count > 0 && this.promote.page == this.promote.page_count) return;
+			this.promote.page++;
+			this.$api.sendRequest({
+				url: '/fenxiao/api/fenxiao/team',
+				data: {
+					page: this.promote.page,
+					page_size: this.promote.page_size,
+					is_pay: this.isPay,
+					level: 1
+				},
+				success: res => {
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					if (res.code >= 0) {
+						if (this.promote.page == 1) this.promote.list = [];
+						this.promote.page_count = res.data.page_count;
+						this.promote.list = this.promote.list.concat(res.data.list);
+					} else {
+						this.$util.showToast({
+							title: res.message
+						});
+					}
+				},
+				fail: res => {
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				}
+			});
+		},
+		// 获取分销商信息
+		getFenxiaoDetail() {
+			this.$api.sendRequest({
+				url: '/fenxiao/api/fenxiao/detail',
+				success: res => {
+					if (res.data) {
+						this.detailData = res.data;
+					} else {
+						this.$util.showToast({
+							title: res.message
+						});
+					}
+				}
+			});
+		},
+		// 获取富文本
+		getPromoteRule() {
+			this.$api.sendRequest({
+				url: '/fenxiao/api/config/promoterule',
+				success: res => {
+					if (res.data) {
+						this.promoteContent = res.data;
+						this.promoteContent.content = res.data.content ? htmlParser(res.data.content) : '';
+					} else {
+						this.$util.showToast({
+							title: res.message
+						});
+					}
+				},
+				fail: res => {
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				}
+			});
+		},
+		/**
+		 * 获取分享海报
+		 */
+		getPoster() {
+			this.$api.sendRequest({
+				url: '/fenxiao/api/fenxiao/posterList',
+				success: res => {
+					if (res.code >= 0) {
+						this.poster = res.data.toString();
+						this.poster = encodeURIComponent(this.poster);
+					}
+				}
+			});
+		},
+		/**
+		 * 获取分享海报id
+		 */
+		getTemplateId() {
+			this.$api.sendRequest({
+				url: '/fenxiao/api/fenxiao/posterTemplateIds',
+				success: res => {
+					if (res.code >= 0) {
+						this.templateId = [...res.data].join();
+					}
+				}
+			});
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+.fenxiao-promote {
+	overflow: hidden;
+	padding: 0 30rpx 160rpx;
+	min-height: 100vh;
+	background-color: #ff2d46;
+	background-size: 100%;
+	background-repeat: no-repeat;
+	.my-earnings,
+	.activity-rules {
+		background-color: #fff;
+		border-radius: 30rpx;
+	}
+	.my-earnings {
+		margin-top: 230rpx;
+		padding-bottom: 40rpx;
+		.earnings-head-wrap {
+			background-color: #fff7f5;
+			height: 160rpx;
+			border-radius: 30rpx;
+			border-bottom-left-radius: 0;
+			border-bottom-right-radius: 0;
+		}
+		.earnings-head {
+			position: relative;
+			padding-top: 60rpx;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			.name {
+				position: absolute;
+				width: 384rpx;
+				height: 74rpx;
+				top: -22rpx;
+			}
+			.content {
+				font-size: $font-size-tag;
+			}
+			.money-bg {
+				width: 80rpx;
+				height: 80rpx;
+			}
+			.money-text {
+				margin: 0 6rpx;
+				font-size: 40rpx;
+				line-height: 1;
+			}
+		}
+		.earnings-body {
+			padding: 0 30rpx;
+			.earnings-tab {
+				display: flex;
+				justify-content: space-around;
+				align-items: center;
+				height: 100rpx;
+				font-size: 30rpx;
+				color: #e93224;
+				margin-bottom: 10rpx;
+				text.active {
+					position: relative;
+					font-weight: bold;
+					&::after {
+						position: absolute;
+						content: '';
+						height: 4rpx;
+						width: 86rpx;
+						left: 50%;
+						bottom: -4rpx;
+						transform: translateX(-50%);
+						background-color: #e93224;
+					}
+				}
+			}
+			.earnings-content-wrap {
+				max-height: 440rpx;
+			}
+			.earnings-item {
+				display: flex;
+				align-items: center;
+				margin-bottom: 20rpx;
+				&:last-child {
+					margin-bottom: 0;
+				}
+				.item-img {
+					width: 90rpx;
+					height: 90rpx;
+					margin-right: 20rpx;
+					flex-shrink: 0;
+				}
+				.item-time {
+					font-size: $font-size-tag;
+					color: $color-tip;
+				}
+				.item-name {
+					line-height: 1.3;
+				}
+				.money {
+					margin-left: auto;
+					color: #f9b124;
+				}
+			}
+		}
+		.earnings-empty {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			height: 160rpx;
+			font-size: 30rpx;
+		}
+	}
+	.activity-rules {
+		position: relative;
+		margin-top: 60rpx;
+		min-height: 300rpx;
+		.rules-name {
+			position: absolute;
+			width: 384rpx;
+			height: 74rpx;
+			top: -22rpx;
+			left: 50%;
+			transform: translateX(-50%);
+		}
+		.content {
+			padding: 70rpx 20rpx 0;
+		}
+		.rules-empty {
+			padding-top: 140rpx;
+			text-align: center;
+			font-size: 30rpx;
+		}
+	}
+
+	.active-btn {
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		right: 0;
+		z-index: 5;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		background-color: #ff2d46;
+		height: 160rpx;
+		padding: 0 60rpx;
+
+		button {
+			flex: 1;
+			margin: 0;
+			border-radius: 50rpx;
+			color: #985400;
+			background: linear-gradient(45deg, #ffe2ac 0%, #fdc174 100%);
+		}
+	}
+}
+</style>
diff --git a/pages_promotion/fenxiao/promote_code.vue b/pages_promotion/fenxiao/promote_code.vue
new file mode 100644
index 0000000..c0d5480
--- /dev/null
+++ b/pages_promotion/fenxiao/promote_code.vue
@@ -0,0 +1,307 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view class="container">
+		<swiper class="swiper" @change="getIndex">
+			<swiper-item v-for="(item, index) in poster" :key="index">
+				<view class="swiper-item">
+					<view class="poster-wrap">
+						<image :src="$util.img(item)" mode="widthFix" :show-menu-by-longpress="true"/>
+					</view>
+				</view>
+			</swiper-item>
+		</swiper>
+
+		<!-- #ifdef H5 -->
+		<view class="tips">长按识别图中二维码</view>
+		<!--  #endif -->
+
+		<!-- #ifdef MP -->
+		<view class="btn color-base-bg color-base-border" @click="save">保存海报</view>
+		<!--  #endif -->
+
+		<uni-popup ref="popupDialog" :custom="true" :mask-click="false">
+			<view class="dialog-popup">
+				<view class="title">提示</view>
+				<view class="message">您拒绝了保存图片到相册的授权请求，无法保存图片到相册，如需正常使用，请授权之后再进行操作。</view>
+				<view class="action-wrap">
+					<view @click="closeDialog">取消</view>
+					<view>
+						<button type="default" open-type="openSetting" @opensetting="closeDialog" hover-class="none">立即授权</button>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+
+		<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 uniPopup from '@/components/uni-popup/uni-popup.vue';
+
+	export default {
+		data() {
+			return {
+				poster: [],
+				fenxiaoInfo: {},
+				posterIndex: 0,
+				//海报模板id
+				templateId: ['default'],
+				mpShareData: null //小程序分享数据
+			};
+		},
+		components: {
+			uniPopup
+		},
+		methods: {
+			/**
+			 * 获取分销海报
+			 */
+			getPoster(id) {
+				return new Promise((resolve, reject) => {
+					this.$api.sendRequest({
+						url: '/fenxiao/api/fenxiao/poster',
+						data: {
+							page: '/pages/index/index',
+							qrcode_param: JSON.stringify({}),
+							template_id: id
+						},
+						success: res => {
+							if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+							if (res.code >= 0) {
+								resolve(res.data.path);
+							}
+						},
+						fail: res => {
+							if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+							reject();
+						}
+					});
+				});
+			},
+			getIndex(e) {
+				this.posterIndex = e.detail.current;
+			},
+			save() {
+				// #ifdef MP
+				uni.downloadFile({
+					url: this.$util.img(this.poster[this.posterIndex]),
+					success: res => {
+						if (res.statusCode === 200) {
+							uni.saveImageToPhotosAlbum({
+								filePath: res.tempFilePath,
+								success: () => {
+									this.$util.showToast({
+										title: '保存成功'
+									});
+								},
+								fail: res => {
+									if (res.errMsg == 'saveImageToPhotosAlbum:fail auth deny' ||
+										res.errMsg == 'saveImageToPhotosAlbum:fail:auth denied') {
+										this.$refs.popupDialog.open();
+									} else {
+										this.$util.showToast({
+											title: '保存失败，请稍后重试'
+										});
+									}
+								}
+							});
+						} else {
+							this.$util.showToast({
+								title: '下载失败'
+							});
+						}
+					},
+					fail: res => {
+						this.$util.showToast({
+							title: '下载失败'
+						});
+					}
+				});
+				// #endif
+			},
+			getFenxiaoDetail() {
+				this.poster = [];
+				try {
+					this.templateId.forEach((item, index) => {
+						this.getPoster(item).then(resolve => {
+							this.poster.push(resolve);
+							if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+						}).catch(reject => {
+							throw reject;
+						});
+					});
+				} catch {
+					this.$util.showToast({
+						title: '海报生成失败'
+					});
+				}
+			},
+
+			closeDialog() {
+				this.$refs.popupDialog.close();
+			}
+		},
+		onLoad(option) {
+			setTimeout( () => {
+				if (!this.addonIsExist.fenxiao) {
+					this.$util.showToast({
+						title: '商家未开启分销',
+						mask: true,
+						duration: 2000
+					});
+					setTimeout(() => {
+						this.$util.redirectTo('/pages/index/index');
+					}, 2000);
+				}
+			},1000);
+
+			if (option.templateId) {
+				this.templateId = option.templateId.split(',');
+			}
+
+			if (this.storeToken) {
+				if(option.poster){
+					this.poster = decodeURIComponent(option.poster).split(',')
+					setTimeout(() => {
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					}, 500)
+				}else{
+					this.getFenxiaoDetail();
+				}
+				
+			} else {
+				this.$nextTick(() => {
+					this.$refs.login.open('/pages_promotion/fenxiao/promote_code');
+				});
+			}
+		},
+		onShow() {
+			//小程序分享
+			// #ifdef MP-WEIXIN
+			this.$util.getMpShare().then(res => {
+				this.mpShareData = res;
+			});
+			// #endif
+		},
+		//分享给好友
+		onShareAppMessage() {
+			return this.mpShareData.appMessage;
+		},
+		//分享到朋友圈
+		onShareTimeline() {
+			return this.mpShareData.timeLine;
+		},
+		watch: {
+			storeToken: function(nVal, oVal) {
+				if (nVal) {
+					this.getFenxiaoDetail();
+				}
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	.container {
+		width: 100vw;
+		min-height: 100vh;
+		background-color: #f5f5f5;
+	}
+
+	.poster-wrap {
+		padding: 40rpx 0;
+		width: calc(100vw - 80rpx);
+		margin: 0 40rpx;
+		line-height: 1;
+
+		image {
+			border-radius: 20rpx;
+			overflow: hidden;
+			width: 100%;
+		}
+	}
+
+	.swiper {
+		height: 1240rpx;
+	}
+
+	.btn {
+		margin: 0 80rpx;
+		margin-top: 30rpx;
+		height: 80rpx;
+		line-height: 80rpx;
+		border-radius: $border-radius;
+		color: #fff;
+		text-align: center;
+	}
+
+	.tips {
+		text-align: center;
+		font-size: $font-size-base;
+		color: #999;
+		font-weight: 600;
+		margin-top: 20rpx;
+	}
+
+	.dialog-popup {
+		width: 580rpx;
+		background: #fff;
+		box-sizing: border-box;
+		border-radius: 10rpx;
+		overflow: hidden;
+		height: initial;
+
+		.title {
+			padding: 30rpx 30rpx 0 30rpx;
+			text-align: center;
+			font-size: 32rpx;
+			font-weight: bold;
+		}
+
+		.message {
+			padding: 0 30rpx;
+			color: #666;
+			text-align: center;
+			font-size: $font-size-base;
+			line-height: 1.3;
+			margin-top: 30rpx;
+		}
+
+		.action-wrap {
+			margin-top: 50rpx;
+			height: 80rpx;
+			display: flex;
+			border-top: 2rpx solid #eee;
+
+			&>view {
+				flex: 1;
+				text-align: center;
+				line-height: 80rpx;
+
+				&:first-child {
+					border-right: 2rpx solid #eee;
+					color: #999;
+				}
+
+				button {
+					border: none;
+					line-height: 80rpx;
+					padding: 0;
+					margin: 0;
+					width: 100%;
+					height: 100%;
+				}
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages_promotion/fenxiao/public/css/follow.scss b/pages_promotion/fenxiao/public/css/follow.scss
new file mode 100644
index 0000000..2a753fa
--- /dev/null
+++ b/pages_promotion/fenxiao/public/css/follow.scss
@@ -0,0 +1,94 @@
+.ns-adv {
+	margin: $margin-updown $margin-both;
+	border-radius: $border-radius;
+	overflow: hidden;
+	line-height: 1;
+
+	image {
+		width: 100%;
+	}
+}
+
+.lineheight-clear {
+	line-height: 1 !important;
+}
+
+// 商品列表双列样式
+.goods-list.double-column {
+	display: flex;
+	flex-wrap: wrap;
+	margin: $margin-updown $margin-both;
+
+	.goods-item {
+		flex: 1;
+		position: relative;
+		background-color: #fff;
+		flex-basis: 48%;
+		max-width: calc((100% - 30rpx) / 2);
+		margin-right: $margin-both;
+		margin-bottom: $margin-updown;
+		border-radius: $border-radius;
+
+		&:nth-child(2n) {
+			margin-right: 0;
+		}
+
+		.goods-img {
+			position: relative;
+			overflow: hidden;
+			padding-top: 100%;
+			border-top-left-radius: $border-radius;
+			border-top-right-radius: $border-radius;
+
+			image {
+				width: 100%;
+				position: absolute;
+				top: 50%;
+				left: 0;
+				transform: translateY(-50%);
+			}
+		}
+
+		.info-wrap {
+			padding: 0 26rpx 26rpx 26rpx;
+		}
+
+		.goods-name {
+			font-size: $font-size-base;
+			line-height: 1.3;
+			overflow: hidden;
+			text-overflow: ellipsis;
+			display: -webkit-box;
+			-webkit-line-clamp: 2;
+			-webkit-box-orient: vertical;
+			margin-top: 20rpx;
+			height: 68rpx;
+		}
+
+		.discount-price {
+			display: inline-block;
+			font-weight: bold;
+			line-height: 1;
+			margin-top: 16rpx;
+
+			.unit {
+				margin-right: 6rpx;
+			}
+		}
+
+		.pro-info {
+			display: flex;
+			margin-top: 16rpx;
+
+			& > view {
+				padding: 2rpx 10rpx;
+				border: 2rpx solid;
+				border-radius: 6rpx;
+			}
+
+			.iconfont {
+				margin-right: 4rpx;
+			}
+		}
+	}
+}
diff --git a/pages_promotion/fenxiao/public/css/index.scss b/pages_promotion/fenxiao/public/css/index.scss
new file mode 100644
index 0000000..ca16ad2
--- /dev/null
+++ b/pages_promotion/fenxiao/public/css/index.scss
@@ -0,0 +1,574 @@
+.fenxiao-index {
+	position: relative;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+}
+.task-popup {
+	.head-wrap{
+		font-size: 16px;
+		line-height: 51px;
+		height: 51px;
+		display: block;
+		text-align: center;
+		margin-top: 30rpx;
+	}
+	.body-wrap{
+		max-height: 50vh;
+		overflow-y: scroll;
+	}
+	.equity-content{
+		width: 400rpx;
+		height: 200rpx;
+		position: relative;
+		margin: 0 auto;
+		// padding: 20rpx 0 20rpx 0rpx;
+	}
+	.subordinate-consumption{
+		// margin-left: 130rpx;
+		font-weight: 900;
+	}
+	.incomplete{
+		font-weight: normal;
+		color: rgb(153,153,153);
+		margin-left: 120rpx;
+		font-size: 24rpx;
+	}
+	.icon-wenhao{
+		margin-left: 10rpx;
+	}
+	.to-complete-box{
+		width: 100rpx;
+		height: 40rpx;
+		border-radius: 60rpx;
+		background: rgb(233,51,35);
+		position: absolute;
+		left: 100%;
+		top: 40px;
+		line-height: 40rpx;
+		text-align: center;
+	}
+	.to-complete-box{
+		padding: 5rpx;
+		color: #fff;
+	}
+	.circle{
+		width: 355rpx;
+		height: 12rpx;
+		margin: 10rpx 0rpx; 
+	}
+	.zero{
+		color:rgb(198,152,53);
+		// margin-left: 130rpx;
+	}
+	.icon-close {
+		position: absolute;
+		float: right;
+		right: 22px;
+		font-size: 16px;
+	}
+}
+.fenxiao-index-header {
+	width: 100%;
+	position: relative;
+	height: 180rpx;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	justify-content: space-between;
+	
+	&.not-level {
+		height: 200rpx;
+	}
+	
+	.member {
+		width: 100%;
+		height: 156rpx;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		padding: 54rpx 32rpx 0;
+		box-sizing: border-box;
+		position: relative;
+		
+		.promote-rules {
+			position: absolute;
+			display: flex;
+			align-items: center;
+			color: #fff;
+			right: 40rpx;
+			font-size: 24rpx;
+			.iconfont{
+				margin-right: 10rpx;
+			}
+		}
+		
+		.member-pic {
+			width: 108rpx;
+			height: 108rpx;
+			border-radius: 50%;
+			border: 4rpx solid #fff;
+			position: relative;
+
+			image {
+				width: 100%;
+				height: 100%;
+				border-radius: 50%;
+			}
+			.level-name {
+				height: 32rpx;
+				background: linear-gradient(180deg, #FCFCFD 0%, #C8D0DD 100%);
+				border-radius: 32rpx;
+				line-height: 32rpx;
+				padding: 0 10rpx;
+				font-size: 18rpx;
+				font-weight: 500;
+				color: #666666;
+				position: absolute;
+				bottom: -4rpx;
+				left: 50%;
+				z-index: 5;
+				white-space: nowrap;
+				transform: translateX(-50%);
+			}
+		}
+
+		.member-info {
+			flex: 1;
+			width: 0;
+			margin-left: 32rpx;
+			display: flex;
+			flex-direction: column;
+			justify-content: center;
+			
+			view {
+				color: #fff;
+			}
+			
+			.member-info-box {
+				display: flex;
+				align-items: center;
+				line-height: 1;
+				.level{
+				    display: -webkit-box;
+				    display: -webkit-flex;
+				    display: flex;
+				    -webkit-box-orient: vertical;
+				    -webkit-box-direction: normal;
+				    -webkit-flex-direction: column;
+				    flex-direction: column;
+				    -webkit-box-pack: center;
+				    -webkit-justify-content: center;
+				    justify-content: center;
+				    text-align: center;
+				    position: relative;
+				    -webkit-flex-shrink: 0;
+				    flex-shrink: 0;
+				    color: #ff3c29;
+				    font-size: 24rpx;
+				    font-style: normal;
+				    font-weight: 400;
+				    margin-left: 24rpx !important;
+				    border-radius: 0 24rpx 24rpx 0;
+				    vertical-align: middle;
+				    background: #fff6d1;
+				    padding: 4rpx 24rpx;
+				    margin: 10rpx 0 10rpx 14rpx;
+					.level-icon {
+					    position: absolute;
+					    top: 50%;
+					    left: 0;
+					    -webkit-transform: translate(-50%, -55%);
+					    transform: translate(-50%, -55%);
+					    width: 40rpx;
+					    height: 40rpx;
+					    margin: auto 0;
+					}
+				}
+			
+			}
+			.name {
+				font-size: 32rpx;
+				font-weight: 600;
+				color: #FFFFFF;
+			}
+
+			.recommend {
+				font-size: $font-size-tag;
+				margin-top: 4rpx;
+				line-height: 1;
+				margin-bottom: 10rpx;
+				display: flex;
+				align-items: center;
+			}
+			
+			.copy {
+				width: 68rpx;
+				height: 30rpx;
+				line-height: 30rpx;
+				background: linear-gradient(172deg, rgba(255,255,255,0.6) 0%, rgba(255,255,255,0.8) 100%);
+				border-radius: 60rpx;
+				text-align: center;
+				display: inline-block;
+				font-size: 18rpx;
+				font-weight: 600;
+				color: #202230;
+				margin-left: 20rpx
+			}
+		}
+
+		.member-tixian {
+			width: 120rpx;
+			height: 50rpx;
+			border: 2rpx solid #ffffff;
+			border-radius: $border-radius;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			font-size: $font-size-tag;
+			color: #ffffff;
+		}
+		.code {
+			width: 50rpx;
+			height: 50rpx;
+		}
+	}
+	
+	.fenxiao-level-wrap {
+		width: calc(100% - 48rpx);
+		height: 128rpx;
+		background: linear-gradient(90deg, #FDE5C2 0%, #FDC172 100%);
+		border-radius: 20rpx 20rpx 0px 0px;
+		padding: 36rpx;
+		box-sizing: border-box;
+		display: flex;
+		align-items: center;
+		
+		.level-icon {
+			width: 70rpx;
+			height: 70rpx;
+		}
+		
+		.level-wrap {
+			flex: 1;
+			width: 0;
+			padding: 0 30rpx;
+			margin-left: 30rpx;
+			position: relative;
+			
+			view {
+				color: #945100;
+				line-height: 1;
+			}
+			
+			.title {
+				font-weight: 600;
+				font-size: 30rpx;
+			}
+			
+			.desc {
+				font-size: 24rpx;
+				margin-top: 10rpx;
+			}
+			
+			&::before {
+				content: "";
+				position: absolute;
+				top: 0;
+				left: 0;
+				width: 2rpx;
+				height: 100%;
+				background: linear-gradient(90deg, #FDE5C2 0%, #FDC172 100%);
+			}
+		}
+		
+		.btn {
+			width: 118rpx;
+			height: 54rpx;
+			line-height: 54rpx;
+			background: #945100;
+			border-radius: 54rpx;
+			font-size: 24rpx;
+			color: #fff;
+			font-weight: 500;
+			text-align: center;
+		}
+	}
+}
+
+.fenxiao_index_money {
+	color: #fff;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	width: 100%;
+
+	.xian {
+		height: 40rpx;
+		border: 2rpx solid rgba(255, 255, 255, 0.5);
+	}
+
+	.index-money-item {
+		padding: 40rpx 0;
+		flex: 1;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+
+		.item_money {
+			color: #fff;
+			font-size: 36rpx;
+			line-height: 1;
+		}
+		.item_tit {
+			padding-top: 10rpx;
+			font-size: $font-size-tag;
+			color: #fff;
+		}
+	}
+}
+
+.fenxiao-index-allmoney {
+	display: flex;
+	flex-direction: column;
+	justify-content: space-between;
+	margin: 20rpx 24rpx;
+	border-radius: 16rpx;
+	background-color: #ffffff;
+	width: calc(100% - 48rpx);
+	padding: 32rpx;
+	box-sizing: border-box;
+
+	.allmoney-top {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		
+		view {
+			line-height: 1;
+			color: #565656;
+			font-size: 24rpx;
+		}
+		
+		.iconright {
+			line-height: 1;
+			font-size: 28rpx;
+			margin-left: 4rpx;
+		}
+	}
+	
+	.total-commission {
+		color: #fa2943;
+		margin-top: 20rpx;
+		font-size: 56rpx;
+		font-weight: bold;
+		line-height: 1;
+	}
+	
+	.allmoney-bottom {
+		display: flex;
+		margin-top: 50rpx;
+	
+		.allmoney-all-wrap {
+			flex: 1;
+			
+			.title {
+				font-size: 24rpx;
+				color: #565656;
+			}
+			
+			.money {
+				font-size: 38rpx;
+			}
+		}
+	}
+	
+	.withdraw-btn {
+		height: 78rpx;
+		line-height: 78rpx;
+		border-radius: 92rpx;
+		background: #fa2943;
+		text-align: center;
+		color: #fff;
+		font-size: 28rpx;
+		margin: 50rpx 10rpx 0 10rpx;
+	}
+}
+
+.uni-popup__wrapper{
+	width: 450rpx;
+	height: 400rpx;
+	background: rgba(0, 0, 0, 0.4);
+}
+
+.fenxiao-team {
+	display: flex;
+	width: 100%;
+	
+	.fenxiao-index-other {
+		margin: 0 24rpx 20rpx 24rpx;
+		border-radius: 16rpx;
+		background-color: #ffffff;
+		padding: 30rpx 0;
+		flex: 1;
+		
+		&:last-child {
+			margin-left: 0;
+		}
+		
+		.all-money-item {
+			margin: 0 30rpx;
+			display: flex;
+			font-size: $font-size-tag;
+			align-items: center;
+			.img-wrap {
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				width: 70rpx;
+				height: 70rpx;
+				image {
+					width: 100%;
+					height: 100%;
+				}
+			}
+			.all-money-tit-wrap {
+				flex: 1;
+				margin-left: 24rpx;
+				display: flex;
+				flex-direction: column;
+				height: 70rpx;
+				
+				.all-money-tit {
+					line-height: 1;
+					color: $color-title;
+					font-size: $font-size-base;
+					flex: 1;
+				}
+				.all-money-num {
+					color: $color-tip;
+					font-size: 24rpx;
+					line-height: 1;
+				}
+			}
+		}
+	}
+}
+
+.fenxiao-menu-list {
+	margin: 0 24rpx 20rpx 24rpx;
+	border-radius: 16rpx;
+	background-color: #ffffff;
+	width: calc(100% - 48rpx);
+	padding: 10rpx 30rpx;
+	box-sizing: border-box;
+	display: flex;
+	flex-wrap: wrap;
+	
+	.menu-item {
+		width: 50%;
+		display: flex;
+		align-items: center;
+		padding: 32rpx 0;
+		
+		.icon-wrap {
+			width: 68rpx;
+			display: flex;
+			align-content: center;
+			justify-content: center;
+			margin-right: 20rpx;
+			
+			image {
+				width: 100%;
+			}
+		}
+		
+		.info {
+			flex: 1;
+			
+			.title {
+				font-size: 28rpx;
+				line-height: 1;
+			}
+			
+			.desc {
+				font-size: 24rpx;
+				margin-top: 12rpx;
+				color: #aaa;
+				line-height: 1;
+			}
+		}
+	}
+}
+
+.empty {
+	width: 100%;
+	height: 400rpx;
+	margin-top: 200rpx;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	justify-content: center;
+	image {
+		width: 300rpx;
+		margin-bottom: 50rpx;
+	}
+	text {
+		font-size: $font-size-tag;
+		font-weight: 600;
+	}
+	view {
+		width: 300rpx;
+		height: 70rpx;
+		border-radius: $border-radius;
+		text-align: center;
+		line-height: 70rpx;
+		color: #ffffff;
+		margin-top: 30rpx;
+	}
+}
+
+.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);
+		padding: 30rpx;
+		&.store-popup {
+			height: calc(100% - 120rpx);
+		}
+		&.safe-area {
+			height: calc(100% - 270rpx);
+		}
+		&.store-popup.safe-area {
+			height: calc(100% - 140rpx);
+		}
+	}
+}
\ No newline at end of file
diff --git a/pages_promotion/fenxiao/public/css/level.scss b/pages_promotion/fenxiao/public/css/level.scss
new file mode 100644
index 0000000..8c8d707
--- /dev/null
+++ b/pages_promotion/fenxiao/public/css/level.scss
@@ -0,0 +1,293 @@
+.level-top {
+	width: 100%;
+	height: 40rpx;
+	position: relative;
+	
+	image {
+		width: 100%;
+		height: 260rpx;
+		position: absolute;
+	}
+}
+
+.level-swiper {
+	width: 100vw;
+	height: 270rpx;
+	
+	.level-item {
+		width: calc(100% - 60rpx);
+		height: 100%;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		margin: 0 26rpx;
+		
+		.level-wrap {
+			width: 100%;
+			height: 90%;
+			background: #fff;
+			border-radius: 16rpx;
+			transition: all .5s;
+			display: flex;
+			flex-direction: column;
+			padding: 20rpx 30rpx;
+			box-sizing: border-box;
+			position: relative;
+		}
+		
+		.not-unlocked {
+			position: absolute;
+			width: 50rpx;
+			height: 50rpx;
+			background: #4B4B4B;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			right: -1rpx;
+			top: -1rpx;
+			border-top-right-radius: 16rpx;
+			border-bottom-left-radius: 16rpx;
+			
+			.iconfont {
+				color: #D3DEE6;
+			}
+		}
+		
+		&.curr {
+			margin: 0;
+			width: 100%;
+			
+			.level-wrap {
+				height: 100%;
+			}
+		}
+		
+		.member-info {
+			display: flex;
+			align-items: center;
+			.head-img {
+				width: 90rpx;
+				height: 90rpx;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				border-radius: 50%;
+				overflow: hidden;
+				
+				image {
+					width: 100%;
+					height: 100%;
+				}
+			}
+			
+			.nickname {
+				color: #fff;
+				margin: 0 20rpx;
+				font-size: 28rpx;
+			}
+			
+			.level-name {
+				line-height: 1;
+				border: 2rpx solid #fff;
+				padding: 4rpx 10rpx;
+				border-radius: 6rpx;
+				font-size: 26rpx;
+				color: #f5f5f5;
+			}
+		}
+		
+		.level-rate {
+			display: flex;
+			margin-top: 30rpx;
+			
+			.rate-item {
+				text-align: left;
+				flex: 1;
+			}
+			.title {
+				color: #f5f5f5;
+				font-size: 24rpx;
+			}
+			.rate {
+				margin-top: 10rpx;
+				color: #fff;
+				font-size: 38rpx;
+				line-height: 1;
+				
+				.percentage {
+					font-size: 28rpx;
+					margin-left: 4rpx;
+				}
+			}
+		}
+	}
+	
+	swiper-item {
+		&:nth-child(1) .level-wrap {
+			background: linear-gradient(to right, #9BA7B1, #D3DEE6);
+		}
+		&:nth-child(2) .level-wrap {
+			background: linear-gradient(to right, #F57E2A, #FAD494);
+		}
+		&:nth-child(3) .level-wrap {
+			background: linear-gradient(to right, #F85151, #FF9999);
+		}
+		&:nth-child(4) .level-wrap {
+			background: linear-gradient(to right, #78B8B4, #AFE6E2);
+		}
+		&:nth-child(5) .level-wrap {
+			background: linear-gradient(to right, #4DA1E1, #58CBF0);
+		}
+		&:nth-child(6) .level-wrap {
+			background: linear-gradient(to right, #81C636, #D1F677);
+		}
+		&:nth-child(7) .level-wrap {
+			background: linear-gradient(to right, #6D7279, #A5AAB0);
+		}
+		&:nth-child(8) .level-wrap {
+			background: linear-gradient(to right, #866DDB, #D49BFE);
+		}
+		&:nth-child(9) .level-wrap {
+			background: linear-gradient(to right, #f1c74e, #f7dc81);
+		}
+		&:nth-child(10) .level-wrap {
+			background: linear-gradient(to right, #418CCF, #9CC6F1);
+		}
+	}
+}
+
+.level-condition {
+	margin: 30rpx 26rpx;
+	background: #fff;
+	padding: 30rpx;
+	border-radius: 10rpx;
+	
+	.condition-title {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		
+		.title {
+			font-size: 32rpx;
+			font-weight: bolder;
+			position: relative;
+			padding-left: 20rpx;
+			line-height: 1;
+			
+			&:before {
+				content: " ";
+				position: absolute;
+				left: 0;
+				top: 0;
+				width: 6rpx;
+				height: 100%;
+				background-color: $base-color;
+				border-radius: 4rpx;
+			}
+		}
+	}
+	
+	.rate {
+		.complete {
+			color: #E7B667;
+			font-size: 26rpx!important;
+			font-weight: normal!important;
+		}
+		.num {
+			color: #bbb;
+			font-size: 26rpx!important;
+			font-weight: normal!important;
+		}
+	}
+	
+	.task-item {
+		padding: 20rpx 30rpx;
+		background: #F8F8F8;
+		border-radius: 10rpx;
+		margin-top: 30rpx;
+		
+		.flex-box {
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+		}
+		
+		.status{
+			color: #999;
+			
+			&.complete {
+				color: #000;
+			}
+		}
+		
+		.title {
+			font-weight: bold;
+			
+			.iconfont {
+				font-size: 28rpx;
+				color: #B7B7B7;
+				margin-left: 10rpx;
+			}
+		}
+		
+		.desc {
+			color: #999;
+			font-size: 24rpx;
+		}
+		
+		.progress {
+			margin: 16rpx 0;
+		}
+		
+		.complete {
+			font-size: 24rpx!important;
+		}
+		.num {
+			font-size: 24rpx!important;
+		}
+	}
+}
+
+.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);
+		padding: 30rpx;
+		&.store-popup {
+			height: calc(100% - 120rpx);
+		}
+		&.safe-area {
+			height: calc(100% - 270rpx);
+		}
+		&.store-popup.safe-area {
+			height: calc(100% - 140rpx);
+		}
+	}
+}
\ No newline at end of file
diff --git a/pages_promotion/fenxiao/public/css/order.scss b/pages_promotion/fenxiao/public/css/order.scss
new file mode 100644
index 0000000..6a786d9
--- /dev/null
+++ b/pages_promotion/fenxiao/public/css/order.scss
@@ -0,0 +1,206 @@
+/deep/ .fixed {
+	position: relative;
+	top: 0;
+}
+/deep/ .empty {
+	margin-top: 0 !important;
+}
+.cart-empty {
+	padding-top: 208rpx !important;
+}
+.color-text-green {
+	color: #11bd64;
+}
+.color-text-orange {
+	color: #ffa044;
+}
+.withdraw-cate {
+	width: 100%;
+	height: 90rpx;
+	display: flex;
+	box-sizing: border-box;
+	background: #ffffff;
+	.cate-li {
+		flex: 1;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		height: 100%;
+		font-size: 30rpx;
+
+		&.active {
+			box-sizing: border-box;
+			position: relative;
+		}
+		&.active::after {
+			position: absolute;
+			bottom: 0;
+			left: 0;
+			content: '';
+			width: 100%;
+			height: 4rpx;
+		}
+	}
+}
+.goods_list {
+	width: 100%;
+	height: 100%;
+	padding: 0 24rpx;
+	box-sizing: border-box;
+	margin-top: 18rpx;
+	.order-item {
+		padding: 30rpx;
+		box-sizing: border-box;
+		border-radius: 10rpx;
+		background: #ffffff;
+		position: relative;
+		margin-bottom: 18rpx;
+
+		.order-header {
+			display: flex;
+			align-items: center;
+			position: relative;
+			padding-bottom: 24rpx;
+			line-height: 1;
+			font-size: $font-size-goods-tag;
+
+			.icon-dianpu {
+				display: inline-block;
+				line-height: 1;
+				margin-right: 12rpx;
+			}
+
+			.status-name {
+				flex: 1;
+				text-align: right;
+			}
+		}
+
+		.order-body {
+			margin-bottom: 24rpx;
+			.goods-wrap {
+				display: flex;
+				position: relative;
+
+				&:last-of-type {
+					margin-bottom: 0;
+				}
+
+				.goods-img {
+					width: 170rpx;
+					height: 170rpx;
+					padding: 20rpx 0 0 0;
+					margin-right: 5rpx;
+
+					image {
+						width: 100%;
+						height: 100%;
+						border-radius: $border-radius;
+					}
+				}
+
+				.goods-info {
+					flex: 1;
+					position: relative;
+					padding: 20rpx 0 0 0;
+					max-width: calc(100% - 200rpx);
+					margin-left: 18rpx;
+					display: flex;
+					flex-direction: column;
+
+					.top-wrap {
+						flex: 1;
+					}
+
+					.goods-name {
+						display: -webkit-box;
+						-webkit-box-orient: vertical;
+						-webkit-line-clamp: 2;
+						overflow: hidden;
+						line-height: 1.5;
+						font-size: $font-size-goods-tag;
+						color: #000;
+					}
+
+					.goods-sub-section {
+						width: 100%;
+						line-height: 1.5;
+						display: flex;
+						align-items: center;
+						font-size: $font-size-goods-tag;
+						margin-top: 20rpx;
+
+						.unit {
+							font-size: $font-size-tag;
+							margin-right: 2rpx;
+						}
+
+						view {
+							flex: 1;
+							line-height: 1;
+							&:last-of-type {
+								text-align: right;
+
+								.iconfont {
+									line-height: 1;
+									font-size: $font-size-tag;
+								}
+							}
+						}
+					}
+					.order-time {
+						margin-top: 12rpx;
+						font-size: $font-size-goods-tag;
+						color: #838383;
+
+						.goods-price {
+							font-size: $font-size-goods-tag;
+							float: right;
+							color: #000;
+						}
+					}
+				}
+			}
+		}
+
+		.order-footer {
+			padding-top: 24rpx;
+			.order-base-info {
+				display: flex;
+
+				.total {
+					text-align: right;
+					padding-top: 20rpx;
+					flex: 1;
+					font-size: $font-size-goods-tag;
+
+					& > text {
+						line-height: 1;
+					}
+				}
+
+				.order-type {
+					font-size: $font-size-goods-tag;
+
+					& > text {
+						line-height: 1;
+					}
+				}
+			}
+			.order-base-info.active {
+				.total {
+					padding-top: 0;
+				}
+				.order-type {
+					padding-top: 0;
+				}
+			}
+		}
+	}
+	.order-item:last-child {
+		border: none;
+	}
+}
+.price-color{
+	color: var(--price-color);
+}
\ No newline at end of file
diff --git a/pages_promotion/fenxiao/public/js/goods_list.js b/pages_promotion/fenxiao/public/js/goods_list.js
new file mode 100644
index 0000000..7d68c2d
--- /dev/null
+++ b/pages_promotion/fenxiao/public/js/goods_list.js
@@ -0,0 +1,265 @@
+import {
+	Weixin
+} from '@/common/js/wx-jssdk.js';
+
+export default {
+	data() {
+		return {
+			categoryList: [],
+			goodsList: [],
+			categoryId: 0,
+			is_fenxiao: false,
+			currIndex: 0,
+			poster: '-1', //海报
+			posterMsg: '', //海报错误信息
+			shareUrl: '/pages_promotion/fenxiao/goods_list',
+			shareType: 'goods',
+			//海报模板id
+			templateId: ['default'],
+		}
+	},
+	onLoad(options) {
+		setTimeout(() => {
+			if (!this.addonIsExist.fenxiao) {
+				this.$util.showToast({
+					title: '商家未开启分销',
+					mask: true,
+					duration: 2000
+				});
+				setTimeout(() => {
+					this.$util.redirectTo('/pages/index/index');
+				}, 2000);
+			}
+		}, 1000);
+		if (options.templateId) {
+			this.templateId = options.templateId.split(',');
+		}
+		this.getGoodsCategoryTree();
+	},
+	onShow() {
+
+		if (!this.storeToken) {
+			this.$util.redirectTo(
+				'/pages_tool/login/login', {
+					back: '/pages_promotion/fenxiao/goods_list'
+				},
+				'redirectTo'
+			);
+			return;
+		}
+
+		if (this.fenxiaoWords && this.fenxiaoWords.concept) this.$langConfig.title(this.fenxiaoWords.concept + '中心');
+		this.is_fenxiao = Boolean(this.memberInfo.is_fenxiao);
+	},
+	methods: {
+		//获取列表
+		getGoodsList(mescroll) {
+			this.$api.sendRequest({
+				url: '/fenxiao/api/goods/page',
+				data: {
+					page: mescroll.num,
+					page_size: mescroll.size,
+					category_id: this.categoryId
+				},
+				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.goodsList = []; //如果是第一页需手动制空列表
+					this.goodsList = this.goodsList.concat(newArr); //追加新数据
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				},
+				fail: res => {
+					//联网失败的回调
+					mescroll.endErr();
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				}
+			});
+		},
+		//商品详情
+		navToDetailPage(item) {
+			this.$util.redirectTo('/pages/goods/detail', {
+				goods_id: item.goods_id
+			});
+		},
+		//查询一级商品分类
+		getGoodsCategoryTree() {
+			this.$api.sendRequest({
+				url: '/api/goodscategory/tree',
+				data: {
+					level: 1
+				},
+				success: res => {
+					if (res.code == 0) {
+						this.categoryList = res.data;
+					}
+				}
+			});
+		},
+		changeCategory(category_id) {
+			this.categoryId = category_id;
+			if (this.$refs.mescroll) {
+				this.$refs.mescroll.refresh();
+				this.$refs.mescroll.myScrollTo(0);
+			}
+		},
+		// 分享商品
+		shareFn(type, keys) {
+			this.shareType = type;
+			if (this.shareType == "fenxiao")
+				this.openPosterPopup();
+			else {
+				this.currIndex = keys;
+				this.$refs.sharePopup.open();
+			}
+		},
+		// #ifdef MP-WEIXIN
+		/**
+		 * 将商品推荐到微信圈子
+		 */
+		openBusinessView() {
+			if (wx.openBusinessView) {
+				wx.openBusinessView({
+					businessType: 'friendGoodsRecommend',
+					extraData: {
+						product: {
+							item_code: this.goodsList[this.currIndex].goods_id,
+							title: this.goodsList[this.currIndex].sku_name,
+							image_list: this.$util.img(this.goodsList[this.currIndex].goods_image)
+						}
+					},
+					success: function (res) {
+						console.log('success', res);
+					},
+					fail: function (res) {
+						console.log('fail', res);
+					}
+				})
+			}
+		},
+		// #endif
+		//-------------------------------------海报-------------------------------------
+		// 打开海报弹出层
+		openPosterPopup() {
+			this.getGoodsPoster();
+			this.$refs.sharePopup.close();
+		},
+		// 关闭海报弹出层
+		closePosterPopup() {
+			this.$refs.posterPopup.close();
+		},
+		//生成海报
+		getGoodsPoster() {
+			uni.showLoading({
+				'title': '海报生成中...'
+			});
+			let url = "";
+			let data = {};
+			if (this.shareType == "goods") {
+				url = "/api/goods/poster";
+				data.page = "/pages/goods/detail";
+				data.qrcode_param = JSON.stringify({
+					goods_id: this.goodsList[this.currIndex].goods_id,
+					source_member: this.memberInfo.member_id
+				});
+			} else {
+				url = "/fenxiao/api/fenxiao/poster";
+				data.page = "/pages/index/index";
+				data.qrcode_param = JSON.stringify({});
+				data.template_id = this.templateId[0];
+			}
+
+			this.$api.sendRequest({
+				url: url,
+				data: data,
+				success: res => {
+					if (res.code == 0) {
+						this.poster = res.data.path + "?time=" + new Date().getTime();
+						this.$refs.posterPopup.open();
+					} else {
+						this.posterMsg = res.message;
+					}
+					uni.hideLoading();
+				},
+				fail: err => {
+					uni.hideLoading();
+				}
+			});
+		},
+		// #ifdef MP || APP-PLUS
+		//小程序中保存海报
+		saveGoodsPoster() {
+			let url = this.$util.img(this.poster);
+			uni.downloadFile({
+				url: url,
+				success: (res) => {
+					if (res.statusCode === 200) {
+						uni.saveImageToPhotosAlbum({
+							filePath: res.tempFilePath,
+							success: () => {
+								this.$util.showToast({
+									title: "保存成功"
+								});
+							},
+							fail: () => {
+								this.$util.showToast({
+									title: "保存失败，请稍后重试"
+								});
+							}
+						});
+					}
+				}
+			});
+		},
+		// #endif
+		// 打开分享弹出层
+		openSharePopup() {
+			this.$refs.sharePopup.open();
+		},
+		// 关闭分享弹出层
+		closeSharePopup() {
+			this.$refs.sharePopup.close();
+		},
+		copyUrl() {
+			let text = this.$config.h5Domain + '/pages/goods/detail?goods_id=' + this.goodsList[this.currIndex].goods_id + '&source_member=' + this.memberInfo.member_id;
+			this.$util.copy(text, () => {
+				this.closeSharePopup();
+			});
+		},
+		imageError(index) {
+			this.goodsList[index].sku_image = this.$util.getDefaultImage().goods;
+			this.$forceUpdate();
+		}
+	},
+	/**
+	 * 自定义分享内容
+	 * @param {Object} res
+	 */
+	onShareAppMessage(res) {
+		var path = this.shareUrl;
+
+		if (this.shareType == "goods") {
+			path = `/pages/goods/detail?goods_id=${this.goodsList[this.currIndex].goods_id}&sku_id=${this.goodsList[this.currIndex].sku_id}&source_member=${this.memberInfo.member_id}`;
+		}
+
+		return {
+			title: this.goodsList[this.currIndex].sku_name,
+			imageUrl: this.$util.img(this.goodsList[this.currIndex].goods_image, {
+				size: 'big'
+			}),
+			path: path,
+			success: res => {
+			},
+			fail: res => {
+			}
+		};
+	}
+}
\ No newline at end of file
diff --git a/pages_promotion/fenxiao/ranking_list.vue b/pages_promotion/fenxiao/ranking_list.vue
new file mode 100644
index 0000000..1f6c723
--- /dev/null
+++ b/pages_promotion/fenxiao/ranking_list.vue
@@ -0,0 +1,416 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view class="container">
+		<mescroll-uni ref="mescroll" @getData="getData" top="0" :size="10">
+			<view slot="list">
+				<block v-if="list.length != 0">
+					<view class="banner" :style="{background: 'url('+ $util.img('public/uniapp/fenxiao/index/header_bg.png') +') no-repeat top left / 100% 100%'}">
+						<view class="info">
+							<view class="info-pic">
+								<image :src="info.headimg ? $util.img(info.headimg) : $util.getDefaultImage().head" @error="info.headimg = $util.getDefaultImage().head" mode="aspectFill"/>
+							</view>
+							<view class="member-info">
+								<view class="rank-info-box">
+									<text class="name">{{info.nickname}}</text>
+								</view>
+								<view class="withdrawal" @click="$util.redirectTo('/pages_promotion/fenxiao/withdraw_apply')" v-if="type == 'profit'">点击提现</view>
+								<view class="withdrawal" @click="$util.redirectTo('/pages_promotion/fenxiao/team')" v-if="type == 'invited_num'">我的团队</view>
+							</view>
+						</view>
+					</view>
+
+					<view class="fenxiao-team" v-if="type == 'profit'">
+						<view class="fenxiao-index-other">
+							<view class="all-money-item">
+								<view class="img-wrap">
+									<text class="iconfont icon-fenxiao"></text>
+								</view>
+								<view class="all-money-tit-wrap">
+									<text class="all-money-tit">分销佣金</text>
+									<text class="all-money-num">{{ info.today_commission}}元</text>
+								</view>
+							</view>
+						</view>
+						<view class="fenxiao-index-other">
+							<view class="all-money-item">
+								<view class="img-wrap">
+									<text class="iconfont icon-baixingbeng"></text>
+								</view>
+								<view class="all-money-tit-wrap">
+									<text class="all-money-tit">佣金排行</text>
+									<text class="all-money-num">您排行第{{ ranking }}名</text>
+								</view>
+							</view>
+						</view>
+					</view>
+					<view class="fenxiao-team" v-if="type == 'invited_num'">
+						<view class="fenxiao-index-other">
+							<view class="all-money-item">
+								<view class="img-wrap">
+									<text class="iconfont icon-huodongtuiyan"></text>
+								</view>
+								<view class="all-money-tit-wrap">
+									<text class="all-money-tit">推广人数</text>
+									<text class="all-money-num">{{ info.one_child_num}}人</text>
+								</view>
+							</view>
+						</view>
+						<view class="fenxiao-index-other">
+							<view class="all-money-item">
+								<view class="img-wrap">
+									<text class="iconfont icon-baixingbeng"></text>
+								</view>
+								<view class="all-money-tit-wrap">
+									<text class="all-money-tit" v-if="type == 'invited_num'">推广排行</text>
+									<text class="all-money-num">您排行第{{ ranking }}名</text>
+								</view>
+							</view>
+						</view>
+					</view>
+
+					<view class="title-rakn-text"  v-if="type == 'profit'">佣金排行</view>
+					<view class="title-rakn-text"  v-if="type == 'invited_num'">推广排行</view>
+
+					<view class="ranking-list">
+						<view class="ranking-item" v-for="(item, index) in list" :key="index">
+							<view class="ranking price-font">{{ index + 1 }}</view>
+							<view class="content">
+								<view class="head-img">
+									<image :src="item.headimg ? $util.img(item.headimg) : $util.getDefaultImage().head" @error="item.headimg = $util.getDefaultImage().head" mode="aspectFill"/>
+								</view>
+								<view class="nickname">{{ item.nickname }}</view>
+							</view>
+							<view class="price-font price-style" v-if="type == 'profit'">
+								￥{{ item.total_commission|moneyFormat }}</view>
+							<view class="price-font price-style" v-if="type == 'invited_num'">{{ item.child_num }}人
+							</view>
+						</view>
+					</view>
+				</block>
+				<block v-if="list.length == 0 && emptyShow">
+					<ns-empty text="暂无数据" :isIndex="false"></ns-empty>
+				</block>
+			</view>
+		</mescroll-uni>
+
+		<loading-cover ref="loadingCover"></loading-cover>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				list: [],
+				emptyShow: false,
+				type: '',
+				ranking: 0,
+				info: {}
+			}
+		},
+		onLoad(data) {
+			this.type = data.type;
+			this.getRanking();
+			this.getFenxiaoDetail();
+		},
+		methods: {
+			getData(mescroll) {
+				this.emptyShow = false;
+				if (mescroll.num == 1) {
+					this.list = [];
+				}
+				this.$api.sendRequest({
+					url: '/fenxiao/api/fenxiao/rankinglist',
+					data: {
+						page_size: mescroll.size,
+						page: mescroll.num,
+						type: this.type
+					},
+					success: res => {
+						this.emptyShow = true;
+						let newArr = [];
+						let msg = res.message;
+						if (res.code == 0 && res.data) {
+							newArr = res.data.list;
+						} else {
+							this.$util.showToast({
+								title: msg
+							});
+						}
+						mescroll.endSuccess(newArr.length);
+						//设置列表数据
+						if (mescroll.num == 1) this.list = []; //如果是第一页需手动制空列表
+						this.list = this.list.concat(newArr); //追加新数据
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					},
+					fail: res => {
+						mescroll.endErr();
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					}
+				});
+			},
+			getRanking() {
+				this.$api.sendRequest({
+					url: '/fenxiao/api/fenxiao/ranking',
+					data: {
+						type: this.type
+					},
+					success: res => {
+						if (res.code >= 0) {
+							this.ranking = res.data;
+						}
+					}
+				})
+			},
+			getFenxiaoDetail() {
+				this.$api.sendRequest({
+					url: '/fenxiao/api/fenxiao/detail',
+					success: res => {
+						if (res.data) {
+							this.info = res.data;
+						}
+					},
+				});
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	.container {
+		width: 100vw;
+		height: 100vh;
+	}
+
+	.banner {
+		width: 100%;
+		height: 200rpx;
+		// background: $base-color;
+	}
+
+	.info {
+		width: 100%;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		padding: 50rpx 80rpx 0;
+		box-sizing: border-box;
+
+		.info-pic {
+			width: 100rpx;
+			height: 100rpx;
+			border-radius: 50%;
+			border: 4rpx solid #fff;
+			position: relative;
+
+			image {
+				width: 100%;
+				height: 100%;
+				border-radius: 50%;
+			}
+
+		}
+
+		.member-info {
+			flex: 1;
+			width: 0;
+			margin-left: 32rpx;
+			display: flex;
+
+			view {
+				color: #fff;
+			}
+
+			.rank-info-box {
+				line-height: 1;
+				flex: 1;
+			}
+
+			.name {
+				font-size: 32rpx;
+				font-weight: 600;
+				color: #FFFFFF;
+			}
+
+			.withdrawal {
+				border-radius: 4px;
+				line-height: 23px;
+				margin: auto;
+				text-align: center;
+				font-size: 11px;
+			}
+
+		}
+
+	}
+
+	.fenxiao-team {
+		display: flex;
+		width: 100%;
+		margin-top: 22rpx;
+
+		.fenxiao-index-other {
+			margin: 0 24rpx 20rpx 24rpx;
+			border-radius: 16rpx;
+			background-color: #ffffff;
+			padding: 30rpx 0;
+			flex: 1;
+
+			&:last-child {
+				margin-left: 0;
+			}
+
+			.all-money-item {
+				margin: 0 30rpx;
+				display: flex;
+				font-size: $font-size-tag;
+				align-items: center;
+
+				.img-wrap {
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					width: 70rpx;
+					height: 70rpx;
+
+					image {
+						width: 100%;
+						height: 100%;
+					}
+				}
+
+				.all-money-tit-wrap {
+					flex: 1;
+					margin-left: 24rpx;
+					display: flex;
+					flex-direction: column;
+					height: 70rpx;
+
+					.all-money-tit {
+						line-height: 1;
+						color: $color-title;
+						font-size: $font-size-base;
+						flex: 1;
+					}
+
+					.all-money-num {
+						color: $color-tip;
+						font-size: 24rpx;
+						line-height: 1;
+					}
+				}
+			}
+		}
+	}
+
+	.icon-wenxiao {
+		text-align: center;
+		font-size: 50rpx;
+		color: var(--base-color) !important;
+	}
+
+	.number {
+		font-weight: 600;
+		text-align: center;
+	}
+
+	.info-text {
+		font-size: 20rpx;
+		text-align: center;
+	}
+
+	.info-title {
+		font-size: 50rpx;
+		font-weight: 900;
+		color: #f5f5f5;
+		text-align: center;
+	}
+
+	.info-rank {
+		color: #f5f5f5;
+		margin-top: 10rpx;
+	}
+
+	.title-rakn-text {
+		text-align: center;
+		font-size: 30rpx;
+		font-weight: 900;
+	}
+
+	.ranking-list {
+		transform: translateY(-120rpx);
+		margin: 200rpx 24rpx;
+		background: #fff;
+		border-radius: 16rpx;
+		padding: 10rpx 20rpx;
+		margin-top: 140rpx;
+
+		.ranking-item {
+			display: flex;
+			align-items: center;
+			padding: 20rpx 0;
+			border-bottom: 2rpx solid #f5f5f5;
+
+			&:last-child {
+				border-bottom: 0;
+			}
+
+			.ranking {
+				width: 60rpx;
+				height: 60rpx;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				box-sizing: border-box;
+				font-size: 24rpx;
+			}
+
+			&:nth-child(1) .ranking {
+				background: rgb(249, 186, 1);
+				border-radius: 50%;
+				border: 10rpx solid rgb(254, 220, 92);
+			}
+
+			&:nth-child(2) .ranking {
+				background: rgb(172, 185, 194);
+				border-radius: 50%;
+				border: 10rpx solid rgb(215, 223, 229);
+			}
+
+			&:nth-child(3) .ranking {
+				background: rgb(211, 163, 136);
+				border-radius: 50%;
+				border: 10rpx solid rgb(235, 201, 190);
+			}
+
+			.content {
+				flex: 1;
+				width: 0;
+				padding: 0 20rpx;
+				display: flex;
+				align-items: center;
+
+				.head-img {
+					width: 90rpx;
+					height: 90rpx;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					border-radius: 50%;
+					overflow: hidden;
+
+					image {
+						width: 100%;
+						height: 100%;
+					}
+				}
+
+				.nickname {
+					color: #333;
+					margin: 0 20rpx;
+					font-size: 28rpx;
+				}
+			}
+		}
+	}
+</style>
diff --git a/pages_promotion/fenxiao/relation.vue b/pages_promotion/fenxiao/relation.vue
new file mode 100644
index 0000000..b1d5b9c
--- /dev/null
+++ b/pages_promotion/fenxiao/relation.vue
@@ -0,0 +1,152 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view>
+		<mescroll-uni ref="mescroll" @getData="getData" top="20" class="member-point" :size="8" v-if="storeToken">
+			<view class="goods_list" slot="list">
+				<view class="order-list">
+					<view class="order-item" v-for="(orderItem, orderIndex) in orderList" :key="orderIndex" @click="toDetail(orderItem.fenxiao_order_id)">
+						<view class="order-header">
+							<text class="site-name font-size-base">{{ orderItem.order_no }}</text>
+							<text class="status-name color-base-text" v-if="orderItem.is_refund == 1">已退款</text>
+							<text class="status-name color-text-green" v-else-if="orderItem.is_settlement == 1">已结算</text>
+							<text class="status-name color-text-orange" v-else>待结算</text>
+						</view>
+
+						<view class="order-body">
+							<view class="goods-wrap">
+								<view class="goods-img">
+									<image :src="$util.img(orderItem.sku_image, { size: 'mid' })" @error="imageError(orderIndex)" mode="aspectFill" :lazy-load="true"></image>
+								</view>
+								<view class="goods-info">
+									<view class="top-wrap">
+										<view class="goods-name font-size-base">{{ orderItem.sku_name }}</view>
+										<view>
+											<text class="color-tip">返{{ fenxiaoWords.account }}</text>
+											<text class="price-color font-size-goods-tag">{{ $lang('common.currencySymbol') }}</text>
+											<text class="price-color font-size-toolbar">{{ orderItem.commission }}</text>
+										</view>
+									</view>
+									<view class="goods-sub-section">
+										<view class="goods-price">
+											<text class="unit price-color">{{ $lang('common.currencySymbol') }}</text>
+											<text class="price-color font-size-toolbar">{{ orderItem.price }}</text>
+										</view>
+										<view>
+											<text>
+												<text class="iconfont icon-close"></text>
+												{{ orderItem.num }}
+											</text>
+										</view>
+									</view>
+								</view>
+							</view>
+						</view>
+						<view class="order-footer">
+							<view class="order-base-info active">
+								<view class="order-type ">
+									<text class="color-tip">{{ $util.timeStampTurnTime(orderItem.create_time) }}</text>
+									<!-- <text>返{{ fenxiaoWords.account }}金额：</text>
+									<text class="color-base-text">{{ $lang('common.currencySymbol') }}{{ orderItem.commission }}</text> -->
+								</view>
+								<view class="total">
+									<text>合计：</text>
+									<text class="price-color">{{ $lang('common.currencySymbol') }}</text>
+									<text class="font-size-toolbar price-color">{{ orderItem.real_goods_money }}</text>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+				<view class="cart-empty"><ns-empty text="暂无订单" :isIndex="false" v-if="orderList.length == 0 && emptyShow"></ns-empty></view>
+			</view>
+		</mescroll-uni>
+
+		<ns-login ref="login"></ns-login>
+		<loading-cover ref="loadingCover"></loading-cover>
+	</view>
+</template>
+
+<script>
+import fenxiaoWords from 'common/js/fenxiao-words.js';
+
+export default {
+	data() {
+		return {
+			orderList: [],
+			emptyShow: false,
+			fenxiaoId: '',
+			subMemberId: ''
+		};
+	},
+	mixins: [fenxiaoWords],
+	onLoad(option) {
+		if (option.fenxiao_id) {
+			this.fenxiaoId = option.fenxiao_id;
+		}
+		if (option.sub_member_id) {
+			this.subMemberId = option.sub_member_id;
+		}
+	},
+	onShow() {
+		if(this.fenxiaoWords && this.fenxiaoWords.concept)this.$langConfig.title(this.fenxiaoWords.concept + '订单');
+	},
+	methods: {
+		//获得列表数据
+		getData(mescroll) {
+			this.emptyShow = false;
+			if (mescroll.num == 1) {
+				this.orderList = [];
+			}
+			this.$api.sendRequest({
+				url: '/fenxiao/api/fenxiao/getorder',
+				data: {
+					page: mescroll.num,
+					page_size: mescroll.size,
+					fenxiao_id: this.fenxiaoId ? this.fenxiaoId : '',
+					sub_member_id: this.subMemberId ? this.subMemberId : ''
+				},
+				success: res => {
+					this.emptyShow = true;
+					let newArr = [];
+					let msg = res.message;
+					if (res.code == 0 && res.data && res.data.list) {
+						newArr = res.data.list;
+					} else {
+						this.$util.showToast({ title: res.message });
+					}
+					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].sku_image = this.$util.getDefaultImage().goods;
+			this.$forceUpdate();
+		},
+		toDetail(e) {
+			this.$util.redirectTo('/pages_promotion/fenxiao/order_detail', {
+				id: e
+			});
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+@import './public/css/order.scss';
+.goods-wraps {
+	align-items: center;
+}
+.goods_list .order-item .order-body .goods-wraps .goods-img,
+.goods_list .order-item .order-body .goods-wraps .goods-info,
+.goods_list .order-item .order-footers {
+	padding: 0;
+}
+</style>
diff --git a/pages_promotion/fenxiao/team.vue b/pages_promotion/fenxiao/team.vue
new file mode 100644
index 0000000..878cc7e
--- /dev/null
+++ b/pages_promotion/fenxiao/team.vue
@@ -0,0 +1,355 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view>
+		<view class="team-cate" v-if="storeToken && levelNum > 1">
+			<block v-for="(item, index) in levelList" :key="index">
+				<view class="cate-li" :class="{ 'active color-base-text color-base-border': currentLevel == item.level }" @click="selectLevel(item.level)">{{ item.name }}</view>
+			</block>
+		</view>
+		<mescroll-uni ref="mescroll" @getData="getData" :top="levelNum > 1 ? 90 : 0" class="member-point" :size="8" v-if="storeToken">
+			<block slot="list">
+				<view class="team-li" v-for="(item, index) in teamList" :key="index" v-if="teamList.length != 0" @click="toFenxiaoOrder(item)">
+					<view class="li-box" :class="{ active: index + 1 == teamList.length }">
+						<image v-if="item.headimg" :src="$util.img(item.headimg)" @error="imageError(index)" mode="aspectFill"></image>
+						<image v-else :src="$util.getDefaultImage().head"></image>
+						<view class="member-info">
+							<view class="member-name">
+								<block v-if="item.is_fenxiao">
+									<view class="left">
+										<view class="flex-box">
+											<view class="name">{{ item.nickname }}</view>
+											<view class="title  color-base-border color-base-text">{{ fenxiaoWords.fenxiao_name }}</view>
+										</view>
+										<view class="color-tip font-size-goods-tag">加入时间：{{ $util.timeStampTurnTime(item.bind_fenxiao_time).substring(0, 10) }}</view>
+									</view>
+									<view class="consume-info">
+										<view>
+											<text>{{ item.one_child_num }}</text>
+											人
+										</view>
+										<view>
+											<text>{{ item.order_num }}</text>
+											单
+										</view>
+										<view>
+											<text>{{ item.order_money | moneyFormat }}</text>
+											元
+										</view>
+									</view>
+								</block>
+								<block v-else>
+									<view class="left">
+										<view class="flex-box">
+											<view class="name font-size-tag">
+												<text>{{ item.nickname }}</text>
+											</view>
+										</view>
+										<view class="color-tip font-size-goods-tag">加入时间：{{ $util.timeStampTurnTime(item.bind_fenxiao_time).substring(0, 10) }}</view>
+									</view>
+									<view class="consume-info">
+										<view>
+											<text>0</text>
+											人
+										</view>
+										<view>
+											<text>{{ item.order_num }}</text>
+											单
+										</view>
+										<view>
+											<text>{{ item.order_money | moneyFormat }}</text>
+											元
+										</view>
+									</view>
+								</block>
+							</view>
+						</view>
+					</view>
+				</view>
+				<block v-if="teamList.length == 0 && emptyShow"><ns-empty text="暂无数据" :isIndex="false"></ns-empty></block>
+			</block>
+		</mescroll-uni>
+
+		<ns-login ref="login"></ns-login>
+		<loading-cover ref="loadingCover"></loading-cover>
+	</view>
+</template>
+
+<script>
+import fenxiaoWords from 'common/js/fenxiao-words.js';
+export default {
+	data() {
+		return {
+			levelList: [
+				{
+					name: '一级',
+					level: 1
+				},
+				{
+					name: '二级',
+					level: 2
+				}
+			],
+			currentLevel: 1,
+			teamList: [],
+			emptyShow: false,
+			levelNum: 0,
+		};
+	},
+	mixins: [fenxiaoWords],
+	onShow() {
+		setTimeout( () => {
+			if (!this.addonIsExist.fenxiao) {
+				this.$util.showToast({
+					title: '商家未开启分销',
+					mask: true,
+					duration: 2000
+				});
+				setTimeout(() => {
+					this.$util.redirectTo('/pages/index/index');
+				}, 2000);
+			}
+		},1000);
+
+		if (this.fenxiaoWords && this.fenxiaoWords.my_team) this.$langConfig.title(this.fenxiaoWords.my_team);
+		this.getFenXiaoLevel();
+
+		if (!this.storeToken) {
+			this.$nextTick(() => {
+				this.$refs.login.open('/pages_promotion/fenxiao/team');
+			});
+		}
+	},
+	methods: {
+		getData(mescroll) {
+			this.emptyShow = false;
+			if (mescroll.num == 1) {
+				this.teamList = [];
+			}
+			this.$api.sendRequest({
+				url: '/fenxiao/api/fenxiao/team',
+				data: {
+					page_size: mescroll.size,
+					page: mescroll.num,
+					level: this.currentLevel
+				},
+				success: res => {
+					this.emptyShow = true;
+					let newArr = [];
+					let msg = res.message;
+					if (res.code == 0 && res.data) {
+						newArr = res.data.list;
+					} else {
+						this.$util.showToast({
+							title: msg
+						});
+					}
+					mescroll.endSuccess(newArr.length);
+					//设置列表数据
+					if (mescroll.num == 1) this.teamList = []; //如果是第一页需手动制空列表
+					this.teamList = this.teamList.concat(newArr); //追加新数据
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				},
+				fail: res => {
+					mescroll.endErr();
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				}
+			});
+		},
+		imageError(e) {
+			this.teamList[e].headimg = this.$util.getDefaultImage().head;
+			this.$forceUpdate();
+		},
+		selectLevel(e) {
+			this.currentLevel = e;
+			this.$refs.mescroll.refresh();
+		},
+		toFenxiaoOrder(item) {
+			if (item.fenxiao_id) {
+				this.$util.redirectTo('/pages_promotion/fenxiao/relation', { fenxiao_id: item.fenxiao_id });
+			} else {
+				this.$util.redirectTo('/pages_promotion/fenxiao/relation', { sub_member_id: item.member_id });
+			}
+		},
+		async getFenXiaoLevel() {
+			let res = await this.$api.sendRequest({
+				url: '/fenxiao/api/config/basics',
+				async: false,
+				success: res => {}
+			});
+			if (res.code == 0 && res.data) {
+				this.levelNum = res.data.level;
+			}
+		}
+	},
+	watch: {
+		storeToken: function(nVal, oVal) {
+			if (nVal) {
+				this.$refs.mescroll.refresh();
+			}
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+.team-cate {
+	padding: 0 30rpx;
+	width: calc(100%);
+	height: 90rpx;
+	display: flex;
+	box-sizing: border-box;
+	background: #ffffff;
+	position: fixed;
+	left: 0;
+	top: var(--window-top);
+
+	.cate-li {
+		flex: 1;
+		justify-content: center;
+		text-align: center;
+		align-items: center;
+		display: inline-block;
+		line-height: 90rpx;
+		height: 100%;
+		font-size: 30rpx;
+
+		&.active {
+			box-sizing: border-box;
+			border-bottom: 4rpx solid;
+		}
+	}
+}
+
+.team-member {
+	width: 100%;
+	height: 70rpx;
+	line-height: 70rpx;
+	color: $color-tip;
+	padding: 0 $padding;
+	box-sizing: border-box;
+}
+
+.team-li {
+	margin: $margin-updown $margin-both;
+	padding: $margin-both;
+	box-sizing: border-box;
+	background: #fff;
+	margin-bottom: 20rpx;
+	border-radius: 10rpx;
+
+	.li-box {
+		display: flex;
+		box-sizing: border-box;
+		align-items: center;
+
+		image {
+			width: 90rpx;
+			height: 90rpx;
+			border-radius: 50%;
+		}
+
+		.member-info {
+			flex: 1;
+			padding-left: $padding;
+			box-sizing: border-box;
+			display: flex;
+			flex-direction: column;
+			justify-content: center;
+
+			.member-name {
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				font-size: $font-size-base;
+
+				.left {
+					width: 0;
+					flex: 1;
+
+					.flex-box {
+						display: flex;
+						align-items: center;
+						margin-bottom: 6rpx;
+					}
+
+					.name {
+						overflow: hidden;
+						text-overflow: ellipsis;
+						white-space: nowrap;
+					}
+
+					.title {
+						padding: 4rpx 16rpx;
+						justify-content: center;
+						align-items: center;
+						text-align: center;
+						font-size: $font-size-activity-tag;
+						border-radius: 4rpx;
+						margin-left: 10rpx;
+						line-height: 1;
+						border: 2rpx solid;
+						color: #fff;
+					}
+				}
+
+				.consume-info {
+					text-align: right;
+
+					text {
+						margin-right: 6rpx;
+					}
+
+					view {
+						line-height: 1.5;
+						font-size: 24rpx;
+					}
+				}
+			}
+
+			.member-date {
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				margin-top: $padding;
+
+				view {
+					width: 50%;
+					height: 100%;
+					text-align: left;
+					line-height: 1;
+
+					text {
+						font-size: $font-size-tag;
+						color: $color-tip;
+					}
+
+					.tit {
+						color: $color-tip;
+					}
+				}
+			}
+		}
+
+		.btn-see {
+			display: flex;
+			flex-direction: row-reverse;
+		}
+	}
+	.order-box-btn {
+		display: inline-block;
+		line-height: 56rpx;
+		padding: 0 30rpx;
+		font-size: 26rpx;
+		color: #303133;
+		border: 2rpx solid #999;
+		-webkit-box-sizing: border-box;
+		box-sizing: border-box;
+		-webkit-border-radius: $border-radius;
+		border-radius: $border-radius;
+		margin-top: 30rpx;
+	}
+	.li-box.active {
+		border: none;
+	}
+}
+</style>
diff --git a/pages_promotion/fenxiao/withdraw_apply.vue b/pages_promotion/fenxiao/withdraw_apply.vue
new file mode 100644
index 0000000..f1e109d
--- /dev/null
+++ b/pages_promotion/fenxiao/withdraw_apply.vue
@@ -0,0 +1,515 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view class="container">
+		<view class="bank-account-wrap" @click="goAccount()">
+			<view class="tx-wrap" v-if="bankAccountInfo.withdraw_type && !isBalance">
+				<text class="tx-to">提现到</text>
+				<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>
+				</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>
+				</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>
+				</view>
+			</view>
+			<text class="tx-to" v-else-if="!isBalance">请添加提现账户</text>
+			<view class="tx-wrap" v-else="isBalance">
+				<text class="tx-to">提现到</text>
+				<view class="tx-bank">余额</view>
+				<view class="tx-img">
+					<image :src="$util.img('public/uniapp/member/apply_withdrawal/tixian.png')" mode="widthFix"></image>
+				</view>
+			</view>
+			<view class="iconfont icon-right"></view>
+		</view>
+		<view class="empty-box"></view>
+		<view class="withdraw-wrap">
+			<view class="withdraw-wrap-title">提现金额：</view>
+			<view class="money-wrap">
+				<text class="unit">{{ $lang('common.currencySymbol') }}</text>
+				<input type="digit" class="withdraw-money" v-model="withdrawMoney" />
+				<view class="delete" @click="remove" v-if="withdrawMoney">
+					<image :src="$util.img('public/uniapp/member/apply_withdrawal/close.png')" mode="widthFix"></image>
+				</view>
+			</view>
+			<view class="bottom">
+				<view>
+					<text class="color-tip">可提现金额：{{ $lang('common.currencySymbol') }}{{ withdrawInfo.account | moneyFormat }}</text>
+					<text class="all-tx color-base-text" @click="allTx">全部提现</text>
+				</view>
+			</view>
+			<view class="desc">
+				<text v-if="withdrawConfigInfo.withdraw > 0">最小提现金额为{{ $lang('common.currencySymbol') }}{{ withdrawConfigInfo.withdraw | moneyFormat }}，</text>
+				<text v-if="withdrawConfigInfo.max > 0">最大提现金额为{{ $lang('common.currencySymbol') }}{{ (withdrawConfigInfo.max > withdrawInfo.account ? withdrawInfo.account : withdrawConfigInfo.max) | moneyFormat }}，</text>
+				<text>手续费为{{ withdrawConfigInfo.withdraw_rate + '%' }}</text>
+			</view>
+		</view>
+
+<!-- 		<view class="btn color-base-border ns-gradient-otherpages-member-widthdrawal-withdrawal" :class="{ disabled: withdrawMoney == '' || withdrawMoney == 0 }" @click="withdraw">
+			提现
+		</view> -->
+		
+		
+		<view class="grace-page-footer page-btm" style="z-index: 999999; background: rgb(255, 255, 255); padding-bottom: 0px;" @click="withdraw">
+			<view data-v-800ec5da="" class="collectionBorder">
+				<button data-v-800ec5da="" class="renren-btn do false middle">提现</button>
+			</view>
+		</view>
+
+	<!-- 	<view class="recoend" @click="toWithdrawal">
+			<view class="recoend-con">提现记录</view>
+		</view> -->
+		<loading-cover ref="loadingCover"></loading-cover>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				withdrawInfo: {},
+				withdrawConfigInfo: {},
+				bankAccountInfo: {},
+				withdrawMoney: '',
+				isSub: false,
+				isBalance: 0,
+				payList: null
+			};
+		},
+		onLoad(option) {
+			if (option.is_balance) this.isBalance = option.is_balance;
+		},
+		onShow() {
+			if (this.storeToken) {
+				this.getTransferType();
+				this.getWithdrawConfigInfo();
+				this.getBankAccountInfo();
+				this.getWithdrawInfo();
+			} else {
+				this.$util.redirectTo('/pages_tool/login/login', {
+					back: '/pages_promotion/fenxiao/withdraw_apply'
+				});
+			}
+		},
+		methods: {
+			toWithdrawal() {
+				this.$util.redirectTo('/pages_promotion/fenxiao/withdraw_list');
+			},
+			//全部提现
+			allTx() {
+				this.withdrawMoney = this.withdrawInfo.account;
+			},
+			// 删除提现金额
+			remove() {
+				this.withdrawMoney = '';
+			},
+			/**
+			 * 获取提现信息
+			 */
+			getWithdrawInfo() {
+				this.$api.sendRequest({
+					url: '/fenxiao/api/fenxiao/detail',
+					success: res => {
+						if (res.code >= 0 && res.data) {
+							this.withdrawInfo = res.data;
+						}
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					},
+					fail: res => {
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					}
+				});
+			},
+
+			/**
+			 * 获取提现配置信息
+			 */
+			getWithdrawConfigInfo() {
+				this.$api.sendRequest({
+					url: '/fenxiao/api/config/withdraw',
+					success: res => {
+						if (res.code >= 0 && res.data) {
+							this.withdrawConfigInfo = res.data;
+						}
+					},
+					fail: res => {
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					}
+				});
+			},
+			/**
+			 * 银行账号信息
+			 */
+			getBankAccountInfo() {
+				this.$api.sendRequest({
+					url: '/api/memberbankaccount/defaultinfo',
+					success: res => {
+
+						if (res.code >= 0) {
+							if (res.data)
+								this.bankAccountInfo = res.data;
+							else if (this.payList && this.payList.balance) {
+								// 如果信息为空，将默认为余额
+								this.isBalance = 1;
+							}
+						}
+					}
+				});
+			},
+			// 获取提现方式
+			getTransferType() {
+				this.payList = null;
+				this.$api.sendRequest({
+					url: "/fenxiao/api/withdraw/transferType",
+					success: res => {
+						if (res.code >= 0 && res.data) {
+							this.payList = res.data;
+						}
+					}
+				});
+			},
+			verify() {
+				if (this.withdrawMoney == '' || this.withdrawMoney < 0 || isNaN(parseFloat(this.withdrawMoney))) {
+					this.$util.showToast({
+						title: '请输入提现金额'
+					});
+					return false;
+				}
+
+				let money = this.withdrawInfo.account;
+				if (this.withdrawConfigInfo.max > 0 && this.withdrawInfo.account > this.withdrawConfigInfo.max) {
+					money = this.withdrawConfigInfo.max;
+				}
+				if (parseFloat(this.withdrawMoney) > 0 && (parseFloat(this.withdrawMoney) > parseFloat(money))) {
+					this.$util.showToast({
+						title: '提现金额超出可提现金额'
+					});
+					return false;
+				}
+				if (parseFloat(this.withdrawMoney) > 0 && (parseFloat(this.withdrawMoney) < parseFloat(this
+						.withdrawConfigInfo.withdraw))) {
+					this.$util.showToast({
+						title: '提现金额小于最低提现金额'
+					});
+					return false;
+				}
+				return true;
+			},
+			withdraw() {
+				if (!this.bankAccountInfo.withdraw_type && !this.isBalance) {
+					this.$util.showToast({
+						title: '请先添加提现方式'
+					});
+					return;
+				}
+				if (this.verify()) {
+					if (this.isSub) return;
+					this.isSub = true;
+
+					var applet_type = 0;
+					if (this.bankAccountInfo.withdraw_type == 'wechatpay') {
+						// #ifdef MP
+						applet_type = 1;
+						// #endif
+					}
+
+					let withdrawType = this.isBalance ? 'balance' : this.bankAccountInfo.withdraw_type;
+					let branchBankName = this.isBalance ? "余额" : this.bankAccountInfo.branch_bank_name;
+					// #ifdef MP-WEIXIN
+					// this.subscribeMessage(() => {
+					this.$api.sendRequest({
+						url: '/fenxiao/api/withdraw/apply',
+						data: {
+							apply_money: this.withdrawMoney,
+							transfer_type: withdrawType, //转账提现类型
+							realname: this.bankAccountInfo.realname,
+							mobile: this.bankAccountInfo.mobile,
+							bank_name: branchBankName,
+							account_number: this.bankAccountInfo.bank_account,
+							applet_type: applet_type
+						},
+						success: res => {
+							if (res.code >= 0) {
+								this.$util.showToast({
+									title: '提现申请成功'
+								});
+								setTimeout(() => {
+									this.$util.redirectTo('/pages_promotion/fenxiao/withdraw_list', {},
+										'redirectTo');
+								}, 1500);
+							} else {
+								this.isSub = false;
+								this.$util.showToast({
+									title: res.message
+								});
+							}
+						},
+						fail: res => {
+							this.isSub = false;
+						}
+					});
+					// });
+					// #endif
+
+					// #ifndef MP-WEIXIN
+					this.$api.sendRequest({
+						url: '/fenxiao/api/withdraw/apply',
+						data: {
+							apply_money: this.withdrawMoney,
+							transfer_type: withdrawType, //转账提现类型
+							realname: this.bankAccountInfo.realname,
+							mobile: this.bankAccountInfo.mobile,
+							bank_name: branchBankName,
+							account_number: this.bankAccountInfo.bank_account,
+							applet_type: applet_type
+						},
+						success: res => {
+							if (res.code >= 0) {
+								this.$util.showToast({
+									title: '提现申请成功'
+								});
+								setTimeout(() => {
+									this.$util.redirectTo('/pages_promotion/fenxiao/withdraw_list', {},
+										'redirectTo');
+								}, 1500);
+							} else {
+								this.isSub = false;
+								this.$util.showToast({
+									title: res.message
+								});
+							}
+						},
+						fail: res => {
+							this.isSub = false;
+						}
+					});
+					// #endif
+				}
+			},
+			goAccount() {
+				this.$util.redirectTo(
+					'/pages_tool/member/account', {
+						back: '/pages_promotion/fenxiao/withdraw_apply',
+						type: 'fenxiao'
+					},
+					'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();
+					}
+				});
+			}
+		},
+	};
+</script>
+
+<style lang="scss">
+	.grace-page-footer{
+	    width: 100%;
+	    position: fixed;
+	    left: 0;
+	    bottom: 0;
+	    z-index: 99 !important;
+	}
+	.collectionBorder{
+	    border-top: 2rpx solid #e6e7eb;
+	    padding: 14rpx 24rpx;
+	    background: #fff;
+	    position: relative;
+	}
+	.renren-btn {
+	    height: 68px;
+	    line-height: 68px;
+	    line-height: 62px;
+	    border-radius: 34px !important;
+	    border-radius: 128px;
+	    background: #ff3c29;
+	    color: #fff;
+	    font-size: 32px;
+	    font-weight: 400;
+	    width: 100%;
+	    border: 0;
+	}
+	.renren-btn.do {
+	    background: -webkit-linear-gradient(317.43deg, #ff3c29, #ff6f29 94.38%);
+	    background: linear-gradient(132.57deg, #ff3c29, #ff6f29 94.38%);
+	    font-size: 28rpx;
+	    font-weight: 500;
+	}
+	.renren-btn.middle {
+	    height: 76rpx;
+	    line-height: 76rpx;
+	    border-radius: 38rpx !important;
+	    font-size: 28rpx !important;
+	    font-weight: 500 !important;
+		margin: 0;
+	}
+	
+	
+	.container {
+		width: 100vw;
+		height: 100vh;
+		background: #fff;
+	}
+
+	.empty-box {
+		height: 20rpx;
+	}
+
+	.bank-account-wrap {
+		margin: 0 20rpx;
+		padding: 20rpx 30rpx;
+		border-bottom: 2rpx solid #f7f7f7;
+		position: relative;
+
+		.tx-wrap {
+			display: flex;
+			justify-content: space-between;
+			margin-right: 60rpx;
+
+			.tx-bank {
+				margin-right: 60rpx;
+				flex: 1;
+				margin-left: 10rpx;
+				text-align: right;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				white-space: nowrap;
+			}
+
+			.tx-img {
+				position: absolute;
+				right: 100rpx;
+				top: 50%;
+				transform: translateY(-50%);
+				width: 40rpx;
+				height: 40rpx;
+
+				image {
+					width: 100%;
+					height: 100%;
+				}
+			}
+		}
+
+		.iconfont {
+			position: absolute;
+			right: 40rpx;
+			top: 50%;
+			transform: translateY(-50%);
+		}
+	}
+
+	.withdraw-wrap {
+		margin: 0 20rpx;
+		padding: 30rpx;
+		border-radius: 16rpx;
+		box-shadow: rgba(110, 110, 110, 0.09) 0 0 20rpx 0;
+
+		.money-wrap {
+			padding: 20rpx 0;
+			border-bottom: 2rpx solid #eee;
+			display: flex;
+			align-items: baseline;
+
+			.unit {
+				font-size: 60rpx;
+				line-height: 1.3;
+			}
+
+			.withdraw-money {
+				height: 70rpx;
+				line-height: 70rpx;
+				min-height: 70rpx;
+				padding-left: 20rpx;
+				font-size: 60rpx;
+				flex: 1;
+				font-weight: bolder;
+			}
+
+			.delete {
+				width: 40rpx;
+				height: 40rpx;
+
+				image {
+					width: 100%;
+					height: 100%;
+				}
+			}
+		}
+
+		.bottom {
+			display: flex;
+			padding-top: 20rpx;
+
+			text {
+				line-height: 1;
+				flex: 2;
+			}
+
+			.all-tx {
+				padding-left: 10rpx;
+			}
+		}
+	}
+
+	.btn {
+		margin: 0 30rpx;
+		margin-top: 60rpx;
+		height: 80rpx;
+		line-height: 80rpx;
+		border-radius: $border-radius;
+		color: #fff;
+		text-align: center;
+		background-color: var(--main-color);
+
+		&.disabled {
+			background: #ccc;
+			border-color: #ccc;
+			color: #fff;
+		}
+	}
+
+	.recoend {
+		margin-top: 40rpx;
+
+		.recoend-con {
+			text-align: center;
+		}
+	}
+
+	.desc {
+		font-size: $font-size-tag;
+		color: #999;
+	}
+</style>
\ No newline at end of file
diff --git a/pages_promotion/fenxiao/withdraw_list.vue b/pages_promotion/fenxiao/withdraw_list.vue
new file mode 100644
index 0000000..4c0a66f
--- /dev/null
+++ b/pages_promotion/fenxiao/withdraw_list.vue
@@ -0,0 +1,209 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view>
+		<mescroll-uni @getData="getData" class="member-point">
+			<view slot="list">
+				<block v-if="withdrawList.length">
+					<view class="detailed-wrap">
+						<view class="cont">
+							<view class="detailed-item" v-for="(item, index) in withdrawList" :key="index" @click="toDetail(item.id)">
+								<view class="info">
+									<view class="event">{{ item.transfer_type=='balance'&&'余额' || item.transfer_type=='alipay'&&'支付宝' || item.transfer_type=='bank'&&'银行卡' || item.transfer_type=='wechatpay'&&'微信' }}</view>
+									<view>
+										<text class="time">{{ $util.timeStampTurnTime(item.create_time) }}</text>
+									</view>
+								</view>
+								<view class="right-wrap">
+									<view class="num color-base-text">￥{{ item.money }}</view>
+									<view class="status-name" :style="withdrawState[item.status].color">{{ item.status_name }}</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</block>
+				<block v-else>
+					<ns-empty :isIndex="false" text="暂无提现记录"></ns-empty>
+				</block>
+			</view>
+		</mescroll-uni>
+		<ns-login ref="login"></ns-login>
+		<loading-cover ref="loadingCover"></loading-cover>
+	</view>
+</template>
+<script>
+import fenxiaoWords from 'common/js/fenxiao-words.js';
+
+export default {
+	data() {
+		return {
+			withdrawState: {
+				'3': {
+					color: 'color: rgb(255, 69, 68)',
+					text: '已转账'
+				},
+				'1': {
+					color: 'color: rgb(255, 160, 68)',
+					text: '待审核'
+				},
+				'2': {
+					color: 'color: rgb(17, 189, 100)',
+					text: '已审核'
+				},
+				'-1': {
+					color: 'color: rgb(255, 69, 68)',
+					text: '已拒绝'
+				}
+			},
+			withdrawList: [],
+			emptyShow: false,
+		};
+	},
+	onShow() {
+		setTimeout( () => {
+			if (!this.addonIsExist.fenxiao) {
+				this.$util.showToast({
+					title: '商家未开启分销',
+					mask: true,
+					duration: 2000
+				});
+				setTimeout(() => {
+					this.$util.redirectTo('/pages/index/index');
+				}, 2000);
+			}
+		},1000);
+
+		if(this.fenxiaoWords && this.fenxiaoWords.withdraw)this.$langConfig.title(this.fenxiaoWords.withdraw + '明细');
+
+		if (!this.storeToken) {
+			this.$nextTick(() => {
+				this.$refs.login.open('/pages_promotion/fenxiao/withdraw_list');
+			});
+		}
+	},
+	mixins: [fenxiaoWords],
+	methods: {
+		//获得列表数据
+		getData(mescroll) {
+			this.emptyShow = false;
+			if (mescroll.num == 1) {
+				this.withdrawList = [];
+			}
+			this.$api.sendRequest({
+				url: '/fenxiao/api/withdraw/page',
+				data: {
+					page_size: mescroll.size,
+					page: mescroll.num,
+				},
+				success: res => {
+					this.emptyShow = true;
+					let newArr = [];
+					let msg = res.message;
+					if (res.code == 0 && res.data && res.data.list) {
+						newArr = res.data.list;
+					} else {
+						this.$util.showToast({
+							title: msg
+						});
+					}
+					mescroll.endSuccess(newArr.length);
+					//设置列表数据
+					if (mescroll.num == 1) this.withdrawList = []; //如果是第一页需手动制空列表
+					this.withdrawList = this.withdrawList.concat(newArr); //追加新数据
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				},
+				fail: res => {
+					mescroll.endErr();
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				}
+			});
+		},
+		toDetail(id) {
+			this.$util.redirectTo('/pages_promotion/fenxiao/withdrawal_detail', {
+				id: id
+			});
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+.account-box {
+	width: 100vw;
+	padding: 30rpx;
+	box-sizing: border-box;
+	padding-bottom: 10rpx;
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+
+	.tit {
+		color: #fff;
+		line-height: 1;
+	}
+
+	.iconmn_jifen_fill {
+		font-size: 60rpx;
+		color: #fff;
+	}
+
+	.point {
+		color: #fff;
+		font-size: 60rpx;
+		margin-left: 10rpx;
+	}
+}
+
+.detailed-wrap {
+	.head {
+		display: flex;
+		height: 90rpx;
+
+		& > view {
+			flex: 1;
+			text-align: left;
+			padding: 0 $padding;
+			line-height: 90rpx;
+		}
+	}
+
+	.cont {
+		background: #fff;
+
+		.detailed-item {
+			padding: $padding 10rpx;
+			margin: 0 $margin-both;
+			border-bottom: 2rpx solid #eee;
+			position: relative;
+
+			&:last-of-type {
+				border-bottom: none;
+			}
+
+			.info {
+				padding-right: 180rpx;
+
+				.event {
+					font-size: $font-size-base;
+					line-height: 1.3;
+				}
+
+				.time {
+					font-size: $font-size-base;
+					color: $color-tip;
+				}
+			}
+
+			.right-wrap {
+				position: absolute;
+				right: 0;
+				top: 0;
+				text-align: right;
+
+				.num {
+					font-size: $font-size-toolbar;
+				}
+			}
+		}
+	}
+}
+</style>
diff --git a/pages_promotion/fenxiao/withdrawal_detail.vue b/pages_promotion/fenxiao/withdrawal_detail.vue
new file mode 100644
index 0000000..ab18b5b
--- /dev/null
+++ b/pages_promotion/fenxiao/withdrawal_detail.vue
@@ -0,0 +1,127 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view>
+		<view class="money-wrap">
+			<text>-{{ detail.money }}</text>
+		</view>
+
+		<!-- 状态0待审核1.待转账2已转账 -1拒绝' -->
+		<view class="item">
+			<view class="line-wrap">
+				<text class="label">当前状态</text>
+				<text class="value">{{ detail.status_name }}</text>
+			</view>
+			<view class="line-wrap">
+				<text class="label">交易号</text>
+				<text class="value">{{ detail.withdraw_no }}</text>
+			</view>
+			<view class="line-wrap">
+				<text class="label">手续费</text>
+				<text class="value">￥{{ detail.withdraw_rate_money }}</text>
+			</view>
+			<view class="line-wrap">
+				<text class="label">申请时间</text>
+				<text class="value">{{ $util.timeStampTurnTime(detail.create_time) }}</text>
+			</view>
+			<view class="line-wrap" v-if="detail.status">
+				<text class="label">审核时间</text>
+				<text class="value">{{ $util.timeStampTurnTime(detail.audit_time) }}</text>
+			</view>
+			<view class="line-wrap" v-if="detail.bank_name">
+				<text class="label">银行名称</text>
+				<text class="value">{{ detail.bank_name }}</text>
+			</view>
+			<view class="line-wrap" v-if="detail.account_number">
+				<text class="label">收款账号</text>
+				<text class="value">{{ detail.account_number }}</text>
+			</view>
+			<view class="line-wrap" v-if="detail.status == -1 && detail.refuse_reason">
+				<text class="label">拒绝理由</text>
+				<text class="value">{{ detail.refuse_reason }}</text>
+			</view>
+			<view class="line-wrap" v-if="detail.status == 3">
+				<text class="label">转账方式名称</text>
+				<text class="value">{{ detail.transfer_name }}</text>
+			</view>
+			<view class="line-wrap" v-if="detail.status == 3">
+				<text class="label">转账时间</text>
+				<text class="value">{{ $util.timeStampTurnTime(detail.payment_time) }}</text>
+			</view>
+		</view>
+
+		<loading-cover ref="loadingCover"></loading-cover>
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			id: 0,
+			detail: {}
+		};
+	},
+	onLoad(option) {
+		this.id = option.id || 0;
+	},
+	onShow() {
+		if (this.storeToken) {
+			this.getDetail();
+		} else {
+			this.$util.redirectTo('/pages_tool/login/login', {
+				back: '/pages_promotion/fenxiao/withdraw_list'
+			}, 'redirectTo');
+		}
+	},
+	methods: {
+		getDetail() {
+			this.$api.sendRequest({
+				url: '/fenxiao/api/withdraw/detail',
+				data: {
+					id: this.id
+				},
+				success: res => {
+					if (res.data) {
+						this.detail = res.data;
+					}
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				},
+				fail: res => {
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				}
+			});
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+.money-wrap {
+	text-align: center;
+	font-size: 50rpx;
+	font-weight: bold;
+	margin: 40rpx;
+	border-bottom: 2rpx solid $color-line;
+	padding: 40rpx;
+}
+
+.item {
+	margin: 40rpx;
+
+	.line-wrap {
+		margin-bottom: 20rpx;
+
+		.label {
+			display: inline-block;
+			width: 200rpx;
+			color: $color-tip;
+			font-size: $font-size-base;
+		}
+
+		.value {
+			display: inline-block;
+			font-size: $font-size-base;
+		}
+	}
+}
+</style>
diff --git a/pages_promotion/merch/detail.vue b/pages_promotion/merch/detail.vue
new file mode 100644
index 0000000..aad7c68
--- /dev/null
+++ b/pages_promotion/merch/detail.vue
@@ -0,0 +1,323 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view class="content">
+		<view class="head-wrap">
+			<!-- 搜索区域 -->
+			<view class="search-wrap uni-flex uni-row" style="margin-bottom: 20rpx;">
+				
+				
+			<!-- 	<view class="flex-item input-wrap">
+					<input class="uni-input" maxlength="50" v-model="keyword" @confirm="search()" placeholder="请输入您要搜索的商品" />
+					<text class="iconfont icon-sousuo3" @click.stop="search()"></text>
+				</view>
+				<view class="iconfont" :class="{ 'icon-apps': isList, 'icon-list': !isList }" @click="changeListStyle()"></view> -->
+				
+				<view style="width: 100rpx;height: 100rpx;">
+					<image :src="$util.img(merch.merch_image)" mode="widthFix" style="width: 100rpx;height: 100rpx;" />
+				</view>
+				<view style="margin-left: 20rpx;padding-top: 22rpx;">
+					<view style="line-height: 1;font-size: 32rpx;font-weight: 600;">{{merch.merch_name}}</view>
+					<view style="color:rgb(255 202 40)">
+						<text class="icox icox-xing"></text>
+						<text class="icox icox-xing"></text>
+						<text class="icox icox-xing"></text>
+						<text class="icox icox-xing"></text>
+						<text class="icox icox-xing"></text>
+					</view>
+				</view>
+				
+			</view>
+
+			<!-- 排序 -->
+			<view class="sort-wrap">
+				<view class="comprehensive-wrap" :class="{ 'color-base-text': orderType === '' }" @click="sortTabClick('')">
+					<text :class="{ 'color-base-text': orderType === '' }">综合</text>
+				</view>
+
+				<view :class="{ 'color-base-text': orderType === 'sale_num' }" @click="sortTabClick('sale_num')">销量
+				</view>
+
+				<view class="price-wrap" @click="sortTabClick('discount_price')">
+					<text :class="{ 'color-base-text': orderType === 'discount_price' }">价格</text>
+					<view class="iconfont-wrap">
+						<view class="iconfont icon-iconangledown-copy asc" :class="{ 'color-base-text': priceOrder === 'asc' && orderType === 'discount_price' }"></view>
+						<view class="iconfont icon-iconangledown desc" :class="{ 'color-base-text': priceOrder === 'desc' && orderType === 'discount_price' }"></view>
+					</view>
+				</view>
+
+			<!-- 	<view :class="{ 'color-base-text': orderType === 'screen' }" class="screen-wrap">
+					<text @click="sortTabClick('screen')">筛选</text>
+					<view @click="sortTabClick('screen')" class="iconfont-wrap">
+						<view class="iconfont icon-shaixuan color-tip"></view>
+					</view>
+				</view> -->
+			</view>
+		</view>
+
+		<mescroll-uni top="240" ref="mescroll" @getData="getGoodsList">
+			<block slot="list">
+				<view class="goods-list single-column" :class="{ show: isList }">
+					<view class="goods-item margin-bottom" v-for="(item, index) in goodsList" :key="index" @click="toDetail(item)">
+						<view class="goods-img">
+							<image :src="goodsImg(item.goods_image)" mode="widthFix" @error="imgError(index)"></image>
+							<view class="color-base-bg goods-tag" v-if="goodsTag(item) != ''">{{ goodsTag(item) }}</view>
+							<view class="sell-out" v-if="item.stock <= 0">
+								<text class="iconfont icon-shuqing"></text>
+							</view>
+						</view>
+						<view class="info-wrap">
+							<view class="name-wrap">
+								<view class="goods-name" :class="[{ 'using-hidden': config.nameLineMode == 'single' }, { 'multi-hidden': config.nameLineMode == 'multiple' }]">
+									{{ item.goods_name }}
+								</view>
+							</view>
+
+							<view class="lineheight-clear">
+								<view class="discount-price" v-if="item.isinformation == 0">
+									<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="discount-price" v-else>
+									<text class="price price-style large">咨询</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"></image>
+								</view>
+								<view class="member-price-tag" v-else-if="item.promotion_type == 1">
+									<image :src="$util.img('public/uniapp/index/discount.png')" mode="widthFix"></image>
+								</view>
+							</view>
+							<view class="pro-info" v-if="item.isinformation == 0">
+								<view class="delete-price color-tip price-font" v-if="showMarketPrice(item)">
+									<text class="unit">{{ $lang('common.currencySymbol') }}</text>
+									<text>{{ showMarketPrice(item) }}</text>
+								</view>
+								<view class="block-wrap">
+									<view class="sale 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="goods-list double-column" :class="{ show: !isList }">
+					<view class="goods-item margin-bottom" v-for="(item, index) in goodsList" :key="index"
+						@click="toDetail(item)" :style="{ left: listPosition[index] ? listPosition[index].left : '', top: listPosition[index] ? listPosition[index].top : '' }">
+						<view class="goods-img">
+							<image :src="goodsImg(item.goods_image)" mode="widthFix" @error="imgError(index)"></image>
+							<view class="color-base-bg goods-tag" v-if="goodsTag(item) != ''">{{ goodsTag(item) }}</view>
+							<view class="sell-out" v-if="item.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" v-if="item.isinformation == 0">
+									<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="discount-price" v-else>
+									<text class="price price-style large">咨询</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"></image>
+								</view>
+								<view class="member-price-tag" v-else-if="item.promotion_type == 1">
+									<image :src="$util.img('public/uniapp/index/discount.png')" mode="widthFix"></image>
+								</view>
+								<view class="delete-price 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"  v-if="item.isinformation == 0">
+								<view class="block-wrap" >
+									<view class="sale 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 v-if="goodsList.length == 0 && emptyShow"><ns-empty text="暂无商品"></ns-empty></view>
+			</block>
+		</mescroll-uni>
+
+		<ns-goods-sku-index ref="goodsSkuIndex" @addCart="addCart"></ns-goods-sku-index>
+
+		<!-- 筛选弹出框 -->
+		<uni-drawer :visible="showScreen" mode="right" @close="showScreen = false" class="screen-wrap">
+			<view class="title color-tip">筛选</view>
+			<scroll-view scroll-y>
+				<!-- 包邮 -->
+			<!-- 	<view class="item-wrap">
+					<view class="label"><text>是否包邮</text></view>
+					<view class="list">
+						<uni-tag :inverted="true" text="包邮" :type="isFreeShipping ? 'primary' : 'default'" @click="isFreeShipping = !isFreeShipping" />
+					</view>
+				</view> -->
+
+				<!-- 价格筛选项 -->
+			<!-- 	<view class="item-wrap">
+					<view class="label"><text>价格区间(元)</text></view>
+					<view class="price-wrap">
+						<input class="uni-input" type="digit" v-model="minPrice" placeholder="最低价" />
+						<view class="h-line"></view>
+						<input class="uni-input" type="digit" v-model="maxPrice" placeholder="最高价" />
+					</view>
+				</view> -->
+
+				<!-- 品牌筛选项 -->
+		<!-- 		<view class="item-wrap" v-if="brandList.length > 0">
+					<view class="label"><text>品牌</text></view>
+					<view class="list">
+						<view v-for="(item, index) in brandList" :key="index">
+							<uni-tag :inverted="true" :text="item.brand_name" :type="item.brand_id == brandId ? 'primary' : 'default'" @click="brandId == item.brand_id ? (brandId = 0) : (brandId = item.brand_id)" />
+						</view>
+					</view>
+				</view> -->
+
+				<!-- 分类筛选项 -->
+				<view class="category-list-wrap">
+					<text class="first">全部分类</text>
+					<view class="class-box">
+						<view @click="selectedCategory('')" class="list-wrap">
+							<text :class="{ selected: !categoryId, 'color-base-text': !categoryId }">全部</text>
+						</view>
+						<view @click="selectedCategory(item.category_id)" v-for="(item, index) in categoryList" :key="index" class="list-wrap">
+							<text :class="{ selected: item.category_id == categoryId, 'color-base-text': item.category_id == categoryId }">{{ item.category_name }}</text>
+						</view>
+					</view>
+				</view>
+			</scroll-view>
+			<view class="footer" :class="{ 'safe-area': isIphoneX }">
+				<button type="default" class="footer-box" @click="resetData">重置</button>
+				<button type="primary" class="footer-box1" @click="screenData">确定</button>
+			</view>
+		</uni-drawer>
+		<loading-cover ref="loadingCover"></loading-cover>
+
+		<!-- #ifdef MP-WEIXIN -->
+		<!-- 小程序隐私协议 -->
+		<privacy-popup ref="privacyPopup"></privacy-popup>
+		<!-- #endif -->
+	</view>
+</template>
+
+<script>
+	import uniDrawer from '@/components/uni-drawer/uni-drawer.vue';
+	import uniTag from '@/components/uni-tag/uni-tag.vue';
+	import nsGoodsSkuIndex from '@/components/ns-goods-sku/ns-goods-sku-index.vue';
+	import list from './public/js/list.js';
+
+	export default {
+		components: {
+			uniDrawer,
+			uniTag,
+			nsGoodsSkuIndex
+		},
+		data() {
+			return {};
+		},
+		mixins: [list]
+	};
+</script>
+
+<style lang="scss">
+	@import './public/css/list.scss';
+</style>
+<style scoped>
+	>>>.uni-tag--primary.uni-tag--inverted {
+		background-color: #f5f5f5 !important;
+	}
+
+	/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_promotion/merch/merchcategory.vue b/pages_promotion/merch/merchcategory.vue
new file mode 100644
index 0000000..13fa130
--- /dev/null
+++ b/pages_promotion/merch/merchcategory.vue
@@ -0,0 +1,266 @@
+<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>
+
+
+		<ns-login ref="login"></ns-login>
+	<!-- 	<loading-cover ref="loadingCover"></loading-cover> -->
+
+	</view>
+</template>
+
+<script>
+	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",
+							}
+						]
+					},*/
+					
+			],
+			user_type:uni.getStorageSync('user_type')
+		};
+		},
+		onLoad() {
+			uni.hideTabBar()
+			this.getCategory()
+			// this.getgoodslist()
+		},
+		onShow() {
+			if (this.$refs.category) this.$refs.category[0].pageShow();
+		},
+		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()
+			},
+			/**
+			 * 切换一级分类
+			 * @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() {
+				
+			},
+			toLogin() {
+				this.$refs.login.open('/pages/goods/category')
+			}
+		},
+		// onPullDownRefresh() {
+		// 	uni.hideTabBar();
+		// 	this.getDiyInfo();
+		// }
+	};
+</script>
+
+<style lang="scss">
+	@import './public/category.scss';
+	
+	/deep/ .uni-popup__wrapper.uni-center {
+		background: rgba(0, 0, 0, 0.6);
+	}
+
+	/deep/ .uni-popup__wrapper-box {
+		border-radius: 0 !important;
+	}
+
+	/deep/ .uni-popup__wrapper.uni-custom.center .uni-popup__wrapper-box {
+		overflow-y: visible;
+	}
+
+	/deep/ .loading-layer {
+		background: #fff !important;
+	}
+
+	// 分类四一级展开
+	/deep/ .category-template-4 .template-four .uni-popup__wrapper-box {
+		border-radius: 0px 0px 14px 14px !important;
+		overflow: hidden;
+	}
+
+	/deep/ .category-template-4 .content-wrap .categoty-goods-wrap .goods-list {
+		margin-top: 30rpx;
+	}
+
+	/deep/ .category-template-4 .content-wrap .goods-list .goods-item .footer-wrap .right-wrap .num-action {
+		width: 46rpx;
+		height: 46rpx;
+	}
+
+	/deep/ .uni-page-refresh-inner .uni-page-refresh__path {
+		stroke: rgb(1, 1, 1) !important;
+	}
+</style>
\ No newline at end of file
diff --git a/pages_promotion/merch/public/category.scss b/pages_promotion/merch/public/category.scss
new file mode 100644
index 0000000..95ed9ad
--- /dev/null
+++ b/pages_promotion/merch/public/category.scss
@@ -0,0 +1,929 @@
+
+	.category-page-wrap {
+			width: 100vw;
+			// height: calc(100vh - var(--tab-bar-height, 0));
+			display: flex;
+			flex-direction: column;
+			background-color: #fff;
+		}
+	
+		.content-box {
+			flex: 1;
+			height: 0;
+			display: flex;
+	
+			.tree-wrap {
+				width: 170rpx;
+				height: 100%;
+				background-color: #f5f5f5;
+			}
+	
+			.right-flex-wrap {
+				flex: 1;
+				width: 0;
+				height: 100%;
+				background: #f4f6fa;
+				display: flex;
+				flex-direction: column;
+				transform: translateX(0px);
+				
+				.content-wrap {
+					display: flex;
+					flex: 1;
+					height: 0;
+					width: 100%;
+				}
+	
+				.child-category-wrap {
+					width: 100%;
+					height: 100%;
+				}
+			}
+		}
+	
+		.tree-wrap .category-item-wrap {
+			height: auto;
+			background-color: #fff;
+		}
+	
+		.tree-wrap .category-item {
+			line-height: 1.5;
+			padding: 26rpx 28rpx;
+			box-sizing: border-box;
+			position: relative;
+			background-color: #f5f5f5;
+	
+			view {
+				color: #222222;
+				width: 100%;
+				white-space: nowrap;
+				text-overflow: ellipsis;
+				overflow: hidden;
+				text-align: center;
+			}
+	
+			&.border-top {
+				border-bottom-right-radius: 12rpx;
+			}
+	
+			&.border-bottom {
+				border-top-right-radius: 12rpx;
+			}
+	
+			&.select {
+				background: #fff;
+	
+				view {
+					color: $base-color;
+					font-weight: bold;
+				}
+	
+				&::before {
+					content: ' ';
+					width: 8rpx;
+					height: 34rpx;
+					background: var(--base-color);
+					display: block;
+					position: absolute;
+					left: 0;
+					top: 50%;
+					transform: translateY(-50%);
+				}
+			}
+		}
+	
+		.search-box {
+			position: relative;
+			padding: 20rpx 30rpx;
+			display: flex;
+			align-items: center;
+			background: #fff;
+	
+			.search-content {
+				position: relative;
+				/* #ifndef MP-WEIXIN */
+				height: 64rpx;
+				/* #endif */
+				/* #ifdef MP-WEIXIN */
+				height: 100%;
+				/* #endif */
+				border-radius: 40rpx;
+				flex: 1;
+				background-color: #f5f5f5;
+	
+				input {
+					box-sizing: border-box;
+					display: block;
+					height: 100%;
+					width: 100%;
+					padding: 0 20rpx 0 40rpx;
+					background: #f5f5f5;
+					color: #333;
+					border-radius: 40rpx;
+				}
+	
+				.iconfont {
+					position: absolute;
+					top: 50%;
+					right: 10rpx;
+					transform: translateY(-50%);
+					font-size: $font-size-toolbar;
+					z-index: 10;
+					color: #89899a;
+					width: 80rpx;
+					text-align: center;
+				}
+			}
+		}
+	
+		.cart-box {
+			height: 100rpx;
+			width: 100%;
+			background: #fff;
+			border-top: 1px solid #f5f5f5;
+			box-sizing: border-box;
+			padding: 0 30rpx;
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+	
+			.left-wrap {
+				display: flex;
+				align-items: center;
+			}
+	
+			.cart-icon {
+				width: 70rpx;
+				height: 70rpx;
+				position: relative;
+	
+				.iconfont {
+					color: var(--btn-text-color);
+					width: inherit;
+					height: inherit;
+					background-color: $base-color;
+					border-radius: 50%;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+				}
+	
+				.num {
+					position: absolute;
+					top: 0;
+					right: 0;
+					transform: translate(60%, 0);
+					display: inline-block;
+					box-sizing: border-box;
+					color: #fff;
+					line-height: 1.2;
+					text-align: center;
+					font-size: 24rpx;
+					padding: 0 6rpx;
+					min-width: 30rpx;
+					border-radius: 16rpx;
+					background-color: var(--price-color);
+					border: 2rpx solid #fff;
+				}
+			}
+	
+			.price {
+				margin-left: 30rpx;
+	
+				.title {
+					color: #333;
+				}
+	
+				.money,
+				.unit {
+					font-weight: bold;
+					color: var(--price-color);
+				}
+			}
+	
+			.settlement-btn {
+				margin: 0 0 0 20rpx;
+				width: 200rpx;
+				font-weight: bold;
+				border-radius: 50rpx;
+				height: 70rpx;
+				line-height: 70rpx;
+			}
+		}
+	
+		.cart-point {
+			width: 26rpx;
+			height: 26rpx;
+			position: fixed;
+			z-index: 1000;
+			background: #f00;
+			border-radius: 50%;
+			transition: all 0.05s;
+		}
+	
+		.category-empty {
+			flex: 1;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			flex-direction: column;
+	
+			image {
+				width: 380rpx;
+			}
+	
+			.tips {
+				font-size: 26rpx;
+				font-weight: 500;
+				color: #999;
+				margin-top: 50rpx;
+			}
+		}
+	
+		.end-tips {
+			text-align: center;
+			color: #999;
+			font-size: 24rpx;
+			padding: 20rpx 0;
+			opacity: 0;
+		}
+	
+		// 风格四
+		.category-template-4 {
+			.search-box {
+				.search-content input {
+					background-color: #f1f1f1;
+				}
+			}
+	
+			.cart-box {
+				position: relative;
+				z-index: 2;
+			}
+	
+			/deep/ .template-four {
+				position: relative;
+				z-index: 1;
+	
+				.template-four-wrap {
+					position: relative;
+					z-index: 1;
+					padding-left: 20rpx;
+					padding-right: 80rpx;
+					padding-bottom: 10rpx;
+					display: flex;
+					height: 172rpx;
+					align-items: baseline;
+					box-sizing: border-box;
+					box-shadow: 0 4rpx 4rpx rgba(123, 123, 123, 0.1);
+				}
+	
+				.template-four-popup {
+					display: flex;
+					flex-direction: column;
+					overflow: hidden;
+	
+					.title {
+						line-height: 1;
+						margin-bottom: 20rpx;
+						font-weight: bold;
+					}
+	
+					.template-four-scroll {
+						display: flex;
+						flex-wrap: wrap;
+						align-items: baseline;
+						align-content: baseline;
+						padding: 20rpx;
+						white-space: nowrap;
+						height: 380rpx;
+						box-sizing: border-box;
+	
+						.uni-scroll-view-content {
+							flex-wrap: wrap;
+							align-items: baseline;
+							align-content: baseline;
+						}
+	
+						.item {
+							display: flex;
+							flex-direction: column;
+							align-items: center;
+							padding: 4rpx 0;
+							color: #666;
+							margin-right: 16rpx;
+							border-radius: 40rpx;
+							margin-bottom: 10rpx;
+							width: calc((100% - 64rpx) / 5);
+	
+							&:nth-child(5n + 5) {
+								margin-right: 0;
+							}
+	
+							.image-warp {
+								margin-bottom: 6rpx;
+								padding: 4rpx;
+								display: flex;
+								align-items: center;
+								justify-content: center;
+								border-radius: 42rpx;
+								border: 4rpx solid transparent;
+							}
+	
+							image {
+								width: 84rpx;
+								height: 84rpx;
+								border-radius: 32rpx;
+							}
+	
+							.text {
+								padding: 2rpx 16rpx;
+								border-radius: 40rpx;
+								font-size: $font-size-tag;
+							}
+	
+							&.selected {
+								.text {
+									background-color: $base-color;
+									color: var(--btn-text-color);
+								}
+							}
+						}
+					}
+	
+					.pack-up {
+						font-size: $font-size-tag;
+						color: #888888;
+						height: 74rpx;
+						display: flex;
+						align-items: center;
+						justify-content: center;
+						border-top: 2rpx solid #f2f2f2;
+	
+						.iconfont {
+							font-size: 40rpx;
+							margin-left: -4rpx;
+						}
+					}
+				}
+	
+				.category-item-all {
+					position: absolute;
+					bottom: 0;
+					z-index: 1;
+					right: 0;
+					top: 0;
+					width: 72rpx;
+					line-height: 1;
+					background-color: #fff;
+	
+					.category-item-all-wrap {
+						position: absolute;
+						bottom: 0;
+						right: 0;
+						top: 0;
+						left: 0;
+						display: flex;
+						flex-direction: column;
+						justify-content: center;
+						align-items: center;
+						z-index: 2;
+					}
+	
+					.text {
+						writing-mode: tb-rl;
+						margin-bottom: 6rpx;
+						letter-spacing: 4rpx;
+						font-size: $font-size-tag;
+						font-weight: bold;
+					}
+	
+					.img {
+						width: 20rpx;
+						height: 20rpx;
+					}
+	
+					&::after {
+						content: '';
+						// box-shadow: -4rpx 10rpx 20rpx rgba(0, 0, 0, 0.1);
+						position: absolute;
+						left: 0;
+						width: 10rpx;
+						// height: 100rpx;
+						top: 20%;
+						bottom: 20%;
+						// transform: translateY(-50%);
+						// background-color: #F0F5FF;
+					}
+				}
+	
+				.uni-scroll-view-content {
+					display: flex;
+				}
+	
+				.category-item {
+					display: flex;
+					flex-direction: column;
+					align-items: center;
+					justify-content: center;
+					min-width: 130rpx;
+					flex-shrink: 0;
+					margin-right: 20rpx;
+					padding: 4rpx 0;
+	
+					&:last-of-type {
+						margin-right: 0;
+					}
+	
+					.image-warp {
+						margin-bottom: 6rpx;
+						padding: 4rpx;
+						display: flex;
+						align-items: center;
+						justify-content: center;
+						border-radius: 42rpx;
+						border: 4rpx solid transparent;
+					}
+	
+					image {
+						width: 84rpx;
+						height: 84rpx;
+						border-radius: 32rpx;
+					}
+	
+					.text {
+						font-size: $font-size-tag;
+					}
+				}
+	
+				.select {
+					.text {
+						padding: 8rpx 16rpx;
+						border-radius: 40rpx;
+						color: #fff;
+						font-size: $font-size-tag;
+						line-height: 1;
+					}
+				}
+			}
+	
+			.content-wrap .categoty-goods-wrap .goods-list {
+				margin-top: 30rpx;
+			}
+	
+			.tree-wrap .category-item.select::before {
+				border-top-right-radius: 8rpx;
+				border-bottom-right-radius: 8rpx;
+			}
+		}
+		
+		
+		/*商品部分*/
+		.item-wrap {
+				width: 100%;
+				box-sizing: border-box;
+				// padding: 0 24rpx;
+				// padding-bottom: 80rpx;
+				&.goods {
+					height: 100%;
+				}
+			}
+		
+			.category-title {
+				padding: 20rpx 0;
+				font-size: 26rpx;
+				// font-weight: bold;
+				color: #222;
+				position: relative;
+				text-align: left;
+				padding-left: 30rpx;
+				// &::after,
+				// &::before {
+				// 	content: ' ';
+				// 	width: 46rpx;
+				// 	border-top: 2rpx solid #dfdfdf;
+				// 	position: absolute;
+				// 	top: 50%;
+				// }
+			
+				&::after {
+					margin-left: 40rpx;
+				}
+			
+				&::before {
+					margin-left: -80rpx;
+				}
+			}
+		
+			.category-adv {
+				width: 100%;
+				overflow: hidden;
+				line-height: 1;
+				padding: 20rpx 0;
+		
+				image {
+					width: 100%;
+					border-radius: 8rpx;
+				}
+			}
+		
+			.category-list {
+				display: flex;
+				flex-wrap: wrap;
+				background: #fff;
+				margin: 0 20rpx;
+				border-radius: 10rpx;
+				padding: 10rpx 0;
+				
+				.category-item {
+					width: 33.33%;
+					display: flex;
+					flex-direction: column;
+					align-items: center;
+					justify-content: center;
+					padding: 16rpx;
+					box-sizing: border-box;
+		
+					.img-box {
+						width: 80%;
+						padding-top: 80%;
+						margin: 0 auto;
+						overflow: hidden;
+						margin-bottom: 20rpx;
+						position: relative;
+		
+						image {
+							position: absolute;
+							width: 100%;
+							left: 50%;
+							top: 50%;
+							transform: translate(-50%, -50%);
+						}
+					}
+		
+					.name {
+						width: 100%;
+						text-overflow: ellipsis;
+						overflow: hidden;
+						white-space: nowrap;
+						text-align: center;
+						line-height: 1;
+		
+						font-size: 24rpx;
+					}
+				}
+			}
+		
+			.goods-list {
+				.goods-item {
+					padding: 0 0 26rpx 0;
+					background: #fff;
+					display: flex;
+					position: relative;
+		
+					.goods-img {
+						width: 180rpx;
+						height: 180rpx;
+						overflow: hidden;
+						border-radius: $border-radius;
+						margin-right: 14rpx;
+		
+						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: 0;
+						left: 0;
+						font-size: $font-size-goods-tag;
+					}
+		
+					.goods-tag-img {
+						position: absolute;
+						border-top-left-radius: $border-radius;
+						width: 80rpx;
+						height: 80rpx;
+						top: 26rpx;
+						left: 26rpx;
+						z-index: 5;
+						overflow: hidden;
+		
+						image {
+							width: 100%;
+							height: 100%;
+						}
+					}
+		
+					.info-wrap {
+						flex: 1;
+						display: flex;
+						flex-direction: column;
+						width: 0;
+					}
+		
+					.name-wrap {
+						flex: 1;
+					}
+		
+					.goods-name {
+						font-size: $font-size-base;
+						line-height: 1.3;
+						overflow: hidden;
+						text-overflow: ellipsis;
+						display: -webkit-box;
+						-webkit-line-clamp: 2;
+						-webkit-box-orient: vertical;
+					}
+		
+					.introduction {
+						line-height: 1;
+						margin-top: 10rpx;
+					}
+		
+					.discount-price {
+						display: inline-block;
+						font-weight: bold;
+						line-height: 1;
+						margin-top: 16rpx;
+						color: var(--price-color);
+		
+						.unit {
+							margin-right: 6rpx;
+						}
+					}
+		
+					.pro-info {
+						display: flex;
+						margin-top: 16rpx;
+		
+						.delete-price {
+							text-decoration: line-through;
+							flex: 1;
+		
+							.unit {
+								margin-right: 0rpx;
+							}
+						}
+		
+						&>view {
+							line-height: 1;
+		
+							&:nth-child(2) {
+								text-align: right;
+							}
+						}
+					}
+		
+					.member-price-tag {
+						display: inline-block;
+						width: 60rpx;
+						line-height: 1;
+						margin-left: 6rpx;
+						height: 28rpx;
+		
+						image {
+							width: 100%;
+							height: 100%;
+						}
+					}
+		
+					.footer-wrap {
+						display: flex;
+						justify-content: space-between;
+		
+						.right-wrap {
+							display: flex;
+							align-items: center;
+							justify-content: end;
+		
+							.num {
+								width: auto;
+								padding: 0 20rpx;
+								line-height: 1;
+							}
+		
+							.num-action {
+								display: flex;
+								align-items: center;
+								justify-content: center;
+								width: 40rpx;
+								height: 40rpx;
+								background: $base-color;
+								border-radius: 50%;
+								position: relative;
+		
+								.click-event {
+									position: absolute;
+									width: 2rpx;
+									height: 2rpx;
+									left: 0;
+									top: 0;
+									transform: translate(-50%, -50%);
+									z-index: 5;
+								}
+		
+								&.reduce {
+									width: 38rpx;
+									height: 38rpx;
+									background-color: transparent;
+									border: 2rpx solid $base-color;
+									box-sizing: border-box;
+		
+									.icon-jian {
+										color: $base-color;
+									}
+								}
+							}
+		
+							.icon-jian,
+							.icon-jia {
+								color: var(--btn-text-color);
+								font-weight: bold;
+								font-size: 26rpx;
+								line-height: 1;
+							}
+		
+							.select-sku {
+								font-weight: bold;
+								color: var(--btn-text-color);
+								font-size: 24rpx;
+								padding: 16rpx 24rpx;
+								position: relative;
+								// height: 40rpx;
+								line-height: 1;
+								text-align: center;
+								border-radius: 50rpx;
+		
+								.num-tag {
+									position: absolute;
+									top: 0;
+									right: 0;
+									transform: translateY(-50%);
+									display: inline-block;
+									box-sizing: border-box;
+									color: #fff;
+									line-height: 1.2;
+									text-align: center;
+									font-size: 24rpx;
+									padding: 0 6rpx;
+									min-width: 32rpx;
+									border-radius: 16rpx;
+									background-color: $base-color;
+									border: 2rpx solid #fff;
+								}
+							}
+						}
+					}
+				}
+		
+				&[data-template='3'] .goods-item {
+					flex-direction: column;
+		
+					.info-wrap {
+						width: 100%;
+						margin-top: 12rpx;
+					}
+		
+					.goods-img {
+						width: 100%;
+						height: auto;
+						margin-right: 0;
+						line-height: 1;
+		
+						image {
+							border-radius: 8rpx;
+						}
+					}
+		
+					.select-sku {
+						font-weight: bold;
+						width: 128rpx;
+						height: 52rpx !important;
+						line-height: 52rpx !important;
+					}
+				}
+			}
+		
+			.categoty-goods-wrap {
+				display: flex;
+				flex-direction: column;
+				height: 100%;
+		
+				.scroll-goods-view {
+					flex: 1;
+					height: 0;
+					transform: translateX(0px);
+				}
+			}
+		
+			.screen-category-wrap {
+				display: flex;
+		
+				.icon-unfold {
+					font-size: 24rpx;
+					color: #999;
+					padding: 0 0 0 20rpx;
+				}
+			}
+		
+			.screen-category {
+				flex: 1;
+				width: 0;
+				padding: 0 0 20rpx 0;
+				white-space: nowrap;
+				height: 60rpx;
+		
+				.item {
+					display: inline-block;
+					padding: 4rpx 24rpx;
+					background: #f5f5f5;
+					color: #666;
+					margin-right: 20rpx;
+					border-radius: 40rpx;
+		
+					&.selected {
+						background-color: $base-color;
+						color: var(--btn-text-color);
+					}
+				}
+			}
+		
+			/deep/ .uni-popup__wrapper-box {
+				border-radius: 0;
+			}
+		
+			.screen-category-popup {
+				display: flex;
+		
+				.screen-category {
+					white-space: break-spaces;
+					padding: 20rpx;
+					height: auto;
+				}
+		
+				.title {
+					line-height: 1;
+					margin-bottom: 20rpx;
+					font-weight: bold;
+				}
+		
+				.item {
+					margin-bottom: 20rpx;
+				}
+			}
+		
+			.end-tips {
+				text-align: center;
+				color: #999;
+				font-size: 24rpx;
+				padding: 30rpx 0 30rpx 0;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+			}
+		
+			/deep/ .loading-layer {
+				background: #fff !important;
+			}
+		
+			.category-empty {
+				flex: 1;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				flex-direction: column;
+				padding-top: 100rpx;
+		
+				image {
+					width: 280rpx;
+					height: 252rpx;
+				}
+		
+				.tips {
+					font-size: 26rpx;
+					font-weight: 500;
+					color: #999;
+					margin-top: 50rpx;
+				}
+			}
+		
+			.screen-category-4 .item {
+				background-color: #f2f2f2 !important;
+				padding: 10rpx 24rpx;
+				line-height: 1;
+				font-size: $font-size-tag;
+		
+				&.selected {
+					background-color: var(--main-color-shallow) !important;
+					color: var(--main-color);
+				}
+			}
+	
\ No newline at end of file
diff --git a/pages_promotion/merch/public/css/list.scss b/pages_promotion/merch/public/css/list.scss
new file mode 100644
index 0000000..2e40653
--- /dev/null
+++ b/pages_promotion/merch/public/css/list.scss
@@ -0,0 +1,647 @@
+.head-wrap {
+	background: #fff;
+	position: fixed;
+	width: 100%;
+	left: 0;
+	z-index: 1;
+
+	.search-wrap {
+		flex: 0.5;
+		padding: 30rpx 30rpx 0;
+		font-size: $font-size-tag;
+		display: flex;
+		align-items: center;
+		.iconfont {
+			margin-left: 16rpx;
+			font-size: 36rpx;
+		}
+		.input-wrap {
+			flex: 1;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			background: $color-bg;
+			height: 64rpx;
+			padding-left: 10rpx;
+			border-radius: 70rpx;
+			input {
+				width: 90%;
+				background: $color-bg;
+				font-size: $font-size-tag;
+				height: 100%;
+				padding: 0 25rpx 0 40rpx;
+				line-height: 50rpx;
+				border-radius: 40rpx;
+			}
+			text {
+				font-size: $font-size-toolbar;
+				color: $color-tip;
+				width: 80rpx;
+				text-align: center;
+				margin-right: 20rpx;
+			}
+		}
+		.category-wrap,
+		.list-style {
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			.iconfont {
+				font-size: 50rpx;
+				color: $color-tip;
+			}
+			text {
+				display: block;
+				margin-top: 60rpx;
+			}
+		}
+	}
+
+	.sort-wrap {
+		display: flex;
+		padding: 10rpx 20rpx 10rpx 0;
+		> view {
+			flex: 1;
+			text-align: center;
+			font-size: $font-size-base;
+			height: 60rpx;
+			line-height: 60rpx;
+			font-weight: bold;
+		}
+		.comprehensive-wrap {
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			.iconfont-wrap {
+				display: inline-block;
+				margin-left: 10rpx;
+				width: 40rpx;
+				.iconfont {
+					font-size: $font-size-toolbar;
+					line-height: 1;
+					margin-bottom: 5rpx;
+				}
+			}
+		}
+		.price-wrap {
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			.iconfont-wrap {
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				flex-direction: column;
+				width: 40rpx;
+				.iconfont {
+					position: relative;
+					float: left;
+					font-size: 32rpx;
+					line-height: 1;
+					height: 20rpx;
+					color: #909399;
+					&.asc {
+						top: -2rpx;
+					}
+					&.desc {
+						top: -6rpx;
+					}
+				}
+			}
+		}
+		.screen-wrap {
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			.iconfont-wrap {
+				display: inline-block;
+				margin-left: 10rpx;
+				width: 40rpx;
+				.iconfont {
+					font-size: $font-size-toolbar;
+					line-height: 1;
+				}
+			}
+		}
+	}
+}
+
+.category-list-wrap {
+	height: 100%;
+	.class-box {
+		display: flex;
+		flex-wrap: wrap;
+		padding: 0 $padding;
+		view {
+			width: calc((100% - 60rpx) / 3);
+			font-size: $font-size-goods-tag;
+			margin-right: 20rpx;
+			height: 60rpx;
+			line-height: 60rpx;
+			text-align: center;
+			margin-bottom: 12rpx;
+			flex-shrink: 0;
+			overflow: hidden;
+			text-overflow: ellipsis;
+			white-space: nowrap;
+			background: rgba(245, 245, 245, 1);
+			border-radius: 5rpx;
+			&:nth-of-type(3n) {
+				margin-right: 0;
+			}
+		}
+	}
+	.first {
+		font-size: $font-size-tag;
+		display: block;
+		// background: $page-color-base;
+		padding: 20rpx;
+	}
+	.second {
+		border-bottom: 2rpx solid $color-line;
+		padding: 20rpx;
+		display: block;
+		font-size: $font-size-tag;
+	}
+	.third {
+		padding: 0 20rpx 20rpx;
+		overflow: hidden;
+		font-size: $font-size-tag;
+		> view {
+			display: inline-block;
+			margin-right: 20rpx;
+			margin-top: 20rpx;
+		}
+		.uni-tag {
+			padding: 0 20rpx;
+		}
+	}
+}
+
+.screen-wrap {
+	.title {
+		font-size: $font-size-tag;
+		padding: $padding;
+		background: #f6f4f5;
+	}
+	scroll-view {
+		height: 85%;
+		.item-wrap {
+			border-bottom: 1px solid #f0f0f0;
+			.label {
+				font-size: $font-size-tag;
+				padding: $padding;
+				view {
+					display: inline-block;
+					font-size: 60rpx;
+					height: 40rpx;
+					vertical-align: middle;
+					line-height: 40rpx;
+				}
+			}
+
+			.list {
+				margin: $margin-updown $margin-both;
+				overflow: hidden;
+				> view {
+					display: inline-block;
+					margin-right: 25rpx;
+					margin-bottom: 25rpx;
+				}
+				.uni-tag {
+					padding: 0 $padding;
+					font-size: $font-size-goods-tag;
+					background: #f5f5f5;
+					height: 52rpx;
+					line-height: 52rpx;
+					border: 0;
+				}
+			}
+			.price-wrap {
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				padding: $padding;
+				input {
+					flex: 1;
+					background: #f5f5f5;
+					height: 52rpx;
+					width: 182rpx;
+					line-height: 50rpx;
+					font-size: $font-size-goods-tag;
+					border-radius: 50rpx;
+					text-align: center;
+					&:first-child {
+						margin-right: 10rpx;
+					}
+					&:last-child {
+						margin-left: 10rpx;
+					}
+				}
+			}
+		}
+	}
+	.footer {
+		height: 90rpx;
+		display: flex;
+		justify-content: center;
+		align-items: flex-start;
+		display: flex;
+		//position: absolute;
+		bottom: 0;
+		width: 100%;
+		.footer-box {
+			border-top-right-radius: 0;
+			border-bottom-right-radius: 0;
+			margin: 0;
+			width: 40%;
+		}
+		.footer-box1 {
+			border-top-left-radius: 0;
+			border-bottom-left-radius: 0;
+			margin: 0;
+			width: 40%;
+		}
+	}
+}
+.safe-area {
+	bottom: 68rpx !important;
+}
+.empty {
+	margin-top: 100rpx;
+}
+.buy-num {
+	font-size: $font-size-activity-tag;
+}
+.icon {
+	width: 34rpx;
+	height: 30rpx;
+}
+.list-style-new {
+	display: flex;
+	align-items: center;
+	.line {
+		width: 4rpx;
+		height: 28rpx;
+		background-color: rgba(227, 227, 227, 1);
+		margin-right: 60rpx;
+	}
+}
+.h-line {
+	width: 37rpx;
+	height: 2rpx;
+	background-color: $color-tip;
+}
+
+.lineheight-clear {
+}
+
+// 商品列表单列样式
+.goods-list.single-column {
+	display: none;
+
+	&.show {
+		display: block;
+	}
+
+	.goods-item {
+		padding: 26rpx;
+		background: #fff;
+		margin: $margin-updown $margin-both;
+		border-radius: $border-radius;
+		display: flex;
+		position: relative;
+
+		.goods-img {
+			position: relative;
+			width: 200rpx;
+			height: 200rpx;
+			// overflow: hidden;
+			border-radius: $border-radius;
+			margin-right: 20rpx;
+			overflow: hidden;
+
+			image {
+				width: 200rpx;
+				height: 200rpx;
+			}
+		}
+
+		.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: 0;
+			left: 0;
+			font-size: $font-size-goods-tag;
+		}
+
+		.goods-tag-img {
+			position: absolute;
+			border-top-left-radius: $border-radius;
+			width: 80rpx;
+			height: 80rpx;
+			top: 26rpx;
+			left: 26rpx;
+			z-index: 5;
+			overflow: hidden;
+
+			image {
+				width: 100%;
+				height: 100%;
+			}
+		}
+
+		.info-wrap {
+			flex: 1;
+			display: flex;
+			flex-direction: column;
+		}
+
+		.name-wrap {
+			flex: 1;
+		}
+
+		.goods-name {
+			font-size: $font-size-base;
+			line-height: 1.3;
+			overflow: hidden;
+			text-overflow: ellipsis;
+			display: -webkit-box;
+			-webkit-line-clamp: 2;
+			-webkit-box-orient: vertical;
+		}
+
+		.introduction {
+			line-height: 1;
+			margin-top: 10rpx;
+		}
+
+		.discount-price {
+			display: inline-block;
+			font-weight: bold;
+			line-height: 1;
+			margin-top: 16rpx;
+
+			.unit {
+				margin-right: 6rpx;
+				color: var(--price-color);
+			}
+			.price {
+				color: var(--price-color);
+			}
+		}
+
+		.pro-info {
+			display: flex;
+			margin-top: auto;
+			align-items: center;
+			position: relative;
+
+			.delete-price {
+				text-decoration: line-through;
+				font-size: $font-size-tag !important;
+				flex: 1;
+
+				.unit {
+					margin-right: 0;
+				}
+			}
+			.block-wrap {
+				flex: 1;
+				line-height: 1;
+				margin-right: 20rpx;
+				.sale {
+					font-size: $font-size-tag !important;
+				}
+			}
+		}
+
+		.member-price-tag {
+			display: inline-block;
+			width: 60rpx;
+			line-height: 1;
+			margin-left: 6rpx;
+
+			image {
+				width: 100%;
+				display: flex;
+				max-height: 30rpx;
+			}
+		}
+		.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: 150rpx;
+			}
+		}
+	}
+}
+// 商品列表双列样式
+.goods-list.double-column {
+	display: none;
+	margin: 0 24rpx;
+	padding-top: $margin-updown;
+	position: relative;
+	flex-wrap: wrap;
+	justify-content: space-between;
+
+	&.show {
+		display: flex;
+	}
+
+	.goods-item {
+		display: flex;
+		flex-direction: column;
+		width: calc(50% - 10rpx);
+		border-radius: $border-radius;
+		overflow: hidden;
+		background-color: #fff;
+
+		&:nth-child(2n + 2) {
+			margin-right: 0;
+		}
+
+		.goods-img {
+			position: relative;
+			overflow: hidden;
+			padding-top: 100%;
+			border-top-left-radius: $border-radius;
+			border-top-right-radius: $border-radius;
+
+			image {
+				width: 100%;
+				position: absolute !important;
+				top: 50%;
+				left: 0;
+				transform: translateY(-50%);
+			}
+		}
+
+		.goods-tag {
+			color: #fff;
+			line-height: 1;
+			padding: 8rpx 16rpx;
+			position: absolute;
+			border-bottom-right-radius: $border-radius;
+			top: 0;
+			left: 0;
+			font-size: $font-size-goods-tag;
+		}
+
+		.goods-tag-img {
+			position: absolute;
+			border-top-left-radius: $border-radius;
+			width: 80rpx;
+			height: 80rpx;
+			top: 0;
+			left: 0;
+			z-index: 5;
+			overflow: hidden;
+
+			image {
+				width: 100%;
+				height: 100%;
+			}
+		}
+
+		.info-wrap {
+			padding: 20rpx;
+			display: flex;
+			flex-direction: column;
+			flex: 1;
+		}
+
+		.goods-name {
+			font-size: $font-size-base;
+			line-height: 1.3;
+			margin-top: 20rpx;
+		}
+
+		.lineheight-clear {
+			margin-top: 16rpx;
+		}
+
+		.discount-price {
+			display: inline-block;
+			font-weight: bold;
+			line-height: 1;
+
+			.unit {
+				margin-right: 6rpx;
+				color: var(--price-color);
+			}
+			.price {
+				color: var(--price-color);
+			}
+		}
+
+		.pro-info {
+			display: flex;
+			margin-top: auto;
+			align-items: center;
+
+			.block-wrap {
+				flex: 1;
+				line-height: 1;
+				margin-right: 20rpx;
+				.sale {
+					font-size: $font-size-tag !important;
+				}
+			}
+		}
+
+		.delete-price {
+			// display: inline-block;
+			// margin-left: 6rpx;
+			// float: right;
+			.unit {
+				margin-right: 6rpx;
+			}
+			text {
+				line-height: 1;
+				font-size: $font-size-tag !important;
+			}
+		}
+
+		.member-price-tag {
+			display: inline-block;
+			width: 60rpx;
+			line-height: 1;
+			margin-left: 6rpx;
+
+			image {
+				width: 100%;
+			}
+		}
+		.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: 250rpx;
+			}
+		}
+	}
+}
+
+.cart-action-wrap {
+	position: relative;
+
+	.shopping-cart-btn {
+		font-size: 36rpx;
+		border: 2rpx solid $base-color;
+		border-radius: 50%;
+		padding: 10rpx;
+		color: $base-color;
+		width: 36rpx;
+		height: 36rpx;
+		text-align: center;
+		line-height: 36rpx;
+	}
+
+	.plus-sign-btn {
+		font-size: 36rpx;
+		border: 2rpx solid $base-color;
+		border-radius: 50%;
+		padding: 10rpx;
+		color: $base-color;
+		width: 36rpx;
+		height: 36rpx;
+		text-align: center;
+		line-height: 36rpx;
+	}
+
+	.buy-btn {
+		background-color: $base-color;
+		color: var(--btn-text-color);
+		border-radius: 50rpx;
+		font-size: $font-size-tag;
+		padding: 12rpx 30rpx;
+		line-height: 1;
+	}
+	.icon-diy {
+		font-size: 80rpx;
+	}
+}
diff --git a/pages_promotion/merch/public/edit.js b/pages_promotion/merch/public/edit.js
new file mode 100644
index 0000000..a4a4817
--- /dev/null
+++ b/pages_promotion/merch/public/edit.js
@@ -0,0 +1,952 @@
+// import {getGoodsInfoById,getCategoryTree,addGoods,editGoods,addVirtualGoods,editVirtualGoods,addVirtualCardGoods,editVirtualCardGoods} from '@/api/goods'
+// import {getOrderFormList} from '@/api/form'
+// import {getSupplyList} from '@/api/supply'
+export default {
+	data() {
+		return {
+			repeatFlag: false,
+			isIphoneX: false,
+			goodsImgHeight: 165, // 商品图片高度
+			isAWait: false,
+			albumPage: 'goodsEdit',
+			//店内分类
+			shopCategoryNumber: 1,
+			shopCategoryData: {
+				store_0: {}
+			},
+			shopCategoryIndex: '',
+
+			categoryList: [],
+			secondCategory: [],
+			thirdCategory: [],
+			categoryId: [0, 0, 0],
+			categoryName: ['', '', ''],
+			currentLevel: 1,
+			lastLevel: 1,
+			showFisrt: true,
+			showSecond: false,
+			showThird: false,
+
+			goodsData: {
+				id: 0,//商品id
+				goodsname:'',//商品名称
+				subtitle:'',//商品简介
+				is_show_arrive:1,//默认商品预达简介0关闭1开启
+				diy_arrive_switch:0,//商品自定义预达简介0关闭1开启
+				goods_start_count:1,//起售数量
+				grounding:1,//0下架1上架
+				is_index_show:1,//0首页不推荐1推荐
+				price:0,//售价
+				productprice:0,//原价
+				costprice:0,//成本价
+				total:0,//库存
+				pick_up_type:0,//提货时,0当日达1次日达2隔日达3自定义
+				dispatchtype:1,//1统一运费
+				dispatchprice:0,//统一运费金额
+				begin_time:'',//团购开始时间
+				end_time:'',//团购结束时间
+				oneday_limit_count:0,//每天限购
+				one_limit_count:0,//单次限购
+				total_limit_count:0,//历史限购
+				is_all_sale:0,//所有团长1部分团长0
+				goods_image:[],
+				begin_time:'',//团购开始时间
+				end_time:''//团购结束时间
+			},
+			groundingArray: ['下架', '上架'],
+			
+			pickuptypeArray: ['当日达', '次日达', '隔日达'],//, '自定义'
+			
+			
+			currCategory: 0, // 当前所设置的商品分类
+			virtualDeliverArray: [{
+					name: '自动发货',
+					value: 'auto_deliver',
+				},
+				{
+					name: '手动发货',
+					value: 'artificial_deliver',
+				},
+				{
+					name: '到店核销',
+					value: 'verify',
+				}
+			],
+			virtualDeliverValue: {
+				'auto_deliver': '自动发货',
+				'artificial_deliver': '手动发货',
+				'verify': '到店核销'
+			},
+			virtualReceiveArray: [{
+					name: '自动收货',
+					value: 'auto_receive',
+				},
+				{
+					name: '买家确认收货',
+					value: 'artificial_receive',
+				},
+			],
+			virtualReceiveValue: {
+				'auto_receive': '自动收货',
+				'artificial_receive': '买家确认收货',
+			},
+			validityTypeArray: ['永久', '购买后几日有效', '指定过期日期'],
+			virtualIndate: 0,
+			minDate: '',
+			carmiLength: '添加卡密',
+			limitLength: [ //限购
+				{
+					name: '单次限购',
+					value: '1'
+				},
+				{
+					name: '长期限购',
+					value: '2'
+				}
+			],
+			current: 0,
+			goodsFormArray: [],
+			goodsForm: [],
+
+			supplyFormArray: [],
+			supplyForm: []
+		};
+	},
+	async onLoad(option) {
+		this.goodsData.id = option.id || 0;
+
+		// if (!this.$util.checkToken('/pages/goods/edit/index?id=' + this.goodsData.id)) return;
+
+		// this.clearStoreage();
+
+		// this.getCategoryTreeFn();
+		if (this.goodsData.id) {
+			this.isAWait = true;
+			uni.setNavigationBarTitle({
+				title: '编辑商品'
+			});
+			await this.editGetGoodsInfo();
+		} else {
+			
+			this.isAWait = false;
+			uni.setNavigationBarTitle({
+				title: '添加商品'
+			});
+		}
+
+		let date = new Date();
+		this.minDate = date.getFullYear() + '-' + date.getMonth() + '-' + date.getUTCDate();
+
+		// if (this.addonIsExit.form) this.getGoodsForm();
+
+		// if (this.addonIsExit.supply) this.getSupplyList();
+
+	},
+	onShow() {
+		this.isIphoneX = this.$util.uniappIsIPhoneX();
+		//this.refreshData();
+	},
+	methods: {
+		
+		groundingChange(e) {
+			this.goodsData.grounding = e.detail.value;
+		},
+		
+		pickuptypeChange(e) {
+			this.goodsData.pick_up_type = e.detail.value;
+		},
+		
+		// 获取编辑商品数据
+		async editGetGoodsInfo() {
+			this.$api.sendRequest({
+				url: 'app.getgoodsinfo',
+				data:{
+					id:this.goodsData.id
+				},
+				success: res => {
+					console.log(res)
+					if(res.result.detail){
+						this.goodsData = res.result.detail
+						console.log(this.goodsData.goods_image)
+					}else{
+						this.$util.showToast({
+							title: '商品不存在',
+						});
+						setTimeout(() => {
+							this.$util.redirectTo('/pages/goods/list', {}, 'redirectTo');
+						}, 1000);
+					}
+					// if (res.status == 0) {
+					// 	setTimeout(() => {
+					// 		this.$util.redirectTo('/pages/goods/list', {}, 'redirectTo');
+					// 	}, 1000);
+					// }
+				}
+			})
+			/*var res = await getGoodsInfoById(this.goodsData.goods_id);
+			if (res.code == 0 && res.data) {
+				var data = res.data;
+
+				data.goods_category.forEach((item, index) => {
+					this.shopCategoryData['store_' + index] = {
+						category_id: item.id,
+						category_name: item.category_name
+					}
+				})
+				this.shopCategoryNumber = data.goods_category.length;
+
+				// 商品分类
+				data.category_id = data.goods_category[0].id;
+				data.category_name = data.goods_category[0].category_name.replace(/\//g, " / ");
+
+				if (typeof data.category_id == 'string') {
+					this.categoryId = data.category_id.split(",");
+					this.categoryName = data.category_name.split(" / ");
+				} else {
+					this.categoryId = data.category_id;
+					this.categoryName = data.category_name;
+				}
+
+				delete data.category_json;
+				delete data.goods_category;
+
+				data.goods_image = data.goods_image.split(",");
+
+				data.goods_sku_data.forEach((item) => {
+					if (item.sku_spec_format) item.sku_spec_format = JSON.parse(item.sku_spec_format);
+				});
+
+				if (data.goods_spec_format) {
+					uni.setStorageSync("editGoodsSpecFormat", data.goods_spec_format);
+					uni.setStorageSync("editGoodsSkuData", JSON.stringify(data.goods_sku_data));
+					data.goods_spec_format = JSON.parse(data.goods_spec_format);
+				} else {
+					data.sku_id = data.goods_sku_data[0].sku_id;
+					data.price = data.goods_sku_data[0].price;
+					data.market_price = data.goods_sku_data[0].market_price;
+					data.cost_price = data.goods_sku_data[0].cost_price;
+					data.weight = data.goods_sku_data[0].weight;
+					data.volume = data.goods_sku_data[0].volume;
+					data.sku_no = data.goods_sku_data[0].sku_no;
+				}
+
+				if (data.goods_class == 1) {
+					// 实物商品
+					delete data.virtual_indate;
+					uni.setStorageSync("editGoodsShippingTemplateId", data.shipping_template);
+					uni.setStorageSync("editGoodsShippingTemplateName", data.template_name ? data.template_name : '');
+				} else {
+					// 虚拟商品
+					delete data.shipping_template;
+					delete data.is_free_shipping;
+				}
+
+				// 商品参数
+				if (data.goods_attr_format) {
+					uni.setStorageSync("editGoodsAttrClass", data.goods_attr_class);
+					uni.setStorageSync("editGoodsAttrName", data.goods_attr_name);
+					uni.setStorageSync("editGoodsAttrFormat", data.goods_attr_format);
+					data.goods_attr_format = JSON.parse(data.goods_attr_format);
+				}
+
+				uni.setStorageSync("editGoodsState", data.goods_state);
+				uni.setStorageSync("editGoodsContent", data.goods_content);
+
+				if (data.verify_validity_type == 1) {
+					this.virtualIndate = data.virtual_indate;
+				} else if (data.verify_validity_type == 2) {
+					this.virtualTime = this.$util.timeStampTurnTime(data.virtual_indate, 'Y-m-d');
+				}
+				data.verify_num = data.goods_sku_data[0].verify_num
+
+				this.goodsData = data;
+
+				this.goodsData.goods_form_index = 0;
+
+				this.goodsData.supply_index = 0;
+
+				this.$forceUpdate();
+			} else {
+				this.$util.showToast({
+					title: '商品不存在',
+				});
+				setTimeout(() => {
+					this.$util.redirectTo('/pages/goods/list', {}, 'redirectTo');
+				}, 1000);
+			}*/
+		},
+		// 选择商品分类
+		openGoodsCategoryPop(index) {
+			this.currCategory = index;
+			if (this.shopCategoryData['store_' + index].category_id) {
+				this.categoryId = this.shopCategoryData['store_' + index].category_id.split(',');
+				this.categoryName = this.shopCategoryData['store_' + index].category_name.split(' / ');
+
+				this.categoryList.forEach((item, index) => {
+					item.selected = this.categoryId.indexOf(item.category_id.toString()) != -1;
+					if (item.selected) {
+						this.secondCategory = item.child_list;
+					}
+					if (item.child_list) {
+						if (item.selected) this.lastLevel = 2;
+						item.child_list.forEach(secondItem => {
+							secondItem.selected = this.categoryId.indexOf(secondItem.category_id.toString()) != -1;
+							if (secondItem.selected) {
+								this.thirdCategory = secondItem.child_list;
+							}
+						});
+					}
+				});
+				this.changeShow(this.categoryId.length);
+			} else {
+				this.categoryId = [0];
+				this.categoryName = [''];
+				this.changeShow(1);
+			}
+			this.$refs.categoryPopup.open();
+		},
+		closeGoodsCategoryPop() {
+			this.$refs.categoryPopup.close();
+		},
+		// 编辑规格类型
+		openGoodsSpec() {
+			this.$util.redirectTo('/pages/goods/edit/spec');
+		},
+		// 编辑多规格
+		openGoodsSpecEdit() {
+			this.$util.redirectTo('/pages/goods/edit/spec_edit', {
+				goods_class: this.goodsData.goods_class,
+				virtual_deliver_type: this.goodsData.virtual_deliver_type
+			});
+		},
+		//编辑卡密
+		openCarmichaelEdit() {
+			this.$util.redirectTo('/pages/goods/edit/carmichael_edit', {
+				goods_class: this.goodsData.goods_class
+			});
+		},
+		// 编辑商品状态
+		openGoodsState() {
+			this.$util.redirectTo('/pages/goods/edit/state', {
+				goods_state: this.goodsData.goods_state
+			});
+		},
+		// 编辑快递运费
+		openExpressFreight() {
+			this.$util.redirectTo('/pages/goods/edit/express_freight', {
+				template_id: this.goodsData.shipping_template
+			});
+		},
+		// 编辑商品详情
+		openGoodsContent() {
+			this.$util.redirectTo('/pages/goods/edit/content');
+		},
+		// 编辑商品参数
+		openAttr() {
+			this.$util.redirectTo('/pages/goods/edit/attr');
+		},
+		/**
+		 * 刷新商品图片高度
+		 * @param {Object} data
+		 */
+		refreshGoodsImgHeight(data) {
+			if (data.height == '') return;
+			var height = parseFloat(data.height.replace('px', ''));
+			this.goodsImgHeight = height + 80;
+			this.$forceUpdate();
+			if (data.isLoad && this.$refs.loadingCover) {
+				// 数据渲染留点时间
+				setTimeout(() => {
+					this.$refs.loadingCover.hide();
+				}, 100);
+			}
+			uni.removeStorageSync("selectedAlbumImg");
+			
+		},
+		// 获取商品分类树状结构
+		getCategoryTreeFn() {
+			getCategoryTree().then(res=>{
+				if (res.data) {
+					this.categoryList = res.data;
+					this.categoryList.forEach((item, index) => {
+						item.selected = this.categoryId.indexOf(item.category_id.toString()) != -1;
+						if (item.selected) {
+							this.secondCategory = item.child_list;
+							this.currentLevel = 1;
+						}
+						if (item.child_list) {
+							if (item.selected) this.lastLevel = 2;
+							item.child_list.forEach(secondItem => {
+								secondItem.selected = this.categoryId.indexOf(secondItem.category_id.toString()) != -1;
+								if (secondItem.selected) {
+									this.thirdCategory = secondItem.child_list;
+									this.currentLevel = 2;
+								}
+								if (secondItem.child_list) {
+									if (secondItem.selected) this.lastLevel = 3;
+									secondItem.child_list.forEach(thirdItem => {
+										thirdItem.selected = this.categoryId.indexOf(thirdItem.category_id.toString()) != -1;
+										if (thirdItem.selected) this.currentLevel = 3;
+									});
+								}
+							});
+						}
+					});
+					this.changeShow(this.lastLevel);
+					if (this.goodsData.goods_id == 0 && this.$refs.loadingCover) {
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					}
+				}
+			});
+		},
+		changeShow(index) {
+			if (index == 1) {
+				this.showFisrt = true;
+				this.showSecond = false;
+				this.showThird = false;
+			} else if (index == 2) {
+				this.showFisrt = false;
+				this.showSecond = true;
+				this.showThird = false;
+			} else if (index == 3) {
+				this.showFisrt = false;
+				this.showSecond = false;
+				this.showThird = true;
+			}
+			this.currentLevel = index;
+			this.$forceUpdate();
+		},
+		selectCategory(category) {
+			this.currentLevel = category.level;
+
+			// 如果当前选中跟上次不一样,则 要清空下级数据
+			if (category.level == 1 && this.categoryId[0] > 0 && this.categoryId[0] != category.captcha_id) {
+				this.categoryId[1] = 0;
+				this.categoryName[1] = '';
+				this.categoryId[2] = 0;
+				this.categoryName[2] = '';
+			} else if (category.level == 2 && this.categoryId[1] > 0 && this.categoryId[1] != category.captcha_id) {
+				this.categoryId[2] = 0;
+				this.categoryName[2] = '';
+			}
+
+			this.categoryId[category.level - 1] = category.category_id;
+			this.categoryName[category.level - 1] = category.category_name;
+			if (category.level == 1) {
+				if (category.child_list) {
+					this.secondCategory = category.child_list;
+				} else {
+					this.categoryId[1] = 0;
+					this.categoryName[1] = '';
+					this.categoryId[2] = 0;
+					this.categoryName[2] = '';
+				}
+			} else if (category.level == 2) {
+				if (category.child_list) {
+					this.thirdCategory = category.child_list;
+				} else {
+					this.categoryId[2] = 0;
+					this.categoryName[2] = '';
+				}
+			}
+
+			this.lastLevel = 1;
+			this.categoryList.forEach((item, index) => {
+				item.selected = this.categoryId[0] == item.category_id;
+				if (item.child_list) {
+					if (item.selected) this.lastLevel = 2;
+					item.child_list.forEach((secondItem, secondIndex) => {
+						secondItem.selected = this.categoryId[1] == secondItem.category_id;
+						if (secondItem.child_list) {
+							if (secondItem.selected) this.lastLevel = 3;
+						}
+					});
+				}
+			});
+
+			this.changeShow(this.lastLevel);
+
+			this.goodsData.category_id = [];
+			this.goodsData.category_name = [];
+
+			for (var i = 0; i < this.categoryId.length; i++) {
+				if (this.categoryId[i]) this.goodsData.category_id.push(this.categoryId[i]);
+			}
+			for (var i = 0; i < this.categoryName.length; i++) {
+				if (this.categoryName[i]) this.goodsData.category_name.push(this.categoryName[i]);
+			}
+
+			this.goodsData.category_id = this.goodsData.category_id.toString();
+			this.goodsData.category_name = this.goodsData.category_name.join(" / ");
+
+			if (
+				(this.lastLevel == 3 && this.categoryId[2]) ||
+				(this.lastLevel == 2 && this.categoryId[1]) ||
+				(this.lastLevel == 1 && this.categoryId[0])
+			) {
+				this.shopCategoryData['store_' + this.currCategory] = {
+					category_id: this.goodsData.category_id,
+					category_name: this.goodsData.category_name
+				};
+				this.closeGoodsCategoryPop();
+			}
+
+			this.$forceUpdate();
+		},
+		addShopCategory() {
+			if (this.shopCategoryNumber == 10) {
+				this.$util.showToast({
+					title: '商品可以属于多个分类，最多10个'
+				});
+				return;
+			}
+			this.shopCategoryData['store_' + this.shopCategoryNumber] = {};
+			++this.shopCategoryNumber;
+		},
+		deleteShopCategory(index) {
+			delete this.shopCategoryData['store_' + index];
+			--this.shopCategoryNumber;
+
+			//重置数据	
+			let i = 0;
+			let obj = {};
+			for (let key in this.shopCategoryData) {
+				obj['store_' + i] = this.shopCategoryData[key];
+				i++;
+			}
+			this.shopCategoryData = {};
+			this.shopCategoryData = Object.assign(this.shopCategoryData, obj);
+		},
+		// 刷新数据
+		refreshData() {
+			var selectedAlbumImg = uni.getStorageSync('selectedAlbumImg');
+			if (selectedAlbumImg) {
+				uni.setStorageSync('selectedAlbumImgTemp', selectedAlbumImg);
+				selectedAlbumImg = JSON.parse(selectedAlbumImg);
+				this.goodsData.goods_image = selectedAlbumImg.list.split(",");
+				this.$refs.goodsShmilyDragImg.refresh();
+			}
+
+			// 规格项
+			this.goodsData.goods_spec_format = uni.getStorageSync('editGoodsSpecFormat') ? JSON.parse(uni.getStorageSync('editGoodsSpecFormat')) : [];
+			if (this.goodsData.goods_spec_format.length <= 0) {
+
+				this.goodsData.carmichael = uni.getStorageSync('editGoodsCarmichael') ? JSON.parse(uni.getStorageSync('editGoodsCarmichael')) : [];
+				if (this.goodsData.carmichael.length > 0) {
+					this.carmiLength = '添加卡密【' + this.goodsData.carmichael.length + '】'
+				}
+			}
+
+			// 多规格数据
+			this.goodsData.goods_sku_data = uni.getStorageSync('editGoodsSkuData') ? JSON.parse(uni.getStorageSync('editGoodsSkuData')) : [];
+			if (this.goodsData.goods_sku_data.length > 0) {
+				this.goodsData.goods_stock = 0;
+				this.goodsData.goods_stock_alarm = 0;
+				this.goodsData.goods_sku_data.forEach((item) => {
+					if (item.stock) this.goodsData.goods_stock += parseInt(item.stock);
+					if (item.stock_alarm) this.goodsData.goods_stock_alarm += parseInt(item.stock_alarm);
+				});
+			}
+
+			// 快递运费
+			this.goodsData.shipping_template = uni.getStorageSync('editGoodsShippingTemplateId') || 0;
+			this.goodsData.is_free_shipping = this.goodsData.shipping_template > 0 ? 0 : 1;
+			this.goodsData.template_name = uni.getStorageSync('editGoodsShippingTemplateName') || '';
+
+			if (uni.getStorageSync('editGoodsState') !== undefined && uni.getStorageSync('editGoodsState') !== '') {
+				this.goodsData.goods_state = uni.getStorageSync('editGoodsState');
+			}
+
+			if (uni.getStorageSync('editGoodsContent') != undefined && uni.getStorageSync('editGoodsContent') != '') {
+				this.goodsData.goods_content = uni.getStorageSync('editGoodsContent');
+			}
+			// 商品参数
+			this.goodsData.goods_attr_class = uni.getStorageSync('editGoodsAttrClass') || 0;
+			this.goodsData.goods_attr_name = uni.getStorageSync('editGoodsAttrName') || '';
+			this.goodsData.goods_attr_format = uni.getStorageSync('editGoodsAttrFormat') ? JSON.parse(uni.getStorageSync('editGoodsAttrFormat')) : [];
+			this.$forceUpdate();
+		},
+		// 验证
+		verify() {
+
+			if (this.goodsData.goodsname.length == 0) {
+				this.$util.showToast({
+					title: '请输入商品名称'
+				});
+				return false;
+			}
+
+			if (this.goodsData.subtitle.length > 100) {
+				this.$util.showToast({
+					title: '商品简介不能超过100个字符'
+				});
+				return false;
+			}
+
+			if (this.goodsData.goods_image.length == 0) {
+				this.$util.showToast({
+					title: '请上传商品图片'
+				});
+				return false;
+			}
+
+
+			// if (!this.shopCategoryData.store_0.category_id) {
+			// 	this.$util.showToast({
+			// 		title: `请选择商品分类`
+			// 	});
+			// 	return false;
+			// }
+
+			// if (this.goodsData.goods_class == 2 && this.goodsData.virtual_deliver_type == 'verify') {
+			// 	if (this.goodsData.verify_validity_type == 1) {
+			// 		if (this.virtualIndate.length == 0) {
+			// 			this.$util.showToast({
+			// 				title: '请输入有效期'
+			// 			});
+			// 			return false;
+			// 		}
+			// 		if (isNaN(this.virtualIndate) || !this.$util.data().regExp.number.test(this.virtualIndate)) {
+			// 			this.$util.showToast({
+			// 				title: '[有效期]格式输入错误'
+			// 			});
+			// 			return false;
+			// 		}
+			// 		if (this.virtualIndate < 1) {
+			// 			this.$util.showToast({
+			// 				title: '有效期不能小于1天'
+			// 			});
+			// 			return false;
+			// 		}
+			// 	}
+
+			// 	if (this.goodsData.verify_validity_type == 2) {
+			// 		if (this.virtualTime.length == 0) {
+			// 			this.$util.showToast({
+			// 				title: '请设置有效期'
+			// 			});
+			// 			return false;
+			// 		}
+			// 	}
+
+			// }
+
+			// 单规格
+				if (this.goodsData.price == 0) {
+					
+					this.$util.showToast({
+						title: '请输入销售价'
+					});
+					return false;
+				}
+				if (isNaN(this.goodsData.price) || !this.$util.data().regExp.digit.test(this.goodsData.price)) {
+					this.$util.showToast({
+						title: '[销售价]格式输入错误'
+					});
+					return false;
+				}
+
+				if (this.goodsData.productprice.length > 0 && (isNaN(this.goodsData.productprice) || !this.$util.data().regExp.digit.test(this.goodsData.productprice))) {
+					this.$util.showToast({
+						title: '[原价价]格式输入错误'
+					});
+					return false;
+				}
+
+			
+
+			// 总库存
+			if (this.goodsData.total == 0) {
+				this.$util.showToast({
+					title: '请输入库存'
+				});
+				return false;
+			}
+
+			if (isNaN(this.goodsData.total) || !this.$util.data().regExp.number.test(this.goodsData.total)) {
+				this.$util.showToast({
+					title: '[库存]格式输入错误'
+				});
+				return false;
+			}
+			if (isNaN(this.goodsData.goods_start_count) || !this.$util.data().regExp.number.test(this.goodsData.goods_start_count)) {
+				this.$util.showToast({
+					title: '[起售]格式输入错误'
+				});
+				return false;
+			}
+			if (this.goodsData.goods_start_count < 0) {
+				this.$util.showToast({
+					title: '起售数量不能小于0'
+				});
+				return false;
+			}
+
+			return true;
+
+		},
+		// 删除本地缓存
+		clearStoreage() {
+
+			// 临时选择的商品图片
+			uni.removeStorageSync("selectedAlbumImg");
+			uni.removeStorageSync("selectedAlbumImgTemp");
+
+			// 商品规格
+			uni.removeStorageSync("editGoodsSpecFormat");
+			uni.removeStorageSync("editGoodsSkuData");
+
+			//电子卡密
+			uni.removeStorageSync("editGoodsCarmichael");
+			uni.removeStorageSync("specName");
+
+			// 物流公司
+			uni.removeStorageSync("editGoodsShippingTemplateId");
+			uni.removeStorageSync("editGoodsShippingTemplateName");
+
+			// 商品状态
+			uni.removeStorageSync("editGoodsState");
+
+			// 商品详情
+			uni.removeStorageSync("editGoodsContent");
+
+			// 商品参数
+			uni.removeStorageSync("editGoodsAttrClass");
+			uni.removeStorageSync("editGoodsAttrName");
+			uni.removeStorageSync("editGoodsAttrFormat");
+		},
+		save() {
+			if (!this.verify()) return;
+			if (this.repeatFlag) return;
+			this.repeatFlag = true;
+			this.$api.sendRequest({
+				url: 'app.addgoods',
+				data:this.goodsData,
+				success: res => {
+					this.$util.showToast({
+						title: res.result.message
+					});
+					if (res.status == 1) {
+						setTimeout(() => {
+							this.$util.redirectTo('/pages/goods/list', {}, 'redirectTo');
+						}, 1000);
+					} else {
+						this.repeatFlag = false;
+					}
+				}
+			})
+			
+			// 清空规格的图片
+			console.log(this.goodsData)
+			return false
+			for (var i = 0; i < this.goodsData.goods_sku_data.length; i++) {
+				if (this.goodsData.goods_sku_data[i].sku_images.length == 0) this.goodsData.goods_sku_data[i].sku_image = '';
+			}
+			var data = JSON.parse(JSON.stringify(this.goodsData));
+			delete data.category_name;
+
+			data.category_json = [];
+			data.category_id = '';
+
+			for (var key in this.shopCategoryData) {
+				if (this.shopCategoryData[key].category_id) {
+					data.category_id += ',' + this.shopCategoryData[key].category_id;
+					data.category_json.push(this.shopCategoryData[key].category_id);
+				}
+			}
+			data.category_id += ',';
+			data.category_json = JSON.stringify(data.category_json);
+			if (data.goods_spec_format.length == 0) {
+				// 单规格数据
+				var singData = {
+					sku_id: (data.goods_id ? data.sku_id : 0),
+					sku_name: data.goods_name,
+					spec_name: '',
+					sku_no: data.sku_no,
+					sku_spec_format: '',
+					price: data.price,
+					market_price: data.market_price,
+					cost_price: data.cost_price,
+					stock: data.goods_stock,
+					stock_alarm: data.goods_stock_alarm,
+					weight: data.weight,
+					volume: this.goodsData.volume,
+					sku_image: data.goods_image[0],
+					sku_images: data.goods_image.toString(),
+					// verify_num: data.goods_sku_data.length > 0 ? data.goods_sku_data[0].verify_num : this.goodsData.verify_num
+					verify_num: data.verify_num
+				}
+				var singleSkuData = JSON.stringify([singData]);
+			}
+			data.goods_image = data.goods_image.toString();
+			// 商品规格json格式
+			data.goods_spec_format = data.goods_spec_format.length > 0 ? JSON.stringify(data.goods_spec_format) : '';
+
+			// SKU商品数据
+			data.goods_sku_data = data.goods_spec_format.length > 0 ? JSON.stringify(data.goods_sku_data) :
+				singleSkuData;
+
+			// 商品参数json格式
+			data.goods_attr_format = data.goods_attr_format.length > 0 ? JSON.stringify(data.goods_attr_format) : '';
+
+			data.spec_type_status = data.goods_spec_format.length > 0 ? 1 : 0;
+
+			if (this.goodsData.verify_validity_type == 1) {
+				data.virtual_indate = this.virtualIndate;
+			} else if (this.goodsData.verify_validity_type == 2) {
+				data.virtual_indate = this.virtualTime;
+			}
+
+			// console.log(this.goodsData.goods_spec_format,'format')
+			// if(this.goodsData.goods_spec_format == '[]'){
+			// 	data.carmichael= data.carmichael
+			// }
+			var save = null;
+			if (data.goods_class == 3) {
+				save = addVirtualCardGoods;
+				if (data.goods_id) save = editVirtualCardGoods;
+			}else if (data.goods_class == 2){
+				save = addVirtualGoods;
+				if (data.goods_id) save = editVirtualGoods;
+			}else {
+				save = addGoods;
+				if (data.goods_id) save = editGoods;
+			}
+			data.goods_form = this.goodsData.goods_form_index ? this.goodsForm[this.goodsData.goods_form_index - 1].id : 0;
+
+			data.supplier_id = this.goodsData.supply_index ? this.supplyForm[this.goodsData.supply_index - 1].supplier_id : 0;
+			if (this.repeatFlag) return;
+			this.repeatFlag = true;
+			save(data).then(res=>{
+				this.$util.showToast({
+					title: res.message
+				});
+				if (res.code == 0) {
+					this.clearStoreage();
+					setTimeout(() => {
+						this.$util.redirectTo('/pages/goods/list', {}, 'tabbar');
+					}, 1000);
+				} else {
+					this.repeatFlag = false;
+				}
+			});
+		},
+		//是否开启限购
+		onLimit() {
+			this.goodsData.is_limit = this.goodsData.is_limit == 1 ? 0 : 1
+		},
+
+		//限购类型
+		limitChange(e) {
+			this.goodsData.limit_type = e
+		},
+		/**
+		 * 是否参与会员折扣
+		 */
+		joinMemberDiscount() {
+			this.goodsData.is_consume_discount = this.goodsData.is_consume_discount == 1 ? 0 : 1;
+		},
+		switchBtn(type) {
+			this.goodsData[type] = this.goodsData[type] == 1 ? 0 : 1;
+		},
+		/**
+		 * 推荐方式选择
+		 * @param {Object} e
+		 */
+		recommendWayChange(e) {
+			this.goodsData.recommend_way = e.detail.value;
+		},
+		/**
+		 * 发货选择
+		 * @param {Object} e
+		 */
+		virtualDeliverTypeChange(e) {
+			this.goodsData.virtual_deliver_type = this.virtualDeliverArray[e.detail.value]['value'];
+		},
+		/**
+		 * 收货选择
+		 * @param {Object} e
+		 */
+		virtualReceiveTypeChange(e) {
+			this.goodsData.virtual_receive_type = this.virtualReceiveArray[e.detail.value]['value'];
+		},
+		/**
+		 * 核销有效期类型
+		 * @param {Object} e
+		 */
+		validityTypeChange(e) {
+			this.goodsData.verify_validity_type = e.detail.value;
+		},
+		/**
+		 * 核销有效期选择
+		 * @param {Object} e
+		 */
+		virtualTimeChange(e) {
+			this.virtualTime = e.detail.value;
+		},
+		
+		/**
+		 * 团购开始时间选择
+		 * @param {Object} e
+		 */
+		beginChange(e) {
+			this.goodsData.begin_time = e.detail.value;
+		},
+		/**
+		 * 团购结束时间选择
+		 * @param {Object} e
+		 */
+		endChange(e) {
+			this.goodsData.end_time = e.detail.value;
+		},
+		
+		/**
+		 * 是否需要核销
+		 */
+		isNeedVerify() {
+			this.goodsData.is_need_verify = this.goodsData.is_need_verify == 1 ? 0 : 1;
+		},
+		/**
+		 * 获取商品表单
+		 */
+		getGoodsForm() {
+			getOrderFormList().then(res=>{
+				if (res.data) {
+					let goodsForm = ['请选择商品表单'];
+					res.data.forEach((item, index) => {
+						goodsForm.push(item.form_name);
+						if (this.goodsData.form_id && this.goodsData.form_id == item.id) this.goodsData.goods_form_index = index + 1;
+					})
+					this.goodsForm = res.data;
+					this.goodsFormArray = goodsForm;
+					this.$forceUpdate();
+				}
+			})
+		},
+		goodsFormChange(e) {
+			this.goodsData.goods_form_index = e.detail.value;
+			this.$forceUpdate();
+		},
+		/**
+		 * 获取供应商
+		 */
+		getSupplyList() {
+			getSupplyList().then(res=>{
+				if (res.data) {
+					let supplyForm = ['请选择供应商'];
+					res.data.forEach((item, index) => {
+						supplyForm.push(item.title);
+						if (this.goodsData.supplier_id && this.goodsData.supplier_id == item.supplier_id) this.goodsData.supply_index = index + 1;
+					})
+					this.supplyForm = res.data;
+					this.supplyFormArray = supplyForm;
+					this.$forceUpdate();
+				}
+			})
+		},
+		supplyChange(e) {
+			this.goodsData.supply_index = e.detail.value;
+			this.$forceUpdate();
+		}
+	}
+};
\ No newline at end of file
diff --git a/pages_promotion/merch/public/edit.scss b/pages_promotion/merch/public/edit.scss
new file mode 100644
index 0000000..37ad7b4
--- /dev/null
+++ b/pages_promotion/merch/public/edit.scss
@@ -0,0 +1,275 @@
+.container{
+	padding-bottom: 40rpx;
+}
+.safe-area{
+	padding-bottom: calc(constant(safe-area-inset-bottom) + 100rpx);
+	padding-bottom: calc(env(safe-area-inset-bottom) + 100rpx);
+}
+.goods-edit-wrap {
+	margin-bottom: 160rpx;
+}
+.form-title {
+	display: flex;
+	justify-content: space-between;
+	margin: $margin-updown $margin-both;
+	// padding: 0 $padding;
+	color: $color-tip;
+}
+.item-wrap uni-radio .uni-radio-input {
+	width: 30rpx !important;
+	height: 30rpx !important;
+}
+.item-wrap {
+	background: #fff;
+	// padding: $padding;
+	margin-top: $margin-updown;
+	.goods-type {
+		display: flex;
+		margin: 0 40rpx $margin-updown 40rpx;
+		flex-wrap: wrap;
+		view {
+			flex: 1;
+			text-align: center;
+			border: 1px solid $color-disabled;
+			color: $color-tip;
+			margin-right: 40rpx;
+			margin-top: 30rpx;
+			position: relative;
+			height: 80rpx;
+			line-height: 80rpx;
+			white-space: nowrap;
+			min-width: calc((100% - 100rpx) / 3);
+			max-width: calc((100% - 100rpx) / 3);
+			&:nth-child(3n+3) {
+				margin-right: 0;
+			}
+			.iconfont {
+				display: none;
+			}
+			&.selected {
+				.iconfont {
+					display: block;
+					position: absolute;
+					bottom: -22rpx;
+					right: -22rpx;
+					font-size: 80rpx;
+				}
+			}
+		}
+	}
+	.form-wrap {
+		display: flex;
+		align-items: center;
+		margin: 0 $margin-both;
+		border-bottom: 1px solid $color-line;
+		height: 100rpx;
+		line-height: 100rpx;
+		&:last-child {
+			border-bottom: none;
+		}
+		.required {
+			font-weight: bold;
+		}
+		.label {
+			vertical-align: middle;
+			margin-right: $margin-both;
+		}
+		input {
+			vertical-align: middle;
+			display: inline-block;
+			flex: 1;
+			text-align: right;
+		}
+		&.more-wrap {
+			.selected {
+				vertical-align: middle;
+				display: inline-block;
+				flex: 1;
+				text-align: right;
+				color: $color-tip;
+				overflow: hidden;
+				white-space: pre;
+				text-overflow: ellipsis;
+				&.have {
+					color: $color-title;
+				}
+			}
+			.iconfont {
+				color: $color-tip;
+				margin-left: 20rpx;
+			}
+			.action {
+				background-color: $color-disabled;
+				border-radius: 50%;
+				color: #fff;
+				width: 36rpx;
+				height: 36rpx;
+				line-height: 36rpx;
+				display: inline-block;
+				text-align: center;
+				font-weight: bold;
+				margin-right: 20rpx;
+			}
+		}
+		&.goods-img {
+			height: 200rpx;
+			line-height: 200rpx;
+			display: block;
+			position: relative;
+			.label{
+				display: inline-block;
+			}
+			.img-list {
+				position: absolute;
+				width: 80%;
+				top: 0;
+				left: 100rpx;
+				margin-top: 40rpx;
+				margin-left: 40rpx;
+			}
+			.tips {
+				color: $color-tip;
+				font-size: $font-size-activity-tag;
+				margin-top: 20rpx;
+			}
+		}
+		.unit {
+			margin-left: 20rpx;
+			width: 40rpx;
+		}
+		&.join-member-discount {
+			.label{
+				flex: 1;
+			}
+		}
+		
+		&.validity-type {
+			border-bottom: 1px solid $color-line!important;
+		}
+	}
+}
+.footer-wrap {
+	position: fixed;
+	width: 100%;
+	bottom: 0;
+	padding: 40rpx 0;
+	z-index: 10;
+	background-color: #fff;
+}
+
+.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);
+		&.safe-area {
+			height: calc(100% - 270rpx);
+		}
+	}
+	&.category {
+		height: 50vh;
+		.popup-header {
+			border-bottom: none;
+		}
+		.popup-body {
+			padding: 0 30rpx;
+			.nav {
+				border-bottom: 2rpx solid $color-line;
+				font-weight: bold;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				white-space: nowrap;
+				text {
+					padding: 0 0 20rpx 0;
+					margin-right: 20rpx;
+					display: inline-block;
+					&:last-child {
+						padding-right: 0;
+					}
+					&.selected {
+						border-bottom: 2px solid;
+					}
+				}
+			}
+			.category {
+				height: 100%;
+				.item {
+					display: block;
+					margin: 20rpx 0 0;
+					text {
+						&:first-child {
+							overflow: hidden;
+							text-overflow: ellipsis;
+							white-space: pre;
+							width: 90%;
+							display: inline-block;
+							vertical-align: middle;
+						}
+					}
+					.iconfont {
+						float: right;
+					}
+				}
+				.child-item{
+					display: flex;
+					justify-content: space-between;
+					margin-left: 40rpx;
+				}
+			}
+		}
+	}
+
+	&.choose-picture {
+		background-color: $color-bg;
+		.popup-header {
+			border-bottom: none;
+			background-color: #fff;
+		}
+		.popup-body {
+			background-color: $color-bg;
+			height: initial;
+			.select-wrap{
+				background-color: #fff;
+				padding: 0 30rpx;
+			}
+			.item {
+				text-align: center;
+				padding: 20rpx;
+				background-color: #fff;
+				border-bottom: 1px solid $color-line;
+				&:last-child {
+					border-bottom: none;
+				}
+				&.cancle {
+					margin-top: 20rpx;
+				}
+			}
+		}
+	}
+}
diff --git a/pages_promotion/merch/public/js/list.js b/pages_promotion/merch/public/js/list.js
new file mode 100644
index 0000000..5496bc4
--- /dev/null
+++ b/pages_promotion/merch/public/js/list.js
@@ -0,0 +1,475 @@
+export default {
+	data() {
+		return {
+			listStyle: '',
+			loadingType: 'loading', //加载更多状态
+			orderType: '',
+			priceOrder: 'desc', //1 价格从低到高 2价格从高到低
+			categoryList: [], //排序类型
+			goodsList: [],
+			order: '',
+			sort: 'desc',
+			showScreen: false,
+			keyword: '',
+			categoryId: 0,
+			minPrice: '',
+			maxPrice: '',
+			isFreeShipping: false, //是否免邮
+			isIphoneX: false,
+			coupon: 0,
+			emptyShow: false,
+			isList: true, //列表样式
+			//分享所需标题
+			share_title: '',
+			//搜索到多少件商品
+			count: 0,
+			//当前分类名称
+			category_title: '',
+			//优惠券数据
+			coupon_name: '',
+			//列表瀑布流数据
+			listHeight: [],
+			listPosition: [],
+			debounce: null,
+			brandId: 0,
+			merch_id:0,
+			merch:{},
+			brandList: [], //品牌筛选项
+			config: {
+				fontWeight: false,
+				padding: 0,
+				cartEvent: "detail",
+				text: "购买",
+				textColor: "#FFFFFF",
+				theme: "default",
+				aroundRadius: 25,
+				control: true,
+				bgColor: "#FF6A00",
+				style: "button",
+				iconDiy: {
+					iconType: "icon",
+					icon: "",
+					style: {
+						fontSize: "60",
+						iconBgColor: [],
+						iconBgColorDeg: 0,
+						iconBgImg: "",
+						bgRadius: 0,
+						iconColor: [
+							"#000000"
+						],
+						iconColorDeg: 0
+					}
+				}
+			},
+		}
+	},
+
+	onLoad(options) {
+		this.categoryId = options.category_id || 0;
+		this.keyword = options.keyword || '';
+		this.coupon = options.coupon || 0;
+		this.goods_id_arr = options.goods_id_arr || 0;
+		this.brandId = options.brand_id || 0;
+		this.merch_id = options.merch_id || 0;
+		if(this.merch_id > 0){
+			this.getMerch()
+		}else{
+			uni.showModal({
+				title:'提示',
+				content:'商家不存在',
+				showCancel:false,
+				success(e){
+					uni.navigateBack({})
+				}
+			})
+		}
+		this.loadCategoryList(this.categoryId);
+		this.getBrandList();
+		this.isIphoneX = this.$util.uniappIsIPhoneX();
+
+		//小程序分享接收source_member
+		if (options.source_member) {
+			uni.setStorageSync('source_member', options.source_member);
+		}
+		// 小程序扫码进入，接收source_member
+		if (options.scene) {
+			var sceneParams = decodeURIComponent(options.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);
+				});
+			}
+		}
+
+		uni.onWindowResize(res => {
+			if (this.debounce) clearTimeout(this.debounce);
+			this.waterfallflow(0);
+		})
+	},
+	onShow() {
+		//记录分享关系
+		if (this.storeToken && uni.getStorageSync('source_member')) {
+			this.$util.onSourceMember(uni.getStorageSync('source_member'));
+		}
+	},
+	/**
+	 * 转发分享
+	 */
+	onShareAppMessage(res) {
+		var title = '搜索到' + this.count + '件“' + this.keyword + this.category_title + this.coupon_name + '”相关的优质商品';
+		let route = this.$util.getCurrentShareRoute(this.memberInfo ? this.memberInfo.member_id : 0);
+		var path = route.path;
+		return {
+			title: title,
+			path: path,
+			success: res => {
+			},
+			fail: res => {
+			}
+		};
+	},
+	// 分享到微信朋友圈
+	onShareTimeline() {
+		var title = '搜索到' + this.count + '件“' + this.keyword + this.category_title + this.coupon_name + '”相关的优质商品';
+		let route = this.$util.getCurrentShareRoute(this.memberInfo ? this.memberInfo.member_id : 0);
+		var query = route.query;
+		return {
+			title: title,
+			query: query,
+			imageUrl: ''
+		};
+	},
+	methods: {
+		getMerch(){
+			this.$api.sendRequest({
+				url: '/merch/api/merch/merchinfo',
+				data: {
+					merch_id:this.merch_id
+				},
+				success: res => {
+					console.log(res)
+					this.merch = res.data
+				}
+			});
+		},
+		/**
+		 * 获取优惠券数据
+		 */
+		couponInfo(id) {
+			return new Promise(resolve => {
+				this.$api.sendRequest({
+					url: '/coupon/api/coupon/typeinfo',
+					data: {
+						coupon_type_id: id
+					},
+					success: res => {
+						if (res.code >= 0) {
+							resolve(res.data.coupon_name);
+						}
+					}
+				});
+			})
+		},
+		/**
+		 *  获取分类名称
+		 */
+		share_select(data, id) {
+			return new Promise((resolve) => {
+				data.forEach((item) => {
+					if (item.category_id == id) {
+						resolve(item.category_name)
+					}
+					if (item.child_list && item.child_list.length > 0) {
+						item.child_list.forEach((v) => {
+							if (v.category_id == id) {
+								resolve(v.category_name)
+							}
+							if (v.child_list && v.child_list.length > 0) {
+								v.forEach((m) => {
+									if (m.category_id == id) {
+										resolve(m.category_name)
+									}
+								})
+
+							}
+						})
+					}
+				})
+			})
+		},
+		//加载分类
+		loadCategoryList(fid, sid) {
+			this.$api.sendRequest({
+				url: '/api/goodscategory/tree',
+				data: {},
+				success: res => {
+					if (res.data != null) {
+						this.categoryList = res.data
+					}
+				}
+			});
+		},
+		getGoodsList(mescroll) {
+			this.$api.sendRequest({
+				url: '/api/goodssku/page',
+				data: {
+					page: mescroll.num,
+					page_size: mescroll.size,
+					keyword: this.keyword,
+					category_id: this.categoryId,
+					brand_id: this.brandId,
+					min_price: this.minPrice,
+					max_price: this.maxPrice,
+					is_free_shipping: (this.isFreeShipping ? 1 : 0),
+					order: this.order,
+					sort: this.sort,
+					coupon: this.coupon,
+					goods_id_arr: this.goods_id_arr,
+					merch_id:this.merch_id
+				},
+				success: res => {
+					let newArr = []
+					let msg = res.message;
+					if (res.code == 0 && res.data) {
+						this.count = res.data.count;
+						if (res.data.page_count == 0) {
+							this.emptyShow = true
+						}
+						newArr = res.data.list;
+						newArr = newArr.map(item => {
+							item.id = this.genNonDuplicate();
+							return item;
+						});
+					} else {
+						this.$util.showToast({
+							title: msg
+						})
+					}
+					this.category_title = '';
+					this.coupon_name = '';
+					if (res.data.config) this.config = res.data.config;
+					if (this.categoryId) {
+						this.share_select(this.categoryList, this.categoryId).then(resolve => {
+							this.category_title = resolve
+						});
+					}
+					if (this.coupon) {
+						this.couponInfo(this.coupon).then(resolve => {
+							this.coupon_name = resolve
+						});
+					}
+					mescroll.endSuccess(newArr.length);
+					//设置列表数据
+					if (mescroll.num == 1) this.goodsList = []; //如果是第一页需手动制空列表
+					this.goodsList = this.goodsList.concat(newArr); //追加新数据
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+
+					this.waterfallflow((mescroll.num - 1) * 10);
+				},
+				fail: res => {
+					//联网失败的回调
+					mescroll.endErr();
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				}
+			});
+		},
+		changeListStyle() {
+			this.isList = !this.isList;
+			this.waterfallflow(0);
+		},
+		//筛选点击
+		sortTabClick(tag) {
+			if (tag == 'sale_num') {
+				this.order = 'sale_num';
+				this.sort = 'desc';
+			} else if (tag == 'discount_price') {
+				this.order = 'discount_price';
+				this.sort = 'desc';
+			} else if (tag == 'screen') {
+				//筛选
+				this.showScreen = true;
+				return;
+			} else {
+				this.order = '';
+				this.sort = '';
+			}
+
+			if (this.orderType === tag && tag !== 'discount_price') return;
+
+			this.orderType = tag;
+			if (tag === 'discount_price') {
+				this.priceOrder = this.priceOrder === 'asc' ? 'desc' : 'asc';
+				this.sort = this.priceOrder;
+			} else {
+				this.priceOrder = '';
+			}
+			this.emptyShow = false;
+			this.goodsList = [];
+			this.$refs.mescroll.refresh();
+		},
+		//商品详情
+		toDetail(item) {
+			this.$util.redirectTo('/pages/goods/detail', {
+				goods_id: item.goods_id
+			});
+		},
+		search() {
+			this.emptyShow = false;
+			this.goodsList = [];
+			this.$refs.mescroll.refresh();
+		},
+		selectedCategory(categoryId) {
+			this.categoryId = categoryId;
+		},
+		screenData() {
+			if (this.minPrice != '' || this.maxPrice != '') {
+				// if (!Number(this.minPrice) && this.minPrice) {
+				// 	this.$util.showToast({
+				// 		title: '请输入最低价'
+				// 	});
+				// 	return;
+				// }
+				if (!Number(this.maxPrice) && this.maxPrice) {
+					this.$util.showToast({
+						title: '请输入最高价'
+					});
+					return;
+				}
+				if (Number(this.minPrice) < 0 || Number(this.maxPrice) < 0) {
+					this.$util.showToast({
+						title: '筛选价格不能小于0'
+					});
+					return;
+				}
+				if (this.minPrice != '' && Number(this.minPrice) > Number(this.maxPrice) && this.maxPrice) {
+
+					this.$util.showToast({
+						title: '最低价不能大于最高价'
+					});
+					return;
+				}
+				if (this.maxPrice != '' && Number(this.maxPrice) < Number(this.minPrice)) {
+					this.$util.showToast({
+						title: '最高价不能小于最低价'
+					});
+					return;
+				}
+			}
+			this.emptyShow = false;
+			this.goodsList = [];
+			this.$refs.mescroll.refresh();
+			this.showScreen = false;
+		},
+		//重置数据
+		resetData() {
+			this.categoryId = 0
+			this.minPrice = ''
+			this.maxPrice = ''
+			this.isFreeShipping = false
+		},
+		goodsImg(imgStr) {
+			let imgs = imgStr.split(',');
+			return imgs[0] ? this.$util.img(imgs[0], {
+				size: 'mid'
+			}) : this.$util.getDefaultImage().goods;
+		},
+		imgError(index) {
+			this.goodsList[index].goods_image = this.$util.getDefaultImage().goods;
+		},
+		showPrice(data) {
+			let price = data.discount_price;
+			if (data.member_price && parseFloat(data.member_price) < parseFloat(price)) price = data.member_price;
+			return price;
+		},
+		showMarketPrice(item) {
+			if (item.market_price_show) {
+				let price = this.showPrice(item);
+				if (item.market_price > 0) {
+					return item.market_price;
+				} else if (parseFloat(item.price) > parseFloat(price)) {
+					return item.price;
+				}
+			}
+			return '';
+		},
+		goodsTag(data) {
+			return data.label_name || '';
+		},
+		/**
+		 * 瀑布流
+		 */
+		waterfallflow(start = 0) {
+			if (!this.isList) {
+				//页面渲染完成后的事件
+				this.$nextTick(() => {
+					setTimeout(() => {
+						let listHeight = [];
+						let listPosition = [];
+						if (start != 0) {
+							listHeight = this.listHeight;
+							listPosition = this.listPosition;
+						}
+						let column = 2;
+						const query = uni.createSelectorQuery().in(this);
+						query.selectAll('.double-column .goods-item').boundingClientRect(data => {
+							for (let i = start; i < data.length; i++) {
+								if (i < column) {
+									let position = {};
+									position.top = uni.upx2px(20) + 'px';
+									if (i % column == 0) {
+										position.left = data[i].width * i + "px";
+									} else {
+										position.left = data[i].width * i + (i % column * uni
+											.upx2px(30)) + "px";
+									}
+									listPosition[i] = position;
+									listHeight[i] = data[i].height + uni.upx2px(20);
+								} else {
+									let minHeight = Math.min(...listHeight); //  找到第一列的最小高度
+									let minIndex = listHeight.findIndex(item => item === minHeight) // 找到最小高度的索引
+									//设置当前子元素项的位置
+									let position = {};
+									position.top = minHeight + uni.upx2px(20) + "px";
+									position.left = listPosition[minIndex].left;
+									listPosition[i] = position;
+									//重新定义数组最小项的高度 进行累加
+									listHeight[minIndex] += data[i].height + uni.upx2px(20);
+								}
+							}
+							this.listHeight = listHeight;
+							this.listPosition = listPosition;
+						}).exec();
+					}, 50)
+				})
+			}
+		},
+		getBrandList() {
+			var data = {
+				page: 1,
+				page_size: 0
+			};
+			this.$api.sendRequest({
+				url: '/api/goodsbrand/page',
+				data: data,
+				success: res => {
+					if (res.code == 0 && res.data) {
+						let data = res.data;
+						this.brandList = data.list;
+					}
+				}
+			});
+		},
+		/**
+		 * 添加购物车回调
+		 */
+		addCart(id) {
+		},
+		genNonDuplicate(len = 6) {
+			return Number(Math.random().toString().substr(3, len) + Date.now()).toString(36);
+		}
+	}
+}
\ No newline at end of file
diff --git a/pages_promotion/merch/public/list.scss b/pages_promotion/merch/public/list.scss
new file mode 100644
index 0000000..a91416e
--- /dev/null
+++ b/pages_promotion/merch/public/list.scss
@@ -0,0 +1,308 @@
+page {
+	overflow: hidden;
+}
+.alarm-red{
+	color: red;
+}
+.search-wrap {
+	display: flex;
+	justify-content: space-between;
+	padding: 30rpx 30rpx 0;
+	background-color: #fff;
+	.search-input-inner {
+		display: flex;
+		align-items: center;
+		width: 460rpx;
+		height: 70rpx;
+		padding: 0 30rpx;
+		background-color: $color-bg;
+		border-radius: 100rpx;
+		box-sizing: border-box;
+		.search-input-icon {
+			margin-right: 10rpx;
+			color: $color-tip;
+		}
+	}
+	.search-btn {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		width: 200rpx;
+		height: 70rpx;
+		color: #fff;
+		border-radius: 100rpx;
+		margin-left: 30rpx;
+		text {
+			margin-right: 10rpx;
+		}
+	}
+}
+.tab-block {
+	// position: relative;
+	display: flex;
+	flex-direction: row;
+	justify-content: space-between; 
+	background: #fff;
+	// margin: 0 30rpx;
+	.choose {
+		// position: absolute;
+		// right: 0;
+		min-width: 50px;
+		background-color: #fff;
+		padding: 20rpx 0rpx 0 20rpx;
+		height: 66rpx;
+	}
+	.tab-wrap {
+		// width: calc(100% - 120rpx);
+		width: 100%;
+		// position: relative;
+		// overflow-x: scroll;
+		padding: 24rpx 0rpx 0 20rpx;
+		height: 66rpx;
+		background-color: #fff;
+		// white-space: nowrap;
+		// overflow: hidden;
+		// text-overflow: ellipsis;
+		display: flex;
+		flex-direction: row;
+		justify-content: space-around;
+	}
+	.tab-item {
+		// display: inline-block;
+	}
+	.active {
+		position: relative;
+		// margin-right: 32rpx;
+		font-weight: 600;
+		&::after {
+			content: '';
+			position: absolute;
+			bottom: 0;
+			left: 0;
+			height:6rpx;
+			width: 100%;
+		}
+	}
+}
+.item-inner {
+	position: relative;
+	margin: 0 30rpx 20rpx;
+	background-color: #fff;
+	border-radius: $border-radius;
+	.item-wrap {
+		display: flex;
+		padding: 30rpx;
+		.item-img {
+			margin-right: 20rpx;
+			width: 160rpx;
+			height: 160rpx;
+			border-radius: $border-radius;
+		}
+		.item-desc {
+			flex: 1;
+			.item-name {
+				width: 450rpx;
+				line-height: 1.6;
+				color: $color-title;
+				display: flex;
+				// white-space: nowrap;
+				align-items: center;
+				font-weight: 600;
+				.name {
+					flex: 1;
+					width: 0;
+					line-height: 1.4;
+				}
+				.goods-class {
+					font-size: 24rpx;
+				}
+			}
+			.item-num-wrap {
+				margin-top: 3px;
+				font-size: $font-size-tag;
+				color: $color-tip;
+				text:first-of-type {
+					margin-right: 30rpx;
+				}
+				view{
+					font-size: 26rpx;
+					line-height: 1.4;
+					color:#999
+				}
+			}
+			.item-operation {
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				line-height: 1;
+				padding-top: 10rpx;
+				.item-price {
+					font-weight: bold;
+				}
+				.iconshenglve {
+					font-size: 48rpx;
+					color: $color-tip;
+				}
+			}
+			.promotion-ident {
+				line-height: 1;
+				padding: 6rpx 0;
+				text{
+					font-size: $font-size-activity-tag;
+					padding: 2rpx 12rpx;
+					border-radius: 4rpx;
+					color: #fff;
+					margin-right:10rpx;
+					border-radius: 50rpx;
+				}
+			}
+		}
+	}
+	.operation {
+		overflow: hidden;
+		position: absolute;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		background-color: rgba(0, 0, 0, 0.6);
+		display: flex;
+		justify-content: space-around;
+		align-items: center;
+		border-radius: 10rpx;
+		.operation-item {
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			image {
+				width: 64rpx;
+				height: 64rpx;
+			}
+			text {
+				margin-top: 10rpx;
+				line-height: 1;
+				color: #fff;
+			}
+		}
+	}
+}
+.screen-wrap {
+	.title {
+		font-size: $font-size-tag;
+		padding: $padding;
+		background: $color-bg;
+	}
+	scroll-view {
+		height: 85%;
+		.item-wrap {
+			border-bottom: 1px solid $color-line;
+			&:last-child {
+				border-bottom: none;
+			}
+			.label {
+				font-size: $font-size-tag;
+				padding: $padding 30rpx 0 $padding;
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				.more {
+					font-size: $font-size-tag;
+					picker {
+						display: inline-block;
+						vertical-align: middle;
+						view {
+							font-size: $font-size-tag;
+						}
+					}
+					.iconfont {
+						display: inline-block;
+						vertical-align: middle;
+						color: $color-tip;
+						font-size: $font-size-base;
+					}
+				}
+				.uni-tag {
+					padding: 0 $padding;
+					font-size: $font-size-goods-tag;
+					background: $color-bg;
+					height: 40rpx;
+					line-height: 40rpx;
+					border: 0;
+					margin-left: $margin-updown;
+				}
+			}
+
+			.list {
+				margin: $margin-updown $margin-both;
+				overflow: hidden;
+				.uni-tag {
+					padding: 0 $padding;
+					font-size: $font-size-goods-tag;
+					background: $color-bg;
+					height: 52rpx;
+					line-height: 52rpx;
+					border: 0;
+					margin-right: 20rpx;
+					margin-bottom: 20rpx;
+					&:nth-child(3n) {
+						margin-right: 0;
+					}
+				}
+			}
+			.value-wrap {
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				padding: $padding;
+				.h-line {
+					width: 40rpx;
+					height: 2rpx;
+					background-color: $color-tip;
+				}
+				input {
+					flex: 1;
+					background: $color-line;
+					height: 60rpx;
+					line-height: 60rpx;
+					font-size: $font-size-goods-tag;
+					border-radius: 50rpx;
+					text-align: center;
+					&:first-child {
+						margin-right: 10rpx;
+					}
+					&:last-child {
+						margin-left: 10rpx;
+					}
+				}
+				picker {
+					display: inline-block;
+					vertical-align: middle;
+					view {
+						font-size: $font-size-tag;
+					}
+				}
+			}
+		}
+	}
+	.footer {
+		height: 90rpx;
+		display: flex;
+		justify-content: center;
+		align-items: flex-start;
+		//position: absolute;
+		bottom: 0;
+		width: 100%;
+		button {
+			margin: 0;
+			width: 40%;
+			&:first-child {
+				border-top-right-radius: 0;
+				border-bottom-right-radius: 0;
+			}
+			&:last-child {
+				border-top-left-radius: 0;
+				border-bottom-left-radius: 0;
+			}
+		}
+	}
+}
diff --git a/pages_promotion/point/detail.vue b/pages_promotion/point/detail.vue
new file mode 100644
index 0000000..48065c5
--- /dev/null
+++ b/pages_promotion/point/detail.vue
@@ -0,0 +1,506 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view>
+		<view scroll-y="true" class="goods-detail" :class="isIphoneX ? 'active' : ''">
+			<view class="goods-container">
+				<view class="goods-media">
+					<!-- #ifdef H5 -->
+					<cover-view class="share">
+						<view class="share_left"><text class="iconfont icon-back_light" @click="$util.goBack()"></text></view>
+					</cover-view>
+					<!-- #endif -->
+
+					<view class="goods-img show">
+						<swiper class="swiper">
+							<swiper-item :item-id="'goods_id_' + pointInfo.type">
+								<view class="item" v-if="pointInfo.type == 2">
+									<image class="adv-pic" :src="pointInfo.image ? $util.img(pointInfo.image) : $util.img('public/uniapp/point/coupon.png')" @error="imageError($util.img('public/uniapp/point/coupon.png'))" mode="aspectFit"/>
+								</view>
+								<view class="item" v-else-if="pointInfo.type == 3">
+									<image class="adv-pic" :src="pointInfo.image ? $util.img(pointInfo.image) : $util.img('public/uniapp/point/hongbao.png')" @error="imageError($util.img('public/uniapp/point/hongbao.png'))" mode="aspectFit"/>
+								</view>
+								<view class="item" v-else><image class="adv-pic" :src="$util.img(pointInfo.image)" @error="imageError()" mode="aspectFit"></image></view>
+							</swiper-item>
+						</swiper>
+					</view>
+				</view>
+				<view class="group-wrap padding-top">
+					<view class="goods-module-wrap">
+						<text class="price-symbol ">{{ pointInfo.point }}积分</text>
+						<template v-if="pointInfo.exchange_price != '0.00' && pointInfo.pay_type > 0">
+							<text class="price-symbol ">+{{ $lang('common.currencySymbol') }}{{ pointInfo.exchange_price }}</text>
+						</template>
+
+						<view class="market-price-wrap" v-if="pointInfo.price">
+							<text class="unit">{{ $lang('common.currencySymbol') }}</text>
+							<text class="money">{{ pointInfo.price }}</text>
+						</view>
+
+						<view class="follow-and-share" v-if="pointInfo.stock_show == 1 || pointInfo.stock_show == undefined">
+							<text class="color-tip" v-if="pointInfo.pointCoupon != 1">库存:{{ pointInfo.stock }}{{ pointInfo.stock >= 0 ? pointInfo.unit : '' }}</text>
+							<text class="color-tip" v-else>库存:无限{{ pointInfo.stock >= 0 ? pointInfo.unit : '' }}</text>
+						</view>
+					</view>
+					<view class="goods-module-wrap info">
+						<text class="sku-name-wrap" v-if="pointInfo.type == 1">{{ pointInfo.goods_name }}</text>
+						<text class="sku-name-wrap" v-else>{{ pointInfo.name }}</text>
+					</view>
+					<view class="coupon-desc">
+						<view v-if="pointInfo.balance && pointInfo.balance > 0" class="color-tip">内含{{ pointInfo.balance }}元</view>
+						<view v-if="pointInfo.coupon_type == 'random'" class="color-tip">无门槛优惠券</view>
+						<view v-if="pointInfo.coupon_type == 'reward'" class="color-tip">{{ '满' + pointInfo.at_least + '减' + pointInfo.money }}</view>
+						<view v-if="pointInfo.coupon_type == 'discount'" class="color-tip">
+							满{{ pointInfo.at_least }}元
+							<text>{{ pointInfo.discount }}折</text>
+						</view>
+						<view v-if="pointInfo.coupon_type == 'discount'" class="color-tip">最多优惠{{ pointInfo.discount_limit }}元</view>
+						<view class="time color-tip" v-if="pointInfo.coupon_type">
+							{{ pointInfo.validity_type == 1 ? '领取之日起' + pointInfo.fixed_term + '天内有效' : $util.timeStampTurnTime(pointInfo.end_time) + '到期' }}
+						</view>
+					</view>
+				</view>
+				<!-- 添加二维码 start -->
+				<view class="detail-community" v-if="pointInfo.qr_data && pointInfo.qr_data.qr_state == 1">
+					<view class="community-box">
+						<image :src="$util.img('public/uniapp/goods/detail_erweiImage.png')" mode="aspectFill"></image>
+						<view class="community-content">
+							<view class="community-title">{{ pointInfo.qr_data.qr_name }}</view>
+							<view class="community-txt">{{ pointInfo.qr_data.community_describe }}</view>
+						</view>
+					</view>
+					<view class="community-btn" @click="onCommunity()">添加</view>
+				</view>
+
+				<!-- 促销 -->
+				<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></view>
+						<view class="community-model-content-draw" v-if="pointInfo.qr_data && pointInfo.qr_data.qr_img">
+							<image
+								:src="
+									pointInfo.qr_data.qr_img != '' && pointInfo.qr_data.qr_state == 1
+										? $util.img(pointInfo.qr_data.qr_img)
+										: $util.img('public/uniapp/goods/detail_erweiImage.png')
+								"
+								mode="aspectFill"
+								show-menu-by-longpress="true"/>
+						</view>
+						<view class="community-model-content-text">长按识别二维码，添加社群</view>
+					</view>
+					<view class="community-model-close" @click.stop="onCloseCommunity()"><text class="iconfont icon-close"></text></view>
+				</view>
+				<!-- 添加二维码 end -->
+				<block v-if="pointInfo.type == 1">
+					<view class="newdetail margin-bottom">
+						<!-- 已选规格 -->
+						<view class="item selected-sku-spec" v-if="pointInfo.sku_spec_format" @click="exchange">
+							<view class="label">选择</view>
+							<view class="box">
+								<text v-for="(item, index) in pointInfo.sku_spec_format" :key="index">{{ item.spec_name }}/{{ item.spec_value_name }}</text>
+							</view>
+							<text class="iconfont icon-right"></text>
+						</view>
+
+						<view class="item goods-attribute" @click="openAttributePopup()" v-if="pointInfo.goods_attr_format && pointInfo.goods_attr_format.length > 0">
+							<view class="label">属性</view>
+							<view class="box">
+								<text v-for="(item, index) in pointInfo.goods_attr_format" :key="index" v-if="index < 2">{{ item.attr_name }}: {{ item.attr_value_name }}</text>
+							</view>
+							<text class="iconfont icon-right"></text>
+						</view>
+					</view>
+
+					<!-- 商品属性 -->
+					<view @touchmove.prevent.stop>
+						<uni-popup ref="attributePopup" type="bottom">
+							<view class="goods-attribute-popup-layer popup-layer">
+								<view class="head-wrap" @click="closeAttributePopup()">
+									<text>商品属性</text>
+									<text class="iconfont icon-close"></text>
+								</view>
+								<scroll-view scroll-y class="goods-attribute-body">
+									<view class="item" v-for="(item, index) in pointInfo.goods_attr_format" :key="index">
+										<text class="attr-name">{{ item.attr_name }}</text>
+										<text class="value-name">{{ item.attr_value_name }}</text>
+									</view>
+								</scroll-view>
+								<view class="button-box"><button type="primary" @click="closeAttributePopup()">确定</button></view>
+							</view>
+						</uni-popup>
+					</view>
+					<!-- 商品服务 -->
+					<view @touchmove.prevent.stop>
+						<uni-popup ref="merchantsServicePopup" type="bottom">
+							<view class="goods-merchants-service-popup-layer popup-layer">
+								<view class="head-wrap" @click="closeMerchantsServicePopup()">
+									<text>商品服务</text>
+									<text class="iconfont icon-close"></text>
+								</view>
+								<scroll-view scroll-y>
+									<view class="item" :class="{ 'empty-desc': !item.desc }" v-for="(item, index) in pointInfo.goods_service" :key="index">
+										<view class="iconfont icon-dui "></view>
+										<view class="info-wrap">
+											<text class="title">{{ item.service_name }}</text>
+											<text class="describe" v-if="item.desc">{{ item.desc }}</text>
+										</view>
+									</view>
+								</scroll-view>
+								<view class="button-box"><button type="primary" @click="closeMerchantsServicePopup()">确定</button></view>
+							</view>
+						</uni-popup>
+					</view>
+				</block>
+
+				<!-- 详情 -->
+				<view class="goods-detail-tab">
+					<view class="detail-tab"><view class="tab-item">兑换详情</view></view>
+
+					<view class="detail-content">
+						<view class="detail-content-item">
+							<view class="goods-details" v-if="pointInfo.content"><rich-text :nodes="pointInfo.content"></rich-text></view>
+							<view class="goods-details active" v-else>暂无兑换详情！</view>
+						</view>
+					</view>
+				</view>
+
+				<!-- SKU选择 -->
+				<ns-goods-sku
+					v-if="pointInfo.id"
+					ref="goodsSku"
+					@refresh="refreshGoodsSkuDetail"
+					:goods-detail="pointInfo"
+					:goods-id="pointInfo.goods_id"
+					:max-buy="pointInfo.max_buy"
+					:min-buy="pointInfo.min_buy"
+					source="point"
+				></ns-goods-sku>
+			</view>
+		</view>
+
+		<view class="detail-swap" @click="exchange()" :class="{ 'position-bottom': isIphoneX }" v-if="!isLogin"><button type="primary" >登录之后方可兑换</button></view>
+		<block v-else>
+			<view class="detail-swap" :class="{ 'position-bottom': isIphoneX }" v-if="pointInfo.stock == 0"><button disabled>库存不足</button></view>
+			<view class="detail-swap" :class="{ 'position-bottom': isIphoneX }" v-else-if="enough"><button disabled>积分不足</button></view>
+			<view class="detail-swap" @click="exchange()" :class="{ 'position-bottom': isIphoneX }" v-else><button type="primary" hover-class="none">兑换</button></view>
+		</block>
+
+		<loading-cover ref="loadingCover"></loading-cover>
+		<ns-login ref="login"></ns-login>
+		<to-top v-if="showTop" @toTop="scrollToTopNative()"></to-top>
+		
+
+		<!-- #ifdef MP-WEIXIN -->
+		<!-- 小程序隐私协议 -->
+		<privacy-popup ref="privacyPopup"></privacy-popup>
+		<!-- #endif -->
+	</view>
+</template>
+<script>
+import uniPopup from '@/components/uni-popup/uni-popup.vue';
+import uniNumberBox from '@/components/uni-number-box/uni-number-box.vue';
+import htmlParser from '@/common/js/html-parser';
+import nsGoodsSku from '@/components/ns-goods-sku/ns-goods-sku.vue';
+import toTop from '@/components/toTop/toTop.vue';
+import scroll from '@/common/js/scroll-view.js';
+export default {
+	components: {
+		uniPopup,
+		uniNumberBox,
+		nsGoodsSku,
+		toTop
+	},
+	data() {
+		return {
+			id: 0,
+			pointInfo: {
+				image: '',
+				pointCoupon: 0
+			},
+			isIphoneX: false, //判断手机是否是iphoneX以上
+			isLogin: false,
+			memberPoint: 0,
+			isCommunity: false, //社群弹窗
+			//分享时详情所用图片
+			shareImg: ''
+		};
+	},
+	mixins: [scroll],
+	onLoad(options) {
+		//小程序分享接收source_member
+		if (options.source_member) {
+			uni.setStorageSync('source_member', options.source_member);
+		}
+		// 小程序扫码进入，接收source_member
+		if (options.scene) {
+			var sceneParams = decodeURIComponent(options.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);
+				});
+			}
+		}
+		this.isIphoneX = this.$util.uniappIsIPhoneX();
+		if (options.id) {
+			this.id = options.id;
+			this.getPointInfo();
+		} else {
+			this.$util.redirectTo('/pages_promotion/point/list', {}, 'redirectTo');
+		}
+	},
+	onShow() {
+		//记录分享关系
+		if (this.storeToken && uni.getStorageSync('source_member')) {
+			this.$util.onSourceMember(uni.getStorageSync('source_member'));
+		}
+	},
+	/**
+	 * 转发分享
+	 */
+	onShareAppMessage(res) {
+		var title = '';
+		var imageUrl = '';
+		switch (this.pointInfo.type) {
+			case 1: //商品
+				title = this.pointInfo.sku_name;
+				imageUrl = this.pointInfo.sku_image;
+				break;
+			case 2: //优惠券
+			case 3: //红包
+				title = this.pointInfo.name;
+				imageUrl = this.pointInfo.image;
+				break;
+		}
+		title = '仅需' + this.pointInfo.point + '积分即可兑换' + title;
+		imageUrl = this.$util.img(imageUrl);
+		var route = this.$util.getCurrentShareRoute(this.memberInfo ? this.memberInfo.member_id : 0);
+		var path = route.path;
+		return {
+			title: title,
+			path: path,
+			imageUrl: imageUrl,
+			success: res => {},
+			fail: res => {}
+		};
+	},
+
+	// 分享到微信朋友圈
+	// #ifdef MP-WEIXIN
+	onShareTimeline() {
+		var title = '';
+		var imageUrl = '';
+		switch (this.pointInfo.type) {
+			case 1: //商品
+				title = this.pointInfo.sku_name;
+				imageUrl = this.pointInfo.sku_image;
+				break;
+			case 2: //优惠券
+			case 3: //红包
+				title = this.pointInfo.name;
+				imageUrl = this.pointInfo.image;
+				break;
+		}
+		title = '仅需' + this.pointInfo.point + '积分即可兑换' + title;
+		imageUrl = this.$util.img(imageUrl);
+		var route = this.$util.getCurrentShareRoute(this.memberInfo ? this.memberInfo.member_id : 0);
+		var query = route.query;
+		return {
+			title: title,
+			query: query,
+			imageUrl: imageUrl
+		};
+	},
+	// #endif
+	computed: {
+		enough() {
+			return parseInt(this.pointInfo.point) > parseInt(this.memberPoint);
+		}
+	},
+	watch: {
+		storeToken: function(nVal, oVal) {
+			if (nVal) {
+				this.isLogin = true;
+				this.getPointInfo();
+			}
+		}
+	},
+	methods: {
+		//获取个人积分信息
+		getAccountInfo(e, f) {
+			if (this.storeToken) {
+				this.$api.sendRequest({
+					url: '/api/memberaccount/info',
+					data: {
+						account_type: 'point'
+					},
+					success: res => {
+						if (res.code == 0 && res.data) {
+							this.isLogin = true;
+							this.memberPoint = res.data.point;
+							let point_num = Math.floor(parseInt(res.data.point) / f);
+							this.Max = e >= point_num ? point_num : e;
+						} else {
+							this.$util.showToast({
+								title: res.message
+							});
+						}
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					}
+				});
+			} else {
+				this.isLogin = false;
+				if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+			}
+		},
+
+		//获取详情
+		getPointInfo() {
+			this.$api.sendRequest({
+				url: '/pointexchange/api/goods/detail',
+				data: {
+					id: this.id
+				},
+				success: res => {
+					if (res.code >= 0 && res.data.length !== 0) {
+						this.pointInfo = res.data;
+
+						//获取分享图片
+						if (this.pointInfo.image) {
+							this.shareImg = this.$util.img(this.pointInfo.image);
+						} else {
+							this.shareImg = this.$util.img('public/uniapp/blindbox/default.png');
+						}
+
+						this.$langConfig.title(this.pointInfo.name);
+						let save = this.pointInfo.type == 2 ? this.pointInfo.count : this.pointInfo.stock;
+
+						if (this.pointInfo.type == 2 && this.pointInfo.stock == -1) {
+							this.pointInfo.pointCoupon = 1;
+						}
+
+						if (this.pointInfo.type == 1) {
+							this.pointInfo.image = this.pointInfo['sku_image'];
+
+							// 当前商品SKU规格
+							if (this.pointInfo.sku_spec_format) this.pointInfo.sku_spec_format = JSON.parse(this.pointInfo.sku_spec_format);
+
+							// 商品属性
+							if (this.pointInfo.goods_attr_format) {
+								let goods_attr_format = JSON.parse(this.pointInfo.goods_attr_format);
+								this.pointInfo.goods_attr_format = this.$util.unique(goods_attr_format, 'attr_id');
+								for (var i = 0; i < this.pointInfo.goods_attr_format.length; i++) {
+									for (var j = 0; j < goods_attr_format.length; j++) {
+										if (
+											this.pointInfo.goods_attr_format[i].attr_id == goods_attr_format[j].attr_id &&
+											this.pointInfo.goods_attr_format[i].attr_value_id != goods_attr_format[j].attr_value_id
+										) {
+											this.pointInfo.goods_attr_format[i].attr_value_name += '、' + goods_attr_format[j].attr_value_name;
+										}
+									}
+								}
+							}
+							if (this.pointInfo.goods_spec_format) this.pointInfo.goods_spec_format = JSON.parse(this.pointInfo.goods_spec_format);
+						}
+
+						this.pointInfo.unit = this.pointInfo.unit || '件';
+
+						// 商品详情
+						if (this.pointInfo.content) this.pointInfo.content = htmlParser(this.pointInfo.content);
+
+						this.getAccountInfo(save, this.pointInfo.point);
+
+					} else {
+						this.$util.showToast({
+							title: res.message
+						});
+						setTimeout(() => {
+							this.$util.redirectTo('/pages_promotion/point/list', {}, 'redirectTo');
+						}, 1000);
+					}
+				}
+			});
+		},
+
+		// 立即购买
+		exchange() {
+			if (!this.storeToken) {
+				this.$refs.login.open('/pages_promotion/point/detail?id=' + this.id);
+				return;
+			}
+			this.$refs.goodsSku.show('point');
+		},
+
+		/**
+		 * 刷新商品详情数据
+		 * @param {Object} pointInfo
+		 */
+		refreshGoodsSkuDetail(pointInfo) {
+			Object.assign(this.pointInfo, pointInfo);
+			this.pointInfo.unit = this.pointInfo.unit || '件';
+		},
+		//服务
+		openMerchantsServicePopup() {
+			this.$refs.merchantsServicePopup.open();
+		},
+		closeMerchantsServicePopup() {
+			this.$refs.merchantsServicePopup.close();
+		},
+		//属性
+		openAttributePopup() {
+			this.$refs.attributePopup.open();
+		},
+		closeAttributePopup() {
+			this.$refs.attributePopup.close();
+		},
+		imageError() {
+			this.pointInfo.image = this.$util.getDefaultImage().goods;
+			this.$forceUpdate();
+		},
+		//添加福利群
+		onCommunity() {
+			this.isCommunity = true;
+		},
+		onCloseCommunity() {
+			this.isCommunity = false;
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+@import '@/common/css/goods_detail.scss';
+.group-wrap .goods-module-wrap.info {
+	padding-bottom: 10rpx;
+}
+.group-wrap {
+	padding-bottom: 20rpx;
+}
+
+.detail-swap {
+	box-sizing: border-box;
+	background: #ffffff;
+	position: fixed;
+	left: 0;
+	bottom: 0rpx;
+	width: 100%;
+	padding: 20rpx 0;
+	padding-bottom: calc(20rpx + constant(safe-area-inset-bottom)) !important;
+	padding-bottom: calc(20rpx + env(safe-area-inset-bottom)) !important;
+
+	button {
+		height: 80rpx;
+		line-height: 80rpx;
+		border-radius: 10rpx;
+		&[type='primary'] {
+			background-color: var(--goods-btn-color);
+		}
+	}
+}
+</style>
+<style scoped>
+/deep/ .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+	max-height: unset !important;
+}
+</style>
diff --git a/pages_promotion/point/goods_list.vue b/pages_promotion/point/goods_list.vue
new file mode 100644
index 0000000..6faea6c
--- /dev/null
+++ b/pages_promotion/point/goods_list.vue
@@ -0,0 +1,894 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view class="content">
+		<view class="head-wrap">
+			<!-- 搜索区域 -->
+			<view class="search-wrap uni-flex uni-row">
+				<view class="flex-item input-wrap">
+					<input class="uni-input" maxlength="50" v-model="keyword" confirm-type="search" @confirm="search()" placeholder="请输入商品关键词" />
+					<text class="iconfont icon-sousuo3" @click.stop="search()"></text>
+				</view>
+			</view>
+
+			<!-- 排序 -->
+			<view class="sort-wrap">
+				<view class="comprehensive-wrap" :class="{ 'color-base-text': order === '' }" @click="sortTabClick('')">
+					<text :class="{ 'color-base-text': order === '' }">综合</text>
+				</view>
+				<view class="price-wrap" @click="sortTabClick('point')">
+					<text :class="{ 'color-base-text': order === 'point' }">积分</text>
+					<view class="iconfont-wrap">
+						<view class="iconfont icon-shangsanjiao-copy" :class="{ 'color-base-text': priceOrder === 'asc' && order === 'point' }"></view>
+						<view class="iconfont icon-sanjiao" :class="{ 'color-base-text': priceOrder === 'desc' && order === 'point' }"></view>
+					</view>
+				</view>
+				<view class="price-wrap" @click="sortTabClick('create_time')">
+					<text :class="{ 'color-base-text': order === 'create_time' }">上新时间</text>
+					<view class="iconfont-wrap">
+						<view class="iconfont icon-shangsanjiao-copy" :class="{ 'color-base-text': priceOrder === 'asc' && order === 'create_time' }"></view>
+						<view class="iconfont icon-sanjiao" :class="{ 'color-base-text': priceOrder === 'desc' && order === 'create_time' }"></view>
+					</view>
+				</view>
+				<view :class="{ 'color-base-text': order === 'screen' }" class="screen-wrap">
+					<text @click="sortTabClick('screen')">筛选</text>
+					<view @click="sortTabClick('screen')" class="iconfont-wrap">
+						<view class="iconfont icon-shaixuan color-tip"></view>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<mescroll-uni top="180" @getData="getData" ref="mescroll" :size="10">
+			<block slot="list">
+				<view class="list-wrap">
+					<view class="goods-list double-column" v-if="goodsList.length">
+						<view class="goods-item margin-bottom" v-for="(item, index) in goodsList" :key="index">
+							<view class="goods-img" @click="toDetail(item)">
+								<image :src="goodsImg(item.image)" mode="widthFix" @error="imgError(index)"></image>
+							</view>
+							<view class="info-wrap">
+								<view class="name-wrap">
+									<view class="goods-name" @click="toDetail(item)">{{ item.name }}</view>
+								</view>
+								<view class="lineheight-clear">
+									<view class="discount-price">
+										<text class="unit ">{{ item.point }}</text>
+										<text class="unit  font-size-tag">积分</text>
+										<block v-if="item.price > 0 && item.pay_type > 0">
+											<text class="unit  font-size-tag">+</text>
+											<text class="unit  font-size-tag">{{ $lang('common.currencySymbol') }}</text>
+											<text class="price  font-size-toolbar" >{{ parseFloat(item.price).toFixed(2).split(".")[0] }}</text>
+											<text class="unit  font-size-tag">.{{ parseFloat(item.price).toFixed(2).split(".")[1] }}</text>
+										</block>
+									</view>
+								</view>
+								<view class="pro-info"  v-if="item.stock_show">
+									<view class="font-size-activity-tag color-tip">库存{{ item.stock }}</view>
+									<view class="sale font-size-activity-tag color-tip" @click="toDetail(item)">
+										<!-- <button type="primary" size="mini">立即兑换</button> -->
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+					<view class="empty" v-if="goodsList.length == 0">
+						<ns-empty :isIndex="false" text="暂无积分商品"></ns-empty>
+					</view>
+				</view>
+			</block>
+		</mescroll-uni>
+
+		<!-- 筛选弹出框 -->
+		<uni-drawer :visible="showScreen" mode="right" @close="showScreen = false" class="screen-wrap">
+			<view class="title color-tip">筛选</view>
+			<scroll-view scroll-y>
+				<!-- 价格筛选项 -->
+				<view class="item-wrap">
+					<view class="label"><text>积分区间</text></view>
+					<view class="price-wrap">
+						<input class="uni-input" type="digit" v-model="minPoint" placeholder="最低" />
+						<view class="h-line"></view>
+						<input class="uni-input" type="digit" v-model="maxPoint" placeholder="最高" />
+					</view>
+				</view>
+				<!-- 分类筛选项 -->
+				<view class="category-list-wrap">
+					<text class="first">全部分类</text>
+					<view class="class-box">
+						<view @click="selectedCategory('')" class="list-wrap"><text :class="{ selected: !categoryId, 'color-base-text': !categoryId }">全部</text></view>
+						<view @click="selectedCategory(item.category_id)" v-for="(item, index) in categoryList" :key="index" class="list-wrap">
+							<text :class="{ selected: item.category_id == categoryId, 'color-base-text': item.category_id == categoryId }">{{ item.category_name }}</text>
+						</view>
+					</view>
+				</view>
+			</scroll-view>
+			<view class="footer" :class="{ 'safe-area': isIphoneX }">
+				<button type="default" class="footer-box" @click="resetData">重置</button>
+				<button type="primary" class="footer-box1" @click="screenData">确定</button>
+			</view>
+		</uni-drawer>
+
+		<!-- #ifdef MP-WEIXIN -->
+		<!-- 小程序隐私协议 -->
+		<privacy-popup ref="privacyPopup"></privacy-popup>
+		<!-- #endif -->
+	</view>
+</template>
+
+<script>
+	import uniDrawer from '@/components/uni-drawer/uni-drawer.vue';
+
+	export default {
+		components: {
+			uniDrawer,
+		},
+		data() {
+			return {
+				listStyle: '',
+				priceOrder: 'desc',
+				categoryList: [], //排序类型
+				goodsList: [],
+				order: '',
+				sort: 'desc',
+				showScreen: false,
+				keyword: '',
+				categoryId: 0,
+				minPoint: '',
+				maxPoint: '',
+				isFreeShipping: false, //是否免邮
+				isIphoneX: false,
+				coupon: 0,
+				emptyShow: false,
+				isList: true, //列表样式
+				mescroll: null,
+				isLogin: false,
+				couponList: [],
+				hongbaoList: [],
+				point: 0,
+			};
+		},
+		onLoad(options) {
+			this.categoryId = options.category_id || 0;
+			this.keyword = options.keyword || '';
+			this.isIphoneX = this.$util.uniappIsIPhoneX();
+			this.coupon = options.coupon || 0;
+			this.loadCategoryList(this.categoryId);
+		},
+		methods: {
+			//获取积分商品详情
+			getData(mescroll) {
+				this.$api.sendRequest({
+					url: '/pointexchange/api/goods/page',
+					data: {
+						page_size: mescroll.size,
+						page: mescroll.num,
+						type: 1,
+						keyword: this.keyword,
+						category_id: this.categoryId,
+						min_point: this.minPoint,
+						max_point: this.maxPoint,
+						is_free_shipping: (this.isFreeShipping ? 1 : 0),
+						order: this.order,
+						sort: this.sort,
+						coupon: this.coupon
+					},
+					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.goodsList = []; //如果是第一页需手动制空列表
+						this.goodsList = this.goodsList.concat(newArr); //追加新数据
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					},
+					fail() {
+						//联网失败的回调
+						mescroll.endErr();
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					}
+				});
+			},
+			//加载分类
+			loadCategoryList(fid, sid) {
+				this.$api.sendRequest({
+					url: '/api/goodscategory/tree',
+					data: {},
+					success: res => {
+						if (res.data != null) this.categoryList = res.data;
+					}
+				});
+			},
+			goodsImg(imgStr) {
+				let imgs = imgStr.split(',');
+				return imgs[0] ? this.$util.img(imgs[0], {
+					size: 'mid'
+				}) : this.$util.getDefaultImage().goods;
+			},
+			imgError(index) {
+				this.goodsList[index].goods_image = this.$util.getDefaultImage().goods;
+			},
+			//跳转至详情页面
+			toDetail(item) {
+				this.$util.redirectTo('/pages_promotion/point/detail', {
+					id: item.id
+				});
+			},
+			search() {
+				this.emptyShow = false;
+				this.goodsList = [];
+				this.$refs.mescroll.refresh();
+			},
+			//筛选点击
+			sortTabClick(tag) {
+				if (tag == 'point') {
+					this.order = 'point';
+					this.sort = 'desc';
+				} else if (tag == 'create_time') {
+					this.order = 'create_time';
+					this.sort = 'desc';
+				} else if (tag == 'screen') {
+					//筛选
+					this.showScreen = true;
+					return;
+				} else {
+					this.order = '';
+					this.sort = '';
+				}
+
+				this.order = tag;
+				if (tag === 'create_time') {
+					this.priceOrder = this.priceOrder === 'asc' ? 'desc' : 'asc';
+					this.sort = this.priceOrder;
+				} else if (tag === 'point') {
+					this.priceOrder = this.priceOrder === 'asc' ? 'desc' : 'asc';
+					this.sort = this.priceOrder;
+				}
+
+				this.emptyShow = false;
+				this.goodsList = [];
+				this.$refs.mescroll.refresh();
+			},
+			selectedCategory(categoryId) {
+				this.categoryId = categoryId;
+			},
+			screenData() {
+				if (this.minPoint != '' || this.maxPoint != '') {
+					// if (!Number(this.minPoint) && this.minPoint) {
+					// 	this.$util.showToast({
+					// 		title: '请输入最低价'
+					// 	});
+					// 	return;
+					// }
+					if (!Number(this.maxPoint) && this.maxPoint) {
+						this.$util.showToast({
+							title: '请输入最高价'
+						});
+						return;
+					}
+					if (Number(this.minPoint) < 0 || Number(this.maxPoint) < 0) {
+						this.$util.showToast({
+							title: '筛选价格不能小于0'
+						});
+						return;
+					}
+					if (this.minPoint != '' && Number(this.minPoint) > Number(this.maxPoint) && this.maxPoint) {
+
+						this.$util.showToast({
+							title: '最低价不能大于最高价'
+						});
+						return;
+					}
+					if (this.maxPoint != '' && Number(this.maxPoint) < Number(this.minPoint)) {
+						this.$util.showToast({
+							title: '最高价不能小于最低价'
+						});
+						return;
+					}
+				}
+				this.emptyShow = false;
+				this.goodsList = [];
+				this.$refs.mescroll.refresh();
+				this.showScreen = false;
+			},
+			//重置数据
+			resetData() {
+				this.showScreen = false;
+				this.categoryId = 0
+				this.minPoint = ''
+				this.maxPoint = ''
+			},
+		},
+	};
+</script>
+
+<style lang="scss">
+	.head-wrap {
+		background: #fff;
+		position: fixed;
+		width: 100%;
+		left: 0;
+		z-index: 1;
+
+		.search-wrap {
+			flex: 0.5;
+			padding: 30rpx 30rpx 0;
+			font-size: $font-size-tag;
+			display: flex;
+			align-items: center;
+
+			.input-wrap {
+				flex: 1;
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				background: $color-bg;
+				height: 70rpx;
+				padding-left: 10rpx;
+				border-radius: 70rpx;
+
+				input {
+					width: 90%;
+					background: $color-bg;
+					font-size: $font-size-tag;
+					height: 50rpx;
+					padding: 10rpx 25rpx 10rpx 40rpx;
+					line-height: 50rpx;
+					border-radius: 40rpx;
+				}
+
+				text {
+					font-size: $font-size-toolbar;
+					color: $color-tip;
+					width: 80rpx;
+					text-align: center;
+					margin-right: 20rpx;
+				}
+			}
+
+			.category-wrap,
+			.list-style {
+				display: flex;
+				justify-content: center;
+				align-items: center;
+
+				.iconfont {
+					font-size: 50rpx;
+					color: $color-tip;
+				}
+
+				text {
+					display: block;
+					margin-top: 60rpx;
+				}
+			}
+		}
+
+		.sort-wrap {
+			display: flex;
+			padding: 10rpx 20rpx 10rpx 0;
+
+			>view {
+				flex: 1;
+				text-align: center;
+				font-size: $font-size-base;
+				height: 60rpx;
+				line-height: 60rpx;
+			}
+
+			.comprehensive-wrap {
+				display: flex;
+				justify-content: center;
+				align-items: center;
+
+				.iconfont-wrap {
+					display: inline-block;
+					margin-left: 10rpx;
+					width: 40rpx;
+
+					.iconfont {
+						font-size: $font-size-toolbar;
+						line-height: 1;
+						margin-bottom: 5rpx;
+					}
+				}
+			}
+
+			.price-wrap {
+				display: flex;
+				justify-content: center;
+				align-items: center;
+
+				.iconfont-wrap {
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					flex-direction: column;
+					width: 40rpx;
+
+					.iconfont {
+						float: left;
+						font-size: 24rpx;
+						line-height: 1;
+						height: 20rpx;
+						color: #909399;
+					}
+				}
+			}
+
+			.screen-wrap {
+				display: flex;
+				justify-content: center;
+				align-items: center;
+
+				.iconfont-wrap {
+					display: inline-block;
+					margin-left: 10rpx;
+					width: 40rpx;
+
+					.iconfont {
+						font-size: $font-size-toolbar;
+						line-height: 1;
+					}
+				}
+			}
+		}
+	}
+
+	.category-list-wrap {
+		height: 100%;
+
+		.class-box {
+			display: flex;
+			flex-wrap: wrap;
+			padding: 0 $padding;
+
+			view {
+				width: calc((100% - 60rpx) / 3);
+				font-size: $font-size-goods-tag;
+				margin-right: 20rpx;
+				height: 60rpx;
+				line-height: 60rpx;
+				text-align: center;
+				margin-bottom: 12rpx;
+				flex-shrink: 0;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				white-space: nowrap;
+				background: rgba(245, 245, 245, 1);
+				border-radius: 5rpx;
+
+				&:nth-of-type(3n) {
+					margin-right: 0;
+				}
+			}
+		}
+
+		.first {
+			font-size: $font-size-tag;
+			display: block;
+			// background: $page-color-base;
+			padding: 20rpx;
+		}
+
+		.second {
+			border-bottom: 2rpx solid $color-line;
+			padding: 20rpx;
+			display: block;
+			font-size: $font-size-tag;
+		}
+
+		.third {
+			padding: 0 20rpx 20rpx;
+			overflow: hidden;
+			font-size: $font-size-tag;
+
+			>view {
+				display: inline-block;
+				margin-right: 20rpx;
+				margin-top: 20rpx;
+			}
+
+			.uni-tag {
+				padding: 0 20rpx;
+			}
+		}
+	}
+
+	.screen-wrap {
+		.title {
+			font-size: $font-size-tag;
+			padding: $padding;
+			background: #f6f4f5;
+		}
+
+		scroll-view {
+			height: 85%;
+
+			.item-wrap {
+				border-bottom: 1px solid #f0f0f0;
+
+				.label {
+					font-size: $font-size-tag;
+					padding: $padding;
+
+					view {
+						display: inline-block;
+						font-size: 60rpx;
+						height: 40rpx;
+						vertical-align: middle;
+						line-height: 40rpx;
+					}
+				}
+
+				.list {
+					margin: $margin-updown $margin-both;
+					overflow: hidden;
+
+					>view {
+						display: inline-block;
+						margin-right: 25rpx;
+						margin-bottom: 25rpx;
+					}
+
+					.uni-tag {
+						padding: 0 $padding;
+						font-size: $font-size-goods-tag;
+						background: #f5f5f5;
+						height: 52rpx;
+						line-height: 52rpx;
+						border: 0;
+					}
+				}
+
+				.price-wrap {
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					padding: $padding;
+
+					input {
+						flex: 1;
+						background: #f5f5f5;
+						height: 52rpx;
+						width: 182rpx;
+						line-height: 50rpx;
+						font-size: $font-size-goods-tag;
+						border-radius: 50rpx;
+						text-align: center;
+
+						&:first-child {
+							margin-right: 10rpx;
+						}
+
+						&:last-child {
+							margin-left: 10rpx;
+						}
+					}
+				}
+			}
+		}
+
+		.footer {
+			height: 90rpx;
+			display: flex;
+			justify-content: center;
+			align-items: flex-start;
+			//position: absolute;
+			bottom: 0;
+			width: 100%;
+
+			.footer-box {
+				border-top-right-radius: 0;
+				border-bottom-right-radius: 0;
+				margin: 0;
+				width: 40%;
+			}
+
+			.footer-box1 {
+				border-top-left-radius: 0;
+				border-bottom-left-radius: 0;
+				margin: 0;
+				width: 40%;
+			}
+		}
+	}
+
+	.safe-area {
+		bottom: 68rpx !important;
+	}
+
+	.empty {
+		margin-top: 100rpx;
+	}
+
+	.buy-num {
+		font-size: $font-size-activity-tag;
+	}
+
+	.icon {
+		width: 34rpx;
+		height: 30rpx;
+	}
+
+	.list-style-new {
+		display: flex;
+		align-items: center;
+
+		.line {
+			width: 4rpx;
+			height: 28rpx;
+			background-color: rgba(227, 227, 227, 1);
+			margin-right: 60rpx;
+		}
+	}
+
+	.h-line {
+		width: 37rpx;
+		height: 2rpx;
+		background-color: $color-tip;
+	}
+
+	.lineheight-clear {
+		line-height: 1 !important;
+	}
+
+	// 商品列表单列样式
+	.goods-list.single-column {
+		.goods-item {
+			padding: 26rpx;
+			background: #fff;
+			margin: $margin-updown $margin-both;
+			border-radius: $border-radius;
+			display: flex;
+			position: relative;
+
+			.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;
+			}
+
+			.goods-tag-img {
+				position: absolute;
+				border-top-left-radius: $border-radius;
+				width: 80rpx;
+				height: 80rpx;
+				top: 26rpx;
+				left: 26rpx;
+				z-index: 5;
+				overflow: hidden;
+
+				image {
+					width: 100%;
+					height: 100%;
+				}
+			}
+
+			.info-wrap {
+				flex: 1;
+				display: flex;
+				flex-direction: column;
+			}
+
+			.name-wrap {
+				flex: 1;
+			}
+
+			.goods-name {
+				font-size: $font-size-base;
+				line-height: 1.3;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				display: -webkit-box;
+				-webkit-line-clamp: 2;
+				-webkit-box-orient: vertical;
+				height: 68rpx;
+			}
+
+			.introduction {
+				line-height: 1;
+				margin-top: 10rpx;
+			}
+
+			.discount-price {
+				display: inline-block;
+				font-weight: bold;
+				line-height: 1;
+				margin-top: 16rpx;
+				color: var(--price-color);
+				.unit {
+					margin-right: 6rpx;
+				}
+			}
+
+			.pro-info {
+				display: flex;
+				margin-top: 16rpx;
+
+				.delete-price {
+					text-decoration: line-through;
+					flex: 1;
+
+					.unit {
+						margin-right: 6rpx;
+					}
+				}
+
+				&>view {
+					line-height: 1;
+
+					&:nth-child(2) {
+						text-align: right;
+					}
+				}
+			}
+
+			.member-price-tag {
+				display: inline-block;
+				width: 60rpx;
+				line-height: 1;
+				margin-left: 6rpx;
+
+				image {
+					width: 100%;
+				}
+			}
+		}
+	}
+
+	// 商品列表双列样式
+	.goods-list.double-column {
+		display: flex;
+		flex-wrap: wrap;
+		margin: 0 $margin-both;
+		padding-top: $margin-updown;
+
+		.goods-item {
+			flex: 1;
+			position: relative;
+			background-color: #fff;
+			flex-basis: 48%;
+			max-width: calc((100% - 30rpx) / 2);
+			margin: 0 $margin-both $margin-updown 0;
+			border-radius: $border-radius;
+
+			&:nth-child(2n) {
+				margin-right: 0;
+			}
+
+			.goods-img {
+				position: relative;
+				overflow: hidden;
+				padding-top: 100%;
+				border-top-left-radius: $border-radius;
+				border-top-right-radius: $border-radius;
+
+				image {
+					width: 100%;
+					position: absolute;
+					top: 50%;
+					left: 0;
+					transform: translateY(-50%);
+				}
+			}
+
+			.goods-tag {
+				color: #fff;
+				line-height: 1;
+				padding: 8rpx 16rpx;
+				position: absolute;
+				border-bottom-right-radius: $border-radius;
+				top: 0;
+				left: 0;
+				font-size: $font-size-goods-tag;
+			}
+
+			.goods-tag-img {
+				position: absolute;
+				border-top-left-radius: $border-radius;
+				width: 80rpx;
+				height: 80rpx;
+				top: 0;
+				left: 0;
+				z-index: 5;
+				overflow: hidden;
+
+				image {
+					width: 100%;
+					height: 100%;
+				}
+			}
+
+			.info-wrap {
+				padding: 0 26rpx 26rpx 26rpx;
+			}
+
+			.goods-name {
+				font-size: $font-size-base;
+				line-height: 1.3;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				display: -webkit-box;
+				-webkit-line-clamp: 2;
+				-webkit-box-orient: vertical;
+				margin-top: 20rpx;
+				height: 68rpx;
+			}
+
+			.discount-price {
+				display: inline-block;
+				font-weight: bold;
+				line-height: 1;
+				margin-top: 16rpx;
+				color: var(--price-color);
+				.unit {
+					margin-right: 6rpx;
+				}
+			}
+
+			.pro-info {
+				display: flex;
+				margin-top: 16rpx;
+
+				.delete-price {
+					text-decoration: line-through;
+					flex: 1;
+
+					.unit {
+						margin-right: 6rpx;
+					}
+				}
+
+				&>view {
+					line-height: 1;
+
+					&:nth-child(2) {
+						text-align: right;
+					}
+				}
+			}
+
+			.member-price-tag {
+				display: inline-block;
+				width: 60rpx;
+				line-height: 1;
+				margin-left: 6rpx;
+
+				image {
+					width: 100%;
+				}
+			}
+		}
+	}
+</style>
+<style scoped>
+	>>>.uni-tag--primary.uni-tag--inverted {
+		background-color: #f5f5f5 !important;
+	}
+</style>
diff --git a/pages_promotion/point/list.vue b/pages_promotion/point/list.vue
new file mode 100644
index 0000000..9c033d2
--- /dev/null
+++ b/pages_promotion/point/list.vue
@@ -0,0 +1,594 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view class="conteiner">
+		<!-- #ifdef MP-WEIXIN -->
+		<view class="point-navbar"
+			:style="{'padding-top': menuButtonBounding.top + 'px', height: menuButtonBounding.height + 'px' }">
+			<view class="nav-wrap" :style="{width: menuButtonBounding.left + 'px'}">
+				<view class="back" @click="back" :style="{width: menuButtonBounding.height + 'px', height: menuButtonBounding.height + 'px' }">
+					<text class="iconfont icon-back_light"></text>
+				</view>
+				<view class="search" @click="$util.redirectTo('/pages_tool/goods/search')">
+					<text class="iconfont icon-sousuo3"></text>
+					<text class="tips">搜索商品</text>
+				</view>
+				<view class="sign" :style="{width: menuButtonBounding.height + 'px', height: menuButtonBounding.height + 'px' }" @click="redirect('/pages_tool/member/signin')">
+					<image :src="$util.img('public/uniapp/point/navbar-sing-icon.png')" mode="widthFix"></image>
+				</view>
+			</view>
+		</view>
+		<view class="point-navbar-block" :style="{ height: menuButtonBounding.bottom + 'px' }"></view>
+		<!-- #endif -->
+
+		<scroll-view scroll-y="true" class="point-scroll-view" @scrolltolower="getData">
+			<view class="point-wrap" :style="{'background-position-y': -menuButtonBounding.bottom + 'px'}">
+				<view class="head-box">
+					<view class="account-content">
+						<view class="left">
+							<image :src="$util.img('public/uniapp/point/point-icon.png')" mode="widthFix"></image>
+							<view>我的积分</view>
+						</view>
+						<view class="right">
+							<text class="point price-font">{{point}}</text>
+							<text class="text">积分</text>
+					<!-- 		<text class="iconfont icon-right"></text> -->
+						</view>
+					</view>
+					<view class="remark">
+						<view class="label">提醒</view>
+						<view class="text">积分兑好礼，每日上新换不停！</view>
+					</view>
+				</view>
+
+			<!-- 	<view class="menu-wrap">
+					<view class="menu-list">
+						<view class="menu-item" @click="openPointPopup()">
+							<image :src="$util.img('/public/uniapp/point/point-rule.png')" class="menu-img"></image>
+							<image :src="$util.img('/public/uniapp/point/must-see.png')" class="menu-tag"></image>
+							<view class="title">活动规则</view>
+						</view>
+						<view class="menu-item" @click="redirect('/pages_tool/recharge/list')">
+							<image :src="$util.img('/public/uniapp/point/recharge.png')" class="menu-img"></image>
+							<image :src="$util.img('/public/uniapp/point/high.png')" class="menu-tag"></image>
+							<view class="title">储值赚积分</view>
+						</view>
+						<view class="menu-item" @click="redirect('/pages_promotion/point/order_list')">
+							<image :src="$util.img('/public/uniapp/point/exchange-record.png')" class="menu-img"></image>
+							<view class="title">兑换记录</view>
+						</view>
+						<view class="menu-item" @click="luckdraw">
+							<image :src="$util.img('/public/uniapp/point/luck-draw.png')" class="menu-img"></image>
+							<view class="title">积分抽奖</view>
+						</view>
+						<view class="menu-item" @click="redirect('/pages_tool/member/point_detail')">
+							<image :src="$util.img('/public/uniapp/point/point-detail.png')" class="menu-img"></image>
+							<view class="title">积分明细</view>
+						</view>
+					</view>
+				</view> -->
+<!-- 
+				<view class="poster-wrap">
+					<view class="poster-item" @click="redirect('/pages_tool/recharge/list')">
+						<image :src="$util.img('/public/uniapp/point/recharge-poster.png')" mode="widthFix"></image>
+					</view>
+					<view class="poster-item" @click="luckdraw">
+						<image :src="$util.img('/public/uniapp/point/luck-draw-poster.png')" mode="widthFix"></image>
+					</view>
+				</view> -->
+
+				<view class="recharge-list-wrap" @click="redirect('/pages_tool/recharge/list')" v-if="rechargeList.length">
+					<view class="item-wrap" v-for="(item, index) in rechargeList.slice(0, 4)" :key="index">
+						<view class="recharge">储值{{ parseFloat(item.buy_price) }}元</view>
+						<view class="point">可得{{ item.point }}积分</view>
+						<view class="btn">去储值</view>
+					</view>
+				</view>
+
+				<view class="body-wrap" :class="{ 'no-login': !storeToken }">
+					<view class="point-exchange-wrap exchange-coupon" v-if="couponList.length > 0">
+						<view class="card-category-title">
+							<text class="before-line"></text>
+							<text>积分换券</text>
+							<text class="after-line"></text>
+						</view>
+
+						<view class="list-wrap">
+							<view class="list-wrap-scroll" :class="{'single-row': couponList.length < 3}">
+								<view class="list-wrap-item coupon-list-wrap-item" v-for="(couponItem, couponIndex) in couponList" :key="couponIndex" @click="toDetail(couponItem)">
+									<view class="img-box">
+										<image :src="$util.img('public/uniapp/point/coupon_' + themeStyle.name + '_bg1.png')"/>
+									</view>
+									<view class="content">
+										<view class="coupon"
+											:style="{ backgroundImage: 'url(' + $util.img('public/uniapp/point/coupon_theme-blue_bg1.jpg') + ')' }">
+											<view class="coupon_left color-line-border">
+												<view class="price price-font">
+													<block v-if="couponItem.coupon_type == 'reward'">
+														<text>￥</text>
+														{{ parseFloat(couponItem.money) }}
+													</block>
+													<block v-if="couponItem.coupon_type == 'discount'">
+														<block v-if="couponItem.coupon_type == 'discount'">
+															{{ parseFloat(couponItem.discount) }}<text>折</text>
+														</block>
+													</block>
+												</view>
+												<view class="coupon-info">
+													<view class="coupon_condition font-size-activity-tag">
+														{{ couponItem.at_least == 0 ? '无门槛优惠券' : '满' + parseFloat(couponItem.at_least).toFixed(0) + '可用' }}
+													</view>
+													<view class="coupon_type font-size-activity-tag" v-if="couponItem.goods_type == 1">全场券</view>
+													<view class="coupon_type font-size-activity-tag" v-else-if="couponItem.goods_type == 2||couponItem.goods_type == 3">指定券</view>
+												</view>
+											</view>
+											<view class="coupon_right">
+												<view class="coupon_num font-size-tag">{{ couponItem.point }}积分</view>
+												<view class="coupon_btn">兑换</view>
+											</view>
+										</view>
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+
+					<view class="point-exchange-wrap exchange-hongbao" v-if="hongbaoList.length > 0">
+						<view class="card-category-title">
+							<text class="before-line"></text>
+							<text>积分换红包</text>
+							<text class="after-line"></text>
+						</view>
+
+						<view class="list-wrap">
+							<view class="list-wrap-item hongbao-list-wrap-item" v-for="(hongbaoItem, hongbaoIndex) in hongbaoList" :key="hongbaoIndex" @click="toDetail(hongbaoItem)">
+								<view class="img-box">
+									<image :src="$util.img('public/uniapp/point/hongbao_bg.png')"></image>
+								</view>
+								<view class="content">
+									<view class="coupon hongbao">
+										<view class="coupon_left">
+											<view class="price price-font">
+												<text>￥</text>
+												{{ parseFloat(hongbaoItem.balance).toFixed(0) }}
+											</view>
+											<!-- <view class="coupon_condition font-size-activity-tag">{{ hongbaoItem.name }}</view> -->
+										</view>
+										<view class="coupon_right">
+											<view class="coupon_num  font-size-tag">{{ hongbaoItem.point }}积分</view>
+											<view class="coupon_btn">兑换</view>
+										</view>
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+
+					<view class="point-exchange-wrap" v-if="goodsList.length > 0">
+						<view class="card-category-title">
+							<text class="before-line"></text>
+							<text>积分换礼品</text>
+							<text class="after-line"></text>
+						</view>
+
+						<view class="list-wrap">
+							<view class="goods-list double-column" v-if="goodsList.length">
+								<view class="goods-item " v-for="(item, index) in goodsList" :key="index">
+									<view class="goods-img" @click="toDetail(item)">
+										<image :src="goodsImg(item)" mode="widthFix" @error="imgError(index)"></image>
+									</view>
+									<view class="info-wrap">
+										<view class="name-wrap">
+											<view class="goods-name" @click="toDetail(item)">{{ item.name }}</view>
+										</view>
+										<view class="lineheight-clear">
+											<view class="discount-price">
+												<view>
+													<text class="unit price-font point">{{ item.point }}</text>
+													<text class="unit  font-size-tag ">积分</text>
+												</view>
+												<block v-if="item.price > 0 && item.pay_type > 0">
+													<text class="unit  font-size-tag">+</text>
+													<view>
+														<text class="font-size-tag">{{ parseFloat(item.price).toFixed(2).split(".")[0] }}</text>
+														<text class="unit  font-size-tag">.{{ parseFloat(item.price).toFixed(2).split(".")[1] }}元</text>
+													</view>
+												</block>
+											</view>
+											<view class="btn" @click="toDetail(item)">兑换</view>
+										</view>
+										<view class="pro-info" v-if="item.stock_show || item.sale_show ">
+											<view class="font-size-activity-tag color-tip" v-if="item.stock_show ">
+												库存:{{ isNaN(parseInt(item.stock)) ? 0 : parseInt(item.stock) }}</view>
+											<view class="font-size-activity-tag color-tip sale" v-if="item.sale_show ">
+												已兑:{{ isNaN(parseInt(item.sale_num)) ? 0 : parseInt(item.sale_num) }}
+											</view>
+										</view>
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</scroll-view>
+
+		<!-- 弹出规则 -->
+		<view @touchmove.prevent.stop>
+			<uni-popup ref="pointPopup" type="bottom">
+				<view class="tips-layer">
+					<view class="head" @click="closePointPopup()">
+						<view class="title">积分说明</view>
+						<text class="iconfont icon-close"></text>
+					</view>
+					<view class="body">
+						<view class="detail margin-bottom">
+							<view class="tip">积分的获取</view>
+							<view class="font-size-base">1、积分可在注册、签到、分享、消费、充值时获得。</view>
+							<view class="font-size-base">2、在购买部分商品时可获得积分。</view>
+							<view class="tip">积分的使用</view>
+							<view class="font-size-base">1、积分可用于兑换积分中心的商品。</view>
+							<view class="font-size-base">2、积分可在参与某些活动时使用。</view>
+							<view class="font-size-base">3、积分不得转让，出售，不设有效期。</view>
+							<view class="tip">积分的查询</view>
+							<view class="font-size-base">1、积分可在会员中心中查询具体数额以及明细。</view>
+						</view>
+					</view>
+				</view>
+			</uni-popup>
+		</view>
+		<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 uniPopup from '@/components/uni-popup/uni-popup.vue';
+	export default {
+		components: {
+			uniPopup
+		},
+		data() {
+			return {
+				mescroll: {
+					num: 0,
+					total: 1,
+					loading: false
+				},
+				categoryList: [{
+						id: 1,
+						name: '积分换好物'
+					},
+					{
+						id: 2,
+						name: '积分换券'
+					},
+					{
+						id: 3,
+						name: '积分换红包'
+					}
+				],
+				isLogin: false,
+				goodsList: [],
+				couponList: [],
+				hongbaoList: [],
+				point: 0,
+				signState: 1, // 签到是否开启
+				mpShareData: null, //小程序分享数据
+				menuButtonBounding: {
+					bottom: 0
+				},
+				rechargeList: [], //充值套餐
+				newestGame: null
+			};
+		},
+		onLoad(option) {
+			setTimeout( () => {
+				if (!this.addonIsExist.pointexchange) {
+					this.$util.showToast({
+						title: '商家未开启积分商城',
+						mask: true,
+						duration: 2000
+					});
+					setTimeout(() => {
+						this.$util.redirectTo('/pages/index/index');
+					}, 2000);
+				}
+			},1000);
+
+			// #ifdef MP-WEIXIN
+			this.menuButtonBounding = uni.getMenuButtonBoundingClientRect();
+			// #endif
+			//小程序分享接收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);
+					});
+				}
+			}
+			this.getData();
+			this.getRechargeList();
+			this.getNewestGame();
+		},
+		onShow() {
+			//记录分享关系
+			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
+
+			if (this.storeToken) this.getAccountInfo();
+			this.getCouponList();
+			this.getHongbaoList();
+			// this.getSignState();
+		},
+		methods: {
+			// 签到是否开启
+			getSignState() {
+				this.$api.sendRequest({
+					url: '/api/membersignin/getSignStatus',
+					success: res => {
+						if (res.code == 0) {
+							this.signState = res.data.is_use;
+						}
+					}
+				});
+			},
+			jumpPage(url) {
+				this.$util.redirectTo(url);
+			},
+			// 打开积分说明弹出层
+			openPointPopup() {
+				this.$refs.pointPopup.open();
+			},
+			// 打开积分说明弹出层
+			closePointPopup() {
+				this.$refs.pointPopup.close();
+			},
+			// 优惠券
+			getCouponList() {
+				this.$api.sendRequest({
+					url: '/pointexchange/api/goods/page',
+					data: {
+						page_size: 0,
+						type: 2
+					},
+					success: res => {
+						if (res.code == 0 && res.data) {
+							this.couponList = res.data.list;
+						} else {
+							this.$util.showToast({
+								title: res.message
+							});
+						}
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					},
+					fail() {
+						//联网失败的回调
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					}
+				});
+			},
+			// 红包
+			getHongbaoList() {
+				this.$api.sendRequest({
+					url: '/pointexchange/api/goods/page',
+					data: {
+						page_size: 0,
+						type: 3
+					},
+					success: res => {
+						if (res.code == 0 && res.data) {
+							this.hongbaoList = res.data.list;
+						} else {
+							this.$util.showToast({
+								title: res.message
+							});
+						}
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					},
+					fail() {
+						//联网失败的回调
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					}
+				});
+			},
+			//获取积分商品详情
+			getData() {
+				if (this.mescroll.loading || this.mescroll.num >= this.mescroll.total) return;
+				this.mescroll.loading = true;
+				this.$api.sendRequest({
+					url: '/pointexchange/api/goods/page',
+					data: {
+						page: this.mescroll.num + 1,
+						page_size: 10,
+						type: 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.mescroll.loading = false;
+						this.mescroll.total = res.data.page_count;
+						this.mescroll.num += 1;
+						if (this.mescroll.num == 1) this.goodsList = []; //如果是第一页需手动制空列表
+						this.goodsList = this.goodsList.concat(newArr); //追加新数据
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					},
+					fail() {
+						this.mescroll.loading = false;
+						//联网失败的回调
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					}
+				});
+			},
+			//跳转至详情页面
+			toDetail(item) {
+				this.$util.redirectTo('/pages_promotion/point/detail', {
+					id: item.id
+				});
+			},
+			goGoodsList() {
+				this.$util.redirectTo('/pages_promotion/point/goods_list');
+			},
+			//获取个人
+			getAccountInfo() {
+				this.$api.sendRequest({
+					url: '/api/memberaccount/info',
+					data: {
+						account_type: 'point'
+					},
+					success: res => {
+						if (res.code == 0 && res.data) {
+							if (!isNaN(parseFloat(res.data.point))) {
+								this.point = parseFloat(res.data.point).toFixed(0);
+							}
+						} else {
+							this.$util.showToast({
+								title: res.message
+							});
+						}
+					}
+				});
+			},
+			//跳转至登录页面
+			login() {
+				this.$refs.login.open('/pages_promotion/point/list');
+			},
+			imgError(index) {
+				this.goodsList[index].image = this.$util.getDefaultImage().goods;
+				this.$forceUpdate();
+			},
+			goodsImg(data) {
+				let img = '';
+				switch (data.type) {
+					case 1:
+						img = this.$util.img(data.image.split(',')[0], {
+							size: 'mid'
+						});
+						break;
+					case 2:
+						img = data.image ? this.$util.img(data.image) : this.$util.img(
+							'public/uniapp/point/coupon.png');
+						break;
+					case 3:
+						img = data.image ? this.$util.img(data.image) : this.$util.img(
+							'public/uniapp/point/hongbao.png');
+						break;
+				}
+				return img;
+			},
+			/**
+			 * 跳转
+			 * @param {Object} url
+			 */
+			redirect(url) {
+				if (!this.storeToken) {
+					this.$refs.login.open(url);
+				} else {
+					this.$util.redirectTo(url);
+				}
+			},
+			getRechargeList() {
+				this.$api.sendRequest({
+					url: '/memberrecharge/api/memberrecharge/page',
+					data: {
+						page_size: 100,
+						page: 1
+					},
+					success: res => {
+						if (res.code == 0 && res.data) {
+							let rechargeList = [];
+							res.data.list.forEach(item => {
+								if (item.point > 0) rechargeList.push(item)
+							});
+							this.rechargeList = rechargeList;
+						}
+					}
+				})
+			},
+			back() {
+				if (getCurrentPages().length > 1) uni.navigateBack({
+					delta: 1
+				});
+				else this.$util.redirectTo('/pages/index/index');
+			},
+			getNewestGame() {
+				this.$api.sendRequest({
+					url: '/api/game/newestgame',
+					success: res => {
+						if (res.code == 0 && res.data) this.newestGame = res.data;
+					}
+				})
+			},
+			luckdraw() {
+				if (this.newestGame) {
+					switch (this.newestGame.game_type) {
+						case 'cards':
+							this.$util.redirectTo('/pages_promotion/game/cards', {
+								id: this.newestGame.game_id
+							});
+							break;
+						case 'egg':
+							this.$util.redirectTo('/pages_promotion/game/smash_eggs', {
+								id: this.newestGame.game_id
+							});
+							break;
+						case 'turntable':
+							this.$util.redirectTo('/pages_promotion/game/turntable', {
+								id: this.newestGame.game_id
+							});
+							break;
+					}
+				} else {
+					this.$util.showToast({
+						title: '暂无相关活动'
+					});
+				}
+			}
+		},
+		//分享给好友
+		onShareAppMessage() {
+			return this.mpShareData.appMessage;
+		},
+		//分享到朋友圈
+		onShareTimeline() {
+			return this.mpShareData.timeLine;
+		}
+	};
+</script>
+
+<style lang="scss">
+	@import './public/css/list.scss';
+</style>
+<style>
+	.ns-adv>>>image {
+		width: 100%;
+		border-radius: 0;
+	}
+</style>
\ No newline at end of file
diff --git a/pages_promotion/point/order_list.vue b/pages_promotion/point/order_list.vue
new file mode 100644
index 0000000..02ddac7
--- /dev/null
+++ b/pages_promotion/point/order_list.vue
@@ -0,0 +1,575 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view class="order-container">
+		<view class="order-nav" v-if="storeToken">
+			<view v-for="(statusItem, statusIndex) in statusList" :key="statusIndex" class="uni-tab-item" :id="statusItem.id" :data-current="statusIndex" @click="ontabtap">
+				<text class="uni-tab-item-title" :class="statusItem.status == orderStatus ? 'uni-tab-item-title-active color-base-text' : ''">
+					{{ statusItem.name }}
+				</text>
+			</view>
+		</view>
+		
+		<mescroll-uni ref="mescroll" @getData="getListData" top="80rpx" >
+			<block slot="list">
+				<block v-if="orderList.length">
+					<view class="order-item" v-for="(orderItem, orderIndex) in orderList" :key="orderIndex" @click="detail(orderItem)">
+						<view class="order-header">
+							<text class="order-no">订单号：{{ orderItem.order_no }}</text>
+							<text class="status-name">
+								{{ orderItem.order_status == 0 ? '待支付' : orderItem.order_status == 1 ? '已完成' : orderItem.order_status == -1 ? '已关闭' : '' }}
+							</text>
+						</view>
+						<view class="order-body">
+							<view class="goods-wrap">
+								<view class="goods-img">
+									<block v-if="orderItem.type == 2">
+										<image :src="$util.img(orderItem.exchange_image) ? $util.img(orderItem.exchange_image) : $util.img('public/uniapp/point/coupon.png')"
+										 @error="imageError(orderIndex)" mode="aspectFill" :lazy-load="true"></image>
+									</block>
+									<block v-else-if="orderItem.type == 3">
+										<image :src="$util.img(orderItem.exchange_image) ? $util.img(orderItem.exchange_image) : $util.img('public/uniapp/point/hongbao.png')"
+										 @error="imageError(orderIndex)" mode="aspectFill" :lazy-load="true"></image>
+									</block>
+									<block v-else>
+										<image :src="$util.img(orderItem.exchange_image)" @error="imageError(orderIndex)" mode="aspectFill" :lazy-load="true"></image>
+									</block>
+								</view>
+								<view class="goods-info">
+									<view class="pro-info">
+										<view class="goods-name">{{ orderItem.exchange_name }}</view>
+										<view class="goods-sub-section">
+											<text class="goods-price">
+												<text class="price-style large">{{ orderItem.point }}</text>
+												<text class="unit price-style small">积分</text>
+												<block v-if="orderItem.price > 0">
+													+
+													<text class="unit price-style small">{{ $lang('common.currencySymbol') }}</text>
+													<text class="price-style large">{{ parseFloat(orderItem.price).toFixed(2).split(".")[0] }}</text>
+													<text class="unit price-style small">.{{ parseFloat(orderItem.price).toFixed(2).split(".")[1] }}</text>
+												</block>
+											</text>
+											<text class="goods-num">
+												<text class="iconfont icon-close"></text>
+												{{ orderItem.num }}
+											</text>
+										</view>
+									</view>
+								</view>
+							</view>
+						</view>
+						<view class="order-footer">
+							<view class="order-action" v-if="orderItem.order_status == 0 && orderItem.type == 1">
+								<view class="order-box-btn font-size-tag" @click.stop="orderClose(orderItem.order_id, orderIndex)">关闭</view>
+								<view class="order-box-btn color-base-bg color-base-border"  @click.stop="openChoosePayment(orderItem.out_trade_no, orderItem.price)">支付</view>
+							</view>
+							<view class="order-action" v-else>
+								<view class="order-box-btn font-size-tag">查看详情</view>
+							</view>
+						</view>
+					</view>
+				</block>
+				<block v-if="showEmpty && !orderList.length">
+					<view class="cart-empty">
+						<ns-empty :isIndex="true" :emptyBtn ="{url: '/pages_promotion/point/list',text: '去逛逛'}" text="暂无积分兑换订单"></ns-empty>
+					</view>
+				</block>
+			</block>
+		</mescroll-uni>
+
+		<!-- 选择支付方式弹窗 -->
+		<ns-payment ref="choosePaymentPopup" :payMoney="payMoney" @confirm="orderPay"></ns-payment>
+		<loading-cover ref="loadingCover"></loading-cover>
+		<ns-login ref="login"></ns-login>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				orderList: [],
+				showEmpty: false,
+				outTradeNo: '',
+				payMoney: 0,
+				statusList: [
+					{status: 'all', id: 'all', name: '全部'},
+					{status: 0, id: 'pay', name: '待支付'},
+					{status: 1, id: 'complete', name: '已完成'},
+				],
+				orderStatus: 'all',
+			};
+		},
+		onLoad() {
+			setTimeout( () => {
+				if (!this.addonIsExist.pointexchange) {
+					this.$util.showToast({
+						title: '商家未开启积分商城',
+						mask: true,
+						duration: 2000
+					});
+					setTimeout(() => {
+						this.$util.redirectTo('/pages/index/index', {}, 'redirectTo');
+					}, 2000);
+				}
+			},1000);
+
+			if (!this.storeToken) {
+				this.$nextTick(() => {
+					this.$refs.login.open('/pages_promotion/point/order_list');
+				});
+			}
+		},
+		onShow() {
+			if (this.$refs.mescroll) this.$refs.mescroll.refresh();
+		},
+		watch: {
+			storeToken: function(nVal, oVal) {
+				if (nVal) {
+					this.$refs.mescroll.refresh();
+				}
+			}
+		},
+		methods: {
+			ontabtap(e) {
+				let index = e.target.dataset.current || e.currentTarget.dataset.current;
+				this.orderStatus = this.statusList[index].status;
+				this.$refs.loadingCover.show();
+				this.$refs.mescroll.refresh();
+			},
+			getListData(mescroll) {
+				this.showEmpty = false;
+				this.$api.sendRequest({
+					url: '/pointexchange/api/order/page',
+					data: {
+						page: mescroll.num,
+						page_size: mescroll.size,
+						order_status: this.orderStatus
+					},
+					success: res => {
+						this.showEmpty = true;
+						let newArr = [];
+						let msg = res.message;
+						if (res.code == 0 && res.data) {
+							newArr = res.data.list;
+						} else {
+							this.$util.showToast({
+								title: msg
+							});
+						}
+						mescroll.endSuccess(newArr.length);
+						//设置列表数据
+						if (mescroll.num == 1) this.orderList = []; //如果是第一页需手动制空列表
+						this.orderList = this.orderList.concat(newArr); //追加新数据
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					},
+					fail: res => {
+						mescroll.endErr();
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					}
+				});
+			},
+			orderClose(order_id, index) {
+				uni.showModal({
+					title: '提示',
+					content: '确定关闭此次兑换？',
+					success: res => {
+						if (res.confirm) {
+							this.$api.sendRequest({
+								url: '/pointexchange/api/order/close',
+								data: {
+									order_id: order_id
+								},
+								success: res => {
+									if (res.code >= 0) {
+										this.orderList[index].order_status = -1;
+										this.$util.showToast({
+											title: '关闭成功'
+										});
+										this.$forceUpdate();
+									}
+								}
+							});
+						}
+					}
+				});
+			},
+			// 显示选择支付方式弹框
+			openChoosePayment(out_trade_no, price) {
+				this.outTradeNo = out_trade_no;
+				this.payMoney = parseFloat(price);
+				this.$refs.choosePaymentPopup.open();
+			},
+			orderPay() {
+				this.$refs.choosePaymentPopup.getPayInfo(this.outTradeNo);
+			},
+			detail(item) {
+				if (item.type == 1 && item.relate_order_id) {
+					switch (item.delivery_type) {
+						case 'store':
+							this.$util.redirectTo('/pages/order/detail_pickup', {
+								order_id: item.relate_order_id
+							});
+							break;
+						case 'local':
+							this.$util.redirectTo('/pages/order/detail_local_delivery', {
+								order_id: item.relate_order_id
+							});
+							break;
+						case 'express':
+							this.$util.redirectTo('/pages/order/detail', {
+								order_id: item.relate_order_id
+							});
+							break;
+						default:
+							this.$util.redirectTo('/pages_tool/order/detail_virtual', {
+								order_id: item.relate_order_id
+							});
+					}
+				} else {
+					this.$util.redirectTo('/pages/order/detail_point', {
+						order_id: item.order_id
+					});
+				}
+			},
+			imageError(index) {
+				this.orderList[index].exchange_image = this.$util.getDefaultImage().goods;
+				this.$forceUpdate();
+			}
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	/deep/ .fixed {
+		position: relative;
+		top: 0;
+	}
+
+	/deep/ .empty {
+		padding-top: 0 !important;
+	}
+
+	.order-container {
+		width: 100vw;
+		height: 100vh;
+	}
+
+	.align-right {
+		text-align: right;
+	}
+
+	.order-item {
+		margin: $margin-updown 24rpx;
+		border-radius: 12rpx;
+		background: #fff;
+		position: relative;
+	
+		.order-header {
+			display: flex;
+			align-items: center;
+			position: relative;
+			padding: $padding 24rpx 26rpx 24rpx;
+	
+			&.waitpay {
+				padding-left: 70rpx;
+	
+				.iconyuan_checked,
+				.iconyuan_checkbox {
+					font-size: $font-size-toolbar;
+					position: absolute;
+					top: 48%;
+					left: 20rpx;
+					transform: translateY(-50%);
+				}
+				.iconyuan_checkbox {
+					color: $color-tip;
+				}
+			}
+	
+			.icondianpu {
+				display: inline-block;
+				line-height: 1;
+				margin-right: 12rpx;
+				font-size: $font-size-base;
+			}
+			
+			.order-no {
+				font-size: 26rpx;
+			}
+	
+			.status-name {
+				flex: 1;
+				text-align: right;
+				font-size: 26rpx;
+				font-weight: 600;
+			}
+		}
+	
+		.order-body {
+			.goods-wrap {
+				display: flex;
+				position: relative;
+				padding: 0 24rpx 30rpx 24rpx;
+	
+				&:last-of-type {
+					margin-bottom: 0;
+				}
+	
+				.goods-img {
+					width: 160rpx;
+					height: 160rpx;
+					margin-right: 20rpx;
+	
+					image {
+						width: 100%;
+						height: 100%;
+						border-radius: $border-radius;
+					}
+				}
+	
+				.goods-info {
+					flex: 1;
+					position: relative;
+					max-width: calc(100% - 180rpx);
+					display: flex;
+					flex-direction: column;
+	
+					.pro-info {
+						flex: 1;
+					}
+	
+					.goods-name {
+						display: -webkit-box;
+						-webkit-box-orient: vertical;
+						-webkit-line-clamp: 2;
+						overflow: hidden;
+						line-height: 1.5;
+						font-size: $font-size-base;
+						color: $color-title;
+					}
+	
+					.goods-sub-section {
+						width: 100%;
+						line-height: 1.3;
+						display: flex;
+						margin-top: 14rpx;
+	
+						.goods-price {
+							font-size: $font-size-tag;
+							color: var(--price-color);
+							flex: 1;
+							font-weight: bold;
+						}
+						.goods-num {
+							font-size: $font-size-tag;
+							color: $color-tip;
+							flex: 1;
+							text-align: right;
+							line-height: 1;
+	
+							.iconfont {
+								font-size: $font-size-tag;
+							}
+						}
+						.goods-type {
+							font-size: $font-size-tag;
+						}
+	
+						.unit {
+							font-size: $font-size-tag;
+							margin-right: 2rpx;
+						}
+	
+						view {
+							flex: 1;
+							line-height: 1.3;
+							display: flex;
+							flex-direction: column;
+	
+							&:last-of-type {
+								text-align: right;
+	
+								.iconfont {
+									line-height: 1;
+									font-size: $font-size-tag;
+								}
+							}
+						}
+					}
+	
+					.goods-action {
+						text-align: right;
+	
+						.action-btn {
+							line-height: 1;
+							padding: 14rpx 20rpx;
+							color: $color-title;
+							display: inline-block;
+							border-radius: $border-radius;
+							background: #fff;
+							border: 2rpx solid #999;
+							font-size: $font-size-tag;
+							margin-left: 10rpx;
+						}
+					}
+				}
+			}
+			
+			.multi-order-goods {
+				width: calc(100vw - 96rpx);
+				white-space: nowrap;
+				margin: 0 24rpx 30rpx 24rpx!important;
+				position: relative;
+				
+				.scroll-view {
+					width: 100%;
+				}
+				
+				.goods-wrap {
+					padding: 0;
+				}
+				
+				.goods-img {
+					min-width: 160rpx;
+				}
+				
+				.shade {
+					position: absolute;
+					z-index: 5;
+					height: 100%;
+					width: 44rpx;
+					right: 0;
+					top: 0;
+					
+					image {
+						width: 100%;
+						height: 100%;
+					}
+				}
+			}
+		}
+	
+		.order-footer {
+			.order-base-info {
+				.total {
+					padding: $padding;
+					font-size: $font-size-tag;
+					background: rgba(248, 248, 248, 0.5);
+					display: flex;
+					margin: 0 24rpx;
+	
+					& > text {
+						flex: 1;
+						line-height: 1;
+						margin-left: 10rpx;
+					}
+				}
+	
+				.order-type {
+					padding-top: 20rpx;
+					flex: 0.5;
+	
+					& > text {
+						line-height: 1;
+					}
+				}
+			}
+	
+			.order-action {
+				text-align: right;
+				padding: 30rpx 24rpx;
+				position: relative;
+				
+				.order-time {
+					position: absolute;
+					top: 35rpx;
+					left: 30rpx;
+					display: flex;
+					align-items: center;
+					font-size: 10px;
+					color:#b5b6b9;
+					
+					image {
+						width: 26rpx;
+						height: 26rpx;
+						margin-right: 6rpx;
+					}
+				}
+	
+				.action-btn {
+					line-height: 1;
+					padding: 20rpx 26rpx;
+					color: #333;
+					display: inline-block;
+					border-radius: $border-radius;
+					background: #fff;
+					border: 2rpx solid #999;
+					font-size: $font-size-tag;
+					margin-left: 10rpx;
+				}
+			}
+		}
+	}
+
+	.empty {
+		padding-top: 200rpx;
+		text-align: center;
+
+		.empty-image {
+			width: 180rpx;
+			height: 180rpx;
+		}
+	}
+	
+	.order-nav {
+		width: 100vw;
+		height: 80rpx;
+		flex-direction: row;
+		/* #ifndef APP-PLUS */
+		white-space: nowrap;
+		/* #endif */
+		background: #fff;
+		display: flex;
+		position: fixed;
+		left: 0;
+		z-index: 998;
+		justify-content: space-around;
+		border-radius: 0px 0px 24rpx 24rpx;
+	
+		.uni-tab-item {
+			width: 120rpx;
+			text-align: center;
+		}
+	
+		.uni-tab-item-title {
+			display: inline-block;
+			height: 80rpx;
+			line-height: 80rpx;
+			border-bottom: 1px solid #fff;
+			flex-wrap: nowrap;
+			/* #ifndef APP-PLUS */
+			white-space: nowrap;
+			/* #endif */
+			text-align: center;
+			font-size: 30rpx;
+			position: relative;
+		}
+	
+		.uni-tab-item-title-active::after {
+			content: " ";
+			display: block;
+			position: absolute;
+			left: 0;
+			bottom: 0;
+			width: 100%;
+			height: 6rpx;
+			background: linear-gradient(270deg, var(--base-color-light-9) 0%, var(--base-color) 100%);
+		}
+	
+		::-webkit-scrollbar {
+			width: 0;
+			height: 0;
+			color: transparent;
+		}
+	}
+</style>
diff --git a/pages_promotion/point/payment.vue b/pages_promotion/point/payment.vue
new file mode 100644
index 0000000..780f7e3
--- /dev/null
+++ b/pages_promotion/point/payment.vue
@@ -0,0 +1,309 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<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="orderPaymentData.exchange_info.type == 1 && orderPaymentData.is_virtual == 0">
+				<!-- 配送方式 -->
+				<view class="delivery-mode" v-if="orderCreateData.delivery &&orderPaymentData.delivery.express_type.length > 1">
+					<view class="action">
+						<view v-for="(deliveryItem, deliveryIndex) in orderPaymentData.delivery.express_type"
+							:key="deliveryIndex"
+							:class="{active: deliveryItem.name == orderCreateData.delivery.delivery_type}"
+							@click="selectDeliveryType(deliveryItem)">
+							{{ deliveryItem.title }}
+							<!-- 外圆角 -->
+							<view class="out-radio"></view>
+						</view>
+					</view>
+				</view>
+
+				<view class="address-box" :class="{'not-delivery-type': orderPaymentData.delivery.express_type.length <= 1}"
+					v-if="orderPaymentData.delivery.delivery_type != 'store'">
+					<block v-if="storeInfo.storeList.length > 1 && orderPaymentData.delivery.delivery_type == 'local'">
+						<view class="local-delivery-store" v-if="Object.keys(storeInfo.currStore).length" @click="$refs.deliveryPopup.open()">
+							<view class="info">
+								由 <text class="store-name">{{ storeInfo.currStore.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" :class="{'local': orderPaymentData.delivery.delivery_type == 'local'}" v-if="orderCreateData.member_address" @click="selectAddress">
+						<view class="content">
+							<text class="name font-size-base">{{ orderCreateData.member_address.name ? orderCreateData.member_address.name : '' }}</text>
+							<text class="font-size-base mobile">{{ orderCreateData.member_address.mobile ? orderCreateData.member_address.mobile : '' }}</text>
+							<text class="cell-more iconfont icon-right"></text>
+							<view class="desc-wrap">
+								{{ orderCreateData.member_address.full_address ? orderCreateData.member_address.full_address : '' }}
+								{{ orderCreateData.member_address.address ? orderCreateData.member_address.address : '' }}
+							</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>
+
+					<!-- 外卖配送 -->
+					<block v-if="orderPaymentData.delivery.delivery_type == 'local'">
+						<view class="local-box" v-if="orderPaymentData.config.local.is_use && orderPaymentData.delivery.local.info && orderPaymentData.delivery.local.info.time_is_open == 1">
+							<view class="pick-block" @click="localtime">
+								<view class="font-size-base">送达时间</view>
+								<view class="time-picker">
+									<text :class="{'color-tip': !orderCreateData.buyer_ask_delivery_title}">{{ orderCreateData.buyer_ask_delivery_title ? orderCreateData.buyer_ask_delivery_title : '请选择送达时间' }}</text>
+									<text class="iconfont icon-right cell-more"></text>
+								</view>
+							</view>
+						</view>
+					</block>
+					<image class="address-line" :src="$util.img('public/uniapp/order/address-line.png')"></image>
+				</view>
+
+				<view class="store-box" :class="{'not-delivery-type': orderPaymentData.delivery.express_type.length <= 1}" v-if="orderPaymentData.delivery.delivery_type == 'store' && storeInfo.currStore">
+					<block v-if="storeInfo.currStore">
+						<view @click="openSiteDelivery" class="store-info">
+							<view class="store-address-info">
+								<view class="info-wrap">
+									<view class="title">
+										<text>{{ storeInfo.currStore.store_name }}</text>
+										<view class="cell-more iconfont icon-right"></view>
+									</view>
+									<view class="store-detail">
+										<view v-if="storeInfo.currStore.open_date">
+											营业时间：{{ storeInfo.currStore.open_date }}</view>
+										<view>地址：{{ storeInfo.currStore.full_address }}
+											{{ storeInfo.currStore.address }}
+										</view>
+									</view>
+								</view>
+							</view>
+						</view>
+						<view class="mobile-wrap store-mobile">
+							<view class="form-group">
+								<text class="text">姓名</text>
+								<input type="text" placeholder-class="color-tip placeholder" class="input" v-model="member_address.name" disabled />
+							</view>
+						</view>
+						<view class="mobile-wrap store-mobile">
+							<view class="form-group">
+								<text class="text">预留手机</text>
+								<input type="number" maxlength="11" placeholder="请输入您的手机号码"
+									placeholder-class="color-tip placeholder" class="input" v-model="member_address.mobile" />
+							</view>
+						</view>
+						<view class="store-time">
+							<view class="left">自提时间</view>
+							<view class="right" @click="storetime">
+								{{orderCreateData.buyer_ask_delivery_title}}
+								<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="mobile-wrap" v-if="orderPaymentData.is_virtual == 1 && orderCreateData.member_address">
+				<view class="tips color-base-text">
+					<text class="iconfont icon-gantanhao"></text>
+					购买虚拟类商品需填写手机号，方便商家与您联系
+				</view>
+				<view class="form-group">
+					<text class="iconfont icon-dianhua2"></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>
+
+			<!-- 店铺 -->
+			<view class="site-wrap" :class="orderPaymentData.exchange_info.type == 2 || orderPaymentData.exchange_info.type == 3 ? 'margin-top' : ''">
+				<view class="site-body">
+					<view class="goods-wrap">
+						<block v-if="orderPaymentData.exchange_info.type == 2">
+							<view class="goods-img">
+								<image :src="orderPaymentData.exchange_info.image ? $util.img(orderPaymentData.exchange_info.image) : $util.img('public/uniapp/point/coupon.png')" @error="imageError()" mode="aspectFill"/>
+							</view>
+						</block>
+						<block v-else-if="orderPaymentData.exchange_info.type == 3">
+							<view class="goods-img">
+								<image :src="orderPaymentData.exchange_info.image ? $util.img(orderPaymentData.exchange_info.image) : $util.img('public/uniapp/point/hongbao.png')" @error="imageError()" mode="aspectFill"/>
+							</view>
+						</block>
+						<block v-else>
+							<view class="goods-img">
+								<image :src="$util.img(orderPaymentData.exchange_info.image)" @error="imageError()" mode="aspectFill"/>
+							</view>
+						</block>
+						<view class="goods-info">
+							<view class="goods-name">{{ orderPaymentData.exchange_info.name }}</view>
+							<view class="goods-sub-section">
+								<view v-if="orderPaymentData.exchange_info.pay_type == 1" class="color-base-text">
+									<text class="goods-price">{{ orderPaymentData.exchange_info.point }}</text>
+									<text class="unit">积分</text>
+									<template v-if="orderPaymentData.exchange_info.price != '0.00'">
+										<text class="unit">+{{ $lang('common.currencySymbol') }}</text>
+										<text class="goods-price">{{ orderPaymentData.exchange_info.price }}</text>
+									</template>
+								</view>
+								<view>
+									<text class="font-size-tag">x</text>
+									<text class="font-size-base">{{ orderPaymentData.goods_num }}</text>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+				<view class="site-footer">
+					<view class="order-cell">
+						<text class="tit">买家留言</text>
+						<view class="box"><input type="text" placeholder="留言前建议先与商家协调一致" placeholder-class="color-tip" v-model="orderCreateData.buyer_message" /></view>
+					</view>
+				</view>
+			</view>
+
+			<!-- 金额 -->
+			<view class="order-money">
+				<view class="order-cell">
+					<text class="tit">所需积分</text>
+					<view class="box">
+						<text class="money">{{ orderPaymentData.point }}</text>
+						<text class="unit">积分</text>
+					</view>
+				</view>
+				<view class="order-cell" v-if="orderPaymentData.exchange_info.type == 1 && orderPaymentData.delivery_money > 0">
+					<text class="tit">运费</text>
+					<view class="box">
+						<text class="unit">{{ $lang('common.currencySymbol') }}</text>
+						<text class="money">{{ orderPaymentData.delivery_money | moneyFormat }}</text>
+					</view>
+				</view>
+
+			</view>
+
+			<view class="error-message" v-if="orderPaymentData.delivery && orderPaymentData.delivery.delivery_type == 'local' && orderPaymentData.delivery && orderPaymentData.delivery.error && orderPaymentData.delivery.error !== ''">
+				{{orderPaymentData.delivery.error_msg}}
+			</view>
+			<view class="order-submit" :class="{ 'bottom-safe-area': isIphoneX }">
+				<view class="order-settlement-info">
+					<text class="font-size-base color-tip margin-right">共{{ orderPaymentData.goods_num }}件</text>
+					<text class="font-size-base">合计：</text>
+					<text class="color-base-text money">{{ orderPaymentData.point }}</text>
+					<text class="color-base-text unit">积分</text>
+					<template v-if="orderPaymentData.exchange_info.type == 1 && orderPaymentData.order_money > 0">
+						<text class="color-base-text unit">+{{ $lang('common.currencySymbol') }}</text>
+						<text class="color-base-text money">{{ orderPaymentData.order_money | moneyFormat }}</text>
+					</template>
+				</view>
+				<view class="submit-btn">
+					<button v-if="createBtn()" type="primary" class="mini" size="mini" @click="openChoosePayment()">提交订单</button>
+					<button v-else class="no-submit mini" size="mini">
+						<block v-if="orderPaymentData.delivery && orderPaymentData.delivery.delivery_type == 'local' && orderPaymentData.delivery && orderPaymentData.delivery.error && orderPaymentData.delivery.start_money > orderPaymentData.price">
+							差{{ orderPaymentData.delivery.start_money-orderPaymentData.price | moneyFormat }}起送
+						</block>
+						<block v-else >提交订单</block>
+					</button>
+				</view>
+			</view>
+			<div class="order-submit-block"></div>
+
+			<!-- 门店列表弹窗 -->
+			<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 }">
+						<view class="delivery-content">
+							<view class="item-wrap" v-for="(item, index) in storeInfo.storeList" :key="index" @click="selectPickupPoint(item)">
+								<view class="detail">
+									<view class="name" :class="item.store_id == orderPaymentData.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 == orderPaymentData.delivery.store_id ? 'color-base-text' : ''" class="font-size-goods-tag">
+											营业时间：{{ item.open_date }}
+										</view>
+										<view :class="item.store_id == orderPaymentData.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 == orderPaymentData.delivery.store_id"><text class="iconfont icon-yuan_checked color-base-text"></text></view>
+							</view>
+							<view v-if="!storeInfo.storeList" class="empty">所选择收货地址附近没有可以自提的门店</view>
+						</view>
+					</view>
+				</view>
+			</uni-popup>
+
+		</scroll-view>
+
+		<!-- 选择支付方式弹窗 -->
+		<ns-payment ref="choosePaymentPopup" :payMoney="orderPaymentData.order_money" @confirm="orderCreate"></ns-payment>
+
+		<loading-cover ref="loadingCover"></loading-cover>
+
+		<!-- 门店自提、同城配送时间选择 -->
+		<ns-select-time @selectTime='selectTime' ref="TimePopup"></ns-select-time>
+	</view>
+</template>
+
+<script>
+	import payment from './public/js/payment.js';
+	import uniPopup from '@/components/uni-popup/uni-popup.vue';
+
+	export default {
+		components: {
+			uniPopup,
+		},
+		mixins: [payment]
+	};
+</script>
+
+<style lang="scss">
+	@import "@/common/css/order_parment.scss";
+</style>
+<style scoped>
+	/deep/ .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+		background: none;
+		max-height: unset !important;
+		overflow-y: hidden !important;
+	}
+
+	>>>.uni-popup__wrapper {
+		border-radius: 20rpx 20rpx 0 0;
+	}
+
+	>>>.uni-popup {
+		z-index: 8;
+	}
+</style>
\ No newline at end of file
diff --git a/pages_promotion/point/public/css/list.scss b/pages_promotion/point/public/css/list.scss
new file mode 100644
index 0000000..1c19734
--- /dev/null
+++ b/pages_promotion/point/public/css/list.scss
@@ -0,0 +1,987 @@
+.conteiner  {
+	width: 100vw;
+	height: 100vh;
+	display: flex;
+	flex-direction: column;
+	
+	.point-scroll-view {
+		flex: 1;
+		height: 0;
+	}
+}
+
+.point-navbar {
+	width: 100vw;
+	padding-bottom: 20rpx;
+	display: flex;
+	align-items: center;
+	position: fixed;
+	left: 0;
+	top: 0;
+	z-index: 100;
+	background-image: linear-gradient(360deg, #F8F8F8 0%, #E74A32 100%);
+	background-size: 100% 400rpx;
+	background-position-y: top;
+	background-repeat: no-repeat;
+	
+	.nav-wrap {
+		height: 100%;
+		display: flex;
+		padding: 0 24rpx;
+		box-sizing: border-box;
+	}
+	
+	.back {
+		background: rgba(255, 255, 255, .4);
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		border-radius: 50%;
+		
+		.iconfont {
+			color: #222222;
+			font-size: 36rpx;
+			font-weight: bold;
+		}
+	}
+	
+	.search {
+		flex: 1;
+		background: #fff;
+		margin: 0 15rpx;
+		border-radius: 30rpx;
+		display: flex;
+		align-items: center;
+		box-sizing: border-box;
+		padding: 20rpx;
+		
+		.tips {
+			color: #4A4A4A;
+			font-size: 24rpx;
+			margin-left: 20rpx;
+		}
+	}
+	
+	.sign {
+		image {
+			width: 100%;
+			height: 100%;
+		}
+	}
+}
+
+.point-navbar-block {
+	padding-bottom: 20rpx;
+}
+
+.point-wrap {
+	background-image: linear-gradient(360deg, #F8F8F8 0%, #E74A32 100%);
+	background-size: 100% 380rpx;
+	background-repeat: no-repeat;
+	// #ifndef MP-WEIXIN
+	padding-top: 20rpx
+	// #endif
+}
+
+/* 说明弹框 */
+.tips-layer {
+	background: #fff;
+	z-index: 999;
+	height: 40%;
+	width: 100%;
+	
+	.head {
+		position: relative;
+	}
+	
+	.title {
+		height: 80rpx;
+		line-height: 80rpx;
+		text-align: center;
+		font-size: $font-size-toolbar;
+		font-weight: 700;
+	}
+	
+	text {
+		position: absolute;
+		top: 8rpx;
+		right: 22px;
+		font-size: $font-size-toolbar;
+		font-weight: 500;
+	}
+	
+	.body {
+		width: 100%;
+		height: calc(100% - 80rpx);
+		overflow-y: scroll;
+		
+		.detail {
+			padding: 20rpx;
+			
+			.font-size-base {
+				margin-bottom: 10rpx;
+			}
+		}
+		
+	}
+}
+
+.lineheight-clear {
+	line-height: 1!important;
+}
+
+// 商品列表双列样式
+.goods-list.double-column {
+	display: flex;
+	flex-wrap: wrap;
+	margin-top: 20rpx;
+	
+	.goods-item {
+		flex: 1;
+		position: relative;
+		background-color: #fff;
+		flex-basis: 48%;
+		max-width: calc((100% - 24rpx) / 2);
+		margin-right: 24rpx;
+		margin-bottom: 24rpx;
+		border-radius: 18rpx;
+			
+		&:nth-child(2n) {
+			margin-right: 0;
+		}
+		
+		.goods-img {
+			position: relative;
+			overflow: hidden;
+			padding-top: 100%;
+			border-top-left-radius: 18rpx;
+			border-top-right-radius: 18rpx;
+			
+			image {
+				width: 100%;
+				position: absolute;
+				top: 50%;
+				left: 0;
+				transform: translateY(-50%);
+			}
+		}
+		
+		.goods-tag{
+			color: #fff;
+			line-height: 1;
+			padding: 8rpx 16rpx;
+			position: absolute;
+			border-bottom-right-radius: $border-radius;
+			top: 0;
+			left: 0;
+			font-size: $font-size-goods-tag;
+		}
+		
+		.goods-tag-img {
+			position: absolute;
+			border-top-left-radius: $border-radius;
+			width: 80rpx;
+			height: 80rpx;
+			top: 0;
+			left: 0;
+			z-index: 5;
+			overflow: hidden;
+			
+			image {
+				width: 100%;
+				height: 100%;
+			}
+		}
+		
+		.info-wrap {
+			padding: 0 20rpx 24rpx 20rpx;
+		}
+		
+		.goods-name {
+			line-height: 1.3;
+			overflow: hidden;
+			text-overflow: ellipsis;
+			display: -webkit-box;
+			-webkit-line-clamp: 2;
+			-webkit-box-orient: vertical;
+			margin-top: 20rpx;
+			font-size: 26rpx;
+			color: #333;
+			font-weight: 600;
+		}
+		
+		.discount-price {
+			display: flex;
+			flex-wrap: wrap;
+			align-items: center;
+			font-weight: bold;
+			line-height: 1;
+			margin-top: 16rpx;
+			color: var(--price-color);
+			overflow: hidden;
+			flex: 1;
+			width: 0;
+			margin-right: 20rpx;
+			view{
+				line-height: 1;
+				color: var(--price-color);
+			}
+			.unit {
+				margin-right: 6rpx;
+			}
+			.point{
+				font-size: 32rpx;
+			}
+		}
+		
+		.pro-info {
+			display: flex;
+			margin-top: 16rpx;
+			justify-content: flex-start;
+			& > view {
+				line-height: 1;
+				display: flex;
+				align-items: center;
+				
+				button {
+					padding: 0 16rpx;
+					line-height: 2;
+				}
+				&:nth-child(2) {
+					&:before{
+						content: ' ';
+						width: 2rpx;
+						background-color: #D8D8D8;
+						height: 20rpx;
+						margin: 0 16rpx;
+					}
+				}
+			}
+		}
+		
+		.member-price-tag {
+			display: inline-block;
+			width: 60rpx;
+			line-height: 1;
+			margin-left: 6rpx;
+			
+			image {
+				width: 100%;
+			}
+		}
+		
+		.lineheight-clear {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			flex-wrap: wrap;
+			
+			.btn {
+				width: 96rpx;
+				height: 50rpx;
+				line-height: 50rpx;
+				background: #FF6C24;
+				border-radius: 50rpx;
+				text-align: center;
+				color: #fff;
+				font-size: 26rpx;
+				margin-top: 20rpx;
+			}
+		}
+	}
+}
+
+.head-wrap {
+	width: 100vw;
+	line-height: 1;
+	position: relative;
+	height: 270rpx;
+	
+	& > image {
+		width: 100%;
+	}
+	
+	.wrap {
+		width: 100%;
+		height: 100%;
+		position: absolute;
+		z-index: 5;
+		top: 0;
+		left: 0;
+	}
+	
+	.member-wrap {
+		height: 190rpx;
+		padding: 50rpx 30rpx 30rpx 30rpx;
+		display: flex;
+		align-items: center;
+		box-sizing: border-box;
+		
+		.headimg {
+			width: 100rpx;
+			height: 100rpx;
+			background: #fff;
+			border: 2px solid #fff;
+			border-radius: 50%;
+			overflow: hidden;
+			
+			image {
+				width: 100%;
+				height: 100%;
+			}
+		}
+		
+		.point {
+			margin-left: 30rpx;
+			color: var(--btn-text-color);
+			font-size: 36rpx;
+		}
+		
+		.point-name {
+			font-size: $font-size-tag;
+			color: var(--btn-text-color);
+			margin-left: 4rpx;
+			margin-top: 5rpx;
+			
+		}
+		
+		.rule {
+			flex: 1;
+			text-align: right;
+			color: var(--btn-text-color);
+		}
+		
+		.icon-wenhao {
+			font-size: 24rpx;
+			color: var(--btn-text-color);
+			margin-right: 6rpx;
+		}
+		
+	}
+	
+	.action-wrap {
+		// margin: 0 30rpx;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		height: 80rpx;
+		background-color: rgba(255, 255, 255, .1);
+		
+		view {
+			line-height: 1;
+			text-align: center;
+			width: calc((100vw - 1rpx) / 2);
+			color: var(--btn-text-color);
+			
+			text {
+				font-size: $font-size-tag;
+				margin-left: 8rpx;
+			}
+			
+			// &:first-child {
+			// 	margin-right: 30rpx;
+			// }
+			
+			&.split {
+				width: 1rpx;
+				height: 50rpx;
+				background-color: rgba(238, 238, 238, .3);
+				flex-shrink: 0;
+			}
+			
+			image {
+				width: 100%;
+			}
+		}
+	}
+	
+	.no-login {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		text-align: center;
+		
+		text {
+			color: #fff;
+		}
+		
+		.login-btn {
+			display: inline-block;
+			height: 70rpx;
+			line-height: 70rpx;
+			width: 200rpx;
+			border: 1px solid #fff;
+			border-radius: $border-radius;
+			margin-bottom: 20rpx;
+		}
+	}
+}
+
+.ns-adv {
+	margin: 0;
+	border-radius: 0;
+	overflow: hidden;
+	line-height: 1;
+	
+	image {
+		width: 100%;
+		border-radius: 0!important;
+	}
+}
+.body-wrap {
+	margin-top: 20rpx;
+	
+	&.no-login{
+		margin-top: 20rpx;
+	}
+	
+	.point-exchange-wrap {
+		padding: 0 24rpx;
+		margin-top: 30rpx;
+	}
+	
+	.type-wrap {
+		display: flex;
+		align-items: center;
+		
+		.type-name {
+			font-size: 30rpx;
+			color: $color-title;
+			line-height: 1;
+		}
+		
+		>view {
+			width: 2rpx;
+			height: 23rpx;
+			background-color: $color-tip;
+			margin: 0 20rpx;
+		}
+		
+		.type-sub {
+			font-size: $font-size-tag;
+			color: $color-tip;
+			line-height: 1;
+		}
+	}
+	
+	.list-wrap {
+		width: 100%;
+		
+		.list-wrap-scroll {
+			width: 100%;
+			flex-direction: row;
+			// white-space: nowrap;
+			line-height: 1;
+		}
+		
+		.list-wrap-item {
+			display: inline-block;
+			width: 330rpx;
+			overflow: hidden;
+			margin-right: 30rpx;
+			margin-top: 20rpx;
+			position: relative;
+			
+			&.coupon-list-wrap-item {
+				// height: 170rpx;
+			}
+			
+			&.hongbao-list-wrap-item {
+				height: 141rpx;
+			}
+			
+			&:nth-child(2n+2){
+				margin-right: 0;
+			}
+			
+			.img-box {
+				width: 100%;
+				height: 100%;
+				position: absolute;
+				top: 0;
+				left: 0;
+				
+				image {
+					width: 100%;
+					height: 100%;
+				}
+			}
+			
+			.content {
+				position: relative;
+				z-index: 9;
+				
+				//优惠券样式
+				.coupon{
+					// background-color: #FFEAEA;
+					background-size: 100% 100%;
+					background-repeat: no-repeat;
+					border-radius: $border-radius;
+					display: flex;
+					padding:$margin-updown 0;
+					.coupon_right{
+						position:relative;
+						width:156rpx;
+						max-width: 156rpx;
+						
+						.coupon_btn{
+							margin: 10rpx auto 0;
+							width:80rpx;
+							height:40rpx;
+							line-height: 40rpx;
+							font-size: $font-size-tag;
+							text-align: center;
+							border-radius: 10rpx;
+							border-width: 1px;
+							border-style: solid;
+							background: #FF3D3D;
+							color: #fff;
+						}
+						.coupon_num {
+							margin-top:10rpx;
+							text-align: center;
+							color: #FF3D3D;
+						}
+						
+						&::after{
+							position :absolute;
+							top:50%;
+							margin-left: 0;
+							content:"";
+							width:0;
+							height:96%;
+							border-left: 2px dashed #FD463E;
+							transform: translateY(-50%);
+						}
+					}
+					.coupon_left{
+						flex:1;
+						width: 0;
+						text-align: left;
+						padding:0 $padding;
+						display: flex;
+						align-items: center;
+						.price{
+							margin-top: 0 !important;
+							padding:0;
+							font-weight: 600;
+							flex: 1;
+							width: 0;
+							overflow: hidden;
+							white-space: nowrap;
+							text-overflow: ellipsis;
+							color: #FD463E;
+							font-size: 56rpx;
+							text{
+								font-size: $font-size-tag;
+								color: #FD463E;
+							}
+						}
+						.coupon-info {
+							flex:1;
+							width: 0;
+							display: flex;
+							flex-direction: column;
+							align-items: flex-start;
+							justify-content: space-between;
+							height: 80%;
+						}
+						.coupon_condition{
+							line-height: 1;
+							overflow: hidden;
+							text-overflow: ellipsis;
+							white-space: nowrap;
+							font-size: 26rpx;
+							font-weight: bold;
+							color: #FD463E;
+						}
+						.coupon_type {
+							color: #FD463E;
+							font-size: 24rpx;
+						}
+					}
+				}
+				
+				.hongbao {
+					.coupon_left {
+						.price, .coupon_condition {
+							color: #FFFFFF;
+						}
+					}
+					
+					.coupon_right {
+						.coupon_num {
+							color: #FFFFFF;
+						}
+						
+						.coupon_btn {
+							color: #fff;
+							border-color: #fff;
+						}
+						&::after{
+							position :absolute;
+							top:0;
+							margin-left: 0;
+							content:"";
+							width:0;
+							height:100%;
+							border-left:0 ;
+							opacity: 0.2;
+						}
+					}
+				}
+				
+				.coupon-price-wrap {
+					width: 100%;
+					height: 105rpx;
+					display: flex;
+					justify-content: space-between;
+					
+					.coupon-price {
+						font-size: 48rpx;
+						margin-top: 10rpx;
+						margin-left: 20rpx;
+						
+						text {
+							font-size: $font-size-tag;
+						}
+					}
+				}
+				
+				.coupon-point {
+					.coupon-point-num {
+						width: 160rpx;
+						height: 44rpx;
+						position: relative;
+						
+						image {
+							width: 100%;
+							height: 100%;
+							position: absolute;
+						}
+						
+						text {
+							position: relative;
+							z-index: 9;
+							color: #FFFFFF;
+							font-size: 24rpx;
+							display: inline-block;
+							width: 100%;
+							line-height: 44rpx;
+							text-align: center;
+							vertical-align: top;
+						}
+					}
+					
+					.coupon-conditions {
+						font-size: $font-size-activity-tag;
+						color: $color-tip;
+						line-height: 1;
+						margin-top: $font-size-tag;
+					}
+				}
+				
+				.coupon-name {
+					font-size: $font-size-tag;
+					color: $color-title;
+					margin-top: 23rpx;
+					line-height: 1;
+					padding: 0 22rpx;
+					overflow: hidden;
+					text-overflow: ellipsis;
+					white-space: nowrap;
+				}
+				
+				// 红包
+				&.hongbao-content {
+					background-color: #FFFFFF;
+					border-radius: 20rpx;
+					padding-bottom: 30rpx;
+				}
+				
+				.hongbao-img {
+					height: 330rpx;
+					
+					image {
+						width: 100%;
+						height: 100%;
+					}
+				}
+				
+				.price {
+					font-size: $font-size-base;
+					color: $color-title;
+					line-height: 1;
+					padding-left: 26rpx;
+					margin-top: 20rpx;
+				}
+				
+				.point {
+					font-size: $font-size-toolbar;
+					padding-left: 26rpx;
+					margin-top: 17rpx;
+					line-height: 1;
+					text {
+						font-size: $font-size-tag;
+					}
+				}
+				
+				.stock {
+					font-size: $font-size-activity-tag;
+					color: $color-tip;
+					line-height: 1;
+					padding-left: 26rpx;
+					margin-top: 20rpx;
+				}
+			}
+		}
+	}
+}
+
+.exchange-coupon {
+	.list-wrap {
+		width: 100%;
+		overflow-x: scroll;
+		
+		.list-wrap-scroll {
+			flex-direction: column;
+			display: flex;
+			max-height: 388rpx;
+			flex-wrap: wrap;
+			
+			&.single-row {
+				max-height: 192rpx;
+			}
+		}
+		
+		.list-wrap-item {
+			width: 424rpx;
+			margin-right: 16rpx;
+			margin-top: 18rpx;
+		}
+	}
+}
+
+.type-wrap-box {
+	display: flex; 
+	justify-content: space-between;
+	
+	.more {
+		color: #ff5251;
+		cursor: pointer;
+	}
+}
+.card-category-title{
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	font-size: 30rpx;
+	color: #222;
+	padding: 0;
+	font-weight: bold;
+	
+	.before-line,.after-line{
+		width: 30rpx;
+		height: 4rpx;
+		margin: 0 10rpx;
+		background-color: #222;
+	}
+	
+}
+.head-box{
+	display: flex;
+	flex-direction: column;
+	background-color: #FFFFFF;
+	border-radius: 16rpx;
+	padding: 24rpx;
+	box-sizing: border-box;
+	width: calc(100% - 48rpx);
+	margin: 0 24rpx 20rpx 24rpx;
+	position: relative;
+	
+	.account-content{
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		
+		.left{
+			display: flex;
+			align-items: center;
+			image{
+				width: 88rpx;
+				height: 88rpx;
+			}
+			view{
+				font-size: 32rpx;
+				font-weight: bold;
+				margin-left: 25rpx;
+			}
+		}
+		.right{
+			display: flex;
+			align-items: baseline;
+			.point{
+				font-weight: bold!important;
+				font-size: 38rpx;
+				color: #FF002D ;
+			}
+			.text{
+				font-size: 28rpx;
+				font-weight: bold;
+				margin: 0 10rpx;
+			}
+		}
+	}
+	.remark{
+		display: flex;
+		align-items: center;
+		margin-top: 30rpx;
+		padding: 25rpx 0 0;
+		border-top: 2rpx solid #F2F2F2;
+		
+		.label{
+			border-radius: 4rpx;
+			border: 2rpx solid #FE172E;
+			color: #FE172E;
+			padding: 2rpx 8rpx;
+			font-size: 22rpx;
+			line-height: 1;
+			font-weight: bold;
+		}
+		.text{
+			font-size: 24rpx;
+			font-weight: bold;
+			margin-left: 30rpx;
+			line-height: 1;
+		}
+	}
+}
+
+.menu-wrap {
+	background: #fff;
+	border-radius: 24rpx;
+	margin: 20rpx 24rpx;
+	padding: 40rpx 0 30rpx 0; 
+	
+	.menu-list {
+		display: flex;
+		
+		.menu-item {
+			flex: 1;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			position: relative;
+			
+			.menu-tag {
+				position: absolute;
+				z-index: 2;
+				right: 0;
+				width: 58rpx;
+				height: 26rpx;
+			}
+			
+			.menu-img {
+				width: 86rpx;
+				height: 86rpx;
+			}
+			
+			.title {
+				margin-top: 16rpx;
+				font-size: 26rpx;
+				color: #222;
+			}
+		}
+	}
+}
+
+.poster-wrap {
+	margin: 20rpx 24rpx;
+	display: flex;
+	
+	.poster-item {
+		flex: 1;
+		border-radius: 16rpx;
+		overflow: hidden;
+		line-height: 1;
+		
+		image {
+			width: 100%;
+			height: auto;
+			will-change: transform;
+			line-height: 1;
+		}
+		
+		&:last-child {
+			margin-left: 20rpx;
+		}
+	}
+}
+
+.recharge-list-wrap {
+	margin: 20rpx 24rpx;
+	display: flex;
+	
+	.item-wrap {
+		overflow: hidden;
+		background: linear-gradient(321deg, #F4402B 0%, #FD7C40 100%);
+		border-radius: 16rpx;
+		position: relative;
+		padding-top: 40rpx;
+		width: calc((100% - 60rpx) / 4);
+		margin-right: 20rpx;
+		text-align: center;
+		
+		&:nth-child(4) {
+			margin-right: 0;
+		}
+		
+		&:before {
+			content: " ";
+			display: block;
+			position: absolute;
+			left: 50%;
+			top: 0;
+			transform: translate(-50%, -50%);
+			background: #f8f8f8;
+			width: 30rpx;
+			height: 30rpx;
+			border-radius: 50%;
+		}
+		
+		.recharge {
+			font-size: 26rpx;
+			color: #FFF20C;
+			white-space: nowrap;
+			padding: 0 10rpx;
+			overflow: hidden;
+		}
+		.point {
+			font-size: 20rpx;
+			color: #fff;
+			white-space: nowrap;
+			padding: 0 10rpx;
+			overflow: hidden;
+		}
+		.btn {
+			margin-top: 30rpx;
+			line-height: 60rpx;
+			font-size: 24rpx;
+			font-weight: 600;
+			color: #FFFFFF;
+			border-top: 2rpx dashed #fff;
+		}
+	}
+}
+
+.exchange-hongbao {
+	.coupon_left {
+		.price text {
+			color: #fff!important;
+		}
+	}
+	.coupon_right {
+		width: 120rpx!important;
+		max-width: 120rpx;
+	}
+}
\ No newline at end of file
diff --git a/pages_promotion/point/public/js/payment.js b/pages_promotion/point/public/js/payment.js
new file mode 100644
index 0000000..9260bdf
--- /dev/null
+++ b/pages_promotion/point/public/js/payment.js
@@ -0,0 +1,581 @@
+export default {
+	data() {
+		return {
+			isIphoneX: false,
+			orderCreateData: {
+				member_address: {
+					name: '',
+					mobile: ''
+				}
+			},
+			orderPaymentData: {
+				exchange_info: {
+					type: 0
+				},
+				delivery: {
+					delivery_type: '',
+					express_type: [],
+					member_address: {
+						name: '',
+						mobile: ''
+					},
+					local: {
+						info: {
+							start_time: 0,
+							end_time: 0,
+							time_week: []
+						}
+					},
+				},
+			},
+			isSub: false,
+			tempData: null,
+			// 门店信息
+			storeInfo: {
+				storeList: [], //门店列表
+				currStore: {} //当前选择门店
+			},
+			// 自提地址
+			member_address: {
+				name: '',
+				mobile: ''
+			},
+			// 当前时间
+			timeInfo: {
+				week: 0,
+				start_time: 0,
+				end_time: 0,
+				showTime: false,
+				showTimeBar: false
+			},
+			deliveryWeek: "",
+			// 选择自提、配送防重判断
+			judge: true,
+			menuButtonBounding: {}
+		};
+	},
+	methods: {
+		// 显示弹出层
+		openPopup(ref) {
+			this.$refs[ref].open();
+		},
+		// 关闭弹出层
+		closePopup(ref) {
+			if (this.tempData) {
+				Object.assign(this.orderCreateData, this.tempData);
+				Object.assign(this.orderPaymentData, this.tempData);
+				this.tempData = null;
+				this.$forceUpdate();
+			}
+			this.$refs[ref].close();
+		},
+		// 选择收货地址
+		selectAddress() {
+			var params = {
+				back: '/pages_promotion/point/payment',
+				local: 0,
+				type: 1
+			}
+			// 外卖配送需要定位地址
+			if (this.orderPaymentData.delivery.delivery_type == 'local') {
+				params.local = 1;
+				params.type = 2;
+			}
+			this.$util.redirectTo('/pages_tool/member/address', params);
+		},
+		// 获取订单初始化数据
+		getOrderPaymentData() {
+			this.orderCreateData = uni.getStorageSync('exchangeOrderCreateData');
+			var pay_flag = uni.getStorageSync("pay_flag"); // 支付中标识，防止返回时，提示,跳转错误
+			if (!this.orderCreateData) {
+				if (pay_flag == 1) {
+					uni.removeStorageSync("pay_flag");
+				} else {
+					this.$util.showToast({
+						title: '未获取到创建订单所需数据！'
+					});
+					setTimeout(() => {
+						this.$util.redirectTo('/pages/index/index');
+					}, 1500);
+				}
+				return;
+			}
+
+			// 获取经纬度
+			if (this.location) {
+				this.orderCreateData.latitude = this.location.latitude;
+				this.orderCreateData.longitude = this.location.longitude;
+			}
+
+			this.$api.sendRequest({
+				url: '/pointexchange/api/ordercreate/payment',
+				data: this.orderCreateData,
+				success: res => {
+					if (res.code >= 0) {
+						this.orderPaymentData = res.data;
+						this.orderPaymentData.timestamp = res.timestamp;
+
+						this.handlePaymentData();
+						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();
+				}
+			})
+		},
+		// 处理结算订单数据
+		handlePaymentData() {
+			this.orderCreateData.delivery = {};
+			this.orderCreateData.buyer_message = '';
+
+			var data = JSON.parse(JSON.stringify(this.orderPaymentData));
+			this.orderCreateData.order_key = data.order_key;
+
+			this.orderCreateData.delivery.store_id = 0;
+			this.orderCreateData.member_address = data.delivery.member_address;
+
+			// 店铺配送方式
+			if (data.delivery.express_type != undefined && data.delivery.express_type[0] != undefined) {
+
+				let deliveryStorage = uni.getStorageSync('delivery');
+				let delivery = data.delivery.express_type[0];
+				data.delivery.express_type.forEach(item => {
+					if (deliveryStorage && item.name == deliveryStorage.delivery_type) {
+						delivery = item;
+					}
+				});
+
+				this.selectDeliveryType(delivery);
+
+			}
+
+			if (this.orderPaymentData.is_virtual) this.orderCreateData.member_address = {
+				mobile: data.member_account.mobile != '' ? data.member_account.mobile : ''
+			};
+
+			// Object.assign(this.orderPaymentData, this.orderCreateData);
+			this.orderCalculate();
+		},
+		// 转化时间字符串
+		getTimeStr(val) {
+			var h = parseInt(val / 3600).toString();
+			var m = parseInt((val % 3600) / 60).toString();
+			if (m.length == 1) {
+				m = '0' + m;
+			}
+			if (h.length == 1) {
+				h = '0' + h;
+			}
+			return h + ':' + m;
+		},
+		// 订单计算
+		orderCalculate() {
+			var data = this.$util.deepClone(this.orderCreateData);
+			data.delivery = JSON.stringify(data.delivery);
+			if (this.orderCreateData.delivery.delivery_type == 'store') {
+				data.member_address = JSON.stringify(this.member_address);
+			} else {
+				data.member_address = JSON.stringify(data.member_address);
+			}
+
+			this.$api.sendRequest({
+				url: '/pointexchange/api/ordercreate/calculate',
+				data,
+				success: res => {
+					if (res.code >= 0) {
+						this.orderPaymentData.member_address = res.data.member_address;
+						this.orderPaymentData.delivery_money = res.data.delivery_money;
+						this.orderPaymentData.order_money = res.data.order_money;
+
+						Object.assign(this.orderPaymentData.delivery, res.data.delivery);
+
+						if (res.data.local_config) this.orderPaymentData.local_config = res.data
+							.config.local;
+
+						//时间选择判断
+						if (res.data.delivery.delivery_store_info) {
+							this.orderPaymentData.delivery_store_info = JSON.parse(res.data.delivery.delivery_store_info);
+							if (this.judge) {
+								if (this.orderPaymentData.delivery.delivery_type == "store") {
+									this.storetime('no');
+								} else if (this.orderPaymentData.delivery.delivery_type == 'local') {
+									this.localtime('no');
+								}
+								this.judge = false;
+							}
+						}
+
+						this.createBtn();
+						this.$forceUpdate();
+					} else {
+						this.$util.showToast({
+							title: res.message
+						});
+					}
+				},
+			})
+		},
+		/**
+		 * 订单创建验证
+		 */
+		createBtn() {
+			if (this.orderPaymentData.delivery &&
+				this.orderPaymentData.delivery.delivery_type == 'local' &&
+				this.orderPaymentData.delivery &&
+				this.orderPaymentData.delivery.error &&
+				this.orderPaymentData.delivery.start_money > this.orderPaymentData.price) {
+				return false;
+			}
+			if (this.orderPaymentData.delivery &&
+				this.orderPaymentData.delivery.delivery_type == 'local' &&
+				this.orderPaymentData.delivery &&
+				this.orderPaymentData.delivery.error &&
+				this.orderPaymentData.delivery.error !== '') {
+				return false;
+			}
+			return true;
+		},
+		// 订单创建
+		orderCreate() {
+			if (this.verify()) {
+				if (this.isSub) return;
+				this.isSub = true;
+
+				uni.setStorageSync('paySource', 'pointexchange');
+
+				var data = this.$util.deepClone(this.orderCreateData);
+				data.delivery = JSON.stringify(data.delivery);
+				if (this.orderCreateData.delivery.delivery_type == 'store') {
+					data.member_address = JSON.stringify(this.member_address);
+				} else {
+					data.member_address = JSON.stringify(data.member_address);
+				}
+
+				this.$api.sendRequest({
+					url: '/pointexchange/api/ordercreate/create',
+					data,
+					success: res => {
+						uni.hideLoading();
+						if (res.code >= 0) {
+							if (this.orderPaymentData.exchange_info.type == 1 && this.orderPaymentData.order_money != '0.00') {
+
+								let orderCreateData = uni.getStorageSync('exchangeOrderCreateData');
+								orderCreateData.out_trade_no = res.data;
+								uni.setStorageSync('exchangeOrderCreateData', orderCreateData);
+
+								this.$refs.choosePaymentPopup.getPayInfo(res.data);
+								this.isSub = false;
+							} else {
+								this.$util.redirectTo('/pages_promotion/point/result', {}, 'redirectTo');
+							}
+						} else {
+							this.isSub = false;
+							if (res.data.error_code == 10 || res.data.error_code == 12) {
+								uni.showModal({
+									title: '订单未创建',
+									content: res.message,
+									confirmText: '去设置',
+									success: res => {
+										if (res.confirm) {
+											this.selectAddress();
+										}
+									}
+								})
+							} else {
+								this.$util.showToast({
+									title: res.message
+								});
+							}
+						}
+					},
+					fail: res => {
+						uni.hideLoading();
+						this.isSub = false;
+					}
+				})
+			}
+		},
+		// 订单验证
+		verify() {
+			if (this.orderPaymentData.exchange_info.type == 1) {
+				if (this.orderPaymentData.is_virtual == 1) {
+					if (!this.orderCreateData.member_address.mobile.length) {
+						this.$util.showToast({
+							title: '请输入您的手机号码'
+						});
+						return false;
+					}
+					if (!this.$util.verifyMobile(this.orderCreateData.member_address.mobile)) {
+						this.$util.showToast({
+							title: '请输入正确的手机号码'
+						});
+						return false;
+					}
+				}
+
+				if (this.orderPaymentData.is_virtual == 0) {
+					if (!this.orderCreateData.delivery || !this.orderCreateData.delivery.delivery_type) {
+						this.$util.showToast({
+							title: '商家未设置配送方式'
+						});
+						return false;
+					}
+
+					if (this.orderCreateData.delivery.delivery_type != 'store') {
+						if (!this.orderCreateData.member_address) {
+							this.$util.showToast({
+								title: '请先选择您的收货地址'
+							});
+							return false;
+						}
+					}
+
+					if (this.orderCreateData.delivery.delivery_type == 'store') {
+						if (!this.orderCreateData.delivery.store_id) {
+							this.$util.showToast({
+								title: '没有可提货的门店,请选择其他配送方式'
+							});
+							return false;
+						}
+						if (!this.member_address.mobile) {
+							this.$util.showToast({
+								title: '请输入预留手机'
+							});
+							return false;
+						}
+						if (!this.$util.verifyMobile(this.member_address.mobile)) {
+							this.$util.showToast({
+								title: '请输入正确的预留手机'
+							});
+							return false;
+						}
+
+						if (!this.orderCreateData.delivery.buyer_ask_delivery_time.start_date || !this.orderCreateData.delivery.buyer_ask_delivery_time.end_date) {
+							this.$util.showToast({
+								title: '请选择自提时间'
+							});
+							return false;
+						}
+					}
+
+					if (this.orderCreateData.delivery.delivery_type == 'local') {
+						if (!this.orderCreateData.delivery.store_id) {
+							this.$util.showToast({
+								title: '没有可配送的门店,请选择其他配送方式'
+							});
+							return false;
+						}
+						if (this.orderPaymentData.config.local.is_use && this.orderPaymentData.delivery.local.info && this.orderPaymentData.delivery.local.info.time_is_open == 1 && (!this.orderCreateData.delivery.buyer_ask_delivery_time.start_date || !this.orderCreateData.delivery.buyer_ask_delivery_time.end_date)) {
+							this.$util.showToast({
+								title: '请选择配送时间'
+							});
+							return false;
+						}
+					}
+				}
+
+			}
+			return true;
+		},
+		// 显示店铺配送信息
+		openSiteDelivery() {
+			this.tempData = {
+				delivery: this.$util.deepClone(this.orderPaymentData.delivery)
+			};
+			this.$refs.deliveryPopup.open();
+		},
+		// 选择配送方式
+		selectDeliveryType(data) {
+			uni.setStorageSync('delivery', {
+				delivery_type: data.name,
+				delivery_type_name: data.title
+			});
+			this.orderCreateData.delivery.delivery_type = data.name;
+			this.orderCreateData.delivery.delivery_type_name = data.title;
+
+			// 如果是门店配送
+			if (data.name == 'store') {
+				this.storeSelected(data);
+				this.member_address.name = this.orderPaymentData.member_account.nickname;
+				if (!this.member_address.mobile) this.member_address.mobile = this.orderPaymentData.member_account.mobile != '' ? this.orderPaymentData.member_account.mobile : '';
+			}
+			if (data.name == 'local') {
+				this.storeSelected(data);
+			}
+			// Object.assign(this.orderPaymentData, this.orderCreateData);
+
+			this.judge = true;
+
+			this.orderCalculate();
+			this.$forceUpdate();
+		},
+		// 切换到门店
+		storeSelected(data) {
+			// 门店列表
+			this.storeInfo.storeList = data.store_list;
+			let store = data.store_list[0] ? data.store_list[0] : null;
+			this.selectPickupPoint(store);
+		},
+		// 选择自提点
+		selectPickupPoint(store_item) {
+			if (store_item) {
+				this.orderCreateData.delivery.store_id = store_item.store_id;
+				this.storeInfo.currStore = store_item;
+				// 存储所选门店
+				let delivery = uni.getStorageSync('delivery') || {
+					name: this.orderCreateData.delivery.delivery_type,
+					title: this.orderCreateData.delivery.delivery_type_name
+				};
+				delivery.store_id = store_item.store_id;
+				uni.setStorageSync('delivery', delivery)
+			} else {
+				this.orderCreateData.delivery.store_id = 0;
+				this.storeInfo.currStore = {};
+			}
+			this.orderCreateData.delivery.buyer_ask_delivery_time = {
+				start_date: '',
+				end_date: ''
+			};
+			this.orderCreateData.buyer_ask_delivery_title = '';
+			// Object.assign(this.orderPaymentData, this.orderCreateData);
+			this.orderCalculate();
+			this.$forceUpdate();
+			this.$refs['deliveryPopup'].close();
+		},
+		imageError() {
+			let imageUrl = ''
+			if (this.orderPaymentData.exchange_info.type == 1) {
+				imageUrl = this.$util.img('public/uniapp/point/gift.png');
+			} else if (this.orderPaymentData.exchange_info.type == 2) {
+				imageUrl = this.$util.img('public/uniapp/point/coupon.png');
+			} else if (this.orderPaymentData.exchange_info.type == 3) {
+				imageUrl = this.$util.img('public/uniapp/point/hongbao.png');
+			} else {
+				imageUrl = this.$util.getDefaultImage().goods;
+			}
+			this.orderPaymentData.exchange_info.image = imageUrl;
+			this.$forceUpdate();
+		},
+		// 获取时间
+		getTime() {
+			// 必须是字符串,跟后端一致
+			let weeks = ['0', '1', '2', '3', '4', '5', '6'];
+			let week = new Date().getDay();
+			this.timeInfo.week = weeks[week];
+		},
+		navigateTo(sku_id) {
+			this.$util.redirectTo('/pages/goods/detail', {
+				sku_id
+			});
+		},
+		// 显示选择支付方式弹框
+		openChoosePayment() {
+			if (this.verify() && this.orderPaymentData.exchange_info.type == 1 && this.orderPaymentData.order_money != '0.00') this.$refs.choosePaymentPopup.open();
+			else this.orderCreate();
+		},
+		/**
+		 * 同城配送数据处理
+		 */
+		localtime(type = '') {
+			let data = this.$util.deepClone(this.orderPaymentData.delivery.local.info);
+			if (data.delivery_time) {
+				data.end_time = data.delivery_time[(data.delivery_time.length - 1)].end_time;
+			}
+			let obj = {
+				delivery: this.orderCreateData.delivery,
+				dataTime: data
+			}
+			this.$refs.TimePopup.open(obj, type);
+		},
+		/**
+		 * 门店自提数据处理
+		 */
+		storetime(type = '') {
+			if (this.orderPaymentData.delivery.delivery_store_info) {
+				let data = this.$util.deepClone(this.storeInfo.currStore);
+				data.delivery_time = typeof data.delivery_time == 'string' && data.delivery_time ? JSON.parse(data
+					.delivery_time) : data.delivery_time;
+				if (!data.delivery_time || data.delivery_time.length == undefined && !data.delivery_time.length) {
+					data.delivery_time = [{
+						start_time: data.start_time,
+						end_time: data.end_time
+					}]
+				}
+				let obj = {
+					delivery: this.orderCreateData.delivery,
+					dataTime: data
+				}
+				this.$refs.TimePopup.open(obj, type);
+				this.$forceUpdate();
+			}
+		},
+		/**
+		 * 弹窗返回数据
+		 */
+		selectTime(data) {
+			if (data.data && data.data.month) {
+				this.orderCreateData.delivery.buyer_ask_delivery_time = {
+					start_date:data.data.start_date,
+					end_date:data.data.end_date
+				};
+				if (data.data.title == '今天' || data.data.title == '明天') {
+					this.orderCreateData.buyer_ask_delivery_title = data.data.title + '(' + data.data.time + ')'
+				} else {
+					this.orderCreateData.buyer_ask_delivery_title = data.data.month + '(' + data.data.time + ')'
+				}
+				this.orderCalculate();
+				this.$forceUpdate();
+			}
+		},
+		back() {
+			uni.navigateBack({
+				delta: 1
+			});
+		}
+	},
+	onShow() {
+		if (uni.getStorageSync('addressBack')) {
+			uni.removeStorageSync('addressBack');
+		}
+		// 判断登录
+		if (!this.storeToken) {
+			this.$util.redirectTo('/pages_tool/login/login');
+		} else {
+			this.getOrderPaymentData();
+		}
+		this.judge = true;
+
+		this.getTime();
+		this.isIphoneX = this.$util.uniappIsIPhoneX()
+	},
+	onHide() {
+		if (this.$refs.loadingCover) this.$refs.loadingCover.show();
+	},
+	onLoad() {
+		if (!this.location) this.$util.getLocation();
+		// #ifdef MP
+		this.menuButtonBounding = uni.getMenuButtonBoundingClientRect();
+		// #endif
+	},
+	watch: {
+		location: function(nVal) {
+			if (nVal) {
+				this.getOrderPaymentData();
+			}
+		}
+	},
+	filters: {
+		// 金额格式化输出
+		moneyFormat(money) {
+			return parseFloat(money).toFixed(2);
+		}
+	}
+}
\ No newline at end of file
diff --git a/pages_promotion/point/result.vue b/pages_promotion/point/result.vue
new file mode 100644
index 0000000..f109295
--- /dev/null
+++ b/pages_promotion/point/result.vue
@@ -0,0 +1,93 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view class="container">
+		<view class="image-wrap">
+			<image :src="$util.img('public/uniapp/pay/pay_success.png')" class="result-image" mode="widthFix"></image>
+		</view>
+		<view class="msg">{{ $lang('exchangeSuccess') }}</view>
+		<view class="action">
+			<view class="btn color-base-border color-base-text" @click="toOrderList()">{{ $lang('see') }}</view>
+			<view class="btn go-home color-base-bg" @click="toIndex">{{ $lang('goHome') }}</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {};
+		},
+		onShow() {
+		},
+		methods: {
+			toOrderList() {
+				this.$util.redirectTo('/pages_promotion/point/order_list', {}, 'redirectTo');
+			},
+			toIndex() {
+				this.$util.redirectTo('/pages/index/index');
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	.container {
+		width: 100vw;
+		height: 100vh;
+		background: #fff;
+
+		.image-wrap {
+			display: flex;
+			justify-content: center;
+			padding: 200rpx 0 40rpx 0;
+
+			.result-image {
+				width: 166rpx;
+			}
+		}
+
+		.msg {
+			text-align: center;
+			line-height: 1;
+			margin-bottom: 50rpx;
+			font-size: $font-size-base;
+			color: #000;
+		}
+
+		.pay-amount {
+			color: #999;
+			text-align: center;
+			line-height: 1;
+			margin-bottom: 30rpx;
+		}
+
+		.action {
+			width: 90%;
+			margin: 0 auto;
+			text-align: center;
+			margin-top: 150rpx;
+			display: flex;
+			justify-content: space-between;
+
+			.btn {
+				width: 310rpx;
+				height: 78rpx;
+				border: 2rpx solid #ffffff;
+				border-radius: $border-radius;
+				font-size: $font-size-tag;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+			}
+
+			.alone {
+				margin-left: 0;
+				width: 60%;
+			}
+
+			.go-home {
+				color: #fff;
+			}
+		}
+	}
+</style>
diff --git a/pages_tool/agreement/contenr.vue b/pages_tool/agreement/contenr.vue
new file mode 100644
index 0000000..41b7087
--- /dev/null
+++ b/pages_tool/agreement/contenr.vue
@@ -0,0 +1,55 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view style="padding: 20rpx;">
+		<rich-text :nodes="content"></rich-text>
+	</view>
+</template>
+
+<script>
+import htmlParser from '@/common/js/html-parser';
+export default {
+	 components: {
+	  },
+    data() {
+        return {
+			content:'',
+			type:'',
+			uniacid:0
+        };
+    },
+    onLoad(option) {
+		this.type = option.type
+		this.uniacid = option.uniacid?option.uniacid:0
+		
+        this.isIphoneX = this.$util.uniappIsIPhoneX()
+		 this.getcontent()
+    },
+    onShow() {
+      
+    },
+    methods: {
+        getcontent() {
+			// privacy  content
+			var data = {
+				type:this.type
+			}
+			if(this.uniacid > 0) data.uniacid = this.uniacid
+            this.$api.sendRequest({
+               	url: '/api/config/agreement',
+				data:data,
+                success: res => {
+					console.log(res.data.title)
+					uni.setNavigationBarTitle({
+						title:res.data.title
+					})
+					this.content = res.data.content
+				}                   
+            });
+        }
+    }
+};
+</script>
+
+<style lang="scss">
+
+</style>
\ No newline at end of file
diff --git a/pages_tool/article/detail.vue b/pages_tool/article/detail.vue
new file mode 100644
index 0000000..e86ed84
--- /dev/null
+++ b/pages_tool/article/detail.vue
@@ -0,0 +1,159 @@
+<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;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages_tool/article/list.vue b/pages_tool/article/list.vue
new file mode 100644
index 0000000..499d256
--- /dev/null
+++ b/pages_tool/article/list.vue
@@ -0,0 +1,221 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view>
+		<mescroll-uni @getData="getData" ref="mescroll">
+			<block slot="list">
+				<view class="article-wrap" v-if="list.length">
+					<ns-adv keyword="NS_ARTICLE" class-name="adv-wrap"></ns-adv>
+					<view class="item" v-for="(item, index) in list" :key="index" @click="toDetail(item)">
+						<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, 'date') }}</text>
+							</view>
+						</view>
+					</view>
+				</view>
+				<view v-else class="empty-wrap"><ns-empty text="暂无文章" :isIndex="false"></ns-empty></view>
+				<loading-cover ref="loadingCover"></loading-cover>
+			</block>
+		</mescroll-uni>
+
+		<!-- #ifdef MP-WEIXIN -->
+		<!-- 小程序隐私协议 -->
+		<privacy-popup ref="privacyPopup"></privacy-popup>
+		<!-- #endif -->
+	</view>
+</template>
+
+<script>
+	import nsAdv from '@/components/ns-adv/ns-adv.vue';
+	export default {
+		data() {
+			return {
+				list: []
+			};
+		},
+		components: {
+			nsAdv
+		},
+		onShow() {
+			this.setPublicShare();
+		},
+		methods: {
+			getData(mescroll) {
+				this.$api.sendRequest({
+					url: '/api/article/page',
+					data: {
+						page_size: mescroll.size,
+						page: mescroll.num
+					},
+					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.list = []; //如果是第一页需手动制空列表
+						this.list = this.list.concat(newArr); //追加新数据
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					},
+					fail: res => {
+						mescroll.endErr();
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					}
+				});
+			},
+			toDetail(item) {
+				this.$util.redirectTo('/pages_tool/article/detail', {
+					article_id: item.article_id
+				});
+			},
+			imgError(index) {
+				if (this.list[index]) this.list[index].cover_img = this.$util.getDefaultImage().article;
+			},
+			// 设置公众号分享
+			setPublicShare() {
+				let shareUrl = this.$config.h5Domain + '/pages_tool/article/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/article/list';
+			return {
+				title: title,
+				path: path,
+				success: res => {},
+				fail: res => {}
+			};
+		},
+		//分享到朋友圈
+		onShareTimeline() {
+			var title = '文章列表';
+			var query = '/pages_tool/article/list';
+			return {
+				title: title,
+				query: query,
+				imageUrl: ''
+			};
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	/deep/ .fixed {
+		position: relative;
+		top: 0;
+	}
+
+	.empty-wrap {
+		padding-top: 200rpx;
+	}
+
+	.article-wrap {
+		background: #f8f8f8;
+
+		.adv-wrap {
+			margin: 24rpx 24rpx 0 24rpx;
+			width: auto;
+		}
+
+		.item {
+			display: flex;
+			padding: 20rpx;
+			background-color: #fff;
+			margin: 24rpx;
+			border-radius: 16rpx;
+
+			.article-img {
+				margin-right: 20rpx;
+				width: 160rpx;
+				height: 160rpx;
+				overflow: hidden;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+
+				image {
+					width: 100%;
+				}
+			}
+
+			.info-wrap {
+				flex: 1;
+				display: flex;
+				flex-direction: column;
+				justify-content: space-between;
+
+				.title {
+					font-weight: bold;
+					margin-bottom: 10rpx;
+					overflow: hidden;
+					text-overflow: ellipsis;
+					display: -webkit-box;
+					-webkit-line-clamp: 2;
+					-webkit-box-orient: vertical;
+					font-size: 30rpx;
+					line-height: 1.5;
+				}
+
+				.abstract {
+					overflow: hidden;
+					text-overflow: ellipsis;
+					display: -webkit-box;
+					-webkit-line-clamp: 2;
+					-webkit-box-orient: vertical;
+					font-size: $font-size-tag;
+				}
+
+				.read-wrap {
+					display: flex;
+					color: #999ca7;
+					justify-content: flex-start;
+					align-items: center;
+					margin-top: 10rpx;
+					line-height: 1;
+
+					text {
+						font-size: $font-size-tag;
+					}
+
+					.iconfont {
+						font-size: 36rpx;
+						vertical-align: bottom;
+						margin-right: 10rpx;
+					}
+
+					.category-icon {
+						width: 8rpx;
+						height: 8rpx;
+						border-radius: 50%;
+						background: $base-color;
+						margin-right: 10rpx;
+					}
+
+					.date {
+						margin-left: 20rpx;
+					}
+				}
+			}
+		}
+	}
+</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
new file mode 100644
index 0000000..de52ecd
--- /dev/null
+++ b/pages_tool/components/chat-message/chat-message.vue
@@ -0,0 +1,342 @@
+<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;
+	}
+</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
new file mode 100644
index 0000000..bc32eec
--- /dev/null
+++ b/pages_tool/components/img-cropping/cropping.vue
@@ -0,0 +1,1484 @@
+<template name="yq-avatar">
+	<view>
+		<image v-if="imgSrc.imgSrc" :src="imgSrc.imgSrc" @click="fSelect" :style="[iS]" class="my-avatar"></image>
+		<canvas canvas-id="avatar-canvas" id="avatar-canvas" class="my-canvas" :style="{ top: sT, height: csH }" disable-scroll="false"></canvas>
+		<canvas
+			canvas-id="oper-canvas"
+			id="oper-canvas"
+			class="oper-canvas"
+			:style="{ top: sT, height: csH }"
+			disable-scroll="false"
+			@touchstart="fStart"
+			@touchmove="fMove"
+			@touchend="fEnd"
+		></canvas>
+		<canvas canvas-id="prv-canvas" id="prv-canvas" class="prv-canvas" disable-scroll="false" @touchstart="fHideImg" :style="{ height: csH, top: pT }"></canvas>
+		<view class="oper-wrapper" :style="{ display: sD, top: tp }">
+			<view class="oper">
+				<view class="btn-wrapper" v-if="sO">
+					<view @click="fClose" class="cancel" :style="{ width: bW }"><text>取消</text></view>
+					<view @click="fSelect" :style="{ width: bW }"><text class="iconfont icon-shangchuan"></text></view>
+					<view @click="fRotate" :style="{ width: bW, display: bD }"><text class="iconfont icon-xuanzhuan"></text></view>
+					<!-- <view @click="fPreview" hover-class="hover" :style="{width: bW}"><text>预览</text></view> -->
+					<view @click="fUpload" :style="{ width: bW }"><text class="upload">上传</text></view>
+				</view>
+				<view class="clr-wrapper" v-else>
+					<slider
+						class="my-slider"
+						@change="fColorChange"
+						block-size="25"
+						value="0"
+						min="-100"
+						max="100"
+						activeColor="red"
+						backgroundColor="green"
+						block-color="grey"
+						show-value
+					></slider>
+					<view @click="fPrvUpload" hover-class="hover" :style="{ width: bW }"><text>上传</text></view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+'use strict';
+const tH = 50;
+export default {
+	name: 'yq-avatar',
+	data() {
+		return {
+			csH: '0',
+			sD: 'none',
+			sT: '-10000px',
+			pT: '-10000px',
+			iS: {},
+			sS: {},
+			sO: true,
+			bW: '19%',
+			bD: 'flex',
+			tp: 0,
+			imgSrc: {
+				imgSrc: ''
+			}
+		};
+	},
+	watch: {
+		avatarSrc() {
+			this.imgSrc.imgSrc = this.avatarSrc;
+		}
+	},
+	props: {
+		avatarSrc: '',
+		avatarStyle: '',
+		selWidth: '',
+		selHeight: '',
+		expWidth: '',
+		expHeight: '',
+		minScale: '',
+		maxScale: '',
+		canScale: '',
+		canRotate: '',
+		lockWidth: '',
+		lockHeight: '',
+		stretch: '',
+		lock: '',
+		fileType: '',
+		noTab: '',
+		inner: '',
+		quality: '',
+		index: '',
+		bgImage: ''
+	},
+	created() {
+		this.cc = uni.createCanvasContext('avatar-canvas', this);
+		this.cco = uni.createCanvasContext('oper-canvas', this);
+		this.ccp = uni.createCanvasContext('prv-canvas', this);
+		this.qlty = parseFloat(this.quality) || 1;
+		this.imgSrc.imgSrc = this.avatarSrc;
+		this.letRotate = this.canRotate === false || this.inner === true || this.inner === 'true' || this.canRotate === 'false' ? 0 : 1;
+		this.letScale = this.canScale === false || this.canScale === 'false' ? 0 : 1;
+		this.isin = this.inner === true || this.inner === 'true' ? 1 : 0;
+		this.indx = this.index || undefined;
+		this.mnScale = parseFloat(this.minScale) || 0.3;
+		this.mxScale = parseFloat(this.maxScale) || 4;
+		this.noBar = this.noTab === true || this.noTab === 'true' ? 1 : 0;
+		this.stc = this.stretch;
+		this.lck = this.lock;
+		this.fType = this.fileType === 'jpg' ? 'jpg' : 'png';
+		if (this.isin || !this.letRotate) {
+			this.bW = '24%';
+			this.bD = 'none';
+		} else {
+			this.bW = '19%';
+			this.bD = 'flex';
+		}
+
+		if (this.noBar) {
+			this.fWindowResize();
+		} else {
+			uni.showTabBar({
+				fail: () => {
+					this.noBar = 1;
+				},
+				success: () => {
+					this.noBar = 0;
+				},
+				complete: res => {
+					this.fWindowResize();
+				}
+			});
+		}
+	},
+	methods: {
+		fWindowResize() {
+			let sysInfo = uni.getSystemInfoSync();
+			this.platform = sysInfo.platform;
+			this.wW = sysInfo.windowWidth;
+
+			// #ifdef H5
+			this.drawTop = sysInfo.windowTop;
+			// #endif
+			// #ifndef H5
+			this.drawTop = 0;
+			// #endif
+
+			// #ifdef MP-ALIPAY
+			this.wH = sysInfo.screenHeight - sysInfo.statusBarHeight - sysInfo.titleBarHeight;
+			this.csH = this.wH - tH + 'px';
+			// #endif
+
+			// #ifndef MP-ALIPAY
+			this.wH = sysInfo.windowHeight;
+			if (!this.noBar) this.wH += tH;
+			this.csH = this.wH - tH + 'px';
+			// #endif
+
+			this.tp = this.csH;
+			// #ifdef H5
+			this.tp = sysInfo.windowTop + parseInt(this.csH) + 'px';
+			// #endif
+
+			this.pxRatio = this.wW / 750;
+
+			let style = this.avatarStyle;
+			if (style && style !== true && (style = style.trim())) {
+				style = style.split(';');
+				let obj = {};
+				for (let v of style) {
+					if (!v) continue;
+					v = v.trim().split(':');
+					if (v[1].toString().indexOf('upx') >= 0) {
+						let arr = v[1].trim().split(' ');
+						for (let k in arr) {
+							if (!arr[k]) continue;
+							if (arr[k].toString().indexOf('upx') >= 0) {
+								arr[k] = parseFloat(arr[k]) * this.pxRatio + 'px';
+							}
+						}
+						v[1] = arr.join(' ');
+					}
+					obj[v[0].trim()] = v[1].trim();
+				}
+				this.iS = obj;
+			}
+
+			this.expWidth && (this.eW = this.expWidth.toString().indexOf('upx') >= 0 ? parseInt(this.expWidth) * this.pxRatio : parseInt(this.expWidth));
+			this.expHeight && (this.eH = this.expHeight.toString().indexOf('upx') >= 0 ? parseInt(this.expHeight) * this.pxRatio : parseInt(this.expHeight));
+
+			if (this.sD === 'flex') {
+				this.fDrawInit(true);
+			}
+			this.fHideImg();
+		},
+		fSelect() {
+			if (this.fSelecting) return;
+			this.fSelecting = true;
+			setTimeout(() => {
+				this.fSelecting = false;
+			}, 500);
+
+			uni.chooseImage({
+				count: 1,
+				sizeType: ['original', 'compressed'],
+				sourceType: ['album', 'camera'],
+				success: r => {
+					// #ifdef MP-ALIPAY
+					uni.showLoading();
+					// #endif
+					// #ifndef MP-ALIPAY
+					uni.showLoading({
+						title: '加载中...',
+						mask: true
+					});
+					// #endif
+
+					let path = (this.imgPath = r.tempFilePaths[0]);
+					uni.getImageInfo({
+						src: path,
+						success: r => {
+							this.imgWidth = r.width;
+							this.imgHeight = r.height;
+							this.path = path;
+							if (!this.hasSel) {
+								let style = this.sS || {};
+								if (this.selWidth && this.selHeight) {
+									let sW = this.selWidth.toString().indexOf('upx') >= 0 ? parseInt(this.selWidth) * this.pxRatio : parseInt(this.selWidth),
+										sH = this.selHeight.toString().indexOf('upx') >= 0 ? parseInt(this.selHeight) * this.pxRatio : parseInt(this.selHeight);
+									style.width = sW + 'px';
+									style.height = sH + 'px';
+									style.top = ((this.wH - sH - tH) | 0) / 2 + 'px';
+									style.left = ((this.wW - sW) | 0) / 2 + 'px';
+								} else {
+									uni.showModal({
+										title: '裁剪框的宽或高没有设置',
+										showCancel: false
+									});
+									return;
+								}
+								this.sS = style;
+							}
+
+							if (this.noBar) {
+								this.fDrawInit(true);
+							} else {
+								uni.hideTabBar({
+									complete: () => {
+										this.fDrawInit(true);
+									}
+								});
+							}
+						},
+						fail: () => {
+							this.$util.showToast({
+								title: '请选择正确图片'
+							});
+						},
+						complete() {
+							uni.hideLoading();
+						}
+					});
+				}
+			});
+		},
+		fUpload() {
+			if (this.fUploading) return;
+			this.fUploading = true;
+			setTimeout(() => {
+				this.fUploading = false;
+			}, 1000);
+
+			let style = this.sS,
+				x = parseInt(style.left),
+				y = parseInt(style.top),
+				width = parseInt(style.width),
+				height = parseInt(style.height),
+				expWidth = this.eW || width * this.pixelRatio,
+				expHeight = this.eH || height * this.pixelRatio;
+
+			// #ifdef MP-ALIPAY
+			uni.showLoading();
+			// #endif
+			// #ifndef MP-ALIPAY
+			uni.showLoading({
+				title: '加载中...',
+				mask: true
+			});
+			// #endif
+
+			this.sD = 'none';
+			this.sT = '-10000px';
+			this.hasSel = false;
+			this.fHideImg();
+			// #ifdef MP-ALIPAY
+			this.cc.toTempFilePath({
+				x: x,
+				y: y,
+				width: width,
+				height: height,
+				destWidth: expWidth,
+				destHeight: expHeight,
+				fileType: this.fType,
+				quality: this.qlty,
+				success: r => {
+					r = r.apFilePath;
+					this.$emit('upload', {
+						avatar: this.imgSrc,
+						path: r,
+						index: this.indx,
+						data: this.rtn,
+						base64: this.base64 || null
+					});
+				},
+				fail: res => {
+					uni.showToast({
+						title: 'error1',
+						duration: 2000
+					});
+				},
+				complete: () => {
+					uni.hideLoading();
+					this.noBar || uni.showTabBar();
+					this.$emit('end');
+				}
+			});
+			// #endif
+
+			// #ifdef MP-WEIXIN
+			uni.canvasToTempFilePath(
+				{
+					x: x,
+					y: y,
+					width: width,
+					height: height,
+					destWidth: expWidth,
+					destHeight: expHeight,
+					canvasId: 'avatar-canvas',
+					fileType: this.fType,
+					quality: this.qlty,
+					success: r => {
+						r = r.tempFilePath;
+						this.blob(r, base64 => {
+							this.$emit('upload', {
+								avatar: this.imgSrc,
+								path: r,
+								index: this.indx,
+								data: this.rtn,
+								base64: base64 || null
+							});
+						});
+					},
+					fail: res => {
+						uni.showToast({
+							title: 'error1',
+							duration: 2000
+						});
+					},
+					complete: () => {
+						uni.hideLoading();
+						this.noBar || uni.showTabBar();
+						this.$emit('end');
+					}
+				},
+				this
+			);
+			// #endif
+
+			// #ifndef MP-ALIPAY
+			uni.canvasToTempFilePath(
+				{
+					x: x,
+					y: y,
+					width: width,
+					height: height,
+					destWidth: expWidth,
+					destHeight: expHeight,
+					canvasId: 'avatar-canvas',
+					fileType: this.fType,
+					quality: this.qlty,
+					success: r => {
+						r = r.tempFilePath;
+						// #ifdef H5
+						this.btop(r).then(r => {
+							this.$emit('upload', {
+								avatar: this.imgSrc,
+								path: r,
+								index: this.indx,
+								data: this.rtn,
+								base64: this.base64 || null
+							});
+							return;
+						});
+						// #endif
+						// #ifndef H5
+						this.$emit('upload', {
+							avatar: this.imgSrc,
+							path: r,
+							index: this.indx,
+							data: this.rtn,
+							base64: this.base64 || null
+						});
+						// #endif
+					},
+					fail: res => {
+						uni.showToast({
+							title: 'error1',
+							duration: 2000
+						});
+					},
+					complete: () => {
+						uni.hideLoading();
+						this.noBar || uni.showTabBar();
+						this.$emit('end');
+					}
+				},
+				this
+			);
+			// #endif
+		},
+		fPrvUpload() {
+			if (this.fPrvUploading) return;
+			this.fPrvUploading = true;
+			setTimeout(() => {
+				this.fPrvUploading = false;
+			}, 1000);
+
+			let style = this.sS,
+				destWidth = parseInt(style.width),
+				destHeight = parseInt(style.height),
+				prvX = this.prvX,
+				prvY = this.prvY,
+				prvWidth = this.prvWidth,
+				prvHeight = this.prvHeight,
+				expWidth = this.eW || parseInt(style.width) * this.pixelRatio,
+				expHeight = this.eH || parseInt(style.height) * this.pixelRatio;
+
+			// #ifdef MP-ALIPAY
+			uni.showLoading();
+			// #endif
+			// #ifndef MP-ALIPAY
+			uni.showLoading({
+				title: '加载中...',
+				mask: true
+			});
+			// #endif
+
+			this.sD = 'none';
+			this.sT = '-10000px';
+			this.hasSel = false;
+			this.fHideImg();
+			// #ifdef MP-ALIPAY
+			this.ccp.toTempFilePath({
+				x: prvX,
+				y: prvY,
+				width: prvWidth,
+				height: prvHeight,
+				destWidth: expWidth,
+				destHeight: expHeight,
+				fileType: this.fType,
+				quality: this.qlty,
+				success: r => {
+					r = r.apFilePath;
+					this.$emit('upload', {
+						avatar: this.imgSrc,
+						path: r,
+						index: this.indx,
+						data: this.rtn,
+						base64: this.base64 || null
+					});
+				},
+				fail: () => {
+					uni.showToast({
+						title: 'error_prv',
+						duration: 2000
+					});
+				},
+				complete: () => {
+					uni.hideLoading();
+					this.noBar || uni.showTabBar();
+					this.$emit('end');
+				}
+			});
+			// #endif
+			// #ifndef MP-ALIPAY
+			uni.canvasToTempFilePath(
+				{
+					x: prvX,
+					y: prvY,
+					width: prvWidth,
+					height: prvHeight,
+					destWidth: expWidth,
+					destHeight: expHeight,
+					canvasId: 'prv-canvas',
+					fileType: this.fType,
+					quality: this.qlty,
+					success: r => {
+						r = r.tempFilePath;
+						// #ifdef H5
+						this.btop(r).then(r => {
+							this.$emit('upload', {
+								avatar: this.imgSrc,
+								path: r,
+								index: this.indx,
+								data: this.rtn,
+								base64: this.base64 || null
+							});
+						});
+						// #endif
+						// #ifndef H5
+						this.$emit('upload', {
+							avatar: this.imgSrc,
+							path: r,
+							index: this.indx,
+							data: this.rtn,
+							base64: this.base64 || null
+						});
+						// #endif
+					},
+					fail: () => {
+						uni.showToast({
+							title: 'error_prv',
+							duration: 2000
+						});
+					},
+					complete: () => {
+						uni.hideLoading();
+						this.noBar || uni.showTabBar();
+						this.$emit('end');
+					}
+				},
+				this
+			);
+			// #endif
+		},
+		fDrawInit(ini = false) {
+			let allWidth = this.wW,
+				allHeight = this.wH,
+				imgWidth = this.imgWidth,
+				imgHeight = this.imgHeight,
+				imgRadio = imgWidth / imgHeight,
+				useWidth = allWidth - 40,
+				useHeight = allHeight - tH - 80,
+				useRadio = useWidth / useHeight,
+				sW = parseInt(this.sS.width),
+				sH = parseInt(this.sS.height);
+
+			this.fixWidth = 0;
+			this.fixHeight = 0;
+			this.lckWidth = 0;
+			this.lckHeight = 0;
+			switch (this.stc) {
+				case 'x':
+					this.fixWidth = 1;
+					break;
+				case 'y':
+					this.fixHeight = 1;
+					break;
+				case 'long':
+					if (imgRadio > 1) this.fixWidth = 1;
+					else this.fixHeight = 1;
+					break;
+				case 'short':
+					if (imgRadio > 1) this.fixHeight = 1;
+					else this.fixWidth = 1;
+					break;
+				case 'longSel':
+					if (sW > sH) this.fixWidth = 1;
+					else this.fixHeight = 1;
+					break;
+				case 'shortSel':
+					if (sW > sH) this.fixHeight = 1;
+					else this.fixWidth = 1;
+					break;
+			}
+			switch (this.lck) {
+				case 'x':
+					this.lckWidth = 1;
+					break;
+				case 'y':
+					this.lckHeight = 1;
+					break;
+				case 'long':
+					if (imgRadio > 1) this.lckWidth = 1;
+					else this.lckHeight = 1;
+					break;
+				case 'short':
+					if (imgRadio > 1) this.lckHeight = 1;
+					else this.lckWidth = 1;
+					break;
+				case 'longSel':
+					if (sW > sH) this.lckWidth = 1;
+					else this.lckHeight = 1;
+					break;
+				case 'shortSel':
+					if (sW > sH) this.lckHeight = 1;
+					else this.lckWidth = 1;
+					break;
+			}
+			if (this.fixWidth) {
+				useWidth = sW;
+				useHeight = useWidth / imgRadio;
+			} else if (this.fixHeight) {
+				useHeight = sH;
+				useWidth = useHeight * imgRadio;
+			} else if (imgRadio < useRadio) {
+				if (imgHeight < useHeight) {
+					useWidth = imgWidth;
+					useHeight = imgHeight;
+				} else {
+					useWidth = useHeight * imgRadio;
+				}
+			} else {
+				if (imgWidth < useWidth) {
+					useWidth = imgWidth;
+					useHeight = imgHeight;
+				} else {
+					useHeight = useWidth / imgRadio;
+				}
+			}
+			if (this.isin) {
+				if (useWidth < sW) {
+					useWidth = sW;
+					useHeight = useWidth / imgRadio;
+					this.lckHeight = 0;
+				}
+				if (useHeight < sH) {
+					useHeight = sH;
+					useWidth = useHeight * imgRadio;
+					this.lckWidth = 0;
+				}
+			}
+
+			this.scaleSize = 1;
+			this.rotateDeg = 0;
+			this.posWidth = ((allWidth - useWidth) / 2) | 0;
+			this.posHeight = ((allHeight - useHeight - tH) / 2) | 0;
+			this.useWidth = useWidth | 0;
+			this.useHeight = useHeight | 0;
+			this.centerX = this.posWidth + useWidth / 2;
+			this.centerY = this.posHeight + useHeight / 2;
+			this.focusX = 0;
+			this.focusY = 0;
+
+			let style = this.sS,
+				left = parseInt(style.left),
+				top = parseInt(style.top),
+				width = parseInt(style.width),
+				height = parseInt(style.height),
+				canvas = this.canvas,
+				canvasOper = this.canvasOper,
+				cc = this.cc,
+				cco = this.cco;
+
+			cco.beginPath();
+			cco.setLineWidth(3);
+			cco.setGlobalAlpha(1);
+			cco.setStrokeStyle('white');
+			cco.strokeRect(left, top, width, height);
+
+			cco.setFillStyle('black');
+			cco.setGlobalAlpha(0.5);
+			cco.fillRect(0, 0, this.wW, top);
+			cco.fillRect(0, top, left, height);
+			cco.fillRect(0, top + height, this.wW, this.wH - height - top - tH);
+			cco.fillRect(left + width, top, this.wW - width - left, height);
+
+			cco.setGlobalAlpha(1);
+			cco.setStrokeStyle('red');
+			cco.moveTo(left + 15, top);
+			cco.lineTo(left, top);
+			cco.lineTo(left, top + 15);
+			cco.moveTo(left + width - 15, top);
+			cco.lineTo(left + width, top);
+			cco.lineTo(left + width, top + 15);
+			cco.moveTo(left + 15, top + height);
+			cco.lineTo(left, top + height);
+			cco.lineTo(left, top + height - 15);
+			cco.moveTo(left + width - 15, top + height);
+			cco.lineTo(left + width, top + height);
+			cco.lineTo(left + width, top + height - 15);
+			cco.stroke();
+
+			cco.draw(false, () => {
+				if (ini) {
+					this.sD = 'flex';
+					this.sT = this.drawTop + 'px';
+					this.fDrawImage(true);
+				}
+			});
+			this.$emit('init');
+		},
+		fDrawImage(ini = false) {
+			let tm_now = Date.now();
+			if (tm_now - this.drawTm < 20) return;
+			this.drawTm = tm_now;
+
+			let cc = this.cc,
+				imgWidth = this.useWidth * this.scaleSize,
+				imgHeight = this.useHeight * this.scaleSize;
+
+			// #ifdef MP-ALIPAY
+			cc.save();
+			// #endif
+
+			if (this.bgImage) {
+				// #ifdef MP-ALIPAY
+				cc.clearRect(0, 0, this.wW, this.wH - tH);
+				// #endif
+				// #ifndef MP-ALIPAY
+				cc.drawImage(this.bgImage, 0, 0, this.wW, this.wH - tH);
+				// #endif
+			} else {
+				cc.fillRect(0, 0, this.wW, this.wH - tH);
+			}
+
+			if (this.isin) {
+				let cx = this.focusX * (this.scaleSize - 1),
+					cy = this.focusY * (this.scaleSize - 1);
+
+				cc.translate(this.centerX, this.centerY);
+				cc.rotate((this.rotateDeg * Math.PI) / 180);
+				cc.drawImage(this.imgPath, this.posWidth - this.centerX - cx, this.posHeight - this.centerY - cy, imgWidth, imgHeight);
+			} else {
+				cc.translate(this.posWidth + imgWidth / 2, this.posHeight + imgHeight / 2);
+				cc.rotate((this.rotateDeg * Math.PI) / 180);
+				cc.drawImage(this.imgPath, -imgWidth / 2, -imgHeight / 2, imgWidth, imgHeight);
+			}
+
+			cc.draw(false);
+
+			// #ifdef MP-ALIPAY
+			cc.restore();
+			// #endif
+		},
+		fPreview() {
+			if (this.fPreviewing) return;
+			this.fPreviewing = true;
+			setTimeout(() => {
+				this.fPreviewing = false;
+			}, 1000);
+
+			let style = this.sS,
+				x = parseInt(style.left),
+				y = parseInt(style.top),
+				width = parseInt(style.width),
+				height = parseInt(style.height);
+
+			// #ifdef MP-ALIPAY
+			uni.showLoading();
+			// #endif
+			// #ifndef MP-ALIPAY
+			uni.showLoading({
+				title: '加载中...',
+				mask: true
+			});
+			// #endif
+
+			// #ifdef MP-ALIPAY
+			this.cc.toTempFilePath({
+				x: x,
+				y: y,
+				width: width,
+				height: height,
+				expWidth: width * this.pixelRatio,
+				expHeight: height * this.pixelRatio,
+				fileType: this.fType,
+				quality: this.qlty,
+				success: r => {
+					this.prvImgTmp = r = r.apFilePath;
+					let ccp = this.ccp,
+						prvX = this.wW,
+						prvY = parseInt(this.csH),
+						prvWidth = parseInt(this.sS.width),
+						prvHeight = parseInt(this.sS.height),
+						useWidth = prvX - 40,
+						useHeight = prvY - 80,
+						radio = useWidth / prvWidth,
+						rHeight = prvHeight * radio;
+					if (rHeight < useHeight) {
+						prvWidth = useWidth;
+						prvHeight = rHeight;
+					} else {
+						radio = useHeight / prvHeight;
+						prvWidth *= radio;
+						prvHeight = useHeight;
+					}
+					ccp.fillRect(0, 0, prvX, prvY);
+					this.prvX = prvX = ((prvX - prvWidth) / 2) | 0;
+					this.prvY = prvY = ((prvY - prvHeight) / 2) | 0;
+					this.prvWidth = prvWidth = prvWidth | 0;
+					this.prvHeight = prvHeight = prvHeight | 0;
+					ccp.drawImage(r, prvX, prvY, prvWidth, prvHeight);
+					ccp.draw(false);
+
+					this.sO = false;
+					this.pT = '0';
+				},
+				fail: () => {
+					uni.showToast({
+						title: 'error2',
+						duration: 2000
+					});
+				},
+				complete: () => {
+					uni.hideLoading();
+				}
+			});
+			// #endif
+
+			// #ifndef MP-ALIPAY
+			uni.canvasToTempFilePath(
+				{
+					x: x,
+					y: y,
+					width: width,
+					height: height,
+					expWidth: width * this.pixelRatio,
+					expHeight: height * this.pixelRatio,
+					canvasId: 'avatar-canvas',
+					fileType: this.fType,
+					quality: this.qlty,
+					success: r => {
+						this.prvImgTmp = r = r.tempFilePath;
+
+						let ccp = this.ccp,
+							prvX = this.wW,
+							prvY = parseInt(this.csH);
+
+						// #ifndef H5||MP-WEIXIN||APP-PLUS
+						prvY += tH;
+						// #endif
+						// #ifdef APP-PLUS
+						if (this.platform === 'android') {
+							prvY += tH;
+						}
+						// #endif
+
+						let prvWidth = parseInt(this.sS.width),
+							prvHeight = parseInt(this.sS.height),
+							useWidth = prvX - 40,
+							useHeight = prvY - 80,
+							radio = useWidth / prvWidth,
+							rHeight = prvHeight * radio;
+						if (rHeight < useHeight) {
+							prvWidth = useWidth;
+							prvHeight = rHeight;
+						} else {
+							radio = useHeight / prvHeight;
+							prvWidth *= radio;
+							prvHeight = useHeight;
+						}
+
+						ccp.fillRect(0, 0, prvX, prvY);
+						this.prvX = prvX = ((prvX - prvWidth) / 2) | 0;
+						this.prvY = prvY = ((prvY - prvHeight) / 2) | 0;
+						this.prvWidth = prvWidth = prvWidth | 0;
+						this.prvHeight = prvHeight = prvHeight | 0;
+						ccp.drawImage(r, prvX, prvY, prvWidth, prvHeight);
+						ccp.draw(false);
+
+						// #ifdef H5
+						this.btop(r).then(r => {
+							this.sO = false;
+							this.pT = this.drawTop + 'px';
+						});
+						// #endif
+
+						this.sO = false;
+						// if (this.platform === 'android') this.sO = false;
+						this.pT = this.drawTop + 'px';
+					},
+					fail: () => {
+						uni.showToast({
+							title: 'error2',
+							duration: 2000
+						});
+					},
+					complete: () => {
+						uni.hideLoading();
+					}
+				},
+				this
+			);
+			// #endif
+		},
+		fChooseImg(index = undefined, params = undefined, data = undefined) {
+			if (params) {
+				let sW = params.selWidth,
+					sH = params.selHeight,
+					expWidth = params.expWidth,
+					expHeight = params.expHeight,
+					quality = params.quality,
+					canRotate = params.canRotate,
+					canScale = params.canScale,
+					minScale = params.minScale,
+					maxScale = params.maxScale,
+					stretch = params.stretch,
+					fileType = params.fileType,
+					inner = params.inner,
+					lock = params.lock;
+
+				expWidth && (this.eW = expWidth.toString().indexOf('upx') >= 0 ? parseInt(expWidth) * this.pxRatio : parseInt(expWidth));
+				expHeight && (this.eH = expHeight.toString().indexOf('upx') >= 0 ? parseInt(expHeight) * this.pxRatio : parseInt(expHeight));
+				this.letRotate = canRotate === false || inner === true || inner === 'true' || canRotate === 'false' ? 0 : 1;
+				this.letScale = canScale === false || canScale === 'false' ? 0 : 1;
+				this.qlty = parseFloat(quality) || 1;
+				this.mnScale = parseFloat(minScale) || 0.3;
+				this.mxScale = parseFloat(maxScale) || 4;
+				this.stc = stretch;
+				this.isin = inner === true || inner === 'true' ? 1 : 0;
+				this.fType = fileType === 'jpg' ? 'jpg' : 'png';
+				this.lck = lock;
+				if (this.isin || !this.letRotate) {
+					this.bW = '24%';
+					this.bD = 'none';
+				} else {
+					this.bW = '19%';
+					this.bD = 'flex';
+				}
+
+				if (sW && sH) {
+					sW = sW.toString().indexOf('upx') >= 0 ? parseInt(sW) * this.pxRatio : parseInt(sW);
+					sH = sH.toString().indexOf('upx') >= 0 ? parseInt(sH) * this.pxRatio : parseInt(sH);
+					this.sS.width = sW + 'px';
+					this.sS.height = sH + 'px';
+					this.sS.top = ((this.wH - sH - tH) | 0) / 2 + 'px';
+					this.sS.left = ((this.wW - sW) | 0) / 2 + 'px';
+					this.hasSel = true;
+				}
+			}
+			this.rtn = data;
+			this.indx = index;
+			this.fSelect();
+		},
+		fRotate() {
+			this.rotateDeg += 90 - (this.rotateDeg % 90);
+			this.fDrawImage();
+		},
+		fStart(e) {
+			let touches = e.touches,
+				touch0 = touches[0],
+				touch1 = touches[1];
+
+			this.touch0 = touch0;
+			this.touch1 = touch1;
+
+			if (touch1) {
+				let x = touch1.x - touch0.x,
+					y = touch1.y - touch0.y;
+				this.fgDistance = Math.sqrt(x * x + y * y);
+			}
+		},
+		fMove(e) {
+			let touches = e.touches,
+				touch0 = touches[0],
+				touch1 = touches[1];
+
+			if (touch1) {
+				let x = touch1.x - touch0.x,
+					y = touch1.y - touch0.y,
+					fgDistance = Math.sqrt(x * x + y * y),
+					scaleSize = 0.005 * (fgDistance - this.fgDistance),
+					beScaleSize = this.scaleSize + scaleSize;
+
+				do {
+					if (!this.letScale) break;
+					if (beScaleSize < this.mnScale) break;
+					if (beScaleSize > this.mxScale) break;
+
+					let growX = (this.useWidth * scaleSize) / 2,
+						growY = (this.useHeight * scaleSize) / 2;
+					if (this.isin) {
+						let imgWidth = this.useWidth * beScaleSize,
+							imgHeight = this.useHeight * beScaleSize,
+							l = this.posWidth - growX,
+							t = this.posHeight - growY,
+							r = l + imgWidth,
+							b = t + imgHeight,
+							left = parseInt(this.sS.left),
+							top = parseInt(this.sS.top),
+							width = parseInt(this.sS.width),
+							height = parseInt(this.sS.height),
+							right = left + width,
+							bottom = top + height,
+							cx,
+							cy;
+
+						if (imgWidth <= width || imgHeight <= height) break;
+						(this.cx = cx = this.focusX * beScaleSize - this.focusX), (this.cy = cy = this.focusY * beScaleSize - this.focusY);
+						this.posWidth -= growX;
+						this.posHeight -= growY;
+						if (this.posWidth - cx > left) {
+							this.posWidth = left + cx;
+						}
+						if (this.posWidth + imgWidth - cx < right) {
+							this.posWidth = right - imgWidth + cx;
+						}
+						if (this.posHeight - cy > top) {
+							this.posHeight = top + cy;
+						}
+						if (this.posHeight + imgHeight - cy < bottom) {
+							this.posHeight = bottom - imgHeight + cy;
+						}
+					} else {
+						this.posWidth -= growX;
+						this.posHeight -= growY;
+					}
+
+					this.scaleSize = beScaleSize;
+				} while (0);
+				this.fgDistance = fgDistance;
+				if (touch1.x !== touch0.x && this.letRotate) {
+					x = (this.touch1.y - this.touch0.y) / (this.touch1.x - this.touch0.x);
+					y = (touch1.y - touch0.y) / (touch1.x - touch0.x);
+					this.rotateDeg += (Math.atan((y - x) / (1 + x * y)) * 180) / Math.PI;
+					this.touch0 = touch0;
+					this.touch1 = touch1;
+				}
+
+				this.fDrawImage();
+			} else if (this.touch0) {
+				let x = touch0.x - this.touch0.x,
+					y = touch0.y - this.touch0.y,
+					beX = this.posWidth + x,
+					beY = this.posHeight + y;
+				if (this.isin) {
+					let imgWidth = this.useWidth * this.scaleSize,
+						imgHeight = this.useHeight * this.scaleSize,
+						l = beX,
+						t = beY,
+						r = l + imgWidth,
+						b = t + imgHeight,
+						left = parseInt(this.sS.left),
+						top = parseInt(this.sS.top),
+						right = left + parseInt(this.sS.width),
+						bottom = top + parseInt(this.sS.height),
+						cx,
+						cy;
+
+					this.cx = cx = this.focusX * this.scaleSize - this.focusX;
+					this.cy = cy = this.focusY * this.scaleSize - this.focusY;
+
+					if (!this.lckWidth && Math.abs(x) < 100) {
+						if (left < l - cx) {
+							this.posWidth = left + cx;
+						} else if (right > r - cx) {
+							this.posWidth = right - imgWidth + cx;
+						} else {
+							this.posWidth = beX;
+							this.focusX -= x;
+						}
+					}
+					if (!this.lckHeight && Math.abs(y) < 100) {
+						if (top < t - cy) {
+							this.focusY -= top + cy - this.posHeight;
+							this.posHeight = top + cy;
+						} else if (bottom > b - cy) {
+							this.focusY -= bottom + cy - (this.posHeight + imgHeight);
+							this.posHeight = bottom - imgHeight + cy;
+						} else {
+							this.posHeight = beY;
+							this.focusY -= y;
+						}
+					}
+				} else {
+					if (Math.abs(x) < 100 && !this.lckWidth) this.posWidth = beX;
+					if (Math.abs(y) < 100 && !this.lckHeight) this.posHeight = beY;
+					this.focusX -= x;
+					this.focusY -= y;
+				}
+
+				this.touch0 = touch0;
+				this.fDrawImage();
+			}
+		},
+		fEnd(e) {
+			let touches = e.touches,
+				touch0 = touches && touches[0],
+				touch1 = touches && touches[1];
+			if (touch0) {
+				this.touch0 = touch0;
+			} else {
+				this.touch0 = null;
+				this.touch1 = null;
+			}
+		},
+		fHideImg() {
+			this.prvImg = '';
+			this.pT = '-10000px';
+			this.sO = true;
+			this.prvImgData = null;
+			this.target = null;
+		},
+		fClose() {
+			this.sD = 'none';
+			this.sT = '-10000px';
+			this.hasSel = false;
+			this.fHideImg();
+			this.noBar || uni.showTabBar();
+			this.$emit('end');
+		},
+		fGetImgData() {
+			return new Promise((resolve, reject) => {
+				let prvX = this.prvX,
+					prvY = this.prvY,
+					prvWidth = this.prvWidth,
+					prvHeight = this.prvHeight;
+				// #ifdef MP-ALIPAY
+				this.ccp.getImageData(
+					{
+						x: prvX,
+						y: prvY,
+						width: prvWidth,
+						height: prvHeight,
+						success(res) {
+							resolve(res.data);
+						},
+						fail(err) {
+							reject(err);
+						}
+					},
+					this
+				);
+				// #endif
+				// #ifndef MP-ALIPAY
+				uni.canvasGetImageData(
+					{
+						canvasId: 'prv-canvas',
+						x: prvX,
+						y: prvY,
+						width: prvWidth,
+						height: prvHeight,
+						success(res) {
+							resolve(res.data);
+						},
+						fail(err) {
+							reject(err);
+						}
+					},
+					this
+				);
+				// #endif
+			});
+		},
+		async fColorChange(e) {
+			let tm_now = Date.now();
+			if (tm_now - this.prvTm < 100) return;
+			this.prvTm = tm_now;
+
+			// #ifdef MP-ALIPAY
+			uni.showLoading();
+			// #endif
+			// #ifndef MP-ALIPAY
+			uni.showLoading({
+				title: '加载中...',
+				mask: true
+			});
+			// #endif
+
+			if (!this.prvImgData) {
+				if (
+					!(this.prvImgData = await this.fGetImgData().catch(() => {
+						uni.showToast({
+							title: 'error_read',
+							duration: 2000
+						});
+					}))
+				)
+					return;
+
+				this.target = new Uint8ClampedArray(this.prvImgData.length);
+			}
+
+			let data = this.prvImgData,
+				target = this.target,
+				i = e.detail.value,
+				r,
+				g,
+				b,
+				a,
+				h,
+				s,
+				l,
+				d,
+				p,
+				q,
+				t,
+				min,
+				max,
+				hK,
+				tR,
+				tG,
+				tB;
+
+			if (i === 0) {
+				target = data;
+			} else {
+				i = (i + 100) / 200;
+				if (i < 0.005) i = 0;
+				if (i > 0.995) i = 1;
+				for (let n = data.length - 1; n >= 0; n -= 4) {
+					r = data[n - 3] / 255;
+					g = data[n - 2] / 255;
+					b = data[n - 1] / 255;
+					max = Math.max(r, g, b);
+					min = Math.min(r, g, b);
+					d = max - min;
+					if (max === min) {
+						h = 0;
+					} else if (max === r && g >= b) {
+						h = 60 * ((g - b) / d);
+					} else if (max === r && g < b) {
+						h = 60 * ((g - b) / d) + 360;
+					} else if (max === g) {
+						h = 60 * ((b - r) / d) + 120;
+					} else if (max === b) {
+						h = 60 * ((r - g) / d) + 240;
+					}
+					l = (max + min) / 2;
+					if (l === 0 || max === min) {
+						s = 0;
+					} else if (0 < l && l <= 0.5) {
+						s = d / (2 * l);
+					} else if (l > 0.5) {
+						s = d / (2 - 2 * l);
+					}
+					data[n] && (a = data[n]);
+
+					if (i < 0.5) {
+						s = (s * i) / 0.5;
+					} else if (i > 0.5) {
+						s = 2 * s + 2 * i - (s * i) / 0.5 - 1;
+					}
+
+					if (s === 0) {
+						r = g = b = Math.round(l * 255);
+					} else {
+						if (l < 0.5) {
+							q = l * (1 + s);
+						} else if (l >= 0.5) {
+							q = l + s - l * s;
+						}
+						p = 2 * l - q;
+						hK = h / 360;
+						tR = hK + 1 / 3;
+						tG = hK;
+						tB = hK - 1 / 3;
+						let correctRGB = t => {
+							if (t < 0) {
+								return t + 1.0;
+							}
+							if (t > 1) {
+								return t - 1.0;
+							}
+							return t;
+						};
+						let createRGB = t => {
+							if (t < 1 / 6) {
+								return p + (q - p) * 6 * t;
+							} else if (t >= 1 / 6 && t < 1 / 2) {
+								return q;
+							} else if (t >= 1 / 2 && t < 2 / 3) {
+								return p + (q - p) * 6 * (2 / 3 - t);
+							}
+							return p;
+						};
+						r = tR = Math.round(createRGB(correctRGB(tR)) * 255);
+						g = tG = Math.round(createRGB(correctRGB(tG)) * 255);
+						b = tB = Math.round(createRGB(correctRGB(tB)) * 255);
+					}
+					a && (target[n] = a);
+					target[n - 3] = r;
+					target[n - 2] = g;
+					target[n - 1] = b;
+				}
+			}
+
+			let prvX = this.prvX,
+				prvY = this.prvY,
+				prvWidth = this.prvWidth,
+				prvHeight = this.prvHeight;
+
+			// #ifdef MP-ALIPAY
+			this.ccp.putImageData(
+				{
+					x: prvX,
+					y: prvY,
+					width: prvWidth,
+					height: prvHeight,
+					data: target,
+					fail() {
+						uni.showToast({
+							title: 'error_put',
+							duration: 2000
+						});
+					},
+					complete() {
+						uni.hideLoading();
+					}
+				},
+				this
+			);
+			// #endif
+
+			// #ifndef MP-ALIPAY
+			uni.canvasPutImageData(
+				{
+					canvasId: 'prv-canvas',
+					x: prvX,
+					y: prvY,
+					width: prvWidth,
+					height: prvHeight,
+					data: target,
+					fail() {
+						uni.showToast({
+							title: 'error_put',
+							duration: 2000
+						});
+					},
+					complete() {
+						uni.hideLoading();
+					}
+				},
+				this
+			);
+			// #endif
+		},
+		btop(base64) {
+			this.base64 = base64;
+			return new Promise(function(resolve, reject) {
+				var arr = base64.split(','),
+					mime = arr[0].match(/:(.*?);/)[1],
+					bstr = atob(arr[1]),
+					n = bstr.length,
+					u8arr = new Uint8Array(n);
+				while (n--) {
+					u8arr[n] = bstr.charCodeAt(n);
+				}
+				return resolve(
+					(window.URL || window.webkitURL).createObjectURL(
+						new Blob([u8arr], {
+							type: mime
+						})
+					)
+				);
+			});
+		},
+		blob(path, callback) {
+			uni.getFileSystemManager().readFile({
+				filePath: path, //选择图片返回的相对路径
+				encoding: 'base64', //编码格式
+				success: res => {
+					//成功的回调
+					let base64 = 'data:image/jpeg;base64,' + res.data; //不加上这串字符，在页面无法显示的哦
+					typeof callback == 'function' && callback(base64);
+				}
+			});
+		}
+	}
+};
+</script>
+
+<style>
+.my-canvas {
+	display: flex;
+	position: fixed !important;
+	background: #000000;
+	left: 0;
+	z-index: 100000;
+	width: 100%;
+}
+
+.my-avatar {
+	width: 150upx;
+	height: 150upx;
+	border-radius: 100%;
+}
+
+.oper-canvas {
+	display: flex;
+	position: fixed !important;
+	left: 0;
+	z-index: 100001;
+	width: 100%;
+}
+
+.prv-canvas {
+	display: flex;
+	position: fixed !important;
+	background: #000000;
+	left: 0;
+	z-index: 200000;
+	width: 100%;
+}
+
+.oper-wrapper {
+	height: 50px;
+	position: fixed !important;
+	box-sizing: border-box;
+	background: #000;
+	width: 100%;
+	left: 0;
+	bottom: 0;
+	z-index: 100009;
+	flex-direction: row;
+}
+
+.oper {
+	display: flex;
+	flex-direction: column;
+	justify-content: center;
+	/* padding: 10upx 20upx 80upx 20upx; */
+	width: 100%;
+	height: 100%;
+	box-sizing: border-box;
+	align-self: center;
+}
+
+.btn-wrapper {
+	display: flex;
+	flex-direction: row;
+	/* #ifndef H5 */
+	flex-grow: 1;
+	/* #endif */
+	/* #ifdef H5 */
+	height: 50px;
+	/* #endif */
+	justify-content: space-between;
+}
+
+.btn-wrapper view {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	font-size: 28rpx;
+}
+
+.btn-wrapper .cancel {
+	color: #fff;
+	font-weight: bold;
+
+	text-align: center;
+}
+
+.btn-wrapper .upload {
+	background: #31bb6d;
+	color: #fff;
+	font-weight: bold;
+	height: 60rpx;
+	line-height: 60rpx;
+	padding: 0 30rpx;
+	border-radius: 8rpx;
+}
+
+.btn-wrapper .iconfont {
+	color: #fff;
+	font-size: 18px;
+}
+
+.hover {
+	background: #f1f1f1;
+	border-radius: 6%;
+}
+
+.clr-wrapper {
+	display: flex;
+	flex-direction: row;
+	flex-grow: 1;
+}
+
+.clr-wrapper view {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	font-size: 14px;
+	color: #333;
+	border: 1px solid #f1f1f1;
+	border-radius: 6%;
+}
+
+.my-slider {
+	flex-grow: 1;
+}
+</style>
diff --git a/pages_tool/components/myp-one/myp-one.vue b/pages_tool/components/myp-one/myp-one.vue
new file mode 100644
index 0000000..4b97fc6
--- /dev/null
+++ b/pages_tool/components/myp-one/myp-one.vue
@@ -0,0 +1,234 @@
+<template>
+	<view class="code-box">
+		<view class="flex-box">
+			<input :value="inputValue" type="number" :focus="autoFocus" :maxlength="maxlength" class="hide-input" @input="getVal" />
+			<block v-for="(item, index) in ranges" :key="index">
+				<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>
+				</view>
+			</block>
+		</view>
+	</view>
+</template>
+
+<script>
+// 支持使用 v-model
+// 支持使用refs
+export default {
+	name: 'mypOneInput',
+	props: {
+		// 支持外部提供，支持使用v-model
+		// 支持通过value来做清空
+		value: {
+			type: String,
+			default: ''
+		},
+		// 4/6
+		maxlength: {
+			type: Number,
+			default: 4
+		},
+		autoFocus: {
+			type: Boolean,
+			default: false
+		},
+		isPwd: {
+			type: Boolean,
+			default: false
+		},
+		// middle-middle line, bottom-bottom line, box-square box
+		type: {
+			type: String,
+			default: 'bottom'
+		}
+	},
+	watch: {
+		maxlength: {
+			immediate: true,
+			handler: function(newV) {
+				if (newV === 6) {
+					this.ranges = [1, 2, 3, 4, 5, 6];
+				} else {
+					this.ranges = [1, 2, 3, 4];
+				}
+			}
+		},
+		value: {
+			immediate: true,
+			handler: function(newV) {
+				if (newV !== this.inputValue) {
+					this.inputValue = newV;
+					this.toMakeAndCheck(newV);
+				}
+			}
+		}
+	},
+	data() {
+		return {
+			inputValue: '',
+			codeIndex: 1,
+			codeArr: [],
+			ranges: [1, 2, 3, 4]
+		};
+	},
+	methods: {
+		getVal(e) {
+			const val = e.detail.value;
+			this.inputValue = val;
+			this.$emit('input', val);
+			this.toMakeAndCheck(val);
+		},
+		toMakeAndCheck(val) {
+			const arr = val.split('');
+			this.codeIndex = arr.length + 1;
+			this.codeArr = arr;
+			if (this.codeIndex > Number(this.maxlength)) {
+				this.$emit('finish', this.codeArr.join(''));
+			}
+		},
+		// refs 时不再提供 v-model 支持
+		// 支持使用refs来设置value
+		// 没有提供数据保护与检测，自己在外面对数据进行检测保护
+		set(val) {
+			this.inputValue = val;
+			this.toMakeAndCheck(val);
+		},
+		// 支持使用refs来清空
+		clear() {
+			this.inputValue = '';
+			this.codeArr = [];
+			this.codeIndex = 1;
+		}
+	}
+};
+</script>
+
+<style scoped>
+@keyframes twinkling {
+	0% {
+		opacity: 0.2;
+	}
+
+	50% {
+		opacity: 0.5;
+	}
+
+	100% {
+		opacity: 0.2;
+	}
+}
+
+.code-box {
+	text-align: center;
+}
+
+.flex-box {
+	display: flex;
+	justify-content: center;
+	flex-wrap: wrap;
+	position: relative;
+}
+
+.flex-box .hide-input {
+	position: absolute;
+	top: 0;
+	left: -100%;
+	width: 200%;
+	height: 100%;
+	text-align: left;
+	z-index: 9;
+	opacity: 1;
+}
+
+.flex-box .item {
+	position: relative;
+	flex: 1;
+	margin-right: 18rpx;
+	font-size: 70rpx;
+	font-weight: bold;
+	color: #333333;
+	line-height: 100rpx;
+}
+
+.flex-box .item::before {
+	content: '';
+	padding-top: 100%;
+	display: block;
+}
+
+.flex-box .item:last-child {
+	margin-right: 0;
+}
+
+.flex-box .middle {
+	border: none;
+}
+
+.flex-box .box {
+	box-sizing: border-box;
+	border: 2rpx solid #cccccc;
+	border-width: 2rpx 0 2rpx 2rpx;
+	margin-right: 0;
+}
+
+.flex-box .box:first-of-type {
+	border-top-left-radius: 8rpx;
+	border-bottom-left-radius: 8rpx;
+}
+
+.flex-box .box:last-child {
+	border-right: 2rpx solid #cccccc;
+	border-top-right-radius: 8rpx;
+	border-bottom-right-radius: 8rpx;
+}
+
+.flex-box .bottom {
+	box-sizing: border-box;
+	border-bottom: 2rpx solid #ddd;
+}
+
+.flex-box .active {
+	border-color: #ddd;
+}
+
+.flex-box .active .line {
+	display: block;
+}
+
+.flex-box .line {
+	display: none;
+	position: absolute;
+	left: 50%;
+	top: 50%;
+	transform: translate(-50%, -50%);
+	width: 2rpx;
+	height: 40rpx;
+	background: #333333;
+	animation: twinkling 1s infinite ease;
+}
+
+.flex-box .dot,
+.flex-box .number {
+	line-height: 40rpx;
+	position: absolute;
+	left: 50%;
+	top: 50%;
+	transform: translate(-50%, -50%);
+}
+
+.flex-box .bottom-line {
+	height: 8rpx;
+	background: #000000;
+	width: 80%;
+	position: absolute;
+	border-radius: 4rpx;
+	top: 50%;
+	left: 50%;
+	transform: translate(-50%, -50%);
+}
+</style>
diff --git a/pages_tool/components/ns-chat/ns-chat-goods.vue b/pages_tool/components/ns-chat/ns-chat-goods.vue
new file mode 100644
index 0000000..cfc0cea
--- /dev/null
+++ b/pages_tool/components/ns-chat/ns-chat-goods.vue
@@ -0,0 +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>
diff --git a/pages_tool/components/ns-chat/ns-chat-order.vue b/pages_tool/components/ns-chat/ns-chat-order.vue
new file mode 100644
index 0000000..334c9fd
--- /dev/null
+++ b/pages_tool/components/ns-chat/ns-chat-order.vue
@@ -0,0 +1,149 @@
+<template>
+	<view class="message">
+		<view class="goods-item" v-if="orderdetails">
+			<image :src="$util.img(orderdetails.order_goods ? orderdetails.order_goods[0].sku_image : '')" mode="aspectFill"></image>
+			<view class="goods-info">
+				<view class="goods-name">{{ orderdetails.order_goods ? orderdetails.order_goods[0].sku_name : '' }}</view>
+				<view class="font-size-goods-tag">订单状态:{{ orderdetails.order_status_name }}</view>
+				<view class="font-size-goods-tag">配送方式:{{ orderdetails.delivery_type_name }}</view>
+				<view class="goods-bottom">
+					<view class="goods-price color-base-text">
+						<text class="goods-price-sign">￥</text>
+						<text>{{ orderdetails.order_goods ? orderdetails.order_goods[0].price : '' }}</text>
+					</view>
+					<view class="goods-option font-size-goods-tag color-base-bg" @click="sendMsg('order')">发送</view>
+				</view>
+			</view>
+		</view>
+		<view class="goods-item" v-else-if="orderInfo">
+			<image :src="$util.img(orderInfo.order_goods ? orderInfo.order_goods[0].sku_image : '')" mode="aspectFill"></image>
+			<view class="goods-info">
+				<view class="goods-name">{{ orderInfo.order_goods ? orderInfo.order_goods[0].sku_name : '' }}</view>
+				<view class="font-size-goods-tag">订单状态:{{ orderInfo.order_status_name }}</view>
+				<view class="font-size-goods-tag">配送方式:{{ orderInfo.delivery_type_name }}</view>
+				<view class="goods-bottom">
+					<view class="goods-price color-base-text">
+						<text class="goods-price-sign">￥</text>
+						<text>{{ orderInfo.order_goods ? orderInfo.order_goods[0].price : '' }}</text>
+					</view>
+					<view class="goods-option font-size-goods-tag disabled">已发送</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+export default {
+	name: 'ns-chat-order',
+	props: {
+		orderId: {
+			type: [Number, String]
+		},
+		isCanSend: Boolean,
+		orderdetails: {
+			type: [Object]
+		}
+	},
+	data() {
+		return {
+			orderInfo: {}
+		};
+	},
+	mounted() {
+		this.getGoodsInfo();
+	},
+	methods: {
+		getGoodsInfo() {
+			if (this.orderId) {
+				this.$api.sendRequest({
+					url: '/api/order/detail',
+					data: {
+						order_id: this.orderId
+					},
+					success: res => {
+						if (res.code >= 0) {
+							this.orderInfo = res.data;
+						}
+					}
+				});
+			}
+		},
+		sendMsg() {
+			this.$emit('sendMsg', 'order');
+		}
+	}
+};
+</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;
+		}
+		.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: 1;
+				overflow: hidden;
+				// font-size: $font-size-tag;
+				margin-bottom: 10rpx;
+			}
+			.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: 20rpx;
+					}
+				}
+				.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/ns-chat/ns-chat-receiveGoods.vue b/pages_tool/components/ns-chat/ns-chat-receiveGoods.vue
new file mode 100644
index 0000000..96edabb
--- /dev/null
+++ b/pages_tool/components/ns-chat/ns-chat-receiveGoods.vue
@@ -0,0 +1,142 @@
+<template>
+	<view class="goods">
+		<view class="goods-msg">
+			<image :src="$util.img(goodsInfo.sku_image)" mode="aspectFill"></image>
+			<view class="goods-item">
+				<view class="title">{{ goodsInfo.goods_name }}</view>
+				<view class="goods-sku">
+					库存:{{ goodsInfo.stock }}
+					<text>销量:{{ goodsInfo.sale_num }}</text>
+				</view>
+				<view class="goods-price">
+					<view class="price color-base-text">
+						<text class="price-util">￥</text>
+						<text class="price-num">{{ goodsInfo.price }}</text>
+					</view>
+					<view class="see-shop color-base-text" @click="go_shop()">
+						查看商品
+						<text class="iconfont icon-right"></text>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: 'ns-chat-receiveGoods',
+		props: {
+			skuId: {
+				type: [Number, String]
+			}
+		},
+		data() {
+			return {
+				goodsInfo: {}
+			};
+		},
+		mounted() {
+			this.getInfo();
+		},
+		methods: {
+			getInfo() {
+				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;
+							this.$emit('upDOM');
+							// that.setPageScrollTo();
+						}
+					}
+				});
+			},
+			go_shop() {
+				this.$util.redirectTo('/pages/goods/detail?goods_id=' + this.goodsInfo.goods_id);
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	.goods {
+		padding: 13rpx 20rpx;
+		box-sizing: border-box;
+		width: 100vw;
+		position: relative;
+
+		.goods-msg {
+			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;
+				border-radius: $border-radius;
+			}
+
+			.goods-item {
+				width: 100%;
+				height: 180rpx;
+				display: flex;
+				flex-direction: column;
+				justify-content: space-between;
+				padding-left: 20rpx;
+				box-sizing: border-box;
+
+				.title {
+					width: 100%;
+					line-height: 1.4;
+					display: -webkit-box;
+					-webkit-box-orient: vertical;
+					-webkit-line-clamp: 2;
+					overflow: hidden;
+				}
+
+				.goods-sku {
+					color: $color-sub;
+
+					text {
+						padding-left: $padding;
+					}
+				}
+
+				.goods-price {
+					display: flex;
+					align-items: center;
+					justify-content: space-between;
+
+					.price {
+						.price-util {
+							font-size: $font-size-activity-tag;
+						}
+					}
+
+					.see-shop {
+						display: flex;
+						align-items: center;
+
+						text {
+							padding-top: 4rpx;
+							padding-left: 4rpx;
+							font-size: $font-size-sub;
+						}
+					}
+				}
+			}
+		}
+	}
+</style>
diff --git a/pages_tool/components/ns-progress/ns-progress.vue b/pages_tool/components/ns-progress/ns-progress.vue
new file mode 100644
index 0000000..e3afc36
--- /dev/null
+++ b/pages_tool/components/ns-progress/ns-progress.vue
@@ -0,0 +1,37 @@
+<template>
+	<view class="progress"><view class="progress-bar " ref="progress" :style="{ width: progress + '%' }"></view></view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {};
+	},
+	props: {
+		progress: {
+			type: [Number, String],
+			default: 10
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+.progress {
+	height: 12rpx;
+	overflow: hidden;
+	background-color: #ccc;
+	border-radius: 8rpx;
+}
+
+.progress-bar {
+	float: left;
+	height: 100%;
+	font-size: $font-size-tag;
+	line-height: 40rpx;
+	color: #fff;
+	text-align: center;
+	transition: width 0.6s ease;
+	background-color: #fff;
+}
+</style>
diff --git a/pages_tool/components/sx-rate/common.js b/pages_tool/components/sx-rate/common.js
new file mode 100644
index 0000000..6e559dc
--- /dev/null
+++ b/pages_tool/components/sx-rate/common.js
@@ -0,0 +1,6 @@
+export function getClientRect(selector, component) {
+	return new Promise((resolve, reject) => {
+		let query = component ? uni.createSelectorQuery().in(component) : uni.createSelectorQuery();
+		return query.select(selector).boundingClientRect(resolve).exec()
+	})
+}
diff --git a/pages_tool/components/sx-rate/index.vue b/pages_tool/components/sx-rate/index.vue
new file mode 100644
index 0000000..6f99821
--- /dev/null
+++ b/pages_tool/components/sx-rate/index.vue
@@ -0,0 +1,218 @@
+<template>
+	<view class="rate-box" :class="[{ animation }, containerClass]" @touchmove="ontouchmove" @touchend="touchMoving = false">
+		<view
+			v-for="(val, i) in list"
+			:key="val"
+			class="rate"
+			:style="{ fontSize, paddingLeft: i !== 0 ? rateMargin : 0, paddingRight: i < list.length - 1 ? rateMargin : 0 }"
+			:class="[
+				{ scale: !disabled && val <= rateValue && animation && touchMoving, 'color-base-text': val <= rateValue, defaultColor: val > rateValue },
+				`rate-${i}`,
+				rateClass
+			]"
+			:data-val="val"
+			@click="onItemClick"
+		>
+			<text class="iconfont icon-star"></text>
+		</view>
+	</view>
+</template>
+
+<script>
+import { getClientRect } from './common';
+
+export default {
+	name: 'sx-rate',
+	props: {
+		// 当前值
+		value: {
+			type: [Number, String]
+		},
+		// 最大星星数量
+		max: {
+			type: Number,
+			default: 5
+		},
+		// 禁用
+		disabled: {
+			type: Boolean,
+			default: false
+		},
+		// 动画效果
+		animation: {
+			type: Boolean,
+			default: true
+		},
+		// 默认星星颜色
+		defaultColor: {
+			type: String,
+			default: '#ccc'
+		},
+		// 滑选后星星颜色
+		activeColor: {
+			type: String
+			// default: '#FFB700'
+		},
+		// 星星大小
+		fontSize: {
+			type: String,
+			default: 'inherit'
+		},
+		// 星星间距
+		margin: {
+			type: String,
+			default: ''
+		},
+		// 自定义类名-容器
+		containerClass: {
+			type: String,
+			default: ''
+		},
+		// 自定义类名-星星
+		rateClass: {
+			type: String,
+			default: ''
+		},
+		index: {
+			// 如果页面中存在多个该组件，通过该属性区分
+			type: [Number, String]
+		}
+	},
+	data() {
+		return {
+			rateValue: 0,
+			touchMoving: false,
+			startX: [],
+			startW: 30
+		};
+	},
+	computed: {
+		list() {
+			return [...new Array(this.max)].map((_, i) => i + 1);
+		},
+		rateMargin() {
+			let margin = this.margin;
+			if (!margin) return 0;
+
+			switch (typeof margin) {
+				case 'number':
+					margin = margin * 2 + 'rpx';
+				case 'string':
+					break;
+				default:
+					return 0;
+			}
+
+			let reg = /^(\d+)([^\d]*)/;
+			let result = reg.exec(margin);
+			if (!result) return 0;
+
+			let [_, num, unit] = result;
+			return num / 2 + unit;
+		}
+	},
+	watch: {
+		value: {
+			handler(val) {
+				this.rateValue = val;
+			},
+			immediate: true
+		}
+	},
+	methods: {
+		// 计算星星位置
+		async initStartX() {
+			let { max } = this;
+			this.startX = [];
+
+			for (let i = 0; i < max; i++) {
+				let selector = `.rate-${i}`;
+				let { left, width } = await getClientRect(selector, this);
+
+				this.startX.push(left);
+				this.startW = width;
+			}
+		},
+
+		/**
+		 * 手指滑动事件回调
+		 * https://github.com/sunxi1997/uni-app-sx-rate/pull/1
+		 * 原本的触摸处理在自定了样式后可能会出现bug, 已解决
+		 */
+		async ontouchmove(e) {
+			if (!this.touchMoving) {
+				this.touchMoving = true;
+				// 开始手指滑动时重新计算星星位置,防止星星位置意外变化
+				await this.initStartX();
+			}
+
+			let { startX, startW, max } = this;
+			let { touches } = e;
+
+			// 触摸焦点停留的位置
+			let { pageX } = touches[touches.length - 1];
+
+			// 超出最左边, 0 星
+			if (pageX <= startX[0]) return this.toggle(0);
+			// 刚好在第一颗星
+			else if (pageX <= startX[0] + startW) return this.toggle(1);
+			// 超出最右边, 最大星
+			else if (pageX >= startX[max - 1]) return this.toggle(max);
+
+			//计算星星停留的位置
+			let startXHash = startX.concat(pageX).sort((a, b) => a - b);
+			this.toggle(startXHash.indexOf(pageX));
+		},
+		// 点击回调
+		onItemClick(e) {
+			let { val } = e.currentTarget.dataset;
+			this.toggle(val);
+		},
+		// 修改值
+		toggle(val) {
+			let { disabled } = this;
+			if (disabled) return;
+			if (this.rateValue !== val) {
+				this.rateValue = val;
+				this.$emit('update:value', val);
+				let data = {
+					index: this.index,
+					value: val
+				};
+				this.$emit('change', data);
+			}
+		}
+	},
+	mounted() {}
+};
+</script>
+
+<style scoped>
+@import './sx-rate/iconfont.css';
+</style>
+
+<style lang="scss">
+.rate-box {
+	min-height: 1.4em;
+	display: flex;
+	align-items: center;
+}
+
+.rate {
+	display: inline-flex;
+	justify-content: center;
+	align-items: center;
+	width: 1.2em;
+	transition: all 0.15s linear;
+}
+
+.rate.scale {
+	transform: scale(1.1);
+}
+
+.defaultColor {
+	color: #ccc !important;
+}
+.activeColor {
+}
+</style>
diff --git a/pages_tool/components/sx-rate/sx-rate/iconfont.css b/pages_tool/components/sx-rate/sx-rate/iconfont.css
new file mode 100644
index 0000000..48200e0
--- /dev/null
+++ b/pages_tool/components/sx-rate/sx-rate/iconfont.css
@@ -0,0 +1,21 @@
+@font-face {font-family: "iconfont";
+  src: url('~@/pages_tool/components/sx-rate/sx-rate/iconfont.eot?t=1574760464482'); /* IE9 */
+  src: url('~@/pages_tool/components/sx-rate/sx-rate/iconfont.eot?t=1574760464482#iefix') format('embedded-opentype'), /* IE6-IE8 */
+  url('data:application/x-font-woff2;charset=utf-8;base64,d09GMgABAAAAAAK8AAsAAAAABnAAAAJwAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHEIGVgCCcAp8gQgBNgIkAwgLBgAEIAWEbQcuG6wFyA4lTcHACOEZBUg8fL/2O3f3fTHEkoh28SSayCSxkkgQG6Uz3UvYITu9Qr5K0Vh6Ij6f+8CXKzVBHDvWa6d0lSfK57mc3gQ6kGt8oBz3ojUG9QLqxYEU6B4YRVYqecPYBS7hMYG6QWF0dlOycoGxxFoViFuxkALGuYAksXRVKNccTOJdSTV7zbSAt/D78Y8XxmRKOavq5CZZAOK+7u2svLVode0TggR0vIQc84BEXNQmjugJxumpJ/SNAvsqD77ui8K3i71aBPvrrNIm6IfSe5K58ltNZ3BbU40Blkf9OmKsIW/Un1qddc4dcSma3ArIX7PPXdlxK5l2zJ+aD6TXnQqmu330wqpeWkYN/OnNm/0trU+YvqNR4UN99f+x/tApIFTfR7u39X4gKPnb9pOX5RAQB6DYyc/zOKCD4OUp6KiiPeqnapbAp56NdegrdhLo5wKq+3UG/0fWcyDpCsuWJVVWO5oZO29bXR0FwJ4uV2ONvTeTCVW9I1wVAylyVeNkYudR0rCOsqoN1M1JPd7QDdMTqYZZXQChwwYybT6Q63BIJvYSJX1eUNYReqi7CrsLGyZDbJqIEUWQAPLroJhWKhjHQUyj8mwkrJJROKsI+XyENeIw5LI4xXQqUiA8xxZNtZBHCAMZrJTDFPAcksmUUIWVEkQTlogQVQSbzdS9iUUr5cDUDgyhEIgAxFcHEqMpKTD+eMK09PlsiFAVGQpu6atJ5kMwDfHsEBcLpweZqlX06ruXVzSqCfEQBANiYEpyUAqYh8jIKEGq+nkSCI1gEY2IqURg28OYvlrW+nr5152AOsuUhV2fSy+EwgAAAA==') format('woff2'),
+  url('~@/pages_tool/components/sx-rate/sx-rate/iconfont.woff?t=1574760464482') format('woff'),
+  url('~@/pages_tool/components/sx-rate/sx-rate/iconfont.ttf?t=1574760464482') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+ */
+  url('~@/pages_tool/components/sx-rate/sx-rate/iconfont.svg?t=1574760464482#iconfont') format('svg'); /* iOS 4.1- */
+}
+
+.iconfont {
+  font-family: "iconfont" !important;
+  font-size: inherit;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.icon-star:before {
+  content: "\e6e3";
+}
+
diff --git a/pages_tool/components/sx-rate/sx-rate/iconfont.eot b/pages_tool/components/sx-rate/sx-rate/iconfont.eot
new file mode 100644
index 0000000..d9e6944
Binary files /dev/null and b/pages_tool/components/sx-rate/sx-rate/iconfont.eot differ
diff --git a/pages_tool/components/sx-rate/sx-rate/iconfont.svg b/pages_tool/components/sx-rate/sx-rate/iconfont.svg
new file mode 100644
index 0000000..8e29477
--- /dev/null
+++ b/pages_tool/components/sx-rate/sx-rate/iconfont.svg
@@ -0,0 +1,29 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<!--
+2013-9-30: Created.
+-->
+<svg>
+<metadata>
+Created by iconfont
+</metadata>
+<defs>
+
+<font id="iconfont" horiz-adv-x="1024" >
+  <font-face
+    font-family="iconfont"
+    font-weight="500"
+    font-stretch="normal"
+    units-per-em="1024"
+    ascent="896"
+    descent="-128"
+  />
+    <missing-glyph />
+    
+    <glyph glyph-name="star" unicode="&#59107;" d="M544.256 812.032l117.248-237.568c5.12-10.752 15.36-17.92 27.136-19.456l262.144-37.888c29.696-4.096 41.472-40.448 19.968-61.44l-189.44-184.832c-8.704-8.192-12.288-19.968-10.24-31.744l44.544-261.12c5.12-29.184-25.6-51.712-52.224-37.888l-234.496 123.392c-10.24 5.632-23.04 5.632-33.28 0L261.12-59.904c-26.112-13.824-57.344 8.704-52.224 37.888l44.544 261.12c2.048 11.776-2.048 23.552-10.24 31.744L53.76 455.68C32.256 476.16 44.032 512.512 73.728 517.12l262.144 37.888c11.776 1.536 22.016 9.216 27.136 19.456l117.248 237.568C493.056 838.656 530.944 838.656 544.256 812.032z"  horiz-adv-x="1024" />
+
+    
+
+
+  </font>
+</defs></svg>
diff --git a/pages_tool/components/sx-rate/sx-rate/iconfont.ttf b/pages_tool/components/sx-rate/sx-rate/iconfont.ttf
new file mode 100644
index 0000000..51da8df
Binary files /dev/null and b/pages_tool/components/sx-rate/sx-rate/iconfont.ttf differ
diff --git a/pages_tool/components/sx-rate/sx-rate/iconfont.woff b/pages_tool/components/sx-rate/sx-rate/iconfont.woff
new file mode 100644
index 0000000..e93b03f
Binary files /dev/null and b/pages_tool/components/sx-rate/sx-rate/iconfont.woff differ
diff --git a/pages_tool/components/sx-rate/sx-rate/iconfont.woff2 b/pages_tool/components/sx-rate/sx-rate/iconfont.woff2
new file mode 100644
index 0000000..982419b
Binary files /dev/null and b/pages_tool/components/sx-rate/sx-rate/iconfont.woff2 differ
diff --git a/pages_tool/components/uni-calendar/calendar.js b/pages_tool/components/uni-calendar/calendar.js
new file mode 100644
index 0000000..2331f75
--- /dev/null
+++ b/pages_tool/components/uni-calendar/calendar.js
@@ -0,0 +1,623 @@
+/**
+ * @1900-2100区间内的公历、农历互转
+ * @charset UTF-8
+ * @github  https://github.com/jjonline/calendar.js
+ * @Author  Jea杨(JJonline@JJonline.Cn)
+ * @Time    2014-7-21
+ * @Time    2016-8-13 Fixed 2033hex、Attribution Annals
+ * @Time    2016-9-25 Fixed lunar LeapMonth Param Bug
+ * @Time    2017-7-24 Fixed use getTerm Func Param Error.use solar year,NOT lunar year
+ * @Version 1.0.3
+ * @公历转农历：calendar.solar2lunar(1987,11,01); //[you can ignore params of prefix 0]
+ * @农历转公历：calendar.lunar2solar(1987,09,10); //[you can ignore params of prefix 0]
+ */
+/* eslint-disable */
+var calendar = {
+
+	/**
+	 * 农历1900-2100的润大小信息表
+	 * @Array Of Property
+	 * @return Hex
+	 */
+	lunarInfo: [0x04bd8, 0x04ae0, 0x0a570, 0x054d5, 0x0d260, 0x0d950, 0x16554, 0x056a0, 0x09ad0,
+		0x055d2, // 1900-1909
+		0x04ae0, 0x0a5b6, 0x0a4d0, 0x0d250, 0x1d255, 0x0b540, 0x0d6a0, 0x0ada2, 0x095b0, 0x14977, // 1910-1919
+		0x04970, 0x0a4b0, 0x0b4b5, 0x06a50, 0x06d40, 0x1ab54, 0x02b60, 0x09570, 0x052f2, 0x04970, // 1920-1929
+		0x06566, 0x0d4a0, 0x0ea50, 0x06e95, 0x05ad0, 0x02b60, 0x186e3, 0x092e0, 0x1c8d7, 0x0c950, // 1930-1939
+		0x0d4a0, 0x1d8a6, 0x0b550, 0x056a0, 0x1a5b4, 0x025d0, 0x092d0, 0x0d2b2, 0x0a950, 0x0b557, // 1940-1949
+		0x06ca0, 0x0b550, 0x15355, 0x04da0, 0x0a5b0, 0x14573, 0x052b0, 0x0a9a8, 0x0e950, 0x06aa0, // 1950-1959
+		0x0aea6, 0x0ab50, 0x04b60, 0x0aae4, 0x0a570, 0x05260, 0x0f263, 0x0d950, 0x05b57, 0x056a0, // 1960-1969
+		0x096d0, 0x04dd5, 0x04ad0, 0x0a4d0, 0x0d4d4, 0x0d250, 0x0d558, 0x0b540, 0x0b6a0, 0x195a6, // 1970-1979
+		0x095b0, 0x049b0, 0x0a974, 0x0a4b0, 0x0b27a, 0x06a50, 0x06d40, 0x0af46, 0x0ab60, 0x09570, // 1980-1989
+		0x04af5, 0x04970, 0x064b0, 0x074a3, 0x0ea50, 0x06b58, 0x05ac0, 0x0ab60, 0x096d5, 0x092e0, // 1990-1999
+		0x0c960, 0x0d954, 0x0d4a0, 0x0da50, 0x07552, 0x056a0, 0x0abb7, 0x025d0, 0x092d0, 0x0cab5, // 2000-2009
+		0x0a950, 0x0b4a0, 0x0baa4, 0x0ad50, 0x055d9, 0x04ba0, 0x0a5b0, 0x15176, 0x052b0, 0x0a930, // 2010-2019
+		0x07954, 0x06aa0, 0x0ad50, 0x05b52, 0x04b60, 0x0a6e6, 0x0a4e0, 0x0d260, 0x0ea65, 0x0d530, // 2020-2029
+		0x05aa0, 0x076a3, 0x096d0, 0x04afb, 0x04ad0, 0x0a4d0, 0x1d0b6, 0x0d250, 0x0d520, 0x0dd45, // 2030-2039
+		0x0b5a0, 0x056d0, 0x055b2, 0x049b0, 0x0a577, 0x0a4b0, 0x0aa50, 0x1b255, 0x06d20, 0x0ada0, // 2040-2049
+		/** Add By JJonline@JJonline.Cn**/
+		0x14b63, 0x09370, 0x049f8, 0x04970, 0x064b0, 0x168a6, 0x0ea50, 0x06b20, 0x1a6c4, 0x0aae0, // 2050-2059
+		0x0a2e0, 0x0d2e3, 0x0c960, 0x0d557, 0x0d4a0, 0x0da50, 0x05d55, 0x056a0, 0x0a6d0, 0x055d4, // 2060-2069
+		0x052d0, 0x0a9b8, 0x0a950, 0x0b4a0, 0x0b6a6, 0x0ad50, 0x055a0, 0x0aba4, 0x0a5b0, 0x052b0, // 2070-2079
+		0x0b273, 0x06930, 0x07337, 0x06aa0, 0x0ad50, 0x14b55, 0x04b60, 0x0a570, 0x054e4, 0x0d160, // 2080-2089
+		0x0e968, 0x0d520, 0x0daa0, 0x16aa6, 0x056d0, 0x04ae0, 0x0a9d4, 0x0a2d0, 0x0d150, 0x0f252, // 2090-2099
+		0x0d520
+	], // 2100
+
+	/**
+	 * 公历每个月份的天数普通表
+	 * @Array Of Property
+	 * @return Number
+	 */
+	solarMonth: [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31],
+
+	/**
+	 * 天干地支之天干速查表
+	 * @Array Of Property trans["甲","乙","丙","丁","戊","己","庚","辛","壬","癸"]
+	 * @return Cn string
+	 */
+	Gan: ['\u7532', '\u4e59', '\u4e19', '\u4e01', '\u620a', '\u5df1', '\u5e9a', '\u8f9b', '\u58ec', '\u7678'],
+
+	/**
+	 * 天干地支之地支速查表
+	 * @Array Of Property
+	 * @trans["子","丑","寅","卯","辰","巳","午","未","申","酉","戌","亥"]
+	 * @return Cn string
+	 */
+	Zhi: ['\u5b50', '\u4e11', '\u5bc5', '\u536f', '\u8fb0', '\u5df3', '\u5348', '\u672a', '\u7533', '\u9149',
+		'\u620c',
+		'\u4ea5'
+	],
+
+	/**
+	 * 天干地支之地支速查表<=>生肖
+	 * @Array Of Property
+	 * @trans["鼠","牛","虎","兔","龙","蛇","马","羊","猴","鸡","狗","猪"]
+	 * @return Cn string
+	 */
+	Animals: ['\u9f20', '\u725b', '\u864e', '\u5154', '\u9f99', '\u86c7', '\u9a6c', '\u7f8a', '\u7334', '\u9e21',
+		'\u72d7', '\u732a'
+	],
+
+	/**
+	 * 24节气速查表
+	 * @Array Of Property
+	 * @trans["小寒","大寒","立春","雨水","惊蛰","春分","清明","谷雨","立夏","小满","芒种","夏至","小暑","大暑","立秋","处暑","白露","秋分","寒露","霜降","立冬","小雪","大雪","冬至"]
+	 * @return Cn string
+	 */
+	solarTerm: ['\u5c0f\u5bd2', '\u5927\u5bd2', '\u7acb\u6625', '\u96e8\u6c34', '\u60ca\u86f0', '\u6625\u5206',
+		'\u6e05\u660e', '\u8c37\u96e8', '\u7acb\u590f', '\u5c0f\u6ee1', '\u8292\u79cd', '\u590f\u81f3',
+		'\u5c0f\u6691',
+		'\u5927\u6691', '\u7acb\u79cb', '\u5904\u6691', '\u767d\u9732', '\u79cb\u5206', '\u5bd2\u9732',
+		'\u971c\u964d',
+		'\u7acb\u51ac', '\u5c0f\u96ea', '\u5927\u96ea', '\u51ac\u81f3'
+	],
+
+	/**
+	 * 1900-2100各年的24节气日期速查表
+	 * @Array Of Property
+	 * @return 0x string For splice
+	 */
+	sTermInfo: ['9778397bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e',
+		'97bcf97c3598082c95f8c965cc920f',
+		'97bd0b06bdb0722c965ce1cfcc920f', 'b027097bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e',
+		'97bcf97c359801ec95f8c965cc920f', '97bd0b06bdb0722c965ce1cfcc920f', 'b027097bd097c36b0b6fc9274c91aa',
+		'97b6b97bd19801ec9210c965cc920e', '97bcf97c359801ec95f8c965cc920f', '97bd0b06bdb0722c965ce1cfcc920f',
+		'b027097bd097c36b0b6fc9274c91aa', '9778397bd19801ec9210c965cc920e', '97b6b97bd19801ec95f8c965cc920f',
+		'97bd09801d98082c95f8e1cfcc920f', '97bd097bd097c36b0b6fc9210c8dc2', '9778397bd197c36c9210c9274c91aa',
+		'97b6b97bd19801ec95f8c965cc920e', '97bd09801d98082c95f8e1cfcc920f', '97bd097bd097c36b0b6fc9210c8dc2',
+		'9778397bd097c36c9210c9274c91aa', '97b6b97bd19801ec95f8c965cc920e', '97bcf97c3598082c95f8e1cfcc920f',
+		'97bd097bd097c36b0b6fc9210c8dc2', '9778397bd097c36c9210c9274c91aa', '97b6b97bd19801ec9210c965cc920e',
+		'97bcf97c3598082c95f8c965cc920f', '97bd097bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa',
+		'97b6b97bd19801ec9210c965cc920e', '97bcf97c3598082c95f8c965cc920f', '97bd097bd097c35b0b6fc920fb0722',
+		'9778397bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e', '97bcf97c359801ec95f8c965cc920f',
+		'97bd097bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e',
+		'97bcf97c359801ec95f8c965cc920f', '97bd097bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa',
+		'97b6b97bd19801ec9210c965cc920e', '97bcf97c359801ec95f8c965cc920f', '97bd097bd07f595b0b6fc920fb0722',
+		'9778397bd097c36b0b6fc9210c8dc2', '9778397bd19801ec9210c9274c920e', '97b6b97bd19801ec95f8c965cc920f',
+		'97bd07f5307f595b0b0bc920fb0722', '7f0e397bd097c36b0b6fc9210c8dc2', '9778397bd097c36c9210c9274c920e',
+		'97b6b97bd19801ec95f8c965cc920f', '97bd07f5307f595b0b0bc920fb0722', '7f0e397bd097c36b0b6fc9210c8dc2',
+		'9778397bd097c36c9210c9274c91aa', '97b6b97bd19801ec9210c965cc920e', '97bd07f1487f595b0b0bc920fb0722',
+		'7f0e397bd097c36b0b6fc9210c8dc2', '9778397bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e',
+		'97bcf7f1487f595b0b0bb0b6fb0722', '7f0e397bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa',
+		'97b6b97bd19801ec9210c965cc920e', '97bcf7f1487f595b0b0bb0b6fb0722', '7f0e397bd097c35b0b6fc920fb0722',
+		'9778397bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e', '97bcf7f1487f531b0b0bb0b6fb0722',
+		'7f0e397bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e',
+		'97bcf7f1487f531b0b0bb0b6fb0722', '7f0e397bd07f595b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa',
+		'97b6b97bd19801ec9210c9274c920e', '97bcf7f0e47f531b0b0bb0b6fb0722', '7f0e397bd07f595b0b0bc920fb0722',
+		'9778397bd097c36b0b6fc9210c91aa', '97b6b97bd197c36c9210c9274c920e', '97bcf7f0e47f531b0b0bb0b6fb0722',
+		'7f0e397bd07f595b0b0bc920fb0722', '9778397bd097c36b0b6fc9210c8dc2', '9778397bd097c36c9210c9274c920e',
+		'97b6b7f0e47f531b0723b0b6fb0722', '7f0e37f5307f595b0b0bc920fb0722', '7f0e397bd097c36b0b6fc9210c8dc2',
+		'9778397bd097c36b0b70c9274c91aa', '97b6b7f0e47f531b0723b0b6fb0721', '7f0e37f1487f595b0b0bb0b6fb0722',
+		'7f0e397bd097c35b0b6fc9210c8dc2', '9778397bd097c36b0b6fc9274c91aa', '97b6b7f0e47f531b0723b0b6fb0721',
+		'7f0e27f1487f595b0b0bb0b6fb0722', '7f0e397bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa',
+		'97b6b7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e397bd097c35b0b6fc920fb0722',
+		'9778397bd097c36b0b6fc9274c91aa', '97b6b7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722',
+		'7f0e397bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa', '97b6b7f0e47f531b0723b0b6fb0721',
+		'7f0e27f1487f531b0b0bb0b6fb0722', '7f0e397bd07f595b0b0bc920fb0722', '9778397bd097c36b0b6fc9274c91aa',
+		'97b6b7f0e47f531b0723b0787b0721', '7f0e27f0e47f531b0b0bb0b6fb0722', '7f0e397bd07f595b0b0bc920fb0722',
+		'9778397bd097c36b0b6fc9210c91aa', '97b6b7f0e47f149b0723b0787b0721', '7f0e27f0e47f531b0723b0b6fb0722',
+		'7f0e397bd07f595b0b0bc920fb0722', '9778397bd097c36b0b6fc9210c8dc2', '977837f0e37f149b0723b0787b0721',
+		'7f07e7f0e47f531b0723b0b6fb0722', '7f0e37f5307f595b0b0bc920fb0722', '7f0e397bd097c35b0b6fc9210c8dc2',
+		'977837f0e37f14998082b0787b0721', '7f07e7f0e47f531b0723b0b6fb0721', '7f0e37f1487f595b0b0bb0b6fb0722',
+		'7f0e397bd097c35b0b6fc9210c8dc2', '977837f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721',
+		'7f0e27f1487f531b0b0bb0b6fb0722', '7f0e397bd097c35b0b6fc920fb0722', '977837f0e37f14998082b0787b06bd',
+		'7f07e7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e397bd097c35b0b6fc920fb0722',
+		'977837f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722',
+		'7f0e397bd07f595b0b0bc920fb0722', '977837f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721',
+		'7f0e27f1487f531b0b0bb0b6fb0722', '7f0e397bd07f595b0b0bc920fb0722', '977837f0e37f14998082b0787b06bd',
+		'7f07e7f0e47f149b0723b0787b0721', '7f0e27f0e47f531b0b0bb0b6fb0722', '7f0e397bd07f595b0b0bc920fb0722',
+		'977837f0e37f14998082b0723b06bd', '7f07e7f0e37f149b0723b0787b0721', '7f0e27f0e47f531b0723b0b6fb0722',
+		'7f0e397bd07f595b0b0bc920fb0722', '977837f0e37f14898082b0723b02d5', '7ec967f0e37f14998082b0787b0721',
+		'7f07e7f0e47f531b0723b0b6fb0722', '7f0e37f1487f595b0b0bb0b6fb0722', '7f0e37f0e37f14898082b0723b02d5',
+		'7ec967f0e37f14998082b0787b0721', '7f07e7f0e47f531b0723b0b6fb0722', '7f0e37f1487f531b0b0bb0b6fb0722',
+		'7f0e37f0e37f14898082b0723b02d5', '7ec967f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721',
+		'7f0e37f1487f531b0b0bb0b6fb0722', '7f0e37f0e37f14898082b072297c35', '7ec967f0e37f14998082b0787b06bd',
+		'7f07e7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e37f0e37f14898082b072297c35',
+		'7ec967f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722',
+		'7f0e37f0e366aa89801eb072297c35', '7ec967f0e37f14998082b0787b06bd', '7f07e7f0e47f149b0723b0787b0721',
+		'7f0e27f1487f531b0b0bb0b6fb0722', '7f0e37f0e366aa89801eb072297c35', '7ec967f0e37f14998082b0723b06bd',
+		'7f07e7f0e47f149b0723b0787b0721', '7f0e27f0e47f531b0723b0b6fb0722', '7f0e37f0e366aa89801eb072297c35',
+		'7ec967f0e37f14998082b0723b06bd', '7f07e7f0e37f14998083b0787b0721', '7f0e27f0e47f531b0723b0b6fb0722',
+		'7f0e37f0e366aa89801eb072297c35', '7ec967f0e37f14898082b0723b02d5', '7f07e7f0e37f14998082b0787b0721',
+		'7f07e7f0e47f531b0723b0b6fb0722', '7f0e36665b66aa89801e9808297c35', '665f67f0e37f14898082b0723b02d5',
+		'7ec967f0e37f14998082b0787b0721', '7f07e7f0e47f531b0723b0b6fb0722', '7f0e36665b66a449801e9808297c35',
+		'665f67f0e37f14898082b0723b02d5', '7ec967f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721',
+		'7f0e36665b66a449801e9808297c35', '665f67f0e37f14898082b072297c35', '7ec967f0e37f14998082b0787b06bd',
+		'7f07e7f0e47f531b0723b0b6fb0721', '7f0e26665b66a449801e9808297c35', '665f67f0e37f1489801eb072297c35',
+		'7ec967f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722'
+	],
+
+	/**
+	 * 数字转中文速查表
+	 * @Array Of Property
+	 * @trans ['日','一','二','三','四','五','六','七','八','九','十']
+	 * @return Cn string
+	 */
+	nStr1: ['\u65e5', '\u4e00', '\u4e8c', '\u4e09', '\u56db', '\u4e94', '\u516d', '\u4e03', '\u516b', '\u4e5d',
+		'\u5341'
+	],
+
+	/**
+	 * 日期转农历称呼速查表
+	 * @Array Of Property
+	 * @trans ['初','十','廿','卅']
+	 * @return Cn string
+	 */
+	nStr2: ['\u521d', '\u5341', '\u5eff', '\u5345'],
+
+	/**
+	 * 月份转农历称呼速查表
+	 * @Array Of Property
+	 * @trans ['正','一','二','三','四','五','六','七','八','九','十','冬','腊']
+	 * @return Cn string
+	 */
+	nStr3: ['\u6b63', '\u4e8c', '\u4e09', '\u56db', '\u4e94', '\u516d', '\u4e03', '\u516b', '\u4e5d', '\u5341',
+		'\u51ac',
+		'\u814a'
+	],
+
+	/**
+	 * 返回农历y年一整年的总天数
+	 * @param lunar Year
+	 * @return Number
+	 * @eg:var count = calendar.lYearDays(1987) ;//count=387
+	 */
+	lYearDays: function(y) {
+		var i;
+		var sum = 348
+		for (i = 0x8000; i > 0x8; i >>= 1) {
+			sum += (this.lunarInfo[y - 1900] & i) ? 1 : 0
+		}
+		return (sum + this.leapDays(y))
+	},
+
+	/**
+	 * 返回农历y年闰月是哪个月；若y年没有闰月 则返回0
+	 * @param lunar Year
+	 * @return Number (0-12)
+	 * @eg:var leapMonth = calendar.leapMonth(1987) ;//leapMonth=6
+	 */
+	leapMonth: function(y) { // 闰字编码 \u95f0
+		return (this.lunarInfo[y - 1900] & 0xf)
+	},
+
+	/**
+	 * 返回农历y年闰月的天数 若该年没有闰月则返回0
+	 * @param lunar Year
+	 * @return Number (0、29、30)
+	 * @eg:var leapMonthDay = calendar.leapDays(1987) ;//leapMonthDay=29
+	 */
+	leapDays: function(y) {
+		if (this.leapMonth(y)) {
+			return ((this.lunarInfo[y - 1900] & 0x10000) ? 30 : 29)
+		}
+		return (0)
+	},
+
+	/**
+	 * 返回农历y年m月（非闰月）的总天数，计算m为闰月时的天数请使用leapDays方法
+	 * @param lunar Year
+	 * @return Number (-1、29、30)
+	 * @eg:var MonthDay = calendar.monthDays(1987,9) ;//MonthDay=29
+	 */
+	monthDays: function(y, m) {
+		if (m > 12 || m < 1) {
+			return -1
+		} // 月份参数从1至12，参数错误返回-1
+		return ((this.lunarInfo[y - 1900] & (0x10000 >> m)) ? 30 : 29)
+	},
+
+	/**
+	 * 返回公历(!)y年m月的天数
+	 * @param solar Year
+	 * @return Number (-1、28、29、30、31)
+	 * @eg:var solarMonthDay = calendar.leapDays(1987) ;//solarMonthDay=30
+	 */
+	solarDays: function(y, m) {
+		if (m > 12 || m < 1) {
+			return -1
+		} // 若参数错误 返回-1
+		var ms = m - 1
+		if (ms == 1) { // 2月份的闰平规律测算后确认返回28或29
+			return (((y % 4 == 0) && (y % 100 != 0) || (y % 400 == 0)) ? 29 : 28)
+		} else {
+			return (this.solarMonth[ms])
+		}
+	},
+
+	/**
+	 * 农历年份转换为干支纪年
+	 * @param  lYear 农历年的年份数
+	 * @return Cn string
+	 */
+	toGanZhiYear: function(lYear) {
+		var ganKey = (lYear - 3) % 10
+		var zhiKey = (lYear - 3) % 12
+		if (ganKey == 0) ganKey = 10 // 如果余数为0则为最后一个天干
+		if (zhiKey == 0) zhiKey = 12 // 如果余数为0则为最后一个地支
+		return this.Gan[ganKey - 1] + this.Zhi[zhiKey - 1]
+	},
+
+	/**
+	 * 公历月、日判断所属星座
+	 * @param  cMonth [description]
+	 * @param  cDay [description]
+	 * @return Cn string
+	 */
+	toAstro: function(cMonth, cDay) {
+		var s =
+			'\u9b54\u7faf\u6c34\u74f6\u53cc\u9c7c\u767d\u7f8a\u91d1\u725b\u53cc\u5b50\u5de8\u87f9\u72ee\u5b50\u5904\u5973\u5929\u79e4\u5929\u874e\u5c04\u624b\u9b54\u7faf'
+		var arr = [20, 19, 21, 21, 21, 22, 23, 23, 23, 23, 22, 22]
+		return s.substr(cMonth * 2 - (cDay < arr[cMonth - 1] ? 2 : 0), 2) + '\u5ea7' // 座
+	},
+
+	/**
+	 * 传入offset偏移量返回干支
+	 * @param offset 相对甲子的偏移量
+	 * @return Cn string
+	 */
+	toGanZhi: function(offset) {
+		return this.Gan[offset % 10] + this.Zhi[offset % 12]
+	},
+
+	/**
+	 * 传入公历(!)y年获得该年第n个节气的公历日期
+	 * @param y公历年(1900-2100)；n二十四节气中的第几个节气(1~24)；从n=1(小寒)算起
+	 * @return day Number
+	 * @eg:var _24 = calendar.getTerm(1987,3) ;//_24=4;意即1987年2月4日立春
+	 */
+	getTerm: function(y, n) {
+		if (y < 1900 || y > 2100) {
+			return -1
+		}
+		if (n < 1 || n > 24) {
+			return -1
+		}
+		var _table = this.sTermInfo[y - 1900]
+		var _info = [
+			parseInt('0x' + _table.substr(0, 5)).toString(),
+			parseInt('0x' + _table.substr(5, 5)).toString(),
+			parseInt('0x' + _table.substr(10, 5)).toString(),
+			parseInt('0x' + _table.substr(15, 5)).toString(),
+			parseInt('0x' + _table.substr(20, 5)).toString(),
+			parseInt('0x' + _table.substr(25, 5)).toString()
+		]
+		var _calday = [
+			_info[0].substr(0, 1),
+			_info[0].substr(1, 2),
+			_info[0].substr(3, 1),
+			_info[0].substr(4, 2),
+
+			_info[1].substr(0, 1),
+			_info[1].substr(1, 2),
+			_info[1].substr(3, 1),
+			_info[1].substr(4, 2),
+
+			_info[2].substr(0, 1),
+			_info[2].substr(1, 2),
+			_info[2].substr(3, 1),
+			_info[2].substr(4, 2),
+
+			_info[3].substr(0, 1),
+			_info[3].substr(1, 2),
+			_info[3].substr(3, 1),
+			_info[3].substr(4, 2),
+
+			_info[4].substr(0, 1),
+			_info[4].substr(1, 2),
+			_info[4].substr(3, 1),
+			_info[4].substr(4, 2),
+
+			_info[5].substr(0, 1),
+			_info[5].substr(1, 2),
+			_info[5].substr(3, 1),
+			_info[5].substr(4, 2)
+		]
+		return parseInt(_calday[n - 1])
+	},
+
+	/**
+	 * 传入农历数字月份返回汉语通俗表示法
+	 * @param lunar month
+	 * @return Cn string
+	 * @eg:var cnMonth = calendar.toChinaMonth(12) ;//cnMonth='腊月'
+	 */
+	toChinaMonth: function(m) { // 月 => \u6708
+		if (m > 12 || m < 1) {
+			return -1
+		} // 若参数错误 返回-1
+		var s = this.nStr3[m - 1]
+		s += '\u6708' // 加上月字
+		return s
+	},
+
+	/**
+	 * 传入农历日期数字返回汉字表示法
+	 * @param lunar day
+	 * @return Cn string
+	 * @eg:var cnDay = calendar.toChinaDay(21) ;//cnMonth='廿一'
+	 */
+	toChinaDay: function(d) { // 日 => \u65e5
+		var s
+		switch (d) {
+			case 10:
+				s = '\u521d\u5341';
+				break
+			case 20:
+				s = '\u4e8c\u5341';
+				break
+				break
+			case 30:
+				s = '\u4e09\u5341';
+				break
+				break
+			default:
+				s = this.nStr2[Math.floor(d / 10)]
+				s += this.nStr1[d % 10]
+		}
+		return (s)
+	},
+
+	/**
+	 * 年份转生肖[!仅能大致转换] => 精确划分生肖分界线是“立春”
+	 * @param y year
+	 * @return Cn string
+	 * @eg:var animal = calendar.getAnimal(1987) ;//animal='兔'
+	 */
+	getAnimal: function(y) {
+		return this.Animals[(y - 4) % 12]
+	},
+
+	/**
+	 * 传入阳历年月日获得详细的公历、农历object信息 <=>JSON
+	 * @param y  solar year
+	 * @param m  solar month
+	 * @param d  solar day
+	 * @return JSON object
+	 * @eg:console.log(calendar.solar2lunar(1987,11,01));
+	 */
+	solar2lunar: function(y, m, d) { // 参数区间1900.1.31~2100.12.31
+		// 年份限定、上限
+		if (y < 1900 || y > 2100) {
+			return -1 // undefined转换为数字变为NaN
+		}
+		// 公历传参最下限
+		if (y == 1900 && m == 1 && d < 31) {
+			return -1
+		}
+		// 未传参  获得当天
+		if (!y) {
+			var objDate = new Date()
+		} else {
+			var objDate = new Date(y, parseInt(m) - 1, d)
+		}
+		var i;
+		var leap = 0;
+		var temp = 0
+		// 修正ymd参数
+		var y = objDate.getFullYear()
+		var m = objDate.getMonth() + 1
+		var d = objDate.getDate()
+		var offset = (Date.UTC(objDate.getFullYear(), objDate.getMonth(), objDate.getDate()) - Date.UTC(1900, 0,
+				31)) /
+			86400000
+		for (i = 1900; i < 2101 && offset > 0; i++) {
+			temp = this.lYearDays(i)
+			offset -= temp
+		}
+		if (offset < 0) {
+			offset += temp;
+			i--
+		}
+
+		// 是否今天
+		var isTodayObj = new Date()
+		var isToday = false
+		if (isTodayObj.getFullYear() == y && isTodayObj.getMonth() + 1 == m && isTodayObj.getDate() == d) {
+			isToday = true
+		}
+		// 星期几
+		var nWeek = objDate.getDay()
+		var cWeek = this.nStr1[nWeek]
+		// 数字表示周几顺应天朝周一开始的惯例
+		if (nWeek == 0) {
+			nWeek = 7
+		}
+		// 农历年
+		var year = i
+		var leap = this.leapMonth(i) // 闰哪个月
+		var isLeap = false
+
+		// 效验闰月
+		for (i = 1; i < 13 && offset > 0; i++) {
+			// 闰月
+			if (leap > 0 && i == (leap + 1) && isLeap == false) {
+				--i
+				isLeap = true;
+				temp = this.leapDays(year) // 计算农历闰月天数
+			} else {
+				temp = this.monthDays(year, i) // 计算农历普通月天数
+			}
+			// 解除闰月
+			if (isLeap == true && i == (leap + 1)) {
+				isLeap = false
+			}
+			offset -= temp
+		}
+		// 闰月导致数组下标重叠取反
+		if (offset == 0 && leap > 0 && i == leap + 1) {
+			if (isLeap) {
+				isLeap = false
+			} else {
+				isLeap = true;
+				--i
+			}
+		}
+		if (offset < 0) {
+			offset += temp;
+			--i
+		}
+		// 农历月
+		var month = i
+		// 农历日
+		var day = offset + 1
+		// 天干地支处理
+		var sm = m - 1
+		var gzY = this.toGanZhiYear(year)
+
+		// 当月的两个节气
+		// bugfix-2017-7-24 11:03:38 use lunar Year Param `y` Not `year`
+		var firstNode = this.getTerm(y, (m * 2 - 1)) // 返回当月「节」为几日开始
+		var secondNode = this.getTerm(y, (m * 2)) // 返回当月「节」为几日开始
+
+		// 依据12节气修正干支月
+		var gzM = this.toGanZhi((y - 1900) * 12 + m + 11)
+		if (d >= firstNode) {
+			gzM = this.toGanZhi((y - 1900) * 12 + m + 12)
+		}
+
+		// 传入的日期的节气与否
+		var isTerm = false
+		var Term = null
+		if (firstNode == d) {
+			isTerm = true
+			Term = this.solarTerm[m * 2 - 2]
+		}
+		if (secondNode == d) {
+			isTerm = true
+			Term = this.solarTerm[m * 2 - 1]
+		}
+		// 日柱 当月一日与 1900/1/1 相差天数
+		var dayCyclical = Date.UTC(y, sm, 1, 0, 0, 0, 0) / 86400000 + 25567 + 10
+		var gzD = this.toGanZhi(dayCyclical + d - 1)
+		// 该日期所属的星座
+		var astro = this.toAstro(m, d)
+
+		return {
+			'lYear': year,
+			'lMonth': month,
+			'lDay': day,
+			'Animal': this.getAnimal(year),
+			'IMonthCn': (isLeap ? '\u95f0' : '') + this.toChinaMonth(month),
+			'IDayCn': this.toChinaDay(day),
+			'cYear': y,
+			'cMonth': m,
+			'cDay': d,
+			'gzYear': gzY,
+			'gzMonth': gzM,
+			'gzDay': gzD,
+			'isToday': isToday,
+			'isLeap': isLeap,
+			'nWeek': nWeek,
+			'ncWeek': '\u661f\u671f' + cWeek,
+			'isTerm': isTerm,
+			'Term': Term,
+			'astro': astro
+		}
+	},
+
+	/**
+	 * 传入农历年月日以及传入的月份是否闰月获得详细的公历、农历object信息 <=>JSON
+	 * @param y  lunar year
+	 * @param m  lunar month
+	 * @param d  lunar day
+	 * @param isLeapMonth  lunar month is leap or not.[如果是农历闰月第四个参数赋值true即可]
+	 * @return JSON object
+	 * @eg:console.log(calendar.lunar2solar(1987,9,10));
+	 */
+	lunar2solar: function(y, m, d, isLeapMonth) { // 参数区间1900.1.31~2100.12.1
+		var isLeapMonth = !!isLeapMonth
+		var leapOffset = 0
+		var leapMonth = this.leapMonth(y)
+		var leapDay = this.leapDays(y)
+		if (isLeapMonth && (leapMonth != m)) {
+			return -1
+		} // 传参要求计算该闰月公历 但该年得出的闰月与传参的月份并不同
+		if (y == 2100 && m == 12 && d > 1 || y == 1900 && m == 1 && d < 31) {
+			return -1
+		} // 超出了最大极限值
+		var day = this.monthDays(y, m)
+		var _day = day
+		// bugFix 2016-9-25
+		// if month is leap, _day use leapDays method
+		if (isLeapMonth) {
+			_day = this.leapDays(y, m)
+		}
+		if (y < 1900 || y > 2100 || d > _day) {
+			return -1
+		} // 参数合法性效验
+
+		// 计算农历的时间差
+		var offset = 0
+		for (var i = 1900; i < y; i++) {
+			offset += this.lYearDays(i)
+		}
+		var leap = 0;
+		var isAdd = false
+		for (var i = 1; i < m; i++) {
+			leap = this.leapMonth(y)
+			if (!isAdd) { // 处理闰月
+				if (leap <= i && leap > 0) {
+					offset += this.leapDays(y);
+					isAdd = true
+				}
+			}
+			offset += this.monthDays(y, i)
+		}
+		// 转换闰月农历 需补充该年闰月的前一个月的时差
+		if (isLeapMonth) {
+			offset += day
+		}
+		// 1900年农历正月一日的公历时间为1900年1月30日0时0分0秒(该时间也是本农历的最开始起始点)
+		var stmap = Date.UTC(1900, 1, 30, 0, 0, 0)
+		var calObj = new Date((offset + d - 31) * 86400000 + stmap)
+		var cY = calObj.getUTCFullYear()
+		var cM = calObj.getUTCMonth() + 1
+		var cD = calObj.getUTCDate()
+
+		return this.solar2lunar(cY, cM, cD)
+	}
+}
+
+export default calendar
diff --git a/pages_tool/components/uni-calendar/uni-calendar-item.vue b/pages_tool/components/uni-calendar/uni-calendar-item.vue
new file mode 100644
index 0000000..b776366
--- /dev/null
+++ b/pages_tool/components/uni-calendar/uni-calendar-item.vue
@@ -0,0 +1,186 @@
+<template>
+	<view
+		class="uni-calendar-item__weeks-box"
+		:class="{
+			'uni-calendar-item--disable': weeks.disable,
+			'uni-calendar-item--isDay': calendar.fullDate === weeks.fullDate && weeks.isDay,
+			'uni-calendar-item--checked': calendar.fullDate === weeks.fullDate && !weeks.isDay,
+			'uni-calendar-item--before-checked': weeks.beforeMultiple,
+			'uni-calendar-item--multiple': weeks.multiple,
+			'uni-calendar-item--after-checked': weeks.afterMultiple
+		}"
+		@click="choiceDate(weeks)"
+	>
+		<view class="uni-calendar-item__weeks-box-item">
+			<text v-if="selected && weeks.extraInfo" class="uni-calendar-item__weeks-box-circle"></text>
+			<text class="uni-calendar-item__weeks-box-text"
+				:class="{
+					'uni-calendar-item--isDay-text': weeks.isDay,
+					'uni-calendar-item--isDay': calendar.fullDate === weeks.fullDate && weeks.isDay,
+					'uni-calendar-item--checked': calendar.fullDate === weeks.fullDate && !weeks.isDay,
+					'uni-calendar-item--before-checked': weeks.beforeMultiple,
+					'uni-calendar-item--multiple': weeks.multiple,
+					'uni-calendar-item--after-checked': weeks.afterMultiple,
+					'uni-calendar-item--disable': weeks.disable
+				}"
+			>
+				{{ weeks.date }}
+			</text>
+			<text v-if="!lunar && !weeks.extraInfo && weeks.isDay" class="uni-calendar-item__weeks-lunar-text"
+				:class="{
+					'uni-calendar-item--isDay-text': weeks.isDay,
+					'uni-calendar-item--isDay': calendar.fullDate === weeks.fullDate && weeks.isDay,
+					'uni-calendar-item--checked': calendar.fullDate === weeks.fullDate && !weeks.isDay,
+					'uni-calendar-item--before-checked': weeks.beforeMultiple,
+					'uni-calendar-item--multiple': weeks.multiple,
+					'uni-calendar-item--after-checked': weeks.afterMultiple
+				}"
+			></text>
+			<text v-if="lunar && !weeks.extraInfo" class="uni-calendar-item__weeks-lunar-text"
+				:class="{
+					'uni-calendar-item--isDay-text': weeks.isDay,
+					'uni-calendar-item--isDay': calendar.fullDate === weeks.fullDate && weeks.isDay,
+					'uni-calendar-item--checked': calendar.fullDate === weeks.fullDate && !weeks.isDay,
+					'uni-calendar-item--before-checked': weeks.beforeMultiple,
+					'uni-calendar-item--multiple': weeks.multiple,
+					'uni-calendar-item--after-checked': weeks.afterMultiple,
+					'uni-calendar-item--disable': weeks.disable
+				}"
+			>
+				{{ weeks.isDay ? '今天' : weeks.lunar.IDayCn === '初一' ? weeks.lunar.IMonthCn : weeks.lunar.IDayCn }}
+			</text>
+			<text v-if="weeks.extraInfo && weeks.extraInfo.info" class="uni-calendar-item__weeks-lunar-text"
+				:class="{
+					'uni-calendar-item--extra': weeks.extraInfo.info,
+					'uni-calendar-item--isDay-text': weeks.isDay,
+					'uni-calendar-item--isDay': calendar.fullDate === weeks.fullDate && weeks.isDay,
+					'uni-calendar-item--checked': calendar.fullDate === weeks.fullDate && !weeks.isDay,
+					'uni-calendar-item--before-checked': weeks.beforeMultiple,
+					'uni-calendar-item--multiple': weeks.multiple,
+					'uni-calendar-item--after-checked': weeks.afterMultiple,
+					'uni-calendar-item--disable': weeks.disable
+				}"
+			>
+				{{ weeks.extraInfo.info }}
+			</text>
+		</view>
+	</view>
+</template>
+
+<script>
+export default {
+	props: {
+		weeks: {
+			type: Object,
+			default() {
+				return {};
+			}
+		},
+		calendar: {
+			type: Object,
+			default: () => {
+				return {};
+			}
+		},
+		selected: {
+			type: Array,
+			default: () => {
+				return [];
+			}
+		},
+		lunar: {
+			type: Boolean,
+			default: false
+		}
+	},
+	methods: {
+		choiceDate(weeks) {
+			this.$emit('change', weeks);
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+.uni-calendar-item__weeks-box {
+	flex: 1;
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	flex-direction: column;
+	justify-content: center;
+	align-items: center;
+}
+
+.uni-calendar-item__weeks-box-text {
+	font-size: 24rpx;
+	color: #fff;
+}
+
+.uni-calendar-item__weeks-lunar-text {
+	font-size: $uni-font-size-base;
+	color: $uni-text-color;
+}
+
+.uni-calendar-item__weeks-box-item {
+	position: relative;
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	flex-direction: column;
+	justify-content: center;
+	align-items: center;
+	width: 100rpx;
+	height: 100rpx;
+	border-radius: 50%;
+}
+
+.uni-calendar-item__weeks-box-circle {
+	position: absolute;
+	top: 10rpx;
+	right: 10rpx;
+	width: 16rpx;
+	height: 16rpx;
+	border-radius: 16rpx;
+	background-color: $uni-color-error;
+}
+
+.uni-calendar-item--disable {
+	color: #feaa93;
+}
+
+.uni-calendar-item--isDay-text {
+	color: #fff;
+}
+
+.uni-calendar-item--isDay {
+	color: #000;
+	background-color: #fff;
+	border-radius: 50%;
+}
+
+.uni-calendar-item--extra {
+	// color: $uni-color-error;
+	// opacity: 0.8;
+}
+
+.uni-calendar-item--checked {
+	color: #fff;
+	background: rgba(255, 255, 255, 0.2);
+	border-radius: 50%;
+}
+
+.uni-calendar-item--multiple {
+	background-color: $uni-color-primary;
+	color: #fff;
+	opacity: 0.8;
+}
+.uni-calendar-item--before-checked {
+	background-color: #ff5a5f;
+	color: #fff;
+}
+.uni-calendar-item--after-checked {
+	background-color: #ff5a5f;
+	color: #fff;
+}
+</style>
diff --git a/pages_tool/components/uni-calendar/uni-calendar.vue b/pages_tool/components/uni-calendar/uni-calendar.vue
new file mode 100644
index 0000000..6234826
--- /dev/null
+++ b/pages_tool/components/uni-calendar/uni-calendar.vue
@@ -0,0 +1,476 @@
+<template>
+	<view class="uni-calendar">
+		<view v-if="!insert && show" class="uni-calendar__mask" :class="{ 'uni-calendar--mask-show': aniMaskShow }" @click="clean"></view>
+		<view v-if="insert || show" class="uni-calendar__content" :class="{ 'uni-calendar--fixed': !insert, 'uni-calendar--ani-show': aniMaskShow }">
+			<view v-if="!insert" class="uni-calendar__header uni-calendar--fixed-top">
+				<view class="uni-calendar__header-btn-box" @click="close"><text class="uni-calendar__header-text uni-calendar--fixed-width">取消</text></view>
+				<view class="uni-calendar__header-btn-box" @click="confirm"><text class="uni-calendar__header-text uni-calendar--fixed-width">确定</text></view>
+			</view>
+			<view class="uni-calendar__header">
+				<view class="uni-calendar__header-btn-box" @click.stop="pre">
+					<!-- <view class="uni-calendar__header-btn uni-calendar--left"></view> -->
+					<text class="iconfont icon-back_light"></text>
+				</view>
+				<picker mode="date" :value="date" fields="month" @change="bindDateChange">
+					<text class="uni-calendar__header-text">{{ (nowDate.year || '') + '年' + (nowDate.month || '') + '月' }}</text>
+				</picker>
+				<view class="uni-calendar__header-btn-box" @click.stop="next">
+					<!-- <view class="uni-calendar__header-btn uni-calendar--right"></view> -->
+					<text class="iconfont icon-right"></text>
+				</view>
+			</view>
+			<view class="uni-calendar__box">
+				<view v-if="showMonth" class="uni-calendar__box-bg">
+					<text class="uni-calendar__box-bg-text">{{ nowDate.month }}</text>
+				</view>
+				<view class="uni-calendar__weeks">
+					<view class="uni-calendar__weeks-day"><text class="uni-calendar__weeks-day-text">日</text></view>
+					<view class="uni-calendar__weeks-day"><text class="uni-calendar__weeks-day-text">一</text></view>
+					<view class="uni-calendar__weeks-day"><text class="uni-calendar__weeks-day-text">二</text></view>
+					<view class="uni-calendar__weeks-day"><text class="uni-calendar__weeks-day-text">三</text></view>
+					<view class="uni-calendar__weeks-day"><text class="uni-calendar__weeks-day-text">四</text></view>
+					<view class="uni-calendar__weeks-day"><text class="uni-calendar__weeks-day-text">五</text></view>
+					<view class="uni-calendar__weeks-day"><text class="uni-calendar__weeks-day-text">六</text></view>
+				</view>
+				<view class="uni-calendar__weeks" v-for="(item, weekIndex) in weeks" :key="weekIndex">
+					<view class="uni-calendar__weeks-item" v-for="(weeks, weeksIndex) in item" :key="weeksIndex">
+						<uni-calendar-item :weeks="weeks" :calendar="calendar" :selected="selected" :lunar="lunar" @change="choiceDate"></uni-calendar-item>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+import Calendar from './util.js';
+import uniCalendarItem from './uni-calendar-item.vue';
+/**
+ * Calendar 日历
+ * @description 日历组件可以查看日期，选择任意范围内的日期，打点操作。常用场景如：酒店日期预订、火车机票选择购买日期、上下班打卡等
+ * @tutorial https://ext.dcloud.net.cn/plugin?id=56
+ * @property {String} date 自定义当前时间，默认为今天
+ * @property {Boolean} lunar 显示农历
+ * @property {String} startDate 日期选择范围-开始日期
+ * @property {String} endDate 日期选择范围-结束日期
+ * @property {Boolean} range 范围选择
+ * @property {Boolean} insert = [true|false] 插入模式,默认为false
+ * 	@value true 弹窗模式
+ * 	@value false 插入模式
+ * @property {Boolean} clearDate = [true|false] 弹窗模式是否清空上次选择内容
+ * @property {Array} selected 打点，期待格式[{date: '2019-06-27', info: '签到', data: { custom: '自定义信息', name: '自定义消息头',xxx:xxx... }}]
+ * @property {Boolean} showMonth 是否选择月份为背景
+ * @event {Function} change 日期改变，`insert :ture` 时生效
+ * @event {Function} confirm 确认选择`insert :false` 时生效
+ * @event {Function} monthSwitch 切换月份时触发
+ * @example <uni-calendar :insert="true":lunar="true" :start-date="'2019-3-2'":end-date="'2019-5-20'"@change="change" />
+ */
+export default {
+	components: {
+		uniCalendarItem
+	},
+	props: {
+		date: {
+			type: String,
+			default: ''
+		},
+		selected: {
+			type: Array,
+			default() {
+				return [];
+			}
+		},
+		lunar: {
+			type: Boolean,
+			default: false
+		},
+		startDate: {
+			type: String,
+			default: ''
+		},
+		endDate: {
+			type: String,
+			default: ''
+		},
+		range: {
+			type: Boolean,
+			default: false
+		},
+		insert: {
+			type: Boolean,
+			default: true
+		},
+		showMonth: {
+			type: Boolean,
+			default: true
+		},
+		clearDate: {
+			type: Boolean,
+			default: true
+		}
+	},
+	data() {
+		return {
+			show: false,
+			weeks: [],
+			calendar: {},
+			nowDate: '',
+			aniMaskShow: false
+		};
+	},
+	watch: {
+		date(newVal) {
+			this.cale.setDate(newVal);
+			this.init(this.cale.selectDate.fullDate);
+		},
+		startDate(val) {
+			this.cale.resetSatrtDate(val);
+		},
+		endDate(val) {
+			this.cale.resetEndDate(val);
+		},
+		selected(newVal) {
+			this.cale.setSelectInfo(this.nowDate.fullDate, newVal);
+			this.weeks = this.cale.weeks;
+		}
+	},
+	created() {
+		// 获取日历方法实例
+		this.cale = new Calendar({
+			// date: new Date(),
+			selected: this.selected,
+			startDate: this.startDate,
+			endDate: this.endDate,
+			range: this.range
+		});
+		// 选中某一天
+		this.cale.setDate(this.date);
+		this.init(this.cale.selectDate.fullDate);
+		// this.setDay
+	},
+	methods: {
+		// 取消穿透
+		clean() {},
+		bindDateChange(e) {
+			const value = e.detail.value + '-1';
+			this.cale.setDate(value);
+			this.init(value);
+		},
+		/**
+		 * 初始化日期显示
+		 * @param {Object} date
+		 */
+		init(date) {
+			this.weeks = this.cale.weeks;
+			this.nowDate = this.calendar = this.cale.getInfo(date);
+		},
+		/**
+		 * 打开日历弹窗
+		 */
+		open() {
+			// 弹窗模式并且清理数据
+			if (this.clearDate && !this.insert) {
+				this.cale.cleanMultipleStatus();
+				this.cale.setDate(this.date);
+				this.init(this.cale.selectDate.fullDate);
+			}
+			this.show = true;
+			this.$nextTick(() => {
+				setTimeout(() => {
+					this.aniMaskShow = true;
+				}, 50);
+			});
+		},
+		/**
+		 * 关闭日历弹窗
+		 */
+		close() {
+			this.aniMaskShow = false;
+			this.$nextTick(() => {
+				setTimeout(() => {
+					this.show = false;
+					this.$emit('close');
+				}, 300);
+			});
+		},
+		/**
+		 * 确认按钮
+		 */
+		confirm() {
+			this.setEmit('confirm');
+			this.close();
+		},
+		/**
+		 * 变化触发
+		 */
+		change() {
+			if (!this.insert) return;
+			this.setEmit('change');
+		},
+		/**
+		 * 选择月份触发
+		 */
+		monthSwitch() {
+			let { year, month } = this.nowDate;
+			this.$emit('monthSwitch', {
+				year,
+				month: Number(month)
+			});
+		},
+		/**
+		 * 派发事件
+		 * @param {Object} name
+		 */
+		setEmit(name) {
+			let { year, month, date, fullDate, lunar, extraInfo } = this.calendar;
+			this.$emit(name, {
+				range: this.cale.multipleStatus,
+				year,
+				month,
+				date,
+				fulldate: fullDate,
+				lunar,
+				extraInfo: extraInfo || {}
+			});
+		},
+		/**
+		 * 选择天触发
+		 * @param {Object} weeks
+		 */
+		choiceDate(weeks) {
+			if (weeks.disable) return;
+			this.calendar = weeks;
+			// 设置多选
+			this.cale.setMultiple(this.calendar.fullDate);
+			this.weeks = this.cale.weeks;
+			this.change();
+		},
+		/**
+		 * 回到今天
+		 */
+		backtoday() {
+			let date = this.cale.getDate(new Date()).fullDate;
+			this.cale.setDate(date);
+			this.init(date);
+			this.change();
+		},
+		/**
+		 * 上个月
+		 */
+		pre() {
+			const preDate = this.cale.getDate(this.nowDate.fullDate, -1, 'month').fullDate;
+			this.setDate(preDate);
+			this.monthSwitch();
+		},
+		/**
+		 * 下个月
+		 */
+		next() {
+			const nextDate = this.cale.getDate(this.nowDate.fullDate, +1, 'month').fullDate;
+			this.setDate(nextDate);
+			this.monthSwitch();
+		},
+		/**
+		 * 设置日期
+		 * @param {Object} date
+		 */
+		setDate(date) {
+			this.cale.setDate(date);
+			this.weeks = this.cale.weeks;
+			this.nowDate = this.cale.getInfo(date);
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+.uni-calendar {
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	flex-direction: column;
+}
+
+.uni-calendar__mask {
+	position: fixed;
+	bottom: 0;
+	top: 0;
+	left: 0;
+	right: 0;
+	background-color: $uni-bg-color-mask;
+	transition-property: opacity;
+	transition-duration: 0.3s;
+	opacity: 0;
+	/* #ifndef APP-NVUE */
+	z-index: 99;
+	/* #endif */
+}
+
+.uni-calendar--mask-show {
+	opacity: 1;
+}
+
+.uni-calendar--fixed {
+	position: fixed;
+	bottom: 0;
+	left: 0;
+	right: 0;
+	transition-property: transform;
+	transition-duration: 0.3s;
+	transform: translateY(460px);
+	/* #ifndef APP-NVUE */
+	z-index: 99;
+	/* #endif */
+}
+
+.uni-calendar--ani-show {
+	transform: translateY(0);
+}
+
+.uni-calendar__content {
+	background: linear-gradient(180deg, rgba(247, 0, 66, 1), rgba(254, 147, 76, 1));
+	border-bottom-left-radius: 24rpx;
+	border-bottom-right-radius: 24rpx;
+}
+
+.uni-calendar__header {
+	position: relative;
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	flex-direction: row;
+	justify-content: space-between;
+	align-items: center;
+	height: 56rpx;
+	width: 657rpx;
+	margin: 0 auto;
+	background-color: #fa556a;
+	border-radius: 28px;
+}
+
+.uni-calendar--fixed-top {
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	flex-direction: row;
+	justify-content: space-between;
+	border-top-color: $uni-border-color;
+	border-top-style: solid;
+	border-top-width: 1px;
+}
+
+.uni-calendar--fixed-width {
+	width: 50px;
+	// padding: 0 15px;
+}
+
+.uni-calendar__backtoday {
+	position: absolute;
+	right: 0;
+	top: 25rpx;
+	padding: 0 5px;
+	padding-left: 10px;
+	height: 25px;
+	line-height: 25px;
+	font-size: 12px;
+	border-top-left-radius: 25px;
+	border-bottom-left-radius: 25px;
+	color: $uni-text-color;
+	background-color: $uni-bg-color-hover;
+}
+
+.uni-calendar__header-text {
+	text-align: center;
+	width: 100px;
+	font-size: 26rpx;
+	color: #fff;
+}
+
+.uni-calendar__header-btn-box {
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	flex-direction: row;
+	align-items: center;
+	justify-content: center;
+	width: 50px;
+	height: 50px;
+	color: #fff !important;
+}
+
+.uni-calendar__header-btn {
+	width: 10px;
+	height: 10px;
+	border-left-color: $uni-text-color-placeholder;
+	border-left-style: solid;
+	border-left-width: 2px;
+	border-top-color: $uni-color-subtitle;
+	border-top-style: solid;
+	border-top-width: 2px;
+}
+
+.uni-calendar--left {
+	transform: rotate(-45deg);
+}
+
+.uni-calendar--right {
+	transform: rotate(135deg);
+}
+
+.uni-calendar__weeks {
+	position: relative;
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	flex-direction: row;
+}
+
+.uni-calendar__weeks-item {
+	flex: 1;
+}
+
+.uni-calendar__weeks-day {
+	flex: 1;
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	flex-direction: column;
+	justify-content: center;
+	align-items: center;
+	height: 45px;
+	color: #fff;
+	font-size: 24rpx;
+}
+
+.uni-calendar__weeks-day-text {
+	font-size: 14px;
+}
+
+.uni-calendar__box {
+	position: relative;
+}
+
+.uni-calendar__box-bg {
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	justify-content: center;
+	align-items: center;
+	position: absolute;
+	top: 0;
+	left: 0;
+	right: 0;
+	bottom: 0;
+}
+
+.uni-calendar__box-bg-text {
+	font-size: 200px;
+	font-weight: bold;
+	color: $uni-text-color-grey;
+	opacity: 0.1;
+	text-align: center;
+	/* #ifndef APP-NVUE */
+	line-height: 1;
+	/* #endif */
+}
+</style>
diff --git a/pages_tool/components/uni-calendar/util.js b/pages_tool/components/uni-calendar/util.js
new file mode 100644
index 0000000..4b423f2
--- /dev/null
+++ b/pages_tool/components/uni-calendar/util.js
@@ -0,0 +1,354 @@
+import CALENDAR from './calendar.js'
+
+class Calendar {
+	constructor({
+		date,
+		selected,
+		startDate,
+		endDate,
+		range
+	} = {}) {
+		// 当前日期
+		this.date = this.getDate(new Date()) // 当前初入日期
+		// 打点信息
+		this.selected = selected || [];
+		// 范围开始
+		this.startDate = startDate
+		// 范围结束
+		this.endDate = endDate
+		this.range = range
+		// 多选状态
+		this.cleanMultipleStatus()
+		// 每周日期
+		this.weeks = {}
+		// this._getWeek(this.date.fullDate)
+	}
+	/**
+	 * 设置日期
+	 * @param {Object} date
+	 */
+	setDate(date) {
+		this.selectDate = this.getDate(date)
+		this._getWeek(this.selectDate.fullDate)
+	}
+
+	/**
+	 * 清理多选状态
+	 */
+	cleanMultipleStatus() {
+		this.multipleStatus = {
+			before: '',
+			after: '',
+			data: []
+		}
+	}
+
+	/**
+	 * 重置开始日期
+	 */
+	resetSatrtDate(startDate) {
+		// 范围开始
+		this.startDate = startDate
+
+	}
+
+	/**
+	 * 重置结束日期
+	 */
+	resetEndDate(endDate) {
+		// 范围结束
+		this.endDate = endDate
+	}
+
+	/**
+	 * 获取任意时间
+	 */
+	getDate(date, AddDayCount = 0, str = 'day') {
+		if (!date) {
+			date = new Date()
+		}
+		if (typeof date !== 'object') {
+			date = date.replace(/-/g, '/')
+		}
+		const dd = new Date(date)
+		switch (str) {
+			case 'day':
+				dd.setDate(dd.getDate() + AddDayCount) // 获取AddDayCount天后的日期
+				break
+			case 'month':
+				if (dd.getDate() === 31) {
+					dd.setDate(dd.getDate() + AddDayCount)
+				} else {
+					dd.setMonth(dd.getMonth() + AddDayCount) // 获取AddDayCount天后的日期
+				}
+				break
+			case 'year':
+				dd.setFullYear(dd.getFullYear() + AddDayCount) // 获取AddDayCount天后的日期
+				break
+		}
+		const y = dd.getFullYear()
+		const m = dd.getMonth() + 1 < 10 ? '0' + (dd.getMonth() + 1) : dd.getMonth() + 1 // 获取当前月份的日期，不足10补0
+		const d = dd.getDate() < 10 ? '0' + dd.getDate() : dd.getDate() // 获取当前几号，不足10补0
+		return {
+			fullDate: y + '-' + m + '-' + d,
+			year: y,
+			month: m,
+			date: d,
+			day: dd.getDay()
+		}
+	}
+
+
+	/**
+	 * 获取上月剩余天数
+	 */
+	_getLastMonthDays(firstDay, full) {
+		let dateArr = []
+		for (let i = firstDay; i > 0; i--) {
+			const beforeDate = new Date(full.year, full.month - 1, -i + 1).getDate()
+			dateArr.push({
+				date: beforeDate,
+				month: full.month - 1,
+				lunar: this.getlunar(full.year, full.month - 1, beforeDate),
+				disable: true
+			})
+		}
+		return dateArr
+	}
+	/**
+	 * 获取本月天数
+	 */
+	_currentMonthDys(dateData, full) {
+		let dateArr = []
+		let fullDate = this.date.fullDate
+		for (let i = 1; i <= dateData; i++) {
+			let isinfo = false
+			let nowDate = full.year + '-' + (full.month < 10 ?
+				full.month : full.month) + '-' + (i < 10 ?
+				'0' + i : i)
+			// 是否今天
+			let isDay = fullDate === nowDate
+			// 获取打点信息
+			let info = this.selected && this.selected.find((item) => {
+				if (this.dateEqual(nowDate, item.date)) {
+					return item
+				}
+			})
+
+			// 日期禁用
+			let disableBefore = true
+			let disableAfter = true
+			if (this.startDate) {
+				let dateCompBefore = this.dateCompare(this.startDate, fullDate)
+				disableBefore = this.dateCompare(dateCompBefore ? this.startDate : fullDate, nowDate)
+			}
+
+			if (this.endDate) {
+				let dateCompAfter = this.dateCompare(fullDate, this.endDate)
+				disableAfter = this.dateCompare(nowDate, dateCompAfter ? this.endDate : fullDate)
+			}
+			let multiples = this.multipleStatus.data
+			let checked = false
+			let multiplesStatus = -1
+			if (this.range) {
+				if (multiples) {
+					multiplesStatus = multiples.findIndex((item) => {
+						return this.dateEqual(item, nowDate)
+					})
+				}
+				if (multiplesStatus !== -1) {
+					checked = true
+				}
+			}
+			let data = {
+				fullDate: nowDate,
+				year: full.year,
+				date: i,
+				multiple: this.range ? checked : false,
+				beforeMultiple: this.dateEqual(this.multipleStatus.before, nowDate),
+				afterMultiple: this.dateEqual(this.multipleStatus.after, nowDate),
+				month: full.month,
+				lunar: this.getlunar(full.year, full.month, i),
+				disable: !disableBefore || !disableAfter,
+				isDay
+			}
+			if (info) {
+				data.extraInfo = info
+			}
+
+			dateArr.push(data)
+		}
+		return dateArr
+	}
+	/**
+	 * 获取下月天数
+	 */
+	_getNextMonthDays(surplus, full) {
+		let dateArr = []
+		for (let i = 1; i < surplus + 1; i++) {
+			dateArr.push({
+				date: i,
+				month: Number(full.month) + 1,
+				lunar: this.getlunar(full.year, Number(full.month) + 1, i),
+				disable: true
+			})
+		}
+		return dateArr
+	}
+
+	/**
+	 * 获取当前日期详情
+	 * @param {Object} date
+	 */
+	getInfo(date) {
+		if (!date) {
+			date = new Date()
+		}
+		const dateInfo = this.canlender.find(item => item.fullDate === this.getDate(date).fullDate)
+		return dateInfo
+	}
+
+	/**
+	 * 比较时间大小
+	 */
+	dateCompare(startDate, endDate) {
+		// 计算截止时间
+		startDate = new Date(startDate.replace('-', '/').replace('-', '/'))
+		// 计算详细项的截止时间
+		endDate = new Date(endDate.replace('-', '/').replace('-', '/'))
+		if (startDate <= endDate) {
+			return true
+		} else {
+			return false
+		}
+	}
+
+	/**
+	 * 比较时间是否相等
+	 */
+	dateEqual(before, after) {
+		// 计算截止时间
+		before = new Date(before.replace('-', '/').replace('-', '/'))
+		// 计算详细项的截止时间
+		after = new Date(after.replace('-', '/').replace('-', '/'))
+		if (before.getTime() - after.getTime() === 0) {
+			return true
+		} else {
+			return false
+		}
+	}
+
+
+	/**
+	 * 获取日期范围内所有日期
+	 * @param {Object} begin
+	 * @param {Object} end
+	 */
+	geDateAll(begin, end) {
+		var arr = []
+		var ab = begin.split('-')
+		var ae = end.split('-')
+		var db = new Date()
+		db.setFullYear(ab[0], ab[1] - 1, ab[2])
+		var de = new Date()
+		de.setFullYear(ae[0], ae[1] - 1, ae[2])
+		var unixDb = db.getTime() - 24 * 60 * 60 * 1000
+		var unixDe = de.getTime() - 24 * 60 * 60 * 1000
+		for (var k = unixDb; k <= unixDe;) {
+			k = k + 24 * 60 * 60 * 1000
+			arr.push(this.getDate(new Date(parseInt(k))).fullDate)
+		}
+		return arr
+	}
+	/**
+	 * 计算阴历日期显示
+	 */
+	getlunar(year, month, date) {
+		return CALENDAR.solar2lunar(year, month, date)
+	}
+	/**
+	 * 设置打点
+	 */
+	setSelectInfo(data, value) {
+		this.selected = value
+		this._getWeek(data)
+	}
+
+	/**
+	 *  获取多选状态
+	 */
+	setMultiple(fullDate) {
+		let {
+			before,
+			after
+		} = this.multipleStatus
+
+		if (!this.range) return
+		if (before && after) {
+			this.multipleStatus.before = ''
+			this.multipleStatus.after = ''
+			this.multipleStatus.data = []
+		} else {
+			if (!before) {
+				this.multipleStatus.before = fullDate
+			} else {
+				this.multipleStatus.after = fullDate
+				if (this.dateCompare(this.multipleStatus.before, this.multipleStatus.after)) {
+					this.multipleStatus.data = this.geDateAll(this.multipleStatus.before, this.multipleStatus
+						.after);
+				} else {
+					this.multipleStatus.data = this.geDateAll(this.multipleStatus.after, this.multipleStatus
+						.before);
+				}
+			}
+		}
+		this._getWeek(fullDate)
+	}
+
+	/**
+	 * 获取每周数据
+	 * @param {Object} dateData
+	 */
+	_getWeek(dateData) {
+		const {
+			fullDate,
+			year,
+			month,
+			date,
+			day
+		} = this.getDate(dateData)
+		let firstDay = new Date(year, month - 1, 1).getDay()
+		let currentDay = new Date(year, month, 0).getDate()
+		let dates = {
+			lastMonthDays: this._getLastMonthDays(firstDay, this.getDate(dateData)), // 上个月末尾几天
+			currentMonthDys: this._currentMonthDys(currentDay, this.getDate(dateData)), // 本月天数
+			nextMonthDays: [], // 下个月开始几天
+			weeks: []
+		}
+		let canlender = []
+		const surplus = 42 - (dates.lastMonthDays.length + dates.currentMonthDys.length)
+		dates.nextMonthDays = this._getNextMonthDays(surplus, this.getDate(dateData))
+		canlender = canlender.concat(dates.lastMonthDays, dates.currentMonthDys, dates.nextMonthDays)
+		let weeks = {}
+		// 拼接数组  上个月开始几天 + 本月天数+ 下个月开始几天
+		for (let i = 0; i < canlender.length; i++) {
+			if (i % 7 === 0) {
+				weeks[parseInt(i / 7)] = new Array(7)
+			}
+			weeks[parseInt(i / 7)][i % 7] = canlender[i]
+		}
+		this.canlender = canlender
+		this.weeks = weeks
+	}
+
+	//静态方法
+	// static init(date) {
+	// 	if (!this.instance) {
+	// 		this.instance = new Calendar(date);
+	// 	}
+	// 	return this.instance;
+	// }
+}
+
+
+export default Calendar
diff --git a/pages_tool/components/uni-nav-bar/uni-nav-bar.vue b/pages_tool/components/uni-nav-bar/uni-nav-bar.vue
new file mode 100644
index 0000000..5747c52
--- /dev/null
+++ b/pages_tool/components/uni-nav-bar/uni-nav-bar.vue
@@ -0,0 +1,220 @@
+<template>
+	<view class="uni-navbar">
+		<view
+			:class="{ 'uni-navbar--fixed': fixed, 'uni-navbar--shadow': shadow, 'uni-navbar--border': border }"
+			:style="{ 'background-color': backgroundColor }"
+			class="uni-navbar__content">
+			<uni-status-bar v-if="statusBar" />
+			<view :style="{ color: color, backgroundColor: backgroundColor }" class="uni-navbar__header uni-navbar__content_view">
+				<view @tap="onClickLeft" class="uni-navbar__header-btns uni-navbar__header-btns-left uni-navbar__content_view">
+					<view class="uni-navbar__content_view" v-if="leftIcon.length"><uni-icons :color="color" :type="leftIcon" size="24" /></view>
+					<view :class="{ 'uni-navbar-btn-icon-left': !leftIcon.length }" class="uni-navbar-btn-text uni-navbar__content_view" v-if="leftText.length">
+						<text :style="{ color: color, fontSize: '14px' }">{{ leftText }}</text>
+					</view>
+					<slot name="left" />
+				</view>
+				<view class="uni-navbar__header-container uni-navbar__content_view">
+					<view class="uni-navbar__header-container-inner uni-navbar__content_view" v-if="title.length">
+						<text class="uni-nav-bar-text" :style="{ color: color }">{{ title }}</text>
+					</view>
+					<!-- 标题插槽 -->
+					<slot />
+				</view>
+				<view :class="title.length ? 'uni-navbar__header-btns-right' : ''" @tap="onClickRight" class="uni-navbar__header-btns uni-navbar__content_view">
+					<view class="uni-navbar__content_view" v-if="rightIcon.length"><uni-icons :color="color" :type="rightIcon" size="24" /></view>
+					<!-- 优先显示图标 -->
+					<view class="uni-navbar-btn-text uni-navbar__content_view" v-if="rightText.length && !rightIcon.length">
+						<text class="uni-nav-bar-right-text">{{ rightText }}</text>
+					</view>
+					<slot name="right" />
+				</view>
+			</view>
+		</view>
+		<view class="uni-navbar__placeholder" v-if="fixed">
+			<uni-status-bar v-if="statusBar" />
+			<view class="uni-navbar__placeholder-view" />
+		</view>
+	</view>
+</template>
+
+<script>
+import uniStatusBar from '@/pages_tool/components/uni-status-bar/uni-status-bar.vue';
+import uniIcons from '@/components/uni-icons/uni-icons.vue';
+
+export default {
+	name: 'UniNavBar',
+	components: {
+		uniStatusBar,
+		uniIcons
+	},
+	props: {
+		title: {
+			type: String,
+			default: ''
+		},
+		leftText: {
+			type: String,
+			default: ''
+		},
+		rightText: {
+			type: String,
+			default: ''
+		},
+		leftIcon: {
+			type: String,
+			default: ''
+		},
+		rightIcon: {
+			type: String,
+			default: ''
+		},
+		fixed: {
+			type: [Boolean, String],
+			default: false
+		},
+		color: {
+			type: String,
+			default: '#000000'
+		},
+		backgroundColor: {
+			type: String,
+			default: '#FFFFFF'
+		},
+		statusBar: {
+			type: [Boolean, String],
+			default: false
+		},
+		shadow: {
+			type: [String, Boolean],
+			default: false
+		},
+		border: {
+			type: [String, Boolean],
+			default: true
+		}
+	},
+	mounted() {
+		if (uni.report && this.title !== '') {
+			uni.report('title', this.title);
+		}
+	},
+	methods: {
+		onClickLeft() {
+			this.$emit('clickLeft');
+		},
+		onClickRight() {
+			this.$emit('clickRight');
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+$nav-height: 44px;
+.uni-nav-bar-text {
+	/* #ifdef APP-PLUS */
+	font-size: 34rpx;
+	/* #endif */
+	/* #ifndef APP-PLUS */
+	font-size: $uni-font-size-lg;
+	/* #endif */
+}
+.uni-nav-bar-right-text {
+	font-size: $uni-font-size-base;
+}
+
+.uni-navbar {
+	width: 750rpx;
+}
+
+.uni-navbar__content {
+	position: relative;
+	width: 750rpx;
+	background-color: $uni-bg-color;
+	overflow: hidden;
+}
+
+.uni-navbar__content_view {
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	align-items: center;
+	flex-direction: row;
+	// background-color: #FFFFFF;
+}
+
+.uni-navbar__header {
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	flex-direction: row;
+	width: 750rpx;
+	height: $nav-height;
+	line-height: $nav-height;
+	font-size: 16px;
+	// background-color: #ffffff;
+}
+
+.uni-navbar__header-btns {
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	flex-wrap: nowrap;
+	width: 120rpx;
+	padding: 0 6px;
+	justify-content: center;
+	align-items: center;
+}
+
+.uni-navbar__header-btns-left {
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	width: 150rpx;
+	justify-content: flex-start;
+}
+
+.uni-navbar__header-btns-right {
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	width: 150rpx;
+	padding-right: 30rpx;
+	justify-content: flex-end;
+}
+
+.uni-navbar__header-container {
+	flex: 1;
+}
+
+.uni-navbar__header-container-inner {
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	flex: 1;
+	align-items: center;
+	justify-content: center;
+	font-size: $uni-font-size-base;
+}
+
+.uni-navbar__placeholder-view {
+	height: $nav-height;
+}
+
+.uni-navbar--fixed {
+	position: fixed;
+	z-index: 998;
+}
+
+.uni-navbar--shadow {
+	/* #ifndef APP-NVUE */
+	box-shadow: 0 1px 6px #ccc;
+	/* #endif */
+}
+
+.uni-navbar--border {
+	border-bottom-width: 1rpx;
+	border-bottom-style: solid;
+	border-bottom-color: $uni-border-color;
+}
+</style>
diff --git a/pages_tool/components/uni-status-bar/uni-status-bar.vue b/pages_tool/components/uni-status-bar/uni-status-bar.vue
new file mode 100644
index 0000000..da1f445
--- /dev/null
+++ b/pages_tool/components/uni-status-bar/uni-status-bar.vue
@@ -0,0 +1,23 @@
+<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>
diff --git a/pages_tool/form/form.vue b/pages_tool/form/form.vue
new file mode 100644
index 0000000..1f3c543
--- /dev/null
+++ b/pages_tool/form/form.vue
@@ -0,0 +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;
+        }
+    }
+</style>
\ No newline at end of file
diff --git a/pages_tool/goods/brand.vue b/pages_tool/goods/brand.vue
new file mode 100644
index 0000000..35322fb
--- /dev/null
+++ b/pages_tool/goods/brand.vue
@@ -0,0 +1,125 @@
+<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;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages_tool/goods/coupon.vue b/pages_tool/goods/coupon.vue
new file mode 100644
index 0000000..e8d99a8
--- /dev/null
+++ b/pages_tool/goods/coupon.vue
@@ -0,0 +1,460 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view>
+		<view class="cf-container color-line-border">
+			<view class="tab">
+				<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>
+		</view>
+
+		<mescroll-uni ref="mescroll" top="100" @getData="getMemberCouponList">
+			<block slot="list">
+				<view class="coupon-listone">
+					<view class="item" v-for="(item, index) in list" :key="index" @click="liClick(item, index)" :style="{ backgroundColor: item.useState == 2 ? '#F2F2F2' : 'var(--main-color-shallow)' }">
+						<view class="item-base" :class="{ disabled: item.useState == 2 }">
+							<image class="coupon-line" mode="heightFix" :src="$util.img('public/uniapp/coupon/coupon_line.png')"></image>
+							<view>
+								<view class="use_price price-font" v-if="item.type == 'reward'" :class="{ disabled: item.useState == 2 }">
+									<text>￥</text>
+									{{ parseFloat(item.money) }}
+								</view>
+								<view class="use_price price-font" v-else-if="item.type == 'discount'" :class="{ disabled: item.useState == 2 }">
+									{{ parseFloat(item.discount) }}
+									<text>折</text>
+								</view>
+								<view class="use_condition font-size-tag" v-if="item.at_least > 0" :class="{ disabled: item.useState == 2 }">满{{ item.at_least }}元可用</view>
+								<view class="use_condition font-size-tag" v-else :class="{ disabled: item.useState == 2 }">无门槛优惠券</view>
+							</view>
+						</view>
+						<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" 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 }">
+									{{ item.use_store==='all'?'适用门店：全部门店': '适用门店：'+item.use_store_name}}
+								</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-else>有效期：长期有效</view>
+						</view>
+						<view class="item-btn">
+							<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>
+					</view>
+				</view>
+				<view v-if="list.length == 0"><ns-empty text="暂无可领取的优惠券" :isIndex="false"></ns-empty></view>
+			</block>
+		</mescroll-uni>
+		<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 {
+				list: [],
+				sort: 1,
+				types: '',
+				couponBtnSwitch: false,
+				//分享建立上下级id
+				mpShareData: null //小程序分享数据
+			};
+		},
+		onLoad(option) {
+			setTimeout( () => {
+				if (!this.addonIsExist.coupon) {
+					this.$util.showToast({
+						title: '商家未开启优惠券',
+						mask: true,
+						duration: 2000
+					});
+					setTimeout(() => {
+						this.$util.redirectTo('/pages/index/index');
+					}, 2000);
+				}
+			},1000);
+			
+			//小程序分享接收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);
+					});
+				}
+			}
+		},
+		onShow() {
+			//记录分享关系
+			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
+		},
+		//分享给好友
+		onShareAppMessage() {
+			return this.mpShareData.appMessage;
+		},
+		//分享到朋友圈
+		onShareTimeline() {
+			return this.mpShareData.timeLine;
+		},
+		methods: {
+			changeSort(sort, types) {
+				this.list = [];
+				this.sort = sort;
+				this.types = types;
+				this.$refs.mescroll.refresh(false);
+			},
+			liClick(item, index) {
+				if(['limit', 'expire', 'out'].includes(item.receivedType)) return false;
+				if (item.useState == 0) this.receiveCoupon(item, index);
+				else this.toGoodsList(item, index);
+			},
+
+			//领取优惠券
+			receiveCoupon(item, index) {
+				if (this.couponBtnSwitch) return;
+				this.couponBtnSwitch = true;
+				if (this.storeToken) {
+					this.$api.sendRequest({
+						url: '/coupon/api/coupon/receive',
+						data: {
+							coupon_type_id: item.coupon_type_id,
+							get_type: 2 //获取方式:1订单2.直接领取3.活动领取
+						},
+						success: res => {
+							this.couponBtnSwitch = false;
+							let msg = '领取成功，快去使用吧';
+							let list = this.list;
+							if (res.code < 0) msg = res.message;
+							
+							if (res.data.is_exist == 1) {
+								for (let i = 0; i < list.length; i++) {
+									if (list[i].coupon_type_id == item.coupon_type_id) {
+										list[i].useState = 1;
+									}
+								}
+							} 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].useState = 2;
+									}
+								}
+							}
+							this.$util.showToast({
+								title: msg
+							});
+						},
+						fail: res => {
+							this.couponBtnSwitch = false;
+						}
+					});
+				} else {
+					this.couponBtnSwitch = false;
+					this.$refs.login.open('/pages_tool/goods/coupon');
+				}
+			},
+			//获取优惠券列表
+			getMemberCouponList(mescroll) {
+				this.$api.sendRequest({
+					url: '/coupon/api/coupon/typepagelists',
+					data: {
+						page: mescroll.num,
+						page_size: mescroll.size,
+						sort: this.sort,
+						type: this.types
+					},
+					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 (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 (mescroll.num == 1) this.list = []; //如果是第一页需手动制空列表
+						this.list = this.list.concat(newArr); //追加新数据
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					},
+					fail() {
+						mescroll.endErr();
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					}
+				});
+			},
+			imageError(index) {
+				this.list[index].logo = this.$util.getDefaultImage().goods;
+				this.$forceUpdate();
+			},
+			couponImageError(index) {
+				this.list[index].image = this.$util.img('public/uniapp/goods/coupon.png');
+				this.$forceUpdate();
+			},
+			toGoodsList(item) {
+				if (item.goods_type != 1) {
+					this.$util.redirectTo('/pages/goods/list', {
+						coupon: item.coupon_type_id
+					});
+				} else {
+					this.$util.redirectTo('/pages/goods/list', {});
+				}
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	.coupon-head {
+		padding: 20rpx 50rpx;
+		display: flex;
+		background: #fff;
+
+		.sort {
+			border: 2rpx solid #c5c5c5;
+			padding: 1rpx 20rpx;
+			border-radius: $border-radius;
+			cursor: pointer;
+			margin-right: 15rpx;
+		}
+	}
+
+	.coupon-listone {
+		padding: 0 30rpx;
+
+		.item {
+			display: flex;
+			background-color: #fff2f0;
+			background-size: 100% 100%;
+			border-radius: 20rpx;
+			align-items: stretch;
+			margin-top: $padding;
+			overflow: hidden;
+
+			.item-base {
+				position: relative;
+				width: 197rpx;
+				min-width: 197rpx;
+				text-align: center;
+				background: linear-gradient(to left, var(--bg-color), var(--bg-color-shallow));
+				background-repeat: no-repeat;
+				background-size: 100% 100%;
+				padding: 38rpx 10rpx 38rpx 18rpx;
+
+				&.disabled {
+					background: #dedede;
+				}
+
+				.coupon-line {
+					position: absolute;
+					right: 0;
+					top: 0;
+					height: 100%;
+				}
+
+				>view {
+					height: auto;
+					position: relative;
+					top: 50%;
+					transform: translate(0, -50%);
+				}
+
+				.use_price {
+					font-size: 60rpx;
+					line-height: 1;
+					color: #fff;
+
+					text {
+						font-size: $font-size-toolbar;
+					}
+
+					&.disabled {
+						color: $color-tip;
+					}
+				}
+
+				.use_condition {
+					color: #fff;
+					margin-top: $padding;
+
+					&.margin_top_none {
+						margin-top: 0;
+					}
+
+					&.disabled {
+						color: $color-tip;
+					}
+				}
+
+				&::after {
+					position: absolute;
+					content: '';
+					background-color: #f8f8f8;
+					left: 0;
+					top: 50%;
+					transform: translate(0, -50%);
+					height: 30rpx;
+					width: 15rpx;
+					border-radius: 0 30rpx 30rpx 0;
+				}
+			}
+
+			.item-btn {
+				width: 160rpx;
+				min-width: 160rpx;
+				align-self: center;
+				position: relative;
+
+				view {
+					width: 100rpx;
+					height: 50rpx;
+					border-radius: $border-radius;
+					line-height: 50rpx;
+					margin: auto;
+					text-align: center;
+					background-image: linear-gradient(to right, var(--bg-color), var(--bg-color-shallow));
+					color: var(--btn-text-color);
+					font-size: $font-size-tag;
+
+					&.disabled {
+						background: #dedede !important;
+						color: #909399 !important;
+					}
+				}
+
+				&::after {
+					position: absolute;
+					content: '';
+					background-color: #f8f8f8;
+					right: 0;
+					top: 50%;
+					transform: translate(0, -50%);
+					height: 30rpx;
+					width: 15rpx;
+					border-radius: 30rpx 0 0 30rpx;
+				}
+			}
+
+			.item-info {
+				flex: 1;
+				display: flex;
+				flex-direction: column;
+				justify-content: space-between;
+				margin-left: 20rpx;
+				overflow: hidden;
+				background-repeat-x: no-repeat;
+				background-repeat-y: repeat;
+
+				.use_time {
+					padding: 20rpx 0;
+					border-top: 2rpx dashed #cccccc;
+					font-size: $font-size-activity-tag;
+					color: #909399;
+				}
+
+				.use_title {
+					font-size: $font-size-base;
+					font-weight: 500;
+					padding: 20rpx 0;
+
+					// height:80rpx;
+					.title {
+						overflow: hidden;
+						white-space: nowrap;
+						text-overflow: ellipsis;
+					}
+
+					.max_price {
+						font-weight: 400;
+						font-size: $font-size-tag;
+					}
+				}
+			}
+		}
+	}
+
+	.empty {
+		margin-top: 200rpx;
+	}
+
+	.cf-container {
+		background: #fff;
+		overflow: hidden;
+	}
+
+	.tab {
+		display: flex;
+		justify-content: space-between;
+		height: 86rpx;
+
+		>view {
+			text-align: center;
+			width: 33%;
+			height: 86rpx;
+
+			text {
+				display: inline-block;
+				line-height: 86rpx;
+				height: 80rpx;
+				font-size: 30rpx;
+			}
+		}
+	}
+
+	.active {
+		border-bottom: 4rpx solid;
+	}
+	.truncate {
+		overflow: hidden;
+		-o-text-overflow: ellipsis;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+	}
+</style>
\ No newline at end of file
diff --git a/pages_tool/goods/coupon_receive.vue b/pages_tool/goods/coupon_receive.vue
new file mode 100644
index 0000000..7fc4b73
--- /dev/null
+++ b/pages_tool/goods/coupon_receive.vue
@@ -0,0 +1,352 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view class="container">
+		<view class="content">
+			<view class="wx-code">
+				<image :src="$util.img(path)" />
+			</view>
+			<view class="get-coupon">
+				<text class="coupon-name">{{ info.coupon_name }}</text>
+				<view class="color-base-text coupon-price" v-if="info.type == 'reward'">￥{{ info.money }}</view>
+				<view class="color-base-text coupon-price" v-else-if="info.type == 'discount'">{{ info.discount }}折</view>
+				<text v-if="info.at_least > 0" class="color-tip">满{{ info.at_least }}元使用</text>
+				<text v-else class="color-tip">无门槛优惠券</text>
+				<view v-if="info.validity_type == 0" class="color-tip">有效期至 {{ $util.timeStampTurnTime(info.end_time) }}</view>
+				<view v-else-if="info.validity_type == 1" class="color-tip">领取之日起{{ info.fixed_term }}天内有效</view>
+				<view v-else class="color-tip">长期有效</view>
+				<!-- 适用场景： -->
+				<view class="color-tip truncate" v-if="info.use_channel!='all'">{{ info.use_channel_name }}</view>
+				<!-- 适用门店： -->
+				<view v-if="info.use_channel!='online' &&info.use_store!='all'" class="color-tip">
+					<view class="w-460 truncate">适用门店：{{ info.use_store_name}}</view>
+				</view>
+				<view class="get-span" @click="receiveGoodsCoupon(info.coupon_type_id)">
+					<button type="primary" v-if="isCanReceive">{{ button }}</button>
+					<button type="primary" disabled v-if="!isCanReceive">{{ button }}</button>
+				</view>
+
+				<view class="color-tip font-size-goods-tag tips">注:扫描二维码或点击右上角进行分享</view>
+			</view>
+		</view>
+		<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 {
+				info: {},
+				couponTypeId: 0,
+				path: '',
+				button: '领取',
+				uid: 0,
+				couponBtnSwitch: false, //获取优惠券防止重复提交
+				receivedNum: 0, 
+				receivedType: ''
+			};
+		},
+		onLoad(data) {
+			setTimeout( () => {
+				if (!this.addonIsExist.coupon) {
+					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
+
+			if (data.source_member) uni.setStorageSync('source_member', data.source_member);
+
+			if (data.coupon_type_id) this.couponTypeId = data.coupon_type_id;
+
+			// 小程序扫码进入
+			if (data.scene) {
+				var sceneParams = decodeURIComponent(data.scene);
+				sceneParams = sceneParams.split('&');
+				if (sceneParams.length) {
+					sceneParams.forEach(item => {
+						if (item.indexOf('coupon_type_id') != -1) this.couponTypeId = item.split('-')[1];
+						if (item.indexOf('m') != -1) {
+							this.source_member = item.split('-')[1];
+							uni.setStorageSync('source_member', data.source_member);
+						}
+					});
+				}
+			}
+		},
+		onShow() {
+			this.getCoupon();
+			this.receivedNum = 0;
+			if (this.storeToken) {
+				//记录分享关系
+				if (uni.getStorageSync('source_member')) {
+					this.$util.onSourceMember(uni.getStorageSync('source_member'));
+				}
+				this.getReceivedNum();
+			}
+		},
+		onHide() {
+			this.couponBtnSwitch = false;
+		},
+		methods: {
+			getCoupon() {
+				this.$api.sendRequest({
+					url: '/coupon/api/coupon/typeinfo',
+					data: {
+						coupon_type_id: this.couponTypeId
+					},
+					success: res => {
+						let data = res.data;
+						if (data) {
+							this.info = data;
+							this.path = data.qrcode;
+							if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+							this.buttonRefresh();
+							this.setPublicShare();
+						} else {
+							this.$util.showToast({
+								title: res.message
+							});
+							setTimeout(() => {
+								this.$util.redirectTo('/pages_tool/goods/coupon', {}, 'redirectTo');
+							}, 1000);
+						}
+					},
+					fail: res => {
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					}
+				});
+			},
+			receiveGoodsCoupon(couponTypeId) {
+				if (!this.storeToken) {
+					this.$refs.login.open('/pages_tool/goods/coupon_receive?coupon_type_id=' + this.couponTypeId);
+					return;
+				}
+
+				if (!this.isCanReceive) return;
+
+				if (this.couponBtnSwitch) return;
+				this.couponBtnSwitch = true;
+
+				this.$api.sendRequest({
+					url: '/coupon/api/coupon/receive',
+					data: {
+						coupon_type_id: couponTypeId,
+						get_type: 2 //获取方式:1订单2.直接领取3.活动领取
+					},
+					success: res => {
+						var data = res.data;
+						let msg = res.message;
+						this.receivedType = data.type;
+						if (res.code == 0) {
+							msg = '领取成功';
+							this.receivedNum += 1;
+						}
+						this.buttonRefresh();
+						this.$util.showToast({
+							title: msg
+						});
+						this.couponBtnSwitch = false;
+					},
+					fail: res => {
+						this.couponBtnSwitch = false;
+					}
+				});
+			},
+			getReceivedNum() {
+				this.$api.sendRequest({
+					url: '/coupon/api/coupon/receivedNum',
+					data: {
+						coupon_type_id: this.couponTypeId
+					},
+					success: res => {
+						if (res.code >= 0) {
+							this.receivedNum = res.data;
+							this.buttonRefresh();
+						}
+					}
+				});
+			},
+			buttonRefresh() {
+				this.button = '领取';
+				if (this.info.count <= this.info.lead_count || this.receivedType == 'out') {
+					this.button = '来迟了该优惠券已被领取完了！';
+				}
+				if (this.info.status == 2 || this.receivedType == 'expire') {
+					this.button = '该优惠券活动已结束！';
+				}
+				if (this.info.status == 3) {
+					this.button = '该优惠券活动已关闭';
+				}
+				if (this.receivedType == 'limit'){
+					this.button = '该优惠券领取已达到上限！';
+				}
+			},
+			/**
+			 * 设置公众号分享
+			 */
+			setPublicShare() {
+				let shareUrl = this.$config.h5Domain + '/pages_tool/goods/coupon_receive?coupon_type_id=' + this.couponTypeId;
+				if (this.memberInfo && this.memberInfo.member_id) shareUrl += '&source_member=' + this.memberInfo.member_id;
+
+				var title = '';
+				if (this.info.type == 'reward') {
+					title = '恭喜您获得一张' + this.info.money + '元的优惠券';
+				} else if (this.info.type == 'discount') {
+					title = '恭喜您获得一张' + this.info.discount + '折优惠券';
+				}
+				if (this.info.at_least > 0) {
+					var desc = `满${this.info.at_least}元可用`;
+				} else {
+					var desc = `无门槛优惠券`;
+				}
+				this.$util.setPublicShare({
+					title: title,
+					desc: desc,
+					link: shareUrl,
+					imgUrl: this.siteInfo ? this.$util.img(this.siteInfo.logo_square) : ''
+				})
+
+			}
+		},
+		computed: {
+			isCanReceive: {
+				get() {
+					if (this.info.count <= this.info.lead_count || ['limit', 'expire', 'out'].includes(this.receivedType) || this.info.status == 2 || this.info.status == 3 ) {
+						return false;
+					}
+					return true;
+				}
+			}
+		},
+		/**
+		 * 自定义分享内容
+		 * @param {Object} res
+		 */
+		onShareAppMessage(res) {
+			var title = '';
+			if (this.info.type == 'reward') {
+				title = '恭喜您获得一张' + this.info.money + '元的优惠券';
+			} else if (this.info.type == 'discount') {
+				title = '恭喜您获得一张' + this.info.discount + '折优惠券';
+			}
+			if (this.info.at_least > 0) {
+				title += `，满${this.info.at_least}元可用`;
+			} else {
+				title += `，无门槛优惠券`;
+			}
+			var path = '/pages_tool/goods/coupon_receive?coupon_type_id=' + this.couponTypeId;
+			if (this.memberInfo && this.memberInfo.member_id) path += '&source_member=' + this.memberInfo.member_id;
+			return {
+				title: title,
+				path: path,
+				success: res => {},
+				fail: res => {}
+			};
+		}
+	};
+</script>
+
+<style lang="scss">
+	page {
+		height: 100%;
+	}
+
+	.container {
+		background: #fff;
+		padding: 0;
+		height: 100vh;
+	}
+
+	.content {
+		background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAZAAAAFXCAMAAAC7jOjyAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyFpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNS1jMDE0IDc5LjE1MTQ4MSwgMjAxMy8wMy8xMy0xMjowOToxNSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIChXaW5kb3dzKSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDpFMjg2MTdERjdFOUExMUU5QjkyMEJEMEY0RjQyNzUxRiIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDpFMjg2MTdFMDdFOUExMUU5QjkyMEJEMEY0RjQyNzUxRiI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOkUyODYxN0REN0U5QTExRTlCOTIwQkQwRjRGNDI3NTFGIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOkUyODYxN0RFN0U5QTExRTlCOTIwQkQwRjRGNDI3NTFGIi8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+VbcUuQAAAYBQTFRFSpiV/lRk+0ZcrBE47XtB9k0o7tFj/Pv6/sytFBQa+S9N8gk1/bA3941HK3HVGp2foy4797Jxh3dpWODNVMq4/dPQqF8zYEgyxTlJ/vPKZR4lztt4/LuH+nWFL0pa09DNlINyuLiyc2ZVdnFs/a2y8IQ//ui6/q1N/8Y4/GtciIqL0LVb4UJT++FoqZiHlsON+JFi/ImVoNzTHC9ZUktD/cOYhW8/wsK8+73F6ejn/urmWYaKkEZN3Zw2z6+wZVpIs5JSvxFB9h5D1nI8/r9Qq2lwn458t6WQrb50sEFI/fbvv3NEmbXQ0q6TQNLJ2Z5L2w472Fdd8wAj0Ol7fbWZ/JymuqRWsIIz9OOWyu/r/dzcG3vqPXx6w46P482n0bVrezA6SLmql4BHaY/Woai0yGNmzSNF0NjglGBk3/GCn6N14StJPmBi8/X0xpdp/j5alZia4MNfxpuh+0QZ/7gkpKOjOz067u/v4N3atFhhtcZ29aZuKjE38hE7/////k1f28s98AAATfRJREFUeNrsnY1DEtn+/52RjSdphULQlUSeFCMvFCqiLYarXu1ayS5by1Zfa8u8mTu5a2gXhH/99/mcc+Z5BnkYTPfnURFKcWZevD9P53MOA1yT63Bk61Urxg53iceOJadYz3b+lwe4ZoeDW65bMgId/+WLG9zuA0vOcbnzv9wFkJQ1QOqXmEfTolNMXQQQePlYc7TLl1YiVhmBXe5CgDR3rDnc6uWVSNUigVwQkGbAGgsbvKQS4YIWveK6OL+ugHCb30zRF+TSrTm/zYsC8i0lfREj9Q1NcndArHJ6l9OtW3V2m9yFAWk2/9FuvfoNw/ougXzTF1G/BbL5LeXfLZDUNZD+OMhuTVYz2/sRO6s7lzPISlWd36wy1C2Q3l9GTudy85IOrrnsdH4j8XetkF49n7O6EBIuKxEhtFB3fpt4pWsgvUnE6fx00oi5LisQV6xxEulNJN1G9N0rpNkTjy+NRmOLu6QSEbgtOLx3PRFpXrRCIPLt+nid2Q8NHOVLKhFXmRzeh6zzwgXSi0J2upbHTIOOfJO/jDz4Zp4en32ma5GkvgGQZnclOGd9oSGOzKWUiCsjHWC3vr372dAegHTl1p3Owol0ug3/ZXQivOCXj/DkU1dEgt8CSDeRr9P5uaEcoUsoEVdIdYifuzBbPdToegHSeUHLWZ1QnWwjdwmBCDn1MU50nrf3UBHqSSEdSsTpjB42NCN5EUZLarFpL+bVHuNhtFORNJvfCMhyZ958sqEbMaGti9k0ah7rEs15QGL6o5zszLf3Ms3TE5COar7OT4v6M23kOb71BeRTe3uPjMeg+qOd8WjvINUaCc/lDQ5zsSPfnvpWQDqYfNZ6czYqIb4ljtTeoPWjNRI+VDE60g58e0+tAj0CSXXrzekoC66WRVfE8cjqQZC0irKEstGxtu/bg98OSJOrduvNUR5JF9/ir3N8P3BQJAetRMK7kkYiOWnTt2d7u6I9Atlsy5t/6VweoL4+4SBE9lqetolI3rXl2ze/JZB2ar7O7KnByY2Giq3dOd8/HoiktV0BkWwZHPTpHWc/k0IrgJybHMqlRNVw1FpnIBw3+Ojs2aP+MWntR5pCsuYwOu7zy40dzYPydFgJJNV+KVER7HrTNW9LItze4BmM/iAZfPQMnplrycNbS3uNAuBzy42dFLB5LunxxJOcAknPJqt15OuMnOjPye5Ip2s1b43nWxmsMzqe9QHIM3ziRy2MFt+Ew6ula3P2jn17B3Vevhn3DE15poY8cXkeoncgm+dNDOqCK6+nhqOVRLi9R2dnEpJBi9VBhruFRISQlxxi2msUbn1pJZL2k0Ke80xNeciY8khEegbS5Exb4cWJQbU85tI1NrymWTrXFC+bqJJBS9VBxiPTa8dzNQqklk4biaTFVGInDe+eIc94bApxwD0LgWx24s0rXolHzZs2BZJ6dKYazyxSh/Jpnx1wZp427ZUO0lAkh6a+vf2Yl08OeTy1nBdgwBhK8lYBMan5GpYSwXvUFMPUaHGpZ2faYYVKVE/oNstF0KPLw9iTmJUbO7hsqIypXAxo1MZrU3ELgSwbtvkYlBIrNRUPcyLcgR7I2bOenMmgBoc5EDUPM5EYlxuXO/EgOGI5j2c8BzrxMPttBZBUe6XErTkNDgBiQoTbMwDSk38ffKR/xr0mZ8xDA8TEkxiVG9vvjUWLhT4kVhvPxWqgFQuB6CJfw1KiTh6EiHF+yO25z84sRWLwVG5DIILk0FVIapV2yo0d1Hl5booYq1wuN44+xEqFaCTidEbt7ciDETHqljMH0o1/N1KHGRCB83qNjhNEoq+l6KYSdzoBAhDgiXOx8RjysBQIFzjPm1dqnprxMLRarYB0rhJj82cIxMBetRSJ2rfvdnTVgEI6FgN9pNG7W+nUVatWjby5mTxMibQG0kliMmiGA4Ac6Ir/LXggkvGt1r69ozovCXunYrlYjOQh4kWwBogU+RomH4laCx6UCN8ZkHYNVwscAOSZRiE8H2rFA0Xib1Vu7LDOK8SHSB6CAhmyWZcYKpND552FzuQhZohNoUMg7SUmz1r9vvtAc4Gaae95R2okkgWxJt9hbwOPRquWRo8+FLeulsVqgeSIHoyF9G0l6anauQODLb5TIJiYdKsO5kOUl0dI1rznH2ktrW9KCY111/zD80lgAcOTtLDaq5wWWW4KGk3nQy4h3cZ5er1pXjgnMezIv5+LQ6MQlEc7x1kTXCFNVd4v0NS4i+YfvplM2pJJZdnbKiApSD5SnLYNM8a7FJW69kXSnkLMkbSBQ6UQXmj3IOEauviYph2WI6sSu2r+4Xle7UAtAgKRbwD7BlSNyhWQR4vQvoVI2laIoX9vC4dSIW3KAw6RJE0gkopSIDyGNQGLtv+yCohYz1e08sfEJgZdccj09ScmidyB++ysayRtwpRqWW3KQ1F6cynaG+mSCsuWd1sGRBJ/RSWPzoiIZ9yRQrSJSbu/IyqkdfJhWArlZJFUeGsXHVkNRJRITNXj05ZjVxDpUCFKlbT/G0wh7fNIC6pOoVhf1hxZDoSsB1PKg7quWkdEOlYIS0wedfJrVCHt81D3AHA8EYnlq/IsB4IrJmO6Frh2jRbzI10opPPhxhnDtv2HwdwNisTydavWA+G5kEv/qmnXaFEi3SmkYyDo8to+rrS+4gYi4fhLD4TjBdPGmvbOnOcvTCEdKNfQNgk8d+mBNNuZqD7ntXhRCmnbgZzT1ncVgbQvETh5/mIU0oFsaxe1pP7CgHQikdrFKOQZn27/NXJRC7gvDkgnEknvXYBCzp518BK5sD0nLg5IBxKpje9chMnaq10+gVwkEJ5r/wLUzvpPxJ0cb/cFUuP4SwCEF3BYeCRtx/wgkWTfgbhd3g7ivuY3ByLwyaTNY0ty1iHhubaBeL2uPhNxu9NtC8R7cQIxAyLNLg4NeazbZqz9qAZelO7+Eilx7fNIX+AuUsZAhCbBMUWRJK0SSQduHYxWqa8CKXrbf3EkhW8MhOcAxZQXbwgUj2CZW69dDqMFBqt9Hhfo0o2B8EQfU/5x+OYhRKx6iXTg1vsaabk7ibAu1GIZAhHiqAqv389MFnyz6DXSwmbpLUgf3UhJP81vbsEu1GIZAeE5wsDrr+SGPFNTQygXD2+VzTJtnU3r/gti3/4Qcae0l9/rNfj738JiGQERbEOEwri/Mj4156V+xKKDMo2z4oLApXsg4u4pAyGrIjy9JyFcfxRC/AYQmav4Hf4pb85CL2Jis9Lxp/GmoC+Gd0CkVCq53W39tAGPNO/iPE/j6R4sFscLBymeb3Kc9T6EuQ7P0Jy/Mjc05xhSNZ/2I87yeNJPId9xJbvVSCkT4wTw1SV3NzxCLiH59Cmun+mhbCK4DlIHqRTp0rJ0vyy+ScJdgPBwKud3jPu9Dy2MfA3jLBCIx/M0beN0AvK2SaSEm8Xk/Tl/Rv5pd6ldfQhJD+J4Gu/BYvEuQgRHqpfOIAMgHONRG59z+GHMjaNntwqIoc2Ca4FInsaTbfsRtRZK4u49IYlCKcSVSm1VsGxxgsOTjvdisVwuQJKCcYD3LDVZJAuZy/krQCPn91cquanjpGWRhuESvniavkafejTOlqTseiLuEu9SXu0S6yTMlORUI98oF7VIjHikn4K9BByepx7DmZD2rqPgQg4EBt6z2KkDjwrgmPOPTzlyDv/40JBlQIwlAk49TS6K0rF6x2Hga1SnkVIp1KgUSzogWy6FQPCxBgkpmOCzKo4BF2jAHwaRxntJQoQkMhEIDsFahfBJTNP9c94pr39qyu8d8oLF6vOsSDrOXqMKOz5Oh7fm5TVASmd4/fMuhRzoXrs5mYebtnracyGFVzmDvz0+N05BS68FD/lIx9PdJyHYEVQOMXUgEmt3toa4d3wKnTrkITRdt1mXrBqXT9BiPaUvVTUPuHTeWlFFxM3Ri70llKQr7ddYrJLU9J2R9YUFE/akc14pwMNXAmrzqZFAQny7FqtZLhN1QPzrcvGWAhGSNOpFFOPj6N89FuaqhnPrXgi00vSVyl6o3jkFEc6tKkSJW0/buZJoiigi8fFZiRe3zlYYNneRWkEFEfi7njTTSLqXuXSAECpzQCITC/E9WCxjhVAiNNYiWCwtHhh7ETRacfCueH28SoGA0fKmz9REyvLLn17/4pbKhZSKbJVTTOlC3JxXgXlcNlj4Rw2zwnY9CNdEP14OFYFHptmLxTKZD+GZRujXlMXvhGNcP3kaJ2YLQ1CU0LiSSE1dii+VxIVaOWqPSi6VCym5/QY8ztxpr/JZUQAQRHiYMnup82LQy4XKGS6DjqQXi2U2YyhIE4aQpDctrnaalBhBI3Hq2eNATPVa9golTdRLiZSZfyhxShfidjEeOTWPMyUQYrJEI2mij/bLigICyZTLMcKjl+tlNqcu8EmPZ2poyhPnBMuLnWYdnE/RtXo8Ni4pR0MUiDbOchOnHRIzFMaHuhD3GfMxlbOSuv5YUyoElz4k4x5PHIsEbe8xYQpE4ASunAmhweoLEJxWb5JFg/2oPbfcwSKdTnt30l7JaM3BtUuVVGXEkrsEmQcvlRNpop4XHTiY8gp5CP+NP6xXCD5nLYk1/452mDCvm7iETAYDX5qx92vvd57v10xAyy5nr3d851lailC1ca/LVYThLroIFzpyzGPII1QheoGfdLmUUe+cpI+DPW/Lg2ifB6NQLmcyXI8u5CIb5dREuFYLX8dXn8HV83pZUq3s0iq57I2tfL5SyeX8ORgxGOUYCbL8YMPhoxyj/5YjZZ/8Fpgut5yns+ccr7lKKW+redtOIhmSD/LlcjMU6tFifTMgECi0EAkoxF3ia/QVrK74ul32RodDBHLmFugTwkhC8JxqMZ+c5DuZliIpOs9xNFUXuKsIBBfrm4rECwqBq9hM48VLc8paVqkHIPDL+Iy1dPIAntIUiLczecBwuRRVk54s1jcEQiI5k3ns8ffPSAIIjiLlUsdKPQGBpyymBNcZIWwGBLw9L3T64pJooO1qXlEg5p4EfQi9frppWQJkK4/F6BwbMRrm+mPyP+DwgwvJ5+GnK8qQAGcV3WKrgyXyIEaLF5kIvbmQbwyE7sHjNVGI8SiS12ORXFo2SOFqq1hSDzfGWOhiedPeE6NmpC77NDkOu9N7jbG+ORBmt7xGPqRFO0MJX+Zu9WRITDuP5SZZCFJrFwji6KEsgVPpgtBjWeObAyFbvyiRYAx0430HS9pKgrrS23Y30M4N/FteBY70t3//6ksABOOtJAXhpS1z6fSOiULc0tDOp1eMp94Nfl5WSJpl6uxPJznh279Z8mUAgkiaSTrI+wzyvNmiz2JRNEXyEAViMgiMovEqXNJHxXH0Lzf5y/De1ZcDSJMYX1yvRas1Rnu/M29BoyvIxMtYqYARIqVde0Y/8EdiGHH5K4puFPXWGnQLMYuXiv0jgKiPygxIrtHlMAdy2U79Gsg1kGsg/0Ag9q2tfD7vZ1ODFX9F+vRX7Oyf4Ae2traugfQRiJvLhEIQFtGcuOhm/XH+s5IcD9PJROyjI3MhLgEjqQx/DaQfQM7cymi2xHjQqUEp22BtQhX8V2kKy312DaQfQFRsin65f9RNISmbgLb41osTroFYCqRU4qh7sMN1d+VykJTE/Dla1y0JdtaFUroGcjFAQB6s3x10IPfF5c5UbUENv9ACyTUQy4CAawix6Il0XIudpDnJRolEGjFXycxwXQOxCAjg4MStvv2k80dUiGLJiESkkePOrp16/4CA8z4LSfvLl+mytZJrS70YgbRbS+/0kY+FXGd6JtdAegaCoZQrI71bhN8lxsAulvypy7zKNzGoxMrarTqugfQOpBhS1k7KIVbWDdFu+FhIVewNZXLKt8PxF6+BWAtE6tlte3BF+TdUK+DolovXQHpVSFN+245cpa2KYokTDVyzdO3ULQdSEtdO5bm26r4cNkPQ95WIGcRZ10B6r/YSDlsZuiQHW3xpd9YW68uSP0iqzpdozpIzbIG4VogFYW/pTFx9znFyd5aLZSHyOCOI6DIf+IFmuagXyLUPsSIPKTWbtBoidWe52Ypbv9ut7TcV1125rxPD/mXq+h1MWJ6eUa7poZoRWrdqXQOxstqr3AlIWzdhQOyu0nX5/eKBlJpswa2qbqLZaMO4lbTXU8eeLu4aiIaHK683T7S0mO+rQkh7nY102F0D0fMoqxeRcKpFoP3wIRyBQZlw10DkacNDo8IIXSZdKbr7ZrKSqsFdDiBck/umQCDgEvfY0DSVUCD+s37NqfMAIRTqC5FegAgu698Tix0Vf/57PePEiFio0m5LzoC4+wUE/EcooyBiS14GIKnelwt1qxBMz4vyxIi2C46tW8+VzvpkstBxhDIiDgLmmwPhyN6CuAaYu2CFkDVRXExa+ym3+8i7BugjYSsVQtcvMIWAVC4DEI4/OGArT/vgSVoqpOgKxRQzT/KOWO5QOYQj49duwGj8FlRdA2HCIERC9JtlXqRrhRxIQPpgtlopRN4rjoS2IbnRR25sMJsCschkiaYKSVB9gA3jz8kg+wwkJQIhWxdYLZJWCnGfyXPl9oxqu1g1q3N8eg8mi6YgITpET9IqGhUODlJtIukOCEd2DMZ+52SmHyJp6UNKJWaStjJFze69ReWmAnzprF9AkhKQjASEN+dRxDcX32vP23YFBB0IFQgfK/fDbLUOe+mqwkpItyuvtH0v2rLzePRismwKJKHzFMJhu8veI0DCt4GkO4UgjyAKJJSLcUVquqw0W+fkIRDV5kJG+7yLNsvuD52du0q6V4WIbp36ENPN5zjct6BIiLSDpCsgdItzBMLHciFX0XKRnAPELTSNG0RLobw/Vw5x5v2jVkRZPGfrwIVwLsABH4ADkBych6QLIJzEA0YmV3bJ0RZ3MUDOzFuo6Yrptt5RoZfEkAkkIxIxD7I4trFH8dkeIXIeks6BEAciMihysTKXCRUtNlttlE5MgbT/VrhdmywqEVU561yBoEQe7Z2vki6AsBQdN9oDa4X7tzUFTkwSvzWQDkYvTQ5JFRBb0tyDCMSDECQEx3kq6QKIuDcU2f8GsuZYs1gu97zn+cUD6aX8zidtSoW0eMEXyS4SiKRIcTCVmL3rSzdOXWDGCrdTyIBCuFBMVIhglUIeXW6FgNVSTFCZ70dOBOKmEmGx7yPRlxjb966iLOyIasbI/pN0hM6sraJcepOFW9i3M4XLFen+LEXcHhXcyJ6oEWRimLx3mRhCwBviuCQXKsdCmRjZ79xCi3X5TRZFQs0O38q847a2Za5E978pPnsk+xG4ObAKCFZn0KMXi1yOK2awd5O5FaucevPSK0SC0mwtEOCQy2eKbtGviwIhUAwMSpfFRY65di4EXh18SMjaQvzF+JBUv9sJiEDO3JmGvRI6E117kWoFP565LAPCdnMmviRUdHEWp+pXRiHnC6R45g5tbTUqLjdNRygY8h/FMyuBoNmScvSilQ6E0N5zX32FoECwHZzb2tqqCOyEitJmavBdsBKIIiNxWczjajj1dgRCgPCVra180y1m7NLHWdEyp642W9bP5F6MQvpssphA8O1M7Ftb7F2biljcKZoLpMdGOYXZsnRC5GLykD4rhCvSTSLdxRwACZWIKtxuF+kBIBrhmlYDkaItSw0WUciVd+pEINRfxOxbdmxVKp6V3CF/jnOXiEiEPgBhZqsoXOAU7hVRCCdGVCV3ZmvLjm9f5i4JsS27nWxkYOxBrOjtRbNl9fbDF6OQvgJhZd6i2xU640AhZbcbNz2wb+W3Go0KehShT0BIk4vlQK66QjhOjG/LjVw5D0DQWoE68na7P+Qqmgnksna/X3mF0CQdkZTtDcQQ42OIY8teybjIjKZwtYBceYWwijsEuXwM0pCtClorQEJwmAvkWiF9FojA425SfiCCu6hWyoKYhghXC0jzaiuEehDIOlyVfNlVKsXsZMdav1AS83WXdVO4F0PkIjJ1geunQNAslXh8g58Ql98iOwjnM81WSfqlBnJwAUB4rs8CIW9xmW9sIQ/AkrOTPaJMk/TLDaTvNstd5Li+ehCxVALJB0RZmVKpGKqwd7c2F8ilBZLqP5C+VU6wu5pNeJBEPYdA/NiK7GLKcVnZl/WPsVmpPguEzX2UqAexN3KhIouwzvgrCMT1rO8Wq28HLzYrntHiewP0wWW2GvYY8+iteg8uLZC+S4TvX4xVVCjEzdkbW+BB3M2cPeSm9V/+CgKRmpT7JRBXH7NCpUIgoMrhjPpZqSiWt1zWNltfnNHqo0TcZ1wfgTSLbrmZAUhkMvJUYfEcbV5eIP0k4j5r9rX0zrN+XlbPKkoPz1ol6ZceCBBx94kH3+fZW04oilGWOE91Jj7gryoQPK2zPhBxu4vNvp809nYqYUg4zhHIpQZC3jr+zFqV4FuCmy6H5em7GfKWvKchHLtCJbJC+MsHpJNl9NjXbSWQYou9QIRm0pOemppK2zp+Q3XjYydIFH1xbQjk4oHgW3qlUu3bcIQnWDZ489cCzyenfoJBbqx5l2IJCSujFNtIfy4UCF4NPnWwt/dor5M0gLNwmP4RoZkGGONTdPz0U9Iau4VG90zhQ1x9WRbdIwwYxaJwuXyX0Jz6CUC8SEhE0oJF5827ZIN1fnh3IUDIS5M/ONgTB64XvVRAeD6NPKbm8gmviMRj1fo8EUmxnfrABQBRSUPkUSxeLoF4CI+pudH83JCoEcve7Z4hASjNSwCE41UwRB5F/hJJhOemRCCjohuBf+EtfFFCtFhspyG970A4Xk1D5HGpbJZADRYCSUhApsCxW2onSExxXqzRf4W4nimch8zjMgHhm0wgQ+N5phD0JD+l+/Cm9xDzG4yLA8LxIgCK5aAojV7rF0Yn1t0VhAyEjPHxcVAI+BDvi4QDEpIp669HathwBKXpy74DaRYNBq6l7zHwTQU3hzcNzqwbJEKSCiQxmkiMeofGHYn86BZKhetBIrzRCA6bjdSF+RCXHgeYK6EXm9X6zLiugUw5AIkDbvLwbQ7+rQcnwnNJ3eDMj1oi0n8ggg4IF8vhMuFugfBNLrm6MwIf8LnKvohYNlWvtQ6A2ODiD80l0IeARkAnc8SHdK8QvmmzxeNx/FKO1U08SHKj/RwOXliUJemCfXfl8vmc66zbwJfntKcZj3s85Fwpk2CXCsGQd46oQ8wNezBZtrjNYMQ9X8+TyAUkhmiz6Go7CoSrVCoZvN+VE+GTcXqucfJhE8/cE5d8SsdGS6BO3ZtAJzLnGHWIiUjX9sqEB7yU2FFuinpmdzYvDghxIgIXwvc+JUAy+YqfP+s68I0bnisQsYlWq3ObRcPeoSlw5o6pIUeix+IJz8VtZke5OiwbV3VUQl9HFwAEnIg7k4cRQyJgsSqVGM1EuhOIzWR4xNMLdudEqE9PJH6SMsNufXqLg4zDyyYYJD4DbzfpfcXr6CJKJ3jtM5WKnxA54/wVcOldV09s5ue6GuxWIbR04h3dSkAmkvfSalb39V4GJO6Ji7f0LgUSTKWCw6rbzYv1IWizztwhJJIT3GeAJkeNV1dORPIZ9DwVZxu3pbpVCHPr4wkwWOMvvMyDcL0BiT8eeQwHNTKyGoe7I4ZANsntxSqEZSJuzp8nRGL5Sqbo6rp6woDER0ZGIIwkZ4t3iUJS9Ny68CFyNWtKMUXV7A3IsjOw6lmt1kc8nuV6YDVuqhAqEUMgqvKXtZmIm88BkVgoV/GXyznhrMvqCQUSjwecgbjncR3OltxFoSRTNITpposaJ0R+soiHBKQeACcewEMcgbtxM4VsmikEJy7kkeIta5ahCYi7mPGD/4CvfJ6GWd3YLAlIHYFUqwikToGsBiWThbu9dUrE85OEBO507dAFQXBxq6twkAHnmEIhEhCxeqVQiLEP4ZrB4V1xjOEYdAnkw+XiVXWLLqsnLrBawMOfC2H3a5c2SwSyTICMVR974rvOgM22aovvDO4ODsrluo6tFpcmDQ7IxdMUusTBJdMwnk49fTq1Mj8Px6VTiBJIKx/C8ZQCG8vrr9Zf/UX3uCxneJdct+CS525tZ2SzzoRcvpIDHhWuVCoK3Qa+zDeKCqmDJ3n7duXp1BRcg8ePVx6Lse9u574dr6YnnfZ4ks0uOxx4IX3jxj34IOPevXs3plbrah+yapCjG0ZZah67E9JbdLD3TXFRHEm4Fp54Z+/wQ6snZ65yLAQiqfgzTbBdoS4DX5XJGgGTNUVOnF0AGH+Kp7kb7MrekG6hLm2zUGMspHHv6cjjVYw+HmsUIoPYNFYINyzTGNs9BBKKge8f5CJlJIgz4xhtdvaeS8xmnZXckBaiE6nkQq7uqidS0gFmOm5bXX2quwRHci3+gufAhLT2YOBwptC/eTweOTEUfYZssgyiLI5X2qtTFQ4ytiAq5+KeTMaT9GDon+zCifChsh95lEN819OGch6ChxH33NBfgj8lR3KxPPjmkcHR3A2AVR0JLOsUovQhBkCCTBw49vU87I2yq2nz2NLlDLsgSb5TJ+LK2fO5HCDhSmes9uvq2qnDKYIPCfyqf03euLG5q5n1uSCBJG8Yjeoy+BCnwofsykCC5wGh4y8DIHa/wMFrEoDgE6eTnjjXoRMpFjNlzsVD5JuR50Y6diKqPGSkftcAyL3Hg98QCDi0oxvEqzHXFjCIsnYHIegIwmEepPZUQPgdjUKGUSM/NqjfUN34BbRVNrBZtnSmnEnHO5GIS5q7LcbYbEjxnOoJzwe1IwWfaqceoEZCOn1687iH2cOegOBf//XXoxtHcHMPbwiQZWUesroZTA1vxh+ukgkrrP3E8e7DrxRIalMNJNiE78M5BLAwM9loTM4s4M0EBFt+MhMBLJKEh60TL6Kcxy3jhmrF83pPhOSUJ/5Q/TGCflqVhwAQcg1W7sI1WIFrsLJyRBQSTH0DhfCokKNI4dd7R4XC3Xt3CxEFkKoMJDg8Mq0bqyZAePg+SIDMOAuNRtQZbTQKzhkCBJ8yAzAQR4dOhJeBuHjlLLs5EINjHlQAoSarSoDMZ+EaRLJ4DeBCoEJYVftbmKx5OISj+QgezDwBUkCnXg0ogWwOTQ+pBwAJGgHZRCBjBMhnZDEDLBoR5xeqEDBWaZAHupF4Z0Camo4T6YFgDmRIe8wqhYwERmzg1Mkpv8UXpXghvrFC9EA8Njq/LlV7EYju5B63UMiwBkiUAhGScRAI6AOy2Q6BGPWetA57heSx/phlhYg1dxr1UiBwDY4iEaaQ1Ddx6veMTFZ8Na6ctCE+ZHpILX5zhTQVJiuKLHyNRtb5mQAhURYACaUJ804cpkHvCb5vlXmMhQrRHPPQyK4CiA0Tw1UbOWWVybpAhfBGCgFfRhzajaMV5tT1UdbI0PTzt8+l8fb5kJkPoWVFjLIaE5/Bny/QG+LUBR7yEE+mnM50LBCVE2E0Wq1mokCez8PHWzrm8Zj3lD5E6dR/vStHNwhElYfwfQOy43tvGPYqY18pypLmQyCS3Zx+WHfW5eF8bqYQOozDXh4kAql6Gjs8AE1nBd+mBsZ5W5kCEN0xJ4WgFkj1iBWxjlRhryoPeS9dNgybLeURjb7XKWTlLZjOlbcQ8r1dMVQI+pDp5w/g5Jzko+58QIDgoXFaIMOpYdGpT2Y/Nxpfsu8ajc+FSeLUeZ6Le2g3iyfZYcsSJ4i5OW7ye/7sFwJBHk7xw/l22oaTOTKQZSkPWZmHa/D2LbkhChneDEpAdqLiZeO7atoyN1g7Pl90jTf3IVkp7I1r85Dp6eeFecUw9SHBZkp06jPOiNqH8DxWe7ErzWNLdtxCRrxIG9JQmaz5+bfsY/7t0PRO0CAPkX0IRjcs7FX4EP49XLb3okA2gxYasJ0oPDOvzUN0URYCGXGq85AhA6eeajvsjUpAyE8mcWaxi5ncJt/BlssYZWnzEFXYq8xD5LA3Mk+cuiIP4eGy+ehl4zc3LbVZoBCfWiFS2BtRAJnHPKQwIsZZg3sHg8Hj44eqgYkh1qY5QyCDMhAfzUOUQHj1lKGuwbsVkk5CyOnphyvyET9/OHT83eDw4J7Y8sSaHOgpi0DusrB3MBgM7ooKicoKGbZSIcRkGSmEyVUMe1ke8ufHPz/+Cl8+Xzjq+9+/X95ROMj6QwSC0+aGpZNdXWKoBCK93vHXU/oeb2uiGvQhVdmj1z+9/Pi/jzO+6MxHNjwk12J5SFZSiJipp2SF+GSFWG6yZtYUp0trWXfvHtGbo7t3ydGRhOnP20/YuHXryS3y7c0nKWhxzgMQbMOGT41TD0pOfXFi0W6Hm4Z98cOiDgjr71rV9T3HbRxvDZAVp3jAzk9vbpGTIKfCxkeblBge4TXAm6OjIxplKZw6UwjYSwIEWzkE3nh0MFPIc2sA2leI+Nak86VRlqbSeePG45G47eOTJ7e149ataICNAiqEzSKalt/1Ya/icFlL2iqpCNAIW8xHIWPkLQEyNB8owLHCR+TWLd3p3H7yi000Wbryu5SH0MuGtn4H5AyYgriLRNJscB2Yqyg+LRxf1LfD/vHgPUZZb0nIBzd359+So8sux+O39TzgDG7/dKxw6rQdaNOs/N74UgdrNVOH2Dda/6JRCOOx6bHJ7eeK9lVrFCI7dcPTuf3kz7jo1CNgst5i6WSeOnUxD2GXDUbU93U4uEk+huO6MplYnLFpyv3mKbovGg77fOsReHlHfBy7KI+lKEvpQwIj8Y+GJ3D7yf+O4VCmSciFldNNvUKCTYVTF8NevQ9h8/Krxn22cc4SINJlu2tyOr/ExbBX8qMaH0IvG/ny+bCxGXkM29hV0H+uGi8z0wMBO1go+CLZKGg4kN0nPxgcfn/PqLgYGLH98oTaKNUNfBugFisbePjUt0/X8rTj1FlxUQaSYtPyDIjUThyPU8kke7dZ730rQ4EqHGo2EHjJDl9zPjIQXdjL8pBlX7iQjfqyBfwW3ocEIIhZwKqpQh63CwQ0V6+HC86Ij17S5R3wqo9W76kVIuYhcQrkzRvVDQJxik59PRreNPIh2rDXWCHiUlJmrR4/BjLsxiIgHLy237JM3cmAvBkQbwbeUCCq+ZB5lUJIHrLvC2fhmjmr61UnXMLgcCoV3EwFUSEgCO1HBwppgmuqVwmQKnuNB5aXQSHgx9/qFcKA3KkO3Hpzp/rm1kD1zhvywhqoV+tVCCarK6Dg5T3QR7CFQsx9CFPIJlEIVjFGPDa8Wa3WH6NGegeCserTQJUOBuRTfeAWPalqFc9HoRCFD1HOGO6H4ZpFffXserUeDfvAKUCglUrZpoeMNDLdARBRIYVClYQdlElh/u2vd0lVjUR7RzTiWF1lJuuTCOQNACEvqX+xLGtoCJzcTgqbHnZMZwwPT07s9sOTQ3ZjqhAVkOrjuEUK8UWfTj+kV+rfTzRA4KRomGVbpWHvkerGVCFBopCDVcg5q9Usfso31erz6Y4Uks2GI1USBgbkG9DL/NuVu6pqrwejXhnIHQrkFgEiRVlweF8PDIDI5fdWYa/Kh0hAHmOntzUK4TlUyDQ1Jcf/Y0DgfODmDT0pCsRzQ9nocaSp9u6H0e9SHyKaLKKQ6YCykMzseHUao6wUaaUIku6clkDAyEC4EAlIuYR4B6Gs/HpDanKAi0QU8uZOnal7oC4CYdo8Jgo5IH1aZnlIYwL7GxZIkwOdDzFXiBOBOInJWrVCITwAiQIQOml4rFIIOymVQn5dAWtFJ4ZU8yH7PnLdWKClVMjzqm7UQSE2xZ4QwZZAxHAaiRRUPBiU+RtHLOwtiD7kJeS3bz7RGxon/ouc4fFTcni+/WUDhYxJeQibMZxRVnsNFWIbCQCQ5QCII0CnYdoCQspeO9wO3tNmXTSdC6+oTNbLTwBEPCl12JuVykes2kuB+NQjyOJe4kMeagfJQxS7dGyaA8EKsjwKShwF+f7beU2UpQt7mUJWolHCN+zb1/uQlDrKMqj26qMssq4Mb+gKs7YUAk+2Fr1JxtL+ezWT91GWy0XDSiC38DRUYa/HLOylPkTDA06X5IYEiNFQJ4YtTJacb5LLWNCyEJHM31BFWQMYHQ6QMHFABjL9VH6y8HKw2zyESIT5kJGRx3QpHb1pRyH8TvTm7zBu/k6/re1Iz86/lw8wujItm6yBl+R8QCH0fAzykLvzETnKioS1RJaDLA+Zfjg/X4AP8YZ8Yg18ty2nruThi0gWqyBDYUhIUC6HvcTc1tGHVBU+JByN1H3kEyLBFnkIm6BS9GVpFSKFvehDqnLYe65C+OY+UpAHPIpKFTCM8Qvs06eLssSTEhVyz8hk4TTpso4HS9ZBIdMFp7Ou/MCbbLth745Pa7HUQ0Yyf4/WsvRRlsJkQfbq9EXwE15CwZTpBJWuc1HQmSyjKKsNhfDvb6pwMCRiJRtO0pmF5CHszIbBs8tA8HxolCXlIXROXXTq1LOz+ZCIngetZyGQt3V9lDWPUZbkQlqYrPdKgYBXny9UA7QKqnQh5A62Hs8zhbxRhb0yELB5zmgEPwGINsqSa1kGvb0mQGzKPKSNKItf0+GgSG7u8EwhTkKDADlWAaFU6PkAEFbt1fQ301qWAQ/wIkHqQ4YePn++8vwh+6Lf1E69RZSFIRYNeslX4HVi4y2JdgNa115FiUyxsPe2IuxVmiyfTzRZBkDgKot5iJgTNlhimPAMeabYx0P6wVLchxjxtp2p81FDHgQJmRCFU60WwtUC3Pp8U2qT9UZlssQ85MYR+6I3qJDhTfmKsctHgLBalplT10RZnPELCi4h5DbwhemhL/J6dHT09cY8RaJx7SCRx2Km/vIlHDbevHn5UmGywkrBGechcvn9s1w6SRxDWkk/5d41WnJYRqe+vOpZpU69pUL4fTMeSGQJoy/la1phsqhTJ+czICrksaJ0Mi+X39E3+8JRuFq+bDUaLlQjmFWTyHeYhL1Dz/WDNtgSvx+kmb6ZQtDqV9cjznrY54SX9evRxKiCiTJ1r67ck32INkwkQEiSrjCq5kDkPKRAwt7EkOnQhL2tFCKsmfNAJEt8U3WAD6elKMuo2lvVOPVIQZoPAevurPvCdbDMVWdhPYsGcJ/4EIiy5g0y9QKJsnbpilEDp84LdEqRXwPEziwAqYZ9dQokkdAzCTC3LkVZxgpZiaqJGE3hxozC3opchVMJZGj6ISaGI5AYri4HzlEIv9OSBxC5qRIIyUSkxFA+nzcmecg86+2Fyw4KqdfB+gGQLAApECAkwbDpgWCclVXWsnTN8zxkg2wGfQ1LZFV4RlQIPD1hkWBQNLZrXjEfYuRDjp9GNX5O49S5oNyXZaQQAuIhKvzhEDG7CKS+rAp7zRXCN2+25oFE3qqIrBzrSyd1bbVXWX5necgmKsSpVUiQT1GTNa8fkIfYDmQfogbC80vfwxiAuAMVAgYwHM5W0YdEfYnR1x8TlAhjUpA0UrhxT8zUjaKsY7UHQVdnGvZ+QRZUIdSHEHcx9HA+4KSjHnhOi9YPpSgrYFzLkpqDwKHfPG/8vqQC4pNrWVVS7aXFRQOFKMrvmKn7iMf14dSUwoekGJBznboiyiINEIQHjB3i5MLrvtnRxHrEt77u8yUSIC8RCGHyWvLqkRv3NHkIKuSOmIfoBWIEZJiFvXLsi/cScO3nq3WnctSr1XkJiFkeAjR2OIIEHMjN88fvUaVGok9VCvmkng+hPkS/xpACwasVJl9h8qVQiBEPdZQl92rvvN/hdxiP730CKMQXLRQ2wEyFI5FINDz6Gq5EQkVkPiBXT56v6qq9VdFkESBhOR4Ma4Eo5tRPThftjcVTbAM6PYHHlePp506D8VShEKNqL9+MwnkscXwLg/X777SO8js1WvLxhdFmmVZ746urNNjFaRB2o8xDChGsbOAXXsIIUQjPoqy3mhjrLY2ySGvU8KbkQ3h+bQBN1YAIZAD+hURZs7ghYBSjrMTox+y2ggf8x0aVefa39+Q8BMs+mloWAomgjgu+aBZkDF+mzdafJR9Cp3BHjwNGPJzPp4dG5ClcXS2Lb9JzAetraLCkGsqdl3/cfMAe4oHhFAZE+jKQNxjsyvO4ijxE0bko9vaCQsJRfZRl5tRZlKWdU+fEo5fHAIuyquEXcOFfUyCiU5eAvAjIYe+IrsnhlhT2ApAwhh31Oni86jpGH6Zhr7Zz8XTM6TQhYlLthSiRF1xRdiZLwo5RweTmgz8m75DniYzOQdDyAP/1ExwYTvLBFZWB3JLORQp7V5e11d7CkSIP0UVZPmzXZkCcddUnjbK0xUVey+N7n4sqJBtFUYz6nGLYqyYSZon7r4o8RNfkQIFkCRBfBCJpPRBpxrChCXsbp07TMYKLtlYfkxubpBCe3/Etzfi+SqfC//G7rlgCKMKJhINobyPhGJ2bhztgtOqQqjuxkUCpEM35yD5EWe3V5CEEiE4hZlHW6p5UfSeJIR/V8vh+Zsf1lQDxreOFT4CIjYBssALwkSIPMYqyJCCiQsBk0RZpCmTPrNq7WDcH4jSaU+ebSxqtR3U48Dn/JFtJr8M9B95LOMJO56eb9QBVSFXnQ5S1LI/ZBNUwNVlViEurYFOydVBIXRn2tlE6wSiL+95gvNxn4QaCGH0dib7WWizRZhXIjIg0QUVrP7TrROlD0MtFyFe0EA0PJLkd+OA2yTZZm5w0HzJZ/QwyyYI4ZrILjaqz1Rih0+mKOXU5LJGG6LpFIA/wN1+POnCMbjurwMPhd/hHt/EA5WPUAlFVe00W7LAoy6C4yMLe6Yf6oQ97XWtGQL5fopWxyCxiGJ0t/DVeG9cCGSUNW+hCJIW8MWpyACCKCAY/B2bX1WN/bDCmq/bOOFuPuEdT7dUb35s3/9hf+7omBlq/o+OooirISLzexltydzYiVgPVUZau2iv2ZWmW9Ul5iH6wKGv6eR07olQfdbH8Tr+w/C6ETYGQ8QKv/Yvo1+9S3zlGtTarKs5QFUZY14lBkwMxWaBh0HIUJFyAuyogeP/L+jIpnUx8WWjAzUSjsTA5eQ4P5y4FMiYqxKU3vje/X8NqEEtFfr+Jbjwh8gBtoMFad2YRSLQAPiRb1/gQVdirUshdbG1QLvo0Vwg1WdMF464TTZTlmmkJhElkMrLzXUoHBHPD6tt7iq6T258UTQ6mPmRdp5D12bDOh5j5jv39APMtI6SWRZsc4jsHwQGjM8HQd4dKBAXiG/WLNJhM4Mk2Rv3bvoIYZSmB6Jsc4E+Z+RDz+RAC5CH2talHduVYG2W1MFmyF4EsZOS7HR2QRITNT+GCnV9MupNlIE4Akg0bA1kPT6pXUEVNHHodfLB/7tU+eUDCXrphAQDZ/N54SMnh707n+qhorpitciSAgGNubg4PLKwLexUrK26r8xD9Tg76lhOxzWGz5XyIuslB2GnlQ+DrI7364WBaF2iNvq2yJgepc9Gg64SaLMhFquGIkckSx0lDXe01HusJuHhoa15B2LqsyEN29r6aAIkCEGaxwhKPbWd9G4jM1cCTwG25Rg4MS3fVrCoP0ZXfWaauyENotXeXAlG4S6k1K8iiLH1zr8qpk3coSfFLJkBwgiqaLUSoRF4XtvVx1mw9oFmOYFB+N6plbczCQEvFBkrktNGGyarDNczN4Yvb710NkE2D55epyTIFAnkuUcjvDwIiD0cCq7LwLLEaPJkfIpaaptwrTlDpyu9xo81n2AqqTXGCSiwuwiVEk7XJTJbOYgVooxyvnDFUxYpLMhCQMM6H1KO+F6OYsG+TypYayP+9XVlR92UZdJ0YAYlGI5Hw7PqsLwL3ohHfLAOyEH3XaExGJxuNd8ZAAv45x5zjVfYVgMHdjB+T8jsFYuxDSLF0iQIJy0D+cjpRIfBkOMrjMWMgxl0npMmBrNVfuSttzzTMyu+q0kk1TKZwcU69RSupqi+LUxD5NDwgAxEnqAoROjm1XVhzqJGMvrgnbWDWMjHUASHTM76NiNgNE5klQOSwt3Fo7EPCYLEcc3VUiiO9GqjKieFO8GDJBAgnMIX8KQdYYKj8DsXYjhoDkbtO7shR1j2jJgday4rUAYiydBLexylanDGEsFcb9WLYqy2dcE1hh57JQGh3l1MqhE7hRsDy0ih3cO99QkXkhVh81syHVLV5iB4IUtjIOsWJMwZE3m1xQm2pxDuoDMcc3IFXdk01HwJATLz6AE8VcpNqgo7xOTHypXnIRsQUiLQcQZWp68rvLFNnE1QQsGXF0snmsFkrKSaGq6wHdW94T5wx5IXm+7X3EB7uBoZ3Zwaw4rDvIxNUkSo8Y7VK3Uji6+BeUFnyHX2hWGNokIfcNkoMSfkdO/GzEOuKTcdhCqTxpYpNDpiuq536/jjL2scd4EEc+84wXESv3HUSRyDBg32ZwqeX0l1IRRDI70og3nJtjgZbmQwJt9Yjvhbl9zfq+RDi1OfFJoe30voQCHu1TQ5hOVM3m6AifVmu1H50aSlCu074pm9paU3gueH6JsDZ2QwefKUzLD7yBekhYvjvD38Kz3ZeKIH8ypqtH7doJRVLJ1h+L8BBYumEufLZWdmrEyCfTZw6GP8w8+nE7Mfwdtz2eMQWxxsSZYFhOJD8emRMkssST7uyAMisBGS8Voshj5jLxQvj/sQ2Lt6LhAvsOBmQJ4ryu7iCSto4QJeHbComqMLyBBVm6putpnCRh/CVOYsI7plKA60ZngOThRVTIRjcB9aRqFjcwfJ74sUPP/98lNqZfjEqJyLiCqopm+1jq7C3KuYhLDFcD4fDkKLP4nd6VwQihr1qINv4Wt4nPn08Rhzx3FxuXO64ZkCCB8H9paWXS9HU3thudoDx4JtNkMjvvz+QsxDHXHkc7dX4WdORCGUSiUJ9XZ+HPPnFIOw9Lw+JiCUxnKDCO0Qhg7bpY+mU5AK8M0CBuL4qg3T+PQtGmgQIdgmm9n3KrhN49sToDzB+/uH/jm4o/IgIZGRV7Dq5o1+OoMzUs7Tai/6sGt7widGGb1YBxCcDEcuL4DcgPJ3bfwUv7XFggZ+OcUjSSabOnDohcrC5//XgIDVc391DONHlA7qhwtrSH/uDawmHaiRCAoBOYFaCDR00U5dKJ0/+9RrOB2tZnwYUyxH0W2uwCapdMh+ijLLYfMjBAZ0PgXMmi0Kcigmq42nbo72gMkBc43mWrL+XgDTZfAgCgSMEN+WMvPiBEPn5hx9evJDKiyKQrDrs1deyxPkQphByMMyp12WnrpqgIkEuzcgLJPvA9CMGKVwM6cypfIgEhJxZ9CC4WQ+m4ELApWBNA4IgNDk+piEiOnYSTWomqJ7cdiw8MfYhxvMhm8NGUZZvfzCUq5zmR0dHT08nTuFrYUXRKPfrLwMvC48K6rSJxb07nASkqejLgj8RBeYf//uDdrx48QPbWuO8sJf4kAj5IuX3KobgkkIg2WFRFm0lXTwENigRcMI4aeFcSyABVMUcUQj1JNooCwVC48X3wnBdDO1VHXOcw4BIIrEewZo7mGhl+f3Ja8ftJ3K1V9t1ciS3kirm1IlC1BNUy68a2vFC6sSkyoi+VEaF73neR/3g8G5AbJ3RmCz4EwZAUDHijnJilKVdhWtQfg/7BuCbD31ImK4+CYs+5HDxRAQCYdZMfm7Ov12lFgtpoDJiBEeM5iH1EXE+JJ7kU3D52QwbH6xvpggPdXOQEZGE48+IuM5fGWX9y4FADBSiBKJY9MmqveRq1WWFRNft2j27Gw1xewvDVHYNo5Clpf2DzbH6LntTZ3TqZIUISSEwRI+EwYEYDgOFVLUKKdBallR+x9LJxvr67AaNsTb0Tj0KumlUiBrWXzmIQAgTjHrnQrzAxxxx1gYkd7/zKXqGL4UUVUiK59TvBiM0y4mE2lzNJf9eEw8My+9V5kNeOxz/uh+tmylEVctqMR8SmaW5rtjhRFLfhQCGWCPR702ANKm1TVXH6F4bqeC+on2b3omaEVFvHHBbvH1zu8WcupiHZGkakg0rfQjrOnEuNPLEWSQcxInnKJU5R7kopMtJribuFEq/4Z7XKYGeYnY4VU016Rtr8zy3Iy+VavKu5JxfYgJ30n///fd3onNTlN/vkx+433prDWWTw6Ci/B6WvwMQ9dui4PcFunbnpSGQ93wzxfY92a2miNGlQLSowz+bEpGqva3K74o5derUt1s4dULFTmRBLBX5ogLJJB1+yCBW6a6tNvLWS6gQsm97lLiQ5foYaIOTO7R2JCLf/f13sob1YpydGk/Dw++++y6liLIokKPXyONftLVB2eQAf9Wkt9dcITOFaDRSWGhMku8zCISctiGQAZCEuBHN7hjdQ5M3AuKLrJgCkfIQyakP3DGYMaTldwLESWtZ9JUi1rJUvb2k2TpGKczlHFQkJNjCLMQxK7WSVtmMIY17d3bwvYOW6ym2+Fx+2RGZwNVHBklbMm1Lfvc3wQFj9466/P4T0Qd16nI9SNWXpUwMW8yHABDWPBNtZOmdxcYpCbEeGrqQ/YNUKqhUCLFZRkB8w3/+14TIvGqNod6H6Kq9GNaAD8Hv2Bkplt/fSaWTmeo77O0dd1Bl0LB3TnzgcOQCy/LWGsSHCOwkBHAlHJgsEjDKkws8v/N+p0kvP4Ig4ztpvFWtqVx5ATheQ6au7zqJrwaMSye7pkAa72ZmPs/MTDQmZnBMNhqJY2xQPv5VolCVE8MDxVZNRCFBtsRLXYAKk+WLxm5EEWWZNDlogWxvwECnzgZz6rolbYkhSRcsG2TfHE/l3l6VQvDwAUiQAlFUsn0z8KUgoB3Ka+ibYzyUOzlo8pB72rerYFGWdoLK2IewHFG0Wftj1SVRH8q9s4hCgnR9CKntRLO0uEP6uX2bjx6bARkxSgzNFRIpFApRiHsj2QKOyDozWaeTE43GxOSHhn1i8pR0v085ckwUYqSF33PjZDkC28mB9WWxk+CJQuoUyHtVA2ALHn/vsIXqIN0NjI3/9cS4t9ejbHLAm6O7v6q639nVKtC2WQRyGC3ACWcnG++ycCc7c0icOt3WkcZVQn1M+BqNLu0HD1SbmYk+RL+CCosBoJDh/zMmIvdlKUonrcrv6DiiGwVxw+KCgQ+h60OOkUiO6SPHgl/HT8dkwU5AbnLAKIsKBKffmsxkqYCsteABRuwxzpVBSrQ9B7HXuNjkQEsn0vkY7OQg79sb3DRYQaX0IbQeVF9sLLBduarPf/p39M6mIFTHeMF1UDzQ7C4n+RDNCipaDAAge+cBMY6ydOV3Nh8irdw2irLYgp3jn+YczJGILiS38XB6iK6OJl9iby9BgRYLTFad7LnPp2Qej1vx+O7vtGN7e2N7m4TCs3/qmxzEsNdw315F56K2dIIma/Lz5y+fP582PnzGO8yH0KVIQ9MjY3upVH1sJ3XwdVktEKYQtkxYmqDy0SmXAgDZ2zTJReZH4q2qvWL53SeW3wvZbBbtFH6HUVg3AAJRlh2BPI++I4GVmBY6tgdeDnx8GreZrjGUnXpKniIZQR7w1TSgMbLzdzKRIF2licR22Fdo2eSg38nBYAXVukIheh9CFrNOTzMgEA7Uq8PD4FCWDBRCF4zgCqo6maDC6Rb8ipj7kB9+kPqyBgybHHTd7xvGTl23k0NlaPrhg5cDA1/m2ATfXG7jMzwGJDO4ChebHJaXtetDJB8CbuWApoovwzUMrR6/bxoA+ftxZHM8Qaooc9vrqjYg5flIfVk3jOdDhoPDbAWVchUu8SHwmstm3zU+k+/Rw8aE2ObwfBqAgLaqY7QMx4jwKUkhKXlvJnGCitiZdYyyHpnEvT8/FYFUDZscdJm6LxqNkiaHKBnqJod32OTwJbpAX0krAwNLeP2/fNmY3PjyGVnAPwwsfQ9IiFOv69YYSgpJkUmr6KeljfHEaO3v1WgUskUDIO/xwHxZ3wbkIhFVo9yd+pK4xlBap06B0CaHt3KTAym/y1crHA5H8RJSH1JnPqTOfAjbHhibHEbGwO+BD6FCZjuTpgiS1G5AWqceZRNUUQw86BeYrD+NFfLzXZtNV+1t1bnImhyiLNbQNzmIYe/xr3j5lxCD+EF40H9cytLEUKMQyYeQ19neQToGr/3y+9Qy3clTD2QVfWUW99bQdb8rNzBTdS6yt6u4J/f2UoWIE1Ti5UOTNfHl3eS7L5APvvsyOUkaZcUpkXmikCZfH2OrdILEafAp3MY71VSU33XVXjBZyyY+HRyLOlOvajJ1nQ+pOqXSiVNZOllAcdA2IN8CMEl8fMku/4ACBHyI/7i08njM2Uohe8G0I/HCsbEc3GPFX8MkhB6Ycff7G9UaQxEIKOTGDWUbEPMhRk5d70PkDbMAyCY49YCLRMCRPVqAI68cjlNMUGnmQ2iUZQbkhx88+h3llH1ZVMPEAsJdAFKt1rPh2TDuj4kbZPpmjXxI48MvLyUEio+BgY/HKy+p6RrYflygPkTQ+RAutbdJWhgm18accjXeCIhB+V3fl2XQ25vVrQ9xalZQAZCTQhUil+qXxmfyPXrSGFU0ORCnPlYfG4sMfM+aHBgQntMqJEwV4pTC3iMzIE+ZQtgaQ2l/KWayxPJ7VWwlncWuxXXSsrhOv+tmDL/89stLQx7gUn49Hhp5O4POfRaC4e1a2hPn5PdbFjN1ngd1JF5PDnwfHa5KQHgDIPP1wEqBmKwIXNGowqlrmjZkIAbv0hbcjGLWJk9QMSCndeJEfI0IjfIXG68VTQ4juNlLtb47PKh4xyRac08ZKQSnXESFBP+nBfLf//73Z/yKt+7t1UZZbB0Ca/E1anKI3lmS/IVeIh+Ph8BMrcC92Dh8bM9tb9dC0juSE4XwnMA5RhNzIQyzosNj8j7eBklh9MGnpU931rfDkY3ZSGS9VW+v6NR1vb1sxlA7QYUm63RyYWFy4aSxOIl3ThvMqdMmBwCSCtZJ0So4rFBIioS9ih0wpQmq6DybqNLVsv77w8cZCJJmPv6fuCupYs/Fl2+Mut8pELHJoappcmAma6bxYUnEMPDyzictke9/pVtrBD79WattA5IfEcrrWohuSMYUwnPlWmZnLxgdWBuu0hPm9UCwxLhPFkdPJPyQhsCX/7W35XKEGybv0kZKJxGf8tKx+ZCTQ7LFUeMQxkmjIUdZBQSySaIsXrFxAADhadir257Jp9hsSAPk5//+79MDOvbj5ltr6MrvEdp14sxuVMXjAqfuQyDkXdomvkxsfSbOnLiLlRGfViMvPx4/dIrl9/rYY08asMDH66QguFzCgZiHCK6iCwbP87tVTONd+L+8GsbO1yhdrPCHch5x7t9PyASI5EO+d0phr+3oxtFPR6oFO9NHcrUXC9nSJFUkUgg3TrLEVX6G1xuebeGElN/fPh95/vzhMY2yAAhOEsomSzjY29sDhVDNC66vEbm1ktTIo2ogaKZ++PedBw/uwHjwIBsXnbpz4Ikc9r5580ZRyyKVdkVv7+zEZLRAu5Si6+HZEzkacXi/0Av/cuYp5LQfNVZr4OWXF1P1XY9ttzoSXy1Et8drttUkB0NwJcvlcqbpAoXg7CCXKccySZfQXB7jmq5mCP4zxCtofN1fkjaa+0M1s/v6/v37WH7HsLdevf3b/c+f3pBWLduq7caLxIsXN6QGX/LoBp0PifhmJyc3wuzqRaLrkxsL6EPwhGcaM5GZmUi9ugjhPG45de/Fi3tDx8RkQdDxPlN+tTlITZbrAA711fuDsTHaMZPM/Dg5S8UHOMIQPG9gSM2irJ+ZqfpEcSCROwQIvKQ+z9y/T/ZpIU0OcFK3xJ0c6KGuR6JYywpHI7OL5OJPzERQgxuLjMWJvQJOOrYBCCA3Xjg+xg0pX2oV8h9Q/YoNFZKukGAyX/sOhODicvRZYkFnE7x8mQaaOc61PNZ0ZfL00d8ijehN1bZ/P6pWVuEP/0YVP0MP7rdbbwDIqqdCHm29oG/oktgif3GUvKFL5At9WU2ESR/C+ik9qw+TExMTC+wVdwr/mJg+HnpBfzFBoiynjx7cj5t7TY53hejfqETGIB8Rz+pkg6Q2vklyVvYFX2Q56NrZ3sLnsd9BQ0VZwOeDrM32rydvbv9GfvFwBrs06nfu04vz4iFJkzbkQ8UFO6eSHhbWZ8OT4oP8j+PbtfFt7zaoY2ChsYUVuK37OiC/4M/iApE/paeJCbwruSU+mhhL8bxffLTF7Y4JMfFPII0dhTTE8Z+EH8bcayYSkpu+rA88uS/9jftvnvzilZt5bhzNz+fFR6fDe8HhBUnk6xFfZEPW/Oni6YmiD+h1QPGLY2PDgz+Kj06SrqarLD46fAWPQnbprOBJfYvio0VQyIF4VtEHTBr029Lcd788uWWXDxysleIX4XkmFIcKCllQHN2Gjxy5Pe93gDjAS9fKte2ll/85xMzw+DjR+I8xkEbtuz/t8tOUi828/GjhwJWTH+WXx6STzH+X2r+ppfHHHx8+HLKTDvuJSAjckzdv7isO9dab+4fyo8Td+Qn5kT84WJYf2cOFWcUvRp3ZRcXDSeek/GBi+Nm24he5Ykbxk5kit6U4q4JPfiU3FjcHRR6Nlw8eUBzk68FEozbzRHFx7otqoa+BSGRBeajRAeWxNhbD+Ecq2zUMmWKvc6/9lfzif9jv//RTo/HLS13gSy/IakXxNHa+rHzWUEj5aGZMvv+HbjuaP5QXKxxubElAGvdvK06r8dub35R/8e6G8m+8CiofTUSUT3paf6f8zy9R1aE2lY9ygvKs8kJO+Z9h1V98vykJ645CIQ8ewB9L/KI81MZt5euqMRtWHapvYEL52D6Br7otf6WSz2/ZNU1+iUSjoU8MKZDDL1uq5z1VnZfqRCa+yPf/o8Hxnx/z2qfxS0A+TCr/71B1Wo3XCeUjf0z56GRB9aOnh8pH9z+oflF1qPmY6hrE8i3OUbJ07x7ckZA8eDBD/obqL/6mwjOxoD7UAXujg3FikKsfNsQSpOJqtfmsf6jVcdjQ/56f+RDd31CPLdULQvOjrX5R85OtfrHlk0oPPz0Q/Tl8fTo89xponnWgEx6NDwYFlJNG90OlkA+Gh4vBVuMKjQkp4EWF3Fns9Pc7U4jOp8PnaQ9Hr1DIH8Zg0YdUrhKQmQdMHkQhzs8d/rq9MyBY8tWMlx+6P/gPCu9h8iN5yYVckfFJEsgdkpB86CcQcCG6MfCbFQIxPez8FbNYCzTmpbkh3DjvnPQRyF+7y/qx0LtA/jC3tJAQXTWLRaTxidQW60DkwbuTfgGZMOKxvPtXl8du//HHvyiPFj8kxVhXYxwS7/Fg5sTeWHKycq8T6HyKRpdm3v04sWglEPu+IZDl3f3u/HplzvHC8c7cfVCffrUEMklc+RJJd4AESoQgcZLt2gK7y/uL1gH5y5gHEOlKJFt0Ce+7D+dAu0oCaSw9kJOPd06nAgZ+CywHdk8tA3JqxgORrC12IxBsf2wZQtkdc/mrxGOR+HOxNPMOfcnCxLt3n//4vBRd+nQHeMzbrQKyuNwCCPzfj50KBBvuzuEB0K5UiEXLJnJ2bj89VV3e8O5u2CofMqHgsSsOtUg68yT+c3icLJ5+OIWY9yR/hdKQKAS7tHxlODZ2x7atAXK6tiuiWF7eX4PxCsba/rKCyu7yq8P2Dz1P+rbNrvXJh4WFhclJOh/y+sPhlbJYk+ZJSmB34VwgbdD4cY3IY3d3f+2viYlF+fIcni78tSZDAbt12DYP9CBmL4bThUkAsjBBecCDxasBZJIkhSZpxyKc0XJgcuG0GyCnRAJ/wQAdLOMFh6+/Tg0v4MnEq/1lxgSQtKW4SkseDcpjYcHx+vUEfp+cuBpAPj8QY16Tk9pYB90vdgFkQnITY8xbvGp5pU//WmNMAMmJQluGrxY78R8t3PXJwiRDQnBMTlwRm7WELuSdmT0jJzW5MGHvBghz3XiJQSw/tnFFZMO2/GoCOZz8CI7n0MxczSVaHtYiVQaewsSHK2KwyGx6i4K7ffH09HTxpCsfAjnH/qu/fpyYqJx0kJedvqKhGDABt49E/zLMB5HH+enF4ckijJOr4tDxYn4CINEen8MUSFcvy8O/9kVvgn5n38R7zPmvVEW93XGC5d13fQEysbvc5byT/cd9KRI2KBP4x9Gb5xv/yLGI3YqLfQHi7xoIDPAduyZl4AQpX/1DeTQ+AJClRl+ALO7u9lLTm0Aku2tG5avzyyVXGEiLGKtHII0fWWnKfnhCfOspGRMGg/4Put+TQ7nZBFL7NbtReo4B7z8XyIM7J/0BYockHK82iz3bHCS7BkSLmMyf5g0TQiyYnH5YXDz8J5Gwn8BYPJx80GuMZQyE5ADSRVZkaOcNJRrDubHFiddotEh+MbH4T8FxAtdrcnbdt1/IPvgMr0e71UAmFC/4bgb79UWjJ154DQphP3X6z1AHntVEeGw3ENhdDnzBR4tWm6zDxVO0VnqTNNlKFQrDBY7FwJYekl9/zYDAk/0jgEzQi7IOOAqB5UliXU4sBsLcOaTKoiM3vfwSGNG/Q2ptKllaxHW8ZjwW/0lAJiYju4FdHz21xX4A0fyc3X5IVuVpBvlHe7tW8/DDBFbYiI85tf8jeDQOmd2YWAgHxmYnerXFHXYuWnD8JyRC/ofQIJfwlFqOhYlZH1r1iZ4i3wsH8o8cxOkyk93j9bwGctn0dg3kGsj1uAZyDeR69DkPuR7XCvn/dFwDuTZZ1+MayFUyWdeX4BrI9bgGcg3kelwDuQZyPa6BXAO5HtdAroFcj2sg1+MayDWQ63EN5BrI9bgGcg3kelwDuQZyPa6BXA/D8f8EGABP9N9L7hGs/gAAAABJRU5ErkJggg==) no-repeat;
+		background-size: 100% auto;
+		height: 100%;
+	}
+
+	.wx-code {
+		position: relative;
+		margin: 0 auto;
+		top: 34%;
+		width: 320rpx;
+		height: 320rpx;
+		text-align: center;
+		padding: 14rpx;
+		box-shadow: 0 0 40rpx -2rpx;
+	}
+
+	.wx-code image {
+		width: 320rpx;
+		height: 320rpx;
+	}
+
+	.get-coupon {
+		position: relative;
+		margin: 0 auto;
+		width: 560rpx;
+		top: 37%;
+		text-align: center;
+		height: 366rpx;
+
+		.coupon-name {
+			font-size: $font-size-toolbar;
+		}
+	}
+
+	.get-span {
+		text-align: center;
+		display: block;
+		border-radius: 6rpx;
+		margin-top: 29px;
+		margin-bottom: 20rpx;
+		height: 80rpx;
+		line-height: 80rpx;
+		color: #fff;
+	}
+
+	.get-coupon .tips {
+		height: 40rpx;
+	}
+
+	.coupon-price {
+		font-size: 52rpx;
+		height: 76rpx;
+	}
+
+	button {
+		box-shadow: 1px 2px 5px rgba(0, 0, 0, 0.3);
+	}
+	.truncate {
+		overflow: hidden;
+		-o-text-overflow: ellipsis;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+	}
+	.color-tip{
+		.w-460{
+			width: 460rpx;
+			margin: 0 auto;
+			color: #909399 !important;
+		}
+		
+	}
+	// .color-tip.truncate{
+	// 	text-align: left;
+	// }
+</style>
\ No newline at end of file
diff --git a/pages_tool/goods/evaluate.vue b/pages_tool/goods/evaluate.vue
new file mode 100644
index 0000000..254dc6b
--- /dev/null
+++ b/pages_tool/goods/evaluate.vue
@@ -0,0 +1,342 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view class="goods-evaluate">
+		<view class="evaluate-tab">
+			<view v-for="(item, index) in evaluateList" :key="index" :class="evaluateTab == item.value ? 'active-tab' : ''" @click="onEvaluateTab(item.value)">
+				{{ item.name }}({{ item.count }})
+			</view>
+		</view>
+		<mescroll-uni ref="mescroll" top="100" @getData="getGoodsEvaluate">
+			<block slot="list">
+				<view class="evaluate-item" v-for="(item, index) in list" :key="index">
+					<view class="evaluator">
+						<view>
+							<view class="evaluator-face">
+								<image v-if="item.member_headimg" :src="$util.img(item.member_headimg)" @error="imageError(index)" mode="aspectFill" />
+								<image v-else :src="$util.getDefaultImage().head" mode="aspectFill" />
+							</view>
+
+							<view class="evaluator-info">
+								<view class="evaluator-info-left">
+									<view class="evaluator-name using-hidden" v-if="item.member_name.length > 2 && item.is_anonymous == 1">
+										{{ item.member_name[0] }}***{{ item.member_name[item.member_name.length - 1] }}
+									</view>
+									<text class="evaluator-name using-hidden" v-else>{{ item.member_name }}</text>
+									<view class="evaluator-time color-tip">{{ $util.timeStampTurnTime(item.create_time) }}</view>
+								</view>
+								<view class="evaluator-xing"><xiaoStarComponent :starCount="item.scores * 2"></xiaoStarComponent></view>
+							</view>
+						</view>
+					</view>
+					<view class="cont">{{ item.content }}</view>
+					<scroll-view scroll-x="true">
+						<view class="evaluate-img" v-if="item.images">
+							<view class="img-box" v-for="(img, img_index) in item.images" :key="img_index" @click="previewEvaluate(index, img_index, 'images')">
+								<image :src="$util.img(img)" mode="aspectFill" />
+							</view>
+						</view>
+					</scroll-view>
+
+					<view v-if="item.explain_first != ''" class="time shop-reply-box">
+						<view class="shop-reply">商家回复：</view>
+						<view class="cont">{{ item.explain_first }}</view>
+					</view>
+
+					<template v-if="item.again_content != '' && item.again_is_audit == 1">
+						<view class="review-evaluation color-base-text">追加评价</view>
+						<view class="cont">{{ item.again_content }}</view>
+						<scroll-view scroll-x="true">
+							<view class="evaluate-img" v-if="item.again_images.length > 0">
+								<view
+									class="img-box"
+									v-for="(again_img, again_index) in item.again_images"
+									:key="again_index"
+									@click="previewEvaluate(index, again_index, 'again_images')"
+								>
+									<image :src="$util.img(again_img)" mode="aspectFill"></image>
+								</view>
+							</view>
+						</scroll-view>
+
+						<view v-if="item.again_explain != ''" class="time shop-reply-box">
+							<view class="shop-reply" v-if="item.again_explain != ''">商家回复：</view>
+							<view class="cont">{{ item.again_explain }}</view>
+						</view>
+					</template>
+				</view>
+				<view v-if="list.length == 0"><ns-empty text="暂无商品评价"></ns-empty></view>
+			</block>
+		</mescroll-uni>
+		<loading-cover ref="loadingCover"></loading-cover>
+	</view>
+</template>
+
+<script>
+import xiaoStarComponent from '@/components/xiao-star-component/xiao-star-component.vue';
+export default {
+	components: { xiaoStarComponent },
+	data() {
+		return {
+			goodsId: 0,
+			list: [],
+			evaluateList: [{ name: '全部', value: 0, count: 0 }, { name: '好评', value: 1, count: 0 }, { name: '中评', value: 2, count: 0 }, { name: '差评', value: 3, count: 0 }],
+			evaluateTab: 0,
+			mescroll_type: {}
+		};
+	},
+	onLoad(data) {
+		this.goodsId = data.goods_id || 0;
+		this.getEvaluateCount();
+	},
+	onShow() {
+	},
+	methods: {
+		getEvaluateCount(mescroll) {
+			this.$api.sendRequest({
+				url: '/api/goodsevaluate/getgoodsevaluate',
+				data: {
+					goods_id: this.goodsId
+				},
+				success: res => {
+					for (let i = 0; i < this.evaluateList.length; i++) {
+						if (this.evaluateList[i].value == 0) {
+							this.evaluateList[i].count = res.data.total;
+						} else if (this.evaluateList[i].value == 1) {
+							this.evaluateList[i].count = res.data.haoping;
+						} else if (this.evaluateList[i].value == 2) {
+							this.evaluateList[i].count = res.data.zhongping;
+						} else if (this.evaluateList[i].value == 3) {
+							this.evaluateList[i].count = res.data.chaping;
+						}
+					}
+				}
+			});
+		},
+		getGoodsEvaluate(mescroll) {
+			this.mescroll_type = mescroll;
+			this.$api.sendRequest({
+				url: '/api/goodsevaluate/page',
+				data: {
+					page: mescroll.num,
+					page_size: mescroll.size,
+					goods_id: this.goodsId,
+					explain_type: this.evaluateTab == 0 ? '' : this.evaluateTab
+				},
+				success: res => {
+					let newArr = [];
+					let msg = res.message;
+					if (res.code == 0 && res.data) {
+						newArr = res.data.list;
+					} else {
+						this.$util.showToast({
+							title: msg
+						});
+					}
+
+					for (var i = 0; i < newArr.length; i++) {
+						if (newArr[i].images) newArr[i].images = newArr[i].images.split(',');
+						if (newArr[i].again_images) newArr[i].again_images = newArr[i].again_images.split(',');
+						if (newArr[i].is_anonymous == 1) newArr[i].member_name = newArr[i].member_name.replace(newArr[i].member_name.substring(1, newArr[i].member_name.length - 1), '***');
+					}
+					mescroll.endSuccess(newArr.length);
+					//设置列表数据
+					if (mescroll.num == 1) this.list = []; //如果是第一页需手动制空列表
+					this.list = this.list.concat(newArr); //追加新数据
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				},
+				fail: res => {
+					mescroll.endErr();
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				}
+			});
+		},
+
+		// 预览评价图片
+		previewEvaluate(index, img_index, field) {
+			var paths = [];
+			for (let i = 0; i < this.list[index][field].length; i++) {
+				paths.push(this.$util.img(this.list[index][field][i]));
+			}
+			uni.previewImage({
+				current: img_index,
+				urls: paths
+			});
+		},
+
+		imageError(index) {
+			this.list[index].member_headimg = this.$util.getDefaultImage().head;
+			this.$forceUpdate();
+		},
+		onEvaluateTab(value) {
+			this.list = [];
+			this.evaluateTab = value;
+			this.mescroll_type.num = 1;
+			this.mescroll_type.size = 10;
+			let mescrolls = {
+				num: 1,
+				size: 10
+			};
+			this.getGoodsEvaluate(this.mescroll_type);
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+.goods-evaluate {
+	.evaluate-tab {
+		display: flex;
+		align-items: center;
+		background: #fff;
+		height: 100rpx;
+		padding: 0 $margin-both;
+
+		view {
+			background: #f0f0f0;
+			color: #333;
+			border-radius: 30rpx;
+			margin-right: 20rpx;
+			padding: 8rpx 30rpx;
+			font-size: 24rpx;
+		}
+		.active-tab {
+			background-color: $base-color;
+			color: #fff;
+		}
+	}
+	.evaluate-item {
+		margin: $margin-updown $margin-both;
+		padding: $margin-both;
+		background: #fff;
+		border-radius: 10rpx;
+
+		.evaluator {
+			& > view {
+				display: flex;
+				align-items: center;
+			}
+
+			.evaluator-face {
+				width: 79rpx;
+				height: 79rpx;
+				border-radius: 50%;
+				overflow: hidden;
+
+				image {
+					width: 100%;
+					height: 100%;
+				}
+			}
+
+			.evaluator-info {
+				width: 85%;
+				margin-left: 13rpx;
+
+				.evaluator-name {
+					color: #303133;
+					font-size: $font-size-base;
+					line-height: 1;
+					width: 250rpx;
+				}
+
+				.evaluator-time {
+					font-size: $font-size-tag;
+					// margin-top: 14rpx;
+					line-height: 1;
+				}
+				.evaluator-info-left {
+					display: flex;
+					align-items: center;
+					justify-content: space-between;
+				}
+			}
+		}
+
+		.cont {
+			text-align: justify;
+			display: -webkit-box;
+			word-break: break-all;
+			font-size: $font-size-base;
+			margin: 26rpx 0 0;
+			color: #000000;
+			line-height: 42rpx;
+		}
+
+		.evaluate-img {
+			display: flex;
+			width: 100%;
+			flex-wrap: wrap;
+			margin-top: 19rpx;
+
+			.img-box {
+				flex-shrink: 0;
+				width: 140rpx;
+				height: 140rpx;
+				overflow: hidden;
+				margin: 20rpx 23rpx 0 0;
+				border-radius: 10rpx;
+
+				&:nth-child(4n) {
+					margin-right: 0;
+				}
+
+				&:nth-child(-n + 4) {
+					margin-top: 0;
+				}
+
+				image {
+					width: 100%;
+					height: 100%;
+				}
+			}
+		}
+
+		.time {
+			font-size: $font-size-tag;
+			background: #f8f8f8;
+			padding: 10rpx 20rpx;
+			border-radius: 6rpx;
+			margin-top: 20rpx;
+
+			text {
+				line-height: 42rpx;
+				color: $color-tip;
+			}
+		}
+
+		.evaluation-reply {
+			margin-top: 10rpx;
+			font-size: $font-size-tag;
+		}
+
+		.review-evaluation {
+			margin-top: 29rpx;
+			font-size: $font-size-base;
+			line-height: 1;
+
+			.review-time {
+				overflow: hidden;
+				float: right;
+			}
+
+			& + .cont {
+				margin: 18rpx 0 0;
+			}
+		}
+	}
+}
+
+.shop-reply {
+	font-size: $font-size-base;
+	color: #000;
+	line-height: 1;
+
+	& + .cont {
+		margin-top: 10rpx !important;
+	}
+}
+
+.shop-reply-box {
+	padding: 20rpx !important;
+}
+</style>
diff --git a/pages_tool/goods/not_exist.vue b/pages_tool/goods/not_exist.vue
new file mode 100644
index 0000000..0dc8b4a
--- /dev/null
+++ b/pages_tool/goods/not_exist.vue
@@ -0,0 +1,43 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view class="page">
+		<view class="closeBox">
+			<image :src="$util.img('public/uniapp/goods/not_exist.png')" mode="widthFix"></image>
+			<text class="close-title">您查看的商品不存在，可能已下架或被删除</text>
+		</view>
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {};
+	},
+	onShow() {},
+	methods: {}
+};
+</script>
+
+<style lang="scss">
+.page{
+	height: 100vh;
+	overflow: hidden;
+}
+.closeBox {
+	width: 100%;
+	display: flex;
+	flex-direction: column;
+	justify-content: center;
+	align-items: center;
+	margin-top: 260rpx;
+}
+image {
+	width: 400rpx;
+}
+.close-title {
+	font-size: $font-size-base;
+	color: $color-tip;
+	margin: 55rpx;
+	letter-spacing: 4rpx;
+}
+</style>
diff --git a/pages_tool/goods/search.vue b/pages_tool/goods/search.vue
new file mode 100644
index 0000000..72bcd9c
--- /dev/null
+++ b/pages_tool/goods/search.vue
@@ -0,0 +1,342 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view>
+		<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 : ''" />
+					<text class="iconfont icon-sousuo3" @click="search()"></text>
+				</view>
+			</view>
+			<view class="search-content">
+				<!-- 历史搜索 -->
+				<view class="history" v-if="historyList.length">
+					<view class="history-box">
+						<view class="history-top">
+							<view class="title">历史搜索</view>
+							<view class="icon iconfont icon-icon7" @click="deleteHistoryList"></view>
+						</view>
+						<view class="history-bottom " id="history-list" :style="{ maxHeight: !isAllHistory ? '100%' : '168rpx' }">
+							<view class="history-li" v-for="(item, index) in historyList" :key="index" @click="otherSearch(item)">
+								<view>{{ item }}</view>
+							</view>
+							<view class="history-li history_more" v-if="isAllHistory" @click="isAllHistory = false">
+								<view><text class="iconfont icon-iconangledown"></text></view>
+							</view>
+						</view>
+					</view>
+				</view>
+
+				<!-- 热门搜索 -->
+				<view class="history" v-if="hotList.length">
+					<view class="history-box">
+						<view class="history-top">
+							<view class="title">热门搜索</view>
+						</view>
+						<view class="history-bottom">
+							<view class="history-li" v-for="(item, index) in hotList" :key="index" @click="otherSearch(item)" @longtap="deleteItem(item)">
+								<view>{{ item }}</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				inputValue: '', //搜索框的值
+				historyList: [], //历史搜索记录
+				searchList: [], //搜索发现列表
+				alikeList: [],
+				isIndex: false,
+				searchWords: '',
+				hotList: [],
+				isAllHistory: false
+			};
+		},
+		onLoad(options) {
+			if (options.keyword) this.inputValue = options.keyword;
+			uni.getStorageSync('search') ? '' : uni.setStorageSync('search', []);
+		},
+		onShow() {
+			this.findHistoryList();
+			this.defaultSearch();
+			this.findHotList();
+			this.$nextTick(function() {
+				this.getHistoryHeight();
+			});
+		},
+		methods: {
+			//获取历史搜索记录
+			findHistoryList() {
+				this.historyList = uni.getStorageSync('search').reverse();
+			},
+			//删除所有历史记录
+			deleteHistoryList() {
+				uni.showModal({
+					title: '提示',
+					content: '确认删除全部历史记录？',
+					success: res => {
+						if (res.confirm) {
+							uni.setStorageSync('search', []);
+							this.findHistoryList();
+						}
+					}
+				});
+			},
+			//删除历史记录的某一项
+			deleteItem(e) {
+				uni.showModal({
+					title: '提示',
+					content: '确认删除该条历史记录？',
+					success: res => {
+						if (res.confirm) {
+							let array = uni.getStorageSync('search');
+							let newArr = array.filter(v => {
+								return v != e;
+							});
+							uni.setStorageSync('search', newArr);
+							this.findHistoryList();
+						}
+					}
+				});
+			},
+			// 获取默认搜素
+			defaultSearch() {
+				this.$api.sendRequest({
+					url: '/api/goods/defaultSearchWords',
+					success: res => {
+						this.searchWords = res.data.words;
+					}
+				});
+			},
+			// 获取热门搜素
+			findHotList() {
+				this.$api.sendRequest({
+					url: '/api/goods/hotSearchWords',
+					success: res => {
+						if (res.data.words != '') {
+							this.hotList = res.data.words.split(',');
+						}
+					}
+				});
+			},
+			//input框获取焦点事件
+			inputFocus(e) {
+				if (this.inputValue.trim() != '') this.dataList = [];
+			},
+			//点击其他列表搜索
+			otherSearch(e) {
+				this.inputValue = e;
+				this.search();
+			},
+			//搜索
+			search() {
+
+				if (this.inputValue.trim() != '') {
+
+					// 对历史搜索处理,判断有无,最近搜索显示在最前
+					let historyList = uni.getStorageSync('search');
+					let array = [];
+					if (historyList.length) {
+						array = historyList.filter(v => {
+							return v != this.inputValue.trim();
+						});
+						array.push(this.inputValue.trim());
+					} else {
+						array.push(this.inputValue.trim());
+					}
+					uni.setStorageSync('search', array);
+
+					this.$util.redirectTo('/pages/goods/list', {
+						keyword: this.inputValue.trim()
+					});
+				} else {
+					if (this.searchWords == '') {
+						this.$util.showToast({
+							title: '搜索内容不能为空哦'
+						});
+					} else {
+						this.$util.redirectTo('/pages/goods/list', {
+							//keyword: this.searchWords
+						});
+					}
+				}
+			},
+			// 获取元素高度
+			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();
+			}
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	/deep/ .fixed {
+		position: relative;
+		top: 0;
+	}
+
+	/deep/ .empty {
+		margin-top: 0 !important;
+	}
+
+	.cart-empty {
+		padding-top: 54px;
+	}
+
+	.content {
+		// overflow: hidden;
+		width: 100vw;
+		/* #ifdef MP */
+		height: 100vh;
+		/* #endif */
+		/* #ifdef H5 */
+		height: calc(100vh - env(safe-area-inset-bottom) - var(--status-bar-height));
+		/* #endif */
+		/* #ifdef APP-PLUS */
+		height: calc(100vh - 44px - env(safe-area-inset-bottom));
+		/* #endif */
+		background: #ffffff;
+	}
+
+	.cate-search {
+		width: 100%;
+		background: #ffffff;
+		padding: 10rpx 30rpx;
+		box-sizing: border-box;
+		/* #ifdef H5 */
+		padding-top: 30rpx;
+		/* #endif */
+
+		input {
+			font-size: $font-size-base;
+			height: 100%;
+			padding: 0 25rpx 0 30rpx;
+			width: calc(100% - 120rpx);
+		}
+
+		text {
+			font-size: 32rpx;
+			color: $color-tip;
+			width: 120rpx;
+			text-align: center;
+		}
+
+		.search-box {
+			width: 100%;
+			height: 64rpx;
+			background: $color-bg;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			border-radius: 40rpx;
+		}
+	}
+
+	.search-content {
+		box-sizing: border-box;
+		background: #ffffff;
+	}
+
+	.history {
+		width: 100%;
+		box-sizing: border-box;
+
+		.history-box {
+			width: 100%;
+			height: 100%;
+			background: #ffffff;
+			padding: 30rpx 30rpx 0rpx 30rpx;
+
+			box-sizing: border-box;
+			overflow: hidden;
+
+			.history-top {
+				width: 100%;
+				height: 60rpx;
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				font-size: $font-size-toolbar;
+
+				.title {
+					font-weight: 500;
+					font-size: $font-size-toolbar;
+				}
+
+				.iconfont {
+					color: $color-tip;
+					font-size: $font-size-base;
+				}
+			}
+
+			.history-bottom {
+				width: 100%;
+				padding-top: $padding;
+				position: relative;
+
+				.history-li {
+					display: inline-block;
+					margin-right: 20rpx;
+					margin-bottom: 15rpx;
+					max-width: 100%;
+
+					view {
+						line-height: 66rpx;
+						background: #f8f8f8 !important;
+						height: 66rpx;
+						color: #303133 !important;
+						margin: 0 0rpx 4rpx 0 !important;
+						padding: 0 $padding;
+						overflow: hidden;
+						white-space: nowrap;
+						text-overflow: ellipsis;
+						border-radius: 20rpx;
+					}
+
+					&.history_more {
+						margin-right: 0;
+						position: absolute;
+						bottom: 0;
+						right: 0;
+					}
+				}
+			}
+		}
+
+		.hidden-show {
+			width: 100%;
+			height: 70rpx;
+			text-align: center;
+			line-height: 70rpx;
+		}
+	}
+
+	.search-alike {
+		width: 100%;
+		height: calc(100vh - 100rpx);
+
+		padding: 0 $padding;
+		box-sizing: border-box;
+
+		.alike-box {
+			width: 100%;
+			height: 100%;
+			background: #ffffff;
+			border-radius: $padding;
+			overflow: hidden;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages_tool/help/detail.vue b/pages_tool/help/detail.vue
new file mode 100644
index 0000000..4eabe01
--- /dev/null
+++ b/pages_tool/help/detail.vue
@@ -0,0 +1,141 @@
+<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;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages_tool/help/list.vue b/pages_tool/help/list.vue
new file mode 100644
index 0000000..77efc6c
--- /dev/null
+++ b/pages_tool/help/list.vue
@@ -0,0 +1,135 @@
+<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>
diff --git a/pages_tool/index/diy.vue b/pages_tool/index/diy.vue
new file mode 100644
index 0000000..ca7371e
--- /dev/null
+++ b/pages_tool/index/diy.vue
@@ -0,0 +1,95 @@
+<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>
+
+		<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 class="page-bottom" v-if="openBottomNav">
+			<diy-bottom-nav @callback="callback" :name="name"/>
+		</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>
+
+		<!-- #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 microPageJs from './public/js/diy.js';
+
+	export default {
+		components: {
+			uniPopup,
+			nsNavbar
+		},
+		mixins: [diyJs, microPageJs]
+	};
+</script>
+
+<style lang="scss">
+	@import '@/common/css/diy.scss';
+</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;
+	}
+
+	/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/index/public/js/diy.js b/pages_tool/index/public/js/diy.js
new file mode 100644
index 0000000..c5db99d
--- /dev/null
+++ b/pages_tool/index/public/js/diy.js
@@ -0,0 +1,12 @@
+export default {
+	data() {
+		return {
+			diyRoute: '/pages_tool/index/diy'
+		};
+	},
+	onLoad(option) {
+	},
+	onShow() {
+	},
+	methods: {},
+}
diff --git a/pages_tool/login/find.vue b/pages_tool/login/find.vue
new file mode 100644
index 0000000..ab04b00
--- /dev/null
+++ b/pages_tool/login/find.vue
@@ -0,0 +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>
diff --git a/pages_tool/login/login.vue b/pages_tool/login/login.vue
new file mode 100644
index 0000000..175c51e
--- /dev/null
+++ b/pages_tool/login/login.vue
@@ -0,0 +1,484 @@
+<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;
+	}
+</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
new file mode 100644
index 0000000..3977688
--- /dev/null
+++ b/pages_tool/login/public/css/common.scss
@@ -0,0 +1,209 @@
+/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%;
+}
diff --git a/pages_tool/member/account.vue b/pages_tool/member/account.vue
new file mode 100644
index 0000000..0d3a084
--- /dev/null
+++ b/pages_tool/member/account.vue
@@ -0,0 +1,449 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view>
+		<mescroll-uni ref="mescroll" @getData="getData" v-if="storeToken">
+			<block slot="list">
+				<view class="nc-info-list-content">
+					<view class="list-item balance-item" @click="setBalanceDefault()" v-if="type=='fenxiao' && payList && payList.balance">
+						<view class="item-top">
+							<view class="item-left">
+								<view class="title-text">提现到余额</view>
+							</view>
+						</view>
+					</view>
+					<block v-if="dataList.length > 0">
+						<view class="list-item" v-for="(item, index) in dataList" :key="index">
+							<view class="item-top">
+								<view class="item-left">
+									<view class="title-text">{{ item.withdraw_type_name }}</view>
+									<view class="info-content">
+										<text class="top-title">{{ item.realname }}</text>
+										<text class="top-num">{{ item.mobile }}</text>
+									</view>
+									<view class="content-bottom">
+										<block v-if="item.withdraw_type == 'alipay'">
+											提现账号：{{ item.bank_account }}
+										</block>
+										<block v-if="item.withdraw_type == 'bank'">
+											银行名称 ：{{ item.branch_bank_name }}
+										</block>
+									</view>
+								</view>
+								<view class="item-btn" @click.stop="editAccount('edit', item.id)">修改</view>
+							</view>
+
+							<view class="item-bottom">
+								<view class="account-default" @click="setDefault(item.id,item.is_default)">
+									<text class="default">设为默认账户</text>
+									<switch v-if="item.is_default == 1" checked disabled style="transform:scale(0.7)" :color="themeStyle.main_color" />
+									<switch v-else style="transform:scale(0.7)" :color="themeStyle.main_color" />
+								</view>
+								<view class="account-btn">
+									<text class="delete" v-if="item.is_default != 1" @click="deleteAccount(item.id)">
+										<text class="iconfont iconicon7"></text>
+									</text>
+								</view>
+							</view>
+						</view>
+					</block>
+				</view>
+				<view v-if="dataList.length <= 0 && (type != 'fenxiao'  || (type == 'fenxiao' && payList && !payList.balance))" class="empty-box">
+					<image :src="$util.img('public/uniapp/member/account/empty.png')" mode="widthFix"></image>
+					<view class="tips">暂无账户信息，请添加</view>
+					<button type="primary" class="add-account" @click="editAccount('add')">{{ $lang('newAddAccount') }}</button>
+				</view>
+			</block>
+		</mescroll-uni>
+		<view class="btn-add" v-if="dataList.length > 0 || (type == 'fenxiao' && payList && payList.balance)">
+			<button class="add-account" type="primary" @click="editAccount('add')">{{ $lang('newAddAccount') }}</button>
+		</view>
+		<loading-cover ref="loadingCover"></loading-cover>
+		<ns-login ref="login"></ns-login>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				dataList: [], //账号列表
+				back: '', // 返回页
+				redirect: 'redirectTo', // 跳转方式
+				type: 'member',
+				payList: null
+			};
+		},
+		onLoad(option) {
+			if (option.back) this.back = option.back;
+			if (option.type) this.type = option.type;
+			if (option.redirect) this.redirect = option.redirect;
+		},
+		onShow() {
+			if (this.storeToken) {
+				this.getTransferType();
+				if (this.$refs.mescroll) this.$refs.mescroll.refresh();
+			} else {
+				this.$nextTick(() => {
+					this.$refs.login.open('/pages_tool/member/account');
+				});
+			}
+		},
+		methods: {
+			// 编辑提现账户信息
+			editAccount(type, id) {
+				let data = {};
+				data.type = this.type;
+				if (type == 'edit') data.id = id;
+				if (this.back) data.back = this.back;
+				this.$util.redirectTo('/pages_tool/member/account_edit', data);
+			},
+			deleteAccount(id) {
+				uni.showModal({
+					title: '操作提示',
+					content: '确定要删除该账户吗？',
+					success: res => {
+						if (res.confirm) {
+							this.$api.sendRequest({
+								url: '/api/memberbankaccount/delete',
+								data: {
+									id: id
+								},
+								success: result => {
+									if (result.code == 0) {
+										this.$util.showToast({
+											title: '删除成功'
+										});
+										this.$refs.mescroll.refresh();
+									} else {
+										this.$util.showToast({
+											title: '删除失败'
+										});
+									}
+								}
+							});
+						}
+					}
+				});
+			},
+			setDefault(id, is_default) {
+				if (is_default == 1) return;
+				this.$api.sendRequest({
+					url: '/api/memberbankaccount/setdefault',
+					data: {
+						id
+					},
+					success: res => {
+						if (res.data >= 0) {
+							if (this.back != '') {
+								this.$util.redirectTo(this.back, {}, this.redirect);
+							} else {
+								if (this.$refs.loadingCover) this.$refs.loadingCover.show();
+								this.dataList = [];
+								this.$refs.mescroll.refresh();
+							}
+						} else {
+							this.$util.showToast({
+								title: res.message
+							});
+						}
+					}
+				});
+			},
+			setBalanceDefault() {
+				this.$util.redirectTo(this.back, {
+					'is_balance': 1
+				}, this.redirect);
+			},
+			getData(mescroll) {
+				this.$api.sendRequest({
+					url: '/api/memberbankaccount/page',
+					data: {
+						page_size: mescroll.size,
+						page: mescroll.num
+					},
+					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 = []; //如果是第一页需手动制空列表
+						this.dataList = this.dataList.concat(newArr); //追加新数据
+
+						let withdrawType = {
+							bank: '银行',
+							alipay: '支付宝',
+							wechatpay: '微信'
+						};
+
+						this.dataList.forEach(item => {
+							item.withdraw_type_name = withdrawType[item.withdraw_type] ? withdrawType[
+								item.withdraw_type] : '';
+						});
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					},
+					fail: res => {
+						mescroll.endErr();
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					}
+				});
+			},
+			getTransferType() {
+				let url = this.type == "member" ? "/api/memberwithdraw/transferType" :
+				"/fenxiao/api/withdraw/transferType";
+				this.$api.sendRequest({
+					url: url,
+					success: res => {
+						if (res.code >= 0 && res.data) {
+							this.payList = res.data;
+						}
+					}
+				});
+			}
+		},
+		watch: {
+			storeToken: function(nVal, oVal) {
+				if (nVal) {
+					this.$refs.mescroll.refresh();
+				}
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	.empty-box {
+		width: 100vw;
+		height: 100vh;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+
+		image {
+			width: 50%;
+		}
+
+		.tips {
+			color: #999999;
+			font-size: 26rpx;
+		}
+
+		.get-account,
+		.add-account {
+			width: 50%;
+			height: 78rpx;
+			line-height: 78rpx;
+			border-radius: 78rpx;
+			margin-top: 50rpx;
+			font-weight: 600;
+		}
+
+		.get-account {
+			width: 50%;
+			background: #fff;
+			color: $base-color;
+			border: 2rpx solid $base-color;
+			margin-top: 20rpx;
+			box-sizing: border-box;
+		}
+	}
+
+	.mescroll-downwarp+.empty-box {
+		height: calc(100vh - 260rpx);
+	}
+
+
+	.btn-add {
+		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;
+
+		.add-account {
+			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;
+			}
+		}
+	}
+
+	.zw {
+		margin-top: 250rpx;
+	}
+
+	.list-item {
+		margin: 0 0;
+		padding: 24rpx $margin-both;
+		box-sizing: border-box;
+		display: flex;
+		flex-direction: column;
+		background-color: #fff;
+		margin-bottom: 18rpx;
+		border-radius: 10rpx;
+		overflow: hidden;
+		position: relative;
+
+		&.balance-item {
+			.item-top {
+				border: none;
+				padding: 0;
+			}
+		}
+
+		&:first-child {
+			margin-top: 18rpx;
+		}
+
+		.item-mr {
+			font-size: $font-size-activity-tag;
+			color: #fff;
+			height: 150rpx;
+			width: 150rpx;
+			display: flex;
+			align-items: flex-end;
+			justify-content: center;
+			position: absolute;
+			right: -90rpx;
+			top: -90rpx;
+			transform: rotate(45deg);
+		}
+
+		.item-top {
+			border-bottom: 2rpx solid $color-line;
+			padding-bottom: 26rpx;
+			display: flex;
+			flex-direction: row;
+
+			.item-left {
+				display: flex;
+				flex-direction: column;
+				width: calc(100% - 100rpx);
+
+				.title-text {
+					font-size: 30rpx;
+					font-weight: bold;
+				}
+
+				.info-content {
+					display: flex;
+
+					.top-title {
+						font-size: 26rpx;
+						margin-right: 15rpx;
+					}
+
+					.top-num {
+						font-size: 26rpx;
+					}
+				}
+
+				.content-bottom {
+					font-size: 26rpx;
+					height: 50rpx;
+				}
+			}
+
+			.item-btn {
+				width: 100rpx;
+				display: flex;
+				align-items: center;
+				color: #999;
+				font-size: 24rpx;
+				justify-content: flex-end;
+			}
+
+		}
+
+		.item-bottom {
+			display: flex;
+			justify-content: space-between;
+			padding-top: 24rpx;
+
+			.account-default {
+				display: flex;
+				align-items: center;
+				font-size: 24rpx;
+				line-height: 1;
+				color: #666666;
+
+				.default {}
+
+				.iconfont {
+					line-height: 1;
+				}
+			}
+
+			.account-btn {
+				font-size: $font-size-base;
+				line-height: 1;
+				display: flex;
+				align-items: center;
+
+				.edit {
+					text {
+						vertical-align: center;
+						margin-right: 10rpx;
+						font-size: 30rpx;
+					}
+				}
+
+				.delete {
+					background: #F1F1F1;
+					justify-content: center;
+					align-items: center;
+					border-radius: 50%;
+					padding: 10rpx;
+					text-align: center;
+					width: 48rpx;
+					height: 48rpx;
+					box-sizing: border-box;
+
+					text {
+						font-size: 26rpx;
+					}
+				}
+			}
+		}
+	}
+</style>
+<style>
+	/deep/ .mescroll-upwarp {
+		padding-bottom: 150rpx;
+	}
+</style>
+<style>
+	.item-bottom>>>.uni-switch-wrapper .uni-switch-input {
+		height: 48rpx !important;
+		width: 88rpx !important;
+	}
+
+	.item-bottom>>>.uni-switch-wrapper .uni-switch-input:after {
+		height: 44rpx !important;
+		width: 44rpx !important;
+	}
+
+	.item-bottom>>>.uni-switch-wrapper .uni-switch-input:before {
+		background-color: #EDEDED !important;
+		height: 44rpx !important;
+		width: 90rpx !important;
+	}
+</style>
\ No newline at end of file
diff --git a/pages_tool/member/account_edit.vue b/pages_tool/member/account_edit.vue
new file mode 100644
index 0000000..1ff5f5a
--- /dev/null
+++ b/pages_tool/member/account_edit.vue
@@ -0,0 +1,324 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view class="account-list-content">
+		<view class="edit-item">
+			<text class="tit">{{ $lang('name') }}</text>
+			<input class="desc uni-input" type="text" maxlength="30" placeholder="请输入真实姓名" name="name" v-model="formData.realname" />
+		</view>
+		<view class="edit-item">
+			<text class="tit">{{ $lang('mobilePhone') }}</text>
+			<input class="desc uni-input" type="number" maxlength="11" placeholder="请输入手机号" v-model="formData.mobile" />
+		</view>
+		<view class="edit-item">
+			<text class="tit">{{ $lang('accountType') }}</text>
+			<picker @change="bindPickerChange" :value="index" :range="payList" class="picker">
+				<text class="desc uni-input">{{ payList[index] }}</text>
+				<text class="iconfont icon-right"></text>
+			</picker>
+		</view>
+		<view class="edit-item" v-if="formData.withdraw_type == 'bank'">
+			<text class="tit">银行名称</text>
+			<input class="desc uni-input" type="text" maxlength="50" placeholder="请输入银行名称" v-model.trim="formData.branch_bank_name" />
+		</view>
+		<view class="edit-item" v-if="formData.withdraw_type != 'wechatpay'">
+			<text class="tit">提现账号</text>
+			<input class="desc uni-input" type="text" maxlength="30" placeholder="请输入提现账号" v-model.trim="formData.bank_account" />
+		</view>
+		<view class="btn">
+			<button type="primary" class="add" @click="saveAccount">{{ $lang('save') }}</button>
+		</view>
+		<loading-cover ref="loadingCover"></loading-cover>
+	</view>
+</template>
+
+<script>
+import validate from 'common/js/validate.js';
+export default {
+	data() {
+		return {
+			formData: {
+				realname: '',
+				mobile: '',
+				withdraw_type: '',
+				bank_account: '',
+				branch_bank_name: ''
+			},
+			payList: [],
+			index: 0,
+			flag: false,
+			transferType: [],
+			accountInfo: null,
+			back: '',
+			type: 'member'
+		};
+	},
+	onLoad(option) {
+		if (option.id) this.formData.id = option.id;
+		if (option.back) this.back = option.back;
+		if (option.type) this.type = option.type; // 区分是从会员提现还是从分销提现
+	},
+	onShow() {
+		if (this.formData.id) {
+			this.getAccountDetail(this.formData.id);
+		} else {
+			this.getTransferType();
+		}
+		if (this.formData.id) {
+			uni.setNavigationBarTitle({
+				title: '编辑账户'
+			});
+		} else {
+			uni.setNavigationBarTitle({
+				title: '新增账户'
+			});
+		}
+	},
+	methods: {
+		getAccountDetail(id) {
+			this.$api.sendRequest({
+				url: '/api/memberbankaccount/info',
+				data: {
+					id: this.formData.id
+				},
+				success: res => {
+					if (res.code == 0 && res.data) {
+						this.accountInfo = res.data;
+						this.formData.realname = res.data.realname;
+						this.formData.mobile = res.data.mobile;
+						this.formData.bank_account = res.data.bank_account;
+						this.formData.branch_bank_name = res.data.branch_bank_name;
+						this.formData.withdraw_type = res.data.withdraw_type;
+					}
+					this.getTransferType();
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				},
+				fail: res => {
+					this.getTransferType();
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				}
+			});
+		},
+		/**
+		 * 获取转账方式
+		 */
+		getTransferType() {
+			this.payList = [];
+			let url = this.type == "member" ? "/api/memberwithdraw/transferType" : "/fenxiao/api/withdraw/transferType";
+			this.$api.sendRequest({
+				url: url,
+				success: res => {
+					if (res.code >= 0 && res.data) {
+						delete res.data.balance;
+						this.transferType = res.data;
+						for (let v in this.transferType) {
+							this.payList.push(this.transferType[v]);
+						}
+
+						if (this.payList.length == 1 && this.payList[0] == '银行卡') {
+							this.formData.withdraw_type = 'bank';
+						}
+
+						this.payList.reverse();
+						if (!this.formData.id && this.$refs.loadingCover) this.$refs.loadingCover.hide();
+
+						if (this.accountInfo && this.$util.inArray(this.accountInfo.withdraw_type_name, this.payList) == -1) {
+							this.payList.push(this.accountInfo.withdraw_type_name);
+						}
+
+						if (this.payList.length && this.accountInfo) {
+							this.index = this.$util.inArray(this.accountInfo.withdraw_type_name, this.payList);
+						}
+
+						if (!this.formData.withdraw_type && this.payList.length) {
+							switch (this.payList[0]) {
+								case '银行卡':
+									this.formData.withdraw_type = 'bank';
+									break;
+								case '支付宝':
+									this.formData.withdraw_type = 'alipay';
+									break;
+								case '微信零钱':
+									this.formData.withdraw_type = 'wechatpay';
+									break;
+							}
+						}
+					}
+				}
+			});
+		},
+		bindPickerChange(e) {
+			this.index = e.detail.value;
+			let value = '';
+			for (let i in this.transferType) {
+				if (this.transferType[i] == this.payList[this.index]) {
+					value = i;
+				}
+			}
+			if (value != '') this.formData.withdraw_type = value;
+		},
+		vertify() {
+			var rule = [
+				{
+					name: 'realname',
+					checkType: 'required',
+					errorMsg: '请输入姓名'
+				},
+				{
+					name: 'mobile',
+					checkType: 'required',
+					errorMsg: '请输入手机号'
+				},
+				{
+					name: 'mobile',
+					checkType: 'phoneno',
+					errorMsg: '请输入正确的手机号'
+				},
+				{
+					name: 'withdraw_type',
+					checkType: 'required',
+					errorMsg: '请选择账户类型'
+				}
+			];
+			if (this.formData.withdraw_type == 'bank') {
+				rule.push({
+					name: 'branch_bank_name',
+					checkType: 'required',
+					errorMsg: '请输入银行名称'
+				});
+			}
+			if (this.formData.withdraw_type != 'wechatpay') {
+				rule.push({
+					name: 'bank_account',
+					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;
+			}
+		},
+		saveAccount() {
+			if (this.flag) return;
+			this.flag = true;
+			if (this.vertify()) {
+				let url = !this.formData.id ? 'add' : 'edit';
+				let data = {};
+				this.$api.sendRequest({
+					url: '/api/memberbankaccount/' + url,
+					data: {
+						id: this.formData.id,
+						realname: this.formData.realname,
+						mobile: this.formData.mobile,
+						withdraw_type: this.formData.withdraw_type,
+						bank_account: this.formData.bank_account,
+						branch_bank_name: this.formData.branch_bank_name
+					},
+					success: res => {
+						if (res.code == 0) {
+							if (!this.formData.id) {
+								this.$util.showToast({
+									title: '添加成功'
+								});
+							} else {
+								this.$util.showToast({
+									title: '修改成功'
+								});
+							}
+							if (this.back != '') {
+								this.$util.redirectTo(this.back, {}, this.redirect);
+							} else {
+								this.$util.redirectTo('/pages_tool/member/account');
+							}
+						} else {
+							this.flag = false;
+							this.$util.showToast({
+								title: res.message
+							});
+						}
+					},
+					fail: res => {
+						this.flag = false;
+					}
+				});
+			}
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+.account-list-content {
+	margin: $margin-updown $margin-both;
+	padding: 0 30rpx;
+	background-color: #fff;
+	border-radius: $border-radius;
+
+	.edit-item {
+		display: flex;
+		align-items: center;
+		padding: 30rpx 0;
+		background-color: #fff;
+
+		.tit {
+			width: 120rpx;
+		}
+
+		.desc {
+			flex: 1;
+			margin-left: 20rpx;
+			padding: 0;
+		}
+
+		&:first-of-type {
+			margin-top: $uni-spacing-row-base;
+		}
+
+		.picker {
+			flex: 1;
+
+			text {
+				&:last-child {
+					line-height: 50rpx;
+					float: right;
+					color: $color-tip;
+					font-size: $font-size-activity-tag;
+				}
+			}
+		}
+	}
+}
+
+.account-list-content > .edit-item + .edit-item {
+	border-top: 2rpx solid $color-line;
+}
+
+.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;
+	left: 0;
+	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>
diff --git a/pages_tool/member/address.vue b/pages_tool/member/address.vue
new file mode 100644
index 0000000..d3cfae4
--- /dev/null
+++ b/pages_tool/member/address.vue
@@ -0,0 +1,599 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view>
+		<mescroll-uni ref="mescroll" @getData="getListData" v-if="storeToken">
+			<block slot="list">
+				<view class="address-list">
+					<template v-if="addressList.length !== 0">
+						<view class="address-item" v-for="(item, index) in addressList" :key="index">
+							<view class="address-item-top" v-if="localType == 2 && item.local_data">
+								<view class="address-item-left">
+									<view class="address-top-info">
+										<view class="address-name">{{ item.name }}</view>
+										<view class="address-tel">{{ item.mobile }}</view>
+										<view class="address-status" v-if="localType == 2 && item.local_data">{{ item.local_data }}</view>
+									</view>
+									<view class="address-info">{{ item.full_address }}{{ item.address }}</view>
+								</view>
+								<view class="address-item-edit" @click="addAddress('edit', item.id)">
+									{{ $lang('modify') }}
+								</view>
+							</view>
+
+							<view class="address-item-top" v-else @click="setDefault(item.id)">
+								<view class="address-item-left">
+									<view class="address-top-info">
+										<view class="address-name">{{ item.name }}</view>
+										<view class="address-tel">{{ item.mobile }}</view>
+									</view>
+									<view class="address-info">{{ item.full_address }}{{ item.address }}</view>
+								</view>
+								<view class="address-item-edit" @click.stop="addAddress('edit', item.id)">
+									{{ $lang('modify') }}
+								</view>
+							</view>
+
+							<view class="address-item-bottom">
+								<view class="address-default" @click="setDefault(item.id,item.is_default)">
+									<text class="default" v-if="localType == 2 && item.local_data">设为默认地址</text>
+									<text class="default" v-else>设为默认地址</text>
+									<switch v-if="item.is_default == 1" checked disabled style="transform:scale(0.7)" :color="themeStyle.main_color" />
+									<switch v-else style="transform:scale(0.7)" :color="themeStyle.main_color" />
+								</view>
+								<view class="address-btn">
+									<text class="delete" v-if="item.is_default != 1" @click="deleteAddress(item.id, item.is_default)">
+										<text class="iconfont icon-icon7"></text>
+									</text>
+								</view>
+							</view>
+						</view>
+
+					</template>
+
+					<view v-if="addressList.length == 0 && showEmpty" class="empty-box">
+						<image :src="$util.img('public/uniapp/member/address/empty.png')" mode="widthFix"/>
+						<view class="tips">暂无收货地址，请添加</view>
+
+						<button type="primary" class="add-address" @click="addAddress('add')">{{ $lang('newAddAddress') }}</button>
+
+						<!-- #ifdef H5 -->
+						<button type="primary" class="get-address" @click="getChooseAddress()" v-if="$util.isWeiXin() && local != 1">{{ $lang('getAddress') }}</button>
+						<!-- #endif -->
+						<!-- #ifdef MP-WEIXIN || MP-BAIDU || MP-TOUTIAO -->
+						<button type="primary" class="get-address" @click="getChooseAddress()" v-if="local != 1">{{ $lang('getAddress') }}</button>
+						<!-- #endif -->
+					</view>
+				</view>
+			</block>
+		</mescroll-uni>
+
+		<view class="btn-add" v-if="addressList.length !== 0">
+			<!-- #ifdef MP-WEIXIN -->
+			<view class="wx-add" @click="getChooseAddress()" v-if="local != 1">
+				<text>{{ $lang('getAddress') }}</text>
+			</view>
+			<!-- #endif -->
+			<!-- #ifdef H5 -->
+			<button type="primary" class="add-address" @click="getChooseAddress()" v-if="$util.isWeiXin() && local != 1">{{ $lang('getAddress') }}</button>
+			<!-- #endif -->
+			<button type="primary" class="add-address" @click="addAddress('add')">
+				<text class="iconfont icon-add1"></text>
+				{{ $lang('newAddAddress') }}
+			</button>
+		</view>
+
+		<ns-login ref="login"></ns-login>
+		<loading-cover ref="loadingCover"></loading-cover>
+	</view>
+</template>
+
+<script>
+	import {
+		Weixin
+	} from 'common/js/wx-jssdk.js';
+
+	export default {
+		data() {
+			return {
+				addressList: [],
+				back: '', // 返回页
+				redirect: 'redirectTo', // 跳转方式
+				isIndex: false,
+				showEmpty: false,
+				local: 0, //定位是否显示
+				localType: 1,
+			};
+		},
+		onLoad(option) {
+			if (option.back) {
+				this.back = option.back;
+				uni.setStorageSync('addressBack', option.back);
+			} else {
+				if (uni.getStorageSync('addressBack')) {
+					this.back = uni.getStorageSync('addressBack');
+					uni.removeStorageSync('addressBack');
+				}
+			}
+			if (option.redirect) this.redirect = option.redirect;
+			if (option.local) this.local = option.local;
+			if (option.type) this.localType = option.type;
+		},
+		onShow() {
+			uni.removeStorageSync('addressInfo');
+
+			if (this.storeToken) {
+				if (this.$refs.mescroll) this.$refs.mescroll.refresh();
+			} else {
+				this.$nextTick(() => {
+					this.$refs.login.open('/pages_tool/member/address');
+				});
+			}
+		},
+		methods: {
+			getListData(mescroll) {
+				let storeId = 0;
+				let delivery = uni.getStorageSync('delivery');
+				if (delivery && delivery.delivery_type == 'local') {
+					storeId = delivery.store_id || 0;
+				}
+				this.showEmpty = false;
+				this.$api.sendRequest({
+					url: '/api/memberaddress/page',
+					data: {
+						page: mescroll.num,
+						page_size: mescroll.size,
+						type: this.localType,
+						store_id: storeId
+					},
+					success: res => {
+						this.showEmpty = true;
+						let newArr = [];
+						let msg = res.message;
+						if (res.code == 0 && res.data) {
+							newArr = res.data.list;
+						} else {
+							this.$util.showToast({
+								title: msg
+							});
+						}
+						mescroll.endSuccess(newArr.length);
+						//设置列表数据
+						if (mescroll.num == 1) this.addressList = []; //如果是第一页需手动制空列表
+						this.addressList = this.addressList.concat(newArr); //追加新数据
+						this.$forceUpdate();
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					},
+					fail: res => {
+						mescroll.endErr();
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					}
+				});
+			},
+
+			/* 地址跳转 */
+			addAddress(type, id) {
+				let data = {
+					type: this.localType
+				};
+				if (type == 'edit') data.id = id;
+				if (this.back) data.back = this.back;
+
+				this.$util.redirectTo('/pages_tool/member/address_edit', data);
+			},
+			/* 删除地址信息 */
+			deleteAddress(id, is_default) {
+				uni.showModal({
+					title: '操作提示',
+					content: '确定要删除该地址吗？',
+					success: res => {
+						if (res.confirm) {
+							if (is_default == 1) {
+								this.$util.showToast({
+									title: '默认地址，不能删除'
+								});
+								return;
+							}
+							this.$api.sendRequest({
+								url: '/api/memberaddress/delete',
+								data: {
+									id: id
+								},
+								success: res => {
+									if (res.code == 0) {
+										this.$util.showToast({
+											title: '删除成功'
+										});
+									} else {
+										this.$util.showToast({
+											title: '删除失败'
+										});
+									}
+									this.$refs.mescroll.refresh();
+								},
+								fail: res => {
+									mescroll.endErr();
+								}
+							});
+						}
+					}
+				});
+			},
+			setDefault(id, is_default) {
+				if (is_default == 1) return;
+				this.$api.sendRequest({
+					url: '/api/memberaddress/setdefault',
+					data: {
+						id
+					},
+					success: res => {
+						if (res.data > 0) {
+							this.$refs.mescroll.refresh();
+							if (this.back != '') {
+								this.$util.redirectTo(this.back, {}, 'redirectTo');
+							} else {
+								if (this.$refs.loadingCover) this.$refs.loadingCover.show();
+								this.addressList = [];
+								this.$refs.mescroll.refresh();
+								this.$util.showToast({
+									title: '修改默认地址成功'
+								});
+							}
+						} else {
+							this.$util.showToast({
+								title: res.message
+							});
+						}
+					}
+				});
+			},
+			/**
+			 * 一键获取地址
+			 */
+			getChooseAddress() {
+				// #ifdef H5
+				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 => {
+							if (jssdkRes.code == 0) {
+								var wxJS = new Weixin();
+								wxJS.init(jssdkRes.data);
+								wxJS.openAddress(res => {
+									if (res.errMsg == 'openAddress:ok') {
+										this.saveAddress({
+											name: res.userName, // 收货人姓名,
+											mobile: res.telNumber, // 手机号
+											province: res.provinceName, // 省
+											city: res.cityName, // 市
+											district: res.countryName, // 县
+											address: res.detailInfo, // 详细地址
+											full_address: res.provinceName + '-' + res.cityName + '-' + res.countryName,
+											is_default: 1
+										});
+									} else {
+										this.$util.showToast({
+											title: res.errMsg == 'openAddress:function not implement' ? 'PC端微信不支持一键获取地址' : res.errMsg
+										});
+									}
+								});
+							} else {
+								this.$util.showToast({
+									title: jssdkRes.message
+								});
+							}
+						}
+					});
+				}
+				// #endif
+
+				// #ifdef MP-WEIXIN || MP-BAIDU || MP-TOUTIAO
+				uni.chooseAddress({
+					success: res => {
+						if (res.errMsg == 'chooseAddress:ok') {
+							this.saveAddress({
+								name: res.userName, // 收货人姓名,
+								mobile: res.telNumber, // 手机号
+								province: res.provinceName, // 省
+								city: res.cityName, // 市
+								district: res.countyName, // 县
+								address: res.detailInfo, // 详细地址
+								full_address: res.provinceName + '-' + res.cityName + '-' + res.countyName,
+								is_default: 1
+							});
+						} else {
+							this.$util.showToast({
+								title: res.errMsg
+							});
+						}
+					},
+					fail: res => {
+						console.log('fail', res);
+					}
+				});
+				// #endif
+			},
+			/**
+			 * 保存微信地址
+			 * @param {Object} params
+			 */
+			saveAddress(params) {
+				this.$api.sendRequest({
+					url: '/api/memberaddress/addthreeparties',
+					data: params,
+					success: res => {
+						if (res.code >= 0) {
+
+							if (this.back != '') {
+								this.$util.redirectTo(this.back, {}, 'redirectTo');
+							} else {
+								this.$refs.mescroll.refresh();
+							}
+
+						} else {
+							this.$util.showToast({
+								title: res.message
+							});
+						}
+					}
+				});
+			}
+		},
+		watch: {
+			storeToken: function(nVal, oVal) {
+				if (nVal) {
+					this.$refs.mescroll.refresh();
+				}
+			}
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	/deep/ .fixed {
+		position: relative;
+		top: 0;
+	}
+
+	.cart-empty {
+		padding-top: 208rpx !important;
+	}
+
+	.address-list {
+		width: 100%;
+		height: 100%;
+		padding-bottom: 40rpx;
+
+		.local {
+			display: flex;
+			align-items: center;
+			margin: $margin-updown $margin-both;
+			background-color: #fff;
+			padding: 30rpx;
+			border-radius: $border-radius;
+
+			text {
+				margin-right: 10rpx;
+			}
+		}
+
+		.address-item {
+			margin: $padding 0 0;
+			display: flex;
+			flex-direction: column;
+			background-color: #ffffff;
+			padding: 24rpx 30rpx;
+			box-sizing: border-box;
+			border-radius: 0;
+
+			.address-item-top {
+				display: flex;
+				flex-direction: row;
+				border-bottom: 1rpx solid $color-line;
+				justify-content: space-between;
+				align-items: center;
+
+				.address-item-left {
+					display: flex;
+					flex-direction: column;
+					width: calc(100% - 100rpx);
+				}
+
+				.address-item-edit {
+					color: #999;
+					font-size: 24rpx;
+					width: 100rpx;
+					text-align: right;
+				}
+
+				.address-top-info {
+					display: flex;
+					justify-content: flex-start;
+					position: relative;
+
+					.address-name {
+						color: #333333;
+						font-size: 30rpx;
+						font-weight: bold;
+					}
+
+					.address-tel {
+						color: #333333;
+						font-size: 30rpx;
+						margin-left: 26rpx;
+						font-weight: bold;
+					}
+
+					.address-status {
+						color: #f00;
+						font-size: $font-size-base;
+						position: absolute;
+						right: 0;
+					}
+				}
+
+				.address-info {
+					font-size: 26rpx;
+					color: #888888;
+					margin-top: 10rpx;
+					margin-bottom: 28rpx;
+				}
+			}
+
+			.address-item-bottom {
+				display: flex;
+				justify-content: space-between;
+				padding-top: 24rpx;
+
+				.address-default {
+					display: flex;
+					align-items: center;
+					font-size: 24rpx;
+					line-height: 1;
+					color: #666666;
+
+					.default {}
+
+					.iconfont {
+						line-height: 1;
+					}
+				}
+
+				.address-btn {
+					font-size: $font-size-base;
+					line-height: 1;
+					display: flex;
+					align-items: center;
+
+					.edit {
+						text {
+							vertical-align: center;
+							margin-right: 10rpx;
+							font-size: 30rpx;
+						}
+					}
+
+					.delete {
+						background: #F1F1F1;
+						justify-content: center;
+						align-items: center;
+						border-radius: 50%;
+						padding: 10rpx;
+						text-align: center;
+						width: 48rpx;
+						height: 48rpx;
+						box-sizing: border-box;
+
+						text {
+							font-size: 26rpx;
+						}
+					}
+				}
+			}
+		}
+	}
+
+	.btn-add {
+		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;
+
+		.add-address {
+			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;
+			}
+		}
+	}
+
+	.wx-add {
+		margin-top: 30rpx;
+		margin-bottom: 30rpx;
+		text-align: center;
+		border-radius: 80rpx;
+		height: 80rpx;
+		line-height: 80rpx;
+		background-color: var(--main-color);
+		border: 2rpx solid var(--main-color);
+		color: #FFFFFF;
+		font-size: $font-size-toolbar;
+	}
+
+	.empty-box {
+		width: 100vw;
+		height: 100vh;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+
+		image {
+			width: 50%;
+		}
+
+		.tips {
+			color: #999999;
+			font-size: 26rpx;
+		}
+
+		.get-address,
+		.add-address {
+			width: 50%;
+			height: 78rpx;
+			line-height: 78rpx;
+			border-radius: 78rpx;
+			margin-top: 50rpx;
+
+			font-size: $font-size-toolbar;
+		}
+
+		.get-address {
+			width: 50%;
+			border: 2rpx solid $base-color;
+			margin-top: 20rpx;
+			box-sizing: border-box;
+		}
+	}
+
+	.mescroll-downwarp+.empty-box {
+		height: calc(100vh - 260rpx);
+	}
+</style>
+<style>
+	.address-item>>>.uni-switch-wrapper .uni-switch-input {
+		height: 48rpx !important;
+		width: 88rpx !important;
+	}
+
+	.address-item>>>.uni-switch-wrapper .uni-switch-input:after {
+		height: 44rpx !important;
+		width: 44rpx !important;
+	}
+
+	.address-item>>>.uni-switch-wrapper .uni-switch-input:before {
+		background-color: #EDEDED !important;
+		height: 44rpx !important;
+		width: 90rpx !important;
+	}
+</style>
\ No newline at end of file
diff --git a/pages_tool/member/address_edit.vue b/pages_tool/member/address_edit.vue
new file mode 100644
index 0000000..4cdfccf
--- /dev/null
+++ b/pages_tool/member/address_edit.vue
@@ -0,0 +1,502 @@
+<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>
+
+                    <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>
+
+            <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>
+
+        <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';
+
+    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 : '';
+            },
+
+            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;
+
+                window.location.href = 'https://apis.map.qq.com/tools/locpicker?search=1&type=0&backurl=' + encodeURIComponent(backurl) + '&key=' + Config.mpKey + '&referer=myapp';
+                // #endif
+            },
+
+            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 = '';
+
+                    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
+                    };
+
+                    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;
+                        }
+                    });
+                }
+            }
+        }
+    };
+</script>
+
+<style lang="scss">
+    /deep/ pick-regions,
+    .pick-regions {
+        flex: 1;
+    }
+
+    .edit-wrap {
+        background: #fff;
+        overflow: hidden;
+
+        .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;
+
+        .text_inp {
+            margin-left: $margin-updown;
+            flex: 1;
+        }
+
+        .tit {
+            width: 148rpx;
+
+            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
new file mode 100644
index 0000000..97b0762
--- /dev/null
+++ b/pages_tool/member/apply_withdrawal.vue
@@ -0,0 +1,426 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view class="container">
+		<view class="bank-account-wrap" @click="goAccount()">
+			<view class="tx-wrap" v-if="bankAccountInfo.withdraw_type">
+				<text class="tx-to">提现到</text>
+				<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>
+				</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>
+				</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>
+				</view>
+			</view>
+			<text class="tx-to" v-else>请添加提现方式</text>
+			<view class="iconfont icon-right"></view>
+		</view>
+		<view class="empty-box"></view>
+		<view class="withdraw-wrap">
+			<view class="withdraw-wrap-title">提现金额</view>
+			<view class="money-wrap">
+				<text class="unit">{{ $lang('common.currencySymbol') }}</text>
+				<input type="digit" class="withdraw-money" v-model="withdrawMoney" />
+				<view class="delete" @click="remove" v-if="withdrawMoney">
+					<image :src="$util.img('public/uniapp/member/apply_withdrawal/close.png')" mode="widthFix"></image>
+				</view>
+			</view>
+			<view class="bootom">
+				<view>
+					<text class="color-tip">可提现余额：{{ $lang('common.currencySymbol') }}{{ withdrawInfo.member_info.balance_money | moneyFormat }}</text>
+					<text class="all-tx color-base-text" @click="allTx">全部提现</text>
+				</view>
+			</view>
+			<view class="desc">
+				<text>最小提现金额为{{ $lang('common.currencySymbol') }}{{ withdrawInfo.config.min | moneyFormat }}</text>
+				<text>，手续费为{{ withdrawInfo.config.rate + '%' }}</text>
+			</view>
+		</view>
+
+		<view class="btn color-base-border ns-gradient-otherpages-member-widthdrawal-withdrawal" :class="{ disabled: withdrawMoney == '' || withdrawMoney == 0 }" @click="withdraw">
+			提现
+		</view>
+
+		<view class="recoend" @click="toWithdrawal">
+			<view class="recoend-con">提现记录</view>
+		</view>
+		<loading-cover ref="loadingCover"></loading-cover>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				withdrawInfo: {
+					config: {
+						is_use: 0,
+						min: 1,
+						rate: 0
+					},
+					member_info: {
+						balance_money: 0,
+						balance_withdraw: 0,
+						balance_withdraw_apply: 0
+					}
+				},
+				bankAccountInfo: {},
+				withdrawMoney: '',
+				isSub: false
+			};
+		},
+		onShow() {
+			if (this.storeToken) {
+				this.getWithdrawInfo();
+				this.getBankAccountInfo();
+			} else {
+				this.$util.redirectTo('/pages_tool/login/login', {
+					back: '/pages_tool/member/apply_withdrawal'
+				});
+			}
+		},
+		methods: {
+			toWithdrawal() {
+				this.$util.redirectTo('/pages_tool/member/withdrawal');
+			},
+			//全部提现
+			allTx() {
+				this.withdrawMoney = this.withdrawInfo.member_info.balance_money;
+			},
+			// 删除提现金额
+			remove() {
+				this.withdrawMoney = '';
+			},
+			/**
+			 * 获取提现信息
+			 */
+			getWithdrawInfo() {
+				this.$api.sendRequest({
+					url: '/api/memberwithdraw/info',
+					success: res => {
+						if (res.code >= 0 && res.data) {
+							this.withdrawInfo = res.data;
+							if (this.withdrawInfo.config.is_use == 0) {
+								this.$util.showToast({
+									title: '未开启提现'
+								});
+								setTimeout(() => {
+									this.$util.redirectTo('/pages/member/index');
+								}, 1500);
+							}
+						}
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					},
+					fail: res => {
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					}
+				});
+			},
+			/**
+			 * 银行账号信息
+			 */
+			getBankAccountInfo() {
+				this.$api.sendRequest({
+					url: '/api/memberbankaccount/defaultinfo',
+					success: res => {
+						if (res.code >= 0 && res.data) {
+							this.bankAccountInfo = res.data;
+						}
+					}
+				});
+			},
+			verify() {
+				if (this.withdrawMoney == '' || this.withdrawMoney == 0 || isNaN(parseFloat(this.withdrawMoney))) {
+					this.$util.showToast({
+						title: '请输入提现金额'
+					});
+					return false;
+				}
+				if (parseFloat(this.withdrawMoney) > parseFloat(this.withdrawInfo.member_info.balance_money)) {
+					this.$util.showToast({
+						title: '提现金额超出可提现金额'
+					});
+					return false;
+				}
+				if (parseFloat(this.withdrawMoney) < parseFloat(this.withdrawInfo.config.min)) {
+					this.$util.showToast({
+						title: '提现金额小于最低提现金额'
+					});
+					return false;
+				}
+				return true;
+			},
+			withdraw() {
+				if (!this.bankAccountInfo.withdraw_type) {
+					this.$util.showToast({
+						title: '请先添加提现方式'
+					});
+					return;
+				}
+				if (this.verify()) {
+					if (this.isSub) return;
+					this.isSub = true;
+
+					var applet_type = 0;
+					if (this.bankAccountInfo.withdraw_type == 'wechatpay') {
+						// #ifdef MP
+						applet_type = 1;
+						// #endif
+					}
+
+					// #ifdef MP
+					this.subscribeMessage(() => {
+						this.$api.sendRequest({
+							url: '/api/memberwithdraw/apply',
+							data: {
+								apply_money: this.withdrawMoney,
+								transfer_type: this.bankAccountInfo.withdraw_type, //转账提现类型
+								realname: this.bankAccountInfo.realname,
+								mobile: this.bankAccountInfo.mobile,
+								bank_name: this.bankAccountInfo.branch_bank_name,
+								account_number: this.bankAccountInfo.bank_account,
+								applet_type: applet_type
+							},
+							success: res => {
+								if (res.code >= 0) {
+									this.$util.showToast({
+										title: '提现申请成功'
+									});
+									setTimeout(() => {
+										this.$util.redirectTo(
+											'/pages_tool/member/withdrawal', {},
+											'redirectTo');
+									}, 1500);
+								} else {
+									this.isSub = false;
+									this.$util.showToast({
+										title: res.message
+									});
+								}
+							},
+							fail: res => {
+								this.isSub = false;
+							}
+						});
+					});
+					// #endif
+
+					// #ifndef MP-WEIXIN
+					this.$api.sendRequest({
+						url: '/api/memberwithdraw/apply',
+						data: {
+							apply_money: this.withdrawMoney,
+							transfer_type: this.bankAccountInfo.withdraw_type, //转账提现类型
+							realname: this.bankAccountInfo.realname,
+							mobile: this.bankAccountInfo.mobile,
+							bank_name: this.bankAccountInfo.branch_bank_name,
+							account_number: this.bankAccountInfo.bank_account,
+							applet_type: applet_type
+						},
+						success: res => {
+							if (res.code >= 0) {
+								this.$util.showToast({
+									title: '提现申请成功'
+								});
+								setTimeout(() => {
+									this.$util.redirectTo('/pages_tool/member/withdrawal', {},
+										'redirectTo');
+								}, 1500);
+							} else {
+								this.isSub = false;
+								this.$util.showToast({
+									title: res.message
+								});
+							}
+						},
+						fail: res => {
+							this.isSub = false;
+						}
+					});
+					// #endif
+				}
+			},
+			goAccount() {
+				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();
+					}
+				});
+			}
+		},
+	};
+</script>
+
+<style lang="scss">
+	.container {
+		width: 100vw;
+		height: 100vh;
+		background: #fff;
+	}
+
+	.empty-box {
+		height: 20rpx;
+	}
+
+	.bank-account-wrap {
+		margin: 0 20rpx;
+		padding: 20rpx 30rpx;
+		border-bottom: 2rpx solid #f7f7f7;
+		position: relative;
+
+		.tx-wrap {
+			display: flex;
+			justify-content: space-between;
+			margin-right: 60rpx;
+
+			.tx-bank {
+				margin-right: 60rpx;
+				flex: 1;
+				margin-left: 10rpx;
+				text-align: right;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				white-space: nowrap;
+			}
+
+			.tx-img {
+				position: absolute;
+				right: 100rpx;
+				top: 50%;
+				transform: translateY(-50%);
+				width: 40rpx;
+				height: 40rpx;
+
+				image {
+					width: 100%;
+					height: 100%;
+				}
+			}
+		}
+
+		.iconfont {
+			position: absolute;
+			right: 40rpx;
+			top: 50%;
+			transform: translateY(-50%);
+		}
+	}
+
+	.withdraw-wrap {
+		margin: 0 20rpx;
+		padding: 30rpx;
+		border-radius: 16rpx;
+		box-shadow: rgba(110, 110, 110, 0.09) 0 0 20rpx 0;
+
+		.money-wrap {
+			padding: 20rpx 0;
+			border-bottom: 2rpx solid #eee;
+			display: flex;
+			align-items: baseline;
+
+			.unit {
+				font-size: 60rpx;
+				line-height: 1.3;
+			}
+
+			.withdraw-money {
+				height: 70rpx;
+				line-height: 70rpx;
+				min-height: 70rpx;
+				padding-left: 20rpx;
+				font-size: 60rpx;
+				flex: 1;
+				font-weight: bolder;
+			}
+
+			.delete {
+				width: 40rpx;
+				height: 40rpx;
+
+				image {
+					width: 100%;
+					height: 100%;
+				}
+			}
+		}
+
+		.bootom {
+			display: flex;
+			padding-top: 20rpx;
+
+			text {
+				line-height: 1;
+				flex: 2;
+			}
+
+			.all-tx {
+				padding-left: 10rpx;
+			}
+		}
+	}
+
+	.btn {
+		margin: 0 30rpx;
+		margin-top: 60rpx;
+		height: 80rpx;
+		line-height: 80rpx;
+		border-radius: $border-radius;
+		color: #fff;
+		text-align: center;
+		background-color: var(--main-color);
+
+		&.disabled {
+			background: #ccc;
+			border-color: #ccc;
+			color: #fff;
+		}
+	}
+
+	.recoend {
+		margin-top: 40rpx;
+
+		.recoend-con {
+			text-align: center;
+		}
+	}
+
+	.desc {
+		font-size: $font-size-tag;
+		color: #999;
+	}
+</style>
\ No newline at end of file
diff --git a/pages_tool/member/assets.vue b/pages_tool/member/assets.vue
new file mode 100644
index 0000000..bf72e84
--- /dev/null
+++ b/pages_tool/member/assets.vue
@@ -0,0 +1,250 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view class="container">
+		<view class="assets-wrap">
+			<view class="assets-block">
+				<view class="assets-tips"><text>风险提示：确认申请后您的资产将被清空且不可找回!</text></view>
+				<view class="assets-box assets-account">
+					<view class="assets-title">
+						<text class="color-base-bg"></text>
+						<text>账户资产</text>
+					</view>
+					<view class="assets-list">
+						<view class="assets-li">
+							<view>{{ member_info.point }}</view>
+							<view>积分</view>
+						</view>
+						<view class="assets-li">
+							<view>￥{{ member_info.balance_money }}</view>
+							<view>现金余额</view>
+						</view>
+						<view class="assets-li">
+							<view>￥{{ member_info.balance }}</view>
+							<view>储值余额</view>
+						</view>
+						<view class="assets-li">
+							<view>{{ accountInfo.member_coupon_count }}</view>
+							<view>优惠券</view>
+						</view>
+					</view>
+				</view>
+				<view class="assets-box assets-order">
+					<view class="assets-title">
+						<text class="color-base-bg"></text>
+						<text>订单资产</text>
+					</view>
+					<view class="assets-list">
+						<view class="assets-li">
+							<view>{{ accountInfo.order_pay_count }}</view>
+							<view>待发货</view>
+						</view>
+						<view class="assets-li">
+							<view>{{ accountInfo.order_delivery_count }}</view>
+							<view>待收货</view>
+						</view>
+						<view class="assets-li">
+							<view>{{ accountInfo.order_refund_count }}</view>
+							<view>退款中</view>
+						</view>
+					</view>
+				</view>
+
+				<view v-if="member_info.is_fenxiao == 1" class="assets-box assets-fenxiao">
+					<view class="assets-title">
+						<text class="color-base-bg"></text>
+						<text>分销资产</text>
+					</view>
+					<view class="assets-list">
+						<view class="assets-li">
+							<view>￥{{ fenxiao_info.account }}</view>
+							<view>可提现佣金</view>
+						</view>
+						<view class="assets-li">
+							<view>￥{{ fenxiao_info.account_withdraw_apply }}</view>
+							<view>提现中佣金</view>
+						</view>
+						<view class="assets-li">
+							<view>{{ accountInfo.fenxiao_order_count }}</view>
+							<view>待结算订单</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="assets-btn">
+				<button type="primary" @click="prev">上一步</button>
+				<button class="color-base-bg" @click="submit">确认申请</button>
+			</view>
+		</view>
+	</view>
+</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;
+						}
+					}
+				}
+			});
+		},
+		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-box {
+		width: 100%;
+		margin-top: 30rpx;
+		background-color: #ffffff;
+		border-radius: 6rpx;
+		padding: 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;
+				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-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;
+
+		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:nth-child(2) {
+			color: var(--btn-text-color);
+		}
+	}
+}
+</style>
diff --git a/pages_tool/member/balance.vue b/pages_tool/member/balance.vue
new file mode 100644
index 0000000..1a70523
--- /dev/null
+++ b/pages_tool/member/balance.vue
@@ -0,0 +1,189 @@
+<template>
+	<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="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="balance price-font">{{ (parseFloat(balanceInfo.balance) + parseFloat(balanceInfo.balance_money)).toFixed(2) }}</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>
+				</view>
+				<view class="flex-item">
+					<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="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="icon">
+					<text class="iconfont icon-chongzhijilu"></text>
+				</view>
+				<text class="title">充值记录</text>
+				<text class="iconfont icon-right"></text>
+			</view> -->
+		</view>
+		
+	<!-- 	<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> -->
+		<ns-login ref="login"></ns-login>
+		<loading-cover ref="loadingCover"></loading-cover>
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			balanceInfo: {
+				balance: 0,
+				balance_money: 0
+			},
+			withdrawConfig: null,
+			memberrechargeConfig: null,
+			menuButtonBounding: {} // 小程序胶囊属性
+		};
+	},
+	async onShow() {
+		this.getWithdrawConfig();
+		this.getMemberrechargeConfig();
+		if (!this.storeToken) {
+			this.$nextTick(() => {
+				this.$refs.login.open('/pages_tool/member/balance');
+			});
+		} else {
+			this.getUserInfo();
+		}
+	},
+	onLoad() {
+		// #ifdef MP
+		this.menuButtonBounding = uni.getMenuButtonBoundingClientRect();
+		// #endif
+	},
+	methods: {
+		toWithdrawal() {
+			this.$util.redirectTo('/pages_tool/member/apply_withdrawal');
+		},
+		toOrderList() {
+			this.$util.redirectTo('/pages_tool/recharge/order_list');
+		},
+		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');
+		},
+		//获取余额信息
+		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
+						});
+					}
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				},
+				fail: res => {
+					mescroll.endErr();
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				}
+			});
+		},
+		/**
+		 * 获取余额提现配置
+		 */
+		getWithdrawConfig() {
+			this.$api.sendRequest({
+				url: '/api/memberwithdraw/config',
+				success: res => {
+					if (res.code >= 0 && res.data) {
+						this.withdrawConfig = res.data;
+					}
+				}
+			});
+		},
+		/**
+		 * 获取充值提现配置
+		 */
+		getMemberrechargeConfig() {
+			this.$api.sendRequest({
+				url: '/memberrecharge/api/memberrecharge/config',
+				success: res => {
+					if (res.code >= 0 && res.data) {
+						this.memberrechargeConfig = res.data;
+					}
+				}
+			});
+		}
+	},
+	onBackPress(options) {
+		if (options.from === 'navigateBack') {
+			return false;
+		}
+		this.$util.redirectTo('/pages/member/index', {}, 'reLaunch');
+		return true;
+	},
+	watch: {
+		storeToken: function(nVal, oVal) {
+			if (nVal) {
+				this.getUserInfo();
+			}
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+@import './public/css/balance.scss';
+</style>
diff --git a/pages_tool/member/balance_detail.vue b/pages_tool/member/balance_detail.vue
new file mode 100644
index 0000000..674e0f7
--- /dev/null
+++ b/pages_tool/member/balance_detail.vue
@@ -0,0 +1,359 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view>
+		<!-- 		<scroll-view id="tab-bar" class="order-nav" :scroll-x="true" :show-scrollbar="false" :scroll-into-view="scrollInto">
+			<view v-for="(statusItem, statusIndex) in statusList" :key="statusIndex" class="uni-tab-item" :id="statusItem.id" :data-current="statusIndex" @click="ontabtap">
+				<text class="uni-tab-item-title" :class="statusIndex == orderStatus ? 'uni-tab-item-title-active' : ''">{{ statusItem.name }}</text>
+			</view>
+		</scroll-view> -->
+	<!-- 	<view class="tab color-bg">
+			<view class="tab-left">
+				<picker mode="date" :value="searchType.date" @change="bindDateChange" fields="month">
+					<view class="uni-input">
+						{{ date }}
+						<text class="iconfont icon-iconangledown"></text>
+					</view>
+				</picker>
+			</view>
+			<view class="tab-right">
+				<picker @change="bindPickerChange" :value="balanceIndex" :range="balanceType" class="picker" range-key="label">
+					<text class="desc uni-input">{{ balanceType[balanceIndex].label }}</text>
+					<text class="iconfont icon-iconangledown"></text>
+				</picker>
+			</view>
+		</view> -->
+		<mescroll-uni @getData="getData" ref="mescroll">
+			<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>
+							<view class="balances-info" @click="toFromDetail(item)">
+								<text class="title">{{ item.remark }}</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>
+							</view>
+						</view>
+					</view>
+				</block>
+				<block v-else><ns-empty :isIndex="false" text="暂无余额明细"></ns-empty></block>
+				<!-- 无明细列表 -->
+			</block>
+		</mescroll-uni>
+		<ns-login ref="login"></ns-login>
+		<loading-cover ref="loadingCover"></loading-cover>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			const currentDate = this.getDate({
+				format: true
+			});
+			return {
+				dataList: [],
+				statusList: [{
+					name: '全部',
+					id: '0'
+				}, {
+					name: '收入',
+					id: '1'
+				}, {
+					name: '支出',
+					id: '2'
+				}],
+				scrollInto: '',
+				orderStatus: '0',
+				date: currentDate,
+				searchType: {
+					from_type: 0,
+					date: ''
+				},
+				balanceType: [{
+					label: '全部',
+					value: '0'
+				}], //积分类型
+				balanceIndex: 0,
+				related_id: 0
+			};
+		},
+		components: {},
+		onLoad(option) {
+			if (option.group_id) this.related_id = option.group_id ? option.group_id : 0;
+			if (option.from_type) this.searchType.from_type = option.from_type;
+			if (option.related_id) this.related_id = option.related_id ? option.related_id : 0;
+			if (option.status) this.orderStatus = option.status;
+			this.getbalanceType();
+		},
+		onShow() {
+			if (!this.storeToken) {
+				this.$nextTick(() => {
+					this.$refs.login.open('/pages_tool/member/balance');
+				});
+			}
+		},
+		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;
+				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}月`;
+			},
+			bindPickerChange(e) {
+				this.balanceIndex = e.detail.value;
+				this.searchType.from_type = this.balanceType[this.balanceIndex].value;
+				this.$refs.mescroll.refresh();
+			},
+			//获取分类类型
+			getbalanceType() {
+				this.$api.sendRequest({
+					url: '/api/memberaccount/fromType',
+					success: res => {
+						let balanceType = Object.assign(res.balance, res.balance_money),
+							typeArr = [{
+								label: '全部',
+								value: '0'
+							}];
+						for (var index in balanceType) {
+							typeArr.push({
+								label: balanceType[index].type_name,
+								value: index
+							})
+						}
+						this.balanceType = typeArr;
+					}
+				});
+			},
+			ontabtap(e) {
+				let index = e.currentTarget.dataset.current;
+				this.orderStatus = this.statusList[index].id;
+				this.$refs.mescroll.refresh();
+			},
+			getData(mescroll) {
+				this.$api.sendRequest({
+					url: '/api/memberaccount/page',
+					data: {
+						page_size: mescroll.size,
+						page: mescroll.num,
+						account_type: 'balance,balance_money',
+						from_type: this.searchType.from_type,
+						date: this.searchType.date,
+						related_id: this.related_id
+					},
+					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 = []; //如果是第一页需手动制空列表
+							this.related_id = 0;
+						}
+						this.dataList = this.dataList.concat(newArr); //追加新数据
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					},
+					fail: res => {
+						mescroll.endErr();
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					}
+				});
+			},
+			toFromDetail(item) {
+				if (item.from_type == 'order' && !isNaN(parseInt(item.type_tag))) {
+					this.$util.redirectTo('/pages/order/detail', {
+						order_id: item.type_tag
+					});
+				} else if (item.from_type == 'refund' && parseInt(item.type_tag) != 0) {
+					this.$util.redirectTo('/pages/order/detail', {
+						order_id: item.type_tag
+					});
+				}
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	.detailed-wrap {
+		padding-top: 20rpx;
+		
+		margin: 24rpx;
+	}
+
+	.tab {
+		position: fixed;
+		top: 0;
+		width: 100%;
+		z-index: 10;
+		display: flex;
+		justify-content: space-between;
+		height: 80rpx;
+		background-color: $color-bg;
+
+		view {
+			flex: 1;
+			text-align: center;
+			line-height: 80rpx;
+
+			text {
+				margin-left: 10rpx;
+				font-size: $font-size-base;
+			}
+		}
+
+		.tab-left {
+			display: flex;
+			padding-left: 46rpx;
+		}
+
+		.tab-right {
+			display: flex;
+			justify-content: flex-end;
+			padding-right: 26rpx;
+		}
+	}
+
+	.order-nav {
+		width: 100vw;
+		height: 70rpx;
+		display: flex;
+		flex-direction: row;
+		/* #ifndef APP-PLUS */
+		white-space: nowrap;
+		/* #endif */
+		background: #fff;
+		border-bottom-left-radius: 24rpx;
+		border-bottom-right-radius: 24rpx;
+		padding-bottom: 30rpx;
+		position: fixed;
+		left: 0;
+		z-index: 998;
+
+		.uni-tab-item {
+			width: 33.33%;
+			text-align: center;
+			/* #ifndef APP-PLUS */
+			display: inline-block;
+			/* #endif */
+			flex-wrap: nowrap;
+		}
+
+		.uni-tab-item-title {
+			color: #555;
+			font-size: $font-size-base;
+			display: block;
+			height: 64rpx;
+			line-height: 64rpx;
+			border-bottom: 4rpx solid #fff;
+			padding: 0 10rpx;
+			flex-wrap: nowrap;
+			/* #ifndef APP-PLUS */
+			white-space: nowrap;
+			/* #endif */
+		}
+
+		.uni-tab-item-title-active {
+			display: block;
+			height: 64rpx;
+			padding: 0 10rpx;
+		}
+
+		::-webkit-scrollbar {
+			width: 0;
+			height: 0;
+			color: transparent;
+		}
+	}
+
+	.balances {
+		padding: $margin-both 24rpx;
+		// 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 {
+			flex: 1;
+			margin-left: 16rpx;
+			display: flex;
+			flex-direction: column;
+
+			text {
+				font-size: $font-size-toolbar;
+				line-height: 1;
+
+				&:last-child {}
+
+				&:nth-child(2) {
+					margin-top: $margin-updown;
+					font-size: $font-size-activity-tag;
+					color: $color-tip;
+				}
+
+				&:nth-child(3) {
+					font-size: $font-size-activity-tag;
+					margin-top: $margin-updown;
+					color: $color-tip;
+				}
+			}
+		}
+
+		.balances-num {
+			text {
+				line-height: 1;
+				font-size: $font-size-toolbar;
+				font-weight: 500;
+				color:#09c15f;
+				font-weight: 700;
+			}
+		}
+	}
+
+	.empty {
+		width: 100%;
+		height: 500rpx;
+		display: flex;
+		justify-content: center;
+		flex-direction: column;
+		align-items: center;
+	}
+</style>
\ No newline at end of file
diff --git a/pages_tool/member/cancellation.vue b/pages_tool/member/cancellation.vue
new file mode 100644
index 0000000..0212f3d
--- /dev/null
+++ b/pages_tool/member/cancellation.vue
@@ -0,0 +1,130 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view class="container">
+		<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>
+			</view>
+
+			<view class="agreement-btn">
+				<view class="align-center agreement-btn-select">
+					<text v-if="isSelect" class="iconfont icon-dui color-base-text" @click="changeSelect"></text>
+					<text v-else class="iconfont icon-yuan_checkbox" @click="changeSelect"></text>
+					<text class="agreement-text" @click="changeSelect">勾选即表示您已阅读并同意本协议</text>
+				</view>
+				<button class="btn color-base-bg" @click="next">下一步</button>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+import htmlParser from '@/common/js/html-parser';
+export default {
+	data() {
+		return {
+			agreement: {},
+			isSelect: false
+		};
+	},
+	onLoad(option) {
+		if (option.back) this.back = option.back;
+		// 判断登录
+		if (!this.storeToken) {
+			this.$util.redirectTo('/pages_tool/login/login');
+		} else {
+			this.getCancelAgreement();
+		}
+	},
+	methods: {
+		getCancelAgreement() {
+			this.$api.sendRequest({
+				url: '/membercancel/api/membercancel/agreement',
+				success: res => {
+					if (res.code >= 0) {
+						this.agreement = res.data;
+						if (this.agreement.content) this.agreement.content = htmlParser(this.agreement.content);
+					}
+				}
+			});
+		},
+		changeSelect() {
+			this.isSelect = this.isSelect == true ? false : true;
+		},
+		next() {
+			if (this.isSelect) {
+				this.$util.redirectTo('/pages_tool/member/assets');
+			} else {
+				this.$util.showToast({
+					title: '请先勾选同意协议'
+				});
+			}
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+.agreement-box {
+	.align-center {
+		text-align: center;
+	}
+
+	.agreement-intro {
+		height: calc(100vh - 210rpx);
+		padding-top: 40rpx;
+		padding-left: 40rpx;
+		padding-right: 40rpx;
+		box-sizing: border-box;
+		overflow-y: auto;
+
+		.agreement-title {
+			font-size: 32rpx;
+			line-height: 60rpx;
+			margin-bottom: 10rpx;
+		}
+
+		.agreement-content {
+			font-size: 24rpx;
+			line-height: 44rpx;
+		}
+	}
+
+	.agreement-btn {
+		position: fixed;
+		width: 100%;
+		height: 210rpx;
+		bottom: 0;
+		padding-top: 16rpx;
+		box-sizing: border-box;
+		text-align: center;
+
+		.agreement-btn-select {
+			display: flex;
+			justify-content: center;
+			align-items: center;
+		}
+
+		.agreement-btn-select .iconfont {
+			color: #838383;
+		}
+
+		.agreement-text {
+			font-size: 28rpx;
+			color: #838383;
+			margin-left: 10rpx;
+		}
+
+		button {
+			display: inline-block;
+			margin-top: 20rpx;
+			color: var(--btn-text-color);
+			font-size: 28rpx;
+			width: 300rpx;
+			height: 80rpx;
+			line-height: 80rpx;
+		}
+	}
+}
+</style>
diff --git a/pages_tool/member/cancelrefuse.vue b/pages_tool/member/cancelrefuse.vue
new file mode 100644
index 0000000..7e60f38
--- /dev/null
+++ b/pages_tool/member/cancelrefuse.vue
@@ -0,0 +1,114 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view class="container">
+		<view class="cancel-wrap">
+			<view class="cancel-img"><image :src="$util.img('public/uniapp/member/refuse.png')"></image></view>
+			<view class="cancel-title">您的申请已拒绝</view>
+			<view class="cancel-reason">拒绝理由：{{ reason }}</view>
+			<view class="cancel-btn">
+				<button type="primary" @click="toIndex">返回</button>
+				<button class="color-base-bg" @click="apply">重新申请</button>
+			</view>
+		</view>
+	</view>
+</template>
+
+<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');
+		} else {
+			this.getStatus();
+		}
+	},
+	methods: {
+		getStatus() {
+			this.$api.sendRequest({
+				url: '/membercancel/api/membercancel/info',
+				success: res => {
+					if (res.code >= 0) {
+						this.reason = res.data.reason;
+					}
+				}
+			});
+		},
+		toIndex() {
+			this.$util.redirectTo('/pages/member/index');
+		},
+		apply() {
+			this.$util.redirectTo('/pages_tool/member/cancellation');
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+.cancel-wrap {
+	padding-top: 300rpx;
+	text-align: center;
+
+	.cancel-img {
+		width: 150rpx;
+		height: 150rpx;
+		display: inline-block;
+
+		image {
+			width: 100%;
+			height: 100%;
+		}
+	}
+
+	.cancel-title {
+		text-align: center;
+		font-size: 32rpx;
+		line-height: 32rpx;
+		margin-top: 30rpx;
+	}
+
+	.cancel-reason {
+		color: #838383;
+		font-size: 28rpx;
+		line-height: 50rpx;
+		margin-top: 20rpx;
+		padding: 0 75rpx;
+	}
+
+	.cancel-btn {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		width: 100%;
+		margin-top: 173rpx;
+
+		button {
+			width: 300rpx;
+			height: 84rpx;
+			font-size: 28rpx;
+			line-height: 84rpx;
+			margin: 0 15rpx;
+			border-radius: $border-radius;
+		}
+
+		button[type='primary'] {
+			background-color: unset !important;
+			color: #333333;
+			border: 2rpx solid #dddddd;
+		}
+
+		button:nth-child(2) {
+			color: #ffffff;
+		}
+	}
+}
+</style>
diff --git a/pages_tool/member/cancelstatus.vue b/pages_tool/member/cancelstatus.vue
new file mode 100644
index 0000000..4c97bfa
--- /dev/null
+++ b/pages_tool/member/cancelstatus.vue
@@ -0,0 +1,190 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view class="container">
+		<view class="cancelstatus-wrap">
+			<view class="cancelstatus-block">
+				<view class="cancelstatus-box">
+					<view class="cancelstatus-box-sort color-base-bg">1</view>
+					<view class="cancelstatus-box-con">
+						<view class="cancelstatus-box-name">提交申请</view>
+						<view class="cancelstatus-box-info">您已提交申请，请耐心等待~</view>
+					</view>
+					<view class="cancelstatus-box-line color-base-bg"></view>
+				</view>
+				<view class="cancelstatus-box">
+					<view class="cancelstatus-box-sort color-base-bg">2</view>
+					<view class="cancelstatus-box-con">
+						<view class="cancelstatus-box-name">等待审核</view>
+						<view class="cancelstatus-box-info">等待审核中，审核通过后您的账号将直接被删除</view>
+					</view>
+					<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-con">
+						<view class="cancelstatus-box-name">审核通过，注销完成</view>
+						<view class="cancelstatus-box-info">您已成功注销账号，期待下一次与您相遇</view>
+					</view>
+				</view>
+			</view>
+			<view class="cancelstatus-btn" v-if="state == 0">
+				<button type="primary" @click="back">返回</button>
+				<button class="color-base-bg" @click="revoke">撤销申请</button>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				state: 0
+			};
+		},
+		onLoad(option) {
+			// 判断登录
+			if (!this.storeToken) {
+				this.$util.redirectTo('/pages_tool/login/login');
+			} else {
+				this.getStatus();
+			}
+		},
+		onShow() {
+			this.getStatus();
+		},
+		methods: {
+			getStatus() {
+				this.$api.sendRequest({
+					url: '/membercancel/api/membercancel/info',
+					success: res => {
+						if (res.code >= 0 && res.data) {
+							this.state = res.data.status;
+							if (this.state == -1) {
+								this.$util.redirectTo('/pages_tool/member/cancelrefuse');
+							}
+						}
+
+						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');
+						}
+					}
+				});
+			},
+			back() {
+				this.$util.redirectTo('/pages/member/index');
+			},
+			revoke() {
+				uni.showModal({
+					title: '风险提示',
+					content: '确定要撤销申请吗？',
+					confirmColor: '#000000',
+					success: res => {
+						if (res.confirm) {
+							this.$api.sendRequest({
+								url: '/membercancel/api/membercancel/cancelApply',
+								success: res => {
+									if (res.code >= 0) {
+										this.$util.redirectTo('/pages/member/index');
+									}
+								}
+							});
+						}
+					}
+				});
+			}
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	.cancelstatus-wrap {
+		.cancelstatus-block {
+			padding: 50rpx;
+		}
+
+		.cancelstatus-box {
+			position: relative;
+			display: flex;
+			height: 200rpx;
+
+			.cancelstatus-box-sort {
+				width: 36rpx;
+				height: 36rpx;
+				text-align: center;
+				line-height: 36rpx;
+				border-radius: 50%;
+				color: #ffffff;
+				margin-right: 17rpx;
+				font-size: 24rpx;
+			}
+
+			.opacity {
+				opacity: 1;
+
+				&-4 {
+					opacity: 0.4;
+				}
+			}
+
+			.cancelstatus-box-name {
+				font-size: 32rpx;
+				line-height: 32rpx;
+				margin-top: 3rpx;
+			}
+
+			.cancelstatus-box-info {
+				margin-top: 15rpx;
+				color: #666666;
+				font-size: 28rpx;
+			}
+
+			.cancelstatus-box-line {
+				position: absolute;
+				width: 2rpx;
+				height: 164rpx;
+				top: 36rpx;
+				left: 18rpx;
+			}
+
+			&.cancelstatus-box-last {
+				height: 80rpx;
+			}
+		}
+
+		.cancelstatus-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;
+				border-radius: $border-radius;
+			}
+
+			button[type='primary'] {
+				background-color: unset !important;
+				color: #333333;
+				border: 2rpx solid #dddddd;
+			}
+
+			button:nth-child(2) {
+				color: #ffffff;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages_tool/member/cancelsuccess.vue b/pages_tool/member/cancelsuccess.vue
new file mode 100644
index 0000000..1e362e5
--- /dev/null
+++ b/pages_tool/member/cancelsuccess.vue
@@ -0,0 +1,100 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view class="container">
+		<view class="cancel-wrap">
+			<view class="cancel-img">
+				<image :src="$util.img('public/uniapp/member/success.png')"></image>
+			</view>
+			<view class="cancel-title">您已成功注销账号</view>
+			<view class="cancel-reason">待下次与您更好的相遇，如需再次使用，请重新注册</view>
+			<view class="cancel-btn"><button class="color-base-bg" @click="success">完成</button></view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		components: {},
+		data() {
+			return {
+				state: ''
+			};
+		},
+		onLoad(option) {
+
+			if (option.back) this.back = option.back;
+
+			// 判断登录
+			if (!this.storeToken) {
+				this.$util.redirectTo('/pages_tool/login/login');
+			} else {
+				this.getStatus();
+			}
+		},
+		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');
+							}
+						}
+					}
+				});
+			}
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	.cancel-wrap {
+		padding-top: 84rpx;
+		text-align: center;
+
+		.cancel-img {
+			width: 100rpx;
+			height: 100rpx;
+			display: inline-block;
+
+			image {
+				width: 100%;
+				height: 100%;
+			}
+		}
+
+		.cancel-title {
+			text-align: center;
+			font-size: 24rpx;
+			line-height: 24rpx;
+			margin-top: 30rpx;
+		}
+
+		.cancel-reason {
+			color: #838383;
+			font-size: 20rpx;
+			line-height: 40rpx;
+			margin-top: 20rpx;
+			padding: 0 175rpx;
+		}
+
+		.cancel-btn {
+			width: 100%;
+			margin-top: 173rpx;
+
+			button {
+				display: inline-block;
+				width: 300rpx;
+				height: 80rpx;
+				font-size: 28rpx;
+				line-height: 80rpx;
+				margin: 0 15rpx;
+				color: #ffffff;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages_tool/member/card.vue b/pages_tool/member/card.vue
new file mode 100644
index 0000000..a168fa9
--- /dev/null
+++ b/pages_tool/member/card.vue
@@ -0,0 +1,229 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view class="member-level">
+		<view class="level-top">
+			<image :src="$util.img('public/uniapp/level/card-top-bg.png')"></image>
+		</view>
+		<view class="banner-container">
+			<view class="memberInfo">
+				<image :src="$util.img(memberInfo.headimg)" v-if="memberInfo.headimg" @error="headimgError" mode="aspectFill"/>
+				<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>
+			</view>
+
+			<view class="image-container item-center">
+				<view class="slide-image">
+					<view class="bg-border"></view>
+					<image :src="$util.img('public/uniapp/level/card-bg.png')"></image>
+					<view class="info">
+						<view class="level-detail">{{ levelInfo.level_name }}</view>
+						<view class="growr-name">{{ levelInfo.level_name }}可享受消费折扣和</view>
+						<view class="growr-value">会员大礼包等权益</view>
+						<view class="growth-rules font-size-tag" @click="openExplainPopup" v-if="levelInfo.remark != ''">
+							<text class="iconfont icon-wenhao font-size-tag"></text>
+						</view>
+						<button type="default" class="renew-btn" @click="$util.redirectTo('/pages_tool/member/card_buy')">立即续费</button>
+					</view>
+				</view>
+			</view>
+
+			<view class="card-content" v-if="levelInfo.is_free_shipping || levelInfo.consume_discount < 100 || levelInfo.point_feedback > 0">
+				<view class="card-content-head">
+					<view class="line-box">
+						<view class="line right"></view>
+					</view>
+					<view class="card-content-title">会员权益</view>
+					<view class="line-box">
+						<view class="line"></view>
+					</view>
+					<view class="clear"></view>
+				</view>
+				<view class="card-privilege-list">
+					<view class="card-privilege-item" v-if="levelInfo.is_free_shipping">
+						<view class="card-privilege-icon"><text class="iconfont icon-tedianquanchangbaoyou"></text>
+						</view>
+						<view class="card-privilege-name">全场包邮</view>
+						<view class="card-privilege-text">享受商品包邮服务</view>
+					</view>
+					<view class="card-privilege-item" v-if="levelInfo.consume_discount < 100">
+						<view class="card-privilege-icon"><text class="iconfont icon-zhekou"></text></view>
+						<view class="card-privilege-name">消费折扣</view>
+						<view class="card-privilege-text">部分商品下单可享{{ levelInfo.consume_discount / 10 }}折优惠</view>
+					</view>
+					<view class="card-privilege-item" v-if="levelInfo.point_feedback > 0">
+						<view class="card-privilege-icon"><text class="iconfont icon-jifen2 f32"></text></view>
+						<view class="card-privilege-name">积分回馈</view>
+						<view class="card-privilege-text">下单享{{ parseFloat(levelInfo.point_feedback) }}倍积分回馈</view>
+					</view>
+				</view>
+
+				<view v-if="levelInfo.send_coupon != '' || levelInfo.send_point > 0 || levelInfo.send_balance > 0">
+					<view class="card-content-head">
+						<view class="line-box">
+							<view class="line right"></view>
+						</view>
+						<view class="card-content-title">开卡礼包</view>
+						<view class="line-box">
+							<view class="line"></view>
+						</view>
+						<view class="clear"></view>
+					</view>
+					<view class="card-privilege-list">
+						<view class="card-privilege-item" v-if="levelInfo.send_point > 0">
+							<view class="card-privilege-icon"><text class="iconfont icon-jifen3"></text></view>
+							<view class="card-privilege-name">积分礼包</view>
+							<view class="card-privilege-text">赠送{{ levelInfo.send_point }}积分</view>
+						</view>
+						<view class="card-privilege-item" v-if="levelInfo.send_balance > 0">
+							<view class="card-privilege-icon"><text class="iconfont icon-hongbao"></text></view>
+							<view class="card-privilege-name">红包礼包</view>
+							<view class="card-privilege-text">赠送{{ parseFloat(levelInfo.send_balance) }}元红包</view>
+						</view>
+						<view class="card-privilege-item" v-if="levelInfo.send_coupon != ''">
+							<view class="card-privilege-icon"><text class="iconfont icon-youhuiquan1"></text></view>
+							<view class="card-privilege-name">优惠券礼包</view>
+							<view class="card-privilege-text">赠送{{ levelInfo.send_coupon.split(',').length }}张优惠券</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<!-- 弹出规则 -->
+		<view @touchmove.prevent.stop>
+			<uni-popup ref="explainPopup" type="bottom">
+				<view class="tips-layer">
+					<view class="head" @click="closeExplainPopup()">
+						<view class="title">会员卡说明</view>
+						<text class="iconfont icon-close"></text>
+					</view>
+					<view class="body">
+						<view class="detail margin-bottom">
+							<block v-if="levelInfo.remark != ''">
+								<view class="tip">会员卡说明</view>
+								<view class="font-size-base">{{ levelInfo.remark }}</view>
+							</block>
+						</view>
+					</view>
+				</view>
+			</uni-popup>
+		</view>
+
+		<ns-goods-recommend ref="goodrecommend" route="super_member"></ns-goods-recommend>
+		<ns-login ref="login"></ns-login>
+	</view>
+</template>
+
+<script>
+	import uniPopup from '@/components/uni-popup/uni-popup.vue';
+	import nsGoodsRecommend from '@/components/ns-goods-recommend/ns-goods-recommend.vue';
+	import scroll from '@/common/js/scroll-view.js';
+
+	export default {
+		components: {
+			uniPopup,
+			nsGoodsRecommend
+		},
+		mixins: [scroll],
+		data() {
+			return {
+				isSub: false, // 是否已提交
+				isIphoneX: false,
+				levelId: 0,
+				levelInfo: {
+					bg_color: '#333'
+				}
+			};
+		},
+		onLoad() {
+			//会员卡
+			if (!this.storeToken) {
+				this.$nextTick(() => {
+					this.$refs.login.open('/pages_tool/member/card');
+				});
+				return;
+			}
+
+			this.isIphoneX = this.$util.uniappIsIPhoneX();
+
+			this.levelId = this.memberInfo.member_level;
+
+			let levelInfo = this.memberInfo.member_level_info;
+			let charge_rule = levelInfo.charge_rule ? JSON.parse(levelInfo.charge_rule) : {};
+			levelInfo.charge_rule_arr = [];
+			Object.keys(charge_rule).forEach(key => {
+				levelInfo.charge_rule_arr.push({
+					key: key,
+					value: charge_rule[key]
+				});
+			});
+			this.levelInfo = levelInfo;
+		},
+		onShow() {},
+		methods: {
+			headimgError() {
+				this.memberInfo.headimg = this.$util.getDefaultImage().head;
+			},
+			/**
+			 * 打开说明弹出层
+			 */
+			openExplainPopup() {
+				this.$refs.explainPopup.open();
+			},
+			/**
+			 * 打开说明弹出层
+			 */
+			closeExplainPopup() {
+				this.$refs.explainPopup.close();
+			}
+		},
+		onBackPress(options) {
+			if (options.from === 'navigateBack') {
+				return false;
+			}
+			this.$util.redirectTo('/pages/member/index');
+			return true;
+		}
+	};
+</script>
+
+<style lang="scss">
+	@import './public/css/card.scss';
+
+	.banner-container .image-container .slide-image {
+		width: calc(100% - 60rpx);
+		height: 360rpx;
+		background-size: 100% 100%;
+		background-repeat: no-repeat;
+	}
+
+	.banner-container .image-container image {
+		background-color: #e3b66b;
+	}
+
+	.banner-container .slide-image .renew-btn {
+		text-align: center;
+		line-height: 56rpx;
+		height: 56rpx;
+		border-radius: $border-radius;
+		width: 160rpx;
+		font-size: $font-size-tag;
+		color: #e3b66b !important;
+		background: #fff;
+		position: absolute;
+		right: 10rpx;
+		bottom: 40rpx;
+		border: none;
+		z-index: 10;
+	}
+</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/member/card_agreement.vue b/pages_tool/member/card_agreement.vue
new file mode 100644
index 0000000..7c378c9
--- /dev/null
+++ b/pages_tool/member/card_agreement.vue
@@ -0,0 +1,67 @@
+<template>
+	<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>
+</template>
+
+<script>
+import htmlParser from '@/common/js/html-parser';
+export default {
+	data() {
+		return {
+			title: '',
+			content: ''
+		};
+	},
+	onLoad() {
+		this.getAgreement();
+	},
+	onShow() {},
+	methods: {
+		getAgreement() {
+			this.$api.sendRequest({
+				url: '/supermember/api/membercard/agreement',
+				success: res => {
+					if (res.data && res.code == 0) {
+						this.title = res.data.title;
+						this.content = htmlParser(res.data.content);
+						uni.setNavigationBarTitle({
+							title: this.title
+						});
+					}
+				}
+			});
+		}
+	},
+	onBackPress(options) {
+		if (options.from === 'navigateBack') {
+			return false;
+		}
+		this.$util.redirectTo('/pages_tool/member/card_buy', {}, 'redirectTo');
+		return true;
+	}
+};
+</script>
+
+<style lang="scss">
+.page {
+	width: 100%;
+	height: 100%;
+	padding: 30rpx;
+	box-sizing: border-box;
+	background-color: #fff;
+}
+
+.agreement-title {
+	font-size: $font-size-toolbar;
+	text-align: center;
+}
+
+.agreement-content {
+	margin-top: $margin-updown;
+	word-break: break-all;
+	font-size: $font-size-base;
+}
+</style>
diff --git a/pages_tool/member/card_buy.vue b/pages_tool/member/card_buy.vue
new file mode 100644
index 0000000..86b07b9
--- /dev/null
+++ b/pages_tool/member/card_buy.vue
@@ -0,0 +1,422 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view class="member-level">
+		<block v-if="levelList.length">
+			<view class="level-top">
+				<image :src="$util.img('public/uniapp/level/card-top-bg.png')"></image>
+			</view>
+			<view class="banner-container">
+				<view class="memberInfo">
+					<image :src="$util.img(memberInfo.headimg)" v-if="memberInfo.headimg" @error="headimgError" mode="aspectFill"/>
+					<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>
+				</view>
+				<swiper :style="{ width: '100vw', height: '390rpx' }" class="margin-bottom"
+					:indicator-dots="swiperConfig.indicatorDots" :indicator-color="swiperConfig.indicatorColor"
+					:indicator-active-color="swiperConfig.indicatorActiveColor" :autoplay="false"
+					: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">
+						<view class="image-container" :class="[
+								curIndex === 0
+									? i === listLen - 1
+										? 'item-left'
+										: i === 1
+										? 'item-right'
+										: 'item-center'
+									: curIndex === listLen - 1
+									? i === 0
+										? 'item-right'
+										: i === listLen - 2
+										? 'item-left'
+										: 'item-center'
+									: i === curIndex - 1
+									? 'item-left'
+									: i === curIndex + 1
+									? 'item-right'
+									: 'item-center'
+							]">
+							<view class="slide-image" style="background-size: 100% 100%;background-repeat:no-repeat"
+								:style="{
+									transform: curIndex === i ? 'scale(' + scaleX + ',' + scaleY + ')' : 'scale(1,1)',
+									transitionDuration: '.3s',
+									transitionTimingFunction: 'ease'
+								}">
+								<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']}"/>
+
+								<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 != ''">
+										<text class="iconfont icon-wenhao font-size-tag"></text>
+									</view>
+								</view>
+							</view>
+						</view>
+					</swiper-item>
+				</swiper>
+
+				<view class="card-content">
+					<view class="card-content-head">
+						<view class="line-box">
+							<view class="line right"></view>
+						</view>
+						<view class="card-content-title">卡种选择</view>
+						<view class="line-box">
+							<view class="line"></view>
+						</view>
+						<view class="clear"></view>
+					</view>
+					<view class="card-time-list">
+						<view class="card-item-box" :class="{ small: currCard.charge_rule_arr.length == 4 }" v-for="(item, index) in currCard.charge_rule_arr" :key="index">
+							<view class="card-time-item" :class="{ active: choiceIndex == index }" @click="choice(index)">
+								<image :src="$util.img('public/uniapp/level/card-icon.png')" mode="widthFix"></image>
+								<view class="time-name">{{ cardType[item.key].name }}</view>
+								<view class="time-price">
+									{{ $lang('common.currencySymbol') }}
+									<text class="price">{{ item.value }}</text>
+									/{{ cardType[item.key].unit }}
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+
+				<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>
+						</view>
+						<view class="card-content-title">会员权益</view>
+						<view class="line-box">
+							<view class="line"></view>
+						</view>
+						<view class="clear"></view>
+					</view>
+					<view class="card-privilege-list">
+						<view class="card-privilege-item" v-if="currCard.is_free_shipping">
+							<view class="card-privilege-icon">
+								<text class="iconfont icon-tedianquanchangbaoyou"></text>
+							</view>
+							<view class="card-privilege-name">全场包邮</view>
+							<view class="card-privilege-text">享受商品包邮服务</view>
+						</view>
+						<view class="card-privilege-item" v-if="currCard.consume_discount < 100">
+							<view class="card-privilege-icon"><text class="iconfont icon-zhekou"></text></view>
+							<view class="card-privilege-name">消费折扣</view>
+							<view class="card-privilege-text">部分商品下单可享{{ currCard.consume_discount / 10 }}折优惠</view>
+						</view>
+						<view class="card-privilege-item" v-if="currCard.point_feedback > 0">
+							<view class="card-privilege-icon"><text class="iconfont icon-jifen2 f32"></text></view>
+							<view class="card-privilege-name">积分回馈</view>
+							<view class="card-privilege-text">下单享{{ parseFloat(currCard.point_feedback) }}倍积分回馈</view>
+						</view>
+					</view>
+
+					<view v-if="currCard.send_coupon != '' || currCard.send_point > 0 || currCard.send_balance > 0">
+						<view class="card-content-head">
+							<view class="line-box">
+								<view class="line right"></view>
+							</view>
+							<view class="card-content-title">开卡礼包</view>
+							<view class="line-box">
+								<view class="line"></view>
+							</view>
+							<view class="clear"></view>
+						</view>
+						<view class="card-privilege-list">
+							<view class="card-privilege-item" v-if="currCard.send_point > 0">
+								<view class="card-privilege-icon"><text class="iconfont icon-jifen3"></text></view>
+								<view class="card-privilege-name">积分礼包</view>
+								<view class="card-privilege-text">赠送{{ currCard.send_point }}积分</view>
+							</view>
+							<view class="card-privilege-item" v-if="currCard.send_balance > 0">
+								<view class="card-privilege-icon"><text class="iconfont icon-hongbao"></text></view>
+								<view class="card-privilege-name">红包礼包</view>
+								<view class="card-privilege-text">赠送{{ parseFloat(currCard.send_balance) }}元红包</view>
+							</view>
+							<view class="card-privilege-item" v-if="currCard.send_coupon != ''">
+								<view class="card-privilege-icon"><text class="iconfont icon-youhuiquan1"></text></view>
+								<view class="card-privilege-name">优惠券礼包</view>
+								<view class="card-privilege-text">赠送{{ currCard.send_coupon.split(',').length }}张优惠券
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+
+				<block v-if="currCard.charge_rule_arr.length">
+					<view class="action-wrap" :class="{ 'bottom-safe-area': isIphoneX, 'have-agreement': agreement }">
+					</view>
+					<view class="action" :class="{ 'bottom-safe-area': isIphoneX, 'have-agreement': agreement }">
+						<view class="action-btn" @click="create">
+							<block v-if="currCard.level_id == levelId"><text class="bold title">立即续费</text></block>
+							<block v-else>
+								<text class="bold title" v-if="currCard.charge_type == 1">充值开通</text>
+								<text class="bold title" v-else>立即开通</text>
+							</block>
+							<text class="font-size-tag">{{ $lang('common.currencySymbol') }}</text>
+							<text class="bold">{{ currCard.charge_rule_arr[choiceIndex].value }}</text>
+							<text>/{{ cardType[currCard.charge_rule_arr[choiceIndex].key].unit }}</text>
+						</view>
+						<view class="agreement" v-if="agreement">
+							购买既视为同意
+							<text @click="$util.redirectTo('/pages_tool/member/card_agreement')">《{{ agreement.title }}》</text>
+						</view>
+					</view>
+				</block>
+			</view>
+
+			<!-- 弹出规则 -->
+			<view @touchmove.prevent.stop>
+				<uni-popup ref="explainPopup" type="bottom">
+					<view class="tips-layer">
+						<view class="head" @click="closeExplainPopup()">
+							<view class="title">会员卡说明</view>
+							<text class="iconfont icon-close"></text>
+						</view>
+						<view class="body">
+							<view class="detail margin-bottom">
+								<block v-if="currCard.remark != ''">
+									<view class="tip">会员卡说明</view>
+									<view class="font-size-base">{{ currCard.remark }}</view>
+								</block>
+							</view>
+						</view>
+					</view>
+				</uni-popup>
+			</view>
+
+			<ns-payment ref="choosePaymentPopup" :payMoney="currCard.charge_rule_arr[choiceIndex].value" @confirm="toPay" v-if="currCard.charge_rule_arr.length"></ns-payment>
+		</block>
+		<block v-else><ns-empty text="暂无可开会员卡" :isIndex="false"></ns-empty></block>
+
+		<ns-login ref="login"></ns-login>
+		<loading-cover ref="loadingCover"></loading-cover>
+		<!-- 选择支付方式弹窗 -->
+	</view>
+</template>
+
+<script>
+	import scroll from '@/common/js/scroll-view.js';
+	import uniPopup from '@/components/uni-popup/uni-popup.vue';
+
+	export default {
+		components: {
+			uniPopup
+		},
+		mixins: [scroll],
+		data() {
+			return {
+				isSub: false, // 是否已提交
+				isIphoneX: false,
+				couponPopList: [],
+				curIndex: 0,
+				isDescAnimating: false,
+				scaleX: (634 / 540).toFixed(4),
+				scaleY: (378 / 330).toFixed(4),
+				swiperConfig: {
+					indicatorDots: false,
+					indicatorColor: 'rgba(255, 255, 255, .4)',
+					indicatorActiveColor: 'rgba(255, 255, 255, 1)',
+					interval: 3000,
+					duration: 300,
+					circular: false,
+					previousMargin: '58rpx',
+					nextMargin: '58rpx'
+				},
+				levelList: [],
+				levelId: 0,
+				cardType: {
+					week: {
+						name: '周卡',
+						unit: '周'
+					},
+					month: {
+						name: '月卡',
+						unit: '月'
+					},
+					quarter: {
+						name: '季卡',
+						unit: '季'
+					},
+					year: {
+						name: '年卡',
+						unit: '年'
+					}
+				},
+				choiceIndex: 0,
+				outTradeNo: '',
+				agreement: null
+			};
+		},
+		computed: {
+			listLen() {
+				return this.levelList.length;
+			},
+			currCard() {
+				if (this.levelList[this.curIndex]) {
+					let card = this.levelList[this.curIndex];
+					let charge_rule = card.charge_rule ? JSON.parse(card.charge_rule) : {};
+					card.charge_rule_arr = [];
+					Object.keys(charge_rule).forEach(key => {
+						card.charge_rule_arr.push({
+							key: key,
+							value: charge_rule[key]
+						});
+					});
+					return card;
+				}
+			}
+		},
+		onLoad() {
+			//会员卡
+			this.isIphoneX = this.$util.uniappIsIPhoneX();
+
+			if (this.storeToken) {
+				this.getCardList();
+			} else {
+				this.$nextTick(() => {
+					this.$refs.login.open('/pages_tool/member/card_buy');
+				});
+			}
+			this.getAgreement();
+		},
+		onShow() {},
+		watch: {
+			storeToken: function(nVal, oVal) {
+				if (nVal) {
+					this.getCardList();
+				}
+			}
+		},
+		methods: {
+			swiperChange(e) {
+				this.curIndex = e.detail.current;
+				this.choiceIndex = 0;
+				this.isDescAnimating = true;
+			},
+			animationfinish(e) {
+				this.isDescAnimating = false;
+			},
+			getCardList() {
+				this.$api.sendRequest({
+					url: '/supermember/api/membercard/lists',
+					success: res => {
+						if (res.code == 0 && res.data) {
+							this.levelList = res.data;
+							this.levelId = this.memberInfo.member_level;
+							for (let i = 0; i < this.levelList.length; i++) {
+								if (this.levelList[i].level_id == this.levelId) {
+									this.curIndex = i;
+									break;
+								}
+							}
+						} else {
+							this.$util.showToast({
+								title: res.message
+							});
+						}
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					}
+				});
+			},
+			choice(index) {
+				this.choiceIndex = index;
+			},
+			/**
+			 * 创建
+			 */
+			create() {
+				if (this.memberInfo.member_level_type && this.memberInfo.member_level != this.currCard.level_id) {
+					uni.showModal({
+						title: '提示',
+						content: '您有尚未过期的会员卡，再次购卡会覆盖掉之前的卡，是否继续？',
+						success: res => {
+							if (res.confirm) {
+								this.$refs.choosePaymentPopup.open();
+							}
+						}
+					});
+				} else {
+					this.$refs.choosePaymentPopup.open();
+				}
+			},
+			/**
+			 * 提交
+			 */
+			toPay() {
+				if (this.isSub) return;
+				this.isSub = true;
+
+				this.$api.sendRequest({
+					url: '/supermember/api/ordercreate/create',
+					data: {
+						level_id: this.currCard.level_id,
+						period_unit: this.currCard.charge_rule_arr[this.choiceIndex].key
+					},
+					success: res => {
+						if (res.data && res.code == 0) {
+							this.outTradeNo = res.data.out_trade_no;
+							uni.setStorageSync('paySource', 'membercard');
+							this.$refs.choosePaymentPopup.getPayInfo(this.outTradeNo);
+						} else {
+							this.isSub = false;
+							this.$util.showToast({
+								title: res.message
+							});
+						}
+					}
+				});
+			},
+			headimgError() {
+				this.memberInfo.headimg = this.$util.getDefaultImage().head;
+			},
+			/**
+			 * 打开说明弹出层
+			 */
+			openExplainPopup() {
+				this.$refs.explainPopup.open();
+			},
+			/**
+			 * 打开说明弹出层
+			 */
+			closeExplainPopup() {
+				this.$refs.explainPopup.close();
+			},
+			getAgreement() {
+				this.$api.sendRequest({
+					url: '/supermember/api/membercard/agreement',
+					success: res => {
+						if (res.code == 0 && res.data && res.data.title != '' && res.data.content != '') {
+							this.agreement = res.data;
+						}
+					}
+				});
+			}
+		},
+		onBackPress(options) {
+			if (options.from === 'navigateBack') {
+				return false;
+			}
+			this.$util.redirectTo('/pages/member/index');
+			return true;
+		}
+	};
+</script>
+
+<style lang="scss">
+	@import './public/css/card.scss';
+</style>
\ No newline at end of file
diff --git a/pages_tool/member/collection.vue b/pages_tool/member/collection.vue
new file mode 100644
index 0000000..064edc2
--- /dev/null
+++ b/pages_tool/member/collection.vue
@@ -0,0 +1,86 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view>
+		<mescroll-uni ref="mescroll" @getData="getData" class="member-point" :size="8" @listenRefresh="listenRefresh" v-if="storeToken">
+			<view class="goods_list" slot="list">
+				<block v-if="collectionList.length > 0">
+					<view class="goods_li margin-top" v-for="(item, index) in collectionList" :key="index" @click.stop="toDetail(item)">
+						<view class="pic">
+							<image :src="$util.img(item.goods_image.split(',')[0], { size: 'mid' })" mode="aspectFill" @error="goodsImageError(index)"></image>
+						</view>
+						<view class="goods_info">
+							<view class="goods_name font-size-base">{{ item.sku_name }}</view>
+							<view class="goods_opection">
+								<view class="left  lineheight-clear ">
+									<text class="symbol price-style small">￥</text>
+									<text class="price price-style large">{{ parseFloat(item.discount_price).toFixed(2).split('.')[0] }}</text>
+									<text class="symbol price-style small">.{{ parseFloat(item.discount_price).toFixed(2).split('.')[1] }}</text>
+								</view>
+								<view class="right">
+									<view class="cars" @click.stop="deleteItem(item.goods_id)">
+										<view class="icon iconfont icon-icon7"></view>
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</block>
+				<!-- 第一个列表为空时 -->
+				<ns-empty v-if="collectionList.length == 0 && isShowEmpty" text="暂无关注的商品" :isIndex="false"></ns-empty>
+				<ns-goods-recommend ref="goodsRecommend"></ns-goods-recommend>
+			</view>
+		</mescroll-uni>
+		<ns-login ref="login"></ns-login>
+		<loading-cover ref="loadingCover"></loading-cover>
+	</view>
+</template>
+
+<script>
+	import nsGoodsRecommend from '@/components/ns-goods-recommend/ns-goods-recommend.vue';
+	import collection from './public/js/collection.js';
+
+	export default {
+		components: {
+			nsGoodsRecommend
+		},
+		mixins: [collection],
+		data() {
+			return {};
+		},
+		onShow() {
+			if (this.storeToken) {
+				if (this.$refs.mescroll) this.$refs.mescroll.refresh();
+			} else {
+				this.$nextTick(() => {
+					this.$refs.login.open('/pages_tool/member/collection');
+				});
+			}
+		},
+		watch: {
+			storeToken: function(nVal, oVal) {
+				if (nVal) {
+					this.$refs.mescroll.refresh();
+				}
+			}
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	/deep/ .fixed {
+		position: relative;
+		top: 0;
+	}
+
+	/deep/ .empty {
+		margin-top: 0 !important;
+	}
+
+	@import './public/css/collection.scss';
+</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/member/contact.vue b/pages_tool/member/contact.vue
new file mode 100644
index 0000000..1a2abaf
--- /dev/null
+++ b/pages_tool/member/contact.vue
@@ -0,0 +1,29 @@
+<template>
+	<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>
+</template>
+
+<script>
+export default {
+	data() {
+		return {};
+	},
+	onLoad(options) {},
+	onShow() {},
+	methods: {}
+};
+</script>
+
+<style lang="scss">
+.contact {
+	width: 80%;
+	text-align: center;
+	margin: 0 auto;
+	image {
+		width: 500rpx;
+	}
+}
+</style>
diff --git a/pages_tool/member/coupon.vue b/pages_tool/member/coupon.vue
new file mode 100644
index 0000000..b646bc9
--- /dev/null
+++ b/pages_tool/member/coupon.vue
@@ -0,0 +1,401 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view :class="isIphoneX ? 'iphone-x' : ''">
+		<view class="cf-container color-line-border" v-if="storeToken">
+			<view class="tab">
+				<view @click="changeState(1)"><text :class="state == 1 ? 'color-base-text active color-base-border-bottom' : ''">未使用</text></view>
+				<view @click="changeState(2)"><text :class="state == 2 ? 'color-base-text active color-base-border-bottom' : ''">已使用</text></view>
+				<view @click="changeState(3)"><text :class="state == 3 ? 'color-base-text active color-base-border-bottom' : ''">已过期</text></view>
+			</view>
+			<!-- <view class="coupon-head">
+				<view class="sort" :class="sort == 1 ? 'color-base-border color-base-text' : ''" @click="changeSort(1, '')">全部</view>
+				<view class="sort" :class="sort == 2 ? 'color-base-border color-base-text' : ''" @click="changeSort(2, 'reward')">满减券</view>
+				<view class="sort" :class="sort == 3 ? 'color-base-border color-base-text' : ''" @click="changeSort(3, 'discount')">折扣券</view>
+				<view class="sort" :class="sort == 4 ? 'color-base-border color-base-text' : ''" @click="changeSort(4, 'no_threshold')">无门槛券</view>
+			</view> -->
+		</view>
+
+		<mescroll-uni ref="mescroll" top="100" @getData="getMemberCounponList" 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)' }">
+						<view class="item-base">
+							<image class="coupon-line" mode="heightFix" :src="$util.img('public/uniapp/coupon/coupon_line.png')"/>
+							<view>
+								<view class="use_price " v-if="item.type == 'divideticket'">
+									<text>￥</text>
+									{{ parseFloat(item.money) }}
+								</view>
+								<view class="use_price " v-if="item.type == 'reward'">
+									<text>￥</text>
+									{{ parseFloat(item.money) }}
+								</view>
+								<view class="use_price" v-else-if="item.type == 'discount'">
+									{{ parseFloat(item.discount) }}
+									<text>折</text>
+								</view>
+								<view class="use_condition font-size-tag" v-if="item.at_least > 0">
+									满{{ item.at_least }}元可用</view>
+								<view class="use_condition font-size-tag" v-else>无门槛优惠券</view>
+							</view>
+						</view>
+						<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" 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 }">
+									{{ item.use_store==='all'?'适用门店：全部门店': '适用门店：'+item.use_store_name}}
+								</view> -->
+							</view>
+							<view class="use_time" v-if="item.end_time">有效期：{{ $util.timeStampTurnTime(item.end_time) }}
+							</view>
+							<view class="use_time" v-else>有效期：长期有效</view>
+						</view>
+						<view class="item-btn">
+							<view class="tag" v-if="item.state == 1">去使用</view>
+							<view class="tag disabled" v-if="item.state == 2">已使用</view>
+							<view class="tag disabled" v-if="item.state == 3">已过期</view>
+						</view>
+					</view>
+				</view>
+				<view v-if="!list.length && showEmpty" class="margin-top cart-empty" :fixed="false">
+					<ns-empty :isIndex="true" :emptyBtn="{url: '/pages/index/index',text: '去逛逛'}" text="暂无优惠券"></ns-empty>
+				</view>
+			</block>
+		</mescroll-uni>
+		<ns-login ref="ns-login"></ns-login>
+		<loading-cover ref="loadingCover"></loading-cover>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				type: '',
+				types: '',
+				state: 1,
+				sort: 1,
+				list: [],
+				isIphoneX: false, //判断手机是否是iphoneX以上
+				showEmpty: false,
+				related_id: 0
+			};
+		},
+		onLoad(data) {
+			setTimeout( () => {
+				if (!this.addonIsExist.coupon) {
+					this.$util.showToast({
+						title: '商家未开启优惠券',
+						mask: true,
+						duration: 2000
+					});
+					setTimeout(() => {
+						this.$util.redirectTo('/pages/index/index');
+					}, 2000);
+				}
+			},1000);
+
+			if (data.related_id) this.related_id = data.related_id ? data.related_id : 0;
+			this.isIphoneX = this.$util.uniappIsIPhoneX();
+		},
+		onShow() {
+			if (this.storeToken) {
+				if (this.$refs.mescroll) this.$refs.mescroll.refresh();
+			} else {
+				this.$nextTick(() => {
+					this.$refs.login.open('/pages_tool/member/coupon');
+				});
+			}
+		},
+		methods: {
+			//切换状态
+			changeState(state) {
+				this.list = [];
+				this.state = state;
+				this.$refs.mescroll.refresh(false);
+			},
+			changeSort(sort, types) {
+				this.list = [];
+				this.sort = sort;
+				this.types = types;
+				this.$refs.mescroll.refresh(false);
+			},
+			getMemberCounponList(mescroll) {
+				this.showEmpty = false;
+				this.$api.sendRequest({
+					url: '/coupon/api/coupon/memberpage',
+					data: {
+						page: mescroll.num,
+						page_size: mescroll.size,
+						state: this.state,
+						is_own: this.type,
+						type: this.types,
+						related_id: this.related_id
+					},
+					success: res => {
+						this.showEmpty = true;
+						let newArr = [];
+						let msg = res.message;
+						if (res.code == 0 && res.data) {
+							newArr = res.data.list;
+						} else {
+							this.$util.showToast({
+								title: msg
+							});
+						}
+						mescroll.endSuccess(newArr.length);
+						//设置列表数据
+						if (mescroll.num == 1) {
+							this.list = []; //如果是第一页需手动制空列表
+							this.related_id = 0;
+						}
+						this.list = this.list.concat(newArr); //追加新数据
+						let data = res.data;
+						if (data) this.couponList = data;
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					},
+					fail: res => {
+						mescroll.endErr();
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					}
+				});
+			},
+			imageError(index) {
+				this.list[index].logo = this.$util.getDefaultImage().goods;
+				this.$forceUpdate();
+			},
+			toGoodsList(item) {
+				if (item.state == 1) {
+					this.$util.redirectTo('/pages/goods/list', {
+						coupon: item.coupon_type_id
+					});
+				}
+			}
+		},
+		watch: {
+			storeToken: function(nVal, oVal) {
+				if (nVal) {
+					this.$refs.mescroll.refresh();
+				}
+			}
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	.cart-empty {
+		margin-top: 208rpx !important;
+	}
+
+	.active {
+		border-bottom: 4rpx solid;
+	}
+
+	.coupon-head {
+		display: flex;
+		background: #fff;
+		padding: 20rpx 50rpx;
+
+		.sort {
+			border: 2rpx solid #c5c5c5;
+			padding: 1rpx 20rpx;
+			border-radius: 10rpx;
+			cursor: pointer;
+			margin-right: 15rpx;
+		}
+	}
+
+	.cf-container {
+		background: #fff;
+		overflow: hidden;
+	}
+
+	.tab {
+		display: flex;
+		justify-content: space-between;
+		height: 86rpx;
+
+		>view {
+			text-align: center;
+			width: 33%;
+			height: 86rpx;
+
+			text {
+				display: inline-block;
+				line-height: 86rpx;
+				height: 80rpx;
+				font-size: 30rpx;
+			}
+		}
+	}
+
+	.coupon-listone {
+		margin: 0 30rpx;
+
+		.item {
+			display: flex;
+			background-color: #fff2f0;
+			background-size: 100% 100%;
+			border-radius: 20rpx;
+			align-items: stretch;
+			margin-top: $padding;
+			overflow: hidden;
+
+			&.item-disabled {
+				.item-base {
+					background: #e7e7e7 !important;
+				}
+			}
+
+			.item-base {
+				position: relative;
+				width: 197rpx;
+				min-width: 197rpx;
+				text-align: center;
+				background: linear-gradient(to left, var(--bg-color), var(--bg-color-shallow));
+				background-repeat: no-repeat;
+				background-size: 100% 100%;
+				padding: 38rpx 10rpx 38rpx 18rpx;
+
+				&.disabled {
+					background: #dedede;
+				}
+
+				.coupon-line {
+					position: absolute;
+					right: 0;
+					top: 0;
+					height: 100%;
+				}
+
+				>view {
+					width: calc(100%);
+					height: auto;
+					position: relative;
+					top: 50%;
+					transform: translate(0, -50%);
+				}
+
+				.use_price {
+					font-size: 60rpx;
+					line-height: 1;
+					color: #fff;
+
+					text {
+						font-size: $font-size-toolbar;
+					}
+
+					&.disabled {
+						color: $color-tip;
+					}
+				}
+
+				.use_condition {
+					color: #fff;
+					margin-top: $padding;
+
+					&.margin_top_none {
+						margin-top: 0;
+					}
+
+					&.disabled {
+						color: $color-tip;
+					}
+				}
+
+				&::after {
+					position: absolute;
+					content: '';
+					background-color: #f8f8f8;
+					left: 0;
+					top: 50%;
+					transform: translate(0, -50%);
+					height: 30rpx;
+					width: 15rpx;
+					border-radius: 0 30rpx 30rpx 0;
+				}
+			}
+
+			.item-btn {
+				position: relative;
+				width: 160rpx;
+				min-width: 160rpx;
+				align-self: center;
+
+				view {
+					width: 100rpx;
+					height: 50rpx;
+					border-radius: $border-radius;
+					line-height: 50rpx;
+					margin: auto;
+					text-align: center;
+					background-image: linear-gradient(to right, var(--bg-color), var(--bg-color-shallow));
+					color: var(--btn-text-color);
+					;
+					font-size: $font-size-tag;
+
+					&.disabled {
+						background: $color-line !important;
+						color: $color-tip !important;
+					}
+				}
+
+				&::after {
+					position: absolute;
+					content: '';
+					background-color: #f8f8f8;
+					right: 0;
+					top: 50%;
+					transform: translate(0, -50%);
+					height: 30rpx;
+					width: 15rpx;
+					border-radius: 30rpx 0 0 30rpx;
+				}
+			}
+
+			.item-info {
+				flex: 1;
+				display: flex;
+				flex-direction: column;
+				justify-content: space-between;
+				margin-left: $padding;
+				overflow: hidden;
+				background-repeat-x: no-repeat;
+				background-repeat-y: repeat;
+
+				.use_time {
+					padding: $padding 0;
+					border-top: 2rpx dashed #cccccc;
+					font-size: $font-size-activity-tag;
+					color: #909399;
+				}
+
+				.use_title {
+					font-size: $font-size-base;
+					font-weight: 500;
+					padding: $padding 0;
+
+					.title {
+						overflow: hidden;
+						white-space: nowrap;
+						text-overflow: ellipsis;
+					}
+
+					.max_price {
+						font-weight: 400;
+						font-size: $font-size-tag;
+					}
+				}
+			}
+		}
+	}
+	.truncate {
+		overflow: hidden;
+		-o-text-overflow: ellipsis;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+	}
+</style>
\ No newline at end of file
diff --git a/pages_tool/member/footprint.vue b/pages_tool/member/footprint.vue
new file mode 100644
index 0000000..3938105
--- /dev/null
+++ b/pages_tool/member/footprint.vue
@@ -0,0 +1,253 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view class="container">
+		<view class="head-wrap" v-if="storeToken">
+			<text @click="manageFootprint">{{ manage ? '完成' : '管理' }}</text>
+		</view>
+		<mescroll-uni ref="mescroll" @getData="getListData" top="110rpx" v-if="storeToken">
+			<block slot="list">
+				<view class="goods-list single-column" v-if="goodsList.length">
+					<view v-for="(item, index) in goodsList" :key="index">
+						<view class="datetime">{{ datetime(item) }}</view>
+						<view class="goods-item" :class="{ manage: manage }">
+							<view class="checkbox-wrap" v-if="manage" @click="singleElection(item)">
+								<text class="iconfont" :class="$util.inArray(item.id, idArr) != -1 ? 'icon-yuan_checked color-base-text' : 'icon-yuan_checkbox'"></text>
+							</view>
+							<view class="goods-img" @click="toDetail(item)">
+								<image :src="goodsImg(item.goods_image)" mode="widthFix" @error="imgError(index)"></image>
+								<view class="color-base-bg goods-tag" v-if="goodsTag(item) != ''">{{ goodsTag(item) }}</view>
+							</view>
+							<view class="info-wrap" @click="toDetail(item)">
+								<view class="name-wrap">
+									<view class="goods-name">{{ item.goods_name }}</view>
+								</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"></image>
+									</view>
+									<view class="member-price-tag" v-else-if="item.promotion_type == 1">
+										<image :src="$util.img('public/uniapp/index/discount.png')" mode="widthFix"></image>
+									</view>
+								</view>
+								<view class="pro-info">
+									<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 class="sale font-size-activity-tag color-tip" v-if="item.sale_show">已售{{ item.sale_num }}{{ item.unit ? item.unit : '件' }}</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+				<view v-else><ns-empty text="暂无浏览过的商品"></ns-empty></view>
+
+				<view class="bottom-wrap" v-if="goodsList.length && manage">
+					<view class="all-election" @click="allElection">
+						<view class="iconfont" :class="isAll ? 'icon-yuan_checked color-base-text' : 'icon-yuan_checkbox'"></view>
+						<text>全选</text>
+					</view>
+					<view class="action-btn"><button type="primary" @click="deleteFootprint()" class="delete" :class="{ disabled: selected }">删除</button></view>
+				</view>
+			</block>
+		</mescroll-uni>
+
+		<ns-login ref="login"></ns-login>
+		<loading-cover ref="loadingCover"></loading-cover>
+	</view>
+</template>
+
+<script>
+var dateList = [];
+
+export default {
+	data() {
+		return {
+			goodsList: [],
+			current: -1,
+			manage: false,
+			idArr: [],
+			mescroll: null,
+			isSub: false,
+		};
+	},
+	onShow() {
+		if (this.storeToken) {
+			if (this.$refs.mescroll) this.$refs.mescroll.refresh();
+		} else {
+			this.$nextTick(() => {
+				this.$refs.login.open('/pages_tool/member/footprint');
+			});
+		}
+	},
+	computed: {
+		selected() {
+			return this.idArr.length == 0;
+		},
+		isAll() {
+			return this.idArr.length == this.goodsList.length;
+		}
+	},
+	methods: {
+		getListData(mescroll) {
+			this.mescroll = mescroll;
+			this.$api.sendRequest({
+				url: '/api/goodsbrowse/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.goodsList = []; //如果是第一页需手动制空列表
+					this.goodsList = this.goodsList.concat(newArr); //追加新数据
+					dateList = [];
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				},
+				fail: res => {
+					mescroll.endErr();
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				}
+			});
+		},
+		longpress(index) {
+			this.current = index;
+		},
+		deleteFootprint() {
+			if (this.idArr.length == 0) {
+				this.$util.showToast({
+					title: '请选择要删除的数据！'
+				});
+				return;
+			}
+			if (this.isSub) return;
+			this.isSub = true;
+			this.$api.sendRequest({
+				url: '/api/goodsbrowse/delete',
+				data: {
+					id: this.idArr.toString()
+				},
+				success: res => {
+					this.isSub = false;
+					if (res.code >= 0) {
+						this.idArr = [];
+						this.mescroll.resetUpScroll();
+					} else {
+						this.$util.showToast({
+							title: res.message
+						});
+					}
+				}
+			});
+		},
+		manageFootprint() {
+			this.manage = !this.manage;
+			dateList = [];
+		},
+		goodsImg(imgStr) {
+			let imgs = imgStr.split(',');
+			return imgs[0]
+				? this.$util.img(imgs[0], {
+						size: 'mid'
+				  })
+				: this.$util.getDefaultImage().goods;
+		},
+		imgError(index) {
+			dateList = [];
+			this.goodsList[index].goods_image = this.$util.getDefaultImage().goods;
+		},
+		showPrice(data) {
+			let price = data.discount_price;
+			if (data.member_price && parseFloat(data.member_price) < parseFloat(price)) price = data.member_price;
+			return price;
+		},
+		showMarketPrice(item) {
+			if (item.market_price_show) {
+				let price = this.showPrice(item);
+				if (item.market_price > 0) {
+					return item.market_price;
+				} else if (parseFloat(item.price) > parseFloat(price)) {
+					return item.price;
+				}
+			}
+			return '';
+		},
+		goodsTag(data) {
+			return data.label_name || '';
+		},
+		datetime(item) {
+			let date = new Date();
+			date.setTime(item.browse_time * 1000);
+			let y = date.getFullYear();
+			let m = date.getMonth() + 1;
+			m = m < 10 ? '0' + m : m;
+			let d = date.getDate();
+			d = d < 10 ? '0' + d : d;
+
+			var dateTime = y + '/' + m + '/' + d;
+
+			if (this.$util.inArray(dateTime, dateList) == -1) {
+				dateList.push(dateTime);
+				return dateTime;
+			}
+		},
+		singleElection(item) {
+			if (this.$util.inArray(item.id, this.idArr) == -1) {
+				this.idArr.push(item.id);
+			} else {
+				this.idArr.splice(this.$util.inArray(item.id, this.idArr), 1);
+			}
+			dateList = [];
+		},
+		allElection() {
+			if (this.idArr.length != this.goodsList.length) {
+				this.idArr = [];
+				let ids = [];
+				this.goodsList.forEach(item => {
+					ids.push(item.id);
+				});
+				this.idArr = ids;
+			} else {
+				this.idArr = [];
+			}
+			dateList = [];
+		},
+		toDetail(e) {
+			this.$util.redirectTo('/pages/goods/detail', {
+				goods_id: e.goods_id
+			});
+		}
+	},
+	watch: {
+		storeToken: function(nVal, oVal) {
+			if (nVal) {
+				this.$refs.mescroll.refresh();
+			}
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+/deep/ .empty {
+	margin-top: 0 !important;
+}
+
+@import './public/css/footprint.scss';
+</style>
diff --git a/pages_tool/member/info.vue b/pages_tool/member/info.vue
new file mode 100644
index 0000000..066494d
--- /dev/null
+++ b/pages_tool/member/info.vue
@@ -0,0 +1,334 @@
+<template>
+	<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 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>
+			</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>
+				<text class="cell-tip">{{ memberInfoformData.number }}</text>
+				<text class="cell-more"></text>
+			</view> -->
+			<!-- 账号 -->
+		<!-- 	<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 class="info-list-cell info-list-con" hover-class="cell-hover" @click="modifyInfo('name')">
+				<text class="cell-tit">昵称</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-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-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-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 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>
+				<text class="cell-more"></text>
+			</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')">
+				<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 class="info-list-cell info-list-con" hover-class="cell-hover" @click="cancellation()">
+				<text class="cell-tit">注销账号</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">
+				<text class="cell-tit">版本号</text>
+				<text class="cell-tip cell-tip1">{{ version }}</text>
+			</view> -->
+
+			<!-- 语言 -->
+			<!-- <view class="info-list-cell info-item info-list-con" hover-class="cell-hover" @click="modifyInfo('language')">
+				<text class="cell-tit">{{ $lang('lang') }}</text>
+				<text class="cell-tip">{{ langList[langIndex].name }}</text>
+				<text class="cell-more"></text>
+			</view> -->
+			<!-- 退出登录 -->
+			<!-- <view class="info-list-cell log-out-btn" >
+				<text class="cell-tit color-base-text"></text>
+			</view> -->
+			<!-- #ifdef H5 -->
+
+			<!-- #endif -->
+			<view class="save-item" @click="logout">
+				<button type="primary">退出登录</button>
+			</view>
+		</view>
+
+		<ns-login ref="login"></ns-login>
+	</view>
+</template>
+
+<script>
+	import uniNavBar from '@/pages_tool/components/uni-nav-bar/uni-nav-bar.vue';
+	import info from './public/js/info.js';
+
+	export default {
+		components: {
+			uniNavBar
+		},
+		data() {
+			return {
+				version: ''
+			};
+		},
+		mixins: [info],
+		onLoad(data) {
+			this.version = this.$config.version;
+		},
+	};
+</script>
+
+<style lang="scss">
+	.info-head {
+		.head-nav {
+			width: 100%;
+			height: var(--status-bar-height);
+			background: #ffffff;
+		}
+
+		.head-nav.active {
+			padding-top: 40rpx;
+		}
+	}
+
+	.captcha {
+		width: 170rpx;
+		height: 50rpx;
+	}
+
+	.info-list-cell {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		padding: 24rpx 30rpx;
+		position: relative;
+		line-height: 50rpx;
+		background-color: #fff;
+
+		&:first-child {
+			padding: 28rpx 30rpx;
+		}
+
+		.cell-tit {
+			white-space: nowrap;
+		}
+
+		.cell-tip1 {
+			margin-right: 40rpx;
+		}
+
+		&.log-out-btn {
+			margin-top: 40rpx;
+
+			.cell-tit {
+				margin: auto;
+			}
+		}
+
+		.info-list-head {
+			border: 1rpx solid $color-line;
+			width: 82rpx;
+			height: 82rpx;
+			border-radius: 50%;
+		}
+
+		.info-list-head image {
+			max-width: 100%;
+			max-height: 100%;
+		}
+
+		// #ifdef MP
+		&.info-item {
+			margin-top: 16rpx;
+		}
+
+		// #endif
+
+		&.info-list-con~&.info-list-con:after {
+			content: '';
+			position: absolute;
+			left: 30rpx;
+			right: 30rpx;
+			top: 0;
+			border-bottom: 1rpx solid $color-line;
+		}
+
+		.cell-tip {
+			margin-left: auto;
+			color: $color-tip;
+			overflow: hidden;
+			white-space: nowrap;
+			text-overflow: ellipsis;
+			max-width: 470rpx;
+		}
+
+		.cell-more {
+			margin-left: 10rpx;
+			width: 32rpx;
+			height: 100%;
+		}
+
+		.cell-more:after {
+			content: '';
+			display: block;
+			width: 12rpx;
+			height: 12rpx;
+
+			border: 2rpx solid darken($color-line, 20%) {
+				right-color: transparent;
+				bottom-color: transparent;
+			}
+
+			transform: rotate(135deg);
+		}
+	}
+
+	.edit-info-box {
+		margin-top: 20rpx;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding: 20rpx 40rpx;
+		min-height: 50rpx;
+		background-color: #fff;
+
+		.info-name {
+			width: 150rpx;
+			font-size: $font-size-base;
+			text-align: left;
+		}
+
+		.info-content {
+			width: 0;
+			font-size: $font-size-base;
+			padding: 0;
+			flex: 1;
+		}
+
+		.dynacode {
+			margin: 0;
+			padding: 0 10rpx;
+			width: 250rpx;
+			height: 60rpx;
+			font-size: $font-size-base;
+			line-height: 60rpx;
+			color: #fff;
+			word-break: break-all;
+		}
+
+		.edit-sex-list {
+			display: flex;
+
+			label {
+				display: flex;
+				margin-left: 30rpx;
+				align-items: center;
+			}
+		}
+
+		uni-radio .uni-radio-input {
+			width: 32rpx;
+			height: 32rpx;
+		}
+	}
+
+	.set-pass-tips {
+		padding: 20rpx 20rpx 0 20rpx;
+	}
+
+	.input-len {
+		width: 500rpx !important;
+	}
+
+	.save-item {
+		margin: 50rpx auto;
+
+		button {
+			font-size: 30rpx;
+		}
+	}
+
+	.empty {
+		width: 100%;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		padding: $padding;
+		box-sizing: border-box;
+		justify-content: center;
+		padding-top: 80rpx;
+
+		.empty_img {
+			width: 63%;
+			height: 450rpx;
+
+			image {
+				width: 100%;
+				height: 100%;
+			}
+		}
+
+		.iconfont {
+			font-size: 190rpx;
+			color: $color-tip;
+			line-height: 1.2;
+		}
+
+		button {
+			min-width: 300rpx;
+			margin-top: 100rpx;
+			height: 70rpx;
+			line-height: 70rpx;
+			font-size: $font-size-base;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages_tool/member/info_edit.vue b/pages_tool/member/info_edit.vue
new file mode 100644
index 0000000..bf3de74
--- /dev/null
+++ b/pages_tool/member/info_edit.vue
@@ -0,0 +1,394 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view>
+		<template v-if="memberInfo">
+			<!-- 修改用户名 -->
+			<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" />
+				</view>
+				<view class="color-tip font-size-goods-tag set-pass-tips">用户名仅可修改一次，请谨慎设置</view>
+				<view class="save-item" @click="save('username')">
+					<button type="primary">保存</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" />
+				</view>
+				<view class="save-item" @click="save('name')">
+					<button type="primary">保存</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" />
+				</view>
+				<view class="save-item" @click="save('realName')">
+					<button type="primary">保存</button>
+				</view>
+			</view>
+			<!-- 修改性别 -->
+			<view v-if="indent == 'sex'" class="edit-info">
+				<view class="edit-info-box">
+					<text class="info-name">性别</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>
+								<radio :color="themeStyle.main_color" :value="item.value" :checked="index === formData.sex" />
+							</view>
+							<view>{{ item.name }}</view>
+						</label>
+					</radio-group>
+				</view>
+				<view class="save-item" @click="save('sex')">
+					<button type="primary">保存</button>
+				</view>
+			</view>
+			<!-- 修改生日 -->
+			<view v-if="indent == 'birthday'" class="edit-info edit-birthday-list">
+				<view class="edit-info-box">
+					<text class="info-name">生日</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>
+				</view>
+			</view>
+			<!-- 修改密码 -->
+			<view v-if="indent == 'password'" class="edit-info">
+				<block v-if="memberInfo.password == 0 && memberInfo.mobile == ''">
+					<view class="empty">
+						<view class="empty_img">
+							<image :src="$util.img('public/uniapp/common/common-empty.png')" mode="aspectFit"></image>
+						</view>
+						<view class="color-tip margin-top margin-bottom">请先绑定手机再执行该操作</view>
+						<button type="primary" size="mini" class="mini button color-base-bg" @click="modifyInfo('mobile')">立即绑定</button>
+					</view>
+				</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" />
+					</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" />
+							<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="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" />
+					</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" />
+					</view>
+
+					<view class="save-item" @click="save('password')">
+						<button type="primary">保存</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" />
+				</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" />
+					<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>
+				</view>
+				<view class="save-item" @click="save('mobile')">
+					<button type="primary">保存</button>
+				</view>
+			</view>
+			<!-- 绑定手机号 -->
+			<view v-if="indent == 'bind_mobile'" class="edit-info">
+				<view class="save-item bind-mobile">
+					<button type="primary" open-type="getPhoneNumber" @getphonenumber="mobileAuth">一键授权绑定</button>
+				</view>
+				<view class="save-item bind-mobile">
+					<button type="primary" @click="manualBinding">手动绑定</button>
+				</view>
+			</view>
+			<view v-if="indent == 'address'" class="edit-info">
+				<view class="edit-info-box">
+					<text class="info-name">所在地区</text>
+					<pick-regions :default-regions="defaultRegions" select-arr="3" @getRegions="handleGetRegions">
+						<text class="select-address " :class="{'color-tip': !formData.fullAddress }">
+							{{ formData.fullAddress ? formData.fullAddress : '请选择省市区县' }}
+						</text>
+					</pick-regions>
+				</view>
+				<view class="edit-info-box">
+					<text class="info-name">详细地址</text>
+					<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>
+				</view>
+			</view>
+		</template>
+		<ns-login ref="login"></ns-login>
+	</view>
+</template>
+
+<script>
+	import uniNavBar from '@/pages_tool/components/uni-nav-bar/uni-nav-bar.vue';
+	import pickRegions from '@/components/pick-regions/pick-regions.vue';
+	import info from './public/js/info.js';
+	import auth from '@/common/js/auth.js';
+
+	export default {
+		components: {
+			uniNavBar,
+			pickRegions
+		},
+		data() {
+			return {};
+		},
+		onLoad(data) {
+			if (data.type) this.indent = data.type;
+		},
+		mixins: [info, auth],
+		filters: {
+			mobile(mobile) {
+				return mobile.substring(0, 4 - 1) + '****' + mobile.substring(6 + 1);
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	.info-head {
+		.head-nav {
+			width: 100%;
+			height: var(--status-bar-height);
+			background: #ffffff;
+		}
+
+		.head-nav.active {
+			padding-top: 40rpx;
+		}
+	}
+
+	.captcha {
+		width: 170rpx;
+		height: 50rpx;
+	}
+
+	.info-list-cell {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		padding: 24rpx 30rpx;
+		position: relative;
+		line-height: 50rpx;
+		background-color: #fff;
+
+		&:first-child {
+			padding: 28rpx 30rpx;
+		}
+
+		.cell-tip1 {
+			margin-right: 40rpx;
+		}
+
+		&.log-out-btn {
+			margin-top: 40rpx;
+
+			.cell-tit {
+				margin: auto;
+			}
+		}
+
+		.info-list-head {
+			border: 1rpx solid $color-line;
+			width: 82rpx;
+			height: 82rpx;
+			border-radius: 50%;
+		}
+
+		.info-list-head image {
+			max-width: 100%;
+			max-height: 100%;
+		}
+
+		// #ifdef MP
+		&.info-item {
+			margin-top: 16rpx;
+		}
+		// #endif
+
+		&.info-list-con~&.info-list-con:after {
+			content: '';
+			position: absolute;
+			left: 30rpx;
+			right: 30rpx;
+			top: 0;
+			border-bottom: 1rpx solid $color-line;
+		}
+
+		.cell-tip {
+			margin-left: auto;
+			color: $color-tip;
+			overflow: hidden;
+			white-space: nowrap;
+			text-overflow: ellipsis;
+			max-width: 470rpx;
+		}
+
+		.cell-more {
+			margin-left: 10rpx;
+			width: 32rpx;
+			height: 100%;
+		}
+
+		.cell-more:after {
+			content: '';
+			display: block;
+			width: 12rpx;
+			height: 12rpx;
+
+			border: 2rpx solid darken($color-line, 20%) {
+				right-color: transparent;
+				bottom-color: transparent;
+			}
+
+			transform: rotate(135deg);
+		}
+	}
+
+	.edit-info-box {
+		margin-top: 20rpx;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding: 20rpx 40rpx;
+		min-height: 50rpx;
+		background-color: #fff;
+
+		.info-name {
+			width: 150rpx;
+			font-size: $font-size-base;
+			text-align: left;
+		}
+
+		.info-content {
+			flex: 1;
+			width: 0;
+			font-size: $font-size-base;
+			padding: 0;
+		}
+
+		.dynacode {
+			margin: 0;
+			padding: 0 10rpx;
+			width: 250rpx;
+			height: 60rpx;
+			font-size: $font-size-base;
+			line-height: 60rpx;
+			word-break: break-all;
+		}
+
+		.edit-sex-list {
+			display: flex;
+
+			label {
+				display: flex;
+				margin-left: 30rpx;
+				align-items: center;
+			}
+		}
+
+		uni-radio .uni-radio-input {
+			width: 32rpx;
+			height: 32rpx;
+		}
+
+		.pick-regions {
+			flex: 1;
+		}
+	}
+
+	.set-pass-tips {
+		padding: 20rpx 20rpx 0 20rpx;
+	}
+
+	.input-len {
+		width: 500rpx !important;
+	}
+
+	.save-item {
+		margin-top: 50rpx;
+
+		button {
+			font-size: 30rpx;
+		}
+	}
+
+	.bind-mobile {
+		button {
+			border-radius: 60rpx;
+		}
+	}
+
+	.empty {
+		width: 100%;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		padding: $padding;
+		box-sizing: border-box;
+		justify-content: center;
+		padding-top: 80rpx;
+
+		.empty_img {
+			width: 63%;
+			height: 450rpx;
+
+			image {
+				width: 100%;
+				height: 100%;
+			}
+		}
+
+		.iconfont {
+			font-size: 190rpx;
+			color: $color-tip;
+			line-height: 1.2;
+		}
+
+		button {
+			min-width: 300rpx;
+			margin-top: 100rpx;
+			height: 70rpx;
+			line-height: 70rpx;
+			font-size: $font-size-base;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages_tool/member/invite_friends.vue b/pages_tool/member/invite_friends.vue
new file mode 100644
index 0000000..04ba327
--- /dev/null
+++ b/pages_tool/member/invite_friends.vue
@@ -0,0 +1,276 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view>
+		<view v-if="info" style="background-color: #fff;">
+
+			<view class="invite_adv">
+				<image :src="$util.img('public/uniapp/member/invite/top_bg.png')" mode="widthFix"></image>
+
+				<view class="desc" @click="openRulePopup" v-if="info.remark != ''">
+					<text class="iconfont icon-bangzhu"></text>
+					活动说明
+				</view>
+				<image class="font" :src="$util.img('public/uniapp/member/invite/top_font.png')" mode="widthFix"/>
+				<view class="time">
+					活动时间：{{ $util.timeStampTurnTime(info.start_time, 1) }}至{{ $util.timeStampTurnTime(info.end_time, 1) }}
+				</view>
+
+				<view class="btn" :style="{ 'background-image': 'url(' + $util.img('public/uniapp/member/invite/top_btn.png') + ')' }" @click="openSharePopup">立即邀请</view>
+			</view>
+			<view class="content invite-list">
+				<view class="title">我的好友</view>
+				<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="img color-base-border">
+									<image mode="aspectFit" :src="item.headimg == '' ? $util.img($util.getDefaultImage().head) : $util.img(item.headimg)"/>
+								</view>
+								<view class="list-left">
+									<view class="info">
+										<view class="name font-size-tag">{{ item.source_member_nickname }}</view>
+										<view class="time font-size-activity-tag color-tip">
+											{{ $util.timeStampTurnTime(item.create_time) }}
+										</view>
+									</view>
+									<view class="prize color-base-text font-size-activity-tag">
+										<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.coupon_num > 0">{{ item.coupon_num }}张优惠券</block>
+									</view>
+								</view>
+							</view>
+						</view>
+						<view class="more_invite color-tip font-size-tag " @click="moreList" v-if="isClick && total_num > page">
+							查看更多
+							<text class="iconfont icon-iconangledown"></text>
+						</view>
+						<view class="more_invite color-tip font-size-tag " @click="moreList" v-if="!isClick && inviteList.length > 5 && total_num <= page">没有更多数据了</view>
+					</view>
+				</block>
+				<block v-else>
+					<view class="empty">
+						<view class="tip">您还没有邀请到新朋友哦</view>
+						<view class="tip">邀请好友，赚取好礼。赶紧去试试吧~</view>
+					</view>
+				</block>
+			</view>
+			<view class="content">
+				<view class="title">邀请好友奖励</view>
+				<view class="invite_active">
+					<view class="list">
+						<view class="item" v-if="$util.inArray('balance', info.type) != -1">
+							<image :src="$util.img('public/uniapp/member/invite/coupon_bg.png')" mode="aspectFill"/>
+							<view class="desc">
+								<view class="price">
+									<text class="font-size-base">{{ $lang('common.currencySymbol') }}</text>
+									<text>{{ info.balance }}</text>
+								</view>
+								<view class="type">现金红包</view>
+							</view>
+						</view>
+
+						<view class="item" v-if="$util.inArray('point', info.type) != -1">
+							<image :src="$util.img('public/uniapp/member/invite/coupon_bg.png')" mode="aspectFill"/>
+							<view class="desc">
+								<view class="price">
+									<text>{{ parseInt(info.point) }}</text>
+								</view>
+								<view class="type">积分</view>
+							</view>
+						</view>
+
+						<view class="item margin_right_none" v-if="$util.inArray('coupon', info.type) != -1">
+							<image :src="$util.img('public/uniapp/member/invite/coupon_bg.png')" mode="aspectFill">
+							</image>
+							<view class="desc">
+								<view class="price">
+									<text>{{ info.coupon.split(',').length }}</text>
+									张
+								</view>
+								<view class="type">优惠券</view>
+							</view>
+						</view>
+					</view>
+					<view class="desc">
+						<view class="title_desc color-tip">分享给好友，让好友通过你的分享链接进入并注册登录，可获得以下奖励：</view>
+						<view class="desc_list">
+							<view class="" v-if="$util.inArray('balance', info.type) != -1">
+								<text>●</text>
+								可得{{ info.balance }}元红包奖励
+							</view>
+							<view class="" v-if="$util.inArray('point', info.type) != -1">
+								<text>●</text>
+								可得{{ info.point }}积分
+							</view>
+							<view class="" v-if="$util.inArray('coupon', info.type) != -1">
+								<text>●</text>
+								可得{{ info.coupon.split(',').length }}张优惠券
+							</view>
+
+							<view class="" v-if="info.max_fetch == 0">
+								<text>●</text>
+								可得奖励不受限制
+							</view>
+							<view class="" v-else>
+								<text>●</text>
+								奖励上限为{{ info.max_fetch }}人
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="content">
+				<view class="title">如何邀请好友</view>
+				<view class="invite_active">
+					<view class="step">
+						<view>
+							<view class="img">
+								<image :src="$util.img('public/uniapp/member/invite/fenxiang.png')" mode="aspectFit"/>
+							</view>
+							<view class="text">分享链接给好友</view>
+						</view>
+						<view>
+							<image :src="$util.img('public/uniapp/member/invite/jiantou.png')" class="jiantou"></image>
+						</view>
+						<view>
+							<view class="img">
+								<image :src="$util.img('public/uniapp/member/invite/shouji.png')" mode="aspectFit"/>
+							</view>
+							<view class="text">好友进入</view>
+						</view>
+						<view>
+							<image :src="$util.img('public/uniapp/member/invite/jiantou.png')" class="jiantou"></image>
+						</view>
+						<view>
+							<view class="img">
+								<image :src="$util.img('public/uniapp/member/invite/hongbao.png')" mode="aspectFit"/>
+							</view>
+							<view class="text">好友注册成功获得奖励</view>
+						</view>
+					</view>
+				</view>
+			</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)" mode="widthFix" :show-menu-by-longpress="true" />
+							</view>
+							<!-- #ifdef MP || APP-PLUS  -->
+							<view class="save" @click="savePoster()">保存图片</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>
+
+			<!-- 分享弹窗 -->
+			<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 -->
+							<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="rulePopup" type="bottom">
+					<view class="tips-layer">
+						<view class="head" @click="closeRulePopup()">
+							<view class="title">活动说明</view>
+							<text class="iconfont icon-close"></text>
+						</view>
+						<view class="body">
+							<view class="detail margin-bottom">{{ info.remark }}</view>
+						</view>
+					</view>
+				</uni-popup>
+			</view>
+		</view>
+		<ns-empty v-else text="暂无相关数据"></ns-empty>
+		<ns-login ref="login"></ns-login>
+		<loading-cover ref="loadingCover"></loading-cover>
+	</view>
+</template>
+
+<script>
+	import inviteFriends from './public/js/invite_friends.js';
+	export default {
+		data() {
+			return {
+				inviteList: [],
+				info: null,
+				page: 1,
+				page_size: 5,
+				total_num: 0,
+				isClick: true,
+				poster: '-1', //海报
+				posterMsg: '' //海报错误信息
+			};
+		},
+		onLoad(option) {
+			this.getBaseInfo();
+			if (this.storeToken) {
+				this.getList();
+			} else {
+				this.$nextTick(() => {
+					this.$refs.login.open('/pages_tool/member/invite_friends');
+				});
+			}
+		},
+		onShow() {},
+		mixins: [inviteFriends],
+		onReady() {}
+	};
+</script>
+
+<style lang="scss">
+	@import './public/css/invite_friends.scss';
+</style>
+<style scoped>
+	/deep/ .uni-popup__wrapper.bottom {
+		border-radius: 24rpx 24rpx 0 0;
+	}
+
+	.poster-layer>>>.uni-popup__wrapper-box {
+		max-height: initial !important;
+	}
+</style>
\ No newline at end of file
diff --git a/pages_tool/member/level.vue b/pages_tool/member/level.vue
new file mode 100644
index 0000000..899fe0d
--- /dev/null
+++ b/pages_tool/member/level.vue
@@ -0,0 +1,381 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view class="member-level">
+		<view class="level-top">
+			<image :src="$util.img('public/uniapp/level/level-top-bg.png')"></image>
+		</view>
+		<view class="banner-container">
+			<view class="memberInfo" v-if="memberInfo">
+				<image :src="$util.img(memberInfo.headimg)" v-if="memberInfo.headimg" @error="memberInfo.headimg = $util.getDefaultImage().head" mode="aspectFill"></image>
+				<image :src="$util.getDefaultImage().head" v-else mode="aspectFill"></image>
+				<view class="member-desc">
+					<view class="font-size-base">{{ memberInfo.nickname }}</view>
+					<view class="font-size-activity-tag">当前等级：{{ memberInfo.member_level_name }}</view>
+				</view>
+				<view class="growth-rules font-size-tag" @click="growthRules">
+					<text class="iconfont icon-wenhao font-size-tag"></text>
+					成长规则
+				</view>
+			</view>
+			<swiper :style="{ width: '100vw', height: '390rpx' }" class="margin-bottom"
+				:indicator-dots="swiperConfig.indicatorDots" :indicator-color="swiperConfig.indicatorColor"
+				:indicator-active-color="swiperConfig.indicatorActiveColor" :autoplay="false"
+				: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">
+					<view class="image-container" :class="[
+							curIndex === 0
+								? i === listLen - 1
+									? 'item-left'
+									: i === 1
+									? 'item-right'
+									: 'item-center'
+								: curIndex === listLen - 1
+								? i === 0
+									? 'item-right'
+									: i === listLen - 2
+									? 'item-left'
+									: 'item-center'
+								: i === curIndex - 1
+								? 'item-left'
+								: i === curIndex + 1
+								? 'item-right'
+								: 'item-center'
+						]">
+						<view class="slide-image" style="background-size: 100% 100%;background-repeat:no-repeat" :style="{
+								transform: curIndex === i ? 'scale(' + scaleX + ',' + scaleY + ')' : 'scale(1,1)',
+								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']}"/>
+
+							<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>
+								<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>
+								<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 }}成长值成为{{
+												levelList[curIndex + 1].level_name
+											}}
+										</view>
+									</block>
+									<block v-else>
+										<view class="residue-growr-value" :style="{color:levelList[curIndex]['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 }}
+									</view>
+								</block>
+							</view>
+						</view>
+					</view>
+				</swiper-item>
+			</swiper>
+			<view class="member-equity" v-if="levelList[curIndex].is_free_shipping > 0 || levelList[curIndex].consume_discount > 0 || levelList[curIndex].point_feedback > 0">
+				<view class="equity-title">会员权益</view>
+				<view class="equity-itme" v-if="levelList[curIndex].is_free_shipping > 0">
+					<image :src="$util.img('public/uniapp/level/exemption_postage.png')" mode="aspectFit"></image>
+					<view class="equity-content" :class="{ active: levelList[curIndex].consume_discount > 0 }">
+						<text>包邮服务</text>
+						<text class="equity-desc">提供商品包邮服务</text>
+					</view>
+				</view>
+				<view class="equity-itme" v-if="levelList[curIndex].consume_discount > 0">
+					<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-else>提供{{ levelList[curIndex].consume_discount }}折消费折扣</text>
+					</view>
+				</view>
+				<view class="equity-itme" v-if="levelList[curIndex].point_feedback > 0">
+					<image :src="$util.img('public/uniapp/level/integral_feedback.png')" mode="aspectFit"></image>
+					<view class="equity-content">
+						<text>享受积分回馈服务</text>
+						<text class="equity-desc">提供{{ levelList[curIndex].point_feedback }}倍积分回馈倍率</text>
+					</view>
+				</view>
+			</view>
+
+			<view class="member-gift" v-if="levelList[curIndex].send_balance > 0 || levelList[curIndex].send_balance > 0 || levelList[curIndex].send_coupon">
+				<view class="gift-title">会员礼包</view>
+				<view class="gift-itme" v-if="levelList[curIndex].send_point > 0">
+					<image :src="$util.img('public/uniapp/level/integral.png')" mode="aspectFit"></image>
+					<view class="gift-content" :class="{ active: levelList[curIndex].send_balance > 0 }">
+						<text>积分礼包</text>
+						<text class="gift-desc">赠送{{ levelList[curIndex].send_point }}积分</text>
+					</view>
+				</view>
+				<view class="gift-itme" v-if="levelList[curIndex].send_balance > 0">
+					<image :src="$util.img('public/uniapp/level/red_packet.png')" mode="aspectFit"></image>
+					<view class="gift-content" :class="{ active: levelList[curIndex].send_coupon }">
+						<text>红包礼包</text>
+						<text class="gift-desc">赠送{{ levelList[curIndex].send_balance }}元红包</text>
+					</view>
+				</view>
+				<view class="gift-itme" v-if="levelList[curIndex].send_coupon" @click="openCoupon(levelList[curIndex].send_coupon)">
+					<image :src="$util.img('public/uniapp/level/coupon.png')" mode="aspectFit"></image>
+					<view class="gift-content">
+						<text>优惠券礼包</text>
+						<text class="gift-desc">赠送{{ levelList[curIndex].coupon_length }}张优惠券</text>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<!-- 优惠券 -->
+		<uni-popup ref="couponPopup" type="bottom">
+			<view class="coupon-popup-box">
+				<view class="coupon-popup-title" @click="closeCoupon">
+					优惠券
+					<text class="iconfont icon-close"></text>
+				</view>
+				<scroll-view class="coupon-popup-content" scroll-y>
+					<view class="coupon-item" v-for="(item, index) in couponPopList" :key="index">
+						<view class="coupon-name">
+							<text class="name">{{ item.coupon_name }}</text>
+							<text class="desc"></text>
+						</view>
+						<view class="coupon-price" v-if="item.type == 'reward'">
+							<text>{{ item.money }}</text>
+							元
+						</view>
+						<view class="coupon-price" v-if="item.type == 'discount'">
+							<text>{{ $util.numberFixed(item.discount, 1) }}</text>
+							折
+						</view>
+					</view>
+				</scroll-view>
+			</view>
+		</uni-popup>
+
+		<to-top v-if="showTop" @toTop="scrollToTopNative()"></to-top>
+		<loading-cover ref="loadingCover"></loading-cover>
+		<ns-login ref="login"></ns-login>
+	</view>
+</template>
+
+<script>
+	import nsProgress from '@/pages_tool/components/ns-progress/ns-progress.vue';
+	import toTop from '@/components/toTop/toTop.vue';
+	import scroll from '@/common/js/scroll-view.js';
+	import uniPopup from '@/components/uni-popup/uni-popup.vue';
+
+	export default {
+		components: {
+			nsProgress,
+			toTop,
+			uniPopup
+		},
+		mixins: [scroll],
+		data() {
+			return {
+				couponPopList: [],
+				curIndex: 0,
+				descIndex: 0,
+				isDescAnimating: false,
+				scaleX: (634 / 540).toFixed(4),
+				scaleY: (378 / 330).toFixed(4),
+				swiperConfig: {
+					indicatorDots: false,
+					indicatorColor: 'rgba(255, 255, 255, .4)',
+					indicatorActiveColor: 'rgba(255, 255, 255, 1)',
+					interval: 3000,
+					duration: 300,
+					circular: false,
+					previousMargin: '58rpx',
+					nextMargin: '58rpx'
+				},
+				levelList: [{
+					needGrowth: 0,
+					growth: 0
+				}],
+				levelId: 0,
+				growth: 0,
+
+				nowIndex: 0, //我当前所在等级的index
+				rule: [] //成长值规则
+			};
+		},
+		computed: {
+			listLen() {
+				return this.levelList.length;
+			},
+			remark() {
+				if (this.levelList[this.curIndex]) {
+					return this.levelList[this.curIndex].remark;
+				}
+			},
+			nextIndex() {
+				let num = 0;
+				if (this.curIndex == this.levelList.length - 1) {
+					return this.curIndex;
+				} else {
+					return this.curIndex + 1;
+				}
+			}
+		},
+		onLoad() {
+			this.getLevelRule();
+			if (!this.storeToken) {
+				this.$nextTick(() => {
+					this.$refs.login.open('/pages_tool/member/level');
+				});
+			} else {
+				this.getLevelList();
+			}
+			// #ifdef MP-ALIPAY
+			this.scaleX = 1
+			this.scaleY = 1
+			// #endif
+		},
+		onShow() {
+		},
+		filters: {
+			rate(index, list, growth) {
+				let nowGrowth = Number(growth);
+				let minGrouth = Number(list[index].growth);
+				if (index == list.length - 1) {
+					return nowGrowth > minGrouth ? 100 : 0;
+				} else {
+					let maxGrouth = Number(list[index + 1].growth);
+					let num2 = nowGrowth - minGrouth;
+					let num1 = maxGrouth - minGrouth;
+					let num = Math.floor((num2 / num1) * 100);
+					return num > 100 ? 100 : num;
+				}
+			}
+		},
+		methods: {
+			swiperChange(e) {
+				let that = this;
+				this.curIndex = e.detail.current;
+				this.isDescAnimating = true;
+				let timer = setTimeout(function() {
+					that.descIndex = e.detail.current;
+					clearTimeout(timer);
+				}, 150);
+			},
+			animationfinish(e) {
+				this.isDescAnimating = false;
+			},
+			getBannerDetail(index) {
+				uni.showLoading({
+					title: '将前往详情页面',
+					duration: 2000,
+					mask: true
+				});
+			},
+			getLevelList() {
+				this.$api.sendRequest({
+					url: '/api/memberlevel/lists',
+					success: res => {
+						if (res.data && res.code == 0) {
+							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.levelId = this.memberInfo.member_level;
+							this.growth = this.memberInfo.growth;
+							for (let i = 0; i < this.levelList.length; i++) {
+								if (this.levelList[i].level_id == this.levelId) {
+									this.curIndex = i;
+									this.descIndex = i;
+									this.nowIndex = i;
+									break;
+								}
+							}
+							this.levelList.forEach((v, i) => {
+								if (parseFloat(v.growth) < parseFloat(this.growth)) {
+									v.needGrowth = 0;
+									v.rate = 100;
+								} else {
+									v.needGrowth = (parseFloat(v.growth) - parseFloat(this.growth))
+										.toFixed(2);
+									v.rate = (this.growth / v.growth).toFixed(2) * 100;
+								}
+							});
+
+							this.levelList.forEach(v => {
+								if (v.consume_discount) {
+									v.consume_discount = (v.consume_discount / 10).toFixed(2);
+								}
+							});
+							if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+						} else {
+							this.$util.showToast({
+								title: res.message
+							});
+							if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+						}
+					}
+				});
+			},
+			getLevelRule() {
+				this.$api.sendRequest({
+					url: '/api/member/accountrule',
+					success: res => {
+						if (res.code == 0 && res.data && res.data.growth) {
+							this.rule = res.data.growth;
+						}
+					}
+				});
+			},
+			growthRules() {
+				this.$util.redirectTo('/pages_tool/member/level_growth_rules');
+			},
+			openCoupon(data) {
+				this.couponPopList = [];
+				this.$api.sendRequest({
+					url: '/coupon/api/coupon/couponbyid',
+					data: {
+						id: data
+					},
+					success: res => {
+						if (res.code >= 0) {
+							this.couponPopList = res.data;
+						}
+					}
+				});
+				this.$refs.couponPopup.open();
+			},
+			closeCoupon() {
+				this.$refs.couponPopup.close();
+			}
+		},
+		onBackPress(options) {
+			if (options.from === 'navigateBack') {
+				return false;
+			}
+			this.$util.redirectTo('/pages/member/index');
+			return true;
+		},
+		watch: {
+			storeToken: function(nVal, oVal) {
+				if (nVal) {
+					this.getLevelList();
+				}
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	@import './public/css/level.scss';
+</style>
\ No newline at end of file
diff --git a/pages_tool/member/level_growth_rules.vue b/pages_tool/member/level_growth_rules.vue
new file mode 100644
index 0000000..14bdadf
--- /dev/null
+++ b/pages_tool/member/level_growth_rules.vue
@@ -0,0 +1,275 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view class="member-level">
+		<view class="grow-explain">
+			<view class="explain-title">
+				<image :src="$util.img('public/uniapp/level/growth_that_left.png')" mode="aspectFit"></image>
+				成长值说明
+				<image :src="$util.img('public/uniapp/level/growth_that_right.png')" mode="aspectFit"></image>
+			</view>
+			<view class="explain-table">
+				<view class="explain-tr">
+					<text class="explain-th">等级</text>
+					<text class="explain-th">成长值</text>
+				</view>
+				<view class="explain-tr" v-for="(item, index) in levelList" :key="index">
+					<text class="explain-td">{{ item.level_name }}</text>
+					<text class="explain-td">{{ item.growth }}</text>
+				</view>
+			</view>
+		</view>
+		<view class="grow-value">
+			<view class="title">
+				<image :src="$util.img('public/uniapp/level/explain.png')" mode="aspectFit"></image>
+				<text>什么是成长值</text>
+			</view>
+			<view class="content color-tip">成长值是消费者在店铺成为会员后，通过消费计算出来的值。成长值决定会员等级，会员等级越高，所享受的会员权益和会员礼包就越多。</view>
+		</view>
+		<view class="acquisition-grow">
+			<view class="title">
+				<image :src="$util.img('public/uniapp/level/explain.png')" mode="aspectFit"></image>
+				<text>如何获得成长值</text>
+			</view>
+			<view class="content color-tip">
+				<text>1、注册会员送x成长值。</text>
+				<text>2、会员充值到余额送x成长值。</text>
+				<text>3、会员签到送x成长值。</text>
+				<text>4、会员消费x元，交易完成即可获得x个成长值。</text>
+			</view>
+		</view>
+
+		<to-top v-if="showTop" @toTop="scrollToTopNative()"></to-top>
+		<loading-cover ref="loadingCover"></loading-cover>
+	</view>
+</template>
+
+<script>
+	import nsProgress from '@/pages_tool/components/ns-progress/ns-progress.vue';
+	import toTop from '@/components/toTop/toTop.vue';
+	import scroll from '@/common/js/scroll-view.js';
+
+	export default {
+		components: {
+			nsProgress,
+			toTop
+		},
+		mixins: [scroll],
+		data() {
+			return {
+				curIndex: 0,
+				descIndex: 0,
+				isDescAnimating: false,
+				scaleX: (634 / 540).toFixed(4),
+				scaleY: (378 / 330).toFixed(4),
+				swiperConfig: {
+					//type==1时的默认参数
+					indicatorDots: false,
+					indicatorColor: 'rgba(255, 255, 255, .4)',
+					indicatorActiveColor: 'rgba(255, 255, 255, 1)',
+					interval: 3000,
+					duration: 300,
+					circular: false,
+					previousMargin: '58rpx',
+					nextMargin: '58rpx'
+				},
+				levelList: [{
+					needGrowth: 0,
+					growth: 0
+				}],
+				levelId: 0,
+				growth: 0,
+
+				nowIndex: 0, //我当前所在等级的index
+				rule: [] //成长值规则
+			};
+		},
+		computed: {
+			listLen() {
+				return this.levelList.length;
+			},
+		},
+		onLoad() {
+			//会员等级
+			this.getLevelList();
+			this.getLevelRule();
+		},
+		onShow() {},
+		filters: {
+			rate(index, list, growth) {
+				let nowGrowth = Number(growth);
+				let minGrouth = Number(list[index].growth);
+				if (index == list.length - 1) {
+					return nowGrowth > minGrouth ? 100 : 0;
+				} else {
+					let maxGrouth = Number(list[index + 1].growth);
+					let num2 = nowGrowth - minGrouth;
+					let num1 = maxGrouth - minGrouth;
+					let num = Math.floor((num2 / num1) * 100);
+					return num > 100 ? 100 : num;
+				}
+			}
+		},
+		methods: {
+			swiperChange(e) {
+				let that = this;
+				this.curIndex = e.detail.current;
+				this.isDescAnimating = true;
+				let timer = setTimeout(function() {
+					that.descIndex = e.detail.current;
+					clearTimeout(timer);
+				}, 150);
+			},
+			animationfinish(e) {
+				this.isDescAnimating = false;
+			},
+			getBannerDetail(index) {
+				uni.showLoading({
+					title: '将前往详情页面',
+					duration: 2000,
+					mask: true
+				});
+			},
+			getLevelList() {
+				this.$api.sendRequest({
+					url: '/api/memberlevel/lists',
+					success: res => {
+						if (res.data && res.code == 0) {
+							this.levelList = res.data;
+							this.levelId = this.memberInfo.member_level;
+							this.growth = this.memberInfo.growth;
+							for (let i = 0; i < this.levelList.length; i++) {
+								if (this.levelList[i].level_id == this.levelId) {
+									this.curIndex = i;
+									this.descIndex = i;
+									this.nowIndex = i;
+									break;
+								}
+							}
+							this.levelList.forEach((v, i) => {
+								let rate = 0;
+								if (i != this.levelList.length - 1) {
+									v.needGrowth = Number(this.levelList[i + 1].growth) - Number(this.growth); //距离下一阶段需要多少成长值
+
+									if (v.needGrowth <= 0) {
+										rate = 100;
+									} else {
+										rate = (this.growth / this.levelList[i + 1].growth).toFixed(2) * 100;
+									}
+								} else {
+									v.needGrowth = Number(this.levelList[i].growth) - Number(this.growth); //距离下一阶段需要多少成长值
+									if (v.needGrowth <= 0) {
+										rate = 100;
+									} else {
+										rate = (this.growth / this.levelList[i].growth).toFixed(2) * 100;
+									}
+								}
+								v.rate = rate;
+							});
+
+							this.levelList.forEach(v => {
+								if (v.consume_discount) {
+									v.consume_discount = (v.consume_discount / 10).toFixed(2);
+								}
+							});
+							if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+						} else {
+							this.$util.showToast({
+								title: res.message
+							});
+							if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+						}
+					}
+				});
+			},
+			getLevelRule() {
+				this.$api.sendRequest({
+					url: '/api/member/accountrule',
+					success: res => {
+						if (res.code == 0 && res.data && res.data.growth) {
+							this.rule = res.data.growth;
+						}
+					}
+				});
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	page {
+		background-color: #fff;
+	}
+
+	.grow-explain {
+		padding: 30rpx;
+		margin-top: 30rpx;
+
+		.explain-title {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			line-height: 1;
+
+			image {
+				margin: 0 20rpx;
+				width: 54rpx;
+				height: 18rpx;
+			}
+
+			margin-bottom: 40rpx;
+		}
+
+		.explain-tr {
+			display: flex;
+		}
+
+		.explain-th {
+			padding: 10rpx 30rpx;
+
+			&~.explain-th {
+				border-left: 4rpx solid #fff;
+			}
+
+			flex: 1;
+			background-color: #f6f1e4;
+		}
+
+		.explain-td {
+			padding: 10rpx 30rpx;
+
+			&~.explain-td {
+				border-left: 4rpx solid #fff;
+			}
+
+			height: 60rpx;
+			line-height: 60rpx;
+			flex: 1;
+			background-color: #fcfbf7;
+		}
+	}
+
+	.grow-value,
+	.acquisition-grow {
+		padding: 0 30rpx 30rpx;
+
+		.title {
+			display: flex;
+			align-items: center;
+
+			image {
+				width: 30rpx;
+				height: 30rpx;
+				margin-right: 10rpx;
+			}
+		}
+
+		.content {
+			font-size: 24rpx;
+			margin-left: 40rpx;
+
+			text {
+				display: block;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages_tool/member/modify_face.vue b/pages_tool/member/modify_face.vue
new file mode 100644
index 0000000..7a2f258
--- /dev/null
+++ b/pages_tool/member/modify_face.vue
@@ -0,0 +1,195 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view class="nc-modify-content">
+		<view class="modify">
+			<view>
+				<image v-if="newImg == ''" :src="memberImg ? $util.img(memberImg) : $util.getDefaultImage().head" @error="memberImg = $util.getDefaultImage().head" mode="aspectFill"/>
+				<image v-else :src="$util.img(newImg)" @error="newImg = $util.getDefaultImage().head" mode="aspectFill" />
+			</view>
+		</view>
+		<view class="opection-box">
+			<block v-if="newImg == ''">
+				<!-- #ifdef MP-ALIPAY -->
+				<button type="primary" @click="uploadFace()">点击上传</button>
+				<!-- #endif -->
+				<!-- #ifndef MP-ALIPAY -->
+				<button type="primary" @click="chooseImage()">点击上传</button>
+				<!-- #endif -->
+			</block>
+			<block v-else>
+				<view class="opec">
+					<button size="mini" class="mini" type="primary" @click="save()">确认保存</button>
+					<button size="mini" class="mini" type="primary" @click="chooseImage()">重新上传</button>
+				</view>
+			</block>
+		</view>
+
+		<img-cropping selWidth="300" selHeight="300" @upload="myUpload" ref="imgCropping"></img-cropping>
+	</view>
+</template>
+
+<script>
+	import imgCropping from '@/pages_tool/components/img-cropping/cropping.vue';
+
+	export default {
+		data() {
+			return {
+				memberImg: '',
+				newImg: '',
+				imgurl: ''
+			};
+		},
+		components: {
+			imgCropping
+		},
+		onShow() {
+			if (!this.storeToken) {
+				this.$util.redirectTo(
+					'/pages_tool/login/login', {
+						back: '/pages_tool/member/modify_face'
+					},
+					'redirectTo'
+				);
+				return;
+			}
+
+			this.memberImg = this.memberInfo.headimg;
+			this.imgurl = this.memberInfo.headimg;
+		},
+		methods: {
+			chooseImage() {
+				this.$refs.imgCropping.fSelect();
+			},
+			//上传返回图片
+			myUpload(rsp) {
+				let app_type = 'h5';
+				let app_type_name = 'H5';
+
+				// #ifdef MP
+				app_type = 'weapp';
+				app_type_name = 'weapp';
+				// #endif
+				uni.request({
+					url: this.$config.baseUrl + '/api/upload/headimgBase64',
+					method: 'POST',
+					data: {
+						app_type: app_type,
+						app_type_name: app_type_name,
+						images: rsp.base64
+					},
+					header: {
+						'content-type': 'application/x-www-form-urlencoded;application/json'
+					},
+					dataType: 'json',
+					responseType: 'text',
+					success: res => {
+						if (res.data.code == 0) {
+							this.newImg = res.data.data.pic_path;
+							this.imgurl = res.data.data.pic_path;
+						}
+					},
+					fail: () => {
+						this.$util.showToast({
+							title: '头像上传失败'
+						});
+					}
+				});
+			},
+			previewImage() {
+				uni.previewImage({
+					current: 0,
+					urls: this.images
+				});
+			},
+			save() {
+				this.$api.sendRequest({
+					url: '/api/member/modifyheadimg',
+					data: {
+						headimg: this.imgurl
+					},
+					success: res => {
+						if (res.code == 0) {
+							this.memberInfo.headimg = this.imgurl;
+							this.$store.commit('setMemberInfo', this.memberInfo);
+							this.$util.showToast({
+								title: '头像修改成功'
+							});
+							setTimeout(() => {
+								this.$util.redirectTo('/pages_tool/member/info', {}, 'redirectTo');
+							}, 2000);
+						} else {
+							this.$util.showToast({
+								title: res.message
+							});
+						}
+					}
+				});
+			},
+			uploadFace() {
+				uni.chooseImage({
+					count: 1,
+					sizeType: ['compressed'],
+					success: (chooseImageRes) => {
+						const tempFilePaths = chooseImageRes.tempFilePaths;
+						this.$api.upload({
+							url: '/api/upload/headimg',
+							filePath: tempFilePaths[0],
+							fileType: 'image',
+							success: (res) => {
+								if (res.code) {
+									this.newImg = res.data.pic_path;
+									this.imgurl = res.data.pic_path;
+								}
+							}
+						})
+					}
+				});
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	page {
+		overflow: hidden;
+	}
+
+	.modify {
+		position: relative;
+		padding-top: 50rpx;
+
+		view {
+			width: 500rpx;
+			height: 500rpx;
+			margin: 0 auto;
+			overflow: hidden;
+			background-color: #ffffff;
+			border: 4rpx solid #ffffff;
+			border-radius: 100%;
+
+			image {
+				width: 100%;
+				height: 100%;
+			}
+		}
+	}
+
+	.opection-box {
+		margin-top: 50rpx;
+	}
+
+	.opec {
+		width: 100%;
+		padding: 0 10%;
+		box-sizing: border-box;
+		display: flex;
+		justify-content: space-between;
+
+		button {
+			padding: 0 30rpx;
+			height: 60rpx;
+			line-height: 60rpx;
+			border: none;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages_tool/member/pay_password.vue b/pages_tool/member/pay_password.vue
new file mode 100644
index 0000000..53989b9
--- /dev/null
+++ b/pages_tool/member/pay_password.vue
@@ -0,0 +1,279 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view class="container">
+		<view class="tips" v-if="step != 0">请输入6位支付密码，建议不要使用重复或连续数字</view>
+		<view class="tips" v-else>验证码已发送至{{ memberInfo.mobile | mobile }}请在下方输入4位数字验证码</view>
+		<view class="password-wrap">
+			<myp-one :maxlength="step == 0 ? 4 : 6" :is-pwd="step != 0" @input="input" ref="input" :auto-focus="true"></myp-one>
+			<view v-show="step == 0" class="dynacode" :class="dynacodeData.seconds == 120 ? 'color-base-text' : 'color-tip'" @click="sendMobileCode">
+				{{ dynacodeData.codeText }}
+			</view>
+			<view class="action-tips" v-show="step == 0">输入短信验证码</view>
+			<view class="action-tips" v-show="step == 1">请设置支付密码</view>
+			<view class="action-tips" v-show="step == 2">请再次输入</view>
+			<view class="btn color-base-bg color-base-border" :class="{ disabled: !isClick }" @click="confirm">确认</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import mypOne from '@/pages_tool/components/myp-one/myp-one.vue';
+	export default {
+		components: {
+			mypOne
+		},
+		data() {
+			return {
+				isClick: false,
+				step: 1,
+				key: '', // 短信key
+				code: '', // 动态码
+				password: '', // 密码
+				repassword: '', // 重复密码
+				isSub: false, // 防重复提交
+				back: '', // 返回页
+				dynacodeData: {
+					seconds: 120,
+					timer: null,
+					codeText: '获取验证码',
+					isSend: false
+				}
+			};
+		},
+		onLoad(option) {
+			if (option.back) this.back = option.back;
+
+			// 判断登录
+			if (!this.storeToken) {
+				this.$util.redirectTo('/pages_tool/login/login');
+			} else {
+				if (this.memberInfo.mobile == '') {
+					uni.showModal({
+						title: '提示',
+						content: '设置支付密码需要先绑定手机号,是否立即绑定?',
+						success: res => {
+							if (res.confirm) {
+								this.$util.redirectTo('/pages_tool/member/info', {
+									action: 'mobile',
+									back: this.back
+								}, 'redirectTo');
+							} else {
+								if (this.back) this.$util.redirectTo(this.back);
+								else this.$util.redirectTo('/pages/member/index');
+							}
+						}
+					});
+				} else {
+					this.step = 0;
+					this.sendMobileCode();
+				}
+			}
+		},
+		methods: {
+			input(val) {
+				if (this.step == 0) {
+					if (val.length == 4) {
+						this.isClick = true;
+						this.code = val;
+					} else {
+						this.isClick = false;
+					}
+				} else if (this.step == 1) {
+					if (val.length == 6) {
+						this.isClick = true;
+						this.password = val;
+					} else {
+						this.isClick = false;
+					}
+				} else {
+					if (val.length == 6) {
+						this.isClick = true;
+						this.repassword = val;
+					} else {
+						this.isClick = false;
+					}
+				}
+			},
+			confirm() {
+				if (this.isClick) {
+					if (this.step == 0) {
+						this.$api.sendRequest({
+							url: '/api/member/verifypaypwdcode',
+							data: {
+								code: this.code,
+								key: this.key
+							},
+							success: res => {
+								if (res.code == 0) {
+									this.$refs.input.clear();
+									this.isClick = false;
+									this.step = 1;
+								} else {
+									this.$util.showToast({
+										title: res.message
+									});
+								}
+							}
+						});
+					} else if (this.step == 1) {
+						this.$refs.input.clear();
+						this.isClick = false;
+						this.step = 2;
+					} else {
+						if (this.password == this.repassword) {
+							if (this.isSub) return;
+							this.isSub = true;
+							this.$api.sendRequest({
+								url: '/api/member/modifypaypassword',
+								data: {
+									key: this.key,
+									code: this.code,
+									password: this.password
+								},
+								success: res => {
+									if (res.code >= 0) {
+										this.$util.showToast({
+											title: '修改成功'
+										});
+										setTimeout(() => {
+											if (this.back) this.$util.redirectTo(this.back, {},
+												'redirectTo');
+											else this.$util.redirectTo('/pages/member/index');
+										}, 2000);
+									} else {
+										this.initInfo();
+										this.$util.showToast({
+											title: res.message
+										});
+									}
+								}
+							});
+						} else {
+							this.$util.showToast({
+								title: '两次输入的密码不一致',
+								success: res => {
+									this.initInfo();
+								}
+							});
+						}
+					}
+				}
+			},
+			initInfo() {
+				this.isClick = false;
+				this.step = 1;
+				this.password = '';
+				this.repassword = '';
+				this.oldpassword = '';
+				this.isSub = false;
+				this.$refs.input.clear();
+			},
+			/**
+			 * 发送手机动态码
+			 */
+			sendMobileCode() {
+				if (this.dynacodeData.seconds != 120) return;
+				if (this.dynacodeData.isSend) return;
+				this.dynacodeData.isSend = true;
+
+				this.$api.sendRequest({
+					url: '/api/member/paypwdcode',
+					success: res => {
+						this.dynacodeData.isSend = false;
+						if (res.code >= 0) {
+							this.key = res.data.key;
+
+							if (this.dynacodeData.seconds == 120 && this.dynacodeData.timer == null) {
+								this.dynacodeData.timer = setInterval(() => {
+									this.dynacodeData.seconds--;
+									this.dynacodeData.codeText = this.dynacodeData.seconds + 's后可重新获取';
+								}, 1000);
+							}
+						} else {
+							this.$util.showToast({
+								title: res.message
+							});
+						}
+					},
+					fail: () => {
+						this.$util.showToast({
+							title: 'request:fail'
+						});
+						this.dynacodeData.isSend = false;
+					}
+				});
+			}
+		},
+		filters: {
+			mobile(mobile) {
+				return mobile.substring(0, 4 - 1) + '****' + mobile.substring(6 + 1);
+			}
+		},
+		watch: {
+			'dynacodeData.seconds': {
+				handler(newValue, oldValue) {
+					if (newValue == 0) {
+						clearInterval(this.dynacodeData.timer);
+						this.dynacodeData = {
+							seconds: 120,
+							timer: null,
+							codeText: '获取动态码',
+							isSend: false
+						};
+					}
+				},
+				immediate: true,
+				deep: true
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	.container {
+		width: 100vw;
+		height: 100vh;
+		background: #fff;
+
+		.tips {
+			width: 60%;
+			margin: 0 auto;
+			text-align: center;
+			padding-top: 100rpx;
+		}
+
+		.password-wrap {
+			width: 80%;
+			margin: 0 auto;
+			margin-top: 40rpx;
+
+			.action-tips {
+				text-align: center;
+				font-weight: 600;
+				margin-top: 80rpx;
+			}
+
+			.dynacode {
+				line-height: 1;
+				margin-top: 20rpx;
+				font-size: $font-size-tag;
+			}
+
+			.btn {
+				margin: 0 auto;
+				margin-top: 30rpx;
+				height: 80rpx;
+				line-height: 80rpx;
+				border-radius: $border-radius;
+				color: #fff;
+				text-align: center;
+
+				&.disabled {
+					background: #ccc !important;
+					border-color: #ccc !important;
+					color: #fff;
+				}
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages_tool/member/point.vue b/pages_tool/member/point.vue
new file mode 100644
index 0000000..f226aab
--- /dev/null
+++ b/pages_tool/member/point.vue
@@ -0,0 +1,161 @@
+<template>
+	<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="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/point/point_bg.png') + ') no-repeat right bottom/ auto 340rpx, linear-gradient(314deg, #F16914 0%, #FEAA4C 100%)' }">
+			<view class="point price-font">{{ pointInfo.point }}</view>
+			<view class="title">当前积分</view>
+			<view class="flex-box">
+				<view class="flex-item">
+					<view class="num price-font">{{ pointInfo.totalPoint }}</view>
+					<view class="font-size-tag">累计积分</view>
+				</view>
+				<view class="flex-item">
+					<view class="num price-font">{{ pointInfo.totalConsumePoint }}</view>
+					<view class="font-size-tag">累计消费</view>
+				</view>
+				<view class="flex-item">
+					<view class="num price-font">{{ pointInfo.todayPoint }}</view>
+					<view class="font-size-tag">今日获得</view>
+				</view>
+			</view>
+		</view>
+
+		<view class="menu-wrap">
+			<view class="menu-item" @click="$util.redirectTo('/pages_tool/member/point_detail')">
+				<view class="icon">
+					<image :src="$util.img('public/uniapp/point/point_detail_icon.png')" mode="widthFix"></image>
+				</view>
+				<text class="title">积分明细</text>
+			</view>
+			<view class="menu-item" @click="$util.redirectTo('/pages_promotion/point/list')">
+				<view class="icon">
+					<image :src="$util.img('public/uniapp/point/point_shop.png')" mode="widthFix"></image>
+				</view>
+				<text class="title">积分商城</text>
+			</view>
+		</view>
+<!-- 
+		<view class="task-wrap">
+			<view class="title">做任务赚积分</view>
+			<view class="task-item" @click="toSign">
+				<view class="icon"><text class="iconfont icon-qiandao1"></text></view>
+				<view class="wrap">
+					<view class="title">每日签到</view>
+					<view class="desc color-tip font-size-tag">连续签到可获得更多积分</view>
+				</view>
+				<view class="btn">去签到</view>
+			</view>
+			<view class="task-item" @click="$util.redirectTo('/pages/index/index')">
+				<view class="icon"><text class="iconfont icon-shangpin"></text></view>
+				<view class="wrap">
+					<view class="title">购买商品</view>
+					<view class="desc color-tip font-size-tag">购买商品可获得积分</view>
+				</view>
+				<view class="btn">去下单</view>
+			</view>
+		</view> -->
+
+		<ns-login ref="login"></ns-login>
+		<loading-cover ref="loadingCover"></loading-cover>
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			pointInfo: {
+				point: 0,
+				totalPoint: 0,
+				totalConsumePoint: 0,
+				todayPoint: 0
+			},
+			menuButtonBounding: {} // 小程序胶囊属性
+		};
+	},
+	onShow() {
+		if (!this.storeToken) {
+			this.$nextTick(() => {
+				this.$refs.login.open('/pages_tool/member/point');
+			});
+		} else {
+			this.getMemberPoint();
+		}
+	},
+	onLoad() {
+		// #ifdef MP
+		this.menuButtonBounding = uni.getMenuButtonBoundingClientRect();
+		// #endif
+	},
+	methods: {
+		toSign() {
+			this.$util.redirectTo('/pages_tool/member/signin');
+		},
+		getMemberPoint() {
+			this.$api.sendRequest({
+				url: '/api/memberaccount/point',
+				data: {
+				},
+				success: res => {
+					if (res.code == 0) {
+						this.pointInfo.point = parseInt(res.data.point);
+						this.pointInfo.totalPoint = parseInt(res.data.point_all);
+						this.pointInfo.totalConsumePoint = parseInt(res.data.point_use);
+						this.pointInfo.todayPoint = parseInt(res.data.point_today);
+					}
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				},
+				fail: res => {
+					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) {
+		if (options.from === 'navigateBack') {
+			return false;
+		}
+		this.$util.redirectTo('/pages/member/index', {}, 'reLaunch');
+		return true;
+	},
+	watch: {
+		storeToken: function(nVal, oVal) {
+			if (nVal) {
+				this.getMemberPoint();
+			}
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+@import './public/css/point.scss';
+</style>
diff --git a/pages_tool/member/point_detail.vue b/pages_tool/member/point_detail.vue
new file mode 100644
index 0000000..fd52a39
--- /dev/null
+++ b/pages_tool/member/point_detail.vue
@@ -0,0 +1,342 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view>
+	<!-- 	<view class="tab color-bg">
+			<view class="tab-left">
+				<picker mode="date" :value="searchType.date" @change="bindDateChange" fields="month">
+					<view class="uni-input">
+						{{ date }}
+						<text class="iconfont icon-iconangledown"></text>
+					</view>
+				</picker>
+			</view>
+			<view class="tab-right">
+				<picker @change="bindPickerChange" :value="pointIndex" :range="pointType" class="picker" range-key="label">
+					<text class="desc uni-input">{{ pointType[pointIndex].label }}</text>
+					<text class="iconfont icon-iconangledown"></text>
+				</picker>
+			</view>
+		</view> -->
+
+		<mescroll-uni @getData="getData" class="member-point" ref="mescroll">
+			<view slot="list">
+				<block v-if="dataList.length">
+					<view class="detailed-wrap">
+						<view class="cont">
+							<view class="detailed-item" v-for="(item, index) in dataList" :key="index">
+								<view class="info" @click="toFromDetail(item)">
+									<view class="event">{{ item.type_name }}</view>
+									<view class="time-box">
+										<text class="time color-tip">{{ $util.timeStampTurnTime(item.create_time) }}</text>
+									</view>
+								</view>
+								<view class="num color-base-text" v-if="item.account_data > 0">+{{ parseInt(item.account_data) }}</view>
+								<view class="num " v-else>{{ parseInt(item.account_data) }}</view>
+							</view>
+						</view>
+					</view>
+				</block>
+				<block v-else>
+					<view class="cart-empty"><ns-empty></ns-empty></view>
+				</block>
+			</view>
+		</mescroll-uni>
+		<loading-cover ref="loadingCover"></loading-cover>
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		const currentDate = this.getDate({
+			format: true
+		});
+		return {
+			memberAccount: {
+				point: 0
+			},
+			dataList: [],
+			date: currentDate,
+			searchType: {
+				from_type: 0,
+				date: ''
+			},
+			pointType: [
+				{
+					label: '全部',
+					value: '0'
+				}
+			], //积分类型
+			pointIndex: 0,
+			related_id: 0
+		};
+	},
+	onShow() {
+		if (!this.storeToken) {
+			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();
+	},
+	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;
+			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}月`;
+		},
+		bindPickerChange(e) {
+			this.pointIndex = e.detail.value;
+			this.searchType.from_type = this.pointType[this.pointIndex].value;
+			this.$refs.mescroll.refresh();
+		},
+		//获取分类类型
+		getPointType() {
+			var temp = [],
+				that = this;
+			this.$api.sendRequest({
+				url: '/api/memberaccount/fromType',
+				success: res => {
+					for (var index in res.point) {
+						var obg = {};
+						obg.label = res.point[index].type_name;
+						obg.value = index;
+						that.pointType.push(obg);
+					}
+				}
+			});
+		},
+		toList() {
+			this.$util.redirectTo('/pages_promotion/point/list');
+		},
+		toOrderList() {
+			this.$util.redirectTo('/pages_promotion/point/order_list');
+		},
+		toFromDetail(item) {
+			if (item.from_type == 'pointexchange') {
+				this.$api.sendRequest({
+					url: '/pointexchange/api/order/info',
+					data: {
+						order_id: item.type_tag
+					},
+					success: res => {
+						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
+										});
+								}
+							} else {
+								this.$util.redirectTo('/pages/order/detail_point', {
+									order_id: data.order_id
+								});
+							}
+						}
+					}
+				});
+			} else if (item.from_type == 'pointcash') {
+				this.$util.redirectTo('/pages/order/detail', {
+					order_id: item.type_tag
+				});
+			} else if (item.from_type == 'memberconsume') {
+				// this.$util.redirectTo('/pages/order/detail', {
+				// 	order_id: item.type_tag
+				// });
+			} else if (item.from_type == 'pointexchangerefund' && parseInt(item.type_tag) != 0) {
+				this.$util.redirectTo('/pages/order/detail_point', {
+					order_id: item.type_tag
+				});
+			} else if (item.from_type == 'refund' && parseInt(item.type_tag) != 0) {
+				this.$util.redirectTo('/pages/order/detail', {
+					order_id: item.type_tag
+				});
+			}
+		},
+		//获得列表数据
+		getData(mescroll) {
+			this.$api.sendRequest({
+				url: '/api/memberaccount/page',
+				data: {
+					page_size: mescroll.size,
+					page: mescroll.num,
+					account_type: 'point',
+					from_type: this.searchType.from_type,
+					date: this.searchType.date,
+					related_id: this.related_id
+				},
+				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 = []; //如果是第一页需手动制空列表
+						this.related_id = 0;
+					}
+					this.dataList = this.dataList.concat(newArr); //追加新数据
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				},
+				fail: res => {
+					mescroll.endErr();
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				}
+			});
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+/deep/ .fixed {
+	position: relative;
+	top: 0;
+}
+
+.tab {
+	position: fixed;
+	top: 0;
+	width: 100%;
+	z-index: 10;
+	display: flex;
+	justify-content: space-between;
+	height: 80rpx;
+	background-color: $color-bg;
+
+	view {
+		flex: 1;
+		text-align: center;
+		line-height: 80rpx;
+
+		text {
+			margin-left: 10rpx;
+			font-size: $font-size-base;
+		}
+	}
+	.tab-left{
+		display: flex;
+		padding-left: 30rpx;
+	}
+	.tab-right{
+		display: flex;
+		justify-content: flex-end;
+		padding-right: 40rpx;
+	}
+}
+
+.cart-empty {
+	margin-top: 208rpx !important;
+}
+
+.detailed-wrap {
+	background: #fff;
+	position: relative;
+	z-index: 9;
+	padding-top: 20rpx;
+
+	.head {
+		display: flex;
+		height: 90rpx;
+
+		& > view {
+			flex: 1;
+			text-align: left;
+			padding: 0 $padding;
+			line-height: 90rpx;
+		}
+	}
+
+	.cont {
+		background: #fff;
+		width: 100%;
+		margin: 0 auto;
+
+		.detailed-item {
+			padding: 30rpx 0 32rpx;
+			margin: 0 32rpx;
+			border-bottom: 2rpx solid $color-line;
+			position: relative;
+			box-sizing: border-box;
+
+			&:last-of-type {
+				border-bottom: none;
+			}
+
+			.info {
+				padding-right: 180rpx;
+
+				.event {
+					font-size: $font-size-base;
+					line-height: 1.3;
+					font-weight: 500;
+				}
+
+				.time-box {
+					line-height: 1;
+					margin-top: 24rpx;
+				}
+
+				.time {
+					font-size: $font-size-activity-tag;
+					color: $color-tip;
+				}
+			}
+
+			.num {
+				width: 160rpx;
+				position: absolute;
+				right: 17rpx;
+				top: 50%;
+				transform: translateY(-50%);
+				text-align: right;
+				font-size: $font-size-toolbar;
+				font-weight: 500;
+			}
+		}
+	}
+}
+</style>
diff --git a/pages_tool/member/public/css/balance.scss b/pages_tool/member/public/css/balance.scss
new file mode 100644
index 0000000..09e4fd5
--- /dev/null
+++ b/pages_tool/member/public/css/balance.scss
@@ -0,0 +1,212 @@
+.custom-navbar {
+	width: 100vw;
+	padding-bottom: 20rpx;
+	position: fixed;
+	left: 0;
+	top: 0;
+	z-index: 100;
+	background: unset;
+	
+	// #ifdef MP-WEIXIN
+	background-size: 100% 380rpx;
+	// #endif
+	
+	.navbar-wrap {
+		position: relative;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		width: 100%;
+		height: 100%;
+	}
+	
+	.navbar-title {
+		color: #fff;
+		font-size: 32rpx;
+		font-weight: 600;
+	}
+	
+	.back {
+		position: absolute;
+		color: #fff;
+		left: 30rpx;
+		font-size: 40rpx;
+	}
+}
+
+.custom-navbar-block {
+	padding-bottom: 20rpx;
+}
+
+.head-wrap {
+	// width: 100vw;
+	background-size: 100%;
+	padding: 32rpx 28rpx; 
+	box-sizing: border-box;
+	// 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 {
+		color: var(--btn-text-color);
+		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;
+	}
+	
+	.flex-box {
+		display: flex;
+		margin-top: 56rpx;
+		
+		.flex-item {
+			flex: 1;
+			
+			.num {
+				font-size: 34rpx;
+				margin-bottom: 20rpx;
+				color: #fff;
+				white-space: nowrap;
+				text-overflow: ellipsis;
+				overflow: hidden;
+			}
+			
+			view {
+				text-align: left;
+				color: #F6F6F6;
+				line-height: 1;
+			}
+		}
+	}
+	.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;
+	background: #fff;
+	// transform: translateY(-90rpx);
+	
+	.menu-item {
+		display: flex;
+		align-items: center;
+		padding: 4rpx 0;
+		
+		.icon {
+			height: 80rpx;
+			border-radius: 20rpx;
+			display: flex;
+			align-items: center;
+			color: #fff;
+			margin-right: 20rpx;
+			
+			.iconfont {
+				font-size: 46rpx;
+				-webkit-background-clip: text !important;
+				-webkit-text-fill-color: transparent;
+				background: linear-gradient(135deg, #FE7849 0%, #FF1959 100%);
+			}
+		}
+		
+		.title {
+			font-size: 28rpx;
+			color: #333333;
+			flex: 1;
+		}
+		
+		.iconright {
+			font-size: 28rpx;
+		}
+	}
+}
+
+.action {
+	position: fixed;
+	width: 100vw;
+	left: 0;
+	bottom: 0;
+	padding-bottom: 100rpx;
+	
+	view {
+		width: calc(100vw - 64rpx);
+		height: 80rpx;
+		line-height: 80rpx;
+		border-radius: 80rpx;
+		margin: 0 auto 30rpx auto;
+		text-align: center;
+		color: #fff;
+		font-size: 32rpx;
+	}
+	.recharge-withdraw {
+		background: #FF4646;
+	}
+	
+	.withdraw {
+		border: 4rpx solid #FF4646;
+		box-sizing: border-box;
+		line-height: 72rpx;
+		color: #FF4646;
+	}
+}
\ No newline at end of file
diff --git a/pages_tool/member/public/css/card.scss b/pages_tool/member/public/css/card.scss
new file mode 100644
index 0000000..c6d49d9
--- /dev/null
+++ b/pages_tool/member/public/css/card.scss
@@ -0,0 +1,670 @@
+.member-level {
+	width: 100%;
+	min-height: 100vh;
+	position: relative;
+}
+.level-top {
+	width: 100%;
+	position: relative;
+	image {
+		width: 100%;
+		height: 460rpx;
+		position: absolute;
+	}
+}
+.banner-container {
+	width: 100vw;
+	position: relative;
+	left: 0;
+	top: 0;
+
+	.memberInfo {
+		width: 100%;
+		height: 140rpx;
+		padding: 40rpx 40rpx 0;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		box-sizing: border-box;
+		image {
+			width: 100rpx;
+			height: 100rpx;
+			border-radius: 50%;
+			border: 4rpx solid #ffffff;
+			box-sizing: border-box;
+		}
+		.growth-rules {
+			position: absolute;
+			display: flex;
+			align-items: center;
+			color: #fff;
+			right: 40rpx;
+			font-size: 24rpx;
+			z-index: 10;
+			.iconfont{
+				margin-right: 10rpx;
+			}
+		}
+		.member-desc {
+			width: calc(100% - 20rpx - 100rpx);
+			height: 100%;
+			padding: 16rpx 0;
+			box-sizing: border-box;
+			display: flex;
+			flex-direction: column;
+			align-items: flex-start;
+			justify-content: center;
+			
+			view {
+				font-weight: bold;
+				line-height: 1;
+				color: #ffffff;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				white-space: nowrap;
+			}
+			
+			.expire-time {
+				color: #ccc;
+				font-weight: normal;
+				margin-top: 10rpx;
+			}
+		}
+	}
+
+	.demand {
+		width: 100%;
+		padding: 0 $padding;
+		box-sizing: border-box;
+		.demand-title {
+			font-size: $font-size-toolbar;
+			font-weight: bold;
+			line-height: 1;
+			display: flex;
+			align-items: center;
+			image {
+				width: 39rpx;
+				height: 35rpx;
+				margin-right: 10rpx;
+			}
+		}
+		.demand-info {
+			padding: 10rpx 24rpx;
+			box-sizing: border-box;
+			display: flex;
+			flex-direction: column;
+			margin-top: 27rpx;
+			border-radius: 10rpx;
+			justify-content: space-between;
+			height: 150rpx;
+			background: #ffffff;
+			.info-title {
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				text {
+					&:nth-child(1) {
+						color: #000;
+						font-size: $font-size-tag;
+					}
+					&:nth-child(2) {
+						color: #959595;
+					}
+				}
+			}
+			progress {
+				margin-top: 39rpx;
+			}
+			.info-size {
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				font-size: $font-size-tag;
+				color: #959595;
+			}
+		}
+	}
+
+	.uni-swiper-dots {
+		bottom: 30rpx !important;
+	}
+
+	.image-container {
+		box-sizing: border-box;
+		width: 100%;
+		height: 100%;
+		display: flex;
+		image {
+			width: 100%;
+			height: 100%;
+		}
+		.slide-image {
+			width: 535rpx;
+			height: 300rpx;
+			z-index: 200;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			border-radius: 20rpx;
+			overflow: hidden;
+			position: relative;
+			.bg-border{
+				width:  calc(100% - 40rpx);
+				height:  calc(100% - 40rpx);
+				position: absolute;
+				top: 18rpx;
+				left: 20rpx;
+				border: 2rpx solid rgba(255, 255, 255, .2);
+				z-index: 10;
+				border-radius: 10rpx;
+				opacity: .5;
+				
+			}
+			.growth-rules{
+				position: absolute;
+				right: 40rpx;
+				top: 40rpx;
+				z-index: 10;
+			}
+			.info {
+				width: 100%;
+				height: 100%;
+				display: flex;
+				flex-direction: column;
+				position: absolute;
+				left: 0;
+				bottom: 0;
+				padding: 30rpx 40rpx;
+				box-sizing: border-box;
+				.level-detail {
+					font-size: 52rpx;
+					display: flex;
+					align-items: center;
+					margin-top: 26rpx;
+				}
+				.growr-name {
+					font-size: 24rpx;
+					margin-top: 50rpx;
+					opacity: 0.8;
+				}
+				.growr-value {
+					font-size: 24rpx;
+					margin-top: 10rpx;
+					opacity: 0.8;
+				}
+				.progress {
+					margin-top: 30rpx;
+				}
+				.residue-growr-value {
+					text-align: right;
+					font-size: 24rpx;
+					margin-top: 10rpx;
+				}
+				view {
+					color: #ffffff;
+					line-height: 1.3;
+				}
+			}
+			.now_growth {
+				margin-top: 20rpx;
+			}
+			.pic {
+				display: flex;
+				justify-content: center;
+				align-items: center;
+
+				image {
+					width: 160rpx;
+				}
+			}
+			.isnow {
+				font-size: 20rpx;
+				color: #fff;
+				padding: 2rpx;
+				line-height: 1;
+				margin-left: 10rpx;
+			}
+		}
+	}
+
+	.item-left {
+		justify-content: flex-end;
+		padding: 56rpx 26rpx 0 0;
+	}
+
+	.image-container-box .item-left {
+		justify-content: center;
+		padding: 56rpx 0 0 0;
+	}
+
+	.item-right {
+		justify-content: flex-start;
+		padding: 56rpx 0 0 26rpx;
+	}
+
+	.item-center {
+		justify-content: center;
+		padding: 56rpx 0 0 0;
+	}
+
+	.card-content {
+		background-color: #fff;
+		border-radius: 10rpx;
+		padding: 20rpx 30rpx 20rpx;
+		// padding: 20rpx 30rpx;
+		margin:$margin-updown $margin-both;
+		.gift-title {
+			font-size: 30rpx;
+		}
+		.equity-itme {
+			display: flex;
+			align-items: center;
+			image {
+				width: 60rpx;
+				height: 60rpx;
+				margin-right: 30rpx;
+			}
+			.equity-content {
+				padding: 20rpx 0;
+				line-height: 1;
+				&.active {
+					border-bottom: 2rpx solid #e5e5e5;
+				}
+				flex: 1;
+				display: flex;
+				flex-direction: column;
+				.equity-desc {
+					font-size: $font-size-activity-tag;
+					margin-top: 16rpx;
+					color: $color-tip;
+				}
+			}
+		}
+	}
+	
+	.card-privilege-list{
+		 width: 100%;
+		 flex-wrap: wrap;
+		 display: flex;
+		 justify-content: center;
+		 
+		 .card-privilege-item{
+			width: 33%;
+			display: inline-block;
+			margin-top: 0;
+			text-align: center;
+			.card-privilege-icon{
+				width: 60rpx;
+				height: 60rpx;
+				text-align: center;
+				margin: 0 auto;
+				line-height: 1;
+			}
+			.card-privilege-name{
+				color: $color-title;
+				font-size: $font-size-sub;
+				padding-top: 20rpx;
+			}
+			.card-privilege-text{
+				color: $color-tip;
+				font-size: $font-size-goods-tag;
+				padding: 0 20rpx;
+			}
+			.iconfont {
+				font-size: 60rpx;
+				background-image:-webkit-linear-gradient(top,#E3B66B,#F7DAA5); 
+				-webkit-background-clip:text; 
+				-webkit-text-fill-color:transparent; 
+			}
+			.icon-zhekou,.icon-hongbao{
+				font-size: 54rpx;
+			}
+			
+		}
+	}
+
+	.member-gift {
+		background-color: #fff;
+		margin: $margin-updown $margin-both;
+		padding: 20rpx 30rpx;
+		border-radius: 10rpx;
+		.gift-title {
+			font-size: 30rpx;
+		}
+		.gift-itme {
+			display: flex;
+			align-items: center;
+			image {
+				width: 60rpx;
+				height: 60rpx;
+				margin-right: 30rpx;
+			}
+			.gift-content {
+				&.active {
+					border-bottom: 2rpx solid #e5e5e5;
+				}
+				padding: 20rpx 0;
+				line-height: 1;
+				flex: 1;
+				display: flex;
+				flex-direction: column;
+				.gift-desc {
+					font-size: 24rpx;
+					margin-top: 16rpx;
+					color: #999;
+				}
+			}
+		}
+	}
+
+	.desc-wrap {
+		box-sizing: border-box;
+		width: 100%;
+		height: 98rpx;
+		padding: 24rpx 66rpx 0;
+
+		.title {
+			width: 100%;
+			height: 42rpx;
+			line-height: 42rpx;
+			color: #222222;
+			font-size: $font-size-base;
+			font-family: 'PingFangTC-Regular';
+			font-weight: 600;
+			text-align: left;
+		}
+
+		.desc {
+			margin-top: 4rpx;
+			width: 100%;
+			height: 34rpx;
+			line-height: 34rpx;
+			color: #999999;
+			font-size: $font-size-tag;
+			font-family: 'PingFangTC-Regular';
+			text-align: left;
+		}
+	}
+
+	@keyframes descAnimation {
+		0% {
+			opacity: 1;
+		}
+
+		25% {
+			opacity: 0.5;
+		}
+
+		50% {
+			opacity: 0;
+		}
+
+		75% {
+			opacity: 0.5;
+		}
+
+		100% {
+			opacity: 1;
+		}
+	}
+
+	@-webkit-keyframes descAnimation {
+		0% {
+			opacity: 1;
+		}
+
+		25% {
+			opacity: 0.5;
+		}
+
+		50% {
+			opacity: 0;
+		}
+
+		75% {
+			opacity: 0.5;
+		}
+
+		100% {
+			opacity: 1;
+		}
+	}
+}
+.coupon-popup-box {
+	background-color: #f7f7f7;
+	.coupon-popup-title {
+		text-align: center;
+		font-size: 32rpx;
+		line-height: 90rpx;
+		height: 90rpx;
+		display: block;
+		font-weight: bold;
+		position: relative;
+		border-bottom: 1rpx solid #eeeeee;
+	}
+	.iconfont {
+		position: absolute;
+		float: right;
+		right: 44rpx;
+		font-size: 40rpx;
+		font-weight: 500;
+	}
+	.coupon-item {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		padding: 20rpx 30rpx;
+		margin-bottom: 20rpx;
+		background-color: #fff;
+		border-radius: 4rpx;
+		.coupon-name {
+			flex: 1;
+			display: flex;
+			flex-direction: column;
+			.desc {
+				margin-top: 20rpx;
+				font-size: $font-size-tag;
+				color: #ababab;
+			}
+		}
+		.coupon-price {
+			color: red;
+			text {
+				font-size: 70rpx;
+			}
+		}
+	}
+	.coupon-popup-content {
+		max-height: 390rpx;
+		padding: 20rpx;
+		box-sizing: border-box;
+	}
+}
+.card-content-head{
+	text-align: center;
+	color: $color-title;
+	margin: 20rpx 0;
+	.line-box{
+		float: left;
+		text-align: center;
+		width: 35%;
+		margin-top: 26rpx;
+		.line{
+			background-color: $color-title;
+			width: 60rpx;
+			height: 2rpx;
+		}
+	}
+	.card-content-title{
+		float: left;
+		text-align: center;
+		width: 30%;
+		font-size: $font-size-base;
+		color: $color-title;
+	}
+}
+
+.right{
+	float: right;
+}
+.clear{
+	clear: both;
+}
+.card-time-list{
+	margin: -7.5rpx;
+	white-space: nowrap;
+	overflow-x: scroll;
+	height: 256rpx;
+		
+	.card-item-box{
+		padding: 15rpx;
+		display: inline-block;
+		width: 33.3333%;
+		box-sizing: border-box;
+		
+		&.small {
+			width: 32.3%;
+		}
+		
+		.card-time-item{
+			border: 2rpx solid #cccccc;
+			border-radius: $border-radius;
+			text-align: center;
+			padding: 25rpx 0 20rpx;
+			
+			image{
+				width: 60rpx;
+			}
+			
+			.time-name {
+				line-height: 1.3;
+			}
+		}
+		.card-time-item.active{
+			border-color: #E3B66B;
+			background: rgba(227, 182, 107, .3);
+		}
+		.time-price{
+			font-size: $font-size-tag;
+			text{
+				font-size: $font-size-toolbar;
+			}
+			
+			.price {
+				font-weight: bolder;
+			}
+		}
+	}
+}
+.action-wrap{
+	height: 140rpx;
+	
+	&.have-agreement{
+		height: 190rpx;
+	}
+	
+	&.bottom-safe-area {
+		padding-bottom: constant(safe-area-inset-bottom);
+		padding-bottom: env(safe-area-inset-bottom);
+	}
+}
+.action {
+	position: fixed;
+	z-index: 5;
+	left: 0;
+	bottom: 0;
+	width: 100vw;
+	height: 140rpx;
+	background: #fff;
+	box-shadow: 0 0 20rpx rgba(0, 0, 0, 0.1);
+	text-align: right;
+	line-height: 100rpx;
+	padding: 0 40rpx;
+	box-sizing: border-box;
+	
+	&.have-agreement{
+		height: 190rpx;
+	}
+	
+	.agreement {
+		text-align: center;
+		font-size: $font-size-tag;
+		line-height: 1;
+		margin-top: 20rpx;
+		
+		text {
+			color: #E3B66B;
+		}
+	}
+
+	&.bottom-safe-area {
+		padding-bottom: constant(safe-area-inset-bottom);
+		padding-bottom: env(safe-area-inset-bottom);
+	}
+
+	.action-btn {
+		width: 100%;
+		height: 80rpx;
+		line-height: 80rpx;
+		color: #7C5711;
+		padding: 0 40rpx;
+		display: inline-block;
+		text-align: center;
+		margin: 30rpx 0 0 0;
+		border-radius: 10rpx;
+		border: none;
+		background-image:linear-gradient(to top,#F7DAA5,#E3B66B);
+		box-sizing: border-box;
+	}
+	
+	.title{
+		margin-right: 6rpx;
+	}
+	
+	.bold{
+		font-weight: bold;
+	}
+}
+
+/* 说明弹框 */
+.tips-layer {
+	background: #fff;
+	z-index: 999;
+	height: 40%;
+	width: 100%;
+	
+	.head {
+		position: relative;
+	}
+	
+	.title {
+		height: 80rpx;
+		line-height: 80rpx;
+		text-align: center;
+		font-size: $font-size-toolbar;
+		font-weight: 700;
+	}
+	
+	text {
+		position: absolute;
+		top: 8rpx;
+		right: 44rpx;
+		font-size: $font-size-toolbar;
+		font-weight: 500;
+	}
+	
+	.body {
+		width: 100%;
+		height: calc(100% - 80rpx);
+		overflow-y: scroll;
+		
+		.detail {
+			padding: 20rpx;
+			
+			.font-size-base {
+				margin-bottom: 10rpx;
+			}
+		}
+		
+	}
+}
\ No newline at end of file
diff --git a/pages_tool/member/public/css/collection.scss b/pages_tool/member/public/css/collection.scss
new file mode 100644
index 0000000..55ba7be
--- /dev/null
+++ b/pages_tool/member/public/css/collection.scss
@@ -0,0 +1,101 @@
+.lineheight-clear {
+	line-height: 1;
+}
+.goods_list {
+	width: 100%;
+	padding: $padding 0;
+	padding-top: 0;
+	box-sizing: border-box;
+
+	.goods_li {
+		height: 200rpx;
+		background: #ffffff;
+		overflow: hidden;
+		border-radius: $border-radius;
+		display: flex;
+		justify-content: space-between;
+		margin: $margin-updown $margin-both;
+		padding: 30rpx;
+
+		.pic {
+			width: 200rpx;
+			height: 200rpx;
+			box-sizing: border-box;
+			border-radius: $border-radius;
+			overflow: hidden;
+			image {
+				width: 100%;
+				height: 100%;
+			}
+		}
+
+		.goods_info {
+			flex: 1;
+			height: 100%;
+			padding-left: 20rpx;
+			box-sizing: border-box;
+			display: flex;
+			justify-content: space-between;
+			flex-direction: column;
+		}
+
+		.goods_name {
+			width: 100%;
+			height: 80rpx;
+			line-height: 1.5;
+			display: -webkit-box;
+			-webkit-box-orient: vertical;
+			-webkit-line-clamp: 2;
+			overflow: hidden;
+		}
+
+		.goods_opection {
+			width: 100%;
+			height: 80rpx;
+			display: flex;
+			justify-content: space-between;
+			align-items: flex-end;
+			
+			.right {
+				display: flex;
+				align-items: flex-end;
+			}
+
+			.symbol {
+				font-size: $font-size-tag;
+				color: var(--price-color);
+			}
+
+			.price {
+				font-size: $font-size-toolbar;
+				color: var(--price-color);
+			}
+
+			.cars {
+				padding: 0rpx 15rpx;
+				border: 1rpx solid $color-line;
+				border-radius: 32rpx;
+			}
+
+			.icon {
+				font-size: $font-size-tag;
+			}
+
+			.alike {
+				padding: 0rpx 15rpx;
+				border: 1rpx solid $color-line;
+				border-radius: 24rpx;
+				margin-left: 20rpx;
+			}
+		}
+	}
+}
+.empty {
+	width: 100%;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	padding: $padding;
+	box-sizing: border-box;
+	margin-top: 50rpx;
+}
diff --git a/pages_tool/member/public/css/footprint.scss b/pages_tool/member/public/css/footprint.scss
new file mode 100644
index 0000000..377bb92
--- /dev/null
+++ b/pages_tool/member/public/css/footprint.scss
@@ -0,0 +1,223 @@
+.empty {
+	margin-top: 100rpx;
+}
+
+.lineheight-clear {
+}
+
+.head-wrap {
+	width: 100vw;
+	height: 90rpx;
+	line-height: 90rpx;
+	background: #fff;
+	box-sizing: border-box;
+	padding: 0 30rpx;
+	text-align: right;
+}
+
+.goods-list.single-column {
+	margin: 0 $margin-both;
+	
+	.checkbox-wrap {
+		margin-right: 20rpx;
+		display: flex;
+		align-items: center;
+		
+		.iconfont {
+			font-size: 40rpx;
+			color: #ccc;
+		}
+	}
+	
+	.datetime {
+		line-height: 1.5;
+		font-size: $font-size-base;
+	}
+	
+	.goods-item {
+		padding: 26rpx;
+		background: #fff;
+		border-radius: $border-radius;
+		display: flex;
+		position: relative;
+		margin: $margin-updown 0;
+		
+		&.first-child {
+			margin-top: 0;
+		}
+		
+		
+		.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;
+		}
+		
+		.goods-tag-img {
+			position: absolute;
+			border-top-left-radius: $border-radius;
+			width: 80rpx;
+			height: 80rpx;
+			top: 26rpx;
+			left: 26rpx;
+			z-index: 5;
+			overflow: hidden;
+			
+			image {
+				width: 100%;
+				height: 100%;
+			}
+		}
+		
+		.info-wrap {
+			flex: 1;
+			display: flex;
+			flex-direction: column;
+			width: calc(100% - 220rpx);
+		}
+		&.manage{
+			.info-wrap {
+				width: calc(100% - 280rpx);
+			}
+		}
+		
+		.name-wrap {
+			flex: 1;
+		}
+		
+		.goods-name {
+			font-size: $font-size-base;
+			line-height: 1.3;
+			overflow: hidden;
+			text-overflow: ellipsis;
+			display: -webkit-box;
+			-webkit-line-clamp: 2;
+			-webkit-box-orient: vertical;
+			height: 68rpx;
+		}
+		
+		.introduction {
+			line-height: 1;
+			margin-top: 10rpx;
+		}
+		
+		.discount-price {
+			display: inline-block;
+			font-weight: bold;
+			line-height: 1;
+			margin-top: 16rpx;
+			color: var(--price-color);
+			.unit {
+				margin-right: 6rpx;
+			}
+		}
+		
+		.pro-info {
+			display: flex;
+			margin-top: auto;
+			
+			.delete-price {
+				text-decoration:line-through;
+				flex: 1;
+				
+				.unit {
+					margin-right: 6rpx;
+				}
+			}
+			
+			& > view {
+				line-height: 1;
+				
+				&:nth-child(2) {
+					text-align: right;
+				}
+			}
+		}
+		
+		.member-price-tag {
+			display: inline-block;
+			width: 60rpx;
+			line-height: 1;
+			margin-left: 6rpx;
+			
+			image {
+				width: 100%;
+				max-height: 30rpx;
+			}
+		}
+	}
+	
+}
+
+.bottom-wrap {
+	position: fixed;
+	width: 100vw;
+	height: 100rpx;
+	background: #fff;
+	bottom: var(--window-bottom);
+	overflow: hidden;
+	display: flex;
+	bottom: 0;
+	z-index: 9;
+	
+	.all-election {
+		flex: 1;
+		height: 100rpx;
+		position: relative;
+		display: inline-block;
+	
+		& > .iconfont {
+			font-size: 40rpx;
+			position: absolute;
+			top: 50%;
+			left: 30rpx;
+			transform: translateY(-50%);
+		}
+		& > .icon-yuan_checkbox {
+			color: $color-disabled;
+		}
+	
+		& > text {
+			margin-left: 56rpx;
+			line-height: 100rpx;
+			padding-left: 30rpx;
+		}
+	}
+	
+	.action-btn {
+		flex: 1;
+		width: 180rpx;
+		height: 100rpx;
+		line-height: 100rpx;
+		border-radius: 0;
+		margin: 0;
+		display: flex;
+		align-items: center;
+		justify-content: flex-end;
+		
+		button {
+			width: 180rpx;
+			height: 70rpx;
+			line-height: 70rpx;
+		}
+	}
+}
\ No newline at end of file
diff --git a/pages_tool/member/public/css/invite_friends.scss b/pages_tool/member/public/css/invite_friends.scss
new file mode 100644
index 0000000..be39d57
--- /dev/null
+++ b/pages_tool/member/public/css/invite_friends.scss
@@ -0,0 +1,363 @@
+.invite_adv {
+	position: relative;
+	image {
+		height: 100%;
+		width: 100%;
+	}
+	.desc {
+		position: absolute;
+		top: 0;
+		right: 10rpx;
+		text-align: right;
+		color: #fff;
+		padding: 20rpx;
+		font-size: $font-size-tag;
+		.title_desc {
+			font-size: $font-size-tag;
+		}
+		.iconfont {
+			display: inline-block;
+			color: #fff;
+			font-size: $font-size-tag;
+			margin-right: 10rpx;
+		}
+	}
+	.time {
+		position: absolute;
+		bottom: 120rpx;
+		text-align: center;
+		width: 100%;
+		color: #fff;
+	}
+	.font {
+		position: absolute;
+		bottom: 220rpx;
+		text-align: center;
+		width: 333rpx;
+		height: 186rpx;
+		z-index: 5;
+		left: calc((100% - 333rpx) / 2);
+	}
+	.btn {
+		position: absolute;
+		background-size: cover;
+		background-repeat: no-repeat;
+		text-align: center;
+		width: 610rpx;
+		line-height: 112rpx;
+		height: 126rpx;
+		left: calc((100% - 610rpx) / 2);
+		color: #ff0029;
+		bottom: -24rpx;
+		font-size: 36rpx;
+		font-weight: bold;
+	}
+}
+.more_invite {
+	text-align: center;
+	padding: 30rpx;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+.content {
+	padding: 30rpx 30rpx 0 30rpx; 
+	
+	.title {
+		font-size: $font-size-toolbar;
+		color: #000;
+		font-weight: 500;
+	}
+	.empty {
+		padding: 50rpx;
+		.tip {
+			font-size: $font-size-base;
+			color: #999999;
+			text-align: center;
+		}
+	}
+	.invitelist_block {
+		border: 2rpx solid $color-line;
+		border-radius: $border-radius;
+		margin-top: $margin-both;
+		background-color: #fff;
+	}
+	.invitelist {
+		.list-item {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			padding: 30rpx 24rpx;
+			
+			.img {
+				width: 70rpx;
+				height: 70rpx;
+				border-radius: 70rpx;
+				border: 2rpx solid;
+				margin-right: $margin-updown;
+				overflow: hidden;
+				image {
+					width: 100%;
+					height: 70rpx;
+					overflow: hidden;
+				}
+			}
+			
+			.list-left {
+				flex: 1;
+				.info {
+					display: flex;
+					
+					& > view {
+						flex: 1;
+					}
+					
+					.time {
+						text-align: right;
+					}
+				}
+			}
+			.prize {
+			}
+		}
+	}
+	.invite_active {
+		.list {
+			display: flex;
+			margin-top: 37rpx;
+			.item {
+				position: relative;
+				width: 232rpx;
+				height: 214rpx;
+				&.margin_right_none {
+					margin: 0;
+				}
+				image {
+					width: 100%;
+					height: 100%;
+				}
+				.desc {
+					position: absolute;
+					top: 0;
+					text-align: center;
+					width: 100%;
+					.price {
+						text-align: center;
+						background-image: -webkit-linear-gradient(bottom, #ff2440, #ff7b7b);
+						-webkit-background-clip: text;
+						-webkit-text-fill-color: transparent;
+						font-size: 30rpx;
+						font-weight: 500;
+						line-height: 1;
+						text {
+							font-size: 50rpx;
+						}
+					}
+					.type {
+						font-size: $font-size-tag;
+						color: #666666;
+					}
+				}
+			}
+			.item:last-child {
+				margin-right: 0rpx !important;
+			}
+		}
+		.desc {
+			color: #999999;
+			padding: 30rpx 0;
+
+			.title {
+				color: #999999;
+				font-weight: 400;
+			}
+			.desc_list {
+				view {
+					color: #999999;
+					display: flex;
+					text {
+						font-size: $font-size-activity-tag;
+						margin-right: 10rpx;
+						align-self: center;
+					}
+				}
+			}
+		}
+	}
+	.step {
+		display: flex;
+		align-items: center;
+		margin-top: 80rpx;
+		padding-bottom: 80rpx;
+		> view {
+			text-align: center;
+			width: 20%;
+			display: flex;
+			flex-direction: column;
+
+			.img {
+				width: 56rpx;
+				height: 56rpx;
+				margin: auto;
+				image {
+					width: 100%;
+					height: 100%;
+				}
+			}
+			.text {
+				margin-top: 20rpx;
+				font-size: $font-size-tag;
+				color: $color-tip;
+			}
+			.jiantou {
+				width: 40rpx;
+				height: 24rpx;
+				margin: auto;
+			}
+		}
+	}
+}
+.invite-list{
+	margin-top: 40rpx;
+}
+.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;
+				text {
+					margin-top: 20rpx;
+					font-size: $font-size-tag;
+					display: block;
+					color: $color-title;
+				}
+			}
+
+			.iconfont {
+				font-size: 80rpx;
+				line-height: initial;
+			}
+			.icon-pengyouquan,.icon-fuzhilianjie,.icon-share-friend {
+				color: #07c160;
+			}
+		}
+	}
+
+	.share-footer {
+		height: 90rpx;
+		line-height: 90rpx;
+		border-top: 2rpx #f5f5f5 solid;
+		text-align: center;
+		color: #666;
+	}
+}
+.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: 70%;
+		margin: 60rpx auto 40rpx auto;
+		box-shadow: 0 0 32rpx rgba(100, 100, 100, 0.3);
+		line-height: 1;
+		border-radius: 16rpx;
+		overflow: hidden;
+		
+		image {
+			width: 100%;
+			height: 750rpx;
+		}
+	}
+	.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;
+	}
+}
+/* 说明弹框 */
+.tips-layer {
+	background: #fff;
+	z-index: 999;
+	height: 40%;
+	width: 100%;
+
+	.head {
+		position: relative;
+	}
+
+	.title {
+		height: 80rpx;
+		line-height: 80rpx;
+		text-align: center;
+		font-size: $font-size-toolbar;
+		font-weight: 700;
+	}
+
+	text {
+		position: absolute;
+		top: 8rpx;
+		right: 44rpx;
+		font-size: $font-size-toolbar;
+		font-weight: 500;
+	}
+
+	.body {
+		width: 100%;
+		height: calc(100% - 80rpx);
+		overflow-y: scroll;
+
+		.detail {
+			padding: 20rpx 30rpx;
+
+			.font-size-base {
+				margin-bottom: 10rpx;
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/pages_tool/member/public/css/level.scss b/pages_tool/member/public/css/level.scss
new file mode 100644
index 0000000..e5f4bbf
--- /dev/null
+++ b/pages_tool/member/public/css/level.scss
@@ -0,0 +1,413 @@
+.member-level {
+	width: 100%;
+	min-height: 100vh;
+	position: relative;
+}
+.level-top {
+	width: 100%;
+	position: relative;
+	image {
+		width: 100%;
+		height: 400rpx;
+		position: absolute;
+	}
+}
+.banner-container {
+	width: 100vw;
+	position: relative;
+	left: 0;
+	top: 0;
+
+	.memberInfo {
+		width: 100%;
+		height: 140rpx;
+		padding: 40rpx 30rpx 0;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		box-sizing: border-box;
+		image {
+			width: 100rpx;
+			height: 100rpx;
+			border-radius: 50%;
+			border: 4rpx solid #ffffff;
+			box-sizing: border-box;
+		}
+		.growth-rules {
+			position: absolute;
+			display: flex;
+			align-items: center;
+			color: #fff;
+			right: 40rpx;
+			font-size: 24rpx;
+			.iconfont{
+				margin-right: 10rpx;
+			}
+		}
+		.member-desc {
+			width: calc(100% - 20rpx - 100rpx);
+			height: 100%;
+			padding: 13rpx 0;
+			box-sizing: border-box;
+			display: flex;
+			flex-direction: column;
+			align-items: flex-start;
+			justify-content: space-between;
+			view {
+				line-height: 1.4;
+				color: #ffffff;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				white-space: nowrap;
+			}
+		}
+	}
+
+	.demand {
+		width: 100%;
+		padding: 0 $padding;
+		box-sizing: border-box;
+		.demand-title {
+			font-size: $font-size-toolbar;
+			font-weight: bold;
+			line-height: 1;
+			display: flex;
+			align-items: center;
+			image {
+				width: 39rpx;
+				height: 35rpx;
+				margin-right: 10rpx;
+			}
+		}
+		.demand-info {
+			padding: 10rpx 24rpx;
+			box-sizing: border-box;
+			display: flex;
+			flex-direction: column;
+			margin-top: 27rpx;
+			border-radius: 10rpx;
+			justify-content: space-between;
+			height: 150rpx;
+			background: #ffffff;
+			.info-title {
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				text {
+					&:nth-child(1) {
+						color: #000;
+						font-size: $font-size-tag;
+					}
+					&:nth-child(2) {
+						color: #959595;
+					}
+				}
+			}
+			progress {
+				margin-top: 39rpx;
+			}
+			.info-size {
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				font-size: $font-size-tag;
+				color: #959595;
+			}
+		}
+	}
+
+	.uni-swiper-dots {
+		bottom: 30rpx !important;
+	}
+
+	.image-container {
+		box-sizing: border-box;
+		width: 100%;
+		height: 100%;
+		display: flex;
+		image {
+			width: 100%;
+			height: 100%;
+		}
+		.slide-image {
+			width: 535rpx;
+			height: 300rpx;
+			z-index: 200;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			border-radius: 20rpx;
+			overflow: hidden;
+			position: relative;
+
+			.info {
+				width: 100%;
+				height: 100%;
+				display: flex;
+				flex-direction: column;
+				position: absolute;
+				left: 0;
+				bottom: 0;
+				padding: 30rpx 40rpx;
+				box-sizing: border-box;
+				.level-detail {
+					font-size: $font-size-toolbar;
+					display: flex;
+					align-items: center;
+				}
+				.growr-name {
+					font-size: 24rpx;
+					margin-top: 30rpx;
+				}
+				.growr-value {
+					font-size: 40rpx;
+				}
+				.progress {
+					margin-top: 30rpx;
+				}
+				.residue-growr-value {
+					text-align: right;
+					font-size: 24rpx;
+					margin-top: 10rpx;
+				}
+				view {
+					color: #ffffff;
+					line-height: 1.3;
+				}
+			}
+			.now_growth {
+				margin-top: 20rpx;
+			}
+			.pic {
+				display: flex;
+				justify-content: center;
+				align-items: center;
+
+				image {
+					width: 160rpx;
+				}
+			}
+			.isnow {
+				font-size: 20rpx;
+				color: #fff;
+				padding: 2rpx 4rpx;
+				line-height: 1;
+				margin-left: 10rpx;
+				border: 2rpx solid #fff;
+				border-radius: 4rpx;
+			}
+		}
+	}
+
+	.item-left {
+		justify-content: flex-end;
+		padding: 56rpx 26rpx 0 0;
+	}
+
+	.image-container-box .item-left {
+		justify-content: center;
+		padding: 56rpx 0 0 0;
+	}
+
+	.item-right {
+		justify-content: flex-start;
+		padding: 56rpx 0 0 26rpx;
+	}
+
+	.item-center {
+		justify-content: center;
+		padding: 56rpx 0 0 0;
+	}
+
+	.member-equity {
+		background-color: #fff;
+		border-radius: 10rpx;
+		padding: 20rpx 30rpx 20rpx;
+		// padding: 20rpx 30rpx;
+		margin:$margin-updown $margin-both;
+		.gift-title {
+			font-size: 30rpx;
+		}
+		.equity-itme {
+			display: flex;
+			align-items: center;
+			image {
+				width: 60rpx;
+				height: 60rpx;
+				margin-right: 30rpx;
+			}
+			.equity-content {
+				padding: 20rpx 0;
+				line-height: 1;
+				&.active {
+					border-bottom: 2rpx solid #e5e5e5;
+				}
+				flex: 1;
+				display: flex;
+				flex-direction: column;
+				.equity-desc {
+					font-size: $font-size-activity-tag;
+					margin-top: 16rpx;
+					color: $color-tip;
+				}
+			}
+		}
+	}
+
+	.member-gift {
+		background-color: #fff;
+		margin: $margin-updown $margin-both;
+		padding: 20rpx 30rpx;
+		border-radius: 10rpx;
+		.gift-title {
+			font-size: 30rpx;
+		}
+		.gift-itme {
+			display: flex;
+			align-items: center;
+			image {
+				width: 60rpx;
+				height: 60rpx;
+				margin-right: 30rpx;
+			}
+			.gift-content {
+				&.active {
+					border-bottom: 2rpx solid #e5e5e5;
+				}
+				padding: 20rpx 0;
+				line-height: 1;
+				flex: 1;
+				display: flex;
+				flex-direction: column;
+				.gift-desc {
+					font-size: 24rpx;
+					margin-top: 16rpx;
+					color: #999;
+				}
+			}
+		}
+	}
+
+	.desc-wrap {
+		box-sizing: border-box;
+		width: 100%;
+		height: 98rpx;
+		padding: 24rpx 66rpx 0;
+
+		.title {
+			width: 100%;
+			height: 42rpx;
+			line-height: 42rpx;
+			color: #222222;
+			font-size: $font-size-base;
+			font-family: 'PingFangTC-Regular';
+			font-weight: 600;
+			text-align: left;
+		}
+
+		.desc {
+			margin-top: 4rpx;
+			width: 100%;
+			height: 34rpx;
+			line-height: 34rpx;
+			color: #999999;
+			font-size: $font-size-tag;
+			font-family: 'PingFangTC-Regular';
+			text-align: left;
+		}
+	}
+
+	@keyframes descAnimation {
+		0% {
+			opacity: 1;
+		}
+
+		25% {
+			opacity: 0.5;
+		}
+
+		50% {
+			opacity: 0;
+		}
+
+		75% {
+			opacity: 0.5;
+		}
+
+		100% {
+			opacity: 1;
+		}
+	}
+
+	@-webkit-keyframes descAnimation {
+		0% {
+			opacity: 1;
+		}
+
+		25% {
+			opacity: 0.5;
+		}
+
+		50% {
+			opacity: 0;
+		}
+
+		75% {
+			opacity: 0.5;
+		}
+
+		100% {
+			opacity: 1;
+		}
+	}
+}
+.coupon-popup-box {
+	background-color: #f7f7f7;
+	.coupon-popup-title {
+		text-align: center;
+		font-size: 32rpx;
+		line-height: 90rpx;
+		height: 90rpx;
+		display: block;
+		font-weight: bold;
+		position: relative;
+		border-bottom: 1rpx solid #eeeeee;
+	}
+	.iconfont {
+		position: absolute;
+		float: right;
+		right: 44rpx;
+		font-size: 40rpx;
+		font-weight: 500;
+	}
+	.coupon-item {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		padding: 20rpx 30rpx;
+		margin-bottom: 20rpx;
+		background-color: #fff;
+		border-radius: 4rpx;
+		.coupon-name {
+			flex: 1;
+			display: flex;
+			flex-direction: column;
+			.desc {
+				margin-top: 20rpx;
+				font-size: $font-size-tag;
+				color: #ababab;
+			}
+		}
+		.coupon-price {
+			color: red;
+			text {
+				font-size: 70rpx;
+			}
+		}
+	}
+	.coupon-popup-content {
+		max-height: 390rpx;
+		padding: 20rpx;
+		box-sizing: border-box;
+	}
+}
diff --git a/pages_tool/member/public/css/point.scss b/pages_tool/member/public/css/point.scss
new file mode 100644
index 0000000..5204ec2
--- /dev/null
+++ b/pages_tool/member/public/css/point.scss
@@ -0,0 +1,207 @@
+.custom-navbar {
+	width: 100vw;
+	padding-bottom: 20rpx;
+	position: fixed;
+	left: 0;
+	top: 0;
+	z-index: 100;
+	background: unset;
+	
+	// #ifdef MP-WEIXIN
+	background-size: 100% 380rpx;
+	// #endif
+	
+	.navbar-wrap {
+		position: relative;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		width: 100%;
+		height: 100%;
+	}
+	
+	.navbar-title {
+		color: #fff;
+		font-size: 32rpx;
+		font-weight: 600;
+	}
+	
+	.back {
+		position: absolute;
+		color: #fff;
+		left: 30rpx;
+		font-size: 40rpx;
+	}
+}
+
+.custom-navbar-block {
+	padding-bottom: 20rpx;
+}
+
+
+.head-wrap {
+	width: 100vw;
+	background-size: 100%;
+	padding: 60rpx 68rpx 140rpx 68rpx; 
+	box-sizing: border-box;
+	border-radius: 0 0 100% 100%/0 0 70rpx 70rpx;
+	overflow: hidden;
+	
+	// #ifdef MP-WEIXIN
+	padding-top: 160rpx;
+	// #endif
+	
+	.title {
+		text-align: left;
+		line-height: 1;
+		color: #F6F6F6;
+	}
+	
+	.point {
+		color: var(--btn-text-color);
+		text-align: left;
+		line-height: 1;
+		margin-bottom: 20rpx;
+		font-size: 64rpx;
+	}
+	
+	.flex-box {
+		display: flex;
+		margin-top: 56rpx;
+		
+		.flex-item {
+			flex: 1;
+			
+			.num {
+				font-size: 34rpx;
+				margin-bottom: 20rpx;
+				color: #fff;
+				white-space: nowrap;
+				text-overflow: ellipsis;
+				overflow: hidden;
+			}
+			
+			view {
+				text-align: left;
+				color: #F6F6F6;
+				line-height: 1;
+			}
+		}
+	}
+}
+
+.menu-wrap {
+	border-radius: 20rpx;
+	margin: 0 24rpx;
+	padding: 30rpx;
+	background: #fff;
+	display: flex;
+	transform: translateY(-90rpx);
+	
+	.menu-item {
+		flex: 1;
+		text-align: left;
+		display: flex;
+		align-items: center;
+		
+		.icon {
+			width: 88rpx;
+			height: 88rpx;
+			background: #F3F3F3;
+			border-radius: 20rpx;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			color: #fff;
+			margin-right: 24rpx;
+			
+			image {
+				width: 70%;
+			}
+		}
+		
+		.title {
+			font-size: 32rpx;
+			font-weight: bold;
+			color: #333333;
+		}
+	}
+}
+
+.task-wrap {
+	background-color: #fff;
+	margin: 30rpx 24rpx;
+	border-radius: 18rpx;
+	padding: 32rpx;
+	transform: translateY(-90rpx);
+	
+	.title {
+		font-size: 32rpx;
+		text-align: left;
+		margin-bottom: 40rpx;
+		font-weight: bold;
+	}
+	
+	.task-item {
+		border-radius: $border-radius;
+		background: #fff;
+		display: flex;
+		align-items: center;
+		margin-bottom: 80rpx;
+		
+		&:last-child {
+			margin-bottom: 30rpx;
+		}
+		
+		.icon {
+			width: 62rpx;
+			height: 62rpx;
+			background: #F3F3F3;
+			border-radius: 20rpx;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			color: #fff;
+		}
+		
+		.iconfont {
+			font-size: 52rpx;
+			-webkit-background-clip: text !important;
+			-webkit-text-fill-color: transparent;
+			background: linear-gradient(135deg, #FE7849 0%, #FF1959 100%);
+		}
+		
+		.iconshangpin {
+			font-size: 48rpx;
+		}
+		
+		.wrap {
+			flex: 1;
+			padding-left: 26rpx;
+			
+			.title {
+				line-height: 1;
+				font-size: 28rpx;
+				font-weight: bold;
+				margin-bottom: 0;
+			}
+			
+			.desc {
+				line-height: 1;
+				margin-top: 10rpx;
+			}
+		}
+		
+		.btn {
+			height: 60rpx;
+			line-height: 60rpx;
+			border-radius: 60rpx;
+			text-align: center;
+			width: 140rpx;
+			color: #fff;
+			font-size: 26rpx;
+			font-weight: 600;
+			background: linear-gradient(135deg, #FE7849 0%, #FF1959 100%);
+		}
+	}
+}
\ No newline at end of file
diff --git a/pages_tool/member/public/js/collection.js b/pages_tool/member/public/js/collection.js
new file mode 100644
index 0000000..9f9189b
--- /dev/null
+++ b/pages_tool/member/public/js/collection.js
@@ -0,0 +1,80 @@
+export default {
+	data() {
+		return {
+			collectionList: [],
+			isShowEmpty: false
+		};
+	},
+	methods: {
+		//跳转至详情页
+		toDetail(e) {
+			this.$util.redirectTo("/pages/goods/detail", {
+				goods_id: e.goods_id
+			});
+		},
+		//请求数据
+		getData(mescroll) {
+			this.isShowEmpty = false;
+			let url = "/api/goodscollect/page"
+			let array = []
+			this.$api.sendRequest({
+				url: url,
+				data: {
+					page_size: mescroll.size,
+					page: mescroll.num,
+				},
+				async: false,
+			}).then((res) => {
+				let newArr = res.data.list;
+				for (var i = 0; i < newArr.length; i++) {
+					newArr[i].composite_score = Math.floor((parseFloat(newArr[i].shop_desccredit) + parseFloat(newArr[i].shop_servicecredit) + parseFloat(newArr[i].shop_deliverycredit)) / 3).toFixed(1);
+				}
+				array = array.concat(newArr);
+				//设置列表数据
+				if (mescroll.num == 1) this.collectionList = []; //如果是第一页需手动制空列表
+				this.collectionList = this.collectionList.concat(newArr); //追加新数据
+				mescroll.endSuccess(array.length);
+				if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				this.isShowEmpty = true;
+			})
+
+		},
+		//监听下拉刷新，初始化页面数据
+		listenRefresh(e) {
+			this.$refs.goodsRecommend.init();
+		},
+		//删除某一项
+		deleteItem(e) {
+			this.$api.sendRequest({
+				url: "/api/goodscollect/delete",
+				data: {
+					goods_id: e
+				},
+				success: res => {
+					if (res.code == 0) {
+						this.$util.showToast({
+							title: "删除成功"
+						})
+						let array = this.collectionList;
+						let newArray = array.filter((v) => {
+							return v.goods_id != e;
+						})
+						this.collectionList = newArray;
+					} else {
+						this.$util.showToast({
+							title: res.message
+						})
+					}
+				}
+			})
+		},
+		imageError(index) {
+			this.collectionList[index].logo = this.$util.getDefaultImage().goods;
+			this.$forceUpdate();
+		},
+		goodsImageError(index) {
+			this.collectionList[index].sku_image = this.$util.getDefaultImage().goods;
+			this.$forceUpdate();
+		}
+	}
+};
diff --git a/pages_tool/member/public/js/info.js b/pages_tool/member/public/js/info.js
new file mode 100644
index 0000000..94d7fbc
--- /dev/null
+++ b/pages_tool/member/public/js/info.js
@@ -0,0 +1,1034 @@
+import validate from '@/common/js/validate.js';
+
+export default {
+	data() {
+		return {
+			registerConfig: {},
+			indent: 'all',
+			customNavTitle: "",
+			formData: {
+				userHeadImg: '',
+				number: '', //账号
+				nickName: '', //昵称
+				sex: '', //性别
+				realName: '', //真实姓名
+				birthday: '', //生日
+				currentPassword: '', //当前密码
+				newPassword: '', //新密码
+				confirmPassword: '', //确认密码
+				mobile: '', //手机号
+				mobileVercode: '', //手机验证码
+				mobileDynacode: '', //手机动态验证吗
+				mobileCodeText: "",
+				username: '',
+				provinceId: 0,
+				cityId: 0,
+				districtId: 0,
+				fullAddress: '',
+				address: ''
+			},
+			memberInfoformData: {
+				userHeadImg: '',
+				number: '', //账号
+				nickName: '', //昵称
+				sex: '', //性别
+				realName: '', //真实姓名
+				birthday: '', //生日
+				currentPassword: '', //当前密码
+				newPassword: '', //新密码
+				confirmPassword: '', //确认密码
+				mobile: '', //手机号
+				mobileVercode: '', //手机验证码
+				mobileDynacode: '', //手机动态验证吗
+				mobileCodeText: "",
+			},
+			langList: [],
+			langIndex: 0,
+			seconds: 120,
+			timer: null,
+			isSend: false,
+			captcha: {
+				id: '',
+				img: ''
+			},
+			isIphoneX: false,
+			items: [{
+				value: '0',
+				name: '未知'
+			},
+				{
+					value: '1',
+					name: '男',
+					checked: 'true'
+				},
+				{
+					value: '2',
+					name: '女'
+				}
+			],
+			current: 0,
+			memberConfig: {
+				is_audit: 0,
+				is_enable: 0
+			},
+			defaultRegions: [],
+		};
+	},
+	onLoad(option) {
+		this.isIphoneX = this.$util.uniappIsIPhoneX()
+		this.formData.mobileCodeText = this.$lang('findanimateCode');
+
+		if (option.back) {
+			this.back = option.back;
+		}
+
+		this.getCaptcha();
+
+		if (option.action) {
+			this.indent = option.action;
+			this.setNavbarTitle()
+
+			// #ifdef MP-WEIXIN
+			option.action == 'bind_mobile' && this.getCode()
+			// #endif
+		}
+
+		this.getRegisterConfig();
+		this.initLang();
+		this.getMemberConfig();
+	},
+	onShow() {
+		if (!this.storeToken) {
+			this.$nextTick(() => {
+				this.$refs.login.open('/pages_tool/member/info');
+			});
+		} else {
+			this.getInfo();
+		}
+	},
+	onHide() {
+		this.seconds = 120;
+		this.formData.mobileCodeText = '获取动态码';
+		this.isSend = false;
+		clearInterval(this.timer);
+	},
+	watch: {
+		seconds(value) {
+			if (value == 0) {
+				this.seconds = 120;
+				this.formData.mobileCodeText = '获取动态码';
+				this.isSend = false;
+				clearInterval(this.timer);
+			}
+		}
+	},
+	computed: {
+		startDate() {
+			return this.getDate('start');
+		},
+		endDate() {
+			return this.getDate('end');
+		}
+	},
+	filters: {
+		mobile(mobile) {
+			return mobile.substring(0, 4 - 1) + '****' + mobile.substring(6 + 1);
+		}
+	},
+	methods: {
+		// 初始化语言
+		initLang() {
+			//获取语言列表
+			this.langList = this.$langConfig.list();
+			if (!uni.getStorageSync("lang")) {
+				this.langIndex = 0;
+			} else {
+				for (let i = 0; i < this.langList.length; i++) {
+					if (this.langList[i].value == uni.getStorageSync("lang")) {
+						this.langIndex = i;
+						break;
+					}
+				}
+			}
+		},
+		setNavbarTitle() {
+			let title = '个人资料';
+			switch (this.indent) {
+				case 'name':
+					title = this.$lang('modifyNickname');
+					break;
+				case 'realName':
+					title = this.$lang('realName');
+					break;
+				case 'sex':
+					title = this.$lang('sex');
+					break;
+				case 'birthday':
+					title = this.$lang('birthday');
+					break;
+				case 'password':
+					title = this.$lang('password');
+					break;
+				case 'mobile':
+					title = this.$lang('mobile');
+					break;
+			}
+			uni.setNavigationBarTitle({
+				title: title
+			});
+		},
+		// 初始化用户信息
+		getInfo() {
+			this.memberInfoformData.userHeadImg = this.memberInfo.headimg;
+			this.memberInfoformData.number = this.memberInfo.username; //账号
+			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.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.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
+			];
+		},
+		// 切换编辑项
+		modifyInfo(action) {
+			switch (action) {
+				case 'cancellation':
+					this.getCancelStatus();
+					break;
+				case 'language':
+					let newArray = [];
+					for (let i = 0; i < this.langList.length; i++) {
+						newArray.push(this.langList[i].name)
+					}
+					uni.showActionSheet({
+						itemList: newArray,
+						success: function (res) {
+							if (vm.langIndex != res.tapIndex) {
+								vm.$langConfig.change(vm.langList[res.tapIndex].value)
+							}
+						}
+					});
+					break;
+				case 'mobile':
+					// #ifdef MP
+					this.$util.redirectTo('/pages_tool/member/info_edit', {
+						action: 'bind_mobile'
+					});
+					// #endif
+					// #ifndef MP
+					this.$util.redirectTo('/pages_tool/member/info_edit', {
+						action
+					});
+					// #endif
+					break;
+				default:
+					this.$util.redirectTo('/pages_tool/member/info_edit', {
+						action
+					});
+			}
+		},
+		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',
+				success: res => {
+					if (res.code >= 0) {
+						if (res.data) {
+							if (res.data.status == 0) {
+								this.$util.redirectTo('/pages_tool/member/cancelstatus', {
+									back: '/pages_tool/member/info'
+								});
+							} else if (res.data.status == 1) {
+								this.$util.redirectTo('/pages_tool/member/cancelsuccess', {
+									back: '/pages_tool/member/info'
+								});
+							} else {
+								this.$util.redirectTo('/pages_tool/member/cancelrefuse', {
+									back: '/pages_tool/member/info'
+								});
+							}
+						} else {
+							this.$util.redirectTo('/pages_tool/member/assets', {
+								back: '/pages_tool/member/info'
+							});
+						}
+					}
+				}
+			});
+		},
+		// 导航返回
+		NavReturn() {
+			uni.navigateBack({
+				delta: 1
+			})
+		},
+		// 获取验证码
+		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, '');
+					}
+				}
+			});
+		},
+		// 退出登录
+		logout() {
+			uni.showModal({
+				title: '提示',
+				content: '确定要退出登录吗',
+				success: (res) => {
+					if (res.confirm) {
+						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');
+					}
+				}
+			});
+		},
+		headImage() {
+			this.$util.redirectTo("/pages_tool/member/modify_face");
+		},
+		// 检测手机是否已绑定
+		async testBinding(type) {
+			var res = await this.checkMobile();
+			return res;
+		},
+		//获取注销的配置信息
+		getMemberConfig() {
+			this.$api.sendRequest({
+				url: '/membercancel/api/membercancel/config',
+				success: res => {
+					if (res.code >= 0) {
+						this.memberConfig = res.data
+					}
+				}
+			});
+
+		},
+		save(type) {
+			switch (type) {
+				case 'username':
+					this.modifyUserName();
+					break;
+				case 'name':
+					this.modifyNickName();
+					break;
+				case 'realName':
+					this.modifyRealName();
+					break;
+				case 'sex':
+					this.modifySex();
+					break;
+				case 'birthday':
+					this.modifyBirthday();
+					break;
+				case 'password':
+					this.modifyPassword();
+					break;
+				case 'mobile':
+					this.modifyMobile();
+					break;
+				case 'address':
+					this.modifyAddress();
+					break;
+			}
+		},
+
+		// ------------------------修改用户名------------------------------
+		modifyUserName() {
+			if (this.formData.username == this.memberInfo.username) {
+				this.$util.showToast({
+					title: this.$lang('alikeusername')
+				});
+				return;
+			}
+			var rule = [{
+				name: 'username',
+				checkType: 'required',
+				errorMsg: this.$lang('noEmityUsername')
+			}];
+			if (!rule.length) return;
+			var checkRes = validate.check(this.formData, rule);
+			if (checkRes) {
+				this.$api.sendRequest({
+					url: '/api/member/modifyusername',
+					data: {
+						username: this.formData.username
+					},
+					success: res => {
+						if (res.code == 0) {
+							this.memberInfo.username = this.formData.username;
+							this.$store.commit('setMemberInfo', this.memberInfo);
+							this.$util.showToast({
+								title: this.$lang("updateSuccess")
+							});
+							this.NavReturn();
+						} else {
+							this.$util.showToast({
+								title: res.message
+							});
+						}
+					}
+				});
+			} else {
+				this.$util.showToast({
+					title: validate.error
+				});
+			}
+		},
+		// ------------------------修改昵称------------------------------
+
+		modifyNickName() {
+			if (this.formData.nickName == this.memberInfo.nickname) {
+				this.$util.showToast({
+					title: this.$lang('alikeNickname')
+				});
+				return;
+			}
+			var rule = [{
+				name: 'nickName',
+				checkType: 'required',
+				errorMsg: this.$lang('noEmityNickname')
+			}];
+			if (!rule.length) return;
+			var checkRes = validate.check(this.formData, rule);
+			if (checkRes) {
+				this.$api.sendRequest({
+					url: '/api/member/modifynickname',
+					data: {
+						nickname: this.formData.nickName
+					},
+					success: res => {
+						if (res.code == 0) {
+							this.memberInfo.nickname = this.formData.nickName;
+							this.$store.commit('setMemberInfo', this.memberInfo);
+							this.$util.showToast({
+								title: this.$lang("updateSuccess")
+							});
+							this.NavReturn();
+						} else {
+							this.$util.showToast({
+								title: res.message
+							});
+						}
+					}
+				});
+			} else {
+				this.$util.showToast({
+					title: validate.error
+				});
+			}
+		},
+
+		// ------------------------修改真实姓名------------------------------
+		modifyRealName() {
+			if (this.formData.realName == this.memberInfo.realname && this.memberInfo.realname) {
+				this.$util.showToast({
+					title: '与原真实姓名一致，无需修改'
+				});
+				return;
+			}
+			var rule = [{
+				name: 'realName',
+				checkType: 'required',
+				errorMsg: '真实姓名不能为空'
+			}];
+			if (!rule.length) return;
+			var checkRes = validate.check(this.formData, rule);
+			if (checkRes) {
+				this.$api.sendRequest({
+					url: '/api/member/modifyrealname',
+					data: {
+						realname: this.formData.realName
+					},
+					success: res => {
+						if (res.code == 0) {
+							this.memberInfo.realname = this.formData.realName;
+							this.$store.commit('setMemberInfo', this.memberInfo);
+							this.$util.showToast({
+								title: this.$lang("updateSuccess")
+							});
+							this.NavReturn();
+						} else {
+							this.$util.showToast({
+								title: res.message
+							});
+						}
+					}
+				});
+			} else {
+				this.$util.showToast({
+					title: validate.error
+				});
+			}
+		},
+
+		// ------------------------修改性别------------------------------
+		radioChange: function (evt) {
+			for (let i = 0; i < this.items.length; i++) {
+				if (this.items[i].value === evt.target.value) {
+					this.formData.sex = i;
+					break;
+				}
+			}
+		},
+
+		modifySex() {
+			this.$api.sendRequest({
+				url: '/api/member/modifysex',
+				data: {
+					sex: this.formData.sex
+				},
+				success: res => {
+					if (res.code == 0) {
+						this.memberInfo.sex = this.formData.sex;
+						this.$store.commit('setMemberInfo', this.memberInfo);
+						this.$util.showToast({
+							title: this.$lang("updateSuccess")
+						});
+						this.NavReturn();
+					} else {
+						this.$util.showToast({
+							title: res.message
+						});
+					}
+				}
+			});
+		},
+
+		// ------------------------修改生日------------------------------
+
+		bindDateChange: function (e) {
+			this.formData.birthday = e.target.value
+		},
+
+		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}-${day}`;
+		},
+
+		modifyBirthday() {
+			if (this.formData.birthday.length == 0) {
+				this.$util.showToast({
+					title: '请选择生日'
+				});
+				return;
+			}
+			this.$api.sendRequest({
+				url: '/api/member/modifybirthday',
+				data: {
+					birthday: this.$util.timeTurnTimeStamp(this.formData.birthday)
+				},
+				success: res => {
+					if (res.code == 0) {
+						this.memberInfo.birthday = this.$util.timeTurnTimeStamp(this.formData.birthday);
+						this.$store.commit('setMemberInfo', this.memberInfo);
+						this.$util.showToast({
+							title: this.$lang("updateSuccess")
+						});
+						this.NavReturn();
+					} else {
+						this.$util.showToast({
+							title: res.message
+						});
+					}
+				}
+			});
+		},
+
+		// ------------------------修改密码------------------------------
+		/**
+		 * 获取注册配置
+		 */
+		getRegisterConfig() {
+			this.$api.sendRequest({
+				url: '/api/register/config',
+				success: res => {
+					if (res.code >= 0) {
+						this.registerConfig = res.data.value;
+					}
+				}
+			});
+		},
+		modifyPassword() {
+			if (this.memberInfo.password) {
+				var rule = [{
+					name: 'currentPassword',
+					checkType: 'required',
+					errorMsg: this.$lang("pleaseInputOldPassword")
+				},
+					{
+						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")
+					}
+				];
+			}
+
+			let regConfig = this.registerConfig;
+			if (regConfig.pwd_len > 0) {
+				rule.push({
+					name: 'newPassword',
+					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: 'newPassword',
+					checkType: 'reg',
+					checkRule: reg,
+					errorMsg: passwordErrorMsg
+				});
+			}
+			var checkRes = validate.check(this.formData, rule);
+			if (checkRes) {
+				if (this.formData.currentPassword == this.formData.newPassword) {
+					this.$util.showToast({
+						title: '新密码不能与原密码相同'
+					});
+					return;
+				}
+				if (this.formData.newPassword != this.formData.confirmPassword) {
+					this.$util.showToast({
+						title: '两次密码不一致'
+					});
+					return;
+				}
+				this.$api.sendRequest({
+					url: '/api/member/modifypassword',
+					data: {
+						new_password: this.formData.newPassword,
+						old_password: this.formData.currentPassword,
+						code: this.formData.mobileDynacode,
+						key: uni.getStorageSync("password_mobile_key"),
+					},
+					success: res => {
+						if (res.code == 0) {
+							this.memberInfo.password = 1;
+							this.$store.commit('setMemberInfo', this.memberInfo);
+							this.$util.showToast({
+								title: this.$lang('updateSuccess')
+							});
+							this.NavReturn();
+							uni.removeStorageSync('password_mobile_key');
+						} else {
+							this.$util.showToast({
+								title: res.message
+							});
+							this.getCaptcha();
+						}
+					}
+				});
+			} else {
+				this.$util.showToast({
+					title: validate.error
+				});
+			}
+		},
+
+		// ------------------------修改手机号------------------------------
+		// 验证手机号
+		vertifyMobile() {
+			var rule = [{
+				name: 'mobile',
+				checkType: 'required',
+				errorMsg: '请输入手机号'
+			}, {
+				name: 'mobile',
+				checkType: 'phoneno',
+				errorMsg: '请输入正确的手机号'
+			}];
+			var checkRes = validate.check(this.formData, rule);
+			if (!checkRes) {
+				this.$util.showToast({
+					title: validate.error
+				});
+				return false;
+			}
+			return true;
+		},
+		// 检测手机号是否存在
+		async checkMobile() {
+			if (!this.vertifyMobile()) return;
+			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: res.message
+				});
+				return false;
+			}
+			return true;
+		},
+
+		// 发送短信动态码
+		async bindMoblieCode() {
+			if (this.seconds != 120) return;
+			var rule = [{
+				name: 'mobile',
+				checkType: 'phoneno',
+				errorMsg: this.$lang("surePhoneNumber")
+			},
+				{
+					name: 'mobileVercode',
+					checkType: 'required',
+					errorMsg: this.$lang("confirmCodeInput")
+				},
+			];
+
+			var checkRes = validate.check(this.formData, rule);
+
+			if (checkRes && !this.isSend) {
+				this.isSend = true;
+				this.$api.sendRequest({
+					url: '/api/member/bindmobliecode',
+					data: {
+						mobile: this.formData.mobile,
+						captcha_id: this.captcha.id,
+						captcha_code: this.formData.mobileVercode
+					},
+					success: res => {
+						let data = res.data;
+						if (data.key) {
+							if (this.seconds == 120 && this.timer == null) {
+								this.timer = setInterval(() => {
+									this.seconds--;
+									this.formData.mobileCodeText = '已发送(' + this.seconds + 's)';
+								}, 1000);
+							}
+							uni.setStorageSync('mobile_key', data.key);
+						} else {
+							this.$util.showToast({
+								title: res.message
+							});
+							this.isSend = false;
+						}
+					},
+					fail: res => {
+						this.isSend = false;
+						this.getCaptcha();
+					}
+				});
+			} else {
+				this.$util.showToast({
+					title: validate.error ? validate.error : '请勿重复点击'
+				});
+			}
+		},
+		async modifyMobile() {
+
+			var mobileRule = [{
+				name: 'mobile',
+				checkType: 'phoneno',
+				errorMsg: this.$lang("surePhoneNumber")
+			},
+				{
+					name: 'mobileVercode',
+					checkType: 'required',
+					errorMsg: this.$lang("confirmCodeInput")
+				},
+				{
+					name: 'mobileDynacode',
+					checkType: 'required',
+					errorMsg: this.$lang("animateCodeInput")
+				},
+			];
+			var checkRes = validate.check(this.formData, mobileRule);
+
+			if (checkRes) {
+				if (this.formData.mobile == this.memberInfo.mobile) {
+					this.$util.showToast({
+						title: this.$lang("alikePhone")
+					});
+					return;
+				}
+				this.$api.sendRequest({
+					url: '/api/member/modifymobile',
+					data: {
+						mobile: this.formData.mobile,
+						captcha_id: this.captcha.id,
+						captcha_code: this.formData.mobileVercode,
+						code: this.formData.mobileDynacode,
+						key: uni.getStorageSync("mobile_key"),
+					},
+					success: res => {
+						if (res.code == 0) {
+							this.memberInfo.mobile = this.formData.mobile;
+							this.$store.commit('setMemberInfo', this.memberInfo);
+							this.$util.showToast({
+								title: this.$lang("updateSuccess")
+							});
+							if (this.back) {
+								this.$util.redirectTo('/pages_tool/member/pay_password', {
+									'back': this.back
+								}, 'redirectTo')
+							} else {
+								this.NavReturn();
+							}
+						} else {
+							this.$util.showToast({
+								title: res.message
+							});
+							this.getCaptcha();
+						}
+					},
+					fail: res => {
+						this.isSend = false;
+						this.getCaptcha();
+					}
+				});
+			} else {
+				this.$util.showToast({
+					title: validate.error
+				});
+			}
+		},
+		/**
+		 * 修改密码发送动态码
+		 */
+		passwordMoblieCode() {
+			if (this.seconds != 120) return;
+
+			if (this.formData.mobileVercode == '') {
+				this.$util.showToast({
+					title: this.$lang("confirmCodeInput")
+				});
+				return;
+			}
+
+			if (!this.isSend) {
+				this.isSend = true;
+				this.$api.sendRequest({
+					url: '/api/member/pwdmobliecode',
+					data: {
+						captcha_id: this.captcha.id,
+						captcha_code: this.formData.mobileVercode
+					},
+					success: res => {
+						let data = res.data;
+						if (data.key) {
+							if (this.seconds == 120 && this.timer == null) {
+								this.timer = setInterval(() => {
+									this.seconds--;
+									this.formData.mobileCodeText = '已发送(' + this.seconds + 's)';
+								}, 1000);
+							}
+							uni.setStorageSync('password_mobile_key', data.key);
+						} else {
+							this.$util.showToast({
+								title: res.message
+							});
+							this.isSend = false;
+						}
+					},
+					fail: res => {
+						this.isSend = false;
+						this.getCaptcha();
+					}
+				});
+			} else {
+				this.$util.showToast({
+					title: '请勿重复点击'
+				});
+			}
+		},
+		modifyAddress() {
+			var rule = [{
+				name: 'fullAddress',
+				checkType: 'required',
+				errorMsg: '请选择所在地区'
+			},
+				{
+					name: 'address',
+					checkType: 'required',
+					errorMsg: '请输入详细地址'
+				}
+			];
+			if (!rule.length) return;
+			var checkRes = validate.check(this.formData, rule);
+			if (checkRes) {
+				this.$api.sendRequest({
+					url: '/api/member/modifyaddress',
+					data: {
+						province_id: this.formData.provinceId,
+						city_id: this.formData.cityId,
+						district_id: this.formData.districtId,
+						address: this.formData.address,
+						full_address: this.formData.fullAddress
+					},
+					success: res => {
+						if (res.code == 0) {
+							this.memberInfo.province_id = this.formData.provinceId;
+							this.memberInfo.city_id = this.formData.cityId;
+							this.memberInfo.district_id = this.formData.districtId;
+							this.memberInfo.address = this.formData.address;
+							this.memberInfo.full_address = this.formData.fullAddress;
+							this.$store.commit('setMemberInfo', this.memberInfo);
+							this.$util.showToast({
+								title: this.$lang("updateSuccess")
+							});
+							this.NavReturn();
+						} else {
+							this.$util.showToast({
+								title: res.message
+							});
+						}
+					}
+				});
+			} else {
+				this.$util.showToast({
+					title: validate.error
+				});
+			}
+		},
+		initFormData() {
+			this.formData.currentPassword = '';
+			this.formData.newPassword = '';
+			this.formData.confirmPassword = '';
+			this.formData.mobileVercode = '';
+			this.formData.mobileDynacode = '';
+			this.formData.mobile = '';
+		},
+		handleGetRegions(regions) {
+			this.formData.fullAddress = '';
+			this.formData.fullAddress += regions[0] != undefined ? regions[0].label : '';
+			this.formData.fullAddress += regions[1] != undefined ? '-' + regions[1].label : '';
+			this.formData.fullAddress += regions[2] != undefined ? '-' + regions[2].label : '';
+			this.formData.provinceId = regions[0] ? regions[0].value : 0;
+			this.formData.cityId = regions[1] ? regions[1].value : 0;
+			this.formData.districtId = regions[2] ? regions[2].value : 0;
+		},
+		/**
+		 * 手动绑定手机号
+		 */
+		manualBinding() {
+			this.indent = 'mobile';
+		},
+		mobileAuth(e) {
+			if (e.detail.errMsg == 'getPhoneNumber:ok') {
+				let data = e.detail
+				// #ifdef MP-WEIXIN
+				Object.assign(data, this.authInfo)
+				// #endif
+				this.$api.sendRequest({
+					url: '/api/member/mobileauth',
+					data,
+					success: res => {
+						if (res.code == 0) {
+							this.$util.showToast({
+								title: this.$lang("updateSuccess")
+							});
+							this.NavReturn();
+						} else {
+							this.$util.showToast({
+								title: res.message
+							});
+						}
+					}
+				})
+			}
+		}
+	}
+};
\ No newline at end of file
diff --git a/pages_tool/member/public/js/invite_friends.js b/pages_tool/member/public/js/invite_friends.js
new file mode 100644
index 0000000..884833b
--- /dev/null
+++ b/pages_tool/member/public/js/invite_friends.js
@@ -0,0 +1,115 @@
+export default {
+	methods: {
+		//获取邀请列表
+		getList() {
+			this.$api.sendRequest({
+				url: '/memberrecommend/api/memberrecommend/lists',
+				data: {
+					page: this.page,
+					page_size: this.page_size
+				},
+				success: res => {
+					this.inviteList = this.inviteList.concat(res.data.list);
+					this.total_num = res.data.page_count;
+				}
+			});
+		},
+		moreList() {
+			this.page++;
+			this.isClick = false;
+			if (this.page < this.total_num) {
+				this.getList();
+				this.isClick = true;
+			} else if (this.page == this.total_num) {
+				this.getList();
+			}
+		},
+		getBaseInfo() {
+			this.$api.sendRequest({
+				url: '/memberrecommend/api/memberrecommend/info',
+				success: res => {
+					if (res.code == 0) {
+						this.info = res.data;
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					}
+				}
+			});
+		},
+		openSharePopup() {
+			this.$refs.sharePopup.open();
+		},
+		// 关闭分享弹出层
+		closeSharePopup() {
+			this.$refs.sharePopup.close();
+		},
+		// 打开规则说明弹出层
+		openRulePopup() {
+			this.$refs.rulePopup.open();
+		},
+		// 打开规则说明弹出层
+		closeRulePopup() {
+			this.$refs.rulePopup.close();
+		},
+		copyUrl() {
+			let text = this.$config.h5Domain + '/pages/index/index';
+			if (this.memberInf && this.memberInfo.member_id) text += '?source_member=' + this.memberInfo.member_id;
+			this.$util.copy(text, () => {
+				this.closeSharePopup();
+			});
+		},
+		// 打开海报弹出层
+		openPosterPopup() {
+			this.getPoster();
+			this.$refs.sharePopup.close();
+			this.$refs.posterPopup.open();
+		},
+		// 关闭海报弹出层
+		closePosterPopup() {
+			this.$refs.posterPopup.close();
+		},
+		//生成海报
+		getPoster() {
+			//活动海报信息
+			let qrcode_param = {
+				source_member: this.memberInfo.member_id
+			};
+			this.$api.sendRequest({
+				url: "/memberrecommend/api/memberrecommend/poster",
+				data: {
+					page: '/pages/index/index',
+					qrcode_param: JSON.stringify(qrcode_param)
+				},
+				success: res => {
+					if (res.code == 0) {
+						this.poster = res.data.path + "?time=" + new Date().getTime();
+					} else {
+						this.posterMsg = res.message;
+					}
+				}
+			});
+		},
+		savePoster() {
+			let url = this.$util.img(this.poster);
+			uni.downloadFile({
+				url: url,
+				success: (res) => {
+					if (res.statusCode === 200) {
+						uni.saveImageToPhotosAlbum({
+							filePath: res.tempFilePath,
+							success: () => {
+								this.$util.showToast({
+									title: "保存成功"
+								});
+							},
+							fail: () => {
+								this.$util.showToast({
+									title: "保存失败，请稍后重试"
+								});
+							}
+						});
+					}
+				}
+			});
+		}
+	}
+}
\ No newline at end of file
diff --git a/pages_tool/member/public/js/signin.js b/pages_tool/member/public/js/signin.js
new file mode 100644
index 0000000..c22ca2e
--- /dev/null
+++ b/pages_tool/member/public/js/signin.js
@@ -0,0 +1,276 @@
+export default {
+	data() {
+		return {
+			showSignDays: [], // 一共展示的天数
+			rule: [{}],
+			hasSign: 0, //今天是否签到
+			signDaysSeries: 0, //连续签到次数
+			MonthData: [], //本月日期信息
+			signList: [],
+			back: '', //返回页
+			redirect: '', //返回方式
+			successTip: {},
+			startDate: null,
+			endDate: null,
+			isActive: "", //判断点击
+			signState: 1,
+			headimg: '',
+			point: 0,
+			growth: 0,
+			signPoint: 0,
+			signGrowth: 0,
+			rewardRuleDay: [],
+			cycle: 0,
+			reward: {}
+		};
+	},
+	onLoad(option) {
+		setTimeout( () => {
+			if (!this.addonIsExist.membersignin) {
+				this.$util.showToast({
+					title: '商家未开启会员签到',
+					mask: true,
+					duration: 2000
+				});
+				setTimeout(() => {
+					this.$util.redirectTo('/pages/index/index');
+				}, 2000);
+			}
+		},1000);
+
+		if (option.back) this.back = option.back;
+		if (option.redirect) this.redirect = option.redirect;
+
+		this.getSignState();
+	},
+	onShow() {
+		if (!this.storeToken) {
+			this.$nextTick(() => {
+				this.$refs.login.open('/pages_tool/member/signin');
+			});
+			return;
+		}
+
+		this.headimg = this.memberInfo.headimg;
+		this.signDaysSeries = this.memberInfo.sign_days_series;
+
+		this.getSignPointData();
+		this.getSignGrowthData();
+		this.setPublicShare();
+
+		this.getIsSign();
+	},
+	methods: {
+		// 获取签到累积积分
+		getSignPointData() {
+			this.$api.sendRequest({
+				url: '/api/memberaccount/sum',
+				data: {
+					account_type: 'point',
+					from_type: 'signin'
+				},
+				success: res => {
+					if (res.code == 0) {
+						this.signPoint = res.data;
+					}
+				}
+			});
+		},
+		// 获取签到累积成长值
+		getSignGrowthData() {
+			this.$api.sendRequest({
+				url: '/api/memberaccount/sum',
+				data: {
+					account_type: 'growth',
+					from_type: 'signin'
+				},
+				success: res => {
+					if (res.code == 0) {
+						this.signGrowth = res.data;
+					}
+				}
+			});
+		},
+		// 签到是否开启
+		getSignState() {
+			this.$api.sendRequest({
+				url: '/api/membersignin/getSignStatus',
+				success: res => {
+					if (res.code == 0) {
+						this.signState = res.data.is_use;
+					}
+				}
+			});
+		},
+		navigateBack() {
+			if (this.back != '') {
+				this.$util.redirectTo(this.back, {}, this.redirect);
+			} else {
+				this.$util.redirectTo('/pages/member/index');
+			}
+		},
+		//获取rule
+		getRule() {
+			this.rewardRuleDay = [];
+			this.$api.sendRequest({
+				url: '/api/membersignin/award',
+				success: res => {
+					if (res.code == 0) {
+
+						this.cycle = res.data.cycle || 0;
+						this.rule = res.data.reward || [];
+						let default_point = 0;
+						if (this.rule.length > 0) {
+							this.rule.forEach((item, index) => {
+								if (item.day == 1) {
+									default_point = item.point;
+								} else {
+									this.rewardRuleDay.push(parseInt(item.day));
+									this.reward[item.day] = item.point;
+								}
+							});
+						}
+						//展示7天
+						var showSignDays = [];
+						var start_day = 1;
+						var end_day = 7;
+						var total_day = res.data.cycle;
+						if (this.signDaysSeries > 5) {
+							start_day = this.signDaysSeries - 5;
+						}
+						if (total_day >= (this.signDaysSeries + 1)) {
+							end_day = this.signDaysSeries + 1;
+						}
+						if (this.signDaysSeries <= 5) {
+							end_day = 8 - start_day;
+						}
+
+						if ((end_day - start_day) < 7 && total_day >= start_day + 6) {
+							end_day = start_day + 6;
+						}
+						if (total_day == this.signDaysSeries) {
+							start_day = this.signDaysSeries - 6;
+							end_day = this.signDaysSeries;
+						}
+
+						for (let i = 1; i <= res.data.cycle; i++) {
+							if (i >= start_day && i <= end_day) {
+								showSignDays.push({
+									day: i,
+									is_last: 0,
+									point: default_point
+								})
+							}
+						}
+
+						if (showSignDays && showSignDays.length) {
+							showSignDays[showSignDays.length - 1]['is_last'] = 1;
+						}
+
+						for (let i in showSignDays) {
+							let item = showSignDays[i];
+							if (this.$util.inArray(item.day, this.rewardRuleDay) != -1) {
+								showSignDays[i]['point'] = parseInt(this.reward[item.day]) + parseInt(default_point);
+							}
+						}
+
+						this.showSignDays = showSignDays;
+						this.$refs.loadingCover.hide();
+					}
+				}
+			});
+		},
+		//判断当前是否签到
+		getIsSign() {
+			this.$api.sendRequest({
+				url: '/api/membersignin/issign',
+				success: res => {
+					if (res.code == 0) {
+						this.hasSign = res.data;
+						this.getRule();
+						this.getSignPointData();
+						this.getSignGrowthData();
+					}
+				}
+			});
+		},
+		//签到
+		sign() {
+			if (this.signState == 0) {
+				this.$util.showToast({
+					title: '签到未开启'
+				})
+			}
+
+			if (!this.hasSign && this.signState == 1) {
+				this.$api.sendRequest({
+					url: '/api/membersignin/signin',
+					success: res => {
+						if (res.code == 0) {
+							this.successTip = res.data;
+							this.$refs.uniPopup.open()
+							this.getRule();
+							this.getSignPointData();
+							this.getSignGrowthData();
+							this.hasSign = 1;
+							this.signDaysSeries = this.signDaysSeries + 1;
+						} else {
+							this.$util.showToast({
+								title: res.message
+							})
+						}
+					}
+				});
+			}
+		},
+		close() {
+			this.$refs.uniPopup.close()
+		},
+		/**
+		 * 设置公众号分享
+		 */
+		setPublicShare() {
+			let shareUrl = this.$config.h5Domain + '/pages_tool/member/signin';
+
+			this.$util.setPublicShare({
+					title: '签到有礼',
+					desc: '天天签到，积分好礼送不停',
+					link: shareUrl,
+					imgUrl: ''
+				},
+				res => {
+					// console.log('公众号分享成功');
+					// this.share();
+				}
+			);
+		},
+	},
+	computed: {
+		pointTomorrow: function() {
+			var signDaysSeries = this.signDaysSeries + 1;
+			var point = this.rule[0].point ? parseInt(this.rule[0].point) : 0;
+			for (let i = 1; i < this.rule.length; i++) {
+				let reward = this.rule[i];
+				if (reward.day == signDaysSeries && reward.point) point += parseInt(reward.point);
+			}
+			return point;
+		},
+		showDay: function() {
+			return parseInt(this.signDaysSeries / 7) * 7 + 1;
+		}
+	},
+	/**
+	 * 自定义分享内容
+	 */
+	onShareAppMessage() {
+		var path = '/pages_tool/member/signin';
+		return {
+			title: '签到有礼，天天签到，积分好礼送不停',
+			imageUrl: '',
+			path: path,
+			success: res => {},
+			fail: res => {},
+			complete: res => {}
+		};
+	}
+};
\ No newline at end of file
diff --git a/pages_tool/member/withdrawal.vue b/pages_tool/member/withdrawal.vue
new file mode 100644
index 0000000..db6a049
--- /dev/null
+++ b/pages_tool/member/withdrawal.vue
@@ -0,0 +1,171 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view>
+		<mescroll-uni @getData="getData" class="member-point">
+			<view slot="list">
+				<block v-if="dataList.length">
+					<view class="detailed-wrap">
+						<view class="cont">
+							<view class="detailed-item" v-for="(item, index) in dataList" :key="index" @click="toDetail(item.id)">
+								<view class="info">
+									<view class="event">{{ item.transfer_type_name }}</view>
+									<view>
+										<text class="time">{{ $util.timeStampTurnTime(item.apply_time) }}</text>
+									</view>
+								</view>
+								<view class="right-wrap">
+									<view class="num color-base-text">￥{{ item.apply_money }}</view>
+									<view class="status-name">{{ item.status_name }}</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</block>
+				<block v-else>
+					<ns-empty :isIndex="false" text="暂无提现记录"></ns-empty>
+				</block>
+			</view>
+		</mescroll-uni>
+		<loading-cover ref="loadingCover"></loading-cover>
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			dataList: []
+		};
+	},
+	onShow() {
+		if (!this.storeToken) {
+			this.$util.redirectTo(
+				'/pages_tool/login/login',
+				{
+					back: '/pages_tool/member/point'
+				},
+				'redirectTo'
+			);
+		}
+	},
+	methods: {
+		//获得列表数据
+		getData(mescroll) {
+			this.$api.sendRequest({
+				url: '/api/memberwithdraw/page',
+				data: {
+					page_size: mescroll.size,
+					page: mescroll.num
+				},
+				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 = []; //如果是第一页需手动制空列表
+					this.dataList = this.dataList.concat(newArr); //追加新数据
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				},
+				fail: res => {
+					mescroll.endErr();
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				}
+			});
+		},
+		toDetail(id) {
+			this.$util.redirectTo('/pages_tool/member/withdrawal_detail', {
+				id: id
+			});
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+.account-box {
+	width: 100vw;
+	padding: 30rpx;
+	box-sizing: border-box;
+	padding-bottom: 10rpx;
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+
+	.tit {
+		color: #fff;
+		line-height: 1;
+	}
+
+	.iconmn_jifen_fill {
+		font-size: 60rpx;
+		color: #fff;
+	}
+
+	.point {
+		color: #fff;
+		font-size: 60rpx;
+		margin-left: 10rpx;
+	}
+}
+
+.detailed-wrap {
+	.head {
+		display: flex;
+		height: 90rpx;
+
+		& > view {
+			flex: 1;
+			text-align: left;
+			padding: 0 $padding;
+			line-height: 90rpx;
+		}
+	}
+
+	.cont {
+		background: #fff;
+
+		.detailed-item {
+			padding: $padding 10rpx;
+			margin: 0 $margin-both;
+			border-bottom: 2rpx solid #eee;
+			position: relative;
+
+			&:last-of-type {
+				border-bottom: none;
+			}
+
+			.info {
+				padding-right: 180rpx;
+
+				.event {
+					font-size: $font-size-base;
+					line-height: 1.3;
+				}
+
+				.time {
+					font-size: $font-size-base;
+					color: $color-tip;
+				}
+			}
+
+			.right-wrap {
+				position: absolute;
+				right: 0;
+				top: 0;
+				text-align: right;
+
+				.num {
+					font-size: $font-size-toolbar;
+				}
+			}
+		}
+	}
+}
+</style>
diff --git a/pages_tool/member/withdrawal_detail.vue b/pages_tool/member/withdrawal_detail.vue
new file mode 100644
index 0000000..c93aacd
--- /dev/null
+++ b/pages_tool/member/withdrawal_detail.vue
@@ -0,0 +1,131 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view>
+		<view class="money-wrap">
+			<text>-{{ detail.apply_money }}</text>
+		</view>
+
+		<!-- 状态0待审核1.待转账2已转账 -1拒绝' -->
+		<view class="item">
+			<view class="line-wrap">
+				<text class="label">当前状态</text>
+				<text class="value">{{ detail.status_name }}</text>
+			</view>
+			<view class="line-wrap">
+				<text class="label">交易号</text>
+				<text class="value">{{ detail.withdraw_no }}</text>
+			</view>
+			<view class="line-wrap">
+				<text class="label">手续费</text>
+				<text class="value">￥{{ detail.service_money }}</text>
+			</view>
+			<view class="line-wrap">
+				<text class="label">申请时间</text>
+				<text class="value">{{ $util.timeStampTurnTime(detail.apply_time) }}</text>
+			</view>
+			<view class="line-wrap" v-if="detail.status">
+				<text class="label">审核时间</text>
+				<text class="value">{{ $util.timeStampTurnTime(detail.audit_time) }}</text>
+			</view>
+			<view class="line-wrap" v-if="detail.bank_name">
+				<text class="label">银行名称</text>
+				<text class="value">{{ detail.bank_name }}</text>
+			</view>
+			<view class="line-wrap">
+				<text class="label">收款账号</text>
+				<text class="value">{{ detail.account_number }}</text>
+			</view>
+			<view class="line-wrap" v-if="detail.status == -1 && detail.refuse_reason">
+				<text class="label">拒绝理由</text>
+				<text class="value">{{ detail.refuse_reason }}</text>
+			</view>
+			<view class="line-wrap" v-if="detail.status == 2">
+				<text class="label">转账方式名称</text>
+				<text class="value">{{ detail.transfer_type_name }}</text>
+			</view>
+			<view class="line-wrap" v-if="detail.status == 2">
+				<text class="label">转账时间</text>
+				<text class="value">{{ $util.timeStampTurnTime(detail.payment_time) }}</text>
+			</view>
+		</view>
+
+		<loading-cover ref="loadingCover"></loading-cover>
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			id: 0,
+			detail: {}
+		};
+	},
+	onLoad(option) {
+		this.id = option.id || 0;
+	},
+	onShow() {
+		if (this.storeToken) {
+			this.getDetail();
+		} else {
+			this.$util.redirectTo(
+				'/pages_tool/login/login',
+				{
+					back: '/pages_tool/member/point'
+				},
+				'redirectTo'
+			);
+		}
+	},
+	methods: {
+		getDetail() {
+			this.$api.sendRequest({
+				url: '/api/memberwithdraw/detail',
+				data: {
+					id: this.id
+				},
+				success: res => {
+					if (res.data) {
+						this.detail = res.data;
+					}
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				},
+				fail: res => {
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				}
+			});
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+.money-wrap {
+	text-align: center;
+	font-size: 50rpx;
+	font-weight: bold;
+	margin: 40rpx;
+	border-bottom: 2rpx solid $color-line;
+	padding: 40rpx;
+}
+
+.item {
+	margin: 40rpx;
+
+	.line-wrap {
+		margin-bottom: 20rpx;
+
+		.label {
+			display: inline-block;
+			width: 200rpx;
+			color: $color-tip;
+			font-size: $font-size-base;
+		}
+
+		.value {
+			display: inline-block;
+			font-size: $font-size-base;
+		}
+	}
+}
+</style>
diff --git a/pages_tool/notice/detail.vue b/pages_tool/notice/detail.vue
new file mode 100644
index 0000000..b27d7ec
--- /dev/null
+++ b/pages_tool/notice/detail.vue
@@ -0,0 +1,142 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view class="page">
+		<view class="notice-title">{{ detail.title }}</view>
+		<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>
+	
+		<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 {
+				noticeId: 0,
+				content: '',
+				detail: {}
+			};
+		},
+		onLoad(options) {
+			this.noticeId = options.notice_id || 0;
+			// 小程序扫码进入
+			if (options.scene) {
+				var sceneParams = decodeURIComponent(options.scene);
+				this.noticeId = sceneParams.split('-')[1];
+			}
+			if (this.noticeId == 0) {
+				this.$util.redirectTo('/pages_tool/notice/list', {}, 'redirectTo');
+			}
+		},
+		onShow() {
+			this.getData();
+		},
+		methods: {
+			getData() {
+				this.$api.sendRequest({
+					url: '/api/notice/info',
+					data: {
+						id: this.noticeId
+					},
+					success: res => {
+						if (res.code == 0) {
+							if (res.data) {
+								this.detail = res.data;
+								this.content = htmlParser(res.data.content);
+								this.$langConfig.title(this.detail.title);
+								this.setPublicShare();
+
+								if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+							} else {
+								this.$util.redirectTo('/pages_tool/notice/list', {}, 'redirectTo');
+							}
+						} else {
+							this.$util.showToast({
+								title: res.message
+							});
+							setTimeout(() => {
+								this.$util.redirectTo('/pages_tool/notice/list', {}, 'redirectTo');
+							}, 2000);
+						}
+					},
+					fail: res => {
+						this.$util.redirectTo('/pages_tool/notice/list', {}, 'redirectTo');
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					}
+				});
+			},
+			// 设置公众号分享
+			setPublicShare() {
+				let shareUrl = this.$config.h5Domain + '/pages_tool/notice/detail?notice_id=' + this.noticeId;
+				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/notice/detail?notice_id=' + this.noticeId;
+			return {
+				title: title,
+				path: path,
+				success: res => {},
+				fail: res => {}
+			};
+		},
+		//分享到朋友圈
+		onShareTimeline() {
+			var title = this.detail.title;
+			var query = 'notice_id=' + this.noticeId;
+			return {
+				title: title,
+				query: query,
+				imageUrl: ''
+			};
+		}
+	};
+</script>
+
+<style lang="scss">
+	.page {
+		width: 100%;
+		height: 100%;
+		padding: 30rpx;
+		box-sizing: border-box;
+		background-color: #fff;
+	}
+
+	.notice-title {
+		font-size: $font-size-toolbar;
+		text-align: left;
+		font-weight: bold;
+	}
+
+	.notice-content {
+		margin-top: $margin-updown;
+		word-break: break-all;
+		font-size: $font-size-base;
+	}
+
+	.notice-meta {
+		text-align: left;
+		margin-top: $margin-updown;
+		color: $color-tip;
+
+		.notice-time {
+			font-size: $font-size-tag;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages_tool/notice/list.vue b/pages_tool/notice/list.vue
new file mode 100644
index 0000000..76aea2c
--- /dev/null
+++ b/pages_tool/notice/list.vue
@@ -0,0 +1,179 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view>
+		<mescroll-uni @getData="getData" ref="mescroll">
+			<block slot="list">
+				<view class="notice-list" v-if="dataList.length">
+					<view class="notice-item" @click="jumpDetail(item.id)" v-for="(item, index) in dataList" :key="index">
+						<view class="title-info">
+							<view class="title">
+								<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>
+							<view class="iconfont icon-right"></view>
+						</view>
+					</view>
+				</view>
+				<view v-else class="cart-empty"><ns-empty text="暂无公告" :isIndex="false"></ns-empty></view>
+				<loading-cover ref="loadingCover"></loading-cover>
+			</block>
+		</mescroll-uni>
+
+		<!-- #ifdef MP-WEIXIN -->
+		<!-- 小程序隐私协议 -->
+		<privacy-popup ref="privacyPopup"></privacy-popup>
+		<!-- #endif -->
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				dataList: []
+			};
+		},
+		onShow() {
+			this.setPublicShare();
+		},
+		methods: {
+			getData(mescroll) {
+				this.$api.sendRequest({
+					url: '/api/notice/page',
+					data: {
+						page_size: mescroll.size,
+						page: mescroll.num
+					},
+					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 = []; //如果是第一页需手动制空列表
+						this.dataList = this.dataList.concat(newArr); //追加新数据
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					},
+					fail: res => {
+						mescroll.endErr();
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					}
+				});
+			},
+			jumpDetail(e) {
+				this.$util.redirectTo('/pages_tool/notice/detail?notice_id=' + e);
+			},
+			// 设置公众号分享
+			setPublicShare() {
+				let shareUrl = this.$config.h5Domain + '/pages_tool/notice/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/notice/list';
+			return {
+				title: title,
+				path: path,
+				success: res => {},
+				fail: res => {}
+			};
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	/deep/ .fixed {
+		position: relative;
+		top: 0;
+	}
+
+	.cart-empty {
+		padding-top: 308rpx;
+	}
+
+	.notice-list {
+		.notice-item {
+			margin: $margin-updown $margin-both;
+			background: #fff;
+			border-radius: 10rpx;
+			padding: 32rpx 34rpx;
+			box-sizing: border-box;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			line-height: 1;
+
+			.title-info {
+				width: 100%;
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				overflow: hidden;
+
+				.title {
+					flex: 6;
+					overflow: hidden;
+					text-overflow: ellipsis;
+					white-space: nowrap;
+					display: flex;
+					align-items: center;
+
+					.txt {
+						color: #000;
+						font-size: $font-size-base;
+					}
+
+					.tag {
+						font-size: 22rpx;
+						color: #ffffff;
+						line-height: 28rpx;
+						border-radius: 6rpx;
+						padding: 2rpx 6rpx;
+						margin-right: 10rpx;
+					}
+				}
+
+				.release-time {
+					flex: 2;
+					overflow: hidden;
+					text-overflow: ellipsis;
+					white-space: nowrap;
+					margin-left: 20rpx;
+					color: $color-tip;
+					text-align: right;
+					font-size: $font-size-tag;
+				}
+
+				.iconfont {
+					color: $color-tip;
+					font-size: $font-size-tag;
+				}
+			}
+
+			.content {
+				margin-top: 10rpx;
+				display: inline-block;
+				white-space: nowrap;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				width: 100%;
+				color: $color-tip;
+				font-size: $font-size-goods-tag;
+				padding-bottom: 30rpx;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages_tool/order/activist.vue b/pages_tool/order/activist.vue
new file mode 100644
index 0000000..727ddee
--- /dev/null
+++ b/pages_tool/order/activist.vue
@@ -0,0 +1,152 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view class="activist-container">
+		<mescroll-uni ref="mescroll" @getData="getListData">
+			<block slot="list">
+				<view class="container">
+					<block v-if="refundList.length">
+						<view class="order-item" v-for="(item, index) in refundList" :key="index">
+							<view class="order-header">
+								<text class="status-num font-size-base">{{ item.order_no }}</text>
+								<view class="status-name" v-if="item.refund_status == 3">退款成功</view>
+								<view class="status-name color-base-text" v-if="item.refund_status == 1">退款中</view>
+								<view class="status-name color-base-text" v-if="item.refund_status == -1">退款失败</view>
+							</view>
+							<view class="goods-wrap">
+								<image :src="$util.img(item.sku_image, { size: 'mid' })" @error="imageError(index)" mode="aspectFill" :lazy-load="true"></image>
+								<view class="goods-info">
+									<view class="goods-name" @click="refundDetail(item.order_goods_id)">{{ item.sku_name }}</view>
+									<view class="goods-num">
+										<view class="num-text color-base-text">{{ item.refund_status_name }}</view>
+										<view class="num-price">
+											<text>￥{{ item.price }}</text>
+											<text class="num">×{{ item.num }}</text>
+										</view>
+									</view>
+								</view>
+							</view>
+							<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>
+								</view>
+								<view class="order-action">
+									<view class="order-box-btn" @click="refundDetail(item.order_goods_id)">查看详情</view>
+									<block v-if="item.refund_action.length">
+										<view
+											class="order-box-btn"
+											@click="refundAction(actionItem.event, item)"
+											v-for="(actionItem, actionIndex) in item.refund_action"
+											:key="actionIndex"
+										>
+											{{ actionItem.title }}
+										</view>
+									</block>
+								</view>
+							</view>
+						</view>
+					</block>
+					<block v-else>
+						<view class="cart-empty" v-if="showEmpty"><ns-empty :isIndex="false" :text="$lang('emptyTips')"></ns-empty></view>
+					</block>
+				</view>
+			</block>
+		</mescroll-uni>
+	</view>
+</template>
+
+<script>
+import refundMethod from './public/js/refundMethod.js';
+
+export default {
+	data() {
+		return {
+			refundList: [],
+			showEmpty: false
+		};
+	},
+	mixins: [refundMethod],
+	onShow() {
+		if (!this.storeToken) {
+			this.$util.redirectTo('/pages/order/login', {
+				back: '/pages_tool/order/activist'
+			});
+		}
+	},
+	methods: {
+		getListData(mescroll) {
+			this.$api.sendRequest({
+				url: '/api/orderrefund/lists',
+				data: {
+					page: mescroll.num,
+					page_size: mescroll.size
+				},
+				success: res => {
+					this.showEmpty = true;
+					let newArr = [];
+					let msg = res.message;
+					if (res.code == 0 && res.data) {
+						newArr = res.data.list;
+					} else {
+						this.$util.showToast({
+							title: msg
+						});
+					}
+					mescroll.endSuccess(newArr.length);
+					//设置列表数据
+					if (mescroll.num == 1) this.refundList = []; //如果是第一页需手动制空列表
+					this.refundList = this.refundList.concat(newArr);
+				},
+				fail: res => {
+					mescroll.endErr();
+				}
+			});
+		},
+		refundDetail(order_goods_id) {
+			this.$util.redirectTo('/pages_tool/order/refund_detail', {
+				order_goods_id
+			});
+		},
+		refundAction(event, data) {
+			switch (event) {
+				case 'orderRefundCancel': // 撤销维权
+					this.cancleRefund(data.order_goods_id, res => {
+						if (res.code >= 0) {
+							this.$util.showToast({
+								title: '撤销成功'
+							});
+							this.$refs.mescroll.refresh();
+						}
+					});
+					break;
+				case 'orderRefundDelivery': // 退款发货
+					this.$util.redirectTo('/pages_tool/order/refund_detail', {
+						order_goods_id: data.order_goods_id,
+						action: 'returngoods'
+					});
+					break;
+				case 'orderRefundAsk':
+					this.$util.redirectTo('/pages_tool/order/refund', {
+						order_goods_id: data.order_goods_id
+					});
+					break;
+			}
+		},
+		imageError(index) {
+			this.refundList[index].sku_image = this.$util.getDefaultImage().goods;
+			this.$forceUpdate();
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+/deep/ .fixed {
+	position: relative;
+	top: 0;
+}
+.cart-empty {
+	padding-top: 308rpx !important;
+}
+@import './public/css/activist.scss';
+</style>
diff --git a/pages_tool/order/detail_virtual.vue b/pages_tool/order/detail_virtual.vue
new file mode 100644
index 0000000..a07c408
--- /dev/null
+++ b/pages_tool/order/detail_virtual.vue
@@ -0,0 +1,23 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view>
+		<loading-cover ref="loadingCover"></loading-cover>
+	</view>
+</template>
+
+<script>
+
+export default {
+	data() {
+		return {};
+	},
+	onLoad(option) {
+		if (option.order_id) {
+			this.$util.redirectTo('/pages/order/detail', {order_id: option.order_id}, 'redirectTo');
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+</style>
diff --git a/pages_tool/order/evaluate.vue b/pages_tool/order/evaluate.vue
new file mode 100644
index 0000000..3ad08c0
--- /dev/null
+++ b/pages_tool/order/evaluate.vue
@@ -0,0 +1,87 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view>
+		<view>
+			<view class="page">
+				<block v-for="(item, index) in goodsList" :key="index">
+					<view class="eval-wrap">
+						<view class="eval-good">
+							<view class="good-box">
+								<image class="good_pic" :src="$util.img(item.sku_image, { size: 'mid' })" @error="imageError(index)" mode="widthFix" />
+								<view class="good_info font-size-base">{{ item.sku_name }}</view>
+							</view>
+						</view>
+						<view class="eval-star" v-if="!isEvaluate">
+							<view class="star-box">
+								<view class="star-title color-base-bg-before">描述相符</view>
+								<view class="rate-box"><sx-rate :value="goodsEvalList[index].scores" :index="index" @change="setStar" /></view>
+								<view class="grade-li">
+									<view class="icon iconfont" :class="
+											goodsEvalList[index].explain_type == '1'
+												? 'icon-haoping1 color-base-text'
+												: goodsEvalList[index].explain_type == '2'
+												? 'icon-zhongchaping color-base-text'
+												: goodsEvalList[index].explain_type == '3'
+												? 'icon-zhongchaping'
+												: ''
+										"></view>
+									<view class="font-size-tag color-base-text" v-if="goodsEvalList[index].explain_type == '1'">好评</view>
+									<view class="font-size-tag color-base-text" v-if="goodsEvalList[index].explain_type == '2'">中评</view>
+									<view class="font-size-tag color-base-text" v-if="goodsEvalList[index].explain_type == '3'">差评</view>
+								</view>
+							</view>
+						</view>
+					</view>
+
+					<view class="eval-text">
+						<view class="text-box">
+							<block v-if="!isEvaluate">
+								<textarea placeholder="请在此处输入您的评价" v-model="goodsEvalList[index].content" maxlength="200" />
+								<text class="maxSize">{{ goodsEvalList[index].content.length }}/200</text>
+							</block>
+							<block v-else>
+								<textarea placeholder="请在此处输入您的追评" v-model="goodsEvalList[index].again_content" maxlength="200" />
+								<text class="maxSize">{{ goodsEvalList[index].again_content.length }}/200</text>
+							</block>
+
+							<view class="other-info">
+								<view class="other-info-box" v-for="(i, t) in imgList[index]" :key="t">
+									<image :src="$util.img(i)" mode="aspectFill" @click="preview(i, index)"></image>
+									<view class="imgDel" @click="deleteImg(i, index ,t)"><text class=" icon iconfont icon-delete"></text></view>
+								</view>
+								<view class="other-info-box active" @click="addImg(index)" v-if="imgList[index].length < 6 || imgList[index].length == undefined">
+									<text class="icon iconfont icon-zhaoxiangji"></text>
+									<text>{{ imgList[index].length ? 6 - imgList[index].length : 0 }}/6</text>
+								</view>
+							</view>
+						</view>
+					</view>
+				</block>
+			</view>
+			<view class="eval-bottom" :class="{ 'safe-area': isIphoneX }">
+				<view class="all-election" @click="isAll()" v-if="!isEvaluate">
+					<view class="iconfont color-base-text" :class="isAnonymous ? 'icon-yuan_checked color-base-text' : 'icon-yuan_checkbox'"></view>
+					<text>匿名</text>
+				</view>
+				<view class="action-btn"><button type="primary" @click="save()">提交</button></view>
+			</view>
+			<loading-cover ref="loadingCover"></loading-cover>
+
+		</view>
+	</view>
+</template>
+
+<script>
+	import sxRate from '@/pages_tool/components/sx-rate/index.vue';
+	import evaluate from './public/js/evaluate.js';
+	export default {
+		components: {
+			sxRate
+		},
+		mixins: [evaluate],
+	};
+</script>
+
+<style lang="scss">
+	@import './public/css/evaluate.scss'
+</style>
\ No newline at end of file
diff --git a/pages_tool/order/logistics.vue b/pages_tool/order/logistics.vue
new file mode 100644
index 0000000..0856b0a
--- /dev/null
+++ b/pages_tool/order/logistics.vue
@@ -0,0 +1,171 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view>
+		<scroll-view class="order-nav" :scroll-x="true" :show-scrollbar="false">
+			<view v-for="(packageItem, packageIndex) in packageList" :key="packageIndex" class="uni-tab-item" @click="ontabtap(packageIndex)">
+				<text class="uni-tab-item-title" :class="packageIndex == currIndex ? 'uni-tab-item-title-active color-base-border  color-base-text' : ''">
+					{{ packageItem.package_name }}
+				</text>
+			</view>
+		</scroll-view>
+		<view v-for="(packageItem, packageIndex) in packageList" :key="packageIndex" class="swiper-item" v-show="packageIndex == currIndex">
+			<view class="container">
+				<view class="goods-wrap">
+					<view class="body">
+						<view class="goods" v-for="(goodsItem, goodsIndex) in packageItem.goods_list" :key="goodsIndex">
+							<view class="goods-img" @click="toGoodsDetail(goodsItem.sku_id)">
+								<image :src="$util.img(goodsItem.sku_image, { size: 'mid' })" @error="imageError(packageIndex, goodsIndex)" mode="aspectFill"></image>
+							</view>
+							<view class="goods-info">
+								<view @click="toGoodsDetail(goodsItem.sku_id)" class="goods-name">{{ goodsItem.sku_name }}</view>
+								<view class="goods-sub-section">
+									<view>
+										<text>
+											<text class="iconfont icon-close"></text>
+											{{ goodsItem.num }}
+										</text>
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+
+				<view class="express-company-wrap" v-if="packageItem.delivery_type == 1">
+					<view class="company-logo"><image :src="$util.img(packageItem.express_company_image)"></image></view>
+					<view class="info">
+						<view class="company">
+							<text>承运公司： {{ packageItem.express_company_name }}</text>
+						</view>
+						<view class="no">
+							<text>
+								运单号：
+								<text class="color-tip">{{ packageItem.delivery_no }}</text>
+							</text>
+							<text class="iconfont icon-fuzhi" @click="copyDeliveryNo(packageItem.delivery_no)"></text>
+						</view>
+					</view>
+				</view>
+
+				<view class="track-wrap" v-if="packageItem.delivery_type == 1">
+					<block v-if="packageItem.trace.success && packageItem.trace.list.length != 0">
+						<view
+							class="track-item"
+							v-for="(traceItem, traceIndex) in packageItem.trace.list"
+							:class="traceIndex == 0 ? 'active' : ''"
+							:key="traceIndex"
+						>
+							<view class="dot" :class="traceIndex == 0 ? 'color-base-bg' : ''"></view>
+							<view class="msg">
+								<view class="text" :class="traceIndex == 0 ? 'color-base-text' : ''">{{ traceItem.remark }}</view>
+								<view class="time" :class="traceIndex == 0 ? 'color-base-text' : ''">{{ traceItem.datetime }}</view>
+							</view>
+						</view>
+					</block>
+					<block v-else-if="packageItem.trace.success && packageItem.trace.list.length == 0">
+						<view class="fail-wrap font-size-base">{{ packageItem.trace.reason }}</view>
+					</block>
+					<block v-else>
+						<view class="fail-wrap font-size-base">{{ packageItem.trace.reason }}</view>
+					</block>
+				</view>
+			</view>
+		</view>
+		<loading-cover ref="loadingCover"></loading-cover>
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			orderId: '',
+			packageList: [],
+			isIphoneX: false,
+			currIndex: 0,
+			status: 0
+		};
+	},
+	onLoad(option) {
+		if (option.order_id) this.orderId = option.order_id;
+	},
+	onShow() {
+		// 判断登录
+		if (!this.storeToken) {
+			this.$util.redirectTo('/pages_tool/login/login');
+		} else {
+			this.getPackageInfo();
+		}
+		this.isIphoneX = this.$util.uniappIsIPhoneX();
+	},
+	methods: {
+		ontabtap(e) {
+			this.currIndex = e;
+			// let index = e.target.dataset.current || e.currentTarget.dataset.current;
+			// this.orderStatus = this.statusList[index].status;
+			// if (this.orderStatus == '') this.mergePayOrder = [];
+			// this.$refs.loadingCover.show();
+			// this.$refs.mescroll.refresh();
+		},
+		getPackageInfo() {
+			this.$api.sendRequest({
+				url: '/api/order/package',
+				data: {
+					order_id: this.orderId
+				},
+				success: res => {
+					if (res.code >= 0) {
+						this.packageList = res.data;
+						this.packageList.forEach(item => {
+							if (item.trace.list) {
+								item.trace.list = item.trace.list.reverse();
+							}
+							item.status = this.status++;
+						});
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					} else {
+						this.$util.showToast({
+							title: '未获取到订单信息！'
+						});
+						setTimeout(() => {
+							this.$util.redirectTo('/pages/order/list');
+						}, 1500);
+					}
+				},
+				fail: res => {
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				}
+			});
+		},
+		toGoodsDetail(e) {
+			this.$util.redirectTo('/pages/goods/detail', { sku_id: e });
+		},
+		imageError(packageIndex, goodsIndex) {
+			this.packageList[packageIndex].goods_list[goodsIndex].sku_image = this.$util.getDefaultImage().goods;
+			this.$forceUpdate();
+		},
+		copyDeliveryNo(value){
+			this.$util.copy(value);
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+@import './public/css/logistics.scss';
+/deep/.uni-scroll-view ::-webkit-scrollbar {
+	/* 隐藏滚动条，但依旧具备可以滚动的功能 */
+	display: none;
+	width: 0;
+	height: 0;
+	color: transparent;
+	background: transparent;
+}
+/deep/::-webkit-scrollbar {
+	display: none;
+	width: 0;
+	height: 0;
+	color: transparent;
+	background: transparent;
+}
+</style>
diff --git a/pages_tool/order/public/css/activist.scss b/pages_tool/order/public/css/activist.scss
new file mode 100644
index 0000000..69d2a64
--- /dev/null
+++ b/pages_tool/order/public/css/activist.scss
@@ -0,0 +1,110 @@
+.activist-container {
+	width: 100vw;
+	height: 100vh;
+}
+
+.order-item {
+	margin: $margin-updown $margin-both;
+	padding: 26rpx 24rpx;
+	border-radius: 10rpx;
+	background: #fff;
+	display: flex;
+	flex-direction: column;
+
+	.order-header {
+		display: flex;
+		align-items: center;
+		padding-bottom: 26rpx;
+		border-bottom: 2rpx solid #f1f1f1;
+
+		.status-num {
+			font-size: $font-size-goods-tag;
+			color: $color-title;
+		}
+
+		.status-name {
+			flex: 1;
+			text-align: right;
+			font-size: $font-size-tag;
+		}
+	}
+
+	.goods-wrap {
+		display: flex;
+		padding: 27rpx 0;
+		box-sizing: border-box;
+		border-bottom: 2rpx solid #f7f7f7;
+		image {
+			width: 170rpx;
+			height: 170rpx;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+		}
+		.goods-info {
+			flex: 1;
+			display: flex;
+			flex-direction: column;
+			justify-content: space-between;
+			margin-left: 15rpx;
+
+			.goods-name {
+				line-height: 38rpx;
+				font-size: $font-size-base;
+				color: $color-title;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				display: -webkit-box;
+				-webkit-line-clamp: 2;
+				-webkit-box-orient: vertical;
+			}
+			.goods-num {
+				display: flex;
+				justify-content: space-between;
+				align-items: flex-start;
+				margin-top: 21rpx;
+				.num-text {
+					font-size: $font-size-tag;
+					line-height: 1;
+				}
+				.num-price {
+					display: flex;
+					flex-direction: column;
+					align-items: flex-end;
+					line-height: 1;
+					font-size: $font-size-tag;
+					.num {
+						color: $color-tip;
+						margin-top: 16rpx;
+						display: flex;
+						align-items: center;
+					}
+				}
+			}
+		}
+	}
+	.goods-btn {
+		display: flex;
+		flex-direction: column;
+		align-items: flex-end;
+		margin-top: 27rpx;
+		.btn-text {
+			font-size: $font-size-tag;
+			text {
+				&:nth-child(2) {
+					margin-left: 17rpx;
+					text {
+						font-size: $font-size-base;
+					}
+				}
+			}
+		}
+		.order-action {
+			display: flex;
+			margin-top: 24rpx;
+			.order-box-btn {
+				font-size: $font-size-goods-tag;
+			}
+		}
+	}
+}
diff --git a/pages_tool/order/public/css/evaluate.scss b/pages_tool/order/public/css/evaluate.scss
new file mode 100644
index 0000000..86f7034
--- /dev/null
+++ b/pages_tool/order/public/css/evaluate.scss
@@ -0,0 +1,230 @@
+.page {
+	padding-bottom: 100rpx;
+}
+
+.eval-good {
+	width: 100%;
+	padding: 0 30rpx;
+	box-sizing: border-box;
+	background: #ffffff;
+
+	.good-box {
+		width: 100%;
+		height: 100%;
+		padding: 30rpx 0;
+		border-bottom: 2rpx solid #f5f5f5;
+		box-sizing: border-box;
+		display: flex;
+		justify-content: space-between;
+
+		.good_pic {
+			width: 180rpx;
+			height: 180rpx;
+			margin-right: 20rpx;
+			box-sizing: border-box;
+		}
+
+		.good_info {
+			width: calc(100% - 200rpx);
+			height: 100%;
+			line-height: 1.3;
+			box-sizing: border-box;
+		}
+	}
+}
+
+.eval-text {
+	width: 100%;
+	padding: 0 $margin-both;
+	box-sizing: border-box;
+	padding-bottom: $padding;
+	margin-top: $margin-updown;
+
+	.text-box {
+		width: 100%;
+		height: 100%;
+		border-radius: $border-radius;
+		background: #ffffff;
+		padding-bottom: $padding;
+		box-sizing: border-box;
+		position: relative;
+
+		textarea {
+			width: 100%;
+			height: 190rpx;
+			padding: $padding;
+			box-sizing: border-box;
+			font-size: $font-size-tag;
+		}
+	}
+
+	.maxSize {
+		position: absolute;
+		right: 20rpx;
+		top: 160rpx;
+		color: #999;
+		font-size: $font-size-tag;
+	}
+
+	.other-info {
+		width: 100%;
+		padding: 0 $padding;
+		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;
+	}
+	.other-info-box.active:active {
+		background: rgba($color: #cccccc, $alpha: 0.6);
+	}
+	// .other-info-box:nth-child(4n) {
+	// 	margin-right: 0;
+	// }
+}
+
+.eval-star {
+	width: 100%;
+	background: #ffffff;
+	padding: 10rpx 30rpx;
+	box-sizing: border-box;
+
+	.star-box {
+		width: 100%;
+		height: 100%;
+		display: flex;
+		align-items: center;
+
+		.star-title {
+			height: 60rpx;
+			position: relative;
+			padding-right: $padding;
+			box-sizing: border-box;
+			line-height: 60rpx;
+			font-size: $font-size-base;
+			font-weight: bold;
+		}
+
+		.grade-li {
+			width: 30%;
+			height: 100%;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+		}
+
+		.icon-haoping1 {
+			font-size: $font-size-base;
+			margin-right: 10rpx;
+		}
+
+		.icon-haoping {
+			font-size: $font-size-base;
+			color: #999;
+			margin-right: 10rpx;
+		}
+
+		.icon-zhongchaping {
+			font-size: $font-size-base;
+			margin-right: 10rpx;
+			color: #ccc;
+		}
+	}
+}
+
+.eval-bottom {
+	position: fixed;
+	z-index: 5;
+	width: 100vw;
+	height: 100rpx;
+	background: #fff;
+	bottom: var(--window-bottom);
+	overflow: hidden;
+	display: flex;
+	justify-content: space-between;
+	&.safe-area {
+		padding-bottom: 68rpx !important;
+	}
+
+	.all-election {
+		height: 100rpx;
+		position: relative;
+		padding-left: 20rpx;
+		display: inline-block;
+		width: 30%;
+
+		& > .iconfont {
+			font-size: 45rpx;
+			position: absolute;
+			top: 50%;
+			left: 24rpx;
+			transform: translateY(-50%);
+		}
+
+		& > text {
+			margin-left: 56rpx;
+			line-height: 100rpx;
+		}
+	}
+
+	.action-btn {
+		flex: 1;
+		height: 100rpx;
+		line-height: 100rpx;
+		border-radius: 0;
+		margin: 0;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		
+		button {
+			width: 100%;
+			height: 80rpx;
+			line-height: 80rpx;
+		}
+	}
+	.action-btn.disabled:after {
+		content: '';
+		border: none;
+	}
+}
\ No newline at end of file
diff --git a/pages_tool/order/public/css/logistics.scss b/pages_tool/order/public/css/logistics.scss
new file mode 100644
index 0000000..73c24e8
--- /dev/null
+++ b/pages_tool/order/public/css/logistics.scss
@@ -0,0 +1,242 @@
+@mixin flex-row-center {
+	display: flex;
+	justify-content: center;
+	align-items: center;
+}
+
+@mixin wrap {
+	padding: 30rpx;
+	border-radius: $border-radius;
+	background: #fff;
+	position: relative;
+	width: calc(100% - 60rpx);
+	box-sizing: border-box;
+}
+.swiper-item {
+	padding-top: 94rpx;
+	height: 100%;
+	.container {
+		height: calc(100vh - 124rpx);
+		overflow-y: scroll;
+		box-sizing: border-box;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		padding-bottom: 30rpx;
+		&.safearea {
+			padding: 68rpx;
+		}
+	}
+	padding-bottom: 30rpx;
+	padding-bottom: constant(safe-area-inset-bottom); /*兼容 IOS<11.2*/
+	padding-bottom: env(safe-area-inset-bottom); /*兼容 IOS>11.2*/
+}
+.order-nav {
+	width: 100vw;
+	// height: 60rpx;
+	flex-direction: row;
+	/* #ifndef APP-PLUS */
+	white-space: nowrap;
+	/* #endif */
+	background: #fff;
+	display: flex;
+	position: fixed;
+	left: 0;
+	z-index: 998;
+
+	.uni-tab-item {
+		display: inline-block;
+		padding: 30rpx 24rpx 0;
+		// height: 60rpx;
+		// line-height: 60rpx;
+	}
+
+	.uni-tab-item-title {
+		color: #555;
+		font-size: $font-size-toolbar;
+		display: block;
+		line-height: 1;
+		padding: 0 10rpx 30rpx;
+		flex-wrap: nowrap;
+		/* #ifndef APP-PLUS */
+		white-space: nowrap;
+		/* #endif */
+		text-align: center;
+	}
+
+	.uni-tab-item-title-active {
+		display: block;
+		border-bottom: 2rpx solid #ffffff;
+		padding: 0 10rpx 30rpx;
+	}
+
+	::-webkit-scrollbar {
+		width: 0;
+		height: 0;
+		color: transparent;
+	}
+}
+
+.goods-wrap {
+	@include wrap;
+	margin-top: 20rpx;
+	padding: 30rpx;
+	.goods {
+		display: flex;
+		position: relative;
+		margin-bottom: 20rpx;
+
+		&:last-of-type {
+			margin-bottom: 0;
+		}
+
+		.goods-img {
+			width: 180rpx;
+			height: 180rpx;
+			margin-right: 20rpx;
+
+			image {
+				width: 100%;
+				height: 100%;
+			}
+		}
+
+		.goods-info {
+			flex: 1;
+			display: flex;
+			flex-direction: column;
+			justify-content: space-between;
+			position: relative;
+			max-width: calc(100% - 140rpx);
+
+			.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: 500;
+			}
+
+			.goods-sub-section {
+				width: 100%;
+				line-height: 1.3;
+				display: flex;
+
+				.goods-price {
+					font-weight: 700;
+					font-size: $font-size-activity-tag;
+				}
+
+				.unit {
+					font-weight: normal;
+					font-size: $font-size-tag;
+					margin-right: 2rpx;
+				}
+
+				view {
+					flex: 1;
+					line-height: 1.3;
+					&:last-of-type {
+						text-align: left;
+
+						.iconfont {
+							line-height: 1;
+							font-size: $font-size-tag;
+						}
+					}
+				}
+			}
+		}
+	}
+}
+
+.express-company-wrap {
+	@include wrap;
+	margin-top: 20rpx;
+	.company-logo {
+		width: 120rpx;
+		height: 120rpx;
+		margin-right: 20rpx;
+		float: left;
+		image {
+			width: 100%;
+			height: 100%;
+		}
+	}
+
+	.info {
+		flex: 1;
+
+		.company {
+			line-height: 1.5;
+			margin-top: 16rpx;
+		}
+
+		.no {
+			margin-top: 10rpx;
+			line-height: 1.5;
+		}
+
+		.icon-fuzhi {
+			font-size: $font-size-base;
+			line-height: 1;
+			margin-left: 6rpx;
+		}
+	}
+}
+
+.track-wrap {
+	@include wrap;
+	margin-top: 20rpx;
+
+	.track-item {
+		position: relative;
+		flex-wrap: wrap;
+		overflow: visible;
+		display: flex;
+		&:after {
+			content: '';
+			position: absolute;
+			z-index: 1;
+			pointer-events: none;
+			background-color: #e5e5e5;
+			width: 2rpx;
+			height: 150%;
+			top: 56rpx;
+			left: 20rpx;
+			bottom: -40rpx;
+		}
+
+		.dot {
+			margin: 34rpx 20rpx 0 10rpx;
+			width: 20rpx;
+			height: 20rpx;
+			border-radius: 10rpx;
+			background-color: #ccc;
+			z-index: 9;
+		}
+
+		.msg {
+			padding: 20rpx 0;
+			flex: 1;
+
+			.text {
+				line-height: 1.5;
+				font-size: $font-size-base;
+			}
+
+			.time {
+				color: $color-tip;
+				font-size: $font-size-activity-tag;
+				line-height: 1.3;
+				margin-top: 10rpx;
+			}
+		}
+
+		&:last-of-type:after {
+			content: unset;
+		}
+	}
+}
diff --git a/pages_tool/order/public/css/refund.scss b/pages_tool/order/public/css/refund.scss
new file mode 100644
index 0000000..c18b3c9
--- /dev/null
+++ b/pages_tool/order/public/css/refund.scss
@@ -0,0 +1,246 @@
+.refund-container {
+	width: 100vw;
+	height: 100vh;
+}
+
+.align-right {
+	text-align: right;
+}
+
+.goods-wrap {
+	margin: $margin-updown $margin-both;
+	padding: 30rpx;
+	border-radius: $border-radius;
+	background: #fff;
+	display: flex;
+	position: relative;
+
+	.goods-img {
+		width: 180rpx;
+		height: 180rpx;
+		margin-right: 20rpx;
+		border-radius: $border-radius;
+		overflow: hidden;
+
+		image {
+			width: 100%;
+			height: 100%;
+		}
+	}
+
+	.goods-info {
+		flex: 1;
+		position: relative;
+		max-width: calc(100% - 200rpx);
+
+		.goods-name {
+			display: -webkit-box;
+			-webkit-box-orient: vertical;
+			-webkit-line-clamp: 2;
+			overflow: hidden;
+			line-height: 1.5;
+			font-size: $font-size-base;
+		}
+	}
+}
+
+.refund-option {
+	margin: $margin-updown $margin-both;
+	border-radius: $border-radius;
+	background: #fff;
+
+	.option-item {
+		padding: $padding;
+		display: flex;
+		position: relative;
+
+		view {
+			flex: 1;
+
+			text {
+				display: block;
+			}
+		}
+
+		.icon-right {
+			position: absolute;
+			top: 50%;
+			transform: translateY(-50%);
+			color: #ddd;
+			right: 20rpx;
+		}
+
+		&:last-of-type {
+			border-top: 2rpx solid #f2f2f2;
+		}
+	}
+}
+
+.refund-form {
+	margin: $margin-updown $margin-both;
+	padding: $padding;
+	border-radius: $border-radius;
+	background: #fff;
+
+	.item-wrap {
+		display: flex;
+		position: relative;
+		line-height: 80rpx;
+
+		.label {
+			width: 142rpx;
+			padding-right: 5rpx;
+			line-height: 80rpx;
+		}
+
+		.cont {
+			flex: 1;
+			line-height: 80rpx;
+			text-align: right;
+			.refund-desc {
+				font-size: $font-size-base;
+				width: 100%;
+				line-height: 1;
+				min-height: 80rpx;
+			}
+			
+			&.reason {
+				padding-right: 40rpx;
+			}
+		}
+		.label.active{
+			width: 100%;
+		}
+
+		.icon-right {
+			position: absolute;
+			top: 50%;
+			transform: translateY(-50%);
+			color: #ddd;
+			right: 0;
+		}
+	}
+}
+.textarea-box{
+	position: relative;
+	.mark{
+		width: 100%;
+		height: 100%;
+		position: absolute;
+		left: 0;
+		bottom: 0;
+		background: red;
+	}
+}
+.newText{
+	width: 100%;
+	min-height: 200rpx;
+	border-radius: $border-radius;
+	box-sizing: border-box;
+	margin-top: 10rpx;
+}
+
+.sub-btn {
+	position: fixed;
+	width: 100%;
+	height: 100rpx;
+	line-height: 100rpx;
+	text-align: center;
+	color: #fff;
+	bottom: 0;
+	&.safe-area {
+		margin-bottom: 48rpx !important;
+	}
+}
+
+.popup {
+	width: 100vw;
+	background: #fff;
+	border-top-left-radius: 24rpx;
+	border-top-right-radius: 24rpx;
+
+	.popup-header {
+		height: 90rpx;
+		display: flex;
+		align-items: center;
+		padding: 0 30rpx;
+
+		& > view {
+			flex: 1;
+			line-height: 1;
+		}
+
+		.tit {
+			font-size: $font-size-toolbar;
+			font-weight: 600;
+		}
+
+		.vice-tit {
+			margin-right: 20rpx;
+		}
+	}
+
+	.popup-footer {
+		height: 140rpx;
+
+		.confirm-btn {
+			height: 80rpx;
+			line-height: 80rpx;
+			color: #fff;
+			text-align: center;
+			margin: 20rpx;
+			border-radius: $border-radius;
+			&.color-base-bg{
+				color: var(--btn-text-color);
+			}
+		}
+		
+		&.bottom-safe-area {
+			padding-bottom: 48rpx;
+		}
+	}
+}
+
+.refund-reason-popup {
+	height: 50vh;
+	display: flex;
+	flex-direction: column;
+	
+	.icon-close {
+		font-size: 40rpx;
+	}
+	
+	.popup-body {
+		flex: 1;
+		
+		.scroll-view {
+			height: 100%;
+		}
+		
+		.item {
+			display: flex;
+			padding: 0 30rpx;
+			position: relative;
+			height: 70rpx;
+			line-height: 70rpx;
+
+			.reason {
+				flex: 1;
+				height: 70rpx;
+				line-height: 70rpx;
+			}
+
+			& > .iconfont {
+				font-size: 40rpx;
+				position: absolute;
+				top: 50%;
+				right: 30rpx;
+				transform: translateY(-50%);
+			}
+
+			& > .icon-yuan_checkbox {
+				color: $color-tip;
+			}
+		}
+	}
+}
diff --git a/pages_tool/order/public/css/refund_detail.scss b/pages_tool/order/public/css/refund_detail.scss
new file mode 100644
index 0000000..2f9594f
--- /dev/null
+++ b/pages_tool/order/public/css/refund_detail.scss
@@ -0,0 +1,327 @@
+.detail-container {
+	width: 100vw;
+	height: 100vh;
+}
+.container {
+	transition: all 0.3s;
+
+	.hide {
+		transform: translateX(-100%);
+	}
+}
+
+.status-wrap {
+	padding: 20rpx;
+	background: #fff;
+	border-top: 1px solid #f5f5f5;
+	margin: 20rpx;
+	border-radius: $border-radius;
+
+	.status-name {
+		display: block;
+		font-size: $font-size-toolbar;
+		line-height: 70rpx;
+		height: 70rpx;
+	}
+
+	.refund-explain {
+		border-top: 1px dashed #eee;
+		padding-top: 20rpx;
+	}
+}
+
+.refund-address-wrap {
+	margin: 20rpx;
+	background: #fff;
+	padding: 20rpx;
+	border-radius: $border-radius;
+
+	.copy {
+		font-size: $font-size-activity-tag;
+		display: inline-block;
+		color: #666;
+		background: #fff;
+		line-height: 1;
+		padding: 6rpx 10rpx;
+		margin-left: 10rpx;
+		border-radius: 4rpx;
+		border: 1px solid #ddd;
+	}
+}
+
+.history-wrap {
+	margin: 20rpx;
+	background: #fff;
+	padding: 20rpx;
+	display: flex;
+	position: relative;
+	border-radius: $border-radius;
+
+	view {
+		flex: 1;
+	}
+
+	.icon-right {
+		position: absolute;
+		top: 50%;
+		transform: translateY(-50%);
+		color: #ddd;
+		right: 20rpx;
+	}
+}
+
+.refund-info {
+	margin: 20rpx;
+	background: #fff;
+	border-radius: $border-radius;
+
+	.header {
+		height: 90rpx;
+		line-height: 90rpx;
+		padding: 0 20rpx;
+	}
+
+	.body {
+		padding-bottom: 20rpx;
+
+		.goods-wrap {
+			display: flex;
+			position: relative;
+			padding: 20rpx;
+			background: #f5f5f5;
+
+			&:last-of-type {
+				margin-bottom: 0;
+			}
+
+			.goods-img {
+				width: 180rpx;
+				height: 180rpx;
+				margin-right: 20rpx;
+
+				image {
+					width: 100%;
+					height: 100%;
+				}
+			}
+
+			.goods-info {
+				flex: 1;
+				position: relative;
+				max-width: calc(100% - 200rpx);
+
+				.goods-name {
+					display: -webkit-box;
+					-webkit-box-orient: vertical;
+					-webkit-line-clamp: 2;
+					overflow: hidden;
+					line-height: 1.5;
+					font-size: $font-size-base;
+				}
+
+				.goods-sub-section {
+					padding-top: 20rpx;
+					width: 100%;
+					line-height: 1.3;
+					display: flex;
+
+					.refund-price {
+						font-size: $font-size-base;
+					}
+
+					.unit {
+						font-weight: normal;
+						font-size: $font-size-tag;
+						margin-right: 2rpx;
+					}
+				}
+			}
+		}
+
+		.info {
+			margin-top: 20rpx;
+
+			.cell {
+				height: 50rpx;
+				line-height: 50rpx;
+				padding: 0 30rpx;
+				font-size: $font-size-tag;
+				color: $color-tip;
+			}
+		}
+	}
+}
+
+.action {
+	position: fixed;
+	z-index: 5;
+	left: 0;
+	bottom: 0;
+	width: 100vw;
+	height: 100rpx;
+	background: #fff;
+	box-shadow: 0 0px 10px rgba(0, 0, 0, 0.1);
+	text-align: right;
+	line-height: 100rpx;
+
+	&.bottom-safe-area {
+		padding-bottom: constant(safe-area-inset-bottom);
+		padding-bottom: env(safe-area-inset-bottom);
+	}
+	.order-box-btn{
+		margin-right: $margin-both;
+		margin-left: 0;
+	}
+
+	.action-btn {
+		height: 70rpx;
+		line-height: 70rpx;
+		color: #fff;
+		padding: 0 40rpx;
+		display: inline-block;
+		text-align: center;
+		margin: 16rpx 20rpx 16rpx 0;
+		border-radius: $border-radius;
+
+		&.white {
+			height: 68rpx;
+			line-height: 68rpx;
+			color: #333;
+			border: 0.5px solid #999;
+			background: #fff;
+		}
+	}
+}
+
+.form-wrap {
+	background: #fff;
+
+	.item {
+		margin: 0 20rpx;
+		display: flex;
+		border-bottom: 1px solid #eee;
+
+		&:last-child {
+			border-bottom: none;
+		}
+
+		.label {
+			width: 140rpx;
+			line-height: 90rpx;
+		}
+
+		.cont {
+			flex: 1;
+			line-height: 90rpx;
+
+			.input,
+			.input-placeholder {
+				height: 90rpx;
+				line-height: 90rpx;
+				font-size: $font-size-base;
+			}
+
+			.textarea {
+				width: 100%;
+				padding: 26rpx 0;
+				line-height: 1.3;
+				font-size: $font-size-base;
+			}
+		}
+	}
+}
+
+.sub-btn {
+	margin-top: 20rpx;
+}
+
+.record-wrap {
+	.cont {
+		width: 100%;
+		background-color: #fff;
+		padding: 30rpx;
+		box-sizing: border-box;
+		margin-top: 20rpx;
+	
+		.head {
+			display: flex;
+			flex-direction: column;
+			color: $color-title;
+			.time {
+				color: $color-tip;
+				font-size: $font-size-tag;
+				float: right;
+			}
+		}
+		.body {
+			padding-top: 20rpx;
+			.refund-action{
+				line-height: 1;
+				color: $color-title;
+			}
+			.desc {
+				margin-top: 10rpx;
+				color: $color-tip;
+				font-size: $font-size-tag;
+			}
+		}
+	}
+	
+	.empty-box{
+		height: 168rpx;
+	}
+}
+
+.history-bottom {
+	position: fixed;
+	z-index: 5;
+	left: 0;
+	bottom: 0;
+	width: 100vw;
+	height: 100rpx;
+	background: #fff;
+	box-shadow: 0 0px 10px rgba(0, 0, 0, 0.1);
+	text-align: right;
+	display: flex;
+
+	&.bottom-safe-area {		
+		padding-bottom: constant(safe-area-inset-bottom);
+		padding-bottom: env(safe-area-inset-bottom);
+	}
+
+	view {
+		flex: 1;
+		text-align: center;
+		line-height: 100rpx;
+
+		&:first-child {
+			border-right: 1px solid #eee;
+		}
+		.iconfont {
+			font-weight: bold;
+			margin-right: 10rpx;
+			font-size: $font-size-base;
+			line-height: 1;
+		}
+	}
+	button {
+		width: 50%;
+		height: 100%;
+		// position: absolute;
+		border: none;
+		z-index: 1;
+		padding: 0;
+		margin: 0;
+		background: none;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		&::after {
+			border: none !important;
+		}
+		.iconfont{
+			margin-right: 10rpx;
+		}
+		
+	}
+}
diff --git a/pages_tool/order/public/js/evaluate.js b/pages_tool/order/public/js/evaluate.js
new file mode 100644
index 0000000..bd86771
--- /dev/null
+++ b/pages_tool/order/public/js/evaluate.js
@@ -0,0 +1,233 @@
+export default {
+	data() {
+		return {
+			orderId: null,
+			orderNo: "",
+			isAnonymous: 1, //是否匿名发布  1.匿名，0.公开
+
+			goodsList: [], //订单列表
+			goodsEvalList: [], //评价列表
+
+			imgList: [],
+			isEvaluate: 0, //判断是否为追评
+
+			flag: false, //防止重复点击 ,
+			evaluateConfig: {
+				evaluate_audit: 1,
+				evaluate_show: 0,
+				evaluate_status: 1
+			},
+
+			isIphoneX: false //判断手机是否是iphoneX以上
+		};
+	},
+	onLoad(options) {
+		//接收订单号，订单是否是追评等信息
+		options.order_id ? (this.orderId = options.order_id) : this.$util.redirectTo('/pages/order/list');
+
+		this.isIphoneX = this.$util.uniappIsIPhoneX();
+		if (!this.storeToken) {
+			this.$util.redirectTo('/pages_tool/login/login', {
+				back: '/pages_tool/order/evaluate?order_id=' + this.orderId
+			}, 'redirectTo');
+		}
+		this.getEvaluateConfig();
+		this.getOrderInfo();
+	},
+	onShow() {
+		//初始化重复点击
+		this.flag = false;
+	},
+	methods: {
+		//获取订单信息
+		getOrderInfo() {
+			//获取订单信息
+			let data = {
+				order_id: this.orderId
+			};
+			this.$api.sendRequest({
+				url: '/api/order/evluateinfo',
+				data: data,
+				success: res => {
+					if (res.code == 0) {
+						this.isEvaluate = res.data.evaluate_status
+						this.goodsList = res.data.list;
+						if (this.goodsList.length) {
+							this.orderNo = res.data.list[0].order_no;
+						}
+						if (this.isEvaluate) {
+							for (let i = 0; i < res.data.list.length; i++) {
+								let array = [];
+								this.imgList.push(array)
+								this.goodsEvalList.push({
+									order_goods_id: res.data.list[i].order_goods_id,
+									goods_id: res.data.list[i].goods_id,
+									sku_id: res.data.list[i].sku_id,
+									again_content: "",
+									again_images: ""
+								});
+							}
+						} else {
+							for (let i = 0; i < res.data.list.length; i++) {
+								let array = [];
+								this.imgList.push(array)
+								this.goodsEvalList.push({
+									content: '', // 评价内容
+									images: "", //图片数组
+									scores: 5, // 评分
+									explain_type: 1, // 评价类型
+									order_goods_id: res.data.list[i].order_goods_id,
+									goods_id: res.data.list[i].goods_id,
+									sku_id: res.data.list[i].sku_id,
+									sku_name: res.data.list[i].sku_name,
+									sku_price: res.data.list[i].price,
+									sku_image: res.data.list[i].sku_image
+								});
+							}
+						}
+					} else {
+						this.$util.showToast({
+							title: "未获取到订单数据"
+						})
+						setTimeout(() => {
+							this.$util.redirectTo('/pages/order/list', {}, "redirectTo");
+						}, 1000)
+					}
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				},
+				fail() {
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				}
+			});
+		},
+		//监听评分变化
+		setStar(e) {
+			this.goodsEvalList[e.index].scores = e.value;
+			if (e.value >= 4) {
+				this.goodsEvalList[e.index].explain_type = 1;
+			} else if (1 < e.value && e.value < 4) {
+				this.goodsEvalList[e.index].explain_type = 2
+			} else {
+				this.goodsEvalList[e.index].explain_type = 3
+			}
+		},
+		//切换，是否匿名
+		isAll() {
+			this.isAnonymous ? this.isAnonymous = 0 : this.isAnonymous = 1
+		},
+		//添加图片
+		addImg(e) {
+			let size = this.imgList[e].length ? this.imgList[e].length : 0
+			this.$util.upload(6 - size, {
+				path: 'evaluateimg'
+			}, res => {
+				let arr = this.imgList[e]
+				arr = arr.concat(res);
+				this.imgList[e] = [];
+				this.$set(this.imgList, e, arr)
+				if (this.isEvaluate) {
+					this.goodsEvalList[e].again_images = this.imgList[e].toString()
+				} else {
+					this.goodsEvalList[e].images = this.imgList[e].toString()
+				}
+			});
+		},
+		//删除图片
+		deleteImg(i, index, j) {
+			this.imgList[index].splice(j, 1);
+			if (this.isEvaluate) {
+				this.goodsEvalList[index].again_images = this.imgList[index].toString()
+			} else {
+				this.goodsEvalList[index].images = this.imgList[index].toString()
+			}
+		},
+		// 图片预览
+		preview(i, j) {
+			let urls = this.imgList[j];
+			for (let k = 0; k < urls.length; k++) {
+				urls[k] = this.$util.img(urls[k])
+			}
+			uni.previewImage({
+				urls: urls,
+				current: i
+			});
+		},
+
+		//提交评价
+		save() {
+			if (this.evaluateConfig.evaluate_status == 0) {
+				this.$util.showToast({
+					title: "商家未开启商品评价功能"
+				});
+				return;
+			}
+			for (let i = 0; i < this.goodsEvalList.length; i++) {
+				if (this.isEvaluate) {
+					if (!this.goodsEvalList[i].again_content.trim().length) {
+						this.$util.showToast({
+							title: "商品的评价不能为空哦"
+						});
+						return;
+					}
+				} else {
+					if (!this.goodsEvalList[i].content.trim().length) {
+						this.$util.showToast({
+							title: "商品的评价不能为空哦"
+						});
+						return;
+					}
+				}
+			}
+			let goodsEvaluate = JSON.stringify(this.goodsEvalList)
+			let data = {
+				order_id: this.orderId,
+				goods_evaluate: goodsEvaluate,
+			};
+			if (!this.isEvaluate) {
+				data.order_no = this.orderNo;
+				data.member_name = this.memberInfo.nickname;
+				data.member_headimg = this.memberInfo.headimg;
+				data.is_anonymous = this.isAnonymous;
+			}
+			if (this.flag) return;
+			this.flag = true;
+			this.$api.sendRequest({
+				url: this.isEvaluate ? '/api/goodsevaluate/again' : '/api/goodsevaluate/add',
+				data: data,
+				success: res => {
+					if (res.code == 0) {
+						this.$util.showToast({
+							title: "评价成功"
+						});
+						setTimeout(() => {
+							this.$util.redirectTo('/pages/order/list', {}, "redirectTo");
+						}, 1000);
+					} else {
+						this.$util.showToast({
+							title: res.message
+						});
+						this.flag = false;
+					}
+				},
+				fail: res => {
+					this.flag = false;
+				}
+			});
+		},
+		imageError(index) {
+			this.goodsList[index].sku_image = this.$util.getDefaultImage().goods;
+			this.$forceUpdate();
+		},
+		getEvaluateConfig() {
+			this.$api.sendRequest({
+				url: '/api/goodsevaluate/config',
+				success: res => {
+					if (res.code == 0) {
+						var data = res.data;
+						this.evaluateConfig = data;
+					}
+				}
+			});
+		}
+	}
+};
\ No newline at end of file
diff --git a/pages_tool/order/public/js/refundMethod.js b/pages_tool/order/public/js/refundMethod.js
new file mode 100644
index 0000000..2feb464
--- /dev/null
+++ b/pages_tool/order/public/js/refundMethod.js
@@ -0,0 +1,30 @@
+export default {
+	methods: {
+		/**
+		 * 撤销退款申请
+		 * @param {Object} order_goods_id
+		 * @param {Object} callback
+		 */
+		cancleRefund(order_goods_id, callback) {
+			uni.showModal({
+				content: '撤销之后本次申请将会关闭,如后续仍有问题可再次发起申请。',
+				cancelText: '暂不撤销',
+				cancelColor: '#898989',
+				success: res => {
+					if (res.confirm) {
+						this.$api.sendRequest({
+							url: '/api/orderrefund/cancel',
+							data: {
+								order_goods_id
+							},
+							success: res => {
+								typeof callback == 'function' && callback(res);
+							}
+						})
+					}
+				}
+			})
+		},
+
+	}
+}
diff --git a/pages_tool/order/refund.vue b/pages_tool/order/refund.vue
new file mode 100644
index 0000000..7cfd496
--- /dev/null
+++ b/pages_tool/order/refund.vue
@@ -0,0 +1,306 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view>
+		<view>
+			<scroll-view scroll-y="true" class="refund-container">
+				<view class="goods-wrap">
+					<view class="goods-img">
+						<image :src="$util.img(refund_data.order_goods_info.sku_image, { size: 'mid' })" @error="refund_data.order_goods_info.sku_image = $util.getDefaultImage().goods" mode="aspectFill" :lazy-load="true"/>
+					</view>
+					<view class="goods-info">
+						<view class="goods-name">{{ refund_data.order_goods_info.sku_name }}</view>
+					</view>
+				</view>
+
+				<view class="refund-option" v-show="!refund_type">
+					<view class="option-item" @click="selectRefundType(1)">
+						<view>
+							<text>退款无需退货</text>
+							<text class="font-size-goods-tag color-tip">没收到货，或与卖家协商同意无需退货只退款</text>
+						</view>
+						<text class="iconfont icon-right"></text>
+					</view>
+					<view class="option-item" @click="selectRefundType(2)" v-if="refund_data.refund_type.length == 2">
+						<view>
+							<text>退货退款</text>
+							<text class="font-size-goods-tag color-tip">已收到货，需退还收到的货物</text>
+						</view>
+						<text class="iconfont icon-right"></text>
+					</view>
+				</view>
+
+				<view v-show="refund_type">
+					<view class="refund-form">
+						<view class="item-wrap" @click="openPopup('refundReasonPopup')">
+							<view class="label">退款原因：</view>
+							<view class="cont reason">
+								<text class="color-tip" v-if="!refund_reason.length">请选择</text>
+								<text class="color-tip" v-else>{{ refund_reason }}</text>
+							</view>
+							<text class="iconfont icon-right"></text>
+						</view>
+						<view class="item-wrap">
+							<view class="label">退款金额：</view>
+							<view class="cont color-base-text">{{ $lang('common.currencySymbol') }}{{ refund_data.refund_money }}</view>
+						</view>
+					</view>
+					
+					<view class="refund-form">
+						<view class="item-wrap"><view class="label active">退款说明</view></view>
+						
+						<!-- #ifdef MP-WEIXIN -->
+						<textarea
+							v-if="!showText"
+							class="newText"
+							placeholder="请输入退款说明(选填)"
+							placeholder-class="color-tip font-size-tag"
+							:auto-height="true"
+							v-model="refund_remark"
+						/>
+						<!-- #endif -->
+						<!-- #ifdef H5 -->
+						<textarea
+							class="newText"
+							placeholder="请输入退款说明(选填)"
+							@blur="textBlur()"
+							placeholder-class="color-tip font-size-tag"
+							:auto-height="true"
+							v-model="refund_remark"
+						/>
+						<!-- #endif -->
+					</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">{{ $lang('common.submit') }}</button>
+					</view>
+				</view>
+
+				<uni-popup ref="refundReasonPopup" type="bottom" @change="change()">
+					<view class="refund-reason-popup popup">
+						<view class="popup-header">
+							<view><text class="tit">退款原因</text></view>
+							<view class="align-right" @click="closePopup('refundReasonPopup')"><text class="iconfont icon-close"></text></view>
+						</view>
+						<view class="popup-body">
+							<scroll-view scroll-y="true" class="scroll-view" :class="{ 'safe-area': isIphoneX }">
+								<view class="reason-list">
+									<view class="item" v-for="(item, index) in refund_data.refund_reason_type" :key="index" @click="changeReason(item)">
+										<view class="reason">{{ item }}</view>
+										<view class="iconfont" :class="refund_reason == item ? 'icon-yuan_checked color-base-text' : 'icon-yuan_checkbox'"></view>
+									</view>
+								</view>
+							</scroll-view>
+						</view>
+						<view class="popup-footer" :class="{ 'bottom-safe-area': isIphoneX }">
+							<view class="confirm-btn color-base-bg" @click="closePopup('refundReasonPopup')">确定</view>
+						</view>
+					</view>
+				</uni-popup>
+			</scroll-view>
+			<loading-cover ref="loadingCover"></loading-cover>
+			
+		</view>
+	</view>
+</template>
+
+<script>
+import uniPopup from '@/components/uni-popup/uni-popup.vue';
+export default {
+	components: {
+		uniPopup
+	},
+	data() {
+		return {
+			order_goods_id: '',
+			refund_type: '',
+			refund_reason: '',
+			refund_remark: '',
+			isIphoneX: false,
+			refund_data: {
+				refund_type: [],
+				order_goods_info: {
+					sku_image: ''
+				}
+			},
+			isSub: false,
+			showText: false //是否展示退款说明，解决原生小程序textarea层级过高  popup不能遮挡的问题
+		};
+	},
+	onLoad(option) {
+		if (option.order_goods_id) this.order_goods_id = option.order_goods_id;
+	},
+	onShow() {
+		this.isIphoneX = this.$util.uniappIsIPhoneX();
+		if (this.storeToken) {
+			this.getRefundData();
+		} else {
+			this.$util.redirectTo('/pages_tool/login/login', { back: '/pages_tool/order/refund?order_goods_id=' + this.order_goods_id });
+		}
+	},
+	methods: {
+		/**
+		 * 显示弹出层
+		 * @param {Object} ref
+		 */
+		openPopup(ref) {
+			this.$refs[ref].open();
+		},
+		/**
+		 * 关闭弹出层
+		 * @param {Object} ref
+		 */
+		closePopup(ref) {
+			this.$refs[ref].close();
+		},
+		textBlur() {
+			uni.pageScrollTo({
+				scrollTop: 0,
+				duration: 0
+			});
+		},
+		/**
+		 * 选择退款方式
+		 * @param {Object} type
+		 */
+		selectRefundType(type) {
+			this.refund_type = type;
+		},
+		getRefundData() {
+			this.$api.sendRequest({
+				url: '/api/orderrefund/refundData',
+				data: {
+					order_goods_id: this.order_goods_id
+				},
+				success: res => {
+					if (res.code >= 0) {
+						this.refund_data = res.data;
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					} else {
+						this.$util.showToast({ title: '未获取到该订单项退款信息' });
+						setTimeout(() => {
+							this.$util.redirectTo('/pages/order/list');
+						}, 1000);
+					}
+				},
+				fail: res => {
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				}
+			});
+		},
+		submit() {
+			if (this.verify()) {
+				if (this.isSub) return;
+				this.isSub = true;
+				
+				// #ifdef MP
+				this.subscribeMessage(() => {
+					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
+						},
+						success: res => {
+							this.$util.showToast({ title: res.message });
+							if (res.code >= 0) {
+								this.$util.redirectTo('/pages_tool/order/activist', {}, 'redirectTo');
+							} else {
+								this.isSub = false;
+							}
+						},
+						fail: res => {
+							this.isSub = false;
+						}
+					});
+				})
+				// #endif
+				
+				// #ifndef MP-WEIXIN
+				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
+					},
+					success: res => {
+						this.$util.showToast({ title: res.message });
+						if (res.code >= 0) {
+							this.$util.redirectTo('/pages_tool/order/activist', {}, 'redirectTo');
+						} else {
+							this.isSub = false;
+						}
+					},
+					fail: res => {
+						this.isSub = false;
+					}
+				});
+				// #endif
+			}
+		},
+		verify() {
+			if (this.refund_reason == '') {
+				this.$util.showToast({ title: '请选择退款原因' });
+				return false;
+			}
+			return true;
+		},
+		changeReason(refund_reason) {
+			this.refund_reason = refund_reason;
+		},
+		change(e) {
+			if (e) this.showText = e.show;
+		},
+		/**
+		 * 微信订阅消息
+		 */
+		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();
+				}
+			})
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+@import './public/css/refund.scss';
+</style>
+<style scoped>
+/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_tool/order/refund_batch.vue b/pages_tool/order/refund_batch.vue
new file mode 100644
index 0000000..a9e3084
--- /dev/null
+++ b/pages_tool/order/refund_batch.vue
@@ -0,0 +1,312 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view>
+		<view>
+			<scroll-view scroll-y="true" class="refund-container">
+				<view class="goods-wrap" v-for="(item,index) in refund_data.order_goods_info" :key="index">
+					<view class="goods-img">
+						<image :src="$util.img(item.sku_image, { size: 'mid' })" @error="item.sku_image = $util.getDefaultImage().goods" mode="aspectFill" :lazy-load="true"/>
+					</view>
+					<view class="goods-info">
+						<view class="goods-name">{{ item.sku_name }}</view>
+					</view>
+				</view>
+
+				<view>
+					
+					<view class="refund-form">
+						<view class="item-wrap" @click="openPopup('refundReasonPopup')">
+							<view class="label">退款原因：</view>
+							<view class="cont reason">
+								<text class="color-tip" v-if="!refund_reason.length">请选择</text>
+								<text class="color-tip" v-else>{{ refund_reason }}</text>
+							</view>
+							<text class="iconfont icon-right"></text>
+						</view>
+						<view class="item-wrap">
+							<view class="label">退款方式：</view>
+							<view class="cont color-base-text" v-if="refund_type == 1">退款无需退货</view>
+							<view class="cont color-base-text" v-else>退货退款</view>
+						</view>
+						<view class="item-wrap">
+							<view class="label">退款金额：</view>
+							<view class="cont color-base-text">{{ $lang('common.currencySymbol') }}{{ refund_data.refund_money }}</view>
+						</view>
+					</view>
+					
+					<view class="refund-form">
+						<view class="item-wrap"><view class="label active">退款说明</view></view>
+						
+						<!-- #ifdef MP-WEIXIN -->
+						<textarea
+							v-if="!showText"
+							class="newText"
+							placeholder="请输入退款说明(选填)"
+							placeholder-class="color-tip font-size-tag"
+							:auto-height="true"
+							v-model="refund_remark"
+						/>
+						<!-- #endif -->
+						<!-- #ifdef H5 -->
+						<textarea
+							class="newText"
+							placeholder="请输入退款说明(选填)"
+							@blur="textBlur()"
+							placeholder-class="color-tip font-size-tag"
+							:auto-height="true"
+							v-model="refund_remark"
+						/>
+						<!-- #endif -->
+					</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> -->
+						<button type="primary">{{ $lang('common.submit') }}</button>
+					</view>
+				</view>
+
+				<uni-popup ref="refundReasonPopup" type="bottom" @change="change()">
+					<view class="refund-reason-popup popup">
+						<view class="popup-header">
+							<view><text class="tit">退款原因</text></view>
+							<view class="align-right" @click="closePopup('refundReasonPopup')"><text class="iconfont icon-close"></text></view>
+						</view>
+						<view class="popup-body">
+							<scroll-view scroll-y="true" class="scroll-view" :class="{ 'safe-area': isIphoneX }">
+								<view class="reason-list">
+									<view class="item" v-for="(item, index) in refund_data.refund_reason_type" :key="index" @click="changeReason(item)">
+										<view class="reason">{{ item }}</view>
+										<view class="iconfont" :class="refund_reason == item ? 'icon-yuan_checked color-base-text' : 'icon-yuan_checkbox'"></view>
+									</view>
+								</view>
+							</scroll-view>
+						</view>
+						<view class="popup-footer" :class="{ 'bottom-safe-area': isIphoneX }">
+							<view class="confirm-btn color-base-bg" @click="closePopup('refundReasonPopup')">确定</view>
+						</view>
+					</view>
+				</uni-popup>
+			</scroll-view>
+			<loading-cover ref="loadingCover"></loading-cover>
+			
+		</view>
+	</view>
+</template>
+
+<script>
+import uniPopup from '@/components/uni-popup/uni-popup.vue';
+export default {
+	components: {
+		uniPopup
+	},
+	data() {
+		return {
+			order_goods_id: '',
+			refund_type: '',
+			refund_reason: '',
+			refund_remark: '',
+			isIphoneX: false,
+			refund_data: {
+				refund_type: [],
+				order_goods_info: {
+					sku_image: ''
+				}
+			},
+			isSub: false,
+			showText: false //是否展示退款说明，解决原生小程序textarea层级过高  popup不能遮挡的问题
+		};
+	},
+	onLoad(option) {
+		if (option.order_goods_id) this.order_goods_id = option.order_goods_id;
+		
+		if (option.refund_type) this.refund_type = option.refund_type;
+	},
+	onShow() {
+		this.isIphoneX = this.$util.uniappIsIPhoneX();
+		if (this.storeToken) {
+			this.getRefundData();
+		} else {
+			this.$util.redirectTo('/pages_tool/login/login', { back: '/pages_tool/order/refund?order_goods_id=' + this.order_goods_id });
+		}
+	},
+	methods: {
+		/**
+		 * 显示弹出层
+		 * @param {Object} ref
+		 */
+		openPopup(ref) {
+			this.$refs[ref].open();
+		},
+		/**
+		 * 关闭弹出层
+		 * @param {Object} ref
+		 */
+		closePopup(ref) {
+			this.$refs[ref].close();
+		},
+		textBlur() {
+			uni.pageScrollTo({
+				scrollTop: 0,
+				duration: 0
+			});
+		},
+		/**
+		 * 选择退款方式
+		 * @param {Object} type
+		 */
+		selectRefundType(type) {
+			this.refund_type = type;
+		},
+		getRefundData() {
+			this.$api.sendRequest({
+				url: '/api/orderrefund/refundDataBatch',
+				data: {
+					order_goods_ids: this.order_goods_id
+				},
+				success: res => {
+					if (res.code >= 0) {
+						this.refund_data = res.data;
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					} else {
+						this.$util.showToast({ title: '未获取到该订单项退款信息' });
+						setTimeout(() => {
+							this.$util.redirectTo('/pages/order/list');
+						}, 1000);
+					}
+				},
+				fail: res => {
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				}
+			});
+		},
+		submit() {
+			if (this.verify()) {
+				if (this.isSub) return;
+				this.isSub = true;
+				
+				// #ifdef MP
+				this.subscribeMessage(() => {
+					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
+						},
+						success: res => {
+							this.$util.showToast({ title: res.message });
+							if (res.code >= 0) {
+								uni.removeStorage({
+									key:'refund_goods_data',
+									success:res=>{
+										this.$util.redirectTo('/pages_tool/order/activist');
+									}
+								})
+							} else {
+								this.isSub = false;
+							}
+						},
+						fail: res => {
+							this.isSub = false;
+						}
+					});
+				})
+				// #endif
+				
+				// #ifndef MP-WEIXIN
+				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
+					},
+					success: res => {
+						this.$util.showToast({ title: res.message });
+						if (res.code >= 0) {
+							uni.removeStorage({
+								key:'refund_goods_data',
+								success:res=>{
+									this.$util.redirectTo('/pages_tool/order/activist');
+								}
+							})
+						} else {
+							this.isSub = false;
+						}
+					},
+					fail: res => {
+						this.isSub = false;
+					}
+				});
+				// #endif
+			}
+		},
+		verify() {
+			if (this.refund_reason == '') {
+				this.$util.showToast({ title: '请选择退款原因' });
+				return false;
+			}
+			return true;
+		},
+		changeReason(refund_reason) {
+			this.refund_reason = refund_reason;
+		},
+		change(e) {
+			if (e) this.showText = e.show;
+		},
+		/**
+		 * 微信订阅消息
+		 */
+		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();
+				}
+			})
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+@import './public/css/refund.scss';
+</style>
+<style scoped>
+/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;
+}
+.sub-btn{
+	padding-top: 20rpx;
+	background-color: #FFFFFF;
+}
+</style>
diff --git a/pages_tool/order/refund_detail.vue b/pages_tool/order/refund_detail.vue
new file mode 100644
index 0000000..898bf3e
--- /dev/null
+++ b/pages_tool/order/refund_detail.vue
@@ -0,0 +1,277 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view>
+		<scroll-view scroll-y="true" class="detail-container" :class="{ 'safe-area': isIphoneX }" v-if="detail">
+			<view v-show="action == ''">
+				<view class="status-wrap">
+					<view class="status-name">{{ detail.refund_status_name }}</view>
+					<view class="refund-explain" v-if="detail.refund_status == 1">
+						<view class="font-size-goods-tag color-tip">如果商家拒绝，你可重新发起申请</view>
+						<view class="font-size-goods-tag color-tip">如果商家同意，将通过申请并退款给你</view>
+						<!-- <view class="font-size-goods-tag color-tip">如果商家逾期未处理，平台将自动通过申请并退款给你</view> -->
+					</view>
+					<view class="refund-explain" v-if="detail.refund_status == 5">
+						<view class="font-size-goods-tag color-tip">如果商家确认收货将会退款给你</view>
+						<view class="font-size-goods-tag color-tip">如果商家拒绝收货，该次退款将会关闭，你可以重新发起退款</view>
+					</view>
+				</view>
+
+				<view class="history-wrap" @click="switchAction('consultrecord')">
+					<view>协商记录</view>
+					<text class="iconfont icon-right"></text>
+				</view>
+
+				<view class="refund-address-wrap" v-if="detail.refund_status == 4">
+					<view class="header">退货地址</view>
+					<view>
+						<text>收货人：{{ detail.shop_contacts }}</text>
+					</view>
+					<view>
+						<text>联系方式：{{ detail.shop_mobile }}</text>
+					</view>
+					<view>
+						<text class="address">退货地址：{{ detail.shop_address }}</text>
+						<view class="copy" @click="$util.copy(detail.shop_address)">复制</view>
+					</view>
+				</view>
+
+				<view class="refund-info">
+					<view class="header">退款信息</view>
+					<view class="body">
+						<!-- 商品信息 -->
+						<view class="goods-wrap">
+							<view class="goods-img" @click="refundDetail(detail)">
+								<image :src="$util.img(detail.sku_image, { size: 'mid' })" @error="imageError()" mode="aspectFill" :lazy-load="true"></image>
+							</view>
+							<view class="goods-info">
+								<view class="goods-name" @click="refundDetail(detail)">{{ detail.sku_name }}</view>
+							</view>
+						</view>
+						<!-- 退款信息 -->
+						<view class="info">
+							<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_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>
+					</view>
+				</view>
+
+				<view class="action" :class="{ 'bottom-safe-area': isIphoneX }" v-if="detail.refund_action.length">
+					<view class="order-box-btn" v-for="(actionItem, actionIndex) in detail.refund_action" :key="actionIndex" @click="refundAction(actionItem.event)">
+						{{ actionItem.title }}
+					</view>
+				</view>
+			</view>
+
+			<view v-show="action == 'returngoods'">
+				<view class="return-goods-container">
+					<view class="form-wrap">
+						<view class="item">
+							<view class="label">物流公司</view>
+							<view class="cont">
+								<input
+									type="text"
+									placeholder="请输入物流公司"
+									class="input"
+									placeholder-class="input-placeholder color-tip"
+									v-model="formData.refund_delivery_name"
+								/>
+							</view>
+						</view>
+						<view class="item">
+							<view class="label">物流单号</view>
+							<view class="cont">
+								<input
+									type="text"
+									placeholder="请输入物流单号"
+									class="input"
+									placeholder-class="input-placeholder color-tip"
+									v-model="formData.refund_delivery_no"
+								/>
+							</view>
+						</view>
+						<view class="item">
+							<view class="label">物流说明</view>
+							<view class="cont">
+								<textarea
+									placeholder-class="color-tip font-size-tag"
+									:auto-height="true"
+									class="textarea"
+									placeholder="选填"
+									v-model="formData.refund_delivery_remark"
+								/>
+							</view>
+						</view>
+					</view>
+					<button type="primary" class="sub-btn" @click="refurnGoods">提交</button>
+				</view>
+			</view>
+
+			<view v-show="action == 'consultrecord'">
+				<view class="record-wrap">
+					<view class="record-item" :class="logItem.action_way == 1 ? 'buyer' : ''" v-for="(logItem, logIndex) in detail.refund_log_list" :key="logIndex">
+						<view class="cont">
+							<view class="head">
+								<text>{{ logItem.action_way == 1 ? '买家' : '卖家' }}</text>
+								<text class="time">{{ $util.timeStampTurnTime(logItem.action_time) }}</text>
+							</view>
+							<view class="body">
+								<view class="refund-action">{{ logItem.action }}</view>
+								<view class="desc" v-if="logItem.desc != ''">{{ logItem.desc }}</view>
+							</view>
+						</view>
+					</view>
+					<view class="empty-box"></view>
+				</view>
+				<view class="history-bottom" :class="{ 'bottom-safe-area': isIphoneX }">
+				<!-- 	<ns-contact :niushop="{order_id: detail.order_id}">
+						<view>
+							<text class="iconfont icon-ziyuan"></text>
+							<text>联系客服</text>
+						</view>
+					</ns-contact> -->
+					<view @click="switchAction('')">返回详情</view>
+				</view>
+			</view>
+		</scroll-view>
+		<loading-cover ref="loadingCover"></loading-cover>
+		
+	</view>
+</template>
+
+<script>
+import refundMethod from './public/js/refundMethod.js';
+import validate from 'common/js/validate.js';
+import nsContact from '@/components/ns-contact/ns-contact.vue';
+export default {
+	data() {
+		return {
+			order_goods_id: '',
+			detail: {
+				refund_action: []
+			},
+			isIphoneX: false,
+			action: '',
+			formData: {
+				refund_delivery_name: '',
+				refund_delivery_no: '',
+				refund_delivery_remark: ''
+			},
+			isSub: false
+		};
+	},
+	components: {
+		nsContact
+	},
+	mixins: [refundMethod],
+	onLoad(option) {
+		if (option.order_goods_id) this.order_goods_id = option.order_goods_id;
+		if (option.action) this.action = option.action;
+		this.isIphoneX = this.$util.uniappIsIPhoneX();
+	},
+	onShow() {
+		if (this.storeToken) {
+			this.getRefundDetail();
+		} else {
+			this.$util.redirectTo('/pages_tool/login/login', { back: '/pages_tool/order/refund_detail?order_goods_id=' + this.order_goods_id });
+		}
+	},
+	methods: {
+		getRefundDetail() {
+			this.$api.sendRequest({
+				url: '/api/orderrefund/detail',
+				data: {
+					order_goods_id: this.order_goods_id
+				},
+				success: res => {
+					if (res.code >= 0) {
+						this.detail = res.data;
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					} else {
+						this.$util.showToast({ title: '未获取到该订单项退款信息' });
+						setTimeout(() => {
+							this.$util.redirectTo('/pages/order/list');
+						}, 1000);
+					}
+				},
+				fail: res => {
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				}
+			});
+		},
+		refundAction(event) {
+			switch (event) {
+				case 'orderRefundCancel':
+					this.cancleRefund(this.detail.order_goods_id, res => {
+						if (res.code >= 0) {
+							this.$util.showToast({ title: '撤销成功' });
+							setTimeout(() => {
+								this.$util.redirectTo('/pages/order/list');
+							}, 1000);
+						}
+					});
+					break;
+				case 'orderRefundDelivery':
+					this.action = 'returngoods';
+					break;
+				case 'orderRefundAsk':
+					this.$util.redirectTo('/pages_tool/order/refund', { order_goods_id: this.detail.order_goods_id });
+					break;
+			}
+		},
+		refurnGoods() {
+			var rule = [
+				{ name: 'refund_delivery_name', checkType: 'required', errorMsg: '请输入物流公司' },
+				{ name: 'refund_delivery_no', checkType: 'required', errorMsg: '请输入物流单号' }
+			];
+			this.formData.order_goods_id = this.order_goods_id;
+			var checkRes = validate.check(this.formData, rule);
+			if (checkRes) {
+				if (this.isSub) return;
+				this.isSub = true;
+				this.$api.sendRequest({
+					url: '/api/orderrefund/delivery',
+					data: this.formData,
+					success: res => {
+						if (res.code == 0) {
+							this.action = '';
+							this.getRefundDetail();
+						} else {
+							this.$util.showToast({ title: res.message });
+						}
+					}
+				});
+			} else {
+				this.$util.showToast({ title: validate.error });
+				return false;
+			}
+		},
+		/**
+		 * 切换操作
+		 */
+		switchAction(action) {
+			this.action = action;
+		},
+		imageError() {
+			this.detail.sku_image = this.$util.getDefaultImage().goods;
+			this.$forceUpdate();
+		},
+		refundDetail(e) {
+			this.$util.redirectTo('/pages/goods/detail', {
+				goods_id: e.goods_id
+			});
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+@import './public/css/refund_detail.scss';
+</style>
diff --git a/pages_tool/order/refund_goods_select.vue b/pages_tool/order/refund_goods_select.vue
new file mode 100644
index 0000000..f34e376
--- /dev/null
+++ b/pages_tool/order/refund_goods_select.vue
@@ -0,0 +1,226 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view class="goods-select">
+		<view class="top">
+			共<text class="color-base-text">{{refund_data.length}}</text>件商品
+		</view>
+		
+		<view class="body">
+			<view class="item" v-for="(item,index) in refund_data" :key="index">
+				<view @click="single(index)" style="display:none">
+					<text v-if="item.judge" class="iconfont icon-yuan_checked color-base-text"></text>
+					<text v-else class="iconfont icon-yuan_checkbox"></text>
+				</view>
+				<image :src="$util.img(item.sku_image)" @error="error(index)"></image>
+				<view class="title">
+					<text>{{item.sku_name}}</text>
+				</view>
+			</view>
+		</view>
+		
+		<view class="bottom-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> -->
+			</view>
+			
+			<view v-if="nexthover" class="next" @click="next">下一步</view>
+			<view v-else class="next nexthover">请选择商品</view>
+		</view>
+		
+		<!-- <loading-cover ref="loadingCover"></loading-cover> -->
+	</view>
+</template>
+
+<script>
+	export default{
+		data(){
+			return{
+				refund_type:1, 
+				refund_data:[],
+				judge:true,
+				order_goods_id:[],
+				nexthover:true
+			}
+		},
+		
+		onLoad(option){
+			if(option.refund_type){
+				this.refund_type = option.refund_type;
+				this.getGoodsInfo()
+			} else{
+				uni.showToast({
+					title:'未查找到订单信息',
+					icon:'none'
+				})
+				setTimeout(()=>{
+					this.$util.redirectTo('/pages/order/list');
+				},1000)
+			}
+		},
+		
+		methods:{
+			/**
+			 * 处理商品选中数据
+			 */
+			getGoodsInfo(){
+				uni.getStorage({
+					key:'refund_goods_data',
+					success:res=>{
+						let refund_data = JSON.parse(res.data);
+						this.refund_data = [];
+						refund_data.forEach(item=>{
+							if(item.refund_status == 0){
+								item.judge = true;
+								this.refund_data.push(item);
+							}
+						})
+					}
+				})
+			},
+			/**
+			 *单选事件 
+			 */
+			single(key){
+				this.refund_data[key].judge = !this.refund_data[key].judge;
+				let allJudge = true;
+				
+				this.refund_data.forEach((item)=>{
+					if(!item.judge){
+						allJudge = false;
+					}
+				})
+				this.judge = allJudge;
+				
+				this.getOrderIdInfo();
+				this.$forceUpdate()
+			},
+			/**
+			 * 全选选择
+			 */
+			all(){
+				
+				this.judge = !this.judge;
+				this.refund_data.map(item=>{
+					item.judge = this.judge;
+					return item;
+				})
+				
+				this.getOrderIdInfo();
+				this.$forceUpdate()
+			},
+			
+			/**
+			 * 获取选择的order_goods_id
+			 */
+			getOrderIdInfo(){
+				this.order_goods_id = [];
+				this.refund_data.forEach(item=>{
+					if(item.judge){
+						this.order_goods_id.push(item.order_goods_id)
+					}
+				})
+				if(this.order_goods_id.length == 0){
+					this.nexthover = false; 
+				}else{
+					this.nexthover = true; 
+				}
+				
+				this.$forceUpdate();
+			},
+			/**
+			 * 跳转退款界面
+			 */
+			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 });
+			},
+			/**
+			 * 默认图片处理
+			 */
+			error(index){
+				this.refund_data[index].sku_image = this.$util.getDefaultImage().goods
+				this.$forceUpdate();
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.goods-select{
+		.top{
+			padding: 20rpx 30rpx;
+			box-sizing: border-box;
+			font-size: 28rpx;
+			background: #FFFFFF;
+			text{
+				font-size: 30rpx;
+				margin: 0 10rpx;
+				font-weight: bold;
+			}
+		}
+		.iconfont{
+			font-size: 40rpx;
+		}
+		.body{
+			margin: 30rpx;
+			border-radius: 10rpx;
+			background: #FFFFFF;
+			padding: 30rpx 0 0;
+			.item{
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				padding: 0 30rpx 30rpx;
+
+				image{
+					width: 180rpx;
+					height: 180rpx;
+					border-radius: 10rpx;
+				}
+				.title{
+					width: 368rpx;
+					height:180rpx;
+					font-size: 28rpx;
+					text{
+						text-overflow: -o-ellipsis-lastline;
+						overflow: hidden;
+						text-overflow: ellipsis;
+						display: -webkit-box;
+						-webkit-line-clamp: 3;
+						line-clamp: 3;
+						-webkit-box-orient: vertical;
+					}
+				}
+			}
+		}
+		.bottom-all{
+			padding-left: 30rpx;
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			background: #FFFFFF;
+			position: fixed;
+			left: 0;
+			bottom: 0;
+			width: 100%;
+			box-sizing: border-box;
+			.next{
+				padding: 16rpx 80rpx;
+				color: #FFFFFF;
+				background: #ff4544;
+			}
+			.nexthover{
+				background: #e7dcdc !important;
+			}
+		}
+	}
+	
+</style>
diff --git a/pages_tool/order/refund_type_select.vue b/pages_tool/order/refund_type_select.vue
new file mode 100644
index 0000000..1356ef1
--- /dev/null
+++ b/pages_tool/order/refund_type_select.vue
@@ -0,0 +1,121 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view>
+		<view>
+			<view class="refund-option">
+				<view class="option-item" @click="selectRefundType(1)">
+					<view>
+						<text>退款无需退货</text>
+						<text class="font-size-goods-tag color-tip">没收到货，或与卖家协商同意无需退货只退款</text>
+					</view>
+					<text class="iconfont icon-right"></text>
+				</view>
+				<view class="option-item" @click="selectRefundType(2)" v-if="refund_data.order_status == 3">
+					<view>
+						<text>退货退款</text>
+						<text class="font-size-goods-tag color-tip">已收到货，需退还收到的货物</text>
+					</view>
+					<text class="iconfont icon-right"></text>
+				</view>
+			</view>
+
+			<loading-cover ref="loadingCover"></loading-cover>
+
+		</view>
+	</view>
+</template>
+
+<script>
+	import uniPopup from '@/components/uni-popup/uni-popup.vue';
+	export default {
+		components: {
+			uniPopup
+		},
+		data() {
+			return {
+				order_id: '',
+				isIphoneX: false,
+				refund_data: {},
+			};
+		},
+		onLoad(option) {
+			if (option.order_id) this.order_id = option.order_id;
+		},
+		onShow() {
+			this.isIphoneX = this.$util.uniappIsIPhoneX();
+			if (this.storeToken) {
+				this.getRefundData();
+			} else {
+				this.$util.redirectTo('/pages_tool/login/login', {
+					back: '/pages_tool/order/refund?order_goods_id=' + this.order_goods_id
+				});
+			}
+		},
+		methods: {
+			/**
+			 * 选择退款方式
+			 * @param {Object} type
+			 */
+			selectRefundType(type) {
+				this.$util.redirectTo('/pages_tool/order/refund_goods_select', {
+					refund_type: type
+				});
+			},
+			/**
+			 * 获取退款订单数据
+			 */
+			getRefundData() {
+				this.$api.sendRequest({
+					url: '/api/order/detail',
+					data: {
+						order_id: this.order_id
+					},
+					success: res => {
+						if (res.code >= 0) {
+							this.refund_data = res.data;
+							uni.setStorage({
+								key: 'refund_goods_data',
+								data: JSON.stringify(res.data.order_goods),
+							})
+							if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+						} else {
+							this.$util.showToast({
+								title: '未获取到该订单项退款信息'
+							});
+							setTimeout(() => {
+								this.$util.redirectTo('/pages/order/list');
+							}, 1000);
+						}
+					},
+					fail: res => {
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					}
+				});
+			},
+		}
+	};
+</script>
+
+<style lang="scss">
+	@import './public/css/refund.scss';
+</style>
+<style scoped>
+	/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;
+	}
+
+	.sub-btn {
+		padding-top: 20rpx;
+		background-color: #FFFFFF;
+	}
+</style>
\ No newline at end of file
diff --git a/pages_tool/pay/cashier.vue b/pages_tool/pay/cashier.vue
new file mode 100644
index 0000000..b620d4a
--- /dev/null
+++ b/pages_tool/pay/cashier.vue
@@ -0,0 +1,379 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view class="cashier">
+		<block v-if="payInfo">
+			<block v-if="payInfo.pay_status == 0">
+				<text class="content">{{ payInfo.pay_body }}</text>
+				<view class="money-wrap">
+					<text class="unit price-font">￥</text>
+					<text class="money price-font">{{ payInfo.pay_money | moneyFormat }}</text>
+				</view>
+				
+				<block v-if="payTypeList.length > 0">
+					<view class="pay-type">
+						<view class="payment-item" v-for="(item, index) in payTypeList" :key="index" @click="payIndex = index">
+							<view>
+								<text class="iconfont" :class="item.icon"></text>
+								<text class="name">{{ item.name }}</text>
+							</view>
+							<text class="iconfont" :class="payIndex == index ? 'icon-yuan_checked color-base-text' : 'icon-checkboxblank'"></text>
+						</view>
+					</view>
+					<button type="primary" @click="confirm">确认支付</button>
+				</block>
+				<view v-else class="empty">店铺尚未配置支付方式！</view>
+			</block>
+			<ns-empty text="该支付单据已支付" :is-index="true" v-else></ns-empty>
+		</block>
+		<ns-empty text="未获取到支付信息" :is-index="true" v-else></ns-empty>
+		<ns-login ref="login"></ns-login>
+	</view>
+</template>
+
+<script>
+import { Weixin } from 'common/js/wx-jssdk.js';
+
+export default {
+	data() {
+		return {
+			payIndex: 0,
+			// #ifdef H5
+			payTypeList: [
+				{
+					name: '支付宝支付',
+					icon: 'icon-zhifubaozhifu-',
+					type: 'alipay'
+				},
+				{
+					name: '微信支付',
+					icon: 'icon-weixin1',
+					type: 'wechatpay'
+				}
+			],
+			timer: null,
+			// #endif
+			// #ifdef MP-WEIXIN
+			payTypeList: [{
+				name: '微信支付',
+				provider: 'wxpay',
+				icon: 'icon-weixin1',
+				type: 'wechatpay'
+			}],
+			// #endif
+			payInfo: null,
+			outTradeNo: ''
+		};
+	},
+	onLoad(option) {
+		this.getPayType();
+		this.outTradeNo = option.out_trade_no || '';
+		this.getPayInfo();
+	},
+	methods: {
+		getPayInfo() {
+			this.$api.sendRequest({
+				url: '/api/pay/info',
+				data: {
+					out_trade_no: this.outTradeNo
+				},
+				success: res => {
+					if (res.code >= 0 && res.data) {
+						this.payInfo = res.data;
+						if (this.payInfo.pay_status == 0) {
+							setTimeout(() => {
+								this.autoPay();
+							}, 500)
+						}
+					} 
+				}
+			});
+		},
+		getPayType() {
+			this.$api.sendRequest({
+				url: '/api/pay/type',
+				success: res => {
+					if (res.data.pay_type == '') {
+						this.payTypeList = [];
+					} else {
+						this.payTypeList.forEach((val, key) => {
+							if (res.data.pay_type.indexOf(val.type) == -1) {
+								this.payTypeList.splice(key, 1);
+							}
+						});
+					}
+				}
+			});
+		},
+		autoPay(){
+			if (!this.payTypeList.length) return;
+			if (this.$util.isWeiXin()) {
+			 	this.payTypeList.forEach((item, index) => {
+					if (item.type == 'wechatpay') {
+						this.payIndex = index;
+						this.confirm();
+					}
+				})
+			} else if (/AlipayClient/.test(window.navigator.userAgent)) {
+				this.payTypeList.forEach((item, index) => {
+					if (item.type == 'alipay') {
+						this.payIndex = index;
+						this.confirm();
+					}
+				})
+			}
+		},
+		confirm() {
+			if (!this.storeToken) {
+				this.$nextTick(() => {
+					this.$refs.login.open('/pages_tool/pay/cashier?out_trade_no=' + this.outTradeNo);
+				});
+				return;
+			}
+			if (this.payTypeList.length == 0 && this.payInfo.pay_money > 0) {
+				this.$util.showToast({
+					title: '请选择支付方式！'
+				});
+				return;
+			}
+			uni.showLoading({
+				title: '支付中...',
+				mask: true
+			});
+			this.pay();
+		},
+		// #ifdef H5
+		pay() {
+			var payType = this.payTypeList[this.payIndex];
+			if (!payType) return;
+
+			let returnUrl = encodeURIComponent(this.$config.h5Domain + '/pages_tool/pay/result?code=' + this.payInfo.out_trade_no);
+
+			this.$api.sendRequest({
+				url: '/api/pay/pay',
+				data: {
+					out_trade_no: this.payInfo.out_trade_no,
+					pay_type: payType.type,
+					return_url: returnUrl
+				},
+				success: res => {
+					uni.hideLoading();
+					if (res.code >= 0) {
+						switch (payType.type) {
+							case 'alipay':
+								if (this.$util.isWeiXin()) {
+									var wx_alipay = encodeURIComponent(res.data.data);
+									this.$util.redirectTo('/pages/pay/wx_pay/wx_pay', { wx_alipay: wx_alipay, out_trade_no: this.payInfo.out_trade_no }, 'redirectTo');
+								} else {
+									location.href = res.data.data;
+									this.checkPayStatus();
+								}
+								break;
+							case 'wechatpay':
+								if (this.$util.isWeiXin()) {
+									if (uni.getSystemInfoSync().platform == 'ios') {
+										var url = uni.getStorageSync('initUrl');
+									} else {
+										var url = location.href;
+									}
+									// 获取jssdk配置
+									this.$api.sendRequest({
+										url: '/wechat/api/wechat/jssdkconfig',
+										data: { url: url },
+										success: jssdkRes => {
+											var wxJS = new Weixin(),
+												payData = res.data.data;
+											wxJS.init(jssdkRes.data);
+											wxJS.pay(
+												{
+													timestamp: payData.timestamp,
+													nonceStr: payData.nonceStr,
+													package: payData.package,
+													signType: payData.signType,
+													paySign: payData.paySign
+												},
+												res => {
+													if (res.errMsg == 'chooseWXPay:ok') {
+														if (!this.back) this.$util.redirectTo('/pages_tool/pay/result', { code: this.payInfo.out_trade_no }, 'redirectTo');
+														else location.replace(this.back + '/pages_tool/pay/result?code=' + this.payInfo.out_trade_no);
+													} else {
+														this.$util.showToast({ title: res.errMsg });
+													}
+												}
+											);
+										}
+									});
+								} else {
+									location.href = res.data.url;
+									this.checkPayStatus();
+								}
+								break;
+						}
+					} else {
+						this.$util.showToast({ title: res.message });
+					}
+				},
+				fail: res => {
+					uni.hideLoading();
+					this.$util.showToast({ title: 'request:fail' });
+				}
+			});
+		},
+		checkPayStatus() {
+			this.timer = setInterval(() => {
+				this.$api.sendRequest({
+					url: '/api/pay/status',
+					data: { out_trade_no: this.payInfo.out_trade_no },
+					success: res => {
+						if (res.code == 0) {
+							if (res.data.pay_status == 2) {
+								clearInterval(this.timer);
+								this.$util.redirectTo('/pages_tool/pay/result', { code: this.payInfo.out_trade_no }, 'redirectTo');
+							}
+						} else {
+							clearInterval(this.timer);
+						}
+					}
+				});
+			}, 1000);
+		},
+		// #endif
+		// #ifdef MP-WEIXIN
+		pay() {
+			var payType = this.payTypeList[this.payIndex];
+			if (!payType) return;
+
+			this.$api.sendRequest({
+				url: '/api/pay/pay',
+				data: {
+					out_trade_no: this.payInfo.out_trade_no,
+					pay_type: payType.type
+				},
+				success: res => {
+					uni.hideLoading();
+					if (res.code >= 0) {
+						var payData = res.data.data;
+						uni.requestPayment({
+							provider: payType.provider,
+							timeStamp: payData.timeStamp,
+							nonceStr: payData.nonceStr,
+							package: payData.package,
+							signType: payData.signType,
+							paySign: payData.paySign,
+							success: res => {
+								this.$util.redirectTo('/pages_tool/pay/result', { code: this.payInfo.out_trade_no }, 'redirectTo');
+							},
+							fail: res => {
+								this.flag = false;
+								if (res.errMsg == 'requestPayment:fail cancel') {
+									this.$util.showToast({ title: '您已取消支付' });
+								} else {
+									uni.showModal({ content: '支付失败,失败原因: ' + res.errMsg, showCancel: false });
+								}
+							}
+						});
+					} else {
+						this.$util.showToast({ title: res.message });
+					}
+				},
+				fail: res => {
+					uni.hideLoading();
+					this.$util.showToast({ title: 'request:fail' });
+				}
+			});
+		}
+		// #endif
+	},
+	watch: {
+		storeToken: function(nVal, oVal) {
+			if (nVal) {
+				this.getPayInfo();
+			}
+		}
+	},
+	filters: {
+		/**
+		 * 金额格式化输出
+		 * @param {Object} money
+		 */
+		moneyFormat(money) {
+			return parseFloat(money).toFixed(2);
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+.cashier {
+	display: flex;
+	align-items: center;
+	flex-direction: column;
+	padding: 80rpx 26rpx;
+	.content {
+		white-space: nowrap;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		width: 100%;
+		padding: 0 60rpx;
+		text-align: center;
+	}
+	.money-wrap {
+		font-weight: bold;
+		margin: 40rpx 0;
+		.unit {
+			font-size: 40rpx;
+			margin-right: 6rpx;
+		}
+		.money {
+			font-size: 70rpx;
+		}
+	}
+
+	.pay-type {
+		width: 100%;
+		background: #fff;
+		border-radius: 20rpx;
+		.payment-item {
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			height: 90rpx;
+			border-bottom: 2rpx solid $color-line;
+			padding: 20rpx 30rpx;
+			&:last-of-type {
+				border-bottom: none;
+			}
+			> view {
+				display: flex;
+				align-items: center;
+				.name {
+					margin-left: 20rpx;
+				}
+			}
+			.iconfont {
+				font-size: 64rpx;
+			}
+			.icon-weixin1 {
+				color: #24af41;
+			}
+			.icon-zhifubaozhifu- {
+				color: #00a0e9;
+			}
+			.icon-yuan_checked {
+				font-size: 40rpx;
+				color: $base-color;
+			}
+			.icon-checkboxblank {
+				font-size: 40rpx;
+			}
+		}
+	}
+	button {
+		width: 100%;
+		margin-top: 80rpx !important;
+		background: $base-color;
+		height: 90rpx;
+		line-height: 90rpx;
+		border-radius: 90rpx;
+	}
+}
+</style>
diff --git a/pages_tool/pay/index.vue b/pages_tool/pay/index.vue
new file mode 100644
index 0000000..5a1833c
--- /dev/null
+++ b/pages_tool/pay/index.vue
@@ -0,0 +1,133 @@
+<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/result.vue b/pages_tool/pay/result.vue
new file mode 100644
index 0000000..818ece9
--- /dev/null
+++ b/pages_tool/pay/result.vue
@@ -0,0 +1,344 @@
+<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;
+	}
+</style>
\ No newline at end of file
diff --git a/pages_tool/pay/wx_pay.vue b/pages_tool/pay/wx_pay.vue
new file mode 100644
index 0000000..7629f8f
--- /dev/null
+++ b/pages_tool/pay/wx_pay.vue
@@ -0,0 +1,94 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view class="launch-mask" v-if="show == true">
+		<view class="mask-img">
+			<image :src="$util.img('public/uniapp/pay/invite_friends_share.png')" mode="aspectFit"></image>
+		</view>
+		<view class="mask-word">点击右上角跳转到浏览器打开</view>
+	</view>
+</template>
+<script>
+
+export default {
+	name: 'wx_pay',
+	data() {
+		return {
+			show : true,
+			wx_alipay : "",
+			out_trade_no : ""
+		};
+	},
+	onLoad(options) {
+		this.wx_alipay = options.wx_alipay || '';
+		this.out_trade_no = options.out_trade_no || '';
+		if(!this.$util.isWeiXin() && this.wx_alipay){
+			this.show = false;
+			location.href = this.wx_alipay;
+		}
+		this.checkPayStatus();
+	},
+	methods: {
+		getPayInfo(out_trade_no) {
+			this.$api.sendRequest({
+				url: '/api/pay/info',
+				data: {
+					out_trade_no
+				},
+				success: res => {
+					if (res.code >= 0 && res.data) {
+						this.checkPayStatus();
+					} 
+				}
+			});
+		},
+		checkPayStatus() {
+			var that = this;
+			var timer = setInterval(() => {
+				that.$api.sendRequest({
+					url: '/api/pay/status',
+					data: { out_trade_no: that.out_trade_no },
+					success: res => {
+						if (res.code == 0) {
+							if (res.data.pay_status == 2) {
+								clearInterval(timer);
+								that.$util.redirectTo('/pages_tool/pay/result', { code: that.out_trade_no }, '', 'redirectTo');
+							}
+						} else {
+							clearInterval(timer);
+						}
+					}
+				});
+			}, 1000);
+		},
+	},
+};
+</script>
+
+<style lang="scss">
+.launch-mask{
+	position:fixed;
+	top:0px;
+	left: 0px;
+	width:100%;
+	height: 100%;
+	background:rgba(0,0,0,0.8);
+	.mask-img{
+		text-align: right;
+		margin:10% 10px 10px 30px;
+		image{
+			width: 50px;
+			height:117px;
+			margin-right:9%
+		}
+	}
+	.mask-word{
+		color: #fff;
+		text-align: center;
+		font-weight: bold;
+		font-size: 18px;
+		text{
+			color:#FF0036 !important
+		}
+	}
+}
+</style>
diff --git a/pages_tool/recharge/list.vue b/pages_tool/recharge/list.vue
new file mode 100644
index 0000000..5155b27
--- /dev/null
+++ b/pages_tool/recharge/list.vue
@@ -0,0 +1,639 @@
+<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>
diff --git a/pages_tool/recharge/order_list.vue b/pages_tool/recharge/order_list.vue
new file mode 100644
index 0000000..900a7b3
--- /dev/null
+++ b/pages_tool/recharge/order_list.vue
@@ -0,0 +1,177 @@
+<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>
diff --git a/pages_tool/storeclose/storeclose.vue b/pages_tool/storeclose/storeclose.vue
new file mode 100644
index 0000000..2ae9896
--- /dev/null
+++ b/pages_tool/storeclose/storeclose.vue
@@ -0,0 +1,99 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view>
+		<view class="closeBox">
+			<image :src="$util.img('public/uniapp/store/storeclose.png')" mode="widthFix"></image>
+			<text class="close-title">{{ textVal }}</text>
+		</view>
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			isIphoneX: false
+		};
+	},
+	onShow() {
+		this.isIphoneX = this.$util.uniappIsIPhoneX();
+		
+		this.getSiteStatus();
+		
+		// #ifdef MP-WEIXIN
+		wx.hideHomeButton();
+		// #endif
+	},
+	methods:{
+		getSiteStatus(){
+			this.$api.sendRequest({
+				url: '/api/site/status',
+				data: {},
+				success: res => {
+					if (res.code == 0) {
+						this.$util.redirectTo('/pages/index/index');
+					}
+				}
+			});
+		}
+	},
+	computed: {
+		textVal() {
+			return '该店铺已打烊...';
+		},
+		pageVal() {
+			if (this.$store.state.siteState == -2) {
+				return '店铺不存在';
+			} else if (this.$store.state.siteState == -3) {
+				return '店铺打烊';
+			}
+		}
+	},
+	onBackPress() {
+		return true;
+	}
+};
+</script>
+
+<style lang="scss">
+.head-nav {
+	width: 100%;
+	height: var(--status-bar-height);
+}
+
+.head-nav.active {
+	padding-top: 40rpx;
+}
+
+.head-return {
+	padding-left: 30rpx;
+	padding-right: 30rpx;
+	height: 90rpx;
+	line-height: 90rpx;
+	text-align: center;
+	font-weight: 600;
+	font-size: $font-size-toolbar;
+
+	text {
+		display: inline-block;
+		margin-right: 10rpx;
+	}
+}
+.closeBox {
+	width: 100%;
+	display: flex;
+	flex-direction: column;
+	justify-content: center;
+	align-items: center;
+	margin-top: 330rpx;
+}
+image {
+	width: 240rpx;
+}
+.close-title {
+	font-size: $font-size-toolbar;
+	color: $color-tip;
+	margin-top: 55rpx;
+	letter-spacing: 4rpx;
+}
+</style>
diff --git a/pages_tool/vr/index.vue b/pages_tool/vr/index.vue
new file mode 100644
index 0000000..bfe126c
--- /dev/null
+++ b/pages_tool/vr/index.vue
@@ -0,0 +1,52 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view>
+		<view class="iconfont iconshang navigate-back" @click="navigateBack"></view>
+		<web-view :src="src"></web-view>
+	</view>
+<!-- 	<diy-bottom-nav></diy-bottom-nav> -->
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			src: ''
+		};
+	},
+	onLoad(option) {
+		// this.src = decodeURIComponent(option.src);
+		this.$api.sendRequest({
+			url: '/api/config/defaultvr',
+			success: res => {
+				console.log(res)
+				if (res.code == 0) {
+					uni.setNavigationBarTitle({
+						title:res.data.title
+					})
+					this.src = res.data.url
+				}
+			},
+			fail: res => {
+			}
+		});
+	},
+	methods: {
+		navigateBack() {
+			uni.navigateBack({
+				delta: 1
+			});
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+.navigate-back {
+	position: absolute;
+	top: 34rpx;
+	left: 34rpx;
+	z-index: 5;
+	font-size: $font-size-toolbar;
+}
+</style>
diff --git a/pages_tool/webview/webview.vue b/pages_tool/webview/webview.vue
new file mode 100644
index 0000000..f6fff44
--- /dev/null
+++ b/pages_tool/webview/webview.vue
@@ -0,0 +1,42 @@
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view>
+		<view class="iconfont iconshang navigate-back" @click="navigateBack"></view>
+		<web-view :src="src"></web-view>
+
+		<!-- #ifdef MP-WEIXIN -->
+		<!-- 小程序隐私协议 -->
+		<privacy-popup ref="privacyPopup"></privacy-popup>
+		<!-- #endif -->
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			src: ''
+		};
+	},
+	onLoad(option) {
+		this.src = decodeURIComponent(option.src);
+	},
+	methods: {
+		navigateBack() {
+			uni.navigateBack({
+				delta: 1
+			});
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+.navigate-back {
+	position: absolute;
+	top: 34rpx;
+	left: 34rpx;
+	z-index: 5;
+	font-size: $font-size-toolbar;
+}
+</style>
diff --git a/project.config.json b/project.config.json
new file mode 100644
index 0000000..30988dd
--- /dev/null
+++ b/project.config.json
@@ -0,0 +1,75 @@
+{
+  "description": "项目配置文件",
+  "packOptions": {
+    "ignore": []
+  },
+  "setting": {
+    "urlCheck": true,
+    "es6": true,
+    "enhance": false,
+    "postcss": true,
+    "preloadBackgroundData": false,
+    "minified": true,
+    "newFeature": false,
+    "coverView": true,
+    "nodeModules": false,
+    "autoAudits": false,
+    "showShadowRootInWxmlPanel": true,
+    "scopeDataCheck": false,
+    "uglifyFileName": false,
+    "checkInvalidKey": true,
+    "checkSiteMap": true,
+    "uploadWithSourceMap": true,
+    "compileHotReLoad": false,
+    "useMultiFrameRuntime": true,
+    "useApiHook": true,
+    "useApiHostProcess": true,
+    "babelSetting": {
+      "ignore": [],
+      "disablePlugins": [],
+      "outputPath": ""
+    },
+    "enableEngineNative": false,
+    "bundle": false,
+    "useIsolateContext": true,
+    "useCompilerModule": true,
+    "userConfirmedUseCompilerModuleSwitch": false,
+    "userConfirmedBundleSwitch": false,
+    "packNpmManually": false,
+    "packNpmRelationList": [],
+    "minifyWXSS": true
+  },
+  "compileType": "miniprogram",
+  "libVersion": "2.16.1",
+  "appid": "wx59e6ba6050bbe7bc",
+  "projectname": "niushop_b2c_v4_uniapp",
+  "debugOptions": {
+    "hidedInDevtools": []
+  },
+  "scripts": {},
+  "staticServerOptions": {
+    "baseURL": "",
+    "servePath": ""
+  },
+  "isGameTourist": false,
+  "condition": {
+    "search": {
+      "list": []
+    },
+    "conversation": {
+      "list": []
+    },
+    "game": {
+      "list": []
+    },
+    "plugin": {
+      "list": []
+    },
+    "gamePlugin": {
+      "list": []
+    },
+    "miniprogram": {
+      "list": []
+    }
+  }
+}
\ No newline at end of file
diff --git a/store/index.js b/store/index.js
new file mode 100644
index 0000000..34eb0f6
--- /dev/null
+++ b/store/index.js
@@ -0,0 +1,351 @@
+import Vue from 'vue'
+import Vuex from 'vuex'
+Vue.use(Vuex)
+
+import Http from '../common/js/http.js'
+import colorList from '../common/js/style_color.js'
+
+const store = new Vuex.Store({
+	state: {
+		token: null,
+		siteInfo: null,
+		memberInfo: null,
+		tabBarList: '',
+		siteState: 1,
+		themeStyle: '',
+		addonIsExist: {
+			bundling: 0,
+			coupon: 0,
+			discount: 0,
+			fenxiao: 0,
+			gift: 0,
+			groupbuy: 0,
+			manjian: 0,
+			memberconsume: 0,
+			memberrecharge: 0,
+			memberregister: 0,
+			membersignin: 0,
+			memberwithdraw: 0,
+			memberrecommend: 0,
+			pintuan: 0,
+			pointexchange: 0,
+			seckill: 0,
+			store: 0,
+			topic: 0,
+			bargain: 0,
+			membercancel: 0,
+			servicer: 0,
+			supermember: 0,
+			giftcard: 0,
+			divideticket: 0,
+			scenefestival: 0,
+			birthdaygift: 0,
+			pinfan: 0,
+			form: 0
+		},
+		authInfo: {}, // 授权信息
+		flRefresh: 0,
+		location: null, // 定位信息
+		defaultImg: {
+			goods: '',
+			head: '',
+			store: '',
+			article: ''
+		},
+		cartList: {},
+		cartIds: [],
+		cartNumber: 0,
+		cartMoney: 0,
+		cartChange: 0,
+		bottomNavHidden: false, // 底部导航是否隐藏，true：隐藏，false：显示
+		globalStoreConfig: null, // 门店配置
+		globalStoreInfo: null, // 门店信息
+		defaultStoreInfo: null, // 默认门店
+		cartPosition: null, // 购物车所在位置
+		componentRefresh: 0, // 组件刷新
+		servicerConfig: null, // 客服配置
+		diySeckillInterval: 0,
+		diyGroupPositionObj: {},
+		diyGroupShowModule: '',
+		tabBarHeight: '56px',
+		mapConfig: {
+			tencent_map_key: '',
+			wap_is_open: 1,
+			wap_valid_time: 0
+		},
+		copyright: null
+	},
+	mutations: {
+		// 设置那些组件展示
+		setDiyGroupShowModule(state, data) {
+			state.diyGroupShowModule = data;
+		},
+		// 设置diyGroup中组件原有高度，通过他们来实现在首页的定位
+		setDiyGroupPositionObj(state, data) {
+			state.diyGroupPositionObj = Object.assign({}, state.diyGroupPositionObj, data);
+		},
+		setSiteState(state, siteStateVal) {
+			state.siteState = siteStateVal;
+		},
+		setThemeStyle(state, value) {
+			state.themeStyle = value
+			uni.setStorageSync('themeStyle', value); // 初始化数据调用
+		},
+		setTabBarList(state, value) {
+			state.tabBarList = value;
+		},
+		setAddonIsExist(state, value) {
+			state.addonIsExist = value;
+			uni.setStorageSync('addonIsExist', value); // 初始化数据调用
+		},
+		setToken(state, value) {
+			state.token = value;
+			if (value) {
+				uni.setStorageSync('token', value); // 初始化数据调用
+			} else {
+				uni.removeStorageSync('token');
+			}
+		},
+		setAuthinfo(state, value) {
+			state.authInfo = value;
+		},
+		setflRefresh(state, flRefreshVal) {
+			state.flRefresh = flRefreshVal;
+		},
+		setLocation(state, value) {
+			var date = new Date();
+			date.setSeconds(60 * state.mapConfig.wap_valid_time);
+			value.valid_time = date.getTime() / 1000; // 定位信息 5分钟内有效，过期后将重新获取定位信息
+			state.location = value;
+			uni.setStorageSync('location', value); // 初始化数据调用
+		},
+		setDefaultImg(state, value) {
+			state.defaultImg = value;
+			uni.setStorageSync('defaultImg', value); // 初始化数据调用
+		},
+		setSiteInfo(state, value) {
+			state.siteInfo = value;
+			uni.setStorageSync('siteInfo', value); // 初始化数据调用
+		},
+		setShopInfo(state, value) {
+			state.shopInfo = value;
+			uni.setStorageSync('shopInfo', value); // 初始化数据调用
+		},
+		setCartChange(state) {
+			state.cartChange += 1;
+		},
+		setBottomNavHidden(state, value) {
+			state.bottomNavHidden = value;
+		},
+		setGlobalStoreConfig(state, value) {
+			state.globalStoreConfig = value;
+			uni.setStorageSync('globalStoreConfig', value); // 初始化数据调用
+		},
+		setGlobalStoreInfo(state, value) {
+			state.globalStoreInfo = value;
+			uni.setStorageSync('globalStoreInfo', value); // 初始化数据调用
+		},
+		setDefaultStoreInfo(state, value) {
+			state.defaultStoreInfo = value;
+			uni.setStorageSync('defaultStoreInfo', value); // 初始化数据调用
+		},
+		setCartPosition(state, value) {
+			state.cartPosition = value;
+		},
+		setComponentRefresh(state) {
+			state.componentRefresh += 1;
+		},
+		// 客服配置
+		setServicerConfig(state, value) {
+			state.servicerConfig = value;
+			uni.setStorageSync('servicerConfig', value);
+		},
+		setDiySeckillInterval(state, value) {
+			state.diySeckillInterval = value;
+		},
+		setTabBarHeight(state, value) {
+			state.tabBarHeight = value;
+		},
+		setMapConfig(state, value) {
+			state.mapConfig = value;
+			uni.setStorageSync('mapConfig', value);
+		},
+		setCopyright(state, value) {
+			state.copyright = value;
+			uni.setStorageSync('copyright', value);
+		},
+		setMemberInfo(state, value) {
+			state.memberInfo = value;
+			if (value) {
+				uni.setStorageSync('memberInfo', value);
+			} else {
+				uni.removeStorageSync('memberInfo');
+			}
+		},
+		setCartNumber(state, cartNumber) {
+			state.cartNumber = cartNumber
+		},
+		setCartList(state, value) {
+			state.cartList = value;
+		},
+		setCartIds(state, value) {
+			state.cartIds = value;
+		},
+		setCartMoney(state, value) {
+			state.cartMoney = value;
+		}
+	},
+	actions: {
+		init() {
+			return new Promise((resolve, reject) => {
+				Http.sendRequest({
+					url: '/api/config/init',
+					success: res => {
+						var data = res.data;
+						if (data) {
+							this.commit('setThemeStyle', colorList[data.style_theme.name]);
+
+							// 底部导航
+							this.commit('setTabBarList', data.diy_bottom_nav);
+
+							this.commit('setAddonIsExist', data.addon_is_exist);
+
+							this.commit('setDefaultImg', data.default_img);
+			
+							this.commit('setSiteInfo', data.site_info);
+
+							this.commit('setServicerConfig', data.servicer);
+						
+							this.commit('setCopyright', data.copyright);
+
+							this.commit('setMapConfig', data.map_config);
+
+							this.commit('setGlobalStoreConfig', data.store_config);
+							
+							//联系我们
+							
+							this.commit('setShopInfo', data.shop_info);
+							// 默认总店
+							if (data.store_info) {
+								this.commit('setDefaultStoreInfo', data.store_info);
+							} else {
+								// 清空不存在的门店信息
+								this.commit('setDefaultStoreInfo', null);
+								this.commit('setGlobalStoreInfo', null);
+							}
+
+							resolve(data);
+						}
+					}
+				});
+			})
+		},
+		// 查询购物车列表、总数量、总价格
+		getCartNumber() {
+			Http.sendRequest({
+				url: '/api/cart/lists',
+				data: {},
+				success: res => {
+					if (res.code == 0) {
+						let list = [];
+						let ids = [];
+						let totalMoney = 0;
+						let totalNum = 0;
+
+						if (res.data.length) {
+
+							res.data.forEach((item) => {
+								let cart = {
+									cart_id: item.cart_id,
+									goods_id: item.goods_id,
+									sku_id: item.sku_id,
+									num: item.num,
+									discount_price: item.discount_price
+								};
+
+								if (!list['goods_' + cart.goods_id]) {
+									list['goods_' + cart.goods_id] = {};
+								}
+								list['goods_' + cart.goods_id]['sku_' + cart
+										.sku_id
+									] =
+									cart;
+								ids.push(cart.cart_id);
+							});
+
+							for (let goods in list) {
+								let num = 0;
+								let money = 0;
+								for (let sku in list[goods]) {
+									let item = list[goods][sku];
+									if (typeof item == 'object') {
+										num += item.num;
+										money += parseFloat(item.discount_price) * parseInt(item
+											.num);
+									}
+								}
+								list[goods].num = num;
+								list[goods].total_money = money;
+
+								totalNum += num;
+								totalMoney += money;
+
+							}
+						}
+
+						this.commit('setCartList', list);
+
+						this.commit('setCartIds', ids);
+
+						this.commit('setCartNumber', totalNum);
+
+						this.commit('setCartMoney', totalMoney);
+
+					}
+				}
+			});
+		},
+		// 清空购物车 ns-goods-sku-index组件中引用
+		emptyCart() {
+			this.commit('setCartList', {});
+			this.commit('setCartIds', []);
+			this.commit('setCartNumber', 0);
+			this.commit('setCartMoney', 0);
+		},
+		// 计算购物车数量、价格
+		cartCalculate() {
+
+			let ids = [];
+			let totalMoney = 0;
+			let totalNum = 0;
+
+			for (let k in this.state.cartList) {
+				let item = this.state.cartList[k];
+
+				let num = 0;
+				let money = 0;
+				for (let sku in item) {
+					if (typeof item[sku] == 'object') {
+						num += item[sku].num;
+						money += parseFloat(item[sku].discount_price) * parseInt(item[sku].num);
+						ids.push(item[sku].cart_id);
+					}
+				}
+				item.num = num;
+				item.total_money = money;
+
+				totalNum += num;
+				totalMoney += money;
+
+			}
+
+			this.commit('setCartNumber', totalNum);
+
+			this.commit('setCartMoney', totalMoney);
+
+			this.commit('setCartIds', ids);
+
+		}
+	}
+})
+export default store
\ No newline at end of file
diff --git a/uni.scss b/uni.scss
new file mode 100644
index 0000000..bd9cf10
--- /dev/null
+++ b/uni.scss
@@ -0,0 +1,32 @@
+/**
+ * 你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
+ * 建议使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
+ */
+
+//主色调，红色：#FF0036，绿色 #4CAF50，蓝色：#03A9F4，黄色：#FF9800，粉色：#FF547B，棕色：#C3A769，浅绿色：#65C4AA，黑色：#333333，紫色：#B323B4，淡粉色：#FF8B8B
+
+// 颜色
+$color-title: #303133; // 主标题
+$color-sub: #606266; // 副标题
+$color-tip: #909399; // 辅助提示色
+$color-bg: #f8f8f8; // 背景色
+$color-line: #eeeeee; //分割线
+$color-disabled: #cccccc; // 禁用色
+
+// 文字
+$font-size-base: 28rpx; // 14px，正文文字
+$font-size-toolbar: 32rpx; // 16px，用于导航栏、标题
+$font-size-sub: 26rpx; // 13px，副标题
+$font-size-tag: 24rpx; // 12px，辅助性文字/大标签
+$font-size-goods-tag: 22rpx; // 11px，商品列表角标
+$font-size-activity-tag: 20rpx; // 10px，活动角标（拼团等角标）/小标签文字
+
+$margin-both: 30rpx; //外边距 左右
+$margin-updown: 20rpx; // 外边距 上下
+$border-radius: 10rpx; //圆角
+$padding: 20rpx; //内边距
+
+$base-color: var(--base-color); // 主色调
+$base-help-color: var(--base-help-color); //辅助颜色
+
+$goods-price-color: var(--goods-price-color);
diff --git a/uni_modules/mp-html/README.md b/uni_modules/mp-html/README.md
new file mode 100644
index 0000000..7626289
--- /dev/null
+++ b/uni_modules/mp-html/README.md
@@ -0,0 +1,194 @@
+## 为减小组件包的大小，默认组件包中不包含编辑、latex 公式等扩展功能，需要使用扩展功能的请参考下方的 插件扩展 栏的说明
+
+## 功能介绍
+- 全端支持（含 `v3、NVUE`）
+- 支持丰富的标签（包括 `table`、`video`、`svg` 等）
+- 支持丰富的事件效果（自动预览图片、链接处理等）
+- 支持设置占位图（加载中、出错时、预览时）
+- 支持锚点跳转、长按复制等丰富功能
+- 支持大部分 *html* 实体
+- 丰富的插件（关键词搜索、内容编辑、`latex` 公式等）
+- 效率高、容错性强且轻量化
+
+查看 [功能介绍](https://jin-yufeng.gitee.io/mp-html/#/overview/feature) 了解更多
+
+## 使用方法
+- `uni_modules` 方式  
+  1. 点击右上角的 `使用 HBuilder X 导入插件` 按钮直接导入项目或点击 `下载插件 ZIP` 按钮下载插件包并解压到项目的 `uni_modules/mp-html` 目录下  
+  2. 在需要使用页面的 `(n)vue` 文件中添加  
+     ```html
+     <!-- 不需要引入，可直接使用 -->
+     <mp-html :content="html" />
+     ```
+     ```javascript
+     export default {
+       data() {
+         return {
+           html: '<div>Hello World!</div>'
+         }
+       }
+     }
+     ```
+  3. 需要更新版本时在 `HBuilder X` 中右键 `uni_modules/mp-html` 目录选择 `从插件市场更新` 即可  
+
+- 源码方式  
+  1. 从 [github](https://github.com/jin-yufeng/mp-html/tree/master/dist/uni-app) 或 [gitee](https://gitee.com/jin-yufeng/mp-html/tree/master/dist/uni-app) 下载源码  
+     插件市场的 **非 uni_modules 版本** 无法更新，不建议从插件市场获取  
+  2. 在需要使用页面的 `(n)vue` 文件中添加  
+     ```html
+     <mp-html :content="html" />
+     ```
+     ```javascript
+     import mpHtml from '@/components/mp-html/mp-html'
+     export default {
+       // HBuilderX 2.5.5+ 可以通过 easycom 自动引入
+       components: {
+         mpHtml
+       },
+       data() {
+         return {
+           html: '<div>Hello World!</div>'
+         }
+       }
+     }
+     ```
+
+- npm 方式  
+  1. 在项目根目录下执行  
+     ```bash
+     npm install mp-html
+     ```
+  2. 在需要使用页面的 `(n)vue` 文件中添加  
+     ```html
+     <mp-html :content="html" />
+     ```
+     ```javascript
+     import mpHtml from 'mp-html/dist/uni-app/components/mp-html/mp-html'
+     export default {
+       // 不可省略
+       components: {
+         mpHtml
+       },
+       data() {
+         return {
+           html: '<div>Hello World!</div>'
+         }
+       }
+     }
+     ```
+  3. 需要更新版本时执行以下命令即可  
+     ```bash
+     npm update mp-html
+     ```
+  
+  使用 *cli* 方式运行的项目，通过 *npm* 方式引入时，需要在 *vue.config.js* 中配置 *transpileDependencies*，详情可见 [#330](https://github.com/jin-yufeng/mp-html/issues/330#issuecomment-913617687)  
+  如果在 **nvue** 中使用还要将 `dist/uni-app/static` 目录下的内容拷贝到项目的 `static` 目录下，否则无法运行  
+
+查看 [快速开始](https://jin-yufeng.gitee.io/mp-html/#/overview/quickstart) 了解更多
+
+## 组件属性
+
+| 属性 | 类型 | 默认值 | 说明 |
+|:---:|:---:|:---:|---|
+| container-style | String |  | 容器的样式（[2.1.0+](https://jin-yufeng.gitee.io/mp-html/#/changelog/changelog#v210)） |
+| content | String |  | 用于渲染的 html 字符串 |
+| copy-link | Boolean | true | 是否允许外部链接被点击时自动复制 |
+| domain | String |  | 主域名（用于链接拼接） |
+| error-img | String |  | 图片出错时的占位图链接 |
+| lazy-load | Boolean | false | 是否开启图片懒加载 |
+| loading-img | String |  | 图片加载过程中的占位图链接 |
+| pause-video | Boolean | true | 是否在播放一个视频时自动暂停其他视频 |
+| preview-img | Boolean | true | 是否允许图片被点击时自动预览 |
+| scroll-table | Boolean | false | 是否给每个表格添加一个滚动层使其能单独横向滚动 |
+| selectable | Boolean | false | 是否开启文本长按复制 |
+| set-title | Boolean | true | 是否将 title 标签的内容设置到页面标题 |
+| show-img-menu | Boolean | true | 是否允许图片被长按时显示菜单 |
+| tag-style | Object |  | 设置标签的默认样式 |
+| use-anchor | Boolean | false | 是否使用锚点链接 |
+
+查看 [属性](https://jin-yufeng.gitee.io/mp-html/#/basic/prop) 了解更多
+
+## 组件事件
+
+| 名称 | 触发时机 |
+|:---:|---|
+| load | dom 树加载完毕时 |
+| ready | 图片加载完毕时 |
+| error | 发生渲染错误时 |
+| imgtap | 图片被点击时 |
+| linktap | 链接被点击时 |
+| play | 音视频播放时 |
+
+查看 [事件](https://jin-yufeng.gitee.io/mp-html/#/basic/event) 了解更多
+
+## api
+组件实例上提供了一些 `api` 方法可供调用
+
+| 名称 | 作用 |
+|:---:|---|
+| in | 将锚点跳转的范围限定在一个 scroll-view 内 |
+| navigateTo | 锚点跳转 |
+| getText | 获取文本内容 |
+| getRect | 获取富文本内容的位置和大小 |
+| setContent | 设置富文本内容 |
+| imgList | 获取所有图片的数组 |
+| pauseMedia | 暂停播放音视频（[2.2.2+](https://jin-yufeng.gitee.io/mp-html/#/changelog/changelog#v222)） |
+| setPlaybackRate | 设置音视频播放速率（[2.4.0+](https://jin-yufeng.gitee.io/mp-html/#/changelog/changelog#v240)） |
+
+查看 [api](https://jin-yufeng.gitee.io/mp-html/#/advanced/api) 了解更多
+
+## 插件扩展  
+除基本功能外，本组件还提供了丰富的扩展，可按照需要选用
+
+| 名称 | 作用 |
+|:---:|---|
+| audio | 音乐播放器 |
+| editable | 富文本 **编辑**（[示例项目](https://mp-html.oss-cn-hangzhou.aliyuncs.com/editable.zip)） |
+| emoji | 解析 emoji |
+| highlight | 代码块高亮显示 |
+| markdown | 渲染 markdown |
+| search | 关键词搜索 |
+| style | 匹配 style 标签中的样式 |
+| txv-video | 使用腾讯视频 |
+| img-cache | 图片缓存 by [@PentaTea](https://github.com/PentaTea) |
+| latex | 渲染 latex 公式 by [@Zeng-J](https://github.com/Zeng-J) |
+
+从插件市场导入的包中 **不含有** 扩展插件，使用插件需通过微信小程序 `富文本插件` 获取或参考以下方法进行打包：  
+1. 获取完整组件包  
+   ```bash
+   npm install mp-html
+   ```
+2. 编辑 `tools/config.js` 中的 `plugins` 项，选择需要的插件  
+3. 生成新的组件包  
+   在 `node_modules/mp-html` 目录下执行  
+   ```bash
+   npm install
+   npm run build:uni-app
+   ```
+4. 拷贝 `dist/uni-app` 中的内容到项目根目录  
+
+查看 [插件](https://jin-yufeng.gitee.io/mp-html/#/advanced/plugin) 了解更多
+
+## 关于 nvue
+`nvue` 使用原生渲染，不支持部分 `css` 样式，为实现和 `html` 相同的效果，组件内部通过 `web-view` 进行渲染，性能上差于原生，根据 `weex` 官方建议，`web` 标签仅应用在非常规的降级场景。因此，如果通过原生的方式（如 `richtext`）能够满足需要，则不建议使用本组件，如果有较多的富文本内容，则可以直接使用 `vue` 页面  
+由于渲染方式与其他端不同，有以下限制：  
+1. 不支持 `lazy-load` 属性
+2. 视频不支持全屏播放
+3. 如果在 `flex-direction: row` 的容器中使用，需要给组件设置宽度或设置 `flex: 1` 占满剩余宽度
+
+纯 `nvue` 模式下，[此问题](https://ask.dcloud.net.cn/question/119678) 修复前，不支持通过 `uni_modules` 引入，需要本地引入（将 [dist/uni-app](https://github.com/jin-yufeng/mp-html/tree/master/dist/uni-app) 中的内容拷贝到项目根目录下）  
+
+## 立即体验
+![富文本插件](https://mp-html.oss-cn-hangzhou.aliyuncs.com/qrcode.jpg)
+
+## 问题反馈
+遇到问题时，请先查阅 [常见问题](https://jin-yufeng.gitee.io/mp-html/#/question/faq) 和 [issue](https://github.com/jin-yufeng/mp-html/issues) 中是否已有相同的问题  
+可通过 [issue](https://github.com/jin-yufeng/mp-html/issues/new/choose) 、插件问答或发送邮件到 [mp_html@126.com](mailto:mp_html@126.com) 提问，不建议在评论区提问（不方便回复）  
+提问请严格按照 [issue 模板](https://github.com/jin-yufeng/mp-html/issues/new/choose) ，描述清楚使用环境、`html` 内容或可复现的 `demo` 项目以及复现方式，对于 **描述不清**、**无法复现** 或重复的问题将不予回复  
+
+欢迎加入 `QQ` 交流群：  
+群1（已满）：`699734691`  
+群2（已满）：`778239129`  
+群3：`960265313`  
+
+查看 [问题反馈](https://jin-yufeng.gitee.io/mp-html/#/question/feedback) 了解更多
diff --git a/uni_modules/mp-html/changelog.md b/uni_modules/mp-html/changelog.md
new file mode 100644
index 0000000..6fd03eb
--- /dev/null
+++ b/uni_modules/mp-html/changelog.md
@@ -0,0 +1,150 @@
+## v2.5.0（2024-04-22）
+1. `U` `play` 事件增加返回 `src` 等信息 [详细](https://github.com/jin-yufeng/mp-html/issues/526)
+2. `U` `preview-img` 属性支持设置为 `all` 开启 `base64` 图片预览 [详细](https://github.com/jin-yufeng/mp-html/issues/536)
+3. `U` `editable` 插件增加简易模式（点击文字直接编辑）
+4. `U` `latex` 插件支持块级公式 [详细](https://github.com/jin-yufeng/mp-html/issues/582)
+5. `F` 修复了表格部分情况下背景丢失的问题 [详细](https://github.com/jin-yufeng/mp-html/issues/587)
+6. `F` 修复了部分 `svg` 无法显示的问题 [详细](https://github.com/jin-yufeng/mp-html/issues/591)
+7. `F` 修复了 `h5` 和 `app` 端部分情况下样式无法识别的问题 [详细](https://github.com/jin-yufeng/mp-html/issues/518)
+8. `F` 修复了 `latex` 插件部分情况下显示不正确的问题 [详细](https://github.com/jin-yufeng/mp-html/issues/580)
+9. `F` 修复了 `editable` 插件表格无法删除的问题
+10. `F` 修复了 `editable` 插件 `vue3` `h5` 端点击图片报错的问题
+11. `F` 修复了 `editable` 插件点击表格没有菜单栏的问题
+## v2.4.3（2024-01-21）
+1. `A` 增加 [card](https://jin-yufeng.gitee.io/mp-html/#/advanced/plugin#card) 插件 [详细](https://github.com/jin-yufeng/mp-html/pull/533) by [@whoooami](https://github.com/whoooami)
+2. `F` 修复了 `svg` 中包含 `foreignobject` 可能不显示的问题 [详细](https://github.com/jin-yufeng/mp-html/issues/523)
+3. `F` 修复了合并单元格的表格部分情况下显示不正确的问题 [详细](https://github.com/jin-yufeng/mp-html/issues/561)
+4. `F` 修复了 `img` 标签设置 `object-fit` 无效的问题 [详细](https://github.com/jin-yufeng/mp-html/issues/567)
+5. `F` 修复了 `latex` 插件公式会换行的问题 [详细](https://github.com/jin-yufeng/mp-html/issues/540) 
+6. `F` 修复了 `editable` 和 `audio` 插件共用时点击 `audio` 无法编辑的问题 [详细](https://github.com/jin-yufeng/mp-html/issues/529) by [@whoooami](https://github.com/whoooami)
+7. `F` 修复了微信小程序部分情况下图片会报错 `replace of undefined` 的问题
+8. `F` 修复了快手小程序图片不显示的问题 [详细](https://github.com/jin-yufeng/mp-html/issues/571)
+## v2.4.2（2023-05-14）
+1. `A` `editable` 插件支持修改文字颜色 [详细](https://github.com/jin-yufeng/mp-html/issues/254)
+2. `F` 修复了 `svg` 中有 `style` 不生效的问题 [详细](https://github.com/jin-yufeng/mp-html/issues/505)
+3. `F` 修复了使用旧版编译器可能报错 `Bad attr nodes` 的问题 [详细](https://github.com/jin-yufeng/mp-html/issues/472)
+4. `F` 修复了 `app` 端可能出现无法读取 `lazyLoad` 的问题 [详细](https://github.com/jin-yufeng/mp-html/issues/513)
+5. `F` 修复了 `editable` 插件在点击换图时未拼接 `domain` 的问题 [详细](https://github.com/jin-yufeng/mp-html/pull/497) by [@TwoKe945](https://github.com/TwoKe945)
+6. `F` 修复了 `latex` 插件部分情况下不显示的问题 [详细](https://github.com/jin-yufeng/mp-html/issues/515) 
+7. `F` 修复了 `editable` 插件点击音视频时其他标签框不消失的问题
+## v2.4.1（2022-12-25）
+1. `F` 修复了没有图片时 `ready` 事件可能不触发的问题
+2. `F` 修复了加载过程中可能出现 `Root label not found` 错误的问题 [详细](https://github.com/jin-yufeng/mp-html/issues/470)
+3. `F` 修复了 `audio` 插件退出页面可能会报错的问题 [详细](https://github.com/jin-yufeng/mp-html/issues/457)
+4. `F` 修复了 `vue3` 运行到 `app` 在 `HBuilder X 3.6.10` 以上报错的问题 [详细](https://github.com/jin-yufeng/mp-html/issues/480)
+5. `F` 修复了 `nvue` 端链接中包含 `%22` 时可能无法显示的问题
+6. `F` 修复了 `vue3` 使用 `highlight` 插件可能报错的问题
+## v2.4.0（2022-08-27）
+1. `A` 增加了 [setPlaybackRate](https://jin-yufeng.gitee.io/mp-html/#/advanced/api#setPlaybackRate) 的 `api`，可以设置音视频的播放速率 [详细](https://github.com/jin-yufeng/mp-html/issues/452)
+2. `A` 示例小程序代码开源 [详细](https://github.com/jin-yufeng/mp-html-demo)
+3. `U` 优化 `ready` 事件触发时机，未设置懒加载的情况下基本可以准确触发 [详细](https://github.com/jin-yufeng/mp-html/issues/195)
+4. `U` `highlight` 插件在编辑状态下不进行高亮处理，便于编辑
+5. `F` 修复了 `flex` 布局下图片大小可能不正确的问题
+6. `F` 修复了 `selectable` 属性没有设置 `force` 也可能出现渲染异常的问题
+7. `F` 修复了表格中的图片大小可能不正确的问题 [详细](https://github.com/jin-yufeng/mp-html/issues/448)
+8. `F` 修复了含有合并单元格的表格可能无法设置竖直对齐的问题
+9. `F` 修复了 `editable` 插件在 `scroll-view` 中使用时工具条位置可能不正确的问题
+10. `F` 修复了 `vue3` 使用 [search](advanced/plugin#search) 插件可能导致错误换行的问题 [详细](https://github.com/jin-yufeng/mp-html/issues/449)
+## v2.3.2（2022-08-13）
+1. `A` 增加 [latex](https://jin-yufeng.gitee.io/mp-html/#/advanced/plugin#latex) 插件，可以渲染数学公式 [详细](https://github.com/jin-yufeng/mp-html/pull/447) by [@Zeng-J](https://github.com/Zeng-J)
+2. `U` 优化根节点下有很多标签的长内容渲染速度
+3. `U` `highlight` 插件适配 `lang-xxx` 格式
+4. `F` 修复了 `table` 标签设置 `border` 属性后可能无法修改边框样式的问题 [详细](https://github.com/jin-yufeng/mp-html/pull/439) by [@zouxingjie](https://github.com/zouxingjie)
+5. `F` 修复了 `editable` 插件输入连续空格无效的问题
+6. `F` 修复了 `vue3` 图片设置 `inline` 会报错的问题 [详细](https://github.com/jin-yufeng/mp-html/issues/438)
+7. `F` 修复了 `vue3` 使用 `table` 可能报错的问题
+## v2.3.1（2022-05-20）
+1. `U` `app` 端支持使用本地图片
+2. `U` 优化了微信小程序 `selectable` 属性在 `ios` 端的处理 [详细](https://jin-yufeng.gitee.io/mp-html/#/basic/prop#selectable)
+3. `F` 修复了 `editable` 插件不在顶部时 `tooltip` 位置可能错误的问题 [详细](https://github.com/jin-yufeng/mp-html/issues/430)
+4. `F` 修复了 `vue3` 运行到微信小程序可能报错丢失内容的问题 [详细](https://github.com/jin-yufeng/mp-html/issues/414)
+5. `F` 修复了 `vue3` 部分标签可能被错误换行的问题
+6. `F` 修复了 `editable` 插件 `app` 端插入视频无法预览的问题
+## v2.3.0（2022-04-01）
+1. `A` 增加了 `play` 事件，音视频播放时触发，可用于与页面其他音视频进行互斥播放 [详细](basic/event#play)
+2. `U` `show-img-menu` 属性支持控制预览时是否长按弹出菜单
+3. `U` 优化 `wxs` 处理，提高渲染性能 [详细](https://developers.weixin.qq.com/community/develop/article/doc/0006cc2b204740f601bd43fa25a413)  
+4. `U` `video` 标签支持 `object-fit` 属性
+5. `U` 增加支持一些常用实体编码 [详细](https://github.com/jin-yufeng/mp-html/issues/418)
+6. `F` 修复了图片仅设置高度可能不显示的问题 [详细](https://github.com/jin-yufeng/mp-html/issues/410)
+7. `F` 修复了 `video` 标签高度设置为 `auto` 不显示的问题 [详细](https://github.com/jin-yufeng/mp-html/issues/411)
+8. `F` 修复了使用 `grid` 布局时可能样式错误的问题 [详细](https://github.com/jin-yufeng/mp-html/issues/413)
+9. `F` 修复了含有合并单元格的表格部分情况下显示异常的问题 [详细](https://github.com/jin-yufeng/mp-html/issues/417)
+10. `F` 修复了 `editable` 插件连续插入内容时顺序不正确的问题
+11. `F` 修复了 `uni-app` 包 `vue3` 使用 `audio` 插件报错的问题
+12. `F` 修复了 `uni-app` 包 `highlight` 插件使用自定义的 `prism.min.js` 报错的问题 [详细](https://github.com/jin-yufeng/mp-html/issues/416)
+## v2.2.2（2022-02-26）
+1. `A` 增加了 [pauseMedia](https://jin-yufeng.gitee.io/mp-html/#/advanced/api#pauseMedia) 的 `api`，可用于暂停播放音视频 [详细](https://github.com/jin-yufeng/mp-html/issues/317)
+2. `U` 优化了长内容的加载速度  
+3. `U` 适配 `vue3` [#389](https://github.com/jin-yufeng/mp-html/issues/389)、[#398](https://github.com/jin-yufeng/mp-html/pull/398) by [@zhouhuafei](https://github.com/zhouhuafei)、[#400](https://github.com/jin-yufeng/mp-html/issues/400)
+4. `F` 修复了小程序端图片高度设置为百分比时可能不显示的问题
+5. `F` 修复了 `highlight` 插件部分情况下可能显示不完整的问题 [详细](https://github.com/jin-yufeng/mp-html/issues/403)
+## v2.2.1（2021-12-24）
+1. `A` `editable` 插件增加上下移动标签功能
+2. `U` `editable` 插件支持在文本中间光标处插入内容
+3. `F` 修复了 `nvue` 端设置 `margin` 后可能导致高度不正确的问题
+4. `F` 修复了 `highlight` 插件使用压缩版的 `prism.css` 可能导致背景失效的问题 [详细](https://github.com/jin-yufeng/mp-html/issues/367)
+5. `F` 修复了编辑状态下使用 `emoji` 插件内容为空时可能报错的问题 [详细](https://github.com/jin-yufeng/mp-html/issues/371)
+6. `F` 修复了使用 `editable` 插件后将 `selectable` 属性设置为 `force` 不生效的问题
+## v2.2.0（2021-10-12）
+1. `A` 增加 `customElements` 配置项，便于添加自定义功能性标签 [详细](https://github.com/jin-yufeng/mp-html/issues/350)
+2. `A` `editable` 插件增加切换音视频自动播放状态的功能 [详细](https://github.com/jin-yufeng/mp-html/pull/341) by [@leeseett](https://github.com/leeseett)
+3. `A` `editable` 插件删除媒体标签时触发 `remove` 事件，便于删除已上传的文件
+4. `U` `editable` 插件 `insertImg` 方法支持同时插入多张图片 [详细](https://github.com/jin-yufeng/mp-html/issues/342)
+5. `U` `editable` 插入图片和音视频时支持拼接 `domian` 主域名
+6. `F` 修复了内部链接参数中包含 `://` 时被认为是外部链接的问题 [详细](https://github.com/jin-yufeng/mp-html/issues/356)
+7. `F` 修复了部分 `svg` 标签名或属性名大小写不正确时不生效的问题 [详细](https://github.com/jin-yufeng/mp-html/issues/351)
+8. `F` 修复了 `nvue` 页面运行到非 `app` 平台时可能样式错误的问题
+## v2.1.5（2021-08-13）
+1. `A` 增加支持标签的 `dir` 属性
+2. `F` 修复了 `ruby` 标签文字与拼音没有居中对齐的问题 [详细](https://github.com/jin-yufeng/mp-html/issues/325)
+3. `F` 修复了音视频标签内有 `a` 标签时可能无法播放的问题
+4. `F` 修复了 `externStyle` 中的 `class` 名包含下划线或数字时可能失效的问题 [详细](https://github.com/jin-yufeng/mp-html/issues/326)
+5. `F` 修复了 `h5` 端引入 `externStyle` 可能不生效的问题 [详细](https://github.com/jin-yufeng/mp-html/issues/326)
+## v2.1.4（2021-07-14）
+1. `F` 修复了 `rt` 标签无法设置样式的问题 [详细](https://github.com/jin-yufeng/mp-html/issues/318)
+2. `F` 修复了表格中有单元格同时合并行和列时可能显示不正确的问题
+3. `F` 修复了 `app` 端无法关闭图片长按菜单的问题 [详细](https://github.com/jin-yufeng/mp-html/issues/322)
+4. `F` 修复了 `editable` 插件只能添加图片链接不能修改的问题 [详细](https://github.com/jin-yufeng/mp-html/pull/312) by [@leeseett](https://github.com/leeseett)
+## v2.1.3（2021-06-12）
+1. `A` `editable` 插件增加 `insertTable` 方法
+2. `U` `editable` 插件支持编辑表格中的空白单元格 [详细](https://github.com/jin-yufeng/mp-html/issues/310)
+3. `F` 修复了 `externStyle` 中使用伪类可能失效的问题 [详细](https://github.com/jin-yufeng/mp-html/issues/298)
+4. `F` 修复了多个组件同时使用时 `tag-style` 属性时可能互相影响的问题 [详细](https://github.com/jin-yufeng/mp-html/pull/305) by [@woodguoyu](https://github.com/woodguoyu)
+5. `F` 修复了包含 `linearGradient` 的 `svg` 可能无法显示的问题
+6. `F` 修复了编译到头条小程序时可能报错的问题
+7. `F` 修复了 `nvue` 端不触发 `click` 事件的问题
+8. `F` 修复了 `editable` 插件尾部插入时无法撤销的问题
+9. `F` 修复了 `editable` 插件的 `insertHtml` 方法只能在末尾插入的问题
+10. `F` 修复了 `editable` 插件插入音频不显示的问题
+## v2.1.2（2021-04-24）
+1. `A` 增加了 [img-cache](https://jin-yufeng.gitee.io/mp-html/#/advanced/plugin#img-cache) 插件，可以在 `app` 端缓存图片 [详细](https://github.com/jin-yufeng/mp-html/issues/292) by [@PentaTea](https://github.com/PentaTea)
+2. `U` 支持通过 `container-style` 属性设置 `white-space` 来保留连续空格和换行符 [详细](https://jin-yufeng.gitee.io/mp-html/#/question/faq#space)
+3. `U` 代码风格符合 [standard](https://standardjs.com) 标准
+4. `U` `editable` 插件编辑状态下支持预览视频 [详细](https://github.com/jin-yufeng/mp-html/issues/286)
+5. `F` 修复了 `svg` 标签内嵌 `svg` 时无法显示的问题
+6. `F` 修复了编译到支付宝和头条小程序时部分区域不可复制的问题 [详细](https://github.com/jin-yufeng/mp-html/issues/291)
+## v2.1.1（2021-04-09）
+1. 修复了对 `p` 标签设置 `tag-style` 可能不生效的问题
+2. 修复了 `svg` 标签中的文本无法显示的问题
+3. 修复了使用 `editable` 插件编辑表格时可能报错的问题
+4. 修复了使用 `highlight` 插件运行到头条小程序时可能没有样式的问题 [详细](https://github.com/jin-yufeng/mp-html/issues/280)
+5. 修复了使用 `editable` 插件 `editable` 属性为 `false` 时会报错的问题 [详细](https://github.com/jin-yufeng/mp-html/issues/284)
+6. 修复了 `style` 插件连续子选择器失效的问题
+7. 修复了 `editable` 插件无法修改图片和字体大小的问题
+## v2.1.0.2（2021-03-21）
+修复了 `nvue` 端使用可能报错的问题
+## v2.1.0（2021-03-20）
+1. `A` 增加了 [container-style](https://jin-yufeng.gitee.io/mp-html/#/basic/prop#container-style) 属性 [详细](https://gitee.com/jin-yufeng/mp-html/pulls/1)
+2. `A` 增加支持 `strike` 标签
+3. `A` `editable` 插件增加 `placeholder` 属性 [详细](https://jin-yufeng.gitee.io/mp-html/#/advanced/plugin#editable)
+4. `A` `editable` 插件增加 `insertHtml` 方法 [详细](https://jin-yufeng.gitee.io/mp-html/#/advanced/plugin#editable)
+5. `U` 外部样式支持标签名选择器 [详细](https://jin-yufeng.gitee.io/mp-html/#/overview/quickstart#setting)
+6. `F` 修复了 `nvue` 端部分情况下可能不显示的问题
+## v2.0.5（2021-03-12）
+1. `U` [linktap](https://jin-yufeng.gitee.io/mp-html/#/basic/event#linktap) 事件增加返回内部文本内容 `innerText` [详细](https://github.com/jin-yufeng/mp-html/issues/271)
+2. `U` [selectable](https://jin-yufeng.gitee.io/mp-html/#/basic/prop#selectable) 属性设置为 `force` 时能够在微信 `iOS` 端生效（文本块会变成 `inline-block`） [详细](https://github.com/jin-yufeng/mp-html/issues/267)
+3. `F` 修复了部分情况下竖向无法滚动的问题 [详细](https://github.com/jin-yufeng/mp-html/issues/182)
+4. `F` 修复了多次修改富文本数据时部分内容可能不显示的问题
+5. `F` 修复了 [腾讯视频](https://jin-yufeng.gitee.io/mp-html/#/advanced/plugin#txv-video) 插件可能无法播放的问题 [详细](https://github.com/jin-yufeng/mp-html/issues/265)
+6. `F` 修复了 [highlight](https://jin-yufeng.gitee.io/mp-html/#/advanced/plugin#highlight) 插件没有设置高亮语言时没有应用默认样式的问题 [详细](https://github.com/jin-yufeng/mp-html/issues/276) by [@fuzui](https://github.com/fuzui)
diff --git a/uni_modules/mp-html/components/mp-html/mp-html.vue b/uni_modules/mp-html/components/mp-html/mp-html.vue
new file mode 100644
index 0000000..5d1d36d
--- /dev/null
+++ b/uni_modules/mp-html/components/mp-html/mp-html.vue
@@ -0,0 +1,498 @@
+<template>
+  <view id="_root" :class="(selectable?'_select ':'')+'_root'" :style="containerStyle">
+    <slot v-if="!nodes[0]" />
+    <!-- #ifndef APP-PLUS-NVUE -->
+    <node v-else :childs="nodes" :opts="[lazyLoad,loadingImg,errorImg,showImgMenu,selectable]" name="span" />
+    <!-- #endif -->
+    <!-- #ifdef APP-PLUS-NVUE -->
+    <web-view ref="web" src="/uni_modules/mp-html/static/app-plus/mp-html/local.html" :style="'margin-top:-2px;height:' + height + 'px'" @onPostMessage="_onMessage" />
+    <!-- #endif -->
+  </view>
+</template>
+
+<script>
+/**
+ * mp-html v2.5.0
+ * @description 富文本组件
+ * @tutorial https://github.com/jin-yufeng/mp-html
+ * @property {String} container-style 容器的样式
+ * @property {String} content 用于渲染的 html 字符串
+ * @property {Boolean} copy-link 是否允许外部链接被点击时自动复制
+ * @property {String} domain 主域名，用于拼接链接
+ * @property {String} error-img 图片出错时的占位图链接
+ * @property {Boolean} lazy-load 是否开启图片懒加载
+ * @property {string} loading-img 图片加载过程中的占位图链接
+ * @property {Boolean} pause-video 是否在播放一个视频时自动暂停其他视频
+ * @property {Boolean} preview-img 是否允许图片被点击时自动预览
+ * @property {Boolean} scroll-table 是否给每个表格添加一个滚动层使其能单独横向滚动
+ * @property {Boolean | String} selectable 是否开启长按复制
+ * @property {Boolean} set-title 是否将 title 标签的内容设置到页面标题
+ * @property {Boolean} show-img-menu 是否允许图片被长按时显示菜单
+ * @property {Object} tag-style 标签的默认样式
+ * @property {Boolean | Number} use-anchor 是否使用锚点链接
+ * @event {Function} load dom 结构加载完毕时触发
+ * @event {Function} ready 所有图片加载完毕时触发
+ * @event {Function} imgtap 图片被点击时触发
+ * @event {Function} linktap 链接被点击时触发
+ * @event {Function} play 音视频播放时触发
+ * @event {Function} error 媒体加载出错时触发
+ */
+// #ifndef APP-PLUS-NVUE
+import node from './node/node'
+// #endif
+import Parser from './parser'
+const plugins=[]
+// #ifdef APP-PLUS-NVUE
+const dom = weex.requireModule('dom')
+// #endif
+export default {
+  name: 'mp-html',
+  data () {
+    return {
+      nodes: [],
+      // #ifdef APP-PLUS-NVUE
+      height: 3
+      // #endif
+    }
+  },
+  props: {
+    containerStyle: {
+      type: String,
+      default: ''
+    },
+    content: {
+      type: String,
+      default: ''
+    },
+    copyLink: {
+      type: [Boolean, String],
+      default: true
+    },
+    domain: String,
+    errorImg: {
+      type: String,
+      default: ''
+    },
+    lazyLoad: {
+      type: [Boolean, String],
+      default: false
+    },
+    loadingImg: {
+      type: String,
+      default: ''
+    },
+    pauseVideo: {
+      type: [Boolean, String],
+      default: true
+    },
+    previewImg: {
+      type: [Boolean, String],
+      default: true
+    },
+    scrollTable: [Boolean, String],
+    selectable: [Boolean, String],
+    setTitle: {
+      type: [Boolean, String],
+      default: true
+    },
+    showImgMenu: {
+      type: [Boolean, String],
+      default: true
+    },
+    tagStyle: Object,
+    useAnchor: [Boolean, Number]
+  },
+  // #ifdef VUE3
+  emits: ['load', 'ready', 'imgtap', 'linktap', 'play', 'error'],
+  // #endif
+  // #ifndef APP-PLUS-NVUE
+  components: {
+    node
+  },
+  // #endif
+  watch: {
+    content (content) {
+      this.setContent(content)
+    }
+  },
+  created () {
+    this.plugins = []
+    for (let i = plugins.length; i--;) {
+      this.plugins.push(new plugins[i](this))
+    }
+  },
+  mounted () {
+    if (this.content && !this.nodes.length) {
+      this.setContent(this.content)
+    }
+  },
+  beforeDestroy () {
+    this._hook('onDetached')
+  },
+  methods: {
+    /**
+     * @description 将锚点跳转的范围限定在一个 scroll-view 内
+     * @param {Object} page scroll-view 所在页面的示例
+     * @param {String} selector scroll-view 的选择器
+     * @param {String} scrollTop scroll-view scroll-top 属性绑定的变量名
+     */
+    in (page, selector, scrollTop) {
+      // #ifndef APP-PLUS-NVUE
+      if (page && selector && scrollTop) {
+        this._in = {
+          page,
+          selector,
+          scrollTop
+        }
+      }
+      // #endif
+    },
+
+    /**
+     * @description 锚点跳转
+     * @param {String} id 要跳转的锚点 id
+     * @param {Number} offset 跳转位置的偏移量
+     * @returns {Promise}
+     */
+    navigateTo (id, offset) {
+      return new Promise((resolve, reject) => {
+        if (!this.useAnchor) {
+          reject(Error('Anchor is disabled'))
+          return
+        }
+        offset = offset || parseInt(this.useAnchor) || 0
+        // #ifdef APP-PLUS-NVUE
+        if (!id) {
+          dom.scrollToElement(this.$refs.web, {
+            offset
+          })
+          resolve()
+        } else {
+          this._navigateTo = {
+            resolve,
+            reject,
+            offset
+          }
+          this.$refs.web.evalJs('uni.postMessage({data:{action:"getOffset",offset:(document.getElementById(' + id + ')||{}).offsetTop}})')
+        }
+        // #endif
+        // #ifndef APP-PLUS-NVUE
+        let deep = ' '
+        // #ifdef MP-WEIXIN || MP-QQ || MP-TOUTIAO
+        deep = '>>>'
+        // #endif
+        const selector = uni.createSelectorQuery()
+          // #ifndef MP-ALIPAY
+          .in(this._in ? this._in.page : this)
+          // #endif
+          .select((this._in ? this._in.selector : '._root') + (id ? `${deep}#${id}` : '')).boundingClientRect()
+        if (this._in) {
+          selector.select(this._in.selector).scrollOffset()
+            .select(this._in.selector).boundingClientRect()
+        } else {
+          // 获取 scroll-view 的位置和滚动距离
+          selector.selectViewport().scrollOffset() // 获取窗口的滚动距离
+        }
+        selector.exec(res => {
+          if (!res[0]) {
+            reject(Error('Label not found'))
+            return
+          }
+          const scrollTop = res[1].scrollTop + res[0].top - (res[2] ? res[2].top : 0) + offset
+          if (this._in) {
+            // scroll-view 跳转
+            this._in.page[this._in.scrollTop] = scrollTop
+          } else {
+            // 页面跳转
+            uni.pageScrollTo({
+              scrollTop,
+              duration: 300
+            })
+          }
+          resolve()
+        })
+        // #endif
+      })
+    },
+
+    /**
+     * @description 获取文本内容
+     * @return {String}
+     */
+    getText (nodes) {
+      let text = '';
+      (function traversal (nodes) {
+        for (let i = 0; i < nodes.length; i++) {
+          const node = nodes[i]
+          if (node.type === 'text') {
+            text += node.text.replace(/&amp;/g, '&')
+          } else if (node.name === 'br') {
+            text += '\n'
+          } else {
+            // 块级标签前后加换行
+            const isBlock = node.name === 'p' || node.name === 'div' || node.name === 'tr' || node.name === 'li' || (node.name[0] === 'h' && node.name[1] > '0' && node.name[1] < '7')
+            if (isBlock && text && text[text.length - 1] !== '\n') {
+              text += '\n'
+            }
+            // 递归获取子节点的文本
+            if (node.children) {
+              traversal(node.children)
+            }
+            if (isBlock && text[text.length - 1] !== '\n') {
+              text += '\n'
+            } else if (node.name === 'td' || node.name === 'th') {
+              text += '\t'
+            }
+          }
+        }
+      })(nodes || this.nodes)
+      return text
+    },
+
+    /**
+     * @description 获取内容大小和位置
+     * @return {Promise}
+     */
+    getRect () {
+      return new Promise((resolve, reject) => {
+        uni.createSelectorQuery()
+          // #ifndef MP-ALIPAY
+          .in(this)
+          // #endif
+          .select('#_root').boundingClientRect().exec(res => res[0] ? resolve(res[0]) : reject(Error('Root label not found')))
+      })
+    },
+
+    /**
+     * @description 暂停播放媒体
+     */
+    pauseMedia () {
+      for (let i = (this._videos || []).length; i--;) {
+        this._videos[i].pause()
+      }
+      // #ifdef APP-PLUS
+      const command = 'for(var e=document.getElementsByTagName("video"),i=e.length;i--;)e[i].pause()'
+      // #ifndef APP-PLUS-NVUE
+      let page = this.$parent
+      while (!page.$scope) page = page.$parent
+      page.$scope.$getAppWebview().evalJS(command)
+      // #endif
+      // #ifdef APP-PLUS-NVUE
+      this.$refs.web.evalJs(command)
+      // #endif
+      // #endif
+    },
+
+    /**
+     * @description 设置媒体播放速率
+     * @param {Number} rate 播放速率
+     */
+    setPlaybackRate (rate) {
+      this.playbackRate = rate
+      for (let i = (this._videos || []).length; i--;) {
+        this._videos[i].playbackRate(rate)
+      }
+      // #ifdef APP-PLUS
+      const command = 'for(var e=document.getElementsByTagName("video"),i=e.length;i--;)e[i].playbackRate=' + rate
+      // #ifndef APP-PLUS-NVUE
+      let page = this.$parent
+      while (!page.$scope) page = page.$parent
+      page.$scope.$getAppWebview().evalJS(command)
+      // #endif
+      // #ifdef APP-PLUS-NVUE
+      this.$refs.web.evalJs(command)
+      // #endif
+      // #endif
+    },
+
+    /**
+     * @description 设置内容
+     * @param {String} content html 内容
+     * @param {Boolean} append 是否在尾部追加
+     */
+    setContent (content, append) {
+      if (!append || !this.imgList) {
+        this.imgList = []
+      }
+      const nodes = new Parser(this).parse(content)
+      // #ifdef APP-PLUS-NVUE
+      if (this._ready) {
+        this._set(nodes, append)
+      }
+      // #endif
+      this.$set(this, 'nodes', append ? (this.nodes || []).concat(nodes) : nodes)
+
+      // #ifndef APP-PLUS-NVUE
+      this._videos = []
+      this.$nextTick(() => {
+        this._hook('onLoad')
+        this.$emit('load')
+      })
+
+      if (this.lazyLoad || this.imgList._unloadimgs < this.imgList.length / 2) {
+        // 设置懒加载，每 350ms 获取高度，不变则认为加载完毕
+        let height = 0
+        const callback = rect => {
+          if (!rect || !rect.height) rect = {}
+          // 350ms 总高度无变化就触发 ready 事件
+          if (rect.height === height) {
+            this.$emit('ready', rect)
+          } else {
+            height = rect.height
+            setTimeout(() => {
+              this.getRect().then(callback).catch(callback)
+            }, 350)
+          }
+        }
+        this.getRect().then(callback).catch(callback)
+      } else {
+        // 未设置懒加载，等待所有图片加载完毕
+        if (!this.imgList._unloadimgs) {
+          this.getRect().then(rect => {
+            this.$emit('ready', rect)
+          }).catch(() => {
+            this.$emit('ready', {})
+          })
+        }
+      }
+      // #endif
+    },
+
+    /**
+     * @description 调用插件钩子函数
+     */
+    _hook (name) {
+      for (let i = plugins.length; i--;) {
+        if (this.plugins[i][name]) {
+          this.plugins[i][name]()
+        }
+      }
+    },
+
+    // #ifdef APP-PLUS-NVUE
+    /**
+     * @description 设置内容
+     */
+    _set (nodes, append) {
+      this.$refs.web.evalJs('setContent(' + JSON.stringify(nodes).replace(/%22/g, '') + ',' + JSON.stringify([this.containerStyle.replace(/(?:margin|padding)[^;]+/g, ''), this.errorImg, this.loadingImg, this.pauseVideo, this.scrollTable, this.selectable]) + ',' + append + ')')
+    },
+
+    /**
+     * @description 接收到 web-view 消息
+     */
+    _onMessage (e) {
+      const message = e.detail.data[0]
+      switch (message.action) {
+        // web-view 初始化完毕
+        case 'onJSBridgeReady':
+          this._ready = true
+          if (this.nodes) {
+            this._set(this.nodes)
+          }
+          break
+        // 内容 dom 加载完毕
+        case 'onLoad':
+          this.height = message.height
+          this._hook('onLoad')
+          this.$emit('load')
+          break
+        // 所有图片加载完毕
+        case 'onReady':
+          this.getRect().then(res => {
+            this.$emit('ready', res)
+          }).catch(() => {
+            this.$emit('ready', {})
+          })
+          break
+        // 总高度发生变化
+        case 'onHeightChange':
+          this.height = message.height
+          break
+        // 图片点击
+        case 'onImgTap':
+          this.$emit('imgtap', message.attrs)
+          if (this.previewImg) {
+            uni.previewImage({
+              current: parseInt(message.attrs.i),
+              urls: this.imgList
+            })
+          }
+          break
+        // 链接点击
+        case 'onLinkTap': {
+          const href = message.attrs.href
+          this.$emit('linktap', message.attrs)
+          if (href) {
+            // 锚点跳转
+            if (href[0] === '#') {
+              if (this.useAnchor) {
+                dom.scrollToElement(this.$refs.web, {
+                  offset: message.offset
+                })
+              }
+            } else if (href.includes('://')) {
+              // 打开外链
+              if (this.copyLink) {
+                plus.runtime.openWeb(href)
+              }
+            } else {
+              uni.navigateTo({
+                url: href,
+                fail () {
+                  uni.switchTab({
+                    url: href
+                  })
+                }
+              })
+            }
+          }
+          break
+        }
+        case 'onPlay':
+          this.$emit('play')
+          break
+        // 获取到锚点的偏移量
+        case 'getOffset':
+          if (typeof message.offset === 'number') {
+            dom.scrollToElement(this.$refs.web, {
+              offset: message.offset + this._navigateTo.offset
+            })
+            this._navigateTo.resolve()
+          } else {
+            this._navigateTo.reject(Error('Label not found'))
+          }
+          break
+        // 点击
+        case 'onClick':
+          this.$emit('tap')
+          this.$emit('click')
+          break
+        // 出错
+        case 'onError':
+          this.$emit('error', {
+            source: message.source,
+            attrs: message.attrs
+          })
+      }
+    }
+    // #endif
+  }
+}
+</script>
+
+<style>
+/* #ifndef APP-PLUS-NVUE */
+/* 根节点样式 */
+._root {
+  padding: 1px 0;
+  overflow-x: auto;
+  overflow-y: hidden;
+  -webkit-overflow-scrolling: touch;
+}
+
+/* 长按复制 */
+._select {
+  user-select: text;
+}
+/* #endif */
+</style>
diff --git a/uni_modules/mp-html/components/mp-html/node/node.vue b/uni_modules/mp-html/components/mp-html/node/node.vue
new file mode 100644
index 0000000..09252fd
--- /dev/null
+++ b/uni_modules/mp-html/components/mp-html/node/node.vue
@@ -0,0 +1,587 @@
+<template>
+  <view :id="attrs.id" :class="'_block _'+name+' '+attrs.class" :style="attrs.style">
+    <block v-for="(n, i) in childs" v-bind:key="i">
+      <!-- 图片 -->
+      <!-- 占位图 -->
+      <image v-if="n.name==='img'&&!n.t&&((opts[1]&&!ctrl[i])||ctrl[i]<0)" class="_img" :style="n.attrs.style" :src="ctrl[i]<0?opts[2]:opts[1]" mode="widthFix" />
+      <!-- 显示图片 -->
+      <!-- #ifdef H5 || (APP-PLUS && VUE2) -->
+      <img v-if="n.name==='img'" :id="n.attrs.id" :class="'_img '+n.attrs.class" :style="(ctrl[i]===-1?'display:none;':'')+n.attrs.style" :src="n.attrs.src||(ctrl.load?n.attrs['data-src']:'')" :data-i="i" @load="imgLoad" @error="mediaError" @tap.stop="imgTap" @longpress="imgLongTap" />
+      <!-- #endif -->
+      <!-- #ifndef H5 || (APP-PLUS && VUE2) -->
+      <!-- 表格中的图片，使用 rich-text 防止大小不正确 -->
+      <rich-text v-if="n.name==='img'&&n.t" :style="'display:'+n.t" :nodes="[{attrs:{style:n.attrs.style||'',src:n.attrs.src},name:'img'}]" :data-i="i" @tap.stop="imgTap" />
+      <!-- #endif -->
+      <!-- #ifndef H5 || APP-PLUS || MP-KUAISHOU -->
+      <image v-else-if="n.name==='img'" :id="n.attrs.id" :class="'_img '+n.attrs.class" :style="(ctrl[i]===-1?'display:none;':'')+'width:'+(ctrl[i]||1)+'px;height:1px;'+n.attrs.style" :src="n.attrs.src" :mode="!n.h?'widthFix':(!n.w?'heightFix':(n.m||'scaleToFill'))" :lazy-load="opts[0]" :webp="n.webp" :show-menu-by-longpress="opts[3]&&!n.attrs.ignore" :image-menu-prevent="!opts[3]||n.attrs.ignore" :data-i="i" @load="imgLoad" @error="mediaError" @tap.stop="imgTap" @longpress="imgLongTap" />
+      <!-- #endif -->
+      <!-- #ifdef MP-KUAISHOU -->
+      <image v-else-if="n.name==='img'" :id="n.attrs.id" :class="'_img '+n.attrs.class" :style="(ctrl[i]===-1?'display:none;':'')+n.attrs.style" :src="n.attrs.src" :lazy-load="opts[0]" :data-i="i" @load="imgLoad" @error="mediaError" @tap.stop="imgTap"></image>
+      <!-- #endif -->
+      <!-- #ifdef APP-PLUS && VUE3 -->
+      <image v-else-if="n.name==='img'" :id="n.attrs.id" :class="'_img '+n.attrs.class" :style="(ctrl[i]===-1?'display:none;':'')+'width:'+(ctrl[i]||1)+'px;'+n.attrs.style" :src="n.attrs.src||(ctrl.load?n.attrs['data-src']:'')" :mode="!n.h?'widthFix':(!n.w?'heightFix':(n.m||''))" :data-i="i" @load="imgLoad" @error="mediaError" @tap.stop="imgTap" @longpress="imgLongTap" />
+      <!-- #endif -->
+      <!-- 文本 -->
+      <!-- #ifdef MP-WEIXIN -->
+      <text v-else-if="n.text" :user-select="opts[4]=='force'&&isiOS" decode>{{n.text}}</text>
+      <!-- #endif -->
+      <!-- #ifndef MP-WEIXIN || MP-BAIDU || MP-ALIPAY || MP-TOUTIAO -->
+      <text v-else-if="n.text" decode>{{n.text}}</text>
+      <!-- #endif -->
+      <text v-else-if="n.name==='br'">\n</text>
+      <!-- 链接 -->
+      <view v-else-if="n.name==='a'" :id="n.attrs.id" :class="(n.attrs.href?'_a ':'')+n.attrs.class" hover-class="_hover" :style="'display:inline;'+n.attrs.style" :data-i="i" @tap.stop="linkTap">
+        <node name="span" :childs="n.children" :opts="opts" style="display:inherit" />
+      </view>
+      <!-- 视频 -->
+      <!-- #ifdef APP-PLUS -->
+      <view v-else-if="n.html" :id="n.attrs.id" :class="'_video '+n.attrs.class" :style="n.attrs.style" v-html="n.html" @vplay.stop="play" />
+      <!-- #endif -->
+      <!-- #ifndef APP-PLUS -->
+      <video v-else-if="n.name==='video'" :id="n.attrs.id" :class="n.attrs.class" :style="n.attrs.style" :autoplay="n.attrs.autoplay" :controls="n.attrs.controls" :loop="n.attrs.loop" :muted="n.attrs.muted" :object-fit="n.attrs['object-fit']" :poster="n.attrs.poster" :src="n.src[ctrl[i]||0]" :data-i="i" @play="play" @error="mediaError" />
+      <!-- #endif -->
+      <!-- #ifdef H5 || APP-PLUS -->
+      <iframe v-else-if="n.name==='iframe'" :style="n.attrs.style" :allowfullscreen="n.attrs.allowfullscreen" :frameborder="n.attrs.frameborder" :src="n.attrs.src" />
+      <embed v-else-if="n.name==='embed'" :style="n.attrs.style" :src="n.attrs.src" />
+      <!-- #endif -->
+      <!-- #ifndef MP-TOUTIAO || ((H5 || APP-PLUS) && VUE3) -->
+      <!-- 音频 -->
+      <audio v-else-if="n.name==='audio'" :id="n.attrs.id" :class="n.attrs.class" :style="n.attrs.style" :author="n.attrs.author" :controls="n.attrs.controls" :loop="n.attrs.loop" :name="n.attrs.name" :poster="n.attrs.poster" :src="n.src[ctrl[i]||0]" :data-i="i" @play="play" @error="mediaError" />
+      <!-- #endif -->
+      <view v-else-if="(n.name==='table'&&n.c)||n.name==='li'" :id="n.attrs.id" :class="'_'+n.name+' '+n.attrs.class" :style="n.attrs.style">
+        <node v-if="n.name==='li'" :childs="n.children" :opts="opts" />
+        <view v-else v-for="(tbody, x) in n.children" v-bind:key="x" :class="'_'+tbody.name+' '+tbody.attrs.class" :style="tbody.attrs.style">
+          <node v-if="tbody.name==='td'||tbody.name==='th'" :childs="tbody.children" :opts="opts" />
+          <block v-else v-for="(tr, y) in tbody.children" v-bind:key="y">
+            <view v-if="tr.name==='td'||tr.name==='th'" :class="'_'+tr.name+' '+tr.attrs.class" :style="tr.attrs.style">
+              <node :childs="tr.children" :opts="opts" />
+            </view>
+            <view v-else :class="'_'+tr.name+' '+tr.attrs.class" :style="tr.attrs.style">
+              <view v-for="(td, z) in tr.children" v-bind:key="z" :class="'_'+td.name+' '+td.attrs.class" :style="td.attrs.style">
+                <node :childs="td.children" :opts="opts" />
+              </view>
+            </view>
+          </block>
+        </view>
+      </view>
+      
+      <!-- 富文本 -->
+      <!-- #ifdef H5 || ((MP-WEIXIN || MP-QQ || APP-PLUS || MP-360) && VUE2) -->
+      <rich-text v-else-if="!n.c&&!handler.isInline(n.name, n.attrs.style)" :id="n.attrs.id" :style="n.f" :user-select="opts[4]" :nodes="[n]" />
+      <!-- #endif -->
+      <!-- #ifndef H5 || ((MP-WEIXIN || MP-QQ || APP-PLUS || MP-360) && VUE2) -->
+      <rich-text v-else-if="!n.c" :id="n.attrs.id" :style="'display:inline;'+n.f" :preview="false" :selectable="opts[4]" :user-select="opts[4]" :nodes="[n]" />
+      <!-- #endif -->
+      <!-- 继续递归 -->
+      <view v-else-if="n.c===2" :id="n.attrs.id" :class="'_block _'+n.name+' '+n.attrs.class" :style="n.f+';'+n.attrs.style">
+        <node v-for="(n2, j) in n.children" v-bind:key="j" :style="n2.f" :name="n2.name" :attrs="n2.attrs" :childs="n2.children" :opts="opts" />
+      </view>
+      <node v-else :style="n.f" :name="n.name" :attrs="n.attrs" :childs="n.children" :opts="opts" />
+    </block>
+  </view>
+</template>
+<script module="handler" lang="wxs">
+// 行内标签列表
+var inlineTags = {
+  abbr: true,
+  b: true,
+  big: true,
+  code: true,
+  del: true,
+  em: true,
+  i: true,
+  ins: true,
+  label: true,
+  q: true,
+  small: true,
+  span: true,
+  strong: true,
+  sub: true,
+  sup: true
+}
+/**
+ * @description 判断是否为行内标签
+ */
+module.exports = {
+  isInline: function (tagName, style) {
+    return inlineTags[tagName] || (style || '').indexOf('display:inline') !== -1
+  }
+}
+</script>
+<script>
+
+import node from './node'
+export default {
+  name: 'node',
+  options: {
+    // #ifdef MP-WEIXIN
+    virtualHost: true,
+    // #endif
+    // #ifdef MP-TOUTIAO
+    addGlobalClass: false
+    // #endif
+  },
+  data () {
+    return {
+      ctrl: {},
+      // #ifdef MP-WEIXIN
+      isiOS: uni.getSystemInfoSync().system.includes('iOS')
+      // #endif
+    }
+  },
+  props: {
+    name: String,
+    attrs: {
+      type: Object,
+      default () {
+        return {}
+      }
+    },
+    childs: Array,
+    opts: Array
+  },
+  components: {
+
+    // #ifndef (H5 || APP-PLUS) && VUE3
+    node
+    // #endif
+  },
+  mounted () {
+    this.$nextTick(() => {
+      for (this.root = this.$parent; this.root.$options.name !== 'mp-html'; this.root = this.root.$parent);
+    })
+    // #ifdef H5 || APP-PLUS
+    if (this.opts[0]) {
+      let i
+      for (i = this.childs.length; i--;) {
+        if (this.childs[i].name === 'img') break
+      }
+      if (i !== -1) {
+        this.observer = uni.createIntersectionObserver(this).relativeToViewport({
+          top: 500,
+          bottom: 500
+        })
+        this.observer.observe('._img', res => {
+          if (res.intersectionRatio) {
+            this.$set(this.ctrl, 'load', 1)
+            this.observer.disconnect()
+          }
+        })
+      }
+    }
+    // #endif
+  },
+  beforeDestroy () {
+    // #ifdef H5 || APP-PLUS
+    if (this.observer) {
+      this.observer.disconnect()
+    }
+    // #endif
+  },
+  methods:{
+    // #ifdef MP-WEIXIN
+    toJSON () { return this },
+    // #endif
+    /**
+     * @description 播放视频事件
+     * @param {Event} e
+     */
+    play (e) {
+      const i = e.currentTarget.dataset.i
+      const node = this.childs[i]
+      this.root.$emit('play', {
+        source: node.name,
+        attrs: {
+          ...node.attrs,
+          src: node.src[this.ctrl[i] || 0]
+        }
+      })
+      // #ifndef APP-PLUS
+      if (this.root.pauseVideo) {
+        let flag = false
+        const id = e.target.id
+        for (let i = this.root._videos.length; i--;) {
+          if (this.root._videos[i].id === id) {
+            flag = true
+          } else {
+            this.root._videos[i].pause() // 自动暂停其他视频
+          }
+        }
+        // 将自己加入列表
+        if (!flag) {
+          const ctx = uni.createVideoContext(id
+            // #ifndef MP-BAIDU
+            , this
+            // #endif
+          )
+          ctx.id = id
+          if (this.root.playbackRate) {
+            ctx.playbackRate(this.root.playbackRate)
+          }
+          this.root._videos.push(ctx)
+        }
+      }
+      // #endif
+    },
+
+    /**
+     * @description 图片点击事件
+     * @param {Event} e
+     */
+    imgTap (e) {
+      const node = this.childs[e.currentTarget.dataset.i]
+      if (node.a) {
+        this.linkTap(node.a)
+        return
+      }
+      if (node.attrs.ignore) return
+      // #ifdef H5 || APP-PLUS
+      node.attrs.src = node.attrs.src || node.attrs['data-src']
+      // #endif
+      this.root.$emit('imgtap', node.attrs)
+      // 自动预览图片
+      if (this.root.previewImg) {
+        uni.previewImage({
+          // #ifdef MP-WEIXIN
+          showmenu: this.root.showImgMenu,
+          // #endif
+          // #ifdef MP-ALIPAY
+          enablesavephoto: this.root.showImgMenu,
+          enableShowPhotoDownload: this.root.showImgMenu,
+          // #endif
+          current: parseInt(node.attrs.i),
+          urls: this.root.imgList
+        })
+      }
+    },
+
+    /**
+     * @description 图片长按
+     */
+    imgLongTap (e) {
+      // #ifdef APP-PLUS
+      const attrs = this.childs[e.currentTarget.dataset.i].attrs
+      if (this.opts[3] && !attrs.ignore) {
+        uni.showActionSheet({
+          itemList: ['保存图片'],
+          success: () => {
+            const save = path => {
+              uni.saveImageToPhotosAlbum({
+                filePath: path,
+                success () {
+                  uni.showToast({
+                    title: '保存成功'
+                  })
+                }
+              })
+            }
+            if (this.root.imgList[attrs.i].startsWith('http')) {
+              uni.downloadFile({
+                url: this.root.imgList[attrs.i],
+                success: res => save(res.tempFilePath)
+              })
+            } else {
+              save(this.root.imgList[attrs.i])
+            }
+          }
+        })
+      }
+      // #endif
+    },
+
+    /**
+     * @description 图片加载完成事件
+     * @param {Event} e
+     */
+    imgLoad (e) {
+      const i = e.currentTarget.dataset.i
+      /* #ifndef H5 || (APP-PLUS && VUE2) */
+      if (!this.childs[i].w) {
+        // 设置原宽度
+        this.$set(this.ctrl, i, e.detail.width)
+      } else /* #endif */ if ((this.opts[1] && !this.ctrl[i]) || this.ctrl[i] === -1) {
+        // 加载完毕，取消加载中占位图
+        this.$set(this.ctrl, i, 1)
+      }
+      this.checkReady()
+    },
+
+    /**
+     * @description 检查是否所有图片加载完毕
+     */
+    checkReady () {
+      if (this.root && !this.root.lazyLoad) {
+        this.root._unloadimgs -= 1
+        if (!this.root._unloadimgs) {
+          setTimeout(() => {
+            this.root.getRect().then(rect => {
+              this.root.$emit('ready', rect)
+            }).catch(() => {
+              this.root.$emit('ready', {})
+            })
+          }, 350)
+        }
+      }
+    },
+
+    /**
+     * @description 链接点击事件
+     * @param {Event} e
+     */
+    linkTap (e) {
+      const node = e.currentTarget ? this.childs[e.currentTarget.dataset.i] : {}
+      const attrs = node.attrs || e
+      const href = attrs.href
+      this.root.$emit('linktap', Object.assign({
+        innerText: this.root.getText(node.children || []) // 链接内的文本内容
+      }, attrs))
+      if (href) {
+        if (href[0] === '#') {
+          // 跳转锚点
+          this.root.navigateTo(href.substring(1)).catch(() => { })
+        } else if (href.split('?')[0].includes('://')) {
+          // 复制外部链接
+          if (this.root.copyLink) {
+            // #ifdef H5
+            window.open(href)
+            // #endif
+            // #ifdef MP
+            uni.setClipboardData({
+              data: href,
+              success: () =>
+                uni.showToast({
+                  title: '链接已复制'
+                })
+            })
+            // #endif
+            // #ifdef APP-PLUS
+            plus.runtime.openWeb(href)
+            // #endif
+          }
+        } else {
+          // 跳转页面
+          uni.navigateTo({
+            url: href,
+            fail () {
+              uni.switchTab({
+                url: href,
+                fail () { }
+              })
+            }
+          })
+        }
+      }
+    },
+
+    /**
+     * @description 错误事件
+     * @param {Event} e
+     */
+    mediaError (e) {
+      const i = e.currentTarget.dataset.i
+      const node = this.childs[i]
+      // 加载其他源
+      if (node.name === 'video' || node.name === 'audio') {
+        let index = (this.ctrl[i] || 0) + 1
+        if (index > node.src.length) {
+          index = 0
+        }
+        if (index < node.src.length) {
+          this.$set(this.ctrl, i, index)
+          return
+        }
+      } else if (node.name === 'img') {
+        // #ifdef H5 && VUE3
+        if (this.opts[0] && !this.ctrl.load) return
+        // #endif
+        // 显示错误占位图
+        if (this.opts[2]) {
+          this.$set(this.ctrl, i, -1)
+        }
+        this.checkReady()
+      }
+      if (this.root) {
+        this.root.$emit('error', {
+          source: node.name,
+          attrs: node.attrs,
+          // #ifndef H5 && VUE3
+          errMsg: e.detail.errMsg
+          // #endif
+        })
+      }
+    }
+  }
+}
+</script>
+<style>
+/* a 标签默认效果 */
+._a {
+  padding: 1.5px 0 1.5px 0;
+  color: #366092;
+  word-break: break-all;
+}
+
+/* a 标签点击态效果 */
+._hover {
+  text-decoration: underline;
+  opacity: 0.7;
+}
+
+/* 图片默认效果 */
+._img {
+  max-width: 100%;
+  -webkit-touch-callout: none;
+}
+
+/* 内部样式 */
+
+._block {
+  display: block;
+}
+
+._b,
+._strong {
+  font-weight: bold;
+}
+
+._code {
+  font-family: monospace;
+}
+
+._del {
+  text-decoration: line-through;
+}
+
+._em,
+._i {
+  font-style: italic;
+}
+
+._h1 {
+  font-size: 2em;
+}
+
+._h2 {
+  font-size: 1.5em;
+}
+
+._h3 {
+  font-size: 1.17em;
+}
+
+._h5 {
+  font-size: 0.83em;
+}
+
+._h6 {
+  font-size: 0.67em;
+}
+
+._h1,
+._h2,
+._h3,
+._h4,
+._h5,
+._h6 {
+  display: block;
+  font-weight: bold;
+}
+
+._image {
+  height: 1px;
+}
+
+._ins {
+  text-decoration: underline;
+}
+
+._li {
+  display: list-item;
+}
+
+._ol {
+  list-style-type: decimal;
+}
+
+._ol,
+._ul {
+  display: block;
+  padding-left: 40px;
+  margin: 1em 0;
+}
+
+._q::before {
+  content: '"';
+}
+
+._q::after {
+  content: '"';
+}
+
+._sub {
+  font-size: smaller;
+  vertical-align: sub;
+}
+
+._sup {
+  font-size: smaller;
+  vertical-align: super;
+}
+
+._thead,
+._tbody,
+._tfoot {
+  display: table-row-group;
+}
+
+._tr {
+  display: table-row;
+}
+
+._td,
+._th {
+  display: table-cell;
+  vertical-align: middle;
+}
+
+._th {
+  font-weight: bold;
+  text-align: center;
+}
+
+._ul {
+  list-style-type: disc;
+}
+
+._ul ._ul {
+  margin: 0;
+  list-style-type: circle;
+}
+
+._ul ._ul ._ul {
+  list-style-type: square;
+}
+
+._abbr,
+._b,
+._code,
+._del,
+._em,
+._i,
+._ins,
+._label,
+._q,
+._span,
+._strong,
+._sub,
+._sup {
+  display: inline;
+}
+
+/* #ifdef APP-PLUS */
+._video {
+  width: 300px;
+  height: 225px;
+}
+/* #endif */
+</style>
\ No newline at end of file
diff --git a/uni_modules/mp-html/components/mp-html/parser.js b/uni_modules/mp-html/components/mp-html/parser.js
new file mode 100644
index 0000000..5a93000
--- /dev/null
+++ b/uni_modules/mp-html/components/mp-html/parser.js
@@ -0,0 +1,1393 @@
+/**
+ * @fileoverview html 解析器
+ */
+
+// 配置
+const config = {
+  // 信任的标签（保持标签名不变）
+  trustTags: makeMap('a,abbr,ad,audio,b,blockquote,br,code,col,colgroup,dd,del,dl,dt,div,em,fieldset,h1,h2,h3,h4,h5,h6,hr,i,img,ins,label,legend,li,ol,p,q,ruby,rt,source,span,strong,sub,sup,table,tbody,td,tfoot,th,thead,tr,title,ul,video'),
+
+  // 块级标签（转为 div，其他的非信任标签转为 span）
+  blockTags: makeMap('address,article,aside,body,caption,center,cite,footer,header,html,nav,pre,section'),
+
+  // #ifdef (MP-WEIXIN || MP-QQ || APP-PLUS || MP-360) && VUE3
+  // 行内标签
+  inlineTags: makeMap('abbr,b,big,code,del,em,i,ins,label,q,small,span,strong,sub,sup'),
+  // #endif
+
+  // 要移除的标签
+  ignoreTags: makeMap('area,base,canvas,embed,frame,head,iframe,input,link,map,meta,param,rp,script,source,style,textarea,title,track,wbr'),
+
+  // 自闭合的标签
+  voidTags: makeMap('area,base,br,col,circle,ellipse,embed,frame,hr,img,input,line,link,meta,param,path,polygon,rect,source,track,use,wbr'),
+
+  // html 实体
+  entities: {
+    lt: '<',
+    gt: '>',
+    quot: '"',
+    apos: "'",
+    ensp: '\u2002',
+    emsp: '\u2003',
+    nbsp: '\xA0',
+    semi: ';',
+    ndash: '–',
+    mdash: '—',
+    middot: '·',
+    lsquo: '‘',
+    rsquo: '’',
+    ldquo: '“',
+    rdquo: '”',
+    bull: '•',
+    hellip: '…',
+    larr: '←',
+    uarr: '↑',
+    rarr: '→',
+    darr: '↓'
+  },
+
+  // 默认的标签样式
+  tagStyle: {
+    // #ifndef APP-PLUS-NVUE
+    address: 'font-style:italic',
+    big: 'display:inline;font-size:1.2em',
+    caption: 'display:table-caption;text-align:center',
+    center: 'text-align:center',
+    cite: 'font-style:italic',
+    dd: 'margin-left:40px',
+    mark: 'background-color:yellow',
+    pre: 'font-family:monospace;white-space:pre',
+    s: 'text-decoration:line-through',
+    small: 'display:inline;font-size:0.8em',
+    strike: 'text-decoration:line-through',
+    u: 'text-decoration:underline'
+    // #endif
+  },
+
+  // svg 大小写对照表
+  svgDict: {
+    animatetransform: 'animateTransform',
+    lineargradient: 'linearGradient',
+    viewbox: 'viewBox',
+    attributename: 'attributeName',
+    repeatcount: 'repeatCount',
+    repeatdur: 'repeatDur',
+    foreignobject: 'foreignObject'
+  }
+}
+const tagSelector={}
+const {
+  windowWidth,
+  // #ifdef MP-WEIXIN
+  system
+  // #endif
+} = uni.getSystemInfoSync()
+const blankChar = makeMap(' ,\r,\n,\t,\f')
+let idIndex = 0
+
+// #ifdef H5 || APP-PLUS
+config.ignoreTags.iframe = undefined
+config.trustTags.iframe = true
+config.ignoreTags.embed = undefined
+config.trustTags.embed = true
+// #endif
+// #ifdef APP-PLUS-NVUE
+config.ignoreTags.source = undefined
+config.ignoreTags.style = undefined
+// #endif
+
+/**
+ * @description 创建 map
+ * @param {String} str 逗号分隔
+ */
+function makeMap (str) {
+  const map = Object.create(null)
+  const list = str.split(',')
+  for (let i = list.length; i--;) {
+    map[list[i]] = true
+  }
+  return map
+}
+
+/**
+ * @description 解码 html 实体
+ * @param {String} str 要解码的字符串
+ * @param {Boolean} amp 要不要解码 &amp;
+ * @returns {String} 解码后的字符串
+ */
+function decodeEntity (str, amp) {
+  let i = str.indexOf('&')
+  while (i !== -1) {
+    const j = str.indexOf(';', i + 3)
+    let code
+    if (j === -1) break
+    if (str[i + 1] === '#') {
+      // &#123; 形式的实体
+      code = parseInt((str[i + 2] === 'x' ? '0' : '') + str.substring(i + 2, j))
+      if (!isNaN(code)) {
+        str = str.substr(0, i) + String.fromCharCode(code) + str.substr(j + 1)
+      }
+    } else {
+      // &nbsp; 形式的实体
+      code = str.substring(i + 1, j)
+      if (config.entities[code] || (code === 'amp' && amp)) {
+        str = str.substr(0, i) + (config.entities[code] || '&') + str.substr(j + 1)
+      }
+    }
+    i = str.indexOf('&', i + 1)
+  }
+  return str
+}
+
+/**
+ * @description 合并多个块级标签，加快长内容渲染
+ * @param {Array} nodes 要合并的标签数组
+ */
+function mergeNodes (nodes) {
+  let i = nodes.length - 1
+  for (let j = i; j >= -1; j--) {
+    if (j === -1 || nodes[j].c || !nodes[j].name || (nodes[j].name !== 'div' && nodes[j].name !== 'p' && nodes[j].name[0] !== 'h') || (nodes[j].attrs.style || '').includes('inline')) {
+      if (i - j >= 5) {
+        nodes.splice(j + 1, i - j, {
+          name: 'div',
+          attrs: {},
+          children: nodes.slice(j + 1, i + 1)
+        })
+      }
+      i = j - 1
+    }
+  }
+}
+
+/**
+ * @description html 解析器
+ * @param {Object} vm 组件实例
+ */
+function Parser (vm) {
+  this.options = vm || {}
+  this.tagStyle = Object.assign({}, config.tagStyle, this.options.tagStyle)
+  this.imgList = vm.imgList || []
+  this.imgList._unloadimgs = 0
+  this.plugins = vm.plugins || []
+  this.attrs = Object.create(null)
+  this.stack = []
+  this.nodes = []
+  this.pre = (this.options.containerStyle || '').includes('white-space') && this.options.containerStyle.includes('pre') ? 2 : 0
+}
+
+/**
+ * @description 执行解析
+ * @param {String} content 要解析的文本
+ */
+Parser.prototype.parse = function (content) {
+  // 插件处理
+  for (let i = this.plugins.length; i--;) {
+    if (this.plugins[i].onUpdate) {
+      content = this.plugins[i].onUpdate(content, config) || content
+    }
+  }
+
+  new Lexer(this).parse(content)
+  // 出栈未闭合的标签
+  while (this.stack.length) {
+    this.popNode()
+  }
+  if (this.nodes.length > 50) {
+    mergeNodes(this.nodes)
+  }
+  return this.nodes
+}
+
+/**
+ * @description 将标签暴露出来（不被 rich-text 包含）
+ */
+Parser.prototype.expose = function () {
+  // #ifndef APP-PLUS-NVUE
+  for (let i = this.stack.length; i--;) {
+    const item = this.stack[i]
+    if (item.c || item.name === 'a' || item.name === 'video' || item.name === 'audio') return
+    item.c = 1
+  }
+  // #endif
+}
+
+/**
+ * @description 处理插件
+ * @param {Object} node 要处理的标签
+ * @returns {Boolean} 是否要移除此标签
+ */
+Parser.prototype.hook = function (node) {
+  for (let i = this.plugins.length; i--;) {
+    if (this.plugins[i].onParse && this.plugins[i].onParse(node, this) === false) {
+      return false
+    }
+  }
+  return true
+}
+
+/**
+ * @description 将链接拼接上主域名
+ * @param {String} url 需要拼接的链接
+ * @returns {String} 拼接后的链接
+ */
+Parser.prototype.getUrl = function (url) {
+  const domain = this.options.domain
+  if (url[0] === '/') {
+    if (url[1] === '/') {
+      // // 开头的补充协议名
+      url = (domain ? domain.split('://')[0] : 'http') + ':' + url
+    } else if (domain) {
+      // 否则补充整个域名
+      url = domain + url
+    } /* #ifdef APP-PLUS */ else {
+      url = plus.io.convertLocalFileSystemURL(url)
+    } /* #endif */
+  } else if (!url.includes('data:') && !url.includes('://')) {
+    if (domain) {
+      url = domain + '/' + url
+    } /* #ifdef APP-PLUS */ else {
+      url = plus.io.convertLocalFileSystemURL(url)
+    } /* #endif */
+  }
+  return url
+}
+
+/**
+ * @description 解析样式表
+ * @param {Object} node 标签
+ * @returns {Object}
+ */
+Parser.prototype.parseStyle = function (node) {
+  const attrs = node.attrs
+  const list = (this.tagStyle[node.name] || '').split(';').concat((attrs.style || '').split(';'))
+  const styleObj = {}
+  let tmp = ''
+
+  if (attrs.id && !this.xml) {
+    // 暴露锚点
+    if (this.options.useAnchor) {
+      this.expose()
+    } else if (node.name !== 'img' && node.name !== 'a' && node.name !== 'video' && node.name !== 'audio') {
+      attrs.id = undefined
+    }
+  }
+
+  // 转换 width 和 height 属性
+  if (attrs.width) {
+    styleObj.width = parseFloat(attrs.width) + (attrs.width.includes('%') ? '%' : 'px')
+    attrs.width = undefined
+  }
+  if (attrs.height) {
+    styleObj.height = parseFloat(attrs.height) + (attrs.height.includes('%') ? '%' : 'px')
+    attrs.height = undefined
+  }
+
+  for (let i = 0, len = list.length; i < len; i++) {
+    const info = list[i].split(':')
+    if (info.length < 2) continue
+    const key = info.shift().trim().toLowerCase()
+    let value = info.join(':').trim()
+    if ((value[0] === '-' && value.lastIndexOf('-') > 0) || value.includes('safe')) {
+      // 兼容性的 css 不压缩
+      tmp += `;${key}:${value}`
+    } else if (!styleObj[key] || value.includes('import') || !styleObj[key].includes('import')) {
+      // 重复的样式进行覆盖
+      if (value.includes('url')) {
+        // 填充链接
+        let j = value.indexOf('(') + 1
+        if (j) {
+          while (value[j] === '"' || value[j] === "'" || blankChar[value[j]]) {
+            j++
+          }
+          value = value.substr(0, j) + this.getUrl(value.substr(j))
+        }
+      } else if (value.includes('rpx')) {
+        // 转换 rpx（rich-text 内部不支持 rpx）
+        value = value.replace(/[0-9.]+\s*rpx/g, $ => parseFloat($) * windowWidth / 750 + 'px')
+      }
+      styleObj[key] = value
+    }
+  }
+
+  node.attrs.style = tmp
+  return styleObj
+}
+
+/**
+ * @description 解析到标签名
+ * @param {String} name 标签名
+ * @private
+ */
+Parser.prototype.onTagName = function (name) {
+  this.tagName = this.xml ? name : name.toLowerCase()
+  if (this.tagName === 'svg') {
+    this.xml = (this.xml || 0) + 1 // svg 标签内大小写敏感
+    config.ignoreTags.style = undefined // svg 标签内 style 可用
+  }
+}
+
+/**
+ * @description 解析到属性名
+ * @param {String} name 属性名
+ * @private
+ */
+Parser.prototype.onAttrName = function (name) {
+  name = this.xml ? name : name.toLowerCase()
+  // #ifdef (VUE3 && (H5 || APP-PLUS)) || APP-PLUS-NVUE
+  if (name.includes('?') || name.includes(';')) {
+    this.attrName = undefined
+    return
+  }
+  // #endif
+  if (name.substr(0, 5) === 'data-') {
+    if (name === 'data-src' && !this.attrs.src) {
+      // data-src 自动转为 src
+      this.attrName = 'src'
+    } else if (this.tagName === 'img' || this.tagName === 'a') {
+      // a 和 img 标签保留 data- 的属性，可以在 imgtap 和 linktap 事件中使用
+      this.attrName = name
+    } else {
+      // 剩余的移除以减小大小
+      this.attrName = undefined
+    }
+  } else {
+    this.attrName = name
+    this.attrs[name] = 'T' // boolean 型属性缺省设置
+  }
+}
+
+/**
+ * @description 解析到属性值
+ * @param {String} val 属性值
+ * @private
+ */
+Parser.prototype.onAttrVal = function (val) {
+  const name = this.attrName || ''
+  if (name === 'style' || name === 'href') {
+    // 部分属性进行实体解码
+    this.attrs[name] = decodeEntity(val, true)
+  } else if (name.includes('src')) {
+    // 拼接主域名
+    this.attrs[name] = this.getUrl(decodeEntity(val, true))
+  } else if (name) {
+    this.attrs[name] = val
+  }
+}
+
+/**
+ * @description 解析到标签开始
+ * @param {Boolean} selfClose 是否有自闭合标识 />
+ * @private
+ */
+Parser.prototype.onOpenTag = function (selfClose) {
+  // 拼装 node
+  const node = Object.create(null)
+  node.name = this.tagName
+  node.attrs = this.attrs
+  // 避免因为自动 diff 使得 type 被设置为 null 导致部分内容不显示
+  if (this.options.nodes.length) {
+    node.type = 'node'
+  }
+  this.attrs = Object.create(null)
+
+  const attrs = node.attrs
+  const parent = this.stack[this.stack.length - 1]
+  const siblings = parent ? parent.children : this.nodes
+  const close = this.xml ? selfClose : config.voidTags[node.name]
+
+  // 替换标签名选择器
+  if (tagSelector[node.name]) {
+    attrs.class = tagSelector[node.name] + (attrs.class ? ' ' + attrs.class : '')
+  }
+
+  // 转换 embed 标签
+  if (node.name === 'embed') {
+    // #ifndef H5 || APP-PLUS
+    const src = attrs.src || ''
+    // 按照后缀名和 type 将 embed 转为 video 或 audio
+    if (src.includes('.mp4') || src.includes('.3gp') || src.includes('.m3u8') || (attrs.type || '').includes('video')) {
+      node.name = 'video'
+    } else if (src.includes('.mp3') || src.includes('.wav') || src.includes('.aac') || src.includes('.m4a') || (attrs.type || '').includes('audio')) {
+      node.name = 'audio'
+    }
+    if (attrs.autostart) {
+      attrs.autoplay = 'T'
+    }
+    attrs.controls = 'T'
+    // #endif
+    // #ifdef H5 || APP-PLUS
+    this.expose()
+    // #endif
+  }
+
+  // #ifndef APP-PLUS-NVUE
+  // 处理音视频
+  if (node.name === 'video' || node.name === 'audio') {
+    // 设置 id 以便获取 context
+    if (node.name === 'video' && !attrs.id) {
+      attrs.id = 'v' + idIndex++
+    }
+    // 没有设置 controls 也没有设置 autoplay 的自动设置 controls
+    if (!attrs.controls && !attrs.autoplay) {
+      attrs.controls = 'T'
+    }
+    // 用数组存储所有可用的 source
+    node.src = []
+    if (attrs.src) {
+      node.src.push(attrs.src)
+      attrs.src = undefined
+    }
+    this.expose()
+  }
+  // #endif
+
+  // 处理自闭合标签
+  if (close) {
+    if (!this.hook(node) || config.ignoreTags[node.name]) {
+      // 通过 base 标签设置主域名
+      if (node.name === 'base' && !this.options.domain) {
+        this.options.domain = attrs.href
+      } /* #ifndef APP-PLUS-NVUE */ else if (node.name === 'source' && parent && (parent.name === 'video' || parent.name === 'audio') && attrs.src) {
+        // 设置 source 标签（仅父节点为 video 或 audio 时有效）
+        parent.src.push(attrs.src)
+      } /* #endif */
+      return
+    }
+
+    // 解析 style
+    const styleObj = this.parseStyle(node)
+
+    // 处理图片
+    if (node.name === 'img') {
+      if (attrs.src) {
+        // 标记 webp
+        if (attrs.src.includes('webp')) {
+          node.webp = 'T'
+        }
+        // data url 图片如果没有设置 original-src 默认为不可预览的小图片
+        if (attrs.src.includes('data:') && this.options.previewImg !== 'all' && !attrs['original-src']) {
+          attrs.ignore = 'T'
+        }
+        if (!attrs.ignore || node.webp || attrs.src.includes('cloud://')) {
+          for (let i = this.stack.length; i--;) {
+            const item = this.stack[i]
+            if (item.name === 'a') {
+              node.a = item.attrs
+            }
+            if (item.name === 'table' && !node.webp && !attrs.src.includes('cloud://')) {
+              if (!styleObj.display || styleObj.display.includes('inline')) {
+                node.t = 'inline-block'
+              } else {
+                node.t = styleObj.display
+              }
+              styleObj.display = undefined
+            }
+            // #ifndef H5 || APP-PLUS
+            const style = item.attrs.style || ''
+            if (style.includes('flex:') && !style.includes('flex:0') && !style.includes('flex: 0') && (!styleObj.width || parseInt(styleObj.width) > 100)) {
+              styleObj.width = '100% !important'
+              styleObj.height = ''
+              for (let j = i + 1; j < this.stack.length; j++) {
+                this.stack[j].attrs.style = (this.stack[j].attrs.style || '').replace('inline-', '')
+              }
+            } else if (style.includes('flex') && styleObj.width === '100%') {
+              for (let j = i + 1; j < this.stack.length; j++) {
+                const style = this.stack[j].attrs.style || ''
+                if (!style.includes(';width') && !style.includes(' width') && style.indexOf('width') !== 0) {
+                  styleObj.width = ''
+                  break
+                }
+              }
+            } else if (style.includes('inline-block')) {
+              if (styleObj.width && styleObj.width[styleObj.width.length - 1] === '%') {
+                item.attrs.style += ';max-width:' + styleObj.width
+                styleObj.width = ''
+              } else {
+                item.attrs.style += ';max-width:100%'
+              }
+            }
+            // #endif
+            item.c = 1
+          }
+          attrs.i = this.imgList.length.toString()
+          let src = attrs['original-src'] || attrs.src
+          // #ifndef H5 || MP-ALIPAY || APP-PLUS || MP-360
+          if (this.imgList.includes(src)) {
+            // 如果有重复的链接则对域名进行随机大小写变换避免预览时错位
+            let i = src.indexOf('://')
+            if (i !== -1) {
+              i += 3
+              let newSrc = src.substr(0, i)
+              for (; i < src.length; i++) {
+                if (src[i] === '/') break
+                newSrc += Math.random() > 0.5 ? src[i].toUpperCase() : src[i]
+              }
+              newSrc += src.substr(i)
+              src = newSrc
+            }
+          }
+          // #endif
+          this.imgList.push(src)
+          if (!node.t) {
+            this.imgList._unloadimgs += 1
+          }
+          // #ifdef H5 || APP-PLUS
+          if (this.options.lazyLoad) {
+            attrs['data-src'] = attrs.src
+            attrs.src = undefined
+          }
+          // #endif
+        }
+      }
+      if (styleObj.display === 'inline') {
+        styleObj.display = ''
+      }
+      // #ifndef APP-PLUS-NVUE
+      if (attrs.ignore) {
+        styleObj['max-width'] = styleObj['max-width'] || '100%'
+        attrs.style += ';-webkit-touch-callout:none'
+      }
+      // #endif
+      // 设置的宽度超出屏幕，为避免变形，高度转为自动
+      if (parseInt(styleObj.width) > windowWidth) {
+        styleObj.height = undefined
+      }
+      // 记录是否设置了宽高
+      if (!isNaN(parseInt(styleObj.width))) {
+        node.w = 'T'
+      }
+      if (!isNaN(parseInt(styleObj.height)) && (!styleObj.height.includes('%') || (parent && (parent.attrs.style || '').includes('height')))) {
+        node.h = 'T'
+      }
+      if (node.w && node.h && styleObj['object-fit']) {
+        if (styleObj['object-fit'] === 'contain') {
+          node.m = 'aspectFit'
+        } else if (styleObj['object-fit'] === 'cover') {
+          node.m = 'aspectFill'
+        }
+      }
+    } else if (node.name === 'svg') {
+      siblings.push(node)
+      this.stack.push(node)
+      this.popNode()
+      return
+    }
+    for (const key in styleObj) {
+      if (styleObj[key]) {
+        attrs.style += `;${key}:${styleObj[key].replace(' !important', '')}`
+      }
+    }
+    attrs.style = attrs.style.substr(1) || undefined
+    // #ifdef (MP-WEIXIN || MP-QQ) && VUE3
+    if (!attrs.style) {
+      delete attrs.style
+    }
+    // #endif
+  } else {
+    if ((node.name === 'pre' || ((attrs.style || '').includes('white-space') && attrs.style.includes('pre'))) && this.pre !== 2) {
+      this.pre = node.pre = 1
+    }
+    node.children = []
+    this.stack.push(node)
+  }
+
+  // 加入节点树
+  siblings.push(node)
+}
+
+/**
+ * @description 解析到标签结束
+ * @param {String} name 标签名
+ * @private
+ */
+Parser.prototype.onCloseTag = function (name) {
+  // 依次出栈到匹配为止
+  name = this.xml ? name : name.toLowerCase()
+  let i
+  for (i = this.stack.length; i--;) {
+    if (this.stack[i].name === name) break
+  }
+  if (i !== -1) {
+    while (this.stack.length > i) {
+      this.popNode()
+    }
+  } else if (name === 'p' || name === 'br') {
+    const siblings = this.stack.length ? this.stack[this.stack.length - 1].children : this.nodes
+    siblings.push({
+      name,
+      attrs: {
+        class: tagSelector[name] || '',
+        style: this.tagStyle[name] || ''
+      }
+    })
+  }
+}
+
+/**
+ * @description 处理标签出栈
+ * @private
+ */
+Parser.prototype.popNode = function () {
+  const node = this.stack.pop()
+  let attrs = node.attrs
+  const children = node.children
+  const parent = this.stack[this.stack.length - 1]
+  const siblings = parent ? parent.children : this.nodes
+
+  if (!this.hook(node) || config.ignoreTags[node.name]) {
+    // 获取标题
+    if (node.name === 'title' && children.length && children[0].type === 'text' && this.options.setTitle) {
+      uni.setNavigationBarTitle({
+        title: children[0].text
+      })
+    }
+    siblings.pop()
+    return
+  }
+
+  if (node.pre && this.pre !== 2) {
+    // 是否合并空白符标识
+    this.pre = node.pre = undefined
+    for (let i = this.stack.length; i--;) {
+      if (this.stack[i].pre) {
+        this.pre = 1
+      }
+    }
+  }
+
+  const styleObj = {}
+
+  // 转换 svg
+  if (node.name === 'svg') {
+    if (this.xml > 1) {
+      // 多层 svg 嵌套
+      this.xml--
+      return
+    }
+    // #ifdef APP-PLUS-NVUE
+    (function traversal (node) {
+      if (node.name) {
+        // 调整 svg 的大小写
+        node.name = config.svgDict[node.name] || node.name
+        for (const item in node.attrs) {
+          if (config.svgDict[item]) {
+            node.attrs[config.svgDict[item]] = node.attrs[item]
+            node.attrs[item] = undefined
+          }
+        }
+        for (let i = 0; i < (node.children || []).length; i++) {
+          traversal(node.children[i])
+        }
+      }
+    })(node)
+    // #endif
+    // #ifndef APP-PLUS-NVUE
+    let src = ''
+    const style = attrs.style
+    attrs.style = ''
+    attrs.xmlns = 'http://www.w3.org/2000/svg';
+    (function traversal (node) {
+      if (node.type === 'text') {
+        src += node.text
+        return
+      }
+      const name = config.svgDict[node.name] || node.name
+      if (name === 'foreignObject') {
+        for (const child of (node.children || [])) {
+          if (child.attrs && !child.attrs.xmlns) {
+            child.attrs.xmlns = 'http://www.w3.org/1999/xhtml'
+            break
+          }
+        }
+      }
+      src += '<' + name
+      for (const item in node.attrs) {
+        const val = node.attrs[item]
+        if (val) {
+          src += ` ${config.svgDict[item] || item}="${val.replace(/"/g, '')}"`
+        }
+      }
+      if (!node.children) {
+        src += '/>'
+      } else {
+        src += '>'
+        for (let i = 0; i < node.children.length; i++) {
+          traversal(node.children[i])
+        }
+        src += '</' + name + '>'
+      }
+    })(node)
+    node.name = 'img'
+    node.attrs = {
+      src: 'data:image/svg+xml;utf8,' + src.replace(/#/g, '%23'),
+      style,
+      ignore: 'T'
+    }
+    node.children = undefined
+    // #endif
+    this.xml = false
+    config.ignoreTags.style = true
+    return
+  }
+
+  // #ifndef APP-PLUS-NVUE
+  // 转换 align 属性
+  if (attrs.align) {
+    if (node.name === 'table') {
+      if (attrs.align === 'center') {
+        styleObj['margin-inline-start'] = styleObj['margin-inline-end'] = 'auto'
+      } else {
+        styleObj.float = attrs.align
+      }
+    } else {
+      styleObj['text-align'] = attrs.align
+    }
+    attrs.align = undefined
+  }
+
+  // 转换 dir 属性
+  if (attrs.dir) {
+    styleObj.direction = attrs.dir
+    attrs.dir = undefined
+  }
+
+  // 转换 font 标签的属性
+  if (node.name === 'font') {
+    if (attrs.color) {
+      styleObj.color = attrs.color
+      attrs.color = undefined
+    }
+    if (attrs.face) {
+      styleObj['font-family'] = attrs.face
+      attrs.face = undefined
+    }
+    if (attrs.size) {
+      let size = parseInt(attrs.size)
+      if (!isNaN(size)) {
+        if (size < 1) {
+          size = 1
+        } else if (size > 7) {
+          size = 7
+        }
+        styleObj['font-size'] = ['x-small', 'small', 'medium', 'large', 'x-large', 'xx-large', 'xxx-large'][size - 1]
+      }
+      attrs.size = undefined
+    }
+  }
+  // #endif
+
+  // 一些编辑器的自带 class
+  if ((attrs.class || '').includes('align-center')) {
+    styleObj['text-align'] = 'center'
+  }
+
+  Object.assign(styleObj, this.parseStyle(node))
+
+  if (node.name !== 'table' && parseInt(styleObj.width) > windowWidth) {
+    styleObj['max-width'] = '100%'
+    styleObj['box-sizing'] = 'border-box'
+  }
+
+  // #ifndef APP-PLUS-NVUE
+  if (config.blockTags[node.name]) {
+    node.name = 'div'
+  } else if (!config.trustTags[node.name] && !this.xml) {
+    // 未知标签转为 span，避免无法显示
+    node.name = 'span'
+  }
+
+  if (node.name === 'a' || node.name === 'ad'
+    // #ifdef H5 || APP-PLUS
+    || node.name === 'iframe' // eslint-disable-line
+    // #endif
+  ) {
+    this.expose()
+  } else if (node.name === 'video') {
+    if ((styleObj.height || '').includes('auto')) {
+      styleObj.height = undefined
+    }
+    /* #ifdef APP-PLUS */
+    let str = '<video style="width:100%;height:100%"'
+    for (const item in attrs) {
+      if (attrs[item]) {
+        str += ' ' + item + '="' + attrs[item] + '"'
+      }
+    }
+    if (this.options.pauseVideo) {
+      str += ' onplay="this.dispatchEvent(new CustomEvent(\'vplay\',{bubbles:!0}));for(var e=document.getElementsByTagName(\'video\'),t=0;t<e.length;t++)e[t]!=this&&e[t].pause()"'
+    }
+    str += '>'
+    for (let i = 0; i < node.src.length; i++) {
+      str += '<source src="' + node.src[i] + '">'
+    }
+    str += '</video>'
+    node.html = str
+    /* #endif */
+  } else if ((node.name === 'ul' || node.name === 'ol') && node.c) {
+    // 列表处理
+    const types = {
+      a: 'lower-alpha',
+      A: 'upper-alpha',
+      i: 'lower-roman',
+      I: 'upper-roman'
+    }
+    if (types[attrs.type]) {
+      attrs.style += ';list-style-type:' + types[attrs.type]
+      attrs.type = undefined
+    }
+    for (let i = children.length; i--;) {
+      if (children[i].name === 'li') {
+        children[i].c = 1
+      }
+    }
+  } else if (node.name === 'table') {
+    // 表格处理
+    // cellpadding、cellspacing、border 这几个常用表格属性需要通过转换实现
+    let padding = parseFloat(attrs.cellpadding)
+    let spacing = parseFloat(attrs.cellspacing)
+    const border = parseFloat(attrs.border)
+    const bordercolor = styleObj['border-color']
+    const borderstyle = styleObj['border-style']
+    if (node.c) {
+      // padding 和 spacing 默认 2
+      if (isNaN(padding)) {
+        padding = 2
+      }
+      if (isNaN(spacing)) {
+        spacing = 2
+      }
+    }
+    if (border) {
+      attrs.style += `;border:${border}px ${borderstyle || 'solid'} ${bordercolor || 'gray'}`
+    }
+    if (node.flag && node.c) {
+      // 有 colspan 或 rowspan 且含有链接的表格通过 grid 布局实现
+      styleObj.display = 'grid'
+      if (styleObj['border-collapse'] === 'collapse') {
+        styleObj['border-collapse'] = undefined
+        spacing = 0
+      }
+      if (spacing) {
+        styleObj['grid-gap'] = spacing + 'px'
+        styleObj.padding = spacing + 'px'
+      } else if (border) {
+        // 无间隔的情况下避免边框重叠
+        attrs.style += ';border-left:0;border-top:0'
+      }
+
+      const width = [] // 表格的列宽
+      const trList = [] // tr 列表
+      const cells = [] // 保存新的单元格
+      const map = {}; // 被合并单元格占用的格子
+
+      (function traversal (nodes) {
+        for (let i = 0; i < nodes.length; i++) {
+          if (nodes[i].name === 'tr') {
+            trList.push(nodes[i])
+          } else if (nodes[i].name === 'colgroup') {
+            let colI = 1
+            for (const col of (nodes[i].children || [])) {
+              if (col.name === 'col') {
+                const style = col.attrs.style || ''
+                const start = style.indexOf('width') ? style.indexOf(';width') : 0
+                // 提取出宽度
+                if (start !== -1) {
+                  let end = style.indexOf(';', start + 6)
+                  if (end === -1) {
+                    end = style.length
+                  }
+                  width[colI] = style.substring(start ? start + 7 : 6, end)
+                }
+                colI += 1
+              }
+            }
+          } else {
+            traversal(nodes[i].children || [])
+          }
+        }
+      })(children)
+
+      for (let row = 1; row <= trList.length; row++) {
+        let col = 1
+        for (let j = 0; j < trList[row - 1].children.length; j++) {
+          const td = trList[row - 1].children[j]
+          if (td.name === 'td' || td.name === 'th') {
+            // 这个格子被上面的单元格占用，则列号++
+            while (map[row + '.' + col]) {
+              col++
+            }
+            let style = td.attrs.style || ''
+            let start = style.indexOf('width') ? style.indexOf(';width') : 0
+            // 提取出 td 的宽度
+            if (start !== -1) {
+              let end = style.indexOf(';', start + 6)
+              if (end === -1) {
+                end = style.length
+              }
+              if (!td.attrs.colspan) {
+                width[col] = style.substring(start ? start + 7 : 6, end)
+              }
+              style = style.substr(0, start) + style.substr(end)
+            }
+            // 设置竖直对齐
+            style += ';display:flex'
+            start = style.indexOf('vertical-align')
+            if (start !== -1) {
+              const val = style.substr(start + 15, 10)
+              if (val.includes('middle')) {
+                style += ';align-items:center'
+              } else if (val.includes('bottom')) {
+                style += ';align-items:flex-end'
+              }
+            } else {
+              style += ';align-items:center'
+            }
+            // 设置水平对齐
+            start = style.indexOf('text-align')
+            if (start !== -1) {
+              const val = style.substr(start + 11, 10)
+              if (val.includes('center')) {
+                style += ';justify-content: center'
+              } else if (val.includes('right')) {
+                style += ';justify-content: right'
+              }
+            }
+            style = (border ? `;border:${border}px ${borderstyle || 'solid'} ${bordercolor || 'gray'}` + (spacing ? '' : ';border-right:0;border-bottom:0') : '') + (padding ? `;padding:${padding}px` : '') + ';' + style
+            // 处理列合并
+            if (td.attrs.colspan) {
+              style += `;grid-column-start:${col};grid-column-end:${col + parseInt(td.attrs.colspan)}`
+              if (!td.attrs.rowspan) {
+                style += `;grid-row-start:${row};grid-row-end:${row + 1}`
+              }
+              col += parseInt(td.attrs.colspan) - 1
+            }
+            // 处理行合并
+            if (td.attrs.rowspan) {
+              style += `;grid-row-start:${row};grid-row-end:${row + parseInt(td.attrs.rowspan)}`
+              if (!td.attrs.colspan) {
+                style += `;grid-column-start:${col};grid-column-end:${col + 1}`
+              }
+              // 记录下方单元格被占用
+              for (let rowspan = 1; rowspan < td.attrs.rowspan; rowspan++) {
+                for (let colspan = 0; colspan < (td.attrs.colspan || 1); colspan++) {
+                  map[(row + rowspan) + '.' + (col - colspan)] = 1
+                }
+              }
+            }
+            if (style) {
+              td.attrs.style = style
+            }
+            cells.push(td)
+            col++
+          }
+        }
+        if (row === 1) {
+          let temp = ''
+          for (let i = 1; i < col; i++) {
+            temp += (width[i] ? width[i] : 'auto') + ' '
+          }
+          styleObj['grid-template-columns'] = temp
+        }
+      }
+      node.children = cells
+    } else {
+      // 没有使用合并单元格的表格通过 table 布局实现
+      if (node.c) {
+        styleObj.display = 'table'
+      }
+      if (!isNaN(spacing)) {
+        styleObj['border-spacing'] = spacing + 'px'
+      }
+      if (border || padding) {
+        // 遍历
+        (function traversal (nodes) {
+          for (let i = 0; i < nodes.length; i++) {
+            const td = nodes[i]
+            if (td.name === 'th' || td.name === 'td') {
+              if (border) {
+                td.attrs.style = `border:${border}px ${borderstyle || 'solid'} ${bordercolor || 'gray'};${td.attrs.style || ''}`
+              }
+              if (padding) {
+                td.attrs.style = `padding:${padding}px;${td.attrs.style || ''}`
+              }
+            } else if (td.children) {
+              traversal(td.children)
+            }
+          }
+        })(children)
+      }
+    }
+    // 给表格添加一个单独的横向滚动层
+    if (this.options.scrollTable && !(attrs.style || '').includes('inline')) {
+      const table = Object.assign({}, node)
+      node.name = 'div'
+      node.attrs = {
+        style: 'overflow:auto'
+      }
+      node.children = [table]
+      attrs = table.attrs
+    }
+  } else if ((node.name === 'tbody' || node.name === 'tr') && node.flag && node.c) {
+    node.flag = undefined;
+    (function traversal (nodes) {
+      for (let i = 0; i < nodes.length; i++) {
+        if (nodes[i].name === 'td') {
+          // 颜色样式设置给单元格避免丢失
+          for (const style of ['color', 'background', 'background-color']) {
+            if (styleObj[style]) {
+              nodes[i].attrs.style = style + ':' + styleObj[style] + ';' + (nodes[i].attrs.style || '')
+            }
+          }
+        } else {
+          traversal(nodes[i].children || [])
+        }
+      }
+    })(children)
+  } else if ((node.name === 'td' || node.name === 'th') && (attrs.colspan || attrs.rowspan)) {
+    for (let i = this.stack.length; i--;) {
+      if (this.stack[i].name === 'table' || this.stack[i].name === 'tbody' || this.stack[i].name === 'tr') {
+        this.stack[i].flag = 1 // 指示含有合并单元格
+      }
+    }
+  } else if (node.name === 'ruby') {
+    // 转换 ruby
+    node.name = 'span'
+    for (let i = 0; i < children.length - 1; i++) {
+      if (children[i].type === 'text' && children[i + 1].name === 'rt') {
+        children[i] = {
+          name: 'div',
+          attrs: {
+            style: 'display:inline-block;text-align:center'
+          },
+          children: [{
+            name: 'div',
+            attrs: {
+              style: 'font-size:50%;' + (children[i + 1].attrs.style || '')
+            },
+            children: children[i + 1].children
+          }, children[i]]
+        }
+        children.splice(i + 1, 1)
+      }
+    }
+  } else if (node.c) {
+    (function traversal (node) {
+      node.c = 2
+      for (let i = node.children.length; i--;) {
+        const child = node.children[i]
+        // #ifdef (MP-WEIXIN || MP-QQ || APP-PLUS || MP-360) && VUE3
+        if (child.name && (config.inlineTags[child.name] || ((child.attrs.style || '').includes('inline') && child.children)) && !child.c) {
+          traversal(child)
+        }
+        // #endif
+        if (!child.c || child.name === 'table') {
+          node.c = 1
+        }
+      }
+    })(node)
+  }
+
+  if ((styleObj.display || '').includes('flex') && !node.c) {
+    for (let i = children.length; i--;) {
+      const item = children[i]
+      if (item.f) {
+        item.attrs.style = (item.attrs.style || '') + item.f
+        item.f = undefined
+      }
+    }
+  }
+  // flex 布局时部分样式需要提取到 rich-text 外层
+  const flex = parent && ((parent.attrs.style || '').includes('flex') || (parent.attrs.style || '').includes('grid'))
+    // #ifdef MP-WEIXIN
+    // 检查基础库版本 virtualHost 是否可用
+    && !(node.c && wx.getNFCAdapter) // eslint-disable-line
+    // #endif
+    // #ifndef MP-WEIXIN || MP-QQ || MP-BAIDU || MP-TOUTIAO
+    && !node.c // eslint-disable-line
+  // #endif
+  if (flex) {
+    node.f = ';max-width:100%'
+  }
+
+  if (children.length >= 50 && node.c && !(styleObj.display || '').includes('flex')) {
+    mergeNodes(children)
+  }
+  // #endif
+
+  for (const key in styleObj) {
+    if (styleObj[key]) {
+      const val = `;${key}:${styleObj[key].replace(' !important', '')}`
+      /* #ifndef APP-PLUS-NVUE */
+      if (flex && ((key.includes('flex') && key !== 'flex-direction') || key === 'align-self' || key.includes('grid') || styleObj[key][0] === '-' || (key.includes('width') && val.includes('%')))) {
+        node.f += val
+        if (key === 'width') {
+          attrs.style += ';width:100%'
+        }
+      } else /* #endif */ {
+        attrs.style += val
+      }
+    }
+  }
+  attrs.style = attrs.style.substr(1) || undefined
+  // #ifdef (MP-WEIXIN || MP-QQ) && VUE3
+  for (const key in attrs) {
+    if (!attrs[key]) {
+      delete attrs[key]
+    }
+  }
+  // #endif
+}
+
+/**
+ * @description 解析到文本
+ * @param {String} text 文本内容
+ */
+Parser.prototype.onText = function (text) {
+  if (!this.pre) {
+    // 合并空白符
+    let trim = ''
+    let flag
+    for (let i = 0, len = text.length; i < len; i++) {
+      if (!blankChar[text[i]]) {
+        trim += text[i]
+      } else {
+        if (trim[trim.length - 1] !== ' ') {
+          trim += ' '
+        }
+        if (text[i] === '\n' && !flag) {
+          flag = true
+        }
+      }
+    }
+    // 去除含有换行符的空串
+    if (trim === ' ') {
+      if (flag) return
+      // #ifdef VUE3
+      else {
+        const parent = this.stack[this.stack.length - 1]
+        if (parent && parent.name[0] === 't') return
+      }
+      // #endif
+    }
+    text = trim
+  }
+  const node = Object.create(null)
+  node.type = 'text'
+  // #ifdef (MP-BAIDU || MP-ALIPAY || MP-TOUTIAO) && VUE3
+  node.attrs = {}
+  // #endif
+  node.text = decodeEntity(text)
+  if (this.hook(node)) {
+    // #ifdef MP-WEIXIN
+    if (this.options.selectable === 'force' && system.includes('iOS') && !uni.canIUse('rich-text.user-select')) {
+      this.expose()
+    }
+    // #endif
+    const siblings = this.stack.length ? this.stack[this.stack.length - 1].children : this.nodes
+    siblings.push(node)
+  }
+}
+
+/**
+ * @description html 词法分析器
+ * @param {Object} handler 高层处理器
+ */
+function Lexer (handler) {
+  this.handler = handler
+}
+
+/**
+ * @description 执行解析
+ * @param {String} content 要解析的文本
+ */
+Lexer.prototype.parse = function (content) {
+  this.content = content || ''
+  this.i = 0 // 标记解析位置
+  this.start = 0 // 标记一个单词的开始位置
+  this.state = this.text // 当前状态
+  for (let len = this.content.length; this.i !== -1 && this.i < len;) {
+    this.state()
+  }
+}
+
+/**
+ * @description 检查标签是否闭合
+ * @param {String} method 如果闭合要进行的操作
+ * @returns {Boolean} 是否闭合
+ * @private
+ */
+Lexer.prototype.checkClose = function (method) {
+  const selfClose = this.content[this.i] === '/'
+  if (this.content[this.i] === '>' || (selfClose && this.content[this.i + 1] === '>')) {
+    if (method) {
+      this.handler[method](this.content.substring(this.start, this.i))
+    }
+    this.i += selfClose ? 2 : 1
+    this.start = this.i
+    this.handler.onOpenTag(selfClose)
+    if (this.handler.tagName === 'script') {
+      this.i = this.content.indexOf('</', this.i)
+      if (this.i !== -1) {
+        this.i += 2
+        this.start = this.i
+      }
+      this.state = this.endTag
+    } else {
+      this.state = this.text
+    }
+    return true
+  }
+  return false
+}
+
+/**
+ * @description 文本状态
+ * @private
+ */
+Lexer.prototype.text = function () {
+  this.i = this.content.indexOf('<', this.i) // 查找最近的标签
+  if (this.i === -1) {
+    // 没有标签了
+    if (this.start < this.content.length) {
+      this.handler.onText(this.content.substring(this.start, this.content.length))
+    }
+    return
+  }
+  const c = this.content[this.i + 1]
+  if ((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z')) {
+    // 标签开头
+    if (this.start !== this.i) {
+      this.handler.onText(this.content.substring(this.start, this.i))
+    }
+    this.start = ++this.i
+    this.state = this.tagName
+  } else if (c === '/' || c === '!' || c === '?') {
+    if (this.start !== this.i) {
+      this.handler.onText(this.content.substring(this.start, this.i))
+    }
+    const next = this.content[this.i + 2]
+    if (c === '/' && ((next >= 'a' && next <= 'z') || (next >= 'A' && next <= 'Z'))) {
+      // 标签结尾
+      this.i += 2
+      this.start = this.i
+      this.state = this.endTag
+      return
+    }
+    // 处理注释
+    let end = '-->'
+    if (c !== '!' || this.content[this.i + 2] !== '-' || this.content[this.i + 3] !== '-') {
+      end = '>'
+    }
+    this.i = this.content.indexOf(end, this.i)
+    if (this.i !== -1) {
+      this.i += end.length
+      this.start = this.i
+    }
+  } else {
+    this.i++
+  }
+}
+
+/**
+ * @description 标签名状态
+ * @private
+ */
+Lexer.prototype.tagName = function () {
+  if (blankChar[this.content[this.i]]) {
+    // 解析到标签名
+    this.handler.onTagName(this.content.substring(this.start, this.i))
+    while (blankChar[this.content[++this.i]]);
+    if (this.i < this.content.length && !this.checkClose()) {
+      this.start = this.i
+      this.state = this.attrName
+    }
+  } else if (!this.checkClose('onTagName')) {
+    this.i++
+  }
+}
+
+/**
+ * @description 属性名状态
+ * @private
+ */
+Lexer.prototype.attrName = function () {
+  let c = this.content[this.i]
+  if (blankChar[c] || c === '=') {
+    // 解析到属性名
+    this.handler.onAttrName(this.content.substring(this.start, this.i))
+    let needVal = c === '='
+    const len = this.content.length
+    while (++this.i < len) {
+      c = this.content[this.i]
+      if (!blankChar[c]) {
+        if (this.checkClose()) return
+        if (needVal) {
+          // 等号后遇到第一个非空字符
+          this.start = this.i
+          this.state = this.attrVal
+          return
+        }
+        if (this.content[this.i] === '=') {
+          needVal = true
+        } else {
+          this.start = this.i
+          this.state = this.attrName
+          return
+        }
+      }
+    }
+  } else if (!this.checkClose('onAttrName')) {
+    this.i++
+  }
+}
+
+/**
+ * @description 属性值状态
+ * @private
+ */
+Lexer.prototype.attrVal = function () {
+  const c = this.content[this.i]
+  const len = this.content.length
+  if (c === '"' || c === "'") {
+    // 有冒号的属性
+    this.start = ++this.i
+    this.i = this.content.indexOf(c, this.i)
+    if (this.i === -1) return
+    this.handler.onAttrVal(this.content.substring(this.start, this.i))
+  } else {
+    // 没有冒号的属性
+    for (; this.i < len; this.i++) {
+      if (blankChar[this.content[this.i]]) {
+        this.handler.onAttrVal(this.content.substring(this.start, this.i))
+        break
+      } else if (this.checkClose('onAttrVal')) return
+    }
+  }
+  while (blankChar[this.content[++this.i]]);
+  if (this.i < len && !this.checkClose()) {
+    this.start = this.i
+    this.state = this.attrName
+  }
+}
+
+/**
+ * @description 结束标签状态
+ * @returns {String} 结束的标签名
+ * @private
+ */
+Lexer.prototype.endTag = function () {
+  const c = this.content[this.i]
+  if (blankChar[c] || c === '>' || c === '/') {
+    this.handler.onCloseTag(this.content.substring(this.start, this.i))
+    if (c !== '>') {
+      this.i = this.content.indexOf('>', this.i)
+      if (this.i === -1) return
+    }
+    this.start = ++this.i
+    this.state = this.text
+  } else {
+    this.i++
+  }
+}
+
+export default Parser
diff --git a/uni_modules/mp-html/package.json b/uni_modules/mp-html/package.json
new file mode 100644
index 0000000..84c07e3
--- /dev/null
+++ b/uni_modules/mp-html/package.json
@@ -0,0 +1,76 @@
+{
+    "id": "mp-html",
+    "displayName": "mp-html 富文本组件【全端支持，支持编辑、latex等扩展】",
+    "version": "v2.5.0",
+    "description": "一个强大的富文本组件，高效轻量，功能丰富",
+    "keywords": [
+        "富文本",
+        "编辑器",
+        "html",
+        "rich-text",
+        "editor"
+    ],
+    "repository": "https://github.com/jin-yufeng/mp-html",
+    "dcloudext": {
+        "sale": {
+            "regular": {
+                "price": "0.00"
+            },
+            "sourcecode": {
+                "price": "0.00"
+            }
+        },
+        "contact": {
+            "qq": ""
+        },
+        "declaration": {
+            "ads": "无",
+            "data": "无",
+            "permissions": "无"
+        },
+        "npmurl": "https://www.npmjs.com/package/mp-html",
+        "type": "component-vue"
+    },
+    "uni_modules": {
+        "platforms": {
+            "cloud": {
+                "tcb": "y",
+                "aliyun": "y"
+            },
+            "client": {
+                "App": {
+                    "app-vue": "y",
+                    "app-nvue": "y"
+                },
+                "H5-mobile": {
+                    "Safari": "y",
+                    "Android Browser": "y",
+                    "微信浏览器(Android)": "y",
+                    "QQ浏览器(Android)": "y"
+                },
+                "H5-pc": {
+                    "Chrome": "y",
+                    "IE": "u",
+                    "Edge": "y",
+                    "Firefox": "y",
+                    "Safari": "y"
+                },
+                "小程序": {
+                    "微信": "y",
+                    "阿里": "y",
+                    "百度": "y",
+                    "字节跳动": "y",
+                    "QQ": "y"
+                },
+                "快应用": {
+                    "华为": "y",
+                    "联盟": "y"
+                },
+                "Vue": {
+                    "vue2": "y",
+                    "vue3": "y"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/uni_modules/mp-html/static/app-plus/mp-html/js/handler.js b/uni_modules/mp-html/static/app-plus/mp-html/js/handler.js
new file mode 100644
index 0000000..1d986bd
--- /dev/null
+++ b/uni_modules/mp-html/static/app-plus/mp-html/js/handler.js
@@ -0,0 +1 @@
+"use strict";function t(t){for(var e=Object.create(null),n=t.attributes.length;n--;)e[t.attributes[n].name]=t.attributes[n].value;return e}function e(){a[1]&&(this.src=a[1],this.onerror=null),this.onclick=null,this.ontouchstart=null,uni.postMessage({data:{action:"onError",source:"img",attrs:t(this)}})}function n(){window.unloadimgs-=1,0===window.unloadimgs&&uni.postMessage({data:{action:"onReady"}})}function o(r,s,c){for(var d=0;d<r.length;d++)!function(d){var u=r[d],l=void 0;if(u.type&&"node"!==u.type)l=document.createTextNode(u.text.replace(/&amp;/g,"&"));else{var g=u.name;"svg"===g&&(c="http://www.w3.org/2000/svg"),"html"!==g&&"body"!==g||(g="div"),l=c?document.createElementNS(c,g):document.createElement(g);for(var p in u.attrs)l.setAttribute(p,u.attrs[p]);if(u.children&&o(u.children,l,c),"img"===g){if(window.unloadimgs+=1,l.onload=n,l.onerror=n,!l.src&&l.getAttribute("data-src")&&(l.src=l.getAttribute("data-src")),u.attrs.ignore||(l.onclick=function(e){e.stopPropagation(),uni.postMessage({data:{action:"onImgTap",attrs:t(this)}})}),a[2]){var h=new Image;h.src=l.src,l.src=a[2],h.onload=function(){l.src=this.src},h.onerror=function(){l.onerror()}}l.onerror=e}else if("a"===g)l.addEventListener("click",function(e){e.stopPropagation(),e.preventDefault();var n,o=this.getAttribute("href");o&&"#"===o[0]&&(n=(document.getElementById(o.substr(1))||{}).offsetTop),uni.postMessage({data:{action:"onLinkTap",attrs:t(this),offset:n}})},!0);else if("video"===g||"audio"===g)i.push(l),u.attrs.autoplay||u.attrs.controls||l.setAttribute("controls","true"),l.onplay=function(){if(uni.postMessage({data:{action:"onPlay"}}),a[3])for(var t=0;t<i.length;t++)i[t]!==this&&i[t].pause()},l.onerror=function(){uni.postMessage({data:{action:"onError",source:g,attrs:t(this)}})};else if("table"===g&&a[4]&&!l.style.cssText.includes("inline")){var f=document.createElement("div");f.style.overflow="auto",f.appendChild(l),l=f}else"svg"===g&&(c=void 0)}s.appendChild(l)}(d)}document.addEventListener("UniAppJSBridgeReady",function(){document.body.onclick=function(){return uni.postMessage({data:{action:"onClick"}})},uni.postMessage({data:{action:"onJSBridgeReady"}})});var a,i=[];window.setContent=function(t,e,n){var r=document.getElementById("content");e[0]&&(document.body.style.cssText=e[0]),e[5]||(r.style.userSelect="none"),n||(r.innerHTML="",i=[]),a=e,window.unloadimgs=0;var s=document.createDocumentFragment();o(t,s),r.appendChild(s);var c=r.scrollHeight;uni.postMessage({data:{action:"onLoad",height:c}}),window.unloadimgs||uni.postMessage({data:{action:"onReady",height:c}}),clearInterval(window.timer),window.timer=setInterval(function(){r.scrollHeight!==c&&(c=r.scrollHeight,uni.postMessage({data:{action:"onHeightChange",height:c}}))},350)},window.onunload=function(){clearInterval(window.timer)};
\ No newline at end of file
diff --git a/uni_modules/mp-html/static/app-plus/mp-html/js/uni.webview.min.js b/uni_modules/mp-html/static/app-plus/mp-html/js/uni.webview.min.js
new file mode 100644
index 0000000..b0c8445
--- /dev/null
+++ b/uni_modules/mp-html/static/app-plus/mp-html/js/uni.webview.min.js
@@ -0,0 +1 @@
+!function(e,n){"object"==typeof exports&&"undefined"!=typeof module?module.exports=n():"function"==typeof define&&define.amd?define(n):(e=e||self).uni=n()}(this,(function(){"use strict";try{var e={};Object.defineProperty(e,"passive",{get:function(){!0}}),window.addEventListener("test-passive",null,e)}catch(e){}var n=Object.prototype.hasOwnProperty;function t(e,t){return n.call(e,t)}var i=[],a=function(e,n){var t={options:{timestamp:+new Date},name:e,arg:n};if(window.__dcloud_weex_postMessage||window.__dcloud_weex_){if("postMessage"===e){var a={data:[n]};return window.__dcloud_weex_postMessage?window.__dcloud_weex_postMessage(a):window.__dcloud_weex_.postMessage(JSON.stringify(a))}var o={type:"WEB_INVOKE_APPSERVICE",args:{data:t,webviewIds:i}};window.__dcloud_weex_postMessage?window.__dcloud_weex_postMessageToService(o):window.__dcloud_weex_.postMessageToService(JSON.stringify(o))}if(!window.plus)return window.parent.postMessage({type:"WEB_INVOKE_APPSERVICE",data:t,pageId:""},"*");if(0===i.length){var r=plus.webview.currentWebview();if(!r)throw new Error("plus.webview.currentWebview() is undefined");var d=r.parent(),s="";s=d?d.id:r.id,i.push(s)}if(plus.webview.getWebviewById("__uniapp__service"))plus.webview.postMessageToUniNView({type:"WEB_INVOKE_APPSERVICE",args:{data:t,webviewIds:i}},"__uniapp__service");else{var w=JSON.stringify(t);plus.webview.getLaunchWebview().evalJS('UniPlusBridge.subscribeHandler("'.concat("WEB_INVOKE_APPSERVICE",'",').concat(w,",").concat(JSON.stringify(i),");"))}},o={navigateTo:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},n=e.url;a("navigateTo",{url:encodeURI(n)})},navigateBack:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},n=e.delta;a("navigateBack",{delta:parseInt(n)||1})},switchTab:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},n=e.url;a("switchTab",{url:encodeURI(n)})},reLaunch:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},n=e.url;a("reLaunch",{url:encodeURI(n)})},redirectTo:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},n=e.url;a("redirectTo",{url:encodeURI(n)})},getEnv:function(e){window.plus?e({plus:!0}):e({h5:!0})},postMessage:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};a("postMessage",e.data||{})}},r=/uni-app/i.test(navigator.userAgent),d=/Html5Plus/i.test(navigator.userAgent),s=/complete|loaded|interactive/;var w=window.my&&navigator.userAgent.indexOf("AlipayClient")>-1;var u=window.swan&&window.swan.webView&&/swan/i.test(navigator.userAgent);var c=window.qq&&window.qq.miniProgram&&/QQ/i.test(navigator.userAgent)&&/miniProgram/i.test(navigator.userAgent);var g=window.tt&&window.tt.miniProgram&&/toutiaomicroapp/i.test(navigator.userAgent);var v=window.wx&&window.wx.miniProgram&&/micromessenger/i.test(navigator.userAgent)&&/miniProgram/i.test(navigator.userAgent);var p=window.qa&&/quickapp/i.test(navigator.userAgent);for(var l,_=function(){window.UniAppJSBridge=!0,document.dispatchEvent(new CustomEvent("UniAppJSBridgeReady",{bubbles:!0,cancelable:!0}))},f=[function(e){if(r||d)return window.__dcloud_weex_postMessage||window.__dcloud_weex_?document.addEventListener("DOMContentLoaded",e):window.plus&&s.test(document.readyState)?setTimeout(e,0):document.addEventListener("plusready",e),o},function(e){if(v)return window.WeixinJSBridge&&window.WeixinJSBridge.invoke?setTimeout(e,0):document.addEventListener("WeixinJSBridgeReady",e),window.wx.miniProgram},function(e){if(c)return window.QQJSBridge&&window.QQJSBridge.invoke?setTimeout(e,0):document.addEventListener("QQJSBridgeReady",e),window.qq.miniProgram},function(e){if(w){document.addEventListener("DOMContentLoaded",e);var n=window.my;return{navigateTo:n.navigateTo,navigateBack:n.navigateBack,switchTab:n.switchTab,reLaunch:n.reLaunch,redirectTo:n.redirectTo,postMessage:n.postMessage,getEnv:n.getEnv}}},function(e){if(u)return document.addEventListener("DOMContentLoaded",e),window.swan.webView},function(e){if(g)return document.addEventListener("DOMContentLoaded",e),window.tt.miniProgram},function(e){if(p){window.QaJSBridge&&window.QaJSBridge.invoke?setTimeout(e,0):document.addEventListener("QaJSBridgeReady",e);var n=window.qa;return{navigateTo:n.navigateTo,navigateBack:n.navigateBack,switchTab:n.switchTab,reLaunch:n.reLaunch,redirectTo:n.redirectTo,postMessage:n.postMessage,getEnv:n.getEnv}}},function(e){return document.addEventListener("DOMContentLoaded",e),o}],m=0;m<f.length&&!(l=f[m](_));m++);l||(l={});var E="undefined"!=typeof uni?uni:{};if(!E.navigateTo)for(var b in l)t(l,b)&&(E[b]=l[b]);return E.webView=l,E}));
\ No newline at end of file
diff --git a/uni_modules/mp-html/static/app-plus/mp-html/local.html b/uni_modules/mp-html/static/app-plus/mp-html/local.html
new file mode 100644
index 0000000..04355c9
--- /dev/null
+++ b/uni_modules/mp-html/static/app-plus/mp-html/local.html
@@ -0,0 +1 @@
+<head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no"><style>body,html{width:100%;height:100%;overflow-x:scroll;overflow-y:hidden}body{margin:0}video{width:300px;height:225px}img{max-width:100%;-webkit-touch-callout:none}</style></head><body><div id="content" style="overflow:hidden"></div><script type="text/javascript" src="./js/uni.webview.min.js"></script><script type="text/javascript" src="./js/handler.js"></script></body>
\ No newline at end of file
diff --git a/uni_modules/uni-datetime-picker/changelog.md b/uni_modules/uni-datetime-picker/changelog.md
new file mode 100644
index 0000000..381c9a8
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/changelog.md
@@ -0,0 +1,85 @@
+## 2.2.2（2021-12-10）
+- 修复 clear-icon 属性在小程序平台不生效的 bug
+## 2.2.1（2021-12-10）
+- 修复 日期范围选在小程序平台，必须多点击一次才能取消选中状态的 bug
+## 2.2.0（2021-11-19）
+- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
+- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-datetime-picker](https://uniapp.dcloud.io/component/uniui/uni-datetime-picker)
+## 2.1.5（2021-11-09） 
+- 新增 提供组件设计资源，组件样式调整
+## 2.1.4（2021-09-10）
+- 修复 hide-second 在移动端的 bug
+- 修复 单选赋默认值时，赋值日期未高亮的 bug
+- 修复 赋默认值时，移动端未正确显示时间的 bug
+## 2.1.3（2021-09-09）
+- 新增 hide-second 属性，支持只使用时分，隐藏秒
+## 2.1.2（2021-09-03）
+- 优化 取消选中时（范围选）直接开始下一次选择, 避免多点一次
+- 优化 移动端支持清除按钮，同时支持通过 ref 调用组件的 clear 方法
+- 优化 调整字号大小，美化日历界面
+- 修复 因国际化导致的 placeholder 失效的 bug
+## 2.1.1（2021-08-24）
+- 新增 支持国际化
+- 优化 范围选择器在 pc 端过宽的问题
+## 2.1.0（2021-08-09）
+- 新增 适配 vue3
+## 2.0.19（2021-08-09）
+- 新增 支持作为 uni-forms 子组件相关功能
+- 修复 在 uni-forms 中使用时，选择时间报 NAN 错误的 bug
+## 2.0.18（2021-08-05）
+- 修复 type 属性动态赋值无效的 bug
+- 修复 ‘确认’按钮被 tabbar 遮盖 bug
+- 修复 组件未赋值时范围选左、右日历相同的 bug
+## 2.0.17（2021-08-04）
+- 修复 范围选未正确显示当前值的 bug
+- 修复 h5 平台（移动端）报错 'cale' of undefined 的 bug
+## 2.0.16（2021-07-21）
+- 新增 return-type 属性支持返回 date 日期对象
+## 2.0.15（2021-07-14）
+- 修复 单选日期类型，初始赋值后不在当前日历的 bug
+- 新增 clearIcon 属性，显示框的清空按钮可配置显示隐藏（仅 pc 有效）
+- 优化 移动端移除显示框的清空按钮，无实际用途
+## 2.0.14（2021-07-14）
+- 修复 组件赋值为空，界面未更新的 bug
+- 修复 start 和 end 不能动态赋值的 bug
+- 修复 范围选类型，用户选择后再次选择右侧日历（结束日期）显示不正确的 bug
+## 2.0.13（2021-07-08）
+- 修复 范围选择不能动态赋值的 bug
+## 2.0.12（2021-07-08）
+- 修复 范围选择的初始时间在一个月内时，造成无法选择的bug
+## 2.0.11（2021-07-08）
+- 优化 弹出层在超出视窗边缘定位不准确的问题
+## 2.0.10（2021-07-08）
+- 修复 范围起始点样式的背景色与今日样式的字体前景色融合，导致日期字体看不清的 bug
+- 优化 弹出层在超出视窗边缘被遮盖的问题
+## 2.0.9（2021-07-07）
+- 新增 maskClick 事件
+- 修复 特殊情况日历 rpx 布局错误的 bug，rpx -> px
+- 修复 范围选择时清空返回值不合理的bug，['', ''] -> []
+## 2.0.8（2021-07-07）
+- 新增 日期时间显示框支持插槽
+## 2.0.7（2021-07-01）
+- 优化 添加 uni-icons 依赖
+## 2.0.6（2021-05-22）
+- 修复 图标在小程序上不显示的 bug
+- 优化 重命名引用组件，避免潜在组件命名冲突
+## 2.0.5（2021-05-20）
+- 优化 代码目录扁平化
+## 2.0.4（2021-05-12）
+- 新增 组件示例地址
+## 2.0.3（2021-05-10）
+- 修复 ios 下不识别 '-' 日期格式的 bug
+- 优化 pc 下弹出层添加边框和阴影
+## 2.0.2（2021-05-08）
+- 修复 在 admin 中获取弹出层定位错误的bug
+## 2.0.1（2021-05-08）
+- 修复 type 属性向下兼容，默认值从 date 变更为 datetime
+## 2.0.0（2021-04-30）
+- 支持日历形式的日期+时间的范围选择
+ > 注意：此版本不向后兼容，不再支持单独时间选择（type=time）及相关的 hide-second 属性（时间选可使用内置组件 picker）
+## 1.0.6（2021-03-18）
+- 新增 hide-second 属性，时间支持仅选择时、分
+- 修复 选择跟显示的日期不一样的 bug
+- 修复 chang事件触发2次的 bug
+- 修复 分、秒 end 范围错误的 bug
+- 优化 更好的 nvue 适配
diff --git a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar-item.vue b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar-item.vue
new file mode 100644
index 0000000..b57610f
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar-item.vue
@@ -0,0 +1,185 @@
+<template>
+	<view class="uni-calendar-item__weeks-box" :class="{
+		'uni-calendar-item--disable':weeks.disable,
+		'uni-calendar-item--before-checked-x':weeks.beforeMultiple,
+		'uni-calendar-item--multiple': weeks.multiple,
+		'uni-calendar-item--after-checked-x':weeks.afterMultiple,
+		}" @click="choiceDate(weeks)" @mouseenter="handleMousemove(weeks)">
+		<view class="uni-calendar-item__weeks-box-item" :class="{
+				'uni-calendar-item--checked':calendar.fullDate === weeks.fullDate && (calendar.userChecked || !checkHover),
+				'uni-calendar-item--checked-range-text': checkHover,
+				'uni-calendar-item--before-checked':weeks.beforeMultiple,
+				'uni-calendar-item--multiple': weeks.multiple,
+				'uni-calendar-item--after-checked':weeks.afterMultiple,
+				'uni-calendar-item--disable':weeks.disable,
+				}">
+			<text v-if="selected&&weeks.extraInfo" class="uni-calendar-item__weeks-box-circle"></text>
+			<text class="uni-calendar-item__weeks-box-text uni-calendar-item__weeks-box-text-disable uni-calendar-item--checked-text">{{weeks.date}}</text>
+		</view>
+		<view :class="{'uni-calendar-item--isDay': weeks.isDay}"></view>
+	</view>
+</template>
+
+<script>
+	export default {
+		props: {
+			weeks: {
+				type: Object,
+				default () {
+					return {}
+				}
+			},
+			calendar: {
+				type: Object,
+				default: () => {
+					return {}
+				}
+			},
+			selected: {
+				type: Array,
+				default: () => {
+					return []
+				}
+			},
+			lunar: {
+				type: Boolean,
+				default: false
+			},
+			checkHover: {
+				type: Boolean,
+				default: false
+			}
+		},
+		methods: {
+			choiceDate(weeks) {
+				this.$emit('change', weeks)
+			},
+			handleMousemove(weeks) {
+				this.$emit('handleMouse', weeks)
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.uni-calendar-item__weeks-box {
+		flex: 1;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		margin: 1px 0;
+		position: relative;
+	}
+
+	.uni-calendar-item__weeks-box-text {
+		font-size: 14px;
+		// font-family: Lato-Bold, Lato;
+		font-weight: bold;
+		color: #455997;
+	}
+
+	.uni-calendar-item__weeks-lunar-text {
+		font-size: 12px;
+		color: #333;
+	}
+
+	.uni-calendar-item__weeks-box-item {
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		width: 40px;
+		height: 40px;
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
+	}
+
+
+	.uni-calendar-item__weeks-box-circle {
+		position: absolute;
+		top: 5px;
+		right: 5px;
+		width: 8px;
+		height: 8px;
+		border-radius: 8px;
+		background-color: #dd524d;
+
+	}
+
+	.uni-calendar-item__weeks-box .uni-calendar-item--disable {
+		// background-color: rgba(249, 249, 249, $uni-opacity-disabled);
+		cursor: default;
+	}
+
+	.uni-calendar-item--disable .uni-calendar-item__weeks-box-text-disable {
+		color: #D1D1D1;
+	}
+
+	.uni-calendar-item--isDay {
+		position: absolute;
+		top: 10px;
+		right: 17%;
+		background-color: #dd524d;
+		width:6px;
+		height: 6px;
+		border-radius: 50%;
+	}
+
+	.uni-calendar-item--extra {
+		color: #dd524d;
+		opacity: 0.8;
+	}
+
+	.uni-calendar-item__weeks-box .uni-calendar-item--checked {
+		background-color: #007aff;
+		border-radius: 50%;
+		box-sizing: border-box;
+		border: 3px solid #fff;
+	}
+
+	.uni-calendar-item--checked .uni-calendar-item--checked-text {
+		color: #fff;
+	}
+
+	.uni-calendar-item--multiple .uni-calendar-item--checked-range-text {
+		color: #333;
+	}
+
+	.uni-calendar-item--multiple {
+		background-color:  #F6F7FC;
+		// color: #fff;
+	}
+
+	.uni-calendar-item--multiple .uni-calendar-item--before-checked,
+	.uni-calendar-item--multiple .uni-calendar-item--after-checked {
+		background-color: #409eff;
+		border-radius: 50%;
+		box-sizing: border-box;
+		border: 3px solid #F6F7FC;
+	}
+
+	.uni-calendar-item--before-checked .uni-calendar-item--checked-text,
+	.uni-calendar-item--after-checked .uni-calendar-item--checked-text {
+		color: #fff;
+	}
+
+	.uni-calendar-item--before-checked-x {
+		border-top-left-radius: 50px;
+		border-bottom-left-radius: 50px;
+		box-sizing: border-box;
+		background-color: #F6F7FC;
+	}
+
+	.uni-calendar-item--after-checked-x {
+		border-top-right-radius: 50px;
+		border-bottom-right-radius: 50px;
+		background-color: #F6F7FC;
+	}
+</style>
diff --git a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.vue b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.vue
new file mode 100644
index 0000000..c48a096
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.vue
@@ -0,0 +1,898 @@
+<template>
+	<view class="uni-calendar" @mouseleave="leaveCale">
+		<view v-if="!insert&&show" class="uni-calendar__mask" :class="{'uni-calendar--mask-show':aniMaskShow}"
+			@click="clean"></view>
+		<view v-if="insert || show" class="uni-calendar__content"
+			:class="{'uni-calendar--fixed':!insert,'uni-calendar--ani-show':aniMaskShow, 'uni-calendar__content-mobile': aniMaskShow}">
+			<view class="uni-calendar__header" :class="{'uni-calendar__header-mobile' :!insert}">
+				<view v-if="left" class="uni-calendar__header-btn-box" @click.stop="pre">
+					<view class="uni-calendar__header-btn uni-calendar--left"></view>
+				</view>
+				<picker mode="date" :value="date" fields="month" @change="bindDateChange">
+					<text
+						class="uni-calendar__header-text">{{ (nowDate.year||'') + ' 年 ' + ( nowDate.month||'') +' 月'}}</text>
+				</picker>
+				<view v-if="right" class="uni-calendar__header-btn-box" @click.stop="next">
+					<view class="uni-calendar__header-btn uni-calendar--right"></view>
+				</view>
+				<view v-if="!insert" class="dialog-close" @click="clean">
+					<view class="dialog-close-plus" data-id="close"></view>
+					<view class="dialog-close-plus dialog-close-rotate" data-id="close"></view>
+				</view>
+
+				<!-- <text class="uni-calendar__backtoday" @click="backtoday">回到今天</text> -->
+			</view>
+			<view class="uni-calendar__box">
+				<view v-if="showMonth" class="uni-calendar__box-bg">
+					<text class="uni-calendar__box-bg-text">{{nowDate.month}}</text>
+				</view>
+				<view class="uni-calendar__weeks" style="padding-bottom: 7px;">
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{SUNText}}</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{monText}}</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{TUEText}}</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{WEDText}}</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{THUText}}</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{FRIText}}</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{SATText}}</text>
+					</view>
+				</view>
+				<view class="uni-calendar__weeks" v-for="(item,weekIndex) in weeks" :key="weekIndex">
+					<view class="uni-calendar__weeks-item" v-for="(weeks,weeksIndex) in item" :key="weeksIndex">
+						<calendar-item class="uni-calendar-item--hook" :weeks="weeks" :calendar="calendar"
+							:selected="selected" :lunar="lunar" :checkHover="range" @change="choiceDate"
+							@handleMouse="handleMouse">
+						</calendar-item>
+					</view>
+				</view>
+			</view>
+			<view v-if="!insert && !range && typeHasTime" class="uni-date-changed uni-calendar--fixed-top"
+				style="padding: 0 80px;">
+				<view class="uni-date-changed--time-date">{{tempSingleDate ? tempSingleDate : selectDateText}}</view>
+				<time-picker type="time" :start="reactStartTime" :end="reactEndTime" v-model="time"
+					:disabled="!tempSingleDate" :border="false" :hide-second="hideSecond" class="time-picker-style">
+				</time-picker>
+			</view>
+
+			<view v-if="!insert && range && typeHasTime" class="uni-date-changed uni-calendar--fixed-top">
+				<view class="uni-date-changed--time-start">
+					<view class="uni-date-changed--time-date">{{tempRange.before ? tempRange.before : startDateText}}
+					</view>
+					<time-picker type="time" :start="reactStartTime" v-model="timeRange.startTime" :border="false"
+						:hide-second="hideSecond" :disabled="!tempRange.before" class="time-picker-style">
+					</time-picker>
+				</view>
+				<uni-icons type="arrowthinright" color="#999" style="line-height: 50px;"></uni-icons>
+				<view class="uni-date-changed--time-end">
+					<view class="uni-date-changed--time-date">{{tempRange.after ? tempRange.after : endDateText}}</view>
+					<time-picker type="time" :end="reactEndTime" v-model="timeRange.endTime" :border="false"
+						:hide-second="hideSecond" :disabled="!tempRange.after" class="time-picker-style">
+					</time-picker>
+				</view>
+			</view>
+			<view v-if="!insert" class="uni-date-changed uni-date-btn--ok">
+				<!-- <view class="uni-calendar__header-btn-box">
+					<text class="uni-calendar__button-text uni-calendar--fixed-width">{{okText}}</text>
+				</view> -->
+				<view class="uni-datetime-picker--btn" @click="confirm">确认</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import Calendar from './util.js';
+	import calendarItem from './calendar-item.vue'
+	import timePicker from './time-picker.vue'
+	import {
+		initVueI18n
+	} from '@dcloudio/uni-i18n'
+	import messages from './i18n/index.js'
+	const {
+		t
+	} = initVueI18n(messages)
+	/**
+	 * Calendar 日历
+	 * @description 日历组件可以查看日期，选择任意范围内的日期，打点操作。常用场景如：酒店日期预订、火车机票选择购买日期、上下班打卡等
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=56
+	 * @property {String} date 自定义当前时间，默认为今天
+	 * @property {Boolean} lunar 显示农历
+	 * @property {String} startDate 日期选择范围-开始日期
+	 * @property {String} endDate 日期选择范围-结束日期
+	 * @property {Boolean} range 范围选择
+	 * @property {Boolean} insert = [true|false] 插入模式,默认为false
+	 * 	@value true 弹窗模式
+	 * 	@value false 插入模式
+	 * @property {Boolean} clearDate = [true|false] 弹窗模式是否清空上次选择内容
+	 * @property {Array} selected 打点，期待格式[{date: '2019-06-27', info: '签到', data: { custom: '自定义信息', name: '自定义消息头',xxx:xxx... }}]
+	 * @property {Boolean} showMonth 是否选择月份为背景
+	 * @event {Function} change 日期改变，`insert :ture` 时生效
+	 * @event {Function} confirm 确认选择`insert :false` 时生效
+	 * @event {Function} monthSwitch 切换月份时触发
+	 * @example <uni-calendar :insert="true":lunar="true" :start-date="'2019-3-2'":end-date="'2019-5-20'"@change="change" />
+	 */
+	export default {
+		components: {
+			calendarItem,
+			timePicker
+		},
+		props: {
+			date: {
+				type: String,
+				default: ''
+			},
+			defTime: {
+				type: [String, Object],
+				default: ''
+			},
+			selectableTimes: {
+				type: [Object],
+				default () {
+					return {}
+				}
+			},
+			selected: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			lunar: {
+				type: Boolean,
+				default: false
+			},
+			startDate: {
+				type: String,
+				default: ''
+			},
+			endDate: {
+				type: String,
+				default: ''
+			},
+			range: {
+				type: Boolean,
+				default: false
+			},
+			typeHasTime: {
+				type: Boolean,
+				default: false
+			},
+			insert: {
+				type: Boolean,
+				default: true
+			},
+			showMonth: {
+				type: Boolean,
+				default: true
+			},
+			clearDate: {
+				type: Boolean,
+				default: true
+			},
+			left: {
+				type: Boolean,
+				default: true
+			},
+			right: {
+				type: Boolean,
+				default: true
+			},
+			checkHover: {
+				type: Boolean,
+				default: true
+			},
+			hideSecond: {
+				type: [Boolean],
+				default: false
+			},
+			pleStatus: {
+				type: Object,
+				default () {
+					return {
+						before: '',
+						after: '',
+						data: [],
+						fulldate: ''
+					}
+				}
+			}
+		},
+		data() {
+			return {
+				show: false,
+				weeks: [],
+				calendar: {},
+				nowDate: '',
+				aniMaskShow: false,
+				firstEnter: true,
+				time: '',
+				timeRange: {
+					startTime: '',
+					endTime: ''
+				},
+				tempSingleDate: '',
+				tempRange: {
+					before: '',
+					after: ''
+				}
+			}
+		},
+		watch: {
+			date: {
+				immediate: true,
+				handler(newVal, oldVal) {
+					if (!this.range) {
+						this.tempSingleDate = newVal
+						setTimeout(() => {
+							this.init(newVal)
+						}, 100)
+					}
+				}
+			},
+			defTime: {
+				immediate: true,
+				handler(newVal, oldVal) {
+					if (!this.range) {
+						this.time = newVal
+					} else {
+						// console.log('-----', newVal);
+						this.timeRange.startTime = newVal.start
+						this.timeRange.endTime = newVal.end
+					}
+				}
+			},
+			startDate(val) {
+				this.cale.resetSatrtDate(val)
+				this.cale.setDate(this.nowDate.fullDate)
+				this.weeks = this.cale.weeks
+			},
+			endDate(val) {
+				this.cale.resetEndDate(val)
+				this.cale.setDate(this.nowDate.fullDate)
+				this.weeks = this.cale.weeks
+			},
+			selected(newVal) {
+				this.cale.setSelectInfo(this.nowDate.fullDate, newVal)
+				this.weeks = this.cale.weeks
+			},
+			pleStatus: {
+				immediate: true,
+				handler(newVal, oldVal) {
+					const {
+						before,
+						after,
+						fulldate,
+						which
+					} = newVal
+					this.tempRange.before = before
+					this.tempRange.after = after
+					setTimeout(() => {
+						if (fulldate) {
+							this.cale.setHoverMultiple(fulldate)
+							if (before && after) {
+								this.cale.lastHover = true
+								if (this.rangeWithinMonth(after, before)) return
+								this.setDate(before)
+							} else {
+								this.cale.setMultiple(fulldate)
+								this.setDate(this.nowDate.fullDate)
+								this.calendar.fullDate = ''
+								this.cale.lastHover = false
+							}
+						} else {
+							this.cale.setDefaultMultiple(before, after)
+							if (which === 'left') {
+								this.setDate(before)
+								this.weeks = this.cale.weeks
+							} else {
+								this.setDate(after)
+								this.weeks = this.cale.weeks
+							}
+							this.cale.lastHover = true
+						}
+					}, 16)
+				}
+			}
+		},
+		computed: {
+			reactStartTime() {
+				const activeDate = this.range ? this.tempRange.before : this.calendar.fullDate
+				const res = activeDate === this.startDate ? this.selectableTimes.start : ''
+				return res
+			},
+			reactEndTime() {
+				const activeDate = this.range ? this.tempRange.after : this.calendar.fullDate
+				const res = activeDate === this.endDate ? this.selectableTimes.end : ''
+				return res
+			},
+			/**
+			 * for i18n
+			 */
+			selectDateText() {
+				return t("uni-datetime-picker.selectDate")
+			},
+			startDateText() {
+				return this.startPlaceholder || t("uni-datetime-picker.startDate")
+			},
+			endDateText() {
+				return this.endPlaceholder || t("uni-datetime-picker.endDate")
+			},
+			okText() {
+				return t("uni-datetime-picker.ok")
+			},
+			monText() {
+				return t("uni-calender.MON")
+			},
+			TUEText() {
+				return t("uni-calender.TUE")
+			},
+			WEDText() {
+				return t("uni-calender.WED")
+			},
+			THUText() {
+				return t("uni-calender.THU")
+			},
+			FRIText() {
+				return t("uni-calender.FRI")
+			},
+			SATText() {
+				return t("uni-calender.SAT")
+			},
+			SUNText() {
+				return t("uni-calender.SUN")
+			},
+		},
+		created() {
+			// 获取日历方法实例
+			this.cale = new Calendar({
+				// date: new Date(),
+				selected: this.selected,
+				startDate: this.startDate,
+				endDate: this.endDate,
+				range: this.range,
+				// multipleStatus: this.pleStatus
+			})
+			// 选中某一天
+			// this.cale.setDate(this.date)
+			this.init(this.date)
+			// this.setDay
+		},
+		methods: {
+			leaveCale() {
+				this.firstEnter = true
+			},
+			handleMouse(weeks) {
+				if (weeks.disable) return
+				if (this.cale.lastHover) return
+				let {
+					before,
+					after
+				} = this.cale.multipleStatus
+				if (!before) return
+				this.calendar = weeks
+				// 设置范围选
+				this.cale.setHoverMultiple(this.calendar.fullDate)
+				this.weeks = this.cale.weeks
+				// hover时，进入一个日历，更新另一个
+				if (this.firstEnter) {
+					this.$emit('firstEnterCale', this.cale.multipleStatus)
+					this.firstEnter = false
+				}
+			},
+			rangeWithinMonth(A, B) {
+				const [yearA, monthA] = A.split('-')
+				const [yearB, monthB] = B.split('-')
+				return yearA === yearB && monthA === monthB
+			},
+
+			// 取消穿透
+			clean() {
+				this.close()
+			},
+
+			clearCalender() {
+				if (this.range) {
+					this.timeRange.startTime = ''
+					this.timeRange.endTime = ''
+					this.tempRange.before = ''
+					this.tempRange.after = ''
+					this.cale.multipleStatus.before = ''
+					this.cale.multipleStatus.after = ''
+					this.cale.multipleStatus.data = []
+					this.cale.lastHover = false
+				} else {
+					this.time = ''
+					this.tempSingleDate = ''
+				}
+				this.calendar.fullDate = ''
+				this.setDate()
+			},
+
+			bindDateChange(e) {
+				const value = e.detail.value + '-1'
+				this.init(value)
+			},
+			/**
+			 * 初始化日期显示
+			 * @param {Object} date
+			 */
+			init(date) {
+				this.cale.setDate(date)
+				this.weeks = this.cale.weeks
+				this.nowDate = this.calendar = this.cale.getInfo(date)
+			},
+			// choiceDate(weeks) {
+			// 	if (weeks.disable) return
+			// 	this.calendar = weeks
+			// 	// 设置多选
+			// 	this.cale.setMultiple(this.calendar.fullDate, true)
+			// 	this.weeks = this.cale.weeks
+			// 	this.tempSingleDate = this.calendar.fullDate
+			// 	this.tempRange.before = this.cale.multipleStatus.before
+			// 	this.tempRange.after = this.cale.multipleStatus.after
+			// 	this.change()
+			// },
+			/**
+			 * 打开日历弹窗
+			 */
+			open() {
+				// 弹窗模式并且清理数据
+				if (this.clearDate && !this.insert) {
+					this.cale.cleanMultipleStatus()
+					// this.cale.setDate(this.date)
+					this.init(this.date)
+				}
+				this.show = true
+				this.$nextTick(() => {
+					setTimeout(() => {
+						this.aniMaskShow = true
+					}, 50)
+				})
+			},
+			/**
+			 * 关闭日历弹窗
+			 */
+			close() {
+				this.aniMaskShow = false
+				this.$nextTick(() => {
+					setTimeout(() => {
+						this.show = false
+						this.$emit('close')
+					}, 300)
+				})
+			},
+			/**
+			 * 确认按钮
+			 */
+			confirm() {
+				this.setEmit('confirm')
+				this.close()
+			},
+			/**
+			 * 变化触发
+			 */
+			change() {
+				if (!this.insert) return
+				this.setEmit('change')
+			},
+			/**
+			 * 选择月份触发
+			 */
+			monthSwitch() {
+				let {
+					year,
+					month
+				} = this.nowDate
+				this.$emit('monthSwitch', {
+					year,
+					month: Number(month)
+				})
+			},
+			/**
+			 * 派发事件
+			 * @param {Object} name
+			 */
+			setEmit(name) {
+				let {
+					year,
+					month,
+					date,
+					fullDate,
+					lunar,
+					extraInfo
+				} = this.calendar
+				this.$emit(name, {
+					range: this.cale.multipleStatus,
+					year,
+					month,
+					date,
+					time: this.time,
+					timeRange: this.timeRange,
+					fulldate: fullDate,
+					lunar,
+					extraInfo: extraInfo || {}
+				})
+			},
+			/**
+			 * 选择天触发
+			 * @param {Object} weeks
+			 */
+			choiceDate(weeks) {
+				if (weeks.disable) return
+				this.calendar = weeks
+				this.calendar.userChecked = true
+				// 设置多选
+				this.cale.setMultiple(this.calendar.fullDate, true)
+				this.weeks = this.cale.weeks
+				this.tempSingleDate = this.calendar.fullDate
+				this.tempRange.before = this.cale.multipleStatus.before
+				this.tempRange.after = this.cale.multipleStatus.after
+				this.change()
+			},
+			/**
+			 * 回到今天
+			 */
+			backtoday() {
+				let date = this.cale.getDate(new Date()).fullDate
+				// this.cale.setDate(date)
+				this.init(date)
+				this.change()
+			},
+			/**
+			 * 比较时间大小
+			 */
+			dateCompare(startDate, endDate) {
+				// 计算截止时间
+				startDate = new Date(startDate.replace('-', '/').replace('-', '/'))
+				// 计算详细项的截止时间
+				endDate = new Date(endDate.replace('-', '/').replace('-', '/'))
+				if (startDate <= endDate) {
+					return true
+				} else {
+					return false
+				}
+			},
+			/**
+			 * 上个月
+			 */
+			pre() {
+				const preDate = this.cale.getDate(this.nowDate.fullDate, -1, 'month').fullDate
+				this.setDate(preDate)
+				this.monthSwitch()
+
+			},
+			/**
+			 * 下个月
+			 */
+			next() {
+				const nextDate = this.cale.getDate(this.nowDate.fullDate, +1, 'month').fullDate
+				this.setDate(nextDate)
+				this.monthSwitch()
+			},
+			/**
+			 * 设置日期
+			 * @param {Object} date
+			 */
+			setDate(date) {
+				this.cale.setDate(date)
+				this.weeks = this.cale.weeks
+				this.nowDate = this.cale.getInfo(date)
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.uni-calendar {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+	}
+
+	.uni-calendar__mask {
+		position: fixed;
+		bottom: 0;
+		top: 0;
+		left: 0;
+		right: 0;
+		background-color: rgba(0, 0, 0, 0.4);
+		transition-property: opacity;
+		transition-duration: 0.3s;
+		opacity: 0;
+		/* #ifndef APP-NVUE */
+		z-index: 99;
+		/* #endif */
+	}
+
+	.uni-calendar--mask-show {
+		opacity: 1
+	}
+
+	.uni-calendar--fixed {
+		position: fixed;
+		bottom: calc(var(--window-bottom));
+		left: 0;
+		right: 0;
+		transition-property: transform;
+		transition-duration: 0.3s;
+		transform: translateY(460px);
+		/* #ifndef APP-NVUE */
+		z-index: 99;
+		/* #endif */
+	}
+
+	.uni-calendar--ani-show {
+		transform: translateY(0);
+	}
+
+	.uni-calendar__content {
+		background-color: #fff;
+	}
+
+	.uni-calendar__content-mobile {
+		border-top-left-radius: 10px;
+		border-top-right-radius: 10px;
+		box-shadow: 0px 0px 5px 3px rgba(0, 0, 0, 0.1);
+	}
+
+	.uni-calendar__header {
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: center;
+		align-items: center;
+		height: 50px;
+	}
+
+	.uni-calendar__header-mobile {
+		padding: 10px;
+		padding-bottom: 0;
+	}
+
+	.uni-calendar--fixed-top {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: space-between;
+		border-top-color: rgba(0, 0, 0, 0.4);
+		border-top-style: solid;
+		border-top-width: 1px;
+	}
+
+	.uni-calendar--fixed-width {
+		width: 50px;
+	}
+
+	.uni-calendar__backtoday {
+		position: absolute;
+		right: 0;
+		top: 25rpx;
+		padding: 0 5px;
+		padding-left: 10px;
+		height: 25px;
+		line-height: 25px;
+		font-size: 12px;
+		border-top-left-radius: 25px;
+		border-bottom-left-radius: 25px;
+		color: #fff;
+		background-color: #f1f1f1;
+	}
+
+	.uni-calendar__header-text {
+		text-align: center;
+		width: 100px;
+		font-size: 15px;
+		color: #666;
+	}
+
+	.uni-calendar__button-text {
+		text-align: center;
+		width: 100px;
+		font-size: 14px;
+		color: #007aff;
+		/* #ifndef APP-NVUE */
+		letter-spacing: 3px;
+		/* #endif */
+	}
+
+	.uni-calendar__header-btn-box {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
+		width: 50px;
+		height: 50px;
+	}
+
+	.uni-calendar__header-btn {
+		width: 9px;
+		height: 9px;
+		border-left-color: #808080;
+		border-left-style: solid;
+		border-left-width: 1px;
+		border-top-color: #555555;
+		border-top-style: solid;
+		border-top-width: 1px;
+	}
+
+	.uni-calendar--left {
+		transform: rotate(-45deg);
+	}
+
+	.uni-calendar--right {
+		transform: rotate(135deg);
+	}
+
+
+	.uni-calendar__weeks {
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+	}
+
+	.uni-calendar__weeks-item {
+		flex: 1;
+	}
+
+	.uni-calendar__weeks-day {
+		flex: 1;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		height: 40px;
+		border-bottom-color: #F5F5F5;
+		border-bottom-style: solid;
+		border-bottom-width: 1px;
+	}
+
+	.uni-calendar__weeks-day-text {
+		font-size: 12px;
+		color: #B2B2B2;
+	}
+
+	.uni-calendar__box {
+		position: relative;
+		// padding: 0 10px;
+		padding-bottom: 7px;
+	}
+
+	.uni-calendar__box-bg {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		justify-content: center;
+		align-items: center;
+		position: absolute;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+	}
+
+	.uni-calendar__box-bg-text {
+		font-size: 200px;
+		font-weight: bold;
+		color: #999;
+		opacity: 0.1;
+		text-align: center;
+		/* #ifndef APP-NVUE */
+		line-height: 1;
+		/* #endif */
+	}
+
+	.uni-date-changed {
+		padding: 0 10px;
+		// line-height: 50px;
+		text-align: center;
+		color: #333;
+		border-top-color: #DCDCDC;
+		;
+		border-top-style: solid;
+		border-top-width: 1px;
+		flex: 1;
+	}
+
+	.uni-date-btn--ok {
+		padding: 20px 15px;
+	}
+
+	.uni-date-changed--time-start {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		align-items: center;
+	}
+
+	.uni-date-changed--time-end {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		align-items: center;
+	}
+
+	.uni-date-changed--time-date {
+		color: #999;
+		line-height: 50px;
+		margin-right: 5px;
+		// opacity: 0.6;
+	}
+
+	.time-picker-style {
+		// width: 62px;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		justify-content: center;
+		align-items: center
+	}
+
+	.mr-10 {
+		margin-right: 10px;
+	}
+
+	.dialog-close {
+		position: absolute;
+		top: 0;
+		right: 0;
+		bottom: 0;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		padding: 0 25px;
+		margin-top: 10px;
+	}
+
+	.dialog-close-plus {
+		width: 16px;
+		height: 2px;
+		background-color: #737987;
+		border-radius: 2px;
+		transform: rotate(45deg);
+	}
+
+	.dialog-close-rotate {
+		position: absolute;
+		transform: rotate(-45deg);
+	}
+
+	.uni-datetime-picker--btn {
+		border-radius: 100px;
+		height: 40px;
+		line-height: 40px;
+		background-color: #007aff;
+		color: #fff;
+		font-size: 16px;
+		letter-spacing: 5px;
+	}
+
+	/* #ifndef APP-NVUE */
+	.uni-datetime-picker--btn:active {
+		opacity: 0.7;
+	}
+	/* #endif */
+</style>
diff --git a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/en.json b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/en.json
new file mode 100644
index 0000000..cc76311
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/en.json
@@ -0,0 +1,19 @@
+{
+	"uni-datetime-picker.selectDate": "select date",
+	"uni-datetime-picker.selectTime": "select time",
+	"uni-datetime-picker.selectDateTime": "select datetime",
+	"uni-datetime-picker.startDate": "start date",
+	"uni-datetime-picker.endDate": "end date",
+	"uni-datetime-picker.startTime": "start time",
+	"uni-datetime-picker.endTime": "end time",
+	"uni-datetime-picker.ok": "ok",
+	"uni-datetime-picker.clear": "clear",
+	"uni-datetime-picker.cancel": "cancel",
+	"uni-calender.MON": "MON",
+	"uni-calender.TUE": "TUE",
+	"uni-calender.WED": "WED",
+	"uni-calender.THU": "THU",
+	"uni-calender.FRI": "FRI",
+	"uni-calender.SAT": "SAT",
+	"uni-calender.SUN": "SUN"
+}
diff --git a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/index.js b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/index.js
new file mode 100644
index 0000000..de7509c
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/index.js
@@ -0,0 +1,8 @@
+import en from './en.json'
+import zhHans from './zh-Hans.json'
+import zhHant from './zh-Hant.json'
+export default {
+	en,
+	'zh-Hans': zhHans,
+	'zh-Hant': zhHant
+}
diff --git a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/zh-Hans.json b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/zh-Hans.json
new file mode 100644
index 0000000..7bc7405
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/zh-Hans.json
@@ -0,0 +1,19 @@
+{
+	"uni-datetime-picker.selectDate": "选择日期",
+	"uni-datetime-picker.selectTime": "选择时间",
+	"uni-datetime-picker.selectDateTime": "选择日期时间",
+	"uni-datetime-picker.startDate": "开始日期",
+	"uni-datetime-picker.endDate": "结束日期",
+	"uni-datetime-picker.startTime": "开始时间",
+	"uni-datetime-picker.endTime": "结束时间",
+	"uni-datetime-picker.ok": "确定",
+	"uni-datetime-picker.clear": "清除",
+	"uni-datetime-picker.cancel": "取消",
+	"uni-calender.SUN": "日",
+	"uni-calender.MON": "一",
+	"uni-calender.TUE": "二",
+	"uni-calender.WED": "三",
+	"uni-calender.THU": "四",
+	"uni-calender.FRI": "五",
+	"uni-calender.SAT": "六"
+}
diff --git a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/zh-Hant.json b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/zh-Hant.json
new file mode 100644
index 0000000..7d37043
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/zh-Hant.json
@@ -0,0 +1,19 @@
+{
+	"uni-datetime-picker.selectDate": "選擇日期",
+	"uni-datetime-picker.selectTime": "選擇時間",
+	"uni-datetime-picker.selectDateTime": "選擇日期時間",
+	"uni-datetime-picker.startDate": "開始日期",
+	"uni-datetime-picker.endDate": "結束日期",
+	"uni-datetime-picker.startTime": "開始时间",
+	"uni-datetime-picker.endTime": "結束时间",
+	"uni-datetime-picker.ok": "確定",
+	"uni-datetime-picker.clear": "清除",
+	"uni-datetime-picker.cancel": "取消",
+	"uni-calender.SUN": "日",
+	"uni-calender.MON": "一",
+	"uni-calender.TUE": "二",
+	"uni-calender.WED": "三",
+	"uni-calender.THU": "四",
+	"uni-calender.FRI": "五",
+	"uni-calender.SAT": "六"
+}
diff --git a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/keypress.js b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/keypress.js
new file mode 100644
index 0000000..9601aba
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/keypress.js
@@ -0,0 +1,45 @@
+// #ifdef H5
+export default {
+  name: 'Keypress',
+  props: {
+    disable: {
+      type: Boolean,
+      default: false
+    }
+  },
+  mounted () {
+    const keyNames = {
+      esc: ['Esc', 'Escape'],
+      tab: 'Tab',
+      enter: 'Enter',
+      space: [' ', 'Spacebar'],
+      up: ['Up', 'ArrowUp'],
+      left: ['Left', 'ArrowLeft'],
+      right: ['Right', 'ArrowRight'],
+      down: ['Down', 'ArrowDown'],
+      delete: ['Backspace', 'Delete', 'Del']
+    }
+    const listener = ($event) => {
+      if (this.disable) {
+        return
+      }
+      const keyName = Object.keys(keyNames).find(key => {
+        const keyName = $event.key
+        const value = keyNames[key]
+        return value === keyName || (Array.isArray(value) && value.includes(keyName))
+      })
+      if (keyName) {
+        // 避免和其他按键事件冲突
+        setTimeout(() => {
+          this.$emit(keyName, {})
+        }, 0)
+      }
+    }
+    document.addEventListener('keyup', listener)
+    this.$once('hook:beforeDestroy', () => {
+      document.removeEventListener('keyup', listener)
+    })
+  },
+	render: () => {}
+}
+// #endif
\ No newline at end of file
diff --git a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/time-picker.vue b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/time-picker.vue
new file mode 100644
index 0000000..699aa63
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/time-picker.vue
@@ -0,0 +1,927 @@
+<template>
+	<view class="uni-datetime-picker">
+		<view @click="initTimePicker">
+			<slot>
+				<view class="uni-datetime-picker-timebox-pointer"
+					:class="{'uni-datetime-picker-disabled': disabled, 'uni-datetime-picker-timebox': border}">
+					<text class="uni-datetime-picker-text">{{time}}</text>
+					<view v-if="!time" class="uni-datetime-picker-time">
+						<text class="uni-datetime-picker-text">{{selectTimeText}}</text>
+					</view>
+				</view>
+			</slot>
+		</view>
+		<view v-if="visible" id="mask" class="uni-datetime-picker-mask" @click="tiggerTimePicker"></view>
+		<view v-if="visible" class="uni-datetime-picker-popup" :class="[dateShow && timeShow ? '' : 'fix-nvue-height']"
+			:style="fixNvueBug">
+			<view class="uni-title">
+				<text class="uni-datetime-picker-text">{{selectTimeText}}</text>
+			</view>
+			<view v-if="dateShow" class="uni-datetime-picker__container-box">
+				<picker-view class="uni-datetime-picker-view" :indicator-style="indicatorStyle" :value="ymd"
+					@change="bindDateChange">
+					<picker-view-column>
+						<view class="uni-datetime-picker-item" v-for="(item,index) in years" :key="index">
+							<text class="uni-datetime-picker-item">{{lessThanTen(item)}}</text>
+						</view>
+					</picker-view-column>
+					<picker-view-column>
+						<view class="uni-datetime-picker-item" v-for="(item,index) in months" :key="index">
+							<text class="uni-datetime-picker-item">{{lessThanTen(item)}}</text>
+						</view>
+					</picker-view-column>
+					<picker-view-column>
+						<view class="uni-datetime-picker-item" v-for="(item,index) in days" :key="index">
+							<text class="uni-datetime-picker-item">{{lessThanTen(item)}}</text>
+						</view>
+					</picker-view-column>
+				</picker-view>
+				<!-- 兼容 nvue 不支持伪类 -->
+				<text class="uni-datetime-picker-sign sign-left">-</text>
+				<text class="uni-datetime-picker-sign sign-right">-</text>
+			</view>
+			<view v-if="timeShow" class="uni-datetime-picker__container-box">
+				<picker-view class="uni-datetime-picker-view" :class="[hideSecond ? 'time-hide-second' : '']"
+					:indicator-style="indicatorStyle" :value="hms" @change="bindTimeChange">
+					<picker-view-column>
+						<view class="uni-datetime-picker-item" v-for="(item,index) in hours" :key="index">
+							<text class="uni-datetime-picker-item">{{lessThanTen(item)}}</text>
+						</view>
+					</picker-view-column>
+					<picker-view-column>
+						<view class="uni-datetime-picker-item" v-for="(item,index) in minutes" :key="index">
+							<text class="uni-datetime-picker-item">{{lessThanTen(item)}}</text>
+						</view>
+					</picker-view-column>
+					<picker-view-column v-if="!hideSecond">
+						<view class="uni-datetime-picker-item" v-for="(item,index) in seconds" :key="index">
+							<text class="uni-datetime-picker-item">{{lessThanTen(item)}}</text>
+						</view>
+					</picker-view-column>
+				</picker-view>
+				<!-- 兼容 nvue 不支持伪类 -->
+				<text class="uni-datetime-picker-sign" :class="[hideSecond ? 'sign-center' : 'sign-left']">:</text>
+				<text v-if="!hideSecond" class="uni-datetime-picker-sign sign-right">:</text>
+			</view>
+			<view class="uni-datetime-picker-btn">
+				<view @click="clearTime">
+					<text class="uni-datetime-picker-btn-text">{{clearText}}</text>
+				</view>
+				<view class="uni-datetime-picker-btn-group">
+					<view class="uni-datetime-picker-cancel" @click="tiggerTimePicker">
+						<text class="uni-datetime-picker-btn-text">{{cancelText}}</text>
+					</view>
+					<view @click="setTime">
+						<text class="uni-datetime-picker-btn-text">{{okText}}</text>
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- #ifdef H5 -->
+		<!-- <keypress v-if="visible" @esc="tiggerTimePicker" @enter="setTime" /> -->
+		<!-- #endif -->
+	</view>
+</template>
+
+<script>
+	// #ifdef H5
+	import keypress from './keypress'
+	// #endif
+	import {
+		initVueI18n
+	} from '@dcloudio/uni-i18n'
+	import messages from './i18n/index.js'
+	const {	t	} = initVueI18n(messages)
+
+	/**
+	 * DatetimePicker 时间选择器
+	 * @description 可以同时选择日期和时间的选择器
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=xxx
+	 * @property {String} type = [datetime | date | time] 显示模式
+	 * @property {Boolean} multiple = [true|false] 是否多选
+	 * @property {String|Number} value 默认值
+	 * @property {String|Number} start 起始日期或时间
+	 * @property {String|Number} end 起始日期或时间
+	 * @property {String} return-type = [timestamp | string]
+	 * @event {Function} change  选中发生变化触发
+	 */
+
+	export default {
+		name: 'UniDatetimePicker',
+		components: {
+			// #ifdef H5
+			keypress
+			// #endif
+		},
+		data() {
+			return {
+				indicatorStyle: `height: 50px;`,
+				visible: false,
+				fixNvueBug: {},
+				dateShow: true,
+				timeShow: true,
+				title: '日期和时间',
+				// 输入框当前时间
+				time: '',
+				// 当前的年月日时分秒
+				year: 1920,
+				month: 0,
+				day: 0,
+				hour: 0,
+				minute: 0,
+				second: 0,
+				// 起始时间
+				startYear: 1920,
+				startMonth: 1,
+				startDay: 1,
+				startHour: 0,
+				startMinute: 0,
+				startSecond: 0,
+				// 结束时间
+				endYear: 2120,
+				endMonth: 12,
+				endDay: 31,
+				endHour: 23,
+				endMinute: 59,
+				endSecond: 59,
+			}
+		},
+		props: {
+			type: {
+				type: String,
+				default: 'datetime'
+			},
+			value: {
+				type: [String, Number],
+				default: ''
+			},
+			modelValue: {
+				type: [String, Number],
+				default: ''
+			},
+			start: {
+				type: [Number, String],
+				default: ''
+			},
+			end: {
+				type: [Number, String],
+				default: ''
+			},
+			returnType: {
+				type: String,
+				default: 'string'
+			},
+			disabled: {
+				type: [Boolean, String],
+				default: false
+			},
+			border: {
+				type: [Boolean, String],
+				default: true
+			},
+			hideSecond: {
+				type: [Boolean, String],
+				default: false
+			}
+		},
+		watch: {
+			value: {
+				handler(newVal, oldVal) {
+					if (newVal) {
+						this.parseValue(this.fixIosDateFormat(newVal)) //兼容 iOS、safari 日期格式
+						this.initTime(false)
+					} else {
+						this.time = ''
+						this.parseValue(Date.now())
+					}
+				},
+				immediate: true
+			},
+			type: {
+				handler(newValue) {
+					if (newValue === 'date') {
+						this.dateShow = true
+						this.timeShow = false
+						this.title = '日期'
+					} else if (newValue === 'time') {
+						this.dateShow = false
+						this.timeShow = true
+						this.title = '时间'
+					} else {
+						this.dateShow = true
+						this.timeShow = true
+						this.title = '日期和时间'
+					}
+				},
+				immediate: true
+			},
+			start: {
+				handler(newVal) {
+					this.parseDatetimeRange(this.fixIosDateFormat(newVal), 'start') //兼容 iOS、safari 日期格式
+				},
+				immediate: true
+			},
+			end: {
+				handler(newVal) {
+					this.parseDatetimeRange(this.fixIosDateFormat(newVal), 'end') //兼容 iOS、safari 日期格式
+				},
+				immediate: true
+			},
+
+			// 月、日、时、分、秒可选范围变化后，检查当前值是否在范围内，不在则当前值重置为可选范围第一项
+			months(newVal) {
+				this.checkValue('month', this.month, newVal)
+			},
+			days(newVal) {
+				this.checkValue('day', this.day, newVal)
+			},
+			hours(newVal) {
+				this.checkValue('hour', this.hour, newVal)
+			},
+			minutes(newVal) {
+				this.checkValue('minute', this.minute, newVal)
+			},
+			seconds(newVal) {
+				this.checkValue('second', this.second, newVal)
+			}
+		},
+		computed: {
+			// 当前年、月、日、时、分、秒选择范围
+			years() {
+				return this.getCurrentRange('year')
+			},
+
+			months() {
+				return this.getCurrentRange('month')
+			},
+
+			days() {
+				return this.getCurrentRange('day')
+			},
+
+			hours() {
+				return this.getCurrentRange('hour')
+			},
+
+			minutes() {
+				return this.getCurrentRange('minute')
+			},
+
+			seconds() {
+				return this.getCurrentRange('second')
+			},
+
+			// picker 当前值数组
+			ymd() {
+				return [this.year - this.minYear, this.month - this.minMonth, this.day - this.minDay]
+			},
+			hms() {
+				return [this.hour - this.minHour, this.minute - this.minMinute, this.second - this.minSecond]
+			},
+
+			// 当前 date 是 start
+			currentDateIsStart() {
+				return this.year === this.startYear && this.month === this.startMonth && this.day === this.startDay
+			},
+
+			// 当前 date 是 end
+			currentDateIsEnd() {
+				return this.year === this.endYear && this.month === this.endMonth && this.day === this.endDay
+			},
+
+			// 当前年、月、日、时、分、秒的最小值和最大值
+			minYear() {
+				return this.startYear
+			},
+			maxYear() {
+				return this.endYear
+			},
+			minMonth() {
+				if (this.year === this.startYear) {
+					return this.startMonth
+				} else {
+					return 1
+				}
+			},
+			maxMonth() {
+				if (this.year === this.endYear) {
+					return this.endMonth
+				} else {
+					return 12
+				}
+			},
+			minDay() {
+				if (this.year === this.startYear && this.month === this.startMonth) {
+					return this.startDay
+				} else {
+					return 1
+				}
+			},
+			maxDay() {
+				if (this.year === this.endYear && this.month === this.endMonth) {
+					return this.endDay
+				} else {
+					return this.daysInMonth(this.year, this.month)
+				}
+			},
+			minHour() {
+				if (this.type === 'datetime') {
+					if (this.currentDateIsStart) {
+						return this.startHour
+					} else {
+						return 0
+					}
+				}
+				if (this.type === 'time') {
+					return this.startHour
+				}
+			},
+			maxHour() {
+				if (this.type === 'datetime') {
+					if (this.currentDateIsEnd) {
+						return this.endHour
+					} else {
+						return 23
+					}
+				}
+				if (this.type === 'time') {
+					return this.endHour
+				}
+			},
+			minMinute() {
+				if (this.type === 'datetime') {
+					if (this.currentDateIsStart && this.hour === this.startHour) {
+						return this.startMinute
+					} else {
+						return 0
+					}
+				}
+				if (this.type === 'time') {
+					if (this.hour === this.startHour) {
+						return this.startMinute
+					} else {
+						return 0
+					}
+				}
+			},
+			maxMinute() {
+				if (this.type === 'datetime') {
+					if (this.currentDateIsEnd && this.hour === this.endHour) {
+						return this.endMinute
+					} else {
+						return 59
+					}
+				}
+				if (this.type === 'time') {
+					if (this.hour === this.endHour) {
+						return this.endMinute
+					} else {
+						return 59
+					}
+				}
+			},
+			minSecond() {
+				if (this.type === 'datetime') {
+					if (this.currentDateIsStart && this.hour === this.startHour && this.minute === this.startMinute) {
+						return this.startSecond
+					} else {
+						return 0
+					}
+				}
+				if (this.type === 'time') {
+					if (this.hour === this.startHour && this.minute === this.startMinute) {
+						return this.startSecond
+					} else {
+						return 0
+					}
+				}
+			},
+			maxSecond() {
+				if (this.type === 'datetime') {
+					if (this.currentDateIsEnd && this.hour === this.endHour && this.minute === this.endMinute) {
+						return this.endSecond
+					} else {
+						return 59
+					}
+				}
+				if (this.type === 'time') {
+					if (this.hour === this.endHour && this.minute === this.endMinute) {
+						return this.endSecond
+					} else {
+						return 59
+					}
+				}
+			},
+
+			/**
+			 * for i18n
+			 */
+			selectTimeText() {
+				return t("uni-datetime-picker.selectTime")
+			},
+			okText() {
+				return t("uni-datetime-picker.ok")
+			},
+			clearText() {
+				return t("uni-datetime-picker.clear")
+			},
+			cancelText() {
+				return t("uni-datetime-picker.cancel")
+			}
+		},
+
+		mounted() {
+			// #ifdef APP-NVUE
+			const res = uni.getSystemInfoSync();
+			this.fixNvueBug = {
+				top: res.windowHeight / 2,
+				left: res.windowWidth / 2
+			}
+			// #endif
+		},
+
+		methods: {
+			/**
+			 * @param {Object} item
+			 * 小于 10 在前面加个 0
+			 */
+
+			lessThanTen(item) {
+				return item < 10 ? '0' + item : item
+			},
+
+			/**
+			 * 解析时分秒字符串，例如：00:00:00
+			 * @param {String} timeString
+			 */
+			parseTimeType(timeString) {
+				if (timeString) {
+					let timeArr = timeString.split(':')
+					this.hour = Number(timeArr[0])
+					this.minute = Number(timeArr[1])
+					this.second = Number(timeArr[2])
+				}
+			},
+
+			/**
+			 * 解析选择器初始值，类型可以是字符串、时间戳，例如：2000-10-02、'08:30:00'、 1610695109000
+			 * @param {String | Number} datetime
+			 */
+			initPickerValue(datetime) {
+				let defaultValue = null
+				if (datetime) {
+					defaultValue = this.compareValueWithStartAndEnd(datetime, this.start, this.end)
+				} else {
+					defaultValue = Date.now()
+					defaultValue = this.compareValueWithStartAndEnd(defaultValue, this.start, this.end)
+				}
+				this.parseValue(defaultValue)
+			},
+
+			/**
+			 * 初始值规则：
+			 * - 用户设置初始值 value
+			 * 	- 设置了起始时间 start、终止时间 end，并 start < value < end，初始值为 value， 否则初始值为 start
+			 * 	- 只设置了起始时间 start，并 start < value，初始值为 value，否则初始值为 start
+			 * 	- 只设置了终止时间 end，并 value < end，初始值为 value，否则初始值为 end
+			 * 	- 无起始终止时间，则初始值为 value
+			 * - 无初始值 value，则初始值为当前本地时间 Date.now()
+			 * @param {Object} value
+			 * @param {Object} dateBase
+			 */
+			compareValueWithStartAndEnd(value, start, end) {
+				let winner = null
+				value = this.superTimeStamp(value)
+				start = this.superTimeStamp(start)
+				end = this.superTimeStamp(end)
+
+				if (start && end) {
+					if (value < start) {
+						winner = new Date(start)
+					} else if (value > end) {
+						winner = new Date(end)
+					} else {
+						winner = new Date(value)
+					}
+				} else if (start && !end) {
+					winner = start <= value ? new Date(value) : new Date(start)
+				} else if (!start && end) {
+					winner = value <= end ? new Date(value) : new Date(end)
+				} else {
+					winner = new Date(value)
+				}
+
+				return winner
+			},
+
+			/**
+			 * 转换为可比较的时间戳，接受日期、时分秒、时间戳
+			 * @param {Object} value
+			 */
+			superTimeStamp(value) {
+				let dateBase = ''
+				if (this.type === 'time' && value && typeof value === 'string') {
+					const now = new Date()
+					const year = now.getFullYear()
+					const month = now.getMonth() + 1
+					const day = now.getDate()
+					dateBase = year + '/' + month + '/' + day + ' '
+				}
+				if (Number(value) && typeof value !== NaN) {
+					value = parseInt(value)
+					dateBase = 0
+				}
+				return this.createTimeStamp(dateBase + value)
+			},
+
+			/**
+			 * 解析默认值 value，字符串、时间戳
+			 * @param {Object} defaultTime
+			 */
+			parseValue(value) {
+				if (!value) {
+					return
+				}
+				if (this.type === 'time' && typeof value === "string") {
+					this.parseTimeType(value)
+				} else {
+					let defaultDate = null
+					defaultDate = new Date(value)
+					if (this.type !== 'time') {
+						this.year = defaultDate.getFullYear()
+						this.month = defaultDate.getMonth() + 1
+						this.day = defaultDate.getDate()
+					}
+					if (this.type !== 'date') {
+						this.hour = defaultDate.getHours()
+						this.minute = defaultDate.getMinutes()
+						this.second = defaultDate.getSeconds()
+					}
+				}
+				if (this.hideSecond) {
+					this.second = 0
+				}
+			},
+
+			/**
+			 * 解析可选择时间范围 start、end，年月日字符串、时间戳
+			 * @param {Object} defaultTime
+			 */
+			parseDatetimeRange(point, pointType) {
+				// 时间为空，则重置为初始值
+				if (!point) {
+					if (pointType === 'start') {
+						this.startYear = 1920
+						this.startMonth = 1
+						this.startDay = 1
+						this.startHour = 0
+						this.startMinute = 0
+						this.startSecond = 0
+					}
+					if (pointType === 'end') {
+						this.endYear = 2120
+						this.endMonth = 12
+						this.endDay = 31
+						this.endHour = 23
+						this.endMinute = 59
+						this.endSecond = 59
+					}
+					return
+				}
+				if (this.type === 'time') {
+					const pointArr = point.split(':')
+					this[pointType + 'Hour'] = Number(pointArr[0])
+					this[pointType + 'Minute'] = Number(pointArr[1])
+					this[pointType + 'Second'] = Number(pointArr[2])
+				} else {
+					if (!point) {
+						pointType === 'start' ? this.startYear = this.year - 60 : this.endYear = this.year + 60
+						return
+					}
+					if (Number(point) && Number(point) !== NaN) {
+						point = parseInt(point)
+					}
+					// datetime 的 end 没有时分秒, 则不限制
+					const hasTime = /[0-9]:[0-9]/
+					if (this.type === 'datetime' && pointType === 'end' && typeof point === 'string' && !hasTime.test(
+							point)) {
+						point = point + ' 23:59:59'
+					}
+					const pointDate = new Date(point)
+					this[pointType + 'Year'] = pointDate.getFullYear()
+					this[pointType + 'Month'] = pointDate.getMonth() + 1
+					this[pointType + 'Day'] = pointDate.getDate()
+					if (this.type === 'datetime') {
+						this[pointType + 'Hour'] = pointDate.getHours()
+						this[pointType + 'Minute'] = pointDate.getMinutes()
+						this[pointType + 'Second'] = pointDate.getSeconds()
+					}
+				}
+			},
+
+			// 获取 年、月、日、时、分、秒 当前可选范围
+			getCurrentRange(value) {
+				const range = []
+				for (let i = this['min' + this.capitalize(value)]; i <= this['max' + this.capitalize(value)]; i++) {
+					range.push(i)
+				}
+				return range
+			},
+
+			// 字符串首字母大写
+			capitalize(str) {
+				return str.charAt(0).toUpperCase() + str.slice(1)
+			},
+
+			// 检查当前值是否在范围内，不在则当前值重置为可选范围第一项
+			checkValue(name, value, values) {
+				if (values.indexOf(value) === -1) {
+					this[name] = values[0]
+				}
+			},
+
+			// 每个月的实际天数
+			daysInMonth(year, month) { // Use 1 for January, 2 for February, etc.
+				return new Date(year, month, 0).getDate();
+			},
+
+			//兼容 iOS、safari 日期格式
+			fixIosDateFormat(value) {
+				if (typeof value === 'string') {
+					value = value.replace(/-/g, '/')
+				}
+				return value
+			},
+
+			/**
+			 * 生成时间戳
+			 * @param {Object} time
+			 */
+			createTimeStamp(time) {
+				if (!time) return
+				if (typeof time === "number") {
+					return time
+				} else {
+					time = time.replace(/-/g, '/')
+					if (this.type === 'date') {
+						time = time + ' ' + '00:00:00'
+					}
+					return Date.parse(time)
+				}
+			},
+
+			/**
+			 * 生成日期或时间的字符串
+			 */
+			createDomSting() {
+				const yymmdd = this.year +
+					'-' +
+					this.lessThanTen(this.month) +
+					'-' +
+					this.lessThanTen(this.day)
+
+				let hhmmss = this.lessThanTen(this.hour) +
+					':' +
+					this.lessThanTen(this.minute)
+
+				if (!this.hideSecond) {
+					hhmmss = hhmmss + ':' + this.lessThanTen(this.second)
+				}
+
+				if (this.type === 'date') {
+					return yymmdd
+				} else if (this.type === 'time') {
+					return hhmmss
+				} else {
+					return yymmdd + ' ' + hhmmss
+				}
+			},
+
+			/**
+			 * 初始化返回值，并抛出 change 事件
+			 */
+			initTime(emit = true) {
+				this.time = this.createDomSting()
+				if (!emit) return
+				if (this.returnType === 'timestamp' && this.type !== 'time') {
+					this.$emit('change', this.createTimeStamp(this.time))
+					this.$emit('input', this.createTimeStamp(this.time))
+					this.$emit('update:modelValue', this.createTimeStamp(this.time))
+				} else {
+					this.$emit('change', this.time)
+					this.$emit('input', this.time)
+					this.$emit('update:modelValue', this.time)
+				}
+			},
+
+			/**
+			 * 用户选择日期或时间更新 data
+			 * @param {Object} e
+			 */
+			bindDateChange(e) {
+				const val = e.detail.value
+				this.year = this.years[val[0]]
+				this.month = this.months[val[1]]
+				this.day = this.days[val[2]]
+			},
+			bindTimeChange(e) {
+				const val = e.detail.value
+				this.hour = this.hours[val[0]]
+				this.minute = this.minutes[val[1]]
+				this.second = this.seconds[val[2]]
+			},
+
+			/**
+			 * 初始化弹出层
+			 */
+			initTimePicker() {
+				if (this.disabled) return
+				const value = this.fixIosDateFormat(this.value)
+				this.initPickerValue(value)
+				this.visible = !this.visible
+			},
+
+			/**
+			 * 触发或关闭弹框
+			 */
+			tiggerTimePicker(e) {
+				this.visible = !this.visible
+			},
+
+			/**
+			 * 用户点击“清空”按钮，清空当前值
+			 */
+			clearTime() {
+				this.time = ''
+				this.$emit('change', this.time)
+				this.$emit('input', this.time)
+				this.$emit('update:modelValue', this.time)
+				this.tiggerTimePicker()
+			},
+
+			/**
+			 * 用户点击“确定”按钮
+			 */
+			setTime() {
+				this.initTime()
+				this.tiggerTimePicker()
+			}
+		}
+	}
+</script>
+
+<style>
+	.uni-datetime-picker {
+		/* #ifndef APP-NVUE */
+		/* width: 100%; */
+		/* #endif */
+	}
+
+	.uni-datetime-picker-view {
+		height: 130px;
+		width: 270px;
+		/* #ifndef APP-NVUE */
+		cursor: pointer;
+		/* #endif */
+	}
+
+	.uni-datetime-picker-item {
+		height: 50px;
+		line-height: 50px;
+		text-align: center;
+		font-size: 14px;
+	}
+
+	.uni-datetime-picker-btn {
+		margin-top: 60px;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		cursor: pointer;
+		/* #endif */
+		flex-direction: row;
+		justify-content: space-between;
+	}
+
+	.uni-datetime-picker-btn-text {
+		font-size: 14px;
+		color: #007AFF;
+	}
+
+	.uni-datetime-picker-btn-group {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+	}
+
+	.uni-datetime-picker-cancel {
+		margin-right: 30px;
+	}
+
+	.uni-datetime-picker-mask {
+		position: fixed;
+		bottom: 0px;
+		top: 0px;
+		left: 0px;
+		right: 0px;
+		background-color: rgba(0, 0, 0, 0.4);
+		transition-duration: 0.3s;
+		z-index: 998;
+	}
+
+	.uni-datetime-picker-popup {
+		border-radius: 8px;
+		padding: 30px;
+		width: 270px;
+		/* #ifdef APP-NVUE */
+		height: 500px;
+		/* #endif */
+		/* #ifdef APP-NVUE */
+		width: 330px;
+		/* #endif */
+		background-color: #fff;
+		position: fixed;
+		top: 50%;
+		left: 50%;
+		transform: translate(-50%, -50%);
+		transition-duration: 0.3s;
+		z-index: 999;
+	}
+
+	.fix-nvue-height {
+		/* #ifdef APP-NVUE */
+		height: 330px;
+		/* #endif */
+	}
+
+	.uni-datetime-picker-time {
+		color: grey;
+	}
+
+	.uni-datetime-picker-column {
+		height: 50px;
+	}
+
+	.uni-datetime-picker-timebox {
+
+		border: 1px solid #E5E5E5;
+		border-radius: 5px;
+		padding: 7px 10px;
+		/* #ifndef APP-NVUE */
+		box-sizing: border-box;
+		cursor: pointer;
+		/* #endif */
+	}
+
+	.uni-datetime-picker-timebox-pointer {
+		/* #ifndef APP-NVUE */
+		cursor: pointer;
+		/* #endif */
+	}
+
+
+	.uni-datetime-picker-disabled {
+		opacity: 0.4;
+		/* #ifdef H5 */
+		cursor: not-allowed !important;
+		/* #endif */
+	}
+
+	.uni-datetime-picker-text {
+		font-size: 14px;
+	}
+
+	.uni-datetime-picker-sign {
+		position: absolute;
+		top: 53px;
+		/* 减掉 10px 的元素高度，兼容nvue */
+		color: #999;
+		/* #ifdef APP-NVUE */
+		font-size: 16px;
+		/* #endif */
+	}
+
+	.sign-left {
+		left: 86px;
+	}
+
+	.sign-right {
+		right: 86px;
+	}
+
+	.sign-center {
+		left: 135px;
+	}
+
+	.uni-datetime-picker__container-box {
+		position: relative;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		margin-top: 40px;
+	}
+
+	.time-hide-second {
+		width: 180px;
+	}
+</style>
diff --git a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue
new file mode 100644
index 0000000..e844331
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue
@@ -0,0 +1,981 @@
+<template>
+	<view class="uni-date">
+		<view class="uni-date-editor" @click="show">
+			<slot>
+				<view class="uni-date-editor--x" :class="{'uni-date-editor--x__disabled': disabled,
+		'uni-date-x--border': border}">
+					<view v-if="!isRange" class="uni-date-x uni-date-single">
+						<uni-icons type="calendar" color="#e1e1e1" size="22"></uni-icons>
+						<input class="uni-date__x-input" type="text" v-model="singleVal"
+							:placeholder="singlePlaceholderText" :disabled="true" />
+					</view>
+					<view v-else class="uni-date-x uni-date-range">
+						<uni-icons type="calendar" color="#e1e1e1" size="22"></uni-icons>
+						<input class="uni-date__x-input t-c" type="text" v-model="range.startDate"
+							:placeholder="startPlaceholderText" :disabled="true" />
+						<slot>
+							<view class="">{{rangeSeparator}}</view>
+						</slot>
+						<input class="uni-date__x-input t-c" type="text" v-model="range.endDate"
+							:placeholder="endPlaceholderText" :disabled="true" />
+					</view>
+					<view v-if="showClearIcon" class="uni-date__icon-clear" @click.stop="clear">
+						<uni-icons type="clear" color="#e1e1e1" size="18"></uni-icons>
+					</view>
+				</view>
+			</slot>
+		</view>
+
+		<view v-show="popup" class="uni-date-mask" @click="close"></view>
+		<view v-if="!isPhone" ref="datePicker" v-show="popup" class="uni-date-picker__container">
+			<view v-if="!isRange" class="uni-date-single--x" :style="popover">
+				<view class="uni-popper__arrow"></view>
+				<view v-if="hasTime" class="uni-date-changed popup-x-header">
+					<input class="uni-date__input t-c" type="text" v-model="tempSingleDate"
+						:placeholder="selectDateText" />
+					<time-picker type="time" v-model="time" :border="false" :disabled="!tempSingleDate"
+						:start="reactStartTime" :end="reactEndTime" :hideSecond="hideSecond" style="width: 100%;">
+						<input class="uni-date__input t-c" type="text" v-model="time" :placeholder="selectTimeText"
+							:disabled="!tempSingleDate" />
+					</time-picker>
+				</view>
+				<calendar ref="pcSingle" :showMonth="false"
+					:start-date="caleRange.startDate" :end-date="caleRange.endDate" :date="defSingleDate"
+					@change="singleChange" style="padding: 0 8px;" />
+				<view v-if="hasTime" class="popup-x-footer">
+					<!-- <text class="">此刻</text> -->
+					<text class="confirm" @click="confirmSingleChange">{{okText}}</text>
+				</view>
+				<view class="uni-date-popper__arrow"></view>
+			</view>
+
+			<view v-else class="uni-date-range--x" :style="popover">
+				<view class="uni-popper__arrow"></view>
+				<view v-if="hasTime" class="popup-x-header uni-date-changed">
+					<view class="popup-x-header--datetime">
+						<input class="uni-date__input uni-date-range__input" type="text" v-model="tempRange.startDate"
+							:placeholder="startDateText" />
+						<time-picker type="time" v-model="tempRange.startTime" :start="reactStartTime" :border="false"
+							:disabled="!tempRange.startDate" :hideSecond="hideSecond">
+							<input class="uni-date__input uni-date-range__input" type="text"
+								v-model="tempRange.startTime" :placeholder="startTimeText"
+								:disabled="!tempRange.startDate" />
+						</time-picker>
+					</view>
+					<uni-icons type="arrowthinright" color="#999" style="line-height: 40px;"></uni-icons>
+					<view class="popup-x-header--datetime">
+						<input class="uni-date__input uni-date-range__input" type="text" v-model="tempRange.endDate"
+							:placeholder="endDateText" />
+						<time-picker type="time" v-model="tempRange.endTime" :end="reactEndTime" :border="false"
+							:disabled="!tempRange.endDate" :hideSecond="hideSecond">
+							<input class="uni-date__input uni-date-range__input" type="text" v-model="tempRange.endTime"
+								:placeholder="endTimeText" :disabled="!tempRange.endDate" />
+						</time-picker>
+					</view>
+				</view>
+				<view class="popup-x-body">
+					<calendar ref="left" :showMonth="false"
+						:start-date="caleRange.startDate" :end-date="caleRange.endDate" :range="true"
+						@change="leftChange" :pleStatus="endMultipleStatus" @firstEnterCale="updateRightCale"
+						@monthSwitch="leftMonthSwitch" style="padding: 0 8px;" />
+					<calendar ref="right" :showMonth="false"
+						:start-date="caleRange.startDate" :end-date="caleRange.endDate" :range="true"
+						@change="rightChange" :pleStatus="startMultipleStatus" @firstEnterCale="updateLeftCale"
+						@monthSwitch="rightMonthSwitch" style="padding: 0 8px;border-left: 1px solid #F1F1F1;" />
+				</view>
+				<view v-if="hasTime" class="popup-x-footer">
+					<text class="" @click="clear">{{clearText}}</text>
+					<text class="confirm" @click="confirmRangeChange">{{okText}}</text>
+				</view>
+			</view>
+		</view>
+		<calendar v-show="isPhone" ref="mobile" :clearDate="false" :date="defSingleDate" :defTime="reactMobDefTime"
+			:start-date="caleRange.startDate" :end-date="caleRange.endDate" :selectableTimes="mobSelectableTime"
+			:pleStatus="endMultipleStatus" :showMonth="false" :range="isRange" :typeHasTime="hasTime" :insert="false"
+			:hideSecond="hideSecond" @confirm="mobileChange" />
+	</view>
+</template>
+<script>
+	/**
+	 * DatetimePicker 时间选择器
+	 * @description 同时支持 PC 和移动端使用日历选择日期和日期范围
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=3962
+	 * @property {String} type 选择器类型
+	 * @property {String|Number|Array|Date} value 绑定值
+	 * @property {String} placeholder 单选择时的占位内容
+	 * @property {String} start 起始时间
+	 * @property {String} end 终止时间
+	 * @property {String} start-placeholder 范围选择时开始日期的占位内容
+	 * @property {String} end-placeholder 范围选择时结束日期的占位内容
+	 * @property {String} range-separator 选择范围时的分隔符
+	 * @property {Boolean} border = [true|false] 是否有边框
+	 * @property {Boolean} disabled = [true|false] 是否禁用
+	 * @property {Boolean} clearIcon = [true|false] 是否显示清除按钮（仅PC端适用）
+	 * @event {Function} change 确定日期时触发的事件
+	 * @event {Function} show 打开弹出层
+	 * @event {Function} close 关闭弹出层
+	 * @event {Function} clear 清除上次选中的状态和值
+	 **/
+	import calendar from './calendar.vue'
+	import timePicker from './time-picker.vue'
+	import {
+		initVueI18n
+	} from '@dcloudio/uni-i18n'
+	import messages from './i18n/index.js'
+	const {
+		t
+	} = initVueI18n(messages)
+
+	export default {
+		name: 'UniDatetimePicker',
+		components: {
+			calendar,
+			timePicker
+		},
+		data() {
+			return {
+				isRange: false,
+				hasTime: false,
+				mobileRange: false,
+				// 单选
+				singleVal: '',
+				tempSingleDate: '',
+				defSingleDate: '',
+				time: '',
+				// 范围选
+				caleRange: {
+					startDate: '',
+					startTime: '',
+					endDate: '',
+					endTime: ''
+				},
+				range: {
+					startDate: '',
+					// startTime: '',
+					endDate: '',
+					// endTime: ''
+				},
+				tempRange: {
+					startDate: '',
+					startTime: '',
+					endDate: '',
+					endTime: ''
+				},
+				// 左右日历同步数据
+				startMultipleStatus: {
+					before: '',
+					after: '',
+					data: [],
+					fulldate: ''
+				},
+				endMultipleStatus: {
+					before: '',
+					after: '',
+					data: [],
+					fulldate: ''
+				},
+				visible: false,
+				popup: false,
+				popover: null,
+				isEmitValue: false,
+				isPhone: false,
+				isFirstShow: true,
+			}
+		},
+		props: {
+			type: {
+				type: String,
+				default: 'datetime'
+			},
+			value: {
+				type: [String, Number, Array, Date],
+				default: ''
+			},
+			modelValue: {
+				type: [String, Number, Array, Date],
+				default: ''
+			},
+			start: {
+				type: [Number, String],
+				default: ''
+			},
+			end: {
+				type: [Number, String],
+				default: ''
+			},
+			returnType: {
+				type: String,
+				default: 'string'
+			},
+			placeholder: {
+				type: String,
+				default: ''
+			},
+			startPlaceholder: {
+				type: String,
+				default: ''
+			},
+			endPlaceholder: {
+				type: String,
+				default: ''
+			},
+			rangeSeparator: {
+				type: String,
+				default: '-'
+			},
+			border: {
+				type: [Boolean],
+				default: true
+			},
+			disabled: {
+				type: [Boolean],
+				default: false
+			},
+			clearIcon: {
+				type: [Boolean],
+				default: true
+			},
+			hideSecond: {
+				type: [Boolean],
+				default: false
+			}
+		},
+		watch: {
+			type: {
+				immediate: true,
+				handler(newVal, oldVal) {
+					if (newVal.indexOf('time') !== -1) {
+						this.hasTime = true
+					} else {
+						this.hasTime = false
+					}
+					if (newVal.indexOf('range') !== -1) {
+						this.isRange = true
+					} else {
+						this.isRange = false
+					}
+				}
+			},
+			value: {
+				immediate: true,
+				handler(newVal, oldVal) {
+					if (this.isEmitValue) {
+						this.isEmitValue = false
+						return
+					}
+					this.initPicker(newVal)
+				}
+			},
+
+			start: {
+				immediate: true,
+				handler(newVal, oldVal) {
+					if (!newVal) return
+					const {
+						defDate,
+						defTime
+					} = this.parseDate(newVal)
+					this.caleRange.startDate = defDate
+					if (this.hasTime) {
+						this.caleRange.startTime = defTime
+					}
+				}
+			},
+
+			end: {
+				immediate: true,
+				handler(newVal, oldVal) {
+					if (!newVal) return
+					const {
+						defDate,
+						defTime
+					} = this.parseDate(newVal)
+					this.caleRange.endDate = defDate
+					if (this.hasTime) {
+						this.caleRange.endTime = defTime
+					}
+				}
+			},
+		},
+		computed: {
+			reactStartTime() {
+				const activeDate = this.isRange ? this.tempRange.startDate : this.tempSingleDate
+				const res = activeDate === this.caleRange.startDate ? this.caleRange.startTime : ''
+				return res
+			},
+			reactEndTime() {
+				const activeDate = this.isRange ? this.tempRange.endDate : this.tempSingleDate
+				const res = activeDate === this.caleRange.endDate ? this.caleRange.endTime : ''
+				return res
+			},
+			reactMobDefTime() {
+				const times = {
+					start: this.tempRange.startTime,
+					end: this.tempRange.endTime
+				}
+				return this.isRange ? times : this.time
+			},
+			mobSelectableTime() {
+				return {
+					start: this.caleRange.startTime,
+					end: this.caleRange.endTime
+				}
+			},
+			datePopupWidth() {
+				// todo
+				return this.isRange ? 653 : 301
+			},
+
+			/**
+			 * for i18n
+			 */
+			singlePlaceholderText() {
+				return this.placeholder || (this.type === 'date' ? this.selectDateText : t(
+					"uni-datetime-picker.selectDateTime"))
+			},
+			startPlaceholderText() {
+				return this.startPlaceholder || this.startDateText
+			},
+			endPlaceholderText() {
+				return this.endPlaceholder || this.endDateText
+			},
+			selectDateText() {
+				return t("uni-datetime-picker.selectDate")
+			},
+			selectTimeText() {
+				return t("uni-datetime-picker.selectTime")
+			},
+			startDateText() {
+				return this.startPlaceholder || t("uni-datetime-picker.startDate")
+			},
+			startTimeText() {
+				return t("uni-datetime-picker.startTime")
+			},
+			endDateText() {
+				return this.endPlaceholder || t("uni-datetime-picker.endDate")
+			},
+			endTimeText() {
+				return t("uni-datetime-picker.endTime")
+			},
+			okText() {
+				return t("uni-datetime-picker.ok")
+			},
+			clearText() {
+				return t("uni-datetime-picker.clear")
+			},
+			showClearIcon() {
+				const { clearIcon, disabled, singleVal, range } = this
+				const bool = clearIcon && !disabled && (singleVal || (range.startDate && range.endDate))
+				return bool
+			}
+		},
+		created() {
+			this.form = this.getForm('uniForms')
+			this.formItem = this.getForm('uniFormsItem')
+
+			// if (this.formItem) {
+			// 	if (this.formItem.name) {
+			// 		this.rename = this.formItem.name
+			// 		this.form.inputChildrens.push(this)
+			// 	}
+			// }
+		},
+		mounted() {
+			this.platform()
+		},
+		methods: {
+			/**
+			 * 获取父元素实例
+			 */
+			getForm(name = 'uniForms') {
+				let parent = this.$parent;
+				let parentName = parent.$options.name;
+				while (parentName !== name) {
+					parent = parent.$parent;
+					if (!parent) return false
+					parentName = parent.$options.name;
+				}
+				return parent;
+			},
+			initPicker(newVal) {
+				if (!newVal || Array.isArray(newVal) && !newVal.length) {
+					this.$nextTick(() => {
+						this.clear(false)
+					})
+					return
+				}
+				if (!Array.isArray(newVal) && !this.isRange) {
+					const {
+						defDate,
+						defTime
+					} = this.parseDate(newVal)
+					this.singleVal = defDate
+					this.tempSingleDate = defDate
+					this.defSingleDate = defDate
+					if (this.hasTime) {
+						this.singleVal = defDate + ' ' + defTime
+						this.time = defTime
+					}
+				} else {
+					const [before, after] = newVal
+					if (!before && !after) return
+					const defBefore = this.parseDate(before)
+					const defAfter = this.parseDate(after)
+					const startDate = defBefore.defDate
+					const endDate = defAfter.defDate
+					this.range.startDate = this.tempRange.startDate = startDate
+					this.range.endDate = this.tempRange.endDate = endDate
+
+					if (this.hasTime) {
+						this.range.startDate = defBefore.defDate + ' ' + defBefore.defTime
+						this.range.endDate = defAfter.defDate + ' ' + defAfter.defTime
+						this.tempRange.startTime = defBefore.defTime
+						this.tempRange.endTime = defAfter.defTime
+					}
+					const defaultRange = {
+						before: defBefore.defDate,
+						after: defAfter.defDate
+					}
+					this.startMultipleStatus = Object.assign({}, this.startMultipleStatus, defaultRange, {
+						which: 'right'
+					})
+					this.endMultipleStatus = Object.assign({}, this.endMultipleStatus, defaultRange, {
+						which: 'left'
+					})
+				}
+			},
+			updateLeftCale(e) {
+				const left = this.$refs.left
+				// 设置范围选
+				left.cale.setHoverMultiple(e.after)
+				left.setDate(this.$refs.left.nowDate.fullDate)
+			},
+			updateRightCale(e) {
+				const right = this.$refs.right
+				// 设置范围选
+				right.cale.setHoverMultiple(e.after)
+				right.setDate(this.$refs.right.nowDate.fullDate)
+			},
+			platform() {
+				const systemInfo = uni.getSystemInfoSync()
+				this.isPhone = systemInfo.windowWidth <= 500
+				this.windowWidth = systemInfo.windowWidth
+			},
+			show(event) {
+				if (this.disabled) {
+					return
+				}
+				this.platform()
+				if (this.isPhone) {
+					this.$refs.mobile.open()
+					return
+				}
+				this.popover = {
+					top: '10px'
+				}
+				const dateEditor = uni.createSelectorQuery().in(this).select(".uni-date-editor")
+				dateEditor.boundingClientRect(rect => {
+					if (this.windowWidth - rect.left < this.datePopupWidth) {
+						this.popover.right = 0
+					}
+				}).exec()
+				setTimeout(() => {
+					this.popup = !this.popup
+					if (!this.isPhone && this.isRange && this.isFirstShow) {
+						this.isFirstShow = false
+						const {
+							startDate,
+							endDate
+						} = this.range
+						if (startDate && endDate) {
+							if (this.diffDate(startDate, endDate) < 30) {
+								this.$refs.right.next()
+							}
+						} else {
+							this.$refs.right.next()
+							this.$refs.right.cale.lastHover = false
+						}
+					}
+
+				}, 50)
+			},
+
+			close() {
+				setTimeout(() => {
+					this.popup = false
+					this.$emit('maskClick', this.value)
+				}, 20)
+			},
+			setEmit(value) {
+				if (this.returnType === "timestamp" || this.returnType === "date") {
+					if (!Array.isArray(value)) {
+						if (!this.hasTime) {
+							value = value + ' ' + '00:00:00'
+						}
+						value = this.createTimestamp(value)
+						if (this.returnType === "date") {
+							value = new Date(value)
+						}
+					} else {
+						if (!this.hasTime) {
+							value[0] = value[0] + ' ' + '00:00:00'
+							value[1] = value[1] + ' ' + '00:00:00'
+						}
+						value[0] = this.createTimestamp(value[0])
+						value[1] = this.createTimestamp(value[1])
+						if (this.returnType === "date") {
+							value[0] = new Date(value[0])
+							value[1] = new Date(value[1])
+						}
+					}
+				}
+				this.formItem && this.formItem.setValue(value)
+				this.$emit('change', value)
+				this.$emit('input', value)
+				this.$emit('update:modelValue', value)
+				this.isEmitValue = true
+			},
+			createTimestamp(date) {
+				date = this.fixIosDateFormat(date)
+				return Date.parse(new Date(date))
+			},
+			singleChange(e) {
+				this.tempSingleDate = e.fulldate
+				if (this.hasTime) return
+				this.confirmSingleChange()
+			},
+
+			confirmSingleChange() {
+				if (!this.tempSingleDate) {
+					this.popup = false
+					return
+				}
+				if (this.hasTime) {
+					this.singleVal = this.tempSingleDate + ' ' + (this.time ? this.time : '00:00:00')
+				} else {
+					this.singleVal = this.tempSingleDate
+				}
+				this.setEmit(this.singleVal)
+				this.popup = false
+			},
+
+			leftChange(e) {
+				const {
+					before,
+					after
+				} = e.range
+				this.rangeChange(before, after)
+				const obj = {
+					before: e.range.before,
+					after: e.range.after,
+					data: e.range.data,
+					fulldate: e.fulldate
+				}
+				this.startMultipleStatus = Object.assign({}, this.startMultipleStatus, obj)
+			},
+
+			rightChange(e) {
+				const {
+					before,
+					after
+				} = e.range
+				this.rangeChange(before, after)
+				const obj = {
+					before: e.range.before,
+					after: e.range.after,
+					data: e.range.data,
+					fulldate: e.fulldate
+				}
+				this.endMultipleStatus = Object.assign({}, this.endMultipleStatus, obj)
+			},
+
+			mobileChange(e) {
+				if (this.isRange) {
+					const {
+						before,
+						after
+					} = e.range
+					this.handleStartAndEnd(before, after, true)
+					if (this.hasTime) {
+						const {
+							startTime,
+							endTime
+						} = e.timeRange
+						this.tempRange.startTime = startTime
+						this.tempRange.endTime = endTime
+					}
+					this.confirmRangeChange()
+
+				} else {
+					if (this.hasTime) {
+						this.singleVal = e.fulldate + ' ' + e.time
+					} else {
+						this.singleVal = e.fulldate
+					}
+					this.setEmit(this.singleVal)
+				}
+				this.$refs.mobile.close()
+			},
+
+			rangeChange(before, after) {
+				if (!(before && after)) return
+				this.handleStartAndEnd(before, after, true)
+				if (this.hasTime) return
+				this.confirmRangeChange()
+			},
+
+			confirmRangeChange() {
+				if (!this.tempRange.startDate && !this.tempRange.endDate) {
+					this.popup = false
+					return
+				}
+				let start, end
+				if (!this.hasTime) {
+					start = this.range.startDate = this.tempRange.startDate
+					end = this.range.endDate = this.tempRange.endDate
+				} else {
+					start = this.range.startDate = this.tempRange.startDate + ' ' +
+						(this.tempRange.startTime ? this.tempRange.startTime : '00:00:00')
+					end = this.range.endDate = this.tempRange.endDate + ' ' +
+						(this.tempRange.endTime ? this.tempRange.endTime : '00:00:00')
+				}
+				const displayRange = [start, end]
+				this.setEmit(displayRange)
+				this.popup = false
+			},
+
+			handleStartAndEnd(before, after, temp = false) {
+				if (!(before && after)) return
+				const type = temp ? 'tempRange' : 'range'
+				if (this.dateCompare(before, after)) {
+					this[type].startDate = before
+					this[type].endDate = after
+				} else {
+					this[type].startDate = after
+					this[type].endDate = before
+				}
+			},
+
+			/**
+			 * 比较时间大小
+			 */
+			dateCompare(startDate, endDate) {
+				// 计算截止时间
+				startDate = new Date(startDate.replace('-', '/').replace('-', '/'))
+				// 计算详细项的截止时间
+				endDate = new Date(endDate.replace('-', '/').replace('-', '/'))
+				if (startDate <= endDate) {
+					return true
+				} else {
+					return false
+				}
+			},
+
+			/**
+			 * 比较时间差
+			 */
+			diffDate(startDate, endDate) {
+				// 计算截止时间
+				startDate = new Date(startDate.replace('-', '/').replace('-', '/'))
+				// 计算详细项的截止时间
+				endDate = new Date(endDate.replace('-', '/').replace('-', '/'))
+				const diff = (endDate - startDate) / (24 * 60 * 60 * 1000)
+				return Math.abs(diff)
+			},
+
+			clear(needEmit = true) {
+				if (!this.isRange) {
+					this.singleVal = ''
+					this.tempSingleDate = ''
+					this.time = ''
+					if (this.isPhone) {
+						this.$refs.mobile && this.$refs.mobile.clearCalender()
+					} else {
+						this.$refs.pcSingle && this.$refs.pcSingle.clearCalender()
+					}
+					if (needEmit) {
+						this.formItem && this.formItem.setValue('')
+						this.$emit('change', '')
+						this.$emit('input', '')
+						this.$emit('update:modelValue', '')
+					}
+				} else {
+					this.range.startDate = ''
+					this.range.endDate = ''
+					this.tempRange.startDate = ''
+					this.tempRange.startTime = ''
+					this.tempRange.endDate = ''
+					this.tempRange.endTime = ''
+					if (this.isPhone) {
+						this.$refs.mobile && this.$refs.mobile.clearCalender()
+					} else {
+						this.$refs.left && this.$refs.left.clearCalender()
+						this.$refs.right && this.$refs.right.clearCalender()
+						this.$refs.right && this.$refs.right.next()
+					}
+					if (needEmit) {
+						this.formItem && this.formItem.setValue([])
+						this.$emit('change', [])
+						this.$emit('input', [])
+						this.$emit('update:modelValue', [])
+					}
+				}
+			},
+
+			parseDate(date) {
+				date = this.fixIosDateFormat(date)
+				const defVal = new Date(date)
+				const year = defVal.getFullYear()
+				const month = defVal.getMonth() + 1
+				const day = defVal.getDate()
+				const hour = defVal.getHours()
+				const minute = defVal.getMinutes()
+				const second = defVal.getSeconds()
+				const defDate = year + '-' + this.lessTen(month) + '-' + this.lessTen(day)
+				const defTime = this.lessTen(hour) + ':' + this.lessTen(minute) + (this.hideSecond ? '' : (':' + this
+					.lessTen(second)))
+				return {
+					defDate,
+					defTime
+				}
+			},
+
+			lessTen(item) {
+				return item < 10 ? '0' + item : item
+			},
+
+			//兼容 iOS、safari 日期格式
+			fixIosDateFormat(value) {
+				if (typeof value === 'string') {
+					value = value.replace(/-/g, '/')
+				}
+				return value
+			},
+
+			leftMonthSwitch(e) {
+				// console.log('leftMonthSwitch 返回:', e)
+			},
+			rightMonthSwitch(e) {
+				// console.log('rightMonthSwitch 返回:', e)
+			}
+		}
+	}
+</script>
+
+<style>
+	.uni-date-x {
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
+		padding: 0 10px;
+		border-radius: 4px;
+		background-color: #fff;
+		color: #666;
+		font-size: 14px;
+	}
+
+	.uni-date-x--border {
+		box-sizing: border-box;
+		border-radius: 4px;
+		border: 1px solid #dcdfe6;
+	}
+
+	.uni-date-editor--x {
+		position: relative;
+	}
+
+	.uni-date-editor--x .uni-date__icon-clear {
+		position: absolute;
+		top: 0;
+		right: 0;
+		display: inline-block;
+		box-sizing: border-box;
+		border: 9px solid transparent;
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
+	}
+
+	.uni-date__x-input {
+		padding: 0 8px;
+		height: 40px;
+		width: 100%;
+		line-height: 40px;
+		font-size: 14px;
+	}
+
+	.t-c {
+		text-align: center;
+	}
+
+	.uni-date__input {
+		height: 40px;
+		width: 100%;
+		line-height: 40px;
+		font-size: 14px;
+	}
+
+	.uni-date-range__input {
+		text-align: center;
+		max-width: 142px;
+	}
+
+	.uni-date-picker__container {
+		position: relative;
+		/* 		position: fixed;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+		box-sizing: border-box;
+		z-index: 996;
+		font-size: 14px; */
+	}
+
+	.uni-date-mask {
+		position: fixed;
+		bottom: 0px;
+		top: 0px;
+		left: 0px;
+		right: 0px;
+		background-color: rgba(0, 0, 0, 0);
+		transition-duration: 0.3s;
+		z-index: 996;
+	}
+
+	.uni-date-single--x {
+		/* padding: 0 8px; */
+		background-color: #fff;
+		position: absolute;
+		top: 0;
+		z-index: 999;
+		border: 1px solid #EBEEF5;
+		box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+		border-radius: 4px;
+	}
+
+	.uni-date-range--x {
+		/* padding: 0 8px; */
+		background-color: #fff;
+		position: absolute;
+		top: 0;
+		z-index: 999;
+		border: 1px solid #EBEEF5;
+		box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+		border-radius: 4px;
+	}
+
+	.uni-date-editor--x__disabled {
+		opacity: 0.4;
+		cursor: default;
+	}
+
+	.uni-date-editor--logo {
+		width: 16px;
+		height: 16px;
+		vertical-align: middle;
+	}
+
+	/* 添加时间 */
+	.popup-x-header {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		/* justify-content: space-between; */
+	}
+
+	.popup-x-header--datetime {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		flex: 1;
+	}
+
+	.popup-x-body {
+		display: flex;
+	}
+
+	.popup-x-footer {
+		padding: 0 15px;
+		border-top-color: #F1F1F1;
+		border-top-style: solid;
+		border-top-width: 1px;
+		/* background-color: #fff; */
+		line-height: 40px;
+		text-align: right;
+		color: #666;
+	}
+
+	.popup-x-footer text:hover {
+		color: #007aff;
+		cursor: pointer;
+		opacity: 0.8;
+	}
+
+	.popup-x-footer .confirm {
+		margin-left: 20px;
+		color: #007aff;
+	}
+
+	.uni-date-changed {
+		/* background-color: #fff; */
+		text-align: center;
+		color: #333;
+		border-bottom-color: #F1F1F1;
+		border-bottom-style: solid;
+		border-bottom-width: 1px;
+		/* padding: 0 50px; */
+	}
+
+	.uni-date-changed--time text {
+		/* padding: 0 20px; */
+		height: 50px;
+		line-height: 50px;
+	}
+
+	.uni-date-changed .uni-date-changed--time {
+		/* display: flex; */
+		flex: 1;
+	}
+
+	.uni-date-changed--time-date {
+		color: #333;
+		opacity: 0.6;
+	}
+
+	.mr-50 {
+		margin-right: 50px;
+	}
+
+	/* picker 弹出层通用的指示小三角, todo：扩展至上下左右方向定位 */
+	.uni-popper__arrow,
+	.uni-popper__arrow::after {
+		position: absolute;
+		display: block;
+		width: 0;
+		height: 0;
+		border-color: transparent;
+		border-style: solid;
+		border-width: 6px;
+	}
+
+	.uni-popper__arrow {
+		filter: drop-shadow(0 2px 12px rgba(0, 0, 0, 0.03));
+		top: -6px;
+		left: 10%;
+		margin-right: 3px;
+		border-top-width: 0;
+		border-bottom-color: #EBEEF5;
+	}
+
+	.uni-popper__arrow::after {
+		content: " ";
+		top: 1px;
+		margin-left: -6px;
+		border-top-width: 0;
+		border-bottom-color: #fff;
+	}
+</style>
diff --git a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/util.js b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/util.js
new file mode 100644
index 0000000..efa5773
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/util.js
@@ -0,0 +1,410 @@
+class Calendar {
+	constructor({
+		date,
+		selected,
+		startDate,
+		endDate,
+		range,
+		// multipleStatus
+	} = {}) {
+		// 当前日期
+		this.date = this.getDate(new Date()) // 当前初入日期
+		// 打点信息
+		this.selected = selected || [];
+		// 范围开始
+		this.startDate = startDate
+		// 范围结束
+		this.endDate = endDate
+		this.range = range
+		// 多选状态
+		this.cleanMultipleStatus()
+		// 每周日期
+		this.weeks = {}
+		// this._getWeek(this.date.fullDate)
+		// this.multipleStatus = multipleStatus
+		this.lastHover = false
+	}
+	/**
+	 * 设置日期
+	 * @param {Object} date
+	 */
+	setDate(date) {
+		this.selectDate = this.getDate(date)
+		this._getWeek(this.selectDate.fullDate)
+	}
+
+	/**
+	 * 清理多选状态
+	 */
+	cleanMultipleStatus() {
+		this.multipleStatus = {
+			before: '',
+			after: '',
+			data: []
+		}
+	}
+
+	/**
+	 * 重置开始日期
+	 */
+	resetSatrtDate(startDate) {
+		// 范围开始
+		this.startDate = startDate
+
+	}
+
+	/**
+	 * 重置结束日期
+	 */
+	resetEndDate(endDate) {
+		// 范围结束
+		this.endDate = endDate
+	}
+
+	/**
+	 * 获取任意时间
+	 */
+	getDate(date, AddDayCount = 0, str = 'day') {
+		if (!date) {
+			date = new Date()
+		}
+		if (typeof date !== 'object') {
+			date = date.replace(/-/g, '/')
+		}
+		const dd = new Date(date)
+		switch (str) {
+			case 'day':
+				dd.setDate(dd.getDate() + AddDayCount) // 获取AddDayCount天后的日期
+				break
+			case 'month':
+				if (dd.getDate() === 31) {
+					dd.setDate(dd.getDate() + AddDayCount)
+				} else {
+					dd.setMonth(dd.getMonth() + AddDayCount) // 获取AddDayCount天后的日期
+				}
+				break
+			case 'year':
+				dd.setFullYear(dd.getFullYear() + AddDayCount) // 获取AddDayCount天后的日期
+				break
+		}
+		const y = dd.getFullYear()
+		const m = dd.getMonth() + 1 < 10 ? '0' + (dd.getMonth() + 1) : dd.getMonth() + 1 // 获取当前月份的日期，不足10补0
+		const d = dd.getDate() < 10 ? '0' + dd.getDate() : dd.getDate() // 获取当前几号，不足10补0
+		return {
+			fullDate: y + '-' + m + '-' + d,
+			year: y,
+			month: m,
+			date: d,
+			day: dd.getDay()
+		}
+	}
+
+
+	/**
+	 * 获取上月剩余天数
+	 */
+	_getLastMonthDays(firstDay, full) {
+		let dateArr = []
+		for (let i = firstDay; i > 0; i--) {
+			const beforeDate = new Date(full.year, full.month - 1, -i + 1).getDate()
+			dateArr.push({
+				date: beforeDate,
+				month: full.month - 1,
+				disable: true
+			})
+		}
+		return dateArr
+	}
+	/**
+	 * 获取本月天数
+	 */
+	_currentMonthDys(dateData, full) {
+		let dateArr = []
+		let fullDate = this.date.fullDate
+		for (let i = 1; i <= dateData; i++) {
+			let isinfo = false
+			let nowDate = full.year + '-' + (full.month < 10 ?
+				full.month : full.month) + '-' + (i < 10 ?
+				'0' + i : i)
+			// 是否今天
+			let isDay = fullDate === nowDate
+			// 获取打点信息
+			let info = this.selected && this.selected.find((item) => {
+				if (this.dateEqual(nowDate, item.date)) {
+					return item
+				}
+			})
+
+			// 日期禁用
+			let disableBefore = true
+			let disableAfter = true
+			if (this.startDate) {
+				// let dateCompBefore = this.dateCompare(this.startDate, fullDate)
+				// disableBefore = this.dateCompare(dateCompBefore ? this.startDate : fullDate, nowDate)
+				disableBefore = this.dateCompare(this.startDate, nowDate)
+			}
+
+			if (this.endDate) {
+				// let dateCompAfter = this.dateCompare(fullDate, this.endDate)
+				// disableAfter = this.dateCompare(nowDate, dateCompAfter ? this.endDate : fullDate)
+				disableAfter = this.dateCompare(nowDate, this.endDate)
+			}
+			let multiples = this.multipleStatus.data
+			let checked = false
+			let multiplesStatus = -1
+			if (this.range) {
+				if (multiples) {
+					multiplesStatus = multiples.findIndex((item) => {
+						return this.dateEqual(item, nowDate)
+					})
+				}
+				if (multiplesStatus !== -1) {
+					checked = true
+				}
+			}
+			let data = {
+				fullDate: nowDate,
+				year: full.year,
+				date: i,
+				multiple: this.range ? checked : false,
+				beforeMultiple: this.isLogicBefore(nowDate, this.multipleStatus.before, this.multipleStatus.after),
+				afterMultiple: this.isLogicAfter(nowDate, this.multipleStatus.before, this.multipleStatus.after),
+				month: full.month,
+				disable: !(disableBefore && disableAfter),
+				isDay,
+				userChecked: false
+			}
+			if (info) {
+				data.extraInfo = info
+			}
+
+			dateArr.push(data)
+		}
+		return dateArr
+	}
+	/**
+	 * 获取下月天数
+	 */
+	_getNextMonthDays(surplus, full) {
+		let dateArr = []
+		for (let i = 1; i < surplus + 1; i++) {
+			dateArr.push({
+				date: i,
+				month: Number(full.month) + 1,
+				disable: true
+			})
+		}
+		return dateArr
+	}
+
+	/**
+	 * 获取当前日期详情
+	 * @param {Object} date
+	 */
+	getInfo(date) {
+		if (!date) {
+			date = new Date()
+		}
+		const dateInfo = this.canlender.find(item => item.fullDate === this.getDate(date).fullDate)
+		return dateInfo
+	}
+
+	/**
+	 * 比较时间大小
+	 */
+	dateCompare(startDate, endDate) {
+		// 计算截止时间
+		startDate = new Date(startDate.replace('-', '/').replace('-', '/'))
+		// 计算详细项的截止时间
+		endDate = new Date(endDate.replace('-', '/').replace('-', '/'))
+		if (startDate <= endDate) {
+			return true
+		} else {
+			return false
+		}
+	}
+
+	/**
+	 * 比较时间是否相等
+	 */
+	dateEqual(before, after) {
+		// 计算截止时间
+		before = new Date(before.replace('-', '/').replace('-', '/'))
+		// 计算详细项的截止时间
+		after = new Date(after.replace('-', '/').replace('-', '/'))
+		if (before.getTime() - after.getTime() === 0) {
+			return true
+		} else {
+			return false
+		}
+	}
+
+	/**
+	 *  比较真实起始日期
+	 */
+
+	isLogicBefore(currentDay, before, after) {
+		let logicBefore = before
+		if (before && after) {
+			logicBefore = this.dateCompare(before, after) ? before : after
+		}
+		return this.dateEqual(logicBefore, currentDay)
+	}
+
+	isLogicAfter(currentDay, before, after) {
+		let logicAfter = after
+		if (before && after) {
+			logicAfter = this.dateCompare(before, after) ? after : before
+		}
+		return this.dateEqual(logicAfter, currentDay)
+	}
+
+	/**
+	 * 获取日期范围内所有日期
+	 * @param {Object} begin
+	 * @param {Object} end
+	 */
+	geDateAll(begin, end) {
+		var arr = []
+		var ab = begin.split('-')
+		var ae = end.split('-')
+		var db = new Date()
+		db.setFullYear(ab[0], ab[1] - 1, ab[2])
+		var de = new Date()
+		de.setFullYear(ae[0], ae[1] - 1, ae[2])
+		var unixDb = db.getTime() - 24 * 60 * 60 * 1000
+		var unixDe = de.getTime() - 24 * 60 * 60 * 1000
+		for (var k = unixDb; k <= unixDe;) {
+			k = k + 24 * 60 * 60 * 1000
+			arr.push(this.getDate(new Date(parseInt(k))).fullDate)
+		}
+		return arr
+	}
+
+	/**
+	 *  获取多选状态
+	 */
+	setMultiple(fullDate) {
+		let {
+			before,
+			after
+		} = this.multipleStatus
+		if (!this.range) return
+		if (before && after) {
+			if (!this.lastHover) {
+				this.lastHover = true
+				return
+			}
+			this.multipleStatus.before = fullDate
+			this.multipleStatus.after = ''
+			this.multipleStatus.data = []
+			this.multipleStatus.fulldate = ''
+			this.lastHover = false
+		} else {
+			if (!before) {
+				this.multipleStatus.before = fullDate
+				this.lastHover = false
+			} else {
+				this.multipleStatus.after = fullDate
+				if (this.dateCompare(this.multipleStatus.before, this.multipleStatus.after)) {
+					this.multipleStatus.data = this.geDateAll(this.multipleStatus.before, this.multipleStatus
+						.after);
+				} else {
+					this.multipleStatus.data = this.geDateAll(this.multipleStatus.after, this.multipleStatus
+						.before);
+				}
+				this.lastHover = true
+			}
+		}
+		this._getWeek(fullDate)
+	}
+
+	/**
+	 *  鼠标 hover 更新多选状态
+	 */
+	setHoverMultiple(fullDate) {
+		let {
+			before,
+			after
+		} = this.multipleStatus
+
+		if (!this.range) return
+		if (this.lastHover) return
+
+		if (!before) {
+			this.multipleStatus.before = fullDate
+		} else {
+			this.multipleStatus.after = fullDate
+			if (this.dateCompare(this.multipleStatus.before, this.multipleStatus.after)) {
+				this.multipleStatus.data = this.geDateAll(this.multipleStatus.before, this.multipleStatus.after);
+			} else {
+				this.multipleStatus.data = this.geDateAll(this.multipleStatus.after, this.multipleStatus.before);
+			}
+		}
+		this._getWeek(fullDate)
+	}
+
+	/**
+	 * 更新默认值多选状态
+	 */
+	setDefaultMultiple(before, after) {
+		this.multipleStatus.before = before
+		this.multipleStatus.after = after
+		if (before && after) {
+			if (this.dateCompare(before, after)) {
+				this.multipleStatus.data = this.geDateAll(before, after);
+				this._getWeek(after)
+			} else {
+				this.multipleStatus.data = this.geDateAll(after, before);
+				this._getWeek(before)
+			}
+		}
+	}
+
+	/**
+	 * 获取每周数据
+	 * @param {Object} dateData
+	 */
+	_getWeek(dateData) {
+		const {
+			fullDate,
+			year,
+			month,
+			date,
+			day
+		} = this.getDate(dateData)
+		let firstDay = new Date(year, month - 1, 1).getDay()
+		let currentDay = new Date(year, month, 0).getDate()
+		let dates = {
+			lastMonthDays: this._getLastMonthDays(firstDay, this.getDate(dateData)), // 上个月末尾几天
+			currentMonthDys: this._currentMonthDys(currentDay, this.getDate(dateData)), // 本月天数
+			nextMonthDays: [], // 下个月开始几天
+			weeks: []
+		}
+		let canlender = []
+		const surplus = 42 - (dates.lastMonthDays.length + dates.currentMonthDys.length)
+		dates.nextMonthDays = this._getNextMonthDays(surplus, this.getDate(dateData))
+		canlender = canlender.concat(dates.lastMonthDays, dates.currentMonthDys, dates.nextMonthDays)
+		let weeks = {}
+		// 拼接数组  上个月开始几天 + 本月天数+ 下个月开始几天
+		for (let i = 0; i < canlender.length; i++) {
+			if (i % 7 === 0) {
+				weeks[parseInt(i / 7)] = new Array(7)
+			}
+			weeks[parseInt(i / 7)][i % 7] = canlender[i]
+		}
+		this.canlender = canlender
+		this.weeks = weeks
+	}
+
+	//静态方法
+	// static init(date) {
+	// 	if (!this.instance) {
+	// 		this.instance = new Calendar(date);
+	// 	}
+	// 	return this.instance;
+	// }
+}
+
+
+export default Calendar
diff --git a/uni_modules/uni-datetime-picker/package.json b/uni_modules/uni-datetime-picker/package.json
new file mode 100644
index 0000000..5e0ff11
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/package.json
@@ -0,0 +1,90 @@
+{
+  "id": "uni-datetime-picker",
+  "displayName": "uni-datetime-picker 日期选择器",
+  "version": "2.2.2",
+  "description": "uni-datetime-picker 日期时间选择器，支持日历，支持范围选择",
+  "keywords": [
+    "uni-datetime-picker",
+    "uni-ui",
+    "uniui",
+    "日期时间选择器",
+    "日期时间"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
+  },
+  "uni_modules": {
+    "dependencies": [
+			"uni-scss",
+			"uni-icons"
+		],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "n"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}
diff --git a/uni_modules/uni-datetime-picker/readme.md b/uni_modules/uni-datetime-picker/readme.md
new file mode 100644
index 0000000..162fbef
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/readme.md
@@ -0,0 +1,21 @@
+
+
+> `重要通知：组件升级更新 2.0.0 后，支持日期+时间范围选择，组件 ui 将使用日历选择日期，ui 变化较大，同时支持 PC 和 移动端。此版本不向后兼容，不再支持单独的时间选择（type=time）及相关的 hide-second 属性（时间选可使用内置组件 picker）。若仍需使用旧版本，可在插件市场下载*非uni_modules版本*，旧版本将不再维护`
+
+## DatetimePicker 时间选择器
+
+> **组件名：uni-datetime-picker**
+> 代码块： `uDatetimePicker`
+
+
+该组件的优势是，支持**时间戳**输入和输出（起始时间、终止时间也支持时间戳），可**同时选择**日期和时间。
+
+若只是需要单独选择日期和时间，不需要时间戳输入和输出，可使用原生的 picker 组件。
+
+**_点击 picker 默认值规则：_**
+
+- 若设置初始值 value, 会显示在 picker 显示框中
+- 若无初始值 value，则初始值 value 为当前本地时间 Date.now()， 但不会显示在 picker 显示框中
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-datetime-picker)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file
diff --git a/uni_modules/uni-scss/changelog.md b/uni_modules/uni-scss/changelog.md
new file mode 100644
index 0000000..b863bb0
--- /dev/null
+++ b/uni_modules/uni-scss/changelog.md
@@ -0,0 +1,8 @@
+## 1.0.3（2022-01-21）
+- 优化 组件示例
+## 1.0.2（2021-11-22）
+- 修复 / 符号在 vue 不同版本兼容问题引起的报错问题
+## 1.0.1（2021-11-22）
+- 修复 vue3中scss语法兼容问题
+## 1.0.0（2021-11-18）
+- init
diff --git a/uni_modules/uni-scss/index.scss b/uni_modules/uni-scss/index.scss
new file mode 100644
index 0000000..1744a5f
--- /dev/null
+++ b/uni_modules/uni-scss/index.scss
@@ -0,0 +1 @@
+@import './styles/index.scss';
diff --git a/uni_modules/uni-scss/package.json b/uni_modules/uni-scss/package.json
new file mode 100644
index 0000000..7cc0ccb
--- /dev/null
+++ b/uni_modules/uni-scss/package.json
@@ -0,0 +1,82 @@
+{
+  "id": "uni-scss",
+  "displayName": "uni-scss 辅助样式",
+  "version": "1.0.3",
+  "description": "uni-sass是uni-ui提供的一套全局样式 ，通过一些简单的类名和sass变量，实现简单的页面布局操作，比如颜色、边距、圆角等。",
+  "keywords": [
+    "uni-scss",
+    "uni-ui",
+    "辅助样式"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": "^3.1.0"
+  },
+  "dcloudext": {
+    "category": [
+        "JS SDK",
+        "通用 SDK"
+    ],
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
+  },
+  "uni_modules": {
+    "dependencies": [],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "u"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "n",
+          "联盟": "n"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}
diff --git a/uni_modules/uni-scss/readme.md b/uni_modules/uni-scss/readme.md
new file mode 100644
index 0000000..b7d1c25
--- /dev/null
+++ b/uni_modules/uni-scss/readme.md
@@ -0,0 +1,4 @@
+`uni-sass` 是 `uni-ui`提供的一套全局样式 ，通过一些简单的类名和`sass`变量，实现简单的页面布局操作，比如颜色、边距、圆角等。
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-sass)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file
diff --git a/uni_modules/uni-scss/styles/index.scss b/uni_modules/uni-scss/styles/index.scss
new file mode 100644
index 0000000..ffac4fe
--- /dev/null
+++ b/uni_modules/uni-scss/styles/index.scss
@@ -0,0 +1,7 @@
+@import './setting/_variables.scss';
+@import './setting/_border.scss';
+@import './setting/_color.scss';
+@import './setting/_space.scss';
+@import './setting/_radius.scss';
+@import './setting/_text.scss';
+@import './setting/_styles.scss';
diff --git a/uni_modules/uni-scss/styles/setting/_border.scss b/uni_modules/uni-scss/styles/setting/_border.scss
new file mode 100644
index 0000000..12a11c3
--- /dev/null
+++ b/uni_modules/uni-scss/styles/setting/_border.scss
@@ -0,0 +1,3 @@
+.uni-border {
+	border: 1px $uni-border-1 solid;
+}
\ No newline at end of file
diff --git a/uni_modules/uni-scss/styles/setting/_color.scss b/uni_modules/uni-scss/styles/setting/_color.scss
new file mode 100644
index 0000000..1ededd9
--- /dev/null
+++ b/uni_modules/uni-scss/styles/setting/_color.scss
@@ -0,0 +1,66 @@
+
+// TODO 暂时不需要 class ，需要用户使用变量实现 ，如果使用类名其实并不推荐
+// @mixin get-styles($k,$c) {
+// 	@if $k == size or $k == weight{
+// 		font-#{$k}:#{$c}
+// 	}@else{
+// 		#{$k}:#{$c}
+// 	}
+// }
+$uni-ui-color:(
+	// 主色
+	primary: $uni-primary,
+	primary-disable: $uni-primary-disable,
+	primary-light: $uni-primary-light,
+	// 辅助色
+	success: $uni-success,
+	success-disable: $uni-success-disable,
+	success-light: $uni-success-light,
+	warning: $uni-warning,
+	warning-disable: $uni-warning-disable,
+	warning-light: $uni-warning-light,
+	error: $uni-error,
+	error-disable: $uni-error-disable,
+	error-light: $uni-error-light,
+	info: $uni-info,
+	info-disable: $uni-info-disable,
+	info-light: $uni-info-light,
+	// 中性色
+	main-color: $uni-main-color,
+	base-color: $uni-base-color,
+	secondary-color: $uni-secondary-color,
+	extra-color: $uni-extra-color,
+	// 背景色
+	bg-color: $uni-bg-color,
+	// 边框颜色
+	border-1: $uni-border-1,
+	border-2: $uni-border-2,
+	border-3: $uni-border-3,
+	border-4: $uni-border-4,
+	// 黑色
+	black:$uni-black,
+	// 白色
+	white:$uni-white,
+	// 透明
+	transparent:$uni-transparent
+) !default;
+@each $key, $child in $uni-ui-color {
+	.uni-#{"" + $key} {
+		color: $child;
+	}
+	.uni-#{"" + $key}-bg {
+		background-color: $child;
+	}
+}
+.uni-shadow-sm {
+	box-shadow: $uni-shadow-sm;
+}
+.uni-shadow-base {
+	box-shadow: $uni-shadow-base;
+}
+.uni-shadow-lg {
+	box-shadow: $uni-shadow-lg;
+}
+.uni-mask {
+	background-color:$uni-mask;
+}
diff --git a/uni_modules/uni-scss/styles/setting/_radius.scss b/uni_modules/uni-scss/styles/setting/_radius.scss
new file mode 100644
index 0000000..9a0428b
--- /dev/null
+++ b/uni_modules/uni-scss/styles/setting/_radius.scss
@@ -0,0 +1,55 @@
+@mixin radius($r,$d:null ,$important: false){
+  $radius-value:map-get($uni-radius, $r) if($important, !important, null);
+  // Key exists within the $uni-radius variable
+  @if (map-has-key($uni-radius, $r) and  $d){
+		@if $d == t {
+				border-top-left-radius:$radius-value;
+				border-top-right-radius:$radius-value;
+		}@else if $d == r {
+				border-top-right-radius:$radius-value;
+				border-bottom-right-radius:$radius-value;
+		}@else if $d == b {
+				border-bottom-left-radius:$radius-value;
+				border-bottom-right-radius:$radius-value;
+		}@else if $d == l {
+				border-top-left-radius:$radius-value;
+				border-bottom-left-radius:$radius-value;
+		}@else if $d == tl {
+				border-top-left-radius:$radius-value;
+		}@else if $d == tr {
+				border-top-right-radius:$radius-value;
+		}@else if $d == br {
+				border-bottom-right-radius:$radius-value;
+		}@else if $d == bl {
+				border-bottom-left-radius:$radius-value;
+		}
+  }@else{
+		border-radius:$radius-value;
+  }
+}
+
+@each $key, $child in $uni-radius {
+	@if($key){
+		.uni-radius-#{"" + $key} {
+				@include radius($key)
+		}
+	}@else{
+		.uni-radius {
+				@include radius($key)
+		}
+	}
+}
+
+@each $direction in t, r, b, l,tl, tr, br, bl {
+	@each $key, $child in $uni-radius {
+		@if($key){
+			.uni-radius-#{"" + $direction}-#{"" + $key} {
+				@include radius($key,$direction,false)
+			}
+		}@else{
+			.uni-radius-#{$direction} {
+				@include radius($key,$direction,false)
+			}
+		}
+	}
+}
diff --git a/uni_modules/uni-scss/styles/setting/_space.scss b/uni_modules/uni-scss/styles/setting/_space.scss
new file mode 100644
index 0000000..3c89528
--- /dev/null
+++ b/uni_modules/uni-scss/styles/setting/_space.scss
@@ -0,0 +1,56 @@
+
+@mixin fn($space,$direction,$size,$n) {
+	@if $n {
+		#{$space}-#{$direction}: #{$size*$uni-space-root}px
+	} @else {
+		 #{$space}-#{$direction}: #{-$size*$uni-space-root}px
+	}
+}
+@mixin get-styles($direction,$i,$space,$n){
+	@if $direction == t {
+		@include fn($space, top,$i,$n);
+	} 
+	@if $direction == r {
+		@include fn($space, right,$i,$n);
+	} 
+	@if $direction == b {
+		@include fn($space, bottom,$i,$n);
+	} 
+	@if $direction == l {
+	 @include fn($space, left,$i,$n);
+	} 
+	@if $direction == x {
+		@include fn($space, left,$i,$n);
+		@include fn($space, right,$i,$n);
+	} 
+	@if $direction == y {
+		@include fn($space, top,$i,$n);
+		@include fn($space, bottom,$i,$n);
+	} 
+	@if $direction == a {
+		@if $n {
+			#{$space}:#{$i*$uni-space-root}px;
+		} @else {
+			#{$space}:#{-$i*$uni-space-root}px;
+		}
+	} 
+}
+
+@each $orientation in m,p {
+	$space: margin;
+	@if $orientation == m {
+		$space: margin;
+	} @else {
+		$space: padding;
+	}
+	@for $i from 0 through 16 {
+		@each $direction in t, r, b, l, x, y, a {
+			.uni-#{$orientation}#{$direction}-#{$i} { 
+				@include  get-styles($direction,$i,$space,true);
+			} 
+			.uni-#{$orientation}#{$direction}-n#{$i} { 
+				@include  get-styles($direction,$i,$space,false);
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/uni_modules/uni-scss/styles/setting/_styles.scss b/uni_modules/uni-scss/styles/setting/_styles.scss
new file mode 100644
index 0000000..689afec
--- /dev/null
+++ b/uni_modules/uni-scss/styles/setting/_styles.scss
@@ -0,0 +1,167 @@
+/* #ifndef APP-NVUE */
+
+$-color-white:#fff;
+$-color-black:#000;
+@mixin base-style($color) {
+	color: #fff;
+	background-color: $color;
+	border-color: mix($-color-black, $color, 8%);
+	&:not([hover-class]):active {
+		background: mix($-color-black, $color, 10%);
+		border-color: mix($-color-black, $color, 20%);
+		color: $-color-white;
+		outline: none;
+	}
+}
+@mixin is-color($color) {
+	@include base-style($color);
+	&[loading] {
+		@include base-style($color);
+		&::before {
+			margin-right:5px;
+		}
+	}
+	&[disabled] {
+	  &,
+		&[loading],
+	  &:not([hover-class]):active {
+	    color: $-color-white;
+			border-color: mix(darken($color,10%), $-color-white);
+	    background-color: mix($color, $-color-white);
+	  }
+	}
+
+}
+@mixin base-plain-style($color) {
+	color:$color;
+	background-color: mix($-color-white, $color, 90%);
+	border-color: mix($-color-white, $color, 70%);
+	&:not([hover-class]):active {
+	  background: mix($-color-white, $color, 80%);
+	  color: $color;
+	  outline: none;
+		border-color: mix($-color-white, $color, 50%);
+	}
+}
+@mixin is-plain($color){
+	&[plain] {
+		@include base-plain-style($color);
+		&[loading] {
+			@include base-plain-style($color);
+			&::before {
+				margin-right:5px;
+			}
+		}
+		&[disabled] {
+		  &,
+		  &:active {
+		    color: mix($-color-white, $color, 40%);
+		    background-color: mix($-color-white, $color, 90%);
+				border-color: mix($-color-white, $color, 80%);
+		  }
+		}
+	}
+}
+
+
+.uni-btn {
+	margin: 5px;
+	color: #393939;
+	border:1px solid #ccc;
+	font-size: 16px;
+	font-weight: 200;
+	background-color: #F9F9F9;
+	// TODO 暂时处理边框隐藏一边的问题
+	overflow: visible;
+	&::after{
+		border: none;
+	}
+
+	&:not([type]),&[type=default] {
+		color: #999;
+		&[loading] {
+			background: none;
+			&::before {
+				margin-right:5px;
+			}
+		}
+
+
+
+		&[disabled]{
+			color: mix($-color-white, #999, 60%);
+		  &,
+			&[loading],
+		  &:active {
+				color: mix($-color-white, #999, 60%);
+		    background-color: mix($-color-white,$-color-black , 98%);
+				border-color: mix($-color-white,  #999, 85%);
+		  }
+		}
+
+		&[plain] {
+			color: #999;
+			background: none;
+			border-color: $uni-border-1;
+			&:not([hover-class]):active {
+				background: none;
+			  color: mix($-color-white, $-color-black, 80%);
+				border-color: mix($-color-white, $-color-black, 90%);
+			  outline: none;
+			}
+			&[disabled]{
+			  &,
+				&[loading],
+			  &:active {
+			    background: none;
+					color: mix($-color-white, #999, 60%);
+					border-color: mix($-color-white,  #999, 85%);
+			  }
+			}
+		}
+	}
+
+	&:not([hover-class]):active {
+	  color: mix($-color-white, $-color-black, 50%);
+	}
+
+	&[size=mini] {
+		font-size: 16px;
+		font-weight: 200;
+		border-radius: 8px;
+	}
+
+
+
+	&.uni-btn-small {
+		font-size: 14px;
+	}
+	&.uni-btn-mini {
+		font-size: 12px;
+	}
+
+	&.uni-btn-radius {
+		border-radius: 999px;
+	}
+	&[type=primary] {
+		@include is-color($uni-primary);
+		@include is-plain($uni-primary)
+	}
+	&[type=success] {
+		@include is-color($uni-success);
+		@include is-plain($uni-success)
+	}
+	&[type=error] {
+		@include is-color($uni-error);
+		@include is-plain($uni-error)
+	}
+	&[type=warning] {
+		@include is-color($uni-warning);
+		@include is-plain($uni-warning)
+	}
+	&[type=info] {
+		@include is-color($uni-info);
+		@include is-plain($uni-info)
+	}
+}
+/* #endif */
diff --git a/uni_modules/uni-scss/styles/setting/_text.scss b/uni_modules/uni-scss/styles/setting/_text.scss
new file mode 100644
index 0000000..a34d08f
--- /dev/null
+++ b/uni_modules/uni-scss/styles/setting/_text.scss
@@ -0,0 +1,24 @@
+@mixin get-styles($k,$c) {
+	@if $k == size or $k == weight{
+		font-#{$k}:#{$c}
+	}@else{
+		#{$k}:#{$c}
+	}
+}
+
+@each $key, $child in $uni-headings {
+	/* #ifndef APP-NVUE */
+	.uni-#{$key} {
+		@each $k, $c in $child {
+			@include get-styles($k,$c)
+		}
+	}
+	/* #endif */
+	/* #ifdef APP-NVUE */
+	.container .uni-#{$key} {
+		@each $k, $c in $child {
+			@include get-styles($k,$c)
+		}
+	}
+	/* #endif */
+}
diff --git a/uni_modules/uni-scss/styles/setting/_variables.scss b/uni_modules/uni-scss/styles/setting/_variables.scss
new file mode 100644
index 0000000..557d3d7
--- /dev/null
+++ b/uni_modules/uni-scss/styles/setting/_variables.scss
@@ -0,0 +1,146 @@
+// @use "sass:math";
+@import  '../tools/functions.scss';
+// 间距基础倍数
+$uni-space-root: 2 !default;
+// 边框半径默认值
+$uni-radius-root:5px !default;
+$uni-radius: () !default;
+// 边框半径断点
+$uni-radius: map-deep-merge(
+  (
+    0: 0,
+		// TODO 当前版本暂时不支持 sm 属性
+    // 'sm': math.div($uni-radius-root, 2),
+    null: $uni-radius-root,
+    'lg': $uni-radius-root * 2,
+    'xl': $uni-radius-root * 6,
+    'pill': 9999px,
+    'circle': 50%
+  ),
+  $uni-radius
+);
+// 字体家族
+$body-font-family: 'Roboto', sans-serif !default;
+// 文本
+$heading-font-family: $body-font-family !default;
+$uni-headings: () !default;
+$letterSpacing: -0.01562em;
+$uni-headings: map-deep-merge(
+  (
+    'h1': (
+      size: 32px,
+			weight: 300,
+			line-height: 50px,
+			// letter-spacing:-0.01562em
+    ),
+    'h2': (
+      size: 28px,
+      weight: 300,
+      line-height: 40px,
+      // letter-spacing: -0.00833em
+    ),
+    'h3': (
+      size: 24px,
+      weight: 400,
+      line-height: 32px,
+      // letter-spacing: normal
+    ),
+    'h4': (
+      size: 20px,
+      weight: 400,
+      line-height: 30px,
+      // letter-spacing: 0.00735em
+    ),
+    'h5': (
+      size: 16px,
+      weight: 400,
+      line-height: 24px,
+      // letter-spacing: normal
+    ),
+    'h6': (
+      size: 14px,
+      weight: 500,
+      line-height: 18px,
+      // letter-spacing: 0.0125em
+    ),
+    'subtitle': (
+      size: 12px,
+      weight: 400,
+      line-height: 20px,
+      // letter-spacing: 0.00937em
+    ),
+    'body': (
+      font-size: 14px,
+			font-weight: 400,
+			line-height: 22px,
+			// letter-spacing: 0.03125em
+    ),
+    'caption': (
+      'size': 12px,
+      'weight': 400,
+      'line-height': 20px,
+      // 'letter-spacing': 0.03333em,
+      // 'text-transform': false
+    )
+  ),
+  $uni-headings
+);
+
+
+
+// 主色
+$uni-primary: #2979ff !default;
+$uni-primary-disable:lighten($uni-primary,20%) !default;
+$uni-primary-light: lighten($uni-primary,25%) !default;
+
+// 辅助色
+// 除了主色外的场景色，需要在不同的场景中使用（例如危险色表示危险的操作）。
+$uni-success: #18bc37 !default;
+$uni-success-disable:lighten($uni-success,20%) !default;
+$uni-success-light: lighten($uni-success,25%) !default;
+
+$uni-warning: #f3a73f !default;
+$uni-warning-disable:lighten($uni-warning,20%) !default;
+$uni-warning-light: lighten($uni-warning,25%) !default;
+
+$uni-error: #e43d33 !default;
+$uni-error-disable:lighten($uni-error,20%) !default;
+$uni-error-light: lighten($uni-error,25%) !default;
+
+$uni-info: #8f939c !default;
+$uni-info-disable:lighten($uni-info,20%) !default;
+$uni-info-light: lighten($uni-info,25%) !default;
+
+// 中性色
+// 中性色用于文本、背景和边框颜色。通过运用不同的中性色，来表现层次结构。
+$uni-main-color: #3a3a3a !default; 			// 主要文字
+$uni-base-color: #6a6a6a !default;			// 常规文字
+$uni-secondary-color: #909399 !default;	// 次要文字
+$uni-extra-color: #c7c7c7 !default;			// 辅助说明
+
+// 边框颜色
+$uni-border-1: #F0F0F0 !default;
+$uni-border-2: #EDEDED !default;
+$uni-border-3: #DCDCDC !default;
+$uni-border-4: #B9B9B9 !default;
+
+// 常规色
+$uni-black: #000000 !default;
+$uni-white: #ffffff !default;
+$uni-transparent: rgba($color: #000000, $alpha: 0) !default;
+
+// 背景色
+$uni-bg-color: #f7f7f7 !default;
+
+/* 水平间距 */
+$uni-spacing-sm: 8px !default;
+$uni-spacing-base: 15px !default;
+$uni-spacing-lg: 30px !default;
+
+// 阴影
+$uni-shadow-sm:0 0 5px rgba($color: #d8d8d8, $alpha: 0.5) !default;
+$uni-shadow-base:0 1px 8px 1px rgba($color: #a5a5a5, $alpha: 0.2) !default;
+$uni-shadow-lg:0px 1px 10px 2px rgba($color: #a5a4a4, $alpha: 0.5) !default;
+
+// 蒙版
+$uni-mask: rgba($color: #000000, $alpha: 0.4) !default;
diff --git a/uni_modules/uni-scss/styles/tools/functions.scss b/uni_modules/uni-scss/styles/tools/functions.scss
new file mode 100644
index 0000000..ac6f63e
--- /dev/null
+++ b/uni_modules/uni-scss/styles/tools/functions.scss
@@ -0,0 +1,19 @@
+// 合并 map
+@function map-deep-merge($parent-map, $child-map){
+	$result: $parent-map;
+	@each $key, $child in $child-map {
+		$parent-has-key: map-has-key($result, $key);
+		$parent-value: map-get($result, $key);
+		$parent-type: type-of($parent-value);
+		$child-type: type-of($child);
+		$parent-is-map: $parent-type == map;
+		$child-is-map: $child-type == map;
+			
+		@if (not $parent-has-key) or ($parent-type != $child-type) or (not ($parent-is-map and $child-is-map)){
+			$result: map-merge($result, ( $key: $child ));
+		}@else {
+			$result: map-merge($result, ( $key: map-deep-merge($parent-value, $child) ));
+		}
+	}
+	@return $result;
+};
diff --git a/uni_modules/uni-scss/theme.scss b/uni_modules/uni-scss/theme.scss
new file mode 100644
index 0000000..80ee62f
--- /dev/null
+++ b/uni_modules/uni-scss/theme.scss
@@ -0,0 +1,31 @@
+// 间距基础倍数
+$uni-space-root: 2;
+// 边框半径默认值
+$uni-radius-root:5px;
+// 主色
+$uni-primary: #2979ff;
+// 辅助色
+$uni-success: #4cd964;
+// 警告色
+$uni-warning: #f0ad4e;
+// 错误色
+$uni-error: #dd524d;
+// 描述色
+$uni-info: #909399;
+// 中性色
+$uni-main-color: #303133;
+$uni-base-color: #606266;
+$uni-secondary-color: #909399;
+$uni-extra-color: #C0C4CC;
+// 背景色
+$uni-bg-color: #f5f5f5;
+// 边框颜色
+$uni-border-1: #DCDFE6;
+$uni-border-2: #E4E7ED;
+$uni-border-3: #EBEEF5;
+$uni-border-4: #F2F6FC;
+
+// 常规色
+$uni-black: #000000;
+$uni-white: #ffffff;
+$uni-transparent: rgba($color: #000000, $alpha: 0);
diff --git a/uni_modules/uni-scss/variables.scss b/uni_modules/uni-scss/variables.scss
new file mode 100644
index 0000000..1c062d4
--- /dev/null
+++ b/uni_modules/uni-scss/variables.scss
@@ -0,0 +1,62 @@
+@import './styles/setting/_variables.scss';
+// 间距基础倍数
+$uni-space-root: 2;
+// 边框半径默认值
+$uni-radius-root:5px;
+
+// 主色
+$uni-primary: #2979ff;
+$uni-primary-disable:mix(#fff,$uni-primary,50%);
+$uni-primary-light: mix(#fff,$uni-primary,80%);
+
+// 辅助色
+// 除了主色外的场景色，需要在不同的场景中使用（例如危险色表示危险的操作）。
+$uni-success: #18bc37;
+$uni-success-disable:mix(#fff,$uni-success,50%);
+$uni-success-light: mix(#fff,$uni-success,80%);
+
+$uni-warning: #f3a73f;
+$uni-warning-disable:mix(#fff,$uni-warning,50%);
+$uni-warning-light: mix(#fff,$uni-warning,80%);
+
+$uni-error: #e43d33;
+$uni-error-disable:mix(#fff,$uni-error,50%);
+$uni-error-light: mix(#fff,$uni-error,80%);
+
+$uni-info: #8f939c;
+$uni-info-disable:mix(#fff,$uni-info,50%);
+$uni-info-light: mix(#fff,$uni-info,80%);
+
+// 中性色
+// 中性色用于文本、背景和边框颜色。通过运用不同的中性色，来表现层次结构。
+$uni-main-color: #3a3a3a; 			// 主要文字
+$uni-base-color: #6a6a6a;			// 常规文字
+$uni-secondary-color: #909399;	// 次要文字
+$uni-extra-color: #c7c7c7;			// 辅助说明
+
+// 边框颜色
+$uni-border-1: #F0F0F0;
+$uni-border-2: #EDEDED;
+$uni-border-3: #DCDCDC;
+$uni-border-4: #B9B9B9;
+
+// 常规色
+$uni-black: #000000;
+$uni-white: #ffffff;
+$uni-transparent: rgba($color: #000000, $alpha: 0);
+
+// 背景色
+$uni-bg-color: #f7f7f7;
+
+/* 水平间距 */
+$uni-spacing-sm: 8px;
+$uni-spacing-base: 15px;
+$uni-spacing-lg: 30px;
+
+// 阴影
+$uni-shadow-sm:0 0 5px rgba($color: #d8d8d8, $alpha: 0.5);
+$uni-shadow-base:0 1px 8px 1px rgba($color: #a5a5a5, $alpha: 0.2);
+$uni-shadow-lg:0px 1px 10px 2px rgba($color: #a5a4a4, $alpha: 0.5);
+
+// 蒙版
+$uni-mask: rgba($color: #000000, $alpha: 0.4);
diff --git a/uni_modules/x-skeleton/changelog.md b/uni_modules/x-skeleton/changelog.md
new file mode 100644
index 0000000..9bd11da
--- /dev/null
+++ b/uni_modules/x-skeleton/changelog.md
@@ -0,0 +1,11 @@
+## 1.0.4（2023-09-02）
+1、优化一些显示的细节问题
+## 1.0.3（2023-09-01）
+1、新增动画、时间、颜色等相关属性
+## 1.0.2（2023-08-31）
+1、回滚到v1.0.0版本，暂时取消动画时间的修改属性
+## 1.0.1（2023-08-31）
+1、新增动画持续时间属性
+2、新增淡出持续时间属性
+## 1.0.0（2023-08-31）
+第一个版本
diff --git a/uni_modules/x-skeleton/components/x-skeleton/x-skeleton-configs.js b/uni_modules/x-skeleton/components/x-skeleton/x-skeleton-configs.js
new file mode 100644
index 0000000..017c6b0
--- /dev/null
+++ b/uni_modules/x-skeleton/components/x-skeleton/x-skeleton-configs.js
@@ -0,0 +1,147 @@
+export default {
+	methods: {
+		bannerConfigs() {
+			return {
+				padding: '20rpx',
+				gridRows: 1,
+				gridColumns: 1,
+				gridRowsGap: '40rpx',
+				gridColumnsGap: '24rpx',
+				itemDirection: 'row',
+				itemGap: '30rpx',
+				itemAlign: 'center',
+				headShow: true,
+				headWidth: '100%',
+				headHeight: '300rpx',
+				headBorderRadius: '20rpx',
+				textShow: false,
+				textRows: 3,
+				textRowsGap: '20rpx',
+				textWidth: '100%',
+				textHeight: '30rpx',
+				textBorderRadius: '6rpx',
+				...this.configs
+			}
+		},
+
+		infoConfigs() {
+			return {
+				padding: '20rpx',
+				gridRows: 1,
+				gridColumns: 1,
+				gridRowsGap: '50rpx',
+				gridColumnsGap: '24rpx',
+				itemDirection: 'row',
+				itemGap: '30rpx',
+				itemAlign: 'flex-start',
+				headShow: true,
+				headWidth: '100rpx',
+				headHeight: '100rpx',
+				headBorderRadius: '50%',
+				textShow: true,
+				textRows: 4,
+				textRowsGap: '30rpx',
+				textWidth: ['50%', '100%', '100%', '80%'],
+				textHeight: ['40rpx', '24rpx', '24rpx', '24rpx'],
+				textBorderRadius: '6rpx',
+				...this.configs
+			}
+		},
+
+		textConfigs() {
+			return {
+				padding: '20rpx',
+				gridRows: 1,
+				gridColumns: 1,
+				gridRowsGap: '50rpx',
+				gridColumnsGap: '24rpx',
+				itemDirection: 'row',
+				itemGap: '30rpx',
+				itemAlign: 'flex-start',
+				headShow: false,
+				headWidth: '100rpx',
+				headHeight: '100rpx',
+				headBorderRadius: '50%',
+				textShow: true,
+				textRows: 4,
+				textRowsGap: '30rpx',
+				textWidth: ['50%', '100%', '100%', '80%'],
+				textHeight: '30rpx',
+				textBorderRadius: '6rpx',
+				...this.configs
+			}
+		},
+
+		menuConfigs() {
+			return {
+				padding: '20rpx',
+				gridRows: 2,
+				gridColumns: 5,
+				gridRowsGap: '40rpx',
+				gridColumnsGap: '40rpx',
+				itemDirection: 'column',
+				itemGap: '16rpx',
+				itemAlign: 'center',
+				headShow: true,
+				headWidth: '100rpx',
+				headHeight: '100rpx',
+				headBorderRadius: '50%',
+				textShow: true,
+				textRows: 1,
+				textRowsGap: '0rpx',
+				textWidth: '100%',
+				textHeight: '24rpx',
+				textBorderRadius: '6rpx',
+				...this.configs
+			}
+		},
+
+		listConfigs() {
+			return {
+				padding: '20rpx',
+				gridRows: 2,
+				gridColumns: 1,
+				gridRowsGap: '50rpx',
+				gridColumnsGap: '24rpx',
+				itemDirection: 'row',
+				itemGap: '30rpx',
+				itemAlign: 'flex-start',
+				headShow: true,
+				headWidth: '200rpx',
+				headHeight: '200rpx',
+				headBorderRadius: '16rpx',
+				textShow: true,
+				textRows: 4,
+				textRowsGap: '30rpx',
+				textWidth: ['50%', '100%', '100%', '80%'],
+				textHeight: ['38rpx', '24rpx', '24rpx', '24rpx'],
+				textBorderRadius: '6rpx',
+				...this.configs
+			}
+		},
+
+		waterfallConfigs() {
+			return {
+				padding: '20rpx',
+				gridRows: 2,
+				gridColumns: 2,
+				gridRowsGap: '40rpx',
+				gridColumnsGap: '24rpx',
+				itemDirection: 'column',
+				itemGap: '16rpx',
+				itemAlign: 'center',
+				headShow: true,
+				headWidth: '100%',
+				headHeight: '400rpx',
+				headBorderRadius: '12rpx',
+				textShow: true,
+				textRows: 3,
+				textRowsGap: '12rpx',
+				textWidth: ['40%', '85%', '60%'],
+				textHeight: ['30rpx', '20rpx', '20rpx'],
+				textBorderRadius: '6rpx',
+				...this.configs
+			}
+		},
+	}
+}
\ No newline at end of file
diff --git a/uni_modules/x-skeleton/components/x-skeleton/x-skeleton.vue b/uni_modules/x-skeleton/components/x-skeleton/x-skeleton.vue
new file mode 100644
index 0000000..6c52e00
--- /dev/null
+++ b/uni_modules/x-skeleton/components/x-skeleton/x-skeleton.vue
@@ -0,0 +1,324 @@
+<template>
+	<view class="x-skeleton" :style="variableStr">
+		<!-- 骨架屏 -->
+		<view 
+			v-if="skeletonLoading"
+			class="x-skeleton__wrapper"
+			:class="[ startFadeOut && 'fade-out' ]"
+			:style="{ padding: skeletonConfigs.padding }"
+		>
+			<view
+				v-for="(row, rowIndex) in gridRowsArr" :key="rowIndex"
+				class="x-skeleton__wrapper__rows" 
+				:style="{ marginBottom: rowIndex < gridRowsArr.length - 1 ? skeletonConfigs.gridRowsGap : 0 }"
+			>
+				<view
+					v-for="(column, columnIndex) in gridColumnsArr" :key="columnIndex"
+					class="x-skeleton__wrapper__columns" 
+					:style="{ 
+						flexDirection: skeletonConfigs.itemDirection, 
+						alignItems: skeletonConfigs.itemAlign,
+						marginRight: columnIndex < gridColumnsArr.length - 1 ? skeletonConfigs.gridColumnsGap : 0,
+					}"
+				>
+					<view 
+						v-if="skeletonConfigs.headShow"
+						class="x-skeleton__wrapper__head" 
+						:class="[ animate && 'animate' ]"
+						:style="{
+							width: skeletonConfigs.headWidth, 
+							height: skeletonConfigs.headHeight, 
+							borderRadius: skeletonConfigs.headBorderRadius,
+							marginRight: (skeletonConfigs.itemDirection == 'row' && skeletonConfigs.textShow) ? skeletonConfigs.itemGap : 0,
+							marginBottom: (skeletonConfigs.itemDirection == 'column' && skeletonConfigs.textShow) ? skeletonConfigs.itemGap : 0
+						}"
+					></view>
+					<view v-if="skeletonConfigs.textShow" class="x-skeleton__wrapper__text">
+						<view
+							v-for="(text, textIndex) in textRowsArr" :key="textIndex"
+							class="x-skeleton__wrapper__text__row" 
+							:class="[animate && 'animate']"
+							:style="{
+								width: text.width, 
+								height: text.height, 
+								borderRadius: skeletonConfigs.textBorderRadius,
+								marginBottom: textIndex < textRowsArr.length - 1 ? skeletonConfigs.textRowsGap : 0
+							}"
+						></view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- 插槽 -->
+		<view v-else>
+			<slot></slot>
+		</view>
+	</view>
+</template>
+
+<script>
+	import XSkeletonConfigs from './x-skeleton-configs.js'
+	export default {
+		name: "x-skeleton",
+		mixins: [ XSkeletonConfigs ],
+		props: {
+			// 骨架屏类型
+			type: {
+				type: String,
+				default: '' //banner轮播图、info个人信息、text段落、menu菜单、list列表、waterfall瀑布流
+			},
+			// 是否展示骨架组件
+			loading: {
+			    type: Boolean,
+			    default: true
+			},
+			// 是否开启动画效果
+			animate: {
+			    type: Boolean,
+			    default: true
+			},
+			// 动画效果持续时间，单位秒
+			animateTime: {
+				type: Number | String,
+				default: 1.8
+			},
+			// 是否开启淡出动画
+			fadeOut: {
+				type: Boolean,
+				default: true
+			},
+			// 淡出效果持续时间，单位秒
+			fadeOutTime: {
+				type: Number | String,
+				default: 0.5
+			},
+			// 骨架的背景色
+			bgColor: {
+				type: String,
+				default: '#EAEDF5'
+			},
+			// 骨架的动画高亮背景色
+			highlightBgColor: {
+				type: String,
+				default: '#F9FAFF'
+			},
+			// 自定义配置
+			configs: {
+				type: Object,
+				default: () => {
+					return {
+						// padding: '30rpx',		   				  //内边距
+						// gridRows: 3, 			 	   			  //行数
+						// gridColumns: 2,	  		  	   			  //列数
+						// gridRowsGap: '40rpx',		   			  //行间隔
+						// gridColumnsGap: '24rpx',	   			  	  //竖间距
+						// itemDirection: 'column',   				  //head与text之间的排列方向（row、column）
+						// itemGap: '16rpx', 				  		  //head与text之间的间隔
+						// itemAlign: 'center',  	   				  //head与text之间的纵轴对齐方式（center、flex-start、flex-end、baseline）
+						// headShow: true,		 	   				  //head是否展示
+						// headWidth: '100%',	  	   				  //head宽度，支持百分比
+						// headHeight: '400rpx',	   				  //head高度
+						// headBorderRadius: '12rpx', 				  //head圆角，支持百分比
+						// textShow: true,		   				      //文本是否展示
+						// textRows: 3,		 	   				  	  //文本的行数
+						// textRowsGap: '12rpx',		   			  //文本间距
+						// textWidth: ['40%', '85%', '60%'], 		  //文本的宽度，可以为百分比，数值，带单位字符串等，可通过数组传入指定每个段落行的宽度
+						// textHeight: ['30rpx', '20rpx', '20rpx'],   //文本的高度，可以为数值，带单位字符串等，可通过数组传入指定每个段落行的高度
+						// textBorderRadius: '6rpx',  			      //文本的圆角，支持百分比
+					}
+				}
+			}
+		},
+
+		computed: {
+			gridRowsArr() {
+				return new Array(Number(this.skeletonConfigs?.gridRows || []));
+			},
+			gridColumnsArr() {
+				return new Array(Number(this.skeletonConfigs?.gridColumns || []));
+			},
+			textRowsArr() {
+				if (!this.skeletonConfigs?.textShow) return [];
+				if (/%$/.test(this.skeletonConfigs.textHeight)) {
+					console.error('x-skeleton: textHeight参数不支持百分比单位');
+				}
+				const rows = []
+				for (let i = 0; i < this.skeletonConfigs.textRows; i++) {
+					const { gridRows, textWidth, textHeight } = this.skeletonConfigs;
+					let item = {},
+						// 需要预防超出数组边界的情况
+						rowWidth = this.isArray(textWidth) ? (textWidth[i] || (i === gridRows - 1 ? '70%' : '100%')) : i === gridRows - 1 ? '70%' : textWidth,
+						rowHeight = this.isArray(textHeight) ? (textHeight[i] || '30rpx') : textHeight
+					// 非百分比的宽度时，调整像素单位
+					if (/%$/.test(rowWidth)) {
+						item.width = rowWidth;
+					} else {
+						item.width = this.addUnit(rowWidth)
+					}
+					item.height = this.addUnit(rowHeight)
+					rows.push(item)
+				}
+				return rows
+			},
+			variableStr() {
+				let keys = ['animateTime', 'fadeOutTime', 'bgColor', 'highlightBgColor'];
+				let str = keys.map(item => {
+					if (item.indexOf('Time') > -1) {
+						return `--${item}:${this[item]}s`
+					} else {
+						return `--${item}:${this[item]}`
+					}
+				}).join(";");
+				return str;
+			}
+		},
+
+		watch: {
+			loading: {
+				immediate: true, 
+				handler(value) {
+					if (value) {
+						this.skeletonLoading = true;
+					} else {
+						if (this.fadeOut) {
+							this.startFadeOut = true;
+							setTimeout(() => {
+								this.skeletonLoading = false;
+								this.startFadeOut = false;
+							}, this.fadeOutTime * 1000);
+						} else {
+							this.skeletonLoading = false;
+						}
+					}
+				}
+			},
+			type: {
+				immediate: true,
+				handler(value) {
+					if (value === 'banner') {
+						this.skeletonConfigs = this.bannerConfigs();
+					} else if (value === 'info') {
+						this.skeletonConfigs = this.infoConfigs();
+					} else if (value === 'text') {
+						this.skeletonConfigs = this.textConfigs();
+					} else if (value === 'menu') {
+						this.skeletonConfigs = this.menuConfigs();
+					} else if (value === 'list') {
+						this.skeletonConfigs = this.listConfigs();
+					} else if (value === 'waterfall') {
+						this.skeletonConfigs = this.waterfallConfigs();
+					} else {
+						this.skeletonConfigs = this.configs || {};
+					}
+				}
+			}
+		},
+
+		data() {
+			return {
+				skeletonConfigs: this.configs || {},
+				skeletonLoading: this.loading,
+				startFadeOut: false,
+				width: 0
+			};
+		},
+		
+		mounted() {
+
+		},
+		
+		methods: {
+			/**
+			 * @description 是否为数组
+			 * @param {object} value 需要判断的对象
+			 */
+			isArray(value) {
+			    if (typeof Array.isArray === 'function') {
+			        return Array.isArray(value)
+			    }
+			    return Object.prototype.toString.call(value) === '[object Array]'
+			},
+			
+			/**
+			 * @description 添加单位，如果有rpx，upx，%，px等单位结尾或者值为auto，直接返回，否则加上px单位结尾
+			 * @param {string|number} value 需要添加单位的值
+			 * @param {string} unit 添加的单位名 比如px
+			 */
+			addUnit(value = 'auto', unit = 'px') {
+				value = String(value);
+				// 用uView内置验证规则中的number判断是否为数值
+				return /^[\+-]?(\d+\.?\d*|\.\d+|\d\.\d+e\+\d+)$/.test(value) ? `${value}${unit}` : value;
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@mixin background {
+		background: linear-gradient(90deg, var(--bgColor) 25%, var(--highlightBgColor) 37%, var(--bgColor) 50%);
+		background-size: 400% 100%;
+	}
+	
+	.x-skeleton {
+		width: 100%;
+		box-sizing: border-box;
+
+		.x-skeleton__wrapper {
+			display: flex;
+			flex-direction: column;
+
+			&__rows {
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+			}
+
+			&__columns {
+				display: flex;
+				align-items: center;
+				flex: 1;
+			}
+
+			&__head {
+				width: 100%;
+				@include background;
+			}
+			
+			&__text {
+				flex: 1;
+				width: 100%;
+				&__row {
+					@include background;
+				}
+			}
+		}
+		
+		.fade-out {
+			opacity: 0;
+			animation: fadeOutAnim var(--fadeOutTime);
+		}
+		
+		@keyframes fadeOutAnim {
+			from {
+				opacity: 1;
+			}
+			to {
+				opacity: 0;
+			}
+		}
+		
+		.animate {
+			animation: skeletonAnim var(--animateTime) ease infinite;
+		}
+		
+		@keyframes skeletonAnim {
+			0% {
+				background-position: 100% 50%;
+			}
+		
+			100% {
+				background-position: 0 50%;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/uni_modules/x-skeleton/package.json b/uni_modules/x-skeleton/package.json
new file mode 100644
index 0000000..7912e90
--- /dev/null
+++ b/uni_modules/x-skeleton/package.json
@@ -0,0 +1,84 @@
+{
+  "id": "x-skeleton",
+  "displayName": "skeleton骨架屏（可任意配置-易用-灵活-动画）",
+  "version": "1.0.4",
+  "description": "x-skeleton骨架屏可随意配置内容，扩展性强，简单易用，内含常用的骨架类型",
+  "keywords": [
+    "skeleton",
+    "骨架屏",
+    "加载效果",
+    "vue",
+    "微信小程序"
+],
+  "repository": "",
+"engines": {
+  },
+  "dcloudext": {
+    "type": "component-vue",
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "插件不采集任何数据",
+      "permissions": "无"
+    },
+    "npmurl": ""
+  },
+  "uni_modules": {
+    "dependencies": [],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "Vue": {
+          "vue2": "y",
+          "vue3": "u"
+        },
+        "App": {
+          "app-vue": "u",
+          "app-nvue": "u"
+        },
+        "H5-mobile": {
+          "Safari": "u",
+          "Android Browser": "u",
+          "微信浏览器(Android)": "u",
+          "QQ浏览器(Android)": "u"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "u"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "u",
+          "百度": "u",
+          "字节跳动": "u",
+          "QQ": "u",
+          "钉钉": "u",
+          "快手": "u",
+          "飞书": "u",
+          "京东": "u"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/x-skeleton/readme.md b/uni_modules/x-skeleton/readme.md
new file mode 100644
index 0000000..74726ab
--- /dev/null
+++ b/uni_modules/x-skeleton/readme.md
@@ -0,0 +1,93 @@
+# x-skeleton
+
+# 功能介绍
+- 支持 H5、微信小程序，其他端未测试过
+- 使用简单、灵活，高度自定义
+- 加载时支持动画
+- 消失时加了动画，不再生硬切换页面
+- 支持绝大部分常用场景：
+1、轮播图 
+2、个人信息 
+3、段落 
+4、菜单 
+5、列表 
+6、瀑布流
+7、自定义...
+
+# 属性说明
+
+| 参数    | 说明                                                | 类型    | 默认值 | 可选值 |
+| ------- | --------------------------------------------------- | ------- | ------ | --- |
+| type | 骨架类型，为空时是完全自定义 | String | - |banner轮播图、info个人信息、text段落、menu菜单、list列表、waterfall瀑布流|
+| loading | 是否显示骨架占位图，设置为false将会展示子组件内容 | Boolean | true |true、false|
+| animate | 是否开启动画效果 | Boolean | true |true、false|
+| animateTime | 动画效果持续时间，单位秒 | Number \| String | 1.8 |-|
+| fadeOut | 是否开启淡出动画 | Boolean | true |true、false|
+| fadeOutTime | 淡出效果持续时间，单位秒 | Number \| String | 0.5 |-|
+| bgColor | 骨架的背景色 | String | #EAEDF5 |-|
+| highlightBgColor | 骨架的动画高亮背景色 | String | #F9FAFF |-|
+| configs | 自定义配置，具体看下方 | Object | {} |-|
+
+## configs参数说明
+
+| 参数    | 说明                                                | 类型  |
+| ------- | --------------------------------------------------- | ------- |
+| padding | 骨架内边距，同 css 的 padding | String |
+| gridRows | 行数 | Number |
+| gridColumns | 列数 | Number |
+| gridRowsGap | 行间隔 | String |
+| gridColumnsGap | 竖间距 | String |
+| itemDirection | head与text之间的排列方向（row、column） | String |
+| itemGap | head与text之间的间隔 | String |
+| itemAlign | head与text之间的纵轴对齐方式，同 flex 的align-items（center、flex-start、flex-end等） | String |
+| headShow | head是否展示 | Boolean |
+| headWidth | head宽度，支持百分比 | String |
+| headHeight | head高度 | String |
+| headBorderRadius | head圆角，支持百分比 | String |
+| textShow | text是否展示 | Boolean |
+| textRows | text的行数 | Number |
+| textRowsGap | text间距 | String |
+| textWidth | text的宽度，可以为百分比，数值，带单位字符串等，可通过数组传入指定每个段落行的宽度 | String \| Array \| Number |
+| textHeight | text的高度，可以为数值，带单位字符串等，可通过数组传入指定每个段落行的高度 | String \| Array \| Number |
+| textBorderRadius | text的圆角，支持百分比 | String |
+
+大部分情况下，直接指定相应的 type 已经够用了，如果大家想进行样式的微调、完全自定义可通过设置 configs 来实现。
+
+简单解释一下这些参数（右边有结构布局图示）：
+
+布局总共分成 4 块，分别是 grid、item、head、text。
+
+1、grid：包含 item，指定每一行有多少个 item，每一列有多少个 item
+
+2、item：包含 head、text，可设置他们之间的排列方式、间距
+
+3、head：一个 item 只有一个 head，可设置宽高、圆角
+
+4、text：一个 item 可以有多行 text，可分别设置宽高、圆角、间距
+
+
+
+# 使用示例
+
+```html
+<x-skeleton type="banner" :loading="loading">
+	<view>我是轮播图</view>
+</x-skeleton>
+```
+
+```js
+export default {
+	data() {
+		return {
+			loading: true,
+		}
+	},
+	onLoad() {
+		setTimeout(() => {
+			this.loading = false;
+		}, 2000);
+	},
+}
+```
+
+更多用法请下载查看示例代码，有问题可以留言
\ No newline at end of file