项目日志:12.26 样式优化

pages.json

@@ -1,6 +1,16 @@
 {
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
 
+		{
+			"path": "pages/my/prize/exchangeDetail",
+			"style": {
+				// "navigationBarTitleText": "兑换详情",
+				"navigationStyle": "custom", //隐藏系统导航栏
+				"enablePullDownRefresh": false
+			}
+
+		},
+
 		{
 			"path": "pages/index/index",
 			"style": {
@@ -260,15 +270,7 @@
 			}
 
 		},
-		{
-			"path": "pages/my/prize/exchangeDetail",
-			"style": {
-				// "navigationBarTitleText": "兑换详情",
-				"navigationStyle": "custom",//隐藏系统导航栏
-				"enablePullDownRefresh": false
-			}
-		
-		},
+
 
 		{
 			"path": "pages/my/Kudos/Kudos",

pages/goods/goods-hotel/index.vue

@@ -1,5 +1,6 @@
 <template>
 	<view class="goods-hotel">
+
 		<view class="search">
 			<u-input placeholder="搜索" border='none' v-model="search" @input="searchText">
 				<template slot="suffix" style='margin-right:40rpx;'>
@@ -11,8 +12,8 @@
 
 		<view class="content">
 			<view class="content-item" v-for="item in hotelList" :key="item.id" @click="selected(item.id)">
-				<image style="flex: none;width: 112rpx;height: 112rpx;border-radius: 50%;" :src="item.logo"
-					mode=""></image>
+				<image style="flex: none;width: 112rpx;height: 112rpx;border-radius: 50%;" :src="item.logo" mode="">
+				</image>
 				<view class="content-item-main">
 					<text class="content-item-main-text">{{item.name}}</text>
 					<view class="content-item-main-call" style="margin: 20rpx 0 12rpx;">
@@ -46,7 +47,7 @@
 		data() {
 			return {
 				// 搜索
-				search:'',
+				search: '',
 				// 组价uni-load-more
 				status: 'noMore',
 				contentText: {
@@ -55,32 +56,35 @@
 					contentnomore: '——  已经到底啦  ——'
 				},
 				// 酒店列表
-				hotelList:[],
-				
+				hotelList: [],
+
 				//______________
-				product_id:-1,			// 产品id
-				
+				product_id: -1, // 产品id
+
 				//______________
 				geo: {},
 			}
 		},
 		onLoad(op) {
-			this.product_id=op.product_id
+			this.product_id = op.product_id
 			this.init();
 		},
 		methods: {
 			//初始化
-			async init(){
+			async init() {
 				await this.getGeo();
 				await this.getHotelList();
 			},
 			//获取地理位置
-			getGeo(callback){
-				return new Promise((resolve,reject)=>{
+			getGeo(callback) {
+				return new Promise((resolve, reject) => {
 					uni.getLocation({
 						type: "gcj02", //返回可以用于wx.openLocation的经纬度
 						success: (res) => {
-							const {latitude, longitude} = res;
+							const {
+								latitude,
+								longitude
+							} = res;
 							this.geo.latitude = latitude
 							this.geo.longitude = longitude
 							resolve(true);
@@ -90,13 +94,13 @@
 							reject(res)
 						}
 					})
-				}) 
+				})
 			},
 			//选择
-			selected(id){
+			selected(id) {
 				this.$store.commit("tab/SET_SELECTEDHOTELId", id)
 				uni.navigateBack({
-					fail: ()=>{
+					fail: () => {
 						uni.switchTab({
 							url: "/pages/index/index"
 						})
@@ -104,74 +108,75 @@
 				})
 			},
 			// 获取酒店列表
-			getHotelList(page=1){
-				if(page==1){
+			getHotelList(page = 1) {
+				if (page == 1) {
 					this.hotelList = [];
 				}
 				const tempobj = {};
-				if(this.geo.latitude&&this.geo.longitude){
+				if (this.geo.latitude && this.geo.longitude) {
 					tempobj['latitude'] = this.geo.latitude;
 					tempobj['longitude'] = this.geo.longitude;
 				}
 				this.$api.hotel.getHotelList({
-					page:page,
-					product_id:this.product_id,
+					page: page,
+					product_id: this.product_id,
 					...tempobj
-				}).then(res=>{
-					console.log(res,"酒店列表")
-					if(res.code==0){
+				}).then(res => {
+					console.log(res, "酒店列表")
+					if (res.code == 0) {
 						let hotelList = res.data.data
 						hotelList = this.calcDistance(hotelList);
 						this.hotelList.push(...hotelList);
-						if(hotelList.length >= 15){
+						if (hotelList.length >= 15) {
 							this.getHotelList(page + 1);
 						}
 					}
 				})
 			},
 			//计算距离
-			calcDistance(hotel){
+			calcDistance(hotel) {
 				let target = hotel
-				if(this.geo.latitude && this.geo.longitude){
-					target.map(item=>{
-						item.distanceToMe=this.$utils.calcDistance(this.geo.latitude,this.geo.longitude,item.latitude,item.longitude).toFixed(1);
+				if (this.geo.latitude && this.geo.longitude) {
+					target.map(item => {
+						item.distanceToMe = this.$utils.calcDistance(this.geo.latitude, this.geo.longitude, item
+							.latitude, item.longitude).toFixed(1);
 						return item;
 					})
 				}
-				
+
 				return target;
 			},
 			// 搜索防抖
-			searchText:util.debounce(function(){
+			searchText: util.debounce(function() {
 				this.goSearch()
-			},1000),
+			}, 1000),
 			// 搜索
-			goSearch(page=1){
-				if(page==1){
+			goSearch(page = 1) {
+				if (page == 1) {
 					this.hotelList = [];
 				}
 				const tempobj = {};
-				if(this.search){
+				if (this.search) {
 					tempobj['name'] = this.search;
 				}
 				this.$api.hotel.getHotelList({
-					page:page,
-					product_id:this.product_id,
+					page: page,
+					product_id: this.product_id,
 					...tempobj
-				}).then(res=>{
-					console.log(res,'搜索酒店列表')
-					if(res.code==0){
-						let hotelList=res.data.data
+				}).then(res => {
+					console.log(res, '搜索酒店列表')
+					if (res.code == 0) {
+						let hotelList = res.data.data
 						hotelList = this.calcDistance(hotelList);
 						this.hotelList.push(...hotelList);
-						if(hotelList.length >= 15){
+						if (hotelList.length >= 15) {
 							this.getHotelList(page + 1);
 						}
 					}
 				})
 			},
 		},
-		
+
 	}
 </script>
 
@@ -201,9 +206,11 @@
 
 	.content {
 		width: 100%;
-		padding: 24rpx 30rpx;
+		margin-top: 24rpx;
+		padding: 0 30rpx;
 		padding-bottom: 30rpx;
 		background-color: #F9F9F9;
+		
 
 		.content-item {
 			margin-bottom: 24rpx;
@@ -212,7 +219,7 @@
 			padding-bottom: 20rpx;
 			height: 204rpx;
 			background: #FFFFFF;
-			box-shadow: 0px 4rpx 24rpx -10rpx rgba(101, 95, 90, 0.3);
+			box-shadow: 0px 4rpx 24rpx -10rpx rgba(101, 95, 90, 0.2);
 			border-radius: 12rpx;
 			display: flex;
 			align-items: center;
@@ -260,14 +267,13 @@
 		}
 	}
 
+	// 搜索
 	.search {
 		padding: 0 30rpx;
 		height: 124rpx;
-		background: #FFFFFF;
+		background-color: $bgColor;
 		box-shadow: 0px 4rpx 8rpx 0px rgba(0, 0, 0, 0.04);
-		display: flex;
-		align-items: center;
-		justify-content: center;
+		@include flexlayout;
 
 		::v-deep .u-input {
 			width: 690rpx !important;

pages/index/active-detail/index.vue

@@ -15,8 +15,8 @@
 			<view class="vote-detail">
 				<!-- 改版 -->
 				<view class="vote-detail-top-main1">
-					<view style="display: inline-block; width: 230rpx;" v-if="activeDeatil.activity_status == 1">距活动开始</view>
-					<view style="display: inline-block; width: 230rpx;" v-else>距活动结束</view>
+					<view class="vote-detail-top-main-text" style="display: inline-block; width: 230rpx;" v-if="activeDeatil.activity_status == 1">距活动开始</view>
+					<view class="vote-detail-top-main-text" style="display: inline-block; width: 230rpx;" v-else>距活动结束</view>
 					<view>
 						<text v-if="countdownh>0">{{countdownd}}</text>
 						<text>{{countdownh}}</text>
@@ -928,6 +928,11 @@
 		justify-content: space-around;
 		height:22px;
 		line-height: 22px;
+		.vote-detail-top-main-text{
+			position: relative;
+			top: 0;
+			left: 70rpx;
+		}
 		
 		&::before,&::after{
 			content: " ";

pages/index/index.scss

@@ -124,7 +124,10 @@
 			font-size: 36rpx;
 			font-weight: 800;
 			position: relative;
-
+			text{
+				position: relative;
+				z-index: 2;
+			}
 			.text-shadow {
 				position: absolute;
 				bottom: 0;
@@ -133,9 +136,12 @@
 				height: 16rpx;
 				background: linear-gradient(270deg, rgba(249, 231, 219, 0) 0%, #F9E7DB 100%);
 				border-radius: 200rpx 0px 0px 200rpx;
+				z-index: 1;
 			}
 
 			&::before {
+				position: relative;
+				z-index: 3;
 				content: '';
 				display: inline-block;
 				width: 6rpx;
@@ -194,7 +200,8 @@
 	.home-banner {
 		height: 640rpx;
 		padding: 0 30rpx;
-		padding-top: 40rpx;
+		padding-top: 20rpx;
+		background-color: #f9f9f9;
 
 		.home-banner-img {
 			position: relative;
@@ -241,7 +248,7 @@
 
 	.home-attach {
 		background-color: #f9f9f9;
-		padding: 40rpx 30rpx 5rpx;
+		padding: 30rpx 30rpx 5rpx;
 	}
 
 	.home-hotel {

pages/map/map - 副本.vue

@@ -1,664 +0,0 @@
-<template>
-	<view class="map">
-		<!-- 查询 -->
-		<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" :scale="scale" :markers="markers"></map>
-			</view>
-		</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 {
-				latitude: 39.924361, //中心纬度
-				longitude: 116.518557, //中心经度
-				mapStyle: 1, //个性化地图
-				scale: 16,//缩放级别
-				markers:[],//标记点
-			}
-		},
-
-		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() {
-				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;
-	}
-
-	.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;
-		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.scss

@@ -302,7 +302,36 @@ page {
 		::v-deep .u-input__content__field-wrapper {
 			padding-left: 36rpx;
 		}
-	}
+	}
+	
+	
+	.search-detail-input{
+		padding: 0 30rpx;
+		height: 124rpx;
+		background-color: #fff;
+		box-shadow: 0px 4rpx 8rpx 0px rgba(0, 0, 0, 0.04);
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		
+		::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;
+		}
+		
+		::v-deep .u-input__content__field-wrapper__field {
+			color: #999999 !important;
+			font-size: 28rpx !important;
+		}
+	}
+	
+	
 
 
 	.search-top {

pages/map/map.vue

@@ -32,7 +32,7 @@
 				</view>
 				<image @click="goJoin"  style=" flex: none; width: 52rpx;height: 46rpx;" src="/static/icon/vip.png" mode=""></image>
 			</view>
-			<view class="search-detail" style="z-index:9" v-if="search.openId==-2">
+			<view class="search-detail search-detail-input"    style="z-index:9" v-if="search.openId==-2">
 				<u-input placeholder="输入酒店/城市名称搜索酒店" border='none' :value="search.text" @input="syncSearchInput">
 					<template slot="suffix" style='margin-right:40rpx;'>
 						<u-image :showLoading="true" :showError='true' src="/static/icon/search.png" width="40rpx"
@@ -125,10 +125,10 @@
 				</view>
 				
 				<view class="address-nav-button" @click="goLocation">
-					<image style="width: 84rpx;height: 84rpx;" src="/static/icon/location.png" mode=""></image>
+					<image style="width: 100rpx;height: 100rpx;" src="/static/icon/location.png" mode=""></image>
 				</view>
 				<view class="address-nav-button" @click="goHotelList">
-					<image style="width: 84rpx;height: 84rpx;" src="/static/icon/list.png" mode=""></image>
+					<image style="width: 100rpx;height: 100rpx;" src="/static/icon/list.png" mode=""></image>
 				</view>
 			</view>
 		</view>
@@ -171,7 +171,7 @@
 				<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 style="width: 100rpx;height: 100rpx;border-radius: 50%;" src="/static/icon/return01.png" mode="">
 				</image>
 			</view>
 

pages/my/integral/integral.vue

@@ -9,7 +9,7 @@
 			</view>
 			<view class="titletext">
 				<view class="textitem" @click="gointegralRecord">
-					<image src="/static/icon/integralrecord.png"></image>
+					<image style="width: 38rpx;height: 44rpx;" src="/static/icon/integralrecord.png"></image>
 					<text>积分记录</text>
 				</view>
 				<view class="textitem" @click="goMyorder">
@@ -17,7 +17,7 @@
 					<text>我的兑换</text>
 				</view>
 				<view class="textitem" @click="gointegralRule">
-					<image src="/static/icon/integralrule.png"></image>
+					<image style="width: 44rpx;height: 40rpx;" src="/static/icon/integralrule.png"></image>
 					<text>积分规则</text>
 				</view>
 			</view>

pages/my/integral/integralOrder.vue

@@ -82,8 +82,8 @@
 				<text>积分</text>
 				<text>{{integral}}积分</text>
 			</view>
-			<view style="width: 694rpx;height: 4rpx;border: 2rpx solid #F2F2F2;margin-top: 38rpx;"></view>
-			<view class="shopNumber">
+			<view style="width: 694rpx;height: 4rpx;border: 2rpx dashed #F2F2F2;margin-top: 38rpx;"></view>
+			<view class="shopNumber" style="margin-top: 38rpx;">
 				<text>合计</text>
 				<text>{{integral}}积分</text>
 			</view>

pages/my/prize/exchangeDetail.vue

@@ -30,14 +30,14 @@
 			<view class="home-banner">
 				<view class="home-banner-img" v-if="in_page==3 && type == 1"
 					@click="goOtherPage(jump_type,jump_config)">
-					<image style="width: 100%; height: 492rpx; border-radius: 12rpx;" :src="advData.img" mode="">
+					<image style="width: 100%; height: 492rpx;border-radius: 12rpx 12rpx 0 0;" :src="advData.img" mode="">
 					</image>
 				</view>
 				<view class="home-banner-img" v-if="in_page==3 && type == 2">
 					<image class="banner-img" v-if="!isOpenVideo" @click="openVideoPlay"
-						style="width: 100%; height: 492rpx; border-radius: 12rpx;" :src="videoCoverImg" mode=""></image>
+						style="width: 100%; height: 492rpx; border-radius: 12rpx 12rpx 0 0;" :src="videoCoverImg" mode=""></image>
 					<video class="baner-video" id="myVideo" ref="myVideo"
-						style="width: 100%; height: 492rpx;border-radius: 12rpx; " :src="videoSrc" controls
+						style="width: 100%; height: 492rpx;border-radius: 12rpx 12rpx 0 0;" :src="videoSrc" controls
 						:enable-progress-gesture="false">
 					</video>
 				</view>
@@ -55,8 +55,13 @@
 	export default {
 		data() {
 			return {
+				//跳转h5,小程序,其他页面
+				jump_type_vip: '',
+				jump_config_vip: {},
+				//加入会员广告配置
+				advise: '',
 				//自定义导航栏
-				bgColor: '#fff',
+				bgColor: '#f9f9f9',
 				title: '兑换详情',
 				//积分商品1奖品2兑换
 				productType: '',
@@ -87,6 +92,20 @@
 			}else if(o.productType == 2){
 				this.productType = o.productType
 			}
+			
+			this.advise = this.$store.getters.allset.add_member
+			this.jump_type_vip = this.advise.value.exchange_jump_type
+			if (this.jump_type_vip == 1) {
+				this.jump_config_vip = this.advise.value.exchange_h5_url
+			} else if (this.jump_type_vip == 2) {
+				this.jump_config_vip.appid = this.advise.value.exchange_appid
+				this.jump_config_vip.path = this.advise.value.exchange_path
+			} else if (this.jump_type_vip == 3) {
+				this.jump_config_vip = this.advise.value.exchange_other_path
+			}
+			
+			
+			
 		},
 		methods: {
 			//返回上一级
@@ -209,38 +228,68 @@
 					console.log('当前页面url：', pageUrl);
 				}
 			},
+			// 跳转其他小程序
+			jumpHAppIDVip(id, urls) {
+				if (id == 1) {
+					const url = urls; // 跳转的外链
+					const navtitle = 'H5'; // 这个标题是你自己可以设置的
+					uni.navigateTo({
+						// 跳转到webview页面
+						url: `/pages/webview/webview?url=${url}&nav=${navtitle}`,
+						success: () => {
+							console.log('成功')
+						},
+						fail: (e) => {
+							console.log(e, "失败")
+						}
+					});
+				} else if (id == 2) {
+					let _this = this
+					let obj = urls;
+					console.log(obj, '----->obj');
+					wx.navigateToMiniProgram({
+						appId: `${obj.appid}`, //appid
+						path: `${obj.path}`, //path
+						extraData: { //参数
+							foo: 'bar'
+						},
+						// envVersion: 'develop', //开发版develop 开发版 trial   体验版 release 正式版 
+						success(res) {
+							let page = _this.getPageUrl()
+							let user_id = ''
+							if (_this.admin != null) {
+								user_id = _this.admin.id
+							} else {
+								user_id = 0
+							}
+							_this.$api.my.userMemberAdd({
+								user_id,
+								page,
+							}).then(res => {
+								console.log(res.data);
+							})
+							// 打开成功
+						},
+						fail(e) {
+							console.log(e, '失败')
+						}
+					})
+				} else if (id == 3) {
+					uni.redirectTo({
+						url: urls,
+						fail: (err) => {
+							uni.reLaunch({
+								url: urls
+							})
+						}
+					})
+				}
+			},
+			
 			// 跳转其他小程序
 			goJoin() {
 				let _this = this
-				wx.navigateToMiniProgram({
-					appId: 'wx255b58f0992b3c53', //appid
-					path: 'newUIMain/enrollment/enrollment', //path
-					extraData: { //参数
-						foo: 'bar'
-					},
-					// envVersion: 'develop', //开发版develop 开发版 trial   体验版 release 正式版 
-					success(res) {
-						let page = _this.getPageUrl()
-						let user_id = ''
-						if (_this.admin != null) {
-							user_id = _this.admin.id
-						} else {
-							user_id = 0
-						}
-						console.log('成功', page)
-						_this.$api.my.userMemberAdd({
-							user_id,
-							page,
-						}).then(res => {
-							console.log(res.data);
-						})
-
-						// 打开成功
-					},
-					fail(e) {
-						console.log(e, '失败')
-					}
-				})
+				this.jumpHAppIDVip(this.jump_type_vip, this.jump_config_vip)
 			},
 		}
 	}
@@ -342,8 +391,7 @@
 			height: 92rpx;
 			position: absolute;
 			bottom: 0;
-			margin-top: -9rpx;
-			border: 1rpx solid;
+			margin-top: -9rpx;;
 			@include flexlayout();
 
 			image {

setting.js

@@ -3,8 +3,8 @@
  */
 const IS_DEV = process.env.NODE_ENV === 'development'
 
-// const URL = 'https://t9.9026.com'
-const URL = 'https://ihg.9026.com'
+const URL = 'https://t9.9026.com'
+// const URL = 'https://ihg.9026.com'
 
 	
 module.exports = {