From 889883aaaa24c471ebdf4bcf48f284c3b45bb6e1 Mon Sep 17 00:00:00 2001
From: anhaogxs <704041637@qq.com>
Date: Fri, 21 May 2021 10:21:19 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B4=AD=E7=89=A9?=
 =?UTF-8?q?=E8=BD=A6=E6=A0=B7=E5=BC=8F=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=8B=BC?=
 =?UTF-8?q?=E5=9B=A2=E7=9A=84=E9=94=99=E8=AF=AF=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/css/style.css               | 16 ++++++++--------
 assets/css/style.less              |  8 ++++----
 pages/activity/GroupRule/index.vue |  4 ++--
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/assets/css/style.css b/assets/css/style.css
index 691507d..48c6cf2 100644
--- a/assets/css/style.css
+++ b/assets/css/style.css
@@ -1832,8 +1832,8 @@ page {
   z-index: 5;
   top: 0;
   /* #ifdef H5 */
-  top: -webkit-calc(44px + env(safe-area-inset-top));
-  top: calc(44px + env(safe-area-inset-top));
+  top: -webkit-calc(0 + env(safe-area-inset-top));
+  top: calc(0 + env(safe-area-inset-top));
   /* #endif */
 }
 .shoppingCart .labelNav .item .iconfont {
@@ -1855,8 +1855,8 @@ page {
   top: 76rpx;
   border-bottom: 1px solid #f5f5f5;
   /* #ifdef H5 */
-  top: -webkit-calc(44px + env(safe-area-inset-top) + 76rpx);
-  top: calc(44px + env(safe-area-inset-top) + 76rpx);
+  top: -webkit-calc(0 + env(safe-area-inset-top) + 76rpx);
+  top: calc(0 + env(safe-area-inset-top) + 76rpx);
   /* #endif  */
 }
 .shoppingCart .nav .administrate {
@@ -6875,8 +6875,8 @@ page {
   right: 0;
   top: 0;
   /* #ifdef H5 */
-  top: -webkit-calc(44px + env(safe-area-inset-top));
-  top: calc(44px + env(safe-area-inset-top));
+  top: -webkit-calc(0 + env(safe-area-inset-top));
+  top: calc(0 + env(safe-area-inset-top));
   /* #endif */
   z-index: 9;
 }
@@ -6920,8 +6920,8 @@ page {
   overflow-x: hidden;
   overflow-scrolling: touch;
   /* #ifdef H5 */
-  top: -webkit-calc(44px + env(safe-area-inset-top) + 88rpx);
-  top: calc(44px + env(safe-area-inset-top) + 88rpx);
+  top: -webkit-calc(0 + env(safe-area-inset-top) + 88rpx);
+  top: calc(0 + env(safe-area-inset-top) + 88rpx);
   /* #endif */
 }
 .productSort .aside .item {
diff --git a/assets/css/style.less b/assets/css/style.less
index c142a62..a4cf16c 100644
--- a/assets/css/style.less
+++ b/assets/css/style.less
@@ -2005,7 +2005,7 @@ page {
   z-index: 5;
   top: 0;
   /* #ifdef H5 */
-  top: calc(44px + env(safe-area-inset-top));
+  top: calc(0 + env(safe-area-inset-top));
   /* #endif */
 }
 
@@ -2028,7 +2028,7 @@ page {
   top: 0.76 * 100rpx;
   border-bottom: 1px solid #f5f5f5;
   /* #ifdef H5 */
-  top: calc(44px + env(safe-area-inset-top) + 76rpx);
+  top: calc(0 + env(safe-area-inset-top) + 76rpx);
   /* #endif  */
 }
 
@@ -7576,7 +7576,7 @@ page {
   top: 0;
 
   /* #ifdef H5 */
-  top: calc(44px + env(safe-area-inset-top));
+  top: calc(0 + env(safe-area-inset-top));
   /* #endif */
   z-index: 9;
   // border-bottom: 1px solid #555;
@@ -7617,7 +7617,7 @@ page {
   overflow-scrolling: touch;
 
   /* #ifdef H5 */
-  top: calc(44px + env(safe-area-inset-top) + 88rpx);
+  top: calc(0 + env(safe-area-inset-top) + 88rpx);
   /* #endif */
 }
 
diff --git a/pages/activity/GroupRule/index.vue b/pages/activity/GroupRule/index.vue
index fbc0bec..3c3aea4 100644
--- a/pages/activity/GroupRule/index.vue
+++ b/pages/activity/GroupRule/index.vue
@@ -42,8 +42,8 @@
           </view>
           <!-- <view class="tui-nickname">不许人间见白头</view> -->
         </view>
-        <view class="tui-user__item" v-for="(item, index) in Array(count)" :key="index">
-          <view class="tui-avatar__box tui-size" v-if="pinkAll[i]"><image class="tui-size" :src="pinkAll[i].avatar"></image></view>
+        <view class="tui-user__item" v-for="(item, index) in Array(storeCombination.people-1)" :key="index">
+          <view class="tui-avatar__box tui-size" v-if="pinkAll[index]"><image class="tui-size" :src="pinkAll[index].avatar"></image></view>
           <view class="tui-avatar__box tui-user__none" v-else><image class="tui-size" :src="`${$VUE_APP_RESOURCES_URL}/images/vacancy.png`"></image></view>
           <!-- <view class="tui-nickname">小可爱本人</view> -->
         </view>

From a176628d529b6be5069c7c5744e401039cf69d4c Mon Sep 17 00:00:00 2001
From: anhaogxs <704041637@qq.com>
Date: Fri, 21 May 2021 16:12:45 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B4=AD=E7=89=A9?=
 =?UTF-8?q?=E8=BD=A6=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/css/style.css  |  9 +--------
 assets/css/style.less | 10 +++++-----
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/assets/css/style.css b/assets/css/style.css
index 48c6cf2..acc3cfa 100644
--- a/assets/css/style.css
+++ b/assets/css/style.css
@@ -1832,8 +1832,6 @@ page {
   z-index: 5;
   top: 0;
   /* #ifdef H5 */
-  top: -webkit-calc(0 + env(safe-area-inset-top));
-  top: calc(0 + env(safe-area-inset-top));
   /* #endif */
 }
 .shoppingCart .labelNav .item .iconfont {
@@ -1855,8 +1853,6 @@ page {
   top: 76rpx;
   border-bottom: 1px solid #f5f5f5;
   /* #ifdef H5 */
-  top: -webkit-calc(0 + env(safe-area-inset-top) + 76rpx);
-  top: calc(0 + env(safe-area-inset-top) + 76rpx);
   /* #endif  */
 }
 .shoppingCart .nav .administrate {
@@ -1883,7 +1879,7 @@ page {
   height: 100%;
 }
 .shoppingCart .list {
-  margin-top: 156rpx;
+  margin-top: 80rpx;
 }
 .shoppingCart .list .item {
   padding: 25rpx 30rpx;
@@ -6920,8 +6916,6 @@ page {
   overflow-x: hidden;
   overflow-scrolling: touch;
   /* #ifdef H5 */
-  top: -webkit-calc(0 + env(safe-area-inset-top) + 88rpx);
-  top: calc(0 + env(safe-area-inset-top) + 88rpx);
   /* #endif */
 }
 .productSort .aside .item {
@@ -6941,7 +6935,6 @@ page {
 .productSort .conter {
   margin-left: 180rpx;
   padding: 0 14rpx;
-  margin-top: 96rpx;
 }
 .productSort .conter .listw {
   padding-top: 20rpx;
diff --git a/assets/css/style.less b/assets/css/style.less
index a4cf16c..cad44cb 100644
--- a/assets/css/style.less
+++ b/assets/css/style.less
@@ -2005,7 +2005,7 @@ page {
   z-index: 5;
   top: 0;
   /* #ifdef H5 */
-  top: calc(0 + env(safe-area-inset-top));
+  // top: calc(0 + env(safe-area-inset-top));
   /* #endif */
 }
 
@@ -2028,7 +2028,7 @@ page {
   top: 0.76 * 100rpx;
   border-bottom: 1px solid #f5f5f5;
   /* #ifdef H5 */
-  top: calc(0 + env(safe-area-inset-top) + 76rpx);
+  // top: calc(0 + env(safe-area-inset-top) + 76rpx);
   /* #endif  */
 }
 
@@ -2059,7 +2059,7 @@ page {
 }
 
 .shoppingCart .list {
-  margin-top: 76+80rpx;
+  margin-top: .8 * 100rpx;
 }
 
 .shoppingCart .list .item {
@@ -7617,7 +7617,7 @@ page {
   overflow-scrolling: touch;
 
   /* #ifdef H5 */
-  top: calc(0 + env(safe-area-inset-top) + 88rpx);
+  // top: calc(0 + env(safe-area-inset-top) + 88rpx);
   /* #endif */
 }
 
@@ -7640,7 +7640,7 @@ page {
 .productSort .conter {
   margin-left: 1.8 * 100rpx;
   padding: 0 0.14 * 100rpx;
-  margin-top: 0.96 * 100rpx;
+  // margin-top: 0.96 * 100rpx;
 }
 
 .productSort .conter .listw {

From 11d6bda8681ad955f5e73286c3478a238ee58593 Mon Sep 17 00:00:00 2001
From: hupeng <guchengwuyue@163.com>
Date: Tue, 1 Jun 2021 13:48:16 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=89=A9=E6=B5=81?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E4=B8=8D=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/Logistics/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/order/Logistics/index.vue b/pages/order/Logistics/index.vue
index 2520607..50e4bd7 100644
--- a/pages/order/Logistics/index.vue
+++ b/pages/order/Logistics/index.vue
@@ -145,7 +145,7 @@ export default {
       };
       express(params)
         .then(res => {
-          this.logisticsList = res.data.traces.reverse();
+          this.logisticsList = res.data.Traces.reverse();
         })
         .catch(err => {
           uni.showToast({