diff --git a/components-diy/diy-article.vue b/components-diy/diy-article.vue
index 7121341..5539a1b 100644
--- a/components-diy/diy-article.vue
+++ b/components-diy/diy-article.vue
@@ -3,29 +3,29 @@
 		<view class="article-wrap" :style="warpCss">
 			<view :class="['list-wrap', value.style]" :style="warpCss">
 				<!-- 自动垂直滚动 -->
-				<swiper class="auto-scroll-swiper" 
-					:style="swiperStyle"
-					:vertical="swiperConfig.vertical !== false"
-					:autoplay="swiperConfig.autoplay !== false"
-					:circular="swiperConfig.circular !== false"
-					:interval="swiperConfig.interval || 3000"
-					:duration="swiperConfig.duration || 500"
+				<swiper class="auto-scroll-swiper" :style="swiperStyle" :vertical="swiperConfig.vertical !== false"
+					:autoplay="swiperConfig.autoplay !== false" :circular="swiperConfig.circular !== false"
+					:interval="swiperConfig.interval || 3000" :duration="swiperConfig.duration || 500"
 					:display-multiple-items="safeDisplayMultipleItems">
 					<swiper-item v-for="(item, index) in list" :key="index" @click="toDetail(item)">
 						<view class="swiper-item-content">
 							<view :class="['item', value.ornament.type]" :style="itemCss">
 								<view class="article-img">
-									<image class="cover-img" :src="$util.img(item.cover_img)" mode="widthFix" @error="imgError(index)" />
+									<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>
+									<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>
+										<text class="date">{{ $util.timeStampTurnTime(item.create_time, 'date')
+											}}</text>
 									</view>
 								</view>
 							</view>
@@ -38,225 +38,228 @@
 </template>
 
 <script>
-	// 文章
-	export default {
-		name: 'diy-article',
-		props: {
-			value: {
-				type: Object
+import DiyMinx from './minx.js'
+// 文章
+export default {
+	name: 'diy-article',
+	props: {
+		value: {
+			type: Object
+		}
+	},
+	mixins: [DiyMinx],
+	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: {
+		// 获取swiper配置，默认空对象
+		swiperConfig() {
+			return this.value?.swiperConfig || {};
 		},
-		data() {
+		// 安全的display-multiple-items值，确保不大于swiper-item数量
+		safeDisplayMultipleItems() {
+			const displayCount = this.swiperConfig.displayMultipleItems || 3;
+			const actualCount = this.list.length;
+			return actualCount > 0 ? Math.min(displayCount, actualCount) : 1;
+		},
+		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;
+		},
+		// swiper容器样式
+		swiperStyle() {
+			// 从swiperConfig获取高度，默认600rpx
+			const height = this.swiperConfig.swiperHeight || 600;
 			return {
-				list: [],
-				loading: true,
-				skeletonConfig: {
-					gridRows: 1,
-					gridRowsGap: '40rpx',
-					headWidth: '160rpx',
-					headHeight: '160rpx',
-					textRows: 2
-				}
+				height: height + 'rpx',
+				width: '100%'
 			};
 		},
-		created() {
-			this.getList();
-		},
-		watch: {
-			// 组件刷新监听
-			componentRefresh: function (nval) {
-				this.getList();
+		// 子项样式
+		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;';
 			}
-		},
-		computed: {
-			// 获取swiper配置，默认空对象
-			swiperConfig() {
-				return this.value?.swiperConfig || {};
-			},
-			// 安全的display-multiple-items值，确保不大于swiper-item数量
-			safeDisplayMultipleItems() {
-				const displayCount = this.swiperConfig.displayMultipleItems || 3;
-				const actualCount = this.list.length;
-				return actualCount > 0 ? Math.min(displayCount, actualCount) : 1;
-			},
-			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;
-			},
-		    // swiper容器样式
-			swiperStyle() {
-				// 从swiperConfig获取高度，默认600rpx
-				const height = this.swiperConfig.swiperHeight || 600;
-				return {
-					height: height + 'rpx',
-					width: '100%'
-				};
-			},
-			// 子项样式
-			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;
+			if (this.value.ornament.type == 'shadow') {
+				obj += 'box-shadow:' + '0 0 10rpx ' + this.value.ornament.color;
 			}
-		},
-		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;
+			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 {
-			.auto-scroll-swiper {
-				height: 600rpx; /* 可以根据需要调整高度 */
-				width: 100%;
-				
-				.swiper-item-content {
-					padding: 10rpx 20rpx;
-					box-sizing: border-box;
-				}
+.article-wrap {
+	.list-wrap {
+		.auto-scroll-swiper {
+			height: 600rpx;
+			/* 可以根据需要调整高度 */
+			width: 100%;
+
+			.swiper-item-content {
+				padding: 10rpx 20rpx;
+				box-sizing: border-box;
 			}
-			
+		}
+
+		.item {
+			margin: 0;
+			margin-bottom: 24rpx;
+		}
+
+		.style-1 .item {
+			padding: 20rpx;
+		}
+
+		&.style-1 {
 			.item {
-				margin: 0;
-				margin-bottom: 24rpx;
-			}
-			
-			.style-1 .item {
-				padding: 20rpx;
-			}
-			
-			&.style-1 {
-				.item {
-					display: flex;
+				display: flex;
+				margin-top: 0;
+
+				&:first-of-type {
 					margin-top: 0;
+				}
 
-					&: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%;
 					}
+				}
 
-					.article-img {
-						margin-right: 20rpx;
-						width: 160rpx;
-						height: 160rpx;
+				.info-wrap {
+					flex: 1;
+					display: flex;
+					flex-direction: column;
+					justify-content: space-between;
+
+					.title {
+						font-weight: bold;
+						margin-bottom: 10rpx;
 						overflow: hidden;
-						display: flex;
-						align-items: center;
-						justify-content: center;
-
-						image {
-							width: 100%;
-						}
+						text-overflow: ellipsis;
+						display: -webkit-box;
+						-webkit-line-clamp: 2;
+						-webkit-box-orient: vertical;
+						font-size: 30rpx;
+						line-height: 1.5;
 					}
 
-					.info-wrap {
-						flex: 1;
+					.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;
-						flex-direction: column;
-						justify-content: space-between;
+						color: #999ca7;
+						justify-content: flex-start;
+						align-items: center;
+						margin-top: 10rpx;
+						line-height: 1;
 
-						.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;
+						text {
 							font-size: $font-size-tag;
 						}
 
-						.read-wrap {
-							display: flex;
-							color: #999ca7;
-							justify-content: flex-start;
-							align-items: center;
-							margin-top: 10rpx;
-							line-height: 1;
+						.iconfont {
+							font-size: 36rpx;
+							vertical-align: bottom;
+							margin-right: 10rpx;
+						}
 
-							text {
-								font-size: $font-size-tag;
-							}
+						.category-icon {
+							width: 8rpx;
+							height: 8rpx;
+							border-radius: 50%;
+							background: $base-color;
+							margin-right: 10rpx;
+						}
 
-							.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;
-							}
+						.date {
+							margin-left: 20rpx;
 						}
 					}
 				}
 			}
 		}
 	}
+}
 </style>
\ No newline at end of file
diff --git a/components-diy/diy-audio.vue b/components-diy/diy-audio.vue
index 28b11c6..22ba175 100644
--- a/components-diy/diy-audio.vue
+++ b/components-diy/diy-audio.vue
@@ -1,444 +1,453 @@
 <template>
 	<view data-component-name="diy-audio">
-		<view class="fui-audio style1" :style="{background:value.background}" v-if="value.type == 'style-2'">
+		<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 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 class="progressBar" :style="{ width: audiowidth }"></view>
 			</view>
-			<view class="time" :style="{color:value.timecolor}">
-			{{audiotime}}
+			<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 @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="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 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 class="progressBar" :style="{ width: audiowidth }"></view>
 			</view>
-			<view class="time" :style="{color:value.timecolor}">
-			<!-- {{audios[value.id].audiotime}} -->
-			{{audiotime}}
+			<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 @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
+import DiyMinx from './minx.js'
+// 音频
+export default {
+	name: 'diy-audio',
+	props: {
+		value: {
+			type: Object
+		}
+	},
+	mixins: [DiyMinx],
+	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;';
 			}
-		},
-		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
+			return obj;
+		}
+	},
+	methods: {
+
+		play() {
+
+			var t = this.value.id, a = this.audiosObj[t] || !1;
+			var e = {
+				audio: this.$util.img(this.value.audioUrl),
 			}
-		},
-		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;';
+			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)
 				}
-				return obj;
 			}
+			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)
 		},
-		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() {
+		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();
+					// 将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
-				});
 			}
+			// 给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;
-	}
+.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;
+}
 
-	.diy-audio>>>.uni-video-container {
-		background-color: transparent;
-	}
+.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/diy-bargain.vue b/components-diy/diy-bargain.vue
index f43ab9f..fa92ffe 100644
--- a/components-diy/diy-bargain.vue
+++ b/components-diy/diy-bargain.vue
@@ -3,13 +3,19 @@
 		<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' : '' }">
+			<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')">
+				<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>
@@ -17,19 +23,25 @@
 
 			<!-- 商品列表 -->
 			<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="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 :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' }]">
+						<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')"/>
+									<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">
@@ -49,9 +61,14 @@
 						</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>
+								<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 + ')' : '',
@@ -67,52 +84,86 @@
 
 			<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="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 : '' }">
+							<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' }]">
+							<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>
+								<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 : '' }">
+							<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">
+				<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 : '' }">
+								<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' }]">
+							<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 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 : '' }">
+								<view class="original-price price-font" v-if="value.priceStyle.lineControl"
+									:style="{ color: value.theme == 'diy' ? value.priceStyle.lineColor : '' }">
 									¥{{ item.price }}
 								</view>
 							</view>
@@ -126,598 +177,601 @@
 </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();
+import DiyMinx from './minx.js'
+// 砍价商品
+export default {
+	name: 'diy-bargain',
+	props: {
+		value: {
+			type: Object
+		}
+	},
+	mixins: [DiyMinx],
+	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();
-		},
-		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();
-			}
 		}
-	};
+	},
+	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/.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;
-	}
+/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;
-	}
+scroll-view ::-webkit-scrollbar {
+	width: 0;
+	height: 0;
+	background-color: transparent;
+	touch-action: none;
+}
 
-	.diy-bargain {
-		overflow: hidden;
+.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;
+	// 头部
+	.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;
-				}
+			.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;
+			.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;
+				&::after {
+					content: '';
+					position: absolute;
+					width: 2rpx;
+					height: 24rpx;
+					background-color: #fff;
+					top: 50%;
+					transform: translateY(-50%);
+					left: -12rpx;
 				}
 			}
 
-			&.style-2 {
+			.head-right {
 				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;
-					}
-				}
+				font-size: $font-size-sub;
+				color: #fff;
 			}
 		}
 
-		// 商品列表
-		&.row1-of1 {
-			.item {
+		&.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;
-				margin-bottom: 20rpx;
-				padding: 16rpx;
+				align-items: center;
+				justify-content: center;
+				height: 36rpx;
+				background: linear-gradient(270deg, #ffbd5b 0%, #fd882e 100%);
+				border-radius: 24rpx;
+				padding: 2rpx;
 
-				&.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 {
+				text:nth-child(1) {
 					position: relative;
+					left: 6rpx;
+					transform: scale(0.9);
 				}
 
-				.progress {
-					display: flex;
-					flex-direction: column;
-					margin-top: 10rpx;
-					margin-right: 16rpx;
+				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;
+				}
+			}
+		}
+	}
 
-					.bg {
-						margin-left: 6rpx;
-						width: auto;
-						height: 20rpx;
-						border-radius: 20rpx;
-						background-color: #ffeadb;
-						position: relative;
+	// 商品列表
+	&.row1-of1 {
+		.item {
+			display: flex;
+			margin-bottom: 20rpx;
+			padding: 16rpx;
 
-						&::after {
-							content: '';
-							width: 26rpx;
-							height: 26rpx;
-							border-radius: 50%;
-							background-color: #fa1a1a;
-							position: absolute;
-							top: 50%;
-							transform: translateY(-50%);
-							right: -18rpx;
-						}
+			&.shadow {
+				margin: 8rpx 8rpx 20rpx 8rpx;
+			}
 
-						.curr {
-							width: 0;
-							height: 20rpx;
-							border-radius: 20rpx;
-							background-color: #fa1a1a;
-							position: relative;
+			&:last-child {
+				margin-bottom: 0;
+				padding-bottom: 20rpx;
+			}
 
-							.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;
-							}
-						}
-					}
+			.img-wrap {
+				width: 200rpx;
+				height: 200rpx;
 
-					.num {
-						font-size: $font-size-tag;
-						margin-top: 12rpx;
-						line-height: 1;
-
-						text {
-							color: #fa1a1a;
-						}
-					}
+				>image {
+					width: 200rpx;
 				}
 			}
 
-			&.style-3 {
-				.progress {
-					display: flex;
-					color: $color-tip;
-					font-size: $font-size-sub;
+			.content {
+				flex: 1;
+				display: flex;
+				flex-direction: column;
+				justify-content: space-between;
+				padding: 6rpx 0 6rpx 20rpx;
 
-					.num {
+				.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);
 					}
 				}
 
-				.item {
-					.content {
-						justify-content: space-around;
+				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;
 					}
 
-					.img-wrap {
-						overflow: hidden;
+					.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;
 					}
 				}
 			}
 		}
 
-		&.horizontal-slide {
-			.scroll {
-				width: calc(100% - 40rpx);
-				padding: 20rpx;
-				line-height: 1;
-				white-space: nowrap;
+		&.style-3 {
+			.progress {
+				display: flex;
+				color: $color-tip;
+				font-size: $font-size-sub;
 
-				.item.shadow {
-					margin-bottom: 8rpx;
+				.num {
+					color: var(--price-color);
 				}
 			}
 
-			.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;
+				.content {
+					justify-content: space-around;
 				}
 
 				.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;
 				}
 			}
 		}
 	}
+
+	&.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/diy-bottom-nav.vue b/components-diy/diy-bottom-nav.vue
index e20b045..89490e2 100644
--- a/components-diy/diy-bottom-nav.vue
+++ b/components-diy/diy-bottom-nav.vue
@@ -5,14 +5,18 @@
 			<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">
+						<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>
+								<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>
+								<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 }"
@@ -24,21 +28,27 @@
 					<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)" />
+								<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>
+								<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 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 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>
@@ -49,173 +59,210 @@
 </template>
 
 <script>
-	export default {
-		name: 'diy-bottom-nav',
-		props: {
-			value: {
-				type: Object
-			},
-			name: {
-				type: String,
-				default: ''
-			}
+import DiyMinx from './minx.js'
+// 底部导航栏
+export default {
+	name: 'diy-bottom-nav',
+	props: {
+		value: {
+			type: Object
 		},
-		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();
+		name: {
+			type: String,
+			default: ''
+		}
+	},
+	mixins: [DiyMinx],
+	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;
+				query.select('.tab-bar')
+					.boundingClientRect(data => {
+						if (data) this.$store.commit('setTabBarHeight', data.height +
+							'px');
+					}).exec();
 			}
-		},
-		watch: {
-			cartChange: function (nval, oval) {
-				if (nval > oval) {
-					let animation = uni.createAnimation({
-						duration: 200,
-						timingFunction: 'ease'
-					});
-					animation.scale(1.2).step();
+		});
+	},
+	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();
-					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;
+				}, 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;
+.placeholder {
+	height: 112rpx;
 
-		&.bluge {
-			height: 180rpx;
-		}
+	&.bluge {
+		height: 180rpx;
 	}
+}
 
-	.safe-area {
-		padding-bottom: 0;
-		padding-bottom: constant(safe-area-inset-bottom);
-		padding-bottom: env(safe-area-inset-bottom);
-	}
+.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;
+.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;
-		bottom: 0;
+		top: 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);
+		height: 2rpx;
+		-webkit-transform: scaleY(0.5);
+		transform: scaleY(0.5);
+	}
 
-		.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;
+			}
 		}
 
-		.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;
-
+		&.bulge {
 			.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;
+					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%;
-					}
-
-					>view {
-						height: inherit;
-						display: flex;
-						align-items: center;
-					}
-
-					.bar-icon {
-						font-size: 42rpx;
+						border-radius: 50%;
 					}
 				}
 
@@ -223,71 +270,37 @@
 					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;
+					height: 40rpx;
+					line-height: 40rpx;
 				}
 			}
 		}
-	}
 
-	.tab-bar-placeholder {
-		padding-bottom: calc(constant(safe-area-inset-bottom) + 112rpx);
-		padding-bottom: calc(env(safe-area-inset-bottom) + 112rpx);
+		.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/diy-category-item.vue b/components-diy/diy-category-item.vue
index b8d1b0f..dacf555 100644
--- a/components-diy/diy-category-item.vue
+++ b/components-diy/diy-category-item.vue
@@ -2,15 +2,16 @@
 	<view data-component-name="diy-category-item" 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"/>
+				<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="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"/>
+							<image :src="$util.img(one.image)" mode="widthFix" />
 						</view>
 						<view class="name">{{ one.category_name }}</view>
 					</view>
@@ -21,9 +22,10 @@
 				<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="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"/>
+								<image :src="$util.img(two.image)" mode="widthFix" :lazy-load="true" />
 							</view>
 							<view class="name">{{ two.category_name }}</view>
 						</view>
@@ -38,9 +40,14 @@
 				<!-- 分类筛选 -->
 				<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="selectCategory(-1)">全部</view>
-							<view class="item" :id="'category-2-' + oneIndex" :class="{ selected: categoryId == oneIndex }" @click="selectCategory(oneIndex)" v-for="(one, oneIndex) in category.child_list" :key="oneIndex">
+						<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="selectCategory(-1)">全部</view>
+							<view class="item" :id="'category-2-' + oneIndex"
+								:class="{ selected: categoryId == oneIndex }" @click="selectCategory(oneIndex)"
+								v-for="(one, oneIndex) in category.child_list" :key="oneIndex">
 								{{ one.category_name }}
 							</view>
 						</scroll-view>
@@ -48,9 +55,12 @@
 					</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 }">
+							<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="selectCategory(oneIndex)" v-for="(one, oneIndex) in category.child_list" :key="oneIndex">
+								<view class="item" :class="{ selected: categoryId == oneIndex }"
+									@click="selectCategory(oneIndex)" v-for="(one, oneIndex) in category.child_list"
+									:key="oneIndex">
 									{{ one.category_name }}
 								</view>
 							</scroll-view>
@@ -58,18 +68,23 @@
 					</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">
-					
+				<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="category-title" style="font-size: 28rpx;padding-bottom: 0;">{{ category.category_name
+						}}</view>
+
 					<!--一级-->
-					<view class="goods-list" :class="{ 'double-column': !isList, 'single-column': isList, 'show': true }" :data-template="value.template">
+					<view class="goods-list"
+						:class="{ 'double-column': !isList, 'single-column': isList, 'show': true }"
+						:data-template="value.template">
 						<block v-if="goodsList.length">
-							<view class="goods-item" v-for="(item, index) in goodsList" :key="index" >
+							<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>
+									<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)">
@@ -79,23 +94,28 @@
 										<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>
+												<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 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"/>
+											<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)">
+											<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>
@@ -127,7 +147,7 @@
 												</block>
 											</block>
 										</view> -->
-									<!-- 	<view class="right-wrap" v-if="value.template == 3">
+										<!-- 	<view class="right-wrap" v-if="value.template == 3">
 											<view class="color-base-bg select-sku" @click="toDetail(item)">立即购买</view>
 										</view> -->
 									</view>
@@ -135,25 +155,27 @@
 							</view>
 						</block>
 						<view class="category-empty" v-else>
-							<image :src="$util.img('public/uniapp/category/empty.png')" mode="widthFix"/>
+							<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-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" :class="{ 'double-column': !isList, 'single-column': isList }" :data-template="value.template">
+				<view class="goods-list" :class="{ 'double-column': !isList, 'single-column': isList }"
+					: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"/>
+							<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">
@@ -164,24 +186,28 @@
 								<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>
+										<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 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"/>
+									<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)">
+									<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>
@@ -191,22 +217,27 @@
 										<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)">
+										<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]">
+											<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)">
+												<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)">
+											<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>
@@ -226,768 +257,783 @@
 </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
-			},
-			isList: {
-				type: Boolean,
-				default: false
+import DiyMinx from './minx.js'
+
+// 商品分类项
+export default {
+	name: 'diy-category-item',
+	props: {
+		category: {
+			type: Object
+		},
+		value: {
+			type: Object,
+			default: () => {
+				return {};
 			}
 		},
-		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
-			};
+		index: {
+			type: Number,
+			default: 0
 		},
-		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';
+		select: {
+			type: Number,
+			default: 0
 		},
-		mounted() {
-			setTimeout(() => {
-				const query = uni.createSelectorQuery().in(this);
-				query.select('.scroll-goods-view')
-					.boundingClientRect(data => {
-						if (data) this.contentWrapHeight = data.height;
-					}).exec();
-			}, 1000);
+		oneCategorySelect: {
+			type: Number,
+			default: 0
 		},
-		watch: {
-			oneCategorySelect: function() {
-				this.scrollTop = -1;
-				this.goodsList = [];
-				this.selectCategory(-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
-			}
+		last: {
+			type: Boolean,
+			default: false
 		},
-		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') {
+		isList: {
+			type: Boolean,
+			default: false
+		}
+	},
+	mixins: [DiyMinx],
+	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.selectCategory(-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.show();
-					});
+						this.$refs.loadingCover.hide();
+					}, 300);
 				}
-
-				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';
+				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();
 					}
 				}
-				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);
+			},
+			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;
+							// });
 						}
-					}
-				});
-			},
-			/**
-			 * 商品图片处理
-			 * @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;
+
+						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);
 					}
 				}
-				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;
+			});
+		},
+		/**
+		 * 商品图片处理
+		 * @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;
+			if (this.cartEditRepeat) return;
 
-				let cart =
-					this.cartList['goods_' + data.goods_id] && this.cartList['goods_' + data.goods_id]['sku_' + data
-						.sku_id
-					] ?
+			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;
+			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);
-			},
-			selectCategory(index) {
-				this.categoryId = index;
-				this.pageIndex = 0;
-				this.totalPage = 1;
-				this.getGoodsList();
-				setTimeout(() => {
-					this.scrollIntoView = 'category-2-' + index;
+			if (_num > parseInt(data.stock)) {
+				this.$util.showToast({
+					title: '商品库存不足'
 				});
-			},
-			/**
-			 * 滚动到底部加载
-			 */
-			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.selectCategory(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.selectCategory(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();
+				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);
+		},
+		selectCategory(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.selectCategory(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.selectCategory(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;
+.small {
+	font-size: 28rpx !important;
+}
+
+.item-wrap {
+	width: 100%;
+	box-sizing: border-box;
+	padding: 0 0rpx;
+
+	&.goods {
+		height: 100%;
 	}
-	.item-wrap {
+}
+
+.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%;
-		box-sizing: border-box;
-		padding: 0 0rpx;
-
-		&.goods {
-			height: 100%;
-		}
+		border-radius: 8rpx;
 	}
+}
 
-	.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%;
-		// }
+.category-list {
+	display: flex;
+	flex-wrap: wrap;
+	background: #fff;
+	margin: 0 20rpx;
+	border-radius: 10rpx;
+	padding: 10rpx 0;
 
-		&::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 {
+	.category-item {
+		width: 33.33%;
 		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;
+		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;
+		.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 {
+			image {
+				position: absolute;
 				width: 100%;
-				text-overflow: ellipsis;
-				overflow: hidden;
-				white-space: nowrap;
-				text-align: center;
-				line-height: 1;
-
-				font-size: 24rpx;
+				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-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;
+		border-radius: $border-radius;
+		overflow: hidden;
+		background-color: #fff;
+		margin-bottom: 20rpx;
+
+		.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-item {
+
+		.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;
-			border-radius: $border-radius;
+			flex: 1;
+		}
+
+		.goods-name {
+			font-size: $font-size-base;
+			line-height: 1.3;
+			margin-top: 20rpx;
+			white-space: nowrap;
 			overflow: hidden;
-			background-color: #fff;
-			margin-bottom: 20rpx;
-			
-			.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%);
-				}
+			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);
 			}
-		
-			.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;
+
+			.price {
+				color: var(--price-color);
 			}
-		
-			.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;
+		}
+
+		.pro-info {
+			display: flex;
+			margin-top: auto;
+			align-items: center;
+
+			.block-wrap {
 				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;
+				margin-right: 20rpx;
+
+				.sale {
 					font-size: $font-size-tag !important;
 				}
 			}
-		
-			.member-price-tag {
-				display: inline-block;
-				width: 60rpx;
+		}
+
+		.delete-price {
+
+			// display: inline-block;
+			// margin-left: 6rpx;
+			// float: right;
+			.unit {
+				margin-right: 6rpx;
+			}
+
+			text {
 				line-height: 1;
-				margin-left: 6rpx;
-		
+				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;
+			}
+		}
+	}
+
+	/* 双列布局 */
+	&.double-column {
+		.goods-item {
+			width: calc(50% - 10rpx);
+		}
+	}
+
+	/* 单列布局 */
+	&.single-column {
+		flex-direction: column;
+
+		.goods-item {
+			width: 100%;
+			flex-direction: row;
+			align-items: center;
+
+			.goods-img {
+				width: 180rpx;
+				height: 180rpx;
+				padding-top: 0;
+				margin-right: 14rpx;
+				border-radius: $border-radius;
+
 				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;
-				}
-			}
-		}
-		
-		/* 双列布局 */
-		&.double-column {
-			.goods-item {
-				width: calc(50% - 10rpx);
-			}
-		}
-		
-		/* 单列布局 */
-		&.single-column {
-			flex-direction: column;
-			.goods-item {
-				width: 100%;
-				flex-direction: row;
-				align-items: center;
-				
-				.goods-img {
-					width: 180rpx;
-					height: 180rpx;
-					padding-top: 0;
-					margin-right: 14rpx;
 					border-radius: $border-radius;
-					
-					image {
-						border-radius: $border-radius;
-					}
-				}
-				
-				.goods-name {
-					white-space: normal;
-					overflow: hidden;
-					text-overflow: ellipsis;
-					display: -webkit-box;
-					-webkit-line-clamp: 2;
-					-webkit-box-orient: vertical;
 				}
 			}
+
+			.goods-name {
+				white-space: normal;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				display: -webkit-box;
+				-webkit-line-clamp: 2;
+				-webkit-box-orient: vertical;
+			}
 		}
-		/**/
-		/*.goods-item {
+	}
+
+	/**/
+	/*.goods-item {
 			padding: 0 0 26rpx 0;
 			background: #fff;
 			display: flex;
@@ -1196,146 +1242,146 @@
 			}
 		}*/
 
-		&[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;
+	&[data-template='3'] .goods-item {
 		flex-direction: column;
-		height: 100%;
 
-		.scroll-goods-view {
-			flex: 1;
-			height: 0;
-			transform: translateX(0px);
+		.info-wrap {
+			width: 100%;
+			margin-top: 12rpx;
 		}
-	}
 
-	.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;
+		.goods-img {
+			width: 100%;
 			height: auto;
-		}
-
-		.title {
+			margin-right: 0;
 			line-height: 1;
-			margin-bottom: 20rpx;
+
+			image {
+				border-radius: 8rpx;
+			}
+		}
+
+		.select-sku {
 			font-weight: bold;
-		}
-
-		.item {
-			margin-bottom: 20rpx;
+			width: 128rpx;
+			height: 52rpx !important;
+			line-height: 52rpx !important;
 		}
 	}
+}
 
-	.end-tips {
-		text-align: center;
-		color: #999;
-		font-size: 24rpx;
-		padding: 30rpx 0 30rpx 0;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-	}
+.categoty-goods-wrap {
+	display: flex;
+	flex-direction: column;
+	height: 100%;
 
-	/deep/ .loading-layer {
-		background: #fff !important;
-	}
-
-	.category-empty {
+	.scroll-goods-view {
 		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;
-		}
+		height: 0;
+		transform: translateX(0px);
 	}
+}
 
-	.screen-category-4 .item {
-		background-color: #f2f2f2 !important;
-		padding: 10rpx 24rpx;
-		line-height: 1;
-		font-size: $font-size-tag;
+.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: var(--main-color-shallow) !important;
-			color: var(--main-color);
+			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/diy-category.vue b/components-diy/diy-category.vue
index ee57887..ff45b67 100644
--- a/components-diy/diy-category.vue
+++ b/components-diy/diy-category.vue
@@ -1,6 +1,6 @@
 <template>
 	<view data-component-name="diy-category" :class="['category-page-wrap', 'category-template-' + value.template]"
-		:style="{height: 'calc(100vh - '+ tabBarHeight +')' }">
+		: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">
@@ -12,32 +12,41 @@
 			<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="onClickSearch()" @tap.stop="onClickSearch()" :style="wxSearchHeight">
+			<!-- 			<view :style="navbarInnerStyle">商品分类</view> -->
+			<view class="search-box" v-if="value.search" @click="onClickSearch()" @tap.stop="onClickSearch()"
+				:style="wxSearchHeight">
 				<view class="search-content">
-					<input type="text" class="uni-input" maxlength="50" :placeholder="$lang('search')" confirm-type="search" @click.stop="onClickSearch()" @tap.stop="onClickSearch()" disabled="true" />
+					<input type="text" class="uni-input" maxlength="50" :placeholder="$lang('search')"
+						confirm-type="search" @click.stop="onClickSearch()" @tap.stop="onClickSearch()"
+						disabled="true" />
 					<text class="iconfont icon-sousuo3"></text>
 				</view>
-				<view class="iconfont" :class="{ 'icon-apps': !isList, 'icon-list': isList }" @click.stop.prevent="changeListStyle()" ></view>
+				<view class="iconfont" :class="{ 'icon-apps': !isList, 'icon-list': isList }"
+					@click.stop.prevent="changeListStyle()"></view>
 			</view>
 		</block>
 		<!-- #endif -->
 		<!-- #ifdef H5 -->
 		<view class="search-box" v-if="value.search" @click="onClickSearch()" @tap.stop="onClickSearch()">
 			<view class="search-content">
-				<input type="text" class="uni-input" maxlength="50" :placeholder="$lang('search')" confirm-type="search" @click.stop="onClickSearch()" @tap.stop="onClickSearch()" disabled="true" />
+				<input type="text" class="uni-input" maxlength="50" :placeholder="$lang('search')" confirm-type="search"
+					@click.stop="onClickSearch()" @tap.stop="onClickSearch()" disabled="true" />
 				<text class="iconfont icon-sousuo3"></text>
 			</view>
-			<view class="iconfont" :class="{ 'icon-apps': !isList, 'icon-list': isList }" @click.stop.prevent="changeListStyle()"></view>
+			<view class="iconfont" :class="{ 'icon-apps': !isList, 'icon-list': isList }"
+				@click.stop.prevent="changeListStyle()"></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)">
+			<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"/>
+						<image :src="$util.img(item.image)" mode="aspectFill" />
+					</view>
+					<view :class="['text', { 'color-base-bg': oneCategorySelect == index }]">{{ item.category_name }}
 					</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()">
@@ -49,11 +58,13 @@
 			<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="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 :class="['text', { 'color-base-bg': oneCategorySelect == index }]">{{
+								item.category_name }}</view>
 						</view>
 					</scroll-view>
 					<view class="pack-up" @click="$refs.templateFourPopup.close()">
@@ -69,10 +80,10 @@
 				<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)">
+							{ 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>
@@ -84,10 +95,11 @@
 						@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">
+						<view class="child-category" v-for="(item, index) in categoryTree" :key="index"
+							:id="'category-' + index">
 							<diy-category-item :category="item" :value="value" ref="categoryItem" :index="index"
-								:select="select" :oneCategorySelect="oneCategorySelect" :isList="isList" @tologin="toLogin"
-								@selectsku="selectSku($event, index)" @addCart="addCartPoint"
+								:select="select" :oneCategorySelect="oneCategorySelect" :isList="isList"
+								@tologin="toLogin" @selectsku="selectSku($event, index)" @addCart="addCartPoint"
 								@loadfinish="getHeightArea"></diy-category-item>
 						</view>
 						<view class="end-tips" ref="endTips" :style="{ opacity: endTips }">已经到底了~</view>
@@ -116,7 +128,7 @@
 			<view class="tips">暂时没有分类哦！</view>
 		</view>
 
-	<!-- 	<view class="cart-box" v-if="(value.template == 2 || value.template == 4) && value.quickBuy && storeToken && categoryTree && categoryTree.length">
+		<!-- 	<view class="cart-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>
@@ -133,890 +145,895 @@
 			</view>
 		</view> -->
 
-		<view class="cart-point" :style="{ left: item.left + 'px', top: item.top + 'px' }" :key="index" v-for="(item, index) in carIconList"></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
+// 获取系统状态栏的高度
+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: [],
-				isList: false,
-				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
+import nsGoodsSkuCategory from '@/components/ns-goods-sku/ns-goods-sku-category.vue';
+import DiyMinx from './minx.js'
+var contentWrapHeight, query, cartPosition;
 
-				// #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);
-			},
-			changeListStyle() {
-				this.isList = !this.isList;
-			},
-			onClickSearch() {
-				this.$util.redirectTo('/pages_tool/goods/search');
+// 商品分类
+export default {
+	components: {
+		nsGoodsSkuCategory
+	},
+	name: 'diy-category',
+	props: {
+		value: {
+			type: Object,
+			default: () => {
+				return {};
 			}
 		}
-	};
+	},
+	mixins: [DiyMinx],
+	data() {
+		return {
+			oneCategorySelect: 0,
+			select: 0,
+			categoryId: 'category-0',
+			categoryTree: null,
+			scrollLock: false,
+			triggered: true,
+			heightArea: [],
+			isSub: false,
+			carIconList: {},
+			endTips: 0,
+			cartAnimation: {},
+			loadType: '',
+			templateFourData: [],
+			isList: false,
+			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);
+		},
+		changeListStyle() {
+			this.isList = !this.isList;
+		},
+		onClickSearch() {
+			this.$util.redirectTo('/pages_tool/goods/search');
+		}
+	}
+};
 </script>
 
 <style lang="scss">
-	.category-page-wrap {
-		width: 100vw;
-		// height: calc(100vh - var(--tab-bar-height, 0));
+.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;
-		background-color: #fff;
-	}
+		transform: translateX(0px);
 
-	.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;
+		.content-wrap {
 			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;
+			flex: 1;
+			height: 0;
 			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%);
-			}
+		.child-category-wrap {
+			width: 100%;
+			height: 100%;
 		}
 	}
+}
 
-	.search-box {
-		position: relative;
-		padding: 20rpx 30rpx;
-		display: flex;
-		align-items: center;
+.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;
 
-		.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;
-			}
+		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 {
-			font-size: 36rpx;
-			margin: 0 0rpx 0 20rpx;
+			position: absolute;
+			top: 50%;
+			right: 10rpx;
+			transform: translateY(-50%);
+			font-size: $font-size-toolbar;
+			z-index: 10;
+			color: #89899a;
+			width: 80rpx;
+			text-align: center;
+		}
+	}
+
+	// 切换列表图标
+	.iconfont {
+		font-size: 36rpx;
+		margin: 0 0rpx 0 20rpx;
+	}
+}
+
+.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 {
-		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;
-		}
+		position: relative;
+		z-index: 2;
 	}
 
-	.cart-point {
-		width: 26rpx;
-		height: 26rpx;
-		position: fixed;
-		z-index: 1000;
-		background: #f00;
-		border-radius: 50%;
-		transition: all 0.05s;
-	}
+	/deep/ .template-four {
+		position: relative;
+		z-index: 1;
 
-	.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 {
+		.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-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-popup {
+			.template-four-scroll {
 				display: flex;
-				flex-direction: column;
-				overflow: hidden;
+				flex-wrap: wrap;
+				align-items: baseline;
+				align-content: baseline;
+				padding: 20rpx;
+				white-space: nowrap;
+				height: 380rpx;
+				box-sizing: border-box;
 
-				.title {
-					line-height: 1;
-					margin-bottom: 20rpx;
-					font-weight: bold;
-				}
-
-				.template-four-scroll {
-					display: flex;
+				.uni-scroll-view-content {
 					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;
+				.item {
 					display: flex;
 					flex-direction: column;
-					justify-content: center;
 					align-items: center;
-					z-index: 2;
-				}
+					padding: 4rpx 0;
+					color: #666;
+					margin-right: 16rpx;
+					border-radius: 40rpx;
+					margin-bottom: 10rpx;
+					width: calc((100% - 64rpx) / 5);
 
-				.text {
-					writing-mode: tb-rl;
-					margin-bottom: 6rpx;
-					letter-spacing: 4rpx;
-					font-size: $font-size-tag;
-					font-weight: bold;
-				}
+					&:nth-child(5n + 5) {
+						margin-right: 0;
+					}
 
-				.img {
-					width: 20rpx;
-					height: 20rpx;
-				}
+					.image-warp {
+						margin-bottom: 6rpx;
+						padding: 4rpx;
+						display: flex;
+						align-items: center;
+						justify-content: center;
+						border-radius: 42rpx;
+						border: 4rpx solid transparent;
+					}
 
-				&::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;
+					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);
+						}
+					}
 				}
 			}
 
-			.uni-scroll-view-content {
+			.pack-up {
+				font-size: $font-size-tag;
+				color: #888888;
+				height: 74rpx;
 				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;
+				border-top: 2rpx solid #f2f2f2;
 
-				&: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;
+				.iconfont {
+					font-size: 40rpx;
+					margin-left: -4rpx;
 				}
 			}
 		}
 
-		.content-wrap .categoty-goods-wrap .goods-list {
-			margin-top: 30rpx;
+		.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;
+			}
 		}
 
-		.tree-wrap .category-item.select::before {
-			border-top-right-radius: 8rpx;
-			border-bottom-right-radius: 8rpx;
+		.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/diy-comp-extend.vue b/components-diy/diy-comp-extend.vue
index 50e0ac3..4f777f7 100644
--- a/components-diy/diy-comp-extend.vue
+++ b/components-diy/diy-comp-extend.vue
@@ -4,6 +4,7 @@
 
 <script>
 // 自定义扩展组件
+import DiyMinx from './minx.js'
 export default {
 	name: 'diy-comp-extend',
 	props: {
@@ -11,11 +12,12 @@ export default {
 			type: Object
 		}
 	},
+	mixins: [DiyMinx],
 	data() {
 		return {};
 	},
 	computed: {},
-	created() {},
+	created() { },
 	methods: {}
 };
 </script>
diff --git a/components-diy/diy-coupon.vue b/components-diy/diy-coupon.vue
index d6cb318..f894987 100644
--- a/components-diy/diy-coupon.vue
+++ b/components-diy/diy-coupon.vue
@@ -7,18 +7,20 @@
 
 			<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">
+					<swiper-item v-for="(numItem, numIndex) in Math.ceil(computedCouponList.length / 3)" :key="numIndex"
+						class="coupon-item-box">
 
 						<view v-for="(item, index) in computedCouponList" class="coupon-item" :key="index"
 							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)">
+								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)">
+								<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>
@@ -42,16 +44,18 @@
 
 			<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">
+					<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)">
+								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)">
+								<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>
@@ -75,15 +79,17 @@
 
 			<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">
+					<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)">
+								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>
@@ -92,7 +98,8 @@
 								<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>
+								<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>
@@ -109,16 +116,18 @@
 
 			<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">
+					<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)">
+								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)">
+								<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>
@@ -143,11 +152,13 @@
 				<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)">
+							<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 }">
+										<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>
@@ -159,12 +170,17 @@
 									<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 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 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>
@@ -175,17 +191,19 @@
 
 			<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">
+					<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)">
+								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="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>
@@ -206,17 +224,18 @@
 							}">
 								<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-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'
-						}">
+								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>
@@ -230,11 +249,13 @@
 			<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)">
+						<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 }">
+									<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>
@@ -244,9 +265,11 @@
 									</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-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 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">
@@ -268,807 +291,809 @@
 </template>
 
 <script>
-	// 优惠券
-	export default {
-		name: 'diy-coupon',
-		props: {
-			value: {
-				type: Object,
-				default: () => {
-					return {};
-				}
+// 优惠券
+import DiyMinx from './minx.js'
+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() {
+		}
+	},
+	mixins: [DiyMinx],
+	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;
 		},
-		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;
+		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;
+			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);
 			}
 		},
-		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;
-					}
+		couponTap(item, index) {
+			if (item.count == item.lead_count) {
+				this.$util.showToast({
+					title: '该优惠券已抢光'
 				});
-			},
-			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);
-										}
+				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);
-										}
+								}
+							} 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', {});
-				}
+						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;
 			}
 		},
-		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;
+		//去使用
+		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;
-	}
+.coupon-wrap {
+	background-size: cover;
+	background-repeat: no-repeat;
+}
 
-	// 风格一
-	/deep/.coupon-style-one {
-		height: 110rpx;
+// 风格一
+/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;
+	.coupon-item-box {
+		display: flex;
 		box-sizing: border-box;
 
-		.coupon-item-box {
-			height: 250rpx !important;
+		.coupon-item {
 			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			width: 210rpx;
+			height: 110rpx;
+			background-repeat: no-repeat;
+			background-size: contain;
 
-			.coupon-item {
+			.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;
-				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;
+					margin-top: 14rpx;
 					line-height: 1;
-					text-align: center;
 				}
 
 				.coupon-num {
-					margin-top: 8rpx;
+					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-get {
-					width: 120rpx;
-					height: 46rpx;
-					line-height: 46rpx;
-					text-align: center;
-					font-size: 24rpx;
+				.coupon-num {
+					font-size: 40rpx;
+					line-height: 1;
 				}
 			}
 		}
 	}
+}
 
-	// 风格四
-	/deep/.coupon-style-four {
-		height: 108rpx;
+// 风格三
+.coupon-wrap.coupon-box-3 {
+	background-size: 100% 100%;
+}
 
-		.coupon-item-box {
-			display: flex;
-			box-sizing: border-box;
+/deep/.coupon-style-three {
+	height: 284rpx;
+	padding: 20rpx;
+	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;
+	.coupon-item-box {
+		height: 250rpx !important;
 		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;
+		.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 {
-				color: #ffffff;
-				font-size: $font-size-activity-tag;
+				margin-top: 20rpx;
+				margin-bottom: 6rpx;
+				line-height: 1;
 				text-align: center;
-				overflow: hidden;
-				white-space: nowrap;
 			}
 
 			.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;
-				align-items: flex-end;
-				justify-content: center;
-				margin-bottom: 10rpx;
+				flex-direction: column;
+				align-items: center;
 
-				.coupon-sign {
-					margin-bottom: 4rpx;
+				.coupon-type {
+					margin-top: 10rpx;
+					line-height: 1;
 				}
 
-				.coupon-size {
+				.coupon-num {
 					font-size: 40rpx;
-				}
-
-				text {
 					line-height: 1;
 				}
 			}
 		}
+	}
+}
 
-		.coupon-get {
-			width: 26%;
-			height: 100%;
+/* 样式一 */
+.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;
-			flex-direction: column;
+			align-items: flex-end;
 			justify-content: center;
-			align-items: center;
+			margin-bottom: 10rpx;
 
-			view {
-				line-height: 1.2;
-				font-size: $font-size-tag;
+			.coupon-sign {
+				margin-bottom: 4rpx;
+			}
+
+			.coupon-size {
+				font-size: 40rpx;
+			}
+
+			text {
+				line-height: 1;
 			}
 		}
 	}
 
-	//风格五
-	.coupon-style-five {
-		.coupon-all {
-			.coupon-box {
-				width: 100%;
-				display: inline-block;
+	.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;
 
-				.coupon-list {
-					height: 160rpx;
-					position: relative;
-					padding: 10rpx 0;
+				image {
+					width: 100%;
+					height: 100%;
+				}
 
-					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 {
-						width: 100%;
-						height: 100%;
+					.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;
-						justify-content: flex-start;
 
-						.coupon-info {
-							width: 25%;
-							min-width: 25%;
-							max-width: 25%;
-
-							.coupon-num {
-								margin: 0;
+						.coupon-type {
+							.coupon-name {
+								font-size: 32rpx;
+								font-weight: bold;
+								width: 300rpx;
 								overflow: hidden;
 								white-space: nowrap;
 								text-overflow: ellipsis;
-								width: 100%;
+							}
 
-								.coupon-size {
-									font-weight: bold;
-								}
-
-								.coupon-sign {}
+							.coupon-least {
+								font-size: 28rpx;
+								color: #999;
 							}
 						}
 
-						.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-get {
+							color: #fff;
+							background-color: #303133;
+							border-radius: 6rpx;
+							padding: 4rpx 8rpx;
+							margin-right: 20rpx;
+							font-size: $font-size-tag;
 						}
 					}
 				}
 			}
 		}
 	}
+}
 
-	//风格六
-	.coupon-style-six {
+//风格六
+.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;
 
-		.style-six-wrap {
+		&::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 {
-			margin-right: 20rpx;
+			width: 100%;
+			height: 100%;
 			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;
+			justify-content: space-between;
 
-			&::after {
-				content: '';
-				position: absolute;
-				left: 26rpx;
-				right: 26rpx;
-				bottom: 70rpx;
-				border-bottom: 2rpx dashed #999;
-			}
+			.coupon-info {
+				min-width: 25%;
+				max-width: 30%;
+				padding: 0;
 
-			.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;
+				.coupon-num {
+					margin: 0;
+					overflow: hidden;
+					white-space: nowrap;
+					text-overflow: ellipsis;
+					width: 100%;
 
-				.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;
+					.coupon-size {
+						font-size: 60rpx;
 						font-weight: bold;
-						width: 280rpx;
-						overflow: hidden;
-						white-space: nowrap;
-						text-overflow: ellipsis;
-					}
-
-					.coupon-least {
-						font-size: $font-size-tag;
-						color: #999;
+						margin-right: 4rpx;
 					}
 				}
+			}
 
-				.coupon-get {
-					padding: 4rpx 40rpx;
-					width: 130rpx;
+			.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;
-					box-sizing: border-box;
-					flex-shrink: 0;
+					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/.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;
-	}
+/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;
-	}
+.coupon-all>>>.uni-scroll-view::-webkit-scrollbar {
+	display: none;
+}
 </style>
\ No newline at end of file
diff --git a/components-diy/diy-digit.vue b/components-diy/diy-digit.vue
index d2d9f6d..0deb2a2 100644
--- a/components-diy/diy-digit.vue
+++ b/components-diy/diy-digit.vue
@@ -1,16 +1,11 @@
 <template>
 	<view :style="componentStyle">
-		<scroll-view 
-			:class="['graphic-nav', value.showStyle == 'fixed' ? 'fixed-layout' : value.showStyle]" 
-			:scroll-x="value.showStyle == 'singleSlide'"
-		>
+		<scroll-view :class="['graphic-nav', value.showStyle == 'fixed' ? 'fixed-layout' : value.showStyle]"
+			:scroll-x="value.showStyle == 'singleSlide'">
 			<view class="uni-scroll-view-content">
-				<view 
-					v-for="(item, index) in value.list" 
-					:key="index"
+				<view v-for="(item, index) in value.list" :key="index"
 					:class="['graphic-nav-item', value.mode, value.mode === 'text' ? 'newright' : '']"
-					:style="{ width: (100 / value.rowCount + '%') + ';' }"
-				>
+					:style="{ width: (100 / value.rowCount + '%') + ';' }">
 					<view style="display:flex;">
 						<view :style="{
 							'line-height': '1.2;',
@@ -18,14 +13,8 @@
 							'font-weight': '600;',
 							'color': value.font.titlecolor + ';'
 						}">
-							<uv-count-to 
-								:ref="`countTo-${index}`"
-								:autoplay="true" 
-								:startVal="30" 
-								:endVal="item.title" 
-								:decimals="getvalue(item.title)"
-								decimal="."
-							></uv-count-to>
+							<uv-count-to :ref="`countTo-${index}`" :autoplay="true" :startVal="30" :endVal="item.title"
+								:decimals="getvalue(item.title)" decimal="."></uv-count-to>
 							<text :style="{
 								'margin-left': '4rpx;',
 								'font-size': (value.font.unitsize * 2 + 'rpx') + ';',
@@ -51,7 +40,8 @@
 <script>
 import uvCountTo from '@/components/uv-count-to/uv-count-to.vue'
 import nsLogin from '@/components/ns-login/ns-login.vue'
-
+import DiyMinx from './minx.js'
+// 自定义数字展示
 export default {
 	name: 'diy-digit',
 	components: {
@@ -64,6 +54,7 @@ export default {
 			default: () => ({})
 		}
 	},
+	mixins: [DiyMinx],
 	data() {
 		return {
 			pageWidth: '',
@@ -83,17 +74,17 @@ export default {
 		componentStyle() {
 			let style = '';
 			style += 'background-image:url(' + this.$util.img(this.value.imageUrl) + ');background-size:100% 100%;';
-			
+
 			if (this.value.componentAngle == 'round') {
 				style += 'border-top-left-radius:' + (2 * this.value.topAroundRadius) + 'rpx;';
 				style += 'border-top-right-radius:' + (2 * this.value.topAroundRadius) + 'rpx;';
 				style += 'border-bottom-left-radius:' + (2 * this.value.bottomAroundRadius) + 'rpx;';
 				style += 'border-bottom-right-radius:' + (2 * this.value.bottomAroundRadius) + 'rpx;';
 			}
-			
+
 			style += 'box-shadow:' + (this.value.ornament.type == 'shadow' ? '0 0 10rpx ' + this.value.ornament.color : '') + ';';
 			style += 'border:' + (this.value.ornament.type == 'stroke' ? '2rpx solid ' + this.value.ornament.color : '') + ';';
-			
+
 			return style;
 		}
 	},
@@ -102,7 +93,7 @@ export default {
 		getvalue(value) {
 			return value % 1 !== 0 ? 2 : 0;
 		},
-		
+
 		// 页面跳转
 		redirectTo(item) {
 			if (!item.wap_url || this.$util.getCurrRoute() != 'pages/member/index' || this.storeToken) {
@@ -112,7 +103,7 @@ export default {
 				this.$refs.login.open(item.wap_url);
 			}
 		},
-		
+
 		// 轮播切换
 		swiperChange(event) {
 			this.swiperCurrent = event.detail.current;
@@ -125,31 +116,31 @@ export default {
 .graphic-nav {
 	padding: 16rpx;
 	box-sizing: border-box;
-	
+
 	&.fixed-layout {
 		.uni-scroll-view-content {
 			display: flex;
 			flex-wrap: wrap;
 		}
 	}
-	
+
 	&.singleSlide {
 		.uni-scroll-view-content {
 			display: flex;
 		}
-		
+
 		.graphic-nav-item {
 			flex-shrink: 0;
 		}
 	}
-	
+
 	&.pageSlide {
 		position: relative;
-		
+
 		.uni-swiper-dots-horizontal {
 			bottom: 0rpx;
 		}
-		
+
 		&.straightLine {
 			.uni-swiper-dot {
 				width: 30rpx;
@@ -157,7 +148,7 @@ export default {
 				height: 8rpx;
 			}
 		}
-		
+
 		&.circle {
 			.uni-swiper-dot {
 				width: 14rpx;
@@ -165,21 +156,21 @@ export default {
 			}
 		}
 	}
-	
+
 	.graphic-nav-wrap {
 		display: flex;
 		flex-wrap: wrap;
 		width: 100%;
 		height: 100%;
 	}
-	
+
 	.graphic-nav-item {
 		display: flex;
 		flex-direction: column;
 		align-items: center;
 		padding: 14rpx 0;
 		box-sizing: border-box;
-		
+
 		.graphic-text {
 			line-height: 1.3;
 			white-space: nowrap;
@@ -187,18 +178,18 @@ export default {
 			overflow: hidden;
 			width: 100%;
 			text-align: center;
-			
+
 			&.alone {
 				padding-top: 0;
 			}
 		}
-		
+
 		&.text {
 			.graphic-text {
 				padding-top: 0;
 			}
 		}
-		
+
 		.graphic-img {
 			position: relative;
 			display: flex;
@@ -207,7 +198,7 @@ export default {
 			width: 100rpx;
 			height: 100rpx;
 			font-size: 90rpx;
-			
+
 			.tag {
 				position: absolute;
 				top: -10rpx;
@@ -221,14 +212,14 @@ export default {
 				line-height: 1;
 				font-size: 24rpx;
 			}
-			
+
 			.icon {
 				font-size: 50rpx;
 				color: #606266;
 			}
 		}
 	}
-	
+
 	&.pageSlide {
 		.graphic-nav-item {
 			flex-shrink: 0;
@@ -247,16 +238,16 @@ export default {
 	justify-content: center;
 	margin-top: -20rpx;
 	padding-bottom: 8rpx;
-	
+
 	.swiper-dot {
 		background-color: rgba(0, 0, 0, 0.3);
 		margin: 8rpx;
-		
+
 		&.active {
 			background-color: #000;
 		}
 	}
-	
+
 	&.straightLine {
 		.swiper-dot {
 			width: 30rpx;
@@ -264,7 +255,7 @@ export default {
 			height: 8rpx;
 		}
 	}
-	
+
 	&.circle {
 		.swiper-dot {
 			width: 15rpx;
diff --git a/components-diy/diy-fenxiao-goods-list.vue b/components-diy/diy-fenxiao-goods-list.vue
index d739bd2..eedd5d0 100644
--- a/components-diy/diy-fenxiao-goods-list.vue
+++ b/components-diy/diy-fenxiao-goods-list.vue
@@ -1,47 +1,50 @@
 <template>
-	<view data-component-name="diy-fenxiao-goods-list" class="diy-fenxiao" v-if="list.length" :class="['goods-list', value.template, value.style]" :style="goodsListWarpCss">
-		<view class="goods-item" v-for="(item, index) in list" :key="index" @click="toDetail(item)" :class="[value.ornament.type]" :style="goodsItemCss">
+	<view data-component-name="diy-fenxiao-goods-list" class="diy-fenxiao" v-if="list.length"
+		:class="['goods-list', value.template, value.style]" :style="goodsListWarpCss">
+		<view class="goods-item" v-for="(item, index) in list" :key="index" @click="toDetail(item)"
+			:class="[value.ornament.type]" :style="goodsItemCss">
 			<view class="goods-img" :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }">
-				<image :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }" :src="$util.img(item.goods_image, { size: 'mid' })" mode="widthFix" @error="imgError(index)"/>
+				<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="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' }]"
-					>
+						: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>
+							<text class="unit price-style small"
+								:style="{ color: value.theme == 'diy' ? value.priceStyle.mainColor : '' }">赚 ￥</text>
+							<text class="price price-style large"
+								:style="{ color: value.theme == 'diy' ? value.priceStyle.mainColor : '' }">{{
+									item.commission_money.split('.')[0] }}</text>
+							<text class="unit price-style small"
+								:style="{ color: value.theme == 'diy' ? value.priceStyle.mainColor : '' }">{{ '.' +
+									item.commission_money.split('.')[1] }}</text>
 						</view>
-						<view class="sale-btn" v-if="value.btnStyle.control && item.is_collect == 0"
-							:style="{
-								background: value.btnStyle.theme == 'diy' ? 'linear-gradient(to right,' + value.btnStyle.bgColorStart + ',' + value.btnStyle.bgColorEnd + ')' : '',
-								color: value.btnStyle.theme == 'diy' ? value.btnStyle.textColor : '',
-								borderRadius: value.btnStyle.aroundRadius * 2 + 'rpx'
-							}"
-							@click.stop="followGoods(item, index)"
-						>
+						<view class="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 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 : '' }">
+					<view class="delete-price" v-if="value.priceStyle.lineControl"
+						:style="{ color: value.theme == 'diy' ? value.priceStyle.lineColor : '' }">
 						￥{{ item.discount_price }}
 					</view>
 				</view>
@@ -51,6 +54,8 @@
 </template>
 
 <script>
+// 自定义分晓商品列表
+import DiyMinx from './minx.js'
 export default {
 	name: 'diy-fenxiao-goods-list',
 	props: {
@@ -58,6 +63,7 @@ export default {
 			type: Object
 		}
 	},
+	mixins: [DiyMinx],
 	data() {
 		return {
 			list: [],
@@ -80,7 +86,7 @@ export default {
 	},
 	watch: {
 		// 组件刷新监听
-		componentRefresh: function(nval) {
+		componentRefresh: function (nval) {
 			this.getData();
 		}
 	},
@@ -209,8 +215,7 @@ export default {
 </script>
 
 <style lang="scss">
-.diy-fenxiao {
-}
+.diy-fenxiao {}
 
 // 商品列表单列样式
 .goods-list.row1-of1 {
@@ -218,9 +223,11 @@ export default {
 		background-color: #fff;
 		display: flex;
 		margin-bottom: 20rpx;
+
 		&:last-of-type {
 			margin-bottom: 0;
 		}
+
 		&.shadow {
 			margin: 8rpx 8rpx 20rpx 8rpx;
 		}
@@ -229,6 +236,7 @@ export default {
 			width: 180rpx;
 			overflow: hidden;
 			margin-right: 20rpx;
+
 			image {
 				width: 100%;
 			}
@@ -244,9 +252,11 @@ export default {
 			.name-wrap {
 				flex: 1;
 				margin-bottom: 10rpx;
+
 				.goods-name {
 					font-size: $font-size-base;
 					line-height: 1.3;
+
 					&.multi-hidden {
 						height: 72rpx;
 					}
@@ -257,25 +267,31 @@ export default {
 				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;
@@ -291,6 +307,7 @@ export default {
 					font-size: $font-size-activity-tag;
 				}
 			}
+
 			.sale-btn {
 				position: absolute;
 				right: 20rpx;
@@ -310,6 +327,7 @@ export default {
 .goods-list.row1-of2 {
 	display: flex;
 	flex-wrap: wrap;
+
 	.goods-item {
 		position: relative;
 		background: #fff;
@@ -317,24 +335,30 @@ export default {
 		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;
@@ -355,9 +379,11 @@ export default {
 
 			.name-wrap {
 				margin-bottom: 10rpx;
+
 				.goods-name {
 					font-size: $font-size-base;
 					line-height: 1.3;
+
 					&.multi-hidden {
 						height: 72rpx;
 					}
@@ -369,24 +395,30 @@ export default {
 				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;
@@ -402,6 +434,7 @@ export default {
 					font-size: $font-size-activity-tag;
 				}
 			}
+
 			.sale-btn {
 				position: absolute;
 				right: 20rpx;
diff --git a/components-diy/diy-float-btn.vue b/components-diy/diy-float-btn.vue
index 47f6b10..55d5a5c 100644
--- a/components-diy/diy-float-btn.vue
+++ b/components-diy/diy-float-btn.vue
@@ -1,8 +1,12 @@
 <template>
-	<view data-component-name="diy-float-btn" class="float-btn" :class="{ left_top: value.bottomPosition == 1, right_top: value.bottomPosition == 2, left_bottom: value.bottomPosition == 3, right_bottom: value.bottomPosition == 4 }" :style="style">
+	<view data-component-name="diy-float-btn" class="float-btn"
+		:class="{ left_top: value.bottomPosition == 1, right_top: value.bottomPosition == 2, left_bottom: value.bottomPosition == 3, right_bottom: value.bottomPosition == 4 }"
+		:style="style">
 		<block v-for="(item, index) in value.list" :key="index">
-			<view class="button-box" @click="$util.diyRedirectTo(item.link)" :style="{ width: value.imageSize + 'px', height: value.imageSize + 'px', fontSize: value.imageSize + 'px' }">
-				<image v-if="!item.iconType || item.iconType == 'img'" :src="$util.img(item.imageUrl)" mode="aspectFit" :show-menu-by-longpress="true"/>
+			<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>
@@ -11,104 +15,109 @@
 </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);
+// 自定义浮动按钮
+import DiyMinx from './minx.js'
+// 获取系统状态栏的高度
+let systemInfo = uni.getSystemInfoSync();
+
+// 自定义浮动按钮
+export default {
+	name: 'diy-float-btn',
+	props: {
+		value: {
+			type: Object,
+			default: () => {
+				return {};
 			}
 		}
-	};
+	},
+	mixins: [DiyMinx],
+	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;
+.float-btn {
+	position: fixed;
+	bottom: 20%;
+	right: 40rpx;
+	z-index: 990;
 
-		&.left_top {
-			top: 100rpx;
-			left: 30rpx;
+	&.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;
 		}
 
-		&.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%;
-			}
+		image {
+			width: 100%;
+			height: 100%;
 		}
 	}
+}
 </style>
\ No newline at end of file
diff --git a/components-diy/diy-follow-official-account.vue b/components-diy/diy-follow-official-account.vue
index 6aa4514..a5070f3 100644
--- a/components-diy/diy-follow-official-account.vue
+++ b/components-diy/diy-follow-official-account.vue
@@ -7,23 +7,25 @@
 </template>
 
 <script>
-	// 关注公众号
-	export default {
-		name: 'diy-follow-official-account',
-		props: {
-			value: {
-				type: Object
-			}
-		},
-		data() {
-			return {};
-		},
-		watch: {
-			// 组件刷新监听
-			componentRefresh: function(nval) {}
-		},
-		methods: {}
-	};
+// 关注公众号展示
+import DiyMinx from './minx.js'
+export default {
+	name: 'diy-follow-official-account',
+	props: {
+		value: {
+			type: Object
+		}
+	},
+	mixins: [DiyMinx],
+	data() {
+		return {};
+	},
+	watch: {
+		// 组件刷新监听
+		componentRefresh: function (nval) { }
+	},
+	methods: {}
+};
 </script>
 
 <style></style>
\ No newline at end of file
diff --git a/components-diy/diy-form.vue b/components-diy/diy-form.vue
index 099dc0f..d936137 100644
--- a/components-diy/diy-form.vue
+++ b/components-diy/diy-form.vue
@@ -1,110 +1,114 @@
 <template>
 	<view data-component-name="diy-form" 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 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 @click="submitform" class="fui-btn btn-danger block mtop">提交信息</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
-						});
-					}
-				});
-			}
+// 自定义表单
+import DiyMinx from './minx.js'
+export default {
+	name: 'diy-from',
+	props: {
+		value: {
+			type: Object
 		}
-	};
+	},
+	mixins: [DiyMinx],
+	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;
-	}
+.diy-from {
+	background: #fff;
+	padding-bottom: 20rpx;
+	border-radius: 10rpx;
+}
 </style>
\ No newline at end of file
diff --git a/components-diy/diy-goods-brand.vue b/components-diy/diy-goods-brand.vue
index 130fba0..21ea2b2 100644
--- a/components-diy/diy-goods-brand.vue
+++ b/components-diy/diy-goods-brand.vue
@@ -2,11 +2,14 @@
 	<x-skeleton data-component-name="diy-goods-brand" type="waterfall" :loading="loading" :configs="skeletonConfig">
 		<view :class="['brand-wrap', value.ornament.type]" :style="warpCss">
 			<view :class="[value.style]">
-				<view class="title-wrap" v-show="value.title" :style="{ color: value.textColor, fontWeight: value.fontWeight ? 'bold' : '' }">{{ value.title }}
+				<view class="title-wrap" v-show="value.title"
+					:style="{ color: value.textColor, fontWeight: value.fontWeight ? 'bold' : '' }">{{ value.title }}
 				</view>
 				<view class="ul-wrap">
 					<view class="li-item" v-for="(item, index) in list" :key="index">
-						<image class="brand-pic" :src="$util.img(item.image_url)" mode="aspectFit" @click="handlerClick(item)" @tap="handlerClick(item)" @error="imgError(index)" :style="itemCss"/>
+						<image class="brand-pic" :src="$util.img(item.image_url)" mode="aspectFit"
+							@click="handlerClick(item)" @tap="handlerClick(item)" @error="imgError(index)"
+							:style="itemCss" />
 					</view>
 				</view>
 			</view>
@@ -15,153 +18,155 @@
 </template>
 
 <script>
-	// 商品品牌
-	import uniGrid from '@/components/uni-grid/uni-grid.vue';
-	import uniGridItem from '@/components/uni-grid-item/uni-grid-item.vue';
+// 商品品牌
+import uniGrid from '@/components/uni-grid/uni-grid.vue';
+import uniGridItem from '@/components/uni-grid-item/uni-grid-item.vue';
 
-	import DiyMinx from './minx.js'
-
-	export default {
-		name: 'diy-goods-brand',
-		props: {
-			value: {
-				type: Object
+import DiyMinx from './minx.js'
+// 自定义商品品牌展示	
+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
 			}
-		},
-		components: {
-			uniGrid,
-			uniGridItem
-		},
-		data() {
-			return {
-				list: [],
-				loading: true,
-				skeletonConfig: {
-					gridRows: 2,
-					gridColumns: 4,
-					gridRowsGap: '20rpx',
-					headWidth: '120rpx',
-					headHeight: '120rpx',
-					textShow: false
-				}
-			};
-		},
-		created() {
+		};
+	},
+	created() {
+		this.getBrandList();
+	},
+	mixins: [DiyMinx],
+	watch: {
+		// 组件刷新监听
+		componentRefresh: function (nval) {
 			this.getBrandList();
-		},
-		mixins: [DiyMinx],
-		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;';
 			}
-		},
-		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;
+			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: {
-			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();
-				}
+		// 子项样式
+		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;
+			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;
 					}
-				});
-			},
-			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;
-			},
-			async handlerClick(item) {
-				await this.__$emitEvent({eventName: 'goods-brand-tap', data: item, promiseCallback: (event, handler, awaitedResult) => {
+					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;
+		},
+		async handlerClick(item) {
+			await this.__$emitEvent({
+				eventName: 'goods-brand-tap', data: item, promiseCallback: (event, handler, awaitedResult) => {
 					if (!awaitedResult) return;
 					this.toDetail(item);
-				}})
-			},
-		}
-	};
+				}
+			})
+		},
+	}
+};
 </script>
 
 <style lang="scss">
-	.brand-wrap {
-		&.shadow {
-			margin-left: 8rpx;
-			margin-right: 8rpx;
-			margin-top: 8rpx;
-			margin-bottom: 8rpx;
+.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;
 		}
 
-		.style-1 {
-			.title-wrap {
-				text-align: center;
-				padding: 20rpx 0 10rpx;
-			}
+		.ul-wrap {
+			display: flex;
+			flex-wrap: wrap;
+			padding: 20rpx;
 
-			.ul-wrap {
+			.li-item {
 				display: flex;
-				flex-wrap: wrap;
-				padding: 20rpx;
+				align-items: center;
+				justify-content: center;
+				width: calc(100% / 4 - 20rpx) !important;
+				height: 124rpx;
+				margin: 10rpx;
+				background-color: #fff;
 
-				.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%;
-					}
+				.brand-pic {
+					width: 100%;
+					height: 100%;
 				}
 			}
 		}
 	}
+}
 </style>
\ No newline at end of file
diff --git a/components-diy/diy-goods-list.vue b/components-diy/diy-goods-list.vue
index 26b9f2f..ebbfeef 100644
--- a/components-diy/diy-goods-list.vue
+++ b/components-diy/diy-goods-list.vue
@@ -2,24 +2,28 @@
 	<x-skeleton data-component-name="diy-goods-list" :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="handlerClick(item)" @tap="handlerClick(item)" :class="[goodsValue.ornament.type]" :style="goodsItemCss">
+				<view class="goods-item" v-for="(item, index) in list" :key="index" @click="handlerClick(item)"
+					@tap="handlerClick(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' }"/>
+						<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
-						">
+						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 }}
+							{{ 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">
@@ -32,13 +36,21 @@
 						<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>
+									<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 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"
@@ -55,29 +67,29 @@
 								<!-- <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"
+									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"
+									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"
+									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>
@@ -86,8 +98,8 @@
 
 								<!--自定义图标 -->
 								<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"
+									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"
@@ -98,24 +110,28 @@
 					</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="handlerClick(item)" @tap="handlerClick(item)" :class="[goodsValue.ornament.type]" :style="goodsItemCss">
+			<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="handlerClick(item)"
+					@tap="handlerClick(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"/>
+						<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
-						">
+						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 }}
+							{{ 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">
@@ -128,18 +144,29 @@
 						<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>
+									<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 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 : '' }">
+								<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 : '' }">
+								<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>
@@ -147,25 +174,31 @@
 					</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="handlerClick(dataItem)" @tap="handlerClick(dataItem)" :class="[goodsValue.ornament.type]" :style="goodsItemCss">
+			<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="handlerClick(dataItem)" @tap="handlerClick(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"/>
+							<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
-							">
+							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 }}
+								{{ 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">
@@ -178,22 +211,32 @@
 							<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' : '' }">
+										<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' : '' }">
+										<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 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 : '' }">
+									<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 : '' }">
+									<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>
@@ -204,545 +247,715 @@
 			</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>
+		<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';
-	import DiyMinx from './minx.js'
-	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();
-		},
-		mixins: [DiyMinx],
-		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') {
+import nsGoodsSkuIndex from '@/components/ns-goods-sku/ns-goods-sku-index.vue';
+import DiyMinx from './minx.js'
 
-					// 单列 风格
-					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);
-			},
-
-			async handlerClick(item) {
-				await this.__$emitEvent({eventName: 'goods-list-tap', data: item, promiseCallback: (event, handler, awaitedResult) => {
-					if (!awaitedResult) return;
-					this.toDetail(item);
-				}})
+// 自定义商品列表展示
+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();
+	},
+	mixins: [DiyMinx],
+	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);
+		},
+
+		async handlerClick(item) {
+			await this.__$emitEvent({
+				eventName: 'goods-list-tap', data: item, promiseCallback: (event, handler, awaitedResult) => {
+					if (!awaitedResult) return;
+					this.toDetail(item);
+				}
+			})
+		}
+	}
+};
 </script>
 
 <style lang="scss" scoped>
-	.goods-list {
+.goods-list {
+	overflow: hidden;
+	padding-bottom: 10rpx;
+
+	.goods-item {
+		position: relative;
 		overflow: hidden;
-		padding-bottom: 10rpx;
+		line-height: 1;
 
-		.goods-item {
-			position: relative;
-			overflow: hidden;
-			line-height: 1;
+		.sale {
+			align-self: baseline;
+			color: $color-tip;
+			font-size: $font-size-activity-tag;
+		}
 
-			.sale {
-				align-self: baseline;
-				color: $color-tip;
-				font-size: $font-size-activity-tag;
+		.info-wrap {
+			.goods-name {
+				margin-bottom: 10rpx;
+				line-height: 1.3;
 			}
 
-			.info-wrap {
-				.goods-name {
-					margin-bottom: 10rpx;
-					line-height: 1.3;
+			.tag-wrap {
+				margin-bottom: 20rpx;
+
+				text {
+					display: inline-block;
+					font-size: 18rpx;
 				}
 
-				.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;
-					}
+				.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;
 				}
 			}
 
-			.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;
+			.member-price {
 				display: flex;
 				align-items: center;
-				justify-content: center;
-				background: rgba(0, 0, 0, 0.5);
-				text{
-					color: #fff;
+
+				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;
 				}
 			}
 		}
 	}
 
-	// 商品列表单列样式
-	.goods-list.row1-of1 {
-		.goods-item {
+	&.style-1 {
+		.pro-info {
 			position: relative;
-			background-color: #fff;
-			display: flex;
-			margin-bottom: 20rpx;
-			padding: 16rpx;
 
-			&:last-of-type {
-				margin-bottom: 0;
+			.price-wrap {
+				line-height: 1;
 			}
 
-			&.shadow {
-				margin: 8rpx 8rpx 20rpx 8rpx;
+			.discount-price {
+				align-items: flex-end;
 			}
 
-			.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;
-					}
-				}
+			.delete-price {
+				margin: 4rpx 0;
+				flex-basis: 100% !important;
 			}
 		}
 
-		&.style-1 {
+		.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 {
-				position: relative;
+				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;
 				}
+			}
 
-				.discount-price {
-					align-items: flex-end;
-				}
+			.delete-price {
+				margin-top: 6rpx;
+				flex-basis: 100% !important;
+			}
+		}
+	}
 
-				.delete-price {
-					margin: 4rpx 0;
-					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: 112rpx;
+				min-width: 140rpx;
 				height: 52rpx;
 				padding: 0 20rpx;
 				line-height: 52rpx;
@@ -750,236 +963,93 @@
 				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;
+	&.style-3 {
+		.pro-info {
+			.member-price {
+				margin-right: auto;
+				align-self: flex-end;
+				margin-bottom: 4rpx;
 			}
 
-			&:nth-of-type(1),
-			&:nth-of-type(2) {
-				margin-top: 0;
+			.sale {
+				line-height: 1;
+				align-self: center;
+				margin-top: 8rpx;
 			}
 
-			&.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 {
+			.discount-price {
 				display: flex;
-				flex-direction: column;
+				flex-wrap: wrap;
 				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;
+				align-content: 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;
-			}
+
+		.swiper {
+			padding: 20rpx 0;
 		}
 	}
 
-	// 商品列表三列样式
-	.goods-list.row1-of3 {
+	.sell-out {
+		text {
+			font-size: 250rpx;
+		}
+	}
+}
+
+// 商品列表三列样式
+.goods-list.row1-of3 {
+	display: flex;
+	flex-wrap: wrap;
+
+	.goods-item {
+		position: relative;
 		display: flex;
-		flex-wrap: wrap;
+		flex-direction: column;
+		// overflow: hidden;
+		margin-top: 20rpx;
+		width: calc(33.3333333% - 14rpx);
+		box-sizing: border-box;
 
-		.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-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: 0;
+				margin-top: 8rpx;
 			}
 
-			&:nth-child(3n) {
-				width: calc(33.3333333% - 15rpx);
+			&:nth-child(1n) {
+				margin-left: 8rpx;
 			}
 
 			&:nth-child(3n-1) {
@@ -987,377 +1057,104 @@
 				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;
-					}
-				}
+			&:nth-child(3n) {
+				margin-right: 0;
+				margin-left: 0;
 			}
 		}
 
-		&.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 {
+		.goods-img-wrap {
 			position: relative;
-			// overflow: hidden;
-			width: 200rpx;
-			display: inline-block;
-			box-sizing: border-box;
+			overflow: hidden;
+			height: 220rpx;
+		}
 
-			&:nth-child(3n + 3) {
-				width: 198rpx;
-			}
+		.goods-img {
+			width: 100%;
+		}
 
-			&.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 {
+			display: flex;
+			flex-direction: column;
+			flex: 1;
+			padding: 10rpx;
 
-			.info-wrap {
-				padding: 10rpx;
+			.pro-info {
+				margin-top: auto;
 				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;
+				.discount-price {
 					display: flex;
 					justify-content: space-between;
 					align-items: center;
 
-					.discount-price {
-						.price-wrap {
-							white-space: nowrap;
-							line-height: 1;
+					.price-wrap {
+						white-space: nowrap;
 
-							.unit {
-								font-size: $font-size-tag !important;
-								// color: var(--price-color);
-							}
+						.unit {
+							font-size: $font-size-tag !important;
+						}
 
-							.price {
-								font-size: $font-size-toolbar;
-							}
+						.price {
+							font-size: $font-size-toolbar;
+						}
 
-							text {
-								font-weight: bold;
-								// color: var(--price-color);
-							}
+						text {
+							font-weight: bold;
 						}
 					}
+				}
 
-					.delete-price {
-						margin-left: 10rpx;
-						text-decoration: line-through;
-						flex: 1;
-						line-height: 28rpx;
-						color: $color-tip;
-						font-size: $font-size-activity-tag;
-					}
+				.delete-price {
+					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;
+	&.style-1 {
+		.pro-info {
+			.price-wrap {
+				line-height: 1;
 			}
 
-			.pro-info {
-				.discount-price {
-					position: relative;
-					flex: 1;
-					display: flex;
-					align-items: baseline;
+			.discount-price {
+				justify-content: unset !important;
+				align-items: baseline !important;
+				flex-wrap: wrap;
+			}
 
-					.sale {
-						position: absolute;
-						bottom: -34rpx;
-						left: 6rpx;
-					}
+			.delete-price {
+				margin-left: 10rpx;
+			}
+		}
+	}
 
-					.price-wrap {
-						display: inline-block;
-					}
+	&.style-2 {
+		.pro-info {
+			position: relative;
+			flex-direction: initial !important;
+			align-items: center;
 
-					.delete-price {
-						display: inline-block;
-					}
-				}
+			.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 {
@@ -1369,51 +1166,312 @@
 				box-sizing: border-box;
 			}
 		}
-		.sell-out{
-			text{
-				font-size: 500rpx;
+	}
+
+	.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%;
+				}
 			}
 		}
 	}
 
-	.cart-action-wrap {
+	.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;
 
-		.cart-num {
-			position: absolute;
-			top: -16rpx;
-			right: -10rpx;
-			padding: 2rpx 4rpx;
-			min-width: 30rpx;
-			height: 30rpx;
-			line-height: 30rpx;
+		&: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;
-			color: #fff;
-			background-color: red;
-			border-radius: 30rpx;
-			font-size: $font-size-activity-tag;
+			box-sizing: border-box;
 		}
 	}
 
-	.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;
+	.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/diy-goods-recommend.vue b/components-diy/diy-goods-recommend.vue
index c43eaba..26649f4 100644
--- a/components-diy/diy-goods-recommend.vue
+++ b/components-diy/diy-goods-recommend.vue
@@ -2,39 +2,57 @@
 	<x-skeleton data-component-name="diy-goods-recommend" 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="['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>
+				<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">
+				<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"/>
+							<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 :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"/>
+								<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>
+										<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 : '' }">
+									<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>
@@ -48,552 +66,561 @@
 </template>
 
 <script>
-	export default {
-		name: 'diy-goods-recommend',
-		props: {
-			value: {
-				type: Object,
-				default: () => {
-					return {};
-				}
+// 自定义商品推荐展示
+import DiyMinx from './minx.js'
+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 '';
-			},
 		}
-	};
+	},
+	mixins: [DiyMinx],
+	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 {
+.goods-list {
+	.goods-item {
+		line-height: 1;
+
+		.sale {
 			line-height: 1;
+			color: $color-tip;
+			font-size: $font-size-activity-tag;
+		}
 
-			.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;
-				}
+		.info-wrap {
+			.goods-name {
+				margin-bottom: 10rpx;
+				line-height: 1.3;
 			}
 		}
-	}
 
-	// 商品列表横向滚动样式
-	.goods-list.style-1 {
-		width: 100%;
-		white-space: nowrap;
-		background-repeat: round;
-
-		.top-wrap {
+		.sell-out {
+			position: absolute;
+			z-index: 1;
+			width: 100%;
+			height: 100%;
+			top: 0;
+			left: 0;
 			display: flex;
 			align-items: center;
-			padding: 20rpx 0;
+			justify-content: center;
+			background: rgba(0, 0, 0, 0.5);
 
-			.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;
-					}
-				}
+			text {
+				color: #fff;
+				font-size: 180rpx;
 			}
 		}
 	}
+}
 
-	// 商品列表横向滚动样式
-	.goods-list.style-2 {
-		width: 100%;
-		white-space: nowrap;
-		background-repeat: round;
-		padding-bottom: 20rpx;
+// 商品列表横向滚动样式
+.goods-list.style-1 {
+	width: 100%;
+	white-space: nowrap;
+	background-repeat: round;
 
-		.top-wrap {
+	.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;
-			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;
+	.goods-item {
+		overflow: hidden;
+		width: 200rpx;
+		display: inline-block;
+		box-sizing: border-box;
 
-		.swiper {
-			display: flex;
-			flex-wrap: wrap;
-			margin: 0 20rpx;
-			padding: 10rpx 0;
-
-			.swiper-item {
-				display: flex;
-				align-items: center;
-			}
+		&:nth-child(3n + 3) {
+			width: 198rpx;
 		}
 
-		.goods-item {
-			overflow: hidden;
-			width: 200rpx;
-			display: inline-block;
-			box-sizing: border-box;
+		&.shadow {
+			margin-top: 8rpx;
+		}
 
-			&.shadow {
-				// margin-top: 20rpx;
+		.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-img, .goods-img-wrap {
-				position: relative;
-				width: 100%;
-				height: 200rpx;
+			.goods-name {
+				font-size: $font-size-sub;
+
+				&.multi-hidden {
+					white-space: break-spaces;
+				}
 			}
 
-			.info-wrap {
+			.pro-info {
+				margin-top: auto;
 				display: flex;
 				flex-direction: column;
-				padding: 10rpx;
+				justify-content: space-between;
 
-				.pro-info {
-					text-align: center;
+				.discount-price {
+					display: flex;
+					justify-content: space-between;
+					align-items: center;
 
-					.label-wrap {
-						border-radius: 40rpx;
-						display: inline-block;
-						margin: 10rpx 0;
-						position: relative;
-						padding-left: 52rpx;
-						padding-right: 16rpx;
-						line-height: 1.7;
+					.price-wrap {
+						line-height: 1;
+						white-space: nowrap;
 
-						image {
-							position: absolute;
-							top: -2rpx;
-							left: -2rpx;
-							width: 46rpx;
-							height: 46rpx;
+						.unit {
+							font-size: $font-size-tag;
+							color: $base-color;
+						}
+
+						.price {
+							font-size: $font-size-toolbar;
 						}
 
 						text {
-							font-size: $font-size-tag;
+							font-weight: bold;
+							color: $base-color;
 						}
 					}
+				}
 
-					.discount-price {
-						.price-wrap {
-							line-height: 1;
-							white-space: nowrap;
+				.delete-price {
+					margin-left: 10rpx;
+					text-decoration: line-through;
+					flex: 1;
+					line-height: 28rpx;
+					color: $color-tip;
+					font-size: $font-size-activity-tag;
+				}
+			}
+		}
+	}
+}
 
-							.unit {
-								font-size: $font-size-tag;
-								color: $base-color;
+// 商品列表横向滚动样式
+.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;
 							}
+						}
+					}
+				}
 
-							.price {
-								font-size: $font-size-toolbar;
-							}
+				.delete-price {
+					margin-left: 10rpx;
+					text-decoration: line-through;
+					flex: 1;
+					line-height: 28rpx;
+					color: $color-tip;
+					font-size: $font-size-activity-tag;
+				}
+			}
+		}
+	}
+}
 
-							text {
-								font-weight: bold;
-								color: $base-color;
-							}
+.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/diy-graphic-nav.vue b/components-diy/diy-graphic-nav.vue
index d730d9a..d645bb3 100644
--- a/components-diy/diy-graphic-nav.vue
+++ b/components-diy/diy-graphic-nav.vue
@@ -1,28 +1,29 @@
 <template>
     <view data-component-name="diy-graphic-nav" :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 :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)]"
+                        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 -->
+                        <!-- #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"/>
+                                    :show-menu-by-longpress="true" />
 
                                 <diy-icon v-if="item.iconType == 'icon'" :icon="item.icon"
                                     :value="item.style ? item.style : null"
@@ -37,43 +38,48 @@
                                 :style="{ fontSize: value.font.size * 2 + 'rpx', fontWeight: value.font.weight, color: value.font.color }">
                                 {{ item.title }}
                             </text>
-                    <!-- #ifdef H5 -->
+                            <!-- #ifdef H5 -->
+                        </view>
+                        <!-- #endif -->
+                        <!-- #ifdef MP -->
                     </view>
                     <!-- #endif -->
-                    <!-- #ifdef MP -->
-                    </view>
-                    <!-- #endif -->                     
                 </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 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 ]">
+        <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' }">
+                <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"/>
+                            :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>
+                            :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 }">
+                    <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>
@@ -88,222 +94,225 @@
 </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
-            }
+// 自定义图形导航
+import DiyMinx from './minx.js'
+export default {
+    name: 'diy-graphic-nav',
+    props: {
+        value: {
+            type: Object
         }
-    };
+    },
+    mixins: [DiyMinx],
+    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.fixed-layout>>>.uni-scroll-view-content {
+    display: flex;
+    flex-wrap: wrap;
+}
 
-    /* 单行滑动 */
-    .graphic-nav.singleSlide>>>.uni-scroll-view-content {
-        display: flex;
-    }
+/* 单行滑动 */
+.graphic-nav.singleSlide>>>.uni-scroll-view-content {
+    display: flex;
+}
 
-    .graphic-nav.pageSlide>>>.uni-swiper-dots-horizontal {
-        bottom: 0rpx;
-    }
+.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.straightLine>>>.uni-swiper-dot {
+    width: 30rpx;
+    border-radius: 0;
+    height: 8rpx;
+}
 
-    .graphic-nav.pageSlide.circle>>>.uni-swiper-dot {
-        width: 14rpx;
-        height: 14rpx;
-    }
+.graphic-nav.pageSlide.circle>>>.uni-swiper-dot {
+    width: 14rpx;
+    height: 14rpx;
+}
 </style>
 <style lang="scss">
-    .graphic-nav {
-        padding: 16rpx;
+.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;
 
-        &.singleSlide {
-            .graphic-nav-item {
-                flex-shrink: 0;
+        .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;
             }
         }
 
-        &.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;
+        &.text {
 
             .graphic-text {
-                padding-top: 12rpx;
-                line-height: 1.5;
-                white-space: nowrap;
-                text-overflow: ellipsis;
-                overflow: hidden;
-                width: 100%;
-                text-align: center;
+                padding-top: 0;
+            }
+        }
 
-                &.alone {
-                    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;
             }
 
-            &.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;
-                }
+            .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-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 {
-            background-color: rgba(0, 0, 0, .3);
-            margin: 8rpx;
-
-            &.active {
-                background-color: rgba(0, 0, 0, 1);
-            }
-
+            width: 30rpx;
+            border-radius: 0;
+            height: 8rpx;
         }
-
-        &.straightLine {
-            .swiper-dot {
-                width: 30rpx;
-                border-radius: 0;
-                height: 8rpx;
-            }
-        }
-
-        &.circle {
-            .swiper-dot {
-                width: 15rpx;
-                border-radius: 50%;
-                height: 15rpx;
-            }
-        }
-
     }
+
+    &.circle {
+        .swiper-dot {
+            width: 15rpx;
+            border-radius: 50%;
+            height: 15rpx;
+        }
+    }
+
+}
 </style>
\ No newline at end of file
diff --git a/components-diy/diy-group.vue b/components-diy/diy-group.vue
index 1af90dc..41541b4 100644
--- a/components-diy/diy-group.vue
+++ b/components-diy/diy-group.vue
@@ -5,34 +5,34 @@
 				<!-- 门店展示 -->
 				<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>
@@ -55,7 +55,8 @@
 
 			<template v-if="item.componentName == 'Search'">
 				<!-- 搜索 -->
-				<diy-search :value="item" :topNavColor="topNavColor" :global="diyGlobalData.global" :haveTopCategory="haveTopCategory" :followOfficialAccount="followOfficialAccount"></diy-search>
+				<diy-search :value="item" :topNavColor="topNavColor" :global="diyGlobalData.global"
+					:haveTopCategory="haveTopCategory" :followOfficialAccount="followOfficialAccount"></diy-search>
 			</template>
 
 			<template v-if="item.componentName == 'RichText'">
@@ -85,7 +86,8 @@
 
 			<template v-if="item.componentName == 'ManyGoodsList'">
 				<!-- 多商品组 -->
-				<diy-many-goods-list :value="item" :global="diyGlobalData.global" :scrollTop="scrollTop"></diy-many-goods-list>
+				<diy-many-goods-list :value="item" :global="diyGlobalData.global"
+					:scrollTop="scrollTop"></diy-many-goods-list>
 			</template>
 
 			<template v-if="item.componentName == 'RubikCube'">
@@ -97,8 +99,8 @@
 				<!-- 视频 -->
 				<diy-video :value="item"></diy-video>
 			</template>
-			
-			
+
+
 
 
 			<template v-if="item.componentName == 'Seckill' && addonIsExist.seckill">
@@ -167,7 +169,7 @@
 				<!-- 文章 -->
 				<diy-article :value="item"></diy-article>
 			</template>
-			
+
 			<template v-if="item.componentName == 'MerchList'">
 				<!-- 商户列表 -->
 				<diy-merch-list :value="item"></diy-merch-list>
@@ -202,13 +204,13 @@
 				<!-- 关注公众号 -->
 				<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>
@@ -222,33 +224,33 @@
 			<template v-if="item.componentName == 'Digit'">
 				<!-- 数字 -->
 				<diy-digit :value="item"></diy-digit>
-			</template>				
-			
+			</template>
+
 			<template v-if="item.componentName == 'VideoList'">
 				<!-- 视频列表 -->
 				<diy-video-list :value="item"></diy-video-list>
 			</template>
-			
+
 			<template v-if="item.componentName == 'BottomNav'">
 				<!-- 底部导航 -->
 				<diy-bottom-nav :value="item"></diy-bottom-nav>
 			</template>
-			
+
 			<template v-if="item.componentName == 'CategoryItem'">
 				<!-- 分类项 -->
 				<diy-category-item :value="item"></diy-category-item>
 			</template>
-			
+
 			<template v-if="item.componentName == 'Category'">
 				<!-- 分类 -->
 				<diy-category :value="item"></diy-category>
 			</template>
-			
+
 			<template v-if="item.componentName == 'Icon'">
 				<!-- 图标 -->
 				<diy-icon :value="item"></diy-icon>
 			</template>
-			
+
 			<!-- 自定义扩展组件 -->
 			<diy-comp-extend :value="item"></diy-comp-extend>
 		</view>
@@ -256,96 +258,98 @@
 </template>
 
 <script>
-	// 组件组
-	export default {
-		components: {},
-		props: {
-			diyData: {
-				type: Object
-			},
-			scrollTop: {
-				type: [String, Number],
-				default: '0'
-			},
-			haveTopCategory: {
-				type: Boolean
-			},
-			followOfficialAccount: {
-				type: Object
-			},
+// 组件组展示
+import DiyMinx from './minx.js'
+export default {
+	components: {},
+	props: {
+		diyData: {
+			type: Object
 		},
-		data() {
-			return {
-				diyGlobalData: null
-			};
+		scrollTop: {
+			type: [String, Number],
+			default: '0'
 		},
-		created() {
-			this.diyGlobalData = JSON.parse(JSON.stringify(this.diyData));
+		haveTopCategory: {
+			type: Boolean
 		},
-		computed: {
-			topNavColor() {
-				var color = '';
-				if (this.diyData.global.topNavBg) {
-					color = 'transparent';
-					if (this.scrollTop > 20) {
-						color = this.diyData.global.topNavColor;
-					} else {
-						color = 'transparent';
-					}
-				} else {
+		followOfficialAccount: {
+			type: Object
+		},
+	},
+	mixins: [DiyMinx],
+	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';
 				}
-				return color;
-			},
-			// 修改属性样式
-			setPagestyle() {
-				this.diyGlobalData.value.forEach((item, index) => {
-					item.pageStyle = '';
-					// 给每个组件增加位置属性，用于定位，搜索、分类导航等定位
-					item.moduleIndex = index + 1;
+			} 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;
-					}
+				// 特殊处理搜索框 当显示位置为滚动至顶部固定时，只设置背景颜色
+				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' + ';';
+				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);
 					}
 				});
-
-				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: {}
-	};
+			} else data = this.setPagestyle;
+			return data;
+		}
+	},
+	methods: {}
+};
 </script>
 
 <style lang="scss">
-	.diy-group {
-		width: 100%;
-	}
+.diy-group {
+	width: 100%;
+}
 </style>
\ No newline at end of file
diff --git a/components-diy/diy-groupbuy.vue b/components-diy/diy-groupbuy.vue
index 2e695d8..b22c507 100644
--- a/components-diy/diy-groupbuy.vue
+++ b/components-diy/diy-groupbuy.vue
@@ -5,7 +5,9 @@
 				<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 :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }"
+							:src="$util.img(item.goods_image, { size: 'mid' })" mode="widthFix"
+							@error="imageError(index)">
 						</image>
 					</view>
 					<view class="content"
@@ -16,9 +18,14 @@
 							{{ 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>
+							<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 + ')' : '',
@@ -32,51 +39,79 @@
 			</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="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 : '' }">
+							<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 :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>
+								<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 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']">
+				<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>
+								<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 :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>
+									<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 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>
@@ -87,376 +122,379 @@
 </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();
-			}
+// 自定义团购展示
+import DiyMinx from './minx.js'
+export default {
+	name: 'diy-groupbuy',
+	props: {
+		value: {
+			type: Object
 		}
-	};
+	},
+	mixins: [DiyMinx],
+	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/.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;
-	}
+/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;
-	}
+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;
+.diy-groupbuy {
+	&.row1-of1 {
+		.item {
+			display: flex;
+			margin-bottom: 20rpx;
+			padding: 16rpx;
 
-				&.shadow {
-					margin: 8rpx 8rpx 20rpx 8rpx;
-				}
+			&.shadow {
+				margin: 8rpx 8rpx 20rpx 8rpx;
+			}
 
-				&:last-child {
-					margin-bottom: 0;
-					padding-bottom: 20rpx;
-				}
+			&:last-child {
+				margin-bottom: 0;
+				padding-bottom: 20rpx;
+			}
 
-				.img-wrap {
+			.img-wrap {
+				width: 200rpx;
+				height: 200rpx;
+
+				>image {
 					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 {
-					margin-top: 6rpx;
-					line-height: 1.5;
+					line-height: 1.3;
+
+					&.multi-hidden {
+						white-space: break-spaces;
+					}
 				}
 
-				.content {
-					flex: 1;
-					margin-left: 20rpx;
-					position: relative;
+				.discount-price {
+					white-space: nowrap;
+					margin-top: auto;
+					font-weight: bold;
+					line-height: 1;
 
-					.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;
+					.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;
 				}
 			}
 		}
 
-		&.horizontal-slide {
-			.scroll {
-				width: calc(100% - 40rpx);
-				padding: 20rpx;
-				line-height: 1;
-				white-space: nowrap;
+		.swiper {
+			width: 100%;
+			white-space: nowrap;
+			padding: 20rpx;
+			box-sizing: border-box;
 
-				.item.shadow {
-					margin-bottom: 8rpx;
-				}
-			}
-
-			.flex-between {
-				justify-content: space-between;
+			.swiper-item {
+				display: flex;
+				align-items: center;
 			}
 
 			.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/diy-horz-blank.vue b/components-diy/diy-horz-blank.vue
index b91d44a..ebb2915 100644
--- a/components-diy/diy-horz-blank.vue
+++ b/components-diy/diy-horz-blank.vue
@@ -4,6 +4,7 @@
 
 <script>
 // 辅助空白
+import DiyMinx from './minx.js'
 export default {
 	name: 'diy-horz-blank',
 	props: {
@@ -11,15 +12,16 @@ export default {
 			type: Object
 		}
 	},
+	mixins: [DiyMinx],
 	data() {
 		return {};
 	},
 	watch: {
 		// 组件刷新监听
-		componentRefresh: function(nval) {}
+		componentRefresh: function (nval) { }
 	},
 	computed: {
-		horzBlankGaugeWrap: function() {
+		horzBlankGaugeWrap: function () {
 			var obj = '';
 			obj += 'background-color:' + this.value.componentBgColor + ';';
 			if (this.value.componentAngle == 'round') {
@@ -32,7 +34,7 @@ export default {
 			return obj;
 		}
 	},
-	created() {},
+	created() { },
 	methods: {}
 };
 </script>
diff --git a/components-diy/diy-horz-line.vue b/components-diy/diy-horz-line.vue
index ce588be..0b6a9f4 100644
--- a/components-diy/diy-horz-line.vue
+++ b/components-diy/diy-horz-line.vue
@@ -1,9 +1,11 @@
 <template>
-	<view data-component-name="diy-horz-line" :style="{ borderTop: '2rpx ' + value.borderStyle + ' ' + value.color }"></view>
+	<view data-component-name="diy-horz-line" :style="{ borderTop: '2rpx ' + value.borderStyle + ' ' + value.color }">
+	</view>
 </template>
 
 <script>
 // 辅助线
+import DiyMinx from './minx.js'
 export default {
 	name: 'diy-horz-line',
 	props: {
@@ -11,12 +13,13 @@ export default {
 			type: Object
 		}
 	},
+	mixins: [DiyMinx],
 	data() {
 		return {};
 	},
 	watch: {
 		// 组件刷新监听
-		componentRefresh: function(nval) {}
+		componentRefresh: function (nval) { }
 	},
 	methods: {}
 };
diff --git a/components-diy/diy-hot-area.vue b/components-diy/diy-hot-area.vue
index 4f4dd4c..40df817 100644
--- a/components-diy/diy-hot-area.vue
+++ b/components-diy/diy-hot-area.vue
@@ -1,73 +1,77 @@
 <template>
 	<view data-component-name="diy-hot-area" :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"/>
+			<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>
+				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 {};
-				}
+// 热区展示
+import DiyMinx from './minx.js'
+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;
+		}
+	},
+	mixins: [DiyMinx],
+	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;';
 			}
-		},
-		methods: {}
-	};
+			return obj;
+		}
+	},
+	methods: {}
+};
 </script>
 
 <style lang="scss" scoped>
-	.hot-area-box {
-		position: relative;
+.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%;
-		overflow: hidden;
-		box-sizing: border-box;
 	}
 
-	.simple-graph-wrap {
-		line-height: 0;
-		overflow: hidden;
-		position: relative;
-
-		image {
-			width: 100%;
-		}
-
-		.heat-map {
-			position: absolute;
-		}
+	.heat-map {
+		position: absolute;
 	}
+}
 </style>
\ No newline at end of file
diff --git a/components-diy/diy-icon.vue b/components-diy/diy-icon.vue
index 924be53..39627cb 100644
--- a/components-diy/diy-icon.vue
+++ b/components-diy/diy-icon.vue
@@ -5,80 +5,84 @@
 </template>
 
 <script>
-	export default {
-		name: 'diy-icon',
-		props: {
-			icon: {
-				type: String,
-				default: ''
-			},
-			value: {
-				type: Object,
-				default: function () {
-					return null;
-				}
-			}
+// 图标展示
+import DiyMinx from './minx.js'
+export default {
+	name: 'diy-icon',
+	props: {
+		icon: {
+			type: String,
+			default: ''
 		},
-		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);
+		value: {
+			type: Object,
+			default: function () {
+				return null;
 			}
 		}
+	},
+	mixins: [DiyMinx],
+	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;
-			}
+.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/diy-image-nav.vue b/components-diy/diy-image-nav.vue
index 6ed0ba5..08ef3fd 100644
--- a/components-diy/diy-image-nav.vue
+++ b/components-diy/diy-image-nav.vue
@@ -1,44 +1,28 @@
 <template>
 	<view :style="componentStyle">
-		<scroll-view 
-			:class="['image-nav', value.showStyle == 'fixed' ? 'fixed-layout' : value.showStyle]" 
-			:scroll-x="value.showStyle == 'singleSlide'"
-		>
+		<scroll-view :class="['image-nav', value.showStyle == 'fixed' ? 'fixed-layout' : value.showStyle]"
+			:scroll-x="value.showStyle == 'singleSlide'">
 			<view class="uni-scroll-view-content">
-				<view 
-					v-for="(item, index) in value.list" 
-					:key="index"
-					:class="['image-nav-item', value.mode]"
-					style="margin-right: 28rpx;"
-				>
+				<view v-for="(item, index) in value.list" :key="index" :class="['image-nav-item', value.mode]"
+					style="margin-right: 28rpx;">
 					<!-- 图片部分 -->
 					<view v-if="value.mode != 'text'" class="image-img" :style="{
 						'font-size': (value.imageSize * 2 + 'rpx') + ';',
 						'width': (item.imgWidth / 2 + 'rpx') + ';',
 						'height': (item.imgHeight / 2 + 'rpx') + ';'
 					}">
-						<image 
-							v-if="item.link.wap_url"
-							:style="{
-								'width': (item.imgWidth / 2 + 'rpx') + ';',
-								'height': (item.imgHeight / 2 + 'rpx') + ';'
-							}"
-							:src="$util.img(item.imageUrl) || $util.img('public/uniapp/default_img/goods.png')"
-							:show-menu-by-longpress="true"
-							@tap="redirectTo(item.link)"
-						></image>
-						<image 
-							v-else
-							:style="{
-								'width': (item.imgWidth / 2 + 'rpx') + ';',
-								'height': (item.imgHeight / 2 + 'rpx') + ';'
-							}"
-							:src="$util.img(item.imageUrl) || $util.img('public/uniapp/default_img/goods.png')"
-							:show-menu-by-longpress="true"
-							@tap="previewImg(item.imageUrl)"
-						></image>
+						<image v-if="item.link.wap_url" :style="{
+							'width': (item.imgWidth / 2 + 'rpx') + ';',
+							'height': (item.imgHeight / 2 + 'rpx') + ';'
+						}" :src="$util.img(item.imageUrl) || $util.img('public/uniapp/default_img/goods.png')"
+							:show-menu-by-longpress="true" @tap="redirectTo(item.link)"></image>
+						<image v-else :style="{
+							'width': (item.imgWidth / 2 + 'rpx') + ';',
+							'height': (item.imgHeight / 2 + 'rpx') + ';'
+						}" :src="$util.img(item.imageUrl) || $util.img('public/uniapp/default_img/goods.png')"
+							:show-menu-by-longpress="true" @tap="previewImg(item.imageUrl)"></image>
 					</view>
-					
+
 					<!-- 文字部分 -->
 					<text class="image-text" :style="{
 						'width': (item.imgWidth / 2 + 'rpx') + ';',
@@ -55,6 +39,7 @@
 
 <script>
 import nsLogin from '@/components/ns-login/ns-login.vue'
+import DiyMinx from './minx.js'
 
 export default {
 	name: 'diy-image-nav',
@@ -67,6 +52,7 @@ export default {
 			default: () => ({})
 		}
 	},
+	mixins: [DiyMinx],
 	data() {
 		return {
 			pageWidth: '',
@@ -86,23 +72,23 @@ export default {
 		componentStyle() {
 			let style = '';
 			style += 'background-color:' + this.value.componentBgColor + ';';
-			
+
 			if (this.value.componentAngle == 'round') {
 				style += 'border-top-left-radius:' + (2 * this.value.topAroundRadius) + 'rpx;';
 				style += 'border-top-right-radius:' + (2 * this.value.topAroundRadius) + 'rpx;';
 				style += 'border-bottom-left-radius:' + (2 * this.value.bottomAroundRadius) + 'rpx;';
 				style += 'border-bottom-right-radius:' + (2 * this.value.bottomAroundRadius) + 'rpx;';
 			}
-			
+
 			style += 'box-shadow:' + (this.value.ornament.type == 'shadow' ? '0 0 10rpx ' + this.value.ornament.color : '') + ';';
 			style += 'border:' + (this.value.ornament.type == 'stroke' ? '2rpx solid ' + this.value.ornament.color : '') + ';';
-			
+
 			return style;
 		},
-		
+
 		swiperHeight() {
 			let height = 0;
-			
+
 			if (this.value.mode == 'graphic') {
 				height = (49 + this.value.imageSize) * this.value.pageCount;
 			} else if (this.value.mode == 'img') {
@@ -110,13 +96,13 @@ export default {
 			} else if (this.value.mode == 'text') {
 				height = 43 * this.value.pageCount;
 			}
-			
+
 			return 'height:' + (2 * height) + 'rpx';
 		},
-		
+
 		isIndicatorDots() {
-			return this.value.carousel.type != 'hide' && 
-				   1 != Math.ceil(this.value.list.length / (this.value.pageCount * this.value.rowCount));
+			return this.value.carousel.type != 'hide' &&
+				1 != Math.ceil(this.value.list.length / (this.value.pageCount * this.value.rowCount));
 		}
 	},
 	methods: {
@@ -125,12 +111,12 @@ export default {
 			uni.previewImage({
 				current: 0,
 				urls: [this.$util.img(imageUrl)],
-				success: (res) => {},
-				fail: (res) => {},
-				complete: (res) => {}
+				success: (res) => { },
+				fail: (res) => { },
+				complete: (res) => { }
 			});
 		},
-		
+
 		// 页面跳转
 		redirectTo(link) {
 			if (!link.wap_url || this.$util.getCurrRoute() != 'pages/member/index' || this.storeToken) {
@@ -139,7 +125,7 @@ export default {
 				this.$refs.login.open(link.wap_url);
 			}
 		},
-		
+
 		// 轮播切换
 		swiperChange(event) {
 			this.swiperCurrent = event.detail.current;
@@ -152,31 +138,31 @@ export default {
 .image-nav {
 	padding: 16rpx;
 	box-sizing: border-box;
-	
+
 	&.fixed-layout {
 		.uni-scroll-view-content {
 			display: flex;
 			flex-wrap: wrap;
 		}
 	}
-	
+
 	&.singleSlide {
 		.uni-scroll-view-content {
 			display: flex;
 		}
-		
+
 		.image-nav-item {
 			flex-shrink: 0;
 		}
 	}
-	
+
 	&.pageSlide {
 		position: relative;
-		
+
 		.uni-swiper-dots-horizontal {
 			bottom: 0rpx;
 		}
-		
+
 		&.straightLine {
 			.uni-swiper-dot {
 				width: 30rpx;
@@ -184,7 +170,7 @@ export default {
 				height: 8rpx;
 			}
 		}
-		
+
 		&.circle {
 			.uni-swiper-dot {
 				width: 14rpx;
@@ -192,46 +178,46 @@ export default {
 			}
 		}
 	}
-	
+
 	.image-nav-wrap {
 		display: flex;
 		flex-wrap: wrap;
 		width: 100%;
 		height: 100%;
 	}
-	
+
 	.image-nav-item {
 		display: flex;
 		flex-direction: column;
 		align-items: center;
 		padding: 14rpx 0;
 		box-sizing: border-box;
-		
+
 		.image-text {
 			padding-top: 12rpx;
 			line-height: 1.5;
 			text-overflow: ellipsis;
 			overflow: hidden;
 			text-align: center;
-			
+
 			&.alone {
 				padding-top: 0;
 			}
 		}
-		
+
 		&.text {
 			.image-text {
 				padding-top: 0;
 			}
 		}
-		
+
 		.image-img {
 			position: relative;
 			display: flex;
 			align-items: center;
 			justify-content: center;
 			font-size: 90rpx;
-			
+
 			.tag {
 				position: absolute;
 				top: -10rpx;
@@ -245,7 +231,7 @@ export default {
 				line-height: 1;
 				font-size: 24rpx;
 			}
-			
+
 			.icon {
 				font-size: 50rpx;
 				color: #606266;
@@ -261,16 +247,16 @@ export default {
 	justify-content: center;
 	margin-top: -20rpx;
 	padding-bottom: 8rpx;
-	
+
 	.swiper-dot {
 		background-color: rgba(0, 0, 0, 0.3);
 		margin: 8rpx;
-		
+
 		&.active {
 			background-color: #000;
 		}
 	}
-	
+
 	&.straightLine {
 		.swiper-dot {
 			width: 30rpx;
@@ -278,7 +264,7 @@ export default {
 			height: 8rpx;
 		}
 	}
-	
+
 	&.circle {
 		.swiper-dot {
 			width: 15rpx;
diff --git a/components-diy/diy-img-ads.vue b/components-diy/diy-img-ads.vue
index 138096f..301d036 100644
--- a/components-diy/diy-img-ads.vue
+++ b/components-diy/diy-img-ads.vue
@@ -2,31 +2,37 @@
 	<view data-component-name="diy-img-ads" class="single-graph">
 		<view :style="imgAdsMarginWarp" class="swiper-box">
 			<block v-if="imgAdsValue.list.length == 1">
-				<view class="simple-graph-wrap" :style="imgAdsSwiper" @click="handlerClick(imgAdsValue.list[0].link)" @tap="handlerClick(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 class="simple-graph-wrap" :style="imgAdsSwiper" @click="handlerClick(imgAdsValue.list[0].link)"
+					@tap="handlerClick(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"
+				'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="handlerClick(item.link)" @tap="handlerClick(item.link)">
+				<swiper-item class="swiper-item" :style="imgAdsSwiper" v-for="(item, index) in imgAdsValue.list"
+					:key="index" v-if="item.imageUrl" @click="handlerClick(item.link)" @tap="handlerClick(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"/>
+						<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>
+				'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>
@@ -34,277 +40,279 @@
 </template>
 
 <script>
-	// 图片广告
-	import DiyMinx from './minx.js'
-	export default {
-		name: 'diy-img-ads',
-		props: {
-			value: {
-				type: Object,
-				default: () => {
-					return {};
-				}
+// 图片广告
+import DiyMinx from './minx.js'
+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();
+	},
+	mixins: [DiyMinx],
+	watch: {
+		// 组件刷新监听
+		componentRefresh: function (nval) { }
+	},
+	computed: {
+		imgAdsMarginWarp: function () {
+			var obj = '';
+			obj = 'background-color:' + this.value.componentBgColor + ';';
+			return obj;
 		},
-		data() {
-			return {
-				isDots: true,
-				swiperHeight: 0,
-				imgAdsValue: null, // 深拷贝一遍数据，防止动态计算图片展示尺寸的时候，影响到父级的数据，导致二次渲染的时候，数据错误
-				swiperIndex: 0
-			};
-		},
-		created() {
-			this.calcSingleRow();
-		},
-		mixins: [DiyMinx],
-		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;
+		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;
 		},
-		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;
+		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;
-				});
+				// 获取最大高度 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';
+			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.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
+			// 是否显示指示器
+			if (this.imgAdsValue.list.length <= 1) {
 				this.isDots = false;
-				// #endif
-			},
-			async handlerClick(link) {
-				await this.__$emitEvent({eventName: 'img-ads-tap', data: link, promiseCallback: (event, handler, awaitedResult) => {
+			}
+
+			// #ifdef H5
+			this.isDots = this.value.indicatorIsShow;
+			// #endif
+
+			// #ifdef MP-WEIXIN
+			this.isDots = false;
+			// #endif
+		},
+		async handlerClick(link) {
+			await this.__$emitEvent({
+				eventName: 'img-ads-tap', data: link, promiseCallback: (event, handler, awaitedResult) => {
 					if (!awaitedResult) return;
 					this.$util.diyRedirectTo(link);
-				}})
-			},
-		}
-	};
+				}
+			})
+		},
+	}
+};
 </script>
 
 <style lang="scss" scoped>
-	.single-graph {
+.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%;
-		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;
+	.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;
 		}
 	}
+}
 
-	.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-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-box {
-		position: relative;
-		width: 100%;
-		overflow: hidden;
-		box-sizing: border-box;
+	&.swiper-right {
+		justify-content: flex-end;
 	}
 
-	.swiper {
-		margin: 0 auto;
-		overflow: hidden;
-	}
+	.swiper-dot {
+		background-color: #b2b2b2;
+		width: 15rpx;
+		border-radius: 50%;
+		height: 15rpx;
+		margin: 8rpx;
 
-	.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;
-			}
+		&.active {
+			background-color: rgba(0, 0, 0, 1);
 		}
 	}
 
-	.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;
-		}
-
+	&.straightLine {
 		.swiper-dot {
-			background-color: #b2b2b2;
-			width: 15rpx;
-			border-radius: 50%;
-			height: 15rpx;
-			margin: 8rpx;
+			width: 18rpx;
+			height: 6rpx;
+			border-radius: 4rpx;
 
 			&.active {
+				width: 36rpx;
 				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;
-	}
+/* 隐藏滚动条，但依旧具备可以滚动的功能 */
+/deep/.uni-scroll-view::-webkit-scrollbar {
+	display: none;
+}
 
-	.swiper /deep/ .uni-swiper-dots-horizontal {
-		bottom: 25rpx;
-	}
+.swiper /deep/ .uni-swiper-dots-horizontal {
+	bottom: 25rpx;
+}
 
-	.swiper-left /deep/ .uni-swiper-dots-horizontal {
-		left: 40rpx;
-		transform: translate(0);
-	}
+.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);
-	}
+.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;
-	}
+.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 {
+	width: 18rpx;
+	height: 6rpx;
+	border-radius: 4rpx;
+}
 
-	.swiper.ns-indicator-dots /deep/ .uni-swiper-dot-active {
-		width: 36rpx;
-	}
+.swiper.ns-indicator-dots /deep/ .uni-swiper-dot-active {
+	width: 36rpx;
+}
 </style>
\ No newline at end of file
diff --git a/components-diy/diy-index-page.vue b/components-diy/diy-index-page.vue
index 328a963..63beccd 100644
--- a/components-diy/diy-index-page.vue
+++ b/components-diy/diy-index-page.vue
@@ -11,22 +11,27 @@
 							@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'">
+								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>
+							<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 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>
+					<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)">
+						<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>
@@ -40,57 +45,78 @@
 					<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>
+							<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="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="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"/>
+														<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 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="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"/>
+														<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 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="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"/>
+														<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 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"/>
+									<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-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>
+												<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)"/>
+													<image :src="$util.img(value.tagImg.imageUrl)" />
 												</view>
 											</view>
 											<view class="info-wrap">
@@ -99,21 +125,29 @@
 												</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>
+														<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 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"/>
+														<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)">
+													<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 class="sale font-size-activity-tag color-tip">已售{{
+														item.sale_num }}{{ item.unit ? item.unit : '件' }}</view>
 												</view>
 											</view>
 										</view>
@@ -135,696 +169,699 @@
 </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
+import nsLoading from '@/components/ns-loading/ns-loading.vue';
+import DiyMinx from './minx.js'
+export default {
+	name: 'diy-index-page',
+	props: {
+		value: {
+			type: Object
+		},
+		bgUrl: {
+			type: String
+		},
+		scrollTop: {
+			type: [String, Number],
+			default: '0'
+		},
+		diyGlobal: {
+			type: Object
+		}
+	},
+	mixins: [DiyMinx],
+	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;
 			}
 		},
-		components: {
-			nsLoading
+		topNavColor() {
+			var color = this.value.componentBgColor || this.value.pageBgColor;
+			if (this.diyGlobal.topNavBg && this.scrollTop > 20) color = this.diyGlobal.topNavColor;
+			return color;
 		},
-		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;
+		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;
 		},
-		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
+		// 分类导航展开菜单的位置
+		uniPopTop() {
+			let diyPositionObj = this.$store.state.diyGroupPositionObj;
+			let data = '0';
 
-				// #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.setModuleLocationFn();
-		},
-		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增加分类导航组件定位位置
-			setModuleLocationFn() {
-				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
+			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.setModuleLocationFn();
+	},
+	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增加分类导航组件定位位置
+		setModuleLocationFn() {
+			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%;
+.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;
+		}
 	}
 
-	.nav-top-category {
-		display: flex;
-		align-items: center;
-		position: fixed;
-		z-index: 999;
-		transition: background 0.3s;
-		width: 100%;
-		padding: 0 24rpx;
+	.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;
 
-		.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;
+		&.active {
+			background-color: transparent;
 		}
 	}
+}
 
-	.nav-topcategory-pop {
-		padding: 0 10rpx 20rpx;
-		display: flex;
-		flex-wrap: wrap;
-		background-color: #fff;
+.diyIndex {
+	width: 100%;
+	height: 100rpx;
+	white-space: nowrap;
+	padding: 20rpx 0 0;
+	box-sizing: border-box;
 
-		.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;
+	&.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 {
-				background-color: transparent;
+				font-size: $font-size-base;
+				font-weight: bold;
 			}
 		}
-	}
 
-	.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;
+		.text-con.active {
 			font-size: $font-size-base;
-			text-align: center;
+			font-weight: bold;
+		}
 
-			.text-con {
-				height: 30px;
-				line-height: 30px;
+		.line {
+			position: absolute;
+			left: calc(50% - 14rpx);
+			width: 28rpx;
+			height: 5rpx;
+			border-radius: 5rpx;
+		}
 
-				&.active {
-					font-size: $font-size-base;
-					font-weight: bold;
-				}
-			}
+		&.fill {
+			border-radius: 50rpx;
+			padding: 0 10rpx;
 
 			.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;
-				}
+				font-weight: 600;
+				color: #fff;
 			}
 		}
 	}
+}
 
-	.index-page-box {
-		width: 100%;
-		height: calc(100vh - 288rpx);
+.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;
 	}
 
-	.index-page-content {
-		width: 100%;
-		// height: calc(100vh - 144px);
+	.twoCategory.min {
+		height: 160rpx;
 	}
 
-	.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));
+	.twoCategory.big {
+		height: 340rpx;
 	}
 
-	.index-category-box {
+	.twoCategory {
 		width: 100%;
-		padding-bottom: 110rpx;
-		padding-bottom: calc(110rpx + constant(safe-area-inset-bottom));
-		padding-bottom: calc(110rpx + env(safe-area-inset-bottom));
+		background: #ffffff;
+		border-radius: 15rpx;
+		overflow: hidden;
+		margin-top: 20rpx;
 
-		.twoCategorylist {
-			position: relative;
-		}
-
-		.twoCategory.min {
-			height: 160rpx;
-		}
-
-		.twoCategory.big {
-			height: 340rpx;
-		}
-
-		.twoCategory {
+		.twoCategory-page {
 			width: 100%;
-			background: #ffffff;
-			border-radius: 15rpx;
-			overflow: hidden;
-			margin-top: 20rpx;
+			height: 100%;
+			padding: 20rpx;
+			box-sizing: border-box;
+		}
 
-			.twoCategory-page {
+		.swiper-item {
+			width: 120rpx;
+			height: 120rpx;
+			display: inline-block;
+			margin-right: calc((100% - 120rpx * 5) / 4);
+			overflow: hidden;
+
+			.item-box {
 				width: 100%;
 				height: 100%;
-				padding: 20rpx;
-				box-sizing: border-box;
-			}
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				flex-direction: column;
 
-			.swiper-item {
-				width: 120rpx;
-				height: 120rpx;
-				display: inline-block;
-				margin-right: calc((100% - 120rpx * 5) / 4);
-				overflow: hidden;
+				image {
+					width: 88rpx;
+					height: 88rpx;
+				}
 
-				.item-box {
+				view {
 					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;
-					}
+					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;
-			}
+		.swiper-item:nth-child(5n) {
+			margin-right: 0;
 		}
 
-		.category_adv {
-			width: 100%;
-			margin: 20rpx 0;
-			border-radius: 15rpx;
-		}
-
-		.category-goods {
-			width: 100%;
+		.swiper-item:nth-child(10n + 6) {
+			margin-top: 15rpx;
 		}
 	}
 
-	.loading {
-		width: 100%;
+	.dot-box {
+		width: calc(100% - 40rpx);
 		height: 50rpx;
-		margin-top: 100rpx;
-	}
-
-	/deep/.uni-scroll-view::-webkit-scrollbar {
-		/* 隐藏滚动条，但依旧具备可以滚动的功能 */
-		display: none;
-	}
-
-	.goods-list.double-column {
+		position: absolute;
+		bottom: 0rpx;
+		left: 20rpx;
+		background: rgba($color: #000000, $alpha: 0);
 		display: flex;
-		flex-wrap: wrap;
-		margin-top: $margin-updown;
+		justify-content: center;
+		align-items: center;
 
-		.goods-item {
-			flex: 1;
+		.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;
-			background-color: #fff;
-			flex-basis: 48%;
-			max-width: calc((100% - 30rpx) / 2);
-			margin-right: $margin-both;
-			margin-bottom: $margin-updown;
-			border-radius: $border-radius;
+			overflow: hidden;
+			padding-top: 100%;
+			border-top-left-radius: $border-radius;
+			border-top-right-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;
+			image {
+				width: 100%;
 				position: absolute;
-				border-bottom-right-radius: $border-radius;
-				top: 0;
+				top: 50%;
 				left: 0;
-				font-size: $font-size-goods-tag;
+				transform: translateY(-50%);
 			}
+		}
 
-			.goods-tag-img {
-				position: absolute;
-				border-top-left-radius: $border-radius;
-				width: 80rpx;
-				height: 80rpx;
-				top: 0;
-				left: 0;
-				z-index: 5;
-				overflow: hidden;
+		.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;
+		}
 
-				image {
-					width: 100%;
-					height: 100%;
-				}
+		.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;
+		.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;
 			}
+		}
 
-			.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;
-			}
+		.pro-info {
+			display: flex;
+			margin-top: 16rpx;
 
-			.discount-price {
-				display: inline-block;
-				font-weight: bold;
-				line-height: 1;
-				margin-top: 16rpx;
+			.delete-price {
+				text-decoration: line-through;
+				flex: 1;
 
 				.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;
+			&>view {
 				line-height: 1;
-				margin-left: 6rpx;
 
-				image {
-					width: 100%;
+				&: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/diy-kefu.vue b/components-diy/diy-kefu.vue
index feb47c3..4a631a4 100644
--- a/components-diy/diy-kefu.vue
+++ b/components-diy/diy-kefu.vue
@@ -1,18 +1,20 @@
 <template>
 	<view data-component-name="diy-kefu" class="diy-kefu" :style="style">
-		<view class="fui-list-group merchgroup" v-for="(item,index) in value.list">
+		<view class="fui-list-group merchgroup" v-for="(item, index) in value.list">
 			<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 class="fui-list-inner">
+					<view class="title" style="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>
+					<span style="font-size:24rpx;padding: 14rpx 18rpx;border-radius:8rpx"
+						:style="{ background: item.BtBgColor, color: item.BtColor }" @click="previewSqs()">立即添加</span>
 				</view>
 			</view>
 		</view>
@@ -20,52 +22,53 @@
 </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] 
-				})
-			}
+// 客服展示
+import DiyMinx from './minx.js'
+export default {
+	name: 'diy-kefu',
+	props: {
+		value: {
+			type: Object
 		}
-	};
+	},
+	mixins: [DiyMinx],
+	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
+<style lang="scss"></style>
\ No newline at end of file
diff --git a/components-diy/diy-listmenu.vue b/components-diy/diy-listmenu.vue
index a74962e..e14e3ae 100644
--- a/components-diy/diy-listmenu.vue
+++ b/components-diy/diy-listmenu.vue
@@ -1,77 +1,80 @@
 <template>
 	<view data-component-name="diy-picture" class="diy-picture" :style="style">
-		<view  class="fui-cell-group">
-		   <!--     <image mode="widthFix" style="width: 100%;" :src="$util.img(item.imageUrl)"></image> -->
+		<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 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': item.style ? item.style.iconColor : '#333' }">
+					<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>
 </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);
-			},
+// 自定义列表菜单展示
+import DiyMinx from './minx.js'
+export default {
+	name: 'diy-listmenu',
+	props: {
+		value: {
+			type: Object
 		}
-	};
+	},
+	mixins: [DiyMinx],
+	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;
+.img-cell {
+	padding: 0 16rpx !important;
 }
 </style>
\ No newline at end of file
diff --git a/components-diy/diy-live.vue b/components-diy/diy-live.vue
index 97387d0..568b58a 100644
--- a/components-diy/diy-live.vue
+++ b/components-diy/diy-live.vue
@@ -1,14 +1,19 @@
 <template>
 	<x-skeleton data-component-name="diy-live" type="banner" :loading="loading" :configs="skeletonConfig">
-		<view class="live-wrap" @click="handlerClick(liveInfo.roomid)" @tap="handlerClick(liveInfo.roomid)" v-if="liveInfo">
+		<view class="live-wrap" @click="handlerClick(liveInfo.roomid)" @tap="handlerClick(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')"/>
+				<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="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>
@@ -18,7 +23,9 @@
 			</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"/>
+					<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>
@@ -31,219 +38,222 @@
 </template>
 
 <script>
-	// 直播
-	import DiyMinx from './minx.js'
-	export default {
-		components: {},
-		name: 'diy-live',
-		props: {
-			value: {
-				type: Object,
-				default: () => {
-					return {};
-				}
+// 直播
+import DiyMinx from './minx.js'
+export default {
+	components: {},
+	name: 'diy-live',
+	props: {
+		value: {
+			type: Object,
+			default: () => {
+				return {};
+			}
+		}
+	},
+	data() {
+		return {
+			loading: true,
+			skeletonConfig: {
+				headHeight: '200rpx'
+			},
+			liveInfo: {
+				banner: '',
+				anchor_img: ''
 			}
-		},
-		data() {
-			return {
-				loading: true,
-				skeletonConfig: {
-					headHeight: '200rpx'
-				},
-				liveInfo: {
-					banner: '',
-					anchor_img: ''
-				}
 
-			};
-		},
-		created() {
+		};
+	},
+	created() {
+		this.getLiveInfo();
+	},
+	mixins: [DiyMinx],
+	watch: {
+		// 组件刷新监听
+		componentRefresh: function (nval) {
 			this.getLiveInfo();
-		},
-		mixins: [DiyMinx],
-		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;
+		}
+	},
+	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;
 					}
-				});
-			},
-			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');
+					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({
+			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 => {
+					})
+					.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();
+						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();
 					}
-				});
-			},
-			async handlerClick(roomid) {
-				await this.__$emitEvent({eventName: 'live-tap', data: roomid, promiseCallback: (event, handler, awaitedResult) => {
+				}
+			});
+		},
+		async handlerClick(roomid) {
+			await this.__$emitEvent({
+				eventName: 'live-tap', data: roomid, promiseCallback: (event, handler, awaitedResult) => {
 					if (!awaitedResult) return;
 					this.entryRoom(roomid);
-				}})
-			},
-		}
-	};
+				}
+			})
+		},
+	}
+};
 </script>
 
 <style lang="scss">
-	.live-wrap {
-		background: #fff;
-		border-radius: 16rpx;
-		overflow: hidden;
+.live-wrap {
+	background: #fff;
+	border-radius: 16rpx;
+	overflow: hidden;
+}
+
+.banner-wrap {
+	width: 100%;
+	position: relative;
+	line-height: 1;
+	display: flex;
+
+	image {
+		width: 100%;
 	}
 
-	.banner-wrap {
+	.shade {
 		width: 100%;
-		position: relative;
-		line-height: 1;
-		display: flex;
+		height: 100%;
+		position: absolute;
+		background: rgba($color: #888, $alpha: 0.3);
+		left: 0;
+		top: 0;
+		z-index: 5;
+	}
 
-		image {
+	.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;
 
-		.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;
+			.status-name {
+				display: inline-block;
+				font-size: $font-size-activity-tag;
 				color: #fff;
-				line-height: 1;
-				width: 100%;
-				white-space: nowrap;
-				overflow: hidden;
-				text-overflow: ellipsis;
-				display: flex;
-				align-items: center;
+				padding: 8rpx 12rpx;
+				background-color: rgba(0, 0, 0, 0.6);
+				border-radius: 36rpx;
+				margin-right: 20rpx;
 
-				.status-name {
-					display: inline-block;
+				.icon-zhibozhong {
 					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;
-					}
+					margin-right: 9rpx;
 				}
 			}
 		}
 	}
+}
 
-	.room-info {
-		padding: 20rpx 30rpx;
-		background: #fff;
-		display: flex;
+.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;
-		}
+	.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;
-	}
+.coupon-all>>>.uni-scroll-view::-webkit-scrollbar {
+	display: none;
+}
 </style>
\ No newline at end of file
diff --git a/components-diy/diy-many-goods-list.vue b/components-diy/diy-many-goods-list.vue
index e9bb9a2..27185fb 100644
--- a/components-diy/diy-many-goods-list.vue
+++ b/components-diy/diy-many-goods-list.vue
@@ -1,255 +1,260 @@
 <template>
 	<view data-component-name="diy-many-goods-list" 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="handlerClick({item,index})" @tap="handlerClick({item,index})">
+		<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="handlerClick({ item, index })" @tap="handlerClick({ 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="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 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>
-	import DiyMinx from './minx.js'
-	export default {
-		name: 'diy-many-goods-list',
-		props: {
-			value: {
-				type: Object,
-				default: () => {
-					return {};
-				}
-			},
-			scrollTop: {
-				type: [Number, String]
-			},
-			global: {
-				type: Object,
-				default: () => {
-					return {};
-				}
+import DiyMinx from './minx.js'
+export default {
+	name: 'diy-many-goods-list',
+	props: {
+		value: {
+			type: Object,
+			default: () => {
+				return {};
 			}
 		},
-		data() {
-			return {
-				cateIndex: 0, // 当前选中的分类id
-				goodsValue: null, // 商品列表数据
-				manyInfo: {
-					bodyHeight: 0,
-					bodyTop: 0,
-					height: 0,
-					top: 0
-				}
-			};
+		scrollTop: {
+			type: [Number, String]
 		},
-		created() {
+		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);
+	},
+	mixins: [DiyMinx],
+	watch: {
+		// 组件刷新监听
+		componentRefresh: function (nval) {
 			this.changeCateIndex(this.value.list[0], 0, true);
 		},
-		mixins: [DiyMinx],
-		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() {
+		scrollTop: function (nval) {
 			const query = uni.createSelectorQuery().in(this);
 			query
-				.select('.many-goods-list .many-goods-list-head')
+				.select('.many-goods-list')
 				.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
-						});
+						this.manyInfo.top = data.top;
 					}
 				})
 				.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();
-			},
-			async handlerClick({item,index}) {
-				await this.__$emitEvent({eventName: 'many-goods-list-tap', data: {item,index}, promiseCallback: (event, handler, awaitedResult) => {
+			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();
+		},
+		async handlerClick({ item, index }) {
+			await this.__$emitEvent({
+				eventName: 'many-goods-list-tap', data: { item, index }, promiseCallback: (event, handler, awaitedResult) => {
 					if (!awaitedResult) return;
 					this.changeCateIndex(item, index, false);
-				}})
-			},
-		}
-	};
+				}
+			})
+		},
+	}
+};
 </script>
 
 <style lang="scss" scoped>
-	.many-goods-list-head {
-		left: 0;
-		right: 0;
-		z-index: 5;
-		background-color: #fff;
-	}
+.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-view {
+	width: 100%;
+	white-space: nowrap;
+	box-sizing: border-box;
+	padding: 20rpx 0;
 
-		.scroll-item {
+	.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;
-			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;
-				}
-			}
+			width: 1rpx;
+			height: 30rpx;
+			background-color: #e5e5e5;
+			position: absolute;
+			left: 0;
+			top: 50%;
+			transform: translateY(-50%);
+		}
 
+		&.active {
 			.name {
-				font-size: 32rpx;
-				color: $color-title;
-				line-height: 1;
-			}
-
-			.cate {
-				display: inline-block;
+				font-weight: bold;
 			}
 
 			.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;
+				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/diy-map.vue b/components-diy/diy-map.vue
index af93cbc..a0e1fb5 100644
--- a/components-diy/diy-map.vue
+++ b/components-diy/diy-map.vue
@@ -1,18 +1,13 @@
 <template>
 	<view data-component-name="diy-map" class="diy-map" :style="style">
-		<view class="fui-list-group merchgroup" style="margin-top:0" v-for="(item,index) in value.list">
-			<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="handlerClick(item)" @tap="handlerClick(item)">
-				<cover-view style="font-size:24rpx">一键导航</cover-view>
-				</cover-view>    
+		<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="handlerClick(item)" @tap="handlerClick(item)">
+					<cover-view style="font-size:24rpx">一键导航</cover-view>
+				</cover-view>
 			</map>
 		</view>
 
@@ -20,68 +15,68 @@
 </template>
 
 <script>
-	// 地图
-	import DiyMinx from './minx.js'
-	export default {
-		name: 'diy-map',
-		props: {
-			value: {
-				type: Object
+// 地图
+import DiyMinx from './minx.js'
+export default {
+	name: 'diy-map',
+	props: {
+		value: {
+			type: Object
+		}
+	},
+	data() {
+		return {
+			loading: true,
+			markers: []
+		};
+	},
+	created() {
+	},
+	mixins: [DiyMinx],
+	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: "一键导航",
+			})
 		},
-		data() {
-			return {
-				loading: true,
-				markers:[]
-			};
-		},
-		created() {
-		},
-		mixins: [DiyMinx],
-		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:"一键导航",
-				  })
-			},
-			async handlerClick(item) {
-				await this.__$emitEvent({eventName: 'map-tap', data: item, promiseCallback: (event, handler, awaitedResult) => {
+		async handlerClick(item) {
+			await this.__$emitEvent({
+				eventName: 'map-tap', data: item, promiseCallback: (event, handler, awaitedResult) => {
 					if (!awaitedResult) return;
 					this.tomap(item);
-				}})
-			}
+				}
+			})
 		}
-	};
+	}
+};
 </script>
 
-<style lang="scss">
-	
-</style>
\ No newline at end of file
+<style lang="scss"></style>
\ No newline at end of file
diff --git a/components-diy/diy-member-info.vue b/components-diy/diy-member-info.vue
index e044310..9922299 100644
--- a/components-diy/diy-member-info.vue
+++ b/components-diy/diy-member-info.vue
@@ -5,52 +5,63 @@
 			<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"/>
+						<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">
+						<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> -->
+							<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" >
+						<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"/>
+						<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) ">
+						<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="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="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"/>
+
+						<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 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')">
@@ -58,17 +69,21 @@
 						<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 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 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-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) : '--' }}
+							{{ memberInfo ? (parseFloat(memberInfo.balance) +
+								parseFloat(memberInfo.balance_money)).toFixed(2) : '--' }}
 						</view>
 						<view class="title">{{ $lang('balance') }}</view>
 					</view>
@@ -85,7 +100,7 @@
 						<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">
@@ -152,9 +167,11 @@
 				</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="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>
@@ -185,7 +202,8 @@
 					<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"/>
+							<image :src="avatarUrl ? avatarUrl : $util.getDefaultImage().head"
+								@error="avatarUrl = $util.getDefaultImage().head" mode="aspectFill" />
 							<text class="iconfont icon-right color-tip"></text>
 						</button>
 					</view>
@@ -197,8 +215,10 @@
 					<!-- #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"/>
+						<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>
@@ -217,595 +237,724 @@
 </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 {};
+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';
+import DiyMinx from './minx.js'
+export default {
+	name: 'diy-member-info',
+	props: {
+		value: {
+			type: Object
+		},
+		global: {
+			type: Object,
+			default: () => {
+				return {};
+			}
+		}
+	},
+	mixins: [DiyMinx],
+	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);
 		},
-		components: {
-			nsContact
-		},
-		data() {
-			return {
-				info: null,
-				superMember: null,
-				memberCode: null,
-				avatarUrl: '', // 头像预览
-				headImg: '', // 头像保存
-				nickName: '',
-				completeInfoCallback: null,
-				menuButtonInfo: menuButtonInfo,
-				
-				langList: [],
-				langIndex: 0,
-				ischina:0
+		superMemberStyle() {
+			let style = {
+				'margin-left': parseInt(this.value.infoMargin) * 2 + 'rpx ',
+				'margin-right': parseInt(this.value.infoMargin) * 2 + 'rpx '
 			};
-		},
-		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();
+			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);
 		},
-		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';
+		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;
 					}
 				}
-
-				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();
 				}
-			},
-			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.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
-						用于处理昵称将统一返回 “微信用户”
-					*/
+							小程序用户头像昵称获取规则调整公告
+							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
+			});
+		},
+		/**
+		 * 查询优惠券数量
+		 */
+		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.$util.showToast({
-								title: userInfo.subMsg
-							})
+							// 第一次赋值
+							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'
 					},
-					fail: (err) => {
-						this.$util.showToast({
-							title: err.subMsg
-						})
+					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 {
+// 增加超出隐藏，是为样式四进行占位【样式四是有定位部分】，定位部分也可以设置颜色
+.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%;
+		}
 	}
 
-	.common-wrap {
-		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;
-	}
 
-	// 会员信息
-	.member-info {
-		.info-wrap {
-			padding: 44rpx 30rpx;
+		.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;
 
-			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{
+		.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;
@@ -813,654 +962,530 @@
 				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;
-			// }
+	.account-info {
+		background: #fff;
+		margin: 20rpx 0 0 0;
+		color: #333;
+		border-radius: 18rpx;
+
+		.solid {
+			background: #f2f2f2;
 		}
 
-		.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;
+		.account-item {
+			.value {
+				color: #000000;
 			}
 
-			.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;
-				}
+			.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 {
-				line-height: 1;
-				font-size: 30rpx;
+				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;
 			}
 
-			.icon-right {
-				font-size: 28rpx;
-				margin-left: 10rpx;
+			.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;
-		padding: 40rpx 0;
 		align-items: center;
-		justify-content: 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: #fff;
+			color: #282c38;
 		}
 
-		.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;
+		.info {
 			display: flex;
-			align-items: center;
+			flex-direction: column;
+			align-items: baseline;
+
+			.name,
+			.desc {
+				color: #fff;
+			}
 		}
 	}
 
-	.data-style-2 {
-		.member-info {
-			// border-radius: 0 0 100% 100%/0 0 70rpx 70rpx;
-			overflow: hidden;
+	.member-code,
+	.user-info {
+		color: #fff;
+		font-weight: bold;
+		font-size: 36rpx;
+	}
 
-			.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;
-				}
-			}
+	.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;
 		}
 
-		.account-info {
-			background: #fff;
-			margin: 20rpx 0 0 0;
-			color: #333;
-			border-radius: 18rpx;
+		.level-name {
+			padding: 0 20rpx 0 6rpx;
+			color: #ddc095;
+			font-size: 24rpx;
+		}
+	}
 
-			.solid {
-				background: #f2f2f2;
-			}
+	.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: #000000;
+					color: #282c38;
+					font-size: 38rpx;
 				}
 
 				.title {
 					color: #666666;
+					font-size: $font-size-tag;
 				}
 			}
 		}
 
-		.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;
-				}
-			}
+			height: 120rpx;
+			line-height: 100rpx;
+			padding: 20rpx;
 
 			.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 {
+				.title {
+					width: 80rpx;
+					height: auto;
+					will-change: transform;
+					margin-right: 20rpx;
+				}
+
+				.desc {
 					font-size: 30rpx;
-					margin-left: 16rpx;
+					color: #333;
+					font-weight: bold;
 				}
 			}
 
-			.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;
+			.super-text {
 				display: flex;
 				align-items: center;
 				justify-content: center;
+				background-color: #333;
+				border-radius: 26rpx;
+				width: 138rpx;
+				height: 52rpx;
 
-				.iconfont {
-					margin-left: 20rpx;
+				&.more {
+					width: 180rpx;
 				}
-			}
 
-			.popup-top-text {
-				text-align: center;
-				font-size: 18rpx;
-				color: rgb(153, 153, 153);
-				margin-top: 30rpx;
+				.see {
+					color: #f6dcad;
+					font-size: $font-size-goods-tag;
+				}
 			}
 		}
 
-		.popup-bottom {
+		.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;
-			background: none !important;
 
-			.iconfont-delete {
-				font-size: 60rpx;
-				margin-top: 20rpx;
-				color: white;
+			.iconfont {
+				margin-left: 20rpx;
 			}
 		}
+
+		.popup-top-text {
+			text-align: center;
+			font-size: 18rpx;
+			color: rgb(153, 153, 153);
+			margin-top: 30rpx;
+		}
 	}
 
-	/deep/ .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+	.popup-bottom {
+		display: flex;
+		align-items: center;
+		justify-content: center;
 		background: none !important;
+
+		.iconfont-delete {
+			font-size: 60rpx;
+			margin-top: 20rpx;
+			color: white;
+		}
 	}
+}
 
-	/deep/ .member-info-style4 .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
-		background: #fff !important;
-	}
+/deep/ .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+	background: none !important;
+}
 
-	.member-code-popup .popup-top {
-		height: auto;
-	}
+/deep/ .member-info-style4 .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+	background: #fff !important;
+}
 
-	.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));
+.member-code-popup .popup-top {
+	height: auto;
+}
 
-			.head {
-				position: relative;
-				border-bottom: 2rpx solid $color-line;
-				padding-bottom: 20rpx;
+.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));
 
-				.title {
-					font-size: $font-size-toolbar;
-					display: block;
-				}
+		.head {
+			position: relative;
+			border-bottom: 2rpx solid $color-line;
+			padding-bottom: 20rpx;
 
-				.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;
-				}
+			.title {
+				font-size: $font-size-toolbar;
+				display: block;
 			}
 
-			.item-wrap {
-				border-bottom: 2rpx solid $color-line;
+			.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;
-				padding: 20rpx 0;
+				font-size: $font-size-toolbar;
+				border: none;
 
-				.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;
+				image {
+					width: 100rpx;
+					height: 100rpx;
+					border-radius: 10rpx;
+					overflow: hidden;
 				}
 			}
 
-			.save-btn {
-				width: 280rpx;
-				height: 90rpx;
-				line-height: 90rpx;
-				background-color: #07c160;
-				color: #fff;
-				margin: 40rpx auto 20rpx;
+			.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;
-	}
+.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/diy-member-my-order.vue b/components-diy/diy-member-my-order.vue
index 876ffaa..7c96434 100644
--- a/components-diy/diy-member-my-order.vue
+++ b/components-diy/diy-member-my-order.vue
@@ -2,53 +2,75 @@
 	<view data-component-name="diy-member-my-order" 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="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>
+							<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>
+							<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>
+						<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="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>
+							<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>
+							<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>
+						<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="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>
+							<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>
+							<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>
+						<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="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>
+							<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 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>
@@ -57,13 +79,18 @@
 				<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>
+							<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>
+							<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>
+						<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>
@@ -74,176 +101,179 @@
 </template>
 
 <script>
-	// 自定义会员中心——我的订单
-	export default {
-		name: 'diy-member-my-order',
-		props: {
-			value: {
-				type: Object
+// 自定义会员中心——我的订单展示
+import DiyMinx from './minx.js'
+export default {
+	name: 'diy-member-my-order',
+	props: {
+		value: {
+			type: Object
+		}
+	},
+	mixins: [DiyMinx],
+	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();
 		},
-		data() {
-			return {
-				orderNum: {
+		// 组件刷新监听
+		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
-				}
-			};
-		},
-		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
-							};
-						}
+		/**
+		 * 获取订单数量
+		 */
+		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);
 				}
+			});
+		},
+		/**
+		 * 跳转
+		 * @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;
+.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;
 	}
 
-	.order-wrap {
-		.status-wrap {
+	.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;
-			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;
-			}
+		.title {
+			font-size: 26rpx;
 		}
 	}
+}
 </style>
\ No newline at end of file
diff --git a/components-diy/diy-merch-list.vue b/components-diy/diy-merch-list.vue
index b25192d..292eaf2 100644
--- a/components-diy/diy-merch-list.vue
+++ b/components-diy/diy-merch-list.vue
@@ -3,10 +3,12 @@
 		<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="handlerClick(item)" @tap="handlerClick(item)">
+					<view :class="['item', value.ornament.type]" v-for="(item, index) in list" :key="index"
+						:style="itemCss" @click="handlerClick(item)" @tap="handlerClick(item)">
 						<view class="merch-img">
-							<image class="cover-img" :src="$util.img(item.merch_image)" mode="widthFix" @error="imgError(index)" />
-						</view> 
+							<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>
@@ -17,25 +19,26 @@
 			</view>
 		</x-skeleton>
 		<view v-else :style="warpCss">
-			<scroll-view :scroll-x="true" :class="['merch-nav', 'singleSlide' ]">
+			<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="handlerClick(item)" @tap="handlerClick(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
+
+					<view class="merch-nav-item graphic" v-for="(item, index) in list" :key="index"
+						:style="{ width: 100 / 4 + '%' }" @click="handlerClick(item)" @tap="handlerClick(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;"
-							/>
+								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);">
+						<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 -->
@@ -45,314 +48,318 @@
 </template>
 
 <script>
-	// 文章
-	import DiyMinx from './minx.js'
-	export default {
-		name: 'diy-article',
-		props: {
-			value: {
-				type: Object
+// 文章
+import DiyMinx from './minx.js'
+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
 			}
-		},
-		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() {
+		};
+	},
+	created() {
+		this.getList();
+	},
+	mixins: [DiyMinx],
+	watch: {
+		// 组件刷新监听
+		componentRefresh: function (nval) {
 			this.getList();
-		},
-		mixins: [DiyMinx],
-		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;
 		},
-		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;
+		// 子项样式
+		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();
 			}
-		},
-		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;
+			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;
 					}
-				});
-			},
-			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;
-			},
-			async handlerClick(item) {
-				await this.__$emitEvent({eventName: 'merch-list-tap', data: item, promiseCallback: (event, handler, awaitedResult) => {
+					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;
+		},
+		async handlerClick(item) {
+			await this.__$emitEvent({
+				eventName: 'merch-list-tap', data: item, promiseCallback: (event, handler, awaitedResult) => {
 					if (!awaitedResult) return;
 					this.toDetail(item);
-				}})
-			}
+				}
+			})
 		}
-	};
+	}
+};
 </script>
 <style>
-	/* 单行滑动 */
-	.merch-nav.singleSlide>>>.uni-scroll-view-content {
-	    display: flex;
-	}
+/* 单行滑动 */
+.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-nav {
+	padding: 16rpx;
+	box-sizing: border-box;
+
+	&.singleSlide {
+		.merch-nav-item {
+			flex-shrink: 0;
+		}
 	}
-	.merch-wrap {
-		.list-wrap {
-			&.style-1 {
-				.item {
+
+	&.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;
-					padding: 20rpx;
-					margin-top: 24rpx;
+					align-items: center;
+					justify-content: center;
 
-					&:first-of-type {
-						margin-top: 0;
+					image {
+						width: 100%;
+					}
+				}
+
+				.info-wrap {
+
+					// flex: 1;
+					// display: flex;
+					// flex-direction: column;
+					// justify-content: space-between;
+					.desc {
+						color: #888
 					}
 
-					.merch-img {
-						margin-right: 20rpx;
-						width: 160rpx;
-						height: 160rpx;
+					.title {
+						font-weight: bold;
+						// margin-bottom: 10rpx;
 						overflow: hidden;
-						display: flex;
-						align-items: center;
-						justify-content: center;
-
-						image {
-							width: 100%;
-						}
+						text-overflow: ellipsis;
+						display: -webkit-box;
+						-webkit-line-clamp: 2;
+						-webkit-box-orient: vertical;
+						font-size: 30rpx;
+						line-height: 1.5;
 					}
 
-					.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;
+					}
 
-						.abstract {
-							overflow: hidden;
-							text-overflow: ellipsis;
-							display: -webkit-box;
-							-webkit-line-clamp: 2;
-							-webkit-box-orient: vertical;
+					.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;
 						}
 
-						.read-wrap {
-							display: flex;
-							color: #999ca7;
-							justify-content: flex-start;
-							align-items: center;
-							margin-top: 10rpx;
-							line-height: 1;
+						.iconfont {
+							font-size: 36rpx;
+							vertical-align: bottom;
+							margin-right: 10rpx;
+						}
 
-							text {
-								font-size: $font-size-tag;
-							}
+						.category-icon {
+							width: 8rpx;
+							height: 8rpx;
+							border-radius: 50%;
+							background: $base-color;
+							margin-right: 10rpx;
+						}
 
-							.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;
-							}
+						.date {
+							margin-left: 20rpx;
 						}
 					}
 				}
 			}
 		}
 	}
+}
 </style>
\ No newline at end of file
diff --git a/components-diy/diy-notes.vue b/components-diy/diy-notes.vue
index a371b44..317f05e 100644
--- a/components-diy/diy-notes.vue
+++ b/components-diy/diy-notes.vue
@@ -3,36 +3,45 @@
 		<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 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="handlerClick(item)" @tap="handlerClick(item)"
-					:style="notesItemStyle">
+				<view class="notes-box-item" v-for="(item, i) in dataList" :key="i" @click="handlerClick(item)"
+					@tap="handlerClick(item)" :style="notesItemStyle">
 					<view class="notes-item" v-if="item.status == 1">
 						<view class="notes-item-con">
 							<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>
+								<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>
+								<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"/>
+							<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-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>
+									<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>
+									<text v-show="value.readNum == 1 && item.is_show_read_num == 1">阅读 {{
+										item.initial_read_num + item.read_num }}</text>
 								</view>
 							</view>
 						</view>
@@ -46,314 +55,316 @@
 </template>
 
 <script>
-	import DiyMinx from './minx.js'
-	export default {
-		name: 'diy-notes',
-		props: {
-			value: {
-				type: Object
+import DiyMinx from './minx.js'
+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();
+	},
+	mixins: [DiyMinx],
+	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;';
 			}
-		},
-		data() {
-			return {
-				loading: true,
-				skeletonConfig: {
-					itemDirection: 'column',
-					headWidth: '100%',
-					headHeight: '320rpx',
-					textRows: 2,
-					textWidth: ['100%', '80%']
-				},
-				dataList: [],
-				giveLikeFlag: false
-			};
-		},
-		created() {
+			return css;
+		}
+	},
+	methods: {
+		refresh() {
 			this.getDataList();
 		},
-		mixins: [DiyMinx],
-		watch: {
-			// 组件刷新监听
-			componentRefresh: function(nval) {
-				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();
 			}
-		},
-		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.$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;
 							}
-						}
-						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;
+							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];
 							}
-							this.dataList[index].is_dianzan = this.dataList[index].is_dianzan == 1 ? 0 : 1;
-						} else {
-							this.$util.showToast({
-								title: res.message
-							});
+
+							item.label = data[i].goods_highlights.split(',');
+							this.dataList.push(item);
 						}
 					}
-				});
-			},
-			imageError(index) {
-				this.dataList[index].img = this.$util.getDefaultImage().goods;
-				this.$forceUpdate();
-			},
-			async handlerClick(item) {
-				await this.__$emitEvent({eventName: 'notes-tap', data: item, promiseCallback: (event, handler, awaitedResult) => {
+					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();
+		},
+		async handlerClick(item) {
+			await this.__$emitEvent({
+				eventName: 'notes-tap', data: item, promiseCallback: (event, handler, awaitedResult) => {
 					if (!awaitedResult) return;
 					this.toDetail(item.note_id);
-				}})
-			}
+				}
+			})
 		}
-	};
+	}
+};
 </script>
 
 <style lang="scss">
-	scroll-view ::-webkit-scrollbar {
-		width: 0;
-		height: 0;
-		background-color: transparent;
-		touch-action: none;
+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;
 	}
 
-	.diy-notes {
+	.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;
 	}
 
-	.diy-notes-top {
-		width: 100%;
+	.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;
-		align-items: center;
-		box-sizing: border-box;
+		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 {
-			width: 70%;
-			font-size: 28rpx;
+			font-size: 30rpx;
 			font-weight: 600;
+			line-height: 44rpx;
+			display: -webkit-box;
+			-webkit-box-orient: vertical;
+			-webkit-line-clamp: 2;
+			overflow: hidden;
 		}
 
-		.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 {
+		.notes-highlights-list {
+			text {
 				display: inline-block;
-				position: absolute;
-				left: 20rpx;
-				bottom: 20rpx;
-				max-width: calc(100vh - 40rpx);
-				background-color: #ffffff;
+				color: #ffffff;
+				font-size: 24rpx;
 				line-height: 36rpx;
-				padding: 0 10rpx 0 4rpx;
+				padding: 0 10rpx;
+				border-radius: 4rpx;
+				margin: 0 5rpx;
 			}
 		}
 
-		.notes-img-wrap-list {
+		.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;
-			flex-wrap: wrap;
-			height: auto;
+			align-items: center;
+			margin-top: 20rpx;
 
-			image {
-				width: calc((100% - 40rpx) / 3);
-				height: 210rpx;
-				margin-top: 20rpx;
+			.notes-num {
+				>text {
+					display: flex;
+					align-items: center;
+					font-size: $font-size-tag;
+					color: #969799;
 
-				&: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;
-						}
+					text.iconfont {
+						font-size: 26rpx;
+						margin-right: 6rpx;
 					}
 				}
 			}
 		}
 	}
+}
 </style>
\ No newline at end of file
diff --git a/components-diy/diy-notice.vue b/components-diy/diy-notice.vue
index 738f7d4..34c0e20 100644
--- a/components-diy/diy-notice.vue
+++ b/components-diy/diy-notice.vue
@@ -1,19 +1,25 @@
 <template>
 	<view data-component-name="diy-notice" 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>
+
+			<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>
+							<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>
+							<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>
@@ -22,7 +28,8 @@
 				<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 }">
+							<text class="beyond-hiding using-hidden"
+								:style="{ color: value.textColor, fontSize: value.fontSize * 2 + 'rpx', fontWeight: value.fontWeight }">
 								{{ item.title }}
 							</text>
 						</swiper-item>
@@ -46,255 +53,257 @@
 	</view>
 </template>
 <script>
-	// 公告
-	export default {
-		name: 'diy-notice',
-		props: {
-			value: {
-				type: Object
+// 公告展示
+import DiyMinx from './minx.js'
+export default {
+	name: 'diy-notice',
+	props: {
+		value: {
+			type: Object
+		}
+	},
+	mixins: [DiyMinx],
+	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;';
 			}
-		},
-		data() {
-			return {
-				list: [],
-				notice: '', // 当前点击的弹框内容
-				marqueeWrapWidth: 0, // 容器宽度
-				marqueeWidth: 0, // 公告内容累加宽度
-				marqueeStyle: '', // 横向滚动样式
-				marqueeAgainStyle: '', // 横向滚动复制样式
-				time: 0, // 滚动完成时间
-				delayTime: 1000 // 动画延迟时间
+			return obj;
+		}
+	},
+	methods: {
+		getData() {
+			var data = {
+				page_size: 0
 			};
-		},
-		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();
+				data.page_size = this.value.count;
 			}
-		},
-		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;
+
+			if (this.value.noticeIds.length) {
+				data.id_arr = this.value.noticeIds.toString();
+				data.page_size = 0;
 			}
-		},
-		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();
-						}
+			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);
+			});
+		},
+		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 = `
+										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 = `
+											this.marqueeAgainStyle = `
 												width: ${this.marqueeWidth}px;
 												left: ${this.marqueeWidth}px;
 												animation-duration: ${this.time}ms;
 												animation-delay: ${this.delayTime}ms;
 											`;
-											}
-										})
-										.exec();
-								})
-								.exec();
-						});
+										}
+									})
+									.exec();
+							})
+							.exec();
 					});
-				}
+				});
 			}
 		}
-	};
+	}
+};
 </script>
 
 <style lang="scss">
-	.notice {
+.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;
-		display: flex;
-		align-items: center;
-		overflow: hidden;
-		padding: 20rpx 0 20rpx 20rpx;
-		font-size: 70rpx;
-		box-sizing: border-box;
+		border-bottom: 2rpx solid $color-line;
+		margin-bottom: 20rpx;
 
-		.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 {
+		.iconfont {
+			position: absolute;
+			float: right;
+			right: 0;
 			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%;
+	.content-wrap {
+		max-height: 600rpx;
+		overflow-y: auto;
 	}
 
-	.marquee-wrap {
-		display: inline-block;
-		width: 100%;
-		height: 100%;
-		vertical-align: middle;
-		overflow: hidden;
-		box-sizing: border-box;
-		position: relative;
+	button {
+		margin-top: 40rpx;
 	}
+}
 
-	.marquee {
-		display: flex;
-		position: absolute;
-		white-space: nowrap;
-		animation: marquee 0s 0s linear infinite;
+.horizontal-wrap {
+	height: 30px;
+	line-height: 30px;
+	position: relative;
+	overflow: hidden;
+	width: 100%;
+}
 
-		text {
-			margin-left: 40rpx;
+.marquee-wrap {
+	display: inline-block;
+	width: 100%;
+	height: 100%;
+	vertical-align: middle;
+	overflow: hidden;
+	box-sizing: border-box;
+	position: relative;
+}
 
-			&:first-child {
-				margin-left: 0;
-			}
+.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%);
-		}
+@keyframes marquee {
+	0% {
+		transform: translateX(0);
 	}
+
+	100% {
+		transform: translateX(-100%);
+	}
+}
 </style>
\ No newline at end of file
diff --git a/components-diy/diy-payment-qrcode.vue b/components-diy/diy-payment-qrcode.vue
index 28f7662..5cd7cae 100644
--- a/components-diy/diy-payment-qrcode.vue
+++ b/components-diy/diy-payment-qrcode.vue
@@ -39,7 +39,8 @@
 </template>
 
 <script>
-// 付款码
+// 付款码展示
+import DiyMinx from './minx.js'
 export default {
 	name: 'diy-payment-qrcode',
 	props: {
@@ -47,10 +48,11 @@ export default {
 			type: Object
 		}
 	},
+	mixins: [DiyMinx],
 	data() {
 		return {};
 	},
-	created() {},
+	created() { },
 	computed: {
 		warpCss() {
 			var obj = '';
@@ -59,7 +61,7 @@ export default {
 	},
 	watch: {
 		// 组件刷新监听
-		componentRefresh: function(nval) {}
+		componentRefresh: function (nval) { }
 	},
 	methods: {
 		toLink() {
@@ -72,7 +74,7 @@ export default {
 			// #ifndef H5
 			// 允许从相机和相册扫码,h5端不起作用
 			uni.scanCode({
-				success: function(res) {
+				success: function (res) {
 					console.log('条码类型：' + res.scanType);
 					console.log('条码内容：' + res.result);
 				}
@@ -95,8 +97,10 @@ export default {
 	display: flex;
 	background-color: #fff;
 	border-radius: 16rpx;
+
 	.qrocde-left {
 		flex: 1;
+
 		.qrocde-desc {
 			margin-top: 20rpx;
 			margin-bottom: 26rpx;
@@ -105,16 +109,19 @@ export default {
 			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;
@@ -123,22 +130,27 @@ export default {
 				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;
@@ -149,15 +161,18 @@ export default {
 		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;
@@ -166,12 +181,13 @@ export default {
 			width: 500rpx;
 			height: 500rpx;
 			border-radius: 50%;
-			background-color:  $base-color;
+			background-color: $base-color;
 			transform: translateY(-50%);
 			z-index: -1;
 		}
 	}
 }
+
 .payment-popup {
 	padding: 0 30rpx 40rpx;
 	background-color: #fff;
@@ -185,6 +201,7 @@ export default {
 		position: relative;
 		border-bottom: 2rpx solid $color-line;
 		margin-bottom: 20rpx;
+
 		.iconfont {
 			position: absolute;
 			float: right;
@@ -192,10 +209,12 @@ export default {
 			font-size: $font-size-toolbar;
 		}
 	}
+
 	.content-wrap {
 		max-height: 600rpx;
 		overflow-y: auto;
 	}
+
 	button {
 		margin-top: 40rpx;
 	}
diff --git a/components-diy/diy-picture.vue b/components-diy/diy-picture.vue
index 20a80bc..1f86e63 100644
--- a/components-diy/diy-picture.vue
+++ b/components-diy/diy-picture.vue
@@ -1,11 +1,13 @@
 <template>
 	<view data-component-name="diy-picture" class="diy-picture" :style="style">
 		<view class="fui-picture">
-		    <view  v-for="(item,index) in value.list" style="line-height: 0;">
-		        <image mode="widthFix" style="width: 100%;height:auto" :src="$util.img(item.imageUrl)" v-if="item.link.wap_url" @click="handlerClick(item)" @tap="handlerClick(item)"></image>
-				<image mode="widthFix" style="width: 100%;height:auto" :src="$util.img(item.imageUrl)" v-else @click="handlerClick(item)" @tap="handlerClick(item)"></image>
-		    </view>
-		<!--   <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}}">
+			<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="handlerClick(item)" @tap="handlerClick(item)"></image>
+				<image mode="widthFix" style="width: 100%;height:auto" :src="$util.img(item.imageUrl)" v-else
+					@click="handlerClick(item)" @tap="handlerClick(item)"></image>
+			</view>
+			<!--   <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>
@@ -13,78 +15,78 @@
 </template>
 
 <script>
-	import DiyMinx from './minx.js'
-	export default {
-		name: 'diy-picture',
-		props: {
-			value: {
-				type: Object
-			}
-		},
-		data() {
-			return {
-				loading: true,
-			};
-		},
-		created() {
+import DiyMinx from './minx.js'
+export default {
+	name: 'diy-picture',
+	props: {
+		value: {
+			type: Object
+		}
+	},
+	data() {
+		return {
+			loading: true,
+		};
+	},
+	created() {
+		// this.getDataList();
+	},
+	watch: {
+		// 组件刷新监听
+		componentRefresh: function (nval) {
 			// this.getDataList();
-		},
-		watch: {
-			// 组件刷新监听
-			componentRefresh: function(nval) {
-				// this.getDataList();
+		}
+	},
+	mixins: [DiyMinx],
+	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
 		},
-		mixins: [DiyMinx],
-		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;';
+		redirectTo(link) {
+			if (link.wap_url) {
+				if (this.$util.getCurrRoute() == 'pages/member/index' && !this.storeToken) {
+					this.$refs.login.open(link.wap_url);
+					return;
 				}
-				return css;
 			}
+			this.$util.diyRedirectTo(link);
 		},
-		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);
-			},
 
-			async handlerClick(item) {
-				await this.__$emitEvent({eventName: 'picture-tap', data: item, promiseCallback: (event, handler, awaitedResult) => {
+		async handlerClick(item) {
+			await this.__$emitEvent({
+				eventName: 'picture-tap', data: item, promiseCallback: (event, handler, awaitedResult) => {
 					if (!awaitedResult) return;
 					if (item.link.wap_url) {
 						this.redirectTo(item.link);
 					} else {
 						this.previewImg(item.imageUrl);
 					}
-				}})
-			}
+				}
+			})
 		}
-	};
+	}
+};
 </script>
 
-<style lang="scss">
-
-</style>
\ No newline at end of file
+<style lang="scss"></style>
\ No newline at end of file
diff --git a/components-diy/diy-pinfan.vue b/components-diy/diy-pinfan.vue
index 19a0d3e..717fcb7 100644
--- a/components-diy/diy-pinfan.vue
+++ b/components-diy/diy-pinfan.vue
@@ -2,32 +2,45 @@
 	<x-skeleton data-component-name="diy-pinfan" :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="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 :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 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>
+							<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 : '' }">
+							<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>
+								<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 : '' }">
+							<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="{
@@ -37,7 +50,8 @@
 							}">
 								<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 == 1 || item.reward_type == 2">返￥{{
+									item.reward_type_num }}</text>
 								<text class="fan" v-if="item.reward_type == 3">返优惠券</text>
 							</button>
 						</view>
@@ -47,67 +61,101 @@
 
 			<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="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 :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 :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 : '' }">
+								<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">
+								<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">
+								<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>
+								<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>
+								<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">
+				<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 :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 :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 : '' }">
+									<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">
+									<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">
+									<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 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>
+									<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>
@@ -119,396 +167,264 @@
 </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();
-			}
+import DiyMinx from './minx.js'
+export default {
+	name: 'diy-pinfan',
+	props: {
+		value: {
+			type: Object
 		}
-	};
+	},
+	mixins: [DiyMinx],
+	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/.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;
-	}
+/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;
-	}
+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 {
+.diy-pinfan {
+	&.row1-of1 {
+		.item {
 			display: flex;
-			justify-content: space-around;
+			margin-bottom: 20rpx;
+			padding: 16rpx;
 
-			.scroll {
-				width: calc(100% - 40rpx);
-				padding: 20rpx;
-				line-height: 1;
-				white-space: nowrap;
-
-				.item.shadow {
-					margin-bottom: 8rpx;
-				}
+			&.shadow {
+				margin: 8rpx 8rpx 20rpx 8rpx;
 			}
 
-			.flex-between {
-				justify-content: space-between;
+			&:last-child {
+				margin-bottom: 0;
 			}
 
-			.item {
-				display: inline-block;
+			.img-wrap {
 				width: 200rpx;
-				overflow: hidden;
-				box-sizing: border-box;
+				height: 200rpx;
 
-				&:nth-child(3n+3) {
-					width: 198rpx;
-				}
-
-				&.shadow {
-					margin-top: 8rpx;
-				}
-
-				.img-wrap {
+				image {
 					width: 200rpx;
-					height: 200rpx;
-					position: relative;
-					overflow: hidden;
-					margin: 0 auto;
+				}
+			}
 
-					>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;
+						}
 					}
 				}
 
-				.content {
-					padding: 10rpx;
+				.price-wrap {
 					display: flex;
-					flex-direction: column;
-					justify-content: space-between;
+					align-items: flex-end;
 
-					&.multi-content {
-						height: 188rpx;
-						box-sizing: border-box;
+					>view:last-of-type {
+						flex: 1;
 					}
 
-					.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 {
+					.discount-price {
 						white-space: nowrap;
-						margin-top: 10rpx;
 						font-weight: bold;
-						line-height: 1;
 
 						.unit {
 							font-size: $font-size-tag;
-							height: 32rpx;
 							color: $base-color;
 						}
 
@@ -517,24 +433,158 @@
 							color: $base-color;
 						}
 					}
-				}
-			}
 
-			.swiper {
-				width: 100%;
-				white-space: nowrap;
-				padding: 20rpx;
-				box-sizing: border-box;
-
-				.swiper-item {
-					display: flex;
-					align-items: center;
+					.original-price {
+						font-size: $font-size-tag;
+						color: $color-tip;
+						text-decoration: line-through;
+						margin: 0 10rpx 4rpx 10rpx;
+					}
 				}
 
-				.item {
-					width: 200rpx;
+				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/diy-pintuan.vue b/components-diy/diy-pintuan.vue
index e4c193b..c094eac 100644
--- a/components-diy/diy-pintuan.vue
+++ b/components-diy/diy-pintuan.vue
@@ -1,23 +1,27 @@
 <template>
 	<x-skeleton data-component-name="diy-pintuan" :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' : '' }">
+			<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"/>
+				<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)"/>
+							<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"/>
+							<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 }">
@@ -25,18 +29,24 @@
 						<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')">
+				<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="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 :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 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' }]">
@@ -47,7 +57,8 @@
 								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 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"
@@ -59,15 +70,19 @@
 						<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' : '' }">
+									<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' : '' }">
+									<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 : '' }">
+								<view class="original-price  price-font" v-if="value.priceStyle.lineControl"
+									:style="{ color: value.theme == 'diy' ? value.priceStyle.lineColor : '' }">
 									¥{{ item.price }}
 								</view>
 							</view>
@@ -85,9 +100,12 @@
 
 			<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="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 :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 + ')' : ''
@@ -95,7 +113,8 @@
 								{{ item.pintuan_num }}人团
 							</view>
 						</view>
-						<view :class="['content', { 'multi-content': value.nameLineMode == 'multiple' }]" v-if="value.goodsNameStyle.control || value.priceStyle.mainControl">
+						<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"
@@ -104,22 +123,28 @@
 								{{ 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' : '' }">
+								<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' : '' }">
+								<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' : '' }">
+									<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' : '' }">
+									<text class="unit price-style small"
+										:style="{ color: value.theme == 'diy' ? value.priceStyle.mainColor + '!important' : '' }">
 										{{ '.' + item.pintuan_price.split('.')[1] }}
 									</text>
 								</view>
@@ -131,11 +156,16 @@
 					</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">
+				<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 :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 + ')' : ''
@@ -143,18 +173,22 @@
 									{{ item.pintuan_num }}人团
 								</view>
 							</view>
-							<view :class="['content', { 'multi-content': value.nameLineMode == 'multiple' }]" v-if="value.goodsNameStyle.control || value.priceStyle.mainControl">
+							<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' : '' }">
+									<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' : '' }">
+									<text class="unit price-style small"
+										:style="{ color: value.theme == 'diy' ? value.priceStyle.mainColor + '!important' : '' }">
 										{{ '.' + item.pintuan_price.split('.')[1] }}
 									</text>
 								</view>
@@ -169,520 +203,398 @@
 </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();
+import DiyMinx from './minx.js'
+export default {
+	name: 'diy-pintuan',
+	props: {
+		value: {
+			type: Object
+		}
+	},
+	mixins: [DiyMinx],
+	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();
-		},
-		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;
 		},
-		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';
-				}
+		// 商品项样式
+		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;
 		},
-		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%']
-					};
-
+		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';
 				}
-			},
-			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();
+				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';
 				}
-				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();
+				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/.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;
-	}
+/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;
-	}
+scroll-view ::-webkit-scrollbar {
+	width: 0;
+	height: 0;
+	background-color: transparent;
+	touch-action: none;
+}
 
-	.diy-pintuan {
-		overflow: hidden;
+.diy-pintuan {
+	overflow: hidden;
 
-		.pintuan-head {
-			padding: 0 24rpx;
+	.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;
-			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;
+			margin-left: 50rpx;
+			margin-right: auto;
+			color: #fff;
 
-			.left-img {
-				width: 174rpx;
-				height: 40rpx;
-			}
+			.img-warp {
+				position: relative;
+				margin-right: 8rpx;
+				line-height: 1;
 
-			.head-content {
-				display: flex;
-				align-items: center;
-				margin-left: 50rpx;
-				margin-right: auto;
-				color: #fff;
+				image {
+					width: 40rpx;
+					height: 40rpx;
+					border-radius: 50%;
+					border: 2rpx solid #ff3d3d;
+					margin-left: -14rpx;
+				}
 
-				.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%);
-					}
+				&: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;
-				font-size: $font-size-sub;
-				color: #fff;
-				line-height: 1;
+				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;
 			}
 
-			&.style-2 {
-				.head-right {
+			&: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;
-					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);
-					}
+					>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;
 
-					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 {
+						.iconfont {
+							display: inline-block;
+							width: 30rpx;
 							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;
+							color: #ffffff;
+							text-align: center;
+							margin-right: -6rpx;
+							background: $base-color;
 						}
 
-						.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;
+						text:last-child {
+							padding: 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;
+				.goods-name {
+					line-height: 1.3;
 				}
 
-				.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;
+				.bottom-wrap {
 					display: flex;
-					flex-direction: column;
+					align-items: center;
 					justify-content: space-between;
+				}
 
-					&.multi-content {
-						height: 142rpx;
-						box-sizing: border-box;
+				.price-wrap {
+					overflow: hidden;
+					width: 260rpx;
+					display: flex;
+					align-items: flex-end;
+					flex-wrap: wrap;
+
+					>view:last-of-type {
+						flex: 1;
 					}
 
-					.goods-name {
-						line-height: 1.3;
-						font-size: $font-size-base;
-
-						&.multi-hidden {
-							white-space: break-spaces;
-						}
-					}
-
-					.price-wrap {
-						line-height: 1;
+					.discount-price {
 						white-space: nowrap;
-						margin-top: 10rpx;
 						font-weight: bold;
+						line-height: 1;
 
 						.unit {
 							font-size: $font-size-tag;
-							height: 32rpx;
 							color: var(--price-color);
 						}
 
@@ -691,86 +603,210 @@
 							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;
+					.original-price {
+						font-size: $font-size-tag;
+						color: $color-tip;
 						line-height: 1;
+						text-decoration: line-through;
+						margin: 0 10rpx;
 					}
 				}
 
-				.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;
+				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;
-					text-align: center;
-					line-height: 44rpx;
-					transform: scale(0.9);
+					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/diy-presale.vue b/components-diy/diy-presale.vue
index 14263f0..d6f4a25 100644
--- a/components-diy/diy-presale.vue
+++ b/components-diy/diy-presale.vue
@@ -2,22 +2,29 @@
 	<x-skeleton data-component-name="diy-presale" :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="handlerClick(item)" @tap="handlerClick(item)" :class="[value.ornament.type]" :style="goodsItemCss">
+				<view class="item" v-for="(item, index) in list" :key="index" @click="handlerClick(item)"
+					@tap="handlerClick(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 :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 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' : '' }">
+							<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' : '' }">
+							<text class="unit price-style small"
+								:style="{ color: value.theme == 'diy' ? value.priceStyle.mainColor + '!important' : '' }">
 								{{ '.' + showPrice(item).split('.')[1] }}
 							</text>
 						</view>
@@ -33,22 +40,29 @@
 			</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="handlerClick(item)" @tap="handlerClick(item)" :class="[value.ornament.type]" :style="goodsItemCss">
+					<view class="item" v-for="(item, index) in list" :key="index" @click="handlerClick(item)"
+						@tap="handlerClick(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 :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 :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' : '' }">
+								<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' : '' }">
+								<text class="unit price-style small"
+									:style="{ color: value.theme == 'diy' ? value.priceStyle.mainColor + '!important' : '' }">
 									{{ '.' + showPrice(item).split('.')[1] }}
 								</text>
 							</view>
@@ -56,24 +70,34 @@
 					</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="handlerClick(item)" @tap="handlerClick(item)":class="[value.ornament.type]" :style="goodsItemCss">
+				<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="handlerClick(item)" @tap="handlerClick(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 :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 :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' : '' }">
+									<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' : '' }">
+									<text class="unit price-style small"
+										:style="{ color: value.theme == 'diy' ? value.priceStyle.mainColor + '!important' : '' }">
 										{{ '.' + showPrice(item).split('.')[1] }}
 									</text>
 								</view>
@@ -87,357 +111,359 @@
 </template>
 
 <script>
-	import DiyMinx from './minx.js'
-	export default {
-		name: 'diy-presale',
-		props: {
-			value: {
-				type: Object
-			}
-		},
-		data() {
-			return {
-				loading: true,
-				skeletonType:'',
-				skeletonConfig: {},
-				list: [],
-				page: 1
-			};
-		},
-		created() {
-			this.initSkeleton();
+import DiyMinx from './minx.js'
+export default {
+	name: 'diy-presale',
+	props: {
+		value: {
+			type: Object
+		}
+	},
+	data() {
+		return {
+			loading: true,
+			skeletonType: '',
+			skeletonConfig: {},
+			list: [],
+			page: 1
+		};
+	},
+	created() {
+		this.initSkeleton();
+		this.getData();
+	},
+	mixins: [DiyMinx],
+	watch: {
+		// 组件刷新监听
+		componentRefresh: function (nval) {
 			this.getData();
-		},
-		mixins: [DiyMinx],
-		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;
 		},
-		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';
+		// 商品项样式
+		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;
 		},
-		methods: {
-			initSkeleton() {
-				if (this.value.template == 'row1-of1') {
+		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
+				// 单列 风格
+				this.skeletonType = 'list';
+				this.skeletonConfig = {
+					textRows: 2
 				};
-				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]);
-									}
+			} 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.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;
-			},
-			async handlerClick(item) {
-				await this.__$emitEvent({eventName: 'presale-tap', data: item, promiseCallback: (event, handler, awaitedResult) => {
+					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;
+		},
+		async handlerClick(item) {
+			await this.__$emitEvent({
+				eventName: 'presale-tap', data: item, promiseCallback: (event, handler, awaitedResult) => {
 					if (!awaitedResult) return;
 					this.toDetail(item);
-				}})
-			}
+				}
+			})
 		}
-	};
+	}
+};
 </script>
 
 <style lang="scss">
-	/deep/.uni-scroll-view ::-webkit-scrollbar {
-		/* 隐藏滚动条，但依旧具备可以滚动的功能 */
-		display: none;
-		width: 0;
-		height: 0;
-		color: transparent;
-		background: transparent;
-	}
+/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;
-	}
+/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;
-	}
+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;
+.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;
-				}
+			&.shadow {
+				margin: 8rpx 8rpx 20rpx 8rpx;
 			}
 
-			.flex-between {
-				justify-content: space-between;
+			&:last-child {
+				margin-bottom: 0;
 			}
 
-			.item {
-				display: inline-block;
+			.img-wrap {
 				width: 200rpx;
-				overflow: hidden;
-				box-sizing: border-box;
+				height: 200rpx;
 
-				&:nth-child(3n + 3) {
-					width: 198rpx;
-				}
-
-				&.shadow {
-					margin-top: 8rpx;
-				}
-
-				.img-wrap {
+				>image {
 					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;
+			.content {
+				flex: 1;
+				margin-left: 20rpx;
+				position: relative;
+				padding: 6rpx 0;
 
-				.swiper-item {
-					display: flex;
-					align-items: center;
+				.goods-name {
+					line-height: 1.5;
 				}
 
-				.item {
-					width: 200rpx;
+				.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/diy-quick-nav.vue b/components-diy/diy-quick-nav.vue
index 7d6b458..401efb7 100644
--- a/components-diy/diy-quick-nav.vue
+++ b/components-diy/diy-quick-nav.vue
@@ -4,17 +4,15 @@
 			<!-- #ifdef MP -->
 			<view class="uni-scroll-view-content">
 				<!-- #endif -->
-				<view
-					class="quick-nav-item"
-					v-for="(item, index) in value.list"
-					:key="index"
-					@click="handlerClick(item)"
-					@tap="handlerClick(item)"
-					:style="{ background: 'linear-gradient(to right,' + item.bgColorStart ? item.bgColorStart : '' + ',' + item.bgColorEnd ? item.bgColorEnd : '' + ')' }"
-				>
+				<view class="quick-nav-item" v-for="(item, index) in value.list" :key="index"
+					@click="handlerClick(item)" @tap="handlerClick(item)"
+					: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>
+						<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>
@@ -28,59 +26,61 @@
 </template>
 
 <script>
-	import DiyMinx from './minx.js'
-	export default {
-		name: 'diy-quick-nav',
-		props: {
-			value: {
-				type: Object
+import DiyMinx from './minx.js'
+export default {
+	name: 'diy-quick-nav',
+	props: {
+		value: {
+			type: Object
+		}
+	},
+	data() {
+		return {};
+	},
+	created() { },
+	mixins: [DiyMinx],
+	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;';
 			}
-		},
-		data() {
-			return {};
-		},
-		created() {},
-		mixins: [DiyMinx],
-		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;
 				}
-				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;
 			}
+			this.$util.diyRedirectTo(link);
 		},
-		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);
-			},
-			async handlerClick(item) {
-				await this.__$emitEvent({eventName: 'quick-nav-tap', data: item, promiseCallback: (event, handler, awaitedResult) => {
+		async handlerClick(item) {
+			await this.__$emitEvent({
+				eventName: 'quick-nav-tap', data: item, promiseCallback: (event, handler, awaitedResult) => {
 					if (!awaitedResult) return;
 					this.redirectTo(item.link);
-				}})
-			}
+				}
+			})
 		}
-	};
+	}
+};
 </script>
 <style>
-.quick-nav >>> .uni-scroll-view-content {
+.quick-nav>>>.uni-scroll-view-content {
 	display: flex;
 }
 </style>
@@ -95,9 +95,11 @@
 		border-radius: 40rpx;
 		margin-right: 20rpx;
 		height: 48rpx;
-		&:first-of-type{
+
+		&:first-of-type {
 			padding-left: 12rpx;
 		}
+
 		&:last-child {
 			margin-right: 0;
 		}
@@ -106,6 +108,7 @@
 			margin-right: 6rpx;
 			height: 30rpx;
 			line-height: 1;
+
 			image {
 				width: 30rpx;
 				height: 30rpx;
diff --git a/components-diy/diy-rich-text.vue b/components-diy/diy-rich-text.vue
index acd048f..05847d2 100644
--- a/components-diy/diy-rich-text.vue
+++ b/components-diy/diy-rich-text.vue
@@ -26,10 +26,10 @@ export default {
 	mixins: [DiyMinx],
 	watch: {
 		// 组件刷新监听
-		componentRefresh: function(nval) {}
+		componentRefresh: function (nval) { }
 	},
 	computed: {
-		richTextWarpCss: function() {
+		richTextWarpCss: function () {
 			var obj = '';
 			obj += 'background-color:' + this.value.componentBgColor + ';';
 			if (this.value.componentAngle == 'round') {
@@ -41,12 +41,14 @@ export default {
 			return obj;
 		}
 	},
-	mounted() {},
+	mounted() { },
 	methods: {
 		async handlerClick(item) {
-			await this.__$emitEvent({eventName: 'rich-text-tap', data: item, promiseCallback: (event, handler, awaitedResult) => {
-				if (!awaitedResult) return;
-			}})
+			await this.__$emitEvent({
+				eventName: 'rich-text-tap', data: item, promiseCallback: (event, handler, awaitedResult) => {
+					if (!awaitedResult) return;
+				}
+			})
 		}
 	}
 };
diff --git a/components-diy/diy-rubik-cube.vue b/components-diy/diy-rubik-cube.vue
index e737c89..d69f916 100644
--- a/components-diy/diy-rubik-cube.vue
+++ b/components-diy/diy-rubik-cube.vue
@@ -8,16 +8,22 @@
 			<!-- 1左2右 -->
 			<template v-if="value.mode == 'row1-lt-of2-rt'">
 				<view class="template-left">
-					<view :class="['item', value.mode]" @click="handlerClick(value.list[0].link)" @tap="handlerClick(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 :class="['item', value.mode]" @click="handlerClick(value.list[0].link)"
+						@tap="handlerClick(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="handlerClick(item.link)" @tap="handlerClick(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 :key="index" :class="['item', value.mode]" @click="handlerClick(item.link)"
+								@tap="handlerClick(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>
@@ -27,25 +33,32 @@
 			<!-- 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="handlerClick(value.list[0].link)" @tap="handlerClick(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 :class="['item', value.mode]"
+						:style="{ marginRight: value.imageGap * 2 + 'rpx', width: list[0].imgWidth, height: list[0].imgHeight + 'px' }"
+						@click="handlerClick(value.list[0].link)" @tap="handlerClick(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="handlerClick(value.list[1].link)" @tap="handlerClick(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 :class="['item', value.mode]"
+						:style="{ marginBottom: value.imageGap * 2 + 'rpx', width: list[1].imgWidth, height: list[1].imgHeight + 'px' }"
+						@click="handlerClick(value.list[1].link)" @tap="handlerClick(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="handlerClick(item.link)" @tap="handlerClick(item.link)"
-									:style="{
+								<view :key="index" :class="['item', value.mode]" @click="handlerClick(item.link)"
+									@tap="handlerClick(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"/>
+									<image :src="$util.img(item.imageUrl)" :mode="item.imageMode || 'scaleToFill'"
+										:style="item.pageItemStyle" :show-menu-by-longpress="true" />
 								</view>
 							</template>
 						</template>
@@ -57,7 +70,8 @@
 				<view :class="['item', value.mode]" v-for="(item, index) in list" :key="index"
 					@click="handlerClick(item.link)" @tap="handlerClick(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"/>
+					<image :src="$util.img(item.imageUrl)" :mode="item.imageMode || 'scaleToFill'"
+						:style="item.pageItemStyle" :show-menu-by-longpress="true" />
 				</view>
 			</template>
 		</view>
@@ -65,459 +79,461 @@
 </template>
 
 <script>
-	// 魔方、橱窗
-	import htmlParser from '@/common/js/html-parser';
-	import DiyMinx from './minx.js'
-	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();
-				}
-			}
-		},
-		mixins: [DiyMinx],
-		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;
-			},
-
-			async handlerClick(link) {
-				await this.__$emitEvent({eventName: 'rubik-cube-tap', data: link, promiseCallback: (event, handler, awaitedResult) => {
-					if (!awaitedResult) return;
-					this.$util.diyRedirectTo(link);
-				}})
+// 魔方、橱窗
+import htmlParser from '@/common/js/html-parser';
+import DiyMinx from './minx.js'
+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();
+			}
+		}
+	},
+	mixins: [DiyMinx],
+	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;
+		},
+
+		async handlerClick(link) {
+			await this.__$emitEvent({
+				eventName: 'rubik-cube-tap', data: link, promiseCallback: (event, handler, awaitedResult) => {
+					if (!awaitedResult) return;
+					this.$util.diyRedirectTo(link);
+				}
+			})
+		}
+	}
+};
 </script>
 <style lang="scss">
-	.rubik-cube {
-		overflow: hidden;
-		display: flex;
-		flex-wrap: wrap;
-		justify-content: space-between;
-	}
+.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 {
+	text-align: center;
+	line-height: 0;
+	overflow: hidden;
+}
 
-	.rubik-cube .item image {
-		width: 100%;
-		max-width: 100%;
-		height: 100%;
-	}
+.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 {
+	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(1) {
+	margin-left: 0 !important;
+}
 
-	.rubik-cube .item.row1-of2:nth-child(2) {
-		margin-right: 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 {
+	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(1) {
+	margin-left: 0 !important;
+}
 
-	.rubik-cube .item.row1-of3:nth-child(3) {
-		margin-right: 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 {
+	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(1) {
+	margin-left: 0 !important;
+}
 
-	.rubik-cube .item.row1-of4:nth-child(4) {
-		margin-right: 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 {
+	// 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(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(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(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 .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,
+.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-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 .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.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(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(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 .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-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 {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+}
 
-	.rubik-cube .template-bottom .item:nth-child(2) {
-		margin-right: 0 !important;
-	}
+.rubik-cube .template-bottom .item:nth-child(2) {
+	margin-right: 0 !important;
+}
 </style>
\ No newline at end of file
diff --git a/components-diy/diy-search.vue b/components-diy/diy-search.vue
index 463798a..a74830b 100644
--- a/components-diy/diy-search.vue
+++ b/components-diy/diy-search.vue
@@ -1,351 +1,370 @@
 <template>
 	<view data-component-name="diy-search" class="diy-search">
 		<view class="diy-search-wrap" :class="value.positionWay" :style="fixedCss">
-			<view :class="['search-box','search-box-'+value.searchStyle]" :style="searchWrapCss" @click="handlerSearchClick" @tap="handlerSearchClick">
-				<block v-if="[1,2].includes(value.searchStyle)">
+			<view :class="['search-box', 'search-box-' + value.searchStyle]" :style="searchWrapCss"
+				@click="handlerSearchClick" @tap="handlerSearchClick">
+				<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"/>
+						<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="handlerSearchClick" disabled="true" :placeholderStyle="placeholderStyle" />
-						<text class="iconfont icon-sousuo3" @click.stop="handlerSearchClick" @tap="handlerSearchClick" :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="handlerSearchClick" disabled="true"
+							:placeholderStyle="placeholderStyle" />
+						<text class="iconfont icon-sousuo3" @click.stop="handlerSearchClick" @tap="handlerSearchClick"
+							: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="handlerSearchClick" @tap="handlerSearchClick">
-						<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="handlerSearchClick"  disabled="true" @click.stop="handlerSearchClick" @tap="handlerSearchClick" :placeholderStyle="placeholderStyle" />
-						<text class="search-content-btn" @click.stop="handlerSearchClick" @tap="handlerSearchClick" :style="{ 'backgroundColor': value.pageBgColor ? value.pageBgColor : 'rgba(0,0,0,0)' }">搜索</text>
+					<view class="search-content" :style="inputStyle" @click.stop="handlerSearchClick"
+						@tap="handlerSearchClick">
+						<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="handlerSearchClick" disabled="true"
+							@click.stop="handlerSearchClick" @tap="handlerSearchClick"
+							:placeholderStyle="placeholderStyle" />
+						<text class="search-content-btn" @click.stop="handlerSearchClick" @tap="handlerSearchClick"
+							:style="{ 'backgroundColor': value.pageBgColor ? value.pageBgColor : 'rgba(0,0,0,0)' }">搜索</text>
 					</view>
-					<view class="img" v-if="value.iconType == 'img'" @click.stop="handlerRedirectToClick(value.searchLink)" @tap="handlerRedirectToClick(value.searchLink)"><image :src="$util.img(value.imageUrl)" mode="heightFix"/>
+					<view class="img" v-if="value.iconType == 'img'"
+						@click.stop="handlerRedirectToClick(value.searchLink)"
+						@tap="handlerRedirectToClick(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="handlerRedirectToClick(value.searchLink)" @tap="handlerRedirectToClick(value.searchLink)"></diy-icon>
+						@click.stop="handlerRedirectToClick(value.searchLink)"
+						@tap="handlerRedirectToClick(value.searchLink)"></diy-icon>
 				</block>
 			</view>
 		</view>
 		<!-- 解决fixed定位后导航栏塌陷的问题 -->
-		<view v-if="value.positionWay == 'fixed'" class="u-navbar-placeholder" :style="{ width: '100%', paddingTop: moduleHeight }"></view>
+		<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
+// 获取系统状态栏的高度
+let systemInfo = uni.getSystemInfoSync();
+let menuButtonInfo = {};
+// 如果是小程序，获取右上角胶囊的尺寸信息，避免导航栏右侧内容与胶囊重叠(支付宝小程序非本API，尚未兼容)
+// #ifdef MP-WEIXIN || MP-BAIDU || MP-TOUTIAO || MP-QQ
+menuButtonInfo = uni.getMenuButtonBoundingClientRect();
+// #endif
 
-	import DiyMinx from './minx.js'
+import DiyMinx from './minx.js'
 
-	// 搜索
-	export default {
-		name: 'diy-search',
-		props: {
-			value: {
-				type: Object,
-				default: () => {
-					return {};
-				}
-			},
-			topNavColor: String,
-			global: {
-				type: Object,
-				default: () => {
-					return {};
-				}
-			},
-			haveTopCategory: {
-				type: Boolean
-			},
-			followOfficialAccount: {
-				type: Object
-			},
+// 搜索
+export default {
+	name: 'diy-search',
+	props: {
+		value: {
+			type: Object,
+			default: () => {
+				return {};
+			}
 		},
-		data() {
-			return {
-				searchText: '',
-				menuButtonInfo: menuButtonInfo,
-				height: 0,
-				placeholderHeight: 0,
-				moduleHeight: 0
-			};
+		topNavColor: String,
+		global: {
+			type: Object,
+			default: () => {
+				return {};
+			}
 		},
-		mixins: [DiyMinx],
-		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;';
+		haveTopCategory: {
+			type: Boolean
+		},
+		followOfficialAccount: {
+			type: Object
+		},
+	},
+	data() {
+		return {
+			searchText: '',
+			menuButtonInfo: menuButtonInfo,
+			height: 0,
+			placeholderHeight: 0,
+			moduleHeight: 0
+		};
+	},
+	mixins: [DiyMinx],
+	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;
+			}
+			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 {
-					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;
+			} else if (diyPositionObj.diySearch && diyPositionObj.nsNavbar) {
+				data = diyPositionObj.nsNavbar.originalVal;
 			}
-		},
-		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.setModuleLocationFn();
-		},
-		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;
+			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;
 					}
-				}
-				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增加搜索组件定位位置
-			setModuleLocationFn() {
-				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();
 				})
-			},
-			async handlerRedirectToClick(link) {
-				await this.__$emitEvent({eventName: 'search-tap', data: link, promiseCallback: (event, handler, awaitedResult) => {
+				.exec();
+		});
+		if (this.value.positionWay == 'fixed') this.navbarPlaceholderHeight();
+	},
+	mounted() {
+		if (this.value.positionWay == 'fixed')
+			this.setModuleLocationFn();
+	},
+	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增加搜索组件定位位置
+		setModuleLocationFn() {
+			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();
+			})
+		},
+		async handlerRedirectToClick(link) {
+			await this.__$emitEvent({
+				eventName: 'search-tap', data: link, promiseCallback: (event, handler, awaitedResult) => {
 					if (!awaitedResult) return;
 					this.redirectTo(link);
-				}})
-			},
-			async handlerSearchClick(item) {
-				await this.__$emitEvent({eventName: 'search-tap', data: item, promiseCallback: (event, handler, awaitedResult) => {
+				}
+			})
+		},
+		async handlerSearchClick(item) {
+			await this.__$emitEvent({
+				eventName: 'search-tap', data: item, promiseCallback: (event, handler, awaitedResult) => {
 					if (!awaitedResult) return;
 					this.search();
-				}})
-			}
+				}
+			})
 		}
-	};
+	}
+};
 </script>
 
 <style lang="scss">
-	/deep/ .uni-input-placeholder {
-		overflow: initial;
+/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%;
+		}
 	}
 
-	.diy-search-wrap {
-		overflow: hidden;
+	.icon {
+		width: 170rpx;
+		height: 60rpx;
+		margin-right: 20rpx;
 	}
+}
 
-	.fixed {
-		position: fixed;
-		left: 0;
-		right: 0;
-		top: 0;
-		z-index: 991;
-		transition: background 0.3s;
-	}
-
-	.search-box {
-		position: relative;
+.search-box-3 {
+	.search-content {
 		display: flex;
 		align-items: center;
+		height: 68rpx;
 
-		.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;
+		.iconfont {
+			position: initial;
+			transform: translateY(0);
 			width: auto;
-			font-size: 74rpx;
+			margin-left: 26rpx;
+			margin-right: 12rpx;
+			font-size: $font-size-base;
+			line-height: 1;
 		}
 
-		.img {
-			margin-left: 20rpx;
-			margin-right: 0;
+		.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;
 		}
 	}
 
-	.search-content {
-		flex: 1;
+	.diy-icon {
+		margin-left: 20rpx;
+		margin-right: 0;
+		width: auto;
+		font-size: 74rpx;
 	}
 
-	.search-content input {
-		box-sizing: border-box;
-		display: block;
-		height: 64rpx;
-		width: 100%;
-		padding: 0 20rpx 0 40rpx;
-		color: #333333;
-		background: none;
+	.img {
+		margin-left: 20rpx;
+		margin-right: 0;
 	}
+}
 
-	.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;
-	}
+.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/diy-seckill.vue b/components-diy/diy-seckill.vue
index 22da80c..1c357ad 100644
--- a/components-diy/diy-seckill.vue
+++ b/components-diy/diy-seckill.vue
@@ -1,25 +1,33 @@
 <template>
 	<x-skeleton data-component-name="diy-seckill" :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' : '' }">
+		<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>
+				<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 :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">
+				<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>
@@ -27,9 +35,12 @@
 
 			<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="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)"/>
+							<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"
@@ -38,35 +49,47 @@
 								{{ 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="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"/>
+										<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 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 : '' }">
+										<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 : '' }">
+										<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 : '' }">
+									<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>
+										<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="{
@@ -82,9 +105,12 @@
 				</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="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)"/>
+							<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"
@@ -93,16 +119,20 @@
 								{{ 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 : '' }">
+								<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 : '' }">
+								<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 : '' }">
+								<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="{
@@ -118,10 +148,14 @@
 				</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">
+					<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)"/>
+								<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"
@@ -130,44 +164,62 @@
 									{{ 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 : '' }">
+									<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 : '' }">
+									<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 : '' }">
+								<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">
+					<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)"/>
+									<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="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 : '' }">
+										<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 : '' }">
+										<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 : '' }">
+									<view class="original-price price-font" v-if="value.priceStyle.lineControl"
+										:style="{ color: value.theme == 'diy' ? value.priceStyle.lineColor : '' }">
 										¥{{ item.price }}
 									</view>
 								</view>
@@ -181,622 +233,780 @@
 </template>
 
 <script>
-	// 秒杀
-	export default {
-		name: 'diy-seckill',
-		props: {
-			value: {
-				type: Object
+// 秒杀倒计时
+import DiyMinx from './minx.js'
+export default {
+	name: 'diy-seckill',
+	props: {
+		value: {
+			type: Object
+		}
+	},
+	mixins: [DiyMinx],
+	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();
 			}
 		},
-		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
-			};
+		// 组件刷新监听
+		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;
 		},
-		created() {
-			this.initSkeleton();
-			this.getHeadData();
+		// 头部时间样式
+		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;
 		},
-		watch: {
-			diySeckillInterval(val, old) {
-				if (val == 0) {
-					clearInterval(this.seckillInterval);
-				} else if (val == 1) {
+		// 商品项样式
+		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();
 				}
-			},
-			// 组件刷新监听
-			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';
+		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;
 			}
-		},
-		methods: {
-			initSkeleton() {
-				if (this.value.template == 'row1-of1') {
 
-					// 单列 风格
-					this.skeletonType = 'list';
-					this.skeletonConfig = {
-						textRows: 3
-					};
+			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;
 
-				} 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();
-					}
+					this.seckillId = v.id;
+					this.index = k;
+					v.isNow = true;
+					throw new Error('end');
 				});
-			},
-			setHeadTime() {
-				if (this.headData == null) return;
-				clearInterval(this.seckillInterval);
-				this.seckillId = 0;
-				this.isFuture = false;
-				this.isLoad = false;
-				this.seckillH = '';
-				this.seckillI = '';
-				this.seckillS = '';
+			} catch (e) {
+				if (e.message != 'end') throw e;
+			}
 
-				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 (!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 (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;
-					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;
+					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();
 					}
-				});
-			},
-			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');
+				}, 1000);
+			}
+			this.timeList = tempArr;
+			this.isLoad = true;
+			if (this.seckillId) {
+				this.getDataList(this.seckillId);
+			} else {
+				this.loading = false;
 			}
 		},
-		onPageHide() {
-			clearInterval(this.seckillInterval);
+		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;
-	}
+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/.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;
-	}
+/deep/::-webkit-scrollbar {
+	display: none;
+	width: 0;
+	height: 0;
+	color: transparent;
+	background: transparent;
+}
 
-	.diy-seckill {
-		overflow: hidden;
+.diy-seckill {
+	overflow: hidden;
 
-		.title-wrap.style-1 {
+	.title-wrap.style-1 {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		padding: 20rpx;
+
+		.time {
 			display: flex;
-			justify-content: space-between;
 			align-items: center;
-			padding: 20rpx;
+			line-height: 1;
+			margin-right: auto;
+			margin-left: 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;
-				}
+			.seckill-title-name {
+				margin-right: 10rpx;
+				font-size: $font-size-tag;
 			}
 
-			.marketimg-box-title-right {
+			.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;
 			}
 		}
 
-		.title-wrap.style-2 {
+		.marketimg-box-title-right {
 			display: flex;
-			justify-content: space-between;
 			align-items: center;
-			padding: 20rpx;
+		}
+	}
 
-			.seckill-style-name {
-				margin-left: 12rpx;
-				margin-right: -12rpx;
-				font-size: 24rpx;
-			}
+	.title-wrap.style-2 {
+		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;
-				border-radius: 30rpx;
-				padding: 0 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;
-				background-image: radial-gradient(transparent 50%, #fff);
+				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;
 
-				.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;
+				&::after {
+					content: '';
+					position: absolute;
+					left: -10rpx;
+					height: 24rpx;
+					width: 2rpx;
+					background-color: #fff;
 				}
 			}
 
-			.marketimg-box-title-right {
+			.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;
 			}
 		}
 
-		.title-wrap.style-3 {
+		.marketimg-box-title-right {
 			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;
+	.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;
 			}
 
-			.time {
+			.number {
 				display: flex;
 				align-items: center;
-				line-height: 1;
-				margin-right: auto;
-				margin-left: 20rpx;
+				justify-content: center;
+				padding: 4rpx;
+				min-width: 38rpx;
+				height: 36rpx;
+				box-sizing: border-box;
+				font-size: $font-size-tag;
+				border-radius: 6rpx;
+			}
 
-				.seckill-title-name {
-					position: relative;
-					margin-right: 10rpx;
-					font-size: $font-size-tag;
+			.symbol {
+				margin: 0 6rpx;
+			}
+		}
 
-					&::after {
-						content: '';
-						position: absolute;
-						left: -10rpx;
-						height: 24rpx;
-						width: 2rpx;
-						background-color: #fff;
+		.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;
 					}
 				}
 
-				.number {
+				.progress {
 					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;
+
+					.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;
+					}
 				}
 
-				.symbol {
-					margin: 0 6rpx;
-				}
-			}
+				.bottom-wrap {
+					display: flex;
+					justify-content: space-between;
+					align-items: center;
 
-			.marketimg-box-title-right {
-				display: flex;
-				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;
+					}
+				}
 			}
 		}
 
-		.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;
+		&.style-1 {
+			.progress .bg {
+				overflow: hidden;
 			}
 		}
 
-		&.row1-of1 {
+		&.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;
-				padding: 20rpx;
+				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 {
-					margin: 8rpx 8rpx 20rpx 8rpx;
-				}
+					width: calc(50% - 18rpx);
+					margin-top: 20rpx;
 
-				&:last-child {
-					margin-bottom: 0;
+					&:nth-of-type(1),
+					&:nth-of-type(2) {
+						margin-top: 8rpx;
+					}
+
+					&:nth-child(2n-1) {
+						margin-left: 8rpx;
+					}
 				}
 
 				.img-wrap {
-					width: 200rpx;
-					height: 200rpx;
-
 					image {
-						width: 200rpx;
+						width: 100%;
 					}
 				}
 
 				.content {
 					display: flex;
-					justify-content: space-between;
 					flex-direction: column;
 					flex: 1;
-					margin: 10rpx 0 10rpx 20rpx;
+					padding: 10rpx 20rpx;
+					position: relative;
 
 					.goods-name {
-						&.multi-hidden {
-							line-height: 1.3;
-						}
+						font-size: $font-size-sub;
+						line-height: 1.5;
+						margin-bottom: 10rpx;
 					}
 
-					.progress {
-						display: flex;
-						align-items: center;
+					.discount-price {
+						margin-top: auto;
+						line-height: 1;
+						white-space: nowrap;
+						font-weight: bold;
 
-						.bg {
-							width: 240rpx;
-							height: 20rpx;
-							border-radius: 20rpx;
-							margin-right: 20rpx;
-							background-color: #fcecd7;
-
-							.curr {
-								height: 20rpx;
-								border-radius: 20rpx;
-								background-color: #fdbe6c;
-							}
+						.unit {
+							display: inline-block;
+							font-size: $font-size-tag;
+							color: var(--price-color);
 						}
 
-						.num {
-							font-size: $font-size-tag;
-							color: $color-tip;
+						.price {
+							font-size: $font-size-toolbar;
+							color: var(--price-color);
 						}
 					}
 
 					.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);
-							}
-						}
+						align-items: flex-end;
 
 						.original-price {
-							margin-top: 4rpx;
-							font-size: $font-size-tag;
+							font-size: $font-size-goods-tag;
 							text-decoration: line-through;
-							line-height: 1;
 							color: $color-tip;
 						}
 
 						button {
 							min-width: 112rpx;
+							width: auto;
 							height: 52rpx;
 							line-height: 52rpx;
 							background-color: $base-color;
@@ -809,375 +1019,219 @@
 					}
 				}
 			}
-
-			&.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;
+	&.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;
 				}
 
-				.item {
+				&.shadow {
+					margin-top: 8rpx;
+				}
+
+				.img-wrap {
+					width: 200rpx;
+					height: 200rpx;
+					position: relative;
 					overflow: hidden;
-					width: calc(50% - 10rpx);
+					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;
-					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;
+		&.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;
 				}
 
-				.flex-between {
-					justify-content: space-between;
+				&.shadow {
+					margin-top: 8rpx;
 				}
 
-				.item {
-					display: inline-block;
+				.img-wrap {
 					width: 200rpx;
+					height: 200rpx;
+					position: relative;
 					overflow: hidden;
-					box-sizing: border-box;
+					margin: 0 auto;
 
-					&:nth-child(3n + 3) {
-						width: 198rpx;
-					}
-
-					&.shadow {
-						margin-top: 8rpx;
-					}
-
-					.img-wrap {
+					>image {
 						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;
+				.content {
+					padding: 10rpx 30rpx;
+					display: flex;
+					flex-direction: column;
+					justify-content: space-between;
+					text-align: center;
 
-					.swiper-item {
-						display: flex;
-						align-items: baseline;
+					.goods-name {
+						line-height: 1.3;
+
+						&.multi-hidden {
+							white-space: break-spaces;
+						}
 					}
 
-					.item {
-						width: 200rpx;
-						box-sizing: border-box;
+					.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;
 					}
 				}
 			}
 
-			&.style-2 {
-				.scroll {
-					width: calc(100% - 40rpx);
-					padding: 0 20rpx 20rpx;
-					line-height: 1;
-					white-space: nowrap;
-				}
+			.swiper {
+				width: 100%;
+				white-space: nowrap;
+				padding: 0 20rpx 20rpx;
+				box-sizing: border-box;
 
-				.flex-between {
-					justify-content: space-between;
+				.swiper-item {
+					display: flex;
+					align-items: baseline;
 				}
 
 				.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/diy-store-label.vue b/components-diy/diy-store-label.vue
index a9b8f47..df15f82 100644
--- a/components-diy/diy-store-label.vue
+++ b/components-diy/diy-store-label.vue
@@ -2,18 +2,26 @@
 	<x-skeleton data-component-name="diy-store-label" type="banner" :loading="loading" :configs="skeletonConfig">
 		<view class="diy-store-label">
 			<block v-if="businessConfig.store_business == 'store'">
-				<scroll-view scroll-x="true" :class="[value.contentStyle, { between: list.length == 3 }]" :style="storeLabelWrapCss" :enable-flex="true">
+				<scroll-view scroll-x="true" :class="[value.contentStyle, { between: list.length == 3 }]"
+					:style="storeLabelWrapCss" :enable-flex="true">
 					<view v-for="(item, index) in storeLabel" :key="index" :class="['item']">
-						<diy-icon v-if="value.icon" class="icon-box" :icon="value.icon" :value="value.style ? value.style : 'null'"></diy-icon>
-						<text class="label-name" :style="{ color: value.textColor, fontSize: value.fontSize * 2 + 'rpx', fontWeight: value.fontWeight }">{{ item }}</text>
+						<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">
+				<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>
+						<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>
@@ -21,150 +29,152 @@
 	</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])
-								}
-							}
-						}
-					}
-				});
-			},
+// 门店标签
+import DiyMinx from './minx.js'
+export default {
+	name: 'diy-store-label',
+	props: {
+		value: {
+			type: Object
 		}
-	};
+	},
+	mixins: [DiyMinx],
+	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 {
+.diy-store-label {
+	.style-1 {
+		display: flex;
+		align-items: baseline;
+
+		/deep/ .uni-scroll-view-content {
 			display: flex;
-			align-items: baseline;
+			align-items: center;
+		}
 
-			/deep/ .uni-scroll-view-content {
-				display: flex;
-				align-items: center;
-			}
+		&.between {
+			justify-content: space-between;
 
-			&.between {
+			/deep/.uni-scroll-view-content {
 				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;
 			}
 
-			.item {
-				flex-shrink: 0;
-				display: flex;
-				align-items: center;
-				padding-right: 20rpx;
+			.label-name {
+				line-height: 40rpx;
+			}
 
-				.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;
-				}
+			&:last-of-type {
+				padding-right: 0;
 			}
 		}
 	}
+}
 </style>
\ No newline at end of file
diff --git a/components-diy/diy-store.vue b/components-diy/diy-store.vue
index 0339c59..3b80596 100644
--- a/components-diy/diy-store.vue
+++ b/components-diy/diy-store.vue
@@ -15,12 +15,14 @@
 					</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-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.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>
@@ -30,7 +32,8 @@
 			<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.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 }">
@@ -44,7 +47,8 @@
 						<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 class="store-icon" @click.stop="search()"><text class="iconfont icon-sousuo3"
+						:style="{ color: value.textColor }"></text></view>
 			</view>
 		</block>
 
@@ -59,7 +63,8 @@
 					<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()" />
+					<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>
@@ -70,6 +75,7 @@
 <script>
 // 门店展示
 import Map from '@/common/js/map/openMap.js';
+import DiyMinx from './minx.js'
 export default {
 	name: 'diy-store',
 	props: {
@@ -77,15 +83,16 @@ export default {
 			type: Object
 		}
 	},
+	mixins: [DiyMinx],
 	data() {
 		return {};
 	},
 	computed: {},
 	watch: {
 		// 组件刷新监听
-		componentRefresh: function(nval) {}
+		componentRefresh: function (nval) { }
 	},
-	created() {},
+	created() { },
 	methods: {
 		//跳转至门店列表
 		toStoreList() {
@@ -117,6 +124,7 @@ export default {
 		justify-content: space-between;
 		align-items: center;
 	}
+
 	.store-info {
 		height: 100rpx;
 		display: flex;
@@ -151,6 +159,7 @@ export default {
 				font-size: $font-size-goods-tag;
 			}
 		}
+
 		.address-wrap {
 			line-height: 1.2;
 			font-size: $font-size-goods-tag;
@@ -193,17 +202,21 @@ export default {
 		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;
@@ -211,10 +224,12 @@ export default {
 		flex-direction: inherit;
 		align-items: center;
 	}
+
 	.info-box {
 		margin-left: 18rpx;
 		margin-bottom: 0 !important;
 	}
+
 	.store-icon text {
 		font-size: 36rpx;
 		color: #fff;
@@ -228,6 +243,7 @@ export default {
 		display: flex;
 		align-items: center;
 		line-height: 1;
+
 		.icon-weizhi {
 			margin-right: 6rpx;
 			font-size: 28rpx;
diff --git a/components-diy/diy-text.vue b/components-diy/diy-text.vue
index ae4dd26..313822d 100644
--- a/components-diy/diy-text.vue
+++ b/components-diy/diy-text.vue
@@ -1,17 +1,21 @@
 <template>
-	<view data-component-name="diy-text" class="diy-text" @click="handlerClick(value.link)" @tap="handlerClick(value.link)" :style="warpCss">
-		<view :class="value.style == 'style-8' ? 'title2' : 'title'" :style="{ fontSize: value.fontSize * 2 + 'rpx', color: value.textColor }">
+	<view data-component-name="diy-text" class="diy-text" @click="handlerClick(value.link)"
+		@tap="handlerClick(value.link)" :style="warpCss">
+		<view :class="value.style == 'style-8' ? 'title2' : 'title'"
+			:style="{ fontSize: value.fontSize * 2 + 'rpx', color: value.textColor }">
 			<block v-if="value.style == 'style-0'" style="height: 40rpx; line-height: 40rpx;">
-				<text :style="{ fontWeight: value.fontWeight}">{{ value.text }}</text>
+				<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>
+				<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>
+					<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>
@@ -19,13 +23,19 @@
 			</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>
+					<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>
+					<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>
@@ -36,7 +46,9 @@
 			<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>
+						<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>
@@ -45,7 +57,9 @@
 			<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>
+						<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>
@@ -53,7 +67,9 @@
 			<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>
+						<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>
@@ -61,8 +77,11 @@
 			<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>
+						<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>
@@ -70,17 +89,24 @@
 				<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 }">
+							<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="handlerClick(value.more.link)" @tap="handlerClick(value.more.link)">
+							<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="handlerClick(value.more.link)" @tap="handlerClick(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>
+						<text class="sub-title" :style="{ color: value.subTitle.color }">{{ value.subTitle.text
+							}}</text>
 					</view>
 				</view>
 			</block>
@@ -88,29 +114,31 @@
 				<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
-								}"
-							>
+							<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="handlerClick(value.more.link)" @tap="handlerClick(value.more.link)">
+							<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="handlerClick(value.more.link)" @tap="handlerClick(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>
+						<text class="sub-title" :style="{ color: value.subTitle.color }">{{ value.subTitle.text
+							}}</text>
 					</view>
 				</view>
 			</block>
@@ -120,56 +148,55 @@
 						<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
-										}"
-									>
+									<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 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)">
+								<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="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>
+								<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
-					}"
-				>
+				<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 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
-					}"
-				>
+				<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>
@@ -177,19 +204,21 @@
 			<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 }">
+						<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>
+						<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 }"
-					>
+					<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>
@@ -206,48 +235,50 @@
 						<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 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 }">
+					<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 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 }"
-				>
+				<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
-					}"
-				>
+				<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>
+				<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)">
+				<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>
@@ -269,11 +300,11 @@ export default {
 	data() {
 		return {};
 	},
-	created() {},
+	created() { },
 	mixins: [DiyMinx],
 	watch: {
 		// 组件刷新监听
-		componentRefresh: function(nval) {}
+		componentRefresh: function (nval) { }
 	},
 	computed: {
 		warpCss() {
@@ -290,10 +321,12 @@ export default {
 	},
 	methods: {
 		async handlerClick(link) {
-			await this.__$emitEvent({eventName: 'text-tap', data: link, promiseCallback: (event, handler, awaitedResult) => {
-				if (!awaitedResult) return;
-				$util.diyRedirectTo(link);
-			}})
+			await this.__$emitEvent({
+				eventName: 'text-tap', data: link, promiseCallback: (event, handler, awaitedResult) => {
+					if (!awaitedResult) return;
+					$util.diyRedirectTo(link);
+				}
+			})
 		}
 	}
 };
@@ -323,7 +356,7 @@ export default {
 	width: 100%;
 }
 
-.diy-text .title > text {
+.diy-text .title>text {
 	padding: 0 15rpx;
 }
 
@@ -541,9 +574,11 @@ export default {
 
 	.style8-box {
 		text-align: left !important;
-		.style8-title{
+
+		.style8-title {
 			margin-left: 20rpx;
 		}
+
 		.style8-wrap {
 			height: 100%;
 			position: absolute;
@@ -821,7 +856,8 @@ export default {
 			font-size: 24rpx;
 			margin-right: 8rpx;
 		}
-		.iconfont{
+
+		.iconfont {
 			font-size: 24rpx;
 		}
 	}
@@ -849,6 +885,7 @@ export default {
 		transform: rotateY(180deg);
 	}
 }
+
 .style14 {
 	display: flex;
 	justify-content: space-between;
@@ -856,28 +893,36 @@ export default {
 	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;
@@ -885,20 +930,25 @@ export default {
 		}
 	}
 }
+
 .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);
@@ -906,6 +956,7 @@ export default {
 			height: 28rpx;
 			display: block;
 			margin-right: 12rpx;
+
 			&:nth-of-type(2) {
 				height: 40rpx;
 				margin-right: 10rpx;
@@ -913,11 +964,13 @@ export default {
 				top: 4rpx;
 			}
 		}
+
 		.my {
 			transform: rotate(40deg);
 			line-height: 0;
 			position: relative;
 			top: 4rpx;
+
 			.yuan {
 				font-size: 100rpx;
 				border-radius: 50%;
@@ -925,6 +978,7 @@ export default {
 				height: 8rpx;
 				display: block;
 			}
+
 			.vertical {
 				border-left: 8rpx solid;
 				height: 20rpx;
@@ -934,27 +988,32 @@ export default {
 			}
 		}
 	}
+
 	.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 {
+
+		&>text {
 			max-width: 200rpx;
 			white-space: nowrap;
 			text-overflow: ellipsis;
 			overflow: hidden;
 		}
 	}
+
 	.style16-title {
 		text-align: left;
 		max-width: 200rpx;
@@ -962,6 +1021,7 @@ export default {
 		text-overflow: ellipsis;
 		overflow: hidden;
 	}
+
 	.style16-sub-title {
 		margin-left: 20rpx;
 		text-align: left;
@@ -976,7 +1036,8 @@ export default {
 		align-items: center;
 		padding: 0 20rpx;
 		position: relative;
-		&> .js-icon {
+
+		&>.js-icon {
 			padding: 8rpx;
 			background-image: radial-gradient(transparent 30%, #fff);
 			border-radius: 50%;
diff --git a/components-diy/diy-video-list.vue b/components-diy/diy-video-list.vue
index b87d041..2717333 100644
--- a/components-diy/diy-video-list.vue
+++ b/components-diy/diy-video-list.vue
@@ -1,98 +1,61 @@
 <template>
 	<view :style="componentStyle">
 		<!-- 固定布局模式 -->
-		<view v-if="value.showStyle == 'fixed'" :class="['goods-list', 'row1-of' + value.rowCount]" style="padding:20rpx;">
-			<view 
-				v-for="(item, index) in value.list" 
-				:key="index"
-				class="goods-item"
-				@tap="showVideo(item)"
-			>
+		<view v-if="value.showStyle == 'fixed'" :class="['goods-list', 'row1-of' + value.rowCount]"
+			style="padding:20rpx;">
+			<view v-for="(item, index) in value.list" :key="index" class="goods-item" @tap="showVideo(item)">
 				<view class="goods-img-wrap">
-					<image 
-						class="goods-img" 
-						style="border-radius:10rpx 10rpx 0 0;" 
-						:src="$util.img(item.imageUrl)" 
-						mode="widthFix"
-						@error="imgError(index)"
-					></image>
+					<image class="goods-img" style="border-radius:10rpx 10rpx 0 0;" :src="$util.img(item.imageUrl)"
+						mode="widthFix" @error="imgError(index)"></image>
 					<view style="position:absolute;top:10rpx;right:10rpx;">
-						<image style="width:30rpx;" :src="$util.img('addon/personnel/shop/view/enterprise/play.png')" mode="widthFix"></image>
+						<image style="width:30rpx;" :src="$util.img('addon/personnel/shop/view/enterprise/play.png')"
+							mode="widthFix"></image>
 					</view>
 				</view>
 				<view class="info-wrap">
-					<view 
-						class="goods-name" 
-						:style="{
-							'font-size': (value.font.size * 2 + 'rpx') + ';',
-							'font-weight': value.font.weight + ';',
-							'color': value.font.color + ';'
-						}"
-					>{{ item.title }}</view>
+					<view class="goods-name" :style="{
+						'font-size': (value.font.size * 2 + 'rpx') + ';',
+						'font-weight': value.font.weight + ';',
+						'color': value.font.color + ';'
+					}">{{ item.title }}</view>
 				</view>
 			</view>
 		</view>
-		
+
 		<!-- 其他布局模式 -->
-		<scroll-view 
-			v-else
-			:class="['video-nav', value.showStyle == 'fixed' ? 'fixed-layout' : value.showStyle]" 
-			:scroll-x="value.showStyle == 'singleSlide'"
-		>
+		<scroll-view v-else :class="['video-nav', value.showStyle == 'fixed' ? 'fixed-layout' : value.showStyle]"
+			:scroll-x="value.showStyle == 'singleSlide'">
 			<view class="uni-scroll-view-content">
-				<view 
-					v-for="(item, index) in value.list" 
-					:key="index"
-					:class="['video-nav-item', value.mode]"
-					:style="{ width: (100 / value.rowCount + '%') + ';' }"
-					@tap="showVideo(item)"
-				>
+				<view v-for="(item, index) in value.list" :key="index" :class="['video-nav-item', value.mode]"
+					:style="{ width: (100 / value.rowCount + '%') + ';' }" @tap="showVideo(item)">
 					<view class="video-img">
-						<image 
-							v-if="item.iconType == 'img'"
-							:style="{
-								'max-width': '200rpx;',
-								'max-height': '200rpx;',
-								'border-radius': '8rpx;'
-							}"
-							:src="$util.img(item.imageUrl) || $util.img('public/uniapp/default_img/goods.png')"
-							mode="widthFix"
-							:show-menu-by-longpress="true"
-						></image>
+						<image v-if="item.iconType == 'img'" :style="{
+							'max-width': '200rpx;',
+							'max-height': '200rpx;',
+							'border-radius': '8rpx;'
+						}" :src="$util.img(item.imageUrl) || $util.img('public/uniapp/default_img/goods.png')" mode="widthFix"
+							:show-menu-by-longpress="true"></image>
 						<view style="position:absolute;top:10rpx;right:10rpx;">
-							<image style="width:30rpx;" :src="$util.img('addon/personnel/shop/view/enterprise/play.png')" mode="widthFix"></image>
+							<image style="width:30rpx;"
+								:src="$util.img('addon/personnel/shop/view/enterprise/play.png')" mode="widthFix">
+							</image>
 						</view>
 					</view>
-					<view 
-						class="video-text" 
-						:style="{
-							'margin-left': '16rpx;',
-							'font-size': (value.font.size * 2 + 'rpx') + ';',
-							'font-weight': value.font.weight + ';',
-							'color': value.font.color + ';'
-						}"
-					>{{ item.title }}</view>
+					<view class="video-text" :style="{
+						'margin-left': '16rpx;',
+						'font-size': (value.font.size * 2 + 'rpx') + ';',
+						'font-weight': value.font.weight + ';',
+						'color': value.font.color + ';'
+					}">{{ item.title }}</view>
 				</view>
 			</view>
 		</scroll-view>
-		
+
 		<!-- 视频播放弹窗 -->
-		<uni-popup 
-			ref="videoPopup" 
-			type="center"
-			style="background:transparent;width:100%;height:100%;"
-		>
+		<uni-popup ref="videoPopup" type="center" style="background:transparent;width:100%;height:100%;">
 			<view class="video-container" style="position:fixed;top:30%;width:100%;left:0;">
-				<video 
-					class="adaptive-video"
-					:autoPauseIfNavigate="true"
-					:autoPauseIfOpenNative="true"
-					:autoplay="false"
-					:enableAutoRotation="true"
-					id="myVideo"
-					:src="video_url"
-					:controls="true"
-				></video>
+				<video class="adaptive-video" :autoPauseIfNavigate="true" :autoPauseIfOpenNative="true"
+					:autoplay="false" :enableAutoRotation="true" id="myVideo" :src="video_url" :controls="true"></video>
 			</view>
 		</uni-popup>
 	</view>
@@ -100,7 +63,7 @@
 
 <script>
 import uniPopup from '@/components/uni-popup/uni-popup.vue'
-
+import DiyMinx from './minx.js'
 export default {
 	name: 'diy-video-list',
 	components: {
@@ -112,6 +75,7 @@ export default {
 			default: () => ({})
 		}
 	},
+	mixins: [DiyMinx],
 	data() {
 		return {
 			pageWidth: '',
@@ -132,25 +96,25 @@ export default {
 		componentStyle() {
 			let style = '';
 			style += 'background-color:' + this.value.componentBgColor + ';';
-			
+
 			if (this.value.componentAngle == 'round') {
 				style += 'border-top-left-radius:' + (2 * this.value.topAroundRadius) + 'rpx;';
 				style += 'border-top-right-radius:' + (2 * this.value.topAroundRadius) + 'rpx;';
 				style += 'border-bottom-left-radius:' + (2 * this.value.bottomAroundRadius) + 'rpx;';
 				style += 'border-bottom-right-radius:' + (2 * this.value.bottomAroundRadius) + 'rpx;';
 			}
-			
+
 			style += 'box-shadow:' + (this.value.ornament.type == 'shadow' ? '0 0 10rpx ' + this.value.ornament.color : '') + ';';
 			style += 'border:' + (this.value.ornament.type == 'stroke' ? '2rpx solid ' + this.value.ornament.color : '') + ';';
-			
+
 			console.log(this.value);
-			
+
 			return style;
 		},
-		
+
 		swiperHeight() {
 			let height = 0;
-			
+
 			if (this.value.mode == 'graphic') {
 				height = (49 + this.value.imageSize) * this.value.pageCount;
 			} else if (this.value.mode == 'img') {
@@ -158,13 +122,13 @@ export default {
 			} else if (this.value.mode == 'text') {
 				height = 43 * this.value.pageCount;
 			}
-			
+
 			return 'height:' + (2 * height) + 'rpx';
 		},
-		
+
 		isIndicatorDots() {
-			return this.value.carousel.type != 'hide' && 
-				   1 != Math.ceil(this.value.list.length / (this.value.pageCount * this.value.rowCount));
+			return this.value.carousel.type != 'hide' &&
+				1 != Math.ceil(this.value.list.length / (this.value.pageCount * this.value.rowCount));
 		}
 	},
 	methods: {
@@ -173,7 +137,7 @@ export default {
 			this.video_url = item.videoUrl;
 			this.$refs.videoPopup.open();
 		},
-		
+
 		// 图片加载错误处理
 		imgError(index) {
 			// 图片加载失败的处理逻辑
@@ -194,7 +158,7 @@ export default {
 	&.row1-of3 {
 		display: flex;
 		flex-wrap: wrap;
-		
+
 		.goods-item {
 			position: relative;
 			display: flex;
@@ -202,89 +166,93 @@ export default {
 			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) {
+
+			&: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) {
+
+				&:nth-of-type(1),
+				&:nth-of-type(2),
+				&:nth-of-type(3) {
 					margin-top: 8rpx;
 				}
-				
+
 				&:nth-child(1n) {
 					margin-left: 8rpx;
 				}
-				
+
 				&:nth-child(3n-1) {
 					margin-left: 20rpx;
 					margin-right: 20rpx;
 				}
-				
+
 				&:nth-child(3n) {
 					margin-right: 0;
 					margin-left: 0;
 				}
 			}
-			
+
 			.goods-img-wrap {
 				position: relative;
 				overflow: hidden;
 				height: 220rpx;
 			}
-			
+
 			.goods-img {
 				width: 100%;
 			}
-			
+
 			.info-wrap {
 				display: flex;
 				flex-direction: column;
 				flex: 1;
-				
+
 				.pro-info {
 					margin-top: auto;
 					display: flex;
 					flex-direction: column;
 					justify-content: space-between;
-					
+
 					.discount-price {
 						display: flex;
 						justify-content: space-between;
 						align-items: center;
-						
+
 						.price-wrap {
 							white-space: nowrap;
-							
+
 							.unit {
 								font-size: 24rpx !important;
 							}
-							
+
 							.price {
 								font-size: 32rpx;
-								
+
 								text {
 									font-weight: 700;
 								}
 							}
 						}
 					}
-					
+
 					.delete-price {
 						text-decoration: line-through;
 						flex: 1;
@@ -295,46 +263,46 @@ export default {
 				}
 			}
 		}
-		
+
 		&.style-1 {
 			.pro-info {
 				.price-wrap {
 					line-height: 1;
 				}
-				
+
 				.discount-price {
 					justify-content: unset !important;
 					align-items: baseline !important;
 					flex-wrap: wrap;
 				}
-				
+
 				.delete-price {
 					margin-left: 10rpx;
 				}
 			}
 		}
-		
+
 		&.style-2 {
 			.pro-info {
 				position: relative;
 				flex-direction: row !important;
 				align-items: center;
-				
+
 				.price-wrap {
 					line-height: 1;
 				}
-				
+
 				.discount-price {
 					align-items: flex-end !important;
 					flex-wrap: wrap;
 					justify-content: unset !important;
 				}
-				
+
 				.delete-price {
 					margin: 20rpx 0;
 					flex-basis: 100% !important;
 				}
-				
+
 				.buy-btn {
 					min-width: 112rpx;
 					height: 52rpx;
@@ -345,19 +313,19 @@ export default {
 				}
 			}
 		}
-		
+
 		.sell-out {
 			text {
 				font-size: 150rpx;
 			}
 		}
 	}
-	
+
 	&.row1-of2 {
 		display: flex;
 		flex-wrap: wrap;
 		justify-content: space-between;
-		
+
 		.goods-item {
 			position: relative;
 			margin-top: 20rpx;
@@ -365,72 +333,74 @@ export default {
 			display: flex;
 			flex-direction: column;
 			box-sizing: border-box;
-			
+
 			&:nth-child(2n) {
 				margin-right: 0 !important;
 			}
-			
-			&:nth-of-type(1), &:nth-of-type(2) {
+
+			&: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) {
+
+				&:nth-of-type(1),
+				&:nth-of-type(2) {
 					margin-top: 8rpx;
 				}
 			}
-			
+
 			.goods-img-wrap {
 				position: relative;
 				overflow: hidden;
 				height: 340rpx;
 			}
-			
+
 			.goods-img {
 				width: 100%;
 			}
-			
+
 			.info-wrap {
 				display: flex;
 				flex-direction: column;
 				flex: 1;
-				
+
 				.sale {
 					flex-basis: 100%;
 				}
-				
+
 				.pro-info {
 					margin-top: auto;
 					display: flex;
 					flex-direction: row;
 					justify-content: space-between;
-					
+
 					.discount-price {
 						.price-wrap {
 							white-space: nowrap;
-							
+
 							.unit {
 								font-weight: 700;
 								font-size: 24rpx !important;
 							}
-							
+
 							.price {
 								font-weight: 700;
 								font-size: 32rpx !important;
 							}
 						}
 					}
-					
+
 					.delete-price {
 						text-decoration: line-through;
 						flex: 1;
@@ -441,57 +411,57 @@ export default {
 				}
 			}
 		}
-		
+
 		&.style-1 {
 			.pro-info {
 				.discount-price {
 					display: flex;
 					flex-wrap: wrap;
 					align-items: baseline;
-					
+
 					.price-wrap {
 						display: inline-block;
-						
+
 						text {
 							font-weight: 700;
 						}
-						
+
 						line-height: 1;
 					}
 				}
-				
+
 				.delete-price {
 					margin-top: 6rpx;
 					flex-basis: 100% !important;
 				}
 			}
 		}
-		
+
 		&.style-2 {
 			.pro-info {
 				position: relative;
 				align-items: center;
-				
+
 				.price-wrap {
 					line-height: 1;
 				}
-				
+
 				.discount-price {
 					display: flex;
 					flex-wrap: wrap;
 					align-items: baseline;
 				}
-				
+
 				.delete-price {
 					margin-top: 4rpx;
 					flex-basis: 100% !important;
 				}
-				
+
 				.sale {
 					line-height: 1;
 					margin-top: 10rpx;
 				}
-				
+
 				.buy-btn {
 					min-width: 140rpx;
 					height: 52rpx;
@@ -502,7 +472,7 @@ export default {
 				}
 			}
 		}
-		
+
 		&.style-3 {
 			.pro-info {
 				.member-price {
@@ -510,19 +480,19 @@ export default {
 					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;
@@ -531,12 +501,12 @@ export default {
 					}
 				}
 			}
-			
+
 			.swiper {
 				padding: 20rpx 0;
 			}
 		}
-		
+
 		.sell-out {
 			text {
 				font-size: 250rpx;
@@ -563,7 +533,7 @@ export default {
 .video-nav {
 	padding: 16rpx;
 	box-sizing: border-box;
-	
+
 	&.fixed-layout {
 		.uni-scroll-view-content {
 			display: flex;
@@ -571,24 +541,24 @@ export default {
 			justify-content: space-between;
 		}
 	}
-	
+
 	&.singleSlide {
 		.uni-scroll-view-content {
 			display: flex;
 		}
-		
+
 		.video-nav-item {
 			flex-shrink: 0;
 		}
 	}
-	
+
 	&.pageSlide {
 		position: relative;
-		
+
 		.uni-swiper-dots-horizontal {
 			bottom: 0rpx;
 		}
-		
+
 		&.straightLine {
 			.uni-swiper-dot {
 				width: 30rpx;
@@ -596,7 +566,7 @@ export default {
 				height: 8rpx;
 			}
 		}
-		
+
 		&.circle {
 			.uni-swiper-dot {
 				width: 14rpx;
@@ -604,21 +574,21 @@ export default {
 			}
 		}
 	}
-	
+
 	.video-nav-wrap {
 		display: flex;
 		flex-wrap: wrap;
 		width: 100%;
 		height: 100%;
 	}
-	
+
 	.video-nav-item {
 		display: flex;
 		flex-direction: column;
 		align-items: center;
 		padding: 14rpx 0;
 		box-sizing: border-box;
-		
+
 		.video-text {
 			padding-top: 12rpx;
 			line-height: 1.5;
@@ -627,25 +597,25 @@ export default {
 			overflow: hidden;
 			width: 100%;
 			text-align: center;
-			
+
 			&.alone {
 				padding-top: 0;
 			}
 		}
-		
+
 		&.text {
 			.video-text {
 				padding-top: 0;
 			}
 		}
-		
+
 		.video-img {
 			position: relative;
 			display: flex;
 			align-items: center;
 			justify-content: center;
 			font-size: 90rpx;
-			
+
 			.tag {
 				position: absolute;
 				top: -10rpx;
@@ -659,7 +629,7 @@ export default {
 				line-height: 1;
 				font-size: 24rpx;
 			}
-			
+
 			.icon {
 				font-size: 50rpx;
 				color: #606266;
@@ -675,16 +645,16 @@ export default {
 	justify-content: center;
 	margin-top: -20rpx;
 	padding-bottom: 8rpx;
-	
+
 	.swiper-dot {
 		background-color: rgba(0, 0, 0, 0.3);
 		margin: 8rpx;
-		
+
 		&.active {
 			background-color: #000;
 		}
 	}
-	
+
 	&.straightLine {
 		.swiper-dot {
 			width: 30rpx;
@@ -692,7 +662,7 @@ export default {
 			height: 8rpx;
 		}
 	}
-	
+
 	&.circle {
 		.swiper-dot {
 			width: 15rpx;
diff --git a/components-diy/diy-video.vue b/components-diy/diy-video.vue
index 634044c..85d7417 100644
--- a/components-diy/diy-video.vue
+++ b/components-diy/diy-video.vue
@@ -1,54 +1,58 @@
 <template>
-	<video  data-component-name="diy-video" class="diy-video" :src="$util.img(value.videoUrl)" :poster="$util.img(value.imageUrl)" :style="videoWarpCss"  objectFit="cover" @click="handlerClick(value.videoUrl)" @tap="handlerClick(value.videoUrl)"></video>
+	<video data-component-name="diy-video" class="diy-video" :src="$util.img(value.videoUrl)"
+		:poster="$util.img(value.imageUrl)" :style="videoWarpCss" objectFit="cover"
+		@click="handlerClick(value.videoUrl)" @tap="handlerClick(value.videoUrl)"></video>
 </template>
 
 <script>
-	// 视频
-	import DiyMinx from './minx.js'
-	export default {
-		name: 'diy-video',
-		props: {
-			value: {
-				type: Object
-			}
-		},
-		data() {
-			return {};
-		},
-		created() {},
-		mixins: [DiyMinx],
-		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: {
-			async handlerClick(videoUrl) {
-				await this.__$emitEvent({eventName: 'video-tap', data: videoUrl, promiseCallback: (event, handler, awaitedResult) => {
-					if (!awaitedResult) return;
-				}})
-			}
+// 视频
+import DiyMinx from './minx.js'
+export default {
+	name: 'diy-video',
+	props: {
+		value: {
+			type: Object
 		}
-	};
+	},
+	data() {
+		return {};
+	},
+	created() { },
+	mixins: [DiyMinx],
+	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: {
+		async handlerClick(videoUrl) {
+			await this.__$emitEvent({
+				eventName: 'video-tap', data: videoUrl, promiseCallback: (event, handler, awaitedResult) => {
+					if (!awaitedResult) return;
+				}
+			})
+		}
+	}
+};
 </script>
 
 <style scoped>
-	video {
-		width: 100%;
-	}
+video {
+	width: 100%;
+}
 
-	.diy-video>>>.uni-video-container {
-		background-color: transparent;
-	}
+.diy-video>>>.uni-video-container {
+	background-color: transparent;
+}
 </style>
\ No newline at end of file