From df188ebfcb85efe6c77a04026cd1b530e3eb9a54 Mon Sep 17 00:00:00 2001
From: "20932067@zju.edu.cn" <Clay>
Date: Sat, 20 Mar 2021 13:43:09 +0800
Subject: [PATCH] 11

---
 src/api/complaint.js                         |  13 ++
 src/api/mail.js                              |   2 +-
 src/components/admin/SuggestList.vue         |  33 ++--
 src/components/admin/mail/Index.vue          |   5 +-
 src/components/admin/message/SendMessage.vue | 173 +++++++------------
 src/components/loginRegister/Login.vue       |   4 +-
 6 files changed, 100 insertions(+), 130 deletions(-)
 create mode 100644 src/api/complaint.js

diff --git a/src/api/complaint.js b/src/api/complaint.js
new file mode 100644
index 0000000..9189e8d
--- /dev/null
+++ b/src/api/complaint.js
@@ -0,0 +1,13 @@
+import axios from './api.config'
+import qs from 'qs'
+
+// 获取投诉与建议
+export const getComplaint = (data) => {
+  return axios.request({
+    url: 'getcomplaint',
+    data: qs.stringify({
+      page: 1,
+      size: 10000
+    }, {arrayFormat: 'brackets'})
+  })
+}
diff --git a/src/api/mail.js b/src/api/mail.js
index 2cae0a6..7819499 100644
--- a/src/api/mail.js
+++ b/src/api/mail.js
@@ -4,7 +4,7 @@ import qs from 'qs'
 // 获取邮箱配置信息
 export const getMailInfo = () => {
   return axios.request({
-    url: 'getmailconfig',
+    url: 'getmailconfig'
   })
 }
 // 获取用户所以信息列表
diff --git a/src/components/admin/SuggestList.vue b/src/components/admin/SuggestList.vue
index 3e83c90..bd06b6b 100644
--- a/src/components/admin/SuggestList.vue
+++ b/src/components/admin/SuggestList.vue
@@ -31,6 +31,7 @@
 
 <script>
 import axios from 'axios'
+import {getComplaint} from '../../api/complaint'
 export default {
     data(){
         return{
@@ -42,21 +43,27 @@ export default {
     },
     methods:{
         getSuggestList(){
-            let loading = this.$loading({lock:true,text:'玩命加载中...'});
-            axios.get(`/admin/suggestList`).then(response=>{
-                let res = response.data;
-                loading.close();
-                if(res.status=='0'){
-                    this.suggestList = res.result;
-                }else{
-                    console.log(res.msg);    
-                }
-            }).catch(err=>{
-                console.log(err);
-            });
+            // let loading = this.$loading({lock:true,text:'玩命加载中...'});
+          getComplaint().then(res=>{
+            console.log(res)
+          })
+
+
+
+            // axios.get(`/admin/suggestList`).then(response=>{
+            //     let res = response.data;
+            //     loading.close();
+            //     if(res.status=='0'){
+            //         this.suggestList = res.result;
+            //     }else{
+            //         console.log(res.msg);
+            //     }
+            // }).catch(err=>{
+            //     console.log(err);
+            // });
         }
     }
-    
+
 }
 </script>
 
diff --git a/src/components/admin/mail/Index.vue b/src/components/admin/mail/Index.vue
index 19d75a6..f3e1922 100644
--- a/src/components/admin/mail/Index.vue
+++ b/src/components/admin/mail/Index.vue
@@ -3,6 +3,7 @@
     <h1>邮件配置</h1>
     <div>
       <el-form ref="mailConfig"
+               class="admin-sendMessage"
                label-width="120px" :model="mailForm">
         <el-form-item label="发件人地址:">
           <el-input v-model="mailForm.sender"></el-input>
@@ -82,7 +83,7 @@ export default {
         }else{
           this.$message({
             type: 'error',
-            message: data.msg
+            message: '获取内容失败!'
           })
         }
       })
@@ -98,7 +99,7 @@ export default {
         }else {
           this.$message({
             type: 'error',
-            message: data.msg
+            message: '发送失败!'
           })
         }
       })
diff --git a/src/components/admin/message/SendMessage.vue b/src/components/admin/message/SendMessage.vue
index def69e4..0186277 100644
--- a/src/components/admin/message/SendMessage.vue
+++ b/src/components/admin/message/SendMessage.vue
@@ -1,126 +1,75 @@
 <template>
-    <div class="sendMessage-page">
-        <person-title>当前位置 :: 消息系统 >> <em>发送消息</em></person-title>
-        <div class="sendMessage-page-cont">
-            <el-form  ref="sendMessageForm"
-            :model="sendMessageForm" class="admin-sendMessage">
-                <el-form-item label="发送类型 :">
-                    <el-radio-group v-model="sendMessageForm.msgWho">
-                    <el-radio label="all" >群发</el-radio>
-                    <el-radio label="one" >单发</el-radio>
-                    </el-radio-group>
-                </el-form-item>
-                <template  v-if="sendMessageForm.msgWho=='one'">
-                    <el-form-item label="对象级别 :">
-                        <el-radio-group v-model="sendMessageForm.msgOneGrade">
-                        <el-radio :label="0" >普通用户</el-radio>
-                        <el-radio :label="1" >工作人员</el-radio>
-                        </el-radio-group>
-                    </el-form-item>
-                    <el-form-item label="单发对象 :" >
-                        <el-input v-model="sendMessageForm.userId"
-                        placeholder="请输入收消息人账号"></el-input>
-                    </el-form-item>
-                </template>
-                <template v-else>
-                <el-form-item label="单发对象 :" >
-                    <el-checkbox-group 
-                        v-model="sendMessageForm.msgAllList"
-                        :min="1"
-                        :max="2">
-                        <el-checkbox :label="0">普通用户</el-checkbox>
-                        <el-checkbox :label="1">工作人员</el-checkbox>
-                    </el-checkbox-group>
-                </el-form-item>
-                </template>
-                <el-form-item label="标题 :" >
-                    <el-input v-model="sendMessageForm.msgTitle"
+  <div class="sendMessage-page">
+    <person-title>当前位置 :: 消息系统 >> <em>发送消息</em></person-title>
+    <div class="sendMessage-page-cont">
+      <el-form ref="sendMessageForm"
+               :model="sendMessageForm" class="admin-sendMessage">
+        <el-form-item label="发送类型 :">
+          <el-radio-group v-model="sendMessageForm.msgwho">
+            <el-radio :label="1">群发</el-radio>
+            <el-radio :label="2">单发</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <template v-if="sendMessageForm.msgwho==1">
+          <el-form-item label="对象级别 :">
+            <el-radio-group v-model="sendMessageForm.msgOneGrade">
+              <el-radio :label="1">全部</el-radio>
+              <el-radio :label="2">快递员</el-radio>
+              <el-radio :label="3">普通用户</el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </template>
+        <template v-else>
+          <el-form-item label="单发对象 :">
+            <el-input v-model="sendMessageForm.phone" placeholder="请输入对方电话!" clearable></el-input>
+          </el-form-item>
+        </template>
+        <el-form-item label="标题 :">
+          <el-input v-model="sendMessageForm.msgTitle"
                     placeholder="消息标题"></el-input>
-                </el-form-item>
-                <el-form-item label="消息 : ">
-                    <el-input type="textarea" :rows="4"
-                    placeholder="请输入内容..." 
-                    v-model="sendMessageForm.remarks">
-                    </el-input>
-                </el-form-item>  
-                <el-form-item>
-                    <el-button type="primary" @click="handleSendMessage">发送消息</el-button>
-                </el-form-item>
-            </el-form>
-        </div>
+        </el-form-item>
+        <el-form-item label="消息 : ">
+          <el-input type="textarea" :rows="4"
+                    placeholder="请输入内容..."
+                    v-model="sendMessageForm.content">
+          </el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="handleSendMessage">发送消息</el-button>
+        </el-form-item>
+      </el-form>
     </div>
+  </div>
 </template>
 
 <script>
-import axios from  'axios'
+import axios from 'axios'
+
 export default {
-    data(){
-        return{ 
-            sendMessageForm:{
-                msgWho:'all',
-                userId:'',
-                msgTitle:'',
-                remarks:'',
-                msgOneGrade:0,
-                msgAllList:[0]
-            }
-        }
-    },
-    methods:{
-        messageFormTest(){
-            let msgData = this.sendMessageForm;
-            if(msgData.remarks=='' && msgData.msgTitle==''){
-                return false
-            }else{
-                if(msgData.msgWho=='all'){
-                    return true
-                }else if(msgData.msgWho=='one' && /^1[3-8][0-9]{9}$/.test(msgData.userId)){
-                    return true
-                }else{
-                    return false
-                }
-            }
-            
-        },
-        handleSendMessage(){
-            let flag = this.messageFormTest();
-            if(flag){
-                let loading = this.$loading({lock:true,text:'玩命加载中...'});
-                axios.post(`/admin/sendMessage`,this.sendMessageForm).then(response=>{
-                    let res = response.data;
-                    loading.close();
-                    if(res.status=='0'){
-                        this.$message({
-                            type: 'success',
-                            message: '发送成功!',
-                            showClose:true
-                        });
-                    }else{   
-                        this.$message({
-                            type: 'error',
-                            message: res.msg,
-                            showClose:true
-                        });
-                    }
-                }).catch(err=>{
-                    console.log(err);
-                    loading.close();
-                })
-            }else{
-                this.$message({
-                    type: 'error',
-                    message: '条件格式不正确!',
-                    showClose:true
-                });
-            }
-        }
+  data () {
+    return {
+      sendMessageForm: {
+        msgwho: 1,
+        phone: '',
+        userId: '',
+        msgTitle: '',
+        content: '',
+        msgOneGrade: 0,
+      }
     }
+  },
+  methods: {
+    handleSendMessage () {
+      let loading = this.$loading({lock: true, text: '玩命加载中...'})
+      loading.close()
+    }
+  }
 }
 </script>
 
 <style>
-.sendMessage-page-cont{
-    width: 60%;
-    margin: 0 auto;
+.sendMessage-page-cont {
+  width: 60%;
+  margin: 0 auto;
 }
 </style>
diff --git a/src/components/loginRegister/Login.vue b/src/components/loginRegister/Login.vue
index a5c4ccd..704c04d 100644
--- a/src/components/loginRegister/Login.vue
+++ b/src/components/loginRegister/Login.vue
@@ -60,8 +60,8 @@
     },
     methods: {
       userLogin (data) {
-        // const baseUrl = 'http://localhost:8083/api/'
-        const baseUrl = 'https://api.tomey.live/api/'
+        const baseUrl = 'http://localhost:8083/api/'
+        // const baseUrl = 'https://api.tomey.live/api/'
         console.log(baseUrl)
         axios({
           method: 'post',