|
@@ -73,7 +73,7 @@ class Shop extends Start_Controller {
|
|
|
$start = ($page - 1)*$perpage;
|
|
|
}
|
|
|
//取得信息列表
|
|
|
- $info_list = $this->shop->find_all($where,'id,type,shopname,shortname,estimaterate,mustba,shopid,yyid,tb,status',$order_str,$start,$perpage);
|
|
|
+ $info_list = $this->shop->find_all($where,'id,type,shopname,shortname,estimaterate,mustba,shopid,yyid,tb,status,remarks',$order_str,$start,$perpage);
|
|
|
//格式化数据
|
|
|
foreach ($info_list as $key=>$value)
|
|
|
{
|
|
@@ -96,6 +96,7 @@ class Shop extends Start_Controller {
|
|
|
{
|
|
|
$info_list[$key]['tb'] = '不同步';
|
|
|
}
|
|
|
+ $info_list[$key]['remarks'] = empty($value['remarks'])?"":$value['remarks'];
|
|
|
|
|
|
if($value['status'] == 0){
|
|
|
$info_list[$key]['status'] = 'active';
|
|
@@ -147,6 +148,7 @@ class Shop extends Start_Controller {
|
|
|
$post['edittime'] = time();
|
|
|
$post['addtime'] = time();
|
|
|
$post['px'] = $this->input->post('px',true);
|
|
|
+ $post['remarks'] = $this->input->post('remarks',true);
|
|
|
$s = $post;
|
|
|
$s['id'] = $post['yyid'];
|
|
|
$s['name'] = $post['shortname'];
|
|
@@ -211,6 +213,7 @@ class Shop extends Start_Controller {
|
|
|
$post['uphone'] = $this->input->post('uphone',true);
|
|
|
**/
|
|
|
$post['px'] = $this->input->post('px',true);
|
|
|
+ $post['remarks'] = $this->input->post('remarks',true);
|
|
|
$post['estimaterate'] = $this->input->post('estimaterate',true);
|
|
|
$post['userexp'] = $this->input->post('userexp',true);
|
|
|
$post['mustba'] = $this->input->post('mustba',true);
|