项目日志:11.29 合并

api/hotel/hotel.js

@@ -7,9 +7,23 @@ export function getHotelList(data){
 		data
 	)
 }
-
-
+// 酒店分类列表
+export function getHotelCategory(data){
+	return request.post(
+		`v1/hotel/categoryList`,
+		data
+	)
+}
+// 酒店详情
+export function getHotelDetail(data){
+	return request.post(
+		`v1/hotel/hotelDetail`,
+		data
+	)
+}
 
 export default {
-  getHotelList
+  getHotelList,
+  getHotelCategory,
+  getHotelDetail
 }

pages/goods/goods-detail/index.vue

@@ -5,7 +5,7 @@
 			<uni-swiper-dot :info="info" :current="current1" :mode="mode" :dots-styles="dotsStyles">
 				<swiper class="swiper-box" @change="change1" circular>
 					<swiper-item v-for="(item ,index) in info" :key="index">
-						<view class="swiper-item" @click="goGoodsDetail(item.pic_url)">
+						<view class="swiper-item" >
 							<image style="width: 100%;height:576rpx;" :src="item.img" mode="aspectFill"></image>
 						</view>
 					</swiper-item>
@@ -16,15 +16,15 @@
 		<view style="background-color: #f9f9f9;">
 			<!-- 价格 -->
 			<view class="price">
-				<view class="price-top">
+				<view class="price-top" v-if="false">
 					<text>￥</text>
-					<text>269</text>
+					<text>{{productDetail.price}}</text>
 				</view>
-				<view class="price-top" v-if="false">
-					<text>300</text>
+				<view class="price-top" v-if="true">
+					<text>{{productDetail.integral}}</text>
 					<text>积分</text>
-				</view>
-				<text class="price-text">端午佳节五香肉粽子，仅限前五名供。</text>
+				</view>	
+				<text class="price-text">{{productDetail.name}}</text>
 				<view class="price-banner" :style="{backgroundImage:'url('+backImageUrl+')'}">
 					<text>加入IHG优悦会会员享受更多福利</text>
 					<image style="width: 12rpx;height: 20rpx;" src="/static/icon/right02.png" mode=""></image>
@@ -47,18 +47,18 @@
 			<!--酒店信息  -->
 			<view class="about">
 				<text class="about-title">可购买酒店信息</text>
-				<text class="about-name">洲际环球大酒店</text>
+				<text class="about-name">{{hotelDetail.name}}</text>
 				<view class="about-address">
 					<text style="margin-right:20rpx ;">地址:</text>
-					<text>成都市武侯区天府大道北段1928号</text>
+					<text>{{hotelDetail.address}}</text>
 				</view>
 				<view class="about-phone">
 					<text style="margin-right:20rpx ;">电话:</text>
-					<text>201823102</text>
+					<text>{{hotelDetail.phone}}</text>
 				</view>
 				<view class="about-all">
-					<text @click="goGoodsHotel" style="margin-right: 16rpx;">全部酒店</text>
-					<image @click="goGoodsHotel" style="width: 12rpx;height: 20rpx;" src="/static/icon/right04.png"
+					<text @click="goGoodsHotel(product_id)" style="margin-right: 16rpx;">全部酒店</text>
+					<image @click="goGoodsHotel(product_id)" style="width: 12rpx;height: 20rpx;" src="/static/icon/right04.png"
 						mode=""></image>
 				</view>
 
@@ -70,7 +70,7 @@
 					<text>产品简介</text>
 				</view>
 				<view class="produce-text">
-					<text>洲际环球大酒店洲际环球大酒店洲际环球大酒店洲际环球大酒店洲际环球大酒店洲际环球大酒店洲际环球大酒店</text>
+					<text>{{productDetail.details}}</text>
 				</view>
 			</view>
 		</view>
@@ -80,10 +80,10 @@
 				<image style="width: 40rpx;height: 42rpx;" src="/static/icon/home01.png" mode=""></image>
 				<text>首页</text>
 			</view>
-			<view class="buy-btn-right" @click="$refs.codePurchase.open()">
+			<view class="buy-btn-right" @click="$refs.codePurchase.open()" v-if="false">
 				<text>立即购买</text>
 			</view>
-			<view v-if="false" class="buy-btn-right" @click="$refs.codePurchase.open()">
+			<view v-if="true" class="buy-btn-right" @click="goIntegralOrder">
 				<text>立即兑换</text>
 			</view>
 		</view>
@@ -95,13 +95,17 @@
 				<view class="pop-price">
 					<view class="pop-price-left">
 						<image style="width: 180rpx;height: 136rpx; border-radius:12rpx ;"
-							src="http://t9.9026.com/imgs/special01.png" mode=""></image>
-						<view class="pop-price-left-money">
+							src="http://t9.9026.com/imgs/special01.png" mode="" ></image>
+						<view class="pop-price-left-money" v-if="false">
 							<text>￥</text>
-							<text>269</text>
+							<text>{{productDetail.price}}</text>
+						</view>
+						<view class="pop-price-left-money">
+							<text>{{productDetail.integral}}</text>
+							<text>积分</text>
 						</view>
 					</view>
-					<image style="width: 52rpx;height: 52rpx;" src="/static/icon/close01.png" mode=""></image>
+					<image style="width: 52rpx;height: 52rpx;" src="/static/icon/close01.png" mode=""  @click="Recipientclose"></image>
 				</view>
 
 				<view class="pop-flavor">
@@ -110,7 +114,7 @@
 						<view class="flavorTitle-item" :class="{'flavorTitle-item-active':isActive === index}"  v-for="(item,index) in flavorList" :key="index"
 							@click="checked(index)">
 							<view :class="{'active-flavor':isActive === index}">
-								{{item.title}}
+								{{item.attr_name}}
 							</view>
 						</view>
 					</view>
@@ -121,7 +125,7 @@
 						<view class="flavorTitle-item" :class="{'flavorTitle-item-active':isActive === index}" v-for="(item,index) in weightList" :key="index"
 							@click="checked(index)">
 							<view :class="{'active-flavor':isActive === index}">
-								{{item.title}}
+								{{item.attr_name}}
 							</view>
 						</view>
 					</view>
@@ -138,10 +142,10 @@
 					</view>
 				</view>
 			</view>
-			<view class="purchase" v-if="true">
+			<view class="purchase" v-if="false">
 				<view class="purchase-btn">立即购买</view>
 			</view>
-			<view class="purchase" v-if="false">
+			<view class="purchase" v-if="true" @click="goIntegralOrder">
 				<view class="purchase-btn">立即兑换</view>
 			</view>
 
@@ -169,6 +173,12 @@
 	export default {
 		data() {
 			return {
+				// 产品详情
+				productDetail:'',
+				// 酒店详情
+				hotelDetail:'',
+				// 产品id
+				product_id:'',
 				packList: [{
 						title: '礼盒'
 					},
@@ -192,7 +202,7 @@
 				}],
 				//激活指定table菜单
 				isActive: 0,
-
+				
 				backImageUrl: require('../../../static/icon/add01.png'),
 
 				//轮播图
@@ -213,11 +223,41 @@
 				mode: 'dot',
 			}
 		},
+		onLoad(op) {
+			this.product_id=op.id
+			this.getProductDetail(op.id)
+		},
 		methods: {
-			//酒店列表
-			goGoodsHotel() {
+			// 获取商品详情
+			getProductDetail(id){
+				this.$api.product.getProductDetail({
+					product_id:id
+				}).then(res=>{
+					console.log(res,"产品详情")
+					console.log(JSON.parse(res.data.attr_group),"产品规格")
+					if(res.code==0){
+						this.productDetail=res.data
+						// 口味
+						this.flavorList=JSON.parse(res.data.attr_group)[0].attr_list
+						// 重量
+						this.weightList=JSON.parse(res.data.attr_group)[1].attr_list
+						this.getHotelDetail(res.data.hotel_id)
+					}
+				})
+			},
+			// 获取酒店详情
+			getHotelDetail(id){
+				this.$api.hotel.getHotelDetail({
+					hotel_id:id
+				}).then(res=>{
+					console.log(res,"酒店详情")
+					this.hotelDetail=res.data
+				})
+			},
+			//跳转酒店列表
+			goGoodsHotel(id) {
 				uni.navigateTo({
-					url: '/pages/goods/goods-hotel/index'
+					url: '/pages/goods/goods-hotel/index?product_id='+id
 				})
 			},
 			//首页
@@ -229,10 +269,12 @@
 			//二维码购买确认按钮
 			dialogConfirm() {
 				console.log('确认');
+				this.codePurchaseClose()
 			},
 			//二维码购买取消按钮
 			dialogClose() {
 				console.log('取消');
+				this.codePurchaseClose()
 			},
 			//菜单index切换
 			checked(index) {
@@ -244,11 +286,19 @@
 			Recipientclose() {
 				this.$refs.Recipient.close()
 			},
+			codePurchaseClose(){
+				this.$refs.codePurchase.close()
+			},
 			// 切换轮播图指示点
 			change1(e) {
 				this.current1 = e.detail.current;
 			},
-
+			// 跳转积分兑换
+			goIntegralOrder(){
+				uni.navigateTo({
+					url:'/pages/my/integral/integralOrder'
+				})
+			}
 
 		}
 	}

pages/goods/goods-hotel/index.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="goods-hotel">
 		<view class="search">
-			<u-input placeholder="搜索" border='none'>
+			<u-input placeholder="搜索" border='none' v-model="search" @input="searchText">
 				<template slot="suffix" style='margin-right:40rpx;'>
 					<u-image :showLoading="true" :showError='true' src="/static/icon/search.png" width="40rpx"
 						height="32rpx"></u-image>
@@ -41,21 +41,61 @@
 </template>
 
 <script>
+	import util from '../../../utils/util.js'
 	export default {
 		data() {
 			return {
+				// 搜索
+				search:'',
+				// 组价uni-load-more
 				status: 'noMore',
 				contentText: {
 					contentdown: '查看更多',
 					contentrefresh: '加载中',
 					contentnomore: '——  已经到底啦  ——'
 				},
+				// 酒店列表
+				hotelList:[],
+				// 产品id
+				product_id:'',
+			}
+		},
+		onLoad(op) {
+			this.product_id=op.product_id
+			if(op.product_id!=''){
+				this.getHotelList(op.product_id)
 			}
 		},
 		methods: {
-
-
-
+			// 获取酒店列表
+			getHotelList(id){
+				this.$api.hotel.getHotelList({
+					page:1,
+					product_id:id
+				}).then(res=>{
+					console.log(res,"酒店列表")
+					if(res.code==0){
+						this.hotelList=res.data.data
+					}
+				})
+			},
+			// 搜索防抖
+			searchText:util.debounce(function(){
+				this.goSearch()
+			},1000),
+			// 搜索
+			goSearch(){
+				this.$api.hotel.getHotelList({
+					page:1,
+					name:this.search,
+					product_id:this.product_id
+				}).then(res=>{
+					console.log(res,'搜索酒店列表')
+					if(res.code==0){
+						this.hotelList=res.data.data
+					}
+				})
+			},
 		}
 	}
 </script>
@@ -79,11 +119,11 @@
 		height: 100%;
 		background: #F9F9F9;
 	}
-	
+
 	.home-bottom {
 		background-color: #f9f9f9;
 	}
-	
+
 	.content {
 		width: 100%;
 		padding: 24rpx 30rpx;
@@ -164,8 +204,9 @@
 		::v-deep .u-input__content__field-wrapper {
 			padding-left: 36rpx;
 		}
-		::v-deep .u-input__content__field-wrapper__field{
-			color:#999999 !important;
+
+		::v-deep .u-input__content__field-wrapper__field {
+			color: #999999 !important;
 			font-size: 28rpx !important;
 		}
 	}

pages/login/login.vue

@@ -88,8 +88,6 @@
 			handleChangeNickname(res) {
 				this.modal.nickname = res.detail.value
 			},
-
-
 			// 加入优悦会
 			goYouyue() {
 				uni.navigateTo({
@@ -127,9 +125,6 @@
 								this.handleGetWechatUserInfo()
 								this.handleConfirmWechatUserInfo()
 							})
-						
-							// this.code = null
-							// this.$hideLoading()
 						})
 					}
 				})

pages/login/youyue.vue

@@ -10,60 +10,60 @@
 			<view><text>HG优悦会是洲际酒店集团的会员忠诚计划。在全球拥有超过1亿会员。</text></view>
 			<view><text> 即刻加入HG优悦会，一键开启会员专享价及会员专属礼遇。轻松赚取积分，使用灵活的积分兑换及竞拍，畅享独特且多元的犒赏体验。</text></view>
 		</view>
-		
+
 		<view class="boxitem">
 			<text class="boxitemtitle">优悦会会员权益</text>
 		</view>
 		<view class="boxitem" style="border-top: none;">
-			<text class="boxitemtitle" >入会第一天起即可臻享礼遇</text>
+			<text class="boxitemtitle">入会第一天起即可臻享礼遇</text>
 		</view>
 		<view class="boxitem" style="border-top: none;">
-			<text class="boxitemtitle" >赚取酒店积分兑换奖励住宿以及更多</text>
+			<text class="boxitemtitle">赚取酒店积分兑换奖励住宿以及更多</text>
 			<text class="boxitemcontent">积分不仅可以兑换体验，目录商品等，还可以兑换全球6000等多个目的地奖励住宿</text>
 			<image src="/static/icon/loginicon1.png"></image>
 		</view>
 		<view class="boxitem" style="border-top: none;">
-			<text class="boxitemtitle" >会员专享价</text>
+			<text class="boxitemtitle">会员专享价</text>
 			<text class="boxitemcontent" style="margin-bottom: 30rpx;">直接预订可享受我们会员专属的优惠房价</text>
 			<image src="/static/icon/loginicon2.png"></image>
 		</view>
 		<view class="boxitem" style="border-top: none;">
-			<text class="boxitemtitle" >会员促销</text>
+			<text class="boxitemtitle">会员促销</text>
 			<text class="boxitemcontent" style="margin-bottom: 30rpx;">尽情享受会员促销，赚取更多奖励积分</text>
 			<image src="/static/icon/loginicon3.png"></image>
 		</view>
-		
+
 		<view class="item"><text class="itemtitle">畅享网络</text></view>
-		
+
 		<view class="itemLast">我们所有酒店均提供免费WIFI，让您始终顺畅连通</view>
-		
+
 		<view class="btn" @click="goOther">
 			<text>立即加入会员</text>
 		</view>
-		
+
 		<view class="logintitle">
 			<view class="line"></view>
 			<view class="logintype"><text>其他登录</text></view>
 			<view class="line"></view>
 		</view>
-		<view class="typebtn">
+		<view class="typebtn" @click="getmsg">
 			<view class="item">
 				<image src="/static/icon/wechart.png" mode="scaleToFill"></image>
 				<text>微信登录</text>
 			</view>
 		</view>
-		
+
 	</view>
 </template>
 
 <script>
-	export default{
-		data(){
-			return{
-				
+	export default {
+		data() {
+			return {
+
 			}
 		},
-		methods:{
+		methods: {
 			// 跳转其他小程序
 			goOther() {
 				wx.navigateToMiniProgram({
@@ -82,30 +82,82 @@
 					}
 				})
 			},
-		}
+			getCode() {
+				return new Promise((resolve, reject) => {
+					uni.login({
+						provider: uni.$u.platform,
+						success: loginRes => {
+							this.code = loginRes.code
+							resolve(this.code)
+						}
+					})
+				})
+			},
+			//获取微信登录的code码
+			getmsg() {
+				uni.getUserInfo({
+					success: res => {
+						this.getCode().then(code => {
+							const params = {
+								encryptData: res.encryptedData,
+								iv: res.iv,
+								code: code
+							}
+							console.log(params);
+							this.$api.my.myLogin(params).then(res => {
+								let {
+									token,
+									user_info
+								} = res.data
+								this.$store.dispatch('user/info', user_info)
+								this.$store.dispatch('user/token', token)
+								if (token != null) {
+									uni.switchTab({
+										url: '/pages/my/my'
+									})
+								}
+							})
+
+							// this.$loading('数据刷新中...')
+							// this.$api.user.update(params).then(res => {
+							//   this.btnLock = false
+							//   this.code = null
+							//   this.$hideLoading()
+							//   this.$store.dispatch('user/info', res.data)
+						}).catch(() => {
+							// this.code = null
+							// this.$hideLoading()
+						})
+					}
+				})
+			},
+		},
 	}
 </script>
 
 <style lang="scss" scoped>
 	$pageColor:#F9F9F9;
 	$bgColor:#FFFFFF;
-	
-	.youyue{
+
+	.youyue {
 		height: 100%;
 		background: $bgColor;
 		padding: 192rpx 30rpx 140rpx 30rpx;
 		position: relative;
 	}
-	.nav{
+
+	.nav {
 		position: absolute;
-		top:0rpx;
+		top: 0rpx;
 		left: 0rpx;
-		image{
+
+		image {
 			width: 750rpx;
 			height: 142rpx;
 		}
 	}
-	.title{
+
+	.title {
 		width: 400rpx;
 		height: 120rpx;
 		font-size: 44rpx;
@@ -115,27 +167,32 @@
 		line-height: 60rpx;
 		margin-bottom: 64rpx;
 	}
-	.detail{
+
+	.detail {
 		width: 690rpx;
 		height: 220rpx;
 		margin-bottom: 64rpx;
-		text{
+
+		text {
 			font-size: 32rpx;
 			font-family: PingFang-SC-Medium, PingFang-SC;
 			font-weight: 500;
 			color: #333333;
 		}
 	}
-	.item{
+
+	.item {
 		margin: 40rpx 0;
-		.itemtitle{
+
+		.itemtitle {
 			font-size: 32rpx;
 			font-family: PingFang-SC-Bold, PingFang-SC;
 			font-weight: bold;
 			color: #333333;
 		}
 	}
-	.itemLast{
+
+	.itemLast {
 		width: 690rpx;
 		font-size: 24rpx;
 		font-family: PingFang-SC-Medium, PingFang-SC;
@@ -143,7 +200,8 @@
 		color: #333333;
 		margin-bottom: 64rpx;
 	}
-	.btn{
+
+	.btn {
 		width: 688rpx;
 		height: 92rpx;
 		background: linear-gradient(270deg, #FF6200 0%, #FF9342 100%);
@@ -151,14 +209,16 @@
 		align-items: center;
 		justify-content: center;
 		border-radius: 12rpx;
-		text{
+
+		text {
 			font-size: 30rpx;
 			font-family: PingFang-SC-Bold, PingFang-SC;
 			font-weight: bold;
 			color: #FFFFFF;
 		}
 	}
-	.logintitle{
+
+	.logintitle {
 		height: 40rpx;
 		width: 690rpx;
 		margin-top: 64rpx;
@@ -166,39 +226,45 @@
 		display: flex;
 		align-items: center;
 		justify-content: space-between;
-		.line{
+
+		.line {
 			width: 240rpx;
 			height: 2rpx;
 			background: #EDEDED;
 			border-radius: 1rpx;
 		}
-		.logintype{
-			text{
+
+		.logintype {
+			text {
 				font-size: 28rpx;
 				font-family: PingFang-SC-Medium, PingFang-SC;
 				font-weight: 500;
 				color: #333333;
 			}
 		}
-		
+
 	}
-	.typebtn{
+
+	.typebtn {
 		display: flex;
 		align-items: center;
 		justify-content: space-around;
-		.item{
+
+		.item {
 			width: 140rpx;
 			height: 156rpx;
 			display: flex;
 			flex-direction: column;
 			align-items: center;
 			justify-content: center;
-			image{
+
+			image {
 				width: 104rpx;
 				height: 104rpx;
 				margin-bottom: 12rpx;
 			}
-			text{
+
+			text {
 				display: block;
 				font-size: 28rpx;
 				font-family: PingFang-SC-Medium, PingFang-SC;
@@ -208,25 +274,28 @@
 		}
 	}
 
-	.boxitem{
+	.boxitem {
 		border-top: #F0F0F0 2rpx solid;
 		border-bottom: #F0F0F0 2rpx solid;
-		padding:40rpx 0;
+		padding: 40rpx 0;
 		position: relative;
-		image{
-			top:35%;
+
+		image {
+			top: 35%;
 			right: 0rpx;
 			width: 96rpx;
-			height:96rpx;
+			height: 96rpx;
 			position: absolute;
 		}
-		.boxitemtitle{
+
+		.boxitemtitle {
 			font-size: 32rpx;
 			font-family: PingFang-SC-Bold, PingFang-SC;
 			font-weight: bold;
 			color: #333333;
 		}
-		.boxitemcontent{
+
+		.boxitemcontent {
 			margin-top: 24rpx;
 			width: 512rpx;
 			display: block;
@@ -236,4 +305,4 @@
 			color: #333333;
 		}
 	}
-</style>
+</style>

pages/my/integral/integral.vue

@@ -29,17 +29,17 @@
 				<text>积分兑换</text>
 			</view>
 			<!-- 瀑布流组件 -->
-			<helang-waterfall-list 
+			<!-- <helang-waterfall-list 
 			:status="waterfall.status"
 			:list="waterfall.list"
-			:reset="waterfall.reset"></helang-waterfall-list>
-			<!-- <view class="ListContent">
-				<view :class="item.short?'[contentItemShort,contentItem]':'[contentItemLong,contentItem]'" v-for="item in arr" @click="goIntegralOrder" >
-					<image :src="item.url" ></image>
-					<view class="itemName">{{item.label}}</view>
-					<view class="itemPrice">{{item.money}}积分</view>
+			:reset="waterfall.reset"></helang-waterfall-list> -->
+			<view class="ListContent">
+				<view :class="item.short?'[contentItemShort,contentItem]':'[contentItemLong,contentItem]'" v-for="item in integralList" @click="goIntegralDetail(item.id)" >
+					<image :src="item.img_urls?item.img_urls:'http://t9.9026.com/imgs/loginBg.png'" ></image>
+					<view class="itemName">{{item.details}}</view>
+					<view class="itemPrice">{{item.integral}}积分</view>
 				</view>
-			</view> -->
+			</view>
 			
 			<!-- 已经到底啦 -->
 			<uni-load-more :status="status" color="#CCCCCC" :content-text="contentText"/>
@@ -139,10 +139,10 @@
 					url:'/pages/my/integral/integralRecord'
 				})
 			},
-			// 跳转积分兑换
-			goIntegralOrder(){
+			// 跳转积分产品详情
+			goIntegralDetail(id){
 				uni.navigateTo({
-					url:'/pages/my/integral/integralOrder'
+					url:'/pages/goods/goods-detail/index?id='+id
 				})
 			},
 			// 跳转订单记录

pages/my/integral/integralExchange.vue

@@ -17,7 +17,7 @@
 		</view>
 		<!-- 加入会员 -->
 		<view class="bottomCard" @click="goOther">
-			<image src="/static/icon/Kudosbg.png"></image>
+			<image src="http://t9.9026.com/imgs/Kudosbg.png"></image>
 			<view class="content">
 				<text>立即加入IHG会员</text>
 				<image src="/static/icon/right.png"></image>

pages/my/integral/integralOrder.vue

@@ -40,7 +40,6 @@
 						</pickerAddress>
 					</uni-forms-item>
 					<uni-forms-item name="region" v-if="formData.type=='快递配送'">
-						<!-- <uni-easyinput type="text" v-model="formData.region" placeholder="详细地址" /> -->
 						<textarea placeholder-style="#999" class="text-area" type="text" placeholder="详细地址" />
 
 					</uni-forms-item>
@@ -65,7 +64,7 @@
 				<text>产品信息</text>
 			</view>
 			<view class="shopCard">
-				<image src="/static/icon/Kudosbg.png"></image>
+				<image src="http://t9.9026.com/imgs/Kudosbg.png"></image>
 				<view style="margin-left: 24rpx;">
 					<text class="name">端午佳节五香肉粽子，仅限前</text>
 					<text class="tag">礼盒装 </text>
@@ -158,6 +157,24 @@
 					shop: '',
 					address: '',
 				},
+				Data:{
+					// 快递类型(1.快递发货 2.到店自提也是线下核销)
+					express_type:'',
+					// 收货人
+					receiver:'',
+					// 联系电话
+					phone:'',
+					// 地址ID，最小行政单位地区ID，express_type=1时必传
+					area_id:'',
+					// 详细地址，express_type=1时必传
+					address:'',
+					// 门店ID，express_type=2时必传
+					hotel_id:'',
+					// 产品ID
+					product_id:'',
+					// 产品规格ID
+					product_attr_id:'',
+				},
 				// 配送方式
 				typeSelect: [{
 					name: '快递配送',
@@ -251,8 +268,14 @@
 					url: '/pages/my/integral/integralExchange'
 				})
 			},
-			// 选择门店
-
+			// 积分兑换
+			goExchange(){
+				this.$api.integral.integralExchange({
+					...formData
+				}).then(res=>{
+					console.log(res)
+				})
+			}
 		}
 	}
 </script>
@@ -287,7 +310,7 @@
 	//底部弹框样式
 	.pop {
 		width: 100%;
-		height: 620rpx;
+		height: 616rpx;
 		background: #FFFFFF;
 		border-radius: 16rpx 16rpx 0 0;
 		overflow: scroll;

pages/my/my.vue

@@ -145,6 +145,7 @@
 
 		onShow() {
 			this.admin = this.$store.getters.userInfo
+		
 		},
 
 		methods: {

pages/my/prize/prize.vue

@@ -47,7 +47,7 @@
 						<view class="title"><text>{{item.name}}</text> </view>
 						<view class='data'><text>{{item.created_at}}</text></view>
 					</view>
-					<view class="content"><text>{{item.details}}</text></view>
+					<view class="content"><text>{{item.remark||'无'}}</text></view>
 				</view>
 			</view>
 		</view>

pages/my/setting/setting.vue

@@ -18,7 +18,7 @@
 			</view>
 		</view>
 		<!-- 按钮 -->
-		<view class="btn">
+		<view class="btn" @click="loginOut">
 			<text>退出登录</text>
 		</view>
 	</view>
@@ -49,6 +49,24 @@
 				uni.navigateTo({
 					url:'/pages/my/verification/verification'
 				})
+			},
+			// 退出登录
+			loginOut(){
+				if(this.$store.getters.token){
+					this.$store.dispatch("user/info", null)
+					this.$store.dispatch("user/token", null)
+					uni.removeStorageSync('auth_token')
+					uni.removeStorageSync('userInfo')
+					uni.reLaunch({
+						url:'/pages/login/login'
+					})
+				}else{
+					uni.showToast({
+						title:'请先登录!',
+						icon:'error'
+					})
+				}
+				
 			}
 		}
 	}

unpackage/dist/dev/mp-weixin/common/vendor.js

@@ -20652,7 +20652,7 @@ var _default =
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.getHotelList = getHotelList;exports.default = void 0;var request = uni.$u.http;
+/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.getHotelList = getHotelList;exports.getHotelCategory = getHotelCategory;exports.getHotelDetail = getHotelDetail;exports.default = void 0;var request = uni.$u.http;
 
 // 酒店列表
 function getHotelList(data) {
@@ -20660,12 +20660,26 @@ function getHotelList(data) {
 
   data);
 
-}var _default =
+}
+// 酒店分类列表
+function getHotelCategory(data) {
+  return request.post("v1/hotel/categoryList",
+
+  data);
 
+}
+// 酒店详情
+function getHotelDetail(data) {
+  return request.post("v1/hotel/hotelDetail",
+
+  data);
 
+}var _default =
 
 {
-  getHotelList: getHotelList };exports.default = _default;
+  getHotelList: getHotelList,
+  getHotelCategory: getHotelCategory,
+  getHotelDetail: getHotelDetail };exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))
 
 /***/ }),

unpackage/dist/dev/mp-weixin/pages/goods/goods-detail/index.js

@@ -129,10 +129,6 @@ var render = function() {
     _vm.e0 = function($event) {
       return _vm.$refs.codePurchase.open()
     }
-
-    _vm.e1 = function($event) {
-      return _vm.$refs.codePurchase.open()
-    }
   }
 }
 var recyclableRender = false
@@ -334,10 +330,20 @@ __webpack_require__.r(__webpack_exports__);
 //
 //
 //
+//
+//
+//
+//
 var _default =
 {
   data: function data() {
     return {
+      // 产品详情
+      productDetail: '',
+      // 酒店详情
+      hotelDetail: '',
+      // 产品id
+      product_id: '',
       packList: [{
         title: '礼盒' },
 
@@ -382,11 +388,41 @@ var _default =
       mode: 'dot' };
 
   },
+  onLoad: function onLoad(op) {
+    this.product_id = op.id;
+    this.getProductDetail(op.id);
+  },
   methods: {
-    //酒店列表
-    goGoodsHotel: function goGoodsHotel() {
+    // 获取商品详情
+    getProductDetail: function getProductDetail(id) {var _this = this;
+      this.$api.product.getProductDetail({
+        product_id: id }).
+      then(function (res) {
+        console.log(res, "产品详情");
+        console.log(JSON.parse(res.data.attr_group), "产品规格");
+        if (res.code == 0) {
+          _this.productDetail = res.data;
+          // 口味
+          _this.flavorList = JSON.parse(res.data.attr_group)[0].attr_list;
+          // 重量
+          _this.weightList = JSON.parse(res.data.attr_group)[1].attr_list;
+          _this.getHotelDetail(res.data.hotel_id);
+        }
+      });
+    },
+    // 获取酒店详情
+    getHotelDetail: function getHotelDetail(id) {var _this2 = this;
+      this.$api.hotel.getHotelDetail({
+        hotel_id: id }).
+      then(function (res) {
+        console.log(res, "酒店详情");
+        _this2.hotelDetail = res.data;
+      });
+    },
+    //跳转酒店列表
+    goGoodsHotel: function goGoodsHotel(id) {
       uni.navigateTo({
-        url: '/pages/goods/goods-hotel/index' });
+        url: '/pages/goods/goods-hotel/index?product_id=' + id });
 
     },
     //首页
@@ -398,10 +434,12 @@ var _default =
     //二维码购买确认按钮
     dialogConfirm: function dialogConfirm() {
       console.log('确认');
+      this.codePurchaseClose();
     },
     //二维码购买取消按钮
     dialogClose: function dialogClose() {
       console.log('取消');
+      this.codePurchaseClose();
     },
     //菜单index切换
     checked: function checked(index) {
@@ -413,9 +451,18 @@ var _default =
     Recipientclose: function Recipientclose() {
       this.$refs.Recipient.close();
     },
+    codePurchaseClose: function codePurchaseClose() {
+      this.$refs.codePurchase.close();
+    },
     // 切换轮播图指示点
     change1: function change1(e) {
       this.current1 = e.detail.current;
+    },
+    // 跳转积分兑换
+    goIntegralOrder: function goIntegralOrder() {
+      uni.navigateTo({
+        url: '/pages/my/integral/integralOrder' });
+
     } } };exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))
 

unpackage/dist/dev/mp-weixin/pages/goods/goods-hotel/index.js

@@ -161,7 +161,50 @@ __webpack_require__.r(__webpack_exports__);
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0; //
+Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+var _util = _interopRequireDefault(__webpack_require__(/*! ../../../utils/util.js */ 194));function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };} //
 //
 //
 //
@@ -203,19 +246,19 @@ Object.defineProperty(exports, "__esModule", { value: true });exports.default =
 //
 //
 //
-var _default =
-{
-  data: function data() {
-    return {
-      status: 'noMore',
-      contentText: {
-        contentdown: '查看更多',
-        contentrefresh: '加载中',
-        contentnomore: '——  已经到底啦  ——' } };
-
-
-  },
-  methods: {} };exports.default = _default;
+var _default = { data: function data() {return { // 搜索
+      search: '', // 组价uni-load-more
+      status: 'noMore', contentText: { contentdown: '查看更多', contentrefresh: '加载中', contentnomore: '——  已经到底啦  ——' }, // 酒店列表
+      hotelList: [], // 产品id
+      product_id: '' };}, onLoad: function onLoad(op) {this.product_id = op.product_id;if (op.product_id != '') {this.getHotelList(op.product_id);}}, methods: { // 获取酒店列表
+    getHotelList: function getHotelList(id) {var _this = this;this.$api.hotel.getHotelList({ page: 1, product_id: id }).then(function (res) {console.log(res, "酒店列表");if (res.code == 0) {_this.hotelList = res.data.data;}});}, // 搜索防抖
+    searchText: _util.default.debounce(function () {this.goSearch();}, 1000), // 搜索
+    goSearch: function goSearch() {var _this2 = this;this.$api.hotel.getHotelList({ page: 1, name: this.search, product_id: this.product_id }).then(function (res) {console.log(res, '搜索酒店列表');
+        if (res.code == 0) {
+          _this2.hotelList = res.data.data;
+        }
+      });
+    } } };exports.default = _default;
 
 /***/ }),
 

unpackage/dist/dev/mp-weixin/pages/login/login.js

@@ -245,8 +245,6 @@ var _default =
     handleChangeNickname: function handleChangeNickname(res) {
       this.modal.nickname = res.detail.value;
     },
-
-
     // 加入优悦会
     goYouyue: function goYouyue() {
       uni.navigateTo({
@@ -284,9 +282,6 @@ var _default =
               _this3.handleGetWechatUserInfo();
               _this3.handleConfirmWechatUserInfo();
             });
-
-            // this.code = null
-            // this.$hideLoading()
           });
         } });
 

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

@@ -132,7 +132,7 @@ __webpack_require__.r(__webpack_exports__);
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0; //
+/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0; //
 //
 //
 //
@@ -215,7 +215,57 @@ var _default =
           console.log(e, '失败');
         } });
 
+    },
+    getCode: function getCode() {var _this = this;
+      return new Promise(function (resolve, reject) {
+        uni.login({
+          provider: uni.$u.platform,
+          success: function success(loginRes) {
+            _this.code = loginRes.code;
+            resolve(_this.code);
+          } });
+
+      });
+    },
+    //获取微信登录的code码
+    getmsg: function getmsg() {var _this2 = this;
+      uni.getUserInfo({
+        success: function success(res) {
+          _this2.getCode().then(function (code) {
+            var params = {
+              encryptData: res.encryptedData,
+              iv: res.iv,
+              code: code };
+
+            console.log(params);
+            _this2.$api.my.myLogin(params).then(function (res) {var _res$data =
+
+
+
+              res.data,token = _res$data.token,user_info = _res$data.user_info;
+              _this2.$store.dispatch('user/info', user_info);
+              _this2.$store.dispatch('user/token', token);
+              if (token != null) {
+                uni.switchTab({
+                  url: '/pages/my/my' });
+
+              }
+            });
+
+            // this.$loading('数据刷新中...')
+            // this.$api.user.update(params).then(res => {
+            //   this.btnLock = false
+            //   this.code = null
+            //   this.$hideLoading()
+            //   this.$store.dispatch('user/info', res.data)
+          }).catch(function () {
+            // this.code = null
+            // this.$hideLoading()
+          });
+        } });
+
     } } };exports.default = _default;
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))
 
 /***/ }),
 

unpackage/dist/dev/mp-weixin/pages/my/integral/integral.js

@@ -296,10 +296,10 @@ __webpack_require__.r(__webpack_exports__);
         url: '/pages/my/integral/integralRecord' });
 
     },
-    // 跳转积分兑换
-    goIntegralOrder: function goIntegralOrder() {
+    // 跳转积分产品详情
+    goIntegralDetail: function goIntegralDetail(id) {
       uni.navigateTo({
-        url: '/pages/my/integral/integralOrder' });
+        url: '/pages/goods/goods-detail/index?id=' + id });
 
     },
     // 跳转订单记录

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

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

unpackage/dist/dev/mp-weixin/pages/my/integral/integralOrder.js

@@ -164,8 +164,7 @@ __webpack_require__.r(__webpack_exports__);
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var pickerAddress = function pickerAddress() {Promise.all(/*! require.ensure | uni_modules/hu-pickerAddress/hu-pickerAddress */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/hu-pickerAddress/hu-pickerAddress")]).then((function () {return resolve(__webpack_require__(/*! @/uni_modules/hu-pickerAddress/hu-pickerAddress.vue */ 572));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
-
+/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;function ownKeys(object, enumerableOnly) {var keys = Object.keys(object);if (Object.getOwnPropertySymbols) {var symbols = Object.getOwnPropertySymbols(object);if (enumerableOnly) symbols = symbols.filter(function (sym) {return Object.getOwnPropertyDescriptor(object, sym).enumerable;});keys.push.apply(keys, symbols);}return keys;}function _objectSpread(target) {for (var i = 1; i < arguments.length; i++) {var source = arguments[i] != null ? arguments[i] : {};if (i % 2) {ownKeys(Object(source), true).forEach(function (key) {_defineProperty(target, key, source[key]);});} else if (Object.getOwnPropertyDescriptors) {Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));} else {ownKeys(Object(source)).forEach(function (key) {Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));});}}return target;}function _defineProperty(obj, key, value) {if (key in obj) {Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true });} else {obj[key] = value;}return obj;}var pickerAddress = function pickerAddress() {Promise.all(/*! require.ensure | uni_modules/hu-pickerAddress/hu-pickerAddress */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/hu-pickerAddress/hu-pickerAddress")]).then((function () {return resolve(__webpack_require__(/*! @/uni_modules/hu-pickerAddress/hu-pickerAddress.vue */ 572));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
 
 
 
@@ -324,6 +323,24 @@ __webpack_require__.r(__webpack_exports__);
         shop: '',
         address: '' },
 
+      Data: {
+        // 快递类型(1.快递发货 2.到店自提也是线下核销)
+        express_type: '',
+        // 收货人
+        receiver: '',
+        // 联系电话
+        phone: '',
+        // 地址ID，最小行政单位地区ID，express_type=1时必传
+        area_id: '',
+        // 详细地址，express_type=1时必传
+        address: '',
+        // 门店ID，express_type=2时必传
+        hotel_id: '',
+        // 产品ID
+        product_id: '',
+        // 产品规格ID
+        product_attr_id: '' },
+
       // 配送方式
       typeSelect: [{
         name: '快递配送' },
@@ -416,9 +433,15 @@ __webpack_require__.r(__webpack_exports__);
       uni.navigateTo({
         url: '/pages/my/integral/integralExchange' });
 
-    }
-    // 选择门店
-  } };exports.default = _default;
+    },
+    // 积分兑换
+    goExchange: function goExchange() {
+      this.$api.integral.integralExchange(_objectSpread({},
+      formData)).
+      then(function (res) {
+        console.log(res);
+      });
+    } } };exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))
 
 /***/ }),

unpackage/dist/dev/mp-weixin/pages/my/integral/integralOrder.wxss

@@ -40,7 +40,7 @@
 }
 .pop.data-v-6779b279 {
   width: 100%;
-  height: 620rpx;
+  height: 616rpx;
   background: #FFFFFF;
   border-radius: 16rpx 16rpx 0 0;
   overflow: scroll;

unpackage/dist/dev/mp-weixin/pages/my/my.js

@@ -302,6 +302,7 @@ __webpack_require__.r(__webpack_exports__);
 
   onShow: function onShow() {
     this.admin = this.$store.getters.userInfo;
+
   },
 
   methods: {

unpackage/dist/dev/mp-weixin/pages/my/setting/setting.js

@@ -183,6 +183,24 @@ var _default =
       uni.navigateTo({
         url: '/pages/my/verification/verification' });
 
+    },
+    // 退出登录
+    loginOut: function loginOut() {
+      if (this.$store.getters.token) {
+        this.$store.dispatch("user/info", null);
+        this.$store.dispatch("user/token", null);
+        uni.removeStorageSync('auth_token');
+        uni.removeStorageSync('userInfo');
+        uni.reLaunch({
+          url: '/pages/login/login' });
+
+      } else {
+        uni.showToast({
+          title: '请先登录!',
+          icon: 'error' });
+
+      }
+
     } } };exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))
 

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

@@ -1 +1 @@
-<view class="setting data-v-03508732"><view style="height:24rpx;" class="data-v-03508732"></view><view class="cell data-v-03508732"><view data-event-opts="{{[['tap',[['goPrivacy',['$event']]]]]}}" class="cell_item data-v-03508732" bindtap="__e"><text class="data-v-03508732">隐私政策</text><image src="/static/icon/right.png" class="data-v-03508732"></image></view><view data-event-opts="{{[['tap',[['goUser',['$event']]]]]}}" class="cell_item data-v-03508732" bindtap="__e"><text class="data-v-03508732">用户协议</text><image src="/static/icon/right.png" class="data-v-03508732"></image></view><view data-event-opts="{{[['tap',[['goVerfication',['$event']]]]]}}" class="cell_item data-v-03508732" bindtap="__e"><text class="data-v-03508732">核销中心</text><image src="/static/icon/right.png" class="data-v-03508732"></image></view></view><view class="btn data-v-03508732"><text class="data-v-03508732">退出登录</text></view></view>
+<view class="setting data-v-03508732"><view style="height:24rpx;" class="data-v-03508732"></view><view class="cell data-v-03508732"><view data-event-opts="{{[['tap',[['goPrivacy',['$event']]]]]}}" class="cell_item data-v-03508732" bindtap="__e"><text class="data-v-03508732">隐私政策</text><image src="/static/icon/right.png" class="data-v-03508732"></image></view><view data-event-opts="{{[['tap',[['goUser',['$event']]]]]}}" class="cell_item data-v-03508732" bindtap="__e"><text class="data-v-03508732">用户协议</text><image src="/static/icon/right.png" class="data-v-03508732"></image></view><view data-event-opts="{{[['tap',[['goVerfication',['$event']]]]]}}" class="cell_item data-v-03508732" bindtap="__e"><text class="data-v-03508732">核销中心</text><image src="/static/icon/right.png" class="data-v-03508732"></image></view></view><view data-event-opts="{{[['tap',[['loginOut',['$event']]]]]}}" class="btn data-v-03508732" bindtap="__e"><text class="data-v-03508732">退出登录</text></view></view>