From 83d75d657853722d77422a523be5cfb16f158e1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E4=B8=BD=E5=90=9B?= <664953382@qq.com>
Date: Wed, 12 Jan 2022 14:38:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=95=99=E8=A8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/website/message.js                   |  26 +++
 src/store/modules/permission.js              |   7 +-
 src/views/system/menu/index.vue              |   6 +-
 src/views/website/aboutUs/index.vue          |   3 +
 src/views/website/activity/active/index.vue  |   3 +
 src/views/website/activity/active/signUp.vue |   3 +
 src/views/website/activity/apply/index.vue   |   3 +
 src/views/website/message/index.vue          | 200 ++++++++++++++-----
 8 files changed, 190 insertions(+), 61 deletions(-)
 create mode 100644 src/api/website/message.js
 create mode 100644 src/views/website/aboutUs/index.vue
 create mode 100644 src/views/website/activity/active/index.vue
 create mode 100644 src/views/website/activity/active/signUp.vue
 create mode 100644 src/views/website/activity/apply/index.vue

diff --git a/src/api/website/message.js b/src/api/website/message.js
new file mode 100644
index 0000000..20bd8c4
--- /dev/null
+++ b/src/api/website/message.js
@@ -0,0 +1,26 @@
+import request from '@/utils/request'
+
+// 留言列表
+export function messageList(data) {
+	return request({
+		url: '/admin/v1/service/message',
+		method: 'post',
+		data,
+	})
+}
+// 留言删除
+export function messageDelete(data) {
+	return request({
+		url: '/admin/v1/service/message/delete',
+		method: 'post',
+		data,
+	})
+}
+// 留言处理
+export function messageHandle(data) {
+	return request({
+		url: '/admin/v1/service/message/handle',
+		method: 'post',
+		data,
+	})
+}
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index bc575b9..da23cf8 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -90,9 +90,10 @@ function handleStr(str, flag) {
 }
 
 function handleComponent(src, flag) {
-	if (flag && src.kind == 1 && src.children.length > 0) {
-		// return src.children[0].component
-		return 'ParentView'
+	if (flag && src.kind == 1) {
+		if (src.children.length > 0 || src.component.length <= 0) {
+			return 'ParentView'
+		}
 	}
 	return src.component
 }
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index 0603526..19c2f32 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -481,6 +481,9 @@ export default {
     submitForm: function () {
       this.$refs["form"].validate((valid) => {
         if (valid) {
+          if (this.form.kind === 1) {
+            this.form.component = "Layout";
+          }
           if (this.form.id) {
             updateMenu(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
@@ -488,9 +491,6 @@ export default {
               this.getList();
             });
           } else {
-            if (this.form.kind === 1) {
-              this.form.component = "Layout";
-            }
             addMenu(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
diff --git a/src/views/website/aboutUs/index.vue b/src/views/website/aboutUs/index.vue
new file mode 100644
index 0000000..8bf0524
--- /dev/null
+++ b/src/views/website/aboutUs/index.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>关于我们</div>
+</template>
\ No newline at end of file
diff --git a/src/views/website/activity/active/index.vue b/src/views/website/activity/active/index.vue
new file mode 100644
index 0000000..162a878
--- /dev/null
+++ b/src/views/website/activity/active/index.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>活动列表</div>
+</template>
diff --git a/src/views/website/activity/active/signUp.vue b/src/views/website/activity/active/signUp.vue
new file mode 100644
index 0000000..436a4da
--- /dev/null
+++ b/src/views/website/activity/active/signUp.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>活动报名2222222222222</div>
+</template>
\ No newline at end of file
diff --git a/src/views/website/activity/apply/index.vue b/src/views/website/activity/apply/index.vue
new file mode 100644
index 0000000..e0d16f7
--- /dev/null
+++ b/src/views/website/activity/apply/index.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>申请</div>
+</template>
\ No newline at end of file
diff --git a/src/views/website/message/index.vue b/src/views/website/message/index.vue
index d48703d..dd04f84 100644
--- a/src/views/website/message/index.vue
+++ b/src/views/website/message/index.vue
@@ -25,13 +25,17 @@
           style="width: 240px"
           @clear="delete queryParams.status"
         >
-          <el-option label="已处理" :value="1" />
-          <el-option label="未处理" :value="2" />
+          <el-option
+            v-for="item in statusOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          ></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="需求内容" prop="name">
+      <el-form-item label="需求内容" prop="content">
         <el-input
-          v-model="queryParams.name"
+          v-model="queryParams.content"
           placeholder="请输入需求内容"
           clearable
           size="small"
@@ -53,7 +57,7 @@
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
+    <!-- <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
           type="primary"
@@ -64,24 +68,42 @@
           >新增</el-button
         >
       </el-col>
-      <right-toolbar
-        :showSearch.sync="showSearch"
-        @queryTable="getList"
-      ></right-toolbar>
-    </el-row>
+      
+    </el-row> -->
+    <right-toolbar
+      :showSearch.sync="showSearch"
+      @queryTable="getList"
+    ></right-toolbar>
 
-    <el-table v-loading="loading" :data="tenantList">
-      <el-table-column label="需求内容" prop="name" width="120" />
-      <el-table-column label="姓名" prop="contact" align="center" />
-      <el-table-column label="单位" prop="contact_mobile" align="center" />
-      <el-table-column label="联系方式" prop="domain" align="center" />
-      <el-table-column label="邮箱" prop="area" align="center" />
-      <el-table-column label="提交网页地址" prop="area" align="center" />
-      <el-table-column label="处理状态" prop="area" align="center" />
-      <el-table-column label="处理结果" prop="area" align="center" />
-      <el-table-column label="创建时间" prop="created_at" align="center">
+    <el-table v-loading="loading" :data="dataList">
+      <el-table-column label="数据编号" prop="id" width="120" />
+      <el-table-column
+        label="需求内容"
+        prop="content"
+        align="center"
+        show-overflow-tooltip
+      />
+      <el-table-column label="姓名" prop="name" align="center" />
+      <el-table-column label="单位" prop="company" align="center" />
+      <el-table-column label="联系方式" prop="mobile" align="center" />
+      <el-table-column label="邮箱" prop="email" align="center" />
+      <el-table-column label="提交网页地址" prop="area_domain" align="center" />
+      <el-table-column label="处理状态" prop="status" align="center">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.created_at) }}</span>
+          {{
+            statusOptions.find((item) => item.value == scope.row.status).label
+          }}
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="处理结果"
+        prop="handle_content"
+        align="center"
+        show-overflow-tooltip
+      />
+      <el-table-column label="处理时间" prop="handle_created_at" align="center">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.handle_created_at) }}</span>
         </template>
       </el-table-column>
       <el-table-column
@@ -94,7 +116,7 @@
             size="mini"
             type="text"
             icon="el-icon-view"
-            @click="handleUpdate(scope.row)"
+            @click="(form = scope.row), (open = true)"
             >查看</el-button
           >
           <el-button
@@ -105,10 +127,11 @@
             >删除</el-button
           >
           <el-button
+            v-if="scope.row.status != 2"
             size="mini"
             type="text"
             icon="el-icon-edit"
-            @click="handleDelete(scope.row)"
+            @click="handleUpdate(scope.row)"
             >处理</el-button
           >
         </template>
@@ -121,21 +144,85 @@
       :limit.sync="queryParams.page_size"
       @pagination="getList"
     />
+    <el-dialog title="查看" :visible.sync="open" width="500px">
+      <el-form ref="form" :model="form" label-width="100px" disabled>
+        <el-form-item label="姓名:">
+          <el-input v-model="form.name" />
+        </el-form-item>
+        <el-form-item label="单位:">
+          <el-input v-model="form.company" />
+        </el-form-item>
+        <el-form-item label="联系方式:">
+          <el-input v-model="form.mobile" />
+        </el-form-item>
+        <el-form-item label="邮箱:">
+          <el-input v-model="form.email" />
+        </el-form-item>
+        <el-form-item label="网页地址:">
+          <el-input v-model="form.area_domain" />
+        </el-form-item>
+        <el-form-item label="需求内容:">
+          <el-input
+            v-model="form.content"
+            type="textarea"
+            :autosize="{ minRows: 2, maxRows: 6 }"
+          />
+        </el-form-item>
+        <el-form-item label="处理状态:">
+          <el-select v-model="form.status">
+            <el-option
+              v-for="item in statusOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="处理结果:">
+          <el-input
+            v-model="form.handle_content"
+            type="textarea"
+            :autosize="{ minRows: 2, maxRows: 6 }"
+          />
+        </el-form-item>
+      </el-form>
+    </el-dialog>
   </div>
 </template>
 <script>
+import {
+  messageList,
+  messageDelete,
+  messageHandle,
+} from "@/api/website/message";
 export default {
   data() {
     return {
-      loading: false,
+      loading: true,
       showSearch: true,
+      statusOptions: [
+        {
+          label: "未处理",
+          value: 1,
+        },
+        {
+          label: "已处理",
+          value: 2,
+        },
+      ],
       queryParams: {
         name: undefined,
+        status: undefined,
+        content: undefined,
         page_num: 1,
         page_size: 10,
       },
       total: 0,
-      tenantList: [1],
+      dataList: [],
+      // 是否显示弹出层
+      open: false,
+      // 表单参数
+      form: {},
     };
   },
   methods: {
@@ -149,42 +236,45 @@ export default {
     },
     getList() {
       this.loading = true;
-      tenant(this.queryParams).then((res) => {
-        this.tenantList = res.data.data;
+      messageList(this.queryParams).then((res) => {
+        this.dataList = res.data.data;
         this.total = res.data.count;
         this.loading = false;
       });
     },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.memberOpen = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: undefined,
-        name: undefined,
-        domain: undefined,
-        province: "",
-        city: "",
-        contact: undefined,
-        contact_mobile: undefined,
-      };
-      this.resetForm("form");
-    },
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加子系统";
-    },
     handleUpdate(row) {
-      this.reset();
-      this.form = Object.assign({}, row);
-      this.open = true;
-      this.title = "修改子系统";
+      this.$prompt('请输入数据编号为"' + row.id + '"的处理结果', "处理", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        closeOnClickModal: false,
+        inputType: "textarea",
+        // inputPattern: /^.{5,20}$/,
+        // inputErrorMessage: "长度必须介于 5 和 20 之间",
+      })
+        .then(({ value }) => {
+          messageHandle({ id: row.id, content: value }).then((response) => {
+            this.getList();
+            this.$modal.msgSuccess("处理成功");
+          });
+        })
+        .catch(() => {});
     },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      this.$modal
+        .confirm('是否确认删除编号为"' + row.id + '"的数据项？')
+        .then(function () {
+          return messageDelete({ id: row.id });
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
+    },
+  },
+  created() {
+    this.getList();
   },
 };
 </script>
\ No newline at end of file