Merge branch 'feature/payment_merchant' of wmtx/platform into release

修改文字bug

Application/Admin/View/PaymentMerchant/rules.html

@@ -99,7 +99,7 @@
             <br>
             <div class="input-list input-list-promote search_label_rehab">
                 <select name="alipay_merchant_id" id="alipay-merchant-select" class="select_gallery" style="width:200px;">
-                    <option value="0">支付宝配置商户</option>
+                    <option value="0">支付宝支付配置商户</option>
                     <?php foreach($aliMerchants as $merchant):?>
                     <option value="<?=$merchant['id']?>"><?=$merchant['name']?></option>
                     <?php endforeach;?>
@@ -107,7 +107,7 @@
             </div>
             <div class="input-list input-list-promote search_label_rehab">
                 <select name="weixin_merchant_id" id="weixin-merchant-select" class="select_gallery" style="width:200px;">
-                    <option value="0">支付宝配置商户</option>
+                    <option value="0">微信支付配置商户</option>
                     <?php foreach($weixinMerchants as $merchant):?>
                     <option value="<?=$merchant['id']?>"><?=$merchant['name']?></option>
                     <?php endforeach;?>
@@ -115,7 +115,7 @@
             </div>
             <div class="input-list input-list-promote search_label_rehab">
                 <select name="express_merchant_id" id="express-merchant-select" class="select_gallery" style="width:200px;">
-                    <option value="0">支付宝配置商户</option>
+                    <option value="0">快捷支付配置商户</option>
                     <?php foreach($expressMerchants as $merchant):?>
                     <option value="<?=$merchant['id']?>"><?=$merchant['name']?></option>
                     <?php endforeach;?>