Merge branch 'gq' of http://git.9026.com/roobe/miao

server/app/Http/Controllers/Api/V1/AuthController.php

@@ -54,6 +54,7 @@ class AuthController extends Controller
      *             "type": 2,
      *             "phone": "15888888888",
      *             "avatar": null,
+     *             "step": 0,  新手引导默认0
      *             "last_ip": null,
      *             "created_at": "2016-09-30 00:45:13",
      *             "updated_at": "2016-09-29 16:43:36"

server/app/Http/Controllers/Api/V1/IndexController.php

@@ -276,7 +276,7 @@ class IndexController extends Controller
         foreach ($dreams as $k => $dream) {
             $data = UserCareDream::where('dream_id',$dream->id)->get();
             $t = ceil((time()-strtotime($dream->created_at))/60); //梦想发布分钟数
-            $care_num = count($data);
+            $care_num = count($data) + $dream->add_care_number;
             if (count($data)==0) $care_num=1;
             $setting = BaseSettingsModel::where('category','paihang')->first();
             $a = $setting?$setting->key:1;

server/app/Http/Controllers/Api/V1/MyController.php

@@ -89,7 +89,7 @@ class MyController extends Controller
         $care_num = $user->UserCareUser;
         $user->care_number = count($care_num);
         $fens = UserCareUser::where('other_user_id',$user->id)->get();
-        $user->fans_number = count($fens);
+        $user->fans_number = count($fens) + $user->add_fens_number;
         $dreams = $user->dreams;
         $user->dreams_number = count($dreams);
         $collection = $user->collection;
@@ -1627,4 +1627,41 @@ class MyController extends Controller
         return $this->api($data);
     }
 
+    /**
+     * @api {get} /api/my/step 新手引导
+     * @apiDescription 新手引导
+     * @apiGroup My
+     * @apiPermission Passport
+     * @apiVersion 0.1.0
+     * @apiSuccessExample {json} Success-Response:
+     * HTTP/1.1 200 OK
+     *{
+     *  "status": true,
+     *  "status_code": 0,
+     *  "message": "",
+     *  "data": ""
+     *               如果step的值等于4表示已完成新手引导不用调用此接口
+     *                  可根据step的值判断用户新手引导到第几步
+     *}
+     * @apiErrorExample {json} Error-Response:
+     *{
+     *  "status": false,
+     *  "status_code": 700,
+     *  "message": "操作失败",
+     *  "data": null
+     *}
+     * HTTP/1.1 400 Bad Request
+     */
+
+    public function step(Request $request)
+    {
+        $user = $this->getUser();
+        if($user->step<5) {  //新手引导一共5步
+            $user->step += 1;
+            $ok = $user->save();
+            if($ok)  return $this->api($user);
+        }
+        return $this->error(ErrorCode::OPERATION_FAILED);
+    }
+
 }

server/app/Models/DreamInfoModel.php

@@ -39,6 +39,7 @@ class DreamInfoModel extends BaseModel
                            'mark',
                            'parameter',
                            'code',
+                           'add_care_number',
                            'status'
                           ];
 

server/app/Models/UserInfoModel.php

@@ -54,7 +54,9 @@ class UserInfoModel extends Authenticatable
                            'remember_token',
                            'birthday',
                            'wechat',
+                           'add_fens_number',
                            'jpush',
+                           'step',
                           ];
 
     protected $hidden = ['password'];

server/database/migrations/2017_12_20_094202_add_add_care_number_to_dream_info_table.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddAddCareNumberToDreamInfoTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('dream_info', function (Blueprint $table) {
+            $table->smallInteger('add_care_number')->after('is_ok')->default(0)->comment('额外增加关注数量');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('dream_info', function (Blueprint $table) {
+            //
+        });
+    }
+}

server/database/migrations/2017_12_20_182906_add_add_fens_number_to_user_info.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddAddFensNumberToUserInfo extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('user_info', function (Blueprint $table) {
+            $table->smallInteger('add_fens_number')->after('jpush')->default(0)->comment('额外增加粉丝数量');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('user_info', function (Blueprint $table) {
+            //
+        });
+    }
+}

server/database/migrations/2017_12_25_153933_add_step_to_user_info_table.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddStepToUserInfoTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('user_info', function (Blueprint $table) {
+            $table->unsignedSmallInteger('step')->after('weibo')->default(0)->comment('新手引导(步数)');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('user_info', function (Blueprint $table) {
+            //
+        });
+    }
+}

server/resources/views/admin/dream/info/edit.blade.php

@@ -175,6 +175,15 @@
                     </div>
                                 
                 </div>
+                <div class="form-group">
+
+                 <label class="control-label col-sm-3">增添关注</label>
+
+                   <div class="col-sm-9">
+                      <input id="" name="data[add_care_number]" class="form-control" value="{{ $data['add_care_number'] or ''}}" required="" aria-required="true"  placeholder="">
+                    </div>
+
+                </div>
              {{--   <div class="form-group">
 
                  <label class="control-label col-sm-3">梦想排行分数</label>

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

@@ -101,6 +101,15 @@
                                         <input id="data_work" name="data[work]" class="form-control" value="{{ $data['work'] 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="" name="data[add_fens_number]" class="form-control" value="{{ $data['add_fens_number'] or ''}}" required="" aria-required="true"  placeholder="">
+                                    </div>
+
+                                </div>
                                 
                                 <div class="form-group">
                                     <label class="control-label col-sm-3">居住地址省</label>

server/routes/api.php

@@ -117,6 +117,10 @@ $api->version('v1', ['namespace' => 'App\Http\Controllers\Api\V1'], function ($a
         'as' => 'my.show',
         'uses' => 'MyController@show',
     ]);
+    $api->get('my/step', [
+        'as' => 'my.step',
+        'uses' => 'MyController@step',
+    ]);
     $api->get('my/persona', [
         'as' => 'my.persona',
         'uses' => 'MyController@persona',