景龙 / feifangu · 提交

转到一个项目

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

修改客户问题

内嵌 并排对比
正在显示 7 个修改的文件 包含 56 行增加 和 55 行删除
@@ -15,7 +15,7 @@ return [ @@ -15,7 +15,7 @@ return [
15 'Reduce' => '减少金额', 15 'Reduce' => '减少金额',
16 'Discount' => '折扣（折）', 16 'Discount' => '折扣（折）',
17 'Coupon_number' => '优惠券数量', 17 'Coupon_number' => '优惠券数量',
18 - 'End_time' => '有效期', 18 + 'End_time' => '有效截止日期',
19 'Createtime' => '创建时间', 19 'Createtime' => '创建时间',
20 'Updatetime' => '更新时间' 20 'Updatetime' => '更新时间'
21 ]; 21 ];
@@ -12,7 +12,7 @@ return [ @@ -12,7 +12,7 @@ return [
12 'Reduce' => '减少金额', 12 'Reduce' => '减少金额',
13 'Discount' => '折扣（折）', 13 'Discount' => '折扣（折）',
14 'Coupon_number' => '优惠券数量', 14 'Coupon_number' => '优惠券数量',
15 - 'End_time' => '有效期', 15 + 'End_time' => '有效截止日期',
16 'Createtime' => '创建时间', 16 'Createtime' => '创建时间',
17 'Updatetime' => '更新时间' 17 'Updatetime' => '更新时间'
18 ]; 18 ];
@@ -14,7 +14,7 @@ return [ @@ -14,7 +14,7 @@ return [
14 'Reduce' => '减少金额', 14 'Reduce' => '减少金额',
15 'Discount' => '折扣（折）', 15 'Discount' => '折扣（折）',
16 'Coupon_number' => '优惠券数量', 16 'Coupon_number' => '优惠券数量',
17 - 'End_time' => '有效期', 17 + 'End_time' => '有效截止日期',
18 'Createtime' => '创建时间', 18 'Createtime' => '创建时间',
19 'Updatetime' => '更新时间' 19 'Updatetime' => '更新时间'
20 ]; 20 ];
@@ -12,13 +12,13 @@ @@ -12,13 +12,13 @@
12 <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> 12 <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>
13 <!--<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>--> 13 <!--<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>-->
14 14
15 - <!--<div class="dropdown btn-group {:$auth->check('advert/multi')?'':'hide'}">-->  
16 - <!--<a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>-->  
17 - <!--<ul class="dropdown-menu text-left" role="menu">-->  
18 - <!--<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>-->  
19 - <!--<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>-->  
20 - <!--</ul>-->  
21 - <!--</div>--> 15 + <div class="dropdown btn-group {:$auth->check('advert/multi')?'':'hide'}">
  16 + <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>
  17 + <ul class="dropdown-menu text-left" role="menu">
  18 + <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>
  19 + <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>
  20 + </ul>
  21 + </div>
22 22
23 23
24 </div> 24 </div>
1 <form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action=""> 1 <form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
2 <div class="form-group"> 2 <div class="form-group">
3 <label class="control-label col-xs-12 col-sm-2">{:__('Order_sn')}:</label> 3 <label class="control-label col-xs-12 col-sm-2">{:__('Order_sn')}:</label>
4 - <div class="col-xs-12 col-sm-8">  
5 - <input id="c-order_sn" data-rule="required" class="form-control" name="row[order_sn]" type="number" value="{$row.order_sn|htmlentities}">  
6 - </div> 4 + <label class="control-label">
  5 + {$row.order_sn|htmlentities}
  6 + </label>
7 </div> 7 </div>
8 <div class="form-group"> 8 <div class="form-group">
9 <label class="control-label col-xs-12 col-sm-2">{:__('Pay_order_sn')}:</label> 9 <label class="control-label col-xs-12 col-sm-2">{:__('Pay_order_sn')}:</label>
10 - <div class="col-xs-12 col-sm-8">  
11 - <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}">  
12 - </div> 10 + <label class="control-label">
  11 + {$row.pay_order_sn|htmlentities}
  12 + </label>
13 </div> 13 </div>
14 <div class="form-group"> 14 <div class="form-group">
15 <label class="control-label col-xs-12 col-sm-2">{:__('Receive_name')}:</label> 15 <label class="control-label col-xs-12 col-sm-2">{:__('Receive_name')}:</label>
16 - <div class="col-xs-12 col-sm-8">  
17 - <input id="c-receive_name" data-rule="required" class="form-control" name="row[receive_name]" type="text" value="{$row.receive_name|htmlentities}">  
18 - </div> 16 + <label class="control-label">
  17 + {$row.receive_name|htmlentities}
  18 + </label>
19 </div> 19 </div>
20 <div class="form-group"> 20 <div class="form-group">
21 <label class="control-label col-xs-12 col-sm-2">{:__('Receive_mobile')}:</label> 21 <label class="control-label col-xs-12 col-sm-2">{:__('Receive_mobile')}:</label>
22 - <div class="col-xs-12 col-sm-8">  
23 - <input id="c-receive_mobile" data-rule="required" class="form-control" name="row[receive_mobile]" type="text" value="{$row.receive_mobile|htmlentities}">  
24 - </div> 22 + <label class="control-label">
  23 + {$row.receive_mobile|htmlentities}
  24 + </label>
25 </div> 25 </div>
26 <div class="form-group"> 26 <div class="form-group">
27 <label class="control-label col-xs-12 col-sm-2">{:__('Receive_address')}:</label> 27 <label class="control-label col-xs-12 col-sm-2">{:__('Receive_address')}:</label>
28 - <div class="col-xs-12 col-sm-8">  
29 - <input id="c-receive_address" data-rule="required" class="form-control" name="row[receive_address]" type="text" value="{$row.receive_address|htmlentities}">  
30 - </div> 28 + <label class="control-label">
  29 + {$row.receive_address|htmlentities}
  30 + </label>
31 </div> 31 </div>
32 <div class="form-group"> 32 <div class="form-group">
33 <label class="control-label col-xs-12 col-sm-2">{:__('ShipperCode')}:</label> 33 <label class="control-label col-xs-12 col-sm-2">{:__('ShipperCode')}:</label>
34 - <div class="col-xs-12 col-sm-8">  
35 - <input id="c-ShipperCode" data-rule="required" class="form-control" name="row[ShipperCode]" type="text" value="{$row.ShipperCode|htmlentities}">  
36 - </div> 34 + <label class="control-label">
  35 + {$row.ShipperCode|htmlentities}
  36 + </label>
37 </div> 37 </div>
38 <div class="form-group"> 38 <div class="form-group">
39 <label class="control-label col-xs-12 col-sm-2">{:__('LogisticCompany')}:</label> 39 <label class="control-label col-xs-12 col-sm-2">{:__('LogisticCompany')}:</label>
40 - <div class="col-xs-12 col-sm-8">  
41 - <input id="c-LogisticCompany" data-rule="required" class="form-control" name="row[LogisticCompany]" type="text" value="{$row.LogisticCompany|htmlentities}">  
42 - </div> 40 + <label class="control-label">
  41 + {$row.LogisticCompany|htmlentities}
  42 + </label>
43 </div> 43 </div>
44 <div class="form-group"> 44 <div class="form-group">
45 <label class="control-label col-xs-12 col-sm-2">{:__('Refund_reason')}:</label> 45 <label class="control-label col-xs-12 col-sm-2">{:__('Refund_reason')}:</label>
46 - <div class="col-xs-12 col-sm-8">  
47 - <input id="c-refund_reason" data-rule="required" class="form-control" name="row[refund_reason]" type="text" value="{$row.refund_reason|htmlentities}">  
48 - </div> 46 + <label class="control-label">
  47 + {$row.refund_reason|htmlentities}
  48 + </label>
49 </div> 49 </div>
50 <div class="form-group"> 50 <div class="form-group">
51 <label class="control-label col-xs-12 col-sm-2">{:__('Return_reason')}:</label> 51 <label class="control-label col-xs-12 col-sm-2">{:__('Return_reason')}:</label>
52 - <div class="col-xs-12 col-sm-8">  
53 - <input id="c-return_reason" data-rule="required" class="form-control" name="row[return_reason]" type="text" value="{$row.return_reason|htmlentities}">  
54 - </div> 52 + <label class="control-label">
  53 + {$row.return_reason|htmlentities}
  54 + </label>
55 </div> 55 </div>
56 <div class="form-group"> 56 <div class="form-group">
57 <label class="control-label col-xs-12 col-sm-2">{:__('Leave_message')}:</label> 57 <label class="control-label col-xs-12 col-sm-2">{:__('Leave_message')}:</label>
58 - <div class="col-xs-12 col-sm-8">  
59 - <input id="c-leave_message" data-rule="required" class="form-control" name="row[leave_message]" type="text" value="{$row.leave_message|htmlentities}">  
60 - </div> 58 + <label class="control-label">
  59 + {$row.leave_message|htmlentities}
  60 + </label>
61 </div> 61 </div>
62 <div class="form-group"> 62 <div class="form-group">
63 <label class="control-label col-xs-12 col-sm-2">{:__('Discount_price')}:</label> 63 <label class="control-label col-xs-12 col-sm-2">{:__('Discount_price')}:</label>
64 - <div class="col-xs-12 col-sm-8">  
65 - <input id="c-discount_price" class="form-control" step="0.01" name="row[discount_price]" type="number" value="{$row.discount_price|htmlentities}">  
66 - </div> 64 + <label class="control-label">
  65 + {$row.discount_price|htmlentities}
  66 + </label>
67 </div> 67 </div>
68 <div class="form-group"> 68 <div class="form-group">
69 <label class="control-label col-xs-12 col-sm-2">{:__('Total_goods_price')}:</label> 69 <label class="control-label col-xs-12 col-sm-2">{:__('Total_goods_price')}:</label>
70 - <div class="col-xs-12 col-sm-8">  
71 - <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}">  
72 - </div> 70 + <label class="control-label">
  71 + {$row.total_goods_price|htmlentities}
  72 + </label>
73 </div> 73 </div>
74 <div class="form-group"> 74 <div class="form-group">
75 <label class="control-label col-xs-12 col-sm-2">{:__('Total_expense_price')}:</label> 75 <label class="control-label col-xs-12 col-sm-2">{:__('Total_expense_price')}:</label>
76 - <div class="col-xs-12 col-sm-8">  
77 - <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}">  
78 - </div> 76 + <label class="control-label">
  77 + {$row.total_expense_price|htmlentities}
  78 + </label>
79 </div> 79 </div>
80 <div class="form-group"> 80 <div class="form-group">
81 <label class="control-label col-xs-12 col-sm-2">{:__('Total_price')}:</label> 81 <label class="control-label col-xs-12 col-sm-2">{:__('Total_price')}:</label>
82 - <div class="col-xs-12 col-sm-8">  
83 - <input id="c-total_price" class="form-control" step="0.01" name="row[total_price]" type="number" value="{$row.total_price|htmlentities}">  
84 - </div> 82 + <label class="control-label">
  83 + {$row.total_price|htmlentities}
  84 + </label>
85 </div> 85 </div>
86 <div class="form-group layer-footer"> 86 <div class="form-group layer-footer">
87 <label class="control-label col-xs-12 col-sm-2"></label> 87 <label class="control-label col-xs-12 col-sm-2"></label>
88 <div class="col-xs-12 col-sm-8"> 88 <div class="col-xs-12 col-sm-8">
89 <!--<button type="submit" class="btn btn-success btn-embossed disabled">{:__('OK')}</button>--> 89 <!--<button type="submit" class="btn btn-success btn-embossed disabled">{:__('OK')}</button>-->
90 - <button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button> 90 + <!--<button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>-->
91 </div> 91 </div>
92 </div> 92 </div>
93 </form> 93 </form>
@@ -105,7 +105,7 @@ class Index extends Api @@ -105,7 +105,7 @@ class Index extends Api
105 $arr['res_banner'] = $res_banner; 105 $arr['res_banner'] = $res_banner;
106 106
107 //首页广告位 107 //首页广告位
108 - $res_advert = Common::findWhereData('advert',['type'=>0],'id,image,url'); 108 + $res_advert = Common::findWhereData('advert',['type'=>0,'status'=>'normal'],'id,image,url');
109 if($res_advert){ 109 if($res_advert){
110 $res_advert['image'] = $this->auth->absolutionUrlOne($res_advert['image']); 110 $res_advert['image'] = $this->auth->absolutionUrlOne($res_advert['image']);
111 } 111 }
@@ -166,7 +166,7 @@ class Index extends Api @@ -166,7 +166,7 @@ class Index extends Api
166 */ 166 */
167 public function popupAdvert(){ 167 public function popupAdvert(){
168 if($this->request->isGet()){ 168 if($this->request->isGet()){
169 - $res = Common::findWhereData('advert',['type'=>1],'id,image,url'); 169 + $res = Common::findWhereData('advert',['type'=>1,'status'=>'normal'],'id,image,url');
170 if($res){ 170 if($res){
171 $res['image'] = $this->auth->absolutionUrlOne($res['image']); 171 $res['image'] = $this->auth->absolutionUrlOne($res['image']);
172 } 172 }
@@ -28,6 +28,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin @@ -28,6 +28,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
28 {field: 'image', title: __('Image'), events: Table.api.events.image, formatter: Table.api.formatter.image,operate:false}, 28 {field: 'image', title: __('Image'), events: Table.api.events.image, formatter: Table.api.formatter.image,operate:false},
29 {field: 'type', title: __('Type'),formatter: Table.api.formatter.label, searchList: {0: __('首页广告位'), 1: __('弹窗广告位')}}, 29 {field: 'type', title: __('Type'),formatter: Table.api.formatter.label, searchList: {0: __('首页广告位'), 1: __('弹窗广告位')}},
30 {field: 'url', title: __('Url')}, 30 {field: 'url', title: __('Url')},
  31 + {field: 'status', title: __('Status'), formatter: Table.api.formatter.status, searchList: {normal:'启用', hidden: '禁用'}},
31 {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime}, 32 {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},
32 // {field: 'updatetime', title: __('Updatetime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime}, 33 // {field: 'updatetime', title: __('Updatetime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},
33 {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate} 34 {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}