萤火科技 hai 1 ano
pai
achega
6ea6b0bfad

+ 3 - 3
src/components/SelectImage2/SelectImage2.vue

@@ -122,8 +122,9 @@ export default {
     }
 
     .uodate-repalce {
-      width: 60px;
-      height: 30px;
+      width: 55px;
+      height: 25px;
+      line-height: 25px;
       font-size: 12px;
       text-align: center;
       position: absolute;
@@ -138,7 +139,6 @@ export default {
       border-radius: 4px;
       font-weight: 600;
       color: #595961;
-      line-height: 30px;
     }
 
     &:hover {

+ 1 - 1
src/views/page/modules/editor/Editor.vue

@@ -248,7 +248,7 @@
             <div class="block-box">
               <div class="block-title">文本内容</div>
               <div class="ueditor">
-                <Ueditor v-model="curItem.params.content" :config="{ initialFrameWidth: 375  }" />
+                <Ueditor v-model="curItem.params.content" :config="{ initialFrameWidth: 375 }" />
               </div>
             </div>
           </a-tab-pane>

+ 3 - 2
src/views/page/modules/phone/Phone.vue

@@ -29,7 +29,7 @@
           :class="{ selected: index === selectedIndex, undrag: inArray(item.type, undragList) }"
           :style="renderItemStyle(item)"
         >
-           <!-- 轮播图 -->
+          <!-- 轮播图 -->
           <div
             v-if="item.type == 'banner'"
             class="diy-banner"
@@ -265,7 +265,8 @@
           >
             <div
               class="goods-list"
-              :class="[`display-${item.style.display}`, `column-${item.style.column}`  ]"
+              :class="[`display-${item.style.display}`, `column-${item.style.column}` ]"
+              :style="{ marginBottom: `-${item.style.itemMargin}px` }"
             >
               <div
                 class="goods-item"

+ 2 - 1
src/views/page/modules/phone/style.less

@@ -523,7 +523,7 @@ dl {
 
         // 单列
         &.column-1 {
-          margin-bottom: 0;
+          margin-bottom: 0 !important;
 
           .goods-item {
             margin-bottom: 6px;
@@ -651,6 +651,7 @@ dl {
               display: flex; // 解决文字超出无法隐藏
               font-size: 12px;
               margin-bottom: 4px;
+              min-height: 17px;
             }
 
             .goods-sales {