From acea2c5445174a6e95084b4569d4484fd0d244eb Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Fri, 15 Apr 2022 15:17:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A8=A1=E6=9D=BF=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/data/view/shop/cate/form.html  | 12 ++++++------
 app/data/view/shop/cate/index.html |  6 +++---
 app/wechat/controller/api/Test.php |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/data/view/shop/cate/form.html b/app/data/view/shop/cate/form.html
index 4ee787002..0dcc84d74 100644
--- a/app/data/view/shop/cate/form.html
+++ b/app/data/view/shop/cate/form.html
@@ -15,22 +15,22 @@
         </div>
 
         <label class="layui-form-item relative block">
-            <span class="help-label"><b>产品分类名称</b>Category Name</span>
+            <span class="help-label"><b>商品分类名称</b>Category Name</span>
             <input class="layui-input" name="name" placeholder="请输入分类名称" required value='{$vo.name|default=""}'>
-            <span class="help-block"><b>必填，</b>请填写产品分类名称，建议字符不要太长，一般 4-6 个汉字</span>
+            <span class="help-block"><b>必填，</b>请填写商品分类名称，建议字符不要太长，一般 4-6 个汉字</span>
         </label>
 
         <div class="layui-form-item relative block">
-            <span class="help-label"><b>产品分类图标</b>Category Cover</span>
+            <span class="help-label"><b>商品分类图标</b>Category Cover</span>
             <label class="relative block">
-                <input class="layui-input think-bg-gray" readonly name="cover" placeholder="请上传产品分类图标" value='{$vo.cover|default=""}'>
+                <input class="layui-input think-bg-gray" readonly name="cover" placeholder="请上传商品分类图标" value='{$vo.cover|default=""}'>
                 <a class="input-right-icon layui-icon layui-icon-upload" data-field="cover" data-file data-type="png,jpg,gif"></a>
             </label>
-            <span class="help-block"><b>可选，</b>请上传产品分类图标，需要是 http 可访问的图片资源链接</span>
+            <span class="help-block"><b>可选，</b>请上传商品分类图标，需要是 http 可访问的图片资源链接</span>
         </div>
 
         <label class="layui-form-item relative block">
-            <span class="color-green font-w7">产品分类描述</span>
+            <span class="color-green font-w7">商品分类描述</span>
             <span class="color-desc margin-left-5">Category Remark</span>
             <textarea class="layui-textarea" name="remark" placeholder="请输入分类描述">{$vo.remark|default=''}</textarea>
         </label>
diff --git a/app/data/view/shop/cate/index.html b/app/data/view/shop/cate/index.html
index 28c4be633..9bac3a9c0 100644
--- a/app/data/view/shop/cate/index.html
+++ b/app/data/view/shop/cate/index.html
@@ -12,7 +12,7 @@
 
 {block name="content"}
 <div class="think-box-notify">
-    <b>注意：</b>产品分类需要在上传产品前添加，当产品分类关联有产品时不建议进行 <b class="color-blue">移动</b> 或 <b class="color-blue">删除</b> 操作!
+    <b>注意：</b>商品分类需要在上传商品前添加，当商品分类关联有商品时不建议进行 <b class="color-blue">移动</b> 或 <b class="color-blue">删除</b> 操作!
 </div>
 
 <div class="think-box-shadow">
@@ -74,14 +74,14 @@
 
     <!--{if auth('add')}-->
     {{# if(d.spt<'{$maxLevel-1}'){ }}
-    <a class="layui-btn layui-btn-sm layui-btn-primary" data-title="添加产品分类" data-modal='{:url("add")}?pid={{d.id}}'>添 加</a>
+    <a class="layui-btn layui-btn-sm layui-btn-primary" data-title="添加商品分类" data-modal='{:url("add")}?pid={{d.id}}'>添 加</a>
     {{# }else{ }}
     <a class="layui-btn layui-btn-sm layui-btn-disabled">添 加</a>
     {{# } }}
     <!--{/if}-->
 
     <!--{if auth('edit')}-->
-    <a class="layui-btn layui-btn-sm" data-title="编辑产品分类" data-modal='{:url("edit")}?id={{d.id}}'>编 辑</a>
+    <a class="layui-btn layui-btn-sm" data-title="编辑商品分类" data-modal='{:url("edit")}?id={{d.id}}'>编 辑</a>
     <!--{/if}-->
 
     <!--{if auth('remove')}-->
diff --git a/app/wechat/controller/api/Test.php b/app/wechat/controller/api/Test.php
index 3208b3edd..854e62571 100644
--- a/app/wechat/controller/api/Test.php
+++ b/app/wechat/controller/api/Test.php
@@ -149,7 +149,7 @@ class Test extends Controller
         p($notify);
         // 微信统一下单处理
         $options = [
-            'body'             => "测试商品，产品ID：{$notify['product_id']}",
+            'body'             => "测试商品，商品ID：{$notify['product_id']}",
             'total_fee'        => '1',
             'trade_type'       => 'NATIVE',
             'notify_url'       => sysuri('wechat/api.test/notify', [], false, true),