cxc/yshopb2c-uniapp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

合并冲突

Browse Source
This commit is contained in:
Gao xiaosong
2021-06-02 01:05:04 +08:00
parent a2042820b9 11d6bda868
commit 43ac4aaab9
4 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
assets/css/style.css
View File

@ -1879,7 +1879,11 @@ page {
height: 100%;
}
.shoppingCart .list {
<<<<<<< HEAD
margin-top: 76rpx;
=======
margin-top: 80rpx;
>>>>>>> 11d6bda8681ad955f5e73286c3478a238ee58593
}
.shoppingCart .list .item {
padding: 25rpx 30rpx;
@ -6871,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;
}
@ -6916,8 +6920,6 @@ 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);
/* #endif */
}
.productSort .aside .item {
@ -6937,7 +6939,6 @@ page {
.productSort .conter {
margin-left: 180rpx;
padding: 0 14rpx;
margin-top: 96rpx;
}
.productSort .conter .listw {
padding-top: 20rpx;

14
assets/css/style.less
View File

@ -2005,7 +2005,11 @@ page {
z-index: 5;
top: 0;
/* #ifdef H5 */
<<<<<<< HEAD
// top: calc(44px + env(safe-area-inset-top));
=======
// top: calc(0 + env(safe-area-inset-top));
>>>>>>> 11d6bda8681ad955f5e73286c3478a238ee58593
/* #endif */
}
@ -2059,7 +2063,11 @@ page {
}
.shoppingCart .list {
<<<<<<< HEAD
margin-top: 76rpx;
=======
margin-top: .8 * 100rpx;
>>>>>>> 11d6bda8681ad955f5e73286c3478a238ee58593
}
.shoppingCart .list .item {
@ -7576,7 +7584,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 +7625,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 */
}
@ -7640,7 +7648,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 {

5
pages/activity/GroupRule/index.vue
View File

@ -42,8 +42,13 @@
</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>

4
pages/order/Logistics/index.vue
View File

@ -135,7 +135,11 @@ export default {
}
express(params)
.then(res => {
<<<<<<< HEAD
this.logisticsList = res.data.traces.reverse()
=======
this.logisticsList = res.data.Traces.reverse();
>>>>>>> 11d6bda8681ad955f5e73286c3478a238ee58593
})
.catch(err => {
uni.showToast({