景龙 / feifangu · 提交

转到一个项目

作者 jinglong
提交 e705744395a5bb644c98b5cf680b93bd79a7493a 1 个父辈 408b94c0
1 个管道 的构建 通过 耗费 8 秒

修改客户问题

内嵌 并排对比
正在显示 7 个修改的文件 包含 56 行增加 和 55 行删除
... ... @@ -15,7 +15,7 @@ return [
'Reduce' => '减少金额',
'Discount' => '折扣（折）',
'Coupon_number' => '优惠券数量',
'End_time' => '有效期',
'End_time' => '有效截止日期',
'Createtime' => '创建时间',
'Updatetime' => '更新时间'
];
... ...
... ... @@ -12,7 +12,7 @@ return [
'Reduce' => '减少金额',
'Discount' => '折扣（折）',
'Coupon_number' => '优惠券数量',
'End_time' => '有效期',
'End_time' => '有效截止日期',
'Createtime' => '创建时间',
'Updatetime' => '更新时间'
];
... ...
... ... @@ -14,7 +14,7 @@ return [
'Reduce' => '减少金额',
'Discount' => '折扣（折）',
'Coupon_number' => '优惠券数量',
'End_time' => '有效期',
'End_time' => '有效截止日期',
'Createtime' => '创建时间',
'Updatetime' => '更新时间'
];
... ...
... ... @@ -12,13 +12,13 @@
<a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('advert/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
<!--<a href="javascript:;" class="btn btn-danger btn-import {:$auth->check('advert/import')?'':'hide'}" title="{:__('Import')}" id="btn-import-file" data-url="ajax/upload" data-mimetype="csv,xls,xlsx" data-multiple="false"><i class="fa fa-upload"></i> {:__('Import')}</a>-->
<!--<div class="dropdown btn-group {:$auth->check('advert/multi')?'':'hide'}">-->
<!--<a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>-->
<!--<ul class="dropdown-menu text-left" role="menu">-->
<!--<li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=normal"><i class="fa fa-eye"></i> {:__('Set to normal')}</a></li>-->
<!--<li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=hidden"><i class="fa fa-eye-slash"></i> {:__('Set to hidden')}</a></li>-->
<!--</ul>-->
<!--</div>-->
<div class="dropdown btn-group {:$auth->check('advert/multi')?'':'hide'}">
<a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>
<ul class="dropdown-menu text-left" role="menu">
<li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=normal"><i class="fa fa-eye"></i> {:__('Set to normal')}</a></li>
<li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=hidden"><i class="fa fa-eye-slash"></i> {:__('Set to hidden')}</a></li>
</ul>
</div>
</div>
... ...
<form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Order_sn')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-order_sn" data-rule="required" class="form-control" name="row[order_sn]" type="number" value="{$row.order_sn|htmlentities}">
</div>
<label class="control-label">
{$row.order_sn|htmlentities}
</label>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Pay_order_sn')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-pay_order_sn" data-rule="required" class="form-control" name="row[pay_order_sn]" type="text" value="{$row.pay_order_sn|htmlentities}">
</div>
<label class="control-label">
{$row.pay_order_sn|htmlentities}
</label>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Receive_name')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-receive_name" data-rule="required" class="form-control" name="row[receive_name]" type="text" value="{$row.receive_name|htmlentities}">
</div>
<label class="control-label">
{$row.receive_name|htmlentities}
</label>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Receive_mobile')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-receive_mobile" data-rule="required" class="form-control" name="row[receive_mobile]" type="text" value="{$row.receive_mobile|htmlentities}">
</div>
<label class="control-label">
{$row.receive_mobile|htmlentities}
</label>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Receive_address')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-receive_address" data-rule="required" class="form-control" name="row[receive_address]" type="text" value="{$row.receive_address|htmlentities}">
</div>
<label class="control-label">
{$row.receive_address|htmlentities}
</label>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('ShipperCode')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-ShipperCode" data-rule="required" class="form-control" name="row[ShipperCode]" type="text" value="{$row.ShipperCode|htmlentities}">
</div>
<label class="control-label">
{$row.ShipperCode|htmlentities}
</label>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('LogisticCompany')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-LogisticCompany" data-rule="required" class="form-control" name="row[LogisticCompany]" type="text" value="{$row.LogisticCompany|htmlentities}">
</div>
<label class="control-label">
{$row.LogisticCompany|htmlentities}
</label>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Refund_reason')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-refund_reason" data-rule="required" class="form-control" name="row[refund_reason]" type="text" value="{$row.refund_reason|htmlentities}">
</div>
<label class="control-label">
{$row.refund_reason|htmlentities}
</label>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Return_reason')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-return_reason" data-rule="required" class="form-control" name="row[return_reason]" type="text" value="{$row.return_reason|htmlentities}">
</div>
<label class="control-label">
{$row.return_reason|htmlentities}
</label>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Leave_message')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-leave_message" data-rule="required" class="form-control" name="row[leave_message]" type="text" value="{$row.leave_message|htmlentities}">
</div>
<label class="control-label">
{$row.leave_message|htmlentities}
</label>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Discount_price')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-discount_price" class="form-control" step="0.01" name="row[discount_price]" type="number" value="{$row.discount_price|htmlentities}">
</div>
<label class="control-label">
{$row.discount_price|htmlentities}
</label>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Total_goods_price')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-total_goods_price" class="form-control" step="0.01" name="row[total_goods_price]" type="number" value="{$row.total_goods_price|htmlentities}">
</div>
<label class="control-label">
{$row.total_goods_price|htmlentities}
</label>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Total_expense_price')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-total_expense_price" class="form-control" step="0.01" name="row[total_expense_price]" type="number" value="{$row.total_expense_price|htmlentities}">
</div>
<label class="control-label">
{$row.total_expense_price|htmlentities}
</label>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Total_price')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-total_price" class="form-control" step="0.01" name="row[total_price]" type="number" value="{$row.total_price|htmlentities}">
</div>
<label class="control-label">
{$row.total_price|htmlentities}
</label>
</div>
<div class="form-group layer-footer">
<label class="control-label col-xs-12 col-sm-2"></label>
<div class="col-xs-12 col-sm-8">
<!--<button type="submit" class="btn btn-success btn-embossed disabled">{:__('OK')}</button>-->
<button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>
<!--<button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>-->
</div>
</div>
</form>
... ...
... ... @@ -105,7 +105,7 @@ class Index extends Api
$arr['res_banner'] = $res_banner;
//首页广告位
$res_advert = Common::findWhereData('advert',['type'=>0],'id,image,url');
$res_advert = Common::findWhereData('advert',['type'=>0,'status'=>'normal'],'id,image,url');
if($res_advert){
$res_advert['image'] = $this->auth->absolutionUrlOne($res_advert['image']);
}
... ... @@ -166,7 +166,7 @@ class Index extends Api
*/
public function popupAdvert(){
if($this->request->isGet()){
$res = Common::findWhereData('advert',['type'=>1],'id,image,url');
$res = Common::findWhereData('advert',['type'=>1,'status'=>'normal'],'id,image,url');
if($res){
$res['image'] = $this->auth->absolutionUrlOne($res['image']);
}
... ...
... ... @@ -28,6 +28,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
{field: 'image', title: __('Image'), events: Table.api.events.image, formatter: Table.api.formatter.image,operate:false},
{field: 'type', title: __('Type'),formatter: Table.api.formatter.label, searchList: {0: __('首页广告位'), 1: __('弹窗广告位')}},
{field: 'url', title: __('Url')},
{field: 'status', title: __('Status'), formatter: Table.api.formatter.status, searchList: {normal:'启用', hidden: '禁用'}},
{field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},
// {field: 'updatetime', title: __('Updatetime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},
{field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
... ...