app/admin/view/user/form.html

@@ -37,7 +37,7 @@
             {if !empty($bases)}
             <div class="layui-form-item">
                 <div class="help-label"><b>角色身份</b>Role Identity</div>
-                <div class="layui-textarea help-checks">
+                <div class="layui-textarea" style="min-height:auto">
                     {foreach $bases as $base}
                     <label class="think-checkbox">
                         {if isset($vo.usertype) and $vo.usertype eq $base.code}
@@ -53,9 +53,9 @@
             {if !empty($authorizes)}
             <div class="layui-form-item">
                 <div class="help-label"><b>访问权限</b>Role Permission</div>
-                <div class="layui-textarea help-checks">
+                <div class="layui-textarea" style="min-height:auto">
                     {if isset($vo.username) and $vo.username eq $superName}
-                    <span class="color-desc padding-left-5">超级用户拥所有访问权限，不需要配置权限。</span>
+                    <span class="color-desc">超级用户拥所有访问权限，不需要配置权限。</span>
                     {else}{foreach $authorizes as $authorize}
                     <label class="think-checkbox">
                         {if in_array($authorize.id, $vo.authorize)}

app/data/view/shop/goods/form.html

@@ -8,7 +8,7 @@
         <!--{notempty name='marks'}-->
         <div class="layui-form-item relative block">
             <span class="help-label label-required-prev"><b>商品标签</b>Mark Name</span>
-            <div class="layui-textarea help-checks">
+            <div class="layui-textarea padding-bottom-10" style="min-height:unset">
                 {foreach $marks as $mark}{if isset($vo.marks) && is_array($vo.marks) && in_array($mark, $vo.marks)}
                 <input checked name="marks[]" title="{$mark}" type="checkbox" value="{$mark}">
                 {else}
@@ -34,7 +34,7 @@
         <!--{notempty name='payments'}-->
         <div class="layui-form-item relative block">
             <span class="help-label label-required-prev"><b>支付方式</b>Goods Payment</span>
-            <div class="layui-textarea help-checks">
+            <div class="layui-textarea padding-bottom-10" style="min-height:unset">
                 {foreach $payments as $payment}{if isset($vo.payment) && is_array($vo.payment) && in_array($payment.code, $vo.payment)}
                 <input checked name="payment[]" title="{$payment.name}" type="checkbox" value="{$payment.code}">
                 {else}
@@ -72,18 +72,13 @@
                     <th class="text-left" style="width:100%">轮播图片</th>
                 </tr>
                 <tr>
-                    <td class="text-center text-top padding-0">
-                        <div class="help-images">
-                            <input name="cover" type="hidden" value="{$vo.cover|default=''}">
-                            <script>$('[name="cover"]').uploadOneImage();</script>
-                        </div>
+                    <td class="text-center help-images text-top">
+                        <input name="cover" type="hidden" value="{$vo.cover|default=''}">
+                        <script>$('[name="cover"]').uploadOneImage();</script>
                     </td>
-                    <td class="text-left padding-0">
-                        <div class="help-images">
-
-                            <input name="slider" type="hidden" value="{$vo.slider|default=''}">
-                            <script>$('[name="slider"]').uploadMultipleImage();</script>
-                        </div>
+                    <td class="text-left help-images">
+                        <input name="slider" type="hidden" value="{$vo.slider|default=''}">
+                        <script>$('[name="slider"]').uploadMultipleImage();</script>
                     </td>
                 </tr>
                 </thead>
@@ -94,7 +89,7 @@
             <div class="layui-clear">
                 <fieldset>
                     <legend><span class="layui-badge think-bg-violet">商品返利配置</span></legend>
-                    <div>
+                    <div class="layui-form-item">
                         {foreach ['非返利商品，其代理不会获得奖励','是返利商品，其代理将会获得奖励'] as $k => $v}
                         {if (isset($vo.rebate_type) and $vo.rebate_type eq $k) or (empty($vo.rebate_type) and $k eq 0)}
                         <input checked name="rebate_type" title="{$v}" type="radio" value="{$k}">
@@ -105,7 +100,7 @@
                 </fieldset>
                 <fieldset>
                     <legend><span class="layui-badge think-bg-violet">入会礼包配置</span></legend>
-                    <div>
+                    <div class="layui-form-item">
                         {foreach ['非入会礼包，购买后不会升级等级','是入会礼包，购买后升级会员等级'] as $k=>$v}
                         {if (isset($vo.vip_entry) and $vo.vip_entry eq $k) or (empty($vo.vip_entry) and $k eq 0)}
                         <input checked lay-filter="vip_entry" name="vip_entry" title="{$v}" type="radio" value="{$k}">
@@ -117,7 +112,7 @@
                 <!--{notempty name='upgrades'}-->
                 <fieldset>
                     <legend><span class="layui-badge think-bg-violet">升级用户等级</span></legend>
-                    <label>
+                    <label class="layui-form-item">
                         <select class="layui-select" lay-filter="vip_upgrade" name="vip_upgrade">
                             {foreach $upgrades as $upgrade}{if isset($vo.vip_upgrade) and $vo.vip_upgrade eq $upgrade.number}
                             <option selected value="{$upgrade.number|default=0}">[ {$upgrade.number|default='0'} ] {$upgrade.name|default=''}</option>
@@ -131,7 +126,7 @@
                 <!--{/notempty}-->
                 <fieldset>
                     <legend><span class="layui-badge think-bg-violet">物流配送发货类型</span></legend>
-                    <div>
+                    <div class="layui-form-item">
                         {foreach ['虚拟商品，无需物流配送','实物商品，需要物流配送'] as $k=>$v}
                         {if (isset($vo.truck_type) and $vo.truck_type eq $k) or (empty($vo.truck_type) and $k eq 0)}
                         <input checked name="truck_type" title="{$v}" type="radio" value="{$k}">
@@ -143,7 +138,7 @@
                 <!--{notempty name='discounts'}-->
                 <fieldset>
                     <legend><span class="layui-badge think-bg-violet">用户购买折扣方案</span></legend>
-                    <label>
+                    <label class="layui-form-item">
                         <select class="layui-select" lay-search name="discount_id">
                             <option value="0"> -- 不设置 --</option>
                             {foreach $discounts as $discount}{if isset($vo.discount_id) and $vo.discount_id eq $discount.id}
@@ -159,7 +154,7 @@
                 <!--{notempty name='upgrades'}-->
                 <fieldset>
                     <legend><span class="layui-badge think-bg-violet">限制最低购买等级</span></legend>
-                    <label>
+                    <label class="layui-form-item">
                         <select class="layui-select" name="limit_low_vip">
                             <option value="0"> -- 不设置 --</option>
                             {foreach $upgrades as $upgrade}{if isset($vo.limit_low_vip) and $vo.limit_low_vip eq $upgrade.number}
@@ -174,8 +169,8 @@
                 <!--{/notempty}-->
                 <fieldset>
                     <legend><span class="layui-badge think-bg-violet">商品限购数量</span></legend>
-                    <label>
-                        <input class="layui-input" type="number" min="0" data-blur-number="0" name="limit_max_num" placeholder="请输入商品限购数量" value="{$vo.limit_max_num|default=0}">
+                    <label class="layui-form-item">
+                        <input class="layui-input" data-blur-number="0" name="limit_max_num" placeholder="请输入商品限购数量" value="{$vo.limit_max_num|default=0}">
                         <span class="help-block">限制每人可购买数量（为 0 时不限制）！</span>
                     </label>
                 </fieldset>

app/data/view/shop/goods/formstyle.html

@@ -1,7 +1,7 @@
 <style>
     .goods-item-box fieldset {
         width: 260px;
-        height: 80px;
+        height: 100px;
         padding: 15px 20px;
         display: inline-block;
         margin: 0 15px 15px 0;

public/static/theme/css/_config.less

@@ -86,14 +86,13 @@
 }
 
 // 通用延时动态
-#defaTransition(@time:0.2s) {
-  transition: all @time linear;
-  -o-transition: all @time linear;
-  -moz-transition: all @time linear;
-  -webkit-transition: all @time linear;
+#defaTransition() {
+  transition: all .2s linear;
+  -o-transition: all .2s linear;
+  -moz-transition: all .2s linear;
+  -webkit-transition: all .2s linear;
 }
 
-// 内容主体布局
 #bodyLayout() {
   > form.layui-form.layui-card {
     margin: 0;
@@ -103,54 +102,4 @@
       padding: 40px 40px 10px 40px;
     }
   }
-}
-
-// Layui 字体图标
-#iconLayout(@size:15px) {
-  font-family: layui-icon !important;
-  font-size: @size;
-  font-style: normal;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
-
-// Flex 基础定位
-#flex() {
-  display: -moz-box;
-  display: -moz-flex;
-  display: -ms-flexbox;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: flex;
-}
-
-// Flex 换行方式
-#flexWrap(@type:wrap) {
-  -ms-flex-wrap: @type;
-  -webkit-flex-wrap: @type;
-  flex-wrap: @type;
-}
-
-// Flex 垂直方向
-#flexAlign(@type) {
-  -ms-flex-align: @type;
-  -webkit-box-align: @type;
-  -webkit-align-items: @type;
-  align-items: @type;
-}
-
-//  Flex 横向布局
-#flexJustify(@type) {
-  -ms-flex-pack: @type;
-  -webkit-box-pack: @type;
-  -webkit-justify-content: @type;
-  justify-content: @type;
-}
-
-// 主轴方向
-#flexDirection(@type:row) {
-  -webkit-box-orient: vertical;
-  -ms-flex-direction: @type;
-  -webkit-flex-direction: @type;
-  flex-direction: @type;
 }

public/static/theme/css/_custom.less

@@ -14,109 +14,6 @@
 // | github 代码仓库：https://github.com/zoujingli/ThinkAdmin
 // +----------------------------------------------------------------------
 
-.flex {
-  #flex();
-
-  &-inline {
-    display: inline-flex;
-  }
-
-  &-wrap {
-    #flexWrap(wrap);
-
-    &-no {
-      #flexWrap(nowrap);
-    }
-
-    &-rev {
-      #flexWrap(wrap-reverse);
-    }
-  }
-
-  // 主轴方向
-  &-direction- {
-    &row {
-      #flexDirection(row);
-
-      &reverse {
-        #flexDirection(row-reverse);
-      }
-    }
-
-    &column {
-      #flexDirection(column);
-
-      &-reverse {
-        #flexDirection(column-reverse);
-      }
-    }
-  }
-
-  // 垂直方向
-  &-align- {
-    &start {
-      #flexAlign(flex-start);
-    }
-
-    &end {
-      #flexAlign(flex-end);
-    }
-
-    &center {
-      #flexAlign(center)
-    }
-  }
-
-  // 横向布局
-  &-justify- {
-    &start {
-      #flexJustify(flex-start);
-    }
-
-    &center {
-      #flexJustify(center);
-    }
-
-    &end {
-      #flexJustify(flex-end);
-    }
-
-    &space- {
-      &between {
-        #flexJustify(space-between);
-      }
-
-      &around {
-        #flexJustify(space-around);
-      }
-
-      &evenly {
-        #flexJustify(space-evenly);
-      }
-    }
-  }
-
-  &-1 {
-    flex: 1;
-  }
-
-  &-2 {
-    flex: 2;
-  }
-
-  &-3 {
-    flex: 3;
-  }
-
-  &-4 {
-    flex: 4;
-  }
-
-  &-5 {
-    flex: 5;
-  }
-}
-
 .fixed {
   position: fixed !important;
 }
@@ -255,25 +152,20 @@
   }
 }
 
-.help-checks:not(td) {
-  padding: 10px 0 10px 10px;
-  min-height: unset;
-  border-radius: @BoxBorderRadius;
-  // background: linear-gradient(-113deg, #EEEEEE, #EEEEEE) !important;
-  #flex();
-  #flexWrap(wrap);
-}
-
-.help-images:not(td) {
+.help-images {
+  color: #333;
   padding: 10px 0 0 10px !important;
   min-height: unset;
-  border-radius: @BoxBorderRadius;
-  // background: linear-gradient(-113deg, #EEEEEE, #EEEEEE) !important;
+  background: linear-gradient(-113deg, #EEEEEE, #EEEEEE) !important;
 
-  #flex();
-  #flexWrap(wrap);
+  &:after {
+    clear: left;
+    content: '';
+    display: block;
+  }
 
-  .uploadimage {
+  > * {
+    float: left;
     margin: 0 10px 10px 0;
   }
 }
@@ -866,8 +758,12 @@
     position: absolute;
     margin-left: -8px;
 
-    #iconLayout(15px);
     content: "\e63d";
+    font-family: layui-icon !important;
+    font-size: 16px;
+    font-style: normal;
+    -webkit-font-smoothing: antialiased;
+    -moz-osx-font-smoothing: grayscale;
 
     animation-name: layui-rotate;
     -webkit-animation-name: layui-rotate;
@@ -980,8 +876,12 @@ label.think-checkbox {
       cursor: pointer;
       padding: 2px;
       content: "\e605";
-      #iconLayout(12px);
+      font-size: 12px;
+      font-style: normal;
       font-weight: 700;
+      font-family: layui-icon !important;
+      -webkit-font-smoothing: antialiased;
+      -moz-osx-font-smoothing: grayscale
     }
   }
 }
@@ -1188,10 +1088,6 @@ label.think-checkbox {
     background: linear-gradient(-125deg, #ff7d7d, #fb2c95) !important
   }
 
-  &none {
-    background: none !important;
-  }
-
   &gray {
     color: #333;
     background: linear-gradient(-113deg, #EEEEEE, #EEEEEE) !important

public/static/theme/css/_display.less

@@ -165,8 +165,30 @@ fieldset {
 .layui-nav {
   .layui-nav-item {
     .layui-nav-more {
+      top: 0;
       right: 15px;
+      width: auto;
+      height: auto;
+      border: none;
+      padding: 0 !important;
       font-size: 14px !important;
+      font-style: normal;
+      font-family: "layui-icon" !important;
+      -moz-osx-font-smoothing: grayscale;
+      -webkit-font-smoothing: antialiased;
+
+      &::before {
+        content: "\e619"
+      }
+    }
+
+    & .layui-nav-mored, &ed .layui-nav-more {
+      border: none;
+      transform: rotate(180deg);
+      -o-transform: rotate(180deg);
+      -ms-transform: rotate(180deg);
+      -moz-transform: rotate(180deg);
+      -webkit-transform: rotate(180deg)
     }
   }
 }
@@ -353,7 +375,7 @@ fieldset {
 
 .layui-form-item {
   .layui-form-checkbox {
-    margin: 4px;
+    margin-top: 0;
   }
 
   .layui-input.text-center:not([type=number]) {
@@ -361,44 +383,24 @@ fieldset {
   }
 }
 
-.layui-textarea {
-  padding: 10px;
+.layui-form-radio {
+  margin-top: 0;
 }
 
-.layui-form-select {
-  .layui-edge {
-    top: 50%;
-    width: unset;
-    height: unset;
-    border: none;
-    margin-top: -7px;
-    line-height: 15px;
-    #iconLayout(15px);
+.layui-form-select dl {
+  top: 37px;
+  padding: 0;
+  border-color: @InputBorderActiveColor;
+}
 
-    &:before {
-      content: "\e61a"
-    }
-  }
-
-  dl {
-    top: 37px;
-    padding: 0;
-    border-color: @InputBorderActiveColor;
-  }
-
-  &ed dl {
-    min-height: fit-content;
-  }
+.layui-form-selected dl {
+  min-height: fit-content;
 }
 
 .layui-form-onswitch em {
   white-space: nowrap;
 }
 
-.layui-form-radio {
-  margin-top: 0;
-}
-
 .layui-form-checkbox.layui-form-checked {
   i {
     border-color: #5FB878;

public/static/theme/css/_layout.less

@@ -185,8 +185,12 @@
         content: "\e65b";
         line-height: 50px;
         text-align: center;
+        font-size: 10px;
+        font-style: normal;
+        font-family: layui-icon !important;
         transform: rotate(180deg);
-        #iconLayout(10px);
+        -webkit-font-smoothing: antialiased;
+        -moz-osx-font-smoothing: grayscale;
       }
 
       top: 50%;
@@ -275,10 +279,6 @@
           padding-bottom: 0;
           color: @LeftMainNavNormalTextColor;
 
-          .layui-nav-more {
-            padding: 0;
-          }
-
           &:hover {
             color: @LeftMainNavActiveTextColor;
           }