rabin 1 년 전
부모
커밋
c56fd370dc
4개의 변경된 파일22개의 추가작업 그리고 4개의 파일을 삭제
  1. 0 1
      src/dai/channel/table/card.php
  2. 6 1
      src/dai/channel/table/manage/card.php
  3. 2 0
      src/dai/channel/table/manage/card_upload.php
  4. 14 2
      src/dai/seller/lib/Manage.php

+ 0 - 1
src/dai/channel/table/card.php

@@ -15,7 +15,6 @@ return array
             'name'      => '分配商户',
             'type'      => 'int(11)',
             'default'   => '-1',
-            'value'     => 'Dever::load("seller/manage")->getList()',
         ),
 
         'number' => array

+ 6 - 1
src/dai/channel/table/manage/card.php

@@ -1,5 +1,8 @@
 <?php
 $channel_id = Dever::input('set')['channel_id'] ?? 0;
+if (!$channel_id) {
+    $channel_id = Dever::input('field')['channel_id'] ?? 0;
+}
 return array
 (
     'list' => array
@@ -31,7 +34,7 @@ return array
         ),
         'data_button' => array
         (
-            '编辑' => array('fastedit', 'seller_id,number,pwd'),
+            '编辑' => array('fastedit', 'number,pwd'),
         ),
         'button' => array
         (
@@ -55,6 +58,7 @@ return array
             'seller_id' => array
             (
                 'name' => '选择商户',
+                'option'     => 'Dever::load("seller/manage")->getList('.$channel_id.')',
             ),
             'sku_id' => array
             (
@@ -81,6 +85,7 @@ return array
             'seller_id' => array
             (
                 'desc' => '请选择要分配卡密的商户,上传后将自动分配给这个商户,如未选择,则为通用卡密,任何商户都可以购买',
+                'option'     => 'Dever::load("seller/manage")->getList('.$channel_id.')',
             ),
             'channel_id' => array
             (

+ 2 - 0
src/dai/channel/table/manage/card_upload.php

@@ -1,4 +1,5 @@
 <?php
+$channel_id = Dever::input('field')['param']['set']['channel_id'] ?? 0;
 return array
 (
     'update' => array
@@ -12,6 +13,7 @@ return array
             'seller_id' => array
             (
                 'desc' => '请选择要分配卡密的商户,上传后将自动分配给这个商户,如未选择,则为通用卡密,任何商户都可以购买',
+                'option'     => 'Dever::load("seller/manage")->getList('.$channel_id.')',
             ),
             'goods' => array
             (

+ 14 - 2
src/dai/seller/lib/Manage.php

@@ -11,14 +11,26 @@ class Manage extends Auth
     }
 
     # 获取卡密可以分配的商户列表
-    public function getList()
+    public function getList($channel_id)
     {
         $data[0] = array
         (
             'id' => -1,
             'name' => '--通用卡密--',
         );
-        $data = array_merge($data, $this->getInfo());
+        $seller = array();
+        if ($channel_id) {
+            $seller_channel = Dever::db('channel', 'seller')->select(array('channel_id' => $channel_id, 'status' => 1), array('group' => 'seller_id'));
+            if ($seller_channel) {
+                foreach ($seller_channel as $v) {
+                    $info = Dever::db('info', 'seller')->find(array('id' => $v['seller_id'], 'status' => 1));
+                    if ($info) {
+                        $seller[] = $info;
+                    }
+                }
+            }
+        }
+        $data = array_merge($data, $seller);
         return $data;
     }