Compare commits

..

No commits in common. "48f1c79c8049a200033e6da4cd456e2cd8b54d3b" and "48d31261ba2bf67624330b21b3f9c32c4dc281dc" have entirely different histories.

2 changed files with 9 additions and 4 deletions

View File

@ -133,10 +133,10 @@ class Send extends Controller
$vo['status'] = 2; $vo['status'] = 2;
$vo['company_name'] = $company['name']; $vo['company_name'] = $company['name'];
$vo['send_datetime'] = $vo['send_datetime'] ?? date('Y-m-d H:i:s'); $vo['send_datetime'] = $vo['send_datetime'] ?? date('Y-m-d H:i:s');
if ($order['status'] === 4) { if ($order['status'] === 3) {
// 更新订单发货状态
$map = ['order_no' => $vo['order_no']]; $map = ['order_no' => $vo['order_no']];
ShopOrder::mk()->where($map)->update(['status' => 5]); // 更新订单发货状态
ShopOrder::mk()->where($map)->update(['status' => 4]);
} }
} }
} }

View File

@ -1,3 +1,4 @@
{block name="content"}
<div class="iframe-pagination notfooter"> <div class="iframe-pagination notfooter">
<fieldset> <fieldset>
<legend>条件搜索</legend> <legend>条件搜索</legend>
@ -40,7 +41,9 @@
</fieldset> </fieldset>
<table id="NewsTable" data-url="{:sysuri()}" data-target-search="#NewsTableSearch"></table> <table id="NewsTable" data-url="{:sysuri()}" data-target-search="#NewsTableSearch"></table>
</div> </div>
{/block}
{block name='script'}
<script> <script>
$(function () { $(function () {
// 初始化表格组件 // 初始化表格组件
@ -80,3 +83,5 @@
<script type="text/html" id="StatusSwitchTpl"> <script type="text/html" id="StatusSwitchTpl">
{{-d.status ? '<b class="color-green">已激活</b>' : '<b class="color-red">已禁用</b>'}} {{-d.status ? '<b class="color-green">已激活</b>' : '<b class="color-red">已禁用</b>'}}
</script> </script>
{/block}