更新取消互选的功能

app/love/controller/MyController.php

@@ -451,7 +451,12 @@ class MyController extends LoveBaseController
         $id      = $this->request->post('id');
         $user_id = cmf_get_current_user_id();
         $user    = UserSelectModel::get(['user_id' => $user_id, 'uid' => $id]);
+        //20230423增加两个userid对调的查询，因为双方都有权利取消
+        if(empty($user)){
+            $user    = UserSelectModel::get(['user_id' => $id, 'uid' => $user_id]);
+        }
         if (!empty($user)) {
+            UserSelectLogModel::where('user_id1|user_id2', $id)->where('update_time',0)->order('id','desc')->update(['update_time'=>time()]);
             $user->delete();
         }
 
@@ -466,7 +471,7 @@ class MyController extends LoveBaseController
         $id      = $this->request->post('id');
         $user_id = cmf_get_current_user_id();
         $user    = UserSelectModel::get(['user_id' => $id, 'uid' => $user_id]);
-        $check   = UserSelectLogModel::where('user_id1|user_id2', $id)->find();
+        $check   = UserSelectLogModel::where('user_id1|user_id2', $id)->where('update_time',0)->find();
         if (!empty($check)) {
             $this->error('对方已被选择！');
         }

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

@@ -86,7 +86,8 @@
                 </p>
             </div>
             <div class="fr mr20">
-                <van-button type="primary" size="mini" @click="location.href = '{:url('Userwall/detail')}?id='+user.id">查看详情</van-button>
+                <van-button type="primary" size="mini" @click="location.href = '{:url('Userwall/detail')}?id='+user.id">查看详情</van-button><br />
+                <van-button type="danger" size="mini" @click.stop="cancel(user.id)">取消互选</van-button>
             </div>
             <div class="clear"></div>
         </div>
@@ -152,8 +153,13 @@
                         title: '确认关系',
                         message: '确认选择后将无法再选择其他人',
                     }).then(() => {
+                        var that = this;
                         $.post("{:url('selectConfirm')}",{id:id},function (json) {
-                            location.reload();
+                            if(json.code == 1){
+                                location.reload();
+                            }else{
+                                that.$toast(json.msg);
+                            }
                         });
                     }).catch(() => {
                         // on cancel
@@ -166,8 +172,13 @@
                         title: '取消选择',
                         message: '确认取消表明心意？',
                     }).then(() => {
+                        var that = this;
                         $.post("{:url('selectCancel')}",{id:id},function (json) {
-                            location.reload();
+                            if(json.code == 1){
+                                location.reload();
+                            }else{
+                                that.$toast(json.msg);
+                            }
                         });
                     }).catch(() => {
                         // on cancel