上传

api/model/index.js

@@ -197,6 +197,18 @@ const api = {
 		auth : true,
 		limit : 1000,
 	},
+	// 获取我的礼品订单
+	getMyGiftOrder: {
+		url: '/index_common/getMyGiftOrder',
+		method: 'GET',
+		auth : true,
+	},
+	// 获取我的礼品订单详情
+	getMyGiftOrderDetail: {
+		url: '/index_common/getMyGiftOrderDetail',
+		method: 'GET',
+		auth : true,
+	},
 }
 
 export default api

pages_order/order/giftList.vue

@@ -55,7 +55,8 @@
 						<text class="c-unit">元</text>
 					</view>
 
-					<view @click.stop="receiveGift(item)" class="btn" v-if="item.state === 0">
+					<view @click.stop="receiveGift(item)" class="btn" 
+					v-if="item.state == 0 && queryParams.type == 1">
 						立即领取
 					</view>
 				</view>
@@ -75,7 +76,7 @@
 		mixins: [mixinsList],
 		data() {
 			return {
-				mixinsListApi: 'getGiftList',
+				mixinsListApi: 'getMyGiftOrder',
 				tabs: [
 					{
 						name: '我赠送的'
@@ -87,9 +88,14 @@
 				current : 0,
 			}
 		},
+		onLoad() {
+			this.queryParams.type = 0
+		},
 		methods: {
 			clickTabs({index}){
-				
+				this.list = []
+				this.queryParams.type = index
+				this.getData()
 			},
 			// 跳转礼包详情
 			toGiftDetail(id) {