diff --git a/app/admin/view/distribution/distribution_partner/lists.html b/app/admin/view/distribution/distribution_partner/lists.html
index 5a9e2ea8..88499bad 100755
--- a/app/admin/view/distribution/distribution_partner/lists.html
+++ b/app/admin/view/distribution/distribution_partner/lists.html
@@ -7,10 +7,6 @@
@@ -290,23 +270,5 @@
});
});
}
-
- function changeFields(id,fields,value){
- $.ajax({
- url:'{:url("distribution.distribution_store_type/changeFields")}',
- data:{id:id,field:fields,value:value},
- type:'get',
- dataType:'json',
- success:function (res) {
- if(res.code == 1) {
- layui.layer.msg(res.msg, {
- offset: '15px'
- , icon: 1
- , time: 1000
- });
- }
- }
- })
- }
});
diff --git a/app/api/logic/DistributionLogic.php b/app/api/logic/DistributionLogic.php
index 1134910a..f9d4710c 100755
--- a/app/api/logic/DistributionLogic.php
+++ b/app/api/logic/DistributionLogic.php
@@ -149,16 +149,19 @@ class DistributionLogic extends Logic
'is_delete' => 0
])->find();
- $result['partner'] = DistributionPartnerEnum::getPartner($partner['type']);
- $result['partner_money'] = $partner['un_core_city_money'];
- if (strpos($partner['city'], $result['own_city']) !== false) {
- $result['partner_money'] = $partner['core_city_money'];
- }
+ if ($partner) {
+ $result['partner'] = DistributionPartnerEnum::getPartner($partner['type']);
+ $result['partner_money'] = $partner['un_core_city_money'];
- $result['store'] = DistributionStoreType::where([
- 'id' => $result['store_id'],
- 'is_delete' => 0
- ])->field('title, money')->find();
+ if (strpos($partner['city'], $result['own_city']) !== false) {
+ $result['partner_money'] = $partner['core_city_money'];
+ }
+
+ $result['store'] = DistributionStoreType::where([
+ 'id' => $result['store_id'],
+ 'is_delete' => 0
+ ])->field('title, money')->find();
+ }
switch ($result['status']) {
case 0: