From 31db814094a520dde087763727c4cd3cd57c83ae 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, 17 Mar 2021 12:08:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=85=BC=E5=AE=B9=E6=A8=A1?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/data/service/UserTransferService.php  |  5 +++--
 app/data/view/user_transfer/config.html   | 27 ++++++++++++++---------
 app/data/view/user_transfer/transfer.html | 11 ++-------
 3 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/app/data/service/UserTransferService.php b/app/data/service/UserTransferService.php
index 24d55d9c4..ac5e8bcc5 100644
--- a/app/data/service/UserTransferService.php
+++ b/app/data/service/UserTransferService.php
@@ -17,8 +17,9 @@ class UserTransferService extends Service
      */
     protected $types = [
         'wechat_wallet'  => '转账到我的微信零钱',
-        'wechat_qrcode'  => '线下微信收款码转账',
-        'alipay_qrcode'  => '线下支付宝收款码转账',
+        'wechat_banks'   => '转账到我的银行卡账户',
+        'wechat_qrcode'  => '线下转账到微信收款码',
+        'alipay_qrcode'  => '线下转账到支付宝收款码',
         'alipay_account' => '线下转账到支付宝账户',
         'transfer_banks' => '线下转账到银行卡账户',
     ];
diff --git a/app/data/view/user_transfer/config.html b/app/data/view/user_transfer/config.html
index 14e163a8e..fd1d57ce5 100644
--- a/app/data/view/user_transfer/config.html
+++ b/app/data/view/user_transfer/config.html
@@ -39,17 +39,18 @@
             <table class="layui-table payment-type" lay-skin="nob">
                 <thead>
                 <tr>
-                    <th class="text-center notselect"><b>提现转账方式</b></th>
-                    <td class="text-center notselect"><b>是否需要审核</b></td>
-                    <td class="text-center notselect"><b>单笔最小提现金额（ 元 ）</b></td>
-                    <td></td>
-                    <td class="text-center notselect"><b>单笔最大提现金额（ 元 ）</b></td>
+                    <th class="text-center notselect nowrap padding-col-5"><b>提现转账方式</b></th>
+                    <td class="text-center notselect nowrap padding-col-5"><b>是否需要审核</b></td>
+                    <td class="text-center notselect nowrap padding-col-5"><b>单笔最小金额（ 元 ）</b></td>
+                    <td class="padding-col-0"></td>
+                    <td class="text-center notselect nowrap padding-col-5"><b>单笔最大金额（ 元 ）</b></td>
+                    <td class="text-center notselect nowrap padding-col-5"><b>每日限提现次数</b></td>
                 </tr>
                 </thead>
                 <tbody>
                 {foreach $types as $k => $t}
                 <tr class="think-bg-white">
-                    <td class="nowrap">
+                    <td class="nowrap padding-col-5">
                         {php} $key = 'transfer['.$k.']["state"]'; {/php}
                         <input type="hidden" name="{$key}" value="0">
                         {if isset($data['transfer'][$k]['state']) and $data['transfer'][$k]['state'] eq 1}
@@ -58,7 +59,7 @@
                         <input type="checkbox" name="{$key}" value="1" lay-skin="primary" title="{$t}">
                         {/if}
                     </td>
-                    <td class="text-center" style="width:80px">
+                    <td class="text-center padding-col-5" style="width:80px">
                         {php} $key = 'transfer['.$k.']["audit"]'; {/php}
                         <input type="hidden" name="{$key}" value="0">
                         {if isset($data['transfer'][$k]['audit']) and $data['transfer'][$k]['audit'] eq 1}
@@ -69,19 +70,25 @@
                         {php} $key = 'transfer['.$k.'][title]'; {/php}
                         <input type="hidden" class="layui-input" name="{$key}" value="{$t}">
                     </td>
-                    <td class="text-center">
+                    <td class="text-center padding-col-5">
                         <label>
                             {php} $key = 'transfer['.$k.'][minAmount]'; {/php}
                             <input placeholder="￥" class="layui-input" data-value-min="0.00" data-blur-number="2" name="{$key}" value="{$data['transfer'][$k]['minAmount'] ?? '1.00'}">
                         </label>
                     </td>
-                    <td class="text-center">-</td>
-                    <td class="text-center">
+                    <td class="text-center padding-col-5">-</td>
+                    <td class="text-center padding-col-5">
                         <label>
                             {php} $key = 'transfer['.$k.'][maxAmount]'; {/php}
                             <input placeholder="￥" class="layui-input" data-value-max="100000.00" data-blur-number="2" name="{$key}" value="{$data['transfer'][$k]['maxAmount'] ?? '2000.00'}">
                         </label>
                     </td>
+                    <td class="text-center padding-col-5">
+                        <label>
+                            {php} $key = 'transfer['.$k.'][dayNumber]'; {/php}
+                            <input class="layui-input text-center padding-left-0" data-blur-number="0" data-value-min="1" data-value-max="100" name="{$key}" value="{$data['transfer'][$k]['dayNumber'] ?? '1'}">
+                        </label>
+                    </td>
                 </tr>
                 {/foreach}
                 </tbody>
diff --git a/app/data/view/user_transfer/transfer.html b/app/data/view/user_transfer/transfer.html
index c1ed8d630..50f62da1e 100644
--- a/app/data/view/user_transfer/transfer.html
+++ b/app/data/view/user_transfer/transfer.html
@@ -5,8 +5,8 @@
             <span class="color-green font-w7 label-required-prev">绑定公众号</span>
             <span class="color-desc margin-left-5">Bind WeChat Type</span>
             <div class="layui-textarea" style="min-height:auto;padding:12px 13px 13px">
-                {php} $data['wechat_type'] = $data['wechat_type'] ?? 'wxapp'; {/php}
-                {foreach ['wxapp'=>'微信小程序', 'wechat'=>'微信服务号'] as $k=>$v}
+                {php} $data['wechat_type'] = $data['wechat_type'] ?? 'normal'; {/php}
+                {foreach ['normal'=>'兼容模式', 'wxapp'=>'微信小程序', 'wechat'=>'微信服务号'] as $k=>$v}
                 {if $k eq $data.wechat_type}
                 <input checked type='radio' name="wechat_type" value="{$k}" title="{$v}">
                 {else}
@@ -16,13 +16,6 @@
             <span class="help-block">请选择公众号类型，以决定用户 OPENID 字段，一定要保证与接口对应</span>
         </div>
 
-        <label class="layui-form-item block relative">
-            <span class="color-green font-w7">绑定公众号</span>
-            <span class="color-desc margin-left-5">Bind WeChat Appid</span>
-            <input name="wechat_appid" required maxlength="18" pattern="^wx[0-9a-z]{16}$" placeholder="请输入18位绑定公众号（必填）" value="{$data.wechat_appid|default=''}" class="layui-input">
-            <span class="help-block">公众号APPID，微信商户绑定的服务号APPID或小程序APPID</span>
-        </label>
-
         <label class="layui-form-item block relative">
             <span class="color-green font-w7">微信商户号</span>
             <span class="color-desc margin-left-5">WeChat Payment Number</span>