blackteay/ThinkAdmin
1
0
Fork 0
mirror of https://gitee.com/zoujingli/ThinkAdmin.git synced 2025-04-06 03:58:04 +08:00
Code Issues Projects Releases Wiki Activity

修改模板文件

Browse Source
This commit is contained in:
Anyon 2020-09-19 17:02:38 +08:00
parent 5c7d63c001
commit 6b431d0107
5 changed files with 30 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/data/view/shop_goods/index.html
View File

@ -64,7 +64,7 @@
</td> </td>
<td class="text-left"> <td class="text-left">
{notempty name='vo.mark'}{foreach $vo.mark as $mark} {notempty name='vo.mark'}{foreach $vo.mark as $mark}
<span class="notselect nowrap margin-right-5 layui-badge layui-bg-cyan">{$mark}</span> <span class="notselect nowrap layui-badge layui-bg-cyan">{$mark}</span>
{/foreach}{/notempty} {/foreach}{/notempty}
</td> </td>
<td class='nowrap'> <td class='nowrap'>

42
app/data/view/shop_order/index.html
View File

@ -55,40 +55,36 @@
{eq name='vo.status' value='3'}<span class="layui-badge layui-badge-middle layui-bg-black">待发货</span>{/eq} {eq name='vo.status' value='3'}<span class="layui-badge layui-badge-middle layui-bg-black">待发货</span>{/eq}
{eq name='vo.status' value='4'}<span class="layui-badge layui-badge-middle layui-bg-green">已发货</span>{/eq} {eq name='vo.status' value='4'}<span class="layui-badge layui-badge-middle layui-bg-green">已发货</span>{/eq}
{eq name='vo.status' value='5'}<span class="layui-badge layui-badge-middle layui-bg-blue">已完成</span>{/eq} {eq name='vo.status' value='5'}<span class="layui-badge layui-badge-middle layui-bg-blue">已完成</span>{/eq}
<div class="inline-block text-middle"> <div class="inline-block text-middle">
订单单号：<span class="color-blue">{$vo.order_no|default=''}</span><br> 订单单号：<span class="color-blue">{$vo.order_no|default=''}</span><br>
订单金额：<b class="color-blue">{$vo.amount_total+0}</b> 元<span class="color-blue">{if $vo.amount_express>0}（含{$vo.amount_express+0}元）{else}（包邮）{/if}</span>已支付 <strong class="color-blue">{$vo.payment_amount+0}</strong> 元<br> 订单金额：<b class="color-blue">{$vo.amount_total+0}</b> 元<span class="color-blue">{if $vo.amount_express>0}（含邮费{$vo.amount_express+0}元）{else}（包邮）{/if}</span>已支付 <b class="color-blue">{$vo.payment_amount+0}</b> 元<br>
下单时间：{$vo.create_at|format_datetime}<br> 下单时间：{$vo.create_at|format_datetime}<br>
支付时间：{$vo.payment_datetime|format_datetime}{if $vo.payment_datetime}<span class="color-blue"> ({$vo.pay_type|default='-'})</span>{/if}<br> 支付时间：{$vo.payment_datetime|format_datetime} {notempty name='vo.pay_type'}<span class="color-blue"> ({$vo.pay_type|default='-'})</span>{/notempty}<br>
</div> </div>
</td> </td>
<td class="nowrap"> <td class="nowrap">
收货信息：{$vo.truck.address_name|default='--'}<span class="margin-left-5 color-blue">{$vo.truck.address_phone|default=''}</span><br> <div>收货信息：{$vo.truck.address_name|default='--'}<span class="margin-left-5 color-blue">{$vo.truck.address_phone|default=''}</span></div>
收货地址：{$vo.truck.address_province|default='--'}{$vo.truck.address_city|default=''}{$vo.truck.address_area|default=''}{$vo.truck.address_content|default=''}<br> <div>收货地址：{$vo.truck.address_province|default='--'}{$vo.truck.address_city|default=''}{$vo.truck.address_area|default=''}{$vo.truck.address_content|default=''}</div>
发货状态：{if empty($vo.truck.company_code)}<span class="layui-badge layui-bg-black">未发货</span>{else} <div>发货状态：<!--{if empty($vo.truck.send_number)}--><span class="layui-badge layui-bg-black">未发货</span><!--{else}--><span class="layui-badge layui-bg-blue">{$vo.truck.company_name|default='--'}</span>
<span class="layui-badge layui-bg-blue">{$vo.truck.company_name|default='--'}</span> <a data-modal="{:url('truckQuery')}?code={$vo.truck.company_code|default=''}&number={$vo.truck.send_number|default=''}" class="layui-badge layui-bg-orange">{$vo.truck.send_number|default='--'}</a>
<a data-title="{$vo.truck.company_name|default=''}（{$vo.truck.send_number|default=''}）" data-tips-text="快递追踪查询" <!--{/if}-->
data-modal="{:url('truckQuery')}?code={$vo.truck.company_code|default=''}&number={$vo.truck.send_number|default=''}" <!--{if auth('truck') and $vo.status eq 3}-->
class="layui-badge layui-bg-orange margin-left-5">{$vo.truck.send_number|default='--'}</a> <a class="margin-left-5" data-title="填写订单信息" data-modal="{:url('truck')}?order_no={$vo.order_no}">填写发货</a>
{/if} <!--{elseif auth('truck') and $vo.status eq 4}-->
{if auth('truck') and $vo.status eq 3} <a class="margin-left-5" data-title="修改发货信息" data-modal="{:url('truck')}?order_no={$vo.order_no}">修改发货</a>
<a class="margin-left-5" data-title="填写订单信息" data-modal="{:url('truck')}?order_no={$vo.order_no}">填写发货</a> <!--{/if}-->
{elseif auth('truck') and $vo.status eq 4} <!--{if auth('cancel') and in_array($vo.status, [1,2])}-->
<a class="margin-left-5" data-title="修改发货信息" data-modal="{:url('truck')}?order_no={$vo.order_no}">修改发货</a> <a class="margin-left-5" data-confirm="确认要取消订单吗？" data-load="{:url('cancel')}?order_no={$vo.order_no}">取消订单</a>
{/if} <!--{/if}-->
<!--{if auth('cancel') and in_array($vo.status, [1,2])}--> </div>
<a class="margin-left-5" data-confirm="确认要取消订单吗？" data-load="{:url('cancel')}?order_no={$vo.order_no}">取消订单</a> <div>发货时间：{$vo.truck.send_datetime|default='--'}</div>
<!--{/if}-->
<br>
发货时间：{$vo.truck.send_datetime|default='--'}<br>
</td> </td>
<td class="nowrap"> <td class="nowrap">
{foreach $vo.items as $item} {foreach $vo.items as $item}
<p> <div>
<b class="color-blue">{$item.stock_sales|default=0}件</b><b class="color-green"> x </b><b class="color-blue">{$item.price_market+0}元 </b> <b class="color-blue">{$item.stock_sales|default=0}件</b><b class="color-green"> x </b><b class="color-blue">{$item.price_market+0}元 </b>
{$item.goods_name|default=''} <span class="color-green"> ( {$item.goods_spec|think_show_goods_spec} ) </span> {$item.goods_name|default=''} <span class="color-green"> ( {$item.goods_spec|think_show_goods_spec} ) </span>
</p> </div>
{/foreach} {/foreach}
</td> </td>
</tr> </tr>

2
public/static/theme/css/console.css
View File

File diff suppressed because one or more lines are too long

2
public/static/theme/css/console.css.map
View File

File diff suppressed because one or more lines are too long

9
public/static/theme/css/console.layui.less
View File

@ -56,6 +56,10 @@ fieldset {
&-disabled { &-disabled {
border: 1px solid #DDD; border: 1px solid #DDD;
} }
& + .layui-btn {
margin-left: 8px;
}
} }
.layui-btn-group { .layui-btn-group {
@ -73,9 +77,12 @@ fieldset {
} }
.layui-badge { .layui-badge {
line-height: 19px;
box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.15); box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.15);
& + .layui-badge {
margin-left: 5px;
}
&-middle { &-middle {
width: 1em; width: 1em;
height: auto; height: auto;