From dd16fead1486836428a1af32fb00785176777202 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Mon, 14 Dec 2020 18:59:32 +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=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/data/view/payment/form.html         |  4 ++--
 app/data/view/payment/form_alipay.html  |  5 +++--
 app/data/view/payment/form_wechat.html  |  3 +++
 app/data/view/payment/index.html        | 11 ++++++-----
 app/data/view/payment/index_search.html |  6 +++---
 5 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/app/data/view/payment/form.html b/app/data/view/payment/form.html
index 0f87cef81..9aa28cce1 100644
--- a/app/data/view/payment/form.html
+++ b/app/data/view/payment/form.html
@@ -12,7 +12,7 @@
         </label>
 
         <div class="layui-form-item">
-            <span class="color-green font-w7 label-required-prev">支付通道</span>
+            <span class="color-green font-w7 label-required-prev">支付方式</span>
             <span class="color-desc margin-left-5">Payment Channel</span>
             <label class="block full-width">
                 {empty name='vo.type'}{php}$vo['type'] = 'wechat_jsapi';{/php}{/empty}
@@ -35,7 +35,7 @@
         <div data-payment-type="alipay" class="layui-hide">{include file='payment/form_alipay'}</div>
         <div data-payment-type="joinpay" class="layui-hide">{include file='payment/form_joinpay'}</div>
 
-        <div class="layui-form-item relative block">
+        <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">
diff --git a/app/data/view/payment/form_alipay.html b/app/data/view/payment/form_alipay.html
index 63fff7fa7..9bce1a628 100644
--- a/app/data/view/payment/form_alipay.html
+++ b/app/data/view/payment/form_alipay.html
@@ -1,17 +1,18 @@
 <label class="layui-form-item margin-bottom-20 block relative">
     <span class="color-green font-s14 font-w7 margin-right-10">支付宝商户编号</span>
+    <span class="color-desc margin-left-5">Alipay Payment Number</span>
     <input name="alipay_appid" required placeholder="请输入支付宝商户编号（必填）" value="{$vo.content.alipay_appid|default=''}" class="layui-input">
     <span class="help-block">支付宝商户编号，开通企业支付宝的唯一商户编号</span>
 </label>
 
 <label class="layui-form-item margin-bottom-20 block relative">
     <span class="color-green font-s14 font-w7">支付宝私钥文件内容</span><span class="nowrap color-desc">（ 需要填写文件的全部内容 ）</span>
-    <textarea name="alipay_public_key" placeholder="请输入支付宝私钥文件内容" class="layui-textarea">{$vo.content.alipay_public_key|default=''}</textarea>
+    <textarea name="alipay_public_key" required placeholder="请输入支付宝私钥文件内容" class="layui-textarea">{$vo.content.alipay_public_key|default=''}</textarea>
     <span class="help-block">从商户平台上下载支付证书，解压并取得其中的支付宝私钥文件用记事本打开并复制文件内容填至此处</span>
 </label>
 
 <label class="layui-form-item margin-bottom-20 block relative">
     <span class="color-green font-s14 font-w7">支付宝公钥证书文件内容</span><span class="nowrap color-desc">（ 需要填写文件的全部内容 ）</span>
-    <textarea name="alipay_private_key" placeholder="请输入支付宝公钥证书文件内容" class="layui-textarea">{$vo.content.alipay_private_key|default=''}</textarea>
+    <textarea name="alipay_private_key" required placeholder="请输入支付宝公钥证书文件内容" class="layui-textarea">{$vo.content.alipay_private_key|default=''}</textarea>
     <span class="help-block">从商户平台上下载支付证书，解压并取得其中的支付宝公钥证书文件用记事本打开并复制文件内容填至此处</span>
 </label>
\ No newline at end of file
diff --git a/app/data/view/payment/form_wechat.html b/app/data/view/payment/form_wechat.html
index c4597eeec..607379eaf 100644
--- a/app/data/view/payment/form_wechat.html
+++ b/app/data/view/payment/form_wechat.html
@@ -1,17 +1,20 @@
 <label class="layui-form-item margin-bottom-20 block relative">
     <span class="color-green font-s14 font-w7 margin-right-10">绑定公众号</span>
+    <span class="color-desc margin-left-5">Bind WeChat Appid</span>
     <input name="wechat_appid" required placeholder="请输入绑定公众号（必填）" value="{$vo.content.wechat_appid|default=''}" class="layui-input">
     <span class="help-block">商户绑定的公众号，授权给汇聚支付平台的公众号APPID</span>
 </label>
 
 <label class="layui-form-item margin-bottom-20 block relative">
     <span class="color-green font-s14 font-w7 margin-right-10">微信商户号</span>
+    <span class="color-desc margin-left-5">WeChat Payment Number</span>
     <input name="wechat_mch_id" required placeholder="请输入微信商户ID（必填）" value="{$vo.content.wechat_mch_id|default=''}" class="layui-input">
     <span class="help-block">微信商户编号，需要在微信商户平台获取，微信商户号 与 公众号APPID 匹配</span>
 </label>
 
 <label class="layui-form-item margin-bottom-20 block relative">
     <span class="color-green font-s14 font-w7 margin-right-10">微信商户密钥</span>
+    <span class="color-desc margin-left-5">WeChat Payment Secret Key</span>
     <input name="wechat_mch_key" required maxlength="32" placeholder="请输入微信商户密钥（必填）" value="{$vo.content.wechat_mch_key|default=''}" class="layui-input">
     <span class="help-block">微信商户密钥，需要在微信商户平台操作设置密码并获取密钥，建议定期更换密钥</span>
 </label>
diff --git a/app/data/view/payment/index.html b/app/data/view/payment/index.html
index ae1124ed5..35f23dbf4 100644
--- a/app/data/view/payment/index.html
+++ b/app/data/view/payment/index.html
@@ -2,10 +2,11 @@
 
 {block name="button"}
 <!--{if auth("add")}-->
-<button data-open='{:url("add")}' class='layui-btn layui-btn-sm layui-btn-primary'>添加支付</button>
+<button data-open='{:url("add")}' class='layui-btn layui-btn-sm layui-btn-primary'>添加支付通道</button>
 <!--{/if}-->
+
 <!--{if auth("remove")}-->
-<button data-action='{:url("remove")}' data-rule="id#{key}" data-confirm="确定要删除这些支付吗？" class='layui-btn layui-btn-sm layui-btn-primary'>删除支付</button>
+<button data-action='{:url("remove")}' data-rule="id#{key}" data-confirm="确定要删除这些支付通道吗？" class='layui-btn layui-btn-sm layui-btn-primary'>删除支付通道</button>
 <!--{/if}-->
 {/block}
 
@@ -22,9 +23,9 @@
             <th class='list-table-sort-td'>
                 <button type="button" data-reload class="layui-btn layui-btn-xs">刷 新</button>
             </th>
-            <th class="text-left nowrap">支付名称</th>
-            <th class="text-left nowrap">支付通道</th>
-            <th class="text-left nowrap">支付状态</th>
+            <th class="text-left nowrap">通道名称</th>
+            <th class="text-left nowrap">支付方式</th>
+            <th class="text-left nowrap">使用状态</th>
             <th class="text-left nowrap">创建时间</th>
             <th class="text-left nowrap"></th>
         </tr>
diff --git a/app/data/view/payment/index_search.html b/app/data/view/payment/index_search.html
index c2a34b6c0..c4984ce9d 100644
--- a/app/data/view/payment/index_search.html
+++ b/app/data/view/payment/index_search.html
@@ -2,13 +2,13 @@
     <legend>条件搜索</legend>
     <form class="layui-form layui-form-pane form-search" action="{:request()->url()}" onsubmit="return false" method="get" autocomplete="off">
         <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">支付名称</label>
+            <label class="layui-form-label">通道名称</label>
             <label class="layui-input-inline">
-                <input name="name" value="{:input('name','')}" placeholder="请输入支付名称" class="layui-input">
+                <input name="name" value="{:input('name','')}" placeholder="请输入通道名称" class="layui-input">
             </label>
         </div>
         <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">支付通道</label>
+            <label class="layui-form-label">支付方式</label>
             <div class="layui-input-inline">
                 <select class="layui-select" name="type">
                     <option value="">-- 全部 --</option>