11.28 11:34

api/hotel/hotel.js

@@ -1,6 +1,6 @@
 const request = uni.$u.http
 
-// 隐私协议http://t9.9026.com/api/auth/mnplogin
+// 酒店列表
 export function getHotelList(data){
 	return request.post(
 		`v1/hotel/hotelList`,
@@ -9,6 +9,7 @@ export function getHotelList(data){
 }
 
 
+
 export default {
   getHotelList
 }

api/index.js

@@ -10,7 +10,8 @@ import my from './my/my.js'
 import hotel from './hotel/hotel.js'
 import active from './active/active.js'
 import category from './category/category.js'
-
+import integral from './integral/integral.js'
+import product from './product/product.js'
 
 const api = {
 	user,
@@ -24,7 +25,9 @@ const api = {
 	document,
 	my,
 	hotel,
-	active
+	active,
+	integral,
+	product
 }
 
 export default api

api/integral/integral.js

@@ -0,0 +1,22 @@
+const request = uni.$u.http
+
+// 获取积分日志
+export function getIntegralLog(data){
+	return request.post(
+		`v1/integral/integralLog`,
+		data
+	)
+}
+// 积分兑换
+export function integralExchange(data){
+	return request.post(
+		`v1/integral/integralExchange`,
+		data
+	)
+}
+
+
+export default {
+  getIntegralLog,
+  integralExchange
+}

api/product/product.js

@@ -0,0 +1,22 @@
+const request = uni.$u.http
+
+// 获取产品列表
+export function getProducts(data){
+	return request.post(
+		`v1/product/productList`,
+		data
+	)
+}
+
+// 获取产品详情
+export function getProductDetail(data){
+	return request.post(
+		`v1/product/productDetail`,
+		data
+	)
+}
+
+export default {
+  getProducts,
+  getProductDetail
+}

components/hch-position/hch-position.vue

@@ -1,28 +1,12 @@
 <template>
-	<view class="content">
-		<view class="page-body" style="height: 100%;" >
-			<view class="page-section page-section-gap" style="height: 100%;">
-				<map id="myMap" style="width: 100%; height: 100%;" :latitude="latitude" :longitude="longitude"
-					:markers="markers" show-location enable-scroll @tap="bindtap" @callouttap="callouttap"
-					@regionchange="regionchange" @updated="updated">
+	<view>
+		<view class="page-body">
+			<view class="page-section page-section-gap">
+				<map id="myMap" style="width: 100%; height: 600px;" :latitude="latitude" :longitude="longitude"
+					:markers="markers" show-location enable-scroll @markertap='markertap' @updated="updated"
+					@anchorpointtap='anchorpointtap'>
 				</map>
 			</view>
-			<view class="store-tips">
-				
-				<!-- <cover-view class="store-des-box" v-if="storeFlag" @tap="storeDesEvn">
-					<cover-image class="store-img" src="/static/icon/1.jpg"></cover-image>
-					<cover-view class="store-des">
-						<cover-view class="store-name">{{store.name}}</cover-view>
-						<cover-view class="store-address">地址:{{store.address}}</cover-view>
-						<cover-view class="store-tel">电话:{{store.tel}}</cover-view>
-					</cover-view>
-				</cover-view> -->
-				<!-- <cover-image v-if="storeAdFlag" class="store-ad" src="/static/icon/ad.jpg"></cover-image>
-				<cover-image v-if="storeAdFlag" class="store-clear" @tap="hideAd" src="/static/icon/clear.png"> -->
-				</cover-image>
-			</view>
-			<cover-view class="near-num">距离最近的门店{{distanceL}}千米</cover-view>
-			<cover-image class="address-icon" src="../../static/icon/navigation.png"></cover-image>
 		</view>
 	</view>
 </template>
@@ -30,29 +14,16 @@
 <script>
 	export default {
 		props: {
-			storeData: {
-				type: Array,
-				default: [{
-						id: 1,
-						name: "门店1号",
-						address: "厦门市思明区汇景商业广场XXX1号",
-						tel: "12345678900"
-					},
-					{
-						id: 2,
-						name: "门店2号",
-						address: "厦门市思明区汇景商业广场XXX2号",
-						tel: "12345678900"
-					}
-				]
-			},
 			markers: {
 				type: Array,
 				default: [{
 						id: 1,
-						latitude: 24.4483294023427,
-						longitude: 118.08479034393311,
-						// iconPath: "../../static/icon/门店.png",
+						latitude: 30.6034799,
+						longitude: 104.1132550,
+						iconPath: "../../static/hch-position/门店.png",
+						width: '38rpx',
+						height: '40rpx',
+						joinCluster: true, // 指定了该参数才会参与聚合
 						callout: {
 							content: "门店1号店",
 							borderRadius: 10,
@@ -62,9 +33,12 @@
 					},
 					{
 						id: 2,
-						latitude: 24.4558,
-						longitude: 118.12266,
-						// iconPath: "../../static/icon/门店.png",
+						latitude: 30.6318237,
+						longitude: 104.0824970,
+						width: '38rpx',
+						height: '40rpx',
+						iconPath: "../../static/hch-position/门店.png",
+						joinCluster: true, // 指定了该参数才会参与聚合
 						callout: {
 							content: "门店2号店",
 							borderRadius: 10,
@@ -75,119 +49,70 @@
 				]
 			}
 		},
-		onLoad() {
-			// this.updated()
-		},
-		
 		data() {
 			return {
-				store: {},
-				storeFlag: false,
-				storeAdFlag: false,
-				distanceL: 0, //附近店门的距离
-				latitude: 39.909,
-				longitude: 116.39742,
-				controls: []
+				latitude: 23.099994,
+				longitude: 113.324520,
+				img:'../../static/hch-position/门店.png'
 			}
 		},
-		methods: {
-			// 点击了门店信息
-			storeDesEvn() {
-				uni.showToast({
-					title: "自己自定义跳门店详情页介绍",
-					duration: 2000,
-					icon: "none"
-				})
-			},
-			// 点击气泡
-			callouttap(e) {
-				this.storeFlag = true
-				this.storeAdFlag = false
-				for (let i = 0; i < this.storeData.length; i++) {
-					const ele = this.storeData[i]
-					if (ele.id == e.markerId) {
-						this.store = ele
-						break
-					}
+
+		onReady() {
+			this._mapContext = uni.createMapContext("map", this);
+
+			// 仅调用初始化，才会触发 on.("markerClusterCreate", (e) => {})
+			this._mapContext.initMarkerCluster({
+				enableDefaultStyle: false,
+				zoomOnClick: true,
+				gridSize: 60,
+				complete(res) {
+					console.log('initMarkerCluster', res)
 				}
+			});
+			this._mapContext.on("markerClusterCreate", (e) => {
+				console.log("markerClusterCreate", e);
+			});
+			this.addMarkers();
+		},
+
+
+
+		methods: {
+			//	点击标记点时触发，e.detail = {markerId}
+			markertap(e) {
+				console.log('--->标记点', e.detail);
 			},
-			// 点击地图
-			bindtap(id) {
-				this.storeFlag = false
-				// this.storeAdFlag=true;
-			},
-			// 隐藏广告图片
-			hideAd() {
-				this.storeAdFlag = false
+			//点击定位标时触发，e.detail = {longitude, latitude}
+			anchorpointtap(e) {
+				console.log('---->定位点', e.detail);
 			},
+
+			//在地图渲染更新完成时触发的方法
 			updated() {
 				let _this = this
-				uni.getLocation({
+				wx.getLocation({
 					type: "gcj02", //返回可以用于wx.openLocation的经纬度
 					success: function(res) {
 						_this.latitude = res.latitude
 						_this.longitude = res.longitude
-						_this.nearDistance(_this.markers, _this.latitude, _this.longitude)
+						// _this.nearDistance(_this.markers, _this.latitude, _this.longitude)
 					},
 					fail: function(res) {
 						console.log(res)
 					}
 				})
 			},
-			// 改变视野时改变经纬度
-			regionchange(e) {
-				let _this = this
-				// 使用 wx.createMapContext 获取 map 上下文 this必须要写 不然没办法得到回调！！！！。
-				var mapCtx = uni.createMapContext("myMap", this)
-				mapCtx.getCenterLocation({
-					success: function(res) {
-						_this.centerLatitude = res.latitude
-						_this.centerLongitude = res.longitude
-						_this.nearDistance(
-							_this.markers,
-							_this.centerLatitude,
-							_this.centerLongitude
-						)
-					},
-					fail: function(res) {
-						console.log(res)
+			addMarkers() {
+				this._mapContext.addMarkers({
+					markers,
+					clear: false,
+					complete(res) {
+						console.log('addMarkers', res)
 					}
-				}) //获取当前地图的中心经纬度
-			},
-			// 两点间距离
-			distance(la1, lo1, la2, lo2) {
-				var La1 = (la1 * Math.PI) / 180.0
-				var La2 = (la2 * Math.PI) / 180.0
-				var La3 = La1 - La2
-				var Lb3 = (lo1 * Math.PI) / 180.0 - (lo2 * Math.PI) / 180.0
-				var s =
-					2 *
-					Math.asin(
-						Math.sqrt(
-							Math.pow(Math.sin(La3 / 2), 2) +
-							Math.cos(La1) * Math.cos(La2) * Math.pow(Math.sin(Lb3 / 2), 2)
-						)
-					)
-				s = s * 6378.137 //地球半径
-				s = Math.round(s * 10000) / 10000
-				return s
-			},
-			// 计算最近的距离
-			nearDistance(array, centerLatitude, centerLongitude) {
-				let temp = []
-				for (let i = 0, l = array.length; i < l; i++) {
-					const element = array[i]
-					let d = this.distance(
-						element.latitude,
-						element.longitude,
-						centerLatitude,
-						centerLongitude
-					)
-					temp.push(d)
-				}
-				this.distanceL = Math.min.apply(null, temp)
+				})
 			}
 		},
+
 		onShow() {},
 		onReady() {}
 	}
@@ -196,7 +121,7 @@
 <style lang="scss" scoped>
 	.content {
 		text-align: center;
-		height: 100%;
+		height: 400rpx;
 	}
 
 	.page-section {

manifest.json

@@ -1,81 +1,80 @@
 {
-    "name" : "hotel_uni",
-    "appid" : "__UNI__89DEB06",
-    "description" : "",
-    "versionName" : "1.0.0",
-    "versionCode" : "100",
-    "transformPx" : false,
-    /* 5+App特有相关 */
-    "app-plus" : {
-        "usingComponents" : true,
-        "nvueStyleCompiler" : "uni-app",
-        "compilerVersion" : 3,
-        "splashscreen" : {
-            "alwaysShowBeforeRender" : true,
-            "waiting" : true,
-            "autoclose" : true,
-            "delay" : 0
-        },
-        /* 模块配置 */
-        "modules" : {},
-        /* 应用发布信息 */
-        "distribute" : {
-            /* android打包配置 */
-            "android" : {
-                "permissions" : [
-                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
-                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-                    "<uses-feature android:name=\"android.hardware.camera\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-                ]
-            },
-            /* ios打包配置 */
-            "ios" : {},
-            /* SDK配置 */
-            "sdkConfigs" : {}
-        }
-    },
-    /* 快应用特有相关 */
-    "quickapp" : {},
-    /* 小程序特有相关 */
-    "mp-weixin" : {
-        "appid" : "wx0f8eba0a55baa7fc",
-        "setting" : {
-            "urlCheck" : false,
-            "minified" : true
-        },
-        "usingComponents" : true
-    },
-    "permission" : {
-        "scope.userLocation" : {
-            "desc" : "获取位置，推荐精彩信息"
-        }
-    },
-    // "requiredPrivateInfos": [
-    // 	"getLocation"
-    // ]
-    "mp-alipay" : {
-        "usingComponents" : true
-    },
-    "mp-baidu" : {
-        "usingComponents" : true
-    },
-    "mp-toutiao" : {
-        "usingComponents" : true
-    },
-    "uniStatistics" : {
-        "enable" : false
-    },
-    "vueVersion" : "2"
+	"name": "hotel_uni",
+	"appid": "__UNI__89DEB06",
+	"description": "",
+	"versionName": "1.0.0",
+	"versionCode": "100",
+	"transformPx": false,
+	/* 5+App特有相关 */
+	"app-plus": {
+		"usingComponents": true,
+		"nvueStyleCompiler": "uni-app",
+		"compilerVersion": 3,
+		"splashscreen": {
+			"alwaysShowBeforeRender": true,
+			"waiting": true,
+			"autoclose": true,
+			"delay": 0
+		},
+		/* 模块配置 */
+		"modules": {},
+		/* 应用发布信息 */
+		"distribute": {
+			/* android打包配置 */
+			"android": {
+				"permissions": [
+					"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+					"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+					"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+					"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+					"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+					"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.CAMERA\"/>",
+					"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+					"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+					"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+					"<uses-feature android:name=\"android.hardware.camera\"/>",
+					"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+				]
+			},
+			/* ios打包配置 */
+			"ios": {},
+			/* SDK配置 */
+			"sdkConfigs": {}
+		}
+	},
+	/* 快应用特有相关 */
+	"quickapp": {},
+	/* 小程序特有相关 */
+	"mp-weixin": {
+		"appid": "wx0f8eba0a55baa7fc",
+		"setting": {
+			"urlCheck": false,
+			"minified": true
+		},
+		"usingComponents": true,
+		"permission": {
+			"scope.userLocation": {
+				"desc": "获取位置，推荐精彩信息"
+			}
+		},
+		"requiredPrivateInfos": ["getLocation", "chooseLocation"]
+
+	},
+	"mp-alipay": {
+		"usingComponents": true
+	},
+	"mp-baidu": {
+		"usingComponents": true
+	},
+	"mp-toutiao": {
+		"usingComponents": true
+	},
+	"uniStatistics": {
+		"enable": false
+	},
+	"vueVersion": "2"
 }

pages/login/login.vue

@@ -31,16 +31,9 @@
 			}
 		},
 		onLoad() {
-			this.getList()
 		},
 		methods: {
-			getList(){
-				this.$api.hotel.getHotelList({
-					page:1
-				}).then(res => {
-					console.log(res);
-				})
-			},
+			
 			
 			
 			// 加入优悦会

pages/map/map - 副本 (2).vue

@@ -0,0 +1,904 @@
+<template>
+	<view class="map">
+		<!-- 查询 -->
+		<view class="search">
+			<view class="search-top" style="padding: 16rpx 30rpx 0rpx;margin-bottom: 20rpx;">
+				<view class="search-loupe" @click="isopenSearch = !isopenSearch">
+					<image style="width: 32rpx;height: 32rpx;" src="/static/icon/search02.png" mode=""></image>
+				</view>
+				<view class="search-area-all">
+					<view :class="isSelectArea?'search-area':'search-areaClick'" @click="openArea">
+						<text>地区</text>
+						<image v-if="isSelectArea" style="width: 16rpx;height: 10rpx;" src="/static/icon/down01.png"
+							mode="">
+						</image>
+						<image v-if="!isSelectArea" style="width: 16rpx;height: 10rpx;" src="/static/icon/up01.png"
+							mode="">
+						</image>
+					</view>
+					<view :class="isSelectBrand?'search-area':'search-areaClick'" @click="openBrand">
+						<text>品牌</text>
+						<image v-if="isSelectBrand" style="width: 16rpx;height: 10rpx;" src="/static/icon/down01.png"
+							mode="">
+						</image>
+						<image v-if="!isSelectBrand" style="width: 16rpx;height: 10rpx;" src="/static/icon/up01.png"
+							mode="">
+						</image>
+					</view>
+					<view class="search-area" :class="isSelectSift?'search-area':'search-areaClick'" @click="openSift">
+						<text>更多筛选</text>
+						<image v-if="isSelectSift" style="width: 16rpx;height: 10rpx;" src="/static/icon/down01.png"
+							mode="">
+						</image>
+						<image v-if="!isSelectSift" style="width: 16rpx;height: 10rpx;" src="/static/icon/up01.png"
+							mode="">
+						</image>
+					</view>
+				</view>
+				<image style=" flex: none; width: 52rpx;height: 46rpx;" src="/static/icon/vip.png" mode=""></image>
+			</view>
+			<view class="search-detail" v-if="isopenSearch">
+				<u-input placeholder="输入酒店/城市名称搜索酒店" border='none'>
+					<template slot="suffix" style='margin-right:40rpx;'>
+						<u-image :showLoading="true" :showError='true' src="/static/icon/search.png" width="40rpx"
+							height="32rpx"></u-image>
+					</template>
+				</u-input>
+			</view>
+			<!-- 选择地区 -->
+			<view class="search-detail" v-if="!isSelectArea">
+				<view class="search-detail-area">
+					<view class="areaTitle" v-for="(item,index) in areaList" :key="index" @click="checked(index)">
+						<view :class="{'active-area':isActive === index}">
+							{{item.title}}
+						</view>
+					</view>
+				</view>
+				<view class="search-detail-btn">
+					<view class="search-detail-btn-left">
+						<text>取消</text>
+					</view>
+					<view class="search-detail-btn-right">
+						<text>确认</text>
+					</view>
+				</view>
+			</view>
+			<!-- 选择品牌-->
+			<view class="search-detail" v-if="!isSelectBrand">
+				<view class="search-detail-area">
+					<view class="areaTitle" v-for="(item,index) in brandList" :key="index" @click="checked(index)">
+						<view :class="{'active-area':isActive === index}">
+							{{item.title}}
+						</view>
+					</view>
+				</view>
+				<view class="search-detail-btn">
+					<view class="search-detail-btn-left">
+						<text>取消</text>
+					</view>
+					<view class="search-detail-btn-right">
+						<text>确认</text>
+					</view>
+				</view>
+			</view>
+			<!-- 筛选-->
+			<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>
+					</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>
+					</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>
+						</view>
+						<view class="search-detail-btn-right">
+							<text>确认</text>
+						</view>
+					</view>
+				</view>
+
+			</view>
+
+		</view>
+		<view class="address" v-if="isShow">
+			<view style="height:1232rpx;">
+				<hch-position :markers="markers"></hch-position>
+			</view>
+			<view class="address-nav">
+				<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="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>
+
+		</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>
+	</view>
+</template>
+
+<script>
+	import TabBar from '../../components/TabBar/tabbar.vue'
+	import HchPosition from '../../components/hch-position/hch-position.vue'
+	export default {
+		components: {
+			TabBar,
+			HchPosition
+		},
+		data() {
+			return {
+				hotelList:[],
+				//门店在地图上的标记 以下字段必填
+				markers: [],
+
+				//暂无数据
+				status: 'noMore',
+				contentText: {
+					contentdown: '查看更多',
+					contentrefresh: '加载中',
+					contentnomore: '——  已经到底啦  ——'
+				},
+				//是否展示地图
+				isShow: true,
+				value: [0],
+				//合作伙伴
+				partner: [{
+					text: '足球',
+					value: 0
+				}, {
+					text: '篮球',
+					value: 1
+				}, {
+					text: '游泳',
+					value: 2
+				}, {
+					text: '游泳',
+					value: 3
+				}, {
+					text: '游泳',
+					value: 4
+				}, {
+					text: '游泳',
+					value: 5
+				}, {
+					text: '游泳',
+					value: 6
+				}, {
+					text: '游泳',
+					value: 7
+				}, ],
+
+				//品牌
+				brandList: [{
+					title: '谷歌'
+				}, {
+					title: '微软'
+				}, {
+					title: 'iphone'
+				}, {
+					title: '新希望'
+				}, {
+					title: '三江重工'
+				}, {
+					title: 'JavaScript'
+				}],
+				//地区
+				areaList: [{
+					title: '重庆'
+				}, {
+					title: '成都'
+				}, {
+					title: '绵阳'
+				}, {
+					title: '广汉'
+				}, {
+					title: '内江'
+				}, {
+					title: '宜宾'
+				}, {
+					title: '大理'
+				}, {
+					title: '自贡'
+				}, {
+					title: '贵州'
+				}, {
+					title: '泸州'
+				}],
+				//激活指定table菜单
+				isActive: 0,
+				//展开搜索
+				isopenSearch: false,
+				//选择地区
+				isSelectArea: true,
+				//选择品牌
+				isSelectBrand: true,
+				//刷选
+				isSelectSift: true,
+				//是否展示合作伙伴
+				isPartner: false,
+				//是否展示加盟品牌
+				isJoin: false,
+			}
+		},
+
+		onLoad() {
+			//获取酒店列表
+			this.getList()
+		},
+
+		methods: {
+			getList() {
+				this.$api.hotel.getHotelList({
+					page: 1
+				}).then(res => {
+					this.hotelList = res.data.data
+					console.log(this.hotelList);
+					this.markers = this.hotelList.map(item=>{
+						return {
+							id:item.id,
+							latitude: item.latitude,
+							longitude: item.longitude,
+							width:'34rpx',
+							height:'40rpx',
+							iconPath: '../../../static/navigation.png',
+							callout: {
+								content:item.name,
+								borderRadius: 10,
+								padding: 10,
+								display: "ALWAYS",
+							}	
+						}
+					})
+					console.log(this.markers);
+				})
+			},
+			//去预定页面
+			goBook() {
+				uni.navigateTo({
+					url: '/pages/map/hotel-book/index'
+				})
+			},
+			//返回上一级
+			returnBtn() {
+				this.isShow = !this.isShow
+			},
+			//打开酒店列表
+			goHotelList() {
+				console.log(111);
+				this.isShow = !this.isShow
+			},
+
+
+			//是否展示加盟品牌
+			selectJoin() {
+				this.isJoin = !this.isJoin
+			},
+			//是否展示合作伙伴
+			selectPartner() {
+				this.isPartner = !this.isPartner
+			},
+			//合作伙伴刷选
+			change(e) {
+				console.log('e:', e);
+			},
+			//菜单index切换
+			checked(index) {
+				this.isActive = index
+			},
+			//展开地区选择
+			openArea() {
+				console.log(111);
+				this.isSelectArea = !this.isSelectArea
+			},
+			//展开品牌选择
+			openBrand() {
+				this.isSelectBrand = !this.isSelectBrand
+			},
+			//展开筛选选择
+			openSift() {
+				this.isSelectSift = !this.isSelectSift
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	page {
+		height: 100%;
+	}
+
+	.map {
+		height: 100%;
+		background-color: #f9f9f9;
+		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%;
+		position: absolute;
+		top: 88rpx;
+		z-index: 999 !important;
+		background-color: #ffffff;
+		box-shadow: 0px 12rpx 16rpx 0px rgba(220, 222, 229, 0.4);
+		padding: 20rpx 30rpx 20rpx;
+
+		.partner {
+			.partner-top {
+				height: 88rpx;
+				border-top: 2rpx solid #F0F0F0;
+				border-bottom: 2rpx solid #F0F0F0;
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				color: #333;
+				font-size: 28rpx;
+			}
+
+			.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;
+				}
+
+				::v-deep .uni-data-checklist .checklist-group .checklist-box .checkbox__inner .checkbox__inner-icon {
+					top: 6rpx !important;
+					left: 17rpx !important;
+					height: 24rpx !important;
+					width: 15rpx !important;
+					border-right-color: #ff6200;
+					border-bottom-color: #ff6200;
+				}
+
+				::v-deep .uni-data-checklist .checklist-group .checklist-box.is--default.is-checked .checklist-text {
+					color: #666 !important;
+					font-size: 24rpx !important;
+				}
+
+				::v-deep .checklist-text {
+					font-size: 24rpx !important;
+				}
+
+				::v-deep .uni-data-checklist .checklist-group .checklist-box.is--default.is-checked .checkbox__inner {
+					border-color: #EDEDED !important;
+					background-color: #ffffff;
+				}
+			}
+		}
+
+		.search-detail-area {
+			width: 100%;
+			display: flex;
+			flex-wrap: wrap;
+			justify-content: flex-start;
+			align-items: center;
+
+			.areaTitle {
+				width: 156rpx;
+				height: 56rpx;
+				background: #FFFFFF;
+				border: 2rpx solid #EDEDED;
+				border-radius: 28rpx;
+				font-size: 28rpx;
+				color: #666;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				margin-right: 20rpx;
+				margin-bottom: 18rpx;
+
+				&:nth-child(4n) {
+					margin-right: 0;
+				}
+			}
+
+			// .areaTitle-item {
+			// 	width: 156rpx;
+			// 	height: 56rpx;
+			// 	background-color: #F1F1F1;
+			// 	border-radius: 26rpx;
+			// 	font-size: 24rpx;
+			// 	color: #999;
+			// 	display: flex;
+			// 	justify-content: center;
+			// 	align-items: center;
+			// }
+			.active-area {
+				width: 156rpx;
+				height: 56rpx;
+				border-radius: 28rpx;
+				background-color: #FF6200;
+				color: #fff;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+			}
+		}
+
+		.search-detail-btn {
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			margin: 38rpx 0 20rpx;
+
+			.search-detail-btn-left {
+				flex: 1;
+				height: 76rpx;
+				background: rgba(237, 237, 237, .55);
+				border-radius: 8rpx;
+				color: #999999;
+				font-size: 30rpx;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				font-weight: bold;
+
+			}
+
+			.search-detail-btn-right {
+				flex: 1;
+				height: 76rpx;
+				background: linear-gradient(270deg, #FF6200 0%, #FF9342 100%);
+				border-radius: 8rpx;
+				color: #FFFFFF;
+				font-size: 30rpx;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				margin-left: 22rpx;
+				font-weight: bold;
+			}
+
+		}
+
+		::v-deep .u-input {
+			width: 690rpx !important;
+			height: 68rpx !important;
+			background: #F1F1F1;
+			border-radius: 74rpx;
+		}
+
+		::v-deep .u-input__content__field-wrapper {
+			padding-left: 36rpx;
+		}
+	}
+
+
+	.search-top {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+	}
+
+	.search {
+		position: relative;
+		flex: none;
+		width: 100%;
+		background: #FFFFFF;
+		box-shadow: 0px 12rpx 16rpx 0px rgba(220, 222, 229, 0.4);
+		display: flex;
+		flex-direction: column;
+		align-items: inherit;
+		justify-content: space-between;
+
+		.search-loupe {
+			flex: none;
+			width: 60rpx;
+			height: 60rpx;
+			background: #FFFFFF;
+			border-radius: 50%;
+			border: 2rpx solid #EDEDED;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			margin-right: 16rpx;
+		}
+
+		.search-area-all {
+			flex: 1;
+			display: flex;
+			align-items: center;
+			justify-content: flex-start;
+
+			.search-areaClick {
+				padding: 12rpx 22rpx;
+				height: 52rpx;
+				background: #FFFFFF;
+				border-radius: 26rpx;
+				border: 2rpx solid #FF6200;
+				font-weight: 500;
+				color: #FF6200;
+				font-size: 28rpx;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				margin-right: 16rpx;
+
+				text {
+					margin-right: 8rpx;
+				}
+			}
+
+			.search-area {
+				padding: 12rpx 22rpx;
+				height: 52rpx;
+				background: #FFFFFF;
+				border-radius: 26rpx;
+				border: 2rpx solid #EDEDED;
+				font-weight: 500;
+				color: #666666;
+				font-size: 28rpx;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				margin-right: 16rpx;
+
+				text {
+					margin-right: 8rpx;
+				}
+			}
+		}
+
+	}
+
+	.address-nav {
+		position: absolute;
+		width: 100%;
+		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 {
+		flex: 1;
+		position: relative;
+
+		.address-detail {
+			position: relative;
+			flex: none;
+			width: 496rpx;
+			border-radius: 10rpx;
+			margin-right: 16rpx;
+
+			&:last-child {
+				margin-right: 0rpx;
+			}
+
+			.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;
+				}
+			}
+
+
+		}
+	}
+</style>

pages/map/map.vue

@@ -1,216 +1,11 @@
 <template>
 	<view class="map">
 		<!-- 查询 -->
-		<view class="search">
-			<view class="search-top" style="padding: 16rpx 30rpx 0rpx;margin-bottom: 20rpx;">
-				<view class="search-loupe" @click="isopenSearch = !isopenSearch">
-					<image style="width: 32rpx;height: 32rpx;" src="/static/icon/search02.png" mode=""></image>
-				</view>
-				<view class="search-area-all">
-					<view :class="isSelectArea?'search-area':'search-areaClick'" @click="openArea">
-						<text>地区</text>
-						<image v-if="isSelectArea" style="width: 16rpx;height: 10rpx;" src="/static/icon/down01.png"
-							mode="">
-						</image>
-						<image v-if="!isSelectArea" style="width: 16rpx;height: 10rpx;" src="/static/icon/up01.png"
-							mode="">
-						</image>
-					</view>
-					<view :class="isSelectBrand?'search-area':'search-areaClick'" @click="openBrand">
-						<text>品牌</text>
-						<image v-if="isSelectBrand" style="width: 16rpx;height: 10rpx;" src="/static/icon/down01.png"
-							mode="">
-						</image>
-						<image v-if="!isSelectBrand" style="width: 16rpx;height: 10rpx;" src="/static/icon/up01.png"
-							mode="">
-						</image>
-					</view>
-					<view class="search-area" :class="isSelectSift?'search-area':'search-areaClick'" @click="openSift">
-						<text>更多筛选</text>
-						<image v-if="isSelectSift" style="width: 16rpx;height: 10rpx;" src="/static/icon/down01.png"
-							mode="">
-						</image>
-						<image v-if="!isSelectSift" style="width: 16rpx;height: 10rpx;" src="/static/icon/up01.png"
-							mode="">
-						</image>
-					</view>
-				</view>
-				<image style=" flex: none; width: 52rpx;height: 46rpx;" src="/static/icon/vip.png" mode=""></image>
+		<view class="address">
+			<view style="width: 750rpx; height:1200rpx;">
+				<map subkey='CQIBZ-P2MR5-PM3IB-QRKTX-SEVJE-GYF34' id="map" class="maps" @regionchange="onMapRegionChange" @tap="onMapTap" @markertap="onmarkertap"  enable3D="true" enableBuilding="true"  enableScroll="true" enableZoom="true"  :latitude="latitude" :layerStyle="mapStyle" :longitude="longitude"   :showCompass="false" :showLocation="true" :showScale="false"></map>
 			</view>
-			<view class="search-detail" v-if="isopenSearch">
-				<u-input placeholder="输入酒店/城市名称搜索酒店" border='none'>
-					<template slot="suffix" style='margin-right:40rpx;'>
-						<u-image :showLoading="true" :showError='true' src="/static/icon/search.png" width="40rpx"
-							height="32rpx"></u-image>
-					</template>
-				</u-input>
-			</view>
-			<!-- 选择地区 -->
-			<view class="search-detail" v-if="!isSelectArea">
-				<view class="search-detail-area">
-					<view class="areaTitle" v-for="(item,index) in areaList" :key="index" @click="checked(index)">
-						<view :class="{'active-area':isActive === index}">
-							{{item.title}}
-						</view>
-					</view>
-				</view>
-				<view class="search-detail-btn">
-					<view class="search-detail-btn-left">
-						<text>取消</text>
-					</view>
-					<view class="search-detail-btn-right">
-						<text>确认</text>
-					</view>
-				</view>
-			</view>
-			<!-- 选择品牌-->
-			<view class="search-detail" v-if="!isSelectBrand">
-				<view class="search-detail-area">
-					<view class="areaTitle" v-for="(item,index) in brandList" :key="index" @click="checked(index)">
-						<view :class="{'active-area':isActive === index}">
-							{{item.title}}
-						</view>
-					</view>
-				</view>
-				<view class="search-detail-btn">
-					<view class="search-detail-btn-left">
-						<text>取消</text>
-					</view>
-					<view class="search-detail-btn-right">
-						<text>确认</text>
-					</view>
-				</view>
-			</view>
-			<!-- 筛选-->
-			<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>
-					</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>
-					</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>
-						</view>
-						<view class="search-detail-btn-right">
-							<text>确认</text>
-						</view>
-					</view>
-				</view>
-
-			</view>
-
 		</view>
-		<view class="address" v-if="isShow">
-			<view style="height:1232rpx;">
-				<hch-position></hch-position>
-			</view>
-			<view class="address-nav">
-				<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="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>
-
-		</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>
 	</view>
 </template>
@@ -225,107 +20,98 @@
 		},
 		data() {
 			return {
-				//暂无数据
-				status: 'noMore',
-				contentText: {
-					contentdown: '查看更多',
-					contentrefresh: '加载中',
-					contentnomore: '——  已经到底啦  ——'
-				},
-				//是否展示地图
-				isShow: true,
-
-
-				value: [0],
-				//合作伙伴
-				partner: [{
-					text: '足球',
-					value: 0
-				}, {
-					text: '篮球',
-					value: 1
-				}, {
-					text: '游泳',
-					value: 2
-				}, {
-					text: '游泳',
-					value: 3
-				}, {
-					text: '游泳',
-					value: 4
-				}, {
-					text: '游泳',
-					value: 5
-				}, {
-					text: '游泳',
-					value: 6
-				}, {
-					text: '游泳',
-					value: 7
-				}, ],
-
-				//品牌
-				brandList: [{
-					title: '谷歌'
-				}, {
-					title: '微软'
-				}, {
-					title: 'iphone'
-				}, {
-					title: '新希望'
-				}, {
-					title: '三江重工'
-				}, {
-					title: 'JavaScript'
-				}],
-				//地区
-				areaList: [{
-					title: '重庆'
-				}, {
-					title: '成都'
-				}, {
-					title: '绵阳'
-				}, {
-					title: '广汉'
-				}, {
-					title: '内江'
-				}, {
-					title: '宜宾'
-				}, {
-					title: '大理'
-				}, {
-					title: '自贡'
-				}, {
-					title: '贵州'
-				}, {
-					title: '泸州'
-				}],
-				//激活指定table菜单
-				isActive: 0,
-				//展开搜索
-				isopenSearch: false,
-				//选择地区
-				isSelectArea: true,
-				//选择品牌
-				isSelectBrand: true,
-				//刷选
-				isSelectSift: true,
-				//是否展示合作伙伴
-				isPartner: false,
-				//是否展示加盟品牌
-				isJoin: false,
-
+				latitude: 39.924361,//中心纬度
+				longitude: 116.518557,//中心经度
+				 mapStyle: 1,//个性化地图
+				 // scale: l.DEFAULT_SCALE,//缩放级别
 			}
 		},
-		methods: {
+
+		onLoad() {
+			//获取酒店列表
+			this.getList()
+			this.updated()
+		},
+
+		methods: {updated() {
+				let _this = this
+				wx.getLocation({
+					type: "gcj02", //返回可以用于wx.openLocation的经纬度
+					success: function(res) {
+						_this.latitude = res.latitude
+						_this.longitude = res.longitude
+					},
+					fail: function(res) {
+						console.log(res);
+					}
+				})
+			},
+			//视野发生变化时触发
+			onMapRegionChange: function(e) {
+			    // var t = e.causedBy, r = e.type, i = e.detail.region;
+			    // if (("drag" == t || "scale" == t) && "end" == r) {
+			    //     for (var n = i.northeast, o = i.southwest, l = this.data.markersSource, s = [], c = 0, u = l.length; c < u; c++) {
+			    //         var d = l[c], g = d.latitude, p = d.longitude;
+			    //         !d.load && g > o.latitude && g < n.latitude & p > o.longitude && p < n.longitude && (d.load = !0, 
+			    //         s.push(d));
+			    //     }
+			    //     a.addMarkers({
+			    //         markers: s,
+			    //         clear: !1
+			    //     });
+			    // }
+			},
+			//点击地图时触发
+			onMapTap: function(e) {},
+			//点击标记点时触发
+			onmarkertap: function(e) {
+			    var t = e.detail.markerId;
+			    wx.vibrateShort({
+			        type: "light"
+			    });
+			    var a = this.data, r = a.swiperCurrent;
+			    a.markersSource;
+			    this.updateActiveMarker(r, t), this.setData({
+			        swiperCurrent: t
+			    });
+			},
+			
+			
+			
+			
+			getList() {
+				this.$api.hotel.getHotelList({
+					page: 1
+				}).then(res => {
+					this.hotelList = res.data.data
+					console.log(this.hotelList);
+					this.markers = this.hotelList.map(item=>{
+						return {
+							id:item.id,
+							latitude: item.latitude,
+							longitude: item.longitude,
+							width:'34rpx',
+							height:'40rpx',
+							iconPath: '../../../static/navigation.png',
+							callout: {
+								content:item.name,
+								borderRadius: 10,
+								padding: 10,
+								display: "ALWAYS",
+							}	
+						}
+					})
+					console.log(this.markers);
+				})
+			},
 			//去预定页面
-			goBook(){
+			goBook() {
 				uni.navigateTo({
-					url:'/pages/map/hotel-book/index'
+					url: '/pages/map/hotel-book/index'
 				})
 			},
 			//返回上一级
-			returnBtn(){
+			returnBtn() {
 				this.isShow = !this.isShow
 			},
 			//打开酒店列表
@@ -333,8 +119,6 @@
 				console.log(111);
 				this.isShow = !this.isShow
 			},
-
-
 			//是否展示加盟品牌
 			selectJoin() {
 				this.isJoin = !this.isJoin
@@ -379,17 +163,23 @@
 		display: flex;
 		flex-direction: column;
 	}
-	.return-btn{
+	.maps{
+		width: 100%;
+		height: 1200rpx;
+	}
+
+	.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;
@@ -399,6 +189,7 @@
 		.hotel-list-item {
 			width: 100%;
 			margin-bottom: 20rpx;
+
 			.wrap {
 				width: 100%;
 				height: 318rpx;
@@ -765,9 +556,11 @@
 			width: 496rpx;
 			border-radius: 10rpx;
 			margin-right: 16rpx;
+
 			&:last-child {
 				margin-right: 0rpx;
 			}
+
 			.inner {
 				width: 100%;
 				height: 318rpx;

pages/my/integral/integral.vue

@@ -62,6 +62,8 @@
 					contentrefresh: '加载中',
 					contentnomore: '——  已经到底啦  ——'
 				},
+				// 积分产品列表
+				integralList:[],
 				
 				arr:[],
 				// 瀑布流组件相关
@@ -75,15 +77,15 @@
 					},{
 						label:'中秋佳节五仁月饼，惊喜特供，限时抢购',
 						money:8459,
-						url:'/static/icon/loginBg.png',
+						url:'http://t9.9026.com/imgs/loginBg.png',
 					},{
 						label:'中秋佳节五仁月饼，惊喜特供，限时抢购1111111111111111111111111111',
 						money:8459,
-						url:'/static/icon/Kudosbg.png',
+						url:'http://t9.9026.com/imgs/Kudosbg.png',
 					},{
 						label:'中秋佳节五仁月饼，惊喜特供，限时抢购',
 						money:8459,
-						url:'/static/icon/Kudosbg.png',
+						url:'http://t9.9026.com/imgs/Kudosbg.png',
 					},{
 						label:'中秋佳节',
 						money:8459,
@@ -91,23 +93,36 @@
 					},{
 						label:'中秋佳节五仁月饼，惊喜特供，限时抢购',
 						money:8459,
-						url:'/static/icon/loginBg.png',
+						url:'http://t9.9026.com/imgs/loginBg.png',
 					},{
 						label:'中秋佳节五仁月饼，惊喜特供，限时抢购1111111111111111111111111111',
 						money:8459,
-						url:'/static/icon/Kudosbg.png',
+						url:'http://t9.9026.com/imgs/Kudosbg.png',
 					},{
 						label:'中秋佳节五仁月饼',
 						money:8459,
-						url:'/static/icon/Kudosbg.png',
+						url:'http://t9.9026.com/imgs/Kudosbg.png',
 					}],
 				}
 			}
 		},
 		onLoad() {
 			this.shortLong()
+			this.getProductList()
 		},
 		methods:{
+			// 获取积分产品列表
+			getProductList(){
+				this.$api.product.getProducts({
+					page:1,
+					type:2,
+				}).then(res=>{
+					console.log(res,"积分产品")
+					if(res.code==0){
+						this.integralList=res.data.data
+					}
+				})
+			},
 			// 跳转积分规则
 			gointegralRule(){
 				uni.navigateTo({

pages/my/integral/integralRecord.vue

@@ -55,14 +55,53 @@
 					contentdown: '查看更多',
 					contentrefresh: '加载中',
 					contentnomore: '——  已经到底啦  ——'
-				}
+				},
+				// 收入列表
+				incomeList:[],
+				// 支出列表
+				spendingList:[],
 			}
 		},
+		onLoad() {
+			// 收入
+			this.getIntegralList(1)
+			// 支出
+			this.getIntegralList(2)
+		},
 		methods:{
 			//菜单index切换
 			checked(index) {
 				this.isActive = index
 			},
+			// 获取积分日志
+			getIntegralList(type){
+				if(type==1){
+					this.$api.integral.getIntegralLog({
+						page:1,
+						type:1
+					}).then(res=>{
+						console.log(res,'收入积分日志')
+						if(res.code==0){
+							this.incomeList=res.data.data
+						}
+					})
+				} else if (type==2){
+					this.$api.integral.getIntegralLog({
+						page:1,
+						type:2
+					}).then(res=>{
+						console.log(res,'支出积分日志')
+						if(res.code==0){
+							this.spendingList=res.data.data
+						}
+					})
+				}else{
+					uni.showToast({
+						title:'请传入正确type值!',
+						icon:'none'
+					})
+				}
+			},
 		}
 	}
 </script>

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

@@ -74,6 +74,5 @@
       }
     ]
   },
-  "usingComponents": {},
-  "sitemapLocation": "sitemap.json"
+  "usingComponents": {}
 }

unpackage/dist/build/mp-weixin/components/waterfall/waterfall-item.js

@@ -1,4 +1,4 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["components/waterfall/waterfall-item"],{"099f":function(t,e,n){"use strict";n.r(e);var a=n("ce74"),r=n.n(a);for(var i in a)"default"!==i&&function(t){n.d(e,t,(function(){return a[t]}))}(i);e["default"]=r.a},"0d6c":function(t,e,n){},"1d15":function(t,e,n){"use strict";var a;n.d(e,"b",(function(){return r})),n.d(e,"c",(function(){return i})),n.d(e,"a",(function(){return a}));var r=function(){var t=this,e=t.$createElement;t._self._c},i=[]},"9cbf":function(t,e,n){"use strict";n.r(e);var a=n("1d15"),r=n("099f");for(var i in r)"default"!==i&&function(t){n.d(e,t,(function(){return r[t]}))}(i);n("9ff4");var u,c=n("f0c5"),o=Object(c["a"])(r["default"],a["b"],a["c"],!1,null,"328fd102",null,!1,a["a"],u);e["default"]=o.exports},"9ff4":function(t,e,n){"use strict";var a=n("0d6c"),r=n.n(a);r.a},ce74:function(t,e,n){"use strict";(function(t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var n={name:"helangWaterfallItem",options:{virtualHost:!0},props:{params:{type:Object,default:function(){return{}}},tag:{type:String|Number,default:""},index:{type:Number,default:-1}},data:function(){return{}},methods:{emitHeight:function(e){var n=this,a=t.createSelectorQuery().in(this);a.select(".waterfall-item-container").boundingClientRect((function(t){var e=Math.floor(t.height);n.$emit("height",e,n.$props.tag)})).exec()},onTap:function(e){this.$emit("click",this.$props.index,this.$props.tag),console.log(e),t.navigateTo({url:"/pages/my/integral/integralOrder"})}}};e.default=n}).call(this,n("543d")["default"])}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["components/waterfall/waterfall-item"],{"099f":function(t,e,n){"use strict";n.r(e);var a=n("ce74"),r=n.n(a);for(var i in a)"default"!==i&&function(t){n.d(e,t,(function(){return a[t]}))}(i);e["default"]=r.a},"0e56":function(t,e,n){"use strict";var a=n("50ed"),r=n.n(a);r.a},"50ed":function(t,e,n){},"9cbf":function(t,e,n){"use strict";n.r(e);var a=n("f278"),r=n("099f");for(var i in r)"default"!==i&&function(t){n.d(e,t,(function(){return r[t]}))}(i);n("0e56");var u,c=n("f0c5"),o=Object(c["a"])(r["default"],a["b"],a["c"],!1,null,"11c3029e",null,!1,a["a"],u);e["default"]=o.exports},ce74:function(t,e,n){"use strict";(function(t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var n={name:"helangWaterfallItem",options:{virtualHost:!0},props:{params:{type:Object,default:function(){return{}}},tag:{type:String|Number,default:""},index:{type:Number,default:-1}},data:function(){return{}},methods:{emitHeight:function(e){var n=this,a=t.createSelectorQuery().in(this);a.select(".waterfall-item-container").boundingClientRect((function(t){var e=Math.floor(t.height);n.$emit("height",e,n.$props.tag)})).exec()},onTap:function(e){this.$emit("click",this.$props.index,this.$props.tag),console.log(e),t.navigateTo({url:"/pages/my/integral/integralOrder"})}}};e.default=n}).call(this,n("543d")["default"])},f278:function(t,e,n){"use strict";var a;n.d(e,"b",(function(){return r})),n.d(e,"c",(function(){return i})),n.d(e,"a",(function(){return a}));var r=function(){var t=this,e=t.$createElement;t._self._c},i=[]}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'components/waterfall/waterfall-item-create-component',
     {

unpackage/dist/build/mp-weixin/components/waterfall/waterfall-item.wxml

@@ -1 +1 @@
-<view class="waterfall-item-container data-v-328fd102"><view class="waterfall-item-container data-v-328fd102"><view data-event-opts="{{[['tap',[['onTap',['$0'],['params.money']]]]]}}" class="contentItem data-v-328fd102" bindtap="__e"><image src="{{params.url}}" mode="widthFix" data-event-opts="{{[['load',[['emitHeight',['$event']]]],['error',[['emitHeight',['$event']]]]]}}" bindload="__e" binderror="__e" class="data-v-328fd102"></image><view class="itemName data-v-328fd102">{{params.label}}</view><view class="itemPrice data-v-328fd102">{{params.money+"积分"}}</view></view></view></view>
+<view class="waterfall-item-container data-v-11c3029e"><view class="waterfall-item-container data-v-11c3029e"><view data-event-opts="{{[['tap',[['onTap',['$0'],['params.money']]]]]}}" class="contentItem data-v-11c3029e" bindtap="__e"><image src="{{params.url}}" mode="widthFix" data-event-opts="{{[['load',[['emitHeight',['$event']]]],['error',[['emitHeight',['$event']]]]]}}" bindload="__e" binderror="__e" class="data-v-11c3029e"></image><view class="itemName data-v-11c3029e">{{params.label}}</view><view class="itemPrice data-v-11c3029e">{{params.money+"积分"}}</view></view></view></view>

unpackage/dist/build/mp-weixin/components/waterfall/waterfall-item.wxss

@@ -1 +1 @@
-.waterfall-item-container.data-v-328fd102{display:flex;flex-wrap:wrap;box-sizing:border-box}.waterfall-item-container .contentItem.data-v-328fd102{width:332rpx;height:100%;background:#fff;box-sizing:border-box;box-shadow:0 4rpx 8rpx 0 rgba(0,0,0,.04);border-radius:12rpx}.waterfall-item-container .contentItem image.data-v-328fd102{width:100%;height:100%}.waterfall-item-container .contentItem .itemName.data-v-328fd102{margin:0 18rpx 10rpx 22rpx;font-size:28rpx;font-family:PingFang-SC-Bold,PingFang-SC;font-weight:700;color:#333}.waterfall-item-container .contentItem .itemPrice.data-v-328fd102{margin-left:22rpx;font-size:28rpx;font-family:PingFang-SC-Bold,PingFang-SC;font-weight:700;color:#ff6200}
+.waterfall-item-container.data-v-11c3029e{display:flex;flex-wrap:wrap;box-sizing:border-box}.waterfall-item-container .contentItem.data-v-11c3029e{width:332rpx;background:#fff;box-sizing:border-box;box-shadow:0 4rpx 8rpx 0 rgba(0,0,0,.04);border-radius:12rpx}.waterfall-item-container .contentItem image.data-v-11c3029e{width:100%;height:100%}.waterfall-item-container .contentItem .itemName.data-v-11c3029e{margin:0 18rpx 10rpx 22rpx;font-size:28rpx;font-family:PingFang-SC-Bold,PingFang-SC;font-weight:700;color:#333}.waterfall-item-container .contentItem .itemPrice.data-v-11c3029e{margin-left:22rpx;font-size:28rpx;font-family:PingFang-SC-Bold,PingFang-SC;font-weight:700;color:#ff6200}

unpackage/dist/build/mp-weixin/components/waterfall/waterfall-list.wxml

@@ -1 +1 @@
-<view class="data-v-e0a05226"><block wx:if="{{showList}}"><view class="waterfall-box h-flex-x h-flex-2 data-v-e0a05226"><view class="data-v-e0a05226"><block wx:for="{{leftList}}" wx:for-item="item" wx:for-index="index" wx:key="_render_id"><view class="{{['list-item','data-v-e0a05226',(showPage>item._current_page)?'show':'']}}"><helang-waterfall-item vue-id="{{'7437c0d5-1-'+index}}" params="{{item}}" tag="left" index="{{index}}" data-event-opts="{{[['^height',[['onHeight']]],['^click',[['onClick']]]]}}" bind:height="__e" bind:click="__e" class="data-v-e0a05226" bind:__l="__l"></helang-waterfall-item></view></block></view><view class="data-v-e0a05226"><block wx:for="{{rightList}}" wx:for-item="item" wx:for-index="index" wx:key="_render_id"><view class="{{['list-item','data-v-e0a05226',(showPage>item._current_page)?'show':'']}}"><helang-waterfall-item vue-id="{{'7437c0d5-2-'+index}}" params="{{item}}" tag="right" index="{{index}}" data-event-opts="{{[['^height',[['onHeight']]],['^click',[['onClick']]]]}}" bind:height="__e" bind:click="__e" class="data-v-e0a05226" bind:__l="__l"></helang-waterfall-item></view></block></view></view></block><slot></slot></view>
+<view class="data-v-59938ca8"><block wx:if="{{showList}}"><view class="waterfall-box h-flex-x h-flex-2 data-v-59938ca8"><view class="data-v-59938ca8"><block wx:for="{{leftList}}" wx:for-item="item" wx:for-index="index" wx:key="_render_id"><view class="{{['list-item','data-v-59938ca8',(showPage>item._current_page)?'show':'']}}"><helang-waterfall-item vue-id="{{'7437c0d5-1-'+index}}" params="{{item}}" tag="left" index="{{index}}" data-event-opts="{{[['^height',[['onHeight']]],['^click',[['onClick']]]]}}" bind:height="__e" bind:click="__e" class="data-v-59938ca8" bind:__l="__l"></helang-waterfall-item></view></block></view><view class="data-v-59938ca8"><block wx:for="{{rightList}}" wx:for-item="item" wx:for-index="index" wx:key="_render_id"><view class="{{['list-item','data-v-59938ca8',(showPage>item._current_page)?'show':'']}}"><helang-waterfall-item vue-id="{{'7437c0d5-2-'+index}}" params="{{item}}" tag="right" index="{{index}}" data-event-opts="{{[['^height',[['onHeight']]],['^click',[['onClick']]]]}}" bind:height="__e" bind:click="__e" class="data-v-59938ca8" bind:__l="__l"></helang-waterfall-item></view></block></view></view></block><slot></slot></view>

unpackage/dist/build/mp-weixin/components/waterfall/waterfall-list.wxss

@@ -1 +1 @@
-.waterfall-box.data-v-e0a05226{padding:20rpx 10rpx;box-sizing:border-box}.waterfall-box > view.data-v-e0a05226{padding:0 10rpx}.waterfall-box .list-item.data-v-e0a05226{margin-bottom:0;opacity:0;box-shadow:0 4rpx 8rpx 0 rgba(0,0,0,.04);overflow:hidden;height:0}.waterfall-box .list-item.show.data-v-e0a05226{margin-bottom:20rpx;opacity:1;height:auto}.h-flex-x.data-v-e0a05226{display:flex;flex-direction:row;flex-wrap:nowrap;justify-content:flex-start;align-items:flex-start;align-content:flex-start}.h-flex-x.h-flex-2 > view.data-v-e0a05226{width:50%}
+.waterfall-box.data-v-59938ca8{padding:20rpx 10rpx;box-sizing:border-box}.waterfall-box > view.data-v-59938ca8{padding:0 10rpx}.waterfall-box .list-item.data-v-59938ca8{margin-bottom:0;opacity:0;box-shadow:0 4rpx 8rpx 0 rgba(0,0,0,.04);overflow:hidden;height:0}.waterfall-box .list-item.show.data-v-59938ca8{margin-bottom:20rpx;opacity:1;height:auto}.h-flex-x.data-v-59938ca8{display:flex;flex-direction:row;flex-wrap:nowrap;justify-content:flex-start;align-items:flex-start;align-content:flex-start}.h-flex-x.h-flex-2 > view.data-v-59938ca8{width:50%}

unpackage/dist/build/mp-weixin/pages/login/login.wxml

@@ -1 +1 @@
-<view class="login data-v-02c56817"><view class="img data-v-02c56817"><image src="http://t9.9026.com/imgs/loginBg.png" mode="scaleToFill" class="data-v-02c56817"></image></view><view class="title data-v-02c56817"><view class="line data-v-02c56817"></view><view class="logintype data-v-02c56817"><text class="data-v-02c56817">登录方式</text></view><view class="line data-v-02c56817"></view></view><view class="typebtn data-v-02c56817"><view data-event-opts="{{[['tap',[['goYouyue',['$event']]]]]}}" class="item data-v-02c56817" bindtap="__e"><image src="/static/icon/youyue.png" mode="scaleToFill" class="data-v-02c56817"></image><text class="data-v-02c56817">加入优悦会</text></view><view data-event-opts="{{[['tap',[['getmsg',['$event']]]]]}}" class="item data-v-02c56817" bindtap="__e"><image src="/static/icon/wechart.png" mode="scaleToFill" class="data-v-02c56817"></image><text class="data-v-02c56817">微信登录</text></view></view></view>
+<view class="login data-v-2ec93caf"><view class="img data-v-2ec93caf"><image src="http://t9.9026.com/imgs/loginBg.png" mode="scaleToFill" class="data-v-2ec93caf"></image></view><view class="title data-v-2ec93caf"><view class="line data-v-2ec93caf"></view><view class="logintype data-v-2ec93caf"><text class="data-v-2ec93caf">登录方式</text></view><view class="line data-v-2ec93caf"></view></view><view class="typebtn data-v-2ec93caf"><view data-event-opts="{{[['tap',[['goYouyue',['$event']]]]]}}" class="item data-v-2ec93caf" bindtap="__e"><image src="/static/icon/youyue.png" mode="scaleToFill" class="data-v-2ec93caf"></image><text class="data-v-2ec93caf">加入优悦会</text></view><view data-event-opts="{{[['tap',[['getmsg',['$event']]]]]}}" class="item data-v-2ec93caf" bindtap="__e"><image src="/static/icon/wechart.png" mode="scaleToFill" class="data-v-2ec93caf"></image><text class="data-v-2ec93caf">微信登录</text></view></view></view>

unpackage/dist/build/mp-weixin/pages/login/login.wxss

@@ -1 +1 @@
-.login.data-v-02c56817{height:100%;background:#fff;padding-top:146rpx;box-sizing:border-box}.img image.data-v-02c56817{width:750rpx;height:596rpx}.title.data-v-02c56817{height:40rpx;width:690rpx;margin-top:168rpx;margin-left:30rpx;margin-bottom:72rpx;display:flex;align-items:center;justify-content:space-between}.title .line.data-v-02c56817{width:240rpx;height:2rpx;background:#ededed;border-radius:1rpx}.title .logintype text.data-v-02c56817{font-size:28rpx;font-family:PingFang-SC-Medium,PingFang-SC;font-weight:500;color:#333}.typebtn.data-v-02c56817{display:flex;align-items:center;justify-content:space-around}.typebtn .item.data-v-02c56817{width:140rpx;height:156rpx;display:flex;flex-direction:column;align-items:center;justify-content:center}.typebtn .item image.data-v-02c56817{width:104rpx;height:104rpx;margin-bottom:12rpx}.typebtn .item text.data-v-02c56817{display:block;font-size:28rpx;font-family:PingFang-SC-Medium,PingFang-SC;font-weight:500;color:#666}
+.login.data-v-2ec93caf{height:100%;background:#fff;padding-top:146rpx;box-sizing:border-box}.img image.data-v-2ec93caf{width:750rpx;height:596rpx}.title.data-v-2ec93caf{height:40rpx;width:690rpx;margin-top:168rpx;margin-left:30rpx;margin-bottom:72rpx;display:flex;align-items:center;justify-content:space-between}.title .line.data-v-2ec93caf{width:240rpx;height:2rpx;background:#ededed;border-radius:1rpx}.title .logintype text.data-v-2ec93caf{font-size:28rpx;font-family:PingFang-SC-Medium,PingFang-SC;font-weight:500;color:#333}.typebtn.data-v-2ec93caf{display:flex;align-items:center;justify-content:space-around}.typebtn .item.data-v-2ec93caf{width:140rpx;height:156rpx;display:flex;flex-direction:column;align-items:center;justify-content:center}.typebtn .item image.data-v-2ec93caf{width:104rpx;height:104rpx;margin-bottom:12rpx}.typebtn .item text.data-v-2ec93caf{display:block;font-size:28rpx;font-family:PingFang-SC-Medium,PingFang-SC;font-weight:500;color:#666}

unpackage/dist/build/mp-weixin/pages/my/Kudos/Kudos.js

@@ -1 +1 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/my/Kudos/Kudos"],{"14ea":function(n,e,t){"use strict";(function(n){t("a89e");o(t("66fd"));var e=o(t("3cae"));function o(n){return n&&n.__esModule?n:{default:n}}wx.__webpack_require_UNI_MP_PLUGIN__=t,n(e.default)}).call(this,t("543d")["createPage"])},"3cae":function(n,e,t){"use strict";t.r(e);var o=t("8557"),u=t("8b78");for(var i in u)"default"!==i&&function(n){t.d(e,n,(function(){return u[n]}))}(i);t("f480");var a,r=t("f0c5"),c=Object(r["a"])(u["default"],o["b"],o["c"],!1,null,"40a8d842",null,!1,o["a"],a);e["default"]=c.exports},4278:function(n,e,t){},7439:function(n,e,t){"use strict";(function(n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var t={data:function(){return{isLike:!1,status:"noMore",contentText:{contentdown:"查看更多",contentrefresh:"加载中",contentnomore:"——  已经到底啦  ——"}}},methods:{goVoteDetail:function(){n.navigateTo({url:"/pages/index/vote-detail/index"})},clickKudos:function(){this.isLike=!this.isLike}}};e.default=t}).call(this,t("543d")["default"])},8557:function(n,e,t){"use strict";t.d(e,"b",(function(){return u})),t.d(e,"c",(function(){return i})),t.d(e,"a",(function(){return o}));var o={uniLoadMore:function(){return Promise.all([t.e("common/vendor"),t.e("uni_modules/uni-load-more/components/uni-load-more/uni-load-more")]).then(t.bind(null,"67038"))}},u=function(){var n=this,e=n.$createElement;n._self._c},i=[]},"8b78":function(n,e,t){"use strict";t.r(e);var o=t("7439"),u=t.n(o);for(var i in o)"default"!==i&&function(n){t.d(e,n,(function(){return o[n]}))}(i);e["default"]=u.a},f480:function(n,e,t){"use strict";var o=t("4278"),u=t.n(o);u.a}},[["14ea","common/runtime","common/vendor"]]]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/my/Kudos/Kudos"],{"14ea":function(n,e,t){"use strict";(function(n){t("a89e");o(t("66fd"));var e=o(t("3cae"));function o(n){return n&&n.__esModule?n:{default:n}}wx.__webpack_require_UNI_MP_PLUGIN__=t,n(e.default)}).call(this,t("543d")["createPage"])},"23dc":function(n,e,t){"use strict";var o=t("f7ce"),u=t.n(o);u.a},"3cae":function(n,e,t){"use strict";t.r(e);var o=t("cb28"),u=t("8b78");for(var c in u)"default"!==c&&function(n){t.d(e,n,(function(){return u[n]}))}(c);t("23dc");var i,r=t("f0c5"),a=Object(r["a"])(u["default"],o["b"],o["c"],!1,null,"746ccd5c",null,!1,o["a"],i);e["default"]=a.exports},7439:function(n,e,t){"use strict";(function(n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var t={data:function(){return{isLike:!1,status:"noMore",contentText:{contentdown:"查看更多",contentrefresh:"加载中",contentnomore:"——  已经到底啦  ——"}}},methods:{goVoteDetail:function(){n.navigateTo({url:"/pages/index/vote-detail/index"})},clickKudos:function(){this.isLike=!this.isLike}}};e.default=t}).call(this,t("543d")["default"])},"8b78":function(n,e,t){"use strict";t.r(e);var o=t("7439"),u=t.n(o);for(var c in o)"default"!==c&&function(n){t.d(e,n,(function(){return o[n]}))}(c);e["default"]=u.a},cb28:function(n,e,t){"use strict";t.d(e,"b",(function(){return u})),t.d(e,"c",(function(){return c})),t.d(e,"a",(function(){return o}));var o={uniLoadMore:function(){return Promise.all([t.e("common/vendor"),t.e("uni_modules/uni-load-more/components/uni-load-more/uni-load-more")]).then(t.bind(null,"67038"))}},u=function(){var n=this,e=n.$createElement;n._self._c},c=[]},f7ce:function(n,e,t){}},[["14ea","common/runtime","common/vendor"]]]);

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

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

unpackage/dist/build/mp-weixin/pages/my/Kudos/Kudos.wxss

@@ -1 +1 @@
-.kudos.data-v-40a8d842{height:100%;background:#f9f9f9}.List.data-v-40a8d842{padding:0 30rpx;box-sizing:border-box;padding-top:24rpx}.List .ListItem.data-v-40a8d842{position:relative;margin-bottom:24rpx;width:690rpx;height:562rpx;background:#fff;box-shadow:0rpx 12rpx 40rpx 0rpx rgba(220,222,229,.4);border-radius:24rpx;padding:20rpx 26rpx 26rpx 24rpx}.List .ListItem .kudosicon.data-v-40a8d842{width:48rpx;position:absolute;top:52rpx;right:58rpx;border-radius:50%;height:48rpx;background:#fff;opacity:.84;display:flex;align-items:center;justify-content:center}.List .ListItem .kudosicon image.data-v-40a8d842{width:29rpx;height:26rpx}.List .ListItem .nav.data-v-40a8d842{display:flex;align-items:center;justify-content:space-between}.List .ListItem .nav .events text.data-v-40a8d842{font-size:30rpx;font-family:PingFang-SC-Bold,PingFang-SC;font-weight:700;color:#333}.List .ListItem .nav .voteStatus.data-v-40a8d842{font-size:30rpx;font-family:PingFang-SC-Medium,PingFang-SC;font-weight:500;color:#999}.List .ListItem .foot.data-v-40a8d842{margin-top:10rpx;display:flex;align-items:center}.List .ListItem .foot image.data-v-40a8d842{width:28rpx;height:28rpx;margin-right:8rpx}.List .ListItem .foot text.data-v-40a8d842{font-size:24rpx;font-family:PingFang-SC-Medium,PingFang-SC;font-weight:500;color:#999;display:block}
+.kudos.data-v-746ccd5c{height:100%;background:#f9f9f9}.List.data-v-746ccd5c{padding:0 30rpx;box-sizing:border-box;padding-top:24rpx}.List .ListItem.data-v-746ccd5c{position:relative;margin-bottom:24rpx;width:690rpx;height:562rpx;background:#fff;box-shadow:0rpx 12rpx 40rpx 0rpx rgba(220,222,229,.4);border-radius:24rpx;padding:20rpx 26rpx 26rpx 24rpx}.List .ListItem .kudosicon.data-v-746ccd5c{width:48rpx;position:absolute;top:52rpx;right:58rpx;border-radius:50%;height:48rpx;background:#fff;opacity:.84;display:flex;align-items:center;justify-content:center}.List .ListItem .kudosicon image.data-v-746ccd5c{width:29rpx;height:26rpx}.List .ListItem .nav.data-v-746ccd5c{display:flex;align-items:center;justify-content:space-between}.List .ListItem .nav .events text.data-v-746ccd5c{font-size:30rpx;font-family:PingFang-SC-Bold,PingFang-SC;font-weight:700;color:#333}.List .ListItem .nav .voteStatus.data-v-746ccd5c{font-size:30rpx;font-family:PingFang-SC-Medium,PingFang-SC;font-weight:500;color:#999}.List .ListItem .foot.data-v-746ccd5c{margin-top:10rpx;display:flex;align-items:center}.List .ListItem .foot image.data-v-746ccd5c{width:28rpx;height:28rpx;margin-right:8rpx}.List .ListItem .foot text.data-v-746ccd5c{font-size:24rpx;font-weight:500;color:#999;display:block}

unpackage/dist/build/mp-weixin/pages/my/integral/integralExchange.js

@@ -1 +1 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/my/integral/integralExchange"],{1198:function(n,t,e){"use strict";e.r(t);var a=e("d4b0"),r=e.n(a);for(var o in a)"default"!==o&&function(n){e.d(t,n,(function(){return a[n]}))}(o);t["default"]=r.a},3836:function(n,t,e){"use strict";var a=e("e837"),r=e.n(a);r.a},"60c3":function(n,t,e){"use strict";(function(n){e("a89e");a(e("66fd"));var t=a(e("da5f"));function a(n){return n&&n.__esModule?n:{default:n}}wx.__webpack_require_UNI_MP_PLUGIN__=e,n(t.default)}).call(this,e("543d")["createPage"])},d4b0:function(n,t,e){"use strict";(function(n){Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var e={data:function(){return{}},methods:{goBack:function(){n.reLaunch({url:"/pages/my/my"})},goOrderDetail:function(){n.navigateTo({url:"/pages/my/myorders/orders"})},goOther:function(){wx.navigateToMiniProgram({appId:"wx255b58f0992b3c53",path:"newUIMain/enrollment/enrollment",extraData:{foo:"bar"},success:function(n){console.log("成功")},fail:function(n){console.log(n,"失败")}})}}};t.default=e}).call(this,e("543d")["default"])},da5f:function(n,t,e){"use strict";e.r(t);var a=e("fd8b"),r=e("1198");for(var o in r)"default"!==o&&function(n){e.d(t,n,(function(){return r[n]}))}(o);e("3836");var u,c=e("f0c5"),f=Object(c["a"])(r["default"],a["b"],a["c"],!1,null,"fbfcf5f8",null,!1,a["a"],u);t["default"]=f.exports},e837:function(n,t,e){},fd8b:function(n,t,e){"use strict";var a;e.d(t,"b",(function(){return r})),e.d(t,"c",(function(){return o})),e.d(t,"a",(function(){return a}));var r=function(){var n=this,t=n.$createElement;n._self._c},o=[]}},[["60c3","common/runtime","common/vendor"]]]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/my/integral/integralExchange"],{1198:function(n,e,t){"use strict";t.r(e);var a=t("d4b0"),r=t.n(a);for(var c in a)"default"!==c&&function(n){t.d(e,n,(function(){return a[n]}))}(c);e["default"]=r.a},"60c3":function(n,e,t){"use strict";(function(n){t("a89e");a(t("66fd"));var e=a(t("da5f"));function a(n){return n&&n.__esModule?n:{default:n}}wx.__webpack_require_UNI_MP_PLUGIN__=t,n(e.default)}).call(this,t("543d")["createPage"])},"80c3":function(n,e,t){"use strict";var a=t("9e49"),r=t.n(a);r.a},"9e49":function(n,e,t){},cd35:function(n,e,t){"use strict";var a;t.d(e,"b",(function(){return r})),t.d(e,"c",(function(){return c})),t.d(e,"a",(function(){return a}));var r=function(){var n=this,e=n.$createElement;n._self._c},c=[]},d4b0:function(n,e,t){"use strict";(function(n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var t={data:function(){return{}},methods:{goBack:function(){n.reLaunch({url:"/pages/my/my"})},goOrderDetail:function(){n.navigateTo({url:"/pages/my/myorders/orders"})},goOther:function(){wx.navigateToMiniProgram({appId:"wx255b58f0992b3c53",path:"newUIMain/enrollment/enrollment",extraData:{foo:"bar"},success:function(n){console.log("成功")},fail:function(n){console.log(n,"失败")}})}}};e.default=t}).call(this,t("543d")["default"])},da5f:function(n,e,t){"use strict";t.r(e);var a=t("cd35"),r=t("1198");for(var c in r)"default"!==c&&function(n){t.d(e,n,(function(){return r[n]}))}(c);t("80c3");var o,u=t("f0c5"),i=Object(u["a"])(r["default"],a["b"],a["c"],!1,null,"bef19622",null,!1,a["a"],o);e["default"]=i.exports}},[["60c3","common/runtime","common/vendor"]]]);

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

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

unpackage/dist/build/mp-weixin/pages/my/integral/integralExchange.wxss

@@ -1 +1 @@
-.exchangeDetail.data-v-fbfcf5f8{height:100%;background:#f9f9f9}.detailCard.data-v-fbfcf5f8{width:750rpx;height:446rpx;display:flex;flex-direction:column;justify-content:center;align-items:center}.detailCard image.data-v-fbfcf5f8{width:120rpx;height:120rpx;margin-bottom:48rpx}.detailCard text.data-v-fbfcf5f8{display:block;font-size:32rpx;font-family:PingFangSC-Medium,PingFang SC;font-weight:500;color:#080f18}.btn.data-v-fbfcf5f8{width:750rpx;height:76rpx;display:flex;justify-content:space-between;align-items:center;padding:0 32rpx}.btn .back.data-v-fbfcf5f8{width:332rpx;height:76rpx;background:#f5f5f5;border-radius:8rpx;display:flex;align-items:center;justify-content:center}.btn .back text.data-v-fbfcf5f8{font-size:30rpx;font-family:PingFang-SC-Bold,PingFang-SC;font-weight:700;color:#ff6301}.btn .checkout.data-v-fbfcf5f8{width:332rpx;height:76rpx;background:linear-gradient(270deg,#ff6200,#ff9342);border-radius:8rpx;display:flex;align-items:center;justify-content:center}.btn .checkout text.data-v-fbfcf5f8{font-size:30rpx;font-family:PingFang-SC-Bold,PingFang-SC;font-weight:700;color:#fff}.bottomCard.data-v-fbfcf5f8{width:690rpx;height:584rpx;background:#fff;box-shadow:0 8rpx 16rpx 0 rgba(220,222,229,.71);border-radius:20rpx;background:#fff;margin-left:30rpx;margin-top:64rpx}.bottomCard image.data-v-fbfcf5f8{width:690rpx;height:492rpx}.bottomCard .content.data-v-fbfcf5f8{width:690rpx;height:92rpx;position:relative;margin-top:-9rpx;display:flex;align-items:center;justify-content:center}.bottomCard .content text.data-v-fbfcf5f8{font-size:30rpx;font-family:PingFang-SC-Medium,PingFang-SC;font-weight:500;color:#333;text-shadow:0 8rpx 16rpx rgba(220,222,229,.71)}
+.exchangeDetail.data-v-bef19622{height:100%;background:#f9f9f9}.detailCard.data-v-bef19622{width:750rpx;height:446rpx;display:flex;flex-direction:column;justify-content:center;align-items:center}.detailCard image.data-v-bef19622{width:120rpx;height:120rpx;margin-bottom:48rpx}.detailCard text.data-v-bef19622{display:block;font-size:32rpx;font-family:PingFangSC-Medium,PingFang SC;font-weight:500;color:#080f18}.btn.data-v-bef19622{width:750rpx;height:76rpx;display:flex;justify-content:space-between;align-items:center;padding:0 32rpx}.btn .back.data-v-bef19622{width:332rpx;height:76rpx;background:#f5f5f5;border-radius:8rpx;display:flex;align-items:center;justify-content:center}.btn .back text.data-v-bef19622{font-size:30rpx;font-family:PingFang-SC-Bold,PingFang-SC;font-weight:700;color:#ff6301}.btn .checkout.data-v-bef19622{width:332rpx;height:76rpx;background:linear-gradient(270deg,#ff6200,#ff9342);border-radius:8rpx;display:flex;align-items:center;justify-content:center}.btn .checkout text.data-v-bef19622{font-size:30rpx;font-family:PingFang-SC-Bold,PingFang-SC;font-weight:700;color:#fff}.bottomCard.data-v-bef19622{width:690rpx;height:584rpx;background:#fff;box-shadow:0 8rpx 16rpx 0 rgba(220,222,229,.71);border-radius:20rpx;background:#fff;margin-left:30rpx;margin-top:64rpx}.bottomCard image.data-v-bef19622{width:690rpx;height:492rpx}.bottomCard .content.data-v-bef19622{width:690rpx;height:92rpx;position:relative;margin-top:-9rpx;display:flex;align-items:center;justify-content:center}.bottomCard .content image.data-v-bef19622{width:12rpx;height:20rpx;margin-left:8rpx}.bottomCard .content text.data-v-bef19622{font-size:30rpx;font-family:PingFang-SC-Medium,PingFang-SC;font-weight:500;color:#333;text-shadow:0 8rpx 16rpx rgba(220,222,229,.71)}

unpackage/dist/build/mp-weixin/pages/my/integral/integralOrder.json

@@ -4,6 +4,8 @@
   "usingComponents": {
     "uni-forms": "/uni_modules/uni-forms/components/uni-forms/uni-forms",
     "uni-forms-item": "/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item",
-    "uni-easyinput": "/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput"
+    "uni-easyinput": "/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput",
+    "uni-popup": "/uni_modules/uni-popup/components/uni-popup/uni-popup",
+    "picker-address": "/uni_modules/hu-pickerAddress/hu-pickerAddress"
   }
 }

unpackage/dist/build/mp-weixin/pages/my/my.json

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

unpackage/dist/build/mp-weixin/pages/my/prize/exchangeDetail.js

@@ -1 +1 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/my/prize/exchangeDetail"],{1959:function(n,e,t){"use strict";var a=t("4a52"),r=t.n(a);r.a},"4a52":function(n,e,t){},"7caf":function(n,e,t){"use strict";(function(n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var t={data:function(){return{}},methods:{goBack:function(){n.reLaunch({url:"/pages/my/my"})},goOrderDetail:function(){n.navigateTo({url:"/pages/my/myorders/orders"})},goOther:function(){wx.navigateToMiniProgram({appId:"wx255b58f0992b3c53",path:"newUIMain/enrollment/enrollment",extraData:{foo:"bar"},success:function(n){console.log("成功")},fail:function(n){console.log(n,"失败")}})}}};e.default=t}).call(this,t("543d")["default"])},"8c28":function(n,e,t){"use strict";t.r(e);var a=t("9d0b"),r=t("917b");for(var o in r)"default"!==o&&function(n){t.d(e,n,(function(){return r[n]}))}(o);t("1959");var u,c=t("f0c5"),i=Object(c["a"])(r["default"],a["b"],a["c"],!1,null,"1e89db76",null,!1,a["a"],u);e["default"]=i.exports},"917b":function(n,e,t){"use strict";t.r(e);var a=t("7caf"),r=t.n(a);for(var o in a)"default"!==o&&function(n){t.d(e,n,(function(){return a[n]}))}(o);e["default"]=r.a},"9d0b":function(n,e,t){"use strict";var a;t.d(e,"b",(function(){return r})),t.d(e,"c",(function(){return o})),t.d(e,"a",(function(){return a}));var r=function(){var n=this,e=n.$createElement;n._self._c},o=[]},"9d5d":function(n,e,t){"use strict";(function(n){t("a89e");a(t("66fd"));var e=a(t("8c28"));function a(n){return n&&n.__esModule?n:{default:n}}wx.__webpack_require_UNI_MP_PLUGIN__=t,n(e.default)}).call(this,t("543d")["createPage"])}},[["9d5d","common/runtime","common/vendor"]]]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/my/prize/exchangeDetail"],{"7caf":function(n,e,t){"use strict";(function(n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var t={data:function(){return{}},methods:{goBack:function(){n.reLaunch({url:"/pages/my/my"})},goOrderDetail:function(){n.navigateTo({url:"/pages/my/myorders/orders"})},goOther:function(){wx.navigateToMiniProgram({appId:"wx255b58f0992b3c53",path:"newUIMain/enrollment/enrollment",extraData:{foo:"bar"},success:function(n){console.log("成功")},fail:function(n){console.log(n,"失败")}})}}};e.default=t}).call(this,t("543d")["default"])},"8c28":function(n,e,t){"use strict";t.r(e);var a=t("9124"),r=t("917b");for(var o in r)"default"!==o&&function(n){t.d(e,n,(function(){return r[n]}))}(o);t("df91");var u,c=t("f0c5"),f=Object(c["a"])(r["default"],a["b"],a["c"],!1,null,"09b9ec51",null,!1,a["a"],u);e["default"]=f.exports},9124:function(n,e,t){"use strict";var a;t.d(e,"b",(function(){return r})),t.d(e,"c",(function(){return o})),t.d(e,"a",(function(){return a}));var r=function(){var n=this,e=n.$createElement;n._self._c},o=[]},"917b":function(n,e,t){"use strict";t.r(e);var a=t("7caf"),r=t.n(a);for(var o in a)"default"!==o&&function(n){t.d(e,n,(function(){return a[n]}))}(o);e["default"]=r.a},"9d5d":function(n,e,t){"use strict";(function(n){t("a89e");a(t("66fd"));var e=a(t("8c28"));function a(n){return n&&n.__esModule?n:{default:n}}wx.__webpack_require_UNI_MP_PLUGIN__=t,n(e.default)}).call(this,t("543d")["createPage"])},df91:function(n,e,t){"use strict";var a=t("fde1"),r=t.n(a);r.a},fde1:function(n,e,t){}},[["9d5d","common/runtime","common/vendor"]]]);

unpackage/dist/build/mp-weixin/pages/my/prize/exchangeDetail.wxml

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

unpackage/dist/build/mp-weixin/pages/my/prize/exchangeDetail.wxss

@@ -1 +1 @@
-.exchangeDetail.data-v-1e89db76{height:100%;background:#f9f9f9}.detailCard.data-v-1e89db76{width:750rpx;height:446rpx;display:flex;flex-direction:column;justify-content:center;align-items:center}.detailCard image.data-v-1e89db76{width:120rpx;height:120rpx;margin-bottom:48rpx}.detailCard text.data-v-1e89db76{display:block;font-size:32rpx;font-family:PingFangSC-Medium,PingFang SC;font-weight:500;color:#080f18}.btn.data-v-1e89db76{width:750rpx;height:76rpx;display:flex;justify-content:space-between;align-items:center;padding:0 32rpx}.btn .back.data-v-1e89db76{width:332rpx;height:76rpx;background:#f5f5f5;border-radius:8rpx;display:flex;align-items:center;justify-content:center}.btn .back text.data-v-1e89db76{font-size:30rpx;font-family:PingFang-SC-Bold,PingFang-SC;font-weight:700;color:#ff6301}.btn .checkout.data-v-1e89db76{width:332rpx;height:76rpx;background:linear-gradient(270deg,#ff6200,#ff9342);border-radius:8rpx;display:flex;align-items:center;justify-content:center}.btn .checkout text.data-v-1e89db76{font-size:30rpx;font-family:PingFang-SC-Bold,PingFang-SC;font-weight:700;color:#fff}.bottomCard.data-v-1e89db76{width:690rpx;height:584rpx;background:#fff;box-shadow:0 8rpx 16rpx 0 rgba(220,222,229,.71);border-radius:20rpx;background:#fff;margin-left:30rpx;margin-top:64rpx}.bottomCard image.data-v-1e89db76{width:690rpx;height:492rpx}.bottomCard .content.data-v-1e89db76{width:690rpx;height:92rpx;position:relative;margin-top:-9rpx;display:flex;align-items:center;justify-content:center}.bottomCard .content text.data-v-1e89db76{font-size:30rpx;font-family:PingFang-SC-Medium,PingFang-SC;font-weight:500;color:#333;text-shadow:0 8rpx 16rpx rgba(220,222,229,.71)}
+.exchangeDetail.data-v-09b9ec51{height:100%;background:#f9f9f9}.detailCard.data-v-09b9ec51{width:750rpx;height:446rpx;display:flex;flex-direction:column;justify-content:center;align-items:center}.detailCard image.data-v-09b9ec51{width:120rpx;height:120rpx;margin-bottom:48rpx}.detailCard text.data-v-09b9ec51{display:block;font-size:32rpx;font-family:PingFangSC-Medium,PingFang SC;font-weight:500;color:#080f18}.btn.data-v-09b9ec51{width:750rpx;height:76rpx;display:flex;justify-content:space-between;align-items:center;padding:0 32rpx}.btn .back.data-v-09b9ec51{width:332rpx;height:76rpx;background:#f5f5f5;border-radius:8rpx;display:flex;align-items:center;justify-content:center}.btn .back text.data-v-09b9ec51{font-size:30rpx;font-family:PingFang-SC-Bold,PingFang-SC;font-weight:700;color:#ff6301}.btn .checkout.data-v-09b9ec51{width:332rpx;height:76rpx;background:linear-gradient(270deg,#ff6200,#ff9342);border-radius:8rpx;display:flex;align-items:center;justify-content:center}.btn .checkout text.data-v-09b9ec51{font-size:30rpx;font-family:PingFang-SC-Bold,PingFang-SC;font-weight:700;color:#fff}.bottomCard.data-v-09b9ec51{width:690rpx;height:584rpx;background:#fff;box-shadow:0 8rpx 16rpx 0 rgba(220,222,229,.71);border-radius:20rpx;background:#fff;margin-left:30rpx;margin-top:64rpx}.bottomCard image.data-v-09b9ec51{width:690rpx;height:492rpx}.bottomCard .content.data-v-09b9ec51{width:690rpx;height:92rpx;position:relative;margin-top:-9rpx;border:1rpx solid;display:flex;align-items:center;justify-content:center}.bottomCard .content image.data-v-09b9ec51{width:12rpx;height:20rpx;margin-left:8rpx}.bottomCard .content text.data-v-09b9ec51{font-size:30rpx;font-family:PingFang-SC-Medium,PingFang-SC;font-weight:500;color:#333;text-shadow:0 8rpx 16rpx rgba(220,222,229,.71)}

unpackage/dist/build/mp-weixin/pages/my/prize/prize.js

@@ -1 +1 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/my/prize/prize"],{"0429":function(n,e,t){"use strict";t.d(e,"b",(function(){return u})),t.d(e,"c",(function(){return r})),t.d(e,"a",(function(){return o}));var o={uniLoadMore:function(){return Promise.all([t.e("common/vendor"),t.e("uni_modules/uni-load-more/components/uni-load-more/uni-load-more")]).then(t.bind(null,"67038"))}},u=function(){var n=this,e=n.$createElement;n._self._c},r=[]},3094:function(n,e,t){},"36fa":function(n,e,t){"use strict";t.r(e);var o=t("0429"),u=t("b0fc");for(var r in u)"default"!==r&&function(n){t.d(e,n,(function(){return u[n]}))}(r);t("88ab");var a,c=t("f0c5"),i=Object(c["a"])(u["default"],o["b"],o["c"],!1,null,"02f90feb",null,!1,o["a"],a);e["default"]=i.exports},"7a8f":function(n,e,t){"use strict";(function(n){t("a89e");o(t("66fd"));var e=o(t("36fa"));function o(n){return n&&n.__esModule?n:{default:n}}wx.__webpack_require_UNI_MP_PLUGIN__=t,n(e.default)}).call(this,t("543d")["createPage"])},"88ab":function(n,e,t){"use strict";var o=t("3094"),u=t.n(o);u.a},b0fc:function(n,e,t){"use strict";t.r(e);var o=t("b31e"),u=t.n(o);for(var r in o)"default"!==r&&function(n){t.d(e,n,(function(){return o[n]}))}(r);e["default"]=u.a},b31e:function(n,e,t){"use strict";(function(n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var t={data:function(){return{items:["实物奖品","线下奖品","中奖记录"],isActive:0,ListHeight:800,status:"noMore",contentText:{contentdown:"查看更多",contentrefresh:"加载中",contentnomore:"—— 已经到底啦 ——"}}},methods:{checked:function(n){this.isActive=n},goExchange:function(){n.navigateTo({url:"/pages/my/prize/exchangePrize"})}}};e.default=t}).call(this,t("543d")["default"])}},[["7a8f","common/runtime","common/vendor"]]]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/my/prize/prize"],{"36fa":function(e,n,t){"use strict";t.r(n);var o=t("d84a"),u=t("b0fc");for(var a in u)"default"!==a&&function(e){t.d(n,e,(function(){return u[e]}))}(a);t("64aa");var r,c=t("f0c5"),i=Object(c["a"])(u["default"],o["b"],o["c"],!1,null,"66934e52",null,!1,o["a"],r);n["default"]=i.exports},"64aa":function(e,n,t){"use strict";var o=t("e0dc"),u=t.n(o);u.a},"7a8f":function(e,n,t){"use strict";(function(e){t("a89e");o(t("66fd"));var n=o(t("36fa"));function o(e){return e&&e.__esModule?e:{default:e}}wx.__webpack_require_UNI_MP_PLUGIN__=t,e(n.default)}).call(this,t("543d")["createPage"])},b0fc:function(e,n,t){"use strict";t.r(n);var o=t("b31e"),u=t.n(o);for(var a in o)"default"!==a&&function(e){t.d(n,e,(function(){return o[e]}))}(a);n["default"]=u.a},b31e:function(e,n,t){"use strict";(function(e){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var t={data:function(){return{items:["实物奖品","线下奖品","中奖记录"],isActive:0,ListHeight:800,status:"noMore",contentText:{contentdown:"查看更多",contentrefresh:"加载中",contentnomore:"—— 已经到底啦 ——"}}},methods:{checked:function(e){this.isActive=e},goExchange:function(){e.navigateTo({url:"/pages/my/prize/exchangePrize"})}}};n.default=t}).call(this,t("543d")["default"])},d84a:function(e,n,t){"use strict";t.d(n,"b",(function(){return u})),t.d(n,"c",(function(){return a})),t.d(n,"a",(function(){return o}));var o={uniLoadMore:function(){return Promise.all([t.e("common/vendor"),t.e("uni_modules/uni-load-more/components/uni-load-more/uni-load-more")]).then(t.bind(null,"67038"))}},u=function(){var e=this,n=e.$createElement;e._self._c},a=[]},e0dc:function(e,n,t){}},[["7a8f","common/runtime","common/vendor"]]]);

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

@@ -1,7 +0,0 @@
-{
-  "desc": "关于本文件的更多信息，请参考文档 https://developers.weixin.qq.com/miniprogram/dev/framework/sitemap.html",
-  "rules": [{
-  "action": "allow",
-  "page": "*"
-  }]
-}