소스 검색

commit -m

zhengjinyi 3 년 전
부모
커밋
800940da5c

+ 1 - 1
components/cm-module/cm-seller/home.vue

@@ -110,7 +110,7 @@
 				})
 			},
 			GetHomeFloorInfo(){//初始化首页楼层数据
-				this.CommonService.GetHomeDataInfo({userId:this.userID,soure:2}).then(response =>{
+				this.CommonService.GetHomeDataInfo({userId:this.userID,source:2}).then(response =>{
 					let data = response.data
 					this.pageList = data.homePageFloor
 					this.hotListPageFloor =  data.pageFloorList

+ 194 - 0
components/cm-module/pageTemplate/template-product.vue

@@ -0,0 +1,194 @@
+<template>
+    <view class="floor-item ad_04 clearfix" @click.stop="navToDetailPage(data)">
+    	<image class="item-img tui-skeleton-fillet" :src="data.image" mode="aspectFill"></image>
+    	<template-Type :product="data"></template-Type>
+    	<view class="floor-item-content">
+    		<view class="title tui-skeleton-rect">
+    			<text class="mclap-tag" v-if="data.beautyActFlag == '1'">美博会</text>
+    			<text class="mclap" :class="data.beautyActFlag == '1' ? 'indent' : ''"
+    		>{{ data.name }} 
+    			</text>
+    		</view>
+    		<view class="floor-item-price">
+    			<template>
+    				<template-Tags :product="data"></template-Tags>
+    			</template>
+    			<view v-if="hasLogin">
+    				<template-Price :product="data"></template-Price>
+    			</view>
+    			<view v-else class="no-price">
+    				<view class="p-stars">
+    					<text class="p-no">¥</text>
+    					<uni-grader
+    						:grade="Number(data.priceGrade)"
+    						:margin="14"
+    					></uni-grader>
+    				</view>
+    			</view>
+    		</view>
+    	</view>
+    </view>
+</template>
+
+<script>
+import { mapState, mapMutations } from 'vuex'	
+import uniGrader from '@/components/uni-grade/uni-grade.vue'
+import templateTags from '@/components/cm-module/pageTemplate/templateTags.vue'
+import templatePrice from '@/components/cm-module/pageTemplate/templatePrice.vue'
+import templateType from '@/components/cm-module/pageTemplate/templateType.vue'	
+export default {
+    name: 'TemplateProduct',
+	components: {
+		uniGrader,
+		templateTags,
+		templatePrice,
+		templateType
+	},
+    props: {
+        data: {
+            type: Object,
+            default: () => {}
+        }
+    },
+    computed: {
+       ...mapState(['hasLogin', 'userInfo', 'isActivity']),
+    },
+    methods: {
+        // 跳转商品详情
+	   navToDetailPage(pros) {
+			this.$api.navigateTo(`/pages/goods/product?id=${pros.productId}`)
+	   }
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+.floor-item {
+	width: 330rpx;
+	height: 516rpx;
+	font-size: $font-size-24;
+	color: $text-color;
+	background: #ffffff;
+	line-height: 36rpx;
+	border-radius: 16rpx;
+	margin-right: 10rpx;
+	margin-bottom: 10rpx;
+	float: left;
+	box-sizing: border-box;
+	position: relative;
+	&:nth-child(2n) {
+		margin-right: 0;
+	}
+	.item-img {
+		width: 330rpx;
+		height: 330rpx;
+		border-radius: 16rpx 16rpx 0 0;
+		display: block;
+		margin-bottom: 8rpx;
+	}
+	.floor-item_tag {
+		width: 100%;
+		height: 32rpx;
+		float: left;
+		margin: 20rpx 0;
+		padding: 0 20rpx;
+		box-sizing: border-box;
+		text {
+			display: inline-block;
+			padding: 0 8rpx;
+			border: 1px solid #e3ebf7;
+			border-radius: 8rpx;
+			color: #9aa5b5;
+			font-size: $font-size-22;
+			line-height: 32rpx;
+			text-align: center;
+			float: left;
+		}
+	}
+	.floor-item-content {
+		width: 100%;
+		padding: 0 20rpx;
+		box-sizing: border-box;
+	}
+	.floor-item-act {
+		display: block;
+		width: 100%;
+		height: 32rpx;
+		text-align: center;
+		box-sizing: border-box;
+	}
+	.title-none {
+		font-size: $font-size-26;
+		color: #ff2a2a;
+		line-height: 54rpx;
+	}
+	.title {
+		width: 100%;
+		height: 70rpx;
+		display: flex;
+		line-height: 35rpx;
+		flex-direction: column;
+		margin: 8rpx 0;
+		padding: 0;
+		position: relative;
+		.mclap {
+			width: 100%;
+			line-height: 35rpx;
+			text-overflow: ellipsis;
+			display: -webkit-box;
+			word-break: break-all;
+			-webkit-box-orient: vertical;
+			-webkit-line-clamp: 2;
+			overflow: hidden;
+			font-size: 26rpx;
+			&.indent {
+				text-indent: 95rpx;
+			}
+		}
+		.mclap-tag {
+			display: block;
+			width: 84rpx;
+			height: 32rpx;
+			background-image: linear-gradient(270deg, #f9c023 0%, #f83600 100%);
+			border-radius: 4rpx 48rpx 4px 4px;
+			line-height: 32rpx;
+			font-size: $font-size-22;
+			color: #ffffff;
+			text-align: center;
+			position: absolute;
+			left: 0;
+			top: 0;
+		}
+	}
+	.no-price {
+		height: 54rpx;
+		line-height: 54rpx;
+		display: flex;
+		box-sizing: border-box;
+		.p-no {
+			line-height: 54rpx;
+			font-size: $font-size-28;
+			color: $text-color;
+			display: inline-block;
+			float: left;
+		}
+		.p-stars {
+			float: left;
+		}
+	}
+	.price {
+		color: #ff2a2a;
+		line-height: 54rpx;
+		&.none {
+			text-decoration: line-through;
+			color: #999999;
+		}
+		.sm {
+			font-size: $font-size-24;
+		}
+		.big {
+			font-size: $font-size-28;
+		}
+	}
+}
+</style>

+ 39 - 249
components/cm-module/pageTemplate/templateL.vue

@@ -1,96 +1,37 @@
 <template>
 	<view class="section_page_main clearfix">
-		<view class="recommend-list" :style="hasLessProduct ? 'height:269px' : ''">
-			<swiper
-				class="tui-banner-swiper"
-				:autoplay="true"
-				:interval="6000"
-				:duration="200"
+		<view class="recommend-list">
+			<cm-simple-swiper
+				@change="onChange"
+				:current="current"
 				:circular="true"
-				@change="swiperChange"
-				:style="hasLessProduct ? 'height:269px' : ''"
+				:swiperHeight="1100"
+				:data="productList"
+				:columns="2"
+				:rows="swiperRows"
+				:gapY="12"
+				:gapX="12"
+				:autoFill="true"
+				:autoplay="true"
+				padding="0 10rpx"
 			>
-				<swiper-item v-for="(product, index) in productList" :key="index">
-					<view
-						class="floor-item ad_04 clearfix"
-						v-for="(item, idx) in product"
-						:key="idx"
-						@click.stop="navToDetailPage(item.product)"
-					>
-						<image class="item-img tui-skeleton-fillet" :src="item.product.image" mode="aspectFill"></image>
-						<template-Type :product="item.product"></template-Type>
-						<view class="floor-item-content">
-							<view class="title tui-skeleton-rect">
-								<text class="mclap-tag" v-if="item.product.beautyActFlag == '1'">美博会</text>
-								<text class="mclap" :class="item.product.beautyActFlag == '1' ? 'indent' : ''"
-									>{{ item.product.name }}
-								</text>
-							</view>
-							<view class="floor-item-price">
-								<template>
-									<template-Tags :product="item.product"></template-Tags>
-								</template>
-								<view v-if="hasLogin">
-									<template v-if="item.product.productCategory == 1">
-										<template-Price  :product="item.product"></template-Price>
-									</template>
-									<template v-else>
-										<view class="price tui-skeleton-rect" v-if="item.product.detailTalkFlag == '2'">
-											<text class="p sm">¥</text> <text class="p big">价格详聊</text>
-										</view>
-										<view class="price tui-skeleton-rect" v-else>
-											<text class="p sm">¥</text>
-											<text class="p big">{{ item.product.price | NumFormat }}</text>
-										</view>
-									</template>
-								</view>
-								<view v-else class="no-price">
-									<template v-if="item.product.productCategory == 1">
-										<view class="p-stars">
-											<text class="p-no">¥</text>
-											<uni-grader
-												:grade="Number(item.product.priceGrade)"
-												:margin="14"
-											></uni-grader>
-										</view>
-									</template>
-									<template v-else>
-										<view class="p-stars"> <text class="p-no">¥登录可见</text> </view>
-									</template>
-								</view>
-							</view>
-						</view>
-					</view>
-				</swiper-item>
-			</swiper>
-			<view class="swiper__recommenddots-box" v-if="productList.length > 1">
-				<view
-					v-for="(item, idx) in productList"
-					:key="idx"
-					:class="[idx === swiperCurrent ? 'swiper__dots-long' : 'none']"
-					:data-index="swiperCurrent"
-					class="swiper__dots-item"
-				>
-				</view>
-			</view>
+				<template v-slot:slide="{ row }">
+					 <template-product :data="row.product"></template-product>
+				</template>
+			</cm-simple-swiper>
 		</view>
 	</view>
 </template>
 
 <script>
 import { mapState, mapMutations } from 'vuex'
-import uniGrader from '@/components/uni-grade/uni-grade.vue'
-import templateTags from '@/components/cm-module/pageTemplate/templateTags.vue'
-import templatePrice from '@/components/cm-module/pageTemplate/templatePrice.vue'
-import templateType from '@/components/cm-module/pageTemplate/templateType.vue'
-
+import CmSimpleSwiper from '@/components/cm-simple-swiper/cm-simple-swiper.vue'
+import TemplateProduct from '@/components/cm-module/pageTemplate/template-product.vue'
 export default {
 	name: 'templateH',
 	components: {
-		uniGrader,
-		templateTags,
-		templatePrice,
-		templateType
+		CmSimpleSwiper,
+		TemplateProduct 
 	},
 	props: {
 		pageData: {
@@ -110,19 +51,15 @@ export default {
 			productCount: 0
 		}
 	},
-	filters: {
-		NumFormat: function(text) {
-			//处理金额
-			return Number(text).toFixed(2)
-		}
-	},
 	created() {
 		this.initData(this.pageData)
 	},
 	computed: {
-		...mapState(['hasLogin', 'userInfo', 'isActivity']),
-		hasLessProduct() {
-			return this.productCount <= 2
+		swiperRows() {
+		    return this.productList.length === 1 ? 1 : 2
+		},
+		swiperHeight() {
+		    return 516 * this.swiperRows
 		}
 	},
 	watch: {
@@ -139,38 +76,18 @@ export default {
 		async initData(data) {
 			const userInfo = await this.$api.getStorage()
 			this.shopId = userInfo.shopId ? userInfo.shopId : 0
-			this.productCount = data.floorImageList4.length
-			if (this.productCount > 0) {
-				this.productList.splice(0, this.productList.length)
-				for (var i = 0, j = data.floorImageList4.length; i < j; i += this.pageSize) {
-					this.productList.push(data.floorImageList4.slice(i, i + this.pageSize))
-				}
-			}
-		},
-		PromotionsFormat(promo) {
-			//促销活动类型数据处理
-			if (promo != null) {
-				if (promo.type == 1 && promo.mode == 1) {
-					return true
-				} else {
-					return false
-				}
-			}
-			return false
-		},
-		tabClick(index) {
-			//轮播图切换
-			this.current = index
+			this.productList = data.floorImageList4
+			// if (this.productCount > 0) {
+			// 	this.productList.splice(0, this.productList.length)
+			// 	for (var i = 0, j = data.floorImageList4.length; i < j; i += this.pageSize) {
+			// 		this.productList.push(data.floorImageList4.slice(i, i + this.pageSize))
+			// 	}
+			// }
 		},
-		swiperChange(e) {
-			//轮播切换
-			const index = e.detail.current
-			this.swiperCurrent = index
+		onChange(e) {
+		    this.current = e.current
 		},
-		navToDetailPage(pros) {
-			//跳转商品详情页
-			this.$api.navigateTo(`/pages/goods/product?id=${pros.productId}`)
-		}
+
 	}
 }
 </script>
@@ -236,134 +153,7 @@ export default {
 			height: 1100rpx;
 			overflow: hidden;
 			transform: translateY(0);
-			.floor-item {
-				width: 339rpx;
-				height: 516rpx;
-				margin-right: 20rpx;
-				font-size: $font-size-24;
-				color: $text-color;
-				background: #ffffff;
-				line-height: 36rpx;
-				border-radius: 16rpx;
-				margin-bottom: 20rpx;
-				float: left;
-				box-sizing: border-box;
-				position: relative;
-				&:nth-child(2n) {
-					margin-right: 0;
-				}
-				.item-img {
-					width: 339rpx;
-					height: 339rpx;
-					border-radius: 16rpx 16rpx 0 0;
-					display: block;
-					margin-bottom: 8rpx;
-				}
-				.floor-item_tag {
-					width: 100%;
-					height: 32rpx;
-					float: left;
-					margin: 20rpx 0;
-					padding: 0 20rpx;
-					box-sizing: border-box;
-					text {
-						display: inline-block;
-						padding: 0 8rpx;
-						border: 1px solid #e3ebf7;
-						border-radius: 8rpx;
-						color: #9aa5b5;
-						font-size: $font-size-22;
-						line-height: 32rpx;
-						text-align: center;
-						float: left;
-					}
-				}
-				.floor-item-content {
-					width: 100%;
-					padding: 0 20rpx;
-					box-sizing: border-box;
-				}
-				.floor-item-act {
-					display: block;
-					width: 100%;
-					height: 32rpx;
-					text-align: center;
-					box-sizing: border-box;
-				}
-				.title-none {
-					font-size: $font-size-26;
-					color: #ff2a2a;
-					line-height: 54rpx;
-				}
-				.title {
-					width: 100%;
-					height: 70rpx;
-					display: flex;
-					line-height: 35rpx;
-					flex-direction: column;
-					margin: 8rpx 0;
-					padding: 0;
-					position: relative;
-					.mclap {
-						width: 100%;
-						line-height: 35rpx;
-						text-overflow: ellipsis;
-						display: -webkit-box;
-						word-break: break-all;
-						-webkit-box-orient: vertical;
-						-webkit-line-clamp: 2;
-						overflow: hidden;
-						font-size: 26rpx;
-						&.indent {
-							text-indent: 95rpx;
-						}
-					}
-					.mclap-tag {
-						display: block;
-						width: 84rpx;
-						height: 32rpx;
-						background-image: linear-gradient(270deg, #f9c023 0%, #f83600 100%);
-						border-radius: 4rpx 48rpx 4px 4px;
-						line-height: 32rpx;
-						font-size: $font-size-22;
-						color: #ffffff;
-						text-align: center;
-						position: absolute;
-						left: 0;
-						top: 0;
-					}
-				}
-				.no-price {
-					height: 54rpx;
-					line-height: 54rpx;
-					display: flex;
-					box-sizing: border-box;
-					.p-no {
-						line-height: 54rpx;
-						font-size: $font-size-28;
-						color: $text-color;
-						display: inline-block;
-						float: left;
-					}
-					.p-stars {
-						float: left;
-					}
-				}
-				.price {
-					color: #ff2a2a;
-					line-height: 54rpx;
-					&.none {
-						text-decoration: line-through;
-						color: #999999;
-					}
-					.sm {
-						font-size: $font-size-24;
-					}
-					.big {
-						font-size: $font-size-28;
-					}
-				}
-			}
+			
 		}
 	}
 	.swiper__recommenddots-box {
@@ -384,13 +174,13 @@ export default {
 			height: 8rpx;
 			border-radius: 100%;
 			margin-left: 6px;
-			background-color: #FFFFFF;
+			background-color: #ffffff;
 		}
 		.swiper__dots-long {
 			width: 32rpx;
 			height: 8rpx;
 			border-radius: 4rpx;
-			background-color: #FFFFFF;
+			background-color: #ffffff;
 			transition: all 0.4s;
 		}
 	}

+ 1 - 1
components/cm-module/supplier/home.vue

@@ -110,7 +110,7 @@
 				})
 			},
 			GetHomeFloorInfo(){//初始化首页楼层数据
-				this.CommonService.GetHomeDataInfo({userId:this.userID,soure:2}).then(response =>{
+				this.CommonService.GetHomeDataInfo({userId:this.userID,source:2}).then(response =>{
 					let data = response.data
 					this.pageList = data.homePageFloor
 					this.hotListPageFloor =  data.pageFloorList

+ 151 - 0
components/cm-simple-swiper/cm-simple-swiper.vue

@@ -0,0 +1,151 @@
+<template>
+    <view class="simple-swiper">
+        <uni-swiper-dot :info="mapList" :current="current" mode="dot" :dotsStyles="dotsStyles">
+            <swiper
+                class="swiper"
+                :style="{ height: swiperHeight + 'rpx' }"
+                :indicator-dots="indicatorDots"
+                :indicator-color="indicatorColor"
+                :indicator-active-color="indicatorActiveColor"
+                :autoplay="autoplay"
+                :current="current"
+                :interval="interval"
+                :duration="duration"
+                :circular="circular"
+                :vertical="vertical"
+                :previousMargin="previousMargin"
+                :nextMargin="nextMargin"
+                :skipHiddenItemLayout="skipHiddenItemLayout"
+                :easingFunction="easingFunction"
+                @change="onChange"
+                @transition="onTransition"
+                @animationfinish="onAnimationfinish"
+            >
+                <swiper-item v-for="(item, index1) in mapList" :key="index1">
+                    <view class="swiper__item" :style="layoutStyle">
+                        <template v-if="item.length">
+                            <view v-for="(data, index2) in item" class="grid" :key="index2">
+                                <slot :row="data" name="slide"></slot>
+                            </view>
+                        </template>
+                        <view v-else class="grid"><slot name="slide" :row="item"></slot></view>
+                    </view>
+                </swiper-item>
+            </swiper>
+        </uni-swiper-dot>
+    </view>
+</template>
+
+<script>
+import swiperProps from './mixins/swiper'
+export default {
+    name: 'cm-simple-swiper',
+    mixins: [swiperProps],
+    props: {
+        /* swiper数据 */
+        data: {
+            type: Array,
+            default: () => []
+        },
+        // 行数
+        rows: {
+            type: Number,
+            default: 1
+        },
+        // 列数
+        columns: {
+            type: Number,
+            default: 1
+        },
+        swiperHeight: {
+            type: Number,
+            default: 350
+        },
+        gapX: {
+            type: Number,
+            default: 0
+        },
+        gapY: {
+            type: Number,
+            default: 0
+        },
+        padding: {
+            type: String,
+            default: '0'
+        },
+        autoFill: {
+            type: Boolean,
+            default: false
+        }
+    },
+    computed: {
+        // 真正渲染的列表
+        mapList() {
+            const result = this.formatSwiperList(this.data)
+            console.log(result)
+            return result
+        },
+        // 宽
+        width() {
+            return 100 / this.columns + '%'
+        },
+        dotsStyles() {
+            return {
+                width: 6,
+                bottom: 8,
+                color: 'background: rgba(255, 255, 255, 0.39)',
+                backgroundColor: 'background: rgba(255, 255, 255, 0.39)',
+                border: '0',
+                selectedBackgroundColor: '#FF457B',
+                selectedBorder: '#FF457B'
+            }
+        },
+        layoutStyle() {
+            return `
+                display: grid;
+                padding: ${this.padding};
+                grid-template-columns: repeat(${this.columns}, 1fr);
+                grid-template-rows: repeat(${this.rows}, 1fr);
+                grid-column-gap: ${this.gapX}rpx;
+                grid-row-gap: ${this.gapX}rpx;
+            `
+        }
+    },
+    methods: {
+        // 处理轮播图数据列表
+        formatSwiperList(list = []) {
+            const result = []
+            const count = this.rows * this.columns
+            // 一屏仅有一个时
+            if (count === 1) {
+                return list
+            }
+            let start = 0
+            // 一屏多个时
+            while (list.length > 0) {
+                if (start >= list.length) {
+                    break
+                }
+                const slice = list.slice(start, start + count)
+                if (slice.length < count && this.autoFill) {
+                    slice.push(...this.fullArray(count - slice.length))
+                }
+                result.push(slice)
+                start += count
+            }
+            return result
+        },
+        // 补全
+        fullArray(count) {
+            return this.data.slice(0, count)
+        }
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+.grid {
+    display: flex;
+    justify-content: center;
+}
+</style>

+ 70 - 0
components/cm-simple-swiper/mixins/swiper.js

@@ -0,0 +1,70 @@
+/* uniapp-swiper混入对象 */
+export default {
+    props: {
+        indicatorDots: {
+            type: Boolean,
+            default: false
+        },
+        indicatorColor: {
+            type: String,
+            default: 'rgba(0, 0, 0, .3)'
+        },
+        indicatorActiveColor: {
+            type: String,
+            default: '#000000'
+        },
+        autoplay: {
+            type: Boolean,
+            default: true
+        },
+        current: {
+            type: Number,
+            default: 0
+        },
+        interval: {
+            type: Number,
+            default: 5000
+        },
+        duration: {
+            type: Number,
+            default: 500
+        },
+        circular: {
+            type: Boolean,
+            default: false
+        },
+        vertical: {
+            type: Boolean,
+            default: false
+        },
+        previousMargin: {
+            type: String,
+            default: '0px'
+        },
+        nextMargin: {
+            type: String,
+            default: '0px'
+        },
+        skipHiddenItemLayout: {
+            type: Boolean,
+            default: false
+        },
+        easingFunction: {
+            type: String,
+            default: 'default',
+            validator: value => ['default', 'linear', 'easeInCubic', 'easeOutCubic', 'easeInOutCubic'].indexOf(value
+                .toString()) > -1
+        }
+    },
+    methods:{
+        onChange(event) {
+            this.$emit('change', event.detail)
+        },
+        onTransition(event) {
+            this.$emit('transition', event.detail)
+        },
+        onAnimationfinish(event) {
+            this.$emit('animationfinish', event.detail)
+        }
+    }
+}

+ 4 - 4
pages/goods/good-hot.vue

@@ -8,7 +8,7 @@
 						采美新品橱窗 <view class="topcontent-title-icon" @click="haveBack"> <text class="iconfont icon-fanhui"></text> </view>
 					</view>
 				</view>
-				<view class="topcontent-swiper" :style="{ top: StatusBar + 40 + 'px' }">
+				<view class="topcontent-swiper" :style="{ top: StatusBar + 44 + 'px' }">
 					<view class="swiper-goods">
 						<view class="swiper-banner-box">
 							<swiper
@@ -102,7 +102,7 @@
 							</view>
 							<view class="floor-item-price">
 								<view class="floor-item-act">
-									<view class="coupon-tags">优惠券</view>
+									<view class="coupon-tags" v-if="pros.couponsLogo">优惠券</view>
 									<template v-if="pros.actStatus === 1">
 										<view class="floor-tags" v-if="PromotionsFormat(pros.promotions)">
 											{{ pros.promotions.name }}
@@ -452,7 +452,7 @@ page {
 }
 .container-topcontent {
 	width: 100%;
-	height: 640rpx;
+	height: 620rpx;
 	background: #ffffff;
 	box-sizing: border-box;
 	position: relative;
@@ -578,7 +578,7 @@ page {
 	}
 	.swiper__dots-box {
 		position: absolute;
-		bottom: -60rpx;
+		bottom: -45rpx;
 		left: 0;
 		right: 0;
 		/* #ifndef APP-NVUE */

+ 1 - 0
pages/second/form/form-presale.vue

@@ -350,6 +350,7 @@
 					fileName:'',
 					ossName:'',
 					productDetails:'',//商品详细信息
+					announType:2,//发布类型 1.二手预成交商品 2.二手估价商品
 					source:4//二手发布来源.1:WWW,2:小程序,3:后台,4:协销
 				 },
 				 addressData:{

+ 1 - 0
pages/second/form/form-seller.vue

@@ -487,6 +487,7 @@
 					fileName:'',
 					ossName:'',
 					productDetails:'',//商品详细信息
+					announType:1,//发布类型 1.二手预成交商品 2.二手估价商品
 					source:4//二手发布来源.1:WWW,2:小程序,3:后台,4:协销
 				 },
 				 checkedFileTypeList:[],

+ 1 - 0
pages/second/form/form.vue

@@ -350,6 +350,7 @@
 					fileName:'',
 					ossName:'',
 					productDetails:'',//商品详细信息
+					announType:1,//发布类型 1.二手预成交商品 2.二手估价商品
 					source:2//二手发布来源.1:WWW,2:小程序,3:后台,4:协销
 				 },
 				 addressData:{

+ 6 - 3
pages/supplier/user/my-product.vue

@@ -60,8 +60,8 @@
 		<tui-modal :show="modal" @click="handleClick" @cancel="hideMobel" :content="contentModalText" color="#333" :size="32" shape="circle" :maskClosable="false"></tui-modal>
 		<!--右抽屉-->
 		<tui-drawer mode="right" :visible="rightDrawer" @close="closeDrawer">
-			<view class="d-container clearfix" :style="{paddingTop:CustomBar+10+'px'}">
-				<scroll-view class="tui-popup-scroll" scroll-y="true">
+			<view class="d-container clearfix">
+				<scroll-view class="tui-popup-scroll" :scroll-y="true" >
 					<view class="d-label">商品名称:</view>
 					<view class="d-input">
 						<input class="input" type="text" value="" v-model="listQuery.name" placeholder="输入商品名称"/>
@@ -162,6 +162,7 @@
 		},
 		data() {
 			return{	
+				CustomBar:this.CustomBar,
 				shopId:0,
 				isSuperv:false,
 				isProductChecked:false,
@@ -766,10 +767,12 @@
 	}
 	.d-container {
 		width: 560rpx;
+		height: 100vh;
+		box-sizing: border-box;
 		padding: 80rpx 30rpx;
 		.tui-popup-scroll{
 			width: 100%;
-			height: auto;
+			height: 100%;
 		}
 		.d-title{
 			width: 100%;

+ 2 - 2
pages/tabBar/home/index.vue

@@ -15,7 +15,7 @@
 			<!-- 直播 -->
 			<page-special :templateData="templateData" v-if="isLiveRequest"></page-special>
 			<!-- 新品橱窗 -->
-			<hot-floor :list="hotListPageFloor" :usserIdentity="userIdentity" v-if="isRequest"></hot-floor>
+			<hot-floor :list="hotListPageFloor" :usserIdentity="userIdentity" v-if="isRequest && hotListPageFloor.length > 0"></hot-floor>
 		</view>	
 		<!-- 楼层 -->
 		<view class="container-section tui-skeleton">
@@ -149,7 +149,7 @@
 				})
 			},
 			GetHomeFloorInfo(){//初始化首页楼层数据
-				this.CommonService.GetHomeDataInfo({userId:this.userID,soure:2}).then(response =>{
+				this.CommonService.GetHomeDataInfo({userId:this.userID,source:2}).then(response =>{
 					let data = response.data
 					this.pageList = data.homePageFloor
 					this.hotListPageFloor =  data.pageFloorList