项目日志:11.23登录接口调试

api/document/document.js

@@ -3,13 +3,13 @@ const request = uni.$u.http
 // 隐私协议
 export function privacy(){
 	return request.get(
-		`api/privacy`
+		`privacy`
 	)
 }
 // 用户协议
 export function agreement(){
 	return request.get(
-		`api/agreement`
+		`agreement`
 	)
 }
 

api/index.js

@@ -4,19 +4,20 @@ import episode from './episode'
 import sign from './sign'
 import pay from './pay'
 import share from './share'
-
 // 酒店
 import document from './document/document.js'
-
+import my from './my/my.js'
 const api = {
-  user,
-  setting,
-  episode,
-  sign,
-  pay,
-  share,
-  
-  document
+	user,
+	setting,
+	episode,
+	sign,
+	pay,
+	share,
+
+
+	document,
+	my,
 }
 
 export default api

api/my/my.js

@@ -0,0 +1,13 @@
+const request = uni.$u.http
+
+// 隐私协议http://t9.9026.com/api/auth/mnplogin
+export function myLogin(data){
+	return request.post(
+		`auth/mnplogin`,
+		data
+	)
+}
+
+export default {
+  myLogin
+}

pages.json

@@ -1,16 +1,21 @@
 {
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
 		
-
+		{
+		
+			"path": "pages/my/my",
+			"style": {
+				"navigationBarTitleText": "我的",
+				"enablePullDownRefresh": false
+			}
+		
+		},
+		
 		{
 			"path": "pages/index/index",
 			"style": {
 				"navigationBarTitleText": "首页",
-				"app-plus": {
-					"animationType": "pop-out",
-					"animationDuration": "slide-in-right",
-					"enablePullDownRefresh": true
-				}
+				"enablePullDownRefresh": false
 			}
 		},
 		{
@@ -83,7 +88,7 @@
 				"navigationBarTitleText": "IHG | 洲际酒店集团中国西区",
 				"enablePullDownRefresh": false
 			}
-		
+
 		},
 		{
 			"path": "pages/msg/msg",
@@ -91,15 +96,16 @@
 				"navigationBarTitleText": "消息",
 				"enablePullDownRefresh": false
 			}
-
+		
 		},
+
 		{
 			"path": "pages/webview/webview",
 			"style": {
 				"navigationBarTitleText": "webview",
 				"enablePullDownRefresh": false
 			}
-		
+
 		},
 		{
 			"path": "pages/login/login",
@@ -117,15 +123,7 @@
 			}
 
 		},
-		{
-
-			"path": "pages/my/my",
-			"style": {
-				"navigationBarTitleText": "我的",
-				"enablePullDownRefresh": false
-			}
-
-		},
+		
 		{
 			"path": "pages/my/PersonalData/personalData",
 			"style": {

pages/index/index.vue

@@ -74,6 +74,17 @@
 
 		<!-- 酒店推荐图片 -->
 		<view class="home-hotel-img">
+			
+			<view class="home-hotel-img-content">
+				<view class="home-hotel-img-content-item" v-for="item in goodsList">
+					<image  class="home-hotel-img-content-item-img"   :class="item.short?'home-hotel-img-content-item-img': 'home-hotel-img-content-item-img-long' "  :src="item.img" mode=""></image>
+					<view class="text">
+						<text class="text-top">{{item.text}}</text>
+						<text class="text-main">{{item.title}}</text>
+					</view>
+				</view>
+			</view>
+		
 			<view class="home-hotel-img-more" @click="goProduceList">
 				<text>查看更多商品</text>
 			</view>
@@ -114,6 +125,35 @@
 		},
 		data() {
 			return {
+				goodsList:[
+					{
+						img:'../../static/icon/goodsimg01.png',
+						text:'中秋佳节五仁月饼，惊喜特供，限时抢购',
+						title:'环球洲际',
+						short:'',
+					},
+					{
+						img:'../../static/icon/goodsimg02.png',
+						text:'中秋佳节五仁月饼，惊喜特供，限时抢购',
+						title:'环球洲际'
+					},
+					{
+						img:'../../static/icon/goodsimg02.png',
+						text:'中秋佳节五仁月饼，惊喜特供，限时抢购',
+						title:'环球洲际'
+					},
+					{
+						img:'../../static/icon/goodsimg01.png',
+						text:'中秋佳节五仁月饼，惊喜特供，限时抢购',
+						title:'环球洲际',
+						short:'',
+					},
+					
+					
+					
+				],
+				
+				
 				status: 'noMore',
 				contentText: {
 					contentdown: '查看更多',
@@ -191,14 +231,14 @@
 			}
 		},
 
-		onLoad() {
+		onShow() {
 			this.shortLong()
 		},
 		methods: {
 			shortLong(){
 				
-				let arr = [{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{}]
-				arr.forEach((item,index,arr)=>{
+				// let arr = [{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{}]
+				this.goodsList.forEach((item,index,arr)=>{
 					if(index%4===0){
 						item.short = true
 					}
@@ -212,7 +252,7 @@
 						item.short = true
 					}
 				})
-				console.log(arr);
+				console.log(this.goodsList);
 				
 			},
 			
@@ -386,9 +426,61 @@
 	}
 
 	.home-hotel-img {
-		height: 1100rpx;
 		background-color: #F9f9f9;
 		padding: 20rpx 30rpx;
+		.home-hotel-img-content{
+			display: flex;
+			align-items: flex-start;
+			justify-content: space-between;
+			flex-wrap: wrap;
+			.home-hotel-img-content-item{
+				width: 332rpx;
+				background: #FFFFFF;
+				box-shadow: 0px 4rpx 8rpx 0px rgba(0,0,0,0.04);
+				border-radius: 12rpx;
+				margin-bottom: 26rpx;
+				&:nth-child(2n+1){
+					position: relative;
+					top: -33px;
+				}
+				&:nth-child(1){
+					position: relative;
+					top: 0;
+				}
+				
+				.home-hotel-img-content-item-img{
+					width: 332rpx; 
+					height: 332rpx;
+					object-fit: cover;
+					object-position: center;
+				}
+				.home-hotel-img-content-item-img-long{
+					width: 332rpx; 
+					height: 400rpx;
+					object-fit: cover;
+					object-position: center;
+				}
+				.text{
+					display: flex;
+					flex-direction: column;
+					align-items: flex-start;
+					justify-content: center;
+					padding: 18rpx 22rpx 32rpx;
+					.text-top{
+						font-size: 28rpx;
+						font-weight: bold;
+						color: #333;
+					}
+					.text-main{
+						margin-top: 20rpx;
+						font-size: 24rpx;
+						color: #999999;
+					}
+				}
+			}
+		}
+		
+		
 		.home-hotel-img-more{
 			height: 70rpx;
 			background-color: #fff;

pages/login/login.vue

@@ -13,7 +13,7 @@
 				<image src="/static/icon/youyue.png" mode="scaleToFill"></image>
 				<text>加入优悦会</text>
 			</view>
-			<view class="item">
+			<view class="item" @click="getmsg">
 				<image src="/static/icon/wechart.png" mode="scaleToFill"></image>
 				<text>微信登录</text>
 			</view>
@@ -22,19 +22,61 @@
 </template>
 
 <script>
-	export default{
-		data(){
-			return{
-				
+	export default {
+		data() {
+			return {
+				code:'',
+				encryptedData:'',
+				iv:''
 			}
 		},
-		methods:{
+		methods: {
 			// 加入优悦会
-			goYouyue(){
+			goYouyue() {
 				uni.navigateTo({
-					url:'/pages/login/youyue'
+					url: '/pages/login/youyue'
 				})
 			},
+			getCode() {
+			  return new Promise((resolve, reject) => {
+			    uni.login({
+			      provider: uni.$u.platform,
+			      success: loginRes => {
+			        this.code = loginRes.code
+					resolve(this.code)
+					}
+			    })
+			  })
+			},
+			//获取微信登录的code码
+			getmsg() {
+				uni.getUserInfo({
+					success: res => {
+						console.log(res);
+					  this.getCode().then(code => {
+					    const params = {
+					      encryptData: res.encryptedData,
+					      iv: res.iv,
+					      code: code
+					    }
+						console.log(params);
+						this.$api.my.myLogin(params).then(res => {
+							console.log(res);
+						})
+						
+					    // this.$loading('数据刷新中...')
+					    // this.$api.user.update(params).then(res => {
+					    //   this.btnLock = false
+					    //   this.code = null
+					    //   this.$hideLoading()
+					    //   this.$store.dispatch('user/info', res.data)
+					    }).catch(() => {
+					      // this.code = null
+					      // this.$hideLoading()
+					    })
+					  }
+					})
+			},
 		}
 	}
 </script>
@@ -42,19 +84,22 @@
 <style lang="scss" scoped>
 	$pageColor:#F9F9F9;
 	$bgColor:#FFFFFF;
-	.login{
+
+	.login {
 		height: 100%;
-		background:$bgColor ;
-		padding-top:146rpx;
+		background: $bgColor;
+		padding-top: 146rpx;
 		box-sizing: border-box;
 	}
-	.img{
-		image{
+
+	.img {
+		image {
 			width: 750rpx;
 			height: 596rpx;
 		}
 	}
-	.title{
+
+	.title {
 		height: 40rpx;
 		width: 690rpx;
 		margin-top: 168rpx;
@@ -63,39 +108,45 @@
 		display: flex;
 		align-items: center;
 		justify-content: space-between;
-		.line{
+
+		.line {
 			width: 240rpx;
 			height: 2rpx;
 			background: #EDEDED;
 			border-radius: 1rpx;
 		}
-		.logintype{
-			text{
+
+		.logintype {
+			text {
 				font-size: 28rpx;
 				font-family: PingFang-SC-Medium, PingFang-SC;
 				font-weight: 500;
 				color: #333333;
 			}
 		}
-		
+
 	}
-	.typebtn{
+
+	.typebtn {
 		display: flex;
 		align-items: center;
 		justify-content: space-around;
-		.item{
+
+		.item {
 			width: 140rpx;
 			height: 156rpx;
 			display: flex;
 			flex-direction: column;
 			align-items: center;
 			justify-content: center;
-			image{
+
+			image {
 				width: 104rpx;
 				height: 104rpx;
 				margin-bottom: 12rpx;
 			}
-			text{
+
+			text {
 				display: block;
 				font-size: 28rpx;
 				font-family: PingFang-SC-Medium, PingFang-SC;
@@ -104,4 +155,4 @@
 			}
 		}
 	}
-</style>
+</style>

pages/msg/msg.vue

@@ -14,12 +14,12 @@
 		<!-- 消息列表 -->
 		<view class="msgListBox">
 			<view class="childBox" v-for="item in 4">
-				<view >活动通知</view>
-				<view >
+				<view class="childBox-top" >活动通知</view>
+				<view  class="childBox-content" >
 					<text>你关注的活动已经开始了</text>
-					<image src="/static/icon/right.png" ></image>
+					<image style="width: 12rpx;height: 20rpx;" src="/static/icon/right.png" ></image>
 				</view>
-				<view >028-329230</view>
+				<view class="childBox-bom">028-329230</view>
 			</view>
 		</view>
 		
@@ -79,53 +79,51 @@
 		::v-deep .u-input__content__field-wrapper {
 			padding-left: 36rpx;
 		}
+		::v-deep .u-input__content__field-wrapper__field{
+			color:#999999 !important;
+			font-size: 28rpx !important;
+		}
 	}
 
 	// 消息列表
 	.msgListBox {
-		padding: 0 30rpx;
+		padding: 48rpx 30rpx;
+		padding-top: 0;
 		margin-top: 24rpx;
 		background: $bgColor;
 		box-shadow: 0rpx 4rpx 24rpx -10rpx rgba(101, 95, 90, 0.3);
 		border-radius: 12rpx;
 		.childBox {
-			width: 690rpx;
-			border-bottom: 1rpx solid #F0F0F0;
-			padding-top: 30rpx;
-			padding-bottom: 30rpx;
-			box-sizing: border-box;
-			view:nth-child(n+0) {
-				font-size: 32rpx;
-				font-family: PingFang-SC-Bold, PingFang-SC;
+			padding-top: 40rpx;
+			padding-bottom: 40rpx;
+			border-bottom:2rpx solid rgba(240, 240, 240, .7) ;
+			&:last-child{
+				padding-bottom: 0;
+				border-bottom: none;
+			}
+			&:first-child{
+				padding-top: 48rpx;
+			}
+			.childBox-top{
 				font-weight: bold;
 				color: #333333;
-				margin-bottom: 24rpx;
+				font-size: 32rpx;
 			}
-
-			view:nth-child(n+1) {
-				margin-bottom: 12rpx;
-				position: relative;
-				text{
-					font-size: 28rpx;
-					font-family: PingFang-SC-Medium, PingFang-SC;
-					font-weight: 500;
-					color: #333333;
-				}
-				image{
-					width:12rpx ;
-					height:20rpx;
-					position: absolute;
-					top:12rpx;
-					right:24rpx;
-				}
+			.childBox-content{
+				padding-right: 24rpx;
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				color: #333333;
+				font-size: 28rpx;
+				margin: 24rpx 0 12rpx;
 			}
-
-			view:nth-child(n+2) {
-				font-size: 26rpx;
-				font-family: PingFang-SC-Medium, PingFang-SC;
-				font-weight: 500;
+			.childBox-bom{
 				color: #999999;
+				font-size: 26rpx;
+
 			}
+			
 		}
 
 	}

pages/my/integral/integral.vue

@@ -33,14 +33,6 @@
 			:status="waterfall.status"
 			:list="waterfall.list"
 			:reset="waterfall.reset"></helang-waterfall-list>
-			<!-- <view class="ListContent">
-				<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>
-				</view>
-			</view> -->
-			
 			<!-- 已经到底啦 -->
 			<uni-load-more :status="status" color="#CCCCCC" :content-text="contentText"/>
 		</view>

pages/my/integral/integralRecord.vue

@@ -12,7 +12,7 @@
 		</view>
 		
 		<!-- 收入 -->
-		<view class="List" :style="{'--height':ListHeight+'rpx'}" v-if="isActive == 0">
+		<view class="List" 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>
@@ -24,7 +24,7 @@
 		
 		<!-- 支出 -->
 		<view class="List" :style="{'--height':ListHeight+'rpx'}" v-if="isActive == 1">
-			<view class="ListItem" v-for="item in 5">
+			<view class="ListItem" v-for="item in 20">
 				<view style="display: flex; justify-content: space-between;">
 					<view class="title"><text>500积分</text> </view>
 					<view class='data'><text>2022-02-10</text></view>
@@ -34,7 +34,9 @@
 		</view>
 		
 		<!-- 已经到底啦 -->
-		<uni-load-more :status="status" color="#CCCCCC" :content-text="contentText"/>
+		<view class="home-bottom" style="margin-top: 88rpx;padding-bottom: 60rpx;" >
+			<uni-load-more :status="status" color="#CCCCCC" :content-text="contentText"/>
+		</view>
 	</view>
 </template>
 
@@ -116,7 +118,7 @@
 				background: linear-gradient(90deg, #F3D69F 0%, #D9A94D 100%);
 				border-radius: 6px;
 				position: absolute;
-				bottom: -40rpx;
+				bottom: -30rpx;
 				left: 40rpx;
 			}
 		}
@@ -138,7 +140,6 @@
 	}
 	.List {
 		width: 750rpx;
-		height: var(--height);
 		background: $bgColor;
 		box-shadow: 0px 4rpx 24rpx -10rpx rgba(101, 95, 90, 0.3);
 		border-radius: 12rpx;
@@ -148,12 +149,17 @@
 	
 		.ListItem {
 			width: 690rpx;
-			height: 160rpx;
 			border-bottom: #F0F0F0 solid 0.5rpx;
 			position: relative;
-			padding-top: 35rpx;
+			padding-top: 40rpx;
+			padding-bottom: 40rpx;
 			box-sizing: border-box;
-	
+			&:first-child{
+				padding-top: 48rpx;
+			}
+			&:last-child{
+				border-bottom: none;
+			}
 			.title {
 				margin-bottom: 10rpx;
 				text {

pages/my/my.vue

@@ -4,27 +4,27 @@
 		<view class="topCard" :style="{backgroundImage:'url('+imgurl+')'}">
 			<!-- 用户名 -->
 			<view class="user">
-				<image src="/static/icon/avatar.png" style="height: 176rpx;width: 176rpx;" ></image>
+				<image class="user-avatar" src="/static/icon/avatar.png" style="height: 176rpx;width: 176rpx;" ></image>
 				<view class="userinfo">
 					<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>
 				<image src="/static/icon/setting.png"	@click="goSetting"
-					style="width: 41rpx;height: 44rpx; position: absolute;top:0rpx;right: 24rpx;"></image>
+					style="width: 44rpx;height: 44rpx; position: absolute;top:0rpx;right: 24rpx;"></image>
 			</view>
 			
 			<!-- 会员 -->
 			<view class="membership">
 				<view class="flex">
 					<view style="display: flex;align-items: center;">
-						<image style="width: 52rpx ;height: 46rpx;" src="../../static/icon/vip.png"></image>
+						<image style="width: 68rpx ;height: 62rpx;" src="../../static/icon/vip.png"></image>
 						<text class="join">加入会员</text>
 					</view>
 
 					<view style="display: flex;align-items: center;">
 						<text class="gojoin">去加入</text>
-						<image style="width: 12rpx ;height: 20rpx;" src="../../static/icon/right.png"></image>
+						<image style="width: 12rpx ;height: 20rpx;" src="../../static/icon/right05.png"></image>
 					</view>
 				</view>
 			</view>
@@ -35,25 +35,33 @@
 					<view class="myorder">我的订单</view>
 					<view class="more">
 						<text style="margin-right: 8rpx;" @click="goMyorders(0)">查看更多</text>
-						<image style="width: 12rpx ;height: 20rpx;" src="../../static/icon/right.png"></image>
+						<image style="width: 12rpx ;height: 20rpx;" src="../../static/icon/right05.png"></image>
 					</view>
 				</view>
 				
 				<view class="content">
 					<view class="flexbox" @click="goMyorders(1)">
-						<image style="width: 56rpx ;height: 52rpx;" src="../../static/icon/exchange.png"></image>
+						<view style="width: 56rpx; height: 56rpx; display: flex;align-items: center;justify-content: center; ">
+							<image style="width: 56rpx ;height: 42rpx;" src="../../static/icon/exchange.png"></image>
+						</view>
 						<text>待兑换</text>
 					</view>
 					<view class="flexbox" @click="goMyorders(2)">
-						<image style="width: 54rpx ;height: 52rpx;" src="../../static/icon/shipments.png"></image>
+						<view style="width: 56rpx; height: 56rpx;display: flex;align-items: center;justify-content: center; ">
+							<image style="width: 54rpx ;height: 52rpx;" src="../../static/icon/shipments.png"></image>
+						</view>
 						<text>待发货</text>
 					</view>
 					<view class="flexbox" @click="goMyorders(3)">
-						<image style="width: 56rpx ;height: 52rpx;" src="../../static/icon/Receipt.png"></image>
+						<view style="width: 56rpx; height: 56rpx;display: flex;align-items: center;justify-content: center; ">
+							<image style="width: 56rpx ;height: 56rpx;" src="../../static/icon/Receipt.png"></image>
+						</view>
 						<text>待收货</text>
 					</view>
 					<view class="flexbox" @click="goMyorders(4)">
-						<image style="width: 54rpx ;height: 52rpx;" src="../../static/icon/finish.png"></image>
+						<view style="width: 56rpx; height: 56rpx;display: flex;align-items: center;justify-content: center; ">
+							<image style="width: 54rpx ;height: 54rpx;" src="../../static/icon/finish.png"></image>
+						</view>
 						<text>已完成</text>
 					</view>
 				</view>
@@ -61,7 +69,7 @@
 		</view>
 		
 		<!-- 列表 -->
-		<view style="padding: 0 30rpx;">
+		<view style="padding:0 30rpx;">
 			<view class="list" v-for="(item,index) in list" @click="goDetail(index)">
 				<view class="title">{{item.title}}</view>
 				<view class="container">{{item.content}}</view>
@@ -87,7 +95,7 @@
 		},
 		data() {
 			return {
-				// 顶部背景图http://t9.9026.com/imgs/banner05.png
+				// 顶部背景图
 				imgurl:'http://t9.9026.com/imgs/bg@2x.png',
 				// 是否登录
 				islogin: false,
@@ -213,17 +221,24 @@
 	}
 
 	.topCard {
-		width: 750rpx;
-		height: 740rpx;
+		width: 100%;
 		border-radius: 0rpx 0rpx 16rpx 16rpx;
-		padding: 46rpx 30rpx 40rpx 30rpx;
+		padding: 40rpx 30rpx 38rpx 30rpx;
 		box-sizing: border-box;
+		background-position: center;
+		background-repeat: no-repeat;
+		background-size: cover;
+		
 
 		.user {
 			width: 690rpx;
 			height: 176rpx;
 			position: relative;
-			margin-bottom: 40rpx;
+			margin-bottom: 38rpx;
+			.user-avatar{
+				object-fit: cover;
+				object-position: center;
+			}
 
 			.userinfo {
 				position: absolute;
@@ -264,7 +279,7 @@
 
 		.membership {
 			width: 690rpx;
-			height: 116rpx;
+			height: 110rpx;
 			background: $bgColor;
 			border-radius: 8rpx;
 			display: flex;
@@ -300,10 +315,9 @@
 		}
 		.orders{
 			width: 690rpx;
-			height: 298rpx;
 			background: $bgColor;
 			border-radius: 8rpx;
-			padding: 40rpx 30rpx 48rpx 36rpx;
+			padding: 40rpx 30rpx 36rpx 36rpx;
 			box-sizing: border-box;
 			.nav{
 				height: 50rpx;
@@ -330,13 +344,13 @@
 				align-items: center;
 				justify-content: space-between;
 				padding:0 20rpx;
-				margin-top: 50rpx;
+				margin-top:72rpx;
 				.flexbox{
 					display: flex;
 					flex-direction: column;
 					align-items: center;
 					text{
-						margin-top:24rpx;
+						margin-top:16rpx;
 						font-size: 28rpx;
 						font-family: PingFang-SC-Medium, PingFang-SC;
 						font-weight: 500;
@@ -349,13 +363,17 @@
 
 	}
 	.list{
-		width: 690rpx;
-		height: 160rpx;
+		width: 100%;
+		padding-top: 32rpx;
+		padding-bottom:32rpx;
 		border-bottom: 2rpx solid  #F0F0F0;
 		display: flex;
 		flex-direction: column;
 		justify-content: center;
 		position: relative;
+		&:first-child{
+			padding-top: 50rpx;
+		}
 		.title{
 			font-size: 36rpx;
 			font-family: PingFang-SC-Bold, PingFang-SC;

pages/my/myorders/orders.vue

@@ -33,7 +33,7 @@
 					<view>未核销</view>
 				</view>
 				<view class="shopCard">
-					<image src="/static/icon/Kudosbg.png"></image>
+					<image src="http://t9.9026.com/imgs/Kudosbg.png"></image>
 					<view style="margin-left: 24rpx;">
 						<text class="name">端午佳节五香肉粽子，仅限前</text>
 						<text class="tag">礼盒装 2000积分</text>
@@ -68,7 +68,7 @@
 					<view>未核销</view>
 				</view>
 				<view class="shopCard">
-					<image src="/static/icon/Kudosbg.png"></image>
+					<image src="http://t9.9026.com/imgs/Kudosbg.png"></image>
 					<view style="margin-left: 24rpx;">
 						<text class="name">端午佳节五香肉粽子，仅限前</text>
 						<text class="tag">礼盒装 2000积分</text>
@@ -99,7 +99,7 @@
 					<view>未核销</view>
 				</view>
 				<view class="shopCard">
-					<image src="/static/icon/Kudosbg.png"></image>
+					<image src="http://t9.9026.com/imgs/Kudosbg.png"></image>
 					<view style="margin-left: 24rpx;">
 						<text class="name">端午佳节五香肉粽子，仅限前</text>
 						<text class="tag">礼盒装 2000积分</text>
@@ -130,7 +130,7 @@
 					<view>未核销</view>
 				</view>
 				<view class="shopCard">
-					<image src="/static/icon/Kudosbg.png"></image>
+					<image src="http://t9.9026.com/imgs/Kudosbg.png"></image>
 					<view style="margin-left: 24rpx;">
 						<text class="name">端午佳节五香肉粽子，仅限前</text>
 						<text class="tag">礼盒装 2000积分</text>
@@ -156,7 +156,7 @@
 					<view>未核销</view>
 				</view>
 				<view class="shopCard">
-					<image src="/static/icon/Kudosbg.png"></image>
+					<image src="http://t9.9026.com/imgs/Kudosbg.png"></image>
 					<view style="margin-left: 24rpx;">
 						<text class="name">端午佳节五香肉粽子，仅限前</text>
 						<text class="tag">礼盒装 2000积分</text>
@@ -174,7 +174,9 @@
 		</view>
 		
 		<!-- 已经到底啦 -->
-		<uni-load-more :status="status" color="#CCCCCC" :content-text="contentText" />
+		<view class="home-bottom">
+			<uni-load-more :status="status" color="#CCCCCC" :content-text="contentText"/>
+		</view>
 		
 		<!-- 弹出层/核销码 -->
 		<uni-popup ref="popup" type="center">
@@ -182,7 +184,7 @@
 				<view class="title"><text>核销码</text></view>
 				<view style="margin-left:30rpx;width: 580rpx;height: 2rpx;background: #F0F0F0;"></view>
 				<view class="img">
-					<image src="/static/icon/Kudosbg.png"></image>
+					<image src="http://t9.9026.com/imgs/Kudosbg.png"></image>
 				</view>
 				<view class="btn">
 					<view class="cancel" @click="closeVFcode"><text>取消</text></view>
@@ -285,6 +287,12 @@
 		height: 100%;
 		background: $pageColor;
 	}
+	
+	.home-bottom {
+		padding-top: 80rpx;
+		background-color: #f9f9f9;
+	}
+	
 
 	::v-deep .segmented-control__text {
 		font-size: 32rpx !important;
@@ -307,7 +315,7 @@
 	
 	
 	.nav {
-		height: 216rpx;
+		height: 220rpx;
 		width: 750rpx;
 		background: $bgColor;
 
@@ -335,10 +343,14 @@
 				::v-deep .u-input__content__field-wrapper {
 					padding-left: 36rpx;
 				}
+				::v-deep .u-input__content__field-wrapper__field{
+					color:#999999 !important;
+					font-size: 28rpx !important;
+				}
 			}
 		}
 		.segmented {
-			margin-top: 15rpx;
+			margin-top: 18rpx;
 			width: 750rpx;
 			border-radius: 0rpx 0rpx 16rpx 16rpx;
 			padding:0 30rpx;
@@ -416,7 +428,7 @@
 				height: 132rpx;
 				margin-left: 16rpx;
 				display: inline-block;
-				border-radius: 10rpx;
+				border-radius: 12rpx;
 			}
 
 			.name {
@@ -458,7 +470,7 @@
 		}
 
 		.btn {
-			margin-top: 15rpx;
+			margin-top: 30rpx;
 			display: flex;
 			justify-content: flex-end;
 

pages/my/verification/verification.vue

@@ -81,7 +81,7 @@
 					<view>未核销</view>
 				</view>
 				<view class="shopCard">
-					<image  src="/static/icon/Kudosbg.png"></image>
+					<image  src="http://t9.9026.com/imgs/Kudosbg.png"></image>
 					<view style="margin-left: 24rpx;">
 						<text class="name">端午佳节五香肉粽子，仅限前</text>
 						<text class="tag">礼盒装 2000积分</text>
@@ -212,6 +212,10 @@
 				::v-deep .u-input__content__field-wrapper {
 					padding-left: 36rpx;
 				}
+				::v-deep .u-input__content__field-wrapper__field{
+					color:#999999 !important;
+					font-size: 28rpx !important;
+				}
 			}
 		}
 		.segmented {
@@ -286,7 +290,7 @@
 				height: 132rpx; 
 				margin-left: 16rpx;
 				display: inline-block;
-				border-radius: 10rpx;
+				border-radius: 12rpx;
 			}
 			.name{
 				font-size: 28rpx;

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

@@ -1,5 +1,6 @@
 {
   "pages": [
+    "pages/my/my",
     "pages/index/index",
     "pages/index/active-list/index",
     "pages/index/active-detail/index",
@@ -14,7 +15,6 @@
     "pages/webview/webview",
     "pages/login/login",
     "pages/login/youyue",
-    "pages/my/my",
     "pages/my/PersonalData/personalData",
     "pages/my/setting/setting",
     "pages/my/myorders/orders",
@@ -74,5 +74,6 @@
       }
     ]
   },
-  "usingComponents": {}
+  "usingComponents": {},
+  "sitemapLocation": "sitemap.json"
 }

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

@@ -28,7 +28,7 @@ var app = new _vue.default(_objectSpread({
   store: _store.default },
 _App.default));
 
-__webpack_require__(/*! utils/request/index */ 164)(app);
+__webpack_require__(/*! utils/request/index */ 165)(app);
 createApp(app).$mount();
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["createApp"]))
 

unpackage/dist/dev/mp-weixin/components/q-turntable/q-turntable.js

@@ -1,6 +1,6 @@
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["components/q-turntable/q-turntable"],{
 
-/***/ 493:
+/***/ 494:
 /*!*************************************************************************!*\
   !*** D:/vscode-demo/IHG/IHG/IHG/components/q-turntable/q-turntable.vue ***!
   \*************************************************************************/
@@ -9,10 +9,10 @@
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _q_turntable_vue_vue_type_template_id_2e5c8c30___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./q-turntable.vue?vue&type=template&id=2e5c8c30& */ 494);
-/* harmony import */ var _q_turntable_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./q-turntable.vue?vue&type=script&lang=js& */ 496);
+/* harmony import */ var _q_turntable_vue_vue_type_template_id_2e5c8c30___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./q-turntable.vue?vue&type=template&id=2e5c8c30& */ 495);
+/* harmony import */ var _q_turntable_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./q-turntable.vue?vue&type=script&lang=js& */ 497);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _q_turntable_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__) if(__WEBPACK_IMPORT_KEY__ !== 'default') (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _q_turntable_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__[key]; }) }(__WEBPACK_IMPORT_KEY__));
-/* harmony import */ var _q_turntable_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./q-turntable.vue?vue&type=style&index=0&lang=css& */ 498);
+/* harmony import */ var _q_turntable_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./q-turntable.vue?vue&type=style&index=0&lang=css& */ 499);
 /* harmony import */ var _HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../../../../../HbuilderX/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 11);
 
 var renderjs
@@ -41,7 +41,7 @@ component.options.__file = "components/q-turntable/q-turntable.vue"
 
 /***/ }),
 
-/***/ 494:
+/***/ 495:
 /*!********************************************************************************************************!*\
   !*** D:/vscode-demo/IHG/IHG/IHG/components/q-turntable/q-turntable.vue?vue&type=template&id=2e5c8c30& ***!
   \********************************************************************************************************/
@@ -50,7 +50,7 @@ component.options.__file = "components/q-turntable/q-turntable.vue"
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_16_0_HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_q_turntable_vue_vue_type_template_id_2e5c8c30___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../HbuilderX/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../../../../HbuilderX/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--16-0!../../../../../../HbuilderX/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!../../../../../../HbuilderX/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!../../../../../../HbuilderX/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../../HbuilderX/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./q-turntable.vue?vue&type=template&id=2e5c8c30& */ 495);
+/* harmony import */ var _HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_16_0_HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_q_turntable_vue_vue_type_template_id_2e5c8c30___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../HbuilderX/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../../../../HbuilderX/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--16-0!../../../../../../HbuilderX/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!../../../../../../HbuilderX/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!../../../../../../HbuilderX/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../../HbuilderX/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./q-turntable.vue?vue&type=template&id=2e5c8c30& */ 496);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "render", function() { return _HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_16_0_HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_q_turntable_vue_vue_type_template_id_2e5c8c30___WEBPACK_IMPORTED_MODULE_0__["render"]; });
 
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "staticRenderFns", function() { return _HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_16_0_HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_q_turntable_vue_vue_type_template_id_2e5c8c30___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"]; });
@@ -63,7 +63,7 @@ __webpack_require__.r(__webpack_exports__);
 
 /***/ }),
 
-/***/ 495:
+/***/ 496:
 /*!********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--16-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/vscode-demo/IHG/IHG/IHG/components/q-turntable/q-turntable.vue?vue&type=template&id=2e5c8c30& ***!
   \********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -90,7 +90,7 @@ render._withStripped = true
 
 /***/ }),
 
-/***/ 496:
+/***/ 497:
 /*!**************************************************************************************************!*\
   !*** D:/vscode-demo/IHG/IHG/IHG/components/q-turntable/q-turntable.vue?vue&type=script&lang=js& ***!
   \**************************************************************************************************/
@@ -99,14 +99,14 @@ render._withStripped = true
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_q_turntable_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../HbuilderX/HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib!../../../../../../HbuilderX/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--12-1!../../../../../../HbuilderX/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../../../../HbuilderX/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../../HbuilderX/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./q-turntable.vue?vue&type=script&lang=js& */ 497);
+/* harmony import */ var _HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_q_turntable_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../HbuilderX/HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib!../../../../../../HbuilderX/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--12-1!../../../../../../HbuilderX/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../../../../HbuilderX/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../../HbuilderX/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./q-turntable.vue?vue&type=script&lang=js& */ 498);
 /* harmony import */ var _HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_q_turntable_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_q_turntable_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_q_turntable_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__) if(__WEBPACK_IMPORT_KEY__ !== 'default') (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_q_turntable_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
  /* harmony default export */ __webpack_exports__["default"] = (_HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_q_turntable_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default.a); 
 
 /***/ }),
 
-/***/ 497:
+/***/ 498:
 /*!*********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--12-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/vscode-demo/IHG/IHG/IHG/components/q-turntable/q-turntable.vue?vue&type=script&lang=js& ***!
   \*********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -205,7 +205,7 @@ var _default =
 
 /***/ }),
 
-/***/ 498:
+/***/ 499:
 /*!**********************************************************************************************************!*\
   !*** D:/vscode-demo/IHG/IHG/IHG/components/q-turntable/q-turntable.vue?vue&type=style&index=0&lang=css& ***!
   \**********************************************************************************************************/
@@ -214,14 +214,14 @@ var _default =
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_6_oneOf_1_2_HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_3_HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_q_turntable_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../HbuilderX/HBuilderX/plugins/uniapp-cli/node_modules/mini-css-extract-plugin/dist/loader.js??ref--6-oneOf-1-0!../../../../../../HbuilderX/HBuilderX/plugins/uniapp-cli/node_modules/css-loader/dist/cjs.js??ref--6-oneOf-1-1!../../../../../../HbuilderX/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!../../../../../../HbuilderX/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--6-oneOf-1-2!../../../../../../HbuilderX/HBuilderX/plugins/uniapp-cli/node_modules/postcss-loader/src??ref--6-oneOf-1-3!../../../../../../HbuilderX/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../../HbuilderX/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./q-turntable.vue?vue&type=style&index=0&lang=css& */ 499);
+/* harmony import */ var _HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_6_oneOf_1_2_HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_3_HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_q_turntable_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../HbuilderX/HBuilderX/plugins/uniapp-cli/node_modules/mini-css-extract-plugin/dist/loader.js??ref--6-oneOf-1-0!../../../../../../HbuilderX/HBuilderX/plugins/uniapp-cli/node_modules/css-loader/dist/cjs.js??ref--6-oneOf-1-1!../../../../../../HbuilderX/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!../../../../../../HbuilderX/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--6-oneOf-1-2!../../../../../../HbuilderX/HBuilderX/plugins/uniapp-cli/node_modules/postcss-loader/src??ref--6-oneOf-1-3!../../../../../../HbuilderX/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../../HbuilderX/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./q-turntable.vue?vue&type=style&index=0&lang=css& */ 500);
 /* harmony import */ var _HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_6_oneOf_1_2_HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_3_HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_q_turntable_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_6_oneOf_1_2_HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_3_HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_q_turntable_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0__);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_6_oneOf_1_2_HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_3_HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_q_turntable_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0__) if(__WEBPACK_IMPORT_KEY__ !== 'default') (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_6_oneOf_1_2_HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_3_HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_q_turntable_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
  /* harmony default export */ __webpack_exports__["default"] = (_HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_6_oneOf_1_2_HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_3_HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_q_turntable_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0___default.a); 
 
 /***/ }),
 
-/***/ 499:
+/***/ 500:
 /*!**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/mini-css-extract-plugin/dist/loader.js??ref--6-oneOf-1-0!./node_modules/css-loader/dist/cjs.js??ref--6-oneOf-1-1!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--6-oneOf-1-2!./node_modules/postcss-loader/src??ref--6-oneOf-1-3!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/vscode-demo/IHG/IHG/IHG/components/q-turntable/q-turntable.vue?vue&type=style&index=0&lang=css& ***!
   \**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -240,7 +240,7 @@ __webpack_require__.r(__webpack_exports__);
     'components/q-turntable/q-turntable-create-component',
     {
         'components/q-turntable/q-turntable-create-component':(function(module, exports, __webpack_require__){
-            __webpack_require__('1')['createComponent'](__webpack_require__(493))
+            __webpack_require__('1')['createComponent'](__webpack_require__(494))
         })
     },
     [['components/q-turntable/q-turntable-create-component']]

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

@@ -1,5 +1,6 @@
 {
   "navigationBarTitleText": "首页",
+  "enablePullDownRefresh": false,
   "usingComponents": {
     "uni-swiper-dot": "/uni_modules/uni-swiper-dot/components/uni-swiper-dot/uni-swiper-dot",
     "uni-load-more": "/uni_modules/uni-load-more/components/uni-load-more/uni-load-more",

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

@@ -154,10 +154,59 @@ page.data-v-57280228 {
   background-color: #f9f9f9;
 }
 .home-hotel-img.data-v-57280228 {
-  height: 1100rpx;
   background-color: #F9f9f9;
   padding: 20rpx 30rpx;
 }
+.home-hotel-img .home-hotel-img-content.data-v-57280228 {
+  display: flex;
+  align-items: flex-start;
+  justify-content: space-between;
+  flex-wrap: wrap;
+}
+.home-hotel-img .home-hotel-img-content .home-hotel-img-content-item.data-v-57280228 {
+  width: 332rpx;
+  background: #FFFFFF;
+  box-shadow: 0px 4rpx 8rpx 0px rgba(0, 0, 0, 0.04);
+  border-radius: 12rpx;
+  margin-bottom: 26rpx;
+}
+.home-hotel-img .home-hotel-img-content .home-hotel-img-content-item.data-v-57280228:nth-child(2n+1) {
+  position: relative;
+  top: -33px;
+}
+.home-hotel-img .home-hotel-img-content .home-hotel-img-content-item.data-v-57280228:nth-child(1) {
+  position: relative;
+  top: 0;
+}
+.home-hotel-img .home-hotel-img-content .home-hotel-img-content-item .home-hotel-img-content-item-img.data-v-57280228 {
+  width: 332rpx;
+  height: 332rpx;
+  object-fit: cover;
+  object-position: center;
+}
+.home-hotel-img .home-hotel-img-content .home-hotel-img-content-item .home-hotel-img-content-item-img-long.data-v-57280228 {
+  width: 332rpx;
+  height: 400rpx;
+  object-fit: cover;
+  object-position: center;
+}
+.home-hotel-img .home-hotel-img-content .home-hotel-img-content-item .text.data-v-57280228 {
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
+  justify-content: center;
+  padding: 18rpx 22rpx 32rpx;
+}
+.home-hotel-img .home-hotel-img-content .home-hotel-img-content-item .text .text-top.data-v-57280228 {
+  font-size: 28rpx;
+  font-weight: bold;
+  color: #333;
+}
+.home-hotel-img .home-hotel-img-content .home-hotel-img-content-item .text .text-main.data-v-57280228 {
+  margin-top: 20rpx;
+  font-size: 24rpx;
+  color: #999999;
+}
 .home-hotel-img .home-hotel-img-more.data-v-57280228 {
   height: 70rpx;
   background-color: #fff;

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

@@ -1 +1 @@
-<view class="login data-v-b237504c"><view class="img data-v-b237504c"><image src="http://t9.9026.com/imgs/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>
+<view class="login data-v-b237504c"><view class="img data-v-b237504c"><image src="http://t9.9026.com/imgs/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 data-event-opts="{{[['tap',[['getmsg',['$event']]]]]}}" class="item data-v-b237504c" bindtap="__e"><image src="/static/icon/wechart.png" mode="scaleToFill" class="data-v-b237504c"></image><text class="data-v-b237504c">微信登录</text></view></view></view>