Tartarus %!s(int64=2) %!d(string=hai) anos
pai
achega
7ff1fd4361
Modificáronse 100 ficheiros con 585 adicións e 123 borrados
  1. 3 1
      components/TabBar/tabbar.vue
  2. 16 9
      pages.json
  3. 1 1
      pages/index/active-detail/index.vue
  4. 4 4
      pages/index/index.vue
  5. 193 0
      pages/map/hotel-book/index.vue
  6. 328 107
      pages/map/map.vue
  7. BIN=BIN
      static/icon/Kudos(1).png
  8. BIN=BIN
      static/icon/Kudos.png
  9. BIN=BIN
      static/icon/Kudosbg.png
  10. BIN=BIN
      static/icon/Receipt.png
  11. BIN=BIN
      static/icon/add01.png
  12. BIN=BIN
      static/icon/address01.png
  13. BIN=BIN
      static/icon/address02.png
  14. BIN=BIN
      static/icon/addressMap.png
  15. BIN=BIN
      static/icon/avatar.png
  16. BIN=BIN
      static/icon/banner02.png
  17. BIN=BIN
      static/icon/banner03.png
  18. BIN=BIN
      static/icon/banner04.png
  19. BIN=BIN
      static/icon/bg@2x.png
  20. BIN=BIN
      static/icon/clean.png
  21. BIN=BIN
      static/icon/close01.png
  22. BIN=BIN
      static/icon/delivery.png
  23. BIN=BIN
      static/icon/down01.png
  24. BIN=BIN
      static/icon/down02.png
  25. BIN=BIN
      static/icon/exchange.png
  26. BIN=BIN
      static/icon/finish.png
  27. BIN=BIN
      static/icon/gift01.png
  28. BIN=BIN
      static/icon/gift02.png
  29. BIN=BIN
      static/icon/home01.png
  30. BIN=BIN
      static/icon/home02.png
  31. BIN=BIN
      static/icon/home03.png
  32. BIN=BIN
      static/icon/home04.png
  33. BIN=BIN
      static/icon/integralbg.png
  34. BIN=BIN
      static/icon/integralicon.png
  35. BIN=BIN
      static/icon/integralrecord.png
  36. BIN=BIN
      static/icon/integralrule.png
  37. BIN=BIN
      static/icon/lament.png
  38. BIN=BIN
      static/icon/list.png
  39. BIN=BIN
      static/icon/local01.png
  40. BIN=BIN
      static/icon/location.png
  41. BIN=BIN
      static/icon/loginicon1.png
  42. BIN=BIN
      static/icon/map01.png
  43. BIN=BIN
      static/icon/map02.png
  44. BIN=BIN
      static/icon/msg01.png
  45. BIN=BIN
      static/icon/msg02.png
  46. BIN=BIN
      static/icon/my01.png
  47. BIN=BIN
      static/icon/my02.png
  48. BIN=BIN
      static/icon/nav01.png
  49. BIN=BIN
      static/icon/nav02.png
  50. BIN=BIN
      static/icon/nav03.png
  51. BIN=BIN
      static/icon/nav04.png
  52. BIN=BIN
      static/icon/nav05.png
  53. BIN=BIN
      static/icon/navigation.png
  54. BIN=BIN
      static/icon/ordermap.png
  55. BIN=BIN
      static/icon/phone.png
  56. BIN=BIN
      static/icon/phone02.png
  57. BIN=BIN
      static/icon/position.png
  58. BIN=BIN
      static/icon/rank01.png
  59. BIN=BIN
      static/icon/reserve01.png
  60. BIN=BIN
      static/icon/reserve02.png
  61. BIN=BIN
      static/icon/return01.png
  62. BIN=BIN
      static/icon/right.png
  63. BIN=BIN
      static/icon/right01.png
  64. BIN=BIN
      static/icon/right02.png
  65. BIN=BIN
      static/icon/right03.png
  66. BIN=BIN
      static/icon/right04.png
  67. BIN=BIN
      static/icon/scan.png
  68. BIN=BIN
      static/icon/search.png
  69. BIN=BIN
      static/icon/search02.png
  70. BIN=BIN
      static/icon/setting.png
  71. BIN=BIN
      static/icon/shipments.png
  72. BIN=BIN
      static/icon/special01.png
  73. BIN=BIN
      static/icon/success.png
  74. BIN=BIN
      static/icon/swiper01.png
  75. BIN=BIN
      static/icon/symbol.png
  76. BIN=BIN
      static/icon/up01.png
  77. BIN=BIN
      static/icon/up02.png
  78. BIN=BIN
      static/icon/vip.png
  79. BIN=BIN
      static/icon/vip02.png
  80. BIN=BIN
      static/icon/votes01.png
  81. BIN=BIN
      static/icon/votes02.png
  82. BIN=BIN
      static/icon/wechart.png
  83. 0 0
      unpackage/dist/build/.automator/mp-weixin/.automator.json
  84. 4 0
      unpackage/dist/build/mp-weixin/app.js
  85. 3 1
      unpackage/dist/build/mp-weixin/app.json
  86. 3 0
      unpackage/dist/build/mp-weixin/app.wxss
  87. 0 0
      unpackage/dist/build/mp-weixin/common/main.js
  88. 0 0
      unpackage/dist/build/mp-weixin/common/runtime.js
  89. 0 0
      unpackage/dist/build/mp-weixin/common/vendor.js
  90. 10 0
      unpackage/dist/build/mp-weixin/components/SwiperBox/index.js
  91. 7 0
      unpackage/dist/build/mp-weixin/components/SwiperBox/index.json
  92. 1 0
      unpackage/dist/build/mp-weixin/components/SwiperBox/index.wxml
  93. 1 0
      unpackage/dist/build/mp-weixin/components/SwiperBox/index.wxss
  94. 0 0
      unpackage/dist/build/mp-weixin/components/TabBar/tabbar.js
  95. 4 0
      unpackage/dist/build/mp-weixin/components/TabBar/tabbar.json
  96. 1 0
      unpackage/dist/build/mp-weixin/components/TabBar/tabbar.wxml
  97. 1 0
      unpackage/dist/build/mp-weixin/components/TabBar/tabbar.wxss
  98. 0 0
      unpackage/dist/build/mp-weixin/components/hch-position/hch-position.js
  99. 4 0
      unpackage/dist/build/mp-weixin/components/hch-position/hch-position.json
  100. 1 0
      unpackage/dist/build/mp-weixin/components/hch-position/hch-position.wxml

+ 3 - 1
components/TabBar/tabbar.vue

xqd
@@ -136,10 +136,12 @@
 <style lang="scss" scoped>
 	.tab-bar {
 		position: fixed;
-		bottom:  0;
+		bottom: 0;
 		left: 0;
 		background-color: #fff;
 		width: 100%;
+		z-index: 999 !important;
+
 		.content {
 			background-color: #fff;
 			box-shadow: 0px -2rpx 20rpx 0px rgba(0, 0, 0, 0.05);

+ 16 - 9
pages.json

xqd xqd
@@ -1,14 +1,6 @@
 {
 	"pages": [ //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages
-
-		{
-			"path": "pages/map/map",
-			"style": {
-				"navigationBarTitleText": "IHG地图",
-				"enablePullDownRefresh": false
-			}
-
-		},
+		
 
 		{
 			"path": "pages/index/index",
@@ -77,7 +69,22 @@
 			}
 
 		},
+		{
+			"path": "pages/map/map",
+			"style": {
+				"navigationBarTitleText": "IHG地图",
+				"enablePullDownRefresh": false
+			}
+
+		},
+		{
+			"path": "pages/map/hotel-book/index",
+			"style": {
+				"navigationBarTitleText": "IHG | 洲际酒店集团中国西区",
+				"enablePullDownRefresh": false
+			}
 		
+		},
 		{
 			"path": "pages/msg/msg",
 			"style": {

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

xqd
@@ -359,7 +359,7 @@
 			display: flex;
 			align-items: center;
 			justify-content: center;
-			font-size: 32rpx;
+			font-size: 30rpx;
 			color: #101010;
 			font-weight: bold;
 			position: absolute;

+ 4 - 4
pages/index/index.vue

xqd xqd xqd
@@ -26,11 +26,11 @@
 		<view class="home-special-area">
 			<view class="home-special-area-left">
 				<text>西部活动专区</text>
-				<image style="width:16rpx;height: 16rpx;margin-left: 14rpx;" src="/static/icon//symbol.png" mode=""></image>
+				<image style="width:16rpx;height: 16rpx;margin-left: 14rpx;" src="/static/icon/symbol.png" mode=""></image>
 			</view>
 			<view @click="goSpecialList" class="home-special-area-right">
 				<text >全部</text>
-				<image style="width: 12rpx; height: 20rpx;margin-left: 8rpx; " src="/static/icon//right01.png" mode="">
+				<image style="width: 12rpx; height: 20rpx;margin-left: 8rpx;" src="/static/icon/right01.png" mode="">
 				</image>
 			</view>
 		</view>
@@ -68,7 +68,7 @@
 		<view class="home-hotel home-special-area">
 			<view class="home-special-area-left">
 				<text>酒店商品推荐</text>
-				<image style="width:16rpx;height: 16rpx;margin-left: 14rpx;" src="/static/icon//symbol.png" mode=""></image>
+				<image style="width:16rpx;height: 16rpx;margin-left: 14rpx;" src="/static/icon/symbol.png" mode=""></image>
 			</view>
 		</view>
 
@@ -83,7 +83,7 @@
 		<view class="home-brand home-special-area">
 			<view class="home-special-area-left">
 				<text>洲际酒店集团品牌</text>
-				<image style="width:16rpx;height: 16rpx;margin-left: 14rpx;" src="/static/icon//symbol.png" mode=""></image>
+				<image style="width:16rpx;height: 16rpx;margin-left: 14rpx;" src="/static/icon/symbol.png" mode=""></image>
 			</view>
 		</view>
 

+ 193 - 0
pages/map/hotel-book/index.vue

xqd
@@ -0,0 +1,193 @@
+<template>
+	<view class="hotel-book">
+		<!-- 背景图 -->
+		<view class="hotel-book-img">
+			<image style="width: 100%; height: 564rpx;" src="/static/icon/swiper01.png" mode=""></image>
+		</view>
+
+		<!-- 酒店介绍 -->
+		<view class="hotel-content">
+			<view class="hotel-content-top">
+				<image style="width: 48rpx;height: 48rpx;" src="/static/icon/local01.png" mode=""></image>
+				<view class="hotel-content-top-text">
+					<text>成都环球中心天堂洲际大饭店</text>
+				</view>
+			</view>
+			<view class="hotel-content-introduce">
+				<view class="introduce-top">
+					<text class="introduce-top-rule1"></text>
+					<text style="margin: 0 8rpx;">酒店介绍</text>
+					<text class="introduce-top-rule2"></text>
+				</view>
+				<view class="introduce-btn-text">
+					<text>由中国最佳酒店评选委员会、洲际酒店共同打造的国内</text>
+				</view>
+				
+				<!-- 声明 -->
+				<view class="introduce-btn">
+					<text>活动声明</text>
+				</view>
+			</view>
+
+		</view>
+		
+		<view class="hotel-btn">
+			<view class="hotel-btn-left">
+				<view class="hotel-btn-left-text">
+					<view style="width: 48rpx;height: 48rpx;display: flex;align-items: center;justify-content: center;">
+						<image style="width: 40rpx;height: 42rpx;" src="/static/icon/home04.png" mode=""></image>
+					</view>
+					<text>首页</text>
+				</view>
+				<view class="hotel-btn-left-text">
+					<view style="width: 48rpx;height: 48rpx; display: flex;align-items: center;justify-content: center; ">
+						<image style="width: 52rpx;height: 46rpx;" src="/static/icon/vip02.png" mode=""></image>
+					</view>
+					<text>会员</text>
+				</view>
+				<view class="hotel-btn-left-text">
+					<view style="width: 48rpx;height: 48rpx;display: flex;align-items: center;justify-content: center;">
+						<image style=" width: 44rpx;height: 44rpx;" src="/static/icon/home03.png" mode=""></image>
+					</view>
+					<text>导航</text>
+				</view>
+			</view>
+			<view class="hotel-btn-right">
+				<text>预订</text>
+			</view>
+		</view>
+
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {}
+		},
+		methods: {}
+	}
+</script>
+
+<style lang="scss" scoped>
+	$pageColor:#F9F9F9;
+	$bgColor:#FFFFFF;
+
+	@mixin flexlayout {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.hotel-book {
+		height: 100%;
+		background: #fff;
+	}
+	
+	.hotel-btn{
+		padding: 0 30rpx;
+		position: fixed;
+		bottom: 0;
+		width: 100%;
+		height: 148rpx;
+		background: #FFFFFF;
+		box-shadow: 0px -2rpx 20rpx 0px rgba(0,0,0,0.04);
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		.hotel-btn-left{
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			.hotel-btn-left-text{
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+				justify-content: flex-start;
+				font-weight: 500;
+				color: #999999;
+				font-size: 22rpx;
+				margin-right:48rpx ;
+			}
+		}
+		.hotel-btn-right{
+			width: 396rpx;
+			height: 92rpx;
+			background: linear-gradient(270deg, #FF6200 0%, #FF9342 100%);
+			border-radius: 12rpx;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			font-weight: bold;
+			color: #FFFFFF;
+			font-size: 30rpx;
+		}
+	}
+
+	.hotel-content {
+		width: 100%;
+		padding: 40rpx 30rpx 100rpx;
+		.hotel-content-top {
+			height: 48rpx;
+			display: flex;
+			align-items: center;
+			justify-content: flex-start;
+
+			.hotel-content-top-text {
+				margin-top: -2rpx;
+				font-weight: bold;
+				color: #333333;
+				font-size: 32rpx;
+				margin-left: 8rpx;
+			}
+		}
+
+		.hotel-content-introduce {
+			margin-top: 32rpx;
+			padding: 48rpx 22rpx;
+			background: #FFFFFF;
+			border-radius: 4rpx;
+			border: 2rpx solid #999999;
+		}
+	}
+
+	.introduce-top {
+		height: 32rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		font-size: 32rpx;
+		font-weight: bold;
+		letter-spacing: 2rpx;
+
+		.introduce-top-rule1 {
+			width: 56rpx;
+			height: 4rpx;
+			background: linear-gradient(90deg, #FFFFFF 0%, #D9A94D 100%);
+		}
+
+		.introduce-top-rule2 {
+			width: 56rpx;
+			height: 4rpx;
+			background: linear-gradient(-90deg, #FFFFFF 0%, #D9A94D 100%);
+		}
+	}
+	.introduce-btn-text{
+		margin-top: 72rpx;
+		text-indent: 2em;
+		font-size: 28rpx;
+		color: #333;
+		font-weight: bold;
+		line-height: 56rpx;
+	}
+	.introduce-btn{
+		margin-top: 72rpx;
+		width: 100%;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		font-size: 30rpx;
+		color: #101010;
+		font-weight: bold;
+	}
+</style>

+ 328 - 107
pages/map/map.vue

xqd xqd xqd xqd xqd xqd xqd xqd xqd
@@ -82,28 +82,32 @@
 				</view>
 			</view>
 			<!-- 筛选-->
-			<view class="search-detail" v-if="!isSelectSift" >
+			<view class="search-detail" v-if="!isSelectSift">
 				<view class="partner">
 					<view class="partner-top" @click="selectPartner">
 						<text>合作伙伴</text>
-						<image  v-if="isPartner" style=" width: 20rpx; height: 12rpx; " src="/static/icon/up02.png" mode=""></image>
-						<image  v-if="!isPartner" style=" width: 20rpx; height: 12rpx; " src="/static/icon/down02.png" mode=""></image>
+						<image v-if="isPartner" style=" width: 20rpx; height: 12rpx; " src="/static/icon/up02.png"
+							mode=""></image>
+						<image v-if="!isPartner" style=" width: 20rpx; height: 12rpx; " src="/static/icon/down02.png"
+							mode=""></image>
 					</view>
 					<view class="partner-main" v-if="isPartner">
 						<uni-data-checkbox multiple v-model="value" :localdata="partner" @change="change">
 						</uni-data-checkbox>
 					</view>
-					
+
 					<view class="partner-top" style="border-top: none;" @click="selectJoin">
 						<text>加盟品牌</text>
-						<image  v-if="isJoin" style=" width: 20rpx; height: 12rpx; " src="/static/icon/up02.png" mode=""></image>
-						<image  v-if="!isJoin" style=" width: 20rpx; height: 12rpx; " src="/static/icon/down02.png" mode=""></image>
+						<image v-if="isJoin" style=" width: 20rpx; height: 12rpx; " src="/static/icon/up02.png" mode="">
+						</image>
+						<image v-if="!isJoin" style=" width: 20rpx; height: 12rpx; " src="/static/icon/down02.png"
+							mode=""></image>
 					</view>
 					<view class="partner-main" v-if="isJoin">
 						<uni-data-checkbox multiple v-model="value" :localdata="partner" @change="change">
 						</uni-data-checkbox>
 					</view>
-					
+
 					<view class="search-detail-btn">
 						<view class="search-detail-btn-left">
 							<text>取消</text>
@@ -117,36 +121,94 @@
 			</view>
 
 		</view>
-		<view class="address">
+		<view class="address" v-if="isShow">
 			<view style="height:1232rpx;">
 				<hch-position></hch-position>
 			</view>
-
 			<view class="address-nav">
-				<view class="address-detail" v-for="item in 3">
-					<image src="/static/icon/Kudosbg.png" class="wait-img"></image>
-					<view class="address-detail-main">
-						<view class="address-detail-main-left">
-							<text class="title">IHG酒店</text>
-							<view class="content">
-								<text>豪华型</text>
+				<view class="address-nav-btn">
+					<view class="">
+						<image style="width: 84rpx;height: 84rpx;" src="/static/icon/location.png" mode=""></image>
+					</view>
+					<view class="" @click="goHotelList">
+						<image style="width: 84rpx;height: 84rpx;" src="/static/icon/list.png" mode=""></image>
+					</view>
+				</view>
+				<view
+					style="width: 100%; overflow-x: scroll;  display: flex;align-items: center;justify-content: space-between;">
+					<view class="address-detail" v-for="item in 3">
+						<view class="mark">
+							<image style="width: 496rpx;height: 318rpx;border-radius: 10rpx;"
+								src="/static/icon/Kudosbg.png" mode=""></image>
+						</view>
+						<view class="inner">
+							<view class="address-detail-main">
+								<view class="address-detail-main-left">
+									<text class="title">IHG酒店</text>
+									<view class="content">
+										<text>豪华型</text>
+									</view>
+									<view class="bottom">
+										<text class="bottom-left">¥</text>
+										<text class="bottom-right">238起</text>
+									</view>
+								</view>
+								<view class="address-detail-main-right" @click="goBook">
+									<text>预订</text>
+								</view>
 							</view>
-							<view class="bottom">
-								<text class="bottom-left">¥</text>
-								<text class="bottom-right">238起</text>
+							<view class="address-detail-position">
+								<image style="width: 18rpx;height: 22rpx;" src="/static/icon/address02.png" mode="">
+								</image>
+								<text style="margin-left:4rpx ;">3.3km</text>
 							</view>
 						</view>
-						<view class="address-detail-main-right">
-							<text>预订</text>
-						</view>
-					</view>
-					<view class="address-detail-position">
-						<image style="width: 18rpx;height: 22rpx;" src="/static/icon/address02.png" mode=""></image>
-						<text style="margin-left:4rpx ;">3.3km</text>
+
 					</view>
 				</view>
 			</view>
 
+		</view>
+
+		<!-- 酒店列表 -->
+		<view class="hotel-list" v-if="!isShow">
+			<view class="hotel-list-item" v-for="item in 10">
+				<view class="wrap">
+					<view class="mark">
+						<image style="width: 694rpx;height: 318rpx;border-radius: 10rpx;" src="/static/icon/Kudosbg.png"
+							mode=""></image>
+					</view>
+					<view class="inner">
+						<view class="address-detail-main">
+							<view class="address-detail-main-left">
+								<text class="title">IHG酒店</text>
+								<view class="content">
+									<text>豪华型</text>
+								</view>
+								<view class="bottom">
+									<text class="bottom-left">¥</text>
+									<text class="bottom-right">238起</text>
+								</view>
+							</view>
+							<view class="address-detail-main-right" @click="goBook">
+								<text>预订</text>
+							</view>
+						</view>
+						<view class="address-detail-position">
+							<image style="width: 18rpx;height: 22rpx;" src="/static/icon/address02.png" mode=""></image>
+							<text style="margin-left:4rpx ;">3.3km</text>
+						</view>
+					</view>
+				</view>
+			</view>
+			<!-- 触底 -->
+			<view class="home-bottom">
+				<uni-load-more :status="status" color="#CCCCCC" :content-text="contentText"/>
+			</view>
+			<view class="return-btn" @click="returnBtn">
+				<image style="width: 132rpx;height: 132rpx;border-radius: 50%;" src="/static/icon/return01.png" mode=""></image>
+			</view>
+			
 		</view>
 		<view style="height: 110rpx;"></view>
 		<tab-bar></tab-bar>
@@ -163,6 +225,17 @@
 		},
 		data() {
 			return {
+				//暂无数据
+				status: 'noMore',
+				contentText: {
+					contentdown: '查看更多',
+					contentrefresh: '加载中',
+					contentnomore: '——  已经到底啦  ——'
+				},
+				//是否展示地图
+				isShow: true,
+
+
 				value: [0],
 				//合作伙伴
 				partner: [{
@@ -174,22 +247,22 @@
 				}, {
 					text: '游泳',
 					value: 2
-				},{
+				}, {
 					text: '游泳',
 					value: 3
-				},{
+				}, {
 					text: '游泳',
 					value: 4
-				},{
+				}, {
 					text: '游泳',
 					value: 5
-				},{
+				}, {
 					text: '游泳',
 					value: 6
-				},{
+				}, {
 					text: '游泳',
 					value: 7
-				},],
+				}, ],
 
 				//品牌
 				brandList: [{
@@ -238,19 +311,36 @@
 				//刷选
 				isSelectSift: true,
 				//是否展示合作伙伴
-				isPartner:false,
+				isPartner: false,
 				//是否展示加盟品牌
-				isJoin:false,
+				isJoin: false,
 
 			}
 		},
 		methods: {
+			//去预定页面
+			goBook(){
+				uni.navigateTo({
+					url:'/pages/map/hotel-book/index'
+				})
+			},
+			//返回上一级
+			returnBtn(){
+				this.isShow = !this.isShow
+			},
+			//打开酒店列表
+			goHotelList() {
+				console.log(111);
+				this.isShow = !this.isShow
+			},
+
+
 			//是否展示加盟品牌
-			selectJoin(){
+			selectJoin() {
 				this.isJoin = !this.isJoin
 			},
 			//是否展示合作伙伴
-			selectPartner(){
+			selectPartner() {
 				this.isPartner = !this.isPartner
 			},
 			//合作伙伴刷选
@@ -289,6 +379,128 @@
 		display: flex;
 		flex-direction: column;
 	}
+	.return-btn{
+		position: fixed;
+		right: 0;
+		top: 927rpx;
+		z-index: 99;
+	}
+	
+	.home-bottom {
+		height: 60rpx;
+		background-color: #f9f9f9;
+	}
+	.hotel-list {
+		width: 100%;
+		background-color: #f9f9f9;
+		padding: 32rpx 30rpx;
+		padding-bottom: 200rpx;
+
+		.hotel-list-item {
+			width: 100%;
+			margin-bottom: 20rpx;
+			.wrap {
+				width: 100%;
+				height: 318rpx;
+				position: relative;
+				box-shadow: 0px 4rpx 8rpx 0px rgba(0, 0, 0, 0.08);
+				border-radius: 10rpx;
+
+				.inner {
+					width: 100%;
+					height: 318rpx;
+					border-radius: 10rpx;
+					background: rgba(0, 0, 0, 0.4);
+					position: absolute;
+					z-index: 2;
+					top: 0;
+					left: 0;
+
+					.address-detail-main {
+						position: absolute;
+						left: 0;
+						bottom: 30rpx;
+						width: 100%;
+						display: flex;
+						align-items: flex-end;
+						justify-content: space-between;
+
+						.address-detail-main-left {
+							position: absolute;
+							left: 20rpx;
+
+							.title {
+								font-size: 32rpx;
+								font-weight: bold;
+								color: #FFFFFF;
+							}
+
+							.content {
+								margin: 12rpx 0 20rpx;
+								width: 92rpx;
+								height: 34rpx;
+								background: rgba(142, 160, 166, .6);
+								border-radius: 17rpx;
+								color: #ffffff;
+								font-size: 22rpx;
+								display: flex;
+								align-items: center;
+								justify-content: center;
+							}
+
+							.bottom {
+								display: flex;
+								align-items: center;
+								justify-content: flex-start;
+
+								.bottom-left {
+									font-size: 24rpx;
+									font-weight: bold;
+									color: #ffffff;
+									margin-right: 6rpx;
+								}
+
+								.bottom-right {
+									font-size: 32rpx;
+									font-weight: bold;
+									color: #ffffff;
+								}
+							}
+						}
+
+						.address-detail-main-right {
+							position: absolute;
+							right: 24rpx;
+							width: 120rpx;
+							height: 44rpx;
+							background: #FF6300;
+							box-shadow: 0px 4rpx 8rpx 0px rgba(0, 0, 0, 0.08);
+							border-radius: 22rpx;
+							display: flex;
+							align-items: center;
+							justify-content: center;
+							color: #ffffff;
+							font-size: 28rpx;
+						}
+					}
+
+					.address-detail-position {
+						position: absolute;
+						top: 22rpx;
+						right: 24rpx;
+						display: flex;
+						align-items: center;
+						justify-content: center;
+						font-weight: 500;
+						color: #FFFFFF;
+						font-size: 20rpx;
+					}
+				}
+			}
+
+
+		}
+	}
 
 	.search-detail {
 		width: 100%;
@@ -313,11 +525,11 @@
 
 			.partner-main {
 				margin-top: 32rpx;
-				
+
 				::v-deep .uni-data-checklist .checklist-group .checklist-box {
 					width: 26%;
 				}
-				
+
 				::v-deep .uni-data-checklist .checklist-group .checklist-box .checkbox__inner {
 					width: 48rpx;
 					height: 48rpx;
@@ -529,10 +741,18 @@
 		bottom: 34rpx;
 		padding: 0 16rpx;
 		display: flex;
+		flex-direction: column;
 		align-items: center;
 		justify-content: space-between;
 		overflow-x: scroll;
 
+		.address-nav-btn {
+			width: 100%;
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+		}
+
 	}
 
 	.address {
@@ -543,103 +763,104 @@
 			position: relative;
 			flex: none;
 			width: 496rpx;
-			height: 318rpx;
-			background: #000;
-			box-shadow: 0px 4rpx 8rpx 0px rgba(0, 0, 0, 0.08);
 			border-radius: 10rpx;
 			margin-right: 16rpx;
-
 			&:last-child {
 				margin-right: 0rpx;
 			}
-
-			.wait-img {
+			.inner {
 				width: 100%;
-				height: 100%;
-				opacity: 0.7;
-				filter: alpha(opacity=60);
-			}
-
-			.address-detail-main {
+				height: 318rpx;
+				border-radius: 10rpx;
+				background: rgba(0, 0, 0, 0.4);
 				position: absolute;
+				z-index: 2;
+				top: 0;
 				left: 0;
-				bottom: 30rpx;
-				width: 100%;
-				display: flex;
-				align-items: flex-end;
-				justify-content: space-between;
 
-				.address-detail-main-left {
+				.address-detail-main {
 					position: absolute;
-					left: 20rpx;
-
-					.title {
-						font-size: 32rpx;
-						font-weight: bold;
-						color: #FFFFFF;
-					}
-
-					.content {
-						margin: 12rpx 0 20rpx;
-						width: 92rpx;
-						height: 34rpx;
-						background: rgba(142, 160, 166, .6);
-						border-radius: 17rpx;
-						color: #ffffff;
-						font-size: 22rpx;
-						display: flex;
-						align-items: center;
-						justify-content: center;
-					}
+					left: 0;
+					bottom: 30rpx;
+					width: 100%;
+					display: flex;
+					align-items: flex-end;
+					justify-content: space-between;
 
-					.bottom {
-						display: flex;
-						align-items: center;
-						justify-content: flex-start;
+					.address-detail-main-left {
+						position: absolute;
+						left: 20rpx;
 
-						.bottom-left {
-							font-size: 24rpx;
+						.title {
+							font-size: 32rpx;
 							font-weight: bold;
-							color: #ffffff;
-							margin-right: 6rpx;
+							color: #FFFFFF;
 						}
 
-						.bottom-right {
-							font-size: 32rpx;
-							font-weight: bold;
+						.content {
+							margin: 12rpx 0 20rpx;
+							width: 92rpx;
+							height: 34rpx;
+							background: rgba(142, 160, 166, .6);
+							border-radius: 17rpx;
 							color: #ffffff;
+							font-size: 22rpx;
+							display: flex;
+							align-items: center;
+							justify-content: center;
 						}
+
+						.bottom {
+							display: flex;
+							align-items: center;
+							justify-content: flex-start;
+
+							.bottom-left {
+								font-size: 24rpx;
+								font-weight: bold;
+								color: #ffffff;
+								margin-right: 6rpx;
+							}
+
+							.bottom-right {
+								font-size: 32rpx;
+								font-weight: bold;
+								color: #ffffff;
+							}
+						}
+					}
+
+					.address-detail-main-right {
+						position: absolute;
+						right: 24rpx;
+						width: 120rpx;
+						height: 44rpx;
+						background: #FF6300;
+						box-shadow: 0px 4rpx 8rpx 0px rgba(0, 0, 0, 0.08);
+						border-radius: 22rpx;
+						display: flex;
+						align-items: center;
+						justify-content: center;
+						color: #ffffff;
+						font-size: 28rpx;
 					}
+
 				}
 
-				.address-detail-main-right {
+				.address-detail-position {
 					position: absolute;
+					top: 22rpx;
 					right: 24rpx;
-					width: 120rpx;
-					height: 44rpx;
-					background: #FF6300;
-					box-shadow: 0px 4rpx 8rpx 0px rgba(0, 0, 0, 0.08);
-					border-radius: 22rpx;
 					display: flex;
 					align-items: center;
 					justify-content: center;
-					color: #ffffff;
-					font-size: 28rpx;
+					font-weight: 500;
+					color: #FFFFFF;
+					font-size: 20rpx;
 				}
-
 			}
 
-			.address-detail-position {
-				position: absolute;
-				top: 22rpx;
-				right: 24rpx;
-				display: flex;
-				align-items: center;
-				justify-content: center;
-				font-weight: 500;
-				color: #FFFFFF;
-				font-size: 20rpx;
-			}
+
 		}
 	}
 </style>

BIN=BIN
static/icon/Kudos(1).png


BIN=BIN
static/icon/Kudos.png


BIN=BIN
static/icon/Kudosbg.png


BIN=BIN
static/icon/Receipt.png


BIN=BIN
static/icon/add01.png


BIN=BIN
static/icon/address01.png


BIN=BIN
static/icon/address02.png


BIN=BIN
static/icon/addressMap.png


BIN=BIN
static/icon/avatar.png


BIN=BIN
static/icon/banner02.png


BIN=BIN
static/icon/banner03.png


BIN=BIN
static/icon/banner04.png


BIN=BIN
static/icon/bg@2x.png


BIN=BIN
static/icon/clean.png


BIN=BIN
static/icon/close01.png


BIN=BIN
static/icon/delivery.png


BIN=BIN
static/icon/down01.png


BIN=BIN
static/icon/down02.png


BIN=BIN
static/icon/exchange.png


BIN=BIN
static/icon/finish.png


BIN=BIN
static/icon/gift01.png


BIN=BIN
static/icon/gift02.png


BIN=BIN
static/icon/home01.png


BIN=BIN
static/icon/home02.png


BIN=BIN
static/icon/home03.png


BIN=BIN
static/icon/home04.png


BIN=BIN
static/icon/integralbg.png


BIN=BIN
static/icon/integralicon.png


BIN=BIN
static/icon/integralrecord.png


BIN=BIN
static/icon/integralrule.png


BIN=BIN
static/icon/lament.png


BIN=BIN
static/icon/list.png


BIN=BIN
static/icon/local01.png


BIN=BIN
static/icon/location.png


BIN=BIN
static/icon/loginicon1.png


BIN=BIN
static/icon/map01.png


BIN=BIN
static/icon/map02.png


BIN=BIN
static/icon/msg01.png


BIN=BIN
static/icon/msg02.png


BIN=BIN
static/icon/my01.png


BIN=BIN
static/icon/my02.png


BIN=BIN
static/icon/nav01.png


BIN=BIN
static/icon/nav02.png


BIN=BIN
static/icon/nav03.png


BIN=BIN
static/icon/nav04.png


BIN=BIN
static/icon/nav05.png


BIN=BIN
static/icon/navigation.png


BIN=BIN
static/icon/ordermap.png


BIN=BIN
static/icon/phone.png


BIN=BIN
static/icon/phone02.png


BIN=BIN
static/icon/position.png


BIN=BIN
static/icon/rank01.png


BIN=BIN
static/icon/reserve01.png


BIN=BIN
static/icon/reserve02.png


BIN=BIN
static/icon/return01.png


BIN=BIN
static/icon/right.png


BIN=BIN
static/icon/right01.png


BIN=BIN
static/icon/right02.png


BIN=BIN
static/icon/right03.png


BIN=BIN
static/icon/right04.png


BIN=BIN
static/icon/scan.png


BIN=BIN
static/icon/search.png


BIN=BIN
static/icon/search02.png


BIN=BIN
static/icon/setting.png


BIN=BIN
static/icon/shipments.png


BIN=BIN
static/icon/special01.png


BIN=BIN
static/icon/success.png


BIN=BIN
static/icon/swiper01.png


BIN=BIN
static/icon/symbol.png


BIN=BIN
static/icon/up01.png


BIN=BIN
static/icon/up02.png


BIN=BIN
static/icon/vip.png


BIN=BIN
static/icon/vip02.png


BIN=BIN
static/icon/votes01.png


BIN=BIN
static/icon/votes02.png


BIN=BIN
static/icon/wechart.png


+ 0 - 0
unpackage/dist/build/.automator/mp-weixin/.automator.json


+ 4 - 0
unpackage/dist/build/mp-weixin/app.js

xqd
@@ -0,0 +1,4 @@
+
+require('./common/runtime.js')
+require('./common/vendor.js')
+require('./common/main.js')

+ 3 - 1
unpackage/dist/build/mp-weixin/app.json

xqd xqd
@@ -9,6 +9,7 @@
     "pages/goods/goods-hotel/index",
     "pages/goods/goods-lucky/index",
     "pages/map/map",
+    "pages/map/hotel-book/index",
     "pages/msg/msg",
     "pages/login/login",
     "pages/login/youyue",
@@ -73,5 +74,6 @@
       }
     ]
   },
-  "usingComponents": {}
+  "usingComponents": {},
+  "sitemapLocation": "sitemap.json"
 }

+ 3 - 0
unpackage/dist/build/mp-weixin/app.wxss

xqd
@@ -0,0 +1,3 @@
+@import './common/main.wxss';
+
+[data-custom-hidden="true"],[bind-data-custom-hidden="true"]{display: none !important;}

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/build/mp-weixin/common/main.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/build/mp-weixin/common/runtime.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/build/mp-weixin/common/vendor.js


+ 10 - 0
unpackage/dist/build/mp-weixin/components/SwiperBox/index.js

xqd
@@ -0,0 +1,10 @@
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["components/SwiperBox/index"],{"11d5":function(n,e,t){"use strict";t.r(e);var u=t("c538"),i=t("4d16");for(var o in i)"default"!==o&&function(n){t.d(e,n,(function(){return i[n]}))}(o);t("4a69");var r,a=t("f0c5"),c=Object(a["a"])(i["default"],u["b"],u["c"],!1,null,"17011793",null,!1,u["a"],r);e["default"]=c.exports},"4a69":function(n,e,t){"use strict";var u=t("8712"),i=t.n(u);i.a},"4d16":function(n,e,t){"use strict";t.r(e);var u=t("54de"),i=t.n(u);for(var o in u)"default"!==o&&function(n){t.d(e,n,(function(){return u[n]}))}(o);e["default"]=i.a},"54de":function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var u={name:"SwiperBox",props:{height:{type:[Number,String],default:"386rpx"},radius:{type:[Number,String],default:"0rpx"}},data:function(){return{loading:!0,list:[t("0afe"),t("0afe")],currentNum:0}},computed:{},created:function(){},methods:{handleClick:function(n){var e=this.list[n];console.log("--\x3edata",e)},handleChange:function(n){this.currentNum=n.current},getSwiper:function(){var n=this;this.$api.setting.banner().then((function(e){n.loading=!1,e.data.forEach((function(e){n.list.push(e.image)}))}))}}};e.default=u},8712:function(n,e,t){},c538:function(n,e,t){"use strict";t.d(e,"b",(function(){return i})),t.d(e,"c",(function(){return o})),t.d(e,"a",(function(){return u}));var u={uLoadingIcon:function(){return Promise.all([t.e("common/vendor"),t.e("node-modules/uview-ui/components/u-loading-icon/u-loading-icon")]).then(t.bind(null,"3a29"))},uSwiper:function(){return Promise.all([t.e("common/vendor"),t.e("node-modules/uview-ui/components/u-swiper/u-swiper")]).then(t.bind(null,"572f"))}},i=function(){var n=this,e=n.$createElement;n._self._c},o=[]}}]);
+;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
+    'components/SwiperBox/index-create-component',
+    {
+        'components/SwiperBox/index-create-component':(function(module, exports, __webpack_require__){
+            __webpack_require__('543d')['createComponent'](__webpack_require__("11d5"))
+        })
+    },
+    [['components/SwiperBox/index-create-component']]
+]);

+ 7 - 0
unpackage/dist/build/mp-weixin/components/SwiperBox/index.json

xqd
@@ -0,0 +1,7 @@
+{
+  "component": true,
+  "usingComponents": {
+    "u-loading-icon": "/node-modules/uview-ui/components/u-loading-icon/u-loading-icon",
+    "u-swiper": "/node-modules/uview-ui/components/u-swiper/u-swiper"
+  }
+}

+ 1 - 0
unpackage/dist/build/mp-weixin/components/SwiperBox/index.wxml

xqd
@@ -0,0 +1 @@
+<view class="{{['swiper-box','','data-v-17011793',(loading)?'loading':'',(loading)?'main-center':'',(loading)?'cross-center':'']}}" style="{{'height:'+(height)+';'}}"><u-loading-icon vue-id="f1df300a-1" show="{{loading}}" vertical="{{true}}" class="data-v-17011793" bind:__l="__l"></u-loading-icon><block wx:if="{{list.length}}"><u-swiper style="width:100%;" vue-id="f1df300a-2" list="{{list}}" height="{{height}}" radius="{{radius}}" bg-color="{{$colors.bgColor}}" indicator="{{true}}" show-title="{{true}}" indicator-mode="dot" indicator-style="{{({bottom:'24rpx'})}}" img-mode data-event-opts="{{[['^click',[['handleClick']]],['^change',[['handleChange']]]]}}" bind:click="__e" bind:change="__e" class="data-v-17011793" bind:__l="__l" vue-slots="{{['indicator']}}"><view class="indicator data-v-17011793" slot="indicator"><block wx:for="{{list}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="{{['indicator__dot','data-v-17011793',index===currentNum&&'indicator__dot--active']}}"></view></block></view></u-swiper></block></view>

+ 1 - 0
unpackage/dist/build/mp-weixin/components/SwiperBox/index.wxss

xqd
@@ -0,0 +1 @@
+.data-v-17011793 .u-swiper{width:100%!important}.swiper-box.loading.data-v-17011793{background-color:#1b203c}.swiper-box .indicator.data-v-17011793{display:flex;flex-direction:row;justify-content:center}.swiper-box .indicator__dot.data-v-17011793{height:20rpx;width:20rpx;border-radius:50%;background-color:hsla(0,0%,100%,.35);margin:0 10px;transition:background-color .3s}.swiper-box .indicator__dot--active.data-v-17011793{background-color:#6eebe8}

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/build/mp-weixin/components/TabBar/tabbar.js


+ 4 - 0
unpackage/dist/build/mp-weixin/components/TabBar/tabbar.json

xqd
@@ -0,0 +1,4 @@
+{
+  "component": true,
+  "usingComponents": {}
+}

+ 1 - 0
unpackage/dist/build/mp-weixin/components/TabBar/tabbar.wxml

xqd
@@ -0,0 +1 @@
+<view class="tab-bar data-v-5e92727a" style="{{'--padding-bottom:'+(''+wagesheight+'rpx')+';'}}"><view class="content main-between cross-center data-v-5e92727a"><block wx:for="{{list}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['handleSwitch',[index]]]]]}}" class="{{['tab-item','dir-top-wrap','cross-center','main-center','data-v-5e92727a',(active===index)?'active':'']}}" bindtap="__e"><view class="icon data-v-5e92727a"><image src="{{active===index?item.selected_icon?item.selected_icon:item.selectedIconPath:item.icon?item.icon:item.iconPath}}" mode="aspectFit" class="data-v-5e92727a"></image></view><text class="data-v-5e92727a">{{item.text}}</text></view></block></view></view>

+ 1 - 0
unpackage/dist/build/mp-weixin/components/TabBar/tabbar.wxss

xqd
@@ -0,0 +1 @@
+.tab-bar.data-v-5e92727a{position:fixed;bottom:0;left:0;background-color:#fff;width:100%;z-index:999!important}.tab-bar .content.data-v-5e92727a{background-color:#fff;box-shadow:0 -2rpx 20rpx 0 rgba(0,0,0,.05);position:absolute;bottom:0;width:100%;height:120rpx;background-size:110% 100%;display:flex;align-items:center;justify-content:center}.tab-bar .content .tab-item.data-v-5e92727a{flex:1;color:#cbc8c7;transition:.3s;font-size:24rpx;position:relative;display:flex;flex-direction:column;align-items:center;justify-content:center}.tab-bar .content .tab-item.active.data-v-5e92727a{color:#ff6200}.tab-bar .content .tab-item .icon.data-v-5e92727a{width:42rpx;height:42rpx}.tab-bar .content .tab-item .icon image.data-v-5e92727a{height:100%;width:100%}

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/build/mp-weixin/components/hch-position/hch-position.js


+ 4 - 0
unpackage/dist/build/mp-weixin/components/hch-position/hch-position.json

xqd
@@ -0,0 +1,4 @@
+{
+  "component": true,
+  "usingComponents": {}
+}

+ 1 - 0
unpackage/dist/build/mp-weixin/components/hch-position/hch-position.wxml

xqd
@@ -0,0 +1 @@
+<view class="content data-v-7b951f47"><view class="page-body data-v-7b951f47" style="height:100%;"><view class="page-section page-section-gap data-v-7b951f47" style="height:100%;"><map style="width:100%;height:100%;" id="myMap" latitude="{{latitude}}" longitude="{{longitude}}" markers="{{markers}}" show-location="{{true}}" enable-scroll="{{true}}" data-event-opts="{{[['tap',[['bindtap',['$event']]]],['callouttap',[['callouttap',['$event']]]],['regionchange',[['regionchange',['$event']]]],['updated',[['updated',['$event']]]]]}}" bindtap="__e" bindcallouttap="__e" bindregionchange="__e" bindupdated="__e" class="data-v-7b951f47"></map></view><view class="store-tips data-v-7b951f47"></view><cover-view class="near-num data-v-7b951f47">{{"距离最近的门店"+distanceL+"千米"}}</cover-view><cover-image class="address-icon data-v-7b951f47" src="../../static/icon/navigation.png"></cover-image></view></view>

Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio