Bladeren bron

项目日志:11.29投票功能部分实现

gubai 2 jaren geleden
bovenliggende
commit
a2e9fcbdfd
100 gewijzigde bestanden met toevoegingen van 1009 en 582 verwijderingen
  1. 11 1
      api/my/my.js
  2. 126 61
      pages/index/active-detail/index.vue
  3. 1 1
      pages/index/active-list/index.vue
  4. 101 25
      pages/index/vote-detail/index.vue
  5. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
  6. 0 1
      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. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-transition/components/uni-transition/uni-transition.js.map
  63. 1 1
      unpackage/dist/dev/mp-weixin/common/main.js
  64. 190 32
      unpackage/dist/dev/mp-weixin/common/vendor.js
  65. 13 13
      unpackage/dist/dev/mp-weixin/components/SwiperBox/index.js
  66. 11 11
      unpackage/dist/dev/mp-weixin/components/TabBar/tabbar.js
  67. 11 11
      unpackage/dist/dev/mp-weixin/components/hch-position/hch-position.js
  68. 14 14
      unpackage/dist/dev/mp-weixin/components/q-turntable/q-turntable.js
  69. 11 11
      unpackage/dist/dev/mp-weixin/components/waterfall/waterfall-item.js
  70. 10 10
      unpackage/dist/dev/mp-weixin/components/waterfall/waterfall-list.js
  71. 13 13
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-icon/u-icon.js
  72. 14 14
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-image/u-image.js
  73. 13 13
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-input/u-input.js
  74. 12 12
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-loading-icon/u-loading-icon.js
  75. 12 12
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-swiper-indicator/u-swiper-indicator.js
  76. 14 14
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-swiper/u-swiper.js
  77. 13 13
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-transition/u-transition.js
  78. 16 16
      unpackage/dist/dev/mp-weixin/pages/goods/goods-detail/index.js
  79. 16 16
      unpackage/dist/dev/mp-weixin/pages/goods/goods-hotel/index.js
  80. 16 16
      unpackage/dist/dev/mp-weixin/pages/goods/goods-lucky/index.js
  81. 16 16
      unpackage/dist/dev/mp-weixin/pages/goods/goods.js
  82. 60 22
      unpackage/dist/dev/mp-weixin/pages/index/active-detail/index.js
  83. 0 0
      unpackage/dist/dev/mp-weixin/pages/index/active-detail/index.wxml
  84. 8 0
      unpackage/dist/dev/mp-weixin/pages/index/active-detail/index.wxss
  85. 17 17
      unpackage/dist/dev/mp-weixin/pages/index/active-list/index.js
  86. 0 0
      unpackage/dist/dev/mp-weixin/pages/index/active-list/index.wxml
  87. 21 21
      unpackage/dist/dev/mp-weixin/pages/index/index.js
  88. 86 24
      unpackage/dist/dev/mp-weixin/pages/index/vote-detail/index.js
  89. 0 0
      unpackage/dist/dev/mp-weixin/pages/index/vote-detail/index.wxml
  90. 12 1
      unpackage/dist/dev/mp-weixin/pages/index/vote-detail/index.wxss
  91. 13 13
      unpackage/dist/dev/mp-weixin/pages/login/login.js
  92. 13 13
      unpackage/dist/dev/mp-weixin/pages/login/youyue.js
  93. 13 13
      unpackage/dist/dev/mp-weixin/pages/map/hotel-book/index.js
  94. 19 19
      unpackage/dist/dev/mp-weixin/pages/map/map.js
  95. 16 16
      unpackage/dist/dev/mp-weixin/pages/msg/msg.js
  96. 14 14
      unpackage/dist/dev/mp-weixin/pages/my/Kudos/Kudos.js
  97. 16 16
      unpackage/dist/dev/mp-weixin/pages/my/PersonalData/personalData.js
  98. 15 15
      unpackage/dist/dev/mp-weixin/pages/my/integral/integral.js
  99. 13 13
      unpackage/dist/dev/mp-weixin/pages/my/integral/integralExchange.js
  100. 18 18
      unpackage/dist/dev/mp-weixin/pages/my/integral/integralOrder.js

+ 11 - 1
api/my/my.js

xqd
@@ -21,9 +21,19 @@ export function update(data){
 		data
 	)
 }
+
+//用户加入会员{{host}}/api/v1/user/
+export function userJoinVip(data){
+	return request.post(
+		`v1/user/userJoinVip`,
+		data
+	)
+}
+
 //http://t9.9026.com/api/users/1/update_avatar_nickname
 
 export default {
   myLogin,
-  update
+  update,
+  userJoinVip
 }

+ 126 - 61
pages/index/active-detail/index.vue

xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd
@@ -2,7 +2,7 @@
 	<view class="active-detail">
 		<!-- 背景图 -->
 		<view class="active-detail-img">
-			<image style="width: 100%; height: 720rpx;" src="http://t9.9026.com/imgs/swiper01.png" mode=""></image>
+			<image style="width: 100%; height: 720rpx;" :src="activeDeatil.banners" mode=""></image>
 		</view>
 
 		<!--投票数  -->
@@ -12,6 +12,15 @@
 					<text style="width: 80rpx; height: 2rpx; background-color: rgba(204, 204, 204, .7); "></text>
 					<view class="vote-detail-top-main">
 						<text>距活动结束:</text>
+						<view class="time">
+							<text>还剩</text>
+							<view class="shijian">{{countdownh}}</view>
+							<text>时</text>
+							<view class="shijian">{{countdownm}}</view>
+							<text>分</text>
+							<view class="shijian">{{countdowns}}</view>
+							<text>秒</text>
+						</view>
 					</view>
 					<text style="width: 80rpx; height: 2rpx; background-color: rgba(204, 204, 204, .7); "></text>
 				</view>
@@ -85,7 +94,8 @@
 			<view class="ListItem" v-for="item in voteList" @click="activeDetail">
 				<image src="http://t9.9026.com/imgs/Kudosbg.png" style="width: 640rpx;height:420rpx;"></image>
 				<view class="kudosicon" :style="{backgroundImage:'url('+hotelImageUrl+')'}">
-					<text style="width: 36rpx;height: 52rpx; display: flex;align-items: center;justify-content: center;color: #FFF;font-size: 24rpx;font-weight: bold; ">{{item.rank}}</text>
+					<text
+						style="width: 36rpx;height: 52rpx; display: flex;align-items: center;justify-content: center;color: #FFF;font-size: 24rpx;font-weight: bold; ">{{item.rank}}</text>
 				</view>
 				<view class="nav">
 					<view class="events">
@@ -95,13 +105,13 @@
 						<text>{{item.ticket_num}}票</text>
 					</view>
 				</view>
-				<view class="foot" @click.stop="goVoteDetail(item.activity_id)">
+				<view class="foot" @click.stop="goVoteDetail(item.id)">
 					<text>投票</text>
 				</view>
 			</view>
 		</view>
 
-		<view class="rank-detail"  :style="{backgroundImage:'url('+backImageUrl+')'}" v-if="isActive==1">
+		<view class="rank-detail" :style="{backgroundImage:'url('+backImageUrl+')'}" v-if="isActive==1">
 			<view class="rank-detail-rank">
 				<image style="width: 92rpx; height: 92rpx; border-radius: 50%; " src="/static/icon/avatar.png" mode="">
 				</image>
@@ -180,11 +190,13 @@
 						<text>点击加入会员可多3次机会</text>
 					</view>
 				</view>
-				
+
 			</view>
-			
+
 			<!-- 分割线 -->
-			<view style="width: 94%; height: 2rpx; background-color:rgba(240, 240, 240, .7);margin: 64rpx auto 80rpx;  "></view>
+			<view
+				style="width: 94%; height: 2rpx; background-color:rgba(240, 240, 240, .7);margin: 64rpx auto 80rpx;  ">
+			</view>
 			<view class=" introduce-top">
 				<text class="introduce-top-rule1"></text>
 				<text style="margin-right:  8rpx; margin-left: 12rpx; ">活动介绍</text>
@@ -193,15 +205,15 @@
 			<view class="introduce-btn-text">
 				<text>由中国最佳酒店评选委员会、洲际酒店共同打造的国内</text>
 			</view>
-			
+
 			<!-- 声明 -->
 			<view class="introduce-btn">
 				<text>活动声明</text>
 			</view>
 		</view>
 		<!-- 触底 -->
-		<view class="home-bottom" v-if="isActive==0" >
-			<uni-load-more :status="status" color="#CCCCCC" :content-text="contentText"/>
+		<view class="home-bottom" v-if="isActive==0">
+			<uni-load-more :status="status" color="#CCCCCC" :content-text="contentText" />
 		</view>
 	</view>
 </template>
@@ -211,14 +223,21 @@
 	export default {
 		data() {
 			return {
+				//活动结束倒计时
+				endTime:'',
+				countdownh: '',
+				countdownm: '',
+				countdowns: '',
+				timer: null, //重复执行
+
 				// 搜索
-				search:'',
+				search: '',
 				// 活动id
-				id:'',
+				id: '',
 				// 活动详情
-				activeDeatil:'',
+				activeDeatil: '',
 				// 投票列表
-				voteList:[],
+				voteList: [],
 				//酒店排名背景图片
 				hotelImageUrl: require('../../../static/icon/tip01.png'),
 				//排行榜背景图片
@@ -253,69 +272,96 @@
 				},
 			}
 		},
-		onLoad(op) {
-			this.id=op.id
-			this.getList(op.id)
-			this.getActiveDetail(op.id)
-			this.getCategoryList(op.id)
+		onLoad(o) {
+			this.id = o.id
+			this.getList(o.id)
+			this.getActiveDetail(o.id)
+			this.getCategoryList(o.id)
 		},
 		methods: {
+			showtime(time) {
+				var nowtime = new Date(), //获取当前时间
+					// endtime = new Date("2021/12/10"); //定义结束时间
+					endtime = new Date(time); //定义结束时间
+				var lefttime = endtime.getTime() - nowtime.getTime(), //距离结束时间的毫秒数
+					leftd = Math.floor(lefttime / (1000 * 60 * 60 * 24)), //计算天数
+					lefth = Math.floor((lefttime / (1000 * 60 * 60) % 24) + leftd * 24) < 10 ? "0" + Math.floor((lefttime /
+						(1000 * 60 * 60) % 24) + leftd * 24) : Math.floor((lefttime / (1000 * 60 * 60) % 24) + leftd *
+						24), //计算小时数
+					leftm = Math.floor(lefttime / (1000 * 60) % 60) < 10 ? "0" + Math.floor(lefttime / (1000 * 60) % 60) :
+					Math.floor(lefttime / (1000 * 60) % 60), //计算分钟数
+					lefts = Math.floor(lefttime / 1000 % 60) < 10 ? "0" + Math.floor(lefttime / 1000 % 60) : Math.floor(
+						lefttime / 1000 % 60); //计算秒数
+				this.countdownh = lefth //返回倒计时的字符串
+				this.countdownm = leftm //返回倒计时的字符串
+				this.countdowns = lefts //返回倒计时的字符串
+				// 倒计时结束时,显示00:00:00
+				if (lefttime < 0) {
+					this.countdownh = this.countdownm = this.countdowns = "00"
+				}
+
+			},
 			// 获取活动项目列表
-			getList(id){
+			getList(id) {
 				this.$api.active.getActiveProjectList({
-					activity_id:id,
-					page:1,
-				}).then(res=>{
-					console.log(res,"活动项目列表")
-					if(res.code==0){
-						this.voteList=res.data.data
+					activity_id: id,
+					page: 1,
+				}).then(res => {
+					console.log(res, "活动项目列表")
+					if (res.code == 0) {
+						this.voteList = res.data.data
 					}
 				})
 			},
 			// 获取活动详情
-			getActiveDetail(id){
+			getActiveDetail(id) {
 				this.$api.active.getActiveDetail({
-					activity_id:id
-				}).then(res=>{
-					console.log(res,"活动详情")
-					if(res.code==0){
-						this.activeDeatil=res.data
+					activity_id: id
+				}).then(res => {
+					console.log(res, "活动详情")
+					if (res.code == 0) {
+						this.activeDeatil = res.data
+						this.endTime = res.data.end_time
+						this.timer = setInterval(() => {
+							this.showtime(this.endTime)
+						})
 					}
 				})
 			},
 			// 获取活动投票项分类
-			getCategoryList(id){
+			getCategoryList(id) {
 				this.$api.category.getCategoryList({
-					page:1,
-					type:3,
-					activity_id:id
-				}).then(res=>{
-					console.log(res,"活动投票项分类")
-					if(res.code==0){
+					page: 1,
+					type: 3,
+					activity_id: id
+				}).then(res => {
+					console.log(res, "活动投票项分类")
+					if (res.code == 0) {
 						// this.areaList=res.data.data
 					}
 				})
 			},
 			//购票详情
-			goVoteDetail(id){
+			goVoteDetail(id) {
+				console.log(id,'--->id')
 				uni.navigateTo({
-					url:'/pages/index/vote-detail/index?id='+id
+					url: '/pages/index/vote-detail/index?id=' + id
 				})
 			},
 			// 搜索防抖
-			searchText:util.debounce(function(){
+			searchText: util.debounce(function() {
 				this.goSearch()
-			},1000),
+			}, 1000),
 			// 搜索
-			goSearch(){
+			goSearch() {
 				this.$api.active.getActiveProjectList({
-					activity_id:this.id,
-					page:1,
-					keyword:this.search
-				}).then(res=>{
-					console.log(res,"搜索活动项目列表")
-					if(res.code==0){
-						this.voteList=res.data.data
+					activity_id: this.id,
+					page: 1,
+					keyword: this.search
+				}).then(res => {
+					console.log(res, "搜索活动项目列表")
+					if (res.code == 0) {
+						this.voteList = res.data.data
 					}
 				})
 			},
@@ -345,6 +391,7 @@
 		height: 100%;
 		background: #F9F9F9;
 	}
+
 	.home-bottom {
 		background-color: #fff;
 		padding-bottom: 84rpx;
@@ -363,8 +410,9 @@
 		::v-deep .u-input__content__field-wrapper {
 			padding-left: 36rpx;
 		}
-		::v-deep .u-input__content__field-wrapper__field{
-			color:#999999 !important;
+
+		::v-deep .u-input__content__field-wrapper__field {
+			color: #999999 !important;
 			font-size: 28rpx !important;
 		}
 	}
@@ -386,31 +434,37 @@
 			font-size: 32rpx;
 			font-weight: bold;
 			letter-spacing: 2rpx;
+
 			.introduce-top-rule1 {
 				width: 56rpx;
 				height: 4rpx;
 				background: linear-gradient(90deg, #FFFFFF 0%, #D9A94D 100%);
 			}
+
 			.introduce-top-rule2 {
 				width: 56rpx;
 				height: 4rpx;
 				background: linear-gradient(-90deg, #FFFFFF 0%, #D9A94D 100%);
 			}
 		}
-		.introduce-main{
+
+		.introduce-main {
 			margin-top: 46rpx;
 			padding: 0 30rpx;
 			font-size: 28rpx;
 			font-weight: bold;
 			color: #333;
-			.introduce-main-start{
+
+			.introduce-main-start {
 				margin-bottom: 24rpx;
 			}
-			.introduce-main-rule{
+
+			.introduce-main-rule {
 				display: flex;
 				align-items: flex-start;
 				justify-content: flex-start;
-				.introduce-main-rule-left{
+
+				.introduce-main-rule-left {
 					display: flex;
 					flex-direction: column;
 					align-items: flex-start;
@@ -419,7 +473,8 @@
 				}
 			}
 		}
-		.introduce-btn-text{
+
+		.introduce-btn-text {
 			padding: 0 30rpx;
 			margin-top: 40rpx;
 			text-indent: 2em;
@@ -428,7 +483,8 @@
 			font-weight: bold;
 			line-height: 56rpx;
 		}
-		.introduce-btn{
+
+		.introduce-btn {
 			margin-top: 72rpx;
 			padding-bottom: 80rpx;
 			width: 100%;
@@ -562,6 +618,15 @@
 					margin-left: 20rpx;
 					color: #333;
 					font-size: 28rpx;
+					display: flex;
+					align-items: center;
+					justify-content: flex-start;
+
+					.time {
+						display: flex;
+						align-items: center;
+						justify-content: flex-start;
+					}
 				}
 			}
 
@@ -735,10 +800,10 @@
 
 			.kudosicon {
 				background-repeat: no-repeat;
-				background-size:36rpx 52rpx;
+				background-size: 36rpx 52rpx;
 				position: absolute;
 				top: 20rpx;
-				left:60rpx;
+				left: 60rpx;
 
 				@include flexlayout() image {
 					width: 32rpx;

+ 1 - 1
pages/index/active-list/index.vue

xqd
@@ -22,7 +22,7 @@
 
 		<view class="List" v-if="isActive==0">
 			<view class="ListItem" v-for="(item,index) in List" @click="activeDetail(item.id)">
-				<image :src="item.banners?item.banners:'http://t9.9026.com/imgs/Kudosbg.png'" style="width: 640rpx;height:420rpx;"></image>
+				<image :src="item.banners?item.cover_img:'http://t9.9026.com/imgs/Kudosbg.png'" style="width: 640rpx;height:420rpx;"></image>
 				<view class="kudosicon" @click.stop="kudosActive(item.id,index)">
 					<image src="/static/icon/Kudos.png" v-if="item.is_like==0"></image>
 					<image src="/static/icon/Kudos(1).png" v-if="item.is_like==1"></image>

+ 101 - 25
pages/index/vote-detail/index.vue

xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd
@@ -2,10 +2,10 @@
 	<view class="vote-detail">
 		<!-- 活动查询 -->
 		<view class="title">
-			<image style="width: 158rpx;height: 158rpx;border-radius: 50%; " src="/static/icon/avatar.png" mode="">
+			<image style="width: 158rpx;height: 158rpx;border-radius: 50%; " :src="voteDetail.logo" mode="">
 			</image>
 			<text class="title-text">{{voteDetail.project_name}}</text>
-			<text class="title-btn">{{voteDetail.intro}}</text>
+			<text class="title-btn">{{voteDetail.activity.title}}</text>
 		</view>
 		<!-- 分割线 -->
 		<view style="width: 92%; height: 2rpx; background-color:#F0F0F0;margin: 40rpx auto;  "></view>
@@ -40,7 +40,7 @@
 					<uni-swiper-dot :info="info" :current="current1" :mode="mode" :dots-styles="dotsStyles">
 						<swiper class="swiper-box" @change="change1" circular>
 							<swiper-item v-for="(item ,index) in info" :key="index">
-								<view class="swiper-item" >
+								<view class="swiper-item">
 									<image style="width: 100%;height:576rpx; border-radius: 12rpx; " :src="item.img"
 										mode="aspectFill"></image>
 								</view>
@@ -51,9 +51,12 @@
 			</view>
 			<!-- 投票 -->
 			<view class="btn" @click="goVote(activity_project_id)">
-				<view class="btn-vote">
+				<view v-if="spending || isStart" class="btn-vote"  :class="spending?'btn-vote': isStart?'btn-vote-fasle' :'' " >
 					<text>投票</text>
 				</view>
+				<view class="btn-vote-fasle" v-if="isEnd"  >
+					<text>投票结束</text>
+				</view>
 			</view>
 			<!-- 帮我拉票 -->
 			<view class="help">
@@ -82,7 +85,7 @@
 					<text>参赛介绍</text>
 				</view>
 				<view class="introduce-text">
-					成都世纪城天堂洲际大饭店为您提供世界各地美食和当地美食;成都世纪城天堂洲际大饭店六个不同的烹饪台将为您展示国际烹饪艺术的精辟之处。在这里,我们的厨师师傅就是艺术能手,而咖啡厅则成就了他们表演绝伦技艺的舞台。
+					{{voteDetail.intro}}
 				</view>
 			</view>
 
@@ -106,22 +109,20 @@
 			<view class="pop">
 				<view class="title"><text>投票成功</text></view>
 				<view class="img">
-					<image src="http://t9.9026.com/imgs/Kudosbg.png"></image>
+					<image :src="voteDetail.activity.success_img"></image>
 				</view>
 				<view class="textfont">
-					<text v-if="false">今日投票数已用完
-					点击 加入IHG会员 可享受额外X票数</text>
-					<text v-if="false">今日投票数还有 2
-					点击再次投票可再次为本项目投票也可为其他项目投票</text>
-					<text v-if="true">恭喜你中奖了!
-					获得了XXX的奖品,请尽快领取</text>
-					</view>
+					<text v-if="!isVoteNum">今日投票数已用完
+						点击 加入IHG会员 可享受额外X票数</text>
+					<text v-if="isVoteNum">今日投票数还有 {{userCanVoteNum}}
+						点击再次投票可再次为本项目投票也可为其他项目投票</text>
+					<!-- <text v-if="true">恭喜你中奖了!
+						获得了XXX的奖品,请尽快领取</text> -->
+				</view>
 				<view class="btn">
-					<view class="cancel" @click="closeVote"><text>关闭</text></view>
-					<view class="cancel" @click="closeVote" v-if="false"><text>再次投票</text></view>
-					<view class="download" @click="goJoin" ><text >加入IHG会员</text></view>
-					<view class="download" @click="goJoin" v-if="false"><text>其他项目</text></view>
-					<view class="download" @click="goJoin" v-if="false"><text>去领取</text></view>
+					<view class="cancel" @click="closeVote"><text>{{isVoteNum?'再次投票':'关闭'}}</text></view>
+					<view class="download" @click="goJoin"><text>{{isVoteNum?'其他项目':'加入IHG会员'}}</text></view>
+					<!-- <view class="download" @click="goJoin" v-if="false"><text>去领取</text></view> -->
 				</view>
 			</view>
 		</uni-popup>
@@ -132,6 +133,21 @@
 	export default {
 		data() {
 			return {
+				//活动id
+				sourceId:'',
+				//活动可以使用的投票数
+				userCanVoteNum:'',
+				isVoteNum:false,
+				//判断活动是否正在进行中
+				spending: false,
+				//判断活动是否开始
+				isStart:false,
+				//判断活动是否结束
+				isEnd:false,
+				//活动开始时间
+				startTime: '',
+				//活动结束时间
+				endTime: "",
 				// 活动项目id
 				activity_project_id: '',
 				// 活动项目详情
@@ -170,9 +186,38 @@
 					console.log(res, "detail")
 					if (res.code == 0) {
 						this.voteDetail = res.data
+						this.startTime = res.data.activity.start_time
+						this.endTime = res.data.activity.end_time
+						this.cancelTime(this.startTime,this.endTime)
+						//活动可以使用的投票数
+						this.userCanVoteNum = res.data.user_can_vote_num
+						if(this.userCanVoteNum > 0){
+							this.isVoteNum = true
+						}else{
+							this.isVoteNum = false
+						}
+						this.sourceId = res.data.activity.id
 					}
 				})
 			},
+			cancelTime(i, j) {
+				let nowtime = new Date() //获取当前时间
+				let startime = new Date(i) //活动开始时间
+				let endtime = new Date(j); //活动结束时间
+				let lefttime = endtime.getTime() - nowtime.getTime() //距离结束时间的毫秒数
+				let spendtime = nowtime.getTime() - startime.getTime() //距离结束时间的毫秒数
+				if (lefttime > 0 && spendtime > 0) {
+					//活动进行中
+					this.spending = true
+				}else if(lefttime<0){
+					//活动结束
+					this.isEnd = true
+				}else if(spendtime<0){
+					//活动未开始
+					this.isStart = true
+				}
+
+			},
 			// 打开弹出层
 			openVote() {
 				this.$refs.popup.open()
@@ -183,6 +228,7 @@
 			},
 			// 跳转其他小程序
 			goJoin() {
+				let _this = this
 				this.closeVote()
 				wx.navigateToMiniProgram({
 					appId: 'wx255b58f0992b3c53', //appid
@@ -192,7 +238,13 @@
 					},
 					// envVersion: 'develop', //开发版develop 开发版 trial   体验版 release 正式版 
 					success(res) {
-						console.log('成功')
+						_this.$api.my.userJoinVip({
+							source_type:1,
+							source_id:_this.sourceId
+						}).then(res=>{
+							console.log('-->res',res)
+							// _this.getDetail()
+						})
 						// 打开成功
 					},
 					fail(e) {
@@ -209,11 +261,21 @@
 					if (res.code == 0) {
 						this.openVote()
 						this.getDetail(this.activity_project_id)
+						
+						
 					} else {
-						uni.showToast({
-							icon: 'none',
-							title: res.msg
-						})
+						if(res.msg.length>7){
+							uni.showToast({
+								icon:'none',
+								title: res.msg
+							})
+						}else{
+							uni.showToast({
+								icon: 'error',
+								title: res.msg
+							})
+						}
+						
 					}
 				}).catch(err => {
 					console.log(err)
@@ -368,6 +430,18 @@
 			font-size: 30rpx;
 			font-weight: bold;
 		}
+
+		.btn-vote-fasle {
+			height: 108rpx;
+			background: #CCCCCC;
+			border-radius: 12rpx;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			color: #FFFFFF;
+			font-size: 30rpx;
+			font-weight: bold;
+		}
 	}
 
 
@@ -484,7 +558,7 @@
 				text-align: center;
 				font-size: 34rpx;
 				font-weight: 400;
-				color: #000000;
+				color: #828282;
 			}
 		}
 
@@ -533,11 +607,13 @@
 		width: 100%;
 		height: 100%;
 		pointer-events: none; //设置area元素不可点击,则事件便会下移至页面下层元素
+
 		.movableView {
 			pointer-events: auto; //可以点击
 			width: 84rpx;
 			height: 84rpx;
-			padding:0 30rpx;
+			padding: 0 30rpx;
+
 			.img-IHg {
 				width: 84rpx;
 				height: 84rpx;

File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map


File diff suppressed because it is too large
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/components/SwiperBox/index.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/components/TabBar/tabbar.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/components/WaterFall/waterfall-item.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/components/WaterFall/waterfall-list.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/components/hch-position/hch-position.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/components/q-turntable/q-turntable.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-icon/u-icon.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-image/u-image.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-input/u-input.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-loading-icon/u-loading-icon.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-swiper-indicator/u-swiper-indicator.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-swiper/u-swiper.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-transition/u-transition.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/goods/goods-detail/index.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/goods/goods-hotel/index.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/goods/goods-lucky/index.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/goods/goods.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/active-detail/index.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/active-list/index.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/vote-detail/index.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/login.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/youyue.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/map/hotel-book/index.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/map/map.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/msg/msg.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/Kudos/Kudos.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/PersonalData/personalData.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/integral/integral.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/integral/integralExchange.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/integral/integralOrder.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/integral/integralRecord.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/integral/integralRule.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/my.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/myorders/orderDetail.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/myorders/orders.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/prize/exchangeDetail.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/prize/exchangePrize.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/prize/prize.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/protocol/PrivacyPolicy.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/protocol/UserAgreement.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/setting/setting.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/verification/orderVerification.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/verification/verification.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/verification/verificationDetail.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/webview/webview.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-forms/components/uni-forms/uni-forms.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-swiper-dot/components/uni-swiper-dot/uni-swiper-dot.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-transition/components/uni-transition/uni-transition.js.map


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

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

File diff suppressed because it is too large
+ 190 - 32
unpackage/dist/dev/mp-weixin/common/vendor.js


File diff suppressed because it is too large
+ 13 - 13
unpackage/dist/dev/mp-weixin/components/SwiperBox/index.js


File diff suppressed because it is too large
+ 11 - 11
unpackage/dist/dev/mp-weixin/components/TabBar/tabbar.js


File diff suppressed because it is too large
+ 11 - 11
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"],{
 
-/***/ 495:
+/***/ 500:
 /*!*************************************************************************!*\
   !*** 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& */ 496);
-/* 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& */ 498);
+/* 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& */ 501);
+/* 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& */ 503);
 /* 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& */ 500);
+/* 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& */ 505);
 /* 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"
 
 /***/ }),
 
-/***/ 496:
+/***/ 501:
 /*!********************************************************************************************************!*\
   !*** 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& */ 497);
+/* 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& */ 502);
 /* 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__);
 
 /***/ }),
 
-/***/ 497:
+/***/ 502:
 /*!********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./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
 
 /***/ }),
 
-/***/ 498:
+/***/ 503:
 /*!**************************************************************************************************!*\
   !*** 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& */ 499);
+/* 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& */ 504);
 /* 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); 
 
 /***/ }),
 
-/***/ 499:
+/***/ 504:
 /*!*********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./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 =
 
 /***/ }),
 
-/***/ 500:
+/***/ 505:
 /*!**********************************************************************************************************!*\
   !*** 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& */ 501);
+/* 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& */ 506);
 /* 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); 
 
 /***/ }),
 
-/***/ 501:
+/***/ 506:
 /*!**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./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__(495))
+            __webpack_require__('1')['createComponent'](__webpack_require__(500))
         })
     },
     [['components/q-turntable/q-turntable-create-component']]

File diff suppressed because it is too large
+ 11 - 11
unpackage/dist/dev/mp-weixin/components/waterfall/waterfall-item.js


File diff suppressed because it is too large
+ 10 - 10
unpackage/dist/dev/mp-weixin/components/waterfall/waterfall-list.js


File diff suppressed because it is too large
+ 13 - 13
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-icon/u-icon.js


File diff suppressed because it is too large
+ 14 - 14
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-image/u-image.js


File diff suppressed because it is too large
+ 13 - 13
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-input/u-input.js


File diff suppressed because it is too large
+ 12 - 12
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-loading-icon/u-loading-icon.js


File diff suppressed because it is too large
+ 12 - 12
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-swiper-indicator/u-swiper-indicator.js


File diff suppressed because it is too large
+ 14 - 14
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-swiper/u-swiper.js


File diff suppressed because it is too large
+ 13 - 13
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-transition/u-transition.js


File diff suppressed because it is too large
+ 16 - 16
unpackage/dist/dev/mp-weixin/pages/goods/goods-detail/index.js


File diff suppressed because it is too large
+ 16 - 16
unpackage/dist/dev/mp-weixin/pages/goods/goods-hotel/index.js


File diff suppressed because it is too large
+ 16 - 16
unpackage/dist/dev/mp-weixin/pages/goods/goods-lucky/index.js


File diff suppressed because it is too large
+ 16 - 16
unpackage/dist/dev/mp-weixin/pages/goods/goods.js


File diff suppressed because it is too large
+ 60 - 22
unpackage/dist/dev/mp-weixin/pages/index/active-detail/index.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/mp-weixin/pages/index/active-detail/index.wxml


+ 8 - 0
unpackage/dist/dev/mp-weixin/pages/index/active-detail/index.wxss

xqd
@@ -222,6 +222,14 @@
   margin-left: 20rpx;
   color: #333;
   font-size: 28rpx;
+  display: flex;
+  align-items: center;
+  justify-content: flex-start;
+}
+.vote .vote-detail .vote-detail-top .vote-detail-top-main .time.data-v-14511315 {
+  display: flex;
+  align-items: center;
+  justify-content: flex-start;
 }
 .vote .vote-detail .vote-detail-btn.data-v-14511315 {
   margin-top: 75rpx;

File diff suppressed because it is too large
+ 17 - 17
unpackage/dist/dev/mp-weixin/pages/index/active-list/index.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/mp-weixin/pages/index/active-list/index.wxml


File diff suppressed because it is too large
+ 21 - 21
unpackage/dist/dev/mp-weixin/pages/index/index.js


File diff suppressed because it is too large
+ 86 - 24
unpackage/dist/dev/mp-weixin/pages/index/vote-detail/index.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/mp-weixin/pages/index/vote-detail/index.wxml


+ 12 - 1
unpackage/dist/dev/mp-weixin/pages/index/vote-detail/index.wxss

xqd xqd
@@ -127,6 +127,17 @@ page.data-v-5749479e {
   font-size: 30rpx;
   font-weight: bold;
 }
+.btn .btn-vote-fasle.data-v-5749479e {
+  height: 108rpx;
+  background: #CCCCCC;
+  border-radius: 12rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  color: #FFFFFF;
+  font-size: 30rpx;
+  font-weight: bold;
+}
 .swiper.data-v-5749479e {
   padding: 0 30rpx;
   margin-top: 64rpx;
@@ -229,7 +240,7 @@ page.data-v-5749479e {
   text-align: center;
   font-size: 34rpx;
   font-weight: 400;
-  color: #000000;
+  color: #828282;
 }
 .pop .btn.data-v-5749479e {
   width: 100%;

File diff suppressed because it is too large
+ 13 - 13
unpackage/dist/dev/mp-weixin/pages/login/login.js


File diff suppressed because it is too large
+ 13 - 13
unpackage/dist/dev/mp-weixin/pages/login/youyue.js


File diff suppressed because it is too large
+ 13 - 13
unpackage/dist/dev/mp-weixin/pages/map/hotel-book/index.js


File diff suppressed because it is too large
+ 19 - 19
unpackage/dist/dev/mp-weixin/pages/map/map.js


File diff suppressed because it is too large
+ 16 - 16
unpackage/dist/dev/mp-weixin/pages/msg/msg.js


File diff suppressed because it is too large
+ 14 - 14
unpackage/dist/dev/mp-weixin/pages/my/Kudos/Kudos.js


File diff suppressed because it is too large
+ 16 - 16
unpackage/dist/dev/mp-weixin/pages/my/PersonalData/personalData.js


File diff suppressed because it is too large
+ 15 - 15
unpackage/dist/dev/mp-weixin/pages/my/integral/integral.js


File diff suppressed because it is too large
+ 13 - 13
unpackage/dist/dev/mp-weixin/pages/my/integral/integralExchange.js


File diff suppressed because it is too large
+ 18 - 18
unpackage/dist/dev/mp-weixin/pages/my/integral/integralOrder.js


Some files were not shown because too many files changed in this diff