11.17 20.46

pages.json

@@ -42,6 +42,22 @@
 				"enablePullDownRefresh": false
 			}
 
+		},
+		{
+			"path": "pages/login/login",
+			"style": {
+				"navigationBarTitleText": "登录账号",
+				"enablePullDownRefresh": false
+			}
+		
+		},
+		{
+			"path": "pages/login/youyue",
+			"style": {
+				"navigationBarTitleText": "登录账号",
+				"enablePullDownRefresh": false
+			}
+		
 		},
 		{
 
@@ -160,6 +176,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/dev/mp-weixin/app.json

@@ -5,6 +5,8 @@
     "pages/index/active-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",
@@ -18,6 +20,8 @@
     "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",

unpackage/dist/dev/mp-weixin/common/vendor.js

@@ -20877,7 +20877,33 @@ module.exports = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAJwAAABkCAYAAABz
 /* 345 */,
 /* 346 */,
 /* 347 */,
-/* 348 */
+/* 348 */,
+/* 349 */,
+/* 350 */,
+/* 351 */,
+/* 352 */,
+/* 353 */,
+/* 354 */,
+/* 355 */,
+/* 356 */,
+/* 357 */,
+/* 358 */,
+/* 359 */,
+/* 360 */,
+/* 361 */,
+/* 362 */,
+/* 363 */,
+/* 364 */,
+/* 365 */,
+/* 366 */,
+/* 367 */,
+/* 368 */,
+/* 369 */,
+/* 370 */,
+/* 371 */,
+/* 372 */,
+/* 373 */,
+/* 374 */
 /*!***************************************************************************************************************!*\
   !*** C:/Users/Administrator/Desktop/ihg/IHG/uni_modules/uni-load-more/components/uni-load-more/i18n/index.js ***!
   \***************************************************************************************************************/
@@ -20885,16 +20911,16 @@ module.exports = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAJwAAABkCAYAAABz
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var _en = _interopRequireDefault(__webpack_require__(/*! ./en.json */ 349));
-var _zhHans = _interopRequireDefault(__webpack_require__(/*! ./zh-Hans.json */ 350));
-var _zhHant = _interopRequireDefault(__webpack_require__(/*! ./zh-Hant.json */ 351));function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}var _default =
+Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var _en = _interopRequireDefault(__webpack_require__(/*! ./en.json */ 375));
+var _zhHans = _interopRequireDefault(__webpack_require__(/*! ./zh-Hans.json */ 376));
+var _zhHant = _interopRequireDefault(__webpack_require__(/*! ./zh-Hant.json */ 377));function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}var _default =
 {
   en: _en.default,
   'zh-Hans': _zhHans.default,
   'zh-Hant': _zhHant.default };exports.default = _default;
 
 /***/ }),
-/* 349 */
+/* 375 */
 /*!**************************************************************************************************************!*\
   !*** C:/Users/Administrator/Desktop/ihg/IHG/uni_modules/uni-load-more/components/uni-load-more/i18n/en.json ***!
   \**************************************************************************************************************/
@@ -20904,7 +20930,7 @@ var _zhHant = _interopRequireDefault(__webpack_require__(/*! ./zh-Hant.json */ 3
 module.exports = JSON.parse("{\"uni-load-more.contentdown\":\"Pull up to show more\",\"uni-load-more.contentrefresh\":\"loading...\",\"uni-load-more.contentnomore\":\"No more data\"}");
 
 /***/ }),
-/* 350 */
+/* 376 */
 /*!*******************************************************************************************************************!*\
   !*** C:/Users/Administrator/Desktop/ihg/IHG/uni_modules/uni-load-more/components/uni-load-more/i18n/zh-Hans.json ***!
   \*******************************************************************************************************************/
@@ -20914,7 +20940,7 @@ module.exports = JSON.parse("{\"uni-load-more.contentdown\":\"Pull up to show mo
 module.exports = JSON.parse("{\"uni-load-more.contentdown\":\"上拉显示更多\",\"uni-load-more.contentrefresh\":\"正在加载...\",\"uni-load-more.contentnomore\":\"没有更多数据了\"}");
 
 /***/ }),
-/* 351 */
+/* 377 */
 /*!*******************************************************************************************************************!*\
   !*** C:/Users/Administrator/Desktop/ihg/IHG/uni_modules/uni-load-more/components/uni-load-more/i18n/zh-Hant.json ***!
   \*******************************************************************************************************************/
@@ -20924,28 +20950,28 @@ module.exports = JSON.parse("{\"uni-load-more.contentdown\":\"上拉显示更多
 module.exports = JSON.parse("{\"uni-load-more.contentdown\":\"上拉顯示更多\",\"uni-load-more.contentrefresh\":\"正在加載...\",\"uni-load-more.contentnomore\":\"沒有更多數據了\"}");
 
 /***/ }),
-/* 352 */,
-/* 353 */,
-/* 354 */,
-/* 355 */,
-/* 356 */,
-/* 357 */,
-/* 358 */,
-/* 359 */,
-/* 360 */,
-/* 361 */,
-/* 362 */,
-/* 363 */,
-/* 364 */,
-/* 365 */,
-/* 366 */,
-/* 367 */,
-/* 368 */,
-/* 369 */,
-/* 370 */,
-/* 371 */,
-/* 372 */,
-/* 373 */
+/* 378 */,
+/* 379 */,
+/* 380 */,
+/* 381 */,
+/* 382 */,
+/* 383 */,
+/* 384 */,
+/* 385 */,
+/* 386 */,
+/* 387 */,
+/* 388 */,
+/* 389 */,
+/* 390 */,
+/* 391 */,
+/* 392 */,
+/* 393 */,
+/* 394 */,
+/* 395 */,
+/* 396 */,
+/* 397 */,
+/* 398 */,
+/* 399 */
 /*!************************************************************************************************!*\
   !*** C:/Users/Administrator/Desktop/ihg/IHG/node_modules/uview-ui/components/u-input/props.js ***!
   \************************************************************************************************/
@@ -21135,14 +21161,14 @@ module.exports = JSON.parse("{\"uni-load-more.contentdown\":\"上拉顯示更多
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))
 
 /***/ }),
-/* 374 */,
-/* 375 */,
-/* 376 */,
-/* 377 */,
-/* 378 */,
-/* 379 */,
-/* 380 */,
-/* 381 */
+/* 400 */,
+/* 401 */,
+/* 402 */,
+/* 403 */,
+/* 404 */,
+/* 405 */,
+/* 406 */,
+/* 407 */
 /*!************************************************************************************************!*\
   !*** C:/Users/Administrator/Desktop/ihg/IHG/node_modules/uview-ui/components/u-image/props.js ***!
   \************************************************************************************************/
@@ -21234,14 +21260,14 @@ module.exports = JSON.parse("{\"uni-load-more.contentdown\":\"上拉顯示更多
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))
 
 /***/ }),
-/* 382 */,
-/* 383 */,
-/* 384 */,
-/* 385 */,
-/* 386 */,
-/* 387 */,
-/* 388 */,
-/* 389 */
+/* 408 */,
+/* 409 */,
+/* 410 */,
+/* 411 */,
+/* 412 */,
+/* 413 */,
+/* 414 */,
+/* 415 */
 /*!*****************************************************************************************************!*\
   !*** C:/Users/Administrator/Desktop/ihg/IHG/uni_modules/uni-forms/components/uni-forms/validate.js ***!
   \*****************************************************************************************************/
@@ -21737,7 +21763,7 @@ SchemaValidator.message = new Message();var _default =
 SchemaValidator;exports.default = _default;
 
 /***/ }),
-/* 390 */
+/* 416 */
 /*!**************************************************************************************************!*\
   !*** C:/Users/Administrator/Desktop/ihg/IHG/uni_modules/uni-forms/components/uni-forms/utils.js ***!
   \**************************************************************************************************/
@@ -22040,32 +22066,6 @@ var isEqual = function isEqual(a, b) {
 };exports.isEqual = isEqual;
 
 /***/ }),
-/* 391 */,
-/* 392 */,
-/* 393 */,
-/* 394 */,
-/* 395 */,
-/* 396 */,
-/* 397 */,
-/* 398 */,
-/* 399 */,
-/* 400 */,
-/* 401 */,
-/* 402 */,
-/* 403 */,
-/* 404 */,
-/* 405 */,
-/* 406 */,
-/* 407 */,
-/* 408 */,
-/* 409 */,
-/* 410 */,
-/* 411 */,
-/* 412 */,
-/* 413 */,
-/* 414 */,
-/* 415 */,
-/* 416 */,
 /* 417 */,
 /* 418 */,
 /* 419 */,
@@ -22075,7 +22075,26 @@ var isEqual = function isEqual(a, b) {
 /* 423 */,
 /* 424 */,
 /* 425 */,
-/* 426 */
+/* 426 */,
+/* 427 */,
+/* 428 */,
+/* 429 */,
+/* 430 */,
+/* 431 */,
+/* 432 */,
+/* 433 */,
+/* 434 */,
+/* 435 */,
+/* 436 */,
+/* 437 */,
+/* 438 */,
+/* 439 */,
+/* 440 */,
+/* 441 */,
+/* 442 */,
+/* 443 */,
+/* 444 */,
+/* 445 */
 /*!*******************************************************************************************************!*\
   !*** C:/Users/Administrator/Desktop/ihg/IHG/node_modules/uview-ui/components/u-loading-icon/props.js ***!
   \*******************************************************************************************************/
@@ -22142,14 +22161,14 @@ var isEqual = function isEqual(a, b) {
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))
 
 /***/ }),
-/* 427 */,
-/* 428 */,
-/* 429 */,
-/* 430 */,
-/* 431 */,
-/* 432 */,
-/* 433 */,
-/* 434 */
+/* 446 */,
+/* 447 */,
+/* 448 */,
+/* 449 */,
+/* 450 */,
+/* 451 */,
+/* 452 */,
+/* 453 */
 /*!*************************************************************************************************!*\
   !*** C:/Users/Administrator/Desktop/ihg/IHG/node_modules/uview-ui/components/u-swiper/props.js ***!
   \*************************************************************************************************/
@@ -22282,14 +22301,14 @@ var isEqual = function isEqual(a, b) {
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))
 
 /***/ }),
-/* 435 */,
-/* 436 */,
-/* 437 */,
-/* 438 */,
-/* 439 */,
-/* 440 */,
-/* 441 */,
-/* 442 */
+/* 454 */,
+/* 455 */,
+/* 456 */,
+/* 457 */,
+/* 458 */,
+/* 459 */,
+/* 460 */,
+/* 461 */
 /*!***********************************************************************************************!*\
   !*** C:/Users/Administrator/Desktop/ihg/IHG/node_modules/uview-ui/components/u-icon/icons.js ***!
   \***********************************************************************************************/
@@ -22512,7 +22531,7 @@ Object.defineProperty(exports, "__esModule", { value: true });exports.default =
   'uicon-en': "\uE692" };exports.default = _default;
 
 /***/ }),
-/* 443 */
+/* 462 */
 /*!***********************************************************************************************!*\
   !*** C:/Users/Administrator/Desktop/ihg/IHG/node_modules/uview-ui/components/u-icon/props.js ***!
   \***********************************************************************************************/
@@ -22609,14 +22628,14 @@ Object.defineProperty(exports, "__esModule", { value: true });exports.default =
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))
 
 /***/ }),
-/* 444 */,
-/* 445 */,
-/* 446 */,
-/* 447 */,
-/* 448 */,
-/* 449 */,
-/* 450 */,
-/* 451 */
+/* 463 */,
+/* 464 */,
+/* 465 */,
+/* 466 */,
+/* 467 */,
+/* 468 */,
+/* 469 */,
+/* 470 */
 /*!*****************************************************************************************************!*\
   !*** C:/Users/Administrator/Desktop/ihg/IHG/node_modules/uview-ui/components/u-transition/props.js ***!
   \*****************************************************************************************************/
@@ -22648,7 +22667,7 @@ Object.defineProperty(exports, "__esModule", { value: true });exports.default =
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))
 
 /***/ }),
-/* 452 */
+/* 471 */
 /*!**********************************************************************************************************!*\
   !*** C:/Users/Administrator/Desktop/ihg/IHG/node_modules/uview-ui/components/u-transition/transition.js ***!
   \**********************************************************************************************************/
@@ -22659,7 +22678,7 @@ Object.defineProperty(exports, "__esModule", { value: true });exports.default =
 Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var _regenerator = _interopRequireDefault(__webpack_require__(/*! ./node_modules/@babel/runtime/regenerator */ 34));
 
 
-var _nvueAniMap = _interopRequireDefault(__webpack_require__(/*! ./nvue.ani-map.js */ 453));function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {try {var info = gen[key](arg);var value = info.value;} catch (error) {reject(error);return;}if (info.done) {resolve(value);} else {Promise.resolve(value).then(_next, _throw);}}function _asyncToGenerator(fn) {return function () {var self = this,args = arguments;return new Promise(function (resolve, reject) {var gen = fn.apply(self, args);function _next(value) {asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);}function _throw(err) {asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);}_next(undefined);});};} // 定义一个一定时间后自动成功的promise，让调用nextTick方法处，进入下一个then方法
+var _nvueAniMap = _interopRequireDefault(__webpack_require__(/*! ./nvue.ani-map.js */ 472));function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {try {var info = gen[key](arg);var value = info.value;} catch (error) {reject(error);return;}if (info.done) {resolve(value);} else {Promise.resolve(value).then(_next, _throw);}}function _asyncToGenerator(fn) {return function () {var self = this,args = arguments;return new Promise(function (resolve, reject) {var gen = fn.apply(self, args);function _next(value) {asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);}function _throw(err) {asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);}_next(undefined);});};} // 定义一个一定时间后自动成功的promise，让调用nextTick方法处，进入下一个then方法
 var nextTick = function nextTick() {return new Promise(function (resolve) {return setTimeout(resolve, 1000 / 50);});}; // nvue动画模块实现细节抽离在外部文件
 
 // 定义类名，通过给元素动态切换类名，赋予元素一定的css动画样式
@@ -22813,7 +22832,7 @@ var getClassNames = function getClassNames(name) {return {
     } } };exports.default = _default;
 
 /***/ }),
-/* 453 */
+/* 472 */
 /*!************************************************************************************************************!*\
   !*** C:/Users/Administrator/Desktop/ihg/IHG/node_modules/uview-ui/components/u-transition/nvue.ani-map.js ***!
   \************************************************************************************************************/
@@ -22889,14 +22908,14 @@ Object.defineProperty(exports, "__esModule", { value: true });exports.default =
     'leave-to': { opacity: 0, transform: 'scale(0.95)' } } };exports.default = _default;
 
 /***/ }),
-/* 454 */,
-/* 455 */,
-/* 456 */,
-/* 457 */,
-/* 458 */,
-/* 459 */,
-/* 460 */,
-/* 461 */
+/* 473 */,
+/* 474 */,
+/* 475 */,
+/* 476 */,
+/* 477 */,
+/* 478 */,
+/* 479 */,
+/* 480 */
 /*!**************************************************************************************************!*\
   !*** C:/Users/Administrator/Desktop/ihg/IHG/uni_modules/uni-icons/components/uni-icons/icons.js ***!
   \**************************************************************************************************/
@@ -24072,14 +24091,14 @@ Object.defineProperty(exports, "__esModule", { value: true });exports.default =
     "unicode_decimal": 58929 }] };exports.default = _default;
 
 /***/ }),
-/* 462 */,
-/* 463 */,
-/* 464 */,
-/* 465 */,
-/* 466 */,
-/* 467 */,
-/* 468 */,
-/* 469 */
+/* 481 */,
+/* 482 */,
+/* 483 */,
+/* 484 */,
+/* 485 */,
+/* 486 */,
+/* 487 */,
+/* 488 */
 /*!**********************************************************************************************************************!*\
   !*** C:/Users/Administrator/Desktop/ihg/IHG/uni_modules/uni-transition/components/uni-transition/createAnimation.js ***!
   \**********************************************************************************************************************/
@@ -24218,12 +24237,12 @@ function createAnimation(option, _this) {
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))
 
 /***/ }),
-/* 470 */,
-/* 471 */,
-/* 472 */,
-/* 473 */,
-/* 474 */,
-/* 475 */
+/* 489 */,
+/* 490 */,
+/* 491 */,
+/* 492 */,
+/* 493 */,
+/* 494 */
 /*!***********************************************************************************************************!*\
   !*** C:/Users/Administrator/Desktop/ihg/IHG/node_modules/uview-ui/components/u-swiper-indicator/props.js ***!
   \***********************************************************************************************************/

unpackage/dist/dev/mp-weixin/pages/index/active-detail/index.js

@@ -98,13 +98,13 @@ var components
 try {
   components = {
     uInput: function() {
-      return Promise.all(/*! import() | node-modules/uview-ui/components/u-input/u-input */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u-input/u-input")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u-input/u-input.vue */ 368))
+      return Promise.all(/*! import() | node-modules/uview-ui/components/u-input/u-input */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u-input/u-input")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u-input/u-input.vue */ 394))
     },
     uImage: function() {
-      return Promise.all(/*! import() | node-modules/uview-ui/components/u-image/u-image */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u-image/u-image")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u-image/u-image.vue */ 376))
+      return Promise.all(/*! import() | node-modules/uview-ui/components/u-image/u-image */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u-image/u-image")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u-image/u-image.vue */ 402))
     },
     uniLoadMore: function() {
-      return Promise.all(/*! import() | uni_modules/uni-load-more/components/uni-load-more/uni-load-more */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-load-more/components/uni-load-more/uni-load-more")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue */ 343))
+      return Promise.all(/*! import() | uni_modules/uni-load-more/components/uni-load-more/uni-load-more */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-load-more/components/uni-load-more/uni-load-more")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue */ 369))
     }
   }
 } catch (e) {

unpackage/dist/dev/mp-weixin/pages/index/active-list/index.js

@@ -98,13 +98,13 @@ var components
 try {
   components = {
     uInput: function() {
-      return Promise.all(/*! import() | node-modules/uview-ui/components/u-input/u-input */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u-input/u-input")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u-input/u-input.vue */ 368))
+      return Promise.all(/*! import() | node-modules/uview-ui/components/u-input/u-input */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u-input/u-input")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u-input/u-input.vue */ 394))
     },
     uImage: function() {
-      return Promise.all(/*! import() | node-modules/uview-ui/components/u-image/u-image */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u-image/u-image")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u-image/u-image.vue */ 376))
+      return Promise.all(/*! import() | node-modules/uview-ui/components/u-image/u-image */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u-image/u-image")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u-image/u-image.vue */ 402))
     },
     uniLoadMore: function() {
-      return Promise.all(/*! import() | uni_modules/uni-load-more/components/uni-load-more/uni-load-more */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-load-more/components/uni-load-more/uni-load-more")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue */ 343))
+      return Promise.all(/*! import() | uni_modules/uni-load-more/components/uni-load-more/uni-load-more */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-load-more/components/uni-load-more/uni-load-more")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue */ 369))
     }
   }
 } catch (e) {

unpackage/dist/dev/mp-weixin/pages/index/index.js

@@ -98,10 +98,10 @@ var components
 try {
   components = {
     uniSwiperDot: function() {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-swiper-dot/components/uni-swiper-dot/uni-swiper-dot */ "uni_modules/uni-swiper-dot/components/uni-swiper-dot/uni-swiper-dot").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-swiper-dot/components/uni-swiper-dot/uni-swiper-dot.vue */ 336))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-swiper-dot/components/uni-swiper-dot/uni-swiper-dot */ "uni_modules/uni-swiper-dot/components/uni-swiper-dot/uni-swiper-dot").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-swiper-dot/components/uni-swiper-dot/uni-swiper-dot.vue */ 362))
     },
     uniLoadMore: function() {
-      return Promise.all(/*! import() | uni_modules/uni-load-more/components/uni-load-more/uni-load-more */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-load-more/components/uni-load-more/uni-load-more")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue */ 343))
+      return Promise.all(/*! import() | uni_modules/uni-load-more/components/uni-load-more/uni-load-more */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-load-more/components/uni-load-more/uni-load-more")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue */ 369))
     }
   }
 } catch (e) {
@@ -158,7 +158,7 @@ __webpack_require__.r(__webpack_exports__);
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var TabBar = function TabBar() {Promise.all(/*! require.ensure | components/TabBar/tabbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/TabBar/tabbar")]).then((function () {return resolve(__webpack_require__(/*! ../../components/TabBar/tabbar.vue */ 354));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var SwiperBox = function SwiperBox() {__webpack_require__.e(/*! require.ensure | components/SwiperBox/index */ "components/SwiperBox/index").then((function () {return resolve(__webpack_require__(/*! ../../components/SwiperBox/index.vue */ 361));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
+/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var TabBar = function TabBar() {Promise.all(/*! require.ensure | components/TabBar/tabbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/TabBar/tabbar")]).then((function () {return resolve(__webpack_require__(/*! ../../components/TabBar/tabbar.vue */ 380));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var SwiperBox = function SwiperBox() {__webpack_require__.e(/*! require.ensure | components/SwiperBox/index */ "components/SwiperBox/index").then((function () {return resolve(__webpack_require__(/*! ../../components/SwiperBox/index.vue */ 387));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
 
 
 

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

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

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

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

unpackage/dist/dev/mp-weixin/uni_modules/uni-segmented-control/components/uni-segmented-control/uni-segmented-control.wxss → unpackage/dist/dev/mp-weixin/pages/login/login.wxss

@@ -24,45 +24,61 @@
 /* 垂直间距 */
 /* 透明度 */
 /* 文章场景相关 */
-.segmented-control.data-v-064e9cd1 {
-  display: flex;
+.login.data-v-b237504c {
+  height: 100%;
+  background: #FFFFFF;
+  padding-top: 146rpx;
   box-sizing: border-box;
-  flex-direction: row;
-  height: 36px;
-  overflow: hidden;
 }
-.segmented-control__item.data-v-064e9cd1 {
-  display: inline-flex;
-  box-sizing: border-box;
-  position: relative;
-  flex: 1;
-  justify-content: center;
+.img image.data-v-b237504c {
+  width: 750rpx;
+  height: 596rpx;
+}
+.title.data-v-b237504c {
+  height: 40rpx;
+  width: 690rpx;
+  margin-top: 168rpx;
+  margin-left: 30rpx;
+  margin-bottom: 72rpx;
+  display: flex;
   align-items: center;
+  justify-content: space-between;
 }
-.segmented-control__item--button.data-v-064e9cd1 {
-  border-style: solid;
-  border-top-width: 1px;
-  border-bottom-width: 1px;
-  border-right-width: 1px;
-  border-left-width: 0;
+.title .line.data-v-b237504c {
+  width: 240rpx;
+  height: 2rpx;
+  background: #EDEDED;
+  border-radius: 1rpx;
 }
-.segmented-control__item--button--first.data-v-064e9cd1 {
-  border-left-width: 1px;
-  border-top-left-radius: 5px;
-  border-bottom-left-radius: 5px;
+.title .logintype text.data-v-b237504c {
+  font-size: 28rpx;
+  font-family: PingFang-SC-Medium, PingFang-SC;
+  font-weight: 500;
+  color: #333333;
 }
-.segmented-control__item--button--last.data-v-064e9cd1 {
-  border-top-right-radius: 5px;
-  border-bottom-right-radius: 5px;
+.typebtn.data-v-b237504c {
+  display: flex;
+  align-items: center;
+  justify-content: space-around;
+}
+.typebtn .item.data-v-b237504c {
+  width: 140rpx;
+  height: 156rpx;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
 }
-.segmented-control__item--text.data-v-064e9cd1 {
-  border-bottom-style: solid;
-  border-bottom-width: 2px;
-  padding: 6px 0;
+.typebtn .item image.data-v-b237504c {
+  width: 104rpx;
+  height: 104rpx;
+  margin-bottom: 12rpx;
 }
-.segmented-control__text.data-v-064e9cd1 {
-  font-size: 14px;
-  line-height: 20px;
-  text-align: center;
+.typebtn .item text.data-v-b237504c {
+  display: block;
+  font-size: 28rpx;
+  font-family: PingFang-SC-Medium, PingFang-SC;
+  font-weight: 500;
+  color: #666666;
 }
 

unpackage/dist/dev/mp-weixin/pages/login/youyue.json

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

unpackage/dist/dev/mp-weixin/pages/login/youyue.wxss

@@ -0,0 +1,154 @@
+@charset "UTF-8";
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+/**
+ * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
+ */
+/* 颜色变量 */
+/* 行为相关颜色 */
+/* 文字基本颜色 */
+/* 背景颜色 */
+/* 边框颜色 */
+/* 尺寸变量 */
+/* 文字尺寸 */
+/* 图片尺寸 */
+/* Border Radius */
+/* 水平间距 */
+/* 垂直间距 */
+/* 透明度 */
+/* 文章场景相关 */
+.youyue.data-v-ae2462ae {
+  height: 100%;
+  background: #FFFFFF;
+  padding: 192rpx 30rpx 140rpx 30rpx;
+  position: relative;
+}
+.nav.data-v-ae2462ae {
+  position: absolute;
+  top: 0rpx;
+  left: 0rpx;
+}
+.nav image.data-v-ae2462ae {
+  width: 750rpx;
+  height: 142rpx;
+}
+.title.data-v-ae2462ae {
+  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.data-v-ae2462ae {
+  width: 690rpx;
+  height: 220rpx;
+  margin-bottom: 64rpx;
+}
+.detail text.data-v-ae2462ae {
+  font-size: 32rpx;
+  font-family: PingFang-SC-Medium, PingFang-SC;
+  font-weight: 500;
+  color: #333333;
+}
+.divided.data-v-ae2462ae {
+  width: 690rpx;
+  height: 2rpx;
+  background: #F0F0F0;
+}
+.item.data-v-ae2462ae {
+  margin: 40rpx 0;
+}
+.item .itemtitle.data-v-ae2462ae {
+  font-size: 32rpx;
+  font-family: PingFang-SC-Bold, PingFang-SC;
+  font-weight: bold;
+  color: #333333;
+}
+.itemcontent.data-v-ae2462ae {
+  margin-bottom: 40rpx;
+  width: 512rpx;
+  font-size: 28rpx;
+  font-family: PingFang-SC-Medium, PingFang-SC;
+  font-weight: 500;
+  color: #333333;
+}
+.itemLast.data-v-ae2462ae {
+  width: 690rpx;
+  font-size: 24rpx;
+  font-family: PingFang-SC-Medium, PingFang-SC;
+  font-weight: 500;
+  color: #333333;
+  margin-bottom: 64rpx;
+}
+.btn.data-v-ae2462ae {
+  width: 688rpx;
+  height: 92rpx;
+  background: linear-gradient(270deg, #FF6200 0%, #FF9342 100%);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  border-radius: 12rpx;
+}
+.btn text.data-v-ae2462ae {
+  font-size: 30rpx;
+  font-family: PingFang-SC-Bold, PingFang-SC;
+  font-weight: bold;
+  color: #FFFFFF;
+}
+.logintitle.data-v-ae2462ae {
+  height: 40rpx;
+  width: 690rpx;
+  margin-top: 64rpx;
+  margin-bottom: 64rpx;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+.logintitle .line.data-v-ae2462ae {
+  width: 240rpx;
+  height: 2rpx;
+  background: #EDEDED;
+  border-radius: 1rpx;
+}
+.logintitle .logintype text.data-v-ae2462ae {
+  font-size: 28rpx;
+  font-family: PingFang-SC-Medium, PingFang-SC;
+  font-weight: 500;
+  color: #333333;
+}
+.typebtn.data-v-ae2462ae {
+  display: flex;
+  align-items: center;
+  justify-content: space-around;
+}
+.typebtn .item.data-v-ae2462ae {
+  width: 140rpx;
+  height: 156rpx;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+}
+.typebtn .item image.data-v-ae2462ae {
+  width: 104rpx;
+  height: 104rpx;
+  margin-bottom: 12rpx;
+}
+.typebtn .item text.data-v-ae2462ae {
+  display: block;
+  font-size: 28rpx;
+  font-family: PingFang-SC-Medium, PingFang-SC;
+  font-weight: 500;
+  color: #666666;
+}
+

unpackage/dist/dev/mp-weixin/pages/map/map.js

@@ -130,7 +130,7 @@ __webpack_require__.r(__webpack_exports__);
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var TabBar = function TabBar() {Promise.all(/*! require.ensure | components/TabBar/tabbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/TabBar/tabbar")]).then((function () {return resolve(__webpack_require__(/*! ../../components/TabBar/tabbar.vue */ 354));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
+Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var TabBar = function TabBar() {Promise.all(/*! require.ensure | components/TabBar/tabbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/TabBar/tabbar")]).then((function () {return resolve(__webpack_require__(/*! ../../components/TabBar/tabbar.vue */ 380));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
 
 
 

unpackage/dist/dev/mp-weixin/pages/msg/msg.js

@@ -98,10 +98,10 @@ var components
 try {
   components = {
     uInput: function() {
-      return Promise.all(/*! import() | node-modules/uview-ui/components/u-input/u-input */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u-input/u-input")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u-input/u-input.vue */ 368))
+      return Promise.all(/*! import() | node-modules/uview-ui/components/u-input/u-input */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u-input/u-input")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u-input/u-input.vue */ 394))
     },
     uImage: function() {
-      return Promise.all(/*! import() | node-modules/uview-ui/components/u-image/u-image */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u-image/u-image")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u-image/u-image.vue */ 376))
+      return Promise.all(/*! import() | node-modules/uview-ui/components/u-image/u-image */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u-image/u-image")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u-image/u-image.vue */ 402))
     }
   }
 } catch (e) {
@@ -158,7 +158,7 @@ __webpack_require__.r(__webpack_exports__);
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var TabBar = function TabBar() {Promise.all(/*! require.ensure | components/TabBar/tabbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/TabBar/tabbar")]).then((function () {return resolve(__webpack_require__(/*! ../../components/TabBar/tabbar.vue */ 354));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
+Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var TabBar = function TabBar() {Promise.all(/*! require.ensure | components/TabBar/tabbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/TabBar/tabbar")]).then((function () {return resolve(__webpack_require__(/*! ../../components/TabBar/tabbar.vue */ 380));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
 
 
 

unpackage/dist/dev/mp-weixin/pages/my/integral/integral.wxml

@@ -1 +1 @@
-<view class="integral data-v-3fcebf05"><view class="nav data-v-3fcebf05"><image style="width:100%;height:100%;" src="/static/icon/integralbg.png" class="data-v-3fcebf05"></image><view class="PointsColumn data-v-3fcebf05"><image src="/static/icon/integralicon.png" class="data-v-3fcebf05"></image><text class="data-v-3fcebf05">1000</text></view><view class="titletext data-v-3fcebf05"><view data-event-opts="{{[['tap',[['gointegralRecord',['$event']]]]]}}" class="textitem data-v-3fcebf05" bindtap="__e"><image src="/static/icon/integralrecord.png" class="data-v-3fcebf05"></image><text class="data-v-3fcebf05">积分记录</text></view><view class="textitem data-v-3fcebf05"><image src="/static/icon/lament.png" class="data-v-3fcebf05"></image><text class="data-v-3fcebf05">我的兑换</text></view><view data-event-opts="{{[['tap',[['gointegralRule',['$event']]]]]}}" class="textitem data-v-3fcebf05" bindtap="__e"><image src="/static/icon/integralrule.png" class="data-v-3fcebf05"></image><text class="data-v-3fcebf05">积分规则</text></view></view></view><view class="shopList data-v-3fcebf05"><view class="listTop data-v-3fcebf05"><text class="data-v-3fcebf05">积分兑换</text></view><view class="ListContent data-v-3fcebf05"><block wx:for="{{4}}" wx:for-item="item" wx:for-index="__i0__"><view class="contentItem data-v-3fcebf05"><image src="/static/icon/Kudosbg.png" class="data-v-3fcebf05"></image><view class="itemName data-v-3fcebf05">中秋佳节五仁月饼，惊喜特供，限时抢购</view><view class="itemPrice data-v-3fcebf05">6000积分</view></view></block></view><uni-load-more vue-id="8becbabe-1" status="{{status}}" color="#CCCCCC" content-text="{{contentText}}" class="data-v-3fcebf05" bind:__l="__l"></uni-load-more></view></view>
+<view class="integral data-v-3fcebf05"><view class="nav data-v-3fcebf05"><image style="width:100%;height:100%;" src="/static/icon/integralbg.png" class="data-v-3fcebf05"></image><view class="PointsColumn data-v-3fcebf05"><image src="/static/icon/integralicon.png" class="data-v-3fcebf05"></image><text class="data-v-3fcebf05">1000</text></view><view class="titletext data-v-3fcebf05"><view data-event-opts="{{[['tap',[['gointegralRecord',['$event']]]]]}}" class="textitem data-v-3fcebf05" bindtap="__e"><image src="/static/icon/integralrecord.png" class="data-v-3fcebf05"></image><text class="data-v-3fcebf05">积分记录</text></view><view class="textitem data-v-3fcebf05"><image src="/static/icon/lament.png" class="data-v-3fcebf05"></image><text class="data-v-3fcebf05">我的兑换</text></view><view data-event-opts="{{[['tap',[['gointegralRule',['$event']]]]]}}" class="textitem data-v-3fcebf05" bindtap="__e"><image src="/static/icon/integralrule.png" class="data-v-3fcebf05"></image><text class="data-v-3fcebf05">积分规则</text></view></view></view><view class="shopList data-v-3fcebf05"><view class="listTop data-v-3fcebf05"><text class="data-v-3fcebf05">积分兑换</text></view><view class="ListContent data-v-3fcebf05"><block wx:for="{{4}}" wx:for-item="item" wx:for-index="__i0__"><view data-event-opts="{{[['tap',[['goIntegralOrder',['$event']]]]]}}" class="contentItem data-v-3fcebf05" bindtap="__e"><image src="/static/icon/Kudosbg.png" class="data-v-3fcebf05"></image><view class="itemName data-v-3fcebf05">中秋佳节五仁月饼，惊喜特供，限时抢购</view><view class="itemPrice data-v-3fcebf05">6000积分</view></view></block></view><uni-load-more vue-id="8becbabe-1" status="{{status}}" color="#CCCCCC" content-text="{{contentText}}" class="data-v-3fcebf05" bind:__l="__l"></uni-load-more></view></view>

unpackage/dist/dev/mp-weixin/pages/my/integral/integral.wxss

@@ -107,54 +107,28 @@
   flex-wrap: wrap;
   box-sizing: border-box;
 }
-.shopList .ListContent .contentItem.data-v-3fcebf05:nth-child(2n+1) {
+.shopList .ListContent .contentItem.data-v-3fcebf05 {
   width: 332rpx;
   height: 578rpx;
-  margin-right: 26rpx;
+  margin-right: 13rpx;
   background: #FFFFFF;
   box-sizing: border-box;
   box-shadow: 0px 4rpx 8rpx 0px rgba(0, 0, 0, 0.04);
   border-radius: 12rpx;
   margin-bottom: 24rpx;
 }
-.shopList .ListContent .contentItem:nth-child(2n+1) image.data-v-3fcebf05 {
+.shopList .ListContent .contentItem image.data-v-3fcebf05 {
   width: 332rpx;
   height: 400rpx;
 }
-.shopList .ListContent .contentItem:nth-child(2n+1) .itemName.data-v-3fcebf05 {
+.shopList .ListContent .contentItem .itemName.data-v-3fcebf05 {
   margin: 0 18rpx 20rpx 22rpx;
   font-size: 28rpx;
   font-family: PingFang-SC-Bold, PingFang-SC;
   font-weight: bold;
   color: #333333;
 }
-.shopList .ListContent .contentItem:nth-child(2n+1) .itemPrice.data-v-3fcebf05 {
-  margin-left: 22rpx;
-  font-size: 28rpx;
-  font-family: PingFang-SC-Bold, PingFang-SC;
-  font-weight: bold;
-  color: #FF6200;
-}
-.shopList .ListContent .contentItem.data-v-3fcebf05:nth-child(2n) {
-  width: 332rpx;
-  height: 510rpx;
-  box-sizing: border-box;
-  background: #FFFFFF;
-  box-shadow: 0px 4rpx 8rpx 0px rgba(0, 0, 0, 0.04);
-  border-radius: 12rpx;
-}
-.shopList .ListContent .contentItem:nth-child(2n) image.data-v-3fcebf05 {
-  width: 332rpx;
-  height: 332rpx;
-}
-.shopList .ListContent .contentItem:nth-child(2n) .itemName.data-v-3fcebf05 {
-  margin: 0 18rpx 20rpx 22rpx;
-  font-size: 28rpx;
-  font-family: PingFang-SC-Bold, PingFang-SC;
-  font-weight: bold;
-  color: #333333;
-}
-.shopList .ListContent .contentItem:nth-child(2n) .itemPrice.data-v-3fcebf05 {
+.shopList .ListContent .contentItem .itemPrice.data-v-3fcebf05 {
   margin-left: 22rpx;
   font-size: 28rpx;
   font-family: PingFang-SC-Bold, PingFang-SC;

unpackage/dist/dev/mp-weixin/pages/my/integral/integralExchange.json

@@ -0,0 +1,5 @@
+{
+  "navigationBarTitleText": "兑换详情",
+  "enablePullDownRefresh": false,
+  "usingComponents": {}
+}

unpackage/dist/dev/mp-weixin/pages/my/integral/integralExchange.wxml

@@ -0,0 +1 @@
+<view class="exchangeDetail data-v-85fdca70"><view class="detailCard data-v-85fdca70"><image src="/static/icon/success.png" class="data-v-85fdca70"></image><text style="margin-bottom:20rpx;" class="data-v-85fdca70">商品兑换成功</text><text class="data-v-85fdca70">-5000积分</text></view><view class="btn data-v-85fdca70"><view data-event-opts="{{[['tap',[['goBack',['$event']]]]]}}" class="back data-v-85fdca70" bindtap="__e"><text class="data-v-85fdca70">返回首页</text></view><view class="checkout data-v-85fdca70"><text class="data-v-85fdca70">查看订单</text></view></view><view class="bottomCard data-v-85fdca70"><image src="/static/icon/Kudosbg.png" class="data-v-85fdca70"></image><view class="content data-v-85fdca70"><text class="data-v-85fdca70">立即加入IHG会员</text><image style="width:12rpx;height:20rpx;position:absolute;bottom:36rpx;left:475rpx;" src="/static/icon/right.png" class="data-v-85fdca70"></image></view></view></view>

unpackage/dist/dev/mp-weixin/pages/my/integral/integralExchange.wxss

@@ -0,0 +1,117 @@
+@charset "UTF-8";
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+/**
+ * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
+ */
+/* 颜色变量 */
+/* 行为相关颜色 */
+/* 文字基本颜色 */
+/* 背景颜色 */
+/* 边框颜色 */
+/* 尺寸变量 */
+/* 文字尺寸 */
+/* 图片尺寸 */
+/* Border Radius */
+/* 水平间距 */
+/* 垂直间距 */
+/* 透明度 */
+/* 文章场景相关 */
+.exchangeDetail.data-v-85fdca70 {
+  height: 100%;
+  background: #F9F9F9;
+}
+.detailCard.data-v-85fdca70 {
+  width: 750rpx;
+  height: 446rpx;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+}
+.detailCard image.data-v-85fdca70 {
+  width: 120rpx;
+  height: 120rpx;
+  margin-bottom: 48rpx;
+}
+.detailCard text.data-v-85fdca70 {
+  display: block;
+  font-size: 32rpx;
+  font-family: PingFangSC-Medium, PingFang SC;
+  font-weight: 500;
+  color: #080F18;
+}
+.btn.data-v-85fdca70 {
+  width: 750rpx;
+  height: 76rpx;
+  display: flex;
+  justify-content: space-around;
+  align-items: center;
+}
+.btn .back.data-v-85fdca70 {
+  width: 332rpx;
+  height: 76rpx;
+  background: #F5F5F5;
+  border-radius: 8rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.btn .back text.data-v-85fdca70 {
+  font-size: 30rpx;
+  font-family: PingFang-SC-Bold, PingFang-SC;
+  font-weight: bold;
+  color: #FF6301;
+}
+.btn .checkout.data-v-85fdca70 {
+  width: 332rpx;
+  height: 76rpx;
+  background: linear-gradient(270deg, #FF6200 0%, #FF9342 100%);
+  border-radius: 8rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.btn .checkout text.data-v-85fdca70 {
+  font-size: 30rpx;
+  font-family: PingFang-SC-Bold, PingFang-SC;
+  font-weight: bold;
+  color: #FFFFFF;
+}
+.bottomCard.data-v-85fdca70 {
+  width: 690rpx;
+  height: 584rpx;
+  background: #FFFFFF;
+  box-shadow: 0px 8rpx 16rpx 0px rgba(220, 222, 229, 0.71);
+  border-radius: 20rpx;
+  background: #FFFFFF;
+  margin-left: 30rpx;
+  margin-top: 64rpx;
+}
+.bottomCard image.data-v-85fdca70 {
+  width: 690rpx;
+  height: 492rpx;
+}
+.bottomCard .content.data-v-85fdca70 {
+  width: 690rpx;
+  height: 92rpx;
+  position: relative;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.bottomCard .content text.data-v-85fdca70 {
+  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);
+}
+

unpackage/dist/dev/mp-weixin/pages/my/integral/integralOrder.json

@@ -0,0 +1,9 @@
+{
+  "navigationBarTitleText": "积分兑换",
+  "enablePullDownRefresh": false,
+  "usingComponents": {
+    "uni-forms": "/uni_modules/uni-forms/components/uni-forms/uni-forms",
+    "uni-forms-item": "/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item",
+    "uni-easyinput": "/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput"
+  }
+}

unpackage/dist/dev/mp-weixin/pages/my/integral/integralOrder.wxss

@@ -0,0 +1,128 @@
+@charset "UTF-8";
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+/**
+ * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
+ */
+/* 颜色变量 */
+/* 行为相关颜色 */
+/* 文字基本颜色 */
+/* 背景颜色 */
+/* 边框颜色 */
+/* 尺寸变量 */
+/* 文字尺寸 */
+/* 图片尺寸 */
+/* Border Radius */
+/* 水平间距 */
+/* 垂直间距 */
+/* 透明度 */
+/* 文章场景相关 */
+.exchangePrize.data-v-6779b279 {
+  height: 100%;
+  background: #FFFFFF;
+}
+.form.data-v-6779b279 {
+  background: #F9F9F9;
+  width: 750rpx;
+  padding: 24rpx 30rpx;
+  box-sizing: border-box;
+}
+.form .selectType.data-v-6779b279 {
+  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.data-v-6779b279 {
+  width: 750rpx;
+  height: 700rpx;
+  background: #FFFFFF;
+  border-radius: 12rpx 12rpx 0px 0px;
+  padding: 32rpx 30rpx;
+}
+.msg .title.data-v-6779b279 {
+  margin-bottom: 24rpx;
+}
+.msg .title text.data-v-6779b279 {
+  font-size: 32rpx;
+  font-family: PingFang-SC-Bold, PingFang-SC;
+  font-weight: bold;
+  color: #080F18;
+}
+.msg .shopCard.data-v-6779b279 {
+  margin-top: 28rpx;
+  width: 694rpx;
+  height: 164rpx;
+  background: #F4F5F6;
+  border-radius: 10rpx;
+  display: flex;
+  align-items: center;
+}
+.msg .shopCard image.data-v-6779b279 {
+  width: 132rpx;
+  height: 132rpx;
+  margin-left: 16rpx;
+  display: inline-block;
+}
+.msg .shopCard .name.data-v-6779b279 {
+  font-size: 28rpx;
+  font-family: PingFangSC-Medium, PingFang SC;
+  font-weight: 500;
+  color: #080F18;
+  display: block;
+}
+.msg .shopCard .tag.data-v-6779b279 {
+  font-size: 24rpx;
+  font-family: PingFang-SC-Medium, PingFang-SC;
+  font-weight: 500;
+  color: #666666;
+}
+.msg .shopNumber.data-v-6779b279 {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-top: 25rpx;
+}
+.msg .shopNumber text.data-v-6779b279 {
+  font-size: 26rpx;
+  font-family: PingFang-SC-Medium, PingFang-SC;
+  font-weight: 500;
+  color: #000000;
+}
+.bottombtn.data-v-6779b279 {
+  width: 690rpx;
+  height: 92rpx;
+  background: linear-gradient(270deg, #FF6200 0%, #FF9342 100%);
+  border-radius: 12rpx;
+  margin-left: 30rpx;
+  position: fixed;
+  bottom: 72rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.bottombtn .btnitem.data-v-6779b279 {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.bottombtn .btnitem text.data-v-6779b279 {
+  font-size: 30rpx;
+  font-family: PingFang-SC-Bold, PingFang-SC;
+  font-weight: bold;
+  color: #FFFFFF;
+}
+