From 35940e7c1b30f3bf4d720dcb998d2003749986da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= <zoujingli@qq.com>
Date: Wed, 12 Apr 2017 19:47:14 +0800
Subject: [PATCH] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E6=94=B9=E5=BE=AE?=
 =?UTF-8?q?=E4=BF=A1=E9=85=8D=E7=BD=AE=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/wechat/view/config.index.html | 20 ++++++++++++++------
 application/wechat/view/config.pay.html   | 20 ++++++++------------
 2 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/application/wechat/view/config.index.html b/application/wechat/view/config.index.html
index 2354aa10c..f856bb4d8 100644
--- a/application/wechat/view/config.index.html
+++ b/application/wechat/view/config.index.html
@@ -1,9 +1,8 @@
 {extend name="extra@admin/content"}
 
 {block name="content"}
-<form onsubmit="return false;" action="{:request()->url(true)}" data-auto="true" method="post" class='form-horizontal'
-      style='padding-top:20px'>
-
+<form onsubmit="return false;" action="{:request()->url(true)}" data-auto="true" method="post"
+      class='form-horizontal' style='padding-top:20px'>
 
     <div class="form-group">
         <label class="col-sm-2 col-xs-3 control-label">URL(服务器地址)</label>
@@ -34,6 +33,9 @@
             <input type="password" name="wechat_appsecret" required="required" title="请输入公众号AppSecret"
                    placeholder="公众号AppSecret（必填）" value="{:sysconf('wechat_appsecret')}"
                    class="layui-input">
+            <p class="help-block">
+                公众号平台与系统对接认证Token，请优先填写此参数并保存，然后再在微信公众号平台操作对接。
+            </p>
         </div>
     </div>
 
@@ -43,8 +45,11 @@
         <label class="col-sm-2 col-xs-3 control-label">Token(令牌)</label>
         <div class='col-sm-8'>
             <input type="text" name="wechat_token" required="required" title="请输入接口Token(令牌)"
-                   placeholder="公众号AppSecret（必填）" value="{:sysconf('wechat_token')}"
+                   placeholder="请输入接口Token（令牌）" value="{:sysconf('wechat_token')}"
                    class="layui-input">
+            <p class="help-block">
+                公众号平台与系统对接认证Token，请优先填写此参数并保存，然后再在微信公众号平台操作对接。
+            </p>
         </div>
     </div>
 
@@ -53,9 +58,12 @@
     <div class="form-group">
         <label class="col-sm-2 col-xs-3  control-label">EncodingAESKey</label>
         <div class='col-sm-8'>
-            <input type="text" name="wechat_encodingaeskey" required="required" title="请输入43位消息加密密钥"
+            <input type="text" name="wechat_encodingaeskey" title="请输入43位消息加密密钥"
                    placeholder="消息加密密钥，若开启了消息加密时必需填写（可选）" value="{:sysconf('wechat_encodingaeskey')}"
-                   class="layui-input">
+                   maxlength="43" class="layui-input">
+            <p class="help-block">
+                公众号平台接口设置为加密模式，消息加密密钥必需填写并保持与公众号平台一致。
+            </p>
         </div>
     </div>
 
diff --git a/application/wechat/view/config.pay.html b/application/wechat/view/config.pay.html
index 9ca4e5aa8..71f046ab1 100644
--- a/application/wechat/view/config.pay.html
+++ b/application/wechat/view/config.pay.html
@@ -1,29 +1,25 @@
 {extend name="extra@admin/content"}
 
 {block name="content"}
-<form onsubmit="return false;" action="{:request()->url(true)}" data-auto="true" method="post" class='form-horizontal'
-      style='padding-top:20px'>
+<form onsubmit="return false;" action="{:request()->url(true)}" data-auto="true" method="post"
+      class='form-horizontal' style='padding-top:20px'>
 
     <div class="form-group">
-        <div class="col-xs-8 col-xs-offset-1 text-center">
-            <h1 style="font-size:24px">商户支付配置</h1>
-            <div class="hr-line-dashed"></div>
-        </div>
-    </div>
-
-    <div class="form-group">
-        <label class="col-sm-2 control-label">商户ID</label>
+        <label class="col-sm-2 control-label">mch_id(商户ID)</label>
         <div class='col-sm-7'>
             <input type='tel' placeholder="请输入10位商户MCH_ID（必填）" title='请输入10位数字商户MCH_ID'
                    required="required" pattern="^\d{10}$" maxlength='10' name='wechat_mch_id'
                    value='{:sysconf("wechat_mch_id")}' class='layui-input'/>
+            <p class="help-block">
+                注意：商户ID必需与微信接口配置公众号APPID对应，否则无法使用支付功能！
+            </p>
         </div>
     </div>
 
     <div class="hr-line-dashed"></div>
 
     <div class="form-group">
-        <label class="col-sm-2 control-label">商户密钥</label>
+        <label class="col-sm-2 control-label">PartnerKey(商户密钥)</label>
         <div class='col-sm-7'>
             <input type='password' placeholder="请输入32位商户支付密钥（必填）" required title='请输入32位商户支付密钥'
                    pattern="^.{32}$" maxlength="32" name='wechat_partnerkey'
@@ -34,7 +30,7 @@
     <div class="hr-line-dashed"></div>
 
     <div class="form-group">
-        <label class="col-sm-2 control-label">支付证书</label>
+        <label class="col-sm-2 control-label">Cert(支付证书)</label>
         <div class="col-sm-7">
             <input type="hidden" name="cert_zip_md5" value="" onchange="this.value=$(this).attr('data-md5')"/>
             <div data-file="one" data-type="zip" data-field="cert_zip_md5" data-uptype="local"