1.首页优惠券 调整

common/request.js

@@ -1,6 +1,8 @@
+//测试地址
 const baseUrl = 'http://58.56.15.138:20201/' 
 const burl2='http://58.56.15.138:20201/' 
-//const baseUrl = 'http://58.56.15.138:20132/' 
+
+// 正式地址
 //  const baseUrl = 'https://apiclt.66km.com/'
 // const burl2='https://apiclt.66km.com/'
 

pages/homePage/allDiscountCard.vue

@@ -44,7 +44,8 @@
 		</view>
 
 		<view class="bottomViewBtn" v-if="itemData.length!=0">
-			<view class="saveCar" @click="alllingqu">一键领取</view>
+			<view class="saveCar" @click="alllingqu" v-if="allHave==false">一键领取</view>
+			<view class="saveCar" style="background-color: #FF9566;" v-else>已全部领取</view>
 		</view>
 
 		<!-- 上拉 加载更多 -->
@@ -66,7 +67,7 @@
 				itemData: [],
 				page: 1,
 				noMoreShow: false,
-
+				allHave:true,
 			}
 		},
 		onLoad(opt) {
@@ -75,22 +76,7 @@
 
 		},
 		methods: {
-			lingqu() {
-
-				uni.showLoading({
-					title: '领取中'
-				})
-				this.$http('worldKeepCar/keepCarMy/listTCouponPage', {
-
-					page: this.page,
-					limit: 10,
-				}, 'GET').then(res => {
-					uni.hideLoading();
-					
-					
-				})
-
-			},
+			
 			lingqu(item, index) {
 				uni.showLoading({
 					title: '领取中'
@@ -121,6 +107,7 @@
 					uni.hideLoading();
 					if (res.code==0) {
 						this.myOrderCoupon()
+						this.allHave = true
 						uni.showToast({
 							title: '领取成功',
 							icon: 'success',
@@ -159,6 +146,16 @@
 					} else {
 						this.noMoreShow = false
 					}
+					
+					if (this.itemData.length != 0) {
+						this.itemData.forEach((item, index) => {
+							if (item.pickNum <= 0) {
+								this.allHave = false
+							}
+						})
+					}
+					
+					
 					
 				})
 			},
@@ -309,7 +306,7 @@
 
 	.saveCar {
 
-		background: linear-gradient(135deg, #FD5300 0%, #FF270A 100%);
+		background-color: #FF4F00;
 		margin: 23rpx 30rpx;
 		height: 74rpx;
 		line-height: 74rpx;