From 831d2916da0656911452aeb6351395bb0b181697 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=96=B7=E7=81=AB=E7=9A=84=E7=A5=9E=E7=81=B5?=
 <zhaozan010903@outlook.com>
Date: Tue, 11 Jul 2023 10:19:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E8=97=8F=E5=8A=9F=E8=83=BD=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 YouBili_front/src/utils/option.js             |  5 ++--
 YouBili_front/src/views/pay/orders.vue        |  5 ++--
 .../src/views/personal/collection.vue         | 26 +++++++++----------
 .../controller/FavoriteController.java        |  2 +-
 .../user/favorite/pojo/entity/Favorite.java   |  2 ++
 .../user/favorite/pojo/vo/FavoriteVO.java     |  2 ++
 .../src/main/resources/application.yaml       |  2 +-
 7 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/YouBili_front/src/utils/option.js b/YouBili_front/src/utils/option.js
index 659a69a..3f92291 100644
--- a/YouBili_front/src/utils/option.js
+++ b/YouBili_front/src/utils/option.js
@@ -210,9 +210,9 @@ export function getCollection(params) {
 // 删除当前收藏
 export function deleteCollection(params) {
     return request({
-        method: 'post',
+        method: 'get',
         url: '/user/favorite/delete',
-        data: params
+        params
     })
 }
 
@@ -222,7 +222,6 @@ export function deletefan(params) {
         method: 'get',
         // url: '/user/fans/{id}/deletefan',
         url: '/user/fans/{followID}/deletefan',
-
         data: params
     })
 }
diff --git a/YouBili_front/src/views/pay/orders.vue b/YouBili_front/src/views/pay/orders.vue
index 3201b95..8f8f205 100644
--- a/YouBili_front/src/views/pay/orders.vue
+++ b/YouBili_front/src/views/pay/orders.vue
@@ -48,8 +48,8 @@
           <el-table-column label="操作">
             <template slot-scope="scope">
 
-              <el-button type="primary" size="mini" @click="buy(scope.row)" v-if="!status">支付</el-button>
-              <el-button type="primary" size="mini" @click="buy(scope.row)" v-if="status" disabled>支付</el-button>
+              <el-button type="primary" size="mini" @click="buy(scope.row)" v-if="!scope.row.status" >支付</el-button>
+              <el-button type="primary" size="mini" @click="buy(scope.row)" v-else disabled>支付</el-button>
 
               <el-button type="danger" icon="el-icon-delete" size="mini"
                          @click="openDeleteConfirm(scope.row)"></el-button>
@@ -119,6 +119,7 @@ export default {
 
 // 弹出删除确认框
     openDeleteConfirm(tableData) {
+      alert(tableData.status)
       let message = '此操作将永久删除【' + tableData.tradeName + '】订单，是否继续？';
       this.$confirm(message, '提示', {
         confirmButtonText: '确定',
diff --git a/YouBili_front/src/views/personal/collection.vue b/YouBili_front/src/views/personal/collection.vue
index b2ee844..762297b 100644
--- a/YouBili_front/src/views/personal/collection.vue
+++ b/YouBili_front/src/views/personal/collection.vue
@@ -19,15 +19,14 @@
 
 
           <el-col :span="12">
-            <div class="idxe">
-              <el-result icon="error" title="错误提示" subTitle="请根据提示进行操作">
+<!--            <div class="idxe">-->
+              <el-result icon="error" title="错误提示" subTitle="请根据提示进行操作" v-if="!isShow">
                 <template slot="extra">
-                  <el-button type="primary" size="medium">返回</el-button>
                 </template>
               </el-result>
-            </div>
-            <div class="grid-content bg-purple" v-show="isShow">
-              <div style="margin-left: 250px;margin-top: 30px;width: auto" v-for="(v,i) of favorite" :key="1">
+<!--            </div>-->
+            <div class="grid-content bg-purple">
+              <div style="margin-left: 250px;margin-top: 30px;width: auto" v-for="(v,i) of favorite" :key="i">
                 <el-card style="width: 900px;height: 250px">
                   <div style="display: flex">
                     <div style="height: 200px;width: 350px;margin-left: 15px;margin-top: 10px">
@@ -49,7 +48,7 @@
                         <div>收藏日期:<span> {{ v.favoriteDate }} </span></div>
                         <div style="margin-left: 300px">
                           <el-button type="danger" icon="el-icon-delete" circle
-                                     v-on:click="deleted(v.favoriteID)"></el-button>
+                                     @click="deleted(v.favoriteID)"></el-button>
                         </div>
                       </div>
 
@@ -109,21 +108,20 @@ export default {
       }).then(() => {
         console.log("被删除的ID是:", favoriteID);
         // 写axios; 删除方法!;
-
-        deleteCollection(favoriteID).then(res => {
-          if (res.success) {
+        deleteCollection({favoriteID: favoriteID}).then(res => {
+          if(res.success) {
             this.$notify({
-              title: '删除成功!',
+              title: '删除成功',
               message: res.data,
               position: 'bottom-right',
               type: 'success'
             });
           } else {
             this.$notify.error({
-              title: '出现问题',
-              message: res.message,
+              title: '错误',
+              message: '这是一条错误的提示消息',
               position: 'bottom-right',
-            })
+            });
           }
         })
 
diff --git a/youbili-project-backend/src/main/java/cn/tedu/youbiliprojectbackend/modules/user/favorite/controller/FavoriteController.java b/youbili-project-backend/src/main/java/cn/tedu/youbiliprojectbackend/modules/user/favorite/controller/FavoriteController.java
index 74f819d..5559929 100644
--- a/youbili-project-backend/src/main/java/cn/tedu/youbiliprojectbackend/modules/user/favorite/controller/FavoriteController.java
+++ b/youbili-project-backend/src/main/java/cn/tedu/youbiliprojectbackend/modules/user/favorite/controller/FavoriteController.java
@@ -37,7 +37,7 @@ public class FavoriteController {
      * @param favoriteID 收藏视频ID
      * @return 返回响应结果
      */
-    @PostMapping("delete")
+    @GetMapping("delete")
     public RestBean<String> delete(@AuthenticationPrincipal CurrentPrincipal currentPrincipal,
                                    Long favoriteID){
         log.debug("开始处理请求: delete");
diff --git a/youbili-project-backend/src/main/java/cn/tedu/youbiliprojectbackend/modules/user/favorite/pojo/entity/Favorite.java b/youbili-project-backend/src/main/java/cn/tedu/youbiliprojectbackend/modules/user/favorite/pojo/entity/Favorite.java
index d925037..f3af0e0 100644
--- a/youbili-project-backend/src/main/java/cn/tedu/youbiliprojectbackend/modules/user/favorite/pojo/entity/Favorite.java
+++ b/youbili-project-backend/src/main/java/cn/tedu/youbiliprojectbackend/modules/user/favorite/pojo/entity/Favorite.java
@@ -1,6 +1,7 @@
 package cn.tedu.youbiliprojectbackend.modules.user.favorite.pojo.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -17,6 +18,7 @@ public class Favorite implements Serializable {
 
     private Long videoID;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date favoriteDate;
 
     private Integer enable;
diff --git a/youbili-project-backend/src/main/java/cn/tedu/youbiliprojectbackend/modules/user/favorite/pojo/vo/FavoriteVO.java b/youbili-project-backend/src/main/java/cn/tedu/youbiliprojectbackend/modules/user/favorite/pojo/vo/FavoriteVO.java
index 6f5e8be..5a8472d 100644
--- a/youbili-project-backend/src/main/java/cn/tedu/youbiliprojectbackend/modules/user/favorite/pojo/vo/FavoriteVO.java
+++ b/youbili-project-backend/src/main/java/cn/tedu/youbiliprojectbackend/modules/user/favorite/pojo/vo/FavoriteVO.java
@@ -1,5 +1,6 @@
 package cn.tedu.youbiliprojectbackend.modules.user.favorite.pojo.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -27,6 +28,7 @@ public class FavoriteVO implements Serializable {
     /**
      * 收藏日期
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date favoriteDate;
     /**
      * 视频标题
diff --git a/youbili-project-backend/src/main/resources/application.yaml b/youbili-project-backend/src/main/resources/application.yaml
index d2af76a..4fd698c 100644
--- a/youbili-project-backend/src/main/resources/application.yaml
+++ b/youbili-project-backend/src/main/resources/application.yaml
@@ -88,4 +88,4 @@ alipay:
   appId: 9021000123600820
   appPrivateKey: MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC7Yo+t20ANKaIRzHdjxmQ0RxXHWa7zZpLLyAtTxI7obLIPviPC3lXepsamO+lgNq4wsrlPfbZjxCcbdunr8xpEwiW69LuYMNL9YbuussjK687HQ6lkLySPKU/IS91MXdXYZVSZ3soSf9Fc0AvE3mz08N7Ocj9tg8wumYj2GM/4Vl7NcpRrYpGWSYChYlxwFLlhWO0GDNA3f69rhiYDg3VC82w/VdiGVwSuDaHfKouGGaqGHujIuCN/3W2+qnjBe+5sT9y81cZjbyinRrcozSFMqXGhmKy6HA1yQ07WU4KB6cR+HBqr4BE7srM5gvBSMoQOtpInuiktuIOMJD5PPjJpAgMBAAECggEAZVYuAYWapAOp5BpBTrIRqrvuqTp1BKiqJo5uocSgzE1MFntrd40pvxlOQMQRt7iahzeAQ97mbhm8VHwAkVuNDzY3lV2YvftZfzIFf7qsICFaWCTdTJK6ILnkrZtpeE0ewsI5+GSlv09kd98DHlpzbht9QwRCDQXDvEfH698LSW7ue0p8vQiwsI5kTHnziTkkB/HTdxFKd+yzoAMslywyQJyhHn90gzg0/OZnvieHMFXKiuSki9wKYB6/V+eMpw9OcoigwLfybQ3EME441NDzTqvLXhg3HbHzYPUjdtY5dPw43P70zttndHOKRQsYEi08gKfy+tIqFPAUm+tIfmE7aQKBgQDtPQJ82s1oTI5NTZK22z93x9m9Oxej2tmE0RWO39X46jE6IHAiQYtSzKeA4dYb9dzlZhGOHNggANBTMi9ZITTevqFHEMP+jYuobWnVks6xI+XTHeMt76o7uy9wJ86YW7jt3yDOMWypI37fQYKSL+heolLRr9toh3PoQb5VNgXo7wKBgQDKNEAD3Rukcl/3iwIMngBecNFJ0Xtd50QJfNHHltYrkpDObyfpTVQB0UCmpCUHP7Ug/2jnRaKwJ8YiOrlLsmSxnuy4/2d3gfvvTUaEgH/nTJyKyChkH7ZjI0o2kntDM2z+QJ7qx8s8pEAlNamCbYtor3W2BKO0ZCWYEbKhiOeqJwKBgQDskn9NlD9rN5Rb//RDBkW3I4K9EhVT32Qz7vAphopwatFmHnzTnDrb+Zs7iXkibr21wF/XMGpRF56mqA/ROKzpRn27STu5NttCvMDiKkCVIrAHI/GsmCdQ4yu+EuQQyL6T7oJfO6gYzn2xEjmrn7x/yiz+Tvhjt1ddD1pGzNV93wKBgCGP9qgthS8QhPlTq21otGr4kuSLzsxRXKuueiuEz9u/oiWBscA5w53hm7eNO1AutOPbQRBSMKTIlUyNLsBvxeLtnCFA0220t5qK2w+XPKOpxboLaxjjYqSl8OWJ/seyu36gP0B9FTDlmngSpiYuBJvFs+YYcwu4K71IArxpOvq1AoGBAJ0KcsiqUy2sIuJ8com8KGeqJKhOvsa87cetbAfsPnx0uiJjWVeks9ba3YU++PMCdpZjYunJC+0Mg4Y3+iGgFR494FLfFlSC77OZo32hhsGxHXh9t2Tmm/09i0UZ7zI8InyNJ9cGuoBG55Ozw7siwzxH/05F9Ze2ArG1J/0pgpts
   alipayPublicKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAw6se+bkZ2MIPX8+l5VwqAxsbi4hGXSsamiQa9xcTj1HqL3VNwWdvmGmIBf6RcmBKPyQ/At2R5atA6V0uV7ygWgmvr2nJUPH9B4svRL+nNGnuxZ47Qpic9fLsKND5yImyb0TIa7e7SQoeZz0vheOfqBtDjkp6FVWMdBHlNLAqhtNPORFAypPE8KxWvGTXNWjrw1K9hN9fKlITe5WHSJszE0FuhJwRrZCIuQTCjuG0XyocSDh120VK4kdZilwf3+nRQJ2Y+yws345m6NOTPU48GQtuPD3gokSGR4YJLisqJ5GHew5sZ+WQiPvBTbPwAaf0KCIXqMH2FZT/UFzWiRPXUQIDAQAB
-  notifyUrl:  http://q5uids.natappfree.cc/alipay/notify
\ No newline at end of file
+  notifyUrl:  http://bcca448b616adc69.natapp.cc/alipay/notify
\ No newline at end of file
-- 
GitLab