修复bug

pages/user-center/costSavingStatistics.vue

@@ -57,12 +57,13 @@
 								</view>
 								<!---->
 								<view class="userHeadCostRing">
-									<mrsongCharts 
+									<mrsongCharts v-if="chartsData.series[0].data.length>0"
 									type='ring' 
 									align='center'
 									:config="config"
 									:options="options"
 									:charts-data="chartsData" />
+									<u-empty v-else text="暂无使用优惠，快去使用吧！" mode="coupon" padding-top="20" color="#000"></u-empty>
 								</view>
 							</view>
 						</view>

pages/user-center/discountDetails.vue

@@ -47,7 +47,7 @@
 					日期
 				</text>
 				<view class="hapPasDetR col">
-					<text class="hapPasDetRC">{{ PassbookAata.updateTime }}</text>
+					<text class="hapPasDetRC">{{ PassbookAata.updateTime?PassbookAata.updateTime:'-' }}</text>
 				</view>
 			</view>
 			<view class="row hapPasDetText" v-if="PassbookAata.tcnum">

pages/user-center/happinessPassbook.vue

@@ -204,6 +204,8 @@
                     };
                 },
             });
+			if(this.msg.BalanceState==1){
+				if(this.msg.StartTime!='') return
 				const now = new Date();
 				this.year = now.getFullYear();
 				this.month = String(now.getMonth() + 1).padStart(2, '0');
@@ -211,6 +213,7 @@
 				now.setMonth(now.getMonth() + 1, 0);
 				this.msg.EndTime = this.year + '-' + this.month + '-'+now.getDate()
 				this.times = this.year + '-' + this.month
+			}
 			this.msg.pageIndex = 1
 			this.dataList = []
 			this.getList();

pages/user-center/points.vue

@@ -205,6 +205,8 @@
                     };
                 },
             });
+			if(this.msg.IntegralState==1){
+				if(this.msg.QStartDate!='') return
 				const now = new Date();
 				this.year = now.getFullYear();
 				this.month = String(now.getMonth() + 1).padStart(2, '0');
@@ -212,6 +214,7 @@
 				now.setMonth(now.getMonth() + 1, 0);
 				this.msg.QEndDate = this.year + '-' + this.month + '-'+now.getDate()
 				this.times = this.year + '-' + this.month
+			}
 			this.msg.pageIndex = 1
 			this.dataList = []
 			this.getList();

pages/user-center/userVip-center.vue

@@ -48,6 +48,12 @@
 										<Text style="margin-top: 10rpx;font-size: 24rpx;">售后</Text>
 										<view class="badge" v-if="statistics.afterSalesOrderNum>0">{{ statistics.afterSalesOrderNum }}</view>
 									</view>
+									<!-- #endif -->\
+									<!-- #ifdef MP-AG -->
+									<view class="order_bar_item" @click="goUrl('/pages/AggregateOrders/AggregateOrdersList?OrderStatus=4')">
+										<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638748964440207840.png" style="width: 66rpx; height: auto" mode="widthFix"></image>
+										<Text style="margin-top: 10rpx;font-size: 24rpx;">取消</Text>
+									</view>
 									<!-- #endif -->
 								</view>
 								<view class="orderProductBox" v-if="g.length>0">