Browse Source

admin update

xiaoyu 3 years ago
parent
commit
b382fc15d8
2 changed files with 2 additions and 4 deletions
  1. 1 3
      admin/control/refill_order.php
  2. 1 1
      admin/templates/default/refill.order.index.php

+ 1 - 3
admin/control/refill_order.php

@@ -110,9 +110,7 @@ class refill_orderControl extends SystemControl
             $this->RefillOrderExport($condition);
         }
         $merchants = [];
-
-        $merchant_list = Model('merchant')->table('merchant,member')->join('inner')->on('member.member_id=merchant.admin_id')
-            ->field('merchant.*')->where(['mchid'=>['egt',0]])->order('available_predeposit desc,merchant_state asc,mchid desc')->limit(1000)->master(true)->select();
+        $merchant_list = Model('')->table('merchant')->limit(1000)->order('name asc')->select();
         foreach ($merchant_list as $value) {
             $merchants[$value['mchid']] = $value;
         }

+ 1 - 1
admin/templates/default/refill.order.index.php

@@ -70,7 +70,7 @@
     .layui-form-select dl dd {
     cursor: pointer;
     width: 130px;
-    text-align: center;
+    
 
     }