update

admin/control/merchant.php

@@ -1015,7 +1015,7 @@ class merchantControl extends SystemControl
                 $result = [];
                 $pid = $provider['provider_id'];
                 $name = $provider['name'];
-                if(!array_key_exists($name , $cfgs)) {
+                if(empty($cfgs) || !array_key_exists($name , $cfgs)) {
                     unset($providers[$key]);
                     continue;
                 }
@@ -1039,6 +1039,9 @@ class merchantControl extends SystemControl
                 }
                 $datas[$pid] = $result;
             }
+            if(empty($datas)) {
+                showMessage('暂无相关通道配置', 'index.php?act=merchant&op=provider');
+            }
             Tpl::output('form', $formData);
             Tpl::output('datas', $datas);
             Tpl::output('providers', $providers);
@@ -1062,7 +1065,9 @@ class merchantControl extends SystemControl
     private function formData($type , $form)
     {
         global $config;
-        $texts = [['中石油' , '中石化'],['中国移动' , '中国联通' , '中国电信']];
+        $texts = [
+            ["中石油" , '中石化'],['移动' , '联通' , '电信']
+        ];
         $type_data = [[1,2] , [4,5,6]];
         $type_text = $texts[$type-1];
         $type_data = $type_data[$type-1];
@@ -1080,7 +1085,7 @@ class merchantControl extends SystemControl
         {
             foreach ($amounts as $amount)
             {
-                $data['text'] = $value . '-' . $amount;
+                $data['text'] = $value . '-' . $amount . '元';
                 $data['type'] = $type_data[$key];
                 $data['amount'] = $amount;
                 $amountData[] = $data;