11.28合并

api/active/active.js

@@ -0,0 +1,52 @@
+const request = uni.$u.http
+
+// 获取活动列表
+export function getActiveList(data){
+	return request.post(
+		`v1/activity/activityList`,
+		data
+	)
+}
+// 获取活动详情
+export function getActiveDetail(data){
+	return request.post(
+		`v1/activity/activityDetail`,
+		data
+	)
+}
+// 点赞
+export function kudos(data){
+	return request.post(
+		`v1/activity/activityLike`,
+		data
+	)
+}
+// 获取活动项目列表
+export function getActiveProjectList(data){
+	return request.post(
+		`v1/activity/activityProjectList`,
+		data
+	)
+}
+// 获取活动项目详情
+export function getActiveProjectDetail(data){
+	return request.post(
+		`v1/activity/activityProjectDetail`,
+		data
+	)
+}
+// 投票
+export function vote(data){
+	return request.post(
+		`v1/activity/vote`,
+		data
+	)
+}
+export default {
+  getActiveDetail,
+  getActiveList,
+  kudos,
+  getActiveProjectList,
+  getActiveProjectDetail,
+  vote
+}

api/category/category.js

@@ -0,0 +1,12 @@
+const request = uni.$u.http
+
+// 分类列表
+export function getCategoryList(data) {
+	return request.post(
+		`v1/setting/categoryList`,
+		data
+	)
+}
+export default {
+	getCategoryList
+}

api/index.js

@@ -8,6 +8,11 @@ import share from './share'
 import document from './document/document.js'
 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,
 	setting,
@@ -16,10 +21,13 @@ const api = {
 	pay,
 	share,
 
-
+	category,
 	document,
 	my,
-	hotel
+	hotel,
+	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
+}

pages/index/active-detail/index.vue

@@ -18,17 +18,17 @@
 
 				<view class="vote-detail-btn">
 					<view class="vote-detail-btn-item">
-						<text class="vote-detail-btn-item-num">45</text>
+						<text class="vote-detail-btn-item-num">{{activeDeatil.project_num}}</text>
 						<text class="vote-detail-btn-item-text">投票项</text>
 					</view>
 					<view style="width: 2rpx;height: 52rpx;background-color: #ccc;"></view>
 					<view class="vote-detail-btn-item">
-						<text class="vote-detail-btn-item-num">2287</text>
+						<text class="vote-detail-btn-item-num">{{activeDeatil.vote_num}}</text>
 						<text class="vote-detail-btn-item-text">累计投票</text>
 					</view>
 					<view style="width: 2rpx;height: 52rpx;background-color: #ccc;"></view>
 					<view class="vote-detail-btn-item">
-						<text class="vote-detail-btn-item-num">2938</text>
+						<text class="vote-detail-btn-item-num">{{activeDeatil.view_num}}</text>
 						<text class="vote-detail-btn-item-text">访问量</text>
 					</view>
 				</view>
@@ -51,7 +51,7 @@
 				</view>
 			</view>
 			<view class="rank-search" v-if="isActive==0">
-				<u-input placeholder="输入IHG酒店名称或编号" border='none'>
+				<u-input placeholder="输入IHG酒店名称或编号" 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>
@@ -63,39 +63,39 @@
 				<view class="areaTitle" v-for="(item,index) in areaList" :key="index">
 					<view class="areaTitle-item">
 						<view :class="{'active-area':isActive === index}" @click="checked(index)">
-							{{item.title}}
+							{{item.name}}
 						</view>
 					</view>
 				</view>
 			</view>
 
-			<view class="tab_area" v-if="isActive==0">
+			<!-- <view class="tab_area" v-if="isActive==0">
 				<view class="areaTitle" v-for="(item,index) in areaList" :key="index">
 					<view class="areaTitle-item">
 						<view :class="{'active-area':isActive === index}" @click="checked(index)">
-							{{item.title}}
+							{{item.name}}
 						</view>
 					</view>
 				</view>
-			</view>
+			</view> -->
 		</view>
 
 		<!-- 查询结果 -->
 		<view class="List" v-if="isActive==0">
-			<view class="ListItem" v-for="item in 2" @click="activeDetail">
+			<view class="ListItem" v-for="item in voteList" @click="activeDetail">
 				<image src="http://t9.9026.com/imgs/Kudosbg.png" style="width: 640rpx;height:420rpx;"></image>
 				<view class="kudosicon" :style="{backgroundImage:'url('+hotelImageUrl+')'}">
-					<text style="width: 36rpx;height: 52rpx; display: flex;align-items: center;justify-content: center;color: #FFF;font-size: 24rpx;font-weight: bold; ">1</text>
+					<text style="width: 36rpx;height: 52rpx; display: flex;align-items: center;justify-content: center;color: #FFF;font-size: 24rpx;font-weight: bold; ">{{item.rank}}</text>
 				</view>
 				<view class="nav">
 					<view class="events">
-						<text>IHG最受欢迎的酒店</text>
+						<text>{{item.project_name}}</text>
 					</view>
 					<view class="voteStatus">
-						<text>1258票</text>
+						<text>{{item.ticket_num}}票</text>
 					</view>
 				</view>
-				<view class="foot" @click.stop="goVoteDetail">
+				<view class="foot" @click.stop="goVoteDetail(item.activity_id)">
 					<text>投票</text>
 				</view>
 			</view>
@@ -207,9 +207,18 @@
 </template>
 
 <script>
+	import util from './../../../utils/util.js'
 	export default {
 		data() {
 			return {
+				// 搜索
+				search:'',
+				// 活动id
+				id:'',
+				// 活动详情
+				activeDeatil:'',
+				// 投票列表
+				voteList:[],
 				//酒店排名背景图片
 				hotelImageUrl: require('../../../static/icon/tip01.png'),
 				//排行榜背景图片
@@ -224,15 +233,15 @@
 					}
 				],
 				areaList: [{
-					title: '全部'
+					name: '全部'
 				}, {
-					title: '成都'
+					name: '成都'
 				}, {
-					title: '重庆'
+					name: '重庆'
 				}, {
-					title: '绵阳'
+					name: '绵阳'
 				}, {
-					title: '南充'
+					name: '南充'
 				}],
 				//激活指定table菜单
 				isActive: 0,
@@ -244,22 +253,80 @@
 				},
 			}
 		},
+		onLoad(op) {
+			this.id=op.id
+			this.getList(op.id)
+			this.getActiveDetail(op.id)
+			this.getCategoryList(op.id)
+		},
 		methods: {
+			// 获取活动项目列表
+			getList(id){
+				this.$api.active.getActiveProjectList({
+					activity_id:id,
+					page:1,
+				}).then(res=>{
+					console.log(res,"活动项目列表")
+					if(res.code==0){
+						this.voteList=res.data.data
+					}
+				})
+			},
+			// 获取活动详情
+			getActiveDetail(id){
+				this.$api.active.getActiveDetail({
+					activity_id:id
+				}).then(res=>{
+					console.log(res,"活动详情")
+					if(res.code==0){
+						this.activeDeatil=res.data
+					}
+				})
+			},
+			// 获取活动投票项分类
+			getCategoryList(id){
+				this.$api.category.getCategoryList({
+					page:1,
+					type:3,
+					activity_id:id
+				}).then(res=>{
+					console.log(res,"活动投票项分类")
+					if(res.code==0){
+						// this.areaList=res.data.data
+					}
+				})
+			},
 			//购票详情
-			goVoteDetail(){
+			goVoteDetail(id){
 				uni.navigateTo({
-					url:'/pages/index/vote-detail/index'
+					url:'/pages/index/vote-detail/index?id='+id
+				})
+			},
+			// 搜索防抖
+			searchText:util.debounce(function(){
+				this.goSearch()
+			},1000),
+			// 搜索
+			goSearch(){
+				this.$api.active.getActiveProjectList({
+					activity_id:this.id,
+					page:1,
+					keyword:this.search
+				}).then(res=>{
+					console.log(res,"搜索活动项目列表")
+					if(res.code==0){
+						this.voteList=res.data.data
+					}
 				})
 			},
-			
 			//菜单index切换
 			checked(index) {
 				this.isActive = index
 			},
 			// 活动详情页
-			activeDetail() {
-				console.log(111);
-			},
+			// activeDetail() {
+			// 	console.log(111);
+			// },
 		}
 	}
 </script>
@@ -386,7 +453,7 @@
 	}
 
 	.area_nav .areaTitle {
-		width: 124rpx;
+		width: 140rpx;
 		height: 52rpx;
 		background-color: #F1F1F1;
 		border-radius: 26rpx;
@@ -398,7 +465,7 @@
 	}
 
 	.areaTitle-item {
-		width: 124rpx;
+		width: 140rpx;
 		height: 52rpx;
 		background-color: #F1F1F1;
 		border-radius: 26rpx;

pages/index/active-list/index.vue

@@ -4,7 +4,7 @@
 		<view class="active-list-search">
 			<!-- 搜索框 -->
 			<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>
@@ -14,31 +14,31 @@
 			<view class="tab_nav">
 				<view class="navTitle" v-for="(item,index) in items" :key="index">
 					<view :class="{'active':isActive === index}" @click="checked(index)">
-						{{item.title}}
+						{{item.name}}
 					</view>
 				</view>
 			</view>
 		</view>
 
 		<view class="List" v-if="isActive==0">
-			<view class="ListItem" v-for="item in 2" @click="activeDetail">
-				<image src="http://t9.9026.com/imgs/Kudosbg.png" style="width: 640rpx;height:420rpx;"></image>
-				<view class="kudosicon">
-					<image src="/static/icon/Kudos.png" v-if="false"></image>
-					<image src="/static/icon/Kudos(1).png"></image>
+			<view class="ListItem" v-for="(item,index) in List" @click="activeDetail(item.id)">
+				<image :src="item.banners?item.banners:'http://t9.9026.com/imgs/Kudosbg.png'" style="width: 640rpx;height:420rpx;"></image>
+				<view class="kudosicon" @click.stop="kudosActive(item.id,index)">
+					<image src="/static/icon/Kudos.png" v-if="item.is_like==0"></image>
+					<image src="/static/icon/Kudos(1).png" v-if="item.is_like==1"></image>
 				</view>
 				<view class="nav">
 					<view class="events">
-						<text>IHG最受欢迎的酒店</text>
+						<text>{{item.title}}</text>
 					</view>
 					<view class="voteStatus">
 						<text v-if="false">未开始</text>
-						<text style="color:#FF6503 ;">投票中</text>
+						<text style="color:#FF6503 ;">{{item.vote_name}}</text>
 					</view>
 				</view>
 				<view class="foot">
 					<image src="/static/icon/data.png"></image>
-					<text>2021-12-20 18:00 结束</text>
+					<text>{{item.end_time}} 结束</text>
 				</view>
 			</view>
 		</view>
@@ -51,20 +51,23 @@
 </template>
 
 <script>
+	import util from './../../../utils/util.js'
 	export default {
 		data() {
 			return {
+				// 搜索
+				search:'',
 				//分段器
 				items: [{
-						title: '热门活动'
+						name: '热门活动'
 					},
 					{
-						title: '西区活动'
+						name: '西区活动'
 					}, {
-						title: '酒店评选'
+						name: '酒店评选'
 					},
 					{
-						title: '旅游推选'
+						name: '旅游推选'
 					}
 				],
 				//激活指定table菜单
@@ -75,17 +78,82 @@
 					contentrefresh: '加载中',
 					contentnomore: '——  已经到底啦  ——'
 				},
+				// 活动列表
+				List:[],
 			}
 		},
+		onLoad() {
+			this.getList()
+			this.getCategoryList()
+			console.log(util,"until")
+		},
 		methods: {
+			// 获取活动列表
+			getList(){
+				this.$api.active.getActiveList({
+					page:1,
+					keyword:'',
+					category_id:''
+				}).then(res=>{
+					console.log(res,'活动列表')
+					if(res.code==0){
+						this.List=res.data.data
+					}
+				})
+			},
+			// 获取分类列表
+			getCategoryList(){
+				this.$api.category.getCategoryList({
+					page:1,
+					type:1
+				}).then(res=>{
+					console.log(res,"活动分类列表")
+					if(res.code==0){
+						// this.items=res.data.data
+					}
+				})
+			},
+			// 点赞活动
+			kudosActive(id,index){
+				let beforeLike=this.List[index].is_like
+				this.$api.active.kudos({
+					activity_id:id
+				}).then(res=>{
+					console.log(res,'点赞')
+					if(res.code==0){
+						if(beforeLike==1){
+							this.List[index].is_like=0
+						}else{
+							this.List[index].is_like=1
+						}
+					}
+				})
+			},
 			//菜单index切换
 			checked(index) {
 				this.isActive = index
 			},
 			// 活动详情页
-			activeDetail(){
+			activeDetail(id){
 				uni.navigateTo({
-					url:'/pages/index/active-detail/index'
+					url:'/pages/index/active-detail/index?id='+id
+				})
+			},
+			// 搜索防抖
+			searchText:util.debounce(function(){
+				this.goSearch()
+			},1000),
+			// 搜索
+			goSearch(){
+				this.$api.active.getActiveList({
+					page:1,
+					keyword:this.search,
+					category_id:''
+				}).then(res=>{
+					console.log(res,'搜索活动列表')
+					if(res.code==0){
+						this.List=res.data.data
+					}
 				})
 			},
 		}
@@ -148,7 +216,7 @@
 		}
 
 		.tab_nav .navTitle {
-			width: 128rpx;
+			width: 150rpx;
 			flex: none;
 			height: 28rpx;
 			font-size: 32rpx;

pages/index/index.vue

@@ -4,9 +4,9 @@
 		<view class="home-swiper">
 			<uni-swiper-dot :info="info" :current="current1" :mode="mode" :dots-styles="dotsStyles">
 				<swiper class="swiper-box" @change="change1" circular>
-					<swiper-item v-for="(items ,index) in info" :key="index">
-						<view v-for="(item ,j) in items" :key="j" class="swiper-item" @click="goGoodsDetail(item.pic_url)">
-							<image style="width:100%;height:142rpx;" :src="item.img"
+					<swiper-item v-for="(item ,index) in info" :key="index">
+						<view class="swiper-item" >
+							<image style="width: 100%;height:416rpx;" :src="item.img"
 								mode="aspectFill"></image>
 						</view>
 					</swiper-item>
@@ -52,7 +52,7 @@
 			<view class="home-banner-img">
 				<image style="width: 100%; height: 576rpx; border-radius: 12rpx;  " src="http://t9.9026.com/imgs/swiper01.png" mode=""></image>
 				<image class="img-clean" style="width: 20rpx; height: 20rpx; " src="/static/icon/clean.png" mode=""></image>
-				<view class="img-IHg">
+				<view class="img-IHg" @click="goJoin">
 					<image style="width: 64rpx; height: 58rpx; " src="/static/icon/vip.png" mode=""></image>
 				</view>
 			</view>
@@ -344,20 +344,8 @@
 					})
 					break;
 					case 1:
-					wx.navigateToMiniProgram({
-						appId: 'wx255b58f0992b3c53', //appid
-						path: 'newUIBooking/hotelDetail/hotelDetail?holidexCode=LZOLJ', //path
-						extraData: { //参数
-							foo: 'bar'
-						},
-						// envVersion: 'develop', //开发版develop 开发版 trial   体验版 release 正式版 
-						success(res) {
-							console.log('成功')
-							// 打开成功
-						},
-						fail(e) {
-							console.log(e, '失败')
-						}
+					uni.navigateTo({
+						url:'/pages/index/active-list/index'
 					})
 					break;
 					default:
@@ -365,9 +353,27 @@
 				}
 				
 			},
+			// 跳转其他小程序
+			goJoin() {
+				wx.navigateToMiniProgram({
+					appId: 'wx255b58f0992b3c53', //appid
+					path: 'newUIMain/enrollment/enrollment', //path
+					extraData: { //参数
+						foo: 'bar'
+					},
+					// envVersion: 'develop', //开发版develop 开发版 trial   体验版 release 正式版 
+					success(res) {
+						console.log('成功')
+						// 打开成功
+					},
+					fail(e) {
+						console.log(e, '失败')
+					}
+				})
+			},
 			// 跳转到h5页面
 			goH5() {
-				const url = 'https://t6.9026.com/admin'; // 跳转的外链
+				const url = 'https://m.sichuanair.com/touch-webapp/user/register'; // 跳转的外链
 				const navtitle = 'H5'; // 这个标题是你自己可以设置的
 				uni.navigateTo({
 					// 跳转到webview页面

pages/index/vote-detail/index.vue

@@ -4,8 +4,8 @@
 		<view class="title">
 			<image style="width: 158rpx;height: 158rpx;border-radius: 50%; " src="/static/icon/avatar.png" mode="">
 			</image>
-			<text class="title-text">成都IHG大酒店</text>
-			<text class="title-btn">2022年四川 “最受欢迎-IHG酒店” 评选</text>
+			<text class="title-text">{{voteDetail.project_name}}</text>
+			<text class="title-btn">{{voteDetail.intro}}</text>
 		</view>
 		<!-- 分割线 -->
 		<view style="width: 92%; height: 2rpx; background-color:#F0F0F0;margin: 40rpx auto;  "></view>
@@ -13,22 +13,22 @@
 		<view class="rank">
 			<view class="vote-detail-btn">
 				<view class="vote-detail-btn-item">
-					<text class="vote-detail-btn-item-num">1</text>
+					<text class="vote-detail-btn-item-num">{{voteDetail.project_no}}</text>
 					<text class="vote-detail-btn-item-text">编号</text>
 				</view>
 				<view style="width: 2rpx;height: 52rpx;background-color: #ccc;"></view>
 				<view class="vote-detail-btn-item">
-					<text class="vote-detail-btn-item-num">2342</text>
+					<text class="vote-detail-btn-item-num">{{voteDetail.ticket_num}}</text>
 					<text class="vote-detail-btn-item-text">票数</text>
 				</view>
 				<view style="width: 2rpx;height: 52rpx;background-color: #ccc;"></view>
 				<view class="vote-detail-btn-item">
-					<text class="vote-detail-btn-item-num">234</text>
+					<text class="vote-detail-btn-item-num">{{voteDetail.rank}}</text>
 					<text class="vote-detail-btn-item-text">排名</text>
 				</view>
 				<view style="width: 2rpx;height: 52rpx;background-color: #ccc;"></view>
 				<view class="vote-detail-btn-item">
-					<text class="vote-detail-btn-item-num">65</text>
+					<text class="vote-detail-btn-item-num">{{voteDetail.next_rank_ticket_num}}</text>
 					<text class="vote-detail-btn-item-text">距上名</text>
 				</view>
 			</view>
@@ -40,7 +40,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; border-radius: 12rpx; " :src="item.img"
 										mode="aspectFill"></image>
 								</view>
@@ -50,7 +50,7 @@
 				</view>
 			</view>
 			<!-- 投票 -->
-			<view class="btn">
+			<view class="btn" @click="goVote(activity_project_id)">
 				<view class="btn-vote">
 					<text>投票</text>
 				</view>
@@ -60,11 +60,20 @@
 				<view class="help-btn">
 					<text>帮我拉票</text>
 				</view>
-				<view class="img-IHg">
+				<!-- <view class="img-IHg" @click="goJoin">
 					<image style="width: 64rpx; height: 58rpx; " src="/static/icon/vip.png" mode=""></image>
-				</view>
+				</view> -->
 			</view>
-			
+
+			<movable-area class="movableArea">
+				<movable-view class="movableView" direction="all" x="630rpx" y="700rpx">
+					<view class="img-IHg" @click="goJoin">
+						<image style="width: 64rpx; height: 58rpx; " src="/static/icon/vip.png" mode=""></image>
+					</view>
+				</movable-view>
+			</movable-area>
+
+
 			<!-- 分割线 -->
 			<view style="width: 92%; height: 2rpx; background-color:#F0F0F0;margin: 64rpx auto;  "></view>
 			<!-- 介绍 -->
@@ -73,24 +82,49 @@
 					<text>参赛介绍</text>
 				</view>
 				<view class="introduce-text">
-					成都世纪城天堂洲际大饭店为您提供世界各地美食和当地美食；成都世纪城天堂洲际大饭店六个不同的烹饪台将为您展示国际喷人艺术的精辟之处。在这里，我们的厨师师傅就是艺术能手，而咖啡厅则成就了他们表演绝伦技艺的舞台。
+					成都世纪城天堂洲际大饭店为您提供世界各地美食和当地美食；成都世纪城天堂洲际大饭店六个不同的烹饪台将为您展示国际烹饪艺术的精辟之处。在这里，我们的厨师师傅就是艺术能手，而咖啡厅则成就了他们表演绝伦技艺的舞台。
 				</view>
 			</view>
-			
+
 			<!-- 预约 -->
 			<view class="reserve">
-				<view class="reserve-left">
+				<view class="reserve-left" @click="goBooking">
 					<image style="width: 36rpx;height: 36rpx; margin-right: 10rpx;" src="/static/icon/reserve02.png"
 						mode=""></image>
 					<text>预约</text>
 				</view>
-				<view class="reserve-right">
+				<view class="reserve-right" @click="goJoin">
 					<image style="width: 60rpx;height: 56rpx; margin-right: 4rpx; " src="/static/icon/reserve01.png"
 						mode=""></image>
 					<text>加入IHG会员</text>
 				</view>
 			</view>
 		</view>
+
+		<!-- 弹出层 -->
+		<uni-popup ref="popup" type="center">
+			<view class="pop">
+				<view class="title"><text>投票成功</text></view>
+				<view class="img">
+					<image src="http://t9.9026.com/imgs/Kudosbg.png"></image>
+				</view>
+				<view class="textfont">
+					<text v-if="false">今日投票数已用完
+					点击 加入IHG会员 可享受额外X票数</text>
+					<text v-if="false">今日投票数还有 2 次
+					点击再次投票可再次为本项目投票也可为其他项目投票</text>
+					<text v-if="true">恭喜你中奖了！
+					获得了XXX的奖品，请尽快领取</text>
+					</view>
+				<view class="btn">
+					<view class="cancel" @click="closeVote"><text>关闭</text></view>
+					<view class="cancel" @click="closeVote" v-if="false"><text>再次投票</text></view>
+					<view class="download" @click="goJoin" ><text >加入IHG会员</text></view>
+					<view class="download" @click="goJoin" v-if="false"><text>其他项目</text></view>
+					<view class="download" @click="goJoin" v-if="false"><text>去领取</text></view>
+				</view>
+			</view>
+		</uni-popup>
 	</view>
 </template>
 
@@ -98,6 +132,10 @@
 	export default {
 		data() {
 			return {
+				// 活动项目id
+				activity_project_id: '',
+				// 活动项目详情
+				voteDetail: '',
 				//轮播图
 				info: [{
 					img: 'http://t9.9026.com/imgs/swiper01.png',
@@ -116,13 +154,81 @@
 				mode: 'default',
 			}
 		},
+		onLoad(op) {
+			this.activity_project_id = op.id
+			this.getDetail(op.id)
+		},
 		methods: {
 			// 切换轮播图指示点
 			change1(e) {
 				this.current1 = e.detail.current;
 			},
-
-
+			getDetail(id) {
+				this.$api.active.getActiveProjectDetail({
+					activity_project_id: id
+				}).then(res => {
+					console.log(res, "detail")
+					if (res.code == 0) {
+						this.voteDetail = res.data
+					}
+				})
+			},
+			// 打开弹出层
+			openVote() {
+				this.$refs.popup.open()
+			},
+			// 关闭弹出层
+			closeVote() {
+				this.$refs.popup.close()
+			},
+			// 跳转其他小程序
+			goJoin() {
+				this.closeVote()
+				wx.navigateToMiniProgram({
+					appId: 'wx255b58f0992b3c53', //appid
+					path: 'newUIMain/enrollment/enrollment', //path
+					extraData: { //参数
+						foo: 'bar'
+					},
+					// envVersion: 'develop', //开发版develop 开发版 trial   体验版 release 正式版 
+					success(res) {
+						console.log('成功')
+						// 打开成功
+					},
+					fail(e) {
+						console.log(e, '失败')
+					}
+				})
+			},
+			// 投票
+			goVote(id) {
+				this.$api.active.vote({
+					activity_project_id: id
+				}).then(res => {
+					console.log(res, '投票')
+					if (res.code == 0) {
+						this.openVote()
+						this.getDetail(this.activity_project_id)
+					} else {
+						uni.showToast({
+							icon: 'none',
+							title: res.msg
+						})
+					}
+				}).catch(err => {
+					console.log(err)
+					uni.showToast({
+						icon: 'none',
+						title: '投票失败'
+					})
+				})
+			},
+			// 去预约
+			goBooking() {
+				uni.switchTab({
+					url: '/pages/map/map'
+				})
+			},
 		}
 	}
 </script>
@@ -235,9 +341,12 @@
 			display: flex;
 			align-items: center;
 			justify-content: center;
-			position: absolute;
-			top: -28rpx;
-			right: 14rpx;
+			position: fixed;
+			// top: -28rpx;
+			// right: 14rpx;
+			top: 1030rpx;
+			right: 30rpx;
+			z-index: 99;
 
 		}
 	}
@@ -328,4 +437,117 @@
 			}
 		}
 	}
+
+	.pop {
+		width: 640rpx;
+		height: 740rpx;
+		background: #FFFFFF;
+		border-radius: 20rpx;
+		padding-top: 32rpx;
+		box-sizing: border-box;
+
+		.title {
+			@include flexlayout();
+			margin-bottom: 32rpx;
+
+			text {
+				font-size: 34rpx;
+				font-family: PingFangSC-Medium, PingFang SC;
+				font-weight: 500;
+				color: #FF7119;
+			}
+		}
+
+		.img {
+			margin-left: 48rpx;
+			width: 544rpx;
+			height: 306rpx;
+			background: $bgColor;
+			border-radius: 2rpx;
+			@include flexlayout();
+			margin-bottom: 32rpx;
+
+			image {
+				width: 544rpx;
+				height: 306rpx;
+			}
+		}
+
+		.textfont {
+			margin-left: 30rpx;
+			margin-bottom: 40rpx;
+			@include flexlayout();
+			width: 572rpx;
+			height: 106rpx;
+
+			text {
+				text-align: center;
+				font-size: 34rpx;
+				font-weight: 400;
+				color: #000000;
+			}
+		}
+
+		.btn {
+			width: 100%;
+			height: 110rpx;
+			display: flex;
+			align-items: center;
+
+			.cancel {
+				@include flexlayout();
+				width: 50%;
+				height: 100%;
+				border-top: #E5E5E5 solid 1rpx;
+				border-right: #E5E5E5 solid 1rpx;
+
+				text {
+					font-size: 32rpx;
+					font-family: PingFangSC-Medium, PingFang SC;
+					font-weight: 500;
+					color: #666666;
+				}
+			}
+
+			.download {
+				border-top: #E5E5E5 solid 1rpx;
+				// border-left:#E5E5E5 solid 0.3rpx;
+				@include flexlayout();
+				height: 100%;
+				width: 50%;
+
+				text {
+					font-size: 32rpx;
+					font-family: PingFangSC-Medium, PingFang SC;
+					font-weight: 500;
+					color: #FF7119;
+				}
+			}
+		}
+	}
+
+	.movableArea {
+		position: fixed;
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 100%;
+		pointer-events: none; //设置area元素不可点击，则事件便会下移至页面下层元素
+		.movableView {
+			pointer-events: auto; //可以点击
+			width: 84rpx;
+			height: 84rpx;
+			padding:0 30rpx;
+			.img-IHg {
+				width: 84rpx;
+				height: 84rpx;
+				background-color: #fff;
+				box-shadow: 0px 8rpx 24rpx 0px rgba(220, 222, 229, 0.4);
+				border-radius: 50%;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+			}
+		}
+	}
 </style>

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>

pages/my/my.vue

@@ -25,7 +25,7 @@
 			</view>
 
 			<!-- 会员 -->
-			<view class="membership">
+			<view class="membership" @click="goJoin">
 				<view class="flex">
 					<view style="display: flex;align-items: center;">
 						<image style="width: 68rpx ;height: 62rpx;" src="../../static/icon/vip.png"></image>
@@ -257,6 +257,24 @@
 				}
 
 			},
+			// 跳转其他小程序
+			goJoin() {
+				wx.navigateToMiniProgram({
+					appId: 'wx255b58f0992b3c53', //appid
+					path: 'newUIMain/enrollment/enrollment', //path
+					extraData: { //参数
+						foo: 'bar'
+					},
+					// envVersion: 'develop', //开发版develop 开发版 trial   体验版 release 正式版 
+					success(res) {
+						console.log('成功')
+						// 打开成功
+					},
+					fail(e) {
+						console.log(e, '失败')
+					}
+				})
+			},
 			// 上传头像
 			uploadAvatar() {
 				// let img = []

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

@@ -19873,7 +19873,12 @@ var _share = _interopRequireDefault(__webpack_require__(/*! ./share */ 157));
 
 var _document = _interopRequireDefault(__webpack_require__(/*! ./document/document.js */ 161));
 var _my = _interopRequireDefault(__webpack_require__(/*! ./my/my.js */ 162));
-var _hotel = _interopRequireDefault(__webpack_require__(/*! ./hotel/hotel.js */ 163));function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };} // 酒店
+var _hotel = _interopRequireDefault(__webpack_require__(/*! ./hotel/hotel.js */ 163));
+var _active = _interopRequireDefault(__webpack_require__(/*! ./active/active.js */ 668));
+var _category = _interopRequireDefault(__webpack_require__(/*! ./category/category.js */ 669));
+var _integral = _interopRequireDefault(__webpack_require__(/*! ./integral/integral.js */ 670));
+var _product = _interopRequireDefault(__webpack_require__(/*! ./product/product.js */ 671));function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };} // 酒店
+
 var api = {
   user: _index.default,
   setting: _setting.default,
@@ -19882,10 +19887,13 @@ var api = {
   pay: _pay.default,
   share: _share.default,
 
-
+  category: _category.default,
   document: _document.default,
   my: _my.default,
-  hotel: _hotel.default };var _default =
+  hotel: _hotel.default,
+  active: _active.default,
+  integral: _integral.default,
+  product: _product.default };var _default =
 
 
 api;exports.default = _default;
@@ -29919,6 +29927,200 @@ Object.defineProperty(exports, "__esModule", { value: true });exports.default =
 Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var _default = {
   props: {} };exports.default = _default;
 
+/***/ }),
+/* 665 */,
+/* 666 */,
+/* 667 */,
+/* 668 */
+/*!*******************************************************!*\
+  !*** D:/vscode-demo/IHG/IHG/IHG/api/active/active.js ***!
+  \*******************************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.getActiveList = getActiveList;exports.getActiveDetail = getActiveDetail;exports.kudos = kudos;exports.getActiveProjectList = getActiveProjectList;exports.getActiveProjectDetail = getActiveProjectDetail;exports.vote = vote;exports.default = void 0;var request = uni.$u.http;
+
+// 获取活动列表
+function getActiveList(data) {
+  return request.post("v1/activity/activityList",
+
+  data);
+
+}
+// 获取活动详情
+function getActiveDetail(data) {
+  return request.post("v1/activity/activityDetail",
+
+  data);
+
+}
+// 点赞
+function kudos(data) {
+  return request.post("v1/activity/activityLike",
+
+  data);
+
+}
+// 获取活动项目列表
+function getActiveProjectList(data) {
+  return request.post("v1/activity/activityProjectList",
+
+  data);
+
+}
+// 获取活动项目详情
+function getActiveProjectDetail(data) {
+  return request.post("v1/activity/activityProjectDetail",
+
+  data);
+
+}
+// 投票
+function vote(data) {
+  return request.post("v1/activity/vote",
+
+  data);
+
+}var _default =
+{
+  getActiveDetail: getActiveDetail,
+  getActiveList: getActiveList,
+  kudos: kudos,
+  getActiveProjectList: getActiveProjectList,
+  getActiveProjectDetail: getActiveProjectDetail,
+  vote: vote };exports.default = _default;
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))
+
+/***/ }),
+/* 669 */
+/*!***********************************************************!*\
+  !*** D:/vscode-demo/IHG/IHG/IHG/api/category/category.js ***!
+  \***********************************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.getCategoryList = getCategoryList;exports.default = void 0;var request = uni.$u.http;
+
+// 分类列表
+function getCategoryList(data) {
+  return request.post("v1/setting/categoryList",
+
+  data);
+
+}var _default =
+{
+  getCategoryList: getCategoryList };exports.default = _default;
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))
+
+/***/ }),
+/* 670 */
+/*!***********************************************************!*\
+  !*** D:/vscode-demo/IHG/IHG/IHG/api/integral/integral.js ***!
+  \***********************************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.getIntegralLog = getIntegralLog;exports.integralExchange = integralExchange;exports.default = void 0;var request = uni.$u.http;
+
+// 获取积分日志
+function getIntegralLog(data) {
+  return request.post("v1/integral/integralLog",
+
+  data);
+
+}
+// 积分兑换
+function integralExchange(data) {
+  return request.post("v1/integral/integralExchange",
+
+  data);
+
+}var _default =
+
+
+{
+  getIntegralLog: getIntegralLog,
+  integralExchange: integralExchange };exports.default = _default;
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))
+
+/***/ }),
+/* 671 */
+/*!*********************************************************!*\
+  !*** D:/vscode-demo/IHG/IHG/IHG/api/product/product.js ***!
+  \*********************************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.getProducts = getProducts;exports.getProductDetail = getProductDetail;exports.default = void 0;var request = uni.$u.http;
+
+// 获取产品列表
+function getProducts(data) {
+  return request.post("v1/product/productList",
+
+  data);
+
+}
+
+// 获取产品详情
+function getProductDetail(data) {
+  return request.post("v1/product/productDetail",
+
+  data);
+
+}var _default =
+
+{
+  getProducts: getProducts,
+  getProductDetail: getProductDetail };exports.default = _default;
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))
+
+/***/ }),
+/* 672 */,
+/* 673 */
+/*!************************************************!*\
+  !*** D:/vscode-demo/IHG/IHG/IHG/utils/util.js ***!
+  \************************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });exports.throttle = throttle;exports.debounce = debounce;exports.default = void 0; // 节流
+function throttle(fn) {var wait = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 200;
+  var last, timer, now;
+  return function () {
+    now = Date.now();
+    if (last && now - last < wait) {
+      clearTimeout(timer);
+      timer = setTimeout(function () {
+        last = now;
+        fn.call.apply(fn, [this].concat(Array.prototype.slice.call(arguments)));
+      }, wait);
+    } else {
+      last = now;
+      fn.call.apply(fn, [this].concat(Array.prototype.slice.call(arguments)));
+    }
+  };
+}
+// 防抖
+function debounce(fn) {var wait = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 200;
+  var timer;
+  return function () {
+    var context = this;
+    var args = arguments;
+    if (timer) clearTimeout(timer);
+    timer = setTimeout(function () {
+      fn.apply(context, args);
+    }, wait);
+  };
+}var _default =
+{
+  throttle: throttle,
+  debounce: debounce };exports.default = _default;
+
 /***/ })
 ]]);
 //# sourceMappingURL=../../.sourcemap/mp-weixin/common/vendor.js.map

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

@@ -161,7 +161,216 @@ __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; //
+/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+var _util = _interopRequireDefault(__webpack_require__(/*! ./../../../utils/util.js */ 673));function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };} //
 //
 //
 //
@@ -369,60 +578,26 @@ __webpack_require__.r(__webpack_exports__);
 //
 //
 //
-var _default =
-{
-  data: function data() {
-    return {
-      //酒店排名背景图片
-      hotelImageUrl: __webpack_require__(/*! ../../../static/icon/tip01.png */ 196),
-      //排行榜背景图片
-      backImageUrl: 'http://t9.9026.com/imgs/rank01.png',
-      rankList: [{
-        title: '投票' },
-
-      {
-        title: '排行榜' },
-      {
-        title: '活动介绍' }],
-
-
-      areaList: [{
-        title: '全部' },
-      {
-        title: '成都' },
-      {
-        title: '重庆' },
-      {
-        title: '绵阳' },
-      {
-        title: '南充' }],
-
-      //激活指定table菜单
-      isActive: 0,
-      status: 'noMore',
-      contentText: {
-        contentdown: '查看更多',
-        contentrefresh: '加载中',
-        contentnomore: '——  已经到底啦  ——' } };
-
-
-  },
-  methods: {
-    //购票详情
-    goVoteDetail: function goVoteDetail() {
-      uni.navigateTo({
-        url: '/pages/index/vote-detail/index' });
-
-    },
-
-    //菜单index切换
-    checked: function checked(index) {
-      this.isActive = index;
-    },
-    // 活动详情页
-    activeDetail: function activeDetail() {
-      console.log(111);
-    } } };exports.default = _default;
+var _default = { data: function data() {return { // 搜索
+      search: '', // 活动id
+      id: '', // 活动详情
+      activeDeatil: '', // 投票列表
+      voteList: [], //酒店排名背景图片
+      hotelImageUrl: __webpack_require__(/*! ../../../static/icon/tip01.png */ 196), //排行榜背景图片
+      backImageUrl: 'http://t9.9026.com/imgs/rank01.png', rankList: [{ title: '投票' }, { title: '排行榜' }, { title: '活动介绍' }], areaList: [{ name: '全部' }, { name: '成都' }, { name: '重庆' }, { name: '绵阳' }, { name: '南充' }], //激活指定table菜单
+      isActive: 0, status: 'noMore', contentText: { contentdown: '查看更多', contentrefresh: '加载中', contentnomore: '——  已经到底啦  ——' } };}, onLoad: function onLoad(op) {this.id = op.id;this.getList(op.id);this.getActiveDetail(op.id);this.getCategoryList(op.id);}, methods: { // 获取活动项目列表
+    getList: function getList(id) {var _this = this;this.$api.active.getActiveProjectList({ activity_id: id, page: 1 }).then(function (res) {console.log(res, "活动项目列表");if (res.code == 0) {_this.voteList = res.data.data;}});}, // 获取活动详情
+    getActiveDetail: function getActiveDetail(id) {var _this2 = this;this.$api.active.getActiveDetail({ activity_id: id }).then(function (res) {console.log(res, "活动详情");if (res.code == 0) {_this2.activeDeatil = res.data;}});}, // 获取活动投票项分类
+    getCategoryList: function getCategoryList(id) {this.$api.category.getCategoryList({ page: 1, type: 3, activity_id: id }).then(function (res) {console.log(res, "活动投票项分类");if (res.code == 0) {// this.areaList=res.data.data
+        }});}, //购票详情
+    goVoteDetail: function goVoteDetail(id) {uni.navigateTo({ url: '/pages/index/vote-detail/index?id=' + id });}, // 搜索防抖
+    searchText: _util.default.debounce(function () {this.goSearch();}, 1000), // 搜索
+    goSearch: function goSearch() {var _this3 = this;this.$api.active.getActiveProjectList({ activity_id: this.id, page: 1, keyword: this.search }).then(function (res) {console.log(res, "搜索活动项目列表");if (res.code == 0) {_this3.voteList = res.data.data;}});}, //菜单index切换
+    checked: function checked(index) {this.isActive = index;} // 活动详情页
+    // activeDetail() {
+    // 	console.log(111);
+    // },
+  } };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/index/active-detail/index.wxss

@@ -126,7 +126,7 @@
   font-family: PingFang-SC-Heavy, PingFang-SC;
 }
 .area_nav .areaTitle.data-v-14511315 {
-  width: 124rpx;
+  width: 140rpx;
   height: 52rpx;
   background-color: #F1F1F1;
   border-radius: 26rpx;
@@ -136,7 +136,7 @@
   align-items: center;
 }
 .areaTitle-item.data-v-14511315 {
-  width: 124rpx;
+  width: 140rpx;
   height: 52rpx;
   background-color: #F1F1F1;
   border-radius: 26rpx;

unpackage/dist/dev/mp-weixin/pages/index/active-list/index.js

@@ -161,7 +161,60 @@ __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; //
+/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+var _util = _interopRequireDefault(__webpack_require__(/*! ./../../../utils/util.js */ 673));function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };} //
 //
 //
 //
@@ -213,43 +266,58 @@ __webpack_require__.r(__webpack_exports__);
 //
 //
 //
-var _default =
-{
-  data: function data() {
-    return {
-      //分段器
-      items: [{
-        title: '热门活动' },
-
-      {
-        title: '西区活动' },
-      {
-        title: '酒店评选' },
-
-      {
-        title: '旅游推选' }],
-
-
-      //激活指定table菜单
-      isActive: 0,
-      status: 'noMore',
-      contentText: {
-        contentdown: '查看更多',
-        contentrefresh: '加载中',
-        contentnomore: '——  已经到底啦  ——' } };
-
-
-  },
-  methods: {
+var _default = { data: function data() {return { // 搜索
+      search: '', //分段器
+      items: [{ name: '热门活动' }, { name: '西区活动' }, { name: '酒店评选' }, { name: '旅游推选' }], //激活指定table菜单
+      isActive: 0, status: 'noMore', contentText: { contentdown: '查看更多', contentrefresh: '加载中', contentnomore: '——  已经到底啦  ——' }, // 活动列表
+      List: [] };}, onLoad: function onLoad() {this.getList();this.getCategoryList();console.log(_util.default, "until");}, methods: { // 获取活动列表
+    getList: function getList() {var _this = this;this.$api.active.getActiveList({ page: 1, keyword: '', category_id: '' }).then(function (res) {console.log(res, '活动列表');if (res.code == 0) {_this.List = res.data.data;}});}, // 获取分类列表
+    getCategoryList: function getCategoryList() {this.$api.category.getCategoryList({ page: 1, type: 1 }).then(function (res) {console.log(res, "活动分类列表");if (res.code == 0) {// this.items=res.data.data
+        }
+      });
+    },
+    // 点赞活动
+    kudosActive: function kudosActive(id, index) {var _this2 = this;
+      var beforeLike = this.List[index].is_like;
+      this.$api.active.kudos({
+        activity_id: id }).
+      then(function (res) {
+        console.log(res, '点赞');
+        if (res.code == 0) {
+          if (beforeLike == 1) {
+            _this2.List[index].is_like = 0;
+          } else {
+            _this2.List[index].is_like = 1;
+          }
+        }
+      });
+    },
     //菜单index切换
     checked: function checked(index) {
       this.isActive = index;
     },
     // 活动详情页
-    activeDetail: function activeDetail() {
+    activeDetail: function activeDetail(id) {
       uni.navigateTo({
-        url: '/pages/index/active-detail/index' });
+        url: '/pages/index/active-detail/index?id=' + id });
 
+    },
+    // 搜索防抖
+    searchText: _util.default.debounce(function () {
+      this.goSearch();
+    }, 1000),
+    // 搜索
+    goSearch: function goSearch() {var _this3 = this;
+      this.$api.active.getActiveList({
+        page: 1,
+        keyword: this.search,
+        category_id: '' }).
+      then(function (res) {
+        console.log(res, '搜索活动列表');
+        if (res.code == 0) {
+          _this3.List = res.data.data;
+        }
+      });
     } } };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/index/active-list/index.wxss

@@ -59,7 +59,7 @@
   font-family: PingFang-SC-Heavy, PingFang-SC;
 }
 .active-list-search .tab_nav .navTitle.data-v-d478d53c {
-  width: 128rpx;
+  width: 150rpx;
   flex: none;
   height: 28rpx;
   font-size: 32rpx;

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

@@ -504,30 +504,36 @@ __webpack_require__.r(__webpack_exports__);
 
           break;
         case 1:
-          wx.navigateToMiniProgram({
-            appId: 'wx255b58f0992b3c53', //appid
-            path: 'newUIBooking/hotelDetail/hotelDetail?holidexCode=LZOLJ', //path
-            extraData: { //参数
-              foo: 'bar' },
-
-            // envVersion: 'develop', //开发版develop 开发版 trial   体验版 release 正式版 
-            success: function success(res) {
-              console.log('成功');
-              // 打开成功
-            },
-            fail: function fail(e) {
-              console.log(e, '失败');
-            } });
+          uni.navigateTo({
+            url: '/pages/index/active-list/index' });
 
           break;
         default:
           console.log(index);}
 
 
+    },
+    // 跳转其他小程序
+    goJoin: function goJoin() {
+      wx.navigateToMiniProgram({
+        appId: 'wx255b58f0992b3c53', //appid
+        path: 'newUIMain/enrollment/enrollment', //path
+        extraData: { //参数
+          foo: 'bar' },
+
+        // envVersion: 'develop', //开发版develop 开发版 trial   体验版 release 正式版 
+        success: function success(res) {
+          console.log('成功');
+          // 打开成功
+        },
+        fail: function fail(e) {
+          console.log(e, '失败');
+        } });
+
     },
     // 跳转到h5页面
     goH5: function goH5() {
-      var url = 'https://t6.9026.com/admin'; // 跳转的外链
+      var url = 'https://m.sichuanair.com/touch-webapp/user/register'; // 跳转的外链
       var navtitle = 'H5'; // 这个标题是你自己可以设置的
       uni.navigateTo({
         // 跳转到webview页面

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

@@ -99,6 +99,9 @@ try {
   components = {
     uniSwiperDot: function() {
       return __webpack_require__.e(/*! import() | uni_modules/uni-swiper-dot/components/uni-swiper-dot/uni-swiper-dot */ "uni_modules/uni-swiper-dot/components/uni-swiper-dot/uni-swiper-dot").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-swiper-dot/components/uni-swiper-dot/uni-swiper-dot.vue */ 440))
+    },
+    uniPopup: function() {
+      return __webpack_require__.e(/*! import() | uni_modules/uni-popup/components/uni-popup/uni-popup */ "uni_modules/uni-popup/components/uni-popup/uni-popup").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-popup/components/uni-popup/uni-popup.vue */ 488))
     }
   }
 } catch (e) {
@@ -155,7 +158,41 @@ __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; //
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
 //
 //
 //
@@ -255,6 +292,10 @@ var _default =
 {
   data: function data() {
     return {
+      // 活动项目id
+      activity_project_id: '',
+      // 活动项目详情
+      voteDetail: '',
       //轮播图
       info: [{
         img: 'http://t9.9026.com/imgs/swiper01.png',
@@ -273,11 +314,82 @@ var _default =
       mode: 'default' };
 
   },
+  onLoad: function onLoad(op) {
+    this.activity_project_id = op.id;
+    this.getDetail(op.id);
+  },
   methods: {
     // 切换轮播图指示点
     change1: function change1(e) {
       this.current1 = e.detail.current;
+    },
+    getDetail: function getDetail(id) {var _this = this;
+      this.$api.active.getActiveProjectDetail({
+        activity_project_id: id }).
+      then(function (res) {
+        console.log(res, "detail");
+        if (res.code == 0) {
+          _this.voteDetail = res.data;
+        }
+      });
+    },
+    // 打开弹出层
+    openVote: function openVote() {
+      this.$refs.popup.open();
+    },
+    // 关闭弹出层
+    closeVote: function closeVote() {
+      this.$refs.popup.close();
+    },
+    // 跳转其他小程序
+    goJoin: function goJoin() {
+      this.closeVote();
+      wx.navigateToMiniProgram({
+        appId: 'wx255b58f0992b3c53', //appid
+        path: 'newUIMain/enrollment/enrollment', //path
+        extraData: { //参数
+          foo: 'bar' },
+
+        // envVersion: 'develop', //开发版develop 开发版 trial   体验版 release 正式版 
+        success: function success(res) {
+          console.log('成功');
+          // 打开成功
+        },
+        fail: function fail(e) {
+          console.log(e, '失败');
+        } });
+
+    },
+    // 投票
+    goVote: function goVote(id) {var _this2 = this;
+      this.$api.active.vote({
+        activity_project_id: id }).
+      then(function (res) {
+        console.log(res, '投票');
+        if (res.code == 0) {
+          _this2.openVote();
+          _this2.getDetail(_this2.activity_project_id);
+        } else {
+          uni.showToast({
+            icon: 'none',
+            title: res.msg });
+
+        }
+      }).catch(function (err) {
+        console.log(err);
+        uni.showToast({
+          icon: 'none',
+          title: '投票失败' });
+
+      });
+    },
+    // 去预约
+    goBooking: function goBooking() {
+      uni.switchTab({
+        url: '/pages/map/map' });
+
     } } };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/index/vote-detail/index.json

@@ -2,6 +2,7 @@
   "navigationBarTitleText": "投票详情",
   "enablePullDownRefresh": false,
   "usingComponents": {
-    "uni-swiper-dot": "/uni_modules/uni-swiper-dot/components/uni-swiper-dot/uni-swiper-dot"
+    "uni-swiper-dot": "/uni_modules/uni-swiper-dot/components/uni-swiper-dot/uni-swiper-dot",
+    "uni-popup": "/uni_modules/uni-popup/components/uni-popup/uni-popup"
   }
 }

unpackage/dist/dev/mp-weixin/pages/index/vote-detail/index.wxss

@@ -107,9 +107,10 @@ page.data-v-5749479e {
   display: flex;
   align-items: center;
   justify-content: center;
-  position: absolute;
-  top: -28rpx;
-  right: 14rpx;
+  position: fixed;
+  top: 1030rpx;
+  right: 30rpx;
+  z-index: 99;
 }
 .btn.data-v-5749479e {
   padding: 0 30rpx;
@@ -180,4 +181,113 @@ page.data-v-5749479e {
 .vote-detail-btn .vote-detail-btn-item .vote-detail-btn-item-text.data-v-5749479e {
   margin-top: 20rpx;
 }
+.pop.data-v-5749479e {
+  width: 640rpx;
+  height: 740rpx;
+  background: #FFFFFF;
+  border-radius: 20rpx;
+  padding-top: 32rpx;
+  box-sizing: border-box;
+}
+.pop .title.data-v-5749479e {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-bottom: 32rpx;
+}
+.pop .title text.data-v-5749479e {
+  font-size: 34rpx;
+  font-family: PingFangSC-Medium, PingFang SC;
+  font-weight: 500;
+  color: #FF7119;
+}
+.pop .img.data-v-5749479e {
+  margin-left: 48rpx;
+  width: 544rpx;
+  height: 306rpx;
+  background: #FFFFFF;
+  border-radius: 2rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-bottom: 32rpx;
+}
+.pop .img image.data-v-5749479e {
+  width: 544rpx;
+  height: 306rpx;
+}
+.pop .textfont.data-v-5749479e {
+  margin-left: 30rpx;
+  margin-bottom: 40rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 572rpx;
+  height: 106rpx;
+}
+.pop .textfont text.data-v-5749479e {
+  text-align: center;
+  font-size: 34rpx;
+  font-weight: 400;
+  color: #000000;
+}
+.pop .btn.data-v-5749479e {
+  width: 100%;
+  height: 110rpx;
+  display: flex;
+  align-items: center;
+}
+.pop .btn .cancel.data-v-5749479e {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 50%;
+  height: 100%;
+  border-top: #E5E5E5 solid 1rpx;
+  border-right: #E5E5E5 solid 1rpx;
+}
+.pop .btn .cancel text.data-v-5749479e {
+  font-size: 32rpx;
+  font-family: PingFangSC-Medium, PingFang SC;
+  font-weight: 500;
+  color: #666666;
+}
+.pop .btn .download.data-v-5749479e {
+  border-top: #E5E5E5 solid 1rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  height: 100%;
+  width: 50%;
+}
+.pop .btn .download text.data-v-5749479e {
+  font-size: 32rpx;
+  font-family: PingFangSC-Medium, PingFang SC;
+  font-weight: 500;
+  color: #FF7119;
+}
+.movableArea.data-v-5749479e {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  pointer-events: none;
+}
+.movableArea .movableView.data-v-5749479e {
+  pointer-events: auto;
+  width: 84rpx;
+  height: 84rpx;
+  padding: 0 30rpx;
+}
+.movableArea .movableView .img-IHg.data-v-5749479e {
+  width: 84rpx;
+  height: 84rpx;
+  background-color: #fff;
+  box-shadow: 0px 8rpx 24rpx 0px rgba(220, 222, 229, 0.4);
+  border-radius: 50%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
 

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

@@ -219,6 +219,8 @@ __webpack_require__.r(__webpack_exports__);
         contentrefresh: '加载中',
         contentnomore: '——  已经到底啦  ——' },
 
+      // 积分产品列表
+      integralList: [],
 
       arr: [],
       // 瀑布流组件相关
@@ -232,15 +234,15 @@ __webpack_require__.r(__webpack_exports__);
         {
           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,
@@ -248,23 +250,36 @@ __webpack_require__.r(__webpack_exports__);
         {
           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: function onLoad() {
     this.shortLong();
+    this.getProductList();
   },
   methods: {
+    // 获取积分产品列表
+    getProductList: function getProductList() {var _this = this;
+      this.$api.product.getProducts({
+        page: 1,
+        type: 2 }).
+      then(function (res) {
+        console.log(res, "积分产品");
+        if (res.code == 0) {
+          _this.integralList = res.data.data;
+        }
+      });
+    },
     // 跳转积分规则
     gointegralRule: function gointegralRule() {
       uni.navigateTo({

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

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

@@ -413,6 +413,24 @@ __webpack_require__.r(__webpack_exports__);
           break;}
 
 
+    },
+    // 跳转其他小程序
+    goJoin: function goJoin() {
+      wx.navigateToMiniProgram({
+        appId: 'wx255b58f0992b3c53', //appid
+        path: 'newUIMain/enrollment/enrollment', //path
+        extraData: { //参数
+          foo: 'bar' },
+
+        // envVersion: 'develop', //开发版develop 开发版 trial   体验版 release 正式版 
+        success: function success(res) {
+          console.log('成功');
+          // 打开成功
+        },
+        fail: function fail(e) {
+          console.log(e, '失败');
+        } });
+
     },
     // 上传头像
     uploadAvatar: function uploadAvatar() {

utils/util.js

@@ -14,7 +14,7 @@ export function throttle(fn, wait = 200) {
 			fn.call(this, ...arguments);
 		}
 	};
-},
+}
 // 防抖
 export function debounce(fn, wait = 200) {
 	let timer;
@@ -26,7 +26,7 @@ export function debounce(fn, wait = 200) {
 			fn.apply(context, args);
 		}, wait)
 	}
-},
+}
 export default {
 	throttle,
 	debounce