hwb0 3 rokov pred
rodič
commit
72d041ef39

+ 2 - 2
packageGoods/components/exchange-popup/exchange-popup.vue

@@ -10,7 +10,7 @@
 					<view class="goods-left-content flex">
 						<view class="goods-left-content__title ells-one">{{ detailInfo.title }}</view>
 						<view class="goods-left-content__coin flex">
-							<image class="image-coin" src="../../static/goods_coin.png" mode=""></image>
+							<image class="image-coin" src="../../../static/public/goods_coin.png" mode=""></image>
 							<view>× {{ payInfo.exValue }}</view>
 						</view>
 					</view>
@@ -42,7 +42,7 @@
 				<view class="flex btn-left">
 					<view class="title">应付:</view>
 					<view class="flex coin">
-						<image src="../../static/goods_coin.png" mode=""></image>
+						<image src="../../../static/public/goods_coin.png" mode=""></image>
 						<view>× {{ payInfo.exchangePrice }}</view>
 					</view>
 				</view>

+ 1 - 1
packageGoods/goods/detail.vue

@@ -12,7 +12,7 @@
 					<view class="detail-info-left__title ells-one">{{ info.title }}</view>
 					<view class="detail-info-left__coin">
 						<view class="content flex">
-							<image src="../static/goods_coin.png" mode=""></image>
+							<image src="../../static/public/goods_coin.png" mode=""></image>
 							<view>× {{ info.exchangePrice }}</view>
 						</view>
 						<view class="txt">原价:<text>¥{{ info.originPrice }}</text></view>

+ 1 - 1
packagePrize/goods/detail.vue

@@ -11,7 +11,7 @@
 					<view class="detail-info-left__title ells-one">{{ info.title }}</view>
 					<view class="detail-info-left__coin">
 						<view class="content flex">
-							<image src="../static/goods_coin.png" mode=""></image>
+							<image src="../../static/public/goods_coin.png" mode=""></image>
 							<view>× {{ info.exchangePrice }}</view>
 						</view>
 						<view class="txt">原价:<text>¥{{ $numberFormat(999) }}</text></view>

BIN
packagePrize/static/goods_coin.png


+ 304 - 435
pages/core/index.vue

@@ -1,130 +1,81 @@
 <template>
-	<view class="core-cla">
+	<view class="core">
+		<!-- nav -->
 		<u-navbar leftIconSize="0" :placeholder="true" bgColor="#ffffff">
 			<view class="u-nav-slot" slot="left">
-				<text>兑换大厅</text>
+				<text>商城</text>
 			</view>
 		</u-navbar>
-		<!-- swiper开始 -->
-		<view class="swiper-ban" v-if="imgTop.length">
-			<view class="uni-padding-wrap">
-				<view class="page-section swiper">
-					<view class="page-section-spacing">
-						<swiper class="swiper" :indicator-dots="indicatorDots" :autoplay="autoplay" :interval="interval"
-							:duration="duration">
-							<swiper-item v-for="(item,index) in imgTop" :key="index"
-								@click="toCoreRange(item.type,item.type=='link'?item.linkUrl:item.goodsTags, item.name)">
-								<image :src="item.picUrl" alt="">
-							</swiper-item>
-						</swiper>
-					</view>
+		<!-- 固定顶部搜索、分类 -->
+		<view class="fixed-top">
+			<!-- 搜索 -->
+			<view class="fixed-top-search flex">
+				<view class="fixed-top-search__input flex">
+					<u--input placeholder="请输入关键词进行搜索" border="none" prefixIcon="search" prefixIconStyle="font-size: 22px;color: #909399" />
+					<view class="fixed-top-search__input__btn">搜索</view>
 				</view>
+				<image src="../../static/core/core_block.png" mode="scaleToFill" />
 			</view>
-		</view>
-		<!-- 分类部分开始 -->
-		<view class="classificationBox">
-			<view v-for="(item,index) in goods" :key="index" @click="toCoreRange('category',item.categoryId, item.name)"
-				class="ificationBox-mar">
-				<img :src="item.picUrl" alt="">
-				<view v-text="item.name" style=" "></view>
+			<view class="fixed-top-classify">
+				<u-tabs @change="changeClassify" :scrollable="true" :list="classifyList" lineWidth="20" lineHeight="2"
+					lineColor="#FF8D0B" :activeStyle="{
+										color: '#333',
+										transform: 'scale(1.1)'
+									}" :inactiveStyle="{
+										color: '#999',
+										transform: 'scale(1.1)'
+									}" itemStyle="padding-left: 15px; padding-right: 15px; height: 44px; text-align: center;">
+				</u-tabs>
 			</view>
 		</view>
-		<!-- 限时秒杀部分开始 -->
-		<view v-for="(item,index) in exclusiveSingle" :key="index" class="sticky-wrap">
-			<view class=" sticky-nav">
-				<text class="sticky-nav-name" v-text="item.name"></text>
-				<view @click="toCoreRange('tag',item.tagId, item.name)" class="sticky-nav-all">
-					<view></view>
-					<view class="flex ">
-						<text>更多</text>
-						<u-icon name="arrow-right" color="#9c9c9c" size="16"></u-icon>
-					</view>
-				</view>
-			</view>
-			<view class="sticky-content-wrap">
-				<view class="flex sticky-content-list">
-					<navigator :url="`/packageGoods/goods/detail?id=${ itemExc.goodsId }`" class="sticky-content-list-item"
-						hover-class="navigator-hover" v-for="(itemExc, indexNum) in item.data" :key="indexNum">
-						<view class="flex iamge-wrap">
-							<image :src="itemExc.picUrl" mode=""></image>
-						</view>
-						<view class="title">{{ itemExc.title }}</view>
-						<view class="bean">
-							<image src="../../static/icon/bean.png" mode="aspectFill"></image>
-							<view>× {{ itemExc.exchangePrice }}</view>
-						</view>
-					</navigator>
-					<view class="sticky-content-list-item"></view>
-				</view>
-			</view>
+		<view class="core-none"></view>
+		<!-- 轮播 -->
+		<view class="core-swiper">
+			<swiper class="core-swiper-centent" circular :indicator-dots="true" :autoplay="true" :interval="3000" indicator-active-color="#fff">
+				<swiper-item class="swiper-item" v-for="(item, index) in swiperList" :key="index">
+					<image :src="item.picUrl" mode=""></image>
+				</swiper-item>
+			</swiper>
 		</view>
-		<!-- 精选商品筛选 -->
-		<u-sticky class="offset-Height" :customNavHeight="navHeight" @touchmove.prevent.stop>
-			<view class="screen-coin uSticky-toTop">
-				<view class="screen-coin-shopin">精选商品</view>
-
-				<view class="flex screen-coin-select">
-					<view @click="ascSelect" class="flex screen-coin-select-text">
-						<view class="title">
-							<text>{{ ascListsingle.text}}</text>
-						</view>
-						<u-icon name="arrow-up" color="#848484" size="18" v-if="ascShow"></u-icon>
-						<u-icon name="arrow-down" color="#848484" size="18" v-else></u-icon>
+		
+		<!-- 二级分类 -->
+		<view class="core-category">
+			<swiper class="core-category-swiper" :autoplay="false">
+				<swiper-item class="swiper-item" v-for="(item, index) in classifyIndex == 0 ? classifyListFilter : classifyList[classifyIndex].list" :key="index">
+					<view class="swiper-item__content" v-for="(items, indexs) in item" :key="indexs">
+						<image :src="items.picUrl" mode="aspectFit"></image>
+						<view class="name">{{ items.name }}</view>
 					</view>
-					<view class="screen-coin-select-line"></view>
-					<view @click="openSelect" class="flex screen-coin-select-text screen-coin-select-text-two">
-						<view class="title">
-							<text v-if="actionInfo.min">{{ actionInfo.min }}</text>
-							<text v-if="actionInfo.max">-{{ actionInfo.max }}</text>
-							<text>{{ actionInfo.desc }}</text>
-						</view>
-						<u-icon name="arrow-up" color="#848484" size="18" v-if="coinShow"></u-icon>
-						<u-icon name="arrow-down" color="#848484" size="18" v-else></u-icon>
+				</swiper-item>
+			</swiper>
+		</view>
+		
+		<!-- 标签商品 -->
+		<view class="tag-goods" v-for="(item, index) in exclusiveSingle" :key="index">
+			<view class="tag-goods-content">
+				<view class="tag-goods-content-nav flex">
+					<view class="tag-goods-content-nav__left flex">
+						<image src="../../static/core/core_tag.png" mode=""></image>
+						<view class="title">{{ item.name }}</view>
+						<image src="../../static/core/core_tag.png" mode=""></image>
 					</view>
-				</view>
-				<view class="screen-coin-list" v-if="ascShow">
-					<view class="flex screen-coin-list-item" v-for="(item, index) in ascList" :key="index"
-						@click="selectCoinTwo(item, index)">
-						<text :class="{ 'action': ascListIndex == index }">{{ item.text }}</text>
+					<view class="tag-goods-content-nav__right flex">
+						<view class="title">更多</view>
+						<image src="../../static/core/core_right.png" mode=""></image>
 					</view>
 				</view>
-
-				<view class="screen-coin-list" v-if="coinShow">
-					<view class="flex screen-coin-list-item" v-for="(item, index) in coinList" :key="index"
-						@click="selectCoin(item, index)">
-						<text v-if="item.min" :class="{ 'action': actionIndex == index }">{{ item.min }}</text>
-						<text v-if="item.max" :class="{ 'action': actionIndex == index }">-{{ item.max }}</text>
-						<text :class="{ 'action': actionIndex == index }">{{ item.desc }}</text>
+				
+				<view class="tag-goods-content-list">
+					<view class="tag-goods-content-list-item flex" v-for="(items, indexs) in item.data" :key="indexs">
+						<view class="image flex">
+							<image :src="items.picUrl" mode="aspectFit"></image>
+						</view>
+						<view class="title">{{ items.exchangePrice }}盲豆</view>
 					</view>
 				</view>
 			</view>
-		</u-sticky>
-		<!-- 精选商品列表 -->
-		<view class="core">
-			<view class="flex core-list">
-				<navigator :url="`/packageGoods/goods/detail?id=${ item.goodsId }`" class="core-list-item"
-					hover-class="navigator-hover" v-for="(item, index) in list" :key="index">
-					<view class="flex iamge-wrap">
-						<image :src="item.picUrl" mode=""></image>
-					</view>
-					<view class="title">{{ item.title }}</view>
-					<view class="bean">
-						<image src="../../static/icon/bean.png" mode="aspectFill"></image>
-						<view>× {{ item.exchangePrice }}</view>
-					</view>
-				</navigator>
-				<view class="core-list-item"></view>
-			</view>
-			<view class="flex empty" v-if="!list.length">
-				<u-empty text="数据为空" mode="order" />
-			</view>
 		</view>
-		<custom-tab-bar :activeValue="'core'" />
-		<!-- 筛选盲豆 -->
-		<u-overlay :show="coinShow" @click="coinShow = false" zIndex="1" @touchmove.prevent.stop></u-overlay>
-		<!-- 筛选排序 -->
-		<u-overlay :show="ascShow" @click="ascShow = false" zIndex="1" @touchmove.prevent.stop></u-overlay>
-
+		
 		<custom-tab-bar :activeValue="'core'" />
 	</view>
 </template>
@@ -139,101 +90,90 @@
 		},
 		data() {
 			return {
-				indicatorDots: true,
-				autoplay: true,
-				interval: 3000,
-				duration: 500,
 				imgTop: [],
 				goods: [],
 				exclusive: [],
 				exclusiveSingle: [],
-
 				pageNum: 1,
 				total: 0,
 				list: [],
-				coinShow: false,
-				coinList: [{
-						min: null,
-						max: null,
-						desc: '全部盲豆'
-					},
-					{
-						min: 1,
-						max: 100,
-						desc: '盲豆'
-					},
-					{
-						min: 101,
-						max: 200,
-						desc: '盲豆'
-					},
-					{
-						min: 201,
-						max: 500,
-						desc: '盲豆'
-					},
-					{
-						min: 501,
-						max: 1000,
-						desc: '盲豆'
-					},
-					{
-						min: 1001,
-						max: 5000,
-						desc: '盲豆'
-					},
-					{
-						min: 5000,
-						max: null,
-						desc: '盲豆以上'
-					},
-				],
-				actionInfo: {},
-				actionIndex: 0,
-				coinNum: {
-					startPrice: null,
-					endPrice: null
-				},
-				orderByColumn: '', //默认exchangePrice
-				isAsc: '', //从低到高asc isAsc:'desc'从高到低
-				ascShow: false,
-				ascList: [{
-						data: '',
-						text: '默认排序'
-					},
-					{
-						data: 'asc',
-						text: '价格从低到高'
-					},
-					{
-						data: 'desc',
-						text: '价格从高到低'
-					},
-				],
-				ascListsingle: {},
-				ascListIndex: 0,
-
-				// 距顶部位置
-				navHeight: 0,
+				
+				/////////
+				classifyList: [], // 分类列表
+				classifyIndex: 0, // 分类选中下标
+				classifyListFilter: [],
+				swiperList: [], // 轮播图
 			};
 		},
 		onLoad() {
-			this.pageList()
-			this.actionInfo = this.coinList[this.actionIndex]
-			this.ascListsingle = this.ascList[this.ascListIndex]
-			this.getSwiper()
-			this.getListIficationBox()
+			// this.pageList()
+			// this.getSwiper()
+			// this.getListIficationBox()
 			this.getExclusive()
-
-			uni.getSystemInfo({
-				success: (data) => {
-					let custom = wx.getMenuButtonBoundingClientRect()
-					//导航栏高度
-					this.navHeight = custom.bottom + custom.top - data.statusBarHeight -6
-				},
-			})
+			this.getClassify()
+			this.getSwiper()
 		},
 		methods: {
+			
+			// 获取分类
+			getClassify() {
+				$http.post('/api/v1/mp/user/exchange/category/listTree', {}).then(res => {
+					if(res.code == 0){
+						let interval = 10
+						this.classifyList = res && res.rows
+						this.classifyList.forEach(item => {
+							item.picUrl = env.filePublic + item.picUrl.split(',')[0] + '?imageView2/2/w/340'
+							item.goodsCategoryList.forEach(ele => {
+								ele.picUrl = env.filePublic + ele.picUrl.split(',')[0] + '?imageView2/2/w/340'
+							})
+							item.list = []
+							if(item.goodsCategoryList.length > interval) {
+								let num = Math.ceil(item.goodsCategoryList.length / interval)
+								let arr = []
+								
+								let a = 0
+								let stop = interval
+								for(let i = 1; i <= num; i++) {
+									arr = item.goodsCategoryList.slice(a, stop)
+									a = i * interval
+									stop = stop + interval
+									
+								}
+							} else {
+								item.list.push(item.goodsCategoryList)
+							}
+						})
+						if(this.classifyList.length > interval) {
+							let num = Math.ceil(this.classifyList.length / interval)
+							let arr = []
+							
+							let a = 0
+							let stop = interval
+							for(let i = 1; i <= num; i++) {
+								arr = this.classifyList.slice(a, stop)
+								a = i * interval
+								stop = stop + interval
+								this.classifyListFilter.push(arr)
+							}
+						} else {
+							this.classifyListFilter =[ [ ...this.classifyList ] ]
+						}
+						this.classifyList.unshift({ name: '全部' })
+						
+					}
+					
+					console.log(this.classifyList);
+					console.log(this.classifyListFilter);
+				})
+			},
+			
+			// 切换分类
+			changeClassify(e) {
+				console.log(e);
+				this.classifyIndex = e.index
+				console.log(this.classifyIndex);
+			},
+			
 			changeIndicatorDots(e) {
 				this.indicatorDots = true
 			},
@@ -269,11 +209,9 @@
 					noToken: true,
 					location: "top"
 				}).then(res => {
-					res.data.forEach(item => {
-						let picUrlArr = item.picUrl.split(',')
-						item.picUrl = env.filePublic + picUrlArr[0]
-					})
-					this.imgTop = this.imgTop.concat(res.data)
+					res.data.forEach(item => item.picUrl = env.filePublic + item.picUrl.split(',')[0])
+					this.swiperList = res.data
+					console.log(this.swiperList);
 				})
 			},
 
@@ -282,6 +220,7 @@
 				$http.post(`/api/v1/mp/user/exchange/category/list`, {
 					noToken: true
 				}).then(res => {
+					console.log(res);
 					res.data.forEach(item => {
 						let picUrlArr = item.picUrl.split(',')
 						item.picUrl = env.filePublic + picUrlArr[0] + '?imageView2/2/w/340'
@@ -314,6 +253,7 @@
 					})
 				})
 				this.exclusiveSingle = goodsList
+				console.log(this.exclusiveSingle);
 			},
 
 
@@ -447,272 +387,201 @@
 		}
 	}
 </script>
-<style lang="scss" scoped>
-	.u-nav-slot {
-		text {
-			font-size: 32rpx;
-		}
-	}
-</style>
-<style lang="scss" scoped>
-	.swiper-ban {
-		background-color: #FFFFFF;
-		padding: 0 3px;
 
-		.uni-padding-wrap {
-			width: 95%;
-			margin: 0 auto;
-			border-radius: 10rpx;
-			overflow: hidden;
+<style lang="scss" scoped>
+	.core {
+		background-color: #fff;
+		
+		&-none {
+			height: 240rpx;
 		}
 	}
-
-	.uni-padding-wrap image {
+	
+	// 固定搜索、分类
+	.fixed-top {
+		position: fixed;
+		z-index: 100;
 		width: 100%;
-		height: 100%;
-	}
-
-	.classificationBox {
-		background-color: #FFFFFF;
-		display: grid;
-		grid-template-columns: 1fr 1fr 1fr 1fr;
-		font-size: 12px;
-
-		.ificationBox-mar {
-			margin: 0 auto;
-			text-align: center;
-			margin-top: 10px;
-			margin-bottom: 10px;
-		}
-	}
-
-	.ificationBox-mar img {
-		width: 44px;
-		height: 44px;
-		border-radius: 29px;
-	}
-
-	.sticky-wrap {
-
-		.sticky-nav {
-			border: 1px;
-			border-radius: 20rpx 20rpx 0 0;
-			background-color: #FFFFFF;
-			margin: 20rpx 20rpx 0 20rpx;
-
-
-			.sticky-nav-name {
-				color: #2f2f2f;
-				font-size: 18px;
-				line-height: 25px;
-				display: inline-block;
-				padding: 8px;
+		background-color: #fff;
+		
+		// 搜索
+		&-search {
+			justify-content: space-between;
+			padding: 14rpx 30rpx 34rpx;
+			
+			&__input {
+				position: relative;
+				flex: 1;
+				height: 84rpx;
+				padding-left: 46rpx;
+				background: #F4F5F6;
+				border-radius: 20rpx;
+				
+				&__btn {
+					position: absolute;
+					right: 0;
+					width: 110rpx;
+					height: 76rpx;
+					line-height: 76rpx;
+					font-size: 34rpx;
+					text-align: center;
+					font-weight: bold;
+					color: #FFC062;
+					background-color: #333333;
+					border-radius: 18rpx;
+				}
 			}
-
-			.sticky-nav-all {
-				width: 128px;
-				height: 40px;
-				text-align: right;
-				line-height: 40px;
-				color: #848484;
-				float: right;
-				display: grid;
-				grid-template-columns: 1fr 1fr;
+			
+			image {
+				width: 52rpx;
+				height: 52rpx;
+				margin-left: 50rpx;
 			}
 		}
-
-		.sticky-content-wrap {
-			margin: 0 20rpx;
-			border-radius: 0 0 20rpx 20rpx;
-			overflow: hidden;
-
-			.sticky-content-list {
+		
+		// 分类
+		&-classify {
+			padding-bottom: 20rpx;
+		}
+	}
+	
+	// 轮播
+	.core-swiper {
+		margin-bottom: 20rpx;
+		
+		&-centent {
+			height: 330rpx;
+			
+			.swiper-item {
 				width: 100%;
-				background-color: #FFFFFF;
-				justify-content: space-around;
-				flex-wrap: wrap;
-				padding-top: 20rpx;
-
-				&-item {
-					box-sizing: border-box;
-					width: 320rpx;
-					height: 460rpx;
-					background-color: #FFFFFF;
-					border-radius: 10rpx;
-					margin-bottom: 30rpx;
-
-					.iamge-wrap {
-						image {
-							border-radius: 10rpx;
-							width: 320rpx;
-							height: 320rpx;
-							margin-bottom: 6rpx;
-						}
-					}
-
-					.title {
-						padding: 0 14rpx;
-						font-size: 28rpx;
-						;
-						overflow: hidden;
-						text-overflow: ellipsis;
-						display: -webkit-box;
-						-webkit-box-orient: vertical;
-						-webkit-line-clamp: 2;
-					}
-
-					.bean {
-						padding: 0 14rpx;
-						display: flex;
-						align-items: center;
-						font-size: 32rpx;
-						line-height: 44rpx;
-						color: rgba(235, 112, 9, 100);
-						margin-top: 12rpx;
-
-						image {
-							width: 42rpx;
-							height: 42rpx;
-							margin-right: 16rpx;
-						}
-					}
-				}
-
-				&-item:last-child {
-					padding: 0;
-					height: 0;
+				height: 100%;
+				
+				image {
+					width: 100%;
+					height: 100%;
 				}
 			}
 		}
-
-		.sticky-content-wrap:last-child {
-			margin-bottom: 20rpx;
-		}
-
-	}
-
-	.screen-coin-shopin {
-		color: #2f2f2f;
-		font-size: 36rpx;
-		line-height: 16rpx;
-		display: inline-block;
-		padding: 18px 8px 0px 8px;
-	}
-
-	.screen-coin-select-text {
-		color: #848484;
 	}
-
-	.screen-coin-select-line {
-		border-right: 3rpx solid #848484;
-		width: 26rpx;
-		height: 26rpx;
-	}
-
-	.screen-coin {
+	
+	// 二级分类
+	.core-category {
 		width: 100%;
-		z-index: 10;
-		background-color: #FFFFFF;
-		border-top: 1px solid #F8F8F8;
-		box-shadow: 0 4rpx 10rpx 0 rgba(151, 151, 151, 0.24);
-
-		&-select {
-			height: 86rpx;
-			line-height: 86rpx;
-			width: 100%;
-			justify-content: flex-start;
-
-			.title {
-				padding-left: 20rpx;
-				margin-right: 10rpx;
-			}
-		}
-
-		&-list {
+		height: 360rpx;
+		margin-bottom: 34rpx;
+		
+		&-swiper {
+			
 			width: 100%;
-			background-color: #FFFFFF;
-			border-top: 1px solid #F8F8F8;
-
-			&-item {
-				height: 86rpx;
-				line-height: 86rpx;
-				background-color: #FFFFFF;
-				border-bottom: 1px solid #F8F8F8;
-			}
-
-			&-item:last-child {
-				border: 0;
-			}
-
-			.action {
-				color: $uni-text-color;
+			height: 100%;
+			
+			.swiper-item {
+				width: 100%;
+				height: 100%;
+				display: flex;
+				flex-wrap: wrap;
+				
+				&__content {
+					display: flex;
+					align-items: center;
+					flex-direction: column;
+					justify-content: space-between;
+					width: 20%;
+					height: 50%;
+					
+					image {
+						width: 90%;
+						height: 70%;
+					}
+				}
 			}
 		}
 	}
-
-	.core {
-		margin: 20rpx 0;
-
-		&-list {
-			justify-content: space-evenly;
-			flex-wrap: wrap;
-
-			&-item {
-				box-sizing: border-box;
-				width: 340rpx;
-				height: 502rpx;
-				background-color: #FFFFFF;
-				border-radius: 10rpx;
-				margin-bottom: 30rpx;
-
-				.iamge-wrap {
+	
+	// 标签商品
+	.tag-goods {
+		border-top: 2px solid #191919;
+		border-bottom: 2px solid #191919;
+		padding: 4rpx 0;
+		margin-bottom: 34rpx;
+		
+		&-content {
+			background-color: #191919;
+			padding: 26rpx 32rpx;
+			
+			&-nav {
+				justify-content: space-between;
+				height: 40rpx;
+				margin-bottom: 34rpx;
+				
+				&__left {
 					image {
-						border-top-left-radius: 10rpx;
-						border-top-right-radius: 10rpx;
-						width: 340rpx;
-						height: 340rpx;
-						margin-bottom: 6rpx;
+						width: 40rpx;
+						height: 30rpx;
+					}
+					
+					.title {
+						font-family: YouSheBiaoTiHei;
+						font-weight: 400;
+						font-size: 40rpx;
+						color: #FFFFFF;
+						padding: 0 36rpx;
 					}
 				}
-
-				.title {
-					padding: 0 14rpx;
-					font-size: 28rpx;
-					// line-height: 40rpx;
-					overflow: hidden;
-					text-overflow: ellipsis;
-					display: -webkit-box;
-					-webkit-box-orient: vertical;
-					-webkit-line-clamp: 2;
-				}
-
-				.bean {
-					padding: 0 14rpx;
-					display: flex;
-					align-items: center;
-					font-size: 32rpx;
-					line-height: 44rpx;
-					color: rgba(235, 112, 9, 100);
-					margin-top: 12rpx;
-
+				
+				&__right {
+					.title {
+						font-family: YouSheBiaoTiHei;
+						font-weight: 400;
+						color: #FFFFFF;
+						margin-right: 12rpx;
+					}
+					
 					image {
-						width: 42rpx;
-						height: 42rpx;
-						margin-right: 16rpx;
+						width: 22rpx;
+						height: 20rpx;
 					}
 				}
 			}
-
-			&-item:last-child {
-				padding: 0;
-				height: 0;
+			
+			&-list {
+				display: flex;
+				height: 260rpx;
+				overflow-x: auto;
+				
+				&-item {
+					flex-direction: column;
+					margin-right: 14rpx;
+					
+					.image {
+						width: 220rpx;
+						height: 200rpx;
+						background: #FFFFFF;
+						box-shadow: 0px 0px 4px 0px rgba(100, 100, 100, 0.13);
+						border-radius: 4rpx;
+						margin-bottom: 24rpx;
+						
+						image {
+							width: 100%;
+							height: 100%;
+						}
+					}
+					
+					.title {
+						text-align: center;
+						line-height: 28rpx;
+						color: #FFFFFF;
+					}
+				}
 			}
 		}
-
-		.empty {
-			height: 60vh;
-		}
 	}
+	
 </style>
 <style lang="scss" scoped>
+	.u-nav-slot {
+		text {
+			font-size: 32rpx;
+		}
+	}
 </style>

+ 2 - 2
pages/ticketBox/detail.vue

@@ -23,7 +23,7 @@
 			
 			<!-- 奖品 -->
 			<swiper class="prize-swiper" previous-margin="100px" next-margin="100px" :interval="4000" :autoplay="true" :circular="true" @change="changePrizeSwiper">
-				<swiper-item :class="prizeIndex == index ? 'swiper-item' : 'swiper-item-side'" v-for="(item, index) in prizeList.slice(0, 11)" :key="index">
+				<swiper-item :class="prizeIndex == index ? 'swiper-item' : 'swiper-item-side'" v-for="(item, index) in prizeList.slice(0, 10)" :key="index">
 					<view class="prize-swiper-item flex">
 						<image :class="prizeIndex == index ? 'img' : 'img-side'" :src="item.picUrl" mode="aspectFit"></image>
 					</view>
@@ -56,7 +56,7 @@
 		<!-- 盲票奖品说明 -->
 		<view class="explain flex">
 			<image class="image-left" src="../../static/ticketBox/ticket_explain_left.png" mode="aspectFit"></image>
-			<view class="explain-title">开必出以下宝贝之一</view>
+			<view class="explain-title">开必出以下宝贝之一</view>
 			<image class="image-right" src="../../static/ticketBox/ticket_explain_right.png" mode="aspectFit"></image>
 		</view>
 		

BIN
static/core/core_block.png


BIN
static/core/core_right.png


BIN
static/core/core_tag.png


+ 0 - 0
packageGoods/static/goods_coin.png → static/public/goods_coin.png