From 3dff96d8b7ded0de93d34cf62fbc914796771439 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Tue, 10 Dec 2019 11:38:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BE=AE=E4=BF=A1=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/wechat/view/config/options.html     |  2 +-
 app/wechat/view/config/options_api.html |  8 ++++----
 app/wechat/view/config/options_thr.html | 18 +++++++++---------
 app/wechat/view/config/options_tst.html | 14 +++++++++-----
 4 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/app/wechat/view/config/options.html b/app/wechat/view/config/options.html
index eeac49d30..cc1ff8147 100644
--- a/app/wechat/view/config/options.html
+++ b/app/wechat/view/config/options.html
@@ -10,7 +10,7 @@
                 {foreach ['api'=>'公众号平台API模式','thr'=>'第三方平台授权模式','test'=>'接口功能测试'] as $k=>$v}
                 <input type="radio" data-wechat-type="{$k}" name="wechat.type" value="{$k}" title="{$v}" lay-filter="wechat_type">
                 {/foreach}
-                <p class="help-block">请选择微信对接方式，其中第三方平台授权需要微信开放平台支持，同时需要搭建 SERVICE 服务！</p>
+                <p class="help-block">请选择微信对接方式，其中第三方平台授权需要微信开放平台支持，同时需要搭建 Service 服务！</p>
             </div>
         </div>
     </div>
diff --git a/app/wechat/view/config/options_api.html b/app/wechat/view/config/options_api.html
index 098dd2b55..0efe96996 100644
--- a/app/wechat/view/config/options_api.html
+++ b/app/wechat/view/config/options_api.html
@@ -1,10 +1,10 @@
 <form onsubmit="return false;" data-auto="true" method="post" class='layui-form layui-card' autocomplete="off">
 
-    <div class="layui-card-body">
+    <div class="layui-card-header padding-left-40 color-desc">
+        使用API直接对接时，需要在微信公众号平台配置授权IP及网页授权域名，另外再将获取到的参数填写到下面。
+    </div>
 
-        <div class="color-blue padding-left-40 padding-bottom-20">
-            使用API直接对接时，需要在微信公众号平台配置授权IP及网页授权域名，另外再将获取到的参数填写到下面！
-        </div>
+    <div class="layui-card-body">
 
         <div class="layui-form-item">
             <label class="layui-form-label">Token<br><span class="nowrap color-desc">接口认证令牌</span></label>
diff --git a/app/wechat/view/config/options_thr.html b/app/wechat/view/config/options_thr.html
index 2937a82a9..8d7184b98 100644
--- a/app/wechat/view/config/options_thr.html
+++ b/app/wechat/view/config/options_thr.html
@@ -1,25 +1,25 @@
 <form onsubmit="return false" data-auto="true" method="post" class='layui-form layui-card' autocomplete="off">
 
+    <div class="layui-card-header padding-left-40 color-desc">
+        使用第三方授权时，需要单独搭建楚才开放平台 Service 服务，二者需要使用 Yar 或 Soap 方式通信。
+    </div>
+
     <div class="layui-card-body">
 
-        <div class="color-blue padding-left-40 padding-bottom-20">
-            使用第三方授权时，需要单独搭建 SERVICE 服务并将域名配置到 WECHAT 文件，二者需要使用 Yar 或 Soap 通信！
-        </div>
-
-        <!--{if !empty($wechat)}-->
+        {if !empty($wechat)}
         <div class="layui-form-item">
             <label class="layui-form-label">QRCode<br><span class="nowrap color-desc">公众号二维码</span></label>
             <div class="layui-input-block">
                 <div class="pull-left notselect"><img data-tips-image src="{$wechat.qrcode_url|down_file}" style="width:100px;margin-left:-7px"></div>
                 <div class="pull-left padding-left-10">
-                    <p class="nowrap">微信昵称：{$wechat.nick_name|default=''}</p>
-                    <p class="nowrap">微信类型：{if $wechat.service_type eq 2}服务号{elseif $wechat.service_type eq 3}小程序{else}订阅号{/if} / {$wechat.verify_type_info == -1 ? '未认证' : '<span class="color-green">已认证</span>'}</p>
-                    <p class="nowrap">注册公司：{$wechat.principal_name}</p>
+                    <p class="nowrap">微信昵称：{$wechat.user_nickname|default='-'}</p>
+                    <p class="nowrap">微信类型：{$wechat.service_type|default='-'} / {$wechat.service_verify == '未认证' ? '未认证' : '<span class="color-green">已认证</span>'}</p>
+                    <p class="nowrap">注册公司：{$wechat.user_company|default='-'}</p>
                     <p class="nowrap">授权绑定：{$wechat.create_at|format_datetime}</p>
                 </div>
             </div>
         </div>
-        <!--{/if}-->
+        {/if}
 
         <div class="layui-form-item">
             <label class="layui-form-label">Authorize<br><span class="nowrap color-desc">公众号授权绑定</span></label>
diff --git a/app/wechat/view/config/options_tst.html b/app/wechat/view/config/options_tst.html
index a3d9aea21..d20ceea2e 100644
--- a/app/wechat/view/config/options_tst.html
+++ b/app/wechat/view/config/options_tst.html
@@ -1,5 +1,9 @@
 <form onsubmit="return false;" data-auto="true" method="post" class='layui-form layui-card padding-bottom-20' autocomplete="off">
 
+    <div class="layui-card-header color-desc">
+        这里对微信开发的常用功能做了些测试案例，请使用微信扫码进行测试。
+    </div>
+
     <div class="layui-card-body">
         <div class="layui-elem-quote border-0">
             <p class="font-s14 margin-bottom-10 color-text">
@@ -18,23 +22,23 @@
         </div>
         <div class="layui-clear">
             <div class="pull-left padding-right-15 notselect">
-                <img class="notselect" data-tips-image src="{:url('@wechat/api.test/oauth_qrc')}" style="width:120px">
+                <img alt="" class="notselect" data-tips-image src="{:url('@wechat/api.test/oauth_qrc')}" style="width:120px">
                 <p class="text-center">网页授权</p>
             </div>
             <div class="pull-left padding-left-0 padding-right-15">
-                <img class="notselect" data-tips-image src="{:url('@wechat/api.test/jssdk_qrc')}" style="width:120px;">
+                <img alt="" class="notselect" data-tips-image src="{:url('@wechat/api.test/jssdk_qrc')}" style="width:120px;">
                 <p class="text-center">JSSDK签名</p>
             </div>
             <div class="pull-left padding-left-0 padding-right-15">
-                <img onerror="this.src='__ROOT__/static/theme/img/wechat/qrc_pay_error.jpg'" class="notselect" data-tips-image src="{:url('@wechat/api.test/jsapiqrc')}" style="width:120px;">
+                <img alt="" onerror="this.src='__ROOT__/static/theme/img/wechat/qrc_pay_error.jpg'" class="notselect" data-tips-image src="{:url('@wechat/api.test/jsapiqrc')}" style="width:120px;">
                 <p class="text-center">JSAPI支付</p>
             </div>
             <div class="pull-left padding-left-0 padding-right-15">
-                <img onerror="this.src='__ROOT__/static/theme/img/wechat/qrc_pay_error.jpg'" class="notselect" data-tips-image src="{:url('@wechat/api.test/scanoneqrc')}" style="width:120px;">
+                <img alt="" onerror="this.src='__ROOT__/static/theme/img/wechat/qrc_pay_error.jpg'" class="notselect" data-tips-image src="{:url('@wechat/api.test/scanoneqrc')}" style="width:120px;">
                 <p class="text-center">扫码支付①</p>
             </div>
             <div class="pull-left padding-left-0">
-                <img onerror="this.src='__ROOT__/static/theme/img/wechat/qrc_pay_error.jpg'" class="notselect" data-tips-image src="{:url('@wechat/api.test/scanqrc')}" style="width:120px;">
+                <img alt="" onerror="this.src='__ROOT__/static/theme/img/wechat/qrc_pay_error.jpg'" class="notselect" data-tips-image src="{:url('@wechat/api.test/scanqrc')}" style="width:120px;">
                 <p class="text-center">扫码支付②</p>
             </div>
         </div>