Merge branch 'master' of http://gitlab.oytour.com/viitto/mallapp

pages/kotra/brand/detail.vue

@@ -296,6 +296,20 @@
               </view>
             </view>
           </view>
+          <!-- //奖章 -->
+          <view class="MedalBox" v-if="details.listEnroll.length > 0">
+            <view
+              v-for="(item, index) in details.listEnroll"
+              :key="index"
+              class="MedalBoxItem"
+            >
+              <image
+                :src="item.MedalImageBig"
+                mode="heightFix"
+                style="height: 100%"
+              />
+            </view>
+          </view>
           <view class="info1 flex flex-between">
             <view class="info1-item">
               <view class="info1-con">
@@ -1254,4 +1268,21 @@ export default {
   background: #d0aa7b;
   color: #111111;
 }
+.MedalBox {
+  background: #f0f0f0;
+  border-radius: 20rpx;
+  box-sizing: border-box;
+  padding: 15rpx;
+  display: flex;
+  flex-wrap: wrap;
+  margin: 30rpx;
+}
+.MedalBoxItem {
+  width: 30%;
+  height: 135rpx;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  margin: 10rpx;
+}
 </style>

pages/kotra/carrier/detail.vue

@@ -1080,8 +1080,7 @@ export default {
   display: flex;
   justify-content: center;
   align-items: center;
-  margin-right: 20rpx;
-  margin-bottom: 20rpx;
+  margin: 10rpx;
 }
 .FirstShopBox {
   margin-bottom: 30rpx;