diff --git a/app/admin/controller/ReceiveProductSync.php b/app/admin/controller/ReceiveProductSync.php index e8cf6061..4aa670fb 100644 --- a/app/admin/controller/ReceiveProductSync.php +++ b/app/admin/controller/ReceiveProductSync.php @@ -183,7 +183,7 @@ class ReceiveProductSync 'desc' => '', 'video_img' => '', 'video_url' => '', - 'is_sale' => 0, + 'is_sale' => 1, 'is_new' => 0, 'is_hot' => 0, 'is_show' => 0, diff --git a/app/admin/controller/v1/Product.php b/app/admin/controller/v1/Product.php index 74ffbafa..779f010f 100644 --- a/app/admin/controller/v1/Product.php +++ b/app/admin/controller/v1/Product.php @@ -171,7 +171,7 @@ class Product // 更新产品参数 if ($put['params'] != "") { ProductParamsModel::productId($id)->delete(); - if (preg_match_all('/(\S+):(.[^\s]+)/', $put['params'], $match_result)) { + if (preg_match_all('/(.+):(.+)/', $put['params'], $match_result)) { $params = []; for ($i = 0; $i < count($match_result[0]); $i++) { $params[] = [ diff --git a/app/index/lang/en-us/mobile.php b/app/index/lang/en-us/mobile.php index 25024bad..175712be 100644 --- a/app/index/lang/en-us/mobile.php +++ b/app/index/lang/en-us/mobile.php @@ -53,6 +53,7 @@ return [ 'product/search' => [ '搜索' => 'Search', '请搜索' => 'Please search...', + '暂无数据' => 'No data', ], // 产品详情 'product/detail' => [ diff --git a/app/index/lang/en-us/pc.php b/app/index/lang/en-us/pc.php index 3572f170..d03bb9ca 100644 --- a/app/index/lang/en-us/pc.php +++ b/app/index/lang/en-us/pc.php @@ -177,6 +177,11 @@ return [ '提交' => 'SUBMIT', ], + // 产品 - 搜索 + 'product/search' => [ + '暂无数据' => 'No data', + ], + // 产品 - 分类 'product/category' => [ '查看全部' => 'View All', diff --git a/app/index/view/mobile/product/search.html b/app/index/view/mobile/product/search.html index db020cd7..3c38619c 100644 --- a/app/index/view/mobile/product/search.html +++ b/app/index/view/mobile/product/search.html @@ -28,7 +28,7 @@
{$page|raw}
{else/} -
暂无数据
+
{:lang_i18n('暂无数据')}
{/notempty} diff --git a/app/index/view/pc/product/search.html b/app/index/view/pc/product/search.html index be4a115f..7579e03c 100644 --- a/app/index/view/pc/product/search.html +++ b/app/index/view/pc/product/search.html @@ -35,7 +35,7 @@
{$page|raw}
{else/} -
暂无数据
+
{:lang_i18n('暂无数据')}
{/notempty}