萤火科技 1 год назад
Родитель
Сommit
10515b8a0c

+ 2 - 6
src/views/market/FullFree.vue

@@ -127,12 +127,8 @@ export default {
       if (excludedGoodsIds.length > 0) {
         this.isLoading = true
         await GoodsApi.listByIds(excludedGoodsIds)
-          .then(result => {
-            this.excludedGoodsList = result.data.list
-          })
-          .finally(result => {
-            this.isLoading = false
-          })
+          .then(result => this.excludedGoodsList = result.data.list)
+          .finally(result => this.isLoading = false)
       }
     },
 

+ 2 - 3
src/views/market/coupon/Index.vue

@@ -36,14 +36,13 @@
       </template>
       <!-- 最低消费金额 -->
       <template slot="min_price" slot-scope="text">
-        <p class="c-p">{{ text }}</p>
+        <p class="c-p">¥{{ text }}</p>
       </template>
       <!-- 优惠方式 -->
       <template slot="discount" slot-scope="item">
         <template v-if="item.coupon_type == 10">
           <span>立减</span>
-          <span class="c-p mlr-2">{{ item.reduce_price }}</span>
-          <span>元</span>
+          <span class="c-p mlr-2">¥{{ item.reduce_price }}</span>
         </template>
         <template v-if="item.coupon_type == 20">
           <span>打</span>

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

@@ -11,14 +11,14 @@
         <a-tab-pane key="1" tab="页面设置">
           <div class="block-box">
             <div class="block-title">基本信息</div>
-            <div class="block-item">
+            <div class="block-item has-tips">
               <span class="label">页面名称</span>
               <div class="flex-box">
                 <a-input v-model="data.page.params.name" />
                 <div class="tips">页面名称仅用于后台管理</div>
               </div>
             </div>
-            <div class="block-item">
+            <div class="block-item has-tips">
               <span class="label">分享标题</span>
               <div class="flex-box">
                 <a-input v-model="data.page.params.shareTitle" />
@@ -30,7 +30,7 @@
         <a-tab-pane key="2" tab="标题栏设置">
           <div class="block-box">
             <div class="block-title">标题栏设置</div>
-            <div class="block-item">
+            <div class="block-item has-tips">
               <span class="label">标题名称</span>
               <div class="flex-box">
                 <a-input v-model="data.page.params.title" />
@@ -374,14 +374,14 @@
           <a-tab-pane key="1" tab="内容设置">
             <div class="block-box">
               <div class="block-title">功能设置</div>
-              <div class="block-item">
+              <div class="block-item has-tips">
                 <span class="label">视频地址</span>
                 <div class="flex-box">
                   <a-input v-model="curItem.params.videoUrl" />
                   <div class="tips">仅支持.mp4格式的视频源地址</div>
                 </div>
               </div>
-              <div class="block-item">
+              <div class="block-item has-tips">
                 <span class="label">视频封面</span>
                 <div class="flex-box">
                   <SImage v-model="curItem.params.poster" :width="160" :height="90" />
@@ -574,7 +574,7 @@
               </div>
               <div class="block-item">
                 <span class="label">切换时间</span>
-                <div class="item-slider" style="width: 190px;">
+                <div class="item-slider">
                   <a-slider v-model="curItem.style.interval" :step="1" :min="1" :max="20" />
                   <span class="unit-text">
                     <span>{{ curItem.style.interval }}</span>

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

@@ -48,7 +48,7 @@ const itemColumns = ['goods_id', 'goods_name', 'goods_image', 'goods_price_min',
 
 // 商品选择器组件
 export default {
-  name: 'SelectGoods',
+  name: 'SGoods',
   components: {
     GoodsModal,
     draggable

+ 1 - 0
src/views/page/modules/editor/modules/SImage.vue

@@ -100,6 +100,7 @@ export default {
     border-radius: 4px;
     background-image: url('~@/assets/img/default-image.png');
     background-size: cover;
+    overflow: hidden;
 
     .update-box-black {
       background: #000;

+ 9 - 2
src/views/page/modules/editor/style.less

@@ -36,7 +36,7 @@
   .tips-wrap,
   .link {
     display: block;
-    line-height: 32px;
+    // line-height: 32px;
     white-space: nowrap;
     font-size: 12px;
   }
@@ -105,12 +105,18 @@
     .block-item {
       display: flex;
       justify-content: space-between;
+      align-items: center;
       margin-bottom: 15px;
 
       &:last-child {
         margin-bottom: 0;
       }
 
+      &.has-tips {
+        .label {
+          margin-top: -22px;
+        }
+      }
 
       .tips {
         margin-top: 5px;
@@ -123,8 +129,9 @@
 
         &-row {
           display: flex;
+          align-items: center;
           margin-bottom: 6px;
-          line-height: 32px;
+          // line-height: 32px;
 
           &:last-child {
             margin-bottom: 0;

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

@@ -159,7 +159,7 @@
               <!-- 小图模式 -->
               <template v-if="dataItm.show_type == 10">
                 <div class="article-item__left flex-box">
-                  <div class="article-item__title twolist-hidden">
+                  <div class="article-item__title twoline-hide">
                     <span class="article-title">{{ dataItm.title }}</span>
                   </div>
                   <div class="article-item__footer">
@@ -260,7 +260,7 @@
                       <!-- 商品名称 -->
                       <div
                         v-if="item.style.show.includes('goodsName')"
-                        class="goods-item_title twolist-hidden"
+                        class="goods-item_title twoline-hide"
                       >
                         <span>{{ dataItm.goods_name }}</span>
                       </div>
@@ -302,7 +302,7 @@
                   <div class="detail">
                     <p
                       v-if="item.style.show.includes('goodsName')"
-                      class="goods-name twolist-hidden"
+                      class="goods-name twoline-hide"
                     >{{ dataItm.goods_name }}</p>
                     <p class="detail-price">
                       <span v-if="item.style.show.includes('goodsPrice')" class="goods-price">

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

@@ -48,7 +48,7 @@ dl {
 
     .content {
       overflow-y: auto;
-      height: 580px;
+      height: 640px;
     }
 
     .devise-item {
@@ -604,7 +604,6 @@ dl {
               height: 100%;
               top: 0;
               left: 0;
-              -o-object-fit: cover;
               object-fit: cover;
             }
           }