bugfix

app/Http/Controllers/ContentController.php

@@ -22,7 +22,7 @@ class ContentController extends Controller
         $data['populargoods'] = GoodInfo::where('baned', false)->where('count', '>', 0)->where('fav_num', '>', 0)->orderby('fav_num', 'desc')->limit(8)->get();
         $data['cats'] = GoodCat::orderby('cat_index', 'asc')->get();
         foreach($data['cats'] as $cat){
-            $data['catgoods'][$cat->cat_name] = GoodInfo::where('cat_id', $cat->id)->where('baned', false)->inRandomOrder()->limit(4)->get();
+            $data['catgoods'][$cat->cat_name] = GoodInfo::where('cat_id', $cat->id)->where('baned', false)->where('count', '>', 0)->inRandomOrder()->limit(4)->get();
         }
         $data['announces'] = Announcement::orderby('id', 'dsc')->limit(3)->get();
         return View::make('welcome')->with($data);

app/Http/Controllers/MessageController.php

@@ -65,6 +65,8 @@ class MessageController extends Controller
         MessageContact::where('user_id', $user_id)
             ->where('contact_id', $contact_id)
             ->update(['unread_count' => 0]);
+        User::where('id', $user_id)
+            ->update(['last_get_new_message_time' => time()]);
         return json_encode($messages);
     }
 

app/User.php

@@ -9,6 +9,8 @@ class User extends Model
 {
     protected $table = 'users';
 
+    protected $fillable = ['last_get_new_message_time', 'last_send_email_time'];
+
     public function user_infos()
     {
         return $this->hasMany('App\UserInfo');

database/migrations/2017_06_17_145134_alter_users_table_add_locker.php

@@ -0,0 +1,39 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AlterUsersTableAddLocker extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        if (Schema::hasTable('users') && !Schema::hasColumn('users', 'last_get_new_message_time')
+         && !Schema::hasColumn('users', 'last_send_email_time')) {
+            Schema::table('users', function (Blueprint $table) {
+                $table->integer('last_get_new_message_time')->nullable()->default(0);
+                $table->integer('last_send_email_time')->nullable()->default(0);
+            });
+        }
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        if (Schema::hasTable('users') && Schema::hasColumn('users', 'last_get_new_message_time')
+            && Schema::hasColumn('users', 'last_send_email_time')) {
+            Schema::table('users', function (Blueprint $table) {
+                $table->dropColumn(['last_get_new_message_time', 'last_send_email_time']);
+            });
+        }
+    }
+}

public/js/good/good_list.js

@@ -40,7 +40,7 @@ function setprice(){
     location.href=hr;
 }
 function setc(ha){
-    var hr="/good/?";
+    var hr="/good?";
     if($("#priceSet1").val()!=""){
         hr=hr+"&start_price="+$("#priceSet1").val();
     }
@@ -61,6 +61,7 @@ function setc(ha){
     }
     if(getUrlParam('cat_id'))
         hr = hr + '&cat_id=' + getUrlParam('cat_id');
+    //alert(hr);
     location.href=hr;
 }
 

public/js/message.js

@@ -157,8 +157,12 @@ Vue.component('message-dialog', {
     mounted: function () {
         this.$nextTick(function () {
             this.$on('loadDialogHandler', function (id) {
-                this.clearMessage(id);
-                this.getHistoryMessage(id);
+                var vm = this;
+                if (vm.contact_id != id)
+                {
+                    this.clearMessage(id);
+                    this.getHistoryMessage(id);
+                }
             });
             this.$on('refreshMessageEvent', function () {
                 this.getNewMessage();