diff --git a/App.vue b/App.vue
index 0143076..11b09d9 100644
--- a/App.vue
+++ b/App.vue
@@ -137,6 +137,7 @@
 				if(that.globalData.copy_command_status == 1){
 					uni.getClipboardData({
 					    success: function (res) {
+							uni.hideToast()
 							if(/^(\/@[1-9]{1}).*\*\//.test(res.data)){
 								that.$store.commit("PARSE_PWD", res.data)
 							}
diff --git a/pages/huitong/huitongbao/index.vue b/pages/huitong/huitongbao/index.vue
index 6d4e4dc..e318266 100644
--- a/pages/huitong/huitongbao/index.vue
+++ b/pages/huitong/huitongbao/index.vue
@@ -60,10 +60,21 @@
 						<text class="tip-text">提示：您有部分积分将于{{userInfo.clear.nextClearDay}}过期，请尽快使用！</text>
 					</view>
 					<view class='item acea-row row-between-wrapper' v-for="(item,index) in integralList" :key="index">
-						<view>
+						<!-- <view>
+							<view class='state'>{{item.type}}
+								<text style="margin-left:10rpx;">{{(item.ext != null&&item.ext.from_phone)?`来自${item.ext.from_phone}`:(item.ext !== null&&item.ext.to_phone)?`转给${item.ext.to_phone}`:''}}</text>
+							</view>
+							<view>{{item.create_time}}</view>
+						</view> -->
+						<view style="width: 87%;margin-right: 20rpx;">
 							<view class='state'>{{item.type}}
 								<text style="margin-left:10rpx;">{{(item.ext != null&&item.ext.from_phone)?`来自${item.ext.from_phone}`:(item.ext !== null&&item.ext.to_phone)?`转给${item.ext.to_phone}`:''}}</text>
 							</view>
+							<view style="color:#333;font-size:24rpx;margin:10rpx 0;white-space: nowrap; overflow: hidden;text-overflow: ellipsis;">
+								<text>昵称:{{item.user_nickname}}</text>
+								<text style="margin-left:10rpx;">订单号:{{item.order_sn}}</text>
+								
+							</view>
 							<view>{{item.create_time}}</view>
 						</view>
 						<view>
diff --git a/pages/order_addcart/order_addcart.vue b/pages/order_addcart/order_addcart.vue
index 27c2fe5..7eddf0a 100644
--- a/pages/order_addcart/order_addcart.vue
+++ b/pages/order_addcart/order_addcart.vue
@@ -311,7 +311,7 @@
 				this.getCartNum();
 				this.goodsHidden = true;
 				this.footerswitch = true;
-				// this.isAllSelect = true; //全不选
+				this.isAllSelect = true; //全不选
 				this.selectValue = []; //选中的数据
 				this.isShowAuth = false;
 				uni.setStorage({
@@ -355,6 +355,8 @@
 						console.log(selectedArr)
 						if(selectedArr.length==i.list.length){
 							this.$set(i,'allCheck',true)
+						}else{
+							this.$set(i,'allCheck',false)
 						}
 						
 					})
@@ -748,6 +750,7 @@
 					})
 					this.cartList.valid = res.data.list;
 					let newArr=JSON.parse(uni.getStorageSync('cartSelectedGoods'))
+					console.log(newArr,"报错")
 					this.cartList.valid.forEach(item=>{
 						item.list.forEach(p=>{
 							newArr.forEach(i=>{
@@ -847,7 +850,7 @@
 				// 全选
 				console.log(allArr,"oooo12345",this.cartList.valid,isFirst)
 				if(!isFirst){
-					this.isAllSelect = allArr.length == this.cartList.valid.length ? true : false
+					this.isAllSelect = allArr.length!=0&&this.cartList.valid.length!=0&&allArr.length == this.cartList.valid.length ? true : false
 				}
 				
 			},
diff --git a/pages/users/user_integral/index.vue b/pages/users/user_integral/index.vue
index 7a64b91..b19f87d 100644
--- a/pages/users/user_integral/index.vue
+++ b/pages/users/user_integral/index.vue
@@ -49,8 +49,13 @@
 						<text class="tip-text">提示：您有部分积分将于{{userInfo.clear.nextClearDay}}过期，请尽快使用！</text>
 					</view>
 					<view class='item acea-row row-between-wrapper' v-for="(item,index) in integralList" :key="index">
-						<view>
+						<view style="width: 87%;margin-right: 20rpx;">
 							<view class='state'>{{item.type}}</view>
+							<view style="color:#333;font-size:24rpx;margin:10rpx 0;white-space: nowrap; overflow: hidden;text-overflow: ellipsis;">
+								<text>昵称:{{item.user_nickname}}</text>
+								<text style="margin-left:10rpx;">订单号:{{item.order_sn}}</text>
+								
+							</view>
 							<view>{{item.create_time}}</view>
 						</view>
 						<view>
@@ -491,7 +496,7 @@
 
 	.integral-details .wrapper .list .item .state {
 		
-		margin-bottom: 24rpx;
+		// margin-bottom: 24rpx;
 		font-size: 30rpx;
 		color: #333333;
 	}
diff --git a/pages/users/user_integral1/fenhong.vue b/pages/users/user_integral1/fenhong.vue
index 406604e..08876fd 100644
--- a/pages/users/user_integral1/fenhong.vue
+++ b/pages/users/user_integral1/fenhong.vue
@@ -39,8 +39,13 @@
 						<text class="tip-text">提示：您有部分积分将于{{userInfo.clear.nextClearDay}}过期，请尽快使用！</text>
 					</view>
 					<view class='item acea-row row-between-wrapper' v-for="(item,index) in integralList" :key="index">
-						<view>
+						<view style="width: 87%;margin-right: 20rpx;">
 							<view class='state'>{{item.type}}</view>
+							<view style="color:#333;font-size:24rpx;margin:10rpx 0;white-space: nowrap; overflow: hidden;text-overflow: ellipsis;">
+								<text>昵称:{{item.user_nickname}}</text>
+								<text style="margin-left:10rpx;">订单号:{{item.order_sn}}</text>
+								
+							</view>
 							<view>{{item.create_time}}</view>
 						</view>
 						<view>
diff --git a/pages/users/user_integral1/index.vue b/pages/users/user_integral1/index.vue
index 5f3dbb7..0d44729 100644
--- a/pages/users/user_integral1/index.vue
+++ b/pages/users/user_integral1/index.vue
@@ -43,9 +43,13 @@
 						<text class="tip-text">提示：您有部分积分将于{{userInfo.clear.nextClearDay}}过期，请尽快使用！</text>
 					</view>
 					<view class='item acea-row row-between-wrapper' v-for="(item,index) in integralList" :key="index">
-						<view>
+						<view style="width: 87%;margin-right: 20rpx;">
 							<view class='state'>{{item.type}}</view>
-							<view style="margin: 10rpx 0;">订单号:{{item.order_sn}}</view>
+							<view style="color:#333;font-size:24rpx;margin:10rpx 0;white-space: nowrap; overflow: hidden;text-overflow: ellipsis;">
+								<text>昵称:{{item.user_nickname}}</text>
+								<text style="margin-left:10rpx;">订单号:{{item.order_sn}}</text>
+								
+							</view>
 							<view>{{item.create_time}}</view>
 						</view>
 						<view>
diff --git a/pages/users/user_integral1/user_contribute.vue b/pages/users/user_integral1/user_contribute.vue
index af20348..018bb61 100644
--- a/pages/users/user_integral1/user_contribute.vue
+++ b/pages/users/user_integral1/user_contribute.vue
@@ -43,8 +43,13 @@
 						<text class="tip-text">提示：您有部分积分将于{{userInfo.clear.nextClearDay}}过期，请尽快使用！</text>
 					</view>
 					<view class='item acea-row row-between-wrapper' v-for="(item,index) in integralList" :key="index">
-						<view>
+						<view style="width: 87%;margin-right: 20rpx;">
 							<view class='state'>{{item.type}}</view>
+							<view style="color:#333;font-size:24rpx;margin:10rpx 0;white-space: nowrap; overflow: hidden;text-overflow: ellipsis;">
+								<text>昵称:{{item.user_nickname}}</text>
+								<text style="margin-left:10rpx;">订单号:{{item.order_sn}}</text>
+								
+							</view>
 							<view>{{item.create_time}}</view>
 						</view>
 						<view>