TmOct5/BlockChainH5
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

解决冲突

Browse Source
This commit is contained in:
张冬雪
2021-11-03 18:43:00 +08:00
parent 1df114459c 72a3d53a17
commit 87b8fe22d0
52 changed files with 49016 additions and 541 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/goods-list/goods-list.vue
View File

@@ -131,7 +131,7 @@
.is_allow_values {
color: #fff;
background-image: linear-gradient(to left, $main-color, $mian-color-light);
background-image: linear-gradient(to left, $mian-color, $mian-color-light);
padding: 2rpx 14rpx;
font-size: 20rpx;
text-align: center;

2
components/mall-refunds-template/mall-refunds-template.vue
View File

@@ -166,7 +166,7 @@
width: 100%;
.copy {
color: $main-color;
color: $mian-color;
font-size: $title-size*0.8;
font-weight: 400;
padding: 0 30rpx;

2
components/mall-shipments-template/mall-shipments-template.vue
View File

@@ -163,7 +163,7 @@
box-sizing: border-box;
width: 100%;
.copy{
color: $main-color;
color: $mian-color;
font-size: $title-size*0.8;
font-weight: 400;
padding: 0 30rpx;

2
components/number-weight-template/number-weight-template.vue
View File

@@ -169,7 +169,7 @@
box-sizing: border-box;
width: 100%;
.copy{
color: $main-color;
color: $mian-color;
font-size: $title-size*0.8;
font-weight: 400;
padding: 0 30rpx;