diff --git a/app/admin/view/distribution/distribution_partner/edit.html b/app/admin/view/distribution/distribution_partner/edit.html index a41c57c7..6366d0a4 100755 --- a/app/admin/view/distribution/distribution_partner/edit.html +++ b/app/admin/view/distribution/distribution_partner/edit.html @@ -77,8 +77,8 @@
@@ -124,12 +124,13 @@ partner.city_arr = partner.city_arr.filter((v, i) => { return v !== txt }) - console.log(partner.city_arr) $("input[name='citys']").val(partner.city_arr.join(',')) }); }, setCity(c) { + $("input[name='citys']").val(c) + partner.city_arr = c.split(',') partner.city_arr.forEach((v) => { let dom = ` diff --git a/app/admin/view/distribution/distribution_partner/lists.html b/app/admin/view/distribution/distribution_partner/lists.html index 37a3c65a..559c413b 100755 --- a/app/admin/view/distribution/distribution_partner/lists.html +++ b/app/admin/view/distribution/distribution_partner/lists.html @@ -255,7 +255,7 @@ ,{field: 'core_city_money', title: '重点城市金额', width:180, templet: "#core_city_money"} ,{field: 'un_core_city_money', title: '非重点城市金额', width:180, templet: "#un_core_city_money"} ,{field: 'type', title: '合伙人类型', width:200} - ,{field: 'is_show', title: '合伙人类型', width:200, templet: "#is_show"} + ,{field: 'is_show', title: '状态', width:200, templet: "#is_show"} ,{fixed: 'right', title: '操作', align: 'center', width:300, toolbar: '#recharge-operation'} ]; diff --git a/app/api/logic/DistributionLogic.php b/app/api/logic/DistributionLogic.php index c86cea5f..aed21dad 100755 --- a/app/api/logic/DistributionLogic.php +++ b/app/api/logic/DistributionLogic.php @@ -22,9 +22,13 @@ namespace app\api\logic; use app\common\enum\DistributionOrderGoodsEnum; +use app\common\enum\DistributionPartnerEnum; use app\common\enum\NoticeEnum; +use app\common\logic\RegionLogic; +use app\common\model\DevRegion; use app\common\model\distribution\Distribution; use app\common\model\distribution\DistributionLevel; +use app\common\model\distribution\DistributionPartner; use app\common\model\distribution\DistributionStoreType; use app\common\model\shop\Shop; use app\common\server\ConfigServer; @@ -606,7 +610,7 @@ class DistributionLogic extends Logic return ['poster'=>$poster]; } - // 获取店铺类型 + // 获取店铺类型和战略计划 public static function scheme() { $store_type_status = ConfigServer::get('distribution','store_type'); @@ -617,9 +621,24 @@ class DistributionLogic extends Logic ->select(); } + $city = DevRegion::where('level', 2) + ->field('id,name') + ->select() + ->toArray(); + + $partner = DistributionPartner::where(['is_show' => 1, 'is_delete' => 0])->field('proportion, city, type, core_city_money, un_core_city_money, is_show')->select(); + + if ($partner) { + foreach ($partner as $k => &$v) { + $partner[$k]['partner'] = DistributionPartnerEnum::getPartner($v['type']); + } + } + return [ 'store_type_status' => $store_type_status, - 'sort_type' => $sort_type + 'sort_type' => $sort_type, + 'city' => $city, + 'partner' => $partner ]; } } \ No newline at end of file