{if isset($vo.loops_time) and $vo.loops_time > 0}
- 循
+ 循
{/if}
{if $vo.rscript eq 1}
- 复
+ 复
{else}
- 单
+ 单
{/if}
- {eq name='vo.status' value='1'}
+ {if $vo.status eq 1}
等待处理
{elseif $vo.status eq 2}
正在处理
{elseif $vo.status eq 3}
处理完成
{elseif $vo.status eq 4 and auth('redo')}
- 处理失败
-
- {/eq}
- {if auth("remove") }
-
+ 处理失败
+
+
+
{/if}
-
+ {if auth("remove") }
+
+
+
+ {/if}
+
+
+
{$vo.exec_desc|raw|default="没有获取到状态描述"}
|
diff --git a/app/data/service/TruckService.php b/app/data/service/TruckService.php
index 2499013d0..0689dfd92 100644
--- a/app/data/service/TruckService.php
+++ b/app/data/service/TruckService.php
@@ -30,8 +30,8 @@ class TruckService extends Service
$map = [['status', '=', 1], ['deleted', '=', 0], ['code', 'in', $codes]];
$template = $this->app->db->name('ShopTruckTemplate')->where($map)->order('sort desc,id desc')->find();
if (empty($template)) return [0, $truckCount, '', '邮费模板编码无效！'];
- $rule = json_decode($template['normal'], true) ?: [];
- foreach (json_decode($template['content'], true) ?: [] as $item) {
+ $rule = json_decode($template['normal'] ?: '[]', true) ?: [];
+ foreach (json_decode($template['content'] ?: '[]', true) ?: [] as $item) {
if (isset($item['city']) && is_array($item['city'])) foreach ($item['city'] as $city) {
if ($city['name'] === $provName && in_array($cityName, $city['subs'])) {
$rule = $item['rule'];
diff --git a/app/data/view/shop_goods/index.html b/app/data/view/shop_goods/index.html
index 1cc1c57db..a6c8c0420 100644
--- a/app/data/view/shop_goods/index.html
+++ b/app/data/view/shop_goods/index.html
@@ -25,7 +25,7 @@
+
{include file='shop_goods/index_search'}
{notempty name='list'}
diff --git a/app/data/view/shop_goods_mark/index.html b/app/data/view/shop_goods_mark/index.html
index ec9f31ee7..eee543d09 100644
--- a/app/data/view/shop_goods_mark/index.html
+++ b/app/data/view/shop_goods_mark/index.html
@@ -48,6 +48,7 @@
{if auth("state") and $vo.status eq 1}
禁 用
+ 禁 用
{/if}
{if auth("state") and $vo.status eq 0}
diff --git a/app/data/view/shop_order/index.html b/app/data/view/shop_order/index.html
index 9f73eacbe..9fb3953ae 100644
--- a/app/data/view/shop_order/index.html
+++ b/app/data/view/shop_order/index.html
@@ -10,7 +10,7 @@
{$v}{$total[$k]??0}
{/if}{/foreach}
-
+
{include file='shop_order/index_search'}
{notempty name='list'}
diff --git a/app/data/view/shop_order_send/index.html b/app/data/view/shop_order_send/index.html
index a1d5937b9..42688f8b4 100644
--- a/app/data/view/shop_order_send/index.html
+++ b/app/data/view/shop_order_send/index.html
@@ -10,7 +10,7 @@
{$v}{$total[$k]??0}
{/if}{/foreach}
-
+
{include file='shop_order_send/index_search'}
{notempty name='list'}
diff --git a/app/data/view/shop_truck_template/form_region.html b/app/data/view/shop_truck_template/form_region.html
index eb6ec1da6..3cf61c57c 100644
--- a/app/data/view/shop_truck_template/form_region.html
+++ b/app/data/view/shop_truck_template/form_region.html
@@ -2,29 +2,27 @@
{block name="content"}