diff --git a/admin/controllers/biz/Settle.php b/admin/controllers/biz/Settle.php index 49e8815a..5e891193 100644 --- a/admin/controllers/biz/Settle.php +++ b/admin/controllers/biz/Settle.php @@ -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); diff --git a/admin/controllers/biz/Situation.php b/admin/controllers/biz/Situation.php index 852e8c0d..677df4b9 100644 --- a/admin/controllers/biz/Situation.php +++ b/admin/controllers/biz/Situation.php @@ -1,6 +1,6 @@ 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) { diff --git a/admin/controllers/biz/store/Store.php b/admin/controllers/biz/store/Store.php index 8860237f..0867bdb9 100755 --- a/admin/controllers/biz/store/Store.php +++ b/admin/controllers/biz/store/Store.php @@ -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) { diff --git a/admin/views/biz/situation/get.php b/admin/views/biz/situation/get.php index a5f1ed1d..29af321c 100644 --- a/admin/views/biz/situation/get.php +++ b/admin/views/biz/situation/get.php @@ -4,7 +4,7 @@
- 店铺概况 + 门店概况
diff --git a/admin/views/biz/srv/lists.php b/admin/views/biz/srv/lists.php index 25a57507..143fdf86 100755 --- a/admin/views/biz/srv/lists.php +++ b/admin/views/biz/srv/lists.php @@ -59,7 +59,7 @@ ID - 商家 + 门店 供应商 其它参数 生效日期 diff --git a/admin/views/biz/store/edit.php b/admin/views/biz/store/edit.php index d1de7c42..6dff249c 100755 --- a/admin/views/biz/store/edit.php +++ b/admin/views/biz/store/edit.php @@ -153,12 +153,12 @@
- +
- +