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 00000000..f9c295a2
Binary files /dev/null and b/CoreCms.Net.Web.Admin/wwwroot/upload/20220922/20220922215851_0484.jpg differ
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>