bug

resources/views/admin/coupon/info/create.blade.php

@@ -105,7 +105,7 @@
                                 <div class="form-group">
 
                                     <label class="control-label col-sm-3">可用产品</label>
-                                    <div class="col-md-6">
+                                    <div class="col-md-6 col-sm-6">
                                         <select name="product_id[]" multiple="multiple" id="product-select"
                                                 class="form-control">
                                             @foreach($product as $item)

resources/views/admin/coupon/info/edit.blade.php

@@ -105,7 +105,7 @@
                                 <div class="form-group">
 
                                     <label class="control-label col-sm-3">可用产品</label>
-                                    <div class="col-md-6">
+                                    <div class="col-md-6 col-sm-6">
                                         <select name="product_id[]" multiple="multiple" id="product-select"
                                                 class="form-control">
                                             @foreach($product as $item)

resources/views/admin/product/category/index.blade.php

@@ -78,11 +78,6 @@
 
                                             </ul>
                                         </div>
-                                        @if(role('Product/Category/view'))
-                                            <button onclick="layer.open({type: 2,area: ['80%', '90%'],content: '{{ U('Product/Category/view',['id'=>$item->id])}}'});"
-                                                    class="btn btn-primary ">查看
-                                            </button>
-                                        @endif
                                     </td>
                                 </tr>
                             @endforeach

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

@@ -37,303 +37,35 @@
 
 
                                 <div class="form-group">
-
-                                    <label class="control-label col-sm-3">登录名</label>
-
+                                    <label class="control-label col-sm-3">微信头像</label>
                                     <div class="col-sm-9">
-                                        <input id="data_username" name="data[username]" class="form-control"
-                                               value="{{ $data['username'] or ''}}" required="" aria-required="true"
-                                               placeholder="">
+                                        <img src="{{ $data['avatar'] }}" alt="">
                                     </div>
 
                                 </div>
-                                <div class="form-group">
 
-                                    <label class="control-label col-sm-3">姓名</label>
-
-                                    <div class="col-sm-9">
-                                        <input id="data_real_name" name="data[real_name]" isChinese class="form-control"
-                                               value="{{ $data['real_name'] or ''}}" required="" aria-required="true"
-                                               placeholder="">
-                                    </div>
-
-                                </div>
                                 <div class="form-group">
 
-                                    <label class="control-label col-sm-3">密码</label>
+                                    <label class="control-label col-sm-3">微信昵称</label>
 
                                     <div class="col-sm-9">
-                                        <input id="data_password" name="data[password]" class="form-control"
-                                               value="{{ $data['password'] or ''}}" required="" aria-required="true"
+                                        <input id="data_username" name="data[nickname]" class="form-control"
+                                               value="{{ $data['nickname'] or ''}}" required="" aria-required="true"
                                                placeholder="">
                                     </div>
 
-                                </div>
-                                <div class="form-group">
-
-                                    <label class="control-label col-sm-3">EMAIL</label>
-
-                                    <div class="col-sm-9">
-                                        <input id="data_email" name="data[email]" email="true" class="form-control"
-                                               value="{{ $data['email'] or ''}}" required="" aria-required="true"
-                                               placeholder="">
-                                    </div>
 
                                 </div>
-                                <div class="form-group">
-
-                                    <label class="control-label col-sm-3">手机号</label>
-
-                                    <div class="col-sm-9">
-                                        <input id="data_mobile" name="data[mobile]" isMobile="true" class="form-control"
-                                               value="{{ $data['mobile'] or ''}}" required="" aria-required="true"
-                                               placeholder="">
-                                    </div>
 
-                                </div>
                                 <div class="form-group">
-
-                                    <label class="control-label col-sm-3">用户头像</label>
-
+                                    <label class="control-label col-sm-3">电话</label>
                                     <div class="col-sm-9">
-                                        <input id="data_avatar" name="data[avatar]" class="form-control"
-                                               value="{{ $data['avatar'] or ''}}" required="" aria-required="true"
-                                               placeholder="">
-                                    </div>
-
-                                </div>
-                                <div class="form-group">
-
-                                    <label class="control-label col-sm-3">性别</label>
-
-                                    <div class="col-sm-9">
-                                        <input id="data_gender" name="data[gender]" class="form-control"
-                                               value="{{ $data['gender'] or ''}}" required="" aria-required="true"
+                                        <input id="data_username" name="data[mobile]" class="form-control"
+                                               value="{{ $data['mobile'] or ''}}" required="" aria-required="true"
                                                placeholder="">
                                     </div>
-
-                                </div>
-
-                                {{--<div class="form-group">
-                                    <label class="control-label col-sm-3">工作类型</label>
-
-                                    <div class="col-sm-9">
-                                        @if(dict()->get('user_info','work_type') != null)
-                                            @foreach(dict()->get('user_info','work_type') as $key=>$val)
-                                                <label class="radio-inline">
-                                                    <input type="radio" name="data[work_type]" value="{{$key}}"
-                                                           @if(isset($data['work_type']) && $data['work_type'] == $key)checked="checked" @endif/>{{$val}}
-                                                </label>
-                                            @endforeach
-                                        @else
-                                            <label class="radio-inline">
-                                                <input type="radio" name="data[work_type]">
-                                            </label>
-                                        @endif
-                                    </div>
-
-                                </div>--}}
-                                <div class="form-group">
-
-                                    <label class="control-label col-sm-3">居住地址省</label>
-
-                                    <div class="col-sm-9">
-                                        <div class="col-sm-2">
-                                            <select class="form-control" id="cmbProvince"
-                                                    name="place_province_id"></select>
-                                        </div>
-                                        <div class="col-sm-2">
-                                            <select class="form-control" id="cmbCity" name="place_city_id"></select>
-                                        </div>
-                                        <div class="col-sm-2">
-                                            <select class="form-control" id="cmbArea" name=""></select>
-                                        </div>
-                                        <script type="text/javascript" src="/base/js/areadata.min.js"></script>
-                                        <script type="text/javascript">
-                                            areadata({
-                                                _cmbProvince: 'cmbProvince',//省
-                                                _cmbCity: 'cmbCity',//市
-                                                _cmbArea: 'cmbArea',//县
-                                                _infoname: 'place_area_id',
-                                                _default: "{{ $data['place_area_id'] or '' }}"//默认县
-                                            });
-                                        </script>
-                                    </div>
-
                                 </div>
 
-                                <div class="form-group">
-
-                                    <label class="control-label col-sm-3">简介</label>
-
-                                    <div class="col-sm-9">
-
-                                        {!! editor() !!}
-                                        <script id="container" name="content"
-                                                type="text/plain">{{ $data['address'] or ''}}</script>
-
-                                    </div>
-
-                                </div>
-                                <div class="form-group">
-
-                                    <label class="control-label col-sm-3">居住时长</label>
-
-                                    <div class="col-sm-9">
-                                        @if(dict()->get('user_info','address_time') != null)
-                                            @foreach(dict()->get('user_info','address_time') as $key=>$val)
-                                                <label class="radio-inline">
-                                                    <input type="radio" name="data[address_time]" value="{{$key}}"
-                                                           @if(isset($data['address_time']) && $data['address_time'] == $key)checked="checked" @endif/>{{$val}}
-                                                </label>
-                                            @endforeach
-                                        @else
-                                            <label class="radio-inline">
-                                                <input type="radio" name="data[address_time]">
-                                            </label>
-                                        @endif
-                                    </div>
-
-                                </div>
-                                <div class="form-group">
-
-                                    <label class="control-label col-sm-3">身份证号</label>
-
-                                    <div class="col-sm-9">
-                                        <input id="data_idcard" name="data[idcard]" isIdCardNo="true"
-                                               class="form-control" value="{{ $data['idcard'] or ''}}" required=""
-                                               aria-required="true" placeholder="">
-                                    </div>
-
-                                </div>
-                                <div class="form-group">
-
-                                    <label class="control-label col-sm-3">身份证正面</label>
-
-                                    <div class="col-sm-9">
-                                        {!!  widget('Tools.ImgUpload')->single('idcard_positive',"data[idcard_positive]", isset($data['idcard_positive'])? $data['idcard_positive'] : "") !!}
-                                    </div>
-
-                                </div>
-                                <div class="form-group">
-
-                                    <label class="control-label col-sm-3">身份证背面</label>
-
-                                    <div class="col-sm-9">
-                                        {!!  widget('Tools.ImgUpload')->multi('idcard_back',"data[idcard_back]", isset($data['idcard_back'])? $data['idcard_back'] : "") !!}
-                                    </div>
-
-                                </div>
-                                <div class="form-group">
-
-                                    {{-- <label class="control-label col-sm-3">学历</label>
-
-                                       <div class="col-sm-9">
-                                       @if(dict()->get('user_info','educational') != null)
-                                           @foreach(dict()->get('user_info','educational') as $key=>$val)
-                                               <label class="radio-inline">
-                                                   <input type="radio" name="data[educational]" value="{{$key}}" @if(isset($data['educational']) && $data['educational'] == $key)checked="checked" @endif/>{{$val}}
-                                               </label>
-                                           @endforeach
-                                        @else
-                                               <label class="radio-inline">
-                                                   <input type="radio" name="data[educational]">
-                                               </label>
-                                              @endif
-                                        </div>
-                                    </div>
-                                    <div class="form-group">
-
-                                     <label class="control-label col-sm-3">婚姻状况</label>
-
-                                       <div class="col-sm-9">
-                                       @if(dict()->get('user_info','marital') != null)
-                                       @foreach(dict()->get('user_info','marital') as $key=>$val)
-                                                                       <label class="radio-inline">
-                                                                           <input type="radio" name="data[marital]" value="{{$key}}" @if(isset($data['marital']) && $data['marital'] == $key)checked="checked" @endif/>{{$val}}
-                                                                       </label>
-                                                                @endforeach
-                                                                @else
-                                                                       <label class="radio-inline">
-                                                                           <input type="radio" name="data[marital]">
-                                                                       </label>
-                                                                @endif
-                                        </div>
-
-                                        </div>
-                                    <div class="form-group">
-
-                                     <label class="control-label col-sm-3">直系亲属联系人关系</label>
-
-                                       <div class="col-sm-9">
-                                       @if(dict()->get('user_info','contact_bind') != null)
-                                       @foreach(dict()->get('user_info','contact_bind') as $key=>$val)
-                                                                       <label class="radio-inline">
-                                                                           <input type="radio" name="data[contact_bind]" value="{{$key}}" @if(isset($data['contact_bind']) && $data['contact_bind'] == $key)checked="checked" @endif/>{{$val}}
-                                                                       </label>
-                                                                @endforeach
-                                                                @else
-                                                                       <label class="radio-inline">
-                                                                           <input type="radio" name="data[contact_bind]">
-                                                                       </label>
-                                                                @endif
-                                        </div>
-
-                                        </div>
-                                    <div class="form-group">
-
-                                     <label class="control-label col-sm-3">直系亲属联系人姓名</label>
-
-                                       <div class="col-sm-9">
-                                         <input id="data_contact_name" name="data[contact_name]" isChinese="true" class="form-control" value="{{ $data['contact_name'] or ''}}" required="" aria-required="true"  placeholder="">
-                                        </div>
-
-                                        </div>
-                                    <div class="form-group">
-
-                                     <label class="control-label col-sm-3">直系亲属联系人手机</label>
-
-                                       <div class="col-sm-9">
-                                         <input id="data_contact_mobile" isMobile="true"  name="data[contact_mobile]" class="form-control" value="{{ $data['contact_mobile'] or ''}}" required="" aria-required="true"  placeholder="">
-                                        </div>
-
-                                        </div>
-                                    <div class="form-group">
-
-                                     <label class="control-label col-sm-3">其他联系人关系</label>
-
-                                       <div class="col-sm-9">
-                                       @if(dict()->get('user_info','other_contact_bind') != null)
-                                       @foreach(dict()->get('user_info','other_contact_bind') as $key=>$val)
-                                                                       <label class="radio-inline">
-                                                                           <input type="radio" name="data[other_contact_bind]" value="{{$key}}" @if(isset($data['other_contact_bind']) && $data['other_contact_bind'] == $key)checked="checked" @endif/>{{$val}}
-                                                                       </label>
-                                                                @endforeach
-                                                                @else
-                                                                       <label class="radio-inline">
-                                                                           <input type="radio" name="data[other_contact_bind]">
-                                                                       </label>
-                                                                @endif
-                                        </div>
-
-                                        </div>
-                                    <div class="form-group">
-
-                                     <label class="control-label col-sm-3">直系亲属联系人姓名</label>
-
-                                       <div class="col-sm-9">
-                                         <input id="data_other_contact_name" isChinese="true" name="data[other_contact_name]" class="form-control" value="{{ $data['other_contact_name'] or ''}}" required="" aria-required="true"  placeholder="">
-                                        </div>
-
-                                        </div>
-                                    <div class="form-group">
-
-                                     <label class="control-label col-sm-3">直系亲属联系人手机</label>--}}
-
-                                    <div class="col-sm-9">
-                                        {{--<input id="data_other_contact_mobile" isMobile="true"  name="data[other_contact_mobile]" class="form-control" value="{{ $data['other_contact_mobile'] or ''}}" required="" aria-required="true"  placeholder="">--}}
-                                    </div>
-                                </div>
                                 <div class="form-group">
                                     <label class="control-label col-sm-3">&nbsp;</label>
                                     <div class="col-sm-9">

resources/views/admin/user/info/index.blade.php

@@ -37,6 +37,7 @@
                                 <th class="sorting" data-sort="avatar"> 头像</th>
                                 <th class="sorting" data-sort="mobile"> 手机号</th>
                                 <th class="sorting" data-sort="created_at">创建时间</th>
+                                <th width="22%">相关操作</th>
                             </tr>
                             </thead>
                             <tbody>
@@ -49,6 +50,35 @@
                                         <td><img src="{{ $item->avatar }}" style="height: 50px"></td>
                                         <td>{{ $item->mobile }}</td>
                                         <td>{{ $item->created_at->format('Y-m-d H:i:s') }}</td>
+                                        <td>
+                                            <div class="btn-group">
+                                                <button data-toggle="dropdown"
+                                                        class="btn btn-warning btn-sm dropdown-toggle"
+                                                        aria-expanded="false">
+                                                    操作 <span class="caret"></span>
+                                                </button>
+                                                <ul class="dropdown-menu">
+
+
+                                                    @if(role('User/Info/update'))
+                                                        <li><a href="{{ U('User/Info/update',['id'=>$item->id])}}"
+                                                               class="font-bold">修改</a></li>
+                                                    @endif
+
+                                                    @if(role('User/Info/destroy'))
+                                                        <li class="divider"></li>
+                                                        <li><a href="{{ U('User/Info/destroy',['id'=>$item->id])}}"
+                                                               onclick="return confirm('你确定执行删除操作？');">删除</a></li>
+                                                    @endif
+
+                                                </ul>
+                                            </div>
+                                            @if(role('User/Info/view'))
+                                                <button onclick="layer.open({type: 2,area: ['80%', '90%'],content: '{{ U('User/Info/view',['id'=>$item->id])}}'});"
+                                                        class="btn btn-primary ">查看
+                                                </button>
+                                            @endif
+                                        </td>
                                     </tr>
                                 @endforeach
                             @endif