Merge branch 'master' into we7

app/Http/Controllers/Admin/Base/UserController.php

@@ -104,7 +104,7 @@ class UserController extends Controller
     {
         if(Request::method() == 'POST'){
             $data = Request::input('info');
-            $data['store_id'] = $this->getStoreId();
+           // $data['store_id'] = $this->getStoreId();
             if(isset($data['admin_role_id']))$data['admin_role_id'] = implode(',', $data['admin_role_id']);
             if($this->_service->create($data)){
                 $this->showMessage('操作成功', urldecode(Request::input('_referer')));
@@ -134,6 +134,7 @@ class UserController extends Controller
             if ($data['password'] == null) {
                 unset($data['password']);
             }
+          //  dd($data);
             if(isset($data['admin_role_id']))$data['admin_role_id'] = implode(',', $data['admin_role_id']);
             if($this->_service->update(Request::input('id'), $data)){
                 $this->showMessage('操作成功', urldecode(Request::input('_referer')));

app/Models/AdminUserModel.php

@@ -34,6 +34,7 @@ class AdminUserModel extends Authenticatable
         'real_name',
         'store_id',
         'password',
+        'store_id',
         'email',
         'mobile',
         'avatar',

app/Services/Admin/AdminUser.php

@@ -162,6 +162,7 @@ class AdminUser extends BaseProcess
                 return false;
             }
         }
+
         $ok = $obj->update($data);
         return $ok;
     }

resources/views/admin/album/manufacturer/index.blade.php

@@ -26,12 +26,12 @@
                                     </div>
                                 </div>
                             </form>
-                            @if(role('Album/Manufacturer/create'))
+                           {{-- @if(role('Album/Manufacturer/create'))
                                 <div class="col-sm-3 pull-right">
                                     <a href="{{ U('Album/Manufacturer/create')}}"
                                        class="btn btn-sm btn-primary pull-right">添加</a>
                                 </div>
-                            @endif
+                            @endif--}}
                         </div>
 
                         <table class="table table-striped table-bordered table-hover dataTables-example dataTable">

resources/views/admin/base/user/edit.blade.php

@@ -36,11 +36,11 @@
                                 </div>
                                 <div class="form-group">
                                     <label class="control-label col-sm-3">账号</label>
-                                    <div class="col-sm-9"><input id="txt_username" name="info[username]" class="form-control" value="{{ $data['username'] or ''}}" placeholder="账号名"></div>
+                                    <div class="col-sm-9"><input id="txt_username" name="info[name]" class="form-control" value="{{ $data['name'] or ''}}" placeholder="账号名"></div>
                                 </div>
                                 <div class="form-group">
                                     <label class="control-label col-sm-3">昵称</label>
-                                    <div class="col-sm-9"><input id="txt_name" name="info[name]" class="form-control" value="{{ $data['name'] or ''}}" placeholder="昵称"></div>
+                                    <div class="col-sm-9"><input id="txt_name" name="info[real_name]" class="form-control" value="{{ $data['real_name'] or ''}}" placeholder="昵称"></div>
                                 </div>
                                 <div class="form-group">
                                     <label class="control-label col-sm-3">E-mail</label>
@@ -48,13 +48,13 @@
                                 </div>
                                 <div class="form-group">
                                     <label class="control-label col-sm-3">电话</label>
-                                    <div class="col-sm-9"><input id="txt_mobile" name="info[mobile]" class="form-control" value="{{ $data['mobile'] or ''}}" placeholder="手机"></div>
+                                    <div class="col-sm-9"><input id="txt_mobile" name="info[mobile]" class="form-control" value="{{ $data['mobile'] or ''}}"  placeholder="手机"></div>
 
                                 </div>
 
                                 <div class="form-group">
                                     <label class="control-label col-sm-3">商户ID</label>
-                                    <div class="col-sm-9"><input id="txt_mobile" name="info[store_id]" class="form-control" value="{{ $data['store_id'] or ''}}" placeholder="手机"></div>
+                                    <div class="col-sm-9"><input id="txt_store_id" name="info[store_id]" class="form-control" value="{{ $data['store_id'] or ''}}" required="" aria-required="true" @if(!empty($data['mobile'])) readonly @endif placeholder="商户ID"></div>
 
                                 </div>