项目日志:11.18产品详情静态

pages.json

@@ -1,13 +1,6 @@
 {
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
-		{
-			"path": "pages/goods/goods-detail/index",
-			"style": {
-				"navigationBarTitleText": "产品详情",
-				"enablePullDownRefresh": false
-			}
 		
-		},
 		{
 			"path": "pages/index/index",
 			"style": {
@@ -50,6 +43,14 @@
 				"enablePullDownRefresh": false
 			}
 		
+		},
+		{
+			"path": "pages/goods/goods-detail/index",
+			"style": {
+				"navigationBarTitleText": "产品详情",
+				"enablePullDownRefresh": false
+			}
+		
 		},
 		{
 			"path": "pages/map/map",
@@ -66,6 +67,22 @@
 				"enablePullDownRefresh": false
 			}
 
+		},
+		{
+			"path": "pages/login/login",
+			"style": {
+				"navigationBarTitleText": "登录账号",
+				"enablePullDownRefresh": false
+			}
+		
+		},
+		{
+			"path": "pages/login/youyue",
+			"style": {
+				"navigationBarTitleText": "登录账号",
+				"enablePullDownRefresh": false
+			}
+		
 		},
 		{
 
@@ -184,6 +201,24 @@
 		        "enablePullDownRefresh": false
 		    }
 		    
+		},
+		{
+		    "path" : "pages/my/integral/integralOrder",
+		    "style" :                                                                                    
+		    {
+		        "navigationBarTitleText": "积分兑换",
+		        "enablePullDownRefresh": false
+		    }
+		    
+		},
+		{
+		    "path" : "pages/my/integral/integralExchange",
+		    "style" :                                                                                    
+		    {
+		        "navigationBarTitleText": "兑换详情",
+		        "enablePullDownRefresh": false
+		    }
+		    
 		},
 		{
 		    "path" : "pages/my/prize/prize",

pages/login/login.vue

@@ -0,0 +1,107 @@
+<template>
+	<view class="login">
+		<view class="img">
+			<image src="/static/icon/loginBg.png" mode="scaleToFill"></image>
+		</view>
+		<view class="title">
+			<view class="line"></view>
+			<view class="logintype"><text>登录方式</text></view>
+			<view class="line"></view>
+		</view>
+		<view class="typebtn">
+			<view class="item" @click="goYouyue">
+				<image src="/static/icon/youyue.png" mode="scaleToFill"></image>
+				<text>加入优悦会</text>
+			</view>
+			<view class="item">
+				<image src="/static/icon/wechart.png" mode="scaleToFill"></image>
+				<text>微信登录</text>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default{
+		data(){
+			return{
+				
+			}
+		},
+		methods:{
+			// 加入优悦会
+			goYouyue(){
+				uni.navigateTo({
+					url:'/pages/login/youyue'
+				})
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	$pageColor:#F9F9F9;
+	$bgColor:#FFFFFF;
+	.login{
+		height: 100%;
+		background:$bgColor ;
+		padding-top:146rpx;
+		box-sizing: border-box;
+	}
+	.img{
+		image{
+			width: 750rpx;
+			height: 596rpx;
+		}
+	}
+	.title{
+		height: 40rpx;
+		width: 690rpx;
+		margin-top: 168rpx;
+		margin-left: 30rpx;
+		margin-bottom: 72rpx;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		.line{
+			width: 240rpx;
+			height: 2rpx;
+			background: #EDEDED;
+			border-radius: 1rpx;
+		}
+		.logintype{
+			text{
+				font-size: 28rpx;
+				font-family: PingFang-SC-Medium, PingFang-SC;
+				font-weight: 500;
+				color: #333333;
+			}
+		}
+		
+	}
+	.typebtn{
+		display: flex;
+		align-items: center;
+		justify-content: space-around;
+		.item{
+			width: 140rpx;
+			height: 156rpx;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			justify-content: center;
+			image{
+				width: 104rpx;
+				height: 104rpx;
+				margin-bottom: 12rpx;
+			}
+			text{
+				display: block;
+				font-size: 28rpx;
+				font-family: PingFang-SC-Medium, PingFang-SC;
+				font-weight: 500;
+				color: #666666;
+			}
+		}
+	}
+</style>

pages/login/youyue.vue

@@ -0,0 +1,194 @@
+<template>
+	<view class="youyue">
+		<view class="nav">
+			<image src="/static/icon/logo@2x.png"></image>
+		</view>
+		<view class="title">
+			IHG优悦会忠诚计划优悦随行悦享世界
+		</view>
+		<view class="detail">
+			<view><text>HG优悦会是洲际酒店集团的会员忠诚计划。在全球拥有超过1亿会员。</text></view>
+			<view><text> 即刻加入HG优悦会，一键开启会员专享价及会员专属礼遇。轻松赚取积分，使用灵活的积分兑换及竞拍，畅享独特且多元的犒赏体验。</text></view>
+		</view>
+		
+		<view class="divided"></view>
+		
+		<view class="item"><text class="itemtitle">优悦会会员权益</text></view>
+		
+		<view class="divided"></view>
+		
+		<view class="item"><text class="itemtitle">入会第一天起即可臻享礼遇</text></view>
+		
+		<view class="divided"></view>
+		
+		<view class="item" ><text class="itemtitle">赚取酒店积分兑换奖励住宿以及更多</text>
+		</view>
+		
+		<view class="itemcontent">积分不仅可以兑换体验，目录商品等，还可以兑换全球6000等多个目的地奖励住宿</view>
+		
+		<view class="divided"></view>
+		
+		<view class="item"><text class="itemtitle">会员促销</text></view>
+		
+		<view class="itemcontent">尽情享受会员促销，赚取更多奖励积分</view>
+		<view class="item"><text class="itemtitle">畅享网络</text></view>
+		
+		<view class="itemLast">我们所有酒店均提供免费WIFI，让您始终顺畅连通</view>
+		
+		<view class="btn">
+			<text>立即加入会员</text>
+		</view>
+		
+		<view class="logintitle">
+			<view class="line"></view>
+			<view class="logintype"><text>其他登录</text></view>
+			<view class="line"></view>
+		</view>
+		<view class="typebtn">
+			<view class="item">
+				<image src="/static/icon/wechart.png" mode="scaleToFill"></image>
+				<text>微信登录</text>
+			</view>
+		</view>
+		
+	</view>
+</template>
+
+<script>
+</script>
+
+<style lang="scss" scoped>
+	$pageColor:#F9F9F9;
+	$bgColor:#FFFFFF;
+	
+	.youyue{
+		height: 100%;
+		background: $bgColor;
+		padding: 192rpx 30rpx 140rpx 30rpx;
+		position: relative;
+	}
+	.nav{
+		position: absolute;
+		top:0rpx;
+		left: 0rpx;
+		image{
+			width: 750rpx;
+			height: 142rpx;
+		}
+	}
+	.title{
+		width: 400rpx;
+		height: 120rpx;
+		font-size: 44rpx;
+		font-family: PingFang-SC-Bold, PingFang-SC;
+		font-weight: bold;
+		color: #333333;
+		line-height: 60rpx;
+		margin-bottom: 64rpx;
+	}
+	.detail{
+		width: 690rpx;
+		height: 220rpx;
+		margin-bottom: 64rpx;
+		text{
+			font-size: 32rpx;
+			font-family: PingFang-SC-Medium, PingFang-SC;
+			font-weight: 500;
+			color: #333333;
+		}
+	}
+	.divided{
+		width: 690rpx;
+		height: 2rpx;
+		background: #F0F0F0;
+	}
+	.item{
+		margin: 40rpx 0;
+		.itemtitle{
+			font-size: 32rpx;
+			font-family: PingFang-SC-Bold, PingFang-SC;
+			font-weight: bold;
+			color: #333333;
+		}
+	}
+	.itemcontent{
+		margin-bottom: 40rpx;
+		width: 512rpx;
+		font-size: 28rpx;
+		font-family: PingFang-SC-Medium, PingFang-SC;
+		font-weight: 500;
+		color: #333333;
+	}
+	.itemLast{
+		width: 690rpx;
+		font-size: 24rpx;
+		font-family: PingFang-SC-Medium, PingFang-SC;
+		font-weight: 500;
+		color: #333333;
+		margin-bottom: 64rpx;
+	}
+	.btn{
+		width: 688rpx;
+		height: 92rpx;
+		background: linear-gradient(270deg, #FF6200 0%, #FF9342 100%);
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		border-radius: 12rpx;
+		text{
+			font-size: 30rpx;
+			font-family: PingFang-SC-Bold, PingFang-SC;
+			font-weight: bold;
+			color: #FFFFFF;
+		}
+	}
+	.logintitle{
+		height: 40rpx;
+		width: 690rpx;
+		margin-top: 64rpx;
+		margin-bottom: 64rpx;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		.line{
+			width: 240rpx;
+			height: 2rpx;
+			background: #EDEDED;
+			border-radius: 1rpx;
+		}
+		.logintype{
+			text{
+				font-size: 28rpx;
+				font-family: PingFang-SC-Medium, PingFang-SC;
+				font-weight: 500;
+				color: #333333;
+			}
+		}
+		
+	}
+	.typebtn{
+		display: flex;
+		align-items: center;
+		justify-content: space-around;
+		.item{
+			width: 140rpx;
+			height: 156rpx;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			justify-content: center;
+			image{
+				width: 104rpx;
+				height: 104rpx;
+				margin-bottom: 12rpx;
+			}
+			text{
+				display: block;
+				font-size: 28rpx;
+				font-family: PingFang-SC-Medium, PingFang-SC;
+				font-weight: 500;
+				color: #666666;
+			}
+		}
+	}
+</style>

pages/my/integral/integral.vue

@@ -26,8 +26,10 @@
 			<view class="listTop">
 				<text>积分兑换</text>
 			</view>
+			
+			
 			<view class="ListContent">
-				<view class="contentItem" v-for="item in 4">
+				<view class="contentItem" v-for="item in 4" @click="goIntegralOrder">
 					<image src="/static/icon/Kudosbg.png"></image>
 					<view class="itemName">中秋佳节五仁月饼，惊喜特供，限时抢购</view>
 					<view class="itemPrice">6000积分</view>
@@ -63,6 +65,12 @@
 				uni.navigateTo({
 					url:'/pages/my/integral/integralRecord'
 				})
+			},
+			// 跳转积分兑换
+			goIntegralOrder(){
+				uni.navigateTo({
+					url:'/pages/my/integral/integralOrder'
+				})
 			}
 		}
 	}
@@ -156,10 +164,10 @@
 			display: flex;
 			flex-wrap: wrap;
 			box-sizing: border-box;
-			.contentItem:nth-child(2n+1){
+			.contentItem{
 				width: 332rpx;
 				height: 578rpx;
-				margin-right: 26rpx;
+				margin-right: 13rpx;
 				background: $bgColor;
 				box-sizing: border-box;
 				box-shadow: 0px 4rpx 8rpx 0px rgba(0,0,0,0.04);
@@ -184,32 +192,6 @@
 					color: #FF6200;
 				}
 			}
-			.contentItem:nth-child(2n){
-				width: 332rpx;
-				height: 510rpx;
-				box-sizing: border-box;
-				background: $bgColor;
-				box-shadow: 0px 4rpx 8rpx 0px rgba(0,0,0,0.04);
-				border-radius: 12rpx;
-				image{
-					width: 332rpx;
-					height: 332rpx;
-				}
-				.itemName{
-					margin:0 18rpx 20rpx 22rpx ;
-					font-size: 28rpx;
-					font-family: PingFang-SC-Bold, PingFang-SC;
-					font-weight: bold;
-					color: #333333;
-				}
-				.itemPrice{
-					margin-left: 22rpx;
-					font-size: 28rpx;
-					font-family: PingFang-SC-Bold, PingFang-SC;
-					font-weight: bold;
-					color: #FF6200;
-				}
-			}
 			
 		}
 	}

pages/my/integral/integralExchange.vue

@@ -0,0 +1,139 @@
+<template>
+	<view class="exchangeDetail">
+		
+		<view class="detailCard">
+			<image src="/static/icon/success.png"></image>
+			<text style="margin-bottom: 20rpx;">商品兑换成功</text>
+			<text>-5000积分</text>
+		</view>
+		
+		<view class="btn">
+			<view class="back" @click="goBack">
+				<text>返回首页</text>
+			</view>
+			<view class="checkout">
+				<text>查看订单</text>
+			</view>
+		</view>
+		
+		<view class="bottomCard">
+			<image src="/static/icon/Kudosbg.png"></image>
+			<view class="content">
+				<text>立即加入IHG会员</text>
+				<image src="/static/icon/right.png" style="width: 12rpx;height: 20rpx; position: absolute;bottom:36rpx;left: 475rpx;"></image>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default{
+		data(){
+			return{
+				
+			}
+		},
+		methods:{
+			// 返回首页
+			goBack(){
+				uni.reLaunch({
+					url:'/pages/my/my'
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	$pageColor:#F9F9F9;
+	$bgColor:#FFFFFF;
+	@mixin flexlayout {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+	.exchangeDetail{
+		height:100%;
+		background:$pageColor ;
+	}
+	.detailCard{
+		width: 750rpx;
+		height: 446rpx;
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		image{
+			width: 120rpx;
+			height: 120rpx;
+			margin-bottom: 48rpx;
+		}
+		text{
+			display: block;
+			font-size: 32rpx;
+			font-family: PingFangSC-Medium, PingFang SC;
+			font-weight: 500;
+			color: #080F18;
+		}
+	}
+	.btn{
+		width: 750rpx;
+		height: 76rpx;
+		display: flex;
+		justify-content: space-around;
+		align-items: center;
+		.back{
+			width: 332rpx;
+			height: 76rpx;
+			background: #F5F5F5;
+			border-radius: 8rpx;
+			@include flexlayout()
+			text{
+				font-size: 30rpx;
+				font-family: PingFang-SC-Bold, PingFang-SC;
+				font-weight: bold;
+				color: #FF6301;
+			}
+		}
+		.checkout{
+			width: 332rpx;
+			height: 76rpx;
+			background: linear-gradient(270deg, #FF6200 0%, #FF9342 100%);
+			border-radius: 8rpx;
+			@include flexlayout()
+			text{
+				font-size: 30rpx;
+				font-family: PingFang-SC-Bold, PingFang-SC;
+				font-weight: bold;
+				color: #FFFFFF;
+			}
+		}
+	}
+	.bottomCard{
+		width: 690rpx;
+		height: 584rpx;
+		background: #FFFFFF;
+		box-shadow: 0px 8rpx 16rpx 0px rgba(220,222,229,0.71);
+		border-radius: 20rpx;
+		background:$bgColor ;
+		margin-left: 30rpx;
+		margin-top: 64rpx;
+		image{
+			width: 690rpx;
+			height: 492rpx;
+		}
+		.content{
+			width: 690rpx;
+			height: 92rpx;
+			position: relative;
+			@include flexlayout()
+			text{
+				font-size: 30rpx;
+				font-family: PingFang-SC-Medium, PingFang-SC;
+				font-weight: 500;
+				color: #333333;
+				text-shadow: 0px 8rpx 16rpx rgba(220,222,229,0.71);
+			}
+		}
+	}
+</style>

pages/my/integral/integralOrder.vue

@@ -0,0 +1,213 @@
+<template>
+	<view class="exchangePrize">
+		<view class="form">
+			<uni-forms :modelValue="formData" >
+				<uni-forms-item  name="type" v-if="istype">
+					<view class="selectType">
+						<picker mode="selector" :value="formData.type" :range='typeSelect'
+							@change="bindTypeChange">
+							<view class="uni-input" >
+								<text v-if="formData.type==''||formData.type==null"
+									style="color: #999999 ;">请选择配送方式</text>
+								<text v-if="formData.type!=''">{{formData.type}}</text>
+							</view>
+							<image src="/static/icon/right.png"
+								style="width: 14rpx;height: 24rpx;position: absolute;top:31rpx;right: 30rpx;"></image>
+						</picker>
+					</view>
+				</uni-forms-item>
+				<uni-forms-item  name="name" v-if="formData.type!=''">
+					<uni-easyinput type="text" v-model="formData.name" placeholder="填写联系人" />
+				</uni-forms-item>
+				<uni-forms-item  name="phone" v-if="formData.type!=''">
+					<uni-easyinput type="number" v-model="formData.phone" placeholder="填写联系电话" />
+				</uni-forms-item>
+				<uni-forms-item  name="region" v-if="formData.type=='快递配送'">
+					<uni-easyinput type="text" v-model="formData.region" placeholder="所在地区" />
+				</uni-forms-item>
+				<uni-forms-item  name="region" v-if="formData.type=='快递配送'">
+					<uni-easyinput type="text" v-model="formData.region" placeholder="详细地址" />
+				</uni-forms-item>
+				<uni-forms-item  name="region" v-if="formData.type=='到店自提'">
+					<uni-easyinput type="text" v-model="formData.region" placeholder="选择门店" />
+				</uni-forms-item>
+				
+			</uni-forms>
+		</view>
+		
+		<view class="msg">
+			<view class="title">
+				<text>产品信息</text>
+			</view>
+			<view class="shopCard">
+				<image  src="/static/icon/Kudosbg.png"></image>
+				<view style="margin-left: 24rpx;">
+					<text class="name">端午佳节五香肉粽子，仅限前</text>
+					<text class="tag">礼盒装 </text>
+				</view>
+			</view>
+			<view class="shopNumber">
+				<text>件数</text>
+				<text>1件</text>
+			</view>
+			<view class="shopNumber">
+				<text>积分</text>
+				<text>2000积分</text>
+			</view>
+			<view style="width: 694rpx;height: 4rpx;border: 2rpx solid #F2F2F2;margin-top: 38rpx;"></view>
+			<view class="shopNumber">
+				<text>合计</text>
+				<text>2000积分</text>
+			</view>
+		</view>
+		
+		<view class="bottombtn" >
+			<view class="btnitem" @click="goExDetail">
+				<text>确认兑换</text>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data(){
+			return{
+				formData:{
+					type:'',
+					phone:'',
+					name:'',
+					region:'',
+					address:'',
+				},
+				typeSelect:['快递配送','到店自提'],
+				istype:'true',
+			}
+		},
+		methods:{
+			// 选择快递方式
+			bindTypeChange:function(e){
+				if(e.detail.value==0){
+					this.formData.type='快递配送'
+				}else{
+					this.formData.type='到店自提'
+				}
+			},
+			// 跳转积分兑换详情
+			goExDetail(){
+				uni.navigateTo({
+					url:'/pages/my/integral/integralExchange'
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	$pageColor:#F9F9F9;
+	$bgColor:#FFFFFF;
+	@mixin flexlayout {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+	.exchangePrize{
+		height: 100%;
+		background:$bgColor ;
+	}
+	
+	.form{
+		background:$pageColor ;
+		width: 750rpx;
+		// height: 690rpx;
+		padding:24rpx 30rpx;
+		box-sizing: border-box;
+		.selectType{
+			width: 690rpx;
+			height: 98rpx;
+			background: #FFFFFF;
+			border-radius: 8rpx;
+			border: 2px solid #EAEAEA;
+			display: flex;
+			align-items:center;
+			padding-left: 20rpx; 
+			box-sizing: border-box;
+			position: relative;
+		}
+	}
+	.msg{
+		width: 750rpx;
+		height: 700rpx;
+		background:$bgColor;
+		border-radius: 12rpx 12rpx 0px 0px;
+		padding:32rpx 30rpx;
+		.title{
+			margin-bottom: 24rpx;
+			text{
+				font-size: 32rpx;
+				font-family: PingFang-SC-Bold, PingFang-SC;
+				font-weight: bold;
+				color: #080F18;
+			}
+		}
+		.shopCard{
+			margin-top: 28rpx;
+			width: 694rpx;
+			height: 164rpx;
+			background: #F4F5F6;
+			border-radius: 10rpx;
+			display: flex;
+			align-items: center;
+			image{
+				width: 132rpx;
+				height: 132rpx; 
+				margin-left: 16rpx;
+				display: inline-block;
+			}
+			.name{
+				font-size: 28rpx;
+				font-family: PingFangSC-Medium, PingFang SC;
+				font-weight: 500;
+				color: #080F18;
+				display: block;
+			}
+			.tag{
+				font-size: 24rpx;
+				font-family: PingFang-SC-Medium, PingFang-SC;
+				font-weight: 500;
+				color: #666666;
+			}
+		}
+		.shopNumber{
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			margin-top: 25rpx;
+			text{
+				font-size: 26rpx;
+				font-family: PingFang-SC-Medium, PingFang-SC;
+				font-weight: 500;
+				color: #000000;
+			}
+		}
+	}
+	.bottombtn{
+		width: 690rpx;
+		height: 92rpx;
+		background: linear-gradient(270deg, #FF6200 0%, #FF9342 100%);	
+		border-radius: 12rpx;
+		margin-left: 30rpx;
+		position: fixed;
+		bottom: 72rpx;
+		@include flexlayout()
+		.btnitem{
+			@include flexlayout()
+			text{
+				font-size: 30rpx;
+				font-family: PingFang-SC-Bold, PingFang-SC;
+				font-weight: bold;
+				color: $bgColor;
+			}
+		}
+	}
+</style>

pages/my/integral/integralRecord.vue

@@ -2,11 +2,18 @@
 	<view class="integralRecord">
 		<!-- 分段器 -->
 		<view class="segmented">
-			<uni-segmented-control :current="current" :values="items" @clickItem="onClickItem" styleType="text"
-				activeColor="#DDB15B"></uni-segmented-control>
+			<!-- <uni-segmented-control :current="current" :values="items" @clickItem="onClickItem" styleType="text"
+				activeColor="#DDB15B"></uni-segmented-control> -->
+				<view class="tab_nav">
+					<view class="navTitle" v-for="(item,index) in items" :key="index">
+						<view :class="{'active':isActive == index}" @click="checked(index)">
+							{{item}}
+						</view>
+					</view>
+				</view>
 		</view>
 		
-		<view class="List" :style="{'--height':ListHeight+'rpx'}" v-if="current == 0">
+		<view class="List" :style="{'--height':ListHeight+'rpx'}" v-if="isActive == 0">
 			<view class="ListItem" v-for="item in 5">
 				<view style="display: flex; justify-content: space-between;">
 					<view class="title"><text>500积分</text> </view>
@@ -15,7 +22,7 @@
 				<view class="content"><text>投票活动奖励</text></view>
 			</view>
 		</view>
-		<view class="List" :style="{'--height':ListHeight+'rpx'}" v-if="current == 1">
+		<view class="List" :style="{'--height':ListHeight+'rpx'}" v-if="isActive == 1">
 			<view class="ListItem" v-for="item in 5">
 				<view style="display: flex; justify-content: space-between;">
 					<view class="title"><text>500积分</text> </view>
@@ -35,6 +42,7 @@
 			return{
 				// 分段器
 				items: ['收入', '支出',],
+				isActive: 0,
 				current: 0,
 				// list高度
 				ListHeight: 800,
@@ -48,11 +56,15 @@
 			}
 		},
 		methods:{
+			//菜单index切换
+			checked(index) {
+				this.isActive = index
+			},
 			onClickItem(e) {
 				if (this.current != e.currentIndex) {
 					this.current = e.currentIndex;
 				}
-			}
+			},
 		}
 	}
 </script>
@@ -76,6 +88,42 @@
 		background: $bgColor;
 		box-shadow: 0px 4rpx 8rpx 0px rgba(0,0,0,0.04);
 		border-radius: 0px 0px 16rpx 16rpx;
+		//菜单切换
+		.tab_nav {
+			width: 690rpx;
+			margin-left: 30rpx;
+			padding:0 80rpx;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			font-family: PingFang-SC-Heavy, PingFang-SC;
+		}
+		.tab_nav .navTitle {
+			@include flexlayout()
+			margin-top: 20rpx;
+			width: 128rpx;
+			flex: none;
+			height: 28rpx;
+			font-size: 32rpx;
+			color: #666;
+			position: relative;
+		}
+		.active {
+			color: #D9A94D;
+			font-weight: bold;
+		
+			&::after {
+				display: inline-block;
+				content: '';
+				width: 48rpx;
+				height: 12rpx;
+				background: linear-gradient(90deg, #F3D69F 0%, #D9A94D 100%);
+				border-radius: 6px;
+				position: absolute;
+				bottom: -40rpx;
+				left: 40rpx;
+			}
+		}
 	}
 	::v-deep .segmented-control__text {
 		font-size: 32rpx !important;

pages/my/my.vue

@@ -3,9 +3,9 @@
 	<view class="my">
 		<view class="topCard">
 			<view class="user">
-				<image src="/static/icon/avatar.png" style="height: 176rpx;width: 176rpx;"></image>
+				<image src="/static/icon/avatar.png" style="height: 176rpx;width: 176rpx;" ></image>
 				<view class="userinfo">
-					<text class="unlogin" v-if="!islogin">请点击登录</text>
+					<text class="unlogin" v-if="!islogin" @click="login">请点击登录</text>
 					<text class="username" v-if="islogin" @click="goPersonData">用户oo1</text>
 					<text class="userId" v-if="islogin" @click="goPersonData">ID23923</text>
 				</view>
@@ -82,7 +82,7 @@
 		},
 		data() {
 			return {
-				islogin: true,
+				islogin: false,
 				list:[{
 					title:'积分',
 					content:'积分兑换奖品'
@@ -96,6 +96,12 @@
 			};
 		},
 		methods:{
+			// 跳转登录页
+			login(){
+				uni.navigateTo({
+					url:'/pages/login/login'
+				})
+			},
 			// 跳转个人信息
 			goPersonData(){
 				uni.navigateTo({
@@ -134,26 +140,54 @@
 						break;
 					case 1:
 						uni.navigateTo({
-							url:'/pages/my/myorders/orders?current='+1
+							url:'/pages/my/myorders/orders?isActive='+1
 						})
 					break;
 					case 2:
 						uni.navigateTo({
-							url:'/pages/my/myorders/orders?current='+2
+							url:'/pages/my/myorders/orders?isActive='+2
 						})
 					break;
 					case 3:
 						uni.navigateTo({
-							url:'/pages/my/myorders/orders?current='+3
+							url:'/pages/my/myorders/orders?isActive='+3
 						})
 					break;
 					case 4:
 						uni.navigateTo({
-							url:'/pages/my/myorders/orders?current='+4
+							url:'/pages/my/myorders/orders?isActive='+4
 						})
 					break;
 				}
 				
+			},
+			// 上传头像
+			uploadAvatar(){
+				// let img = []
+				// uni.chooseImage({
+				// 	count: 1, //默认9
+				// 	sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
+				// 	sourceType: ['album'], //从相册选择
+				// 	success: function (res) {
+				// 		console.log(JSON.stringify(res.tempFilePaths));
+				// 		img = res.tempFilePaths[0]
+				// 		uni.uploadFile({
+				// 			//后端接口地址
+				// 			url: `${baseUrl}` + '/api/attachment/upload',
+				// 			//图片临时地址
+				// 			filePath: img,
+				// 			// 上传文件类型
+				// 			formData: {
+				// 				tag: 'avatar'
+				// 			},
+				// 			success: (res) => {
+				// 				//后端返回的图片名称
+				// 				let data = JSON.parse(res.data)
+				// 				// _this.formData.avatar = data.data.file
+				// 			},
+				// 		})
+				// 	},
+				// });
 			}
 		}
 	}

pages/my/myorders/orderDetail.vue

@@ -1,8 +1,372 @@
 <template>
+	<view class="orderDetail">
+
+		<view class="nav">
+			<text class="orderStatus">待收货</text>
+		</view>
+
+		<view class="midBox">
+			<!-- 物流信息 -->
+			<view class="logistics" v-if="true">
+				<view class="logisticsTitle">物流信息</view>
+				<view class="logisticsMsg"><text>快递公司</text><text style="margin-left: 26rpx;">京东快递</text></view>
+				<view class="logisticsMsg"><text>快递单号</text><text style="margin-left: 26rpx;">JD39084237234</text>
+				</view>
+				<view class="copy" @click="copyOrder">复制</view>
+			</view>
+
+			<view class="delivery">
+				<view class="deliveryTitle">
+					<text>配送信息</text>
+				</view>
+				<view class="deliveryMsg" >
+					<image class="bgimg" src="../../../static/icon/ordermap.png"></image>
+					<!-- 联系信息 -->
+					<view class="deliveryicon">
+						<image src="/static/icon/phone.png"></image>
+						<text>联系信息</text>
+					</view>
+					<view class="deliverytext">
+						<text>刘奕伶</text>
+						<text style="margin-left: 24rpx;">400-123-4567</text>
+					</view>
+
+					<!-- 发货方式 -->
+					<view class="deliveryicon">
+						<image src="/static/icon/delivery.png"></image>
+						<text>发货方式</text>
+					</view>
+					<view class="deliverytext">
+						<text>快递发货</text>
+					</view>
+
+					<!-- 收货地址 -->
+					<view class="deliveryicon" v-if="true">
+						<image src="/static/icon/position.png"></image>
+						<text>收货地址</text>
+					</view>
+					<view class="deliverytext" v-if="true">
+						<text>四川省 成都市 高新区 XXX小区 XXX号</text>
+					</view>
+
+					<!-- 门店地址 -->
+					<view class="deliveryicon" v-if="false">
+						<image src="/static/icon/position.png"></image>
+						<text>门店地址</text>
+					</view>
+					<view class="deliverytext" v-if="false" style="position:relative;">
+						<text>四川省 成都市 高新区 XXX小区 XXX号</text>
+						<image src="/static/icon/navigation.png"
+							style="width: 50rpx;height: 48rpx; position: absolute; top: 0rpx;right: 30rpx;"></image>
+					</view>
+
+					<!-- 门店联系方式 -->
+					<view class="deliveryicon" v-if="false">
+						<image src="/static/icon/phone.png"></image>
+						<text>门店联系方式</text>
+					</view>
+					<view class="deliverytext" v-if="false">
+						<text>400-123-4567</text>
+					</view>
+				</view>
+			</view>
+
+			<view class="myorder">
+				<view class="orderTitle">订单信息</view>
+				<view class="orderMsg"><text>订单编号</text><text style="margin-left: 26rpx;">62aae0eb9c6fd622</text></view>
+				<view class="orderMsg"><text>下单时间</text><text style="margin-left: 26rpx;">2022-08-20 12:32:12</text>
+				</view>
+				<view class="copyorder" @click="copyOrder">复制</view>
+			</view>
+		</view>
+
+		<!-- 产品信息 -->
+		<view class="shopMsg">
+			<view class="title">
+				<text>产品信息</text>
+			</view>
+			<view class="shopCard">
+				<image src="/static/icon/Kudosbg.png"></image>
+				<view style="margin-left: 24rpx;">
+					<text class="name">端午佳节五香肉粽子，仅限前</text>
+					<text class="tag">礼盒装 2000积分</text>
+				</view>
+			</view>
+			<view class="shopNumber">
+				<text>件数</text>
+				<text>1件</text>
+			</view>
+			<view class="shopNumber">
+				<text>积分</text>
+				<text>2000积分</text>
+			</view>
+			<view style="width: 694rpx;height: 4rpx;border: 2rpx solid #F2F2F2;margin-top: 38rpx;"></view>
+			<view class="shopNumber">
+				<text>合计</text>
+				<text>2000积分</text>
+			</view>
+		</view>
+	</view>
 </template>
 
 <script>
+	export default {
+		data() {
+			return {
+			}
+		},
+		
+		methods: {
+			// 复制订单号
+			copyOrder(){
+				uni.setClipboardData({
+					data: 'hello',
+					success: function () {
+						uni.showToast({
+							title:'复制成功!'
+						})
+					}
+				});
+			}
+		},
+		computed: {
+			
+		}
+	}
 </script>
 
-<style>
-</style>
+<style lang="scss" scoped>
+	$pageColor:#F9F9F9;
+	$bgColor:#FFFFFF;
+
+	// flex布局居中对齐
+	@mixin flexlayout {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.orderDetail {
+		height: 100%;
+		background: $pageColor;
+	}
+
+	.nav {
+		width: 750rpx;
+		height: 108rpx;
+		background: $bgColor;
+		border-radius: 0px 0px 16rpx 16rpx;
+		padding: 32rpx 0 0 28rpx;
+		box-sizing: border-box;
+
+		.orderStatus {
+			font-size: 40rpx;
+			font-family: PingFang-SC-Bold, PingFang-SC;
+			font-weight: bold;
+			color: #FF6200;
+		}
+	}
+
+	.midBox {
+		margin-top: 24rpx;
+		width: 750rpx;
+		background: $bgColor;
+		border-radius: 16rpx;
+		position: relative;
+		padding: 40rpx 28rpx;
+		box-sizing: border-box;
+
+
+		.logistics {
+			position: relative;
+
+			.logisticsTitle {
+				margin-bottom: 25rpx;
+				font-size: 30rpx;
+				font-family: PingFang-SC-Bold, PingFang-SC;
+				font-weight: bold;
+				color: #080F18;
+			}
+
+			.logisticsMsg {
+				margin-bottom: 25rpx;
+
+				text {
+					font-size: 28rpx;
+					font-family: PingFang-SC-Medium, PingFang-SC;
+					font-weight: 500;
+					color: #666666;
+				}
+			}
+
+			.copy {
+				position: absolute;
+				right: 30rpx;
+				top: 75rpx;
+				font-size: 28rpx;
+				font-family: PingFang-SC-Medium, PingFang-SC;
+				font-weight: 500;
+				color: #FF6200;
+			}
+		}
+
+		.myorder {
+			position: relative;
+
+			.orderTitle {
+				margin-bottom: 25rpx;
+				font-size: 30rpx;
+				font-family: PingFang-SC-Bold, PingFang-SC;
+				font-weight: bold;
+				color: #080F18;
+			}
+
+			.orderMsg {
+				margin-bottom: 25rpx;
+
+				text {
+					font-size: 28rpx;
+					font-family: PingFang-SC-Medium, PingFang-SC;
+					font-weight: 500;
+					color: #666666;
+				}
+			}
+
+			.copyorder {
+				position: absolute;
+				right: 30rpx;
+				bottom: 75rpx;
+				font-size: 28rpx;
+				font-family: PingFang-SC-Medium, PingFang-SC;
+				font-weight: 500;
+				color: #FF6200;
+			}
+		}
+
+		.delivery {
+			margin-bottom: 20rpx;
+
+			.deliveryTitle {
+				margin-bottom: 24rpx;
+
+				text {
+					font-size: 32rpx;
+					font-family: PingFang-SC-Bold, PingFang-SC;
+					font-weight: bold;
+					color: #080F18;
+				}
+			}
+
+			.deliveryMsg {
+				width: 694rpx;
+				display: flex;
+				flex-direction: column;
+				justify-content: center;
+				padding-top: 24rpx;
+				position: relative;
+				.bgimg{
+					width: 100%;
+					height: 100%;
+					position: absolute;
+					top:0rpx;
+				}
+				.deliveryicon {
+					margin-bottom: 15rpx;
+					display: flex;
+					align-items: center;
+					z-index: 999;
+					image {
+						width: 26rpx;
+						height: 26rpx;
+						margin-right: 5rpx;
+					}
+
+					text {
+						font-size: 28rpx;
+						font-family: PingFang-SC-Medium, PingFang-SC;
+						font-weight: 500;
+						color: #333333;
+					}
+				}
+
+				.deliverytext {
+					margin-bottom: 20rpx;
+					z-index: 999;
+					text {
+						font-size: 28rpx;
+						font-family: PingFangSC-Medium, PingFang SC;
+						font-weight: 500;
+						color: #080F18;
+					}
+				}
+			}
+		}
+	}
+
+	.shopMsg {
+		margin-top: 24rpx;
+		width: 750rpx;
+		height: 534rpx;
+		background: $bgColor;
+		border-radius: 12rpx 12rpx 0px 0px;
+		padding: 32rpx 30rpx;
+		box-sizing: border-box;
+
+		.title {
+			margin-bottom: 24rpx;
+
+			text {
+				font-size: 32rpx;
+				font-family: PingFang-SC-Bold, PingFang-SC;
+				font-weight: bold;
+				color: #080F18;
+			}
+		}
+
+		.shopCard {
+			margin-top: 28rpx;
+			width: 694rpx;
+			height: 164rpx;
+			background: #F4F5F6;
+			border-radius: 10rpx;
+			display: flex;
+			align-items: center;
+
+			image {
+				width: 132rpx;
+				height: 132rpx;
+				margin-left: 16rpx;
+				display: inline-block;
+			}
+
+			.name {
+				font-size: 28rpx;
+				font-family: PingFangSC-Medium, PingFang SC;
+				font-weight: 500;
+				color: #080F18;
+				display: block;
+			}
+
+			.tag {
+				font-size: 24rpx;
+				font-family: PingFang-SC-Medium, PingFang-SC;
+				font-weight: 500;
+				color: #666666;
+			}
+		}
+
+		.shopNumber {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			margin-top: 25rpx;
+
+			text {
+				font-size: 26rpx;
+				font-family: PingFang-SC-Medium, PingFang-SC;
+				font-weight: 500;
+				color: #000000;
+			}
+		}
+	}
+</style>

pages/my/myorders/orders.vue

@@ -14,19 +14,26 @@
 			</view>
 			<!-- 分段器 -->
 			<view class="segmented">
-				<uni-segmented-control :current="current" :values="items" @clickItem="onClickItem" styleType="text"
-					activeColor="#DDB15B"></uni-segmented-control>
+				<!-- <uni-segmented-control :current="current" :values="items" @clickItem="onClickItem" styleType="text"
+					activeColor="#DDB15B"></uni-segmented-control> -->
+				<view class="tab_nav">
+					<view class="navTitle" v-for="(item,index) in items" :key="index">
+						<view :class="{'active':isActive == index}" @click="checked(index)">
+							{{item}}
+						</view>
+					</view>
+				</view>
 			</view>
 		</view>
 		<!-- 全部 -->
-		<view v-if="current === 0">
+		<view v-if="isActive === 0">
 			<view class="card" v-for="item in 2">
 				<view class="toptitle">
 					<view>订单号：62aae0eb9c6fd622</view>
 					<view>未核销</view>
 				</view>
 				<view class="shopCard">
-					<image  src="/static/icon/Kudosbg.png"></image>
+					<image src="/static/icon/Kudosbg.png"></image>
 					<view style="margin-left: 24rpx;">
 						<text class="name">端午佳节五香肉粽子，仅限前</text>
 						<text class="tag">礼盒装 2000积分</text>
@@ -54,14 +61,14 @@
 			</view>
 		</view>
 		<!-- 待兑换 -->
-		<view v-if="current == 1">
+		<view v-if="isActive == 1">
 			<view class="card" v-for="item in 2">
 				<view class="toptitle">
 					<view>订单号：62aae0eb9c6fd622</view>
 					<view>未核销</view>
 				</view>
 				<view class="shopCard">
-					<image  src="/static/icon/Kudosbg.png"></image>
+					<image src="/static/icon/Kudosbg.png"></image>
 					<view style="margin-left: 24rpx;">
 						<text class="name">端午佳节五香肉粽子，仅限前</text>
 						<text class="tag">礼盒装 2000积分</text>
@@ -73,26 +80,26 @@
 					<text class="totalContent">2000积分</text>
 				</view>
 				<view class="btn">
-					
-					<view class="btnitem" >
+
+					<view class="btnitem">
 						<text>取消</text>
 					</view>
-					<view class="btnitem" >
+					<view class="btnitem">
 						<text>兑换</text>
 					</view>
-					
+
 				</view>
 			</view>
 		</view>
 		<!-- 待发货 -->
-		<view v-if="current ==2">
+		<view v-if="isActive ==2">
 			<view class="card" v-for="item in 2">
 				<view class="toptitle">
 					<view>订单号：62aae0eb9c6fd622</view>
 					<view>未核销</view>
 				</view>
 				<view class="shopCard">
-					<image  src="/static/icon/Kudosbg.png"></image>
+					<image src="/static/icon/Kudosbg.png"></image>
 					<view style="margin-left: 24rpx;">
 						<text class="name">端午佳节五香肉粽子，仅限前</text>
 						<text class="tag">礼盒装 2000积分</text>
@@ -104,26 +111,26 @@
 					<text class="totalContent">2000积分</text>
 				</view>
 				<view class="btn">
-					
+
 					<view class="btnitem" v-if="false">
 						<text>取消</text>
 					</view>
 					<view class="btnitem" v-if="false">
 						<text>兑换</text>
 					</view>
-					
+
 				</view>
 			</view>
 		</view>
 		<!-- 待收货 -->
-		<view v-if="current == 3">
+		<view v-if="isActive == 3">
 			<view class="card" v-for="item in 2" @click="goOrderDetail">
 				<view class="toptitle">
 					<view>订单号：62aae0eb9c6fd622</view>
 					<view>未核销</view>
 				</view>
 				<view class="shopCard">
-					<image  src="/static/icon/Kudosbg.png"></image>
+					<image src="/static/icon/Kudosbg.png"></image>
 					<view style="margin-left: 24rpx;">
 						<text class="name">端午佳节五香肉粽子，仅限前</text>
 						<text class="tag">礼盒装 2000积分</text>
@@ -135,21 +142,21 @@
 					<text class="totalContent">2000积分</text>
 				</view>
 				<view class="btn">
-					<view class="btnitem" >
+					<view class="btnitem">
 						<text>确认收货</text>
 					</view>
 				</view>
 			</view>
 		</view>
 		<!-- 已完成 -->
-		<view v-if="current == 4">
+		<view v-if="isActive == 4">
 			<view class="card" v-for="item in 2">
 				<view class="toptitle">
 					<view>订单号：62aae0eb9c6fd622</view>
 					<view>未核销</view>
 				</view>
 				<view class="shopCard">
-					<image  src="/static/icon/Kudosbg.png"></image>
+					<image src="/static/icon/Kudosbg.png"></image>
 					<view style="margin-left: 24rpx;">
 						<text class="name">端午佳节五香肉粽子，仅限前</text>
 						<text class="tag">礼盒装 2000积分</text>
@@ -161,12 +168,12 @@
 					<text class="totalContent">2000积分</text>
 				</view>
 				<view class="btn">
-					
+
 				</view>
 			</view>
 		</view>
-		
-		<uni-load-more :status="status" color="#CCCCCC" :content-text="contentText"/>
+
+		<uni-load-more :status="status" color="#CCCCCC" :content-text="contentText" />
 		<!-- 弹出层 -->
 		<uni-popup ref="popup" type="center">
 			<view class="pop">
@@ -185,10 +192,11 @@
 </template>
 
 <script>
-	export default{
-		data(){
-			return{
-				items: ['全部', '待兑换', '待发货','待收货','已完成'],
+	export default {
+		data() {
+			return {
+				items: ['全部', '待兑换', '待发货', '待收货', '已完成'],
+				isActive: 0,
 				current: 0,
 				status: 'noMore',
 				contentText: {
@@ -199,51 +207,55 @@
 			}
 		},
 		onLoad(o) {
-			if(o.current){
-				this.current=o.current
+			if (o.isActive) {
+				this.isActive = o.isActive
 			}
 		},
-		methods:{
+		methods: {
+			//菜单index切换
+			checked(index) {
+				this.isActive = index
+			},
 			onClickItem(e) {
 				if (this.current != e.currentIndex) {
 					this.current = e.currentIndex;
 				}
 			},
 			// 跳转订单详情
-			goOrderDetail(){
+			goOrderDetail() {
 				uni.navigateTo({
-					url:'/pages/my/myorders/orderDetail'
+					url: '/pages/my/myorders/orderDetail'
 				})
 			},
-			openVFcode(){
+			openVFcode() {
 				this.$refs.popup.open()
 			},
-			closeVFcode(){
+			closeVFcode() {
 				this.$refs.popup.close()
 			},
 			// 保存图片
-			handleDownImg(){
+			handleDownImg() {
 				this.$refs.popup.close()
-			    // const that = this;
-			    // uni.downloadFile({
-			    //     url:'网络路径',
-			    //     success: res => {
-			    //         if (res.statusCode === 200) {
-			    //             uni.saveImageToPhotosAlbum({
-			    //                 filePath: res.tempFilePath,
-			    //                 success: function() {
-			    //                     this.tools.toast('保存成功');
-							// 		this.$refs.popup.close()
-			    //                 },
-			    //                 fail: function() {
-			    //                     this.tools.toast('保存失败，请稍后重试');
-			    //                 }
-			    //             });
-			    //         } else {
-			    //             this.tools.toast('下载失败');
-			    //         }
-			    //     }
-			    // });
+				// const that = this;
+				// uni.downloadFile({
+				//     url:'网络路径',
+				//     success: res => {
+				//         if (res.statusCode === 200) {
+				//             uni.saveImageToPhotosAlbum({
+				//                 filePath: res.tempFilePath,
+				//                 success: function() {
+				//                     this.tools.toast('保存成功');
+				// 		this.$refs.popup.close()
+				//                 },
+				//                 fail: function() {
+				//                     this.tools.toast('保存失败，请稍后重试');
+			 //                 }
+				//             });
+				//         } else {
+				//             this.tools.toast('下载失败');
+				//         }
+				//     }
+				// });
 			},
 		},
 	}
@@ -252,25 +264,27 @@
 <style lang="scss" scoped>
 	$pageColor:#F9F9F9;
 	$bgColor:#FFFFFF;
-	
+
 	// flex布局居中对齐
 	@mixin flexlayout {
 		display: flex;
 		align-items: center;
 		justify-content: center;
 	}
-	.orders{
+
+	.orders {
 		height: 100%;
-		background:$pageColor ;
+		background: $pageColor;
 	}
+
 	::v-deep .segmented-control__text {
 		font-size: 32rpx !important;
 		font-family: PingFang-SC-Heavy, PingFang-SC;
 		font-weight: 500 !important;
 		color: #666666 !important;
-		
+
 	}
-	
+
 	::v-deep .segmented-control__item--text {
 		font-size: 32rpx !important;
 		font-family: PingFang-SC-Heavy, PingFang-SC;
@@ -278,48 +292,100 @@
 		padding: 10rpx 0 !important;
 		color: #D9A94D !important;
 		border-radius: 4rpx !important;
-		
+
 	}
+	
+	
+	
 	.nav {
 		height: 216rpx;
 		width: 750rpx;
 		background: $bgColor;
-	
+
 		.navbox {
 			display: flex;
 			align-items: center;
 			justify-content: space-between;
 			padding: 0 30rpx;
 			box-sizing: border-box;
+
 			// 搜索
 			.search {
 				height: 124rpx;
 				width: 690px;
 				background-color: $bgColor;
 				@include flexlayout;
-			
+
 				::v-deep .u-input {
 					width: 690rpx !important;
 					height: 68rpx !important;
 					background: #F1F1F1;
 					border-radius: 74rpx;
 				}
-			
+
 				::v-deep .u-input__content__field-wrapper {
 					padding-left: 36rpx;
 				}
 			}
 		}
+		.segmented {
+			margin-top: 15rpx;
+			width: 750rpx;
+			border-radius: 0rpx 0rpx 16rpx 16rpx;
+			padding:0 30rpx;
+			box-sizing: border-box;
+			//菜单切换
+			.tab_nav {
+				width: 690rpx;
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				font-family: PingFang-SC-Heavy, PingFang-SC;
+				
+			}
+			
+			.tab_nav .navTitle {
+				width: 128rpx;
+				flex: none;
+				height: 28rpx;
+				font-size: 32rpx;
+				color: #666;
+				display: flex;
+				align-items: center;
+				justify-content: space-around;
+				position: relative;
+			}
+			
+			.active {
+				color: #D9A94D;
+				font-weight: bold;
+			
+				&::after {
+					display: inline-block;
+					content: '';
+					width: 48rpx;
+					height: 12rpx;
+					background: linear-gradient(90deg, #F3D69F 0%, #D9A94D 100%);
+					border-radius: 6px;
+					position: absolute;
+					bottom: -30rpx;
+					left: 40rpx;
+				}
+			}
+			}
+		
 	}
-	.card{
+
+	.card {
 		margin-top: 24rpx;
 		// width: 750rpx;
 		// height: 426rpx;
 		background: $bgColor;
 		border-radius: 16rpx;
-		padding:32rpx 28rpx 24rpx 28rpx;
+		padding: 32rpx 28rpx 24rpx 28rpx;
 		box-sizing: border-box;
-		.toptitle{
+
+		.toptitle {
 			display: flex;
 			justify-content: space-between;
 			align-items: center;
@@ -328,7 +394,8 @@
 			font-weight: bold;
 			color: #080F18;
 		}
-		.shopCard{
+
+		.shopCard {
 			margin-top: 28rpx;
 			width: 694rpx;
 			height: 164rpx;
@@ -336,58 +403,66 @@
 			border-radius: 10rpx;
 			display: flex;
 			align-items: center;
-			image{
+
+			image {
 				width: 132rpx;
-				height: 132rpx; 
+				height: 132rpx;
 				margin-left: 16rpx;
 				display: inline-block;
 			}
-			.name{
+
+			.name {
 				font-size: 28rpx;
 				font-family: PingFangSC-Medium, PingFang SC;
 				font-weight: 500;
 				color: #080F18;
 				display: block;
 			}
-			.tag{
+
+			.tag {
 				font-size: 24rpx;
 				font-family: PingFang-SC-Medium, PingFang-SC;
 				font-weight: 500;
 				color: #666666;
 			}
 		}
-		.points{
+
+		.points {
 			display: flex;
 			justify-content: flex-end;
 			align-items: center;
 			margin-top: 30rpx;
-			.totalName{
+
+			.totalName {
 				font-size: 22rpx;
 				font-family: PingFang-SC-Medium, PingFang-SC;
 				font-weight: 500;
 				color: #080F18;
 				margin-right: 10rpx;
 			}
-			.totalContent{
+
+			.totalContent {
 				font-size: 30rpx;
 				font-family: PingFang-SC-Heavy, PingFang-SC;
 				font-weight: 800;
 				color: #080F18;
 			}
 		}
-		.btn{
+
+		.btn {
 			margin-top: 15rpx;
 			display: flex;
 			justify-content: flex-end;
-			.btnitem{
+
+			.btnitem {
 				margin-left: 16rpx;
 				width: 170rpx;
 				height: 60rpx;
 				background: #FFFFFF;
 				border-radius: 30rpx;
 				border: 2rpx solid #D0D0D0;
-				@include flexlayout()
-				text{
+
+				@include flexlayout() text {
 					font-size: 26rpx;
 					font-family: PingFang-SC-Medium, PingFang-SC;
 					font-weight: 500;
@@ -395,26 +470,30 @@
 				}
 			}
 		}
-		
+
 	}
-	.pop{
+
+	.pop {
 		width: 640rpx;
 		height: 764rpx;
 		background: $bgColor;
 		border-radius: 20rpx;
 		padding-top: 64rpx;
 		box-sizing: border-box;
-		.title{
+
+		.title {
 			@include flexlayout();
 			margin-bottom: 24rpx;
-			text{
+
+			text {
 				font-size: 34rpx;
 				font-family: PingFangSC-Medium, PingFang SC;
 				font-weight: 500;
 				color: #333333;
 			}
 		}
-		.img{
+
+		.img {
 			margin-top: 10rpx;
 			margin-left: 48rpx;
 			width: 544rpx;
@@ -422,37 +501,43 @@
 			background: $bgColor;
 			border-radius: 2rpx;
 			@include flexlayout();
-			image{
+
+			image {
 				width: 392rpx;
 				height: 390rpx;
 			}
 		}
-		.btn{
+
+		.btn {
 			margin-top: 40rpx;
 			width: 100%;
 			height: 110rpx;
 			display: flex;
 			align-items: center;
-			.cancel{
+
+			.cancel {
 				@include flexlayout();
-				width:50%;
+				width: 50%;
 				height: 100%;
-				border-top:#E5E5E5 solid 1rpx;
-				border-right:#E5E5E5 solid 1rpx;
-				text{
+				border-top: #E5E5E5 solid 1rpx;
+				border-right: #E5E5E5 solid 1rpx;
+
+				text {
 					font-size: 32rpx;
 					font-family: PingFangSC-Medium, PingFang SC;
 					font-weight: 500;
 					color: #666666;
 				}
 			}
-			.download{
-				border-top:#E5E5E5 solid 1rpx;
+
+			.download {
+				border-top: #E5E5E5 solid 1rpx;
 				// border-left:#E5E5E5 solid 0.3rpx;
 				@include flexlayout();
 				height: 100%;
-				width:50%;
-				text{
+				width: 50%;
+
+				text {
 					font-size: 32rpx;
 					font-family: PingFangSC-Medium, PingFang SC;
 					font-weight: 500;
@@ -461,4 +546,4 @@
 			}
 		}
 	}
-</style>
+</style>

pages/my/prize/prize.vue

@@ -2,26 +2,35 @@
 	<view class="prize">
 		<!-- 分段器 -->
 		<view class="segmented">
-			<uni-segmented-control :current="current" :values="items" @clickItem="onClickItem" styleType="text"
-				activeColor="#DDB15B"></uni-segmented-control>
+			<!-- <uni-segmented-control :current="current" :values="items" @clickItem="onClickItem" styleType="text"
+				activeColor="#DDB15B"></uni-segmented-control> -->
+			<view class="tab_nav">
+				<view class="navTitle" v-for="(item,index) in items" :key="index">
+					<view :class="{'active':isActive == index}" @click="checked(index)">
+						{{item}}
+					</view>
+				</view>
+			</view>
 		</view>
 
+
+
 		<view style="margin-bottom: 60rpx; ">
 			<!-- 实物奖品 -->
-			<view class="prizeList" :style="{'--height':ListHeight+'rpx'}" v-if="current === 0">
+			<view class="prizeList" :style="{'--height':ListHeight+'rpx'}" v-if="isActive == 0">
 				<view class="ListItem" v-for="item in 5">
 					<view class="title"><text>HUAWEI MateBook X Pro</text></view>
 					<view class='data'><text>2022-02-10</text></view>
 					<view class="alreadyBtn" v-if="false">
 						<text>已兑换</text>
 					</view>
-					<view class="instantBtn"  @click="goExchange">
+					<view class="instantBtn" @click="goExchange">
 						<text>立即兑换</text>
 					</view>
 				</view>
 			</view>
 			<!-- 线下奖品 -->
-			<view class="prizeList" :style="{'--height':ListHeight+'rpx'}" v-if="current === 1">
+			<view class="prizeList" :style="{'--height':ListHeight+'rpx'}" v-if="isActive == 1">
 				<view class="ListItem" v-for="item in 5">
 					<view class="title"><text>HUAWEI MateBook X Pro</text></view>
 					<view class='data'><text>2022-02-10</text></view>
@@ -34,7 +43,7 @@
 				</view>
 			</view>
 			<!-- 中奖记录 -->
-			<view class="prizeList" :style="{'--height':ListHeight+'rpx'}" v-if="current === 2">
+			<view class="prizeList" :style="{'--height':ListHeight+'rpx'}" v-if="isActive == 2">
 				<view class="ListItem" v-for="item in 5">
 					<view style="display: flex; justify-content: space-between;">
 						<view class="title"><text>活动奖品</text> </view>
@@ -45,7 +54,7 @@
 			</view>
 		</view>
 
-		<uni-load-more :status="status" color="#CCCCCC" :content-text="contentText"/>
+		<uni-load-more :status="status" color="#CCCCCC" :content-text="contentText" />
 
 	</view>
 </template>
@@ -55,7 +64,7 @@
 		data() {
 			return {
 				items: ['实物奖品', '线下奖品', '中奖记录'],
-				current: 0,
+				isActive: 0,
 				ListHeight: 800,
 				status: 'noMore',
 				contentText: {
@@ -66,15 +75,19 @@
 			}
 		},
 		methods: {
+			//菜单index切换
+			checked(index) {
+				this.isActive = index
+			},
 			onClickItem(e) {
 				if (this.current != e.currentIndex) {
 					this.current = e.currentIndex;
 				}
 			},
 			// 立即兑换
-			goExchange(){
+			goExchange() {
 				uni.navigateTo({
-					url:'/pages/my/prize/exchangePrize'
+					url: '/pages/my/prize/exchangePrize'
 				})
 			}
 		},
@@ -97,13 +110,51 @@
 		background: $pageColor;
 	}
 
+
+
 	.segmented {
-		width: 100%;
+		// border: 1rpx solid;
+		width: 750rpx;
 		height: 112rpx;
 		background: $bgColor;
 		box-shadow: 0px 4rpx 8rpx 0rpx rgba(0, 0, 0, 0.04);
 		border-radius: 0rpx 0rpx 16rpx 16rpx;
 		margin-bottom: 24rpx;
+		padding:0rpx 30rpx;
+		box-sizing: border-box;
+		//菜单切换
+		.tab_nav {
+			width: 690rpx;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			font-family: PingFang-SC-Heavy, PingFang-SC;
+		}
+		.tab_nav .navTitle {
+			margin-top: 20rpx;
+			width: 128rpx;
+			flex: none;
+			height: 28rpx;
+			font-size: 32rpx;
+			color: #666;
+			position: relative;
+		}
+		.active {
+			color: #D9A94D;
+			font-weight: bold;
+
+			&::after {
+				display: inline-block;
+				content: '';
+				width: 48rpx;
+				height: 12rpx;
+				background: linear-gradient(90deg, #F3D69F 0%, #D9A94D 100%);
+				border-radius: 6px;
+				position: absolute;
+				bottom: -40rpx;
+				left: 40rpx;
+			}
+		}
 	}
 
 	::v-deep .segmented-control__text {
@@ -204,17 +255,18 @@
 				}
 			}
 		}
-		.ListItem:last-child{
+
+		.ListItem:last-child {
 			width: 690rpx;
 			height: 160rpx;
 			border-bottom: #F0F0F0 solid 0rpx;
 			position: relative;
 			padding-top: 35rpx;
 			box-sizing: border-box;
-		
+
 			.title {
 				margin-bottom: 10rpx;
-		
+
 				text {
 					font-size: 32rpx;
 					font-family: PingFang-SC-Bold, PingFang-SC;
@@ -222,7 +274,7 @@
 					color: #333333;
 				}
 			}
-		
+
 			.data {
 				text {
 					font-size: 26rpx;
@@ -231,7 +283,7 @@
 					color: #999999;
 				}
 			}
-		
+
 			.alreadyBtn {
 				position: absolute;
 				top: 50rpx;
@@ -242,7 +294,7 @@
 				border-radius: 30rpx;
 				border: 2rpx solid #D0D0D0;
 				@include flexlayout();
-		
+
 				text {
 					font-size: 26rpx;
 					font-family: PingFang-SC-Medium, PingFang-SC;
@@ -250,7 +302,7 @@
 					color: #D0D0D0;
 				}
 			}
-		
+
 			.instantBtn {
 				position: absolute;
 				top: 50rpx;
@@ -261,7 +313,7 @@
 				border-radius: 30rpx;
 				border: 2rpx solid #FF6200;
 				@include flexlayout();
-		
+
 				text {
 					font-size: 26rpx;
 					font-family: PingFang-SC-Medium, PingFang-SC;
@@ -269,7 +321,7 @@
 					color: #FF6200;
 				}
 			}
-		
+
 			.content {
 				text {
 					font-size: 28rpx;

pages/my/verification/verification.vue

@@ -12,18 +12,25 @@
 					</u-input>
 				</view>
 				<view>
-					<image src="/static/icon/scan.png" style="width: 48rpx ;height: 48rpx;"></image>
+					<image src="/static/icon/scan.png" style="width: 48rpx ;height: 48rpx;" @click="scanCode"></image>
 				</view>
 			</view>
 			<!-- 分段器 -->
 			<view class="segmented">
-				<uni-segmented-control :current="current" :values="items" @clickItem="onClickItem" styleType="text"
-					activeColor="#DDB15B"></uni-segmented-control>
+				<!-- <uni-segmented-control :current="current" :values="items" @clickItem="onClickItem" styleType="text"
+					activeColor="#DDB15B"></uni-segmented-control> -->
+					<view class="tab_nav">
+						<view class="navTitle" v-for="(item,index) in items" :key="index">
+							<view :class="{'active':isActive == index}" @click="checked(index)">
+								{{item}}
+							</view>
+						</view>
+					</view>
 			</view>
 		</view>
 		
 		<!-- 未核销列表 -->
-		<view v-if="current === 0">
+		<view v-if="isActive === 0">
 			<view class="card" v-for="item in 2" >
 				<view class="toptitle">
 					<view>洲际天堂大饭店</view>
@@ -46,7 +53,7 @@
 			</view>
 		</view>
 		<!-- 已核销列表 -->
-		<view v-if="current === 1">
+		<view v-if="isActive === 1">
 			<view class="card" v-for="item in 2" @click="goDetail">
 				<view class="toptitle">
 					<view>洲际天堂大饭店</view>
@@ -69,7 +76,7 @@
 			</view>
 		</view>
 		<!-- 我的列表 -->
-		<view v-if="current === 2" >
+		<view v-if="isActive === 2" >
 			<view class="card" v-for="item in 2" @click="goDetail">
 				<view class="toptitle">
 					<view>洲际天堂大饭店</view>
@@ -101,6 +108,7 @@
 			return{
 				items: ['未核销', '已核销', '我的'],
 				current: 0,
+				isActive: 0,
 				status: 'noMore',
 				contentText: {
 					contentdown: '查看更多',
@@ -110,6 +118,10 @@
 			}
 		},
 		methods:{
+			//菜单index切换
+			checked(index) {
+				this.isActive = index
+			},
 			onClickItem(e) {
 				if (this.current != e.currentIndex) {
 					this.current = e.currentIndex;
@@ -126,6 +138,15 @@
 				uni.navigateTo({
 					url:'/pages/my/verification/verificationDetail'
 				})
+			},
+			// 扫码
+			scanCode(){
+				uni.scanCode({
+					success: function (res) {
+						console.log('条码类型：' + res.scanType);
+						console.log('条码内容：' + res.result);
+					}
+				});
 			}
 		}
 	}
@@ -170,13 +191,14 @@
 		height: 216rpx;
 		width: 750rpx;
 		background: $bgColor;
-
+		
 		.navbox {
 			display: flex;
 			align-items: center;
 			justify-content: space-between;
 			padding: 0 30rpx;
 			box-sizing: border-box;
+			margin-bottom: 15rpx;
 			// 搜索
 			.search {
 				height: 124rpx;
@@ -196,6 +218,46 @@
 				}
 			}
 		}
+		.segmented {
+			width: 750rpx;
+			box-sizing: border-box;
+			//菜单切换
+			.tab_nav {
+				width: 750rpx;
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				padding:0 30rpx;
+				font-family: PingFang-SC-Heavy, PingFang-SC;
+			}
+		
+			.tab_nav .navTitle {
+				@include flexlayout()
+				width: 128rpx;
+				flex: none;
+				height: 28rpx;
+				font-size: 32rpx;
+				color: #666;
+				position: relative;
+			}
+		
+			.active {
+				color: #D9A94D;
+				font-weight: bold;
+				box-sizing: border-box;
+				&::after {
+					display: inline-block;
+					content: '';
+					width: 48rpx;
+					height: 12rpx;
+					background: linear-gradient(90deg, #F3D69F 0%, #D9A94D 100%);
+					border-radius: 6px;
+					position: absolute;
+					bottom: -30rpx;
+					left: 42rpx;
+				}
+			}
+		}
 	}
 	.card{
 		margin-top: 24rpx;

unpackage/dist/build/mp-weixin/app.js

@@ -0,0 +1,4 @@
+
+require('./common/runtime.js')
+require('./common/vendor.js')
+require('./common/main.js')

unpackage/dist/build/mp-weixin/app.json

@@ -0,0 +1,75 @@
+{
+  "pages": [
+    "pages/index/index",
+    "pages/index/active-list/index",
+    "pages/index/active-detail/index",
+    "pages/index/vote-detail/index",
+    "pages/goods/goods",
+    "pages/goods/goods-detail/index",
+    "pages/map/map",
+    "pages/msg/msg",
+    "pages/login/login",
+    "pages/login/youyue",
+    "pages/my/my",
+    "pages/my/PersonalData/personalData",
+    "pages/my/setting/setting",
+    "pages/my/myorders/orders",
+    "pages/my/myorders/orderDetail",
+    "pages/my/protocol/PrivacyPolicy",
+    "pages/my/protocol/UserAgreement",
+    "pages/my/verification/verification",
+    "pages/my/verification/orderVerification",
+    "pages/my/verification/verificationDetail",
+    "pages/my/integral/integral",
+    "pages/my/integral/integralRule",
+    "pages/my/integral/integralRecord",
+    "pages/my/integral/integralOrder",
+    "pages/my/integral/integralExchange",
+    "pages/my/prize/prize",
+    "pages/my/prize/exchangePrize",
+    "pages/my/prize/exchangeDetail",
+    "pages/my/Kudos/Kudos"
+  ],
+  "subPackages": [],
+  "window": {
+    "navigationBarTextStyle": "black",
+    "navigationBarTitleText": "",
+    "navigationBarBackgroundColor": "#FFF"
+  },
+  "tabBar": {
+    "custom": true,
+    "color": "#CBC8C7",
+    "selectedColor": "#FF6200",
+    "backgroundColor": "#fff",
+    "borderStyle": "black",
+    "display": "none",
+    "list": [
+      {
+        "pagePath": "pages/index/index",
+        "iconPath": "static/icon/home02.png",
+        "selectedIconPath": "static/icon/home01.png",
+        "text": "首页"
+      },
+      {
+        "pagePath": "pages/map/map",
+        "iconPath": "static/icon/map02.png",
+        "selectedIconPath": "static/icon/map01.png",
+        "text": "IHG地图"
+      },
+      {
+        "pagePath": "pages/msg/msg",
+        "iconPath": "static/icon/msg02.png",
+        "selectedIconPath": "static/icon/msg01.png",
+        "text": "消息"
+      },
+      {
+        "pagePath": "pages/my/my",
+        "iconPath": "static/icon/my02.png",
+        "selectedIconPath": "static/icon/my01.png",
+        "text": "我的"
+      }
+    ]
+  },
+  "usingComponents": {},
+  "sitemapLocation": "sitemap.json"
+}

unpackage/dist/build/mp-weixin/app.wxss

@@ -0,0 +1,3 @@
+@import './common/main.wxss';
+
+[data-custom-hidden="true"],[bind-data-custom-hidden="true"]{display: none !important;}

unpackage/dist/build/mp-weixin/components/SwiperBox/index.js

@@ -0,0 +1,10 @@
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["components/SwiperBox/index"],{"11d5":function(n,e,t){"use strict";t.r(e);var u=t("c538"),i=t("4d16");for(var o in i)"default"!==o&&function(n){t.d(e,n,(function(){return i[n]}))}(o);t("4a69");var r,a=t("f0c5"),c=Object(a["a"])(i["default"],u["b"],u["c"],!1,null,"17011793",null,!1,u["a"],r);e["default"]=c.exports},"4a69":function(n,e,t){"use strict";var u=t("8712"),i=t.n(u);i.a},"4d16":function(n,e,t){"use strict";t.r(e);var u=t("54de"),i=t.n(u);for(var o in u)"default"!==o&&function(n){t.d(e,n,(function(){return u[n]}))}(o);e["default"]=i.a},"54de":function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var u={name:"SwiperBox",props:{height:{type:[Number,String],default:"386rpx"},radius:{type:[Number,String],default:"0rpx"}},data:function(){return{loading:!0,list:[t("0afe"),t("0afe")],currentNum:0}},computed:{},created:function(){},methods:{handleClick:function(n){var e=this.list[n];console.log("--\x3edata",e)},handleChange:function(n){this.currentNum=n.current},getSwiper:function(){var n=this;this.$api.setting.banner().then((function(e){n.loading=!1,e.data.forEach((function(e){n.list.push(e.image)}))}))}}};e.default=u},8712:function(n,e,t){},c538:function(n,e,t){"use strict";t.d(e,"b",(function(){return i})),t.d(e,"c",(function(){return o})),t.d(e,"a",(function(){return u}));var u={uLoadingIcon:function(){return Promise.all([t.e("common/vendor"),t.e("node-modules/uview-ui/components/u-loading-icon/u-loading-icon")]).then(t.bind(null,"3a29"))},uSwiper:function(){return Promise.all([t.e("common/vendor"),t.e("node-modules/uview-ui/components/u-swiper/u-swiper")]).then(t.bind(null,"572f"))}},i=function(){var n=this,e=n.$createElement;n._self._c},o=[]}}]);
+;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
+    'components/SwiperBox/index-create-component',
+    {
+        'components/SwiperBox/index-create-component':(function(module, exports, __webpack_require__){
+            __webpack_require__('543d')['createComponent'](__webpack_require__("11d5"))
+        })
+    },
+    [['components/SwiperBox/index-create-component']]
+]);

unpackage/dist/build/mp-weixin/components/SwiperBox/index.json

@@ -0,0 +1,7 @@
+{
+  "usingComponents": {
+    "u-loading-icon": "/node-modules/uview-ui/components/u-loading-icon/u-loading-icon",
+    "u-swiper": "/node-modules/uview-ui/components/u-swiper/u-swiper"
+  },
+  "component": true
+}

unpackage/dist/build/mp-weixin/components/SwiperBox/index.wxml

@@ -0,0 +1 @@
+<view class="{{['swiper-box','','data-v-17011793',(loading)?'loading':'',(loading)?'main-center':'',(loading)?'cross-center':'']}}" style="{{'height:'+(height)+';'}}"><u-loading-icon vue-id="f1df300a-1" show="{{loading}}" vertical="{{true}}" class="data-v-17011793" bind:__l="__l"></u-loading-icon><block wx:if="{{list.length}}"><u-swiper style="width:100%;" vue-id="f1df300a-2" list="{{list}}" height="{{height}}" radius="{{radius}}" bg-color="{{$colors.bgColor}}" indicator="{{true}}" show-title="{{true}}" indicator-mode="dot" indicator-style="{{({bottom:'24rpx'})}}" img-mode data-event-opts="{{[['^click',[['handleClick']]],['^change',[['handleChange']]]]}}" bind:click="__e" bind:change="__e" class="data-v-17011793" bind:__l="__l" vue-slots="{{['indicator']}}"><view class="indicator data-v-17011793" slot="indicator"><block wx:for="{{list}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="{{['indicator__dot','data-v-17011793',index===currentNum&&'indicator__dot--active']}}"></view></block></view></u-swiper></block></view>

unpackage/dist/build/mp-weixin/components/SwiperBox/index.wxss

@@ -0,0 +1 @@
+.data-v-17011793 .u-swiper{width:100%!important}.swiper-box.loading.data-v-17011793{background-color:#1b203c}.swiper-box .indicator.data-v-17011793{display:flex;flex-direction:row;justify-content:center}.swiper-box .indicator__dot.data-v-17011793{height:20rpx;width:20rpx;border-radius:50%;background-color:hsla(0,0%,100%,.35);margin:0 10px;transition:background-color .3s}.swiper-box .indicator__dot--active.data-v-17011793{background-color:#6eebe8}

unpackage/dist/build/mp-weixin/components/TabBar/tabbar.wxml

@@ -0,0 +1 @@
+<view class="tab-bar data-v-3ab234ad" style="{{'--padding-bottom:'+(''+wagesheight+'rpx')+';'}}"><view class="content main-between cross-center data-v-3ab234ad"><block wx:for="{{list}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['handleSwitch',[index]]]]]}}" class="{{['tab-item','dir-top-wrap','cross-center','main-center','data-v-3ab234ad',(active===index)?'active':'']}}" bindtap="__e"><view class="icon data-v-3ab234ad"><image src="{{active===index?item.selected_icon?item.selected_icon:item.selectedIconPath:item.icon?item.icon:item.iconPath}}" mode="aspectFit" class="data-v-3ab234ad"></image></view><text class="data-v-3ab234ad">{{item.text}}</text></view></block></view></view>

unpackage/dist/build/mp-weixin/components/TabBar/tabbar.wxss

@@ -0,0 +1 @@
+.tab-bar.data-v-3ab234ad{position:fixed;bottom:0;left:0;background-color:#fff;width:100%}.tab-bar .content.data-v-3ab234ad{background-color:#fff;box-shadow:0 -2rpx 20rpx 0 rgba(0,0,0,.05);position:absolute;bottom:0;width:100%;height:120rpx;background-size:110% 100%;display:flex;align-items:center;justify-content:center}.tab-bar .content .tab-item.data-v-3ab234ad{flex:1;color:#cbc8c7;transition:.3s;font-size:24rpx;position:relative;display:flex;flex-direction:column;align-items:center;justify-content:center}.tab-bar .content .tab-item.active.data-v-3ab234ad{color:#ff6200}.tab-bar .content .tab-item .icon.data-v-3ab234ad{width:42rpx;height:42rpx}.tab-bar .content .tab-item .icon image.data-v-3ab234ad{height:100%;width:100%}

unpackage/dist/build/mp-weixin/components/waterfall/waterfall-item.js

@@ -0,0 +1,10 @@
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["components/waterfall/waterfall-item"],{"099f":function(t,e,n){"use strict";n.r(e);var a=n("ce74"),r=n.n(a);for(var i in a)"default"!==i&&function(t){n.d(e,t,(function(){return a[t]}))}(i);e["default"]=r.a},"6f0f":function(t,e,n){"use strict";var a;n.d(e,"b",(function(){return r})),n.d(e,"c",(function(){return i})),n.d(e,"a",(function(){return a}));var r=function(){var t=this,e=t.$createElement;t._self._c},i=[]},"9b17":function(t,e,n){"use strict";var a=n("d774"),r=n.n(a);r.a},"9cbf":function(t,e,n){"use strict";n.r(e);var a=n("6f0f"),r=n("099f");for(var i in r)"default"!==i&&function(t){n.d(e,t,(function(){return r[t]}))}(i);n("9b17");var u,f=n("f0c5"),c=Object(f["a"])(r["default"],a["b"],a["c"],!1,null,"6f020568",null,!1,a["a"],u);e["default"]=c.exports},ce74:function(t,e,n){"use strict";(function(t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var n={name:"helangWaterfallItem",options:{virtualHost:!0},props:{params:{type:Object,default:function(){return{}}},tag:{type:String|Number,default:""},index:{type:Number,default:-1}},data:function(){return{}},methods:{emitHeight:function(e){var n=this,a=t.createSelectorQuery().in(this);a.select(".waterfall-item-container").boundingClientRect((function(t){var e=Math.floor(t.height);n.$emit("height",e,n.$props.tag)})).exec()},onTap:function(){this.$emit("click",this.$props.index,this.$props.tag)}}};e.default=n}).call(this,n("543d")["default"])},d774:function(t,e,n){}}]);
+;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
+    'components/waterfall/waterfall-item-create-component',
+    {
+        'components/waterfall/waterfall-item-create-component':(function(module, exports, __webpack_require__){
+            __webpack_require__('543d')['createComponent'](__webpack_require__("9cbf"))
+        })
+    },
+    [['components/waterfall/waterfall-item-create-component']]
+]);

unpackage/dist/build/mp-weixin/components/waterfall/waterfall-item.json

@@ -0,0 +1,4 @@
+{
+  "usingComponents": {},
+  "component": true
+}

unpackage/dist/build/mp-weixin/components/waterfall/waterfall-item.wxml

@@ -0,0 +1 @@
+<view class="waterfall-item-container data-v-6f020568"><view data-event-opts="{{[['tap',[['onTap',['$event']]]]]}}" class="waterfall-item data-v-6f020568" bindtap="__e"><image src="{{params.url}}" mode="widthFix" data-event-opts="{{[['load',[['emitHeight',['$event']]]],['error',[['emitHeight',['$event']]]]]}}" bindload="__e" binderror="__e" class="data-v-6f020568"></image><view class="content data-v-6f020568"><view class="data-v-6f020568">{{params.title}}</view><view class="money data-v-6f020568">{{params.money+"元"}}</view><view style="margin:0 0 8rpx 0;" class="data-v-6f020568"><text class="label data-v-6f020568">{{params.label}}</text></view><view class="shop-name data-v-6f020568">{{params.shop}}</view></view></view></view>

unpackage/dist/build/mp-weixin/components/waterfall/waterfall-item.wxss

@@ -0,0 +1 @@
+.waterfall-item.data-v-6f020568{padding:16rpx;background-color:#fff;border-radius:4px;font-size:28rpx;color:#666}.waterfall-item image.data-v-6f020568{display:block;width:100%;height:350rpx}.waterfall-item .content.data-v-6f020568{margin-top:16rpx}.waterfall-item .content .money.data-v-6f020568{color:#fa3534;margin-top:8rpx}.waterfall-item .content .label.data-v-6f020568{background-color:#fa3534;color:#fff;font-size:20rpx;padding:4rpx 16rpx;border-radius:20rpx}.waterfall-item .content .shop-name.data-v-6f020568{font-size:20rpx;color:#999}

unpackage/dist/build/mp-weixin/components/waterfall/waterfall-list.json

@@ -0,0 +1,6 @@
+{
+  "component": true,
+  "usingComponents": {
+    "helang-waterfall-item": "/components/waterfall/waterfall-item"
+  }
+}

unpackage/dist/build/mp-weixin/components/waterfall/waterfall-list.wxml

@@ -0,0 +1 @@
+<view class="data-v-28f8aa14"><block wx:if="{{showList}}"><view class="waterfall-box h-flex-x h-flex-2 data-v-28f8aa14"><view class="data-v-28f8aa14"><block wx:for="{{leftList}}" wx:for-item="item" wx:for-index="index" wx:key="_render_id"><view class="{{['list-item','data-v-28f8aa14',(showPage>item._current_page)?'show':'']}}"><helang-waterfall-item vue-id="{{'7437c0d5-1-'+index}}" params="{{item}}" tag="left" index="{{index}}" data-event-opts="{{[['^height',[['onHeight']]],['^click',[['onClick']]]]}}" bind:height="__e" bind:click="__e" class="data-v-28f8aa14" bind:__l="__l"></helang-waterfall-item></view></block></view><view class="data-v-28f8aa14"><block wx:for="{{rightList}}" wx:for-item="item" wx:for-index="index" wx:key="_render_id"><view class="{{['list-item','data-v-28f8aa14',(showPage>item._current_page)?'show':'']}}"><helang-waterfall-item vue-id="{{'7437c0d5-2-'+index}}" params="{{item}}" tag="right" index="{{index}}" data-event-opts="{{[['^height',[['onHeight']]],['^click',[['onClick']]]]}}" bind:height="__e" bind:click="__e" class="data-v-28f8aa14" bind:__l="__l"></helang-waterfall-item></view></block></view></view></block><slot></slot></view>

unpackage/dist/build/mp-weixin/components/waterfall/waterfall-list.wxss

@@ -0,0 +1 @@
+.waterfall-box.data-v-28f8aa14{padding:20rpx 10rpx;box-sizing:border-box}.waterfall-box > view.data-v-28f8aa14{padding:0 10rpx}.waterfall-box .list-item.data-v-28f8aa14{margin-bottom:0;opacity:0;overflow:hidden;height:0}.waterfall-box .list-item.show.data-v-28f8aa14{margin-bottom:20rpx;opacity:1;overflow:auto;height:auto}.h-flex-x.data-v-28f8aa14{display:flex;flex-direction:row;flex-wrap:nowrap;justify-content:flex-start;align-items:flex-start;align-content:flex-start}.h-flex-x.h-flex-2 > view.data-v-28f8aa14{width:50%}

unpackage/dist/build/mp-weixin/node-modules/uview-ui/components/u-icon/u-icon.json

@@ -0,0 +1,4 @@
+{
+  "usingComponents": {},
+  "component": true
+}

unpackage/dist/build/mp-weixin/node-modules/uview-ui/components/u-icon/u-icon.wxml

@@ -0,0 +1 @@
+<view data-event-opts="{{[['tap',[['clickHandler',['$event']]]]]}}" class="{{['u-icon','data-v-1b4719dc','u-icon--'+labelPos]}}" bindtap="__e"><block wx:if="{{isImg}}"><image class="u-icon__img data-v-1b4719dc" style="{{$root.s0}}" src="{{name}}" mode="{{imgMode}}"></image></block><block wx:else><text class="{{['u-icon__icon','data-v-1b4719dc',uClasses]}}" style="{{$root.s1}}" hover-class="{{hoverClass}}">{{icon}}</text></block><block wx:if="{{label!==''}}"><text class="u-icon__label data-v-1b4719dc" style="{{'color:'+(labelColor)+';'+('font-size:'+($root.g0)+';')+('margin-left:'+(labelPos=='right'?$root.g1:0)+';')+('margin-top:'+(labelPos=='bottom'?$root.g2:0)+';')+('margin-right:'+(labelPos=='left'?$root.g3:0)+';')+('margin-bottom:'+(labelPos=='top'?$root.g4:0)+';')}}">{{label}}</text></block></view>

unpackage/dist/build/mp-weixin/node-modules/uview-ui/components/u-icon/u-icon.wxss

@@ -0,0 +1 @@
+view.data-v-1b4719dc, scroll-view.data-v-1b4719dc, swiper-item.data-v-1b4719dc{display:flex;flex-direction:column;flex-shrink:0;flex-grow:0;flex-basis:auto;align-items:stretch;align-content:flex-start}@font-face{font-family:uicon-iconfont;src:url(https://at.alicdn.com/t/font_2225171_8kdcwk4po24.ttf) format("truetype")}.u-icon.data-v-1b4719dc{display:flex;align-items:center}.u-icon--left.data-v-1b4719dc{flex-direction:row-reverse;align-items:center}.u-icon--right.data-v-1b4719dc{flex-direction:row;align-items:center}.u-icon--top.data-v-1b4719dc{flex-direction:column-reverse;justify-content:center}.u-icon--bottom.data-v-1b4719dc{flex-direction:column;justify-content:center}.u-icon__icon.data-v-1b4719dc{font-family:uicon-iconfont;position:relative;display:flex;flex-direction:row;align-items:center}.u-icon__icon--primary.data-v-1b4719dc{color:#3c9cff}.u-icon__icon--success.data-v-1b4719dc{color:#5ac725}.u-icon__icon--error.data-v-1b4719dc{color:#f56c6c}.u-icon__icon--warning.data-v-1b4719dc{color:#f9ae3d}.u-icon__icon--info.data-v-1b4719dc{color:#909399}.u-icon__img.data-v-1b4719dc{height:auto;will-change:transform}.u-icon__label.data-v-1b4719dc{line-height:1}

unpackage/dist/build/mp-weixin/node-modules/uview-ui/components/u-image/u-image.json

@@ -0,0 +1,7 @@
+{
+  "component": true,
+  "usingComponents": {
+    "u-transition": "/node-modules/uview-ui/components/u-transition/u-transition",
+    "u-icon": "/node-modules/uview-ui/components/u-icon/u-icon"
+  }
+}

unpackage/dist/build/mp-weixin/node-modules/uview-ui/components/u-image/u-image.wxml

@@ -0,0 +1 @@
+<u-transition vue-id="6369c185-1" mode="fade" show="{{show}}" duration="{{fade?1000:0}}" class="data-v-5ede0e0a" bind:__l="__l" vue-slots="{{['default']}}"><view data-event-opts="{{[['tap',[['onClick',['$event']]]]]}}" class="u-image data-v-5ede0e0a" style="{{$root.s0}}" bindtap="__e"><block wx:if="{{!isError}}"><image class="u-image__image data-v-5ede0e0a" style="{{'border-radius:'+(shape=='circle'?'10000px':$root.g0)+';'+('width:'+($root.g1)+';')+('height:'+($root.g2)+';')}}" src="{{src}}" mode="{{mode}}" show-menu-by-longpress="{{showMenuByLongpress}}" lazy-load="{{lazyLoad}}" data-event-opts="{{[['error',[['onErrorHandler',['$event']]]],['load',[['onLoadHandler',['$event']]]]]}}" binderror="__e" bindload="__e"></image></block><block wx:if="{{showLoading&&loading}}"><view class="u-image__loading data-v-5ede0e0a" style="{{'border-radius:'+(shape=='circle'?'50%':$root.g3)+';'+('background-color:'+(this.bgColor)+';')+('width:'+($root.g4)+';')+('height:'+($root.g5)+';')}}"><block wx:if="{{$slots.loading}}"><slot name="loading"></slot></block><block wx:else><u-icon vue-id="{{('6369c185-2')+','+('6369c185-1')}}" name="{{loadingIcon}}" width="{{width}}" height="{{height}}" class="data-v-5ede0e0a" bind:__l="__l"></u-icon></block></view></block><block wx:if="{{showError&&isError&&!loading}}"><view class="u-image__error data-v-5ede0e0a" style="{{'border-radius:'+(shape=='circle'?'50%':$root.g6)+';'+('width:'+($root.g7)+';')+('height:'+($root.g8)+';')}}"><block wx:if="{{$slots.error}}"><slot name="error"></slot></block><block wx:else><u-icon vue-id="{{('6369c185-3')+','+('6369c185-1')}}" name="{{errorIcon}}" width="{{width}}" height="{{height}}" class="data-v-5ede0e0a" bind:__l="__l"></u-icon></block></view></block></view></u-transition>

unpackage/dist/build/mp-weixin/node-modules/uview-ui/components/u-image/u-image.wxss

@@ -0,0 +1 @@
+view.data-v-5ede0e0a, scroll-view.data-v-5ede0e0a, swiper-item.data-v-5ede0e0a{display:flex;flex-direction:column;flex-shrink:0;flex-grow:0;flex-basis:auto;align-items:stretch;align-content:flex-start}.u-image.data-v-5ede0e0a{position:relative;transition:opacity .5s ease-in-out}.u-image__image.data-v-5ede0e0a{width:100%;height:100%}.u-image__loading.data-v-5ede0e0a, .u-image__error.data-v-5ede0e0a{position:absolute;top:0;left:0;width:100%;height:100%;display:flex;flex-direction:row;align-items:center;justify-content:center;background-color:#f3f4f6;color:#909193;font-size:46rpx}

unpackage/dist/build/mp-weixin/node-modules/uview-ui/components/u-input/u-input.json

@@ -0,0 +1,6 @@
+{
+  "component": true,
+  "usingComponents": {
+    "u-icon": "/node-modules/uview-ui/components/u-icon/u-icon"
+  }
+}

unpackage/dist/build/mp-weixin/node-modules/uview-ui/components/u-input/u-input.wxss

@@ -0,0 +1 @@
+view.data-v-1102bca3, scroll-view.data-v-1102bca3, swiper-item.data-v-1102bca3{display:flex;flex-direction:column;flex-shrink:0;flex-grow:0;flex-basis:auto;align-items:stretch;align-content:flex-start}.u-input.data-v-1102bca3{display:flex;flex-direction:row;align-items:center;justify-content:space-between;flex:1}.u-input--radius.data-v-1102bca3, .u-input--square.data-v-1102bca3{border-radius:4px}.u-input--no-radius.data-v-1102bca3{border-radius:0}.u-input--circle.data-v-1102bca3{border-radius:100px}.u-input__content.data-v-1102bca3{flex:1;display:flex;flex-direction:row;align-items:center;justify-content:space-between}.u-input__content__field-wrapper.data-v-1102bca3{position:relative;display:flex;flex-direction:row;margin:0;flex:1}.u-input__content__field-wrapper__field.data-v-1102bca3{line-height:26px;text-align:left;color:#303133;height:24px;font-size:15px;flex:1}.u-input__content__clear.data-v-1102bca3{width:20px;height:20px;border-radius:100px;background-color:#c6c7cb;display:flex;flex-direction:row;align-items:center;justify-content:center;-webkit-transform:scale(.82);transform:scale(.82);margin-left:4px}.u-input__content__subfix-icon.data-v-1102bca3{margin-left:4px}.u-input__content__prefix-icon.data-v-1102bca3{margin-right:4px}

unpackage/dist/build/mp-weixin/node-modules/uview-ui/components/u-loading-icon/u-loading-icon.json

@@ -0,0 +1,4 @@
+{
+  "component": true,
+  "usingComponents": {}
+}

unpackage/dist/build/mp-weixin/node-modules/uview-ui/components/u-loading-icon/u-loading-icon.wxml

@@ -0,0 +1 @@
+<block wx:if="{{show}}"><view class="{{['u-loading-icon','data-v-5ebd6a54',vertical&&'u-loading-icon--vertical']}}" style="{{$root.s0}}"><block wx:if="{{!webviewHide}}"><view data-ref="ani" class="{{['u-loading-icon__spinner','data-v-5ebd6a54','vue-ref','u-loading-icon__spinner--'+mode]}}" style="{{'color:'+(color)+';'+('width:'+($root.g0)+';')+('height:'+($root.g1)+';')+('border-top-color:'+(color)+';')+('border-bottom-color:'+(otherBorderColor)+';')+('border-left-color:'+(otherBorderColor)+';')+('border-right-color:'+(otherBorderColor)+';')+('animation-duration:'+(duration+'ms')+';')+('animation-timing-function:'+(mode==='semicircle'||mode==='circle'?timingFunction:'')+';')}}"><block wx:if="{{mode==='spinner'}}"><block class="data-v-5ebd6a54"><block wx:for="{{array12}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="u-loading-icon__dot data-v-5ebd6a54"></view></block></block></block></view></block><block wx:if="{{text}}"><text class="u-loading-icon__text data-v-5ebd6a54" style="{{'font-size:'+($root.g2)+';'+('color:'+(textColor)+';')}}">{{text}}</text></block></view></block>

unpackage/dist/build/mp-weixin/node-modules/uview-ui/components/u-swiper-indicator/u-swiper-indicator.js

@@ -0,0 +1,10 @@
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["node-modules/uview-ui/components/u-swiper-indicator/u-swiper-indicator"],{"091c":function(t,n,i){},"2e53":function(t,n,i){"use strict";var e=i("091c"),r=i.n(e);r.a},"32d9":function(t,n,i){"use strict";i.r(n);var e=i("7ea5"),r=i.n(e);for(var u in e)"default"!==u&&function(t){i.d(n,t,(function(){return e[t]}))}(u);n["default"]=r.a},"76bf":function(t,n,i){"use strict";var e;i.d(n,"b",(function(){return r})),i.d(n,"c",(function(){return u})),i.d(n,"a",(function(){return e}));var r=function(){var t=this,n=t.$createElement,i=(t._self._c,"line"===t.indicatorMode?t.$u.addUnit(t.lineWidth*t.length):null),e="line"===t.indicatorMode?t.__get_style([t.lineStyle]):null,r="dot"===t.indicatorMode?t.__map(t.length,(function(n,i){var e=t.__get_orig(n),r=t.__get_style([t.dotStyle(i)]);return{$orig:e,s1:r}})):null;t.$mp.data=Object.assign({},{$root:{g0:i,s0:e,l0:r}})},u=[]},"7ea5":function(t,n,i){"use strict";(function(t){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var e=r(i("5a4d"));function r(t){return t&&t.__esModule?t:{default:t}}var u={name:"u-swiper-indicator",mixins:[t.$u.mpMixin,t.$u.mixin,e.default],data:function(){return{lineWidth:22}},computed:{lineStyle:function(){var n={};return n.width=t.$u.addUnit(this.lineWidth),n.transform="translateX(".concat(t.$u.addUnit(this.current*this.lineWidth),")"),n.backgroundColor=this.indicatorActiveColor,n},dotStyle:function(){var t=this;return function(n){var i={};return i.backgroundColor=n===t.current?t.indicatorActiveColor:t.indicatorInactiveColor,i}}}};n.default=u}).call(this,i("543d")["default"])},"92a5":function(t,n,i){"use strict";i.r(n);var e=i("76bf"),r=i("32d9");for(var u in r)"default"!==u&&function(t){i.d(n,t,(function(){return r[t]}))}(u);i("2e53");var o,a=i("f0c5"),c=Object(a["a"])(r["default"],e["b"],e["c"],!1,null,"49d35c99",null,!1,e["a"],o);n["default"]=c.exports}}]);
+;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
+    'node-modules/uview-ui/components/u-swiper-indicator/u-swiper-indicator-create-component',
+    {
+        'node-modules/uview-ui/components/u-swiper-indicator/u-swiper-indicator-create-component':(function(module, exports, __webpack_require__){
+            __webpack_require__('543d')['createComponent'](__webpack_require__("92a5"))
+        })
+    },
+    [['node-modules/uview-ui/components/u-swiper-indicator/u-swiper-indicator-create-component']]
+]);

unpackage/dist/build/mp-weixin/node-modules/uview-ui/components/u-swiper-indicator/u-swiper-indicator.json

@@ -0,0 +1,4 @@
+{
+  "usingComponents": {},
+  "component": true
+}

unpackage/dist/build/mp-weixin/node-modules/uview-ui/components/u-swiper-indicator/u-swiper-indicator.wxml

@@ -0,0 +1 @@
+<view class="u-swiper-indicator data-v-49d35c99"><block wx:if="{{indicatorMode==='line'}}"><view class="{{['u-swiper-indicator__wrapper','data-v-49d35c99','u-swiper-indicator__wrapper--'+indicatorMode]}}" style="{{'width:'+($root.g0)+';'+('background-color:'+(indicatorInactiveColor)+';')}}"><view class="u-swiper-indicator__wrapper--line__bar data-v-49d35c99" style="{{$root.s0}}"></view></view></block><block wx:if="{{indicatorMode==='dot'}}"><view class="u-swiper-indicator__wrapper data-v-49d35c99"><block wx:for="{{$root.l0}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="{{['u-swiper-indicator__wrapper__dot','data-v-49d35c99',index===current&&'u-swiper-indicator__wrapper__dot--active']}}" style="{{item.s1}}"></view></block></view></block></view>

unpackage/dist/build/mp-weixin/node-modules/uview-ui/components/u-swiper-indicator/u-swiper-indicator.wxss

@@ -0,0 +1 @@
+view.data-v-49d35c99, scroll-view.data-v-49d35c99, swiper-item.data-v-49d35c99{display:flex;flex-direction:column;flex-shrink:0;flex-grow:0;flex-basis:auto;align-items:stretch;align-content:flex-start}.u-swiper-indicator__wrapper.data-v-49d35c99{display:flex;flex-direction:row}.u-swiper-indicator__wrapper--line.data-v-49d35c99{border-radius:100px;height:4px}.u-swiper-indicator__wrapper--line__bar.data-v-49d35c99{width:22px;height:4px;border-radius:100px;background-color:#fff;transition:-webkit-transform .3s;transition:transform .3s;transition:transform .3s,-webkit-transform .3s}.u-swiper-indicator__wrapper__dot.data-v-49d35c99{width:5px;height:5px;border-radius:100px;margin:0 4px}.u-swiper-indicator__wrapper__dot--active.data-v-49d35c99{width:12px}

unpackage/dist/build/mp-weixin/node-modules/uview-ui/components/u-swiper/u-swiper.json

@@ -0,0 +1,7 @@
+{
+  "component": true,
+  "usingComponents": {
+    "u-loading-icon": "/node-modules/uview-ui/components/u-loading-icon/u-loading-icon",
+    "u-swiper-indicator": "/node-modules/uview-ui/components/u-swiper-indicator/u-swiper-indicator"
+  }
+}

unpackage/dist/build/mp-weixin/node-modules/uview-ui/components/u-swiper/u-swiper.wxss

@@ -0,0 +1 @@
+view.data-v-5678f2ce, scroll-view.data-v-5678f2ce, swiper-item.data-v-5678f2ce{display:flex;flex-direction:column;flex-shrink:0;flex-grow:0;flex-basis:auto;align-items:stretch;align-content:flex-start}.u-swiper.data-v-5678f2ce{display:flex;flex-direction:row;justify-content:center;align-items:center;position:relative;overflow:hidden}.u-swiper__wrapper.data-v-5678f2ce{flex:1}.u-swiper__wrapper__item.data-v-5678f2ce{flex:1}.u-swiper__wrapper__item__wrapper.data-v-5678f2ce{display:flex;flex-direction:row;position:relative;overflow:hidden;transition:-webkit-transform .3s;transition:transform .3s;transition:transform .3s,-webkit-transform .3s;flex:1}.u-swiper__wrapper__item__wrapper__image.data-v-5678f2ce{flex:1}.u-swiper__wrapper__item__wrapper__video.data-v-5678f2ce{flex:1}.u-swiper__wrapper__item__wrapper__title.data-v-5678f2ce{position:absolute;background-color:rgba(0,0,0,.3);bottom:0;left:0;right:0;font-size:28rpx;padding:12rpx 24rpx;color:#fff;flex:1}.u-swiper__indicator.data-v-5678f2ce{position:absolute;bottom:10px}

unpackage/dist/build/mp-weixin/node-modules/uview-ui/components/u-transition/u-transition.json

@@ -0,0 +1,4 @@
+{
+  "usingComponents": {},
+  "component": true
+}

unpackage/dist/build/mp-weixin/node-modules/uview-ui/components/u-transition/u-transition.wxml

@@ -0,0 +1 @@
+<block wx:if="{{inited}}"><view data-ref="u-transition" data-event-opts="{{[['tap',[['clickHandler',['$event']]]],['touchmove',[['noop',['$event']]]]]}}" class="{{['u-transition','data-v-3d839bb2','vue-ref',classes]}}" style="{{$root.s0}}" bindtap="__e" bindtouchmove="__e"><slot></slot></view></block>

unpackage/dist/build/mp-weixin/node-modules/uview-ui/components/u-transition/u-transition.wxss

@@ -0,0 +1,29 @@
+view.data-v-3d839bb2, scroll-view.data-v-3d839bb2, swiper-item.data-v-3d839bb2{display:flex;flex-direction:column;flex-shrink:0;flex-grow:0;flex-basis:auto;align-items:stretch;align-content:flex-start}.u-fade-enter-active.data-v-3d839bb2,
+.u-fade-leave-active.data-v-3d839bb2{transition-property:opacity}.u-fade-enter.data-v-3d839bb2,
+.u-fade-leave-to.data-v-3d839bb2{opacity:0}.u-fade-zoom-enter.data-v-3d839bb2,
+.u-fade-zoom-leave-to.data-v-3d839bb2{-webkit-transform:scale(.95);transform:scale(.95);opacity:0}.u-fade-zoom-enter-active.data-v-3d839bb2,
+.u-fade-zoom-leave-active.data-v-3d839bb2{transition-property:opacity,-webkit-transform;transition-property:transform,opacity;transition-property:transform,opacity,-webkit-transform}.u-fade-down-enter-active.data-v-3d839bb2,
+.u-fade-down-leave-active.data-v-3d839bb2,
+.u-fade-left-enter-active.data-v-3d839bb2,
+.u-fade-left-leave-active.data-v-3d839bb2,
+.u-fade-right-enter-active.data-v-3d839bb2,
+.u-fade-right-leave-active.data-v-3d839bb2,
+.u-fade-up-enter-active.data-v-3d839bb2,
+.u-fade-up-leave-active.data-v-3d839bb2{transition-property:opacity,-webkit-transform;transition-property:opacity,transform;transition-property:opacity,transform,-webkit-transform}.u-fade-up-enter.data-v-3d839bb2,
+.u-fade-up-leave-to.data-v-3d839bb2{-webkit-transform:translate3d(0,100%,0);transform:translate3d(0,100%,0);opacity:0}.u-fade-down-enter.data-v-3d839bb2,
+.u-fade-down-leave-to.data-v-3d839bb2{-webkit-transform:translate3d(0,-100%,0);transform:translate3d(0,-100%,0);opacity:0}.u-fade-left-enter.data-v-3d839bb2,
+.u-fade-left-leave-to.data-v-3d839bb2{-webkit-transform:translate3d(-100%,0,0);transform:translate3d(-100%,0,0);opacity:0}.u-fade-right-enter.data-v-3d839bb2,
+.u-fade-right-leave-to.data-v-3d839bb2{-webkit-transform:translate3d(100%,0,0);transform:translate3d(100%,0,0);opacity:0}.u-slide-down-enter-active.data-v-3d839bb2,
+.u-slide-down-leave-active.data-v-3d839bb2,
+.u-slide-left-enter-active.data-v-3d839bb2,
+.u-slide-left-leave-active.data-v-3d839bb2,
+.u-slide-right-enter-active.data-v-3d839bb2,
+.u-slide-right-leave-active.data-v-3d839bb2,
+.u-slide-up-enter-active.data-v-3d839bb2,
+.u-slide-up-leave-active.data-v-3d839bb2{transition-property:-webkit-transform;transition-property:transform;transition-property:transform,-webkit-transform}.u-slide-up-enter.data-v-3d839bb2,
+.u-slide-up-leave-to.data-v-3d839bb2{-webkit-transform:translate3d(0,100%,0);transform:translate3d(0,100%,0)}.u-slide-down-enter.data-v-3d839bb2,
+.u-slide-down-leave-to.data-v-3d839bb2{-webkit-transform:translate3d(0,-100%,0);transform:translate3d(0,-100%,0)}.u-slide-left-enter.data-v-3d839bb2,
+.u-slide-left-leave-to.data-v-3d839bb2{-webkit-transform:translate3d(-100%,0,0);transform:translate3d(-100%,0,0)}.u-slide-right-enter.data-v-3d839bb2,
+.u-slide-right-leave-to.data-v-3d839bb2{-webkit-transform:translate3d(100%,0,0);transform:translate3d(100%,0,0)}.u-zoom-enter-active.data-v-3d839bb2,
+.u-zoom-leave-active.data-v-3d839bb2{transition-property:-webkit-transform;transition-property:transform;transition-property:transform,-webkit-transform}.u-zoom-enter.data-v-3d839bb2,
+.u-zoom-leave-to.data-v-3d839bb2{-webkit-transform:scale(.95);transform:scale(.95)}

unpackage/dist/build/mp-weixin/pages/goods/goods-detail/index.js

@@ -0,0 +1 @@
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/goods/goods-detail/index"],{"0650":function(n,e,t){"use strict";t.r(e);var o=t("bca3"),u=t.n(o);for(var r in o)"default"!==r&&function(n){t.d(e,n,(function(){return o[n]}))}(r);e["default"]=u.a},"1b2f":function(n,e,t){"use strict";(function(n){t("a89e");o(t("66fd"));var e=o(t("b391"));function o(n){return n&&n.__esModule?n:{default:n}}wx.__webpack_require_UNI_MP_PLUGIN__=t,n(e.default)}).call(this,t("543d")["createPage"])},"256d":function(n,e,t){},5500:function(n,e,t){"use strict";t.d(e,"b",(function(){return u})),t.d(e,"c",(function(){return r})),t.d(e,"a",(function(){return o}));var o={uniSwiperDot:function(){return t.e("uni_modules/uni-swiper-dot/components/uni-swiper-dot/uni-swiper-dot").then(t.bind(null,"b59b"))},uniPopup:function(){return t.e("uni_modules/uni-popup/components/uni-popup/uni-popup").then(t.bind(null,"76a6"))}},u=function(){var n=this,e=n.$createElement;n._self._c},r=[]},b391:function(n,e,t){"use strict";t.r(e);var o=t("5500"),u=t("0650");for(var r in u)"default"!==r&&function(n){t.d(e,n,(function(){return u[n]}))}(r);t("ccd8");var i,c=t("f0c5"),a=Object(c["a"])(u["default"],o["b"],o["c"],!1,null,"70ad9494",null,!1,o["a"],i);e["default"]=a.exports},bca3:function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var o={data:function(){return{backImageUrl:t("232b"),info:[{img:t("0afe"),name:"酒店预订"}],dotsStyles:{backgroundColor:"rgba(255, 255, 255, .3)",border:"1px rgba(255, 255, 255, .3) solid",color:"#fff",selectedBackgroundColor:"rgba(255, 255, 255, 1)",selectedBorder:"1px rgba(255, 255, 255, 1) solid"},current1:0,mode:"default"}},methods:{Recipientopen:function(){this.$refs.Recipient.open("bottom")},Recipientclose:function(){this.$refs.Recipient.close()},change1:function(n){this.current1=n.detail.current}}};e.default=o},ccd8:function(n,e,t){"use strict";var o=t("256d"),u=t.n(o);u.a}},[["1b2f","common/runtime","common/vendor"]]]);

unpackage/dist/build/mp-weixin/pages/goods/goods-detail/index.json

@@ -0,0 +1,8 @@
+{
+  "navigationBarTitleText": "产品详情",
+  "enablePullDownRefresh": false,
+  "usingComponents": {
+    "uni-swiper-dot": "/uni_modules/uni-swiper-dot/components/uni-swiper-dot/uni-swiper-dot",
+    "uni-popup": "/uni_modules/uni-popup/components/uni-popup/uni-popup"
+  }
+}

unpackage/dist/build/mp-weixin/pages/goods/goods.json

@@ -0,0 +1,9 @@
+{
+  "navigationBarTitleText": "产品活动列表",
+  "enablePullDownRefresh": false,
+  "usingComponents": {
+    "u-input": "/node-modules/uview-ui/components/u-input/u-input",
+    "u-image": "/node-modules/uview-ui/components/u-image/u-image",
+    "waterfall": "/components/waterfall/waterfall-list"
+  }
+}

unpackage/dist/build/mp-weixin/pages/goods/goods.wxml

@@ -0,0 +1 @@
+<view class="goods data-v-d65e5662"><view class="goods-img data-v-d65e5662"><image style="width:100%;height:450rpx;" src="/static/icon/swiper01.png" mode class="data-v-d65e5662"></image></view><view class="main data-v-d65e5662"><view class="search data-v-d65e5662"><u-input vue-id="576f0adc-1" placeholder="搜索" border="none" class="data-v-d65e5662" bind:__l="__l" vue-slots="{{['suffix']}}"><view style="margin-right:40rpx;" slot="suffix" class="data-v-d65e5662"><u-image vue-id="{{('576f0adc-2')+','+('576f0adc-1')}}" showLoading="{{true}}" showError="{{true}}" src="/static/icon/search.png" width="40rpx" height="32rpx" class="data-v-d65e5662" bind:__l="__l"></u-image></view></u-input></view><view class="tab_nav data-v-d65e5662"><block wx:for="{{items}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="navTitle data-v-d65e5662"><view class="navTitle-item data-v-d65e5662"><view data-event-opts="{{[['tap',[['checked',[index]]]]]}}" class="{{['data-v-d65e5662',(isActive===index)?'active':'']}}" bindtap="__e">{{''+item.title+''}}</view></view></view></block></view></view><view class="data-v-d65e5662"><text data-event-opts="{{[['tap',[['goGoodsDetail',['$event']]]]]}}" bindtap="__e" class="data-v-d65e5662">商品</text><waterfall vue-id="576f0adc-3" status="{{waterfall.status}}" list="{{waterfall.list}}" reset="{{waterfall.reset}}" data-event-opts="{{[['^click',[['onClick']]],['^done',[['onDone']]]]}}" bind:click="__e" bind:done="__e" class="data-v-d65e5662" bind:__l="__l"></waterfall></view></view>

unpackage/dist/build/mp-weixin/pages/goods/goods.wxss

@@ -0,0 +1 @@
+.goods.data-v-d65e5662{height:100%}.tab_nav.data-v-d65e5662{width:100%;height:100rpx;display:flex;align-items:center;font-family:PingFang-SC-Heavy,PingFang-SC;overflow-x:scroll}.tab_nav .navTitle.data-v-d65e5662{width:154rpx;flex:none;height:28rpx;font-size:32rpx;color:#666;position:relative;display:flex;align-items:center;justify-content:center;margin-right:16rpx}.navTitle-item.data-v-d65e5662{width:154rpx;flex:none;height:28rpx;font-size:32rpx;color:#666;position:relative;display:flex;align-items:center;justify-content:center}.active.data-v-d65e5662{color:#d9a94d;font-weight:700}.active.data-v-d65e5662::after{display:inline-block;content:"";width:48rpx;height:12rpx;background:linear-gradient(90deg,#f3d69f,#d9a94d);border-radius:6px;position:absolute;bottom:-32rpx;left:51rpx}.search.data-v-d65e5662  .u-input{width:690rpx!important;height:68rpx!important;background:#f1f1f1;border-radius:74rpx}.search.data-v-d65e5662  .u-input__content__field-wrapper{padding-left:36rpx}.goods-img.data-v-d65e5662{width:100%;height:450rpx}.main.data-v-d65e5662{position:relative;top:-36rpx;padding:48rpx 30rpx 0;border-radius:16rpx 16rpx 0 0;height:238rpx;background:#fff;box-shadow:0 4rpx 8rpx 0 rgba(0,0,0,.04)}

unpackage/dist/build/mp-weixin/pages/index/active-detail/index.json

@@ -0,0 +1,9 @@
+{
+  "navigationBarTitleText": "IHG最受欢迎酒店",
+  "enablePullDownRefresh": false,
+  "usingComponents": {
+    "u-input": "/node-modules/uview-ui/components/u-input/u-input",
+    "u-image": "/node-modules/uview-ui/components/u-image/u-image",
+    "uni-load-more": "/uni_modules/uni-load-more/components/uni-load-more/uni-load-more"
+  }
+}

unpackage/dist/build/mp-weixin/pages/index/active-list/index.json

@@ -0,0 +1,9 @@
+{
+  "navigationBarTitleText": "活动列表",
+  "enablePullDownRefresh": false,
+  "usingComponents": {
+    "u-input": "/node-modules/uview-ui/components/u-input/u-input",
+    "u-image": "/node-modules/uview-ui/components/u-image/u-image",
+    "uni-load-more": "/uni_modules/uni-load-more/components/uni-load-more/uni-load-more"
+  }
+}

unpackage/dist/build/mp-weixin/pages/index/index.json

@@ -0,0 +1,9 @@
+{
+  "navigationBarTitleText": "首页",
+  "usingComponents": {
+    "uni-swiper-dot": "/uni_modules/uni-swiper-dot/components/uni-swiper-dot/uni-swiper-dot",
+    "uni-load-more": "/uni_modules/uni-load-more/components/uni-load-more/uni-load-more",
+    "tab-bar": "/components/TabBar/tabbar",
+    "swiper-box": "/components/SwiperBox/index"
+  }
+}

unpackage/dist/build/mp-weixin/pages/index/vote-detail/index.js

@@ -0,0 +1 @@
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/index/vote-detail/index"],{"01db":function(e,n,t){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var r={data:function(){return{info:[{img:t("0afe"),name:"酒店预订"}],dotsStyles:{backgroundColor:"rgba(255, 255, 255, .3)",border:"1px rgba(255, 255, 255, .3) solid",color:"#fff",selectedBackgroundColor:"rgba(255, 255, 255, 1)",selectedBorder:"1px rgba(255, 255, 255, 1) solid"},current1:0,mode:"default"}},methods:{change1:function(e){this.current1=e.detail.current}}};n.default=r},"2e72":function(e,n,t){},"3fa7":function(e,n,t){"use strict";t.d(n,"b",(function(){return u})),t.d(n,"c",(function(){return o})),t.d(n,"a",(function(){return r}));var r={uniSwiperDot:function(){return t.e("uni_modules/uni-swiper-dot/components/uni-swiper-dot/uni-swiper-dot").then(t.bind(null,"b59b"))}},u=function(){var e=this,n=e.$createElement;e._self._c},o=[]},"42af":function(e,n,t){"use strict";var r=t("2e72"),u=t.n(r);u.a},"923c":function(e,n,t){"use strict";t.r(n);var r=t("01db"),u=t.n(r);for(var o in r)"default"!==o&&function(e){t.d(n,e,(function(){return r[e]}))}(o);n["default"]=u.a},a61d:function(e,n,t){"use strict";(function(e){t("a89e");r(t("66fd"));var n=r(t("f4c9"));function r(e){return e&&e.__esModule?e:{default:e}}wx.__webpack_require_UNI_MP_PLUGIN__=t,e(n.default)}).call(this,t("543d")["createPage"])},f4c9:function(e,n,t){"use strict";t.r(n);var r=t("3fa7"),u=t("923c");for(var o in u)"default"!==o&&function(e){t.d(n,e,(function(){return u[e]}))}(o);t("42af");var a,c=t("f0c5"),i=Object(c["a"])(u["default"],r["b"],r["c"],!1,null,"611cbc36",null,!1,r["a"],a);n["default"]=i.exports}},[["a61d","common/runtime","common/vendor"]]]);

unpackage/dist/build/mp-weixin/pages/index/vote-detail/index.json

@@ -0,0 +1,7 @@
+{
+  "navigationBarTitleText": "投票详情",
+  "enablePullDownRefresh": false,
+  "usingComponents": {
+    "uni-swiper-dot": "/uni_modules/uni-swiper-dot/components/uni-swiper-dot/uni-swiper-dot"
+  }
+}

unpackage/dist/build/mp-weixin/pages/login/login.js

@@ -0,0 +1 @@
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/login/login"],{"4c44":function(n,t,e){"use strict";e.r(t);var u=e("f026"),c=e.n(u);for(var a in u)"default"!==a&&function(n){e.d(t,n,(function(){return u[n]}))}(a);t["default"]=c.a},5809:function(n,t,e){"use strict";e.r(t);var u=e("adb7"),c=e("4c44");for(var a in c)"default"!==a&&function(n){e.d(t,n,(function(){return c[n]}))}(a);e("e2c5");var r,o=e("f0c5"),f=Object(o["a"])(c["default"],u["b"],u["c"],!1,null,"1c7c3666",null,!1,u["a"],r);t["default"]=f.exports},a735:function(n,t,e){"use strict";(function(n){e("a89e");u(e("66fd"));var t=u(e("5809"));function u(n){return n&&n.__esModule?n:{default:n}}wx.__webpack_require_UNI_MP_PLUGIN__=e,n(t.default)}).call(this,e("543d")["createPage"])},adb7:function(n,t,e){"use strict";var u;e.d(t,"b",(function(){return c})),e.d(t,"c",(function(){return a})),e.d(t,"a",(function(){return u}));var c=function(){var n=this,t=n.$createElement;n._self._c},a=[]},e2c5:function(n,t,e){"use strict";var u=e("f67c"),c=e.n(u);c.a},f026:function(n,t,e){"use strict";(function(n){Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var e={data:function(){return{}},methods:{goYouyue:function(){n.navigateTo({url:"/pages/login/youyue"})}}};t.default=e}).call(this,e("543d")["default"])},f67c:function(n,t,e){}},[["a735","common/runtime","common/vendor"]]]);

unpackage/dist/build/mp-weixin/pages/login/login.json

@@ -0,0 +1,5 @@
+{
+  "navigationBarTitleText": "登录账号",
+  "enablePullDownRefresh": false,
+  "usingComponents": {}
+}

unpackage/dist/build/mp-weixin/pages/login/login.wxml

@@ -0,0 +1 @@
+<view class="login data-v-1c7c3666"><view class="img data-v-1c7c3666"><image src="/static/icon/loginBg.png" mode="scaleToFill" class="data-v-1c7c3666"></image></view><view class="title data-v-1c7c3666"><view class="line data-v-1c7c3666"></view><view class="logintype data-v-1c7c3666"><text class="data-v-1c7c3666">登录方式</text></view><view class="line data-v-1c7c3666"></view></view><view class="typebtn data-v-1c7c3666"><view data-event-opts="{{[['tap',[['goYouyue',['$event']]]]]}}" class="item data-v-1c7c3666" bindtap="__e"><image src="/static/icon/youyue.png" mode="scaleToFill" class="data-v-1c7c3666"></image><text class="data-v-1c7c3666">加入优悦会</text></view><view class="item data-v-1c7c3666"><image src="/static/icon/wechart.png" mode="scaleToFill" class="data-v-1c7c3666"></image><text class="data-v-1c7c3666">微信登录</text></view></view></view>

unpackage/dist/build/mp-weixin/pages/login/login.wxss

@@ -0,0 +1 @@
+.login.data-v-1c7c3666{height:100%;background:#fff;padding-top:146rpx;box-sizing:border-box}.img image.data-v-1c7c3666{width:750rpx;height:596rpx}.title.data-v-1c7c3666{height:40rpx;width:690rpx;margin-top:168rpx;margin-left:30rpx;margin-bottom:72rpx;display:flex;align-items:center;justify-content:space-between}.title .line.data-v-1c7c3666{width:240rpx;height:2rpx;background:#ededed;border-radius:1rpx}.title .logintype text.data-v-1c7c3666{font-size:28rpx;font-family:PingFang-SC-Medium,PingFang-SC;font-weight:500;color:#333}.typebtn.data-v-1c7c3666{display:flex;align-items:center;justify-content:space-around}.typebtn .item.data-v-1c7c3666{width:140rpx;height:156rpx;display:flex;flex-direction:column;align-items:center;justify-content:center}.typebtn .item image.data-v-1c7c3666{width:104rpx;height:104rpx;margin-bottom:12rpx}.typebtn .item text.data-v-1c7c3666{display:block;font-size:28rpx;font-family:PingFang-SC-Medium,PingFang-SC;font-weight:500;color:#666}