1

pages/home/home.vue

@@ -50,12 +50,10 @@ export default {
 			opacity: 0
 		};
 	},
-	created() {
-		this.getData();
-	},
 	onShow() {
 		this.integralCount = 0
 		this.getUserInfo();
+		this.getData();
 	},
 	onPageScroll(e) {
 		console.log(e)
@@ -203,7 +201,7 @@ export default {
 				font-size: 82rpx;
 				font-weight: bolder;
 				color: #ffffff;
-				margin-top: 15rpx;
+				margin-top: 78rpx;
 			}
 			.header-integral-tip {
 				font-size: 24rpx;

pagesA/coupon/coupon.vue

@@ -48,13 +48,10 @@
 					<view class="coupon-info">
 						<image v-if="!isExpired(item)" class="bg-img" src="../../static/coupon-bottom-h.png" mode=""></image>
 						<image v-if="isExpired(item)" class="bg-img" src="../../static/coupon-bottom-gray.png" mode=""></image>
-						<view class="left" v-if="item.validityStatus===100">
+						<view class="left">
 							<view v-if="item.cardAccount">卡号：{{item.cardAccount}}<text v-if="type==200" @click="copy(item.cardAccount)">复制</text></view>
 							<view>卡密：{{item.cardPasswd}}<text v-if="type==200" @click="copy(item.cardPasswd)">复制</text></view>
 						</view>
-						<view class="left" v-if="isExpired(item)">
-							<view>卡密：{{item.cardPasswd}}</view>
-						</view>
 						<view>
 							<image @click="clickItem(item)" class="img" :src="getImg(item)" mode=""></image>
 							<view v-if="type==200" class="bottom-text">{{item.useState==10?'待使用':'已使用'}}</view>

pagesA/integralDetail/integralDetail.vue

@@ -13,7 +13,7 @@
 		</view>
 		<view v-if="integralList.length > 0" class="list">
 			<view class="item" v-for="(item, index) in integralList" :key="index">
-				<image class="icon" :src="item.img"></image>
+				<image class="icon" :src="item.integral<0?'../../static/integral-use.png':'../../static/integral-income.png'"></image>
 				<view class="item-right">
 					<view class="item-right-top">
 						<view class="item-title">