admin/liche
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

store about bizname modify mendian

Browse Source
This commit is contained in:
qianhy
2023-02-17 11:40:55 +08:00
committed by lccsw
parent d23f8abe8c
commit bb53926e64
8 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/controllers/biz/Settle.php
+2 -2
View File
@@ -168,7 +168,7 @@ class Settle extends HD_Controller
$this->data['yearAry'] = $this->auto_business_model->year();
$this->data['monthAry'] = $this->auto_business_model->month();
$this->data['pager'] = array('count' => ceil($total / $size), 'curr' => $page,'totle'=>$total);
$this->data['_title'] = '商家结算管理';
$this->data['_title'] = '门店结算管理';
$view = $params['_biz_type']==1 ? 'biz/settle/lists_brand' : 'biz/settle/lists';
$this->show_view($view,true);
}
@@ -400,7 +400,7 @@ class Settle extends HD_Controller
$this->data['monthAry'] = $this->auto_business_model->month();
$this->data['type_arr'] = $this->biz_settle_static_model->other_price_type();
$this->data['pager'] = array('count' => ceil($total / $size), 'curr' => $page,'totle'=>$total);
$this->data['_title'] = '商家结算管理';
$this->data['_title'] = '门店结算管理';
$view = $params['_biz_type']==1 ? 'biz/settle/lists_static_brand' : 'biz/settle/lists_static';
$this->show_view($view,true);
admin/controllers/biz/Situation.php
+3 -3
View File
@@ -1,6 +1,6 @@
<?php
/**
* Notes:店铺概况
* Notes:门店概况
* Created on: 2022/1/7 14:52
* Created by: dengbw
*/
@@ -42,10 +42,10 @@ class Situation extends HD_Controller
$biz_id = $this->input->get('id');
$re_biz = $this->mdBiz->get(['id' => $biz_id, 'status' => 1]);
if (!$re_biz || empty($re_biz)) {
return $this->show_json(SYS_CODE_FAIL, '店铺不存在！');
return $this->show_json(SYS_CODE_FAIL, '门店不存在！');
}
$base_info = [];
//店铺概况
//门店概况
$re_base = $this->mdBizBase->get(['biz_id' => $biz_id]);
$fields = $this->mdBizBase->get_fields();
foreach ($fields as $key => $value) {
admin/controllers/biz/store/Store.php
+17 -17
View File
@@ -174,7 +174,7 @@ class Store extends HD_Controller
$biz = $this->biz_model->get(array('id' => $id, 'status>-1' => null));
if (!$biz || empty($biz)) {
return $this->show_json(SYS_CODE_FAIL, '店铺不存在！');
return $this->show_json(SYS_CODE_FAIL, '门店不存在！');
}
$this->data['citys'] = $this->area_model->select(array('province_id' => $biz['province_id']), '', 0, 0, 'distinct(city_id), city_name');
@@ -251,7 +251,7 @@ class Store extends HD_Controller
$biz['status'] = 1;
$biz['biz_name'] = $this->input->post('biz_name', true);
if (!$biz['biz_name']) {
return $this->show_json(SYS_CODE_FAIL, '商家名称不能为空');
return $this->show_json(SYS_CODE_FAIL, '门店不能为空');
}
//中文转拼音
$pinyin = new PinYin();
@@ -287,7 +287,7 @@ class Store extends HD_Controller
//上传头像
$biz['headimg'] = $this->input->post('headimg');
//商家标签
//门店标签
$tag_more = $this->input->post('tag_more');
if (!$tag_more || !is_array($tag_more)) {
$tag_more = array();
@@ -325,7 +325,7 @@ class Store extends HD_Controller
$biz['biz_name'] = $this->input->post('biz_name', true);
if (!$biz['biz_name']) {
return $this->show_json(SYS_CODE_FAIL, '商家名称不能为空');
return $this->show_json(SYS_CODE_FAIL, '门店不能为空');
}
//中文转拼音
$pinyin = new PinYin();
@@ -399,7 +399,7 @@ class Store extends HD_Controller
}
}
//商家标签
//门店标签
$tag_more = $this->input->post('tag_more');
if (!$tag_more || !is_array($tag_more)) {
$tag_more = array();
@@ -513,7 +513,7 @@ class Store extends HD_Controller
}
$biz = $this->biz_model->get(array('id' => $biz_id));
if (!$biz || empty($biz)) {
return $this->show_json(SYS_CODE_FAIL, '商家不存在！');
return $this->show_json(SYS_CODE_FAIL, '门店不存在！');
}
$biz_name = $biz['biz_name'];
$where['biz_id'] = $biz_id;
@@ -613,7 +613,7 @@ class Store extends HD_Controller
return $this->show_json(0, "该用户已是门店管理员了");
}
$biz = $this->biz_model->get(array('id' => $biz_id));
//绑定商家
//绑定门店
$data['uid'] = $uid;
$data['brand_id'] = $biz['brand_id'];
$data['biz_id'] = $biz_id;
@@ -669,7 +669,7 @@ class Store extends HD_Controller
return $this->show_json(0, "该用户已是门店管理员了");
}
$biz = $this->biz_model->get(array('id' => $biz_id));
//绑定商家
//绑定门店
$data['uid'] = $uid;
$data['brand_id'] = $biz['brand_id'];
$data['biz_id'] = $biz_id;
@@ -753,7 +753,7 @@ class Store extends HD_Controller
$this->data['lists'] = $lists;
$this->data['pager'] = array('count' => ceil($count / $size), 'curr' => $page);
$this->data['_title'] = "商家{$biz_name}管理员列表";
$this->data['_title'] = "{$biz_name}管理员列表";
$this->show_view('biz/store/lists_manager', true);
}
@@ -779,7 +779,7 @@ class Store extends HD_Controller
}
if (!$biz_id) {
return $this->show_json(SYS_CODE_FAIL, '商家不存在！');
return $this->show_json(SYS_CODE_FAIL, '门店不存在！');
}
//店铺名称
@@ -837,12 +837,12 @@ class Store extends HD_Controller
// }
//店铺名称
$biz = $this->biz_model->get(array('id' => $biz_id));
//绑定商家
//绑门店
$data = array('uid' => $uid);
$data['biz_id'] = $biz_id;
$data['brand_id'] = $biz['brand_id'];
$this->$ub_model->add($data);
//生成商家关联数据
//生成门店关联数据
//座上宾
$this->load->model('app/zsb/app_zsb_user_model');
$this->load->model('user/user_model', 'user_model');
@@ -906,11 +906,11 @@ class Store extends HD_Controller
}
//店铺名称
$biz = $this->biz_model->get(array('id' => $biz_id));
//绑定商家
//绑定门店
$data = array('uid' => $uid);
$data['brand_id'] = $biz['brand_id'];
$this->$ub_model->update($data, array('id' => $id));
//生成商家关联数据
//生成门店关联数据
//座上宾
$res = $this->app_zsb_user_model->get(array('mobile' => $mobile));
if (!$res) {
@@ -931,7 +931,7 @@ class Store extends HD_Controller
}
/**
* 获取店铺可选列表
* 获取门店可选列表
* @return bool
*/
function json_lists()
@@ -984,7 +984,7 @@ class Store extends HD_Controller
}
/**
* 获取店铺信息
* 获取门店信息
* @return bool
*/
function json_get()
@@ -1062,7 +1062,7 @@ class Store extends HD_Controller
$biz_id = $this->input->get('id');
$biz = $this->biz_model->get(array('id' => $biz_id));
if (!$biz) {
return $this->show_json(SYS_CODE_FAIL, '店铺不存在！');
return $this->show_json(SYS_CODE_FAIL, '门店不存在！');
}
$base_info = $this->biz_info_model->get(['biz_id' => $biz_id]);
if (!$base_info) {
admin/views/biz/situation/get.php
+1 -1
View File
@@ -4,7 +4,7 @@
<div class="am-panel am-panel-default">
<div class="am-panel-hd">
<span href="javascript:void(0)" style="font-size: 20px">
店铺概况
门店概况
</span>
</div>
<div class="am-panel-bd">
admin/views/biz/srv/lists.php
+1 -1
View File
@@ -59,7 +59,7 @@
<thead>
<tr>
<th width="8%"><span>ID</span></th>
<th width="20%"><span>商家</span></th>
<th width="20%"><span>门店</span></th>
<th width="20%"><span>供应商</span></th>
<th width="20%"><span>其它参数</span></th>
<th width="15%"><span>生效日期</span></th>
admin/views/biz/store/edit.php
+2 -2
View File
@@ -153,12 +153,12 @@
</div>
</div>
<div class="am-form-group">
<label class="am-para-label">商家名称：</label>
<label class="am-para-label">门店：</label>
<div class="am-para-input"><input type="text" placeholder="(最多 30 个字符)" name="biz_name"
value="<?= $biz['biz_name'] ?>"/></div>
</div>
<div class="am-form-group">
<label class="am-para-label">商家地址：</label>
<label class="am-para-label">门店地址：</label>
<div class="am-para-input">
<div class="am-form-inline">
<div class="am-form-group" style="display: none">
admin/views/biz/store/get_info.php
+3 -3
View File
@@ -182,7 +182,7 @@
</colgroup>
<thead>
<tr>
<th class="vuetable-th-slot-title">商家名</th>
<th class="vuetable-th-slot-title">品牌</th>
<th class="vuetable-th-slot-actions text-right">操作</th>
</tr>
</thead>
@@ -294,14 +294,14 @@
}
});
},
//选择商家
//选择品牌
brandModal: function () {
var that = this;
layer.open({
type: 1,
area: ['55%', '80%'], //宽高
content: $('#brand-modal'),
title: '选择商家',
title: '选择品牌',
shade: false,
btn: ['选好了'],
yes: function (index) {
admin/views/biz/store/lists.php
+4 -4
View File
@@ -3,7 +3,7 @@
action="/biz/store/store/lists">
<div class="am-form am-form-horizontal">
<div class="am-form-group fl">
<label class="am-para-label w100">商家名称：</label>
<label class="am-para-label w100">门店：</label>
<div class="am-para-inline w150">
<input type="text" name="bizname" value="<?= $bizname ?>"/>
</div>
@@ -40,7 +40,7 @@
</div>
</div>
<div class="am-form-group fl">
<label class="am-para-label w100">商家地址：</label>
<label class="am-para-label w100">门店地址：</label>
<div class="am-form-group am-para-inline w150" style="display: none">
<select name="province_id" data-toggle="next-select"
data-refurl="/common/area?key=city&id={value}&url=search" data-next="#bd-hd-city">
@@ -132,7 +132,7 @@
<tr>
<th width="50"></th>
<th width="5%"><span>ID</span></th>
<th width="30%"><span>商家名称</span></th>
<th width="30%"><span>门店</span></th>
<th width="30%"><span>品牌</span></th>
<th width="12%"><span>类型</span></th>
<th width="12%"><span>状态</span></th>
@@ -182,7 +182,7 @@
@click="biz_manage_modal(<?= $v['id'] ?>)">门店管理员</a>
<a class="am-btn am-btn-primary am-btn-xs"
data-modal="/common/share_link?id=<?= $v['id'] ?>&app_id=1&pages=storeInfo"
data-title="狸车小程序店铺首页">分享链接</a>
data-title="狸车小程序门店首页">分享链接</a>
<a data-open="/biz/store/store/get?id=<?= $v['id'] ?>" class="am-btn am-btn-primary am-btn-xs">修改</a>
<input type="hidden" class="biz-id-<?= $v['id'] ?>" name="id" value="<?= $v['id'] ?>" checked>
<select data-update-group="" data-list-target=".biz-id-<?= $v['id'] ?>"