合并冲突

assets/css/style.css

@@ -1879,11 +1879,7 @@ page {
   height: 100%;
 }
 .shoppingCart .list {
-<<<<<<< HEAD
-  margin-top: 76rpx;
-=======
   margin-top: 80rpx;
->>>>>>> 11d6bda8681ad955f5e73286c3478a238ee58593
 }
 .shoppingCart .list .item {
   padding: 25rpx 30rpx;

assets/css/style.less

@@ -2063,11 +2063,7 @@ page {
 }
 
 .shoppingCart .list {
-<<<<<<< HEAD
-  margin-top: 76rpx;
-=======
   margin-top: .8 * 100rpx;
->>>>>>> 11d6bda8681ad955f5e73286c3478a238ee58593
 }
 
 .shoppingCart .list .item {

pages/activity/GroupRule/index.vue

@@ -42,13 +42,8 @@
           </view>
           <!-- <view class="tui-nickname">不许人间见白头</view> -->
         </view>
-<<<<<<< HEAD
-        <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[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>
->>>>>>> 11d6bda8681ad955f5e73286c3478a238ee58593
           <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>