增加头像样式

app/admin/view/menu/index.html

@@ -45,7 +45,6 @@
             <td class='text-center nowrap notselect'>
 
                 {if auth("add")}
-                <span class="text-explode">|</span>
                 <!--{if $vo.spt < 2}-->
                 <a class="layui-btn layui-btn-xs layui-btn-primary" data-title="添加子菜单" data-modal='{:url("add")}?pid={$vo.id}'>添 加</a>
                 <!--{else}-->

app/admin/view/queue/index.html

@@ -53,7 +53,7 @@
     </div>
 
     {include file='queue/index_search'}
-    <table class="layui-table margin-top-15" lay-skin="line">
+    <table class="layui-table" lay-skin="line">
         {notempty name='list'}
         <thead>
         <tr>

app/admin/view/user/index.html

@@ -26,8 +26,7 @@
         <li data-open="{:url('index')}?type={$k}" class="layui-this">{$v}</li>
         {else}
         <li data-open="{:url('index')}?type={$k}">{$v}</li>
-        {/if}
-        {/foreach}
+        {/if}{/foreach}
     </ul>
     <div class="layui-tab-content think-box-shadow table-block table-block">
         {include file='user/index_search'}
@@ -58,8 +57,10 @@
                     <label><input data-action-blur="{:request()->url()}" data-value="id#{$vo.id};action#sort;sort#{value}" data-loading="false" value="{$vo.sort}" class="list-sort-input"></label>
                 </td>
                 <td class='text-left nowrap'>
-                    <img alt="img" width="40px" height="40px" data-tips-image src="{$vo.headimg|default=''}">
-                    <div class="inline-block sub-span-blue text-middle margin-left-10">
+                    <div class="headimg">
+                        <img alt="img" data-tips-image src="{$vo.headimg|default=''}">
+                    </div>
+                    <div class="inline-block sub-span-blue">
                         登录账号：<span><b>{$vo.username|default=''}</b></span><br>
                         用户昵称：<span><b>{$vo.nickname|default='-'|raw}</b></span><br>
                     </div>

app/data/view/member/index.html

@@ -26,8 +26,10 @@
                 <label><input class="list-check-box" value='{$vo.id}' type='checkbox'></label>
             </td>
             <td class="sub-span-blue nowrap">
-                <img alt="img" style="width:32px;height:32px" data-tips-image class="margin-right-5" src="{$vo.headimg|default='__ROOT__/static/theme/img/headimg.png'}">
-                <div class="inline-block text-middle">
+                <div class="headimg">
+                    <img alt="img" data-tips-image src="{$vo.headimg|default='__ROOT__/static/theme/img/headimg.png'}">
+                </div>
+                <div class="inline-block">
                     {notempty name='vo.username'}
                     <div>姓名：<span>{$vo.username|default='-'}</span></div>
                     {else}
@@ -36,7 +38,7 @@
                     <div>手机：<span>{$vo.phone|default='-'}</span></div>
                 </div>
             </td>
-            <td>{$vo.region_province|default=''}{$vo.region_city|default=''}{$vo.region_area|default=''}</td>
+            <td class="nowrap">{$vo.region_province|default=''}{$vo.region_city|default=''}{$vo.region_area|default=''}</td>
             <td class="nowrap">
                 使用状态：{if $vo.status eq 0}<b class="color-red margin-right-5">已冻结</b>{elseif $vo.status eq 1}<b class="color-green margin-right-5">使用中</b>{/if}<br>
                 注册时间：{$vo.create_at|format_datetime}

app/data/view/shop_goods/index.html

@@ -55,7 +55,9 @@
                 </td>
                 <td class='nowrap'>
                     {notempty name='vo.cover'}
-                    <img data-tips-image style="width:auto;height:40px" src="{$vo.cover|default=''}" class="margin-right-5" alt="img">
+                    <div class="headimg">
+                        <img alt="img" data-tips-image src="{$vo.cover|default=''}">
+                    </div>
                     {/notempty}
                     <div class="inline-block text-top sub-span-blue">
                         商品编号：<span>{$vo.code|default='--'}</span><br>

app/data/view/shop_order/index.html

@@ -34,15 +34,19 @@
                 </td>
                 <td class="nowrap relative">
                     <div>
-                        <img data-tips-image style="width:35px;height:35px" src="{$vo.fromer.headimg|default='__ROOT__/static/theme/img/headimg.png'}" class="margin-right-5" alt="img">
-                        <div class="inline-block text-middle sub-span-blue">
+                        <div class="headimg">
+                            <img alt="img" data-tips-image src="{$vo.fromer.headimg|default='__ROOT__/static/theme/img/headimg.png'}">
+                        </div>
+                        <div class="inline-block sub-span-blue">
                             推荐会员：{$vo.fromer.nickname|default='--'}<br>
                             推荐手机：<span>{$vo.fromer.phone|default='--'}</span><br>
                         </div>
                     </div>
                     <div>
-                        <img data-tips-image style="width:35px;height:35px" src="{$vo.member.headimg|default='__ROOT__/static/theme/img/headimg.png'}" class="margin-right-5" alt="img">
-                        <div class="inline-block text-middle sub-span-blue">
+                        <div class="headimg">
+                            <img alt="img" data-tips-image src="{$vo.member.headimg|default='__ROOT__/static/theme/img/headimg.png'}">
+                        </div>
+                        <div class="inline-block sub-span-blue">
                             会员昵称：{$vo.member.nickname|default='--'}<br>
                             会员手机：<span>{$vo.member.phone|default='--'}</span><br>
                         </div>

app/data/view/shop_order/truck.html

@@ -10,12 +10,12 @@
                 </label>
                 <label class="layui-col-xs6 relative block">
                     <span class="color-green font-w7 label-required-prev">收货人手机</span>
-                    <span class="color-desc margin-left-5">Consignee's mobile phone</span>
+                    <span class="color-desc margin-left-5">Consignee mobile</span>
                     <input class="layui-input" required placeholder="请输入收货人手机" name="address_phone" value="{$vo.address_phone|default=''}">
                 </label>
                 <div class="layui-col-xs12 relative block">
                     <span class="color-green font-w7 label-required-prev">收货所在区域</span>
-                    <span class="color-desc margin-left-5">（原区域： {$vo.address_province|default='--'} {$vo.address_city|default=''} {$vo.address_area|default=''} ）</span>
+                    <span class="color-desc margin-left-5">（原区域：{$vo.address_province|default='--'} {$vo.address_city|default=''} {$vo.address_area|default=''} ）</span>
                     <div class="layui-row layui-col-space10">
                         <label class="layui-col-xs4"><select class="layui-select block full-width" lay-ignore name="form_province"></select></label>
                         <label class="layui-col-xs4"><select class="layui-select block full-width" lay-ignore name="form_city"></select></label>
@@ -24,7 +24,7 @@
                 </div>
                 <label class="layui-col-xs12 relative block">
                     <span class="color-green font-w7 label-required-prev">收货详细地址</span>
-                    <span class="color-desc margin-left-5">（原地址： {$vo.address_content|default=""} )</span>
+                    <span class="color-desc margin-left-5">（原地址：{$vo.address_content|default=""} )</span>
                     <input name="address_content" required value='{$vo.address_content|default=""}' placeholder="请输入收货地址" class="layui-input">
                 </label>
             </div>

app/data/view/shop_order_send/index.html

@@ -33,8 +33,10 @@
                     <label><input class="list-check-box" value='{$vo.id}' type='checkbox'></label>
                 </td>
                 <td class="nowrap relative">
-                    <img data-tips-image style="width:55px;height:55px" src="{$vo.member.headimg|default='__ROOT__/static/theme/img/headimg.png'}" class="margin-right-5" alt="img">
-                    <div class="inline-block text-middle sub-span-blue">
+                    <div class="headimg" style="width:56px;height:56px">
+                        <img data-tips-image src="{$vo.member.headimg|default='__ROOT__/static/theme/img/headimg.png'}" alt="img">
+                    </div>
+                    <div class="inline-block sub-span-blue">
                         会员昵称：{$vo.member.nickname|default='--'}<br>
                         会员手机：<span>{$vo.member.phone|default='--'}</span><br>
                         订单单号：<span>{$vo.order_no|default='--'}</span><br>

app/wechat/view/fans/index.html

@@ -41,11 +41,13 @@
             <td class='list-table-check-td think-checkbox'>
                 <label><input class="list-check-box" value='{$vo.openid}' type='checkbox'></label>
             </td>
-            <td class='text-left nowrap relative layui-elip'>
-                <img alt="" src="{$vo.headimgurl|default=''}" data-tips-image class="inline-block text-top margin-right-5" style="width:40px;height:40px">
+            <td class='text-left nowrap'>
+                <div class="headimg">
+                    <img alt="img" src="{$vo.headimgurl|default=''}" data-tips-image>
+                </div>
                 <div class="inline-block">
-                    昵称：{$vo.nickname|default='--'}<br>
-                    区域：{$vo.country|default='--'} {$vo.province} {$vo.city}
+                    <p>昵称：{$vo.nickname|default='--'}</p>
+                    <p>区域：{$vo.country|default='--'} {$vo.province|default=''} {$vo.city|default=''}</p>
                 </div>
             </td>
             <td class="text-left padding-0">

public/static/theme/css/console.custom.less

@@ -74,6 +74,17 @@
   display: inline-block !important
 }
 
+.think-box-shadow {
+  padding: 20px !important;
+  background: #fff !important;
+  box-shadow: @maxShadow;
+  border-radius: @borderRadius;
+
+  > form.layui-card {
+    box-shadow: none;
+  }
+}
+
 .pull- {
   &left {
     float: left !important
@@ -1034,7 +1045,7 @@
   position: relative;
   background: url(../img/wechat/mobile_head.png) no-repeat 0 0;
   box-shadow: @minShadow;
-  border-radius: @borderRadus;
+  border-radius: @borderRadius;
 
   .mobile-header {
     color: #fff;

public/static/theme/css/console.dynamic.less

@@ -1,4 +1,4 @@
 @minShadow: 0 2px 3px 0 rgba(0, 0, 0, .11);
 @maxShadow: 0 2px 3px 0 rgba(0, 0, 0, .22);
-@borderRadus: 5px;
+@borderRadius: 5px;
 @borderColor: #DCDCDC;

public/static/theme/css/console.layui.less

@@ -6,38 +6,42 @@ fieldset {
   padding: 10px 20px 5px 20px;
   background: #fff;
   box-shadow: @minShadow;
-  border-radius: @borderRadus;
+  border-radius: @borderRadius;
 
   legend {
     color: #666;
     padding: 0 10px;
-    font-size: 14px;
+    font-size: 13px;
   }
 }
 
-.layui-code {
-  border-radius: @borderRadus;
-}
-
 .layui-tab, .layui-card {
   overflow: hidden;
   box-shadow: @minShadow;
-  border-radius: @borderRadus;
+  border-radius: @borderRadius;
+}
 
-  .layui-card-header {
-    padding: 0 20px;
-  }
-
-  .layui-card-body {
-    padding: 20px;
-  }
-
-  .layui-tab-content {
+.layui-tab {
+  > .layui-tab-content {
     padding: 20px;
     background: #fff;
   }
 }
 
+.layui-card {
+  > .layui-card-header {
+    padding: 0 20px;
+  }
+
+  > .layui-card-body {
+    padding: 20px;
+  }
+}
+
+.layui-code {
+  border-radius: @borderRadius;
+}
+
 .layui-body > .layui-card > .layui-card-body {
   > .layui-tab, > .layui-card {
     box-shadow: @maxShadow;
@@ -70,7 +74,7 @@ fieldset {
   &-group {
     overflow: hidden;
     line-height: 28px;
-    border-radius: @borderRadus;
+    border-radius: @borderRadius;
     background: #009688;
     border: 1px solid #009688 !important;
 
@@ -102,7 +106,6 @@ fieldset {
     width: 1em;
     height: auto;
     padding: 5px;
-    margin-right: 5px;
     white-space: normal;
     vertical-align: middle;
   }
@@ -175,19 +178,16 @@ fieldset {
   }
 }
 
-/** 自定义表单样式 */
-.think-box-shadow {
-  padding: 20px !important;
-  background: #fff !important;
-  box-shadow: @maxShadow;
-  border-radius: @borderRadus;
+.layui-input, .layui-select {
+  line-height: 38px
+}
 
-  > form.layui-card {
-    box-shadow: none;
+.layui-form-checkbox.layui-form-checked {
+  i {
+    border-color: #5FB878;
   }
 }
 
-/** checkbox & radio */
 label.think-radio, label.think-checkbox {
   cursor: pointer;
   margin-right: 10px;
@@ -262,45 +262,12 @@ label.think-radio, label.think-checkbox {
   }
 }
 
-.layui-layer-content {
-  .layui-form.layui-card {
-    margin: 0;
-
-    .layui-card-body {
-      padding: 30px 40px 0 0
-    }
-  }
-}
-
-.layui-layer-dialog {
-  .layui-layer-content {
-    .layui-layer-ico {
-      top: 50% !important;
-      margin-top: -15px !important
-    }
-  }
-}
-
-.laydate-footer-btns span {
-  line-height: 24px !important
-}
-
-.layui-input, .layui-select {
-  line-height: 38px
-}
-
-.layui-form-checkbox.layui-form-checked {
-  i {
-    border-color: #5FB878;
-  }
-}
-
 .layui-table {
   overflow: hidden;
   border-width: 0;
   box-shadow: @minShadow;
   border-color: @borderColor;
-  border-radius: @borderRadus;
+  border-radius: @borderRadius;
   border-collapse: separate;
 
   &[lay-skin='nob'] {
@@ -331,39 +298,50 @@ label.think-radio, label.think-checkbox {
   tr {
     td, th {
       font-size: 12px;
-      border-color: @borderColor;
+      border-color: #E9E9E9;
       border-width: 0 0 1px 1px;
 
-      .text-explode {
-        color: #ccc !important;
-        margin: 0 4px !important;
+      div.headimg {
+        width: 35px;
+        height: 35px;
+        border: 1px solid @borderColor;
+        display: inline-block;
+        overflow: hidden;
+        text-align: center;
+        margin-right: 5px;
+        border-radius: 50%;
+        vertical-align: middle;
+        box-shadow: @minShadow;
 
-        &:first-child {
-          opacity: 0;
-          display: none;
+        > img {
+          width: 110%;
+          height: 110%;
+          max-width: 110%;
+          max-height: 110%;
+          margin: -5% 0 0 -5%;
+        }
+
+        & + * {
+          vertical-align: middle;
         }
       }
 
-      .background-image {
-        float: left;
-        width: 40px;
-        height: 40px;
-        margin-right: 5px;
-        display: inline-block;
-        background: no-repeat center center;
-        background-size: cover;
-        vertical-align: middle
+      &:last-child, &:last-child {
+        border-right-width: 1px;
+        border-right-color: @borderColor;
       }
-    }
 
-    td:last-child, th:last-child {
-      border-right-width: 1px;
+      &:first-child, &:first-child {
+        border-left-width: 1px;
+        border-left-color: @borderColor;
+      }
     }
   }
 
   tr:first-child {
     th, td {
       border-top-width: 1px;
+      border-top-color: @borderColor;
 
       &:last-child {
         border-top-right-radius: 5px;
@@ -378,6 +356,7 @@ label.think-radio, label.think-checkbox {
   tr:last-child {
     th, td {
       border-bottom-width: 1px;
+      border-bottom-color: @borderColor;
     }
 
     td {
@@ -405,11 +384,6 @@ label.think-radio, label.think-checkbox {
     }
   }
 
-  .list-table-image {
-    width: 22px;
-    cursor: pointer
-  }
-
   .list-table-sort-td {
     width: 10px !important;
     text-align: center !important;
@@ -434,7 +408,7 @@ label.think-radio, label.think-checkbox {
 
   .list-table-check-td {
     width: 10px !important;
-    text-align: center;
+    text-align: center !important;
     padding-left: 15px !important;
     padding-right: 15px !important;
 
@@ -443,4 +417,29 @@ label.think-radio, label.think-checkbox {
       vertical-align: middle
     }
   }
+}
+
+.layui-layer-content {
+  .layui-form.layui-card {
+    margin: 0;
+
+    .layui-card-body {
+      padding: 20px 40px 30px 0;
+    }
+  }
+}
+
+.layui-layer-dialog {
+  .layui-layer-content {
+    .layui-layer-ico {
+      top: 50% !important;
+      margin-top: -15px !important
+    }
+  }
+}
+
+.laydate-footer-btns {
+  span {
+    line-height: 24px !important
+  }
 }