Parcourir la source

11.25 17:55合并

Tartarus il y a 2 ans
Parent
commit
b638f167f3
100 fichiers modifiés avec 1008 ajouts et 607 suppressions
  1. 11 1
      api/my/my.js
  2. 2 1
      pages/goods/goods-lucky/index.vue
  3. 92 10
      pages/index/index.vue
  4. 175 83
      pages/my/my.vue
  5. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
  6. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map
  7. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
  8. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/components/SwiperBox/index.js.map
  9. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/components/TabBar/tabbar.js.map
  10. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/components/WaterFall/waterfall-item.js.map
  11. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/components/WaterFall/waterfall-list.js.map
  12. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/components/hch-position/hch-position.js.map
  13. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/components/q-turntable/q-turntable.js.map
  14. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-icon/u-icon.js.map
  15. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-image/u-image.js.map
  16. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-input/u-input.js.map
  17. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-loading-icon/u-loading-icon.js.map
  18. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-swiper-indicator/u-swiper-indicator.js.map
  19. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-swiper/u-swiper.js.map
  20. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-transition/u-transition.js.map
  21. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/goods/goods-detail/index.js.map
  22. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/goods/goods-hotel/index.js.map
  23. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/goods/goods-lucky/index.js.map
  24. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/goods/goods.js.map
  25. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/active-detail/index.js.map
  26. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/active-list/index.js.map
  27. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
  28. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/vote-detail/index.js.map
  29. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/login.js.map
  30. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/youyue.js.map
  31. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/map/hotel-book/index.js.map
  32. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/map/map.js.map
  33. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/msg/msg.js.map
  34. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/Kudos/Kudos.js.map
  35. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/PersonalData/personalData.js.map
  36. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/integral/integral.js.map
  37. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/integral/integralExchange.js.map
  38. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/integral/integralOrder.js.map
  39. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/integral/integralRecord.js.map
  40. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/integral/integralRule.js.map
  41. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/my.js.map
  42. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/myorders/orderDetail.js.map
  43. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/myorders/orders.js.map
  44. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/prize/exchangeDetail.js.map
  45. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/prize/exchangePrize.js.map
  46. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/prize/prize.js.map
  47. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/protocol/PrivacyPolicy.js.map
  48. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/protocol/UserAgreement.js.map
  49. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/setting/setting.js.map
  50. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/verification/orderVerification.js.map
  51. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/verification/verification.js.map
  52. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/verification/verificationDetail.js.map
  53. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/webview/webview.js.map
  54. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.js.map
  55. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.js.map
  56. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.js.map
  57. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-forms/components/uni-forms/uni-forms.js.map
  58. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.js.map
  59. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.js.map
  60. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.js.map
  61. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-swiper-dot/components/uni-swiper-dot/uni-swiper-dot.js.map
  62. 1 1
      unpackage/dist/dev/mp-weixin/common/runtime.js
  63. 59 7
      unpackage/dist/dev/mp-weixin/common/vendor.js
  64. 14 14
      unpackage/dist/dev/mp-weixin/components/SwiperBox/index.js
  65. 12 12
      unpackage/dist/dev/mp-weixin/components/TabBar/tabbar.js
  66. 12 12
      unpackage/dist/dev/mp-weixin/components/hch-position/hch-position.js
  67. 14 14
      unpackage/dist/dev/mp-weixin/components/q-turntable/q-turntable.js
  68. 12 12
      unpackage/dist/dev/mp-weixin/components/waterfall/waterfall-item.js
  69. 10 10
      unpackage/dist/dev/mp-weixin/components/waterfall/waterfall-list.js
  70. 14 14
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-icon/u-icon.js
  71. 15 15
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-image/u-image.js
  72. 14 14
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-input/u-input.js
  73. 13 13
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-loading-icon/u-loading-icon.js
  74. 13 13
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-swiper-indicator/u-swiper-indicator.js
  75. 15 15
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-swiper/u-swiper.js
  76. 14 14
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-transition/u-transition.js
  77. 17 17
      unpackage/dist/dev/mp-weixin/pages/goods/goods-detail/index.js
  78. 17 17
      unpackage/dist/dev/mp-weixin/pages/goods/goods-hotel/index.js
  79. 19 18
      unpackage/dist/dev/mp-weixin/pages/goods/goods-lucky/index.js
  80. 17 17
      unpackage/dist/dev/mp-weixin/pages/goods/goods.js
  81. 19 19
      unpackage/dist/dev/mp-weixin/pages/index/active-detail/index.js
  82. 7 7
      unpackage/dist/dev/mp-weixin/pages/index/active-list/index.js
  83. 74 3
      unpackage/dist/dev/mp-weixin/pages/index/index.js
  84. 0 0
      unpackage/dist/dev/mp-weixin/pages/index/index.wxml
  85. 9 10
      unpackage/dist/dev/mp-weixin/pages/index/index.wxss
  86. 16 16
      unpackage/dist/dev/mp-weixin/pages/index/vote-detail/index.js
  87. 14 14
      unpackage/dist/dev/mp-weixin/pages/login/login.js
  88. 14 14
      unpackage/dist/dev/mp-weixin/pages/login/youyue.js
  89. 14 14
      unpackage/dist/dev/mp-weixin/pages/map/hotel-book/index.js
  90. 20 20
      unpackage/dist/dev/mp-weixin/pages/map/map.js
  91. 17 17
      unpackage/dist/dev/mp-weixin/pages/msg/msg.js
  92. 15 15
      unpackage/dist/dev/mp-weixin/pages/my/Kudos/Kudos.js
  93. 17 17
      unpackage/dist/dev/mp-weixin/pages/my/PersonalData/personalData.js
  94. 16 16
      unpackage/dist/dev/mp-weixin/pages/my/integral/integral.js
  95. 14 14
      unpackage/dist/dev/mp-weixin/pages/my/integral/integralExchange.js
  96. 19 19
      unpackage/dist/dev/mp-weixin/pages/my/integral/integralOrder.js
  97. 15 15
      unpackage/dist/dev/mp-weixin/pages/my/integral/integralRecord.js
  98. 14 14
      unpackage/dist/dev/mp-weixin/pages/my/integral/integralRule.js
  99. 111 19
      unpackage/dist/dev/mp-weixin/pages/my/my.js
  100. 1 0
      unpackage/dist/dev/mp-weixin/pages/my/my.json

+ 11 - 1
api/my/my.js

xqd
@@ -14,6 +14,16 @@ export function joinVip(data){
 		data
 	)
 }
+
+export function update(data){
+	return request.post(
+		`users/1/update_avatar_nickname`,
+		data
+	)
+}
+//http://t9.9026.com/api/users/1/update_avatar_nickname
+
 export default {
-  myLogin
+  myLogin,
+  update
 }

+ 2 - 1
pages/goods/goods-lucky/index.vue

xqd
@@ -153,7 +153,8 @@
 			// 用户点击开始抽奖
 			turntableStart() {
 				let index = Math.floor(Math.random() * 6 + 1) //前端随机数,这里应该后台返回中奖结果
-				this.award = index
+				// this.award = index
+				this.award = 2
 				this.$refs.turntable.begin(this.award);
 			},
 

+ 92 - 10
pages/index/index.vue

xqd xqd xqd xqd xqd xqd
@@ -76,7 +76,7 @@
 		<view class="home-hotel-img">
 			
 			<view class="home-hotel-img-content">
-				<view class="home-hotel-img-content-item" v-for="item in goodsList">
+				<view class="home-hotel-img-content-item" v-for="item in goodsList" :style="{marginTop:item.marginTop || 0 }">
 					<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>
@@ -148,6 +148,47 @@
 						title:'环球洲际',
 						short:'',
 					},
+					{
+						img:'http://t9.9026.com/imgs/goodsimg01.png',
+						text:'中秋佳节五仁月饼,惊喜特供,限时抢购',
+						title:'环球洲际',
+						short:'',
+					},{
+						img:'http://t9.9026.com/imgs/goodsimg01.png',
+						text:'中秋佳节五仁月饼,惊喜特供,限时抢购',
+						title:'环球洲际',
+						short:'',
+					},{
+						img:'http://t9.9026.com/imgs/goodsimg01.png',
+						text:'中秋佳节五仁月饼,惊喜特供,限时抢购',
+						title:'环球洲际',
+						short:'',
+					},{
+						img:'http://t9.9026.com/imgs/goodsimg01.png',
+						text:'中秋佳节五仁月饼,惊喜特供,限时抢购',
+						title:'环球洲际',
+						short:'',
+					},{
+						img:'http://t9.9026.com/imgs/goodsimg01.png',
+						text:'中秋佳节五仁月饼,惊喜特供,限时抢购',
+						title:'环球洲际',
+						short:'',
+					},{
+						img:'http://t9.9026.com/imgs/goodsimg01.png',
+						text:'中秋佳节五仁月饼,惊喜特供,限时抢购',
+						title:'环球洲际',
+						short:'',
+					},{
+						img:'http://t9.9026.com/imgs/goodsimg01.png',
+						text:'中秋佳节五仁月饼,惊喜特供,限时抢购',
+						title:'环球洲际',
+						short:'',
+					},{
+						img:'http://t9.9026.com/imgs/goodsimg01.png',
+						text:'中秋佳节五仁月饼,惊喜特供,限时抢购',
+						title:'环球洲际',
+						short:'',
+					},
 				],
 				status: 'noMore',
 				contentText: {
@@ -157,10 +198,39 @@
 				},
 				//轮播图
 				info: [
+					[{
+						img:'http://t9.9026.com/imgs/swiper01.png',
+						name:'酒店预订'
+					},
 					{
 						img:'http://t9.9026.com/imgs/swiper01.png',
 						name:'酒店预订'
 					},
+					{
+						img:'http://t9.9026.com/imgs/swiper01.png',
+						name:'酒店预订'
+					},
+					{
+						img:'http://t9.9026.com/imgs/swiper01.png',
+						name:'酒店预订'
+					}],
+					[{
+						img:'http://t9.9026.com/imgs/swiper01.png',
+						name:'酒店预订'
+					},
+					{
+						img:'http://t9.9026.com/imgs/swiper01.png',
+						name:'酒店预订'
+					},
+					{
+						img:'http://t9.9026.com/imgs/swiper01.png',
+						name:'酒店预订'
+					},
+					{
+						img:'http://t9.9026.com/imgs/swiper01.png',
+						name:'酒店预订'
+					}],
+					
 				],
 				dotsStyles: {
 					bottom:24,
@@ -243,6 +313,7 @@
 					}
 					if(index%4===2){
 						item.long = true
+						item.marginTop = -66+"rpx"
 					}
 					if(index%4===3){
 						item.short = true
@@ -351,7 +422,18 @@
 	.home-swiper {
 		height: 416rpx;
 		.swiper-box{
-			height: 416rpx;
+			::v-deep swiper-item{
+				width: 100%;
+				height: 208px;
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				view{
+					width: 25%;
+				}
+				
+			}
+			
 		}
 	}
 
@@ -497,14 +579,14 @@
 				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;
-				}
+				// &:nth-child(2n+1){
+				// 	// position: relative;
+				// 	top: -33px;
+				// }
+				// &:nth-child(1){
+				// 	// position: relative;
+				// 	top: 0;
+				// }
 				
 				.home-hotel-img-content-item-img{
 					width: 332rpx; 

+ 175 - 83
pages/my/my.vue

xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd
@@ -4,18 +4,26 @@
 		<view class="topCard" :style="{backgroundImage:'url('+imgurl+')'}">
 			<!-- 用户名 -->
 			<view class="user">
-				<view class="">
-					<image class="user-avatar" src="/static/icon/avatar.png" style="height: 176rpx;width: 176rpx;" ></image>
+				<view v-if="admin.avatar">
+					<button class="avatar" open-type="chooseAvatar" @click="handleGetWechatUserInfo">
+						<image class="user-avatar" style="height: 176rpx;width: 176rpx;border-radius: 50%;"
+							:src="admin.avatar? admin.avatar : '/static/icon/avatar.png'" />
+					</button>
+					<view class="userinfo">
+						<text class="unlogin">{{admin.nickname}}</text>
+					</view>
+				</view>
+				<view v-else>
+					<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>
 				</view>
-				<image src="/static/icon/setting.png"	@click="goSetting"
+				<image src="/static/icon/setting.png" @click="goSetting"
 					style="width: 44rpx;height: 44rpx; position: absolute;top:0rpx;right: 24rpx;"></image>
 			</view>
-			
+
 			<!-- 会员 -->
 			<view class="membership" @click="goJoin">
 				<view class="flex">
@@ -30,7 +38,7 @@
 					</view>
 				</view>
 			</view>
-			
+
 			<!-- 订单 -->
 			<view class="orders">
 				<view class="nav">
@@ -40,28 +48,32 @@
 						<image style="width: 12rpx ;height: 20rpx;" src="../../static/icon/right05.png"></image>
 					</view>
 				</view>
-				
+
 				<view class="content">
 					<view class="flexbox" @click="goMyorders(1)">
-						<view style="width: 56rpx; height: 56rpx; display: flex;align-items: center;justify-content: center; ">
+						<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)">
-						<view style="width: 56rpx; height: 56rpx;display: flex;align-items: center;justify-content: center; ">
+						<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)">
-						<view style="width: 56rpx; height: 56rpx;display: flex;align-items: center;justify-content: center; ">
+						<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)">
-						<view style="width: 56rpx; height: 56rpx;display: flex;align-items: center;justify-content: center; ">
+						<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>
@@ -69,21 +81,31 @@
 				</view>
 			</view>
 		</view>
-		
+
 		<!-- 列表 -->
 		<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>
-				<image  src="../../static/icon/right.png"></image>
+				<image src="../../static/icon/right.png"></image>
 			</view>
-			
+
 		</view>
-		
+		<u-modal :show="modal.show" :title="modal.title" :show-confirm-button="false">
+			<view>
+				<button class="avatar" open-type="chooseAvatar" @chooseavatar="handleChooseAvatar">
+					<image class="user-avatar" style="height: 176rpx;width: 176rpx;border-radius: 50%;"
+						:src="modal.avatar?modal.avatar:'/static/icon/avatar.png'" />
+				</button>
+				<input class="avatar" type="nickname" :value="modal.nickname" placeholder="填写昵称"
+					@change="handleChangeNickname">
+
+				<button class="confirm" @click="handleConfirmWechatUserInfo">提交</button>
+			</view>
+		</u-modal>
 		<!-- 底部导航栏 -->
 		<view style="height: 140rpx; width: 100%;"></view>
 		<tab-bar checked="my"></tab-bar>
-
 	</view>
 </template>
 
@@ -97,96 +119,143 @@
 		},
 		data() {
 			return {
-				admin:'',
+				modal: {
+					show: false,
+					title: '用户信息获取',
+					nickname: '',
+					avatar: ''
+				},
+				admin: '',
 				// 顶部背景图
-				imgurl:'http://t9.9026.com/imgs/bg@2x.png',
+				imgurl: 'http://t9.9026.com/imgs/bg@2x.png',
 				// 是否登录
 				islogin: false,
 				// 列表内容
-				list:[{
-					title:'积分',
-					content:'积分兑换奖品'
-				},{
-					title:'奖品',
-					content:'查看所有奖品'
-				},{
-					title:'点赞',
-					content:'查看所有点赞'
+				list: [{
+					title: '积分',
+					content: '积分兑换奖品'
+				}, {
+					title: '奖品',
+					content: '查看所有奖品'
+				}, {
+					title: '点赞',
+					content: '查看所有点赞'
 				}]
 			};
 		},
-		
-		onLoad() {
-			this.$store.getters = this.admin
-			console.log(this.$store.getters,111);
-			
+
+		onShow() {
+			this.admin = this.$store.getters.userInfo
 		},
-		
-		methods:{
+
+		methods: {
+			// 微信获取头像
+			handleGetWechatUserInfo() {
+				console.log(1111);
+				this.modal.show = true
+				this.modal.nickname = this.admin.nickname
+				this.modal.avatar = this.admin.avatar
+			},
+
+
+			//提交微信名称和头像
+			handleConfirmWechatUserInfo() {
+				if (!this.modal.avatar) {
+					this.$u.toast('请上传头像')
+					return
+				}
+				if (!this.modal.nickname) {
+					this.$u.toast('请填写昵称')
+					return
+				}
+				this.$loading('数据提交中...')
+				this.$api.my.update({avatar: this.modal.avatar, nickname: this.modal.nickname}).then(res=>{
+					  this.$hideLoading()  
+					  this.$store.dispatch('user/info', res.data)
+					  this.modal.show = false
+				})
+				// this.$api.user.update({ avatar: this.modal.avatar, nickname: this.modal.nickname }).then(res => {
+				//   this.code = null
+				//   this.$hideLoading()
+				//   this.$store.dispatch('user/info', res.data)
+				//   this.modal.show = false
+				// }).catch(() => {
+				//   this.$hideLoading()
+				// })
+			},
+			// 微信获取头像
+			handleChooseAvatar(e) {
+				console.log(e.detail);
+				this.modal.avatar = e.detail.avatarUrl
+			},
+			handleChangeNickname(res) {
+				this.modal.nickname = res.detail.value
+			},
+
 			// 跳转登录页
-			login(){
+			login() {
 				uni.navigateTo({
-					url:'/pages/login/login'
+					url: '/pages/login/login'
 				})
 			},
 			// 跳转个人信息
-			goPersonData(){
+			goPersonData() {
 				uni.navigateTo({
-					url:'/pages/my/PersonalData/personalData'
+					url: '/pages/my/PersonalData/personalData'
 				})
 			},
 			// 跳转设置页面
-			goSetting(){
+			goSetting() {
 				uni.navigateTo({
-					url:'/pages/my/setting/setting'
+					url: '/pages/my/setting/setting'
 				})
 			},
 			// 跳转积分页
-			goDetail(index){
-				if(index==0){
+			goDetail(index) {
+				if (index == 0) {
 					uni.navigateTo({
-						url:'/pages/my/integral/integral'
+						url: '/pages/my/integral/integral'
 					})
-				}else if(index==1){
+				} else if (index == 1) {
 					uni.navigateTo({
-						url:'/pages/my/prize/prize'
+						url: '/pages/my/prize/prize'
 					})
-				}else{
+				} else {
 					uni.navigateTo({
-						url:'/pages/my/Kudos/Kudos'
+						url: '/pages/my/Kudos/Kudos'
 					})
 				}
 			},
 			// 跳转订单页
-			goMyorders(index){
-				switch(index){
+			goMyorders(index) {
+				switch (index) {
 					case 0:
 						uni.navigateTo({
-							url:'/pages/my/myorders/orders'
+							url: '/pages/my/myorders/orders'
 						})
 						break;
 					case 1:
 						uni.navigateTo({
-							url:'/pages/my/myorders/orders?isActive='+1
+							url: '/pages/my/myorders/orders?isActive=' + 1
 						})
-					break;
+						break;
 					case 2:
 						uni.navigateTo({
-							url:'/pages/my/myorders/orders?isActive='+2
+							url: '/pages/my/myorders/orders?isActive=' + 2
 						})
-					break;
+						break;
 					case 3:
 						uni.navigateTo({
-							url:'/pages/my/myorders/orders?isActive='+3
+							url: '/pages/my/myorders/orders?isActive=' + 3
 						})
-					break;
+						break;
 					case 4:
 						uni.navigateTo({
-							url:'/pages/my/myorders/orders?isActive='+4
+							url: '/pages/my/myorders/orders?isActive=' + 4
 						})
-					break;
+						break;
 				}
-				
+
 			},
 			// 跳转其他小程序
 			goJoin() {
@@ -207,7 +276,7 @@
 				})
 			},
 			// 上传头像
-			uploadAvatar(){
+			uploadAvatar() {
 				// let img = []
 				// uni.chooseImage({
 				// 	count: 1, //默认9
@@ -247,6 +316,14 @@
 		background-color: $pageColor;
 	}
 
+	.avatar {
+		width: 176rpx;
+		height: 176rpx;
+		border-radius: 50%;
+	}
+
+
+
 	.topCard {
 		width: 100%;
 		border-radius: 0rpx 0rpx 16rpx 16rpx;
@@ -255,14 +332,15 @@
 		background-position: center;
 		background-repeat: no-repeat;
 		background-size: cover;
-		
+
 
 		.user {
 			width: 690rpx;
 			height: 176rpx;
 			position: relative;
 			margin-bottom: 38rpx;
-			.user-avatar{
+
+			.user-avatar {
 				object-fit: cover;
 				object-position: center;
 			}
@@ -315,12 +393,14 @@
 			padding-right: 24rpx;
 			box-sizing: border-box;
 			margin-bottom: 24rpx;
+
 			.flex {
 				display: flex;
 				align-items: center;
 				justify-content: space-between;
 				height: 68rpx;
 				width: 650rpx;
+
 				.join {
 					font-size: 36rpx;
 					font-family: PingFang-SC-Bold, PingFang-SC;
@@ -340,44 +420,51 @@
 
 
 		}
-		.orders{
+
+		.orders {
 			width: 690rpx;
 			background: $bgColor;
 			border-radius: 8rpx;
 			padding: 40rpx 30rpx 36rpx 36rpx;
 			box-sizing: border-box;
-			.nav{
+
+			.nav {
 				height: 50rpx;
 				width: 633rpx;
 				display: flex;
 				align-items: center;
 				justify-content: space-between;
-				.myorder{
+
+				.myorder {
 					font-size: 28rpx;
 					font-family: PingFang-SC-Heavy, PingFang-SC;
 					font-weight: 800;
 					color: #333333;
 				}
-				.more{
+
+				.more {
 					font-size: 28rpx;
 					font-family: PingFang-SC-Bold, PingFang-SC;
 					font-weight: bold;
 					color: #627885;
-					
+
 				}
 			}
-			.content{
+
+			.content {
 				display: flex;
 				align-items: center;
 				justify-content: space-between;
-				padding:0 20rpx;
-				margin-top:72rpx;
-				.flexbox{
+				padding: 0 20rpx;
+				margin-top: 72rpx;
+
+				.flexbox {
 					display: flex;
 					flex-direction: column;
 					align-items: center;
-					text{
-						margin-top:16rpx;
+
+					text {
+						margin-top: 16rpx;
 						font-size: 28rpx;
 						font-family: PingFang-SC-Medium, PingFang-SC;
 						font-weight: 500;
@@ -389,36 +476,41 @@
 
 
 	}
-	.list{
+
+	.list {
 		width: 100%;
 		padding-top: 32rpx;
-		padding-bottom:32rpx;
-		border-bottom: 2rpx solid  #F0F0F0;
+		padding-bottom: 32rpx;
+		border-bottom: 2rpx solid #F0F0F0;
 		display: flex;
 		flex-direction: column;
 		justify-content: center;
 		position: relative;
-		&:first-child{
+
+		&:first-child {
 			padding-top: 50rpx;
 		}
-		.title{
+
+		.title {
 			font-size: 36rpx;
 			font-family: PingFang-SC-Bold, PingFang-SC;
 			font-weight: bold;
 			color: #333333;
 			margin-bottom: 16rpx;
 		}
-		.container{
+
+		.container {
 			font-size: 28rpx;
 			font-family: PingFang-SC-Medium, PingFang-SC;
 			font-weight: 500;
 			color: #333333;
 		}
-		image{
-			width: 12rpx ;
+
+		image {
+			width: 12rpx;
 			height: 20rpx;
 			position: absolute;
-			top:70rpx;
+			top: 70rpx;
 			right: 0rpx;
 		}
 	}

Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/components/SwiperBox/index.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/components/TabBar/tabbar.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/components/WaterFall/waterfall-item.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/components/WaterFall/waterfall-list.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/components/hch-position/hch-position.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/components/q-turntable/q-turntable.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-icon/u-icon.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-image/u-image.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-input/u-input.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-loading-icon/u-loading-icon.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-swiper-indicator/u-swiper-indicator.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-swiper/u-swiper.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-transition/u-transition.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/goods/goods-detail/index.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/goods/goods-hotel/index.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/goods/goods-lucky/index.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/goods/goods.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/active-detail/index.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/active-list/index.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/vote-detail/index.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/login.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/youyue.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/map/hotel-book/index.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/map/map.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/msg/msg.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/Kudos/Kudos.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/PersonalData/personalData.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/integral/integral.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/integral/integralExchange.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/integral/integralOrder.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/integral/integralRecord.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/integral/integralRule.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/my.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/myorders/orderDetail.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/myorders/orders.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/prize/exchangeDetail.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/prize/exchangePrize.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/prize/prize.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/protocol/PrivacyPolicy.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/protocol/UserAgreement.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/setting/setting.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/verification/orderVerification.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/verification/verification.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/verification/verificationDetail.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/webview/webview.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-forms/components/uni-forms/uni-forms.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-swiper-dot/components/uni-swiper-dot/uni-swiper-dot.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 1
unpackage/dist/dev/mp-weixin/common/runtime.js


Fichier diff supprimé car celui-ci est trop grand
+ 59 - 7
unpackage/dist/dev/mp-weixin/common/vendor.js


Fichier diff supprimé car celui-ci est trop grand
+ 14 - 14
unpackage/dist/dev/mp-weixin/components/SwiperBox/index.js


Fichier diff supprimé car celui-ci est trop grand
+ 12 - 12
unpackage/dist/dev/mp-weixin/components/TabBar/tabbar.js


Fichier diff supprimé car celui-ci est trop grand
+ 12 - 12
unpackage/dist/dev/mp-weixin/components/hch-position/hch-position.js


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

xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd
@@ -1,6 +1,6 @@
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["components/q-turntable/q-turntable"],{
 
-/***/ 497:
+/***/ 498:
 /*!*************************************************************************************!*\
   !*** C:/Users/Administrator/Desktop/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& */ 498);
-/* 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& */ 500);
+/* 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& */ 499);
+/* 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& */ 501);
 /* 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& */ 502);
+/* 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& */ 503);
 /* harmony import */ var _D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./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"
 
 /***/ }),
 
-/***/ 498:
+/***/ 499:
 /*!********************************************************************************************************************!*\
   !*** C:/Users/Administrator/Desktop/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 _D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_16_0_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_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__(/*! -!./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!./q-turntable.vue?vue&type=template&id=2e5c8c30& */ 499);
+/* harmony import */ var _D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_16_0_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_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__(/*! -!./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!./q-turntable.vue?vue&type=template&id=2e5c8c30& */ 500);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "render", function() { return _D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_16_0_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_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 _D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_16_0_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_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__);
 
 /***/ }),
 
-/***/ 499:
+/***/ 500:
 /*!********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./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!C:/Users/Administrator/Desktop/ihg/IHG/components/q-turntable/q-turntable.vue?vue&type=template&id=2e5c8c30& ***!
   \********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -90,7 +90,7 @@ render._withStripped = true
 
 /***/ }),
 
-/***/ 500:
+/***/ 501:
 /*!**************************************************************************************************************!*\
   !*** C:/Users/Administrator/Desktop/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 _D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_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__(/*! -!./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!./q-turntable.vue?vue&type=script&lang=js& */ 501);
+/* harmony import */ var _D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_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__(/*! -!./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!./q-turntable.vue?vue&type=script&lang=js& */ 502);
 /* harmony import */ var _D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_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(_D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_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 _D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_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 _D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_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"] = (_D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_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); 
 
 /***/ }),
 
-/***/ 501:
+/***/ 502:
 /*!*********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./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!C:/Users/Administrator/Desktop/ihg/IHG/components/q-turntable/q-turntable.vue?vue&type=script&lang=js& ***!
   \*********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -205,7 +205,7 @@ var _default =
 
 /***/ }),
 
-/***/ 502:
+/***/ 503:
 /*!**********************************************************************************************************************!*\
   !*** C:/Users/Administrator/Desktop/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 _D_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_D_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_6_oneOf_1_2_D_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_3_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_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__(/*! -!./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!./q-turntable.vue?vue&type=style&index=0&lang=css& */ 503);
+/* harmony import */ var _D_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_D_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_6_oneOf_1_2_D_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_3_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_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__(/*! -!./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!./q-turntable.vue?vue&type=style&index=0&lang=css& */ 504);
 /* harmony import */ var _D_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_D_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_6_oneOf_1_2_D_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_3_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_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(_D_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_D_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_6_oneOf_1_2_D_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_3_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_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 _D_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_D_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_6_oneOf_1_2_D_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_3_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_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 _D_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_D_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_6_oneOf_1_2_D_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_3_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_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"] = (_D_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_D_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_6_oneOf_1_2_D_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_3_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_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); 
 
 /***/ }),
 
-/***/ 503:
+/***/ 504:
 /*!**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./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!C:/Users/Administrator/Desktop/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__(497))
+            __webpack_require__('1')['createComponent'](__webpack_require__(498))
         })
     },
     [['components/q-turntable/q-turntable-create-component']]

Fichier diff supprimé car celui-ci est trop grand
+ 12 - 12
unpackage/dist/dev/mp-weixin/components/waterfall/waterfall-item.js


Fichier diff supprimé car celui-ci est trop grand
+ 10 - 10
unpackage/dist/dev/mp-weixin/components/waterfall/waterfall-list.js


Fichier diff supprimé car celui-ci est trop grand
+ 14 - 14
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-icon/u-icon.js


Fichier diff supprimé car celui-ci est trop grand
+ 15 - 15
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-image/u-image.js


Fichier diff supprimé car celui-ci est trop grand
+ 14 - 14
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-input/u-input.js


Fichier diff supprimé car celui-ci est trop grand
+ 13 - 13
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-loading-icon/u-loading-icon.js


Fichier diff supprimé car celui-ci est trop grand
+ 13 - 13
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-swiper-indicator/u-swiper-indicator.js


Fichier diff supprimé car celui-ci est trop grand
+ 15 - 15
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-swiper/u-swiper.js


Fichier diff supprimé car celui-ci est trop grand
+ 14 - 14
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-transition/u-transition.js


Fichier diff supprimé car celui-ci est trop grand
+ 17 - 17
unpackage/dist/dev/mp-weixin/pages/goods/goods-detail/index.js


Fichier diff supprimé car celui-ci est trop grand
+ 17 - 17
unpackage/dist/dev/mp-weixin/pages/goods/goods-hotel/index.js


Fichier diff supprimé car celui-ci est trop grand
+ 19 - 18
unpackage/dist/dev/mp-weixin/pages/goods/goods-lucky/index.js


Fichier diff supprimé car celui-ci est trop grand
+ 17 - 17
unpackage/dist/dev/mp-weixin/pages/goods/goods.js


Fichier diff supprimé car celui-ci est trop grand
+ 19 - 19
unpackage/dist/dev/mp-weixin/pages/index/active-detail/index.js


Fichier diff supprimé car celui-ci est trop grand
+ 7 - 7
unpackage/dist/dev/mp-weixin/pages/index/active-list/index.js


+ 74 - 3
unpackage/dist/dev/mp-weixin/pages/index/index.js

xqd xqd xqd xqd xqd
@@ -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 */ 442))
+      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 */ 443))
     },
     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 */ 449))
+      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 */ 450))
     }
   }
 } 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 */ 460));}).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 */ 467));}).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 */ 461));}).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 */ 468));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
 
 
 
@@ -302,6 +302,47 @@ __webpack_require__.r(__webpack_exports__);
         text: '中秋佳节五仁月饼,惊喜特供,限时抢购',
         title: '环球洲际' },
 
+      {
+        img: 'http://t9.9026.com/imgs/goodsimg01.png',
+        text: '中秋佳节五仁月饼,惊喜特供,限时抢购',
+        title: '环球洲际',
+        short: '' },
+
+      {
+        img: 'http://t9.9026.com/imgs/goodsimg01.png',
+        text: '中秋佳节五仁月饼,惊喜特供,限时抢购',
+        title: '环球洲际',
+        short: '' },
+      {
+        img: 'http://t9.9026.com/imgs/goodsimg01.png',
+        text: '中秋佳节五仁月饼,惊喜特供,限时抢购',
+        title: '环球洲际',
+        short: '' },
+      {
+        img: 'http://t9.9026.com/imgs/goodsimg01.png',
+        text: '中秋佳节五仁月饼,惊喜特供,限时抢购',
+        title: '环球洲际',
+        short: '' },
+      {
+        img: 'http://t9.9026.com/imgs/goodsimg01.png',
+        text: '中秋佳节五仁月饼,惊喜特供,限时抢购',
+        title: '环球洲际',
+        short: '' },
+      {
+        img: 'http://t9.9026.com/imgs/goodsimg01.png',
+        text: '中秋佳节五仁月饼,惊喜特供,限时抢购',
+        title: '环球洲际',
+        short: '' },
+      {
+        img: 'http://t9.9026.com/imgs/goodsimg01.png',
+        text: '中秋佳节五仁月饼,惊喜特供,限时抢购',
+        title: '环球洲际',
+        short: '' },
+      {
+        img: 'http://t9.9026.com/imgs/goodsimg01.png',
+        text: '中秋佳节五仁月饼,惊喜特供,限时抢购',
+        title: '环球洲际',
+        short: '' },
       {
         img: 'http://t9.9026.com/imgs/goodsimg01.png',
         text: '中秋佳节五仁月饼,惊喜特供,限时抢购',
@@ -317,10 +358,39 @@ __webpack_require__.r(__webpack_exports__);
 
       //轮播图
       info: [
+      [{
+        img: 'http://t9.9026.com/imgs/swiper01.png',
+        name: '酒店预订' },
+
+      {
+        img: 'http://t9.9026.com/imgs/swiper01.png',
+        name: '酒店预订' },
+
+      {
+        img: 'http://t9.9026.com/imgs/swiper01.png',
+        name: '酒店预订' },
+
       {
         img: 'http://t9.9026.com/imgs/swiper01.png',
         name: '酒店预订' }],
 
+      [{
+        img: 'http://t9.9026.com/imgs/swiper01.png',
+        name: '酒店预订' },
+
+      {
+        img: 'http://t9.9026.com/imgs/swiper01.png',
+        name: '酒店预订' },
+
+      {
+        img: 'http://t9.9026.com/imgs/swiper01.png',
+        name: '酒店预订' },
+
+      {
+        img: 'http://t9.9026.com/imgs/swiper01.png',
+        name: '酒店预订' }]],
+
+
 
       dotsStyles: {
         bottom: 24,
@@ -403,6 +473,7 @@ __webpack_require__.r(__webpack_exports__);
         }
         if (index % 4 === 2) {
           item.long = true;
+          item.marginTop = -66 + "rpx";
         }
         if (index % 4 === 3) {
           item.short = true;

Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/mp-weixin/pages/index/index.wxml


+ 9 - 10
unpackage/dist/dev/mp-weixin/pages/index/index.wxss

xqd xqd
@@ -35,8 +35,15 @@ page.data-v-57280228 {
 .home-swiper.data-v-57280228 {
   height: 416rpx;
 }
-.home-swiper .swiper-box.data-v-57280228 {
-  height: 416rpx;
+.home-swiper .swiper-box.data-v-57280228  swiper-item {
+  width: 100%;
+  height: 208px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+.home-swiper .swiper-box.data-v-57280228  swiper-item view {
+  width: 25%;
 }
 .home-nav.data-v-57280228 {
   position: relative;
@@ -170,14 +177,6 @@ page.data-v-57280228 {
   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;

Fichier diff supprimé car celui-ci est trop grand
+ 16 - 16
unpackage/dist/dev/mp-weixin/pages/index/vote-detail/index.js


Fichier diff supprimé car celui-ci est trop grand
+ 14 - 14
unpackage/dist/dev/mp-weixin/pages/login/login.js


Fichier diff supprimé car celui-ci est trop grand
+ 14 - 14
unpackage/dist/dev/mp-weixin/pages/login/youyue.js


Fichier diff supprimé car celui-ci est trop grand
+ 14 - 14
unpackage/dist/dev/mp-weixin/pages/map/hotel-book/index.js


Fichier diff supprimé car celui-ci est trop grand
+ 20 - 20
unpackage/dist/dev/mp-weixin/pages/map/map.js


Fichier diff supprimé car celui-ci est trop grand
+ 17 - 17
unpackage/dist/dev/mp-weixin/pages/msg/msg.js


Fichier diff supprimé car celui-ci est trop grand
+ 15 - 15
unpackage/dist/dev/mp-weixin/pages/my/Kudos/Kudos.js


Fichier diff supprimé car celui-ci est trop grand
+ 17 - 17
unpackage/dist/dev/mp-weixin/pages/my/PersonalData/personalData.js


Fichier diff supprimé car celui-ci est trop grand
+ 16 - 16
unpackage/dist/dev/mp-weixin/pages/my/integral/integral.js


Fichier diff supprimé car celui-ci est trop grand
+ 14 - 14
unpackage/dist/dev/mp-weixin/pages/my/integral/integralExchange.js


Fichier diff supprimé car celui-ci est trop grand
+ 19 - 19
unpackage/dist/dev/mp-weixin/pages/my/integral/integralOrder.js


Fichier diff supprimé car celui-ci est trop grand
+ 15 - 15
unpackage/dist/dev/mp-weixin/pages/my/integral/integralRecord.js


Fichier diff supprimé car celui-ci est trop grand
+ 14 - 14
unpackage/dist/dev/mp-weixin/pages/my/integral/integralRule.js


Fichier diff supprimé car celui-ci est trop grand
+ 111 - 19
unpackage/dist/dev/mp-weixin/pages/my/my.js


+ 1 - 0
unpackage/dist/dev/mp-weixin/pages/my/my.json

xqd
@@ -2,6 +2,7 @@
   "navigationBarTitleText": "我的",
   "enablePullDownRefresh": false,
   "usingComponents": {
+    "u-modal": "/node-modules/uview-ui/components/u-modal/u-modal",
     "tab-bar": "/components/TabBar/tabbar"
   }
 }

Certains fichiers n'ont pas été affichés car il y a eu trop de fichiers modifiés dans ce diff