From dfb7b3012681bebd4667e162938da5c800ffe3b2 Mon Sep 17 00:00:00 2001
From: liudan <18634735655@163.com>
Date: Wed, 3 Jul 2024 00:26:38 +0800
Subject: [PATCH] 1
---
App.vue | 1 +
pages/huitong/huitongbao/index.vue | 13 ++++++++++++-
pages/order_addcart/order_addcart.vue | 7 +++++--
pages/users/user_integral/index.vue | 9 +++++++--
pages/users/user_integral1/fenhong.vue | 7 ++++++-
pages/users/user_integral1/index.vue | 8 ++++++--
pages/users/user_integral1/user_contribute.vue | 7 ++++++-
7 files changed, 43 insertions(+), 9 deletions(-)
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 @@
提示：您有部分积分将于{{userInfo.clear.nextClearDay}}过期，请尽快使用！
-
+
+
{{item.type}}
{{(item.ext != null&&item.ext.from_phone)?`来自${item.ext.from_phone}`:(item.ext !== null&&item.ext.to_phone)?`转给${item.ext.to_phone}`:''}}
+
+ 昵称:{{item.user_nickname}}
+ 订单号:{{item.order_sn}}
+
+
{{item.create_time}}
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 @@
提示：您有部分积分将于{{userInfo.clear.nextClearDay}}过期，请尽快使用！
-
+
{{item.type}}
+
+ 昵称:{{item.user_nickname}}
+ 订单号:{{item.order_sn}}
+
+
{{item.create_time}}
@@ -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 @@
提示：您有部分积分将于{{userInfo.clear.nextClearDay}}过期，请尽快使用！
-
+
{{item.type}}
+
+ 昵称:{{item.user_nickname}}
+ 订单号:{{item.order_sn}}
+
+
{{item.create_time}}
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 @@
提示：您有部分积分将于{{userInfo.clear.nextClearDay}}过期，请尽快使用！
-
+
{{item.type}}
- 订单号:{{item.order_sn}}
+
+ 昵称:{{item.user_nickname}}
+ 订单号:{{item.order_sn}}
+
+
{{item.create_time}}
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 @@
提示：您有部分积分将于{{userInfo.clear.nextClearDay}}过期，请尽快使用！
-
+
{{item.type}}
+
+ 昵称:{{item.user_nickname}}
+ 订单号:{{item.order_sn}}
+
+
{{item.create_time}}