项目日志:11.21合并

pages.json

@@ -263,6 +263,7 @@
 		"navigationBarTextStyle": "black", // black or white
 		"navigationBarTitleText": "",
 		"navigationBarBackgroundColor": "#FFF"
+		// "navigationStyle":"custom"
 	},
 	"easycom": {
 		"^u-(.*)": "uview-ui/components/u-$1/u-$1.vue",

pages/my/Kudos/Kudos.vue

@@ -1,11 +1,11 @@
 <template>
 	<view class="kudos">
 		<view class="List">
-			<view class="ListItem" v-for="item in 6">
+			<view class="ListItem" v-for="item in 6" @click="goVoteDetail">
 				<image src="/static/icon/Kudosbg.png" style="width: 640rpx;height:420rpx;"></image>
 				<view class="kudosicon">
-					<image src="/static/icon/Kudos.png" v-if="false"></image>
-					<image src="/static/icon/Kudos(1).png" ></image>
+					<image src="/static/icon/Kudos.png" v-if="isLike" @click.stop="clickKudos"></image>
+					<image src="/static/icon/Kudos(1).png" v-if="!isLike" @click.stop="clickKudos"></image>
 				</view>
 				<view class="nav">
 					<view class="events">
@@ -30,6 +30,7 @@
 	export default{
 		data(){
 			return{
+				isLike:false,
 				status: 'noMore',
 				contentText: {
 					contentdown: '查看更多',
@@ -39,7 +40,16 @@
 			}
 		},
 		methods:{
-			
+			// 跳转投票详情
+			goVoteDetail(){
+				uni.navigateTo({
+					url:'/pages/index/vote-detail/index'
+				})
+			},
+			// 点赞
+			clickKudos(){
+				this.isLike=!this.isLike
+			}
 		}
 	}
 </script>

pages/my/PersonalData/personalData.vue

@@ -119,7 +119,7 @@
 			height: 74rpx;
 			background: #FFFFFF;
 			border-radius: 8rpx;
-			border: 2px solid #EAEAEA;
+			border: 1px solid #EAEAEA;
 			display: flex;
 			align-items:center;
 			padding-left: 20rpx; 

pages/my/integral/integral.vue

@@ -1,5 +1,6 @@
 <template>
 	<view class="integral">
+
 		<view class="nav">
 			<image src="/static/icon/integralbg.png" style="width: 100%; height: 100%;"></image>
 			<view class="PointsColumn">

pages/my/integral/integralExchange.vue

@@ -11,7 +11,7 @@
 			<view class="back" @click="goBack">
 				<text>返回首页</text>
 			</view>
-			<view class="checkout">
+			<view class="checkout" @click="goOrderDetail">
 				<text>查看订单</text>
 			</view>
 		</view>
@@ -39,6 +39,12 @@
 				uni.reLaunch({
 					url:'/pages/my/my'
 				})
+			},
+			// 跳转订单详情
+			goOrderDetail(){
+				uni.navigateTo({
+					url:'/pages/my/myorders/orders'
+				})
 			}
 		}
 	}

pages/my/integral/integralRule.vue

@@ -1,9 +1,48 @@
 <template>
-	<view>积分规则</view>
+	<view class="UserAgreement">
+		<view class="title"><text>积分规则</text></view>
+		<view class="content">
+			<view><text>1.1 由中国最佳酒店评选委员会、洲际酒店共同打造的国内高端酒店行业"2022第十五届中国最佳酒店年度大奖评选"活动已正式开启,本次评选将继续以高标准,市场化的,模式对全行业优秀酒店开展评选,宣传,推优等系列活动</text></view>
+			<view><text>历届评选活动中,累计超过6000家高端酒店积极参与,吸引了4000万客户在线投票,多家电视,网络及平面媒体参与报道,最终共同评选出年度酒店行业各项大奖并向行业下游及终端客户广泛推荐.</text></view>
+			<view><text>本届评选活动将结合参评酒店特色,面向市场需求,强化酒店品牌宣传及客户互动.为行业决策,商务出行,旅游度假提供有力的数据参考及特色推荐.</text></view>
+		</view>
+	</view>
 </template>
 
 <script>
 </script>
 
-<style>
+<style lang="scss" scoped>
+	$pageColor:#F9F9F9;
+	$bgColor:#FFFFFF;
+	.UserAgreement{
+		height: 100%;
+		background: $bgColor;
+	}
+	.title{
+		height: 82rpx;
+		width: 750rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		text{
+			font-size: 32rpx;
+			font-family: PingFang-SC-Bold, PingFang-SC;
+			font-weight: bold;
+			color: #333333;
+		}
+	}
+	.content{
+		padding: 0 30rpx;
+		view{
+			margin-bottom: 24rpx;
+			text{
+				font-size: 28rpx;
+				font-family: PingFang-SC-Bold, PingFang-SC;
+				font-weight: bold;
+				color: #333333;
+			}
+		}
+		
+	}
 </style>

pages/my/my.vue

@@ -83,7 +83,7 @@
 		data() {
 			return {
 				imgurl: require('../../static/icon/bg@2x.png'),
-				islogin: true,
+				islogin: false,
 				list:[{
 					title:'积分',
 					content:'积分兑换奖品'

pages/my/myorders/orders.vue

@@ -212,6 +212,7 @@
 			}
 		},
 		methods: {
+			
 			//菜单index切换
 			checked(index) {
 				this.isActive = index

pages/my/prize/exchangeDetail.vue

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

pages/my/protocol/PrivacyPolicy.vue

@@ -1,11 +1,48 @@
 <template>
-	<view>
-		隐私政策
+	<view class="Privacy">
+		<view class="title"><text>隐私协议</text></view>
+		<view class="content">
+			<view><text>1.1 由中国最佳酒店评选委员会、洲际酒店共同打造的国内高端酒店行业"2022第十五届中国最佳酒店年度大奖评选"活动已正式开启,本次评选将继续以高标准,市场化的,模式对全行业优秀酒店开展评选,宣传,推优等系列活动</text></view>
+			<view><text>历届评选活动中,累计超过6000家高端酒店积极参与,吸引了4000万客户在线投票,多家电视,网络及平面媒体参与报道,最终共同评选出年度酒店行业各项大奖并向行业下游及终端客户广泛推荐.</text></view>
+			<view><text>本届评选活动将结合参评酒店特色,面向市场需求,强化酒店品牌宣传及客户互动.为行业决策,商务出行,旅游度假提供有力的数据参考及特色推荐.</text></view>
+		</view>
 	</view>
 </template>
 
 <script>
 </script>
 
-<style>
+<style lang="scss" scoped>
+	$pageColor:#F9F9F9;
+	$bgColor:#FFFFFF;
+	.Privacy{
+		height: 100%;
+		background: $bgColor;
+	}
+	.title{
+		height: 82rpx;
+		width: 750rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		text{
+			font-size: 32rpx;
+			font-family: PingFang-SC-Bold, PingFang-SC;
+			font-weight: bold;
+			color: #333333;
+		}
+	}
+	.content{
+		padding: 0 30rpx;
+		view{
+			margin-bottom: 24rpx;
+			text{
+				font-size: 28rpx;
+				font-family: PingFang-SC-Bold, PingFang-SC;
+				font-weight: bold;
+				color: #333333;
+			}
+		}
+		
+	}
 </style>

pages/my/protocol/UserAgreement.vue

@@ -1,11 +1,48 @@
 <template>
-	<view>
-		用户协议
+	<view class="UserAgreement">
+		<view class="title"><text>用户协议</text></view>
+		<view class="content">
+			<view><text>1.1 由中国最佳酒店评选委员会、洲际酒店共同打造的国内高端酒店行业"2022第十五届中国最佳酒店年度大奖评选"活动已正式开启,本次评选将继续以高标准,市场化的,模式对全行业优秀酒店开展评选,宣传,推优等系列活动</text></view>
+			<view><text>历届评选活动中,累计超过6000家高端酒店积极参与,吸引了4000万客户在线投票,多家电视,网络及平面媒体参与报道,最终共同评选出年度酒店行业各项大奖并向行业下游及终端客户广泛推荐.</text></view>
+			<view><text>本届评选活动将结合参评酒店特色,面向市场需求,强化酒店品牌宣传及客户互动.为行业决策,商务出行,旅游度假提供有力的数据参考及特色推荐.</text></view>
+		</view>
 	</view>
 </template>
 
 <script>
 </script>
 
-<style>
+<style lang="scss" scoped>
+	$pageColor:#F9F9F9;
+	$bgColor:#FFFFFF;
+	.UserAgreement{
+		height: 100%;
+		background: $bgColor;
+	}
+	.title{
+		height: 82rpx;
+		width: 750rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		text{
+			font-size: 32rpx;
+			font-family: PingFang-SC-Bold, PingFang-SC;
+			font-weight: bold;
+			color: #333333;
+		}
+	}
+	.content{
+		padding: 0 30rpx;
+		view{
+			margin-bottom: 24rpx;
+			text{
+				font-size: 28rpx;
+				font-family: PingFang-SC-Bold, PingFang-SC;
+				font-weight: bold;
+				color: #333333;
+			}
+		}
+		
+	}
 </style>

pages/my/verification/orderVerification.vue

@@ -13,6 +13,20 @@
 				<uni-forms-item label="兑换时间" labelWidth="150rpx">
 					<uni-easyinput v-model="FormData.date" placeholder="请输入兑换时间" />
 				</uni-forms-item>
+				
+				<!-- <uni-forms-item label="兑换时间" labelWidth="150rpx">
+					<view class="date">
+						<picker mode="date" :value="FormData.date" :start="startDate" :end="endDate"
+							@change="bindDateChange">
+							<view class="uni-input" >
+								<text v-if="FormData.date==''||FormData.date==null"
+									style="color: #999999 ;">选择兑换时间</text>
+								<text v-if="FormData.date!=''">{{FormData.date}}</text>
+							</view>
+						</picker>
+					</view>
+				</uni-forms-item> -->
+				
 			</uni-forms>
 		</view>
 		
@@ -48,6 +62,9 @@
 <script>
 	export default{
 		data(){
+			const currentDate = this.getDate({
+				format: true
+			})
 			return{
 				FormData:{
 					name:'',
@@ -56,7 +73,16 @@
 				},
 			}
 		},
+		computed: {
+			startDate() {
+				return this.getDate('start');
+			},
+			endDate() {
+				return this.getDate('end');
+			}
+		},
 		methods:{
+			
 			// 核销订单
 			verificationOrder(){
 				uni.showModal({
@@ -72,8 +98,26 @@
 						}
 					}
 				});
+			},
+			bindDateChange: function(e) {
+				this.FormData.date=e.detail.value
+			},
+			getDate(type) {
+				const date = new Date();
+				let year = date.getFullYear();
+				let month = date.getMonth() + 1;
+				let day = date.getDate();
+			
+				if (type === 'start') {
+					year = year - 60;
+				} else if (type === 'end') {
+					year = year + 2;
+				}
+				month = month > 9 ? month : '0' + month;
+				day = day > 9 ? day : '0' + day;
+				return `${year}-${month}-${day}`;
 			}
-		}
+		},
 	}
 </script>
 
@@ -209,4 +253,14 @@
 			}
 		}
 	}
+	.date{
+		width: 545rpx;
+		height: 74rpx;
+		background: #FFFFFF;
+		display: flex;
+		align-items:center;
+		padding-left: 20rpx; 
+		box-sizing: border-box;
+		position: relative;
+	}
 </style>

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

@@ -1,19 +1,34 @@
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["components/q-turntable/q-turntable"],{
 
+<<<<<<< HEAD
 /***/ 485:
 /*!*************************************************************************!*\
   !*** D:/vscode-demo/IHG/IHG/IHG/components/q-turntable/q-turntable.vue ***!
   \*************************************************************************/
+=======
+/***/ 484:
+/*!*************************************************************************************!*\
+  !*** C:/Users/Administrator/Desktop/ihg/IHG/components/q-turntable/q-turntable.vue ***!
+  \*************************************************************************************/
+>>>>>>> 34ff92b08d15fe081f02b6043841043afb600bb7
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
+<<<<<<< HEAD
 /* 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& */ 486);
 /* 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& */ 488);
 /* 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& */ 490);
 /* 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);
+=======
+/* 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& */ 485);
+/* 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& */ 487);
+/* 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& */ 489);
+/* 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);
+>>>>>>> 34ff92b08d15fe081f02b6043841043afb600bb7
 
 var renderjs
 
@@ -23,7 +38,7 @@ var renderjs
 
 /* normalize component */
 
-var component = Object(_HbuilderX_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_3__["default"])(
+var component = Object(_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_3__["default"])(
   _q_turntable_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__["default"],
   _q_turntable_vue_vue_type_template_id_2e5c8c30___WEBPACK_IMPORTED_MODULE_0__["render"],
   _q_turntable_vue_vue_type_template_id_2e5c8c30___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"],
@@ -41,32 +56,51 @@ component.options.__file = "components/q-turntable/q-turntable.vue"
 
 /***/ }),
 
+<<<<<<< HEAD
 /***/ 486:
 /*!********************************************************************************************************!*\
   !*** D:/vscode-demo/IHG/IHG/IHG/components/q-turntable/q-turntable.vue?vue&type=template&id=2e5c8c30& ***!
   \********************************************************************************************************/
+=======
+/***/ 485:
+/*!********************************************************************************************************************!*\
+  !*** C:/Users/Administrator/Desktop/ihg/IHG/components/q-turntable/q-turntable.vue?vue&type=template&id=2e5c8c30& ***!
+  \********************************************************************************************************************/
+>>>>>>> 34ff92b08d15fe081f02b6043841043afb600bb7
 /*! exports provided: render, staticRenderFns, recyclableRender, components */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
+<<<<<<< HEAD
 /* 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& */ 487);
 /* 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 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& */ 486);
+/* 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"]; });
+>>>>>>> 34ff92b08d15fe081f02b6043841043afb600bb7
 
-/* 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"]; });
+/* 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"]; });
 
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "recyclableRender", 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__["recyclableRender"]; });
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "recyclableRender", 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__["recyclableRender"]; });
 
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "components", 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__["components"]; });
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "components", 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__["components"]; });
 
 
 
 /***/ }),
 
+<<<<<<< HEAD
 /***/ 487:
 /*!********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./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& ***!
   \********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+=======
+/***/ 486:
+/*!********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./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& ***!
+  \********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+>>>>>>> 34ff92b08d15fe081f02b6043841043afb600bb7
 /*! exports provided: render, staticRenderFns, recyclableRender, components */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -90,15 +124,23 @@ render._withStripped = true
 
 /***/ }),
 
+<<<<<<< HEAD
 /***/ 488:
 /*!**************************************************************************************************!*\
   !*** D:/vscode-demo/IHG/IHG/IHG/components/q-turntable/q-turntable.vue?vue&type=script&lang=js& ***!
   \**************************************************************************************************/
+=======
+/***/ 487:
+/*!**************************************************************************************************************!*\
+  !*** C:/Users/Administrator/Desktop/ihg/IHG/components/q-turntable/q-turntable.vue?vue&type=script&lang=js& ***!
+  \**************************************************************************************************************/
+>>>>>>> 34ff92b08d15fe081f02b6043841043afb600bb7
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
+<<<<<<< HEAD
 /* 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& */ 489);
 /* 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__));
@@ -110,6 +152,19 @@ __webpack_require__.r(__webpack_exports__);
 /*!*********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./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& ***!
   \*********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+=======
+/* 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& */ 488);
+/* 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); 
+
+/***/ }),
+
+/***/ 488:
+/*!*********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./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& ***!
+  \*********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+>>>>>>> 34ff92b08d15fe081f02b6043841043afb600bb7
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -205,15 +260,23 @@ var _default =
 
 /***/ }),
 
+<<<<<<< HEAD
 /***/ 490:
 /*!**********************************************************************************************************!*\
   !*** D:/vscode-demo/IHG/IHG/IHG/components/q-turntable/q-turntable.vue?vue&type=style&index=0&lang=css& ***!
   \**********************************************************************************************************/
+=======
+/***/ 489:
+/*!**********************************************************************************************************************!*\
+  !*** C:/Users/Administrator/Desktop/ihg/IHG/components/q-turntable/q-turntable.vue?vue&type=style&index=0&lang=css& ***!
+  \**********************************************************************************************************************/
+>>>>>>> 34ff92b08d15fe081f02b6043841043afb600bb7
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
+<<<<<<< HEAD
 /* 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& */ 491);
 /* 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__));
@@ -225,6 +288,19 @@ __webpack_require__.r(__webpack_exports__);
 /*!**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./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& ***!
   \**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+=======
+/* 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& */ 490);
+/* 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); 
+
+/***/ }),
+
+/***/ 490:
+/*!**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./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& ***!
+  \**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+>>>>>>> 34ff92b08d15fe081f02b6043841043afb600bb7
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -240,7 +316,11 @@ __webpack_require__.r(__webpack_exports__);
     'components/q-turntable/q-turntable-create-component',
     {
         'components/q-turntable/q-turntable-create-component':(function(module, exports, __webpack_require__){
+<<<<<<< HEAD
             __webpack_require__('1')['createComponent'](__webpack_require__(485))
+=======
+            __webpack_require__('1')['createComponent'](__webpack_require__(484))
+>>>>>>> 34ff92b08d15fe081f02b6043841043afb600bb7
         })
     },
     [['components/q-turntable/q-turntable-create-component']]

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

@@ -1 +1 @@
-<view class="kudos data-v-e3119cfa"><view class="List data-v-e3119cfa"><block wx:for="{{6}}" wx:for-item="item" wx:for-index="__i0__"><view class="ListItem data-v-e3119cfa"><image style="width:640rpx;height:420rpx;" src="/static/icon/Kudosbg.png" class="data-v-e3119cfa"></image><view class="kudosicon data-v-e3119cfa"><block wx:if="{{false}}"><image src="/static/icon/Kudos.png" class="data-v-e3119cfa"></image></block><image src="/static/icon/Kudos(1).png" class="data-v-e3119cfa"></image></view><view class="nav data-v-e3119cfa"><view class="events data-v-e3119cfa"><text class="data-v-e3119cfa">IHG最受欢迎的酒店</text></view><view class="voteStatus data-v-e3119cfa"><block wx:if="{{false}}"><text class="data-v-e3119cfa">未开始</text></block><text style="color:#FF6503;" class="data-v-e3119cfa">投票中</text></view></view><view class="foot data-v-e3119cfa"><image src="/static/icon/data.png" class="data-v-e3119cfa"></image><text class="data-v-e3119cfa">2021-12-20 18:00 结束</text></view></view></block></view><uni-load-more vue-id="406f7fe3-1" status="{{status}}" color="#CCCCCC" content-text="{{contentText}}" class="data-v-e3119cfa" bind:__l="__l"></uni-load-more></view>
+<view class="kudos data-v-e3119cfa"><view class="List data-v-e3119cfa"><block wx:for="{{6}}" wx:for-item="item" wx:for-index="__i0__"><view data-event-opts="{{[['tap',[['goVoteDetail',['$event']]]]]}}" class="ListItem data-v-e3119cfa" bindtap="__e"><image style="width:640rpx;height:420rpx;" src="/static/icon/Kudosbg.png" class="data-v-e3119cfa"></image><view class="kudosicon data-v-e3119cfa"><block wx:if="{{isLike}}"><image src="/static/icon/Kudos.png" data-event-opts="{{[['tap',[['clickKudos',['$event']]]]]}}" catchtap="__e" class="data-v-e3119cfa"></image></block><block wx:if="{{!isLike}}"><image src="/static/icon/Kudos(1).png" data-event-opts="{{[['tap',[['clickKudos',['$event']]]]]}}" catchtap="__e" class="data-v-e3119cfa"></image></block></view><view class="nav data-v-e3119cfa"><view class="events data-v-e3119cfa"><text class="data-v-e3119cfa">IHG最受欢迎的酒店</text></view><view class="voteStatus data-v-e3119cfa"><block wx:if="{{false}}"><text class="data-v-e3119cfa">未开始</text></block><text style="color:#FF6503;" class="data-v-e3119cfa">投票中</text></view></view><view class="foot data-v-e3119cfa"><image src="/static/icon/data.png" class="data-v-e3119cfa"></image><text class="data-v-e3119cfa">2021-12-20 18:00 结束</text></view></view></block></view><uni-load-more vue-id="406f7fe3-1" status="{{status}}" color="#CCCCCC" content-text="{{contentText}}" class="data-v-e3119cfa" bind:__l="__l"></uni-load-more></view>

unpackage/dist/dev/mp-weixin/pages/my/PersonalData/personalData.wxss

@@ -37,7 +37,7 @@
   height: 74rpx;
   background: #FFFFFF;
   border-radius: 8rpx;
-  border: 2px solid #EAEAEA;
+  border: 1px solid #EAEAEA;
   display: flex;
   align-items: center;
   padding-left: 20rpx;

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

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