From 27ccee9b20da2dc177e5650a15ac0a12eb9cc604 Mon Sep 17 00:00:00 2001
From: ELF <360197197@qq.com>
Date: Wed, 22 Jul 2020 10:28:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controller/PaymentMerchantController.class.php   | 12 ++++++++----
 Application/Admin/View/PaymentMerchant/form.html     |  8 ++++----
 Application/Admin/View/PaymentMerchant/list.html     |  9 ++++++---
 .../Admin/View/PaymentMerchant/ruleAddForm.html      |  2 +-
 .../Admin/View/PaymentMerchant/ruleEditForm.html     |  2 +-
 Application/Admin/View/PaymentMerchant/rules.html    |  2 +-
 6 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/Application/Admin/Controller/PaymentMerchantController.class.php b/Application/Admin/Controller/PaymentMerchantController.class.php
index efe8a7833..49697aabe 100644
--- a/Application/Admin/Controller/PaymentMerchantController.class.php
+++ b/Application/Admin/Controller/PaymentMerchantController.class.php
@@ -22,6 +22,7 @@ class PaymentMerchantController extends ThinkController
         $mainName = I('main_name', '');
         $adminId = I('admin_id', 0);
         $channel = I('channel', 0);
+        $account = I('account', '');
         $way = I('way', 0);
         $status = I('status', -1);
         $startedAt = I('started_at', '1970-01-01');
@@ -34,6 +35,9 @@ class PaymentMerchantController extends ThinkController
         if ($mainName != '') {
             $conditions['main_name'] = ['like', '%' . $mainName . '%'];
         }
+        if ($account != '') {
+            $conditions['account'] = ['like', '%' . $account . '%'];
+        }
         if ($adminId != 0) {
             $conditions['admin_id'] = $adminId;
         }
@@ -99,7 +103,7 @@ class PaymentMerchantController extends ThinkController
 
     public function add()
     {
-        $this->meta_title = '添加商户';
+        $this->meta_title = '添加收款商户';
         $this->assign('channels', PaymentMerchantService::$channels);
         $this->display('form');
     }
@@ -131,11 +135,11 @@ class PaymentMerchantController extends ThinkController
 
     public function edit()
     {
-        $this->meta_title = '编辑商户';
+        $this->meta_title = '编辑收款商户';
         $id = I('id', 0);
         $merchant = M('payment_merchant', 'tab_')->where(['id' => $id])->find();
         if ($merchant == null) {
-            $this->error('支付商户不存在');
+            $this->error('收款商户不存在');
         }
         $paymentMerchantService = new PaymentMerchantService();
         $config = $merchant['config'] ? json_decode($merchant['config'], true) : null;
@@ -162,7 +166,7 @@ class PaymentMerchantController extends ThinkController
         if ($name == '') {
             $this->ajaxReturn([
                 'status' => 0,
-                'message' => '请输入商户名称',
+                'message' => '请输入支付配置名称',
             ]);
         }
         if ($mainName == '') {
diff --git a/Application/Admin/View/PaymentMerchant/form.html b/Application/Admin/View/PaymentMerchant/form.html
index 68e382640..23f07c87d 100644
--- a/Application/Admin/View/PaymentMerchant/form.html
+++ b/Application/Admin/View/PaymentMerchant/form.html
@@ -81,7 +81,7 @@
           <table  border="0" cellspacing="0" cellpadding="0">
             <tbody>
             <tr>
-                <td class="l"><i class="mustmark">*</i>商户名称：</td>
+                <td class="l"><i class="mustmark">*</i>支付配置名称：</td>
                 <td class="r table_radio">
                     <input type="text" class="txt ratio" name="name" id="name" value="<?=$record?$record['name']:''?>" placeholder="请输入商户名称">
                     <span class="notice-text"></span>
@@ -112,10 +112,10 @@
               </td>
             </tr>
             <tr>
-              <td class="l"><i class="mustmark">*</i>支付渠道：</td>
+              <td class="l"><i class="mustmark">*</i>支付商户：</td>
               <td class="r">
                 <select name="channel" id="channel" class="select_gallery" <?php if($record):?>disabled<?php endif;?>>
-                  <option value="">请选择支付类型</option>
+                  <option value="">请选择支付商户</option>
                   <?php foreach($channels as $key => $name):?>
                   <option value="<?=$key?>" <?php if($record && $record['channel'] == $key):?>selected<?php endif;?>><?=$name?></option>
                   <?php endforeach;?>
@@ -488,7 +488,7 @@
   <script type="text/javascript" src="__STATIC__/datetimepicker/js/locales/bootstrap-datetimepicker.zh-CN.js" charset="UTF-8"></script>
 <script type="text/javascript">
 //导航高亮
-highlight_subnav("{:U('PresidentDeposit/records')}");
+highlight_subnav("{:U('PaymentMerchant/list')}");
 $(".select_gallery").select2();
 
 $(function(){
diff --git a/Application/Admin/View/PaymentMerchant/list.html b/Application/Admin/View/PaymentMerchant/list.html
index 529d8f3e4..edd6e797b 100644
--- a/Application/Admin/View/PaymentMerchant/list.html
+++ b/Application/Admin/View/PaymentMerchant/list.html
@@ -98,6 +98,9 @@
             <div class="input-list">
                 <input type="text" name="main_name" placeholder="请输入商户主体" class="" value="" style="width: 150px">
             </div>
+            <div class="input-list">
+                <input type="text" name="account" placeholder="请输入商户账号" class="" value="" style="width: 150px">
+            </div>
             <div class="input-list">
                 <select id="channel_select" name="channel" class="select_gallery" style="width:200px;">
                     <option value="0">请选择支付渠道</option>
@@ -170,9 +173,9 @@
                 <!-- 表头 -->
                 <thead>
                 <tr>
-                    <th>商户名称</th>
+                    <th>支付配置名称</th>
                     <th>商户主体</th>
-                    <th>支付渠道</th>
+                    <th>支付商户</th>
                     <th>商户账户</th>
                     <th>支持支付方式</th>
                     <th>状态</th>
@@ -256,7 +259,7 @@
     </script>
     <script type="text/javascript">
         //导航高亮
-        highlight_subnav("{:U('Market/rebindRecords')}");
+        highlight_subnav("{:U('PaymentMerchant/list')}");
         $(function(){
             //搜索功能
             $("#search").click(function(){
diff --git a/Application/Admin/View/PaymentMerchant/ruleAddForm.html b/Application/Admin/View/PaymentMerchant/ruleAddForm.html
index a7195da3e..ec5b199f8 100644
--- a/Application/Admin/View/PaymentMerchant/ruleAddForm.html
+++ b/Application/Admin/View/PaymentMerchant/ruleAddForm.html
@@ -250,7 +250,7 @@
   <script type="text/javascript" src="__STATIC__/datetimepicker/js/locales/bootstrap-datetimepicker.zh-CN.js" charset="UTF-8"></script>
 <script type="text/javascript">
 //导航高亮
-highlight_subnav("{:U('Market/rebindRecords')}");
+highlight_subnav("{:U('PaymentMerchant/rules')}");
 $(".select_gallery").select2();
 
 $(function(){
diff --git a/Application/Admin/View/PaymentMerchant/ruleEditForm.html b/Application/Admin/View/PaymentMerchant/ruleEditForm.html
index 5ff2c13fb..3e2e21b84 100644
--- a/Application/Admin/View/PaymentMerchant/ruleEditForm.html
+++ b/Application/Admin/View/PaymentMerchant/ruleEditForm.html
@@ -227,7 +227,7 @@
   <script type="text/javascript" src="__STATIC__/datetimepicker/js/locales/bootstrap-datetimepicker.zh-CN.js" charset="UTF-8"></script>
 <script type="text/javascript">
 //导航高亮
-highlight_subnav("{:U('Market/rebindRecords')}");
+highlight_subnav("{:U('PaymentMerchant/rules')}");
 $(".select_gallery").select2();
 
 $(function(){
diff --git a/Application/Admin/View/PaymentMerchant/rules.html b/Application/Admin/View/PaymentMerchant/rules.html
index 0a71023e8..3d26e4809 100644
--- a/Application/Admin/View/PaymentMerchant/rules.html
+++ b/Application/Admin/View/PaymentMerchant/rules.html
@@ -220,7 +220,7 @@
     </script>
     <script type="text/javascript">
         //导航高亮
-        highlight_subnav("{:U('Market/rebindRecords')}");
+        highlight_subnav("{:U('PaymentMerchant/rules')}");
         $(function(){
             //搜索功能
             $("#search").click(function(){