From 8b466c07e88833833e1c91f9412a832922a770b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=A7=E7=81=B0=E7=81=B0?= <jianweie@163.com>
Date: Fri, 23 Sep 2022 01:59:47 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91sku?=
 =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E5=A2=9E=E5=8A=A0=E7=BC=93=E5=AD=98=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=E3=80=82=20=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=95=86=E5=93=81=E5=88=86=E7=B1=BB=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E6=9B=B4=E6=96=B0=E9=94=99=E8=AF=AF=E5=AE=9E=E4=BD=93?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82=20=E3=80=90=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E3=80=91=E4=BF=AE=E5=A4=8D=E9=A6=96=E9=A1=B5=E5=BC=B9?=
 =?UTF-8?q?=E7=AA=97=E7=BB=84=E4=BB=B6=E3=80=90coreshop-modal-img=E3=80=91?=
 =?UTF-8?q?=E7=BC=BA=E5=B0=91=E5=85=B3=E9=97=AD=E6=8C=89=E9=92=AE=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E3=80=82=20=E3=80=90=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E3=80=91=E4=BF=AE=E5=A4=8D=E5=BE=AE=E4=BF=A1=E5=B0=8F=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=8F=E8=AE=A2=E9=98=85=E6=B6=88=E6=81=AF=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=BA=93=E8=A2=AB=E6=B8=85=E7=A9=BA=E7=9A=84=E6=83=85=E5=86=B5?=
 =?UTF-8?q?=E4=B8=8B=EF=BC=8C=E9=BB=98=E8=AE=A4=E6=A8=A1=E6=9D=BF=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BD=E4=B8=BA=E7=A9=BA=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Good/ICoreCmsGoodsRepository.cs           |   2 +-
 .../Good/ICoreCmsGoodsServices.cs             |   2 +-
 .../Good/CoreCmsGoodsRepository.cs            |   2 +-
 .../Good/CoreCmsGoodsServices.cs              |   2 +-
 .../coreshop-modal-img/coreshop-modal-img.vue |   4 +-
 .../Good/CoreCmsGoodsCategoryController.cs    |   2 +-
 .../Good/CoreCmsGoodsController.cs            |   2 +-
 CoreCms.Net.Web.Admin/Doc.xml                 |  91 +++++++++++++
 CoreCms.Net.Web.Admin/NLog.config             |   2 +-
 .../upload/20220922/20220922215851_0484.jpg   | Bin 0 -> 6326 bytes
 .../message/wechatappletsmessage/index.html   | 120 ++++++++++++++++++
 11 files changed, 221 insertions(+), 8 deletions(-)
 create mode 100644 CoreCms.Net.Web.Admin/wwwroot/upload/20220922/20220922215851_0484.jpg

diff --git a/CoreCms.Net.IRepository/Good/ICoreCmsGoodsRepository.cs b/CoreCms.Net.IRepository/Good/ICoreCmsGoodsRepository.cs
index d9761bc6..f5982ed3 100644
--- a/CoreCms.Net.IRepository/Good/ICoreCmsGoodsRepository.cs
+++ b/CoreCms.Net.IRepository/Good/ICoreCmsGoodsRepository.cs
@@ -79,7 +79,7 @@ namespace CoreCms.Net.IRepository
         /// <param name="predicate">条件表达式树</param>
         /// <param name="blUseNoLock">是否使用WITH(NOLOCK)</param>
         /// <returns></returns>
-        new Task<int> GetCountAsync(Expression<Func<CoreCmsGoods, bool>> predicate, bool blUseNoLock = false);
+        Task<int> GetCountAsync(Expression<Func<CoreCmsGoods, bool>> predicate, bool blUseNoLock = false);
 
 
         /// <summary>
diff --git a/CoreCms.Net.IServices/Good/ICoreCmsGoodsServices.cs b/CoreCms.Net.IServices/Good/ICoreCmsGoodsServices.cs
index 7af66433..8fb5452b 100644
--- a/CoreCms.Net.IServices/Good/ICoreCmsGoodsServices.cs
+++ b/CoreCms.Net.IServices/Good/ICoreCmsGoodsServices.cs
@@ -145,7 +145,7 @@ namespace CoreCms.Net.IServices
         /// <param name="predicate">条件表达式树</param>
         /// <param name="blUseNoLock">是否使用WITH(NOLOCK)</param>
         /// <returns></returns>
-        new Task<int> GetCountAsync(Expression<Func<CoreCmsGoods, bool>> predicate, bool blUseNoLock = false);
+        Task<int> GetCountAsync(Expression<Func<CoreCmsGoods, bool>> predicate, bool blUseNoLock = false);
 
 
         /// <summary>
diff --git a/CoreCms.Net.Repository/Good/CoreCmsGoodsRepository.cs b/CoreCms.Net.Repository/Good/CoreCmsGoodsRepository.cs
index 6db4a66c..01e5394b 100644
--- a/CoreCms.Net.Repository/Good/CoreCmsGoodsRepository.cs
+++ b/CoreCms.Net.Repository/Good/CoreCmsGoodsRepository.cs
@@ -1019,7 +1019,7 @@ namespace CoreCms.Net.Repository
         /// <param name="predicate">条件表达式树</param>
         /// <param name="blUseNoLock">是否使用WITH(NOLOCK)</param>
         /// <returns></returns>
-        public new async Task<int> GetCountAsync(Expression<Func<CoreCmsGoods, bool>> predicate, bool blUseNoLock = false)
+        public async Task<int> GetCountAsync(Expression<Func<CoreCmsGoods, bool>> predicate, bool blUseNoLock = false)
         {
             var count = 0;
             if (blUseNoLock)
diff --git a/CoreCms.Net.Services/Good/CoreCmsGoodsServices.cs b/CoreCms.Net.Services/Good/CoreCmsGoodsServices.cs
index 68bef88b..51c655dd 100644
--- a/CoreCms.Net.Services/Good/CoreCmsGoodsServices.cs
+++ b/CoreCms.Net.Services/Good/CoreCmsGoodsServices.cs
@@ -922,7 +922,7 @@ namespace CoreCms.Net.Services
         /// <param name="predicate">条件表达式树</param>
         /// <param name="blUseNoLock">是否使用WITH(NOLOCK)</param>
         /// <returns></returns>
-        public new async Task<int> GetCountAsync(Expression<Func<CoreCmsGoods, bool>> predicate, bool blUseNoLock = false)
+        public async Task<int> GetCountAsync(Expression<Func<CoreCmsGoods, bool>> predicate, bool blUseNoLock = false)
         {
             return await _dal.GetCountAsync(predicate, blUseNoLock);
         }
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-modal-img/coreshop-modal-img.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-modal-img/coreshop-modal-img.vue
index cbb13ad0..da2cf2d7 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-modal-img/coreshop-modal-img.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-modal-img/coreshop-modal-img.vue
@@ -1,8 +1,10 @@
 <template>
     <view class="coreshop-modal-box" :class="show?'show':''">
         <view class="dialog">
+            <view class="coreshop-flex coreshop-align-end coreshop-self-end coreshop-justify-end">
+                <u-icon name="close-circle" color="#ffffff" size="28" @click="closeEvent"></u-icon>
+            </view>
             <image class="img" :src="src" lazy-load mode="widthFix" @tap="imgEvent"></image>
-            <text class="cuIcon-roundclose close" @tap="closeEvent"></text>
         </view>
     </view>
 </template>
diff --git a/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsGoodsCategoryController.cs b/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsGoodsCategoryController.cs
index 0e4941b7..67a80507 100644
--- a/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsGoodsCategoryController.cs
+++ b/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsGoodsCategoryController.cs
@@ -216,7 +216,7 @@ namespace CoreCms.Net.Web.Admin.Controllers
             oldModel.createTime = entity.createTime;
 
             //事物处理过程结束
-            var result = await _coreCmsGoodsCategoryServices.UpdateAsync(entity);
+            var result = await _coreCmsGoodsCategoryServices.UpdateAsync(oldModel);
             var bl = result.code == 0;
             jm.code = bl ? 0 : 1;
             jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure;
diff --git a/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsGoodsController.cs b/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsGoodsController.cs
index ea7cecd7..c2ed4c35 100644
--- a/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsGoodsController.cs
+++ b/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsGoodsController.cs
@@ -583,7 +583,7 @@ namespace CoreCms.Net.Web.Admin.Controllers
             //获取参数列表
             var paramsList = await _goodsParamsServices.QueryListByClauseAsync(p => p.id > 0, p => p.id, OrderByType.Desc, true, true);
             //获取SKU列表
-            var skuList = await _goodsTypeSpecServices.QueryListByClauseAsync(p => p.id > 0, p => p.id, OrderByType.Desc, true);
+            var skuList = await _goodsTypeSpecServices.QueryListByClauseAsync(p => p.id > 0, p => p.id, OrderByType.Desc, true, true);
 
             //获取品牌
             var brands = await _brandServices.QueryListByClauseAsync(p => p.id > 0 && p.isShow == true, p => p.id, OrderByType.Desc, true, true);
diff --git a/CoreCms.Net.Web.Admin/Doc.xml b/CoreCms.Net.Web.Admin/Doc.xml
index 21fc5388..505ceb8f 100644
--- a/CoreCms.Net.Web.Admin/Doc.xml
+++ b/CoreCms.Net.Web.Admin/Doc.xml
@@ -393,6 +393,97 @@
             <param name="model"></param>
             <returns></returns>
         </member>
+        <member name="T:CoreCms.Net.Web.Admin.Controllers.CoreCmsPrinterController">
+             <summary>
+             打印机列表
+            </summary>
+        </member>
+        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsPrinterController.#ctor(Microsoft.AspNetCore.Hosting.IWebHostEnvironment,CoreCms.Net.IServices.ICoreCmsPrinterServices,CoreCms.Net.IServices.ICoreCmsStoreServices)">
+             <summary>
+             构造函数
+            </summary>
+        </member>
+        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsPrinterController.GetPageList">
+            <summary>
+            获取列表
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsPrinterController.GetIndex">
+            <summary>
+            首页数据
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsPrinterController.GetCreate">
+            <summary>
+            创建数据
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsPrinterController.DoCreate(CoreCms.Net.Model.Entities.CoreCmsPrinter)">
+            <summary>
+            创建提交
+            </summary>
+            <param name="entity"></param>
+            <returns></returns>
+        </member>
+        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsPrinterController.GetEdit(CoreCms.Net.Model.FromBody.FMIntId)">
+            <summary>
+            编辑数据
+            </summary>
+            <param name="entity"></param>
+            <returns></returns>
+        </member>
+        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsPrinterController.DoEdit(CoreCms.Net.Model.Entities.CoreCmsPrinter)">
+            <summary>
+            编辑提交
+            </summary>
+            <param name="entity"></param>
+            <returns></returns>
+        </member>
+        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsPrinterController.DoDelete(CoreCms.Net.Model.FromBody.FMIntId)">
+            <summary>
+            单选删除
+            </summary>
+            <param name="entity"></param>
+            <returns></returns>
+        </member>
+        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsPrinterController.DoRefreshToken(CoreCms.Net.Model.FromBody.FMIntId)">
+            <summary>
+            刷新Token
+            </summary>
+            <param name="entity"></param>
+            <returns></returns>
+        </member>
+        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsPrinterController.DoPrintTest(CoreCms.Net.Model.FromBody.FMIntId)">
+            <summary>
+            打印测试页
+            </summary>
+            <param name="entity"></param>
+            <returns></returns>
+        </member>
+        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsPrinterController.GetDetails(CoreCms.Net.Model.FromBody.FMIntId)">
+            <summary>
+            预览数据
+            </summary>
+            <param name="entity"></param>
+            <returns></returns>
+        </member>
+        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsPrinterController.DoSetIsDefault(CoreCms.Net.Model.FromBody.FMUpdateBoolDataByIntId)">
+            <summary>
+            设置是否默认
+            </summary>
+            <param name="entity"></param>
+            <returns></returns>
+        </member>
+        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsPrinterController.DoSetIsOpen(CoreCms.Net.Model.FromBody.FMUpdateBoolDataByIntId)">
+            <summary>
+            设置是否开启
+            </summary>
+            <param name="entity"></param>
+            <returns></returns>
+        </member>
         <member name="T:CoreCms.Net.Web.Admin.Controllers.CoreCmsArticleController">
             <summary>
                 文章表
diff --git a/CoreCms.Net.Web.Admin/NLog.config b/CoreCms.Net.Web.Admin/NLog.config
index 1a2906c7..42eb752b 100644
--- a/CoreCms.Net.Web.Admin/NLog.config
+++ b/CoreCms.Net.Web.Admin/NLog.config
@@ -14,7 +14,7 @@
     dbProvider="Microsoft.Data.SqlClient.SqlConnection, Microsoft.Data.SqlClient"
     connectionString="Server=127.0.0.1;Database=BaseMIS;User ID=sa;Password=123456"
     -->
-    <target name="log_database" xsi:type="Database" dbProvider="Microsoft.Data.SqlClient.SqlConnection, Microsoft.Data.SqlClient" connectionString="Server=127.0.0.1;uid=CoreShop;pwd=CoreShop;Database=CoreShop;MultipleActiveResultSets=true;pooling=true;min pool size=5;max pool size=32767;connect timeout=20;Encrypt=True;TrustServerCertificate=True;">
+    <target name="log_database" xsi:type="Database" dbProvider="Microsoft.Data.SqlClient.SqlConnection, Microsoft.Data.SqlClient" connectionString="Server=127.0.0.1;uid=CoreShopProfessional;pwd=CoreShopProfessional;Database=CoreShopProfessional;MultipleActiveResultSets=true;pooling=true;min pool size=5;max pool size=32767;connect timeout=20;Encrypt=True;TrustServerCertificate=True;">
       <commandText>
         INSERT INTO SysNLogRecords
         (LogDate,LogLevel,LogType,LogTitle,Logger,Message,MachineName,MachineIp,NetRequestMethod
diff --git a/CoreCms.Net.Web.Admin/wwwroot/upload/20220922/20220922215851_0484.jpg b/CoreCms.Net.Web.Admin/wwwroot/upload/20220922/20220922215851_0484.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..f9c295a22944a3a6d1509acd0e2899176b6cd203
GIT binary patch
literal 6326
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

literal 0
HcmV?d00001

diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/shop/message/wechatappletsmessage/index.html b/CoreCms.Net.Web.Admin/wwwroot/views/shop/message/wechatappletsmessage/index.html
index b7aea740..d34bfbdb 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/shop/message/wechatappletsmessage/index.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/shop/message/wechatappletsmessage/index.html
@@ -47,37 +47,61 @@
                                                     模板ID：
                                                 </label>
                                                 <div class="layui-input-block">
+                                                    {{#  if(d.data.order){ }}
                                                     <input type="text" name="setting[0][templateId]" required="" lay-verify="required" value="{{d.data.order.templateId || ''}}" placeholder="请输入模板ID" autocomplete="off" class="layui-input">
+                                                    {{#  } else { }}
+                                                    <input type="text" name="setting[0][templateId]" required="" lay-verify="required" value="" placeholder="请输入模板ID" autocomplete="off" class="layui-input">
+                                                    {{#  } }}
                                                 </div>
                                             </div>
                                             <div class="layui-form-item">
                                                 <label class="layui-form-label layui-form-required">订单编号：</label>
                                                 <div class="layui-input-block">
+                                                    {{#  if(d.data.order){ }}
                                                     <input type="text" name="setting[0][data01]" required="" lay-verify="required" value="{{d.data.order.data01 || ''}}" placeholder="请输入订单编号" autocomplete="off" class="layui-input">
+                                                    {{#  } else { }}
+                                                    <input type="text" name="setting[0][data01]" required="" lay-verify="required" value="" placeholder="请输入订单编号" autocomplete="off" class="layui-input">
+                                                    {{#  } }}
                                                 </div>
                                             </div>
                                             <div class="layui-form-item">
                                                 <label class="layui-form-label layui-form-required">订单金额：</label>
                                                 <div class="layui-input-block">
+                                                    {{#  if(d.data.order){ }}
                                                     <input type="text" name="setting[0][data02]" required="" lay-verify="required" value="{{d.data.order.data02 || ''}}" placeholder="请输入订单金额" autocomplete="off" class="layui-input">
+                                                    {{#  } else { }}
+                                                    <input type="text" name="setting[0][data02]" required="" lay-verify="required" value="" placeholder="请输入订单金额" autocomplete="off" class="layui-input">
+                                                    {{#  } }}
                                                 </div>
                                             </div>
                                             <div class="layui-form-item">
                                                 <label class="layui-form-label">收货人名：</label>
                                                 <div class="layui-input-block">
+                                                    {{#  if(d.data.order){ }}
                                                     <input type="text" name="setting[0][data03]" required="" value="{{d.data.order.data03 || ''}}" placeholder="请输入收货人名" autocomplete="off" class="layui-input">
+                                                    {{#  } else { }}
+                                                    <input type="text" name="setting[0][data03]" required="" value="" placeholder="请输入收货人名" autocomplete="off" class="layui-input">
+                                                    {{#  } }}
                                                 </div>
                                             </div>
                                             <div class="layui-form-item">
                                                 <label class="layui-form-label">收货电话：</label>
                                                 <div class="layui-input-block">
+                                                    {{#  if(d.data.order){ }}
                                                     <input type="text" name="setting[0][data04]" required="" value="{{d.data.order.data04 || ''}}" placeholder="请输入收货电话" autocomplete="off" class="layui-input">
+                                                    {{#  } else { }}
+                                                    <input type="text" name="setting[0][data04]" required="" value="" placeholder="请输入收货电话" autocomplete="off" class="layui-input">
+                                                    {{#  } }}
                                                 </div>
                                             </div>
                                             <div class="layui-form-item">
                                                 <label class="layui-form-label">收货地址：</label>
                                                 <div class="layui-input-block">
+                                                    {{#  if(d.data.order){ }}
                                                     <input type="text" name="setting[0][data05]" required="" value="{{d.data.order.data05 || ''}}" placeholder="请输入收货地址" autocomplete="off" class="layui-input">
+                                                    {{#  } else { }}
+                                                    <input type="text" name="setting[0][data05]" required="" value="" placeholder="请输入收货地址" autocomplete="off" class="layui-input">
+                                                    {{#  } }}
                                                 </div>
                                             </div>
                                         </div>
@@ -85,31 +109,51 @@
                                             <div class="layui-form-item">
                                                 <label class="layui-form-label layui-form-required">模板ID：</label>
                                                 <div class="layui-input-block">
+                                                    {{#  if(d.data.cancel){ }}
                                                     <input type="text" name="setting[1][templateId]" required="" lay-verify="required" value="{{d.data.cancel.templateId || ''}}" placeholder="请输入模板ID" autocomplete="off" class="layui-input">
+                                                    {{#  } else { }}
+                                                    <input type="text" name="setting[1][templateId]" required="" lay-verify="required" value="" placeholder="请输入模板ID" autocomplete="off" class="layui-input">
+                                                    {{#  } }}
                                                 </div>
                                             </div>
                                             <div class="layui-form-item">
                                                 <label class="layui-form-label layui-form-required">订单编号：</label>
                                                 <div class="layui-input-block">
+                                                    {{#  if(d.data.cancel){ }}
                                                     <input type="text" name="setting[1][data01]" required="" lay-verify="required" value="{{d.data.cancel.data01 || ''}}" placeholder="请输入订单编号" autocomplete="off" class="layui-input">
+                                                    {{#  } else { }}
+                                                    <input type="text" name="setting[1][data01]" required="" lay-verify="required" value="" placeholder="请输入订单编号" autocomplete="off" class="layui-input">
+                                                    {{#  } }}
                                                 </div>
                                             </div>
                                             <div class="layui-form-item">
                                                 <label class="layui-form-label layui-form-required">订单金额：</label>
                                                 <div class="layui-input-block">
+                                                    {{#  if(d.data.cancel){ }}
                                                     <input type="text" name="setting[1][data02]" required="" lay-verify="required" value="{{d.data.cancel.data02 || ''}}" placeholder="请输入订单金额" autocomplete="off" class="layui-input">
+                                                    {{#  } else { }}
+                                                    <input type="text" name="setting[1][data02]" required="" lay-verify="required" value="" placeholder="请输入订单金额" autocomplete="off" class="layui-input">
+                                                    {{#  } }}
                                                 </div>
                                             </div>
                                             <div class="layui-form-item">
                                                 <label class="layui-form-label">下单时间：</label>
                                                 <div class="layui-input-block">
+                                                    {{#  if(d.data.cancel){ }}
                                                     <input type="text" name="setting[1][data03]" required="" value="{{d.data.cancel.data03 || ''}}" placeholder="请输入下单时间" autocomplete="off" class="layui-input">
+                                                    {{#  } else { }}
+                                                    <input type="text" name="setting[1][data03]" required="" value="" placeholder="请输入下单时间" autocomplete="off" class="layui-input">
+                                                    {{#  } }}
                                                 </div>
                                             </div>
                                             <div class="layui-form-item">
                                                 <label class="layui-form-label">温馨提示：</label>
                                                 <div class="layui-input-block">
+                                                    {{#  if(d.data.cancel){ }}
                                                     <input type="text" name="setting[1][data04]" required="" value="{{d.data.cancel.data04 || ''}}" placeholder="请输入温馨提示" autocomplete="off" class="layui-input">
+                                                    {{#  } else { }}
+                                                    <input type="text" name="setting[1][data04]" required="" value="" placeholder="请输入温馨提示" autocomplete="off" class="layui-input">
+                                                    {{#  } }}
                                                 </div>
                                             </div>
                                         </div>
@@ -117,25 +161,41 @@
                                             <div class="layui-form-item">
                                                 <label class="layui-form-label layui-form-required">模板ID：</label>
                                                 <div class="layui-input-block">
+                                                    {{#  if(d.data.pay){ }}
                                                     <input type="text" name="setting[2][templateId]" required="" lay-verify="required" value="{{d.data.pay.templateId || ''}}" placeholder="请输入模板ID" autocomplete="off" class="layui-input">
+                                                    {{#  } else { }}
+                                                    <input type="text" name="setting[2][templateId]" required="" lay-verify="required" value="" placeholder="请输入模板ID" autocomplete="off" class="layui-input">
+                                                    {{#  } }}
                                                 </div>
                                             </div>
                                             <div class="layui-form-item">
                                                 <label class="layui-form-label layui-form-required">订单编号：</label>
                                                 <div class="layui-input-block">
+                                                    {{#  if(d.data.pay){ }}
                                                     <input type="text" name="setting[2][data01]" required="" lay-verify="required" value="{{d.data.pay.data01 || ''}}" placeholder="请输入订单编号" autocomplete="off" class="layui-input">
+                                                    {{#  } else { }}
+                                                    <input type="text" name="setting[2][data01]" required="" lay-verify="required" value="" placeholder="请输入订单编号" autocomplete="off" class="layui-input">
+                                                    {{#  } }}
                                                 </div>
                                             </div>
                                             <div class="layui-form-item">
                                                 <label class="layui-form-label">支付金额：</label>
                                                 <div class="layui-input-block">
+                                                    {{#  if(d.data.pay){ }}
                                                     <input type="text" name="setting[2][data02]" value="{{d.data.pay.data02 || ''}}" placeholder="请输入支付金额" autocomplete="off" class="layui-input">
+                                                    {{#  } else { }}
+                                                    <input type="text" name="setting[2][data02]" value="" placeholder="请输入支付金额" autocomplete="off" class="layui-input">
+                                                    {{#  } }}
                                                 </div>
                                             </div>
                                             <div class="layui-form-item">
                                                 <label class="layui-form-label">支付时间：</label>
                                                 <div class="layui-input-block">
+                                                    {{#  if(d.data.pay){ }}
                                                     <input type="text" name="setting[2][data03]" value="{{d.data.pay.data03 || ''}}" placeholder="请输入支付时间" autocomplete="off" class="layui-input">
+                                                    {{#  } else { }}
+                                                    <input type="text" name="setting[2][data03]" value="" placeholder="请输入支付时间" autocomplete="off" class="layui-input">
+                                                    {{#  } }}
                                                 </div>
                                             </div>
                                         </div>
@@ -143,25 +203,41 @@
                                             <div class="layui-form-item">
                                                 <label class="layui-form-label layui-form-required">模板ID：</label>
                                                 <div class="layui-input-block">
+                                                    {{#  if(d.data.ship){ }}
                                                     <input type="text" name="setting[3][templateId]" required="" lay-verify="required" value="{{d.data.ship.templateId || ''}}" placeholder="请输入模板ID" autocomplete="off" class="layui-input">
+                                                    {{#  } else { }}
+                                                    <input type="text" name="setting[3][templateId]" required="" lay-verify="required" value="" placeholder="请输入模板ID" autocomplete="off" class="layui-input">
+                                                    {{#  } }}
                                                 </div>
                                             </div>
                                             <div class="layui-form-item">
                                                 <label class="layui-form-label layui-form-required">订单编号：</label>
                                                 <div class="layui-input-block">
+                                                    {{#  if(d.data.ship){ }}
                                                     <input type="text" name="setting[3][data01]" required="" lay-verify="required" value="{{d.data.ship.data01 || ''}}" placeholder="请输入订单编号" autocomplete="off" class="layui-input">
+                                                    {{#  } else { }}
+                                                    <input type="text" name="setting[3][data01]" required="" lay-verify="required" value="" placeholder="请输入订单编号" autocomplete="off" class="layui-input">
+                                                    {{#  } }}
                                                 </div>
                                             </div>
                                             <div class="layui-form-item">
                                                 <label class="layui-form-label">快递公司：</label>
                                                 <div class="layui-input-block">
+                                                    {{#  if(d.data.ship){ }}
                                                     <input type="text" name="setting[3][data02]" required="" value="{{d.data.ship.data02 || ''}}" placeholder="请输入快递公司，例如：{{!character_string2.DATA!}}" autocomplete="off" class="layui-input">
+                                                    {{#  } else { }}
+                                                    <input type="text" name="setting[3][data02]" required="" value="" placeholder="请输入快递公司，例如：{{!character_string2.DATA!}}" autocomplete="off" class="layui-input">
+                                                    {{#  } }}
                                                 </div>
                                             </div>
                                             <div class="layui-form-item">
                                                 <label class="layui-form-label">快递编号：</label>
                                                 <div class="layui-input-block">
+                                                    {{#  if(d.data.ship){ }}
                                                     <input type="text" name="setting[3][data03]" required="" value="{{d.data.ship.data03 || ''}}" placeholder="请输入快递编号，例如：{{!character_string3.DATA!}}" autocomplete="off" class="layui-input">
+                                                    {{#  } else { }}
+                                                    <input type="text" name="setting[3][data03]" required="" value="" placeholder="请输入快递编号，例如：{{!character_string3.DATA!}}" autocomplete="off" class="layui-input">
+                                                    {{#  } }}
                                                 </div>
                                             </div>
                                         </div>
@@ -169,31 +245,51 @@
                                             <div class="layui-form-item">
                                                 <label class="layui-form-label layui-form-required">模板ID：</label>
                                                 <div class="layui-input-block">
+                                                    {{#  if(d.data.aftersale){ }}
                                                     <input type="text" name="setting[4][templateId]" required="" lay-verify="required" value="{{d.data.aftersale.templateId || ''}}" placeholder="请输入模板ID" autocomplete="off" class="layui-input">
+                                                    {{#  } else { }}
+                                                    <input type="text" name="setting[4][templateId]" required="" lay-verify="required" value="" placeholder="请输入模板ID" autocomplete="off" class="layui-input">
+                                                    {{#  } }}
                                                 </div>
                                             </div>
                                             <div class="layui-form-item">
                                                 <label class="layui-form-label layui-form-required">订单编号：</label>
                                                 <div class="layui-input-block">
+                                                    {{#  if(d.data.aftersale){ }}
                                                     <input type="text" name="setting[4][data01]" required="" lay-verify="required" value="{{d.data.aftersale.data01 || ''}}" placeholder="请输入订单编号" autocomplete="off" class="layui-input">
+                                                    {{#  } else { }}
+                                                    <input type="text" name="setting[4][data01]" required="" lay-verify="required" value="" placeholder="请输入订单编号" autocomplete="off" class="layui-input">
+                                                    {{#  } }}
                                                 </div>
                                             </div>
                                             <div class="layui-form-item">
                                                 <label class="layui-form-label">订单金额：</label>
                                                 <div class="layui-input-block">
+                                                    {{#  if(d.data.aftersale){ }}
                                                     <input type="text" name="setting[4][data02]" required="" value="{{d.data.aftersale.data02 || ''}}" placeholder="请输入订单金额" autocomplete="off" class="layui-input">
+                                                    {{#  } else { }}
+                                                    <input type="text" name="setting[4][data02]" required="" value="" placeholder="请输入订单金额" autocomplete="off" class="layui-input">
+                                                    {{#  } }}
                                                 </div>
                                             </div>
                                             <div class="layui-form-item">
                                                 <label class="layui-form-label">售后单号：</label>
                                                 <div class="layui-input-block">
+                                                    {{#  if(d.data.aftersale){ }}
                                                     <input type="text" name="setting[4][data03]" required="" value="{{d.data.aftersale.data03 || ''}}" placeholder="请输入售后单号" autocomplete="off" class="layui-input">
+                                                    {{#  } else { }}
+                                                    <input type="text" name="setting[4][data03]" required="" value="" placeholder="请输入售后单号" autocomplete="off" class="layui-input">
+                                                    {{#  } }}
                                                 </div>
                                             </div>
                                             <div class="layui-form-item">
                                                 <label class="layui-form-label">售后状态：</label>
                                                 <div class="layui-input-block">
+                                                    {{#  if(d.data.aftersale){ }}
                                                     <input type="text" name="setting[4][data04]" required="" value="{{d.data.aftersale.data04 || ''}}" placeholder="请输入售后状态" autocomplete="off" class="layui-input">
+                                                    {{#  } else { }}
+                                                    <input type="text" name="setting[4][data04]" required="" value="" placeholder="请输入售后状态" autocomplete="off" class="layui-input">
+                                                    {{#  } }}
                                                 </div>
                                             </div>
                                         </div>
@@ -201,37 +297,61 @@
                                             <div class="layui-form-item">
                                                 <label class="layui-form-label layui-form-required">模板ID：</label>
                                                 <div class="layui-input-block">
+                                                    {{#  if(d.data.refund){ }}
                                                     <input type="text" name="setting[5][templateId]" required="" lay-verify="required" value="{{d.data.refund.templateId || ''}}" placeholder="请输入模板ID" autocomplete="off" class="layui-input">
+                                                    {{#  } else { }}
+                                                    <input type="text" name="setting[5][templateId]" required="" lay-verify="required" value="" placeholder="请输入模板ID" autocomplete="off" class="layui-input">
+                                                    {{#  } }}
                                                 </div>
                                             </div>
                                             <div class="layui-form-item">
                                                 <label class="layui-form-label layui-form-required">订单编号：</label>
                                                 <div class="layui-input-block">
+                                                    {{#  if(d.data.refund){ }}
                                                     <input type="text" name="setting[5][data01]" required="" lay-verify="required" value="{{d.data.refund.data01 || ''}}" placeholder="请输入订单编号" autocomplete="off" class="layui-input">
+                                                    {{#  } else { }}
+                                                    <input type="text" name="setting[5][data01]" required="" lay-verify="required" value="" placeholder="请输入订单编号" autocomplete="off" class="layui-input">
+                                                    {{#  } }}
                                                 </div>
                                             </div>
                                             <div class="layui-form-item">
                                                 <label class="layui-form-label">售后单号：</label>
                                                 <div class="layui-input-block">
+                                                    {{#  if(d.data.refund){ }}
                                                     <input type="text" name="setting[5][data02]" required="" value="{{d.data.refund.data02 || ''}}" placeholder="请输入售后单号" autocomplete="off" class="layui-input">
+                                                    {{#  } else { }}
+                                                    <input type="text" name="setting[5][data02]" required="" value="" placeholder="请输入售后单号" autocomplete="off" class="layui-input">
+                                                    {{#  } }}
                                                 </div>
                                             </div>
                                             <div class="layui-form-item">
                                                 <label class="layui-form-label">退款金额：</label>
                                                 <div class="layui-input-block">
+                                                    {{#  if(d.data.refund){ }}
                                                     <input type="text" name="setting[5][data03]" required="" value="{{d.data.refund.data03 || ''}}" placeholder="请输入退款金额" autocomplete="off" class="layui-input">
+                                                    {{#  } else { }}
+                                                    <input type="text" name="setting[5][data03]" required="" value="" placeholder="请输入退款金额" autocomplete="off" class="layui-input">
+                                                    {{#  } }}
                                                 </div>
                                             </div>
                                             <div class="layui-form-item">
                                                 <label class="layui-form-label">退款方式：</label>
                                                 <div class="layui-input-block">
+                                                    {{#  if(d.data.refund){ }}
                                                     <input type="text" name="setting[5][data04]" required="" value="{{d.data.refund.data04 || ''}}" placeholder="请输入退款方式" autocomplete="off" class="layui-input">
+                                                    {{#  } else { }}
+                                                    <input type="text" name="setting[5][data04]" required="" value="" placeholder="请输入退款方式" autocomplete="off" class="layui-input">
+                                                    {{#  } }}
                                                 </div>
                                             </div>
                                             <div class="layui-form-item">
                                                 <label class="layui-form-label">退款时间：</label>
                                                 <div class="layui-input-block">
+                                                    {{#  if(d.data.refund){ }}
                                                     <input type="text" name="setting[5][data05]" required="" value="{{d.data.refund.data05 || ''}}" placeholder="请输入退款时间" autocomplete="off" class="layui-input">
+                                                    {{#  } else { }}
+                                                    <input type="text" name="setting[5][data05]" required="" value="" placeholder="请输入退款时间" autocomplete="off" class="layui-input">
+                                                    {{#  } }}
                                                 </div>
                                             </div>
                                         </div>