合并分支 'Branch_liuzhen' 到 'master'

Branch liuzhen



查看合并请求 !241

@@ -7,6 +7,8 @@ use app\api\model\Store;
 use app\common\controller\Backend;
 use app\common\controller\Backend;
 use app\admin\model\Litestorespec as SpecModel;
 use app\admin\model\Litestorespec as SpecModel;
 use app\admin\model\Litestorespecvalue as SpecValueModel;
 use app\admin\model\Litestorespecvalue as SpecValueModel;
+use think\Db;
+
 /**
 /**
  * 
  * 
  *
  *
@@ -21,8 +23,8 @@ class Litestoregoods extends Backend
      * @var \app\admin\model\Litestoregoods
      * @var \app\admin\model\Litestoregoods
      */
      */
     protected $model = null;
     protected $model = null;
-    protected $dataLimit = true;
-    protected $dataLimitField = 'store_id';
+    protected $admin_id;
+    protected $group_id;
     protected $multiFields = 'is_recommend';
     protected $multiFields = 'is_recommend';
     protected $noNeedRight = ['selectpage'];
     protected $noNeedRight = ['selectpage'];
 
 
@@ -42,7 +44,7 @@ class Litestoregoods extends Backend
         $this->view->assign("spec_attr", '');
         $this->view->assign("spec_attr", '');
         $this->view->assign("spec_list", '');
         $this->view->assign("spec_list", '');
         $auth_group = new AuthGroupAccess();
         $auth_group = new AuthGroupAccess();
-        $admin_id = session('admin.id');
+        $this->admin_id = $admin_id = session('admin.id');
         $group_id = $auth_group->where(['uid'=>$admin_id,'group_id'=>1])->count();
         $group_id = $auth_group->where(['uid'=>$admin_id,'group_id'=>1])->count();
         $store = '';
         $store = '';
         if($group_id == 1) {
         if($group_id == 1) {
@@ -77,15 +79,26 @@ class Litestoregoods extends Backend
             {
             {
                 return $this->selectpage();
                 return $this->selectpage();
             }
             }
+            $where_g = [];
+            $auth_group = new AuthGroupAccess();
+            $group = $auth_group->where(['uid'=>$this->admin_id,'group_id'=>4])->count();
+            if($group) {
+                $store = Db::name('store')->where('admin_id',$this->admin_id)->value('id');
+                $where_g = [
+                    'store_id' => $store
+                ];
+            }
             list($where, $sort, $order, $offset, $limit) = $this->buildparams();
             list($where, $sort, $order, $offset, $limit) = $this->buildparams();
             $total = $this->model
             $total = $this->model
                     ->with(['category','freight'])
                     ->with(['category','freight'])
+                    ->where($where_g)
                     ->where($where)
                     ->where($where)
                     ->order($sort, $order)
                     ->order($sort, $order)
                     ->count();
                     ->count();
 
 
             $list = $this->model
             $list = $this->model
                     ->with(['category','freight'])
                     ->with(['category','freight'])
+                    ->where($where_g)
                     ->where($where)
                     ->where($where)
                     ->order($sort, $order)
                     ->order($sort, $order)
                     ->limit($offset, $limit)
                     ->limit($offset, $limit)

@@ -139,6 +139,7 @@ class Store extends Backend
                         $result_admin = $admin_model->isUpdate(false)->save($admin_data);
                         $result_admin = $admin_model->isUpdate(false)->save($admin_data);
                         $auth_group_data['uid'] = $admin_model->id;
                         $auth_group_data['uid'] = $admin_model->id;
                         $result_auth_group = $auth_group_model->isUpdate(false)->save($auth_group_data);
                         $result_auth_group = $auth_group_model->isUpdate(false)->save($auth_group_data);
+                        $row->allowField(true)->isUpdate(true)->save(['admin_id'=>$admin_model->id]);
                     }
                     }
                     if($params['status'] == 4) {
                     if($params['status'] == 4) {
                         // 审核不通过，执行退款操作
                         // 审核不通过，执行退款操作

@@ -7,7 +7,7 @@
             <select name="row[store_id]" id="" data-rule="required" class="form-control">
             <select name="row[store_id]" id="" data-rule="required" class="form-control">
                 <option value="">选择商家</option>
                 <option value="">选择商家</option>
                 {foreach name="store" item="vo"}
                 {foreach name="store" item="vo"}
-                <option value="{vo.admin_id}">{$vo.store_name}</option>
+                <option value="{vo.id}">{$vo.store_name}</option>
                 {/foreach}
                 {/foreach}
             </select>
             </select>
         </div>
         </div>

@@ -6,7 +6,7 @@
         <div class="col-xs-12 col-sm-8">
         <div class="col-xs-12 col-sm-8">
             <select name="row[store_id]" id="" data-rule="required" class="form-control">
             <select name="row[store_id]" id="" data-rule="required" class="form-control">
                 {foreach name="store" item="vo"}
                 {foreach name="store" item="vo"}
-                <option value="{$vo.admin_id}" {eq name="vo.admin_id" value="$row.store_id"}selected{/eq}>{$vo.store_name}</option>
+                <option value="{$vo.id}" {eq name="vo.id" value="$row.store_id"}selected{/eq}>{$vo.store_name}</option>
                 {/foreach}
                 {/foreach}
             </select>
             </select>
         </div>
         </div>