人才刚需购房

app/Admin/Controllers/Content/BuyHouseBlacklistController.php

@@ -47,6 +47,7 @@ class BuyHouseBlacklistController extends Controller
         $grid->email('邮箱');
         $grid->id_card('证件号');
         $grid->end_time('拉黑截止时间');
+        $grid->comment('备注');
         $grid->status('状态')->display(function () use ($status_text) {
             return $status_text[$this->status];
         });
@@ -81,21 +82,23 @@ class BuyHouseBlacklistController extends Controller
     public function status(Request $request)
     {
         //接收参数
-        $id     = $request->id;
-        $status = $request->status;
-        $url    = empty($request->url) ? admin_base_path('content/buy_house_blacklist') : $request->url;
+        $id      = $request->id;
+        $status  = $request->status;
+        $comment = $request->comment;
+        $url     = empty($request->url) ? admin_base_path('content/buy_house_blacklist') : $request->url;
         if (empty($id) || empty($status)) {
             admin_toastr('数据异常', 'error');
             return redirect(admin_base_path('content/buy_house_blacklist'));
         }
 
         //更新数据
-        $update = ['status' => $status];
+        $update = ['status' => $status, 'comment' => $comment];
         if ($status == 2) {
             $end_time           = $request->end_time;
             $update['end_time'] = $end_time;
         } else {
             $update['end_time'] = null;
+            $update['comment']  = '';
         }
         $result = TalentHousePeople::where('id', '=', $id)
             ->update($update);

app/Admin/Controllers/Content/BuyHouseController.php

@@ -392,10 +392,10 @@ class BuyHouseController extends Controller
             ->where('is_draft', 2)
             ->orderByRaw(DB::raw("FIELD(talent_level,'第一层次','第二层次','第三层次','第四层次','第五层次','第六层次','第七层次') asc"));
         if ($status == 1) {
-            $filename = '审核通过.xls';
+            $filename = $house['name'].'审核不通过名单.xls';
             $query    = $query->whereIn('status', [1, 3]);
         } else {
-            $filename = '审核不通过.xls';
+            $filename = $house['name'].'审核通过名单.xls';
             $query    = $query->where('status', 2);
         }
         $data = $query->get();
@@ -445,7 +445,18 @@ class BuyHouseController extends Controller
     public function image(Request $request)
     {
         $src = $request->src;
+        $photo_data[] = [
+            'alt' => '',
+            'pid' => 1,
+            'src' => $src,
+        ];
+        $photos = [
+            'title' => '图片信息',
+            'id' => 1,
+            'start' => 0,
+            'data' =>$photo_data
+        ];
 
-        return view('admin.content.buy_house_image',['src'=>$src]);
+        return view('admin.content.buy_house_image',['src'=>$src,'photos'=>$photos]);
     }
 }

app/Http/Controllers/Api/Crontab/OneHourController.php

@@ -41,7 +41,7 @@ class OneHourController extends ApiBaseController
     {
         TalentHousePeople::where('end_time', '<', date('Y-m-d H:i:s'))
             ->where('status', 2)
-            ->update(['status' => 1, 'end_time' => null]);
+            ->update(['status' => 1, 'end_time' => null, 'comment' => '']);
 
         return true;
     }

resources/views/admin/ajax/buy_house_detail.blade.php

@@ -359,17 +359,12 @@
             ,shade: 0
             ,maxmin: true
             ,content: "{{ admin_url('content/buy_house/image') }}?src="+src
-            ,btn: ['旋转','缩放','关闭'] //只是为了演示
+            ,btn: ['旋转','关闭'] //只是为了演示
             ,yes: function(index,layero){
                 var iframeWin = window[layero.find('iframe')[0]['name']];//得到iframe页的窗口对象
                 iframeWin.transform();
                 return false;
             },
-            btn2: function(index,layero) {
-                var iframeWin = window[layero.find('iframe')[0]['name']];//得到iframe页的窗口对象
-                iframeWin.zoom();
-                return false;
-            },
             btn3: function() {
                 layer.closeAll();
             }

resources/views/admin/content/buy_house_blacklist.blade.php

@@ -21,6 +21,12 @@
                                     <input type="text" name="end_time" required class="form-control" value="" id="datetimepicker" placeholder="请选择时间">
                                 </div>
                             </div>
+                            <div class="form-group  ">
+                                <label for="reason" class="col-sm-2  control-label">备注</label>
+                                <div class="col-sm-8">
+                                    <textarea name="comment" class="form-control" rows="5" placeholder="输入备注"></textarea>
+                                </div>
+                            </div>
                         </div>
                         <input type="hidden" name="status" value="2">
                         <input type="hidden" name="id" id="id" value="" />

resources/views/admin/content/buy_house_image.blade.php

@@ -5,7 +5,7 @@
 </style>
 <script src="{{ theme_asset('jquery/jquery.min.js') }}"></script>
 <script src="{{ theme_asset('statistics/js/layer/layer.js') }}"></script>
-<img src="{{$src}}" class="img">
+{{--<img src="{{$src}}" class="img">--}}
 <script>
     //获取图片原始高度
     var img_url = '{{$src}}';
@@ -17,13 +17,10 @@
     };
 
     //图片旋转
-    var deg = 0;
+    var num = 0;
     function transform(){
-        deg += 90;
-        if (deg === 360) {
-            deg = 0;
-        }
-        $('.img').css('transform','rotate('+deg+'deg)');
+        num = (num + 90) % 360;
+        $("#layui-layer-photos").css('transform', 'rotate(' + num + 'deg)');
     }
 
     //图片缩放
@@ -37,4 +34,34 @@
             $('.img').css('width','100%');
         }
     }
+
+    layer.photos({
+        photos: {!!json_encode($photos)!!}
+    });
+    $(document).on("mousewheel DOMMouseScroll", ".layui-layer-phimg img", function (e) {
+        var delta = (e.originalEvent.wheelDelta && (e.originalEvent.wheelDelta > 0 ? 1 : -1)) || // chrome & ie
+            (e.originalEvent.detail && (e.originalEvent.detail > 0 ? -1 : 1)); // firefox
+        var imagep = $(".layui-layer-phimg").parent().parent();
+        var image = $(".layui-layer-phimg").parent();
+        var h = image.height();
+        var w = image.width();
+        if (delta > 0) {
+
+            h = h * 1.05;
+            w = w * 1.05;
+
+        } else if (delta < 0) {
+            if (h > 100) {
+                h = h * 0.95;
+                w = w * 0.95;
+            }
+        }
+        imagep.css("top", (window.innerHeight - h) / 2);
+        imagep.css("left", (window.innerWidth - w) / 2);
+        image.height(h);
+        image.width(w);
+        imagep.height(h);
+        imagep.width(w);
+
+    });
 </script>

resources/views/admin/content/export_house_result.blade.php

@@ -34,6 +34,7 @@
             <th>序号</th>
             <th>房源名称</th>
             <th>类型</th>
+            <th>姓名</th>
             <th>联系电话</th>
             <th>证件号</th>
             <th>籍贯</th>