From 1bf230b2460b69e55bb0640161128847cbb57d03 Mon Sep 17 00:00:00 2001
From: fuji <541359373@qq.com>
Date: Tue, 2 Jun 2020 10:14:54 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E3=80=90=E6=B7=BB=E5=8A=A0=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E5=8F=8D=E9=A6=88=E9=A1=B5=E9=9D=A2=E3=80=91-?=
 =?UTF-8?q?=E6=9C=AA=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/vue2-forntend/src/api/user.js         |  9 ++++
 backend/vue2-forntend/src/router/index.js     | 14 +++++
 .../src/views/Feedback/index.vue              | 54 +++++++++++++++++++
 3 files changed, 77 insertions(+)
 create mode 100644 backend/vue2-forntend/src/views/Feedback/index.vue

diff --git a/backend/vue2-forntend/src/api/user.js b/backend/vue2-forntend/src/api/user.js
index 0e39361..87c82b1 100644
--- a/backend/vue2-forntend/src/api/user.js
+++ b/backend/vue2-forntend/src/api/user.js
@@ -104,3 +104,12 @@ export function resetPWD(uid,data){
     data,
   })   
 }
+
+// 用户反馈
+export function feedback(uid, data) {
+  return request({
+    url: `/api/user/${uid}/feedback/new`,//没确定
+    method: 'post',
+    data,
+  })   
+}
\ No newline at end of file
diff --git a/backend/vue2-forntend/src/router/index.js b/backend/vue2-forntend/src/router/index.js
index 9870559..12f8787 100644
--- a/backend/vue2-forntend/src/router/index.js
+++ b/backend/vue2-forntend/src/router/index.js
@@ -134,6 +134,19 @@ export const constantRoutes = [
       ]
     },
 
+    {
+      path: '/Feedback',
+      component: Layout,
+      children: [
+        {
+          path: 'index',
+          name: 'Feedback',
+          component: () => import('@/views/Feedback/index'),
+          meta: { title: '用户反馈', icon: 'eye' }
+        }
+      ]
+    },
+
     {
       path: '/About',
       component: Layout,
@@ -147,6 +160,7 @@ export const constantRoutes = [
       ]
     },
 
+
   // 404 page must be placed at the end !!!
   { path: '*', redirect: '/404', hidden: true }
 ]
diff --git a/backend/vue2-forntend/src/views/Feedback/index.vue b/backend/vue2-forntend/src/views/Feedback/index.vue
new file mode 100644
index 0000000..8d9f434
--- /dev/null
+++ b/backend/vue2-forntend/src/views/Feedback/index.vue
@@ -0,0 +1,54 @@
+<template>
+    <v-app>
+      <v-container ma-24>
+          <v-col>
+
+            <v-textarea
+              v-model="feed"
+              label="您的意见对我们很重要!💖"
+              outlined
+              class="pa-12"
+              centered
+              append-icon="mdi-comment"
+              rows="10"
+              no-resize
+            >
+              <template v-slot:append>
+                <v-btn @click="submit">
+                  提交
+                  <v-icon>mdi-reply</v-icon>
+                </v-btn>
+              </template>
+            </v-textarea>
+
+          </v-col>
+      </v-container>
+    </v-app>
+
+</template>
+
+
+<script>
+  import {feedback} from '@/api/user';
+  export default {
+    data: () => ({
+      feed:  '',
+    }),
+
+    methods: {
+      submit() {
+        if (this.feed=='') {
+          this.$message("不能为空哦")
+        }
+        else {
+          feedback(this.$store.getters.uid, this.feed).then(res => {
+            this.$message('提交成功！感谢您的反馈！补锅侠已经在路上啦！😃')
+            console.log(res)
+            }).catch(error => {
+            console.log(error)
+          })
+        }
+      }
+    }
+  }
+</script>
-- 
Gitee


From dcbc67388f0f3c274ba5df5983e9c00abccc503d Mon Sep 17 00:00:00 2001
From: fuji <541359373@qq.com>
Date: Tue, 2 Jun 2020 17:09:02 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E3=80=90BUG=E5=8F=8D=E9=A6=88=E3=80=91?=
 =?UTF-8?q?=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/vue2-forntend/src/router/index.js          | 2 +-
 backend/vue2-forntend/src/views/Feedback/index.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/vue2-forntend/src/router/index.js b/backend/vue2-forntend/src/router/index.js
index 12f8787..609c415 100644
--- a/backend/vue2-forntend/src/router/index.js
+++ b/backend/vue2-forntend/src/router/index.js
@@ -142,7 +142,7 @@ export const constantRoutes = [
           path: 'index',
           name: 'Feedback',
           component: () => import('@/views/Feedback/index'),
-          meta: { title: '用户反馈', icon: 'eye' }
+          meta: { title: '用户反馈', icon: 'link' }
         }
       ]
     },
diff --git a/backend/vue2-forntend/src/views/Feedback/index.vue b/backend/vue2-forntend/src/views/Feedback/index.vue
index 8d9f434..c2df263 100644
--- a/backend/vue2-forntend/src/views/Feedback/index.vue
+++ b/backend/vue2-forntend/src/views/Feedback/index.vue
@@ -14,7 +14,7 @@
               no-resize
             >
               <template v-slot:append>
-                <v-btn @click="submit">
+                <v-btn @click="submit" :disabled="feed==''" color="primary">
                   提交
                   <v-icon>mdi-reply</v-icon>
                 </v-btn>
-- 
Gitee


From 32fcb3d6c3bf5fbd32c61cf1854d907cc82ac87b Mon Sep 17 00:00:00 2001
From: fuji <541359373@qq.com>
Date: Tue, 2 Jun 2020 17:11:26 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E3=80=90BUG=E5=8F=8D=E9=A6=88=E3=80=91?=
 =?UTF-8?q?=E5=BE=AE=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/vue2-forntend/src/api/user.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/vue2-forntend/src/api/user.js b/backend/vue2-forntend/src/api/user.js
index 87c82b1..7e01dec 100644
--- a/backend/vue2-forntend/src/api/user.js
+++ b/backend/vue2-forntend/src/api/user.js
@@ -108,7 +108,7 @@ export function resetPWD(uid,data){
 // 用户反馈
 export function feedback(uid, data) {
   return request({
-    url: `/api/user/${uid}/feedback/new`,//没确定
+    url: `/api/user/${uid}/report/new`,//没确定
     method: 'post',
     data,
   })   
-- 
Gitee


From 21e0de4d3109b0b88635c1307be41dd4e60a4ea4 Mon Sep 17 00:00:00 2001
From: fuji <541359373@qq.com>
Date: Tue, 2 Jun 2020 17:36:34 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E3=80=90=E7=94=A8=E6=88=B7=E5=8F=8D?=
 =?UTF-8?q?=E9=A6=88=E3=80=91=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/ddl_killer/migrations/0025_report.py  | 22 +++++++++++++++++++
 backend/ddl_killer/views.py                   |  1 +
 backend/vue2-forntend/src/api/user.js         |  3 ++-
 .../src/views/Feedback/index.vue              | 15 ++++++++-----
 4 files changed, 35 insertions(+), 6 deletions(-)
 create mode 100644 backend/ddl_killer/migrations/0025_report.py

diff --git a/backend/ddl_killer/migrations/0025_report.py b/backend/ddl_killer/migrations/0025_report.py
new file mode 100644
index 0000000..47cf18e
--- /dev/null
+++ b/backend/ddl_killer/migrations/0025_report.py
@@ -0,0 +1,22 @@
+# Generated by Django 3.0.5 on 2020-06-02 17:16
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('ddl_killer', '0024_message_usermessage'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Report',
+            fields=[
+                ('rid', models.AutoField(primary_key=True, serialize=False)),
+                ('content', models.TextField(blank=True, null=True)),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='ddl_killer.User')),
+            ],
+        ),
+    ]
diff --git a/backend/ddl_killer/views.py b/backend/ddl_killer/views.py
index 5bebaf4..2b18adb 100644
--- a/backend/ddl_killer/views.py
+++ b/backend/ddl_killer/views.py
@@ -32,6 +32,7 @@ from .models import Note
 from .models import CourseNote
 from .models import Message
 from .models import UserMessage
+from .models import Report
 
 from itsdangerous import URLSafeTimedSerializer as utsr
 import base64
diff --git a/backend/vue2-forntend/src/api/user.js b/backend/vue2-forntend/src/api/user.js
index 7e01dec..1e983c4 100644
--- a/backend/vue2-forntend/src/api/user.js
+++ b/backend/vue2-forntend/src/api/user.js
@@ -108,7 +108,8 @@ export function resetPWD(uid,data){
 // 用户反馈
 export function feedback(uid, data) {
   return request({
-    url: `/api/user/${uid}/report/new`,//没确定
+    baseURL: '',
+    url: `/api/user/${uid}/report`,
     method: 'post',
     data,
   })   
diff --git a/backend/vue2-forntend/src/views/Feedback/index.vue b/backend/vue2-forntend/src/views/Feedback/index.vue
index c2df263..0ecf151 100644
--- a/backend/vue2-forntend/src/views/Feedback/index.vue
+++ b/backend/vue2-forntend/src/views/Feedback/index.vue
@@ -4,7 +4,7 @@
           <v-col>
 
             <v-textarea
-              v-model="feed"
+              v-model="content"
               label="您的意见对我们很重要!💖"
               outlined
               class="pa-12"
@@ -14,7 +14,7 @@
               no-resize
             >
               <template v-slot:append>
-                <v-btn @click="submit" :disabled="feed==''" color="primary">
+                <v-btn @click="submit" :disabled="content==''" color="primary">
                   提交
                   <v-icon>mdi-reply</v-icon>
                 </v-btn>
@@ -32,17 +32,22 @@
   import {feedback} from '@/api/user';
   export default {
     data: () => ({
-      feed:  '',
+      content:  '',
     }),
 
     methods: {
       submit() {
-        if (this.feed=='') {
+        if (this.content=='') {
           this.$message("不能为空哦")
         }
         else {
-          feedback(this.$store.getters.uid, this.feed).then(res => {
+          var data = {
+            content: this.content
+          }
+          console.log(data)
+          feedback(this.$store.getters.uid, data).then(res => {
             this.$message('提交成功！感谢您的反馈！补锅侠已经在路上啦！😃')
+            this.content = ''
             console.log(res)
             }).catch(error => {
             console.log(error)
-- 
Gitee