11.21

pages.json

@@ -77,9 +77,7 @@
 			}
 
 		},
-
-
-
+		
 		{
 			"path": "pages/msg/msg",
 			"style": {
@@ -87,6 +85,14 @@
 				"enablePullDownRefresh": false
 			}
 
+		},
+		{
+			"path": "pages/webview/webview",
+			"style": {
+				"navigationBarTitleText": "webview",
+				"enablePullDownRefresh": false
+			}
+		
 		},
 		{
 			"path": "pages/login/login",

pages/login/youyue.vue

@@ -11,34 +11,27 @@
 			<view><text> 即刻加入HG优悦会，一键开启会员专享价及会员专属礼遇。轻松赚取积分，使用灵活的积分兑换及竞拍，畅享独特且多元的犒赏体验。</text></view>
 		</view>
 		
-		<view class="divided"></view>
-		
-		<view class="item"><text class="itemtitle">优悦会会员权益</text></view>
-		
-		<view class="divided"></view>
-		
-		<view class="item"><text class="itemtitle">入会第一天起即可臻享礼遇</text></view>
-		
-		<view class="divided"></view>
-		
-		<view class="item" ><text class="itemtitle">赚取酒店积分兑换奖励住宿以及更多</text>
+		<view class="boxitem">
+			<text class="boxitemtitle">优悦会会员权益</text>
+		</view>
+		<view class="boxitem" style="border-top: none;">
+			<text class="boxitemtitle" >入会第一天起即可臻享礼遇</text>
+		</view>
+		<view class="boxitem" style="border-top: none;">
+			<text class="boxitemtitle" >赚取酒店积分兑换奖励住宿以及更多</text>
+			<text class="boxitemcontent">积分不仅可以兑换体验，目录商品等，还可以兑换全球6000等多个目的地奖励住宿</text>
+			<image src="/static/icon/loginicon1.png"></image>
+		</view>
+		<view class="boxitem" style="border-top: none;">
+			<text class="boxitemtitle" >会员专享价</text>
+			<text class="boxitemcontent" style="margin-bottom: 30rpx;">直接预订可享受我们会员专属的优惠房价</text>
+			<image src="/static/icon/loginicon2.png"></image>
+		</view>
+		<view class="boxitem" style="border-top: none;">
+			<text class="boxitemtitle" >会员促销</text>
+			<text class="boxitemcontent" style="margin-bottom: 30rpx;">尽情享受会员促销，赚取更多奖励积分</text>
+			<image src="/static/icon/loginicon3.png"></image>
 		</view>
-		
-		<view class="itemcontent">积分不仅可以兑换体验，目录商品等，还可以兑换全球6000等多个目的地奖励住宿</view>
-		
-		<view class="divided"></view>
-		
-		<view class="item"><text class="itemtitle">会员专享价</text></view>
-		
-		<view class="itemcontent" style="margin-bottom: 76rpx;">直接预订可享受我们会员专属的优惠房价</view>
-		
-		<view class="divided"></view>
-		
-		<view class="item"><text class="itemtitle">会员促销</text></view>
-		
-		<view class="itemcontent" style="margin-bottom: 76rpx;">尽情享受会员促销，赚取更多奖励积分</view>
-		
-		<view class="divided"></view>
 		
 		<view class="item"><text class="itemtitle">畅享网络</text></view>
 		
@@ -60,16 +53,6 @@
 			</view>
 		</view>
 		
-		
-		<view class="loginicon1">
-			<image src="/static/icon/loginicon1.png"></image>
-		</view>
-		<view class="loginicon2">
-			<image src="/static/icon/loginicon2.png"></image>
-		</view>
-		<view class="loginicon3">
-			<image src="/static/icon/loginicon3.png"></image>
-		</view>
 	</view>
 </template>
 
@@ -116,11 +99,6 @@
 			color: #333333;
 		}
 	}
-	.divided{
-		width: 690rpx;
-		height: 2rpx;
-		background: #F0F0F0;
-	}
 	.item{
 		margin: 40rpx 0;
 		.itemtitle{
@@ -130,14 +108,6 @@
 			color: #333333;
 		}
 	}
-	.itemcontent{
-		margin-bottom: 40rpx;
-		width: 512rpx;
-		font-size: 28rpx;
-		font-family: PingFang-SC-Medium, PingFang-SC;
-		font-weight: 500;
-		color: #333333;
-	}
 	.itemLast{
 		width: 690rpx;
 		font-size: 24rpx;
@@ -210,37 +180,33 @@
 			}
 		}
 	}
-	.loginicon1{
-		width: 96rpx;
-		height:96rpx;
-		position: absolute;
-		top:1010rpx;
-		right:30rpx;
+
+	.boxitem{
+		border-top: #F0F0F0 2rpx solid;
+		border-bottom: #F0F0F0 2rpx solid;
+		padding:40rpx 0;
+		position: relative;
 		image{
-			width: 100%;
-			height:100%;
+			top:35%;
+			right: 0rpx;
+			width: 96rpx;
+			height:96rpx;
+			position: absolute;
 		}
-	}
-	.loginicon2{
-		width: 96rpx;
-		height:96rpx;
-		position: absolute;
-		top:1265rpx;
-		right:30rpx;
-		image{
-			width: 100%;
-			height:100%;
+		.boxitemtitle{
+			font-size: 32rpx;
+			font-family: PingFang-SC-Bold, PingFang-SC;
+			font-weight: bold;
+			color: #333333;
 		}
-	}
-	.loginicon3{
-		width: 96rpx;
-		height:96rpx;
-		position: absolute;
-		top:1510rpx;
-		right:30rpx;
-		image{
-			width: 100%;
-			height:100%;
+		.boxitemcontent{
+			margin-top: 24rpx;
+			width: 512rpx;
+			display: block;
+			font-size: 28rpx;
+			font-family: PingFang-SC-Medium, PingFang-SC;
+			font-weight: 500;
+			color: #333333;
 		}
 	}
 </style>

pages/msg/msg.vue

@@ -88,12 +88,11 @@
 		background: $bgColor;
 		box-shadow: 0rpx 4rpx 24rpx -10rpx rgba(101, 95, 90, 0.3);
 		border-radius: 12rpx;
-
 		.childBox {
 			width: 690rpx;
-			height: 202rpx;
 			border-bottom: 1rpx solid #F0F0F0;
-			padding-top: 40rpx;
+			padding-top: 30rpx;
+			padding-bottom: 30rpx;
 			box-sizing: border-box;
 			view:nth-child(n+0) {
 				font-size: 32rpx;

pages/my/integral/integral.vue

@@ -149,6 +149,7 @@
 		.PointsColumn{
 			position: absolute;
 			width: 690rpx;
+			border-radius: 8rpx;
 			height: 74rpx;
 			background: #FFFFFF;
 			border-radius: $bgColor;
@@ -165,13 +166,13 @@
 				margin-left: 16rpx;
 				font-size: 48rpx;
 				font-family: DINAlternate-Bold, DINAlternate;
-				font-weight: bold;
+				font-weight: 500;
 				color: #333333;
 			}
 		}
 		.titletext{
 			position: absolute;
-			bottom:40rpx;
+			bottom:30rpx;
 			left: 30rpx;
 			width: 690rpx;
 			height: 74rpx;

pages/my/integral/integralExchange.vue

@@ -1,12 +1,12 @@
 <template>
 	<view class="exchangeDetail">
-		
+
 		<view class="detailCard">
 			<image src="/static/icon/success.png"></image>
 			<text style="margin-bottom: 20rpx;">商品兑换成功</text>
 			<text>-5000积分</text>
 		</view>
-		
+
 		<view class="btn">
 			<view class="back" @click="goBack">
 				<text>返回首页</text>
@@ -15,36 +15,52 @@
 				<text>查看订单</text>
 			</view>
 		</view>
-		
-		<view class="bottomCard">
+
+		<view class="bottomCard" @click="goH5">
 			<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(){
+			goOrderDetail() {
 				uni.navigateTo({
-					url:'/pages/my/myorders/orders'
+					url: '/pages/my/myorders/orders'
 				})
+			},
+			// 跳转到h5页面
+			goH5() {
+				const url = 'https://t6.9026.com/admin'; // 跳转的外链
+				const navtitle = 'H5'; // 这个标题是你自己可以设置的
+				uni.navigateTo({
+					// 跳转到webview页面
+					url: `/pages/webview/webview?url=${url}&nav=${navtitle}`,
+					success: () => {
+						console.log('成功')
+					},
+					fail:(e)=>{
+						console.log(e,"失败")
+					}
+				});
 			}
 		}
 	}
@@ -53,28 +69,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;
@@ -82,32 +103,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;
@@ -115,31 +139,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/integral/integralOrder.vue

@@ -16,10 +16,10 @@
 						</picker>
 					</view>
 				</uni-forms-item>
-				<uni-forms-item  name="name" v-if="formData.type!=''">
+				<uni-forms-item  name="name" v-if="formData.type!=''||isVerification==true">
 					<uni-easyinput type="text" v-model="formData.name" placeholder="填写联系人" />
 				</uni-forms-item>
-				<uni-forms-item  name="phone" v-if="formData.type!=''">
+				<uni-forms-item  name="phone" v-if="formData.type!=''||isVerification==true">
 					<uni-easyinput type="number" v-model="formData.phone" placeholder="填写联系电话" />
 				</uni-forms-item>
 				<uni-forms-item  name="region" v-if="formData.type=='快递配送'">
@@ -28,8 +28,19 @@
 				<uni-forms-item  name="region" v-if="formData.type=='快递配送'">
 					<uni-easyinput type="text" v-model="formData.region" placeholder="详细地址" />
 				</uni-forms-item>
-				<uni-forms-item  name="region" v-if="formData.type=='到店自提'">
-					<uni-easyinput type="text" v-model="formData.region" placeholder="选择门店" />
+				<uni-forms-item  name="region" v-if="formData.type=='到店自提'||isVerification==true">
+					<view class="selectType">
+						<picker mode="selector" :value="formData.region" :range='regionSelect'
+							@change="bindregionChange">
+							<view class="uni-input" >
+								<text v-if="formData.region==''||formData.region==null"
+									style="color: #999999 ;">请选择门店</text>
+								<text v-if="formData.region!=''">{{formData.region}}</text>
+							</view>
+							<image src="/static/icon/right.png"
+								style="width: 14rpx;height: 24rpx;position: absolute;top:31rpx;right: 30rpx;"></image>
+						</picker>
+					</view>
 				</uni-forms-item>
 				
 			</uni-forms>
@@ -61,8 +72,8 @@
 			</view>
 		</view>
 		
-		<view class="bottombtn" >
-			<view class="btnitem" @click="goExDetail">
+		<view class="bottombtn" @click="goExDetail">
+			<view class="btnitem" >
 				<text>确认兑换</text>
 			</view>
 		</view>
@@ -73,6 +84,7 @@
 	export default {
 		data(){
 			return{
+				isVerification:false,
 				formData:{
 					type:'',
 					phone:'',
@@ -81,24 +93,25 @@
 					address:'',
 				},
 				typeSelect:['快递配送','到店自提'],
-				istype:'true',
+				istype:true,
+				regionSelect:['第一门店','第二门店','第三门店','第四门店']
 			}
 		},
 		methods:{
 			// 选择快递方式
 			bindTypeChange:function(e){
-				if(e.detail.value==0){
-					this.formData.type='快递配送'
-				}else{
-					this.formData.type='到店自提'
-				}
+				this.formData.type=this.typeSelect[e.detail.value]
 			},
 			// 跳转积分兑换详情
 			goExDetail(){
 				uni.navigateTo({
 					url:'/pages/my/integral/integralExchange'
 				})
-			}
+			},
+			// 选择门店
+			bindregionChange:function(e){
+				this.formData.region=this.regionSelect[e.detail.value]
+			},
 		}
 	}
 </script>

pages/my/my.vue

@@ -2,6 +2,7 @@
 
 	<view class="my">
 		<view class="topCard" :style="{backgroundImage:'url('+imgurl+')'}">
+			<!-- 用户名 -->
 			<view class="user">
 				<image src="/static/icon/avatar.png" style="height: 176rpx;width: 176rpx;" ></image>
 				<view class="userinfo">
@@ -12,7 +13,8 @@
 				<image src="/static/icon/setting.png"	@click="goSetting"
 					style="width: 41rpx;height: 44rpx; position: absolute;top:0rpx;right: 24rpx;"></image>
 			</view>
-
+			
+			<!-- 会员 -->
 			<view class="membership">
 				<view class="flex">
 					<view style="display: flex;align-items: center;">
@@ -27,6 +29,7 @@
 				</view>
 			</view>
 			
+			<!-- 订单 -->
 			<view class="orders">
 				<view class="nav">
 					<view class="myorder">我的订单</view>
@@ -75,15 +78,20 @@
 </template>
 
 <script>
+	// 引入组件
 	import TabBar from '../../components/TabBar/tabbar.vue'
 	export default {
+		// 注册组件
 		components: {
 			TabBar
 		},
 		data() {
 			return {
+				// 顶部背景图
 				imgurl: require('../../static/icon/bg@2x.png'),
-				islogin: false,
+				// 是否登录
+				islogin: true,
+				// 列表内容
 				list:[{
 					title:'积分',
 					content:'积分兑换奖品'
@@ -207,7 +215,6 @@
 	.topCard {
 		width: 750rpx;
 		height: 740rpx;
-		// background: #627885;
 		border-radius: 0rpx 0rpx 16rpx 16rpx;
 		padding: 46rpx 30rpx 40rpx 30rpx;
 		box-sizing: border-box;
@@ -324,7 +331,8 @@
 			.content{
 				display: flex;
 				align-items: center;
-				justify-content: space-around;
+				justify-content: space-between;
+				padding:0 20rpx;
 				margin-top: 50rpx;
 				.flexbox{
 					display: flex;

pages/my/myorders/orderDetail.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="orderDetail">
-
+		<!-- 标题栏 -->
 		<view class="nav">
 			<text class="orderStatus">待收货</text>
 		</view>
@@ -70,7 +70,7 @@
 					</view>
 				</view>
 			</view>
-
+			<!-- 订单信息 -->
 			<view class="myorder">
 				<view class="orderTitle">订单信息</view>
 				<view class="orderMsg"><text>订单编号</text><text style="margin-left: 26rpx;">62aae0eb9c6fd622</text></view>
@@ -179,7 +179,6 @@
 
 		.logistics {
 			position: relative;
-
 			.logisticsTitle {
 				margin-bottom: 25rpx;
 				font-size: 30rpx;
@@ -202,7 +201,7 @@
 			.copy {
 				position: absolute;
 				right: 30rpx;
-				top: 75rpx;
+				top: 68rpx;
 				font-size: 28rpx;
 				font-family: PingFang-SC-Medium, PingFang-SC;
 				font-weight: 500;
@@ -235,7 +234,7 @@
 			.copyorder {
 				position: absolute;
 				right: 30rpx;
-				bottom: 75rpx;
+				bottom: 72rpx;
 				font-size: 28rpx;
 				font-family: PingFang-SC-Medium, PingFang-SC;
 				font-weight: 500;

pages/my/prize/exchangeDetail.vue

@@ -14,15 +14,17 @@
 				<text>查看订单</text>
 			</view>
 		</view>
-
-		<view class="bottomCard">
-			<image src="/static/icon/Kudosbg.png"></image>
-			<view class="content">
-				<text>立即加入IHG会员</text>
-				<image src="/static/icon/right.png"
-					style="width: 12rpx;height: 20rpx; position: absolute;bottom:36rpx;left: 475rpx;"></image>
+		
+		
+			<view class="bottomCard" @click="goOther">
+				<image src="/static/icon/Kudosbg.png"></image>
+				<view class="content">
+					<text>立即加入IHG会员</text>
+					<image src="/static/icon/right.png"
+						style="width: 12rpx;height: 20rpx; position: absolute;bottom:36rpx;left: 475rpx;"></image>
+				</view>
 			</view>
-		</view>
+		
 	</view>
 </template>
 
@@ -46,6 +48,24 @@
 				uni.navigateTo({
 					url: '/pages/my/myorders/orders'
 				})
+			},
+			// 跳转其他小程序
+			goOther(){
+				 wx.navigateToMiniProgram({
+				        appId: 'wxdc8ecff90bf3f4c3',  //appid
+				        path: '/pages/index/index',//path
+				        extraData: {  //参数
+				          foo: 'bar'
+				        },
+				        // envVersion: 'develop', //开发版develop 开发版 trial   体验版 release 正式版 
+				        success(res) {
+				          console.log('成功')
+				          // 打开成功
+				        },
+						fail(e) {
+							console.log(e,'失败')
+						}
+				      })
 			}
 		}
 	}

pages/my/prize/exchangePrize.vue

@@ -16,10 +16,10 @@
 						</picker>
 					</view>
 				</uni-forms-item>
-				<uni-forms-item  name="name" v-if="formData.type!=''">
+				<uni-forms-item  name="name" v-if="formData.type!=''||isVerification==true">
 					<uni-easyinput type="text" v-model="formData.name" placeholder="填写联系人" />
 				</uni-forms-item>
-				<uni-forms-item  name="phone" v-if="formData.type!=''">
+				<uni-forms-item  name="phone" v-if="formData.type!=''||isVerification==true">
 					<uni-easyinput type="number" v-model="formData.phone" placeholder="填写联系电话" />
 				</uni-forms-item>
 				<uni-forms-item  name="region" v-if="formData.type=='快递配送'">
@@ -28,10 +28,20 @@
 				<uni-forms-item  name="region" v-if="formData.type=='快递配送'">
 					<uni-easyinput type="text" v-model="formData.region" placeholder="详细地址" />
 				</uni-forms-item>
-				<uni-forms-item  name="region" v-if="formData.type=='到店自提'">
-					<uni-easyinput type="text" v-model="formData.region" placeholder="选择门店" />
+				<uni-forms-item  name="region" v-if="formData.type=='到店自提'||isVerification==true">
+					<view class="selectType">
+						<picker mode="selector" :value="formData.region" :range='regionSelect'
+							@change="bindregionChange">
+							<view class="uni-input" >
+								<text v-if="formData.region==''||formData.region==null"
+									style="color: #999999 ;">请选择门店</text>
+								<text v-if="formData.region!=''">{{formData.region}}</text>
+							</view>
+							<image src="/static/icon/right.png"
+								style="width: 14rpx;height: 24rpx;position: absolute;top:31rpx;right: 30rpx;"></image>
+						</picker>
+					</view>
 				</uni-forms-item>
-				
 			</uni-forms>
 		</view>
 		
@@ -52,8 +62,8 @@
 			</view>
 		</view>
 		
-		<view class="bottombtn" >
-			<view class="btnitem" @click="goExDetail">
+		<view class="bottombtn" @click="goExDetail">
+			<view class="btnitem" >
 				<text>确认兑换</text>
 			</view>
 		</view>
@@ -64,6 +74,7 @@
 	export default {
 		data(){
 			return{
+				isVerification:false,
 				formData:{
 					type:'',
 					phone:'',
@@ -72,7 +83,8 @@
 					address:'',
 				},
 				typeSelect:['快递配送','到店自提'],
-				istype:'true',
+				istype:true,
+				regionSelect:['第一门店','第二门店','第三门店','第四门店']
 			}
 		},
 		methods:{
@@ -89,7 +101,11 @@
 				uni.navigateTo({
 					url:'/pages/my/prize/exchangeDetail'
 				})
-			}
+			},
+			// 选择门店
+			bindregionChange:function(e){
+				this.formData.region=this.regionSelect[e.detail.value]
+			},
 		}
 	}
 </script>

pages/my/prize/prize.vue

@@ -29,6 +29,7 @@
 					</view>
 				</view>
 			</view>
+			
 			<!-- 线下奖品 -->
 			<view class="prizeList" :style="{'--height':ListHeight+'rpx'}" v-if="isActive == 1">
 				<view class="ListItem" v-for="item in 5">
@@ -42,6 +43,7 @@
 					</view>
 				</view>
 			</view>
+			
 			<!-- 中奖记录 -->
 			<view class="prizeList" :style="{'--height':ListHeight+'rpx'}" v-if="isActive == 2">
 				<view class="ListItem" v-for="item in 5">
@@ -53,7 +55,8 @@
 				</view>
 			</view>
 		</view>
-
+		
+		<!-- 已经到底啦 -->
 		<uni-load-more :status="status" color="#CCCCCC" :content-text="contentText" />
 
 	</view>
@@ -63,22 +66,27 @@
 	export default {
 		data() {
 			return {
+				// 分段器标题
 				items: ['实物奖品', '线下奖品', '中奖记录'],
 				isActive: 0,
+				// 列表高度
 				ListHeight: 800,
+				// 组件uni-load-more
 				status: 'noMore',
 				contentText: {
 					contentdown: '查看更多',
 					contentrefresh: '加载中',
-					contentnomore: '——  已经到底啦  ——'
-				}
+					contentnomore: '—— 已经到底啦 ——'
+				},
+				
 			}
 		},
 		methods: {
-			//菜单index切换
+			//分段器标题切换
 			checked(index) {
 				this.isActive = index
 			},
+			// 分段器内容切换
 			onClickItem(e) {
 				if (this.current != e.currentIndex) {
 					this.current = e.currentIndex;
@@ -113,7 +121,6 @@
 
 
 	.segmented {
-		// border: 1rpx solid;
 		width: 750rpx;
 		height: 112rpx;
 		background: $bgColor;

pages/webview/webview.vue

@@ -0,0 +1,36 @@
+<template>
+	<view class="webview">
+		<web-view :src='url'></web-view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				title:'',
+			}
+		},
+		onLoad(op) {
+			console.log(op)
+			this.url = op.url
+			this.title=op.nav
+			this.getWebviewPage()
+		},
+		methods: {
+			getWebviewPage() {
+				//设置 webview 界面的状态栏的 title
+				uni.setNavigationBarTitle({
+					title: this.title
+				});
+			}
+		}
+	}
+</script>
+
+<style lang="less">
+	.webview {
+		width: 100vw;
+		height: 100vh;
+	}
+</style>

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

@@ -30,7 +30,8 @@
     "pages/my/prize/prize",
     "pages/my/prize/exchangePrize",
     "pages/my/prize/exchangeDetail",
-    "pages/my/Kudos/Kudos"
+    "pages/my/Kudos/Kudos",
+	"pages/webview/webview"
   ],
   "subPackages": [],
   "window": {

unpackage/dist/dev/.sourcemap/mp-weixin/pages/webview/webview.wxml.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["uni-app:///main.js"],"names":["wx","__webpack_require_UNI_MP_PLUGIN__","__webpack_require__","createPage","Page"],"mappings":";;;;;;;;;;kDAAA;;;AAGA;AACA,2N,8FAHA;AACAA,EAAE,CAACC,iCAAH,GAAuCC,mBAAvC,CAGAC,UAAU,CAACC,oBAAD,CAAV,C","file":"pages/webview/webview.wxml.js","sourcesContent":["import 'uni-pages';\n// @ts-ignore\nwx.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;\nimport Vue from 'vue'\nimport Page from './pages/webview/webview.wxml.vue'\ncreatePage(Page)"],"sourceRoot":""}

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

@@ -10,6 +10,7 @@
     "pages/goods/goods-hotel/index",
     "pages/goods/goods-lucky/index",
     "pages/msg/msg",
+    "pages/webview/webview",
     "pages/login/login",
     "pages/login/youyue",
     "pages/my/my",

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

@@ -1,34 +1,19 @@
 (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:
+/***/ 509:
 /*!*************************************************************************************!*\
   !*** 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 import */ var _q_turntable_vue_vue_type_template_id_2e5c8c30___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./q-turntable.vue?vue&type=template&id=2e5c8c30& */ 510);
+/* 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& */ 512);
 /* 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 _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& */ 514);
 /* 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
 
@@ -56,29 +41,17 @@ 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:
+/***/ 510:
 /*!********************************************************************************************************************!*\
   !*** 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 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& */ 511);
 /* 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 _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"]; });
 
@@ -90,17 +63,10 @@ __webpack_require__.r(__webpack_exports__);
 
 /***/ }),
 
-<<<<<<< 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:
+/***/ 511:
 /*!********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./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__) {
 
@@ -124,47 +90,26 @@ render._withStripped = true
 
 /***/ }),
 
-<<<<<<< HEAD
-/***/ 488:
-/*!**************************************************************************************************!*\
-  !*** D:/vscode-demo/IHG/IHG/IHG/components/q-turntable/q-turntable.vue?vue&type=script&lang=js& ***!
-  \**************************************************************************************************/
-=======
-/***/ 487:
+/***/ 512:
 /*!**************************************************************************************************************!*\
   !*** 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__));
- /* 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); 
-
-/***/ }),
-
-/***/ 489:
-/*!*********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
-  !*** ./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__ = __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& */ 513);
 /* 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:
+/***/ 513:
 /*!*********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./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__) {
 
@@ -260,47 +205,26 @@ var _default =
 
 /***/ }),
 
-<<<<<<< HEAD
-/***/ 490:
-/*!**********************************************************************************************************!*\
-  !*** D:/vscode-demo/IHG/IHG/IHG/components/q-turntable/q-turntable.vue?vue&type=style&index=0&lang=css& ***!
-  \**********************************************************************************************************/
-=======
-/***/ 489:
+/***/ 514:
 /*!**********************************************************************************************************************!*\
   !*** 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__));
- /* 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); 
-
-/***/ }),
-
-/***/ 491:
-/*!**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
-  !*** ./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__ = __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& */ 515);
 /* 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:
+/***/ 515:
 /*!**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./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__) {
 
@@ -316,11 +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__){
-<<<<<<< HEAD
-            __webpack_require__('1')['createComponent'](__webpack_require__(485))
-=======
-            __webpack_require__('1')['createComponent'](__webpack_require__(484))
->>>>>>> 34ff92b08d15fe081f02b6043841043afb600bb7
+            __webpack_require__('1')['createComponent'](__webpack_require__(509))
         })
     },
     [['components/q-turntable/q-turntable-create-component']]

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

@@ -60,11 +60,6 @@
   font-weight: 500;
   color: #333333;
 }
-.divided.data-v-ae2462ae {
-  width: 690rpx;
-  height: 2rpx;
-  background: #F0F0F0;
-}
 .item.data-v-ae2462ae {
   margin: 40rpx 0;
 }
@@ -74,14 +69,6 @@
   font-weight: bold;
   color: #333333;
 }
-.itemcontent.data-v-ae2462ae {
-  margin-bottom: 40rpx;
-  width: 512rpx;
-  font-size: 28rpx;
-  font-family: PingFang-SC-Medium, PingFang-SC;
-  font-weight: 500;
-  color: #333333;
-}
 .itemLast.data-v-ae2462ae {
   width: 690rpx;
   font-size: 24rpx;
@@ -151,37 +138,32 @@
   font-weight: 500;
   color: #666666;
 }
-.loginicon1.data-v-ae2462ae {
-  width: 96rpx;
-  height: 96rpx;
-  position: absolute;
-  top: 1010rpx;
-  right: 30rpx;
-}
-.loginicon1 image.data-v-ae2462ae {
-  width: 100%;
-  height: 100%;
+.boxitem.data-v-ae2462ae {
+  border-top: #F0F0F0 2rpx solid;
+  border-bottom: #F0F0F0 2rpx solid;
+  padding: 40rpx 0;
+  position: relative;
 }
-.loginicon2.data-v-ae2462ae {
+.boxitem image.data-v-ae2462ae {
+  top: 35%;
+  right: 0rpx;
   width: 96rpx;
   height: 96rpx;
   position: absolute;
-  top: 1265rpx;
-  right: 30rpx;
 }
-.loginicon2 image.data-v-ae2462ae {
-  width: 100%;
-  height: 100%;
-}
-.loginicon3.data-v-ae2462ae {
-  width: 96rpx;
-  height: 96rpx;
-  position: absolute;
-  top: 1510rpx;
-  right: 30rpx;
+.boxitem .boxitemtitle.data-v-ae2462ae {
+  font-size: 32rpx;
+  font-family: PingFang-SC-Bold, PingFang-SC;
+  font-weight: bold;
+  color: #333333;
 }
-.loginicon3 image.data-v-ae2462ae {
-  width: 100%;
-  height: 100%;
+.boxitem .boxitemcontent.data-v-ae2462ae {
+  margin-top: 24rpx;
+  width: 512rpx;
+  display: block;
+  font-size: 28rpx;
+  font-family: PingFang-SC-Medium, PingFang-SC;
+  font-weight: 500;
+  color: #333333;
 }