潘浩文 / fupai1 · 提交

转到一个项目

作者 潘浩文
提交 4763dd952a2fe96b70593558cf6b6482a5c014bc 1 个父辈 11e5399d
1 个管道 的构建 通过 耗费 1 秒

后台设备模块开发

内嵌 并排对比
正在显示 3 个修改的文件 包含 44 行增加 和 80 行删除
@@ -140,14 +140,16 @@ class AdminLightController extends AdminBaseController @@ -140,14 +140,16 @@ class AdminLightController extends AdminBaseController
140 public function edit() 140 public function edit()
141 { 141 {
142 $id = $this->request->param('id'); 142 $id = $this->request->param('id');
143 - $data = Db::name('temple')  
144 -// ->alias('t')  
145 -// ->join('user u','t.user_id=u.id')  
146 - ->where('id', $id)  
147 -// ->field('t.*,u.user_login') 143 + $data = Db::name('light')
  144 + ->alias('l')
  145 + ->join('temple t','t.id=l.temple_id')
  146 + ->where('l.id', $id)
  147 + ->field('l.*,t.name as tname,t.id as tid')
148 ->find(); 148 ->find();
149 - $user=Db::name('user')->alias('u')->join('role_user r','u.id=r.user_id')->where('r.role_id',2)->field('u.*')->select();  
150 - $this->assign('user',$user); 149 + $temple=Db::name('temple')->select();
  150 + $this->assign('temple',$temple);
  151 + $area=Db::name('temple_area')->where('temple_id',$data['temple_id'])->select();
  152 + $this->assign('area',$area);
151 $this->assign('list', $data); 153 $this->assign('list', $data);
152 return $this->fetch(); 154 return $this->fetch();
153 } 155 }
@@ -168,8 +170,7 @@ class AdminLightController extends AdminBaseController @@ -168,8 +170,7 @@ class AdminLightController extends AdminBaseController
168 { 170 {
169 $param = $this->request->param(); 171 $param = $this->request->param();
170 $param['create_time'] = time(); 172 $param['create_time'] = time();
171 - $param['percent']=intval($param['percent'])/intval(100);  
172 - Db::name('temple')->where('id', $param['id'])->update($param); 173 + Db::name('light')->where('id', $param['id'])->update($param);
173 $this->success('编辑成功'); 174 $this->success('编辑成功');
174 } 175 }
175 176
@@ -193,12 +194,12 @@ class AdminLightController extends AdminBaseController @@ -193,12 +194,12 @@ class AdminLightController extends AdminBaseController
193 $re=Db::name('light_order') 194 $re=Db::name('light_order')
194 ->alias('lo') 195 ->alias('lo')
195 ->join('light l','lo.light_id=l.id') 196 ->join('light l','lo.light_id=l.id')
196 - ->where(['l.temple_id'=>$id,'lo.end_time'=>['>',time()]]) 197 + ->where(['l.id'=>$id,'lo.end_time'=>['>',time()]])
197 ->find(); 198 ->find();
198 if ($re){ 199 if ($re){
199 - $this->error('该寺庙下有进行中的订单，不允许删除'); 200 + $this->error('该设备有进行中的订单，不允许删除');
200 } 201 }
201 - Db::name('temple')->where('id', $id)->delete(); 202 + Db::name('light')->where('id', $id)->delete();
202 $this->success('删除成功'); 203 $this->success('删除成功');
203 } 204 }
204 205
@@ -36,7 +36,7 @@ @@ -36,7 +36,7 @@
36 <tr> 36 <tr>
37 <th>所属寺庙<span class="form-required">*</span></th> 37 <th>所属寺庙<span class="form-required">*</span></th>
38 <td> 38 <td>
39 - <select name="temple_id" required id="temple"> 39 + <select name="temple_id" required id="temple_id">
40 <option value="">请选择所属寺庙</option> 40 <option value="">请选择所属寺庙</option>
41 <foreach name="temple" item="vo"> 41 <foreach name="temple" item="vo">
42 <option value="{$vo.id}">{$vo.name}</option> 42 <option value="{$vo.id}">{$vo.name}</option>
@@ -47,7 +47,7 @@ @@ -47,7 +47,7 @@
47 <tr> 47 <tr>
48 <th>所属区域<span class="form-required">*</span></th> 48 <th>所属区域<span class="form-required">*</span></th>
49 <td> 49 <td>
50 - <select name="area_id" required id="area"> 50 + <select name="area_id" required id="area_id">
51 <option value="">请选择所属区域</option> 51 <option value="">请选择所属区域</option>
52 </select> 52 </select>
53 </td> 53 </td>
@@ -14,107 +14,70 @@ @@ -14,107 +14,70 @@
14 <body> 14 <body>
15 <div class="wrap js-check-wrap"> 15 <div class="wrap js-check-wrap">
16 <ul class="nav nav-tabs"> 16 <ul class="nav nav-tabs">
17 - <li><a href="{:url('AdminTemple/index')}">寺庙列表</a></li>  
18 - <li><a href="{:url('AdminTemple/add')}">添加寺庙</a></li>  
19 - <li class="active"><a>编辑寺庙</a></li> 17 + <li><a href="{:url('AdminLight/index')}">设备列表</a></li>
  18 + <li><a href="{:url('AdminLight/add')}">添加设备</a></li>
  19 + <li class="active"><a>编辑设备</a></li>
20 </ul> 20 </ul>
21 - <form action="{:url('AdminTemple/editPost')}" method="post" class="form-horizontal js-ajax-form margin-top-20"> 21 + <form action="{:url('AdminLight/editPost')}" method="post" class="form-horizontal js-ajax-form margin-top-20">
22 <div class="row"> 22 <div class="row">
23 <div class="col-md-9"> 23 <div class="col-md-9">
24 <table class="table table-bordered"> 24 <table class="table table-bordered">
25 <tr> 25 <tr>
26 - <th width="120">添加地区<span class="form-required">*</span></th> 26 + <th>设备ID<span class="form-required">*</span></th>
27 <td> 27 <td>
28 <input value="{$list.id}" name="id" hidden> 28 <input value="{$list.id}" name="id" hidden>
29 - <input class="form-control" type="text" name="address"  
30 - id="address" required value="{$list.address}" placeholder="省/市"/> 29 + <input class="form-control" type="text" name="number"
  30 + id="number" required value="{$list.number}" placeholder="请输入设备ID"/>
31 </td> 31 </td>
32 </tr> 32 </tr>
33 <tr> 33 <tr>
34 - <th>添加寺庙名称<span class="form-required">*</span></th> 34 + <th>所属寺庙<span class="form-required">*</span></th>
35 <td> 35 <td>
36 - <input class="form-control" type="text" name="name"  
37 - id="name" required value="{$list.name}" placeholder="请输入寺庙名称"/>  
38 - </td>  
39 - </tr>  
40 - <tr>  
41 - <th>寺庙缩略图</th>  
42 - <td>  
43 - <div>  
44 - <input type="hidden" name="thumbnail" id="thumbnail" value="{$list.thumbnail|default=''}">  
45 - <a href="javascript:uploadOneImage('图片上传','#thumbnail');">  
46 - <if condition="empty($list.thumbnail)">  
47 - <img src="__TMPL__/public/assets/images/default-thumbnail.png"  
48 - id="thumbnail-preview"  
49 - width="135" style="cursor: pointer"/>  
50 - <else/>  
51 - <img src="{:cmf_get_image_preview_url($list.thumbnail)}"  
52 - id="thumbnail-preview"  
53 - width="135" style="cursor: pointer"/>  
54 - </if>  
55 - </a>  
56 - <input type="button" class="btn btn-sm btn-cancel-thumbnail" value="取消图片">  
57 - </div>  
58 - </td>  
59 - </tr>  
60 - <tr>  
61 - <th>寺庙账户银行</th>  
62 - <td>  
63 - <input class="form-control" type="text" name="bank"  
64 - id="bank" value="{$list.bank}" placeholder="请输入银行全称"/>  
65 - </td>  
66 - </tr>  
67 - <tr>  
68 - <th>寺庙账户银行</th>  
69 - <td>  
70 - <input class="form-control" type="text" name="bank_account"  
71 - id="bank_account" value="{$list.bank_account}" placeholder="请输入银行账户"/>  
72 - </td>  
73 - </tr>  
74 - <tr>  
75 - <th>寺庙账户姓名</th>  
76 - <td>  
77 - <input class="form-control" type="text" name="bank_user"  
78 - id="bank_user" value="{$list.bank_user}" placeholder="请输入持卡人姓名"/> 36 + <select name="temple_id" required id="temple_id">
  37 + <option value="">请选择所属寺庙</option>
  38 + <foreach name="temple" item="vo">
  39 + <option value="{$vo.id}" <eq name="list.temple_id" value="$vo.id">selected</eq>>{$vo.name}</option>
  40 + </foreach>
  41 + </select>
79 </td> 42 </td>
80 </tr> 43 </tr>
81 <tr> 44 <tr>
82 - <th>寺庙账户<span class="form-required">*</span></th> 45 + <th>所属区域<span class="form-required">*</span></th>
83 <td> 46 <td>
84 - <select name="user_id" required>  
85 - <option value="">请选择寺庙账户</option>  
86 - <foreach name="user" item="vo">  
87 - <option value="{$vo.id}" <eq name="list.user_id" value="$vo.id">selected</eq>>{$vo.user_login}</option> 47 + <select name="area_id" required id="area_id">
  48 + <option value="">请选择所属区域</option>
  49 + <foreach name="area" item="vo">
  50 + <option value="{$vo.id}" <eq name="list.area_id" value="$vo.id">selected</eq>>{$vo.name}</option>
88 </foreach> 51 </foreach>
89 </select> 52 </select>
90 </td> 53 </td>
91 </tr> 54 </tr>
92 <tr> 55 <tr>
93 - <th>单笔分成比例(%)</th> 56 + <th>设备位置(行)<span class="form-required">*</span></th>
94 <td> 57 <td>
95 - <input class="form-control" type="number" name="percent"  
96 - id="percent" value="{$list.percent*100}" placeholder=""/> 58 + <input class="form-control" type="number" name="row"
  59 + id="row" value="{$list.row}" placeholder="请输入设备位置(行)" required/>
97 </td> 60 </td>
98 </tr> 61 </tr>
99 <tr> 62 <tr>
100 - <th>寺庙负责人</th> 63 + <th>设备位置(列)<span class="form-required">*</span></th>
101 <td> 64 <td>
102 - <input class="form-control" type="text" name="temple_user"  
103 - id="temple_user" value="{$list.temple_user}" placeholder="请输入寺庙负责人姓名"/> 65 + <input class="form-control" type="number" name="column"
  66 + id="column" value="{$list.column}" placeholder="请输入设备位置(列)" required/>
104 </td> 67 </td>
105 </tr> 68 </tr>
106 <tr> 69 <tr>
107 - <th>负责人电话</th> 70 + <th>该位置价格(元)<span class="form-required">*</span></th>
108 <td> 71 <td>
109 - <input class="form-control" type="number" name="temple_user_mobile"  
110 - id="temple_user_mobile" value="{$list.temple_user_mobile}" placeholder="请输入负责人电话"/> 72 + <input class="form-control" type="number" name="price"
  73 + id="price" value="{$list.price}" placeholder="请输入该位置价格" required/>
111 </td> 74 </td>
112 </tr> 75 </tr>
113 </table> 76 </table>
114 <div class="form-group"> 77 <div class="form-group">
115 <div class="col-sm-offset-2 col-sm-10"> 78 <div class="col-sm-offset-2 col-sm-10">
116 <button type="submit" class="btn btn-primary js-ajax-submit">编辑</button> 79 <button type="submit" class="btn btn-primary js-ajax-submit">编辑</button>
117 - <a class="btn btn-default" href="{:url('AdminTemple/index')}">{:lang('BACK')}</a> 80 + <a class="btn btn-default" href="{:url('AdminLight/index')}">{:lang('BACK')}</a>
118 </div> 81 </div>
119 </div> 82 </div>
120 </div> 83 </div>