1

pages/huitong/huitongbao/index.vue

@@ -73,7 +73,7 @@
 							<view style="color:#333;font-size:24rpx;margin:10rpx 0;white-space: nowrap; overflow: hidden;text-overflow: ellipsis;">
 							
 								
-								<text>昵称:{{item.order?item.order.nickname:item.user_nickname}}</text>
+								<text>昵称:{{item.order.order_id?item.order.user.nickname:item.user_nickname}}</text>
 								<text style="margin-left:10rpx;" v-if="item.order_sn">订单号:{{item.order_sn}}</text>
 								
 							</view>

pages/order_addcart/order_addcart.vue

@@ -319,7 +319,7 @@
 				this.getCartNum();
 				this.goodsHidden = true;
 				this.footerswitch = true;
-				this.isAllSelect = true; //全不选
+				// this.isAllSelect = true; //全不选
 				this.selectValue = []; //选中的数据
 				this.isShowAuth = false;
 				uni.setStorage({
@@ -690,7 +690,7 @@
 					}
 					that.onMyEvent();
 					that.getCartList(true);
-					that.isAllSelect = true
+					// that.isAllSelect = true
 
 				}).catch(error => {
 					that.$util.Tips({
@@ -740,12 +740,20 @@
 			// 购物车列表
 			getCartList: function(isChange) {
 				let that = this;
+				let resArr=[]
+				this.cartList.valid.forEach(item=>{
+					item.list.forEach(i=>{
+						if(i.check){
+							resArr.push(i.product_id)
+						}
+					})
+				})
 				getCartList().then(res => {
 					res.data.list.forEach((item, index) => {
 						// item.allCheck = true
-						this.$set(item,'allCheck',true)
+						// this.$set(item,'allCheck',true)
 						item.list.forEach((goods, j) => {
-							goods.check = true
+							// goods.check = true
 							if (goods.cart_num == 1) {
 								goods.numSub = true;
 							} else {
@@ -756,7 +764,15 @@
 							} else {
 								goods.numAdd = false;
 							}
+							if(resArr.includes(goods.product_id)){
+								goods.check = true;
+							}
 						})
+						let selectedArr = item.list.filter(y=>{return y.check})
+						
+						if(selectedArr.length==item.list.length){
+							this.$set(item,'allCheck',true)
+						}
 					})
 					this.cartList.valid = res.data.list;
 					// let newArr=JSON.parse(uni.getStorageSync('cartSelectedGoods'))
@@ -782,7 +798,7 @@
 						this.recommend = false
 					}
 					const sku = {}
-					this.checkboxAllChange(true)
+					// this.checkboxAllChange(true)
 					// 
 				});
 			},

pages/users/user_integral/index.vue

@@ -53,7 +53,7 @@
 							<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.order?item.order.nickname:item.user_nickname}}</text>
+								<text>昵称:{{item.order.order_id?item.order.user.nickname:item.user_nickname}}</text>
 								<text style="margin-left:10rpx;" v-if="item.order_sn">订单号:{{item.order_sn}}</text>
 							</view>
 							<view>{{item.create_time}}</view>

pages/users/user_integral1/fenhong.vue

@@ -43,7 +43,7 @@
 							<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.order?item.order.nickname:item.user_nickname}}</text>
+								<text>昵称:{{item.order.order_id?item.order.user.nickname:item.user_nickname}}</text>
 								<text style="margin-left:10rpx;" v-if="item.order_sn">订单号:{{item.order_sn}}</text>
 								
 							</view>

pages/users/user_integral1/index.vue

@@ -46,7 +46,7 @@
 						<view style="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.order?item.order.nickname:item.user_nickname}}</text>
+								<text>昵称:{{item.order.order_id?item.order.user.nickname:item.user_nickname}}</text>
 								<text style="margin-left:10rpx;" v-if="item.order_sn">订单号:{{item.order_sn}}</text>
 								
 							</view>

pages/users/user_integral1/user_contribute.vue

@@ -47,7 +47,7 @@
 							<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.order?item.order.nickname:item.user_nickname}}</text>
+								<text>昵称:{{item.order.order_id?item.order.user.nickname:item.user_nickname}}</text>
 								<text style="margin-left:10rpx;" v-if="item.order_sn">订单号:{{item.order_sn}}</text>
 							</view>
 							<view>{{item.create_time}}</view>