作者 杨育虎

2

@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 namespace app\admin\controller; 3 namespace app\admin\controller;
4 4
5 use app\common\controller\Backend; 5 use app\common\controller\Backend;
6 -use think\Db; 6 +
7 /** 7 /**
8 * 8 *
9 * 9 *
@@ -75,50 +75,4 @@ class Product extends Backend @@ -75,50 +75,4 @@ class Product extends Backend
75 } 75 }
76 return $this->view->fetch(); 76 return $this->view->fetch();
77 } 77 }
78 -  
79 -  
80 - /**  
81 - * 添加  
82 - */  
83 - public function add()  
84 - {  
85 - if ($this->request->isPost()) {  
86 - $params = $this->request->post("row/a");  
87 - if ($params) {  
88 - $params = $this->preExcludeFields($params);  
89 -  
90 - if ($this->dataLimit && $this->dataLimitFieldAutoFill) {  
91 - $params[$this->dataLimitField] = $this->auth->id;  
92 - }  
93 - $result = false;  
94 - Db::startTrans();  
95 - try {  
96 - //是否采用模型验证  
97 - if ($this->modelValidate) {  
98 - $name = str_replace("\\model\\", "\\validate\\", get_class($this->model));  
99 - $validate = is_bool($this->modelValidate) ? ($this->modelSceneValidate ? $name . '.add' : $name) : $this->modelValidate;  
100 - $this->model->validateFailException(true)->validate($validate);  
101 - }  
102 - $result = $this->model->allowField(true)->save($params);  
103 - Db::commit();  
104 - } catch (ValidateException $e) {  
105 - Db::rollback();  
106 - $this->error($e->getMessage());  
107 - } catch (PDOException $e) {  
108 - Db::rollback();  
109 - $this->error($e->getMessage());  
110 - } catch (Exception $e) {  
111 - Db::rollback();  
112 - $this->error($e->getMessage());  
113 - }  
114 - if ($result !== false) {  
115 - $this->success();  
116 - } else {  
117 - $this->error(__('No rows were inserted'));  
118 - }  
119 - }  
120 - $this->error(__('Parameter %s can not be empty', ''));  
121 - }  
122 - return $this->view->fetch();  
123 - }  
124 } 78 }
@@ -15,8 +15,15 @@ return [ @@ -15,8 +15,15 @@ return [
15 'Tidu2' => '价格梯度2', 15 'Tidu2' => '价格梯度2',
16 'Tidu3' => '价格梯度3', 16 'Tidu3' => '价格梯度3',
17 'Tidu4' => '价格梯度4', 17 'Tidu4' => '价格梯度4',
  18 + 'Price2' => '价格2',
  19 + 'Price1' => '价格1',
18 'Createtime' => '创建时间', 20 'Createtime' => '创建时间',
19 'Updatetime' => '更改时间', 21 'Updatetime' => '更改时间',
  22 + 'Price3' => '价格3',
  23 + 'Price4' => '价格4',
  24 + 'Price5' => '价格5',
  25 + 'Tidu5' => '价格梯度5',
  26 + 'Price' => '商品单价',
20 'Classa.class' => '分类', 27 'Classa.class' => '分类',
21 'Classcon.class_con' => '详细分类', 28 'Classcon.class_con' => '详细分类',
22 'Logo.logo' => '品牌' 29 'Logo.logo' => '品牌'
@@ -21,21 +21,21 @@ @@ -21,21 +21,21 @@
21 </div> 21 </div>
22 </div> 22 </div>
23 <div class="form-group"> 23 <div class="form-group">
24 - <label class="control-label col-xs-12 col-sm-2">{:__('Logo_id')}:</label> 24 + <label class="control-label col-xs-12 col-sm-2">{:__('Class_id')}:</label>
25 <div class="col-xs-12 col-sm-8"> 25 <div class="col-xs-12 col-sm-8">
26 - <input id="c-logo_id" data-rule="required" data-field="logo" data-source="logo/index" class="form-control selectpage" name="row[logo_id]" type="text" value=""> 26 + <input id="c-class_id" data-rule="required" data-source="class/index" class="form-control selectpage" name="row[class_id]" type="text" value="">
27 </div> 27 </div>
28 </div> 28 </div>
29 <div class="form-group"> 29 <div class="form-group">
30 - <label class="control-label col-xs-12 col-sm-2">{:__('Class_id')}:</label> 30 + <label class="control-label col-xs-12 col-sm-2">{:__('Class_con_id')}:</label>
31 <div class="col-xs-12 col-sm-8"> 31 <div class="col-xs-12 col-sm-8">
32 - <input id="c-class_id" data-rule="required" data-field="class" data-source="classa/index" class="form-control selectpage" name="row[class_id]" type="text" value=""> 32 + <input id="c-class_con_id" data-rule="required" data-source="class/con/index" class="form-control selectpage" name="row[class_con_id]" type="text" value="">
33 </div> 33 </div>
34 </div> 34 </div>
35 <div class="form-group"> 35 <div class="form-group">
36 - <label class="control-label col-xs-12 col-sm-2">{:__('Class_con_id')}:</label> 36 + <label class="control-label col-xs-12 col-sm-2">{:__('Logo_id')}:</label>
37 <div class="col-xs-12 col-sm-8"> 37 <div class="col-xs-12 col-sm-8">
38 - <input id="c-class_con_id" data-rule="required" data-field="class_con" data-source="class_con/index" class="form-control selectpage" name="row[class_con_id]" type="text" value=""> 38 + <input id="c-logo_id" data-rule="required" data-source="logo/index" class="form-control selectpage" name="row[logo_id]" type="text" value="">
39 </div> 39 </div>
40 </div> 40 </div>
41 <div class="form-group"> 41 <div class="form-group">
@@ -73,25 +73,67 @@ @@ -73,25 +73,67 @@
73 <div class="form-group"> 73 <div class="form-group">
74 <label class="control-label col-xs-12 col-sm-2">{:__('Tidu1')}:</label> 74 <label class="control-label col-xs-12 col-sm-2">{:__('Tidu1')}:</label>
75 <div class="col-xs-12 col-sm-8"> 75 <div class="col-xs-12 col-sm-8">
76 - <input id="c-tidu1" data-rule="required" class="form-control" name="row[tidu1]" type="text"> 76 + <input id="c-tidu1" class="form-control" name="row[tidu1]" type="text">
77 </div> 77 </div>
78 </div> 78 </div>
79 <div class="form-group"> 79 <div class="form-group">
80 <label class="control-label col-xs-12 col-sm-2">{:__('Tidu2')}:</label> 80 <label class="control-label col-xs-12 col-sm-2">{:__('Tidu2')}:</label>
81 <div class="col-xs-12 col-sm-8"> 81 <div class="col-xs-12 col-sm-8">
82 - <input id="c-tidu2" data-rule="required" class="form-control" name="row[tidu2]" type="text"> 82 + <input id="c-tidu2" class="form-control" name="row[tidu2]" type="text">
83 </div> 83 </div>
84 </div> 84 </div>
85 <div class="form-group"> 85 <div class="form-group">
86 <label class="control-label col-xs-12 col-sm-2">{:__('Tidu3')}:</label> 86 <label class="control-label col-xs-12 col-sm-2">{:__('Tidu3')}:</label>
87 <div class="col-xs-12 col-sm-8"> 87 <div class="col-xs-12 col-sm-8">
88 - <input id="c-tidu3" data-rule="required" class="form-control" name="row[tidu3]" type="text"> 88 + <input id="c-tidu3" class="form-control" name="row[tidu3]" type="text">
89 </div> 89 </div>
90 </div> 90 </div>
91 <div class="form-group"> 91 <div class="form-group">
92 <label class="control-label col-xs-12 col-sm-2">{:__('Tidu4')}:</label> 92 <label class="control-label col-xs-12 col-sm-2">{:__('Tidu4')}:</label>
93 <div class="col-xs-12 col-sm-8"> 93 <div class="col-xs-12 col-sm-8">
94 - <input id="c-tidu4" data-rule="required" class="form-control" name="row[tidu4]" type="text"> 94 + <input id="c-tidu4" class="form-control" name="row[tidu4]" type="text">
  95 + </div>
  96 + </div>
  97 + <div class="form-group">
  98 + <label class="control-label col-xs-12 col-sm-2">{:__('Price2')}:</label>
  99 + <div class="col-xs-12 col-sm-8">
  100 + <input id="c-price2" class="form-control" step="0.01" name="row[price2]" type="number">
  101 + </div>
  102 + </div>
  103 + <div class="form-group">
  104 + <label class="control-label col-xs-12 col-sm-2">{:__('Price1')}:</label>
  105 + <div class="col-xs-12 col-sm-8">
  106 + <input id="c-price1" class="form-control" step="0.01" name="row[price1]" type="number">
  107 + </div>
  108 + </div>
  109 + <div class="form-group">
  110 + <label class="control-label col-xs-12 col-sm-2">{:__('Price3')}:</label>
  111 + <div class="col-xs-12 col-sm-8">
  112 + <input id="c-price3" class="form-control" step="0.01" name="row[price3]" type="number">
  113 + </div>
  114 + </div>
  115 + <div class="form-group">
  116 + <label class="control-label col-xs-12 col-sm-2">{:__('Price4')}:</label>
  117 + <div class="col-xs-12 col-sm-8">
  118 + <input id="c-price4" class="form-control" step="0.01" name="row[price4]" type="number">
  119 + </div>
  120 + </div>
  121 + <div class="form-group">
  122 + <label class="control-label col-xs-12 col-sm-2">{:__('Price5')}:</label>
  123 + <div class="col-xs-12 col-sm-8">
  124 + <input id="c-price5" class="form-control" step="0.01" name="row[price5]" type="number">
  125 + </div>
  126 + </div>
  127 + <div class="form-group">
  128 + <label class="control-label col-xs-12 col-sm-2">{:__('Tidu5')}:</label>
  129 + <div class="col-xs-12 col-sm-8">
  130 + <input id="c-tidu5" class="form-control" name="row[tidu5]" type="text">
  131 + </div>
  132 + </div>
  133 + <div class="form-group">
  134 + <label class="control-label col-xs-12 col-sm-2">{:__('Price')}:</label>
  135 + <div class="col-xs-12 col-sm-8">
  136 + <input id="c-price" data-rule="required" class="form-control" step="0.01" name="row[price]" type="number">
95 </div> 137 </div>
96 </div> 138 </div>
97 <div class="form-group layer-footer"> 139 <div class="form-group layer-footer">
@@ -21,21 +21,21 @@ @@ -21,21 +21,21 @@
21 </div> 21 </div>
22 </div> 22 </div>
23 <div class="form-group"> 23 <div class="form-group">
24 - <label class="control-label col-xs-12 col-sm-2">{:__('Logo_id')}:</label> 24 + <label class="control-label col-xs-12 col-sm-2">{:__('Class_id')}:</label>
25 <div class="col-xs-12 col-sm-8"> 25 <div class="col-xs-12 col-sm-8">
26 - <input id="c-logo_id" data-rule="required" data-field="logo" data-source="logo/index" class="form-control selectpage" name="row[logo_id]" type="text" value="{$row.logo_id|htmlentities}"> 26 + <input id="c-class_id" data-rule="required" data-source="class/index" class="form-control selectpage" name="row[class_id]" type="text" value="{$row.class_id|htmlentities}">
27 </div> 27 </div>
28 </div> 28 </div>
29 <div class="form-group"> 29 <div class="form-group">
30 - <label class="control-label col-xs-12 col-sm-2">{:__('Class_id')}:</label> 30 + <label class="control-label col-xs-12 col-sm-2">{:__('Class_con_id')}:</label>
31 <div class="col-xs-12 col-sm-8"> 31 <div class="col-xs-12 col-sm-8">
32 - <input id="c-class_id" data-rule="required" data-field="class" data-source="classa/index" class="form-control selectpage" name="row[class_id]" type="text" value="{$row.class_id|htmlentities}"> 32 + <input id="c-class_con_id" data-rule="required" data-source="class/con/index" class="form-control selectpage" name="row[class_con_id]" type="text" value="{$row.class_con_id|htmlentities}">
33 </div> 33 </div>
34 </div> 34 </div>
35 <div class="form-group"> 35 <div class="form-group">
36 - <label class="control-label col-xs-12 col-sm-2">{:__('Class_con_id')}:</label> 36 + <label class="control-label col-xs-12 col-sm-2">{:__('Logo_id')}:</label>
37 <div class="col-xs-12 col-sm-8"> 37 <div class="col-xs-12 col-sm-8">
38 - <input id="c-class_con_id" data-rule="required" data-field="class_con" data-source="class_con/index" class="form-control selectpage" name="row[class_con_id]" type="text" value="{$row.class_con_id|htmlentities}"> 38 + <input id="c-logo_id" data-rule="required" data-source="logo/index" class="form-control selectpage" name="row[logo_id]" type="text" value="{$row.logo_id|htmlentities}">
39 </div> 39 </div>
40 </div> 40 </div>
41 <div class="form-group"> 41 <div class="form-group">
@@ -73,25 +73,67 @@ @@ -73,25 +73,67 @@
73 <div class="form-group"> 73 <div class="form-group">
74 <label class="control-label col-xs-12 col-sm-2">{:__('Tidu1')}:</label> 74 <label class="control-label col-xs-12 col-sm-2">{:__('Tidu1')}:</label>
75 <div class="col-xs-12 col-sm-8"> 75 <div class="col-xs-12 col-sm-8">
76 - <input id="c-tidu1" data-rule="required" class="form-control" name="row[tidu1]" type="text" value="{$row.tidu1|htmlentities}"> 76 + <input id="c-tidu1" class="form-control" name="row[tidu1]" type="text" value="{$row.tidu1|htmlentities}">
77 </div> 77 </div>
78 </div> 78 </div>
79 <div class="form-group"> 79 <div class="form-group">
80 <label class="control-label col-xs-12 col-sm-2">{:__('Tidu2')}:</label> 80 <label class="control-label col-xs-12 col-sm-2">{:__('Tidu2')}:</label>
81 <div class="col-xs-12 col-sm-8"> 81 <div class="col-xs-12 col-sm-8">
82 - <input id="c-tidu2" data-rule="required" class="form-control" name="row[tidu2]" type="text" value="{$row.tidu2|htmlentities}"> 82 + <input id="c-tidu2" class="form-control" name="row[tidu2]" type="text" value="{$row.tidu2|htmlentities}">
83 </div> 83 </div>
84 </div> 84 </div>
85 <div class="form-group"> 85 <div class="form-group">
86 <label class="control-label col-xs-12 col-sm-2">{:__('Tidu3')}:</label> 86 <label class="control-label col-xs-12 col-sm-2">{:__('Tidu3')}:</label>
87 <div class="col-xs-12 col-sm-8"> 87 <div class="col-xs-12 col-sm-8">
88 - <input id="c-tidu3" data-rule="required" class="form-control" name="row[tidu3]" type="text" value="{$row.tidu3|htmlentities}"> 88 + <input id="c-tidu3" class="form-control" name="row[tidu3]" type="text" value="{$row.tidu3|htmlentities}">
89 </div> 89 </div>
90 </div> 90 </div>
91 <div class="form-group"> 91 <div class="form-group">
92 <label class="control-label col-xs-12 col-sm-2">{:__('Tidu4')}:</label> 92 <label class="control-label col-xs-12 col-sm-2">{:__('Tidu4')}:</label>
93 <div class="col-xs-12 col-sm-8"> 93 <div class="col-xs-12 col-sm-8">
94 - <input id="c-tidu4" data-rule="required" class="form-control" name="row[tidu4]" type="text" value="{$row.tidu4|htmlentities}"> 94 + <input id="c-tidu4" class="form-control" name="row[tidu4]" type="text" value="{$row.tidu4|htmlentities}">
  95 + </div>
  96 + </div>
  97 + <div class="form-group">
  98 + <label class="control-label col-xs-12 col-sm-2">{:__('Price2')}:</label>
  99 + <div class="col-xs-12 col-sm-8">
  100 + <input id="c-price2" class="form-control" step="0.01" name="row[price2]" type="number" value="{$row.price2|htmlentities}">
  101 + </div>
  102 + </div>
  103 + <div class="form-group">
  104 + <label class="control-label col-xs-12 col-sm-2">{:__('Price1')}:</label>
  105 + <div class="col-xs-12 col-sm-8">
  106 + <input id="c-price1" class="form-control" step="0.01" name="row[price1]" type="number" value="{$row.price1|htmlentities}">
  107 + </div>
  108 + </div>
  109 + <div class="form-group">
  110 + <label class="control-label col-xs-12 col-sm-2">{:__('Price3')}:</label>
  111 + <div class="col-xs-12 col-sm-8">
  112 + <input id="c-price3" class="form-control" step="0.01" name="row[price3]" type="number" value="{$row.price3|htmlentities}">
  113 + </div>
  114 + </div>
  115 + <div class="form-group">
  116 + <label class="control-label col-xs-12 col-sm-2">{:__('Price4')}:</label>
  117 + <div class="col-xs-12 col-sm-8">
  118 + <input id="c-price4" class="form-control" step="0.01" name="row[price4]" type="number" value="{$row.price4|htmlentities}">
  119 + </div>
  120 + </div>
  121 + <div class="form-group">
  122 + <label class="control-label col-xs-12 col-sm-2">{:__('Price5')}:</label>
  123 + <div class="col-xs-12 col-sm-8">
  124 + <input id="c-price5" class="form-control" step="0.01" name="row[price5]" type="number" value="{$row.price5|htmlentities}">
  125 + </div>
  126 + </div>
  127 + <div class="form-group">
  128 + <label class="control-label col-xs-12 col-sm-2">{:__('Tidu5')}:</label>
  129 + <div class="col-xs-12 col-sm-8">
  130 + <input id="c-tidu5" class="form-control" name="row[tidu5]" type="text" value="{$row.tidu5|htmlentities}">
  131 + </div>
  132 + </div>
  133 + <div class="form-group">
  134 + <label class="control-label col-xs-12 col-sm-2">{:__('Price')}:</label>
  135 + <div class="col-xs-12 col-sm-8">
  136 + <input id="c-price" data-rule="required" class="form-control" step="0.01" name="row[price]" type="number" value="{$row.price|htmlentities}">
95 </div> 137 </div>
96 </div> 138 </div>
97 <div class="form-group layer-footer"> 139 <div class="form-group layer-footer">
@@ -27,19 +27,29 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin @@ -27,19 +27,29 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
27 {field: 'id', title: __('Id')}, 27 {field: 'id', title: __('Id')},
28 {field: 'avatar', title: __('Avatar'), events: Table.api.events.image, formatter: Table.api.formatter.image}, 28 {field: 'avatar', title: __('Avatar'), events: Table.api.events.image, formatter: Table.api.formatter.image},
29 {field: 'name', title: __('Name')}, 29 {field: 'name', title: __('Name')},
30 - {field: 'classa.class', title: __('Classa.class')},  
31 - {field: 'classcon.class_con', title: __('Classcon.class_con')},  
32 - {field: 'logo.logo', title: __('Logo.logo')},  
33 - {field: 'con', title: __('Con')}, 30 + {field: 'class_id', title: __('Class_id')},
  31 + {field: 'class_con_id', title: __('Class_con_id')},
  32 + {field: 'logo_id', title: __('Logo_id')},
34 {field: 'fengzhuang', title: __('Fengzhuang')}, 33 {field: 'fengzhuang', title: __('Fengzhuang')},
35 - // {field: 'book_avatar', title: __('book_avatar')}, 34 + {field: 'con', title: __('Con')},
  35 + {field: 'stock', title: __('Stock')},
  36 + {field: 'book_avatar', title: __('Book_avatar'), events: Table.api.events.image, formatter: Table.api.formatter.image},
36 {field: 'tidu1', title: __('Tidu1')}, 37 {field: 'tidu1', title: __('Tidu1')},
37 {field: 'tidu2', title: __('Tidu2')}, 38 {field: 'tidu2', title: __('Tidu2')},
38 {field: 'tidu3', title: __('Tidu3')}, 39 {field: 'tidu3', title: __('Tidu3')},
39 {field: 'tidu4', title: __('Tidu4')}, 40 {field: 'tidu4', title: __('Tidu4')},
40 - {field: 'stock', title: __('Stock')}, 41 + {field: 'price2', title: __('Price2'), operate:'BETWEEN'},
  42 + {field: 'price1', title: __('Price1'), operate:'BETWEEN'},
41 {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime}, 43 {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},
42 {field: 'updatetime', title: __('Updatetime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime}, 44 {field: 'updatetime', title: __('Updatetime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},
  45 + {field: 'price3', title: __('Price3'), operate:'BETWEEN'},
  46 + {field: 'price4', title: __('Price4'), operate:'BETWEEN'},
  47 + {field: 'price5', title: __('Price5'), operate:'BETWEEN'},
  48 + {field: 'tidu5', title: __('Tidu5')},
  49 + {field: 'price', title: __('Price'), operate:'BETWEEN'},
  50 + {field: 'classa.class', title: __('Classa.class')},
  51 + {field: 'classcon.class_con', title: __('Classcon.class_con')},
  52 + {field: 'logo.logo', title: __('Logo.logo')},
43 {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate} 53 {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
44 ] 54 ]
45 ] 55 ]