From d4cde950c3d36a835e94a0213ecf8abe7ee549f2 Mon Sep 17 00:00:00 2001
From: wangxiaowei <wang199765>
Date: Thu, 14 Nov 2024 11:16:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distribution_partner/lists.html           | 38 -------------------
 app/api/logic/DistributionLogic.php           | 21 +++++-----
 2 files changed, 12 insertions(+), 47 deletions(-)

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 @@
 <div class="wrapper">
     <div class="layui-card">
         <div class="layui-tab layui-tab-card" lay-filter="tab-all">
-            <ul class="layui-tab-title">
-                <li data-type="1" class="layui-this">类型</li>
-                <li data-type="2">设置</li>
-            </ul>
             <div class="layui-tab-content">
                 <div class="layui-tab-item layui-show">
                     <div class="layui-card">
@@ -39,22 +35,6 @@
                         </div>
                     </div>
                 </div>
-                <div class="layui-tab-item">
-                    <div class="layui-form" lay-filter="">
-                        <div class="layui-form-item">
-                            <label class="layui-form-label">功能状态：</label>
-                            <div class="layui-input-inline">
-                                <input type="radio" name="open_store_type" value="1" title="开启">
-                                <input type="radio" name="open_store_type" value="0" title="关闭">
-                            </div>
-                        </div>
-                        <div class="layui-form-item">
-                            <div class="layui-input-block">
-                                <button class="layui-btn layui-btn-sm {$view_theme_color}" lay-submit lay-filter="set">确定</button>
-                            </div>
-                        </div>
-                    </div>
-                </div>
             </div>
         </div>
     </div>
@@ -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
-                        });
-                    }
-                }
-            })
-        }
     });
 </script>
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: