Skip to content

朱继来 / 后台订单管理

Go to a project
Commit a3a06ebf by 朱继来
Options

Merge branch 'zjl_adjust_20181008' into development

parents d3d4054e 67628772
Inline Side-by-side
Showing with 24 additions and 20 deletions
public/css/detail.css
...@@ -151,7 +151,6 @@ li { ...@@ -151,7 +151,6 @@ li {
border-radius: 4px; border-radius: 4px;
padding: 5px; padding: 5px;
resize: none; resize: none;
margin-bottom: 10px;
} }
.preferential_price{ /* 优惠金额 */ .preferential_price{ /* 优惠金额 */
display: none; display: none;
......
resources/views/addOffline/content.blade.php
...@@ -196,12 +196,16 @@ ...@@ -196,12 +196,16 @@
</tr> </tr>
</thead> </thead>
<tbody></tbody> <tbody></tbody>
<tfoot>
<tr>
<td colspan="9"><textarea name="remark" id="remark" class="form-control" placeholder="填写订单备注信息"></textarea></td>
</tr>
</tfoot>
</table> </table>
</div> </div>
<!-- 订单金额 --> <!-- 订单金额 -->
<div class="amount-section"> <div class="amount-section">
<textarea name="remark" id="remark" cols="30" rows="3" placeholder="填写订单备注信息"></textarea>
<p>应付金额：<span class="text-danger order_amount"></span></p> <p>应付金额：<span class="text-danger order_amount"></span></p>
</div> </div>
</div> </div>
......
resources/views/addOnline/content.blade.php
...@@ -342,6 +342,13 @@ ...@@ -342,6 +342,13 @@
</tr> </tr>
</thead> </thead>
<tbody></tbody> <tbody></tbody>
<tfoot>
<tr>
<td colspan="9">
<textarea name="remark" id="remark" class="form-control" placeholder="填写订单备注信息"></textarea>
</td>
</tr>
</tfoot>
</table> </table>
</div> </div>
</div> </div>
...@@ -381,11 +388,6 @@ ...@@ -381,11 +388,6 @@
<p class="con-title"><span>应付金额：</span></p> <p class="con-title"><span>应付金额：</span></p>
<p class="con-val text-danger order_amount"></p> <p class="con-val text-danger order_amount"></p>
</div> </div>
<div class="row">
<p class="con-title"><span>备注信息：</span></p>
<textarea name="remark" id="remark" cols="50" rows="3" placeholder="填写订单备注信息"></textarea>
</div>
</div> </div>
</div> </div>
......
resources/views/addOrder/content.blade.php
...@@ -362,6 +362,13 @@ ...@@ -362,6 +362,13 @@
</tr> </tr>
</thead> </thead>
<tbody></tbody> <tbody></tbody>
<tfoot>
<tr>
<td colspan="9">
<textarea name="remark" id="remark" class="form-control" placeholder="填写订单备注信息"></textarea>
</td>
</tr>
</tfoot>
</table> </table>
</div> </div>
</div> </div>
...@@ -396,11 +403,6 @@ ...@@ -396,11 +403,6 @@
<p class="con-title"><span>应付金额：</span></p> <p class="con-title"><span>应付金额：</span></p>
<p class="con-val text-danger order_amount"></p> <p class="con-val text-danger order_amount"></p>
</div> </div>
<div class="row">
<p class="con-title"><span>备注信息：</span></p>
<textarea name="remark" id="remark" cols="50" rows="3" placeholder="填写订单备注信息"></textarea>
</div>
</div> </div>
</div> </div>
......
resources/views/detail/content.blade.php
...@@ -457,19 +457,16 @@ ...@@ -457,19 +457,16 @@
@endforeach @endforeach
@endif @endif
</tbody> </tbody>
</table> <tfoot>
</div>
@if ($order_info['order_remark']) @if ($order_info['order_remark'])
<div class="tabs-box">
<table class="table table-bordered table-hover"">
<tr> <tr>
<td width="10%">订单备注信息：</td> <td>订单备注信息：</td>
<td>{{$order_info['order_remark']}}</td> <td colspan="8">{{$order_info['order_remark']}}</td>
</tr> </tr>
@endif
</tfoot>
</table> </table>
</div> </div>
@endif
<div class="tabs-box order-total"> <div class="tabs-box order-total">
<div> <div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment