dlh/dlh_test_server
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复错误

Browse Source
This commit is contained in:
wangxiaowei 2024-11-14 11:16:44 +08:00
parent 2fc8ff51fb
commit d4cde950c3
2 changed files with 12 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
app/admin/view/distribution/distribution_partner/lists.html
View File

@ -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>

21
app/api/logic/DistributionLogic.php
View File

@ -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: