增加三观

app/love/controller/MyController.php

@@ -13,6 +13,7 @@ namespace app\love\controller;
 use app\common\Constant;
 use app\common\Fun;
 use app\love\model\LotteryPrizeModel;
+use app\love\model\QuestionModel;
 use app\love\model\UserFavoriteModel;
 use app\love\model\UserFriendModel;
 use app\love\model\UserGiftModel;
@@ -21,6 +22,7 @@ use app\love\model\UserMarryModel;
 use app\love\model\UserMatingModel;
 use app\love\model\UserMessageModel;
 use app\love\model\UserModel;
+use app\love\model\UserOutlookModel;
 use app\love\model\UserSelectLogModel;
 use app\love\model\UserSelectModel;
 use app\love\model\UserVisitModel;
@@ -375,7 +377,7 @@ class MyController extends LoveBaseController
             ->where('is_confirm', 1)
             ->find();
         //奖品
-        $has_prize   = LotteryPrizeModel::all();
+        $has_prize = LotteryPrizeModel::all();
         $this->assign('has_prize', $has_prize->isEmpty() ? 'false' : 'true');
         if (!empty($select)) {
             //已选择
@@ -470,7 +472,7 @@ class MyController extends LoveBaseController
             $user = UserSelectModel::get(['user_id' => $id, 'uid' => $user_id]);
         }
         if (!empty($user)) {
-            UserSelectLogModel::where('user_id1|user_id2', $id)->update(['delete_time'=>time()]);
+            UserSelectLogModel::where('user_id1|user_id2', $id)->update(['delete_time' => time()]);
             $user->delete();
         }
 
@@ -548,8 +550,8 @@ class MyController extends LoveBaseController
         Db::name('config')->where('id', 1)->setInc('select_num');
         //发送提示
         $form_id = $this->user->sex = 1 ? $user_id : $id;
-        $to_id = $this->user->sex = 1 ? $id : $user_id;
-        $time = time();
+        $to_id   = $this->user->sex = 1 ? $id : $user_id;
+        $time    = time();
         UserMessageModel::create([
             'from_id'     => $form_id,
             'to_id'       => $to_id,
@@ -821,6 +823,40 @@ class MyController extends LoveBaseController
         $this->success('核销成功！');
     }
 
+    public function outlook()
+    {
+        $question      = QuestionModel::all();
+        $question_list = [];
+        foreach ($question as $k => $v) {
+            $question_list[$k]['title']  = $v['title'];
+            $question_list[$k]['option'] = [$v['option1'], $v['option2'], $v['option3'], $v['option4']];
+        }
+        $this->assign('question', $question_list);
+        $this->assign('option_title', ['A', 'B', 'C', 'D']);
+
+        return $this->fetch();
+    }
+
+    public function postOutlook()
+    {
+        $data    = $this->request->post();
+        $user_id = $this->user['id'];
+        $outlook = UserOutlookModel::where('user_id', $user_id)->find();
+        if (empty($outlook)) {
+            $data['user_id']     = $user_id;
+            $data['create_time'] = time();
+            UserOutlookModel::create($data);
+        } else {
+            foreach ($data as $k => $v) {
+                $outlook->$k = $v;
+            }
+            $outlook->create_time = time();
+            $outlook->save();
+        }
+
+        $this->success();
+    }
+
     private function _file_name($ext)
     {
         //生成随机文件名

app/love/model/QuestionModel.php

@@ -0,0 +1,19 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkCMF [ WE CAN DO IT MORE SIMPLE ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2013-2019 http://www.thinkcmf.com All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: 老猫 <thinkcmf@126.com>
+// +----------------------------------------------------------------------
+namespace app\love\model;
+
+use think\Model;
+
+class QuestionModel extends Model
+{
+
+
+}

app/love/model/UserOutlookModel.php

@@ -0,0 +1,19 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkCMF [ WE CAN DO IT MORE SIMPLE ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2013-2019 http://www.thinkcmf.com All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: 老猫 <thinkcmf@126.com>
+// +----------------------------------------------------------------------
+namespace app\love\model;
+
+use think\Model;
+
+class UserOutlookModel extends Model
+{
+
+
+}

app/portal/controller/IndexController.php

@@ -14,9 +14,11 @@ use app\admin\model\SlideItemModel;
 use app\common\Excel;
 use app\common\Fun;
 use app\love\controller\LoveBaseController;
+use app\love\model\ActiveApplyModel;
 use app\love\model\UserFriendModel;
 use app\love\model\UserInviteModel;
 use app\love\model\UserMatingModel;
+use app\love\model\UserOutlookModel;
 use app\love\model\UserSelectLogModel;
 use app\portal\model\UserModel;
 
@@ -25,6 +27,16 @@ class IndexController extends LoveBaseController
     public function index()
     {
         $user_id = cmf_get_current_user_id();
+
+        //判断三观
+        $active = ActiveApplyModel::where('user_id',$user_id)->where('active_id',2)->find();
+        if ($active) {
+            $outlook = UserOutlookModel::where('user_id',$user_id)->find();
+            if (empty($outlook)) {
+                return redirect('/love/my/outlook');
+            }
+        }
+
         $user    = UserModel::get($user_id);
         $matting = UserMatingModel::where('user_id', $user_id)->find();
         $where   = [

public/.htaccess

@@ -1,12 +0,0 @@
-<IfModule mod_rewrite.c>
-  Options +FollowSymlinks -Multiviews
-  RewriteEngine On
-
-  RewriteCond %{REQUEST_FILENAME} !-d
-  RewriteCond %{REQUEST_FILENAME} !-f
-  RewriteRule ^api/?(.*)$ api.php?s=$1 [QSA,PT,L]
-
-  RewriteCond %{REQUEST_FILENAME} !-d
-  RewriteCond %{REQUEST_FILENAME} !-f
-  RewriteRule ^(.*)$ index.php?s=$1 [QSA,PT,L]
-</IfModule>

public/themes/simpleboot3/love/active/detail.html

@@ -132,7 +132,11 @@
                         self.$toast(json.msg);
                         if (json.code == 1) {
                             setTimeout(function(){
-                                location.reload();
+                                if (self.info.id == 2) {
+                                    location.href = "{:url('my/outlook')}";
+                                } else {
+                                    location.reload();
+                                }
                             },2000);
                         } else {
                             self.disabled = false;

public/themes/simpleboot3/love/my/outlook.html

@@ -0,0 +1,68 @@
+<extend name="public@base"/>
+<block name="css">
+    <style>
+        .van-nav-bar--fixed {z-index:100;}
+        .van-nav-bar .van-icon,.van-nav-bar__text {color:white;}
+
+        .van-radio {
+            margin-bottom: 8px;
+        }
+    </style>
+</block>
+<block name="body">
+    <!--头部-->
+    <van-nav-bar
+            class="bg-pink"
+            fixed="true"
+    >
+        <template #title>
+            <span style="color:white;">三观问卷</span>
+        </template>
+    </van-nav-bar>
+    <div style="width:100%;height:46px;"></div>
+    <div class="bg-white" style="padding:20px;font-size:20px;font-weight: bold;">「三观雷达启动中」10个婚恋问题自测：找到和你同频的TA！</div>
+
+    <volist name="question" key="k1" id="item">
+    <div class="bg-white" style="padding:20px;margin-top:20px;">
+        <div style="margin-bottom: 8px;font-weight: bold;">{$k1}.{$item.title}</div>
+        <van-radio-group v-model="form.question{$k1}">
+            <volist name="item.option" key="k2" id="option">
+                <van-radio name="{$k2}">{$option_title[$k2 - 1]}.{$option}</van-radio>
+            </volist>
+        </van-radio-group>
+    </div>
+    </volist>
+
+    <div style="padding:16px;">
+        <van-button block class="bg-pink" @click="onSubmit">提交</van-button>
+    </div>
+</block>
+<block name="script">
+    <script>
+        new Vue({
+            el: '#app',
+            data() {
+                return {
+                    form: {question1:'',question2:'',question3:'',question4:'',question5:'',question6:'',question7:'',question8:'',question9:'',question10:''},
+                };
+            },
+            methods: {
+                onSubmit() {
+                    for (let i=1;i<=10;i++) {
+                        console.log(this.form['question'+i]);
+                        if (!this.form['question'+i]) {
+                            this.$toast(`第${i}题未选择`);
+                            return false;
+                        }
+                    }
+                    $.post("{:url('postOutlook')}", this.form, function (json) {
+                        location.href = "{:url('/')}";
+                    }, 'json');
+                },
+            },
+            computed: {
+
+            }
+        });
+    </script>
+</block>