From 434ca85ab8d9d7c9896d0c4f58ce2cd791fc786b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= <zoujingli@qq.com>
Date: Fri, 14 Apr 2017 15:28:41 +0800
Subject: [PATCH] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E5=A2=9E=E5=8A=A0=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=E9=BB=98=E8=AE=A4=E5=8F=98=E9=87=8F($=5Furl=5F,$=5Fur?=
 =?UTF-8?q?i=5F)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/wechat/view/config.index.html | 10 ++---
 application/wechat/view/config.pay.html   | 46 ++++++++++++-----------
 2 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/application/wechat/view/config.index.html b/application/wechat/view/config.index.html
index 2f0afbff1..6089f60f3 100644
--- a/application/wechat/view/config.index.html
+++ b/application/wechat/view/config.index.html
@@ -5,7 +5,7 @@
       class='form-horizontal' style='padding-top:20px'>
 
     <div class="form-group">
-        <label class="col-sm-2 col-xs-3 control-label">URL <span class="nowrap">(服务器地址)</span></label>
+        <label class="col-sm-2 control-label">URL <span class="nowrap">(服务器地址)</span></label>
         <div class="col-sm-8">
             <input onmouseenter="this.select()" class="layui-input" readonly="readonly"
                    value="{:url('@wechat/api','',true,true)}"/>
@@ -19,7 +19,7 @@
     <div class="hr-line-dashed"></div>
 
     <div class="form-group">
-        <label class="col-sm-2 col-xs-3 control-label">AppID <span class="nowrap">(应用ID)</span></label>
+        <label class="col-sm-2 control-label">AppID <span class="nowrap">(应用ID)</span></label>
         <div class='col-sm-8'>
             <input type="text" name="wechat_appid" title="请输入以wx开头的18位公众号APPID"
                    pattern="^wx[0-9a-z]{16}$" maxlength="18" required="required"
@@ -33,7 +33,7 @@
     <div class="hr-line-dashed"></div>
 
     <div class="form-group">
-        <label class="col-sm-2 col-xs-3 control-label">AppSecret <span class="nowrap">(应用密钥)</span></label>
+        <label class="col-sm-2 control-label">AppSecret <span class="nowrap">(应用密钥)</span></label>
         <div class='col-sm-8'>
             <input type="password" name="wechat_appsecret" required="required" title="请输入32位公众号AppSecret"
                    placeholder="公众号AppSecret（必填）" value="{:sysconf('wechat_appsecret')}"
@@ -48,7 +48,7 @@
     <div class="hr-line-dashed"></div>
 
     <div class="form-group">
-        <label class="col-sm-2 col-xs-3 control-label">Token <span class="nowrap">(令牌)</span></label>
+        <label class="col-sm-2 control-label">Token <span class="nowrap">(令牌)</span></label>
         <div class='col-sm-8'>
             <input type="text" name="wechat_token" required="required" title="请输入接口Token(令牌)"
                    placeholder="Token（令牌）" value="{:sysconf('wechat_token')}"
@@ -62,7 +62,7 @@
     <div class="hr-line-dashed"></div>
 
     <div class="form-group">
-        <label class="col-sm-2 col-xs-3 control-label">Encoding<span class="nowrap">AESKey</span></label>
+        <label class="col-sm-2 control-label">Encoding <span class="nowrap">AESKey</span></label>
         <div class='col-sm-8'>
             <input type="text" name="wechat_encodingaeskey" title="请输入43位消息加密密钥"
                    placeholder="消息加密密钥，若开启了消息加密时必需填写（可选）" value="{:sysconf('wechat_encodingaeskey')}"
diff --git a/application/wechat/view/config.pay.html b/application/wechat/view/config.pay.html
index d50afdea8..5b028c63c 100644
--- a/application/wechat/view/config.pay.html
+++ b/application/wechat/view/config.pay.html
@@ -20,7 +20,7 @@
       class='form-horizontal' style='padding-top:20px'>
 
     <div class="form-group">
-        <label class="col-sm-2 col-xs-3 control-label">MCH_ID <span class="nowrap">(商户ID)</span></label>
+        <label class="col-sm-2 control-label">MCH_ID <span class="nowrap">(商户ID)</span></label>
         <div class='col-sm-8'>
             <input type='tel' placeholder="请输入10位商户MCH_ID（必填）" title='请输入10位数字商户MCH_ID'
                    required="required" pattern="^\d{10}$" maxlength='10' name='wechat_mch_id'
@@ -34,7 +34,7 @@
     <div class="hr-line-dashed"></div>
 
     <div class="form-group">
-        <label class="col-sm-2 col-xs-3 control-label">PartnerKey <span class="nowrap">(商户密钥)</span></label>
+        <label class="col-sm-2 control-label">PartnerKey <span class="nowrap">(商户密钥)</span></label>
         <div class='col-sm-8'>
             <input type='password' placeholder="请输入32位商户支付密钥（必填）" required title='请输入32位商户支付密钥'
                    pattern="^.{32}$" maxlength="32" name='wechat_partnerkey'
@@ -48,26 +48,28 @@
     <div class="hr-line-dashed"></div>
 
     <div class="form-group">
-        <label class="col-sm-2 col-xs-3 control-label">Apiclient <span class="nowrap">(双向证书)</span></label>
+        <label class="col-sm-2 control-label">Apiclient <span class="nowrap">(双向证书)</span></label>
         <div class="col-sm-8">
-            <input title="apiclient_key.pem" type="hidden" name="wechat_cert_key_md5">
-            <input title="apiclient_cert.pem" type="hidden" name="wechat_cert_cert_md5">
-            <button data-file="one" data-type="pem" data-field="wechat_cert_key_md5"
-                    type="button" class="layui-btn layui-btn-primary">
-                {if file_exists(sysconf('wechat_cert_key'))}
-                已上传 apiclient_key.pem 文件
-                {else/}
-                请上传 apiclient_key.pem 文件
-                {/if}
-            </button>
-            <button data-file="one" data-type="pem" data-field="wechat_cert_cert_md5"
-                    type="button" class="layui-btn layui-btn-primary">
-                {if file_exists(sysconf('wechat_cert_cert'))}
-                已上传 apiclient_cert.pem 文件
-                {else/}
-                请上传 apiclient_cert.pem 文件
-                {/if}
-            </button>
+            <div class="nowrap">
+                <input title="apiclient_key.pem" type="hidden" name="wechat_cert_key_md5">
+                <input title="apiclient_cert.pem" type="hidden" name="wechat_cert_cert_md5">
+                <button data-file="one" data-type="pem" data-field="wechat_cert_key_md5"
+                        type="button" class="layui-btn layui-btn-primary">
+                    {if file_exists(sysconf('wechat_cert_key'))}
+                    已上传 apiclient_key.pem
+                    {else/}
+                    请上传 apiclient_key.pem
+                    {/if}
+                </button>
+                <button data-file="one" data-type="pem" data-field="wechat_cert_cert_md5"
+                        type="button" class="layui-btn layui-btn-primary">
+                    {if file_exists(sysconf('wechat_cert_cert'))}
+                    已上传 apiclient_cert.pem
+                    {else/}
+                    请上传 apiclient_cert.pem
+                    {/if}
+                </button>
+            </div>
             <p class="help-block">
                 企业打款、企业红包、订单退款等操作需要使用双向证书，可在<a href="https://pay.weixin.qq.com" target="_blank">微信商户平台</a>下载证书！
             </p>
@@ -96,7 +98,7 @@
         /*！ 证书上传动作 */
         $('[name="wechat_cert_key_md5"],[name="wechat_cert_cert_md5"]').on('change', function () {
             this.value = $(this).attr('data-md5');
-            $('[data-field="' + this.name + '"]').html('已选择 ' + this.title + ' 文件');
+            $('[data-field="' + this.name + '"]').html('已选择 ' + this.title);
         });
 
         var isShow = false;