Merge branch 'master' of http://47.118.43.255:3000/jjhc/jucai

app/Http/Controllers/Web/Content/BuyhouseController.php

@@ -471,7 +471,7 @@ class BuyhouseController extends WebBaseController
         }
 
         $house = TalentHouse::find($apply['house_id']);
-        if (strtotime($house['apply_time_end']) > time()) {
+        if (strtotime($house['apply_time_end']) < time()) {
             return response()->json(['status' => 0, 'msg' => '报名结束的申报无法撤消']);
         }
 

public/themes/default/views/app/content/buyhouse/list.blade.php

@@ -600,14 +600,14 @@
                         type: 'warning'
                     }).then(() => {
                         axios.get("{{route('buyhouse.back')}}?id="+this.user.id).then(response => {
-                            console.log(response.data);
-                            /*if(response.data.status){
+                            // console.log(response.data);
+                            if(response.data.status){
                                 location.href = "{{route('buyhouse.login')}}";
                             }else{
                                 this.$message.error(response.data.msg);
                                 this.loading.close();
                                 return false;
-                            }*/
+                            }
                         });
                     });
                 },