1

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

@@ -25,6 +25,9 @@
     						</div>
 				        </div>
 				        </form>
+						<div class="col-sm-1 pull-left">
+							<a href="{{ U('Album/Agent/create')}}" class="btn btn-sm btn-primary pull-left">添加</a>
+						</div>
 						{{--@if(role('Album/Agent/create'))
     					<div class="col-sm-3 pull-right">
     					   <a href="{{ U('Album/Agent/create')}}" class="btn btn-sm btn-primary pull-right">添加</a>
@@ -38,10 +41,10 @@
 								
             <th class="sorting" data-sort="id"> ID </th>
             <th> 微信昵称 </th>
+			<th class="sorting" data-sort="name"> 名称 </th>
             <th class="sorting" data-sort="user_id"> 电话 </th>
             <th class="sorting" data-sort="address"> 地址 </th>
-            <th class="sorting" data-sort="name"> 名称 </th>
-            <th class="sorting" data-sort="status"> 状态 </th>
+            <th class="sorting" data-sort="status"> 审核状态 </th>
 								<th>是否为boss</th>
         						<th width="22%">相关操作</th>
         					</tr>
@@ -52,9 +55,9 @@
 								
             <td>{{ $item->id }}</td>
             <td>{{ $item->nickname }}</td>
+			<td>{{ $item->name }}</td>
             <td>{{ $item->phone }}</td>
             <td>{{ $item->address }}</td>
-            <td>{{ $item->name }}</td>
             <td>{{ $item->status }}</td>
 								@if($item->is_boss != 1)
 									<td>不是</td>
@@ -85,7 +88,9 @@
 												<a href="{{ U('Album/Agent/destroy',['id'=>$item->id])}}" onclick="return confirm('你确定执行删除操作？');" class="btn btn-sm btn-danger pull-right">删除</a>
 										@endif
 										@if(role('Album/Product/Price/index'))
-												<a href="{{ U('Album/Product/Price/index',['id'=>$item->id])}}" class="btn btn-sm btn-primary pull-right">查看报价</a>
+											@if($item->status == '已审核')
+												<a href="{{ U('Album/Product/Price/index',['id'=>$item->id])}}" class="btn btn-sm btn-primary pull-left">查看报价</a>
+											@endif
 										@endif
 
 									</div>

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

@@ -71,7 +71,7 @@
 
                                     <div class="form-group">
 
-                                        <label class="control-label col-sm-3">厂家LOGO(130*130)</label>
+                                        <label class="control-label col-sm-3">厂家LOGO(130像素 * 130像素)</label>
                                         <div class="col-sm-9">
                                             {!!  widget('Tools.ImgUpload')->single2('/upload/logo','logo',"logo",  isset($data['logo'])? $data['logo'] : '',array("sizex"=>130,"sizey"=>130)) !!}
                                         </div>
@@ -223,7 +223,7 @@
 
                                     <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">
                                             {!!  widget('Tools.ImgUpload')->multi2('/upload/banner','banner',"data[banner]", isset($data['banner'])? $data['banner'] : '',[]) !!}
                                         </div>
@@ -301,18 +301,9 @@
                                     <td>{{ $video['name'] }}</td>
                                     <td>{{ $video['url'] }}</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">
-                                                <li><a href="{{ U('Album/Manufactuier/videoDel',['id'=>$video['id']])}}" onclick="return confirm('你确定执行删除操作？');">删除</a></li>
-                                            </ul>
+                                        <div class="pull-right">
+                                            <a href="{{ U('Album/Manufactuier/videoDel',['id'=>$video['id']])}}" onclick="return confirm('你确定执行删除操作？');" class="btn btn-sm btn-danger pull-right">删除</a>
                                         </div>
-
-
                                     </td>
                                 </tr>
                             @else