From e730282fde264b84a820625e2d6af71efb096021 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= <zoujingli@qq.com>
Date: Sun, 9 Jan 2022 16:24:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=94=AF=E4=BB=98=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/data/view/base/payment/form.html         | 17 +++++++----------
 app/data/view/base/payment/form_alipay.html  |  6 +++---
 app/data/view/base/payment/form_joinpay.html |  6 +++---
 app/data/view/base/payment/form_voucher.html |  2 +-
 app/data/view/base/payment/form_wechat.html  |  6 +++---
 5 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/app/data/view/base/payment/form.html b/app/data/view/base/payment/form.html
index 6ee019967..b21b096e0 100644
--- a/app/data/view/base/payment/form.html
+++ b/app/data/view/base/payment/form.html
@@ -5,7 +5,7 @@
     <div class="layui-card-body padding-40">
 
         <div class="layui-form-item label-required-prev">
-            <span class="help-block"><b>支付方式图标</b>Payment Image</span>
+            <span class="help-label"><b>支付方式图标</b>Payment Image</span>
             <label class="relative block label-required-null">
                 <input class="layui-input" name="cover" placeholder="请上传支付方式图标" required value='{$vo.cover|default=""}'>
                 <a class="layui-icon layui-icon-upload input-right-icon" data-field="cover" data-file data-type="png,jpg,gif"></a>
@@ -14,13 +14,13 @@
         </div>
 
         <label class="layui-form-item relative block">
-            <span class="help-block"><b>支付方式名称</b>Payment Name</span>
+            <span class="help-label"><b>支付方式名称</b>Payment Name</span>
             <input class="layui-input" maxlength="50" name="name" placeholder="请输入支付名称" required value="{$vo.name|default=''}"/>
             <span class="help-block"><b>必填，</b>请填写支付方式名称，支付名称尽量不要重复，字符不要太长一般4-6个汉字</span>
         </label>
 
         <div class="layui-form-item">
-            <span class="help-block"><b>支付通道方式</b>Payment Channel</span>
+            <span class="help-label"><b>支付通道方式</b>Payment Channel</span>
             <label class="block full-width">
                 {empty name='vo.type'}
                 <select name="type" class="layui-select" lay-filter="payment-type" lay-search>
@@ -49,13 +49,10 @@
         <div class="layui-hide" data-payment-type="joinpay">{include file='base/payment/form_joinpay'}</div>
         <div class="layui-hide" data-payment-type="voucher">{include file='base/payment/form_voucher'}</div>
 
-        <div class="layui-form-item relative layui-hide">
-            <span class="color-green font-w7">支付描述</span>
-            <span class="color-desc margin-left-5">Payment Remark</span>
-            <label class="relative block">
-                <textarea class="layui-textarea" name="remark" placeholder="请输入支付描述">{$vo.remark|default=''}</textarea>
-            </label>
-        </div>
+        <label class="layui-form-item relative layui-hide">
+            <span class="help-label"><b>支付描述</b>Payment Remark</span>
+            <textarea class="layui-textarea" name="remark" placeholder="请输入支付描述">{$vo.remark|default=''}</textarea>
+        </label>
 
         <div class="hr-line-dashed"></div>
         {notempty name='vo.id'}<input name='id' type='hidden' value='{$vo.id}'>{/notempty}
diff --git a/app/data/view/base/payment/form_alipay.html b/app/data/view/base/payment/form_alipay.html
index e2c7995dc..5b0516650 100644
--- a/app/data/view/base/payment/form_alipay.html
+++ b/app/data/view/base/payment/form_alipay.html
@@ -1,17 +1,17 @@
 <label class="layui-form-item block relative">
-    <span class="help-block"><b>支付宝商户编号</b>Alipay Payment Number</span>
+    <span class="help-label"><b>支付宝商户编号</b>Alipay Payment Number</span>
     <input class="layui-input" name="alipay_appid" placeholder="请输入支付宝商户编号（必填）" required value="{$vo.content.alipay_appid|default=''}">
     <span class="help-block">支付宝商户编号，开通企业支付宝的唯一商户编号</span>
 </label>
 
 <label class="layui-form-item block relative">
-    <span class="help-block"><b>支付宝私钥文件内容</b>（ 需要填写文件的全部内容 ）</span>
+    <span class="help-label"><b>支付宝私钥文件内容</b>（ 需要填写文件的全部内容 ）</span>
     <textarea class="layui-textarea" name="alipay_private_key" placeholder="请输入支付宝私钥文件内容（必填）" required>{$vo.content.alipay_private_key|default=''}</textarea>
     <span class="help-block">从商户平台上下载支付证书，解压并取得其中的支付宝私钥文件用记事本打开并复制文件内容填至此处</span>
 </label>
 
 <label class="layui-form-item block relative">
-    <span class="help-block"><b>应用公钥证书文件内容</b>（ 需要填写文件的全部内容 ）</span>
+    <span class="help-label"><b>应用公钥证书文件内容</b>（ 需要填写文件的全部内容 ）</span>
     <textarea class="layui-textarea" name="alipay_public_key" placeholder="请输入应用公钥证书文件内容（必填）" required>{$vo.content.alipay_public_key|default=''}</textarea>
     <span class="help-block">从商户平台上下载支付证书，解压并取得其中的应用公钥证书文件用记事本打开并复制文件内容填至此处</span>
 </label>
\ No newline at end of file
diff --git a/app/data/view/base/payment/form_joinpay.html b/app/data/view/base/payment/form_joinpay.html
index 02237da64..7671e55d5 100644
--- a/app/data/view/base/payment/form_joinpay.html
+++ b/app/data/view/base/payment/form_joinpay.html
@@ -5,19 +5,19 @@
 </label>
 
 <label class="layui-form-item block relative">
-    <span class="help-block"><b>汇聚支付报备商户号</b></span>
+    <span class="help-label"><b>汇聚支付报备商户号</b></span>
     <input class="layui-input" maxlength="15" name="joinpay_trade" placeholder="请输入汇聚支付报备商户号（必填）" required value="{$vo.content.joinpay_trade|default=''}">
     <span class="help-block">汇聚支付报备商户号，需要联系汇聚支付平台的客服获取，通常以 777 开头的15位数字！</span>
 </label>
 
 <label class="layui-form-item block relative">
-    <span class="help-block"><b>汇聚支付的商户编号</b></span>
+    <span class="help-label"><b>汇聚支付的商户编号</b></span>
     <input class="layui-input" maxlength="15" name="joinpay_mch_id" placeholder="请输入汇聚支付的商户编号（必填）" required value="{$vo.content.joinpay_mch_id|default=''}">
     <span class="help-block">汇聚支付的商户编号，需要在汇聚支付平台商户中心获取，通常是以 888 开头的15位数字！</span>
 </label>
 
 <label class="layui-form-item block relative">
-    <span class="help-block"><b>汇聚支付的商户密钥</b></span>
+    <span class="help-label"><b>汇聚支付的商户密钥</b></span>
     <input class="layui-input" maxlength="32" name="joinpay_mch_key" placeholder="请输入汇聚支付的商户密钥（必填）" required value="{$vo.content.joinpay_mch_key|default=''}">
     <span class="help-block">汇聚支付的商户密钥，需要在汇聚支付平台商户中心的密钥管理处获取，通常为32位字符串！</span>
 </label>
\ No newline at end of file
diff --git a/app/data/view/base/payment/form_voucher.html b/app/data/view/base/payment/form_voucher.html
index 3c39e6ba9..f18be686f 100644
--- a/app/data/view/base/payment/form_voucher.html
+++ b/app/data/view/base/payment/form_voucher.html
@@ -1,5 +1,5 @@
 <div class="layui-form-item label-required-prev">
-    <span class="help-block"><b>线下支付二维码</b>Payment Qrcode Image</span>
+    <span class="help-label"><b>线下支付二维码</b>Payment Qrcode Image</span>
     <label class="relative block label-required-null">
         <input class="layui-input" name="voucher_qrcode" placeholder="请上传线下支付二维码图片 &nbsp;&nbsp;&nbsp;&nbsp;" required value='{$vo.content.voucher_qrcode|default=""}'>
         <a class="layui-icon layui-icon-upload input-right-icon" data-field="voucher_qrcode" data-file data-type="png,jpg,gif"></a>
diff --git a/app/data/view/base/payment/form_wechat.html b/app/data/view/base/payment/form_wechat.html
index 7d4de4777..6e629a311 100644
--- a/app/data/view/base/payment/form_wechat.html
+++ b/app/data/view/base/payment/form_wechat.html
@@ -11,19 +11,19 @@
 </label>
 
 <label class="layui-form-item block relative">
-    <span class="help-block"><b>微信商户密钥</b>WeChat Payment Secret Key</span>
+    <span class="help-label"><b>微信商户密钥</b>WeChat Payment Secret Key</span>
     <input class="layui-input" maxlength="32" name="wechat_mch_key" pattern=".{32}" placeholder="请输入32位微信商户密钥（必填）" required value="{$vo.content.wechat_mch_key|default=''}">
     <span class="help-block">微信商户密钥，需要在微信商户平台操作设置密码并获取密钥，建议定期更换密钥</span>
 </label>
 
 <label class="layui-form-item layui-hide relative">
-    <span class="help-block"><b>微信商户密钥文件内容</b>（ 需要填写文件的全部内容 ）</span>
+    <span class="help-label"><b>微信商户密钥文件内容</b>（ 需要填写文件的全部内容 ）</span>
     <textarea class="layui-textarea" name="wechat_mch_key_text" placeholder="请输入微信KEY密钥内容">{$vo.content.wechat_mch_key_text|default=''}</textarea>
     <span class="help-block">从商户平台上下载支付证书，解压并取得其中的 apiclient_key.pem 用记事本打开并复制文件内容填至此处</span>
 </label>
 
 <label class="layui-form-item layui-hide relative">
-    <span class="help-block"><b>微信商户证书文件内容</b>（ 需要填写文件的全部内容 ）</span>
+    <span class="help-label"><b>微信商户证书文件内容</b>（ 需要填写文件的全部内容 ）</span>
     <textarea class="layui-textarea" name="wechat_mch_cert_text" placeholder="请输入微信CERT证书内容">{$vo.content.wechat_mch_cert_text|default=''}</textarea>
     <span class="help-block">从商户平台上下载支付证书，解压并取得其中的 apiclient_cert.pem 用记事本打开并复制文件内容填至此处</span>
 </label>
\ No newline at end of file