Tartarus преди 2 години
родител
ревизия
20fa3814b9
променени са 31 файла, в които са добавени 824 реда и са изтрити 153 реда
  1. 5 1
      api/index.js
  2. 30 0
      api/lottery/lottery.js
  3. 46 0
      api/orders/orders.js
  4. 44 12
      pages/my/Kudos/Kudos.vue
  5. 5 1
      pages/my/integral/integral.vue
  6. 3 3
      pages/my/integral/integralRecord.vue
  7. 45 8
      pages/my/myorders/orders.vue
  8. 58 10
      pages/my/prize/prize.vue
  9. 51 5
      pages/my/verification/verification.vue
  10. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
  11. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/Kudos/Kudos.js.map
  12. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/integral/integral.js.map
  13. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/integral/integralRecord.js.map
  14. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/myorders/orders.js.map
  15. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/prize/prize.js.map
  16. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/verification/verification.js.map
  17. 102 2
      unpackage/dist/dev/mp-weixin/common/vendor.js
  18. 39 7
      unpackage/dist/dev/mp-weixin/pages/my/Kudos/Kudos.js
  19. 1 1
      unpackage/dist/dev/mp-weixin/pages/my/Kudos/Kudos.wxml
  20. 4 0
      unpackage/dist/dev/mp-weixin/pages/my/integral/integral.js
  21. 1 1
      unpackage/dist/dev/mp-weixin/pages/my/integral/integral.wxml
  22. 1 1
      unpackage/dist/dev/mp-weixin/pages/my/integral/integralRecord.wxml
  23. 1 1
      unpackage/dist/dev/mp-weixin/pages/my/integral/integralRecord.wxss
  24. 212 53
      unpackage/dist/dev/mp-weixin/pages/my/myorders/orders.js
  25. 0 0
      unpackage/dist/dev/mp-weixin/pages/my/myorders/orders.wxml
  26. 50 2
      unpackage/dist/dev/mp-weixin/pages/my/prize/prize.js
  27. 0 0
      unpackage/dist/dev/mp-weixin/pages/my/prize/prize.wxml
  28. 1 2
      unpackage/dist/dev/mp-weixin/pages/my/prize/prize.wxss
  29. 121 43
      unpackage/dist/dev/mp-weixin/pages/my/verification/verification.js
  30. 0 0
      unpackage/dist/dev/mp-weixin/pages/my/verification/verification.wxml
  31. 4 0
      unpackage/dist/dev/mp-weixin/pages/my/verification/verification.wxss

+ 5 - 1
api/index.js

xqd xqd
@@ -12,6 +12,8 @@ import active from './active/active.js'
 import category from './category/category.js'
 import integral from './integral/integral.js'
 import product from './product/product.js'
+import lottery from './lottery/lottery.js'
+import orders from './orders/orders.js'
 
 const api = {
 	user,
@@ -27,7 +29,9 @@ const api = {
 	hotel,
 	active,
 	integral,
-	product
+	product,
+	lottery,
+	orders
 }
 
 export default api

+ 30 - 0
api/lottery/lottery.js

xqd
@@ -0,0 +1,30 @@
+const request = uni.$u.http
+
+// 抽奖
+export function luckyDraw(data){
+	return request.post(
+		`v1/draw/luckyDraw`,
+		data
+	)
+}
+
+// 抽奖详情
+export function getDrawInfo(data){
+	return request.post(
+		`v1/draw/drawInfo`,
+		data
+	)
+}
+// 中奖记录
+export function getDrawRecord(data){
+	return request.post(
+		`v1/draw/drawRecord`,
+		data
+	)
+}
+
+export default {
+  luckyDraw,
+  getDrawInfo,
+  getDrawRecord
+}

+ 46 - 0
api/orders/orders.js

xqd
@@ -0,0 +1,46 @@
+const request = uni.$u.http
+
+// 订单列表
+export function getOrderList(data){
+	return request.post(
+		`v1/order/orderList`,
+		data
+	)
+}
+
+// 我的订单详情
+export function getOrderDetail(data){
+	return request.post(
+		`v1/order/orderDetail`,
+		data
+	)
+}
+
+// 订单兑换
+export function orderExchange(data){
+	return request.post(
+		`v1/order/orderExchange`,
+		data
+	)
+}
+// 核销订单
+export function confirmOrder(data){
+	return request.post(
+		`v1/order/confirmOrder`,
+		data
+	)
+}
+// 核销订单详情
+export function confirmOrderDetail(data){
+	return request.post(
+		`v1/order/confirmOrderDetail`,
+		data
+	)
+}
+export default {
+ getOrderList,
+ getOrderDetail,
+ orderExchange,
+ confirmOrder,
+ confirmOrderDetail
+}

+ 44 - 12
pages/my/Kudos/Kudos.vue

xqd xqd xqd xqd
@@ -2,15 +2,15 @@
 	<view class="kudos">
 		<!-- 点赞列表 -->
 		<view class="List">
-			<view class="ListItem" v-for="item in 6" @click="goVoteDetail">
+			<view class="ListItem" v-for="(item,index) in List" @click="goVoteDetail(item.id)">
 				<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="isLike" @click.stop="clickKudos"></image>
-					<image src="/static/icon/Kudos(1).png" v-if="!isLike" @click.stop="clickKudos"></image>
+					<image src="/static/icon/Kudos.png" v-if="item.is_like!=1" @click.stop="clickKudos(item.id,index)"></image>
+					<image src="/static/icon/Kudos(1).png" v-if="item.is_like==1" @click.stop="clickKudos(item.id,index)"></image>
 				</view>
 				<view class="nav">
 					<view class="events">
-						<text>IHG最受欢迎的酒店</text>
+						<text>{{item.title}}</text>
 					</view>
 					<view class="voteStatus">
 						<text v-if="false">未开始</text>
@@ -19,7 +19,7 @@
 				</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>
@@ -32,8 +32,6 @@
 	export default{
 		data(){
 			return{
-				// 点赞状态
-				isLike:false,
 				//组件uni-load-more
 				status: 'noMore',
 				contentText: {
@@ -41,19 +39,53 @@
 					contentrefresh: '加载中',
 					contentnomore: '——  已经到底啦  ——'
 				},
+				// 点赞列表
+				List:[],
 			}
 		},
+		onLoad() {
+			this.getList()
+		},
 		methods:{
+			// 获取点赞列表
+			getList(){
+				this.$api.active.getActiveList({
+					page:1,
+					is_my_like:1
+				}).then(res=>{
+					console.log(res,"点赞列表")
+					if(res.code==0){
+						this.List=res.data.data
+					}else{
+						uni.showToast({
+							title:res.msg,
+							icon:'none'
+						})
+					}
+				})
+			},
 			// 跳转投票详情
-			goVoteDetail(){
+			goVoteDetail(id){
 				uni.navigateTo({
-					url:'/pages/index/vote-detail/index'
+					url:'/pages/index/active-detail/index?id='+id
 				})
 			},
 			// 点赞
-			clickKudos(){
-				this.isLike=!this.isLike
-			}
+			clickKudos(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
+						}
+					}
+				})
+			},
 		}
 	}
 </script>

+ 5 - 1
pages/my/integral/integral.vue

xqd xqd xqd
@@ -5,7 +5,7 @@
 			<image src="http://t9.9026.com/imgs/integralbg.png" style="width: 100%; height: 100%;"></image>
 			<view class="PointsColumn">
 				<image src="/static/icon/integralicon.png"></image>
-				<text>1000</text>
+				<text>{{userIntegral}}</text>
 			</view>
 			<view class="titletext">
 				<view class="textitem" @click="gointegralRecord">
@@ -55,6 +55,8 @@
 		},
 		data(){
 			return{
+				// 用户积分
+				userIntegral:0,
 				// 组件uni-load-more	
 				status: 'noMore',
 				contentText: {
@@ -109,6 +111,8 @@
 		onLoad() {
 			this.shortLong()
 			this.getProductList()
+			console.log(this.$store.getters.userInfo)
+			this.userIntegral=this.$store.getters.userInfo.integral
 		},
 		methods:{
 			// 获取积分产品列表

+ 3 - 3
pages/my/integral/integralRecord.vue

xqd xqd xqd
@@ -13,7 +13,7 @@
 		
 		<!-- 收入 -->
 		<view class="List" v-if="isActive == 0">
-			<view class="ListItem" v-for="item in 5">
+			<view class="ListItem" v-for="item in incomeList">
 				<view style="display: flex; justify-content: space-between;">
 					<view class="title"><text>500积分</text> </view>
 					<view class='data'><text>2022-02-10</text></view>
@@ -24,7 +24,7 @@
 		
 		<!-- 支出 -->
 		<view class="List" :style="{'--height':ListHeight+'rpx'}" v-if="isActive == 1">
-			<view class="ListItem" v-for="item in 20">
+			<view class="ListItem" v-for="item in spendingList">
 				<view style="display: flex; justify-content: space-between;">
 					<view class="title"><text>500积分</text> </view>
 					<view class='data'><text>2022-02-10</text></view>
@@ -183,7 +183,7 @@
 		box-shadow: 0px 4rpx 24rpx -10rpx rgba(101, 95, 90, 0.3);
 		border-radius: 12rpx;
 		margin-top: 24rpx;
-		padding: 8rpx 28rpx 0 32rpx;
+		padding: 0rpx 28rpx 0 32rpx;
 		box-sizing: border-box;
 	
 		.ListItem {

+ 45 - 8
pages/my/myorders/orders.vue

xqd xqd xqd xqd xqd xqd xqd xqd
@@ -4,7 +4,7 @@
 			<!-- 搜索栏 -->
 			<view class="navbox">
 				<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>
@@ -25,7 +25,7 @@
 		</view>
 		<!-- 全部 -->
 		<view v-if="isActive === 0">
-			<view class="card" v-for="item in 2">
+			<view class="card" v-for="item in orderList">
 				<view class="toptitle">
 					<view>订单号:62aae0eb9c6fd622</view>
 					<view>未核销</view>
@@ -60,7 +60,7 @@
 		</view>
 		<!-- 待兑换 -->
 		<view v-if="isActive == 1">
-			<view class="card" v-for="item in 2">
+			<view class="card" v-for="item in orderList">
 				<view class="toptitle">
 					<view>订单号:62aae0eb9c6fd622</view>
 					<view>未核销</view>
@@ -91,7 +91,7 @@
 		</view>
 		<!-- 待发货 -->
 		<view v-if="isActive ==2">
-			<view class="card" v-for="item in 2">
+			<view class="card" v-for="item in orderList">
 				<view class="toptitle">
 					<view>订单号:62aae0eb9c6fd622</view>
 					<view>未核销</view>
@@ -122,7 +122,7 @@
 		</view>
 		<!-- 待收货 -->
 		<view v-if="isActive == 3">
-			<view class="card" v-for="item in 2" @click="goOrderDetail">
+			<view class="card" v-for="item in orderList" @click="goOrderDetail">
 				<view class="toptitle">
 					<view>订单号:62aae0eb9c6fd622</view>
 					<view>未核销</view>
@@ -148,7 +148,7 @@
 		</view>
 		<!-- 已完成 -->
 		<view v-if="isActive == 4">
-			<view class="card" v-for="item in 2">
+			<view class="card" v-for="item in orderList">
 				<view class="toptitle">
 					<view>订单号:62aae0eb9c6fd622</view>
 					<view>未核销</view>
@@ -195,9 +195,12 @@
 </template>
 
 <script>
+	import util from './../../../utils/util.js'
 	export default {
 		data() {
 			return {
+				// 搜索
+				search:'',
 				// 分段器标题
 				items: ['全部', '待兑换', '待发货', '待收货', '已完成'],
 				isActive: 0,
@@ -208,20 +211,54 @@
 					contentrefresh: '加载中',
 					contentnomore: '——  已经到底啦  ——'
 				},
+				// 订单列表
+				orderList:[],
 			}
 		},
 		onLoad(o) {
 			if (o.isActive) {
 				this.isActive = o.isActive
+				this.getMyOrder(o.isActive)
+			}else{
+				this.getMyOrder()
 			}
 		},
 		methods: {
-			
+			// 获取订单列表
+			getMyOrder(type){
+				this.$api.orders.getOrderList({
+					page:1,
+					status:type||'',
+					keyword:this.search
+				}).then(res=>{
+					console.log(res,type,"订单列表")
+					if(res.code==0){
+						this.orderList=res.data.data
+					}
+				})
+			},
 			//菜单index切换
 			checked(index) {
 				this.isActive = index
+				this.getMyOrder(index)
+			},
+			// 搜索防抖
+			searchText:util.debounce(function(){
+				this.goSearch()
+			},1000),
+			// 搜索
+			goSearch(){
+				this.$api.orders.getOrderList({
+					status:this.isActive,
+					page:1,
+					keyword:this.search
+				}).then(res=>{
+					console.log(res,"搜索活动项目列表")
+					if(res.code==0){
+						this.orderList=res.data.data
+					}
+				})
 			},
-			
 			// 跳转订单详情
 			goOrderDetail() {
 				uni.navigateTo({

+ 58 - 10
pages/my/prize/prize.vue

xqd xqd xqd xqd xqd xqd
@@ -14,7 +14,7 @@
 		<view style="margin-bottom: 60rpx; ">
 			<!-- 实物奖品 -->
 			<view class="prizeList" :style="{'--height':ListHeight+'rpx'}" v-if="isActive == 0">
-				<view class="ListItem" v-for="item in 5">
+				<view class="ListItem" v-for="item in PhysicalPrizes">
 					<view class="title"><text>HUAWEI MateBook X Pro</text></view>
 					<view class='data'><text>2022-02-10</text></view>
 					<view class="alreadyBtn" v-if="false">
@@ -28,7 +28,7 @@
 			
 			<!-- 线下奖品 -->
 			<view class="prizeList" :style="{'--height':ListHeight+'rpx'}" v-if="isActive == 1">
-				<view class="ListItem" v-for="item in 5">
+				<view class="ListItem" v-for="item in VirtualPrizes">
 					<view class="title"><text>HUAWEI MateBook X Pro</text></view>
 					<view class='data'><text>2022-02-10</text></view>
 					<view class="alreadyBtn" v-if="false">
@@ -42,12 +42,12 @@
 			
 			<!-- 中奖记录 -->
 			<view class="prizeList" :style="{'--height':ListHeight+'rpx'}" v-if="isActive == 2">
-				<view class="ListItem" v-for="item in 5">
+				<view class="ListItem" v-for="item in prizeRecord">
 					<view style="display: flex; justify-content: space-between;">
-						<view class="title"><text>活动奖品</text> </view>
-						<view class='data'><text>2022-02-10</text></view>
+						<view class="title"><text>{{item.name}}</text> </view>
+						<view class='data'><text>{{item.created_at}}</text></view>
 					</view>
-					<view class="content"><text>点赞“IHG最受欢迎酒店”获得奖品“xxx”</text></view>
+					<view class="content"><text>{{item.details}}</text></view>
 				</view>
 			</view>
 		</view>
@@ -74,10 +74,58 @@
 					contentrefresh: '加载中',
 					contentnomore: '—— 已经到底啦 ——'
 				},
-				
+				// 实物奖品列表
+				PhysicalPrizes:[],
+				// 虚拟奖品列表
+				VirtualPrizes:[],
+				// 中奖记录
+				prizeRecord:[]
 			}
 		},
+		onLoad() {
+			// 实物奖品
+			this.getPrizeList(3)
+			// 虚拟奖品
+			this.getPrizeList(4)
+			// 中奖记录
+			this.getPrizeRecord()
+		},
 		methods: {
+			// 获取奖品列表
+			getPrizeList(type){
+				this.$api.product.getProducts({
+					type:type,
+					page:1
+				}).then(res=>{
+					if(type==3){
+						console.log(res,"实物奖品")
+						if(res.code==0){
+							this.PhysicalPrizes=res.data.data
+						}
+					}else if(type==4){
+						console.log(res,"虚拟奖品")
+						if(res.code==0){
+							this.VirtualPrizes=res.data.data
+						}
+					}else{
+						uni.showToast({
+							title:'type不正确!',
+							icon:'none'
+						})
+					}
+				})
+			},
+			// 获取中奖记录
+			getPrizeRecord(){
+				this.$api.lottery.getDrawRecord({
+					page:1
+				}).then(res=>{
+					console.log(res,"中奖记录")
+					if(res.code==0){
+						this.prizeRecord=res.data.data
+					}
+				})
+			},
 			//分段器标题切换
 			checked(index) {
 				this.isActive = index
@@ -87,7 +135,7 @@
 				uni.navigateTo({
 					url: '/pages/my/prize/exchangePrize'
 				})
-			}
+			},
 		},
 
 	}
@@ -170,11 +218,11 @@
 
 	.prizeList {
 		width: 750rpx;
-		height: var(--height);
+		// height: var(--height);
 		background: $bgColor;
 		box-shadow: 0px 4rpx 24rpx -10rpx rgba(101, 95, 90, 0.3);
 		border-radius: 12rpx;
-		padding: 8rpx 28rpx 0 32rpx;
+		padding: 0rpx 28rpx 0 32rpx;
 		box-sizing: border-box;
 
 		.ListItem {

+ 51 - 5
pages/my/verification/verification.vue

xqd xqd xqd xqd xqd xqd xqd
@@ -4,7 +4,7 @@
 			<!-- 搜索栏 -->
 			<view class="navbox">
 				<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>
@@ -29,7 +29,7 @@
 		
 		<!-- 未核销列表 -->
 		<view v-if="isActive === 0">
-			<view class="card" v-for="item in 2" >
+			<view class="card" v-for="item in orderList" >
 				<view class="toptitle">
 					<view>洲际天堂大饭店</view>
 					<view>未核销</view>
@@ -52,7 +52,7 @@
 		</view>
 		<!-- 已核销列表 -->
 		<view v-if="isActive === 1">
-			<view class="card" v-for="item in 2" @click="goDetail">
+			<view class="card" v-for="item in orderList" @click="goDetail">
 				<view class="toptitle">
 					<view>洲际天堂大饭店</view>
 					<view>未核销</view>
@@ -75,7 +75,7 @@
 		</view>
 		<!-- 我的列表 -->
 		<view v-if="isActive === 2" >
-			<view class="card" v-for="item in 2" @click="goDetail">
+			<view class="card" v-for="item in orderList" @click="goDetail">
 				<view class="toptitle">
 					<view>洲际天堂大饭店</view>
 					<view>未核销</view>
@@ -97,14 +97,19 @@
 			</view>
 		</view>
 		<!-- 已经到底啦 -->
-		<uni-load-more :status="status" color="#CCCCCC" :content-text="contentText"/>
+		<view class="home-bottom">
+			<uni-load-more :status="status" color="#CCCCCC" :content-text="contentText"/>
+		</view>
 	</view>
 </template>
 
 <script>
+	import util from './../../../utils/util.js'
 	export default{
 		data(){
 			return{
+				// 搜索
+				search:'',
 				// 分段器标题
 				items: ['未核销', '已核销', '我的'],
 				isActive: 0,
@@ -115,12 +120,49 @@
 					contentrefresh: '加载中',
 					contentnomore: '——  已经到底啦  ——'
 				},
+				// 订单列表
+				orderList:[],
 			}
 		},
+		onLoad() {
+			this.getMyOrder(1)
+		},
 		methods:{
+			// 获取订单列表
+			getMyOrder(type){
+				this.$api.orders.getOrderList({
+					page:1,
+					confirm_status:type||'',
+					keyword:this.search
+				}).then(res=>{
+					console.log(res,type,"订单列表")
+					if(res.code==0){
+						this.orderList=res.data.data
+					}
+				})
+			},
 			//菜单index切换
 			checked(index) {
+				console.log(index)
 				this.isActive = index
+				this.getMyOrder(index+1)
+			},
+			// 搜索防抖
+			searchText:util.debounce(function(){
+				this.goSearch()
+			},1000),
+			// 搜索
+			goSearch(){
+				this.$api.orders.getOrderList({
+					confirm_status:this.isActive+1,
+					page:1,
+					keyword:this.search
+				}).then(res=>{
+					console.log(res,"搜索活动项目列表")
+					if(res.code==0){
+						this.orderList=res.data.data
+					}
+				})
 			},
 			// 跳转核销订单
 			goOrderVF(){
@@ -327,4 +369,8 @@
 			}
 		}
 	}
+	.home-bottom {
+		padding-top: 80rpx;
+		background-color: #f9f9f9;
+	}
 </style>

Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/Kudos/Kudos.js.map


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/integral/integral.js.map


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/integral/integralRecord.js.map


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/myorders/orders.js.map


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/prize/prize.js.map


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/verification/verification.js.map


+ 102 - 2
unpackage/dist/dev/mp-weixin/common/vendor.js

xqd xqd xqd
@@ -19875,7 +19875,9 @@ var _hotel = _interopRequireDefault(__webpack_require__(/*! ./hotel/hotel.js */
 var _active = _interopRequireDefault(__webpack_require__(/*! ./active/active.js */ 164));
 var _category = _interopRequireDefault(__webpack_require__(/*! ./category/category.js */ 165));
 var _integral = _interopRequireDefault(__webpack_require__(/*! ./integral/integral.js */ 661));
-var _product = _interopRequireDefault(__webpack_require__(/*! ./product/product.js */ 721));function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };} // 酒店
+var _product = _interopRequireDefault(__webpack_require__(/*! ./product/product.js */ 721));
+var _lottery = _interopRequireDefault(__webpack_require__(/*! ./lottery/lottery.js */ 722));
+var _orders = _interopRequireDefault(__webpack_require__(/*! ./orders/orders.js */ 723));function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };} // 酒店
 
 var api = {
   user: _index.default,
@@ -19891,7 +19893,9 @@ var api = {
   hotel: _hotel.default,
   active: _active.default,
   integral: _integral.default,
-  product: _product.default };var _default =
+  product: _product.default,
+  lottery: _lottery.default,
+  orders: _orders.default };var _default =
 
 
 api;exports.default = _default;
@@ -30136,6 +30140,102 @@ function getProductDetail(data) {
   getProductDetail: getProductDetail };exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))
 
+/***/ }),
+/* 722 */
+/*!*********************************************************************!*\
+  !*** C:/Users/Administrator/Desktop/ihg/IHG/api/lottery/lottery.js ***!
+  \*********************************************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.luckyDraw = luckyDraw;exports.getDrawInfo = getDrawInfo;exports.getDrawRecord = getDrawRecord;exports.default = void 0;var request = uni.$u.http;
+
+// 抽奖
+function luckyDraw(data) {
+  return request.post("v1/draw/luckyDraw",
+
+  data);
+
+}
+
+// 抽奖详情
+function getDrawInfo(data) {
+  return request.post("v1/draw/drawInfo",
+
+  data);
+
+}
+// 中奖记录
+function getDrawRecord(data) {
+  return request.post("v1/draw/drawRecord",
+
+  data);
+
+}var _default =
+
+{
+  luckyDraw: luckyDraw,
+  getDrawInfo: getDrawInfo,
+  getDrawRecord: getDrawRecord };exports.default = _default;
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))
+
+/***/ }),
+/* 723 */
+/*!*******************************************************************!*\
+  !*** C:/Users/Administrator/Desktop/ihg/IHG/api/orders/orders.js ***!
+  \*******************************************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.getOrderList = getOrderList;exports.getOrderDetail = getOrderDetail;exports.orderExchange = orderExchange;exports.confirmOrder = confirmOrder;exports.confirmOrderDetail = confirmOrderDetail;exports.default = void 0;var request = uni.$u.http;
+
+// 订单列表
+function getOrderList(data) {
+  return request.post("v1/order/orderList",
+
+  data);
+
+}
+
+// 我的订单详情
+function getOrderDetail(data) {
+  return request.post("v1/order/orderDetail",
+
+  data);
+
+}
+
+// 订单兑换
+function orderExchange(data) {
+  return request.post("v1/order/orderExchange",
+
+  data);
+
+}
+// 核销订单
+function confirmOrder(data) {
+  return request.post("v1/order/confirmOrder",
+
+  data);
+
+}
+// 核销订单详情
+function confirmOrderDetail(data) {
+  return request.post("v1/order/confirmOrderDetail",
+
+  data);
+
+}var _default =
+{
+  getOrderList: getOrderList,
+  getOrderDetail: getOrderDetail,
+  orderExchange: orderExchange,
+  confirmOrder: confirmOrder,
+  confirmOrderDetail: confirmOrderDetail };exports.default = _default;
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))
+
 /***/ })
 ]]);
 //# sourceMappingURL=../../.sourcemap/mp-weixin/common/vendor.js.map

+ 39 - 7
unpackage/dist/dev/mp-weixin/pages/my/Kudos/Kudos.js

xqd
@@ -189,27 +189,59 @@ var _default =
 {
   data: function data() {
     return {
-      // 点赞状态
-      isLike: false,
       //组件uni-load-more
       status: 'noMore',
       contentText: {
         contentdown: '查看更多',
         contentrefresh: '加载中',
-        contentnomore: '——  已经到底啦  ——' } };
+        contentnomore: '——  已经到底啦  ——' },
 
+      // 点赞列表
+      List: [] };
 
   },
+  onLoad: function onLoad() {
+    this.getList();
+  },
   methods: {
+    // 获取点赞列表
+    getList: function getList() {var _this = this;
+      this.$api.active.getActiveList({
+        page: 1,
+        is_my_like: 1 }).
+      then(function (res) {
+        console.log(res, "点赞列表");
+        if (res.code == 0) {
+          _this.List = res.data.data;
+        } else {
+          uni.showToast({
+            title: res.msg,
+            icon: 'none' });
+
+        }
+      });
+    },
     // 跳转投票详情
-    goVoteDetail: function goVoteDetail() {
+    goVoteDetail: function goVoteDetail(id) {
       uni.navigateTo({
-        url: '/pages/index/vote-detail/index' });
+        url: '/pages/index/active-detail/index?id=' + id });
 
     },
     // 点赞
-    clickKudos: function clickKudos() {
-      this.isLike = !this.isLike;
+    clickKudos: function clickKudos(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;
+          }
+        }
+      });
     } } };exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))
 

+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/my/Kudos/Kudos.wxml

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

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

xqd xqd
@@ -212,6 +212,8 @@ __webpack_require__.r(__webpack_exports__);
 
   data: function data() {
     return {
+      // 用户积分
+      userIntegral: 0,
       // 组件uni-load-more	
       status: 'noMore',
       contentText: {
@@ -266,6 +268,8 @@ __webpack_require__.r(__webpack_exports__);
   onLoad: function onLoad() {
     this.shortLong();
     this.getProductList();
+    console.log(this.$store.getters.userInfo);
+    this.userIntegral = this.$store.getters.userInfo.integral;
   },
   methods: {
     // 获取积分产品列表

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

xqd
@@ -1 +1 @@
-<view class="integral data-v-3fcebf05"><view class="nav data-v-3fcebf05"><image style="width:100%;height:100%;" src="http://t9.9026.com/imgs/integralbg.png" class="data-v-3fcebf05"></image><view class="PointsColumn data-v-3fcebf05"><image src="/static/icon/integralicon.png" class="data-v-3fcebf05"></image><text class="data-v-3fcebf05">1000</text></view><view class="titletext data-v-3fcebf05"><view data-event-opts="{{[['tap',[['gointegralRecord',['$event']]]]]}}" class="textitem data-v-3fcebf05" bindtap="__e"><image src="/static/icon/integralrecord.png" class="data-v-3fcebf05"></image><text class="data-v-3fcebf05">积分记录</text></view><view data-event-opts="{{[['tap',[['goMyorder',['$event']]]]]}}" class="textitem data-v-3fcebf05" bindtap="__e"><image src="/static/icon/lament.png" class="data-v-3fcebf05"></image><text class="data-v-3fcebf05">我的兑换</text></view><view data-event-opts="{{[['tap',[['gointegralRule',['$event']]]]]}}" class="textitem data-v-3fcebf05" bindtap="__e"><image src="/static/icon/integralrule.png" class="data-v-3fcebf05"></image><text class="data-v-3fcebf05">积分规则</text></view></view></view><view class="shopList data-v-3fcebf05"><view class="listTop data-v-3fcebf05"><text class="data-v-3fcebf05">积分兑换</text></view><helang-waterfall-list vue-id="8becbabe-1" status="{{waterfall.status}}" list="{{waterfall.list}}" reset="{{waterfall.reset}}" class="data-v-3fcebf05" bind:__l="__l"></helang-waterfall-list><uni-load-more vue-id="8becbabe-2" status="{{status}}" color="#CCCCCC" content-text="{{contentText}}" class="data-v-3fcebf05" bind:__l="__l"></uni-load-more></view></view>
+<view class="integral data-v-3fcebf05"><view class="nav data-v-3fcebf05"><image style="width:100%;height:100%;" src="http://t9.9026.com/imgs/integralbg.png" class="data-v-3fcebf05"></image><view class="PointsColumn data-v-3fcebf05"><image src="/static/icon/integralicon.png" class="data-v-3fcebf05"></image><text class="data-v-3fcebf05">{{userIntegral}}</text></view><view class="titletext data-v-3fcebf05"><view data-event-opts="{{[['tap',[['gointegralRecord',['$event']]]]]}}" class="textitem data-v-3fcebf05" bindtap="__e"><image src="/static/icon/integralrecord.png" class="data-v-3fcebf05"></image><text class="data-v-3fcebf05">积分记录</text></view><view data-event-opts="{{[['tap',[['goMyorder',['$event']]]]]}}" class="textitem data-v-3fcebf05" bindtap="__e"><image src="/static/icon/lament.png" class="data-v-3fcebf05"></image><text class="data-v-3fcebf05">我的兑换</text></view><view data-event-opts="{{[['tap',[['gointegralRule',['$event']]]]]}}" class="textitem data-v-3fcebf05" bindtap="__e"><image src="/static/icon/integralrule.png" class="data-v-3fcebf05"></image><text class="data-v-3fcebf05">积分规则</text></view></view></view><view class="shopList data-v-3fcebf05"><view class="listTop data-v-3fcebf05"><text class="data-v-3fcebf05">积分兑换</text></view><helang-waterfall-list vue-id="8becbabe-1" status="{{waterfall.status}}" list="{{waterfall.list}}" reset="{{waterfall.reset}}" class="data-v-3fcebf05" bind:__l="__l"></helang-waterfall-list><uni-load-more vue-id="8becbabe-2" status="{{status}}" color="#CCCCCC" content-text="{{contentText}}" class="data-v-3fcebf05" bind:__l="__l"></uni-load-more></view></view>

+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/my/integral/integralRecord.wxml

xqd
@@ -1 +1 @@
-<view class="integralRecord data-v-edd69d94"><view class="segmented data-v-edd69d94"><view class="tab_nav data-v-edd69d94"><block wx:for="{{items}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="navTitle data-v-edd69d94"><view data-event-opts="{{[['tap',[['checked',[index]]]]]}}" class="{{['data-v-edd69d94',(isActive==index)?'active':'']}}" bindtap="__e">{{''+item+''}}</view></view></block></view></view><block wx:if="{{isActive==0}}"><view class="List data-v-edd69d94"><block wx:for="{{5}}" wx:for-item="item" wx:for-index="__i0__"><view class="ListItem data-v-edd69d94"><view style="display:flex;justify-content:space-between;" class="data-v-edd69d94"><view class="title data-v-edd69d94"><text class="data-v-edd69d94">500积分</text></view><view class="data data-v-edd69d94"><text class="data-v-edd69d94">2022-02-10</text></view></view><view class="content data-v-edd69d94"><text class="data-v-edd69d94">投票活动奖励</text></view></view></block></view></block><block wx:if="{{isActive==1}}"><view class="List data-v-edd69d94" style="{{'--height:'+(ListHeight+'rpx')+';'}}"><block wx:for="{{20}}" wx:for-item="item" wx:for-index="__i1__"><view class="ListItem data-v-edd69d94"><view style="display:flex;justify-content:space-between;" class="data-v-edd69d94"><view class="title data-v-edd69d94"><text class="data-v-edd69d94">500积分</text></view><view class="data data-v-edd69d94"><text class="data-v-edd69d94">2022-02-10</text></view></view><view class="content data-v-edd69d94"><text class="data-v-edd69d94">积分兑换商品</text></view></view></block></view></block><view class="home-bottom data-v-edd69d94" style="margin-top:88rpx;padding-bottom:60rpx;"><uni-load-more vue-id="ccfc12e0-1" status="{{status}}" color="#CCCCCC" content-text="{{contentText}}" class="data-v-edd69d94" bind:__l="__l"></uni-load-more></view></view>
+<view class="integralRecord data-v-edd69d94"><view class="segmented data-v-edd69d94"><view class="tab_nav data-v-edd69d94"><block wx:for="{{items}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="navTitle data-v-edd69d94"><view data-event-opts="{{[['tap',[['checked',[index]]]]]}}" class="{{['data-v-edd69d94',(isActive==index)?'active':'']}}" bindtap="__e">{{''+item+''}}</view></view></block></view></view><block wx:if="{{isActive==0}}"><view class="List data-v-edd69d94"><block wx:for="{{incomeList}}" wx:for-item="item" wx:for-index="__i0__"><view class="ListItem data-v-edd69d94"><view style="display:flex;justify-content:space-between;" class="data-v-edd69d94"><view class="title data-v-edd69d94"><text class="data-v-edd69d94">500积分</text></view><view class="data data-v-edd69d94"><text class="data-v-edd69d94">2022-02-10</text></view></view><view class="content data-v-edd69d94"><text class="data-v-edd69d94">投票活动奖励</text></view></view></block></view></block><block wx:if="{{isActive==1}}"><view class="List data-v-edd69d94" style="{{'--height:'+(ListHeight+'rpx')+';'}}"><block wx:for="{{spendingList}}" wx:for-item="item" wx:for-index="__i1__"><view class="ListItem data-v-edd69d94"><view style="display:flex;justify-content:space-between;" class="data-v-edd69d94"><view class="title data-v-edd69d94"><text class="data-v-edd69d94">500积分</text></view><view class="data data-v-edd69d94"><text class="data-v-edd69d94">2022-02-10</text></view></view><view class="content data-v-edd69d94"><text class="data-v-edd69d94">积分兑换商品</text></view></view></block></view></block><view class="home-bottom data-v-edd69d94" style="margin-top:88rpx;padding-bottom:60rpx;"><uni-load-more vue-id="ccfc12e0-1" status="{{status}}" color="#CCCCCC" content-text="{{contentText}}" class="data-v-edd69d94" bind:__l="__l"></uni-load-more></view></view>

+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/my/integral/integralRecord.wxss

xqd
@@ -91,7 +91,7 @@
   box-shadow: 0px 4rpx 24rpx -10rpx rgba(101, 95, 90, 0.3);
   border-radius: 12rpx;
   margin-top: 24rpx;
-  padding: 8rpx 28rpx 0 32rpx;
+  padding: 0rpx 28rpx 0 32rpx;
   box-sizing: border-box;
 }
 .List .ListItem.data-v-edd69d94 {

+ 212 - 53
unpackage/dist/dev/mp-weixin/pages/my/myorders/orders.js

xqd xqd
@@ -164,7 +164,204 @@ __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 */ 190));function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };} //
 //
 //
 //
@@ -360,58 +557,20 @@ __webpack_require__.r(__webpack_exports__);
 //
 //
 //
-var _default =
-{
-  data: function data() {
-    return {
-      // 分段器标题
-      items: ['全部', '待兑换', '待发货', '待收货', '已完成'],
-      isActive: 0,
-      // 组件uni-load-more
-      status: 'noMore',
-      contentText: {
-        contentdown: '查看更多',
-        contentrefresh: '加载中',
-        contentnomore: '——  已经到底啦  ——' } };
-
-
-  },
-  onLoad: function onLoad(o) {
-    if (o.isActive) {
-      this.isActive = o.isActive;
-    }
-  },
-  methods: {
-
-    //菜单index切换
-    checked: function checked(index) {
-      this.isActive = index;
-    },
-
-    // 跳转订单详情
-    goOrderDetail: function goOrderDetail() {
-      uni.navigateTo({
-        url: '/pages/my/myorders/orderDetail' });
-
-    },
-    // 跳转积分兑换
-    goIntegralExchange: function goIntegralExchange() {
-      uni.navigateTo({
-        url: '/pages/my/integral/integralOrder' });
-
-    },
-    // 打开弹出层
-    openVFcode: function openVFcode() {
-      this.$refs.popup.open();
-    },
-    // 关闭弹出层
-    closeVFcode: function closeVFcode() {
-      this.$refs.popup.close();
-    },
-    // 保存图片
-    handleDownImg: function handleDownImg() {
-      this.$refs.popup.close();
-      // const that = this;
+var _default = { data: function data() {return { // 搜索
+      search: '', // 分段器标题
+      items: ['全部', '待兑换', '待发货', '待收货', '已完成'], isActive: 0, // 组件uni-load-more
+      status: 'noMore', contentText: { contentdown: '查看更多', contentrefresh: '加载中', contentnomore: '——  已经到底啦  ——' }, // 订单列表
+      orderList: [] };}, onLoad: function onLoad(o) {if (o.isActive) {this.isActive = o.isActive;this.getMyOrder(o.isActive);} else {this.getMyOrder();}}, methods: { // 获取订单列表
+    getMyOrder: function getMyOrder(type) {var _this = this;this.$api.orders.getOrderList({ page: 1, status: type || '', keyword: this.search }).then(function (res) {console.log(res, type, "订单列表");if (res.code == 0) {_this.orderList = res.data.data;}});}, //菜单index切换
+    checked: function checked(index) {this.isActive = index;this.getMyOrder(index);}, // 搜索防抖
+    searchText: _util.default.debounce(function () {this.goSearch();}, 1000), // 搜索
+    goSearch: function goSearch() {var _this2 = this;this.$api.orders.getOrderList({ status: this.isActive, page: 1, keyword: this.search }).then(function (res) {console.log(res, "搜索活动项目列表");if (res.code == 0) {_this2.orderList = res.data.data;}});}, // 跳转订单详情
+    goOrderDetail: function goOrderDetail() {uni.navigateTo({ url: '/pages/my/myorders/orderDetail' });}, // 跳转积分兑换
+    goIntegralExchange: function goIntegralExchange() {uni.navigateTo({ url: '/pages/my/integral/integralOrder' });}, // 打开弹出层
+    openVFcode: function openVFcode() {this.$refs.popup.open();}, // 关闭弹出层
+    closeVFcode: function closeVFcode() {this.$refs.popup.close();}, // 保存图片
+    handleDownImg: function handleDownImg() {this.$refs.popup.close(); // const that = this;
       // uni.downloadFile({
       //     url:'网络路径',
       //     success: res => {

Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
unpackage/dist/dev/mp-weixin/pages/my/myorders/orders.wxml


+ 50 - 2
unpackage/dist/dev/mp-weixin/pages/my/prize/prize.js

xqd
@@ -229,12 +229,60 @@ var _default =
       contentText: {
         contentdown: '查看更多',
         contentrefresh: '加载中',
-        contentnomore: '—— 已经到底啦 ——' } };
-
+        contentnomore: '—— 已经到底啦 ——' },
 
+      // 实物奖品列表
+      PhysicalPrizes: [],
+      // 虚拟奖品列表
+      VirtualPrizes: [],
+      // 中奖记录
+      prizeRecord: [] };
 
   },
+  onLoad: function onLoad() {
+    // 实物奖品
+    this.getPrizeList(3);
+    // 虚拟奖品
+    this.getPrizeList(4);
+    // 中奖记录
+    this.getPrizeRecord();
+  },
   methods: {
+    // 获取奖品列表
+    getPrizeList: function getPrizeList(type) {var _this = this;
+      this.$api.product.getProducts({
+        type: type,
+        page: 1 }).
+      then(function (res) {
+        if (type == 3) {
+          console.log(res, "实物奖品");
+          if (res.code == 0) {
+            _this.PhysicalPrizes = res.data.data;
+          }
+        } else if (type == 4) {
+          console.log(res, "虚拟奖品");
+          if (res.code == 0) {
+            _this.VirtualPrizes = res.data.data;
+          }
+        } else {
+          uni.showToast({
+            title: 'type不正确!',
+            icon: 'none' });
+
+        }
+      });
+    },
+    // 获取中奖记录
+    getPrizeRecord: function getPrizeRecord() {var _this2 = this;
+      this.$api.lottery.getDrawRecord({
+        page: 1 }).
+      then(function (res) {
+        console.log(res, "中奖记录");
+        if (res.code == 0) {
+          _this2.prizeRecord = res.data.data;
+        }
+      });
+    },
     //分段器标题切换
     checked: function checked(index) {
       this.isActive = index;

Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
unpackage/dist/dev/mp-weixin/pages/my/prize/prize.wxml


+ 1 - 2
unpackage/dist/dev/mp-weixin/pages/my/prize/prize.wxss

xqd
@@ -83,11 +83,10 @@
 }
 .prizeList.data-v-0f0357ab {
   width: 750rpx;
-  height: var(--height);
   background: #FFFFFF;
   box-shadow: 0px 4rpx 24rpx -10rpx rgba(101, 95, 90, 0.3);
   border-radius: 12rpx;
-  padding: 8rpx 28rpx 0 32rpx;
+  padding: 0rpx 28rpx 0 32rpx;
   box-sizing: border-box;
 }
 .prizeList .ListItem.data-v-0f0357ab {

+ 121 - 43
unpackage/dist/dev/mp-weixin/pages/my/verification/verification.js

xqd xqd
@@ -161,7 +161,113 @@ __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 */ 190));function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };} //
 //
 //
 //
@@ -264,48 +370,20 @@ __webpack_require__.r(__webpack_exports__);
 //
 //
 //
-var _default =
-{
-  data: function data() {
-    return {
-      // 分段器标题
-      items: ['未核销', '已核销', '我的'],
-      isActive: 0,
-      // 组件uni-load-more
-      status: 'noMore',
-      contentText: {
-        contentdown: '查看更多',
-        contentrefresh: '加载中',
-        contentnomore: '——  已经到底啦  ——' } };
-
-
-  },
-  methods: {
-    //菜单index切换
-    checked: function checked(index) {
-      this.isActive = index;
-    },
-    // 跳转核销订单
-    goOrderVF: function goOrderVF() {
-      uni.navigateTo({
-        url: '/pages/my/verification/orderVerification' });
-
-    },
-    // 跳转核销详情
-    goDetail: function goDetail() {
-      uni.navigateTo({
-        url: '/pages/my/verification/verificationDetail' });
-
-    },
-    // 扫码
-    scanCode: function scanCode() {
-      uni.scanCode({
-        success: function success(res) {
-          console.log('条码类型:' + res.scanType);
-          console.log('条码内容:' + res.result);
-        } });
-
-    } } };exports.default = _default;
+//
+//
+var _default = { data: function data() {return { // 搜索
+      search: '', // 分段器标题
+      items: ['未核销', '已核销', '我的'], isActive: 0, // 组件uni-load-more
+      status: 'noMore', contentText: { contentdown: '查看更多', contentrefresh: '加载中', contentnomore: '——  已经到底啦  ——' }, // 订单列表
+      orderList: [] };}, onLoad: function onLoad() {this.getMyOrder(1);}, methods: { // 获取订单列表
+    getMyOrder: function getMyOrder(type) {var _this = this;this.$api.orders.getOrderList({ page: 1, confirm_status: type || '', keyword: this.search }).then(function (res) {console.log(res, type, "订单列表");if (res.code == 0) {_this.orderList = res.data.data;}});}, //菜单index切换
+    checked: function checked(index) {console.log(index);this.isActive = index;this.getMyOrder(index + 1);}, // 搜索防抖
+    searchText: _util.default.debounce(function () {this.goSearch();}, 1000), // 搜索
+    goSearch: function goSearch() {var _this2 = this;this.$api.orders.getOrderList({ confirm_status: this.isActive + 1, page: 1, keyword: this.search }).then(function (res) {console.log(res, "搜索活动项目列表");if (res.code == 0) {_this2.orderList = res.data.data;}});}, // 跳转核销订单
+    goOrderVF: function goOrderVF() {uni.navigateTo({ url: '/pages/my/verification/orderVerification' });}, // 跳转核销详情
+    goDetail: function goDetail() {uni.navigateTo({ url: '/pages/my/verification/verificationDetail' });}, // 扫码
+    scanCode: function scanCode() {uni.scanCode({ success: function success(res) {console.log('条码类型:' + res.scanType);console.log('条码内容:' + res.result);} });} } };exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))
 
 /***/ }),

Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
unpackage/dist/dev/mp-weixin/pages/my/verification/verification.wxml


+ 4 - 0
unpackage/dist/dev/mp-weixin/pages/my/verification/verification.wxss

xqd
@@ -185,4 +185,8 @@
   font-weight: 500;
   color: #080F18;
 }
+.home-bottom.data-v-7dcb3836 {
+  padding-top: 80rpx;
+  background-color: #f9f9f9;
+}
 

Някои файлове не бяха показани, защото твърде много файлове са промени