Commit 1b2ca74725462e1ce6dc7b0d076a136c78bfe57f

Authored by 后端研发-苏明海
2 parents 4bca600d f69a2f52

Merge branch 'dev' into 'test'

Dev

See merge request !272
pages/giftpack/birthdaygift/birthdaygift.wxss
@@ -110,7 +110,7 @@ @@ -110,7 +110,7 @@
110 line-height: 45rpx; 110 line-height: 45rpx;
111 } 111 }
112 .top_card { 112 .top_card {
113 - width: calc(50% - 30rpx); 113 + width: 355rpx;
114 display: inline-block; 114 display: inline-block;
115 margin: 15rpx; 115 margin: 15rpx;
116 } 116 }
pages/giftpack/evaluategift/evaluategift.wxss
@@ -121,7 +121,7 @@ @@ -121,7 +121,7 @@
121 } 121 }
122 122
123 .top_card { 123 .top_card {
124 - width: calc(50% - 30rpx); 124 + width: 355rpx;
125 display: inline-block; 125 display: inline-block;
126 margin: 15rpx; 126 margin: 15rpx;
127 } 127 }
pages/giftpack/festival/festival.wxss
@@ -126,7 +126,7 @@ @@ -126,7 +126,7 @@
126 } 126 }
127 127
128 .top_card { 128 .top_card {
129 - width: calc(50% - 30rpx); 129 + width: 355rpx;
130 display: inline-block; 130 display: inline-block;
131 margin: 15rpx; 131 margin: 15rpx;
132 } 132 }
@@ -137,7 +137,6 @@ @@ -137,7 +137,6 @@
137 background-repeat: no-repeat; 137 background-repeat: no-repeat;
138 border-radius: 20rpx; 138 border-radius: 20rpx;
139 height: 250rpx; 139 height: 250rpx;
140 - margin: 5rpx;  
141 } 140 }
142 141
143 .img1 { 142 .img1 {
pages/giftpack/newvipgift/newvipgift.wxss
@@ -126,7 +126,7 @@ @@ -126,7 +126,7 @@
126 } 126 }
127 127
128 .top_card { 128 .top_card {
129 - width: calc(50% - 30rpx); 129 + width: 355rpx;
130 display: inline-block; 130 display: inline-block;
131 margin: 15rpx; 131 margin: 15rpx;
132 } 132 }