合并分支 'Branch_liuzhen' 到 'master'

Branch liuzhen



查看合并请求 !267

@@ -51,6 +51,10 @@ class Litestoregoods extends Backend
             $store_model = new Store();
             $store_model = new Store();
             $store = $store_model->where('status',3)->select();
             $store = $store_model->where('status',3)->select();
         }
         }
+        $group = $auth_group->where(['uid'=>$this->admin_id,'group_id'=>4])->count();
+        if($group) {
+            $admin_id = Db::name('store')->where('admin_id',$this->admin_id)->value('id');
+        }
         $this->view->assign('admin_id',$admin_id);
         $this->view->assign('admin_id',$admin_id);
         $this->view->assign('store',$store);
         $this->view->assign('store',$store);
         $this->view->assign('group_id',$group_id);
         $this->view->assign('group_id',$group_id);

@@ -221,7 +221,7 @@
         <div class="col-xs-12 col-sm-8">
         <div class="col-xs-12 col-sm-8">
 
 
             <select  id="c-is_recommend" data-rule="required" class="form-control selectpicker" name="row[is_recommend]">
             <select  id="c-is_recommend" data-rule="required" class="form-control selectpicker" name="row[is_recommend]">
-                {foreach name="isDeleteList" item="vo"}
+                {foreach name="isRecommendList" item="vo"}
                 <option value="{$key}" {in name="key" value="0"}selected{/in}>{$vo}</option>
                 <option value="{$key}" {in name="key" value="0"}selected{/in}>{$vo}</option>
                 {/foreach}
                 {/foreach}
             </select>
             </select>