From b828f4a594b8a3da378a4ed2c1823073b6217970 Mon Sep 17 00:00:00 2001
From: jsasg <735273025@qq.com>
Date: Wed, 16 Jul 2025 10:31:14 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E4=BA=A7=E5=93=81=E6=90=9C=E7=B4=A2?=
=?UTF-8?q?=E6=97=A0=E6=95=B0=E6=8D=AE=E8=AF=AD=E8=A8=80=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/index/lang/en-us/mobile.php | 1 +
app/index/lang/en-us/pc.php | 5 +++++
app/index/view/mobile/product/search.html | 2 +-
app/index/view/pc/product/search.html | 2 +-
4 files changed, 8 insertions(+), 2 deletions(-)
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}
From 48f2fc1b1365dd6dc3f9f9e29fac5df6b7e87757 Mon Sep 17 00:00:00 2001
From: jsasg <735273025@qq.com>
Date: Wed, 16 Jul 2025 11:51:48 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E5=90=8E=E5=8F=B0=E7=AE=A1=E7=90=86?=
=?UTF-8?q?=20=E4=BA=A7=E5=93=81=E5=8F=82=E6=95=B0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/admin/controller/v1/Product.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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[] = [
From d3108bbee43f81e3c08b5528b72c40dc09902b28 Mon Sep 17 00:00:00 2001
From: jsasg <735273025@qq.com>
Date: Wed, 16 Jul 2025 13:38:54 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E4=BA=A7=E5=93=81=E7=9B=AE=E5=BD=95?=
=?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=BA=A7=E5=93=81=E9=BB=98=E8=AE=A4=E5=9C=A8?=
=?UTF-8?q?=E5=94=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/admin/controller/ReceiveProductSync.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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,