Merge branch 'feature/#base_management'

src/api/base/info.js

@@ -1,10 +1,10 @@
 import api from '@/utils/request';
 
 export const getList = params =>
-	api.post(`/yxl-back-end/admin/banner/page`, params);
+	api.post(`/yxl-back-end/admin/tweet/page`, params);
 export const getItem = ({ id, params }) =>
-	api.get(`/yxl-back-end/admin/banner/${id}`, params);
+	api.get(`/yxl-back-end/admin/tweet/${id}`, params);
 export const saveItem = params =>
-	api.post(`/yxl-back-end/admin/banner/save`, params);
+	api.post(`/yxl-back-end/admin/tweet/save`, params);
 export const delItem = ({ id, params }) =>
-	api.del(`/yxl-back-end/admin/banner/${id}`, params);
+	api.del(`/yxl-back-end/admin/tweet/${id}`, params);

src/components/RichText.vue

@@ -27,7 +27,7 @@ export default {
     return {
       intance: null,
       config: {
-        serverUrl: '//ueditor.szcloudplus.com/cos',
+        // serverUrl: '//ueditor.szcloudplus.com/cos',
         // 你的UEditor资源存放的路径，相对于打包后的index.html
         UEDITOR_HOME_URL: './static/UE/',
         // 编辑器不自动被内容撑高

src/main.js

@@ -61,10 +61,10 @@ Vue.prototype.$success = message.success;
 Vue.prototype.$error = message.error;
 Vue.prototype.$warning = message.warning;
 
-// window.UEDITOR_CONFIG = `${process.env.VUE_APP_BASE_API}/oss/ueditor/ueditor-action`;
-// window.UEDITOR_SERVER_URL = `${process.env.VUE_APP_BASE_API}/oss/ueditor/ueditor-action`;
-window.UEDITOR_CONFIG = `https://ex.by-health.com/baby-institute-back-end/oss/ueditor/ueditor-action`;
-window.UEDITOR_SERVER_URL = `https://ex.by-health.com/baby-institute-back-end/oss/ueditor/ueditor-action`;
+window.UEDITOR_CONFIG = `${process.env.VUE_APP_BASE_API}yxl-back-end/framework/oss/ueditor/ueditor-action`;
+window.UEDITOR_SERVER_URL = `${process.env.VUE_APP_BASE_API}yxl-back-end/framework/oss/ueditor/ueditor-action`;
+// window.UEDITOR_CONFIG = `https://ex.by-health.com/baby-institute-back-end/oss/ueditor/ueditor-action`;
+// window.UEDITOR_SERVER_URL = `https://ex.by-health.com/baby-institute-back-end/oss/ueditor/ueditor-action`;
 
 new Vue({
   el: '#app',

src/mixins/filterList.js

@@ -58,12 +58,12 @@ const filterList = (params = {}) => ({
           this.pagination = total;
         }
         this.loadCallBack(data);
-      } else {
-        Message({
-          message: msg,
-          type: 'error',
-          duration: 5 * 1000
-        });
+        // } else {
+        //   Message({
+        //     message: msg,
+        //     type: 'error',
+        //     duration: 5 * 1000
+        //   });
       }
     },
 

src/views/baseManagement/bannerManagement/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="">
-    <toolbar @onSearch="filterData" />
+    <toolbar @on-filter="filterData" @on-reset="filterData" />
 
     <div class="m-10 bg-w p-20 br-10">
       <el-button type="primary" icon="el-icon-plus" @click="handleAdd"

src/views/baseManagement/infoManagement/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="">
-    <toolbar @onSearch="filterData" />
+    <toolbar @on-filter="filterData" @on-reset="filterData" />
 
     <div class="m-10 bg-w p-20 br-10">
       <el-button type="primary" icon="el-icon-plus" @click="handleAdd"
@@ -122,6 +122,14 @@ export default {
     };
   },
 
+  created() {
+    this.$g_on('base_info_reload', this.reload);
+  },
+
+  beforeDestroy() {
+    this.$g_off('base_info_reload', this.reload);
+  },
+
   methods: {
     handleAdd() {
       this.$InfoItemModal();

src/views/baseManagement/infoManagement/modal/ItemModal.vue

@@ -2,7 +2,7 @@
   <el-dialog
     :title="title"
     :visible.sync="modal"
-    width="500px"
+    width="80%"
     :close-on-click-modal="false"
     @close="
       res => {
@@ -12,15 +12,18 @@
   >
     <el-form ref="form" :model="form" :rules="rules" label-width="100px">
       <el-form-item label="作者" prop="author">
-        <el-input v-model="form.author" :disabled="id"></el-input>
+        <el-input v-model="form.author" :disabled="id !== ''"></el-input>
       </el-form-item>
       <el-form-item label="标题" prop="title">
         <el-input v-model="form.title"></el-input>
       </el-form-item>
-      <!-- TODO 富文本编辑 -->
-      <!-- <el-form-item label="链接" prop="link">
-        <el-input v-model="form.link"></el-input>
-      </el-form-item> -->
+      <el-form-item label="简介" prop="brief">
+        <el-input v-model="form.brief" type="textarea" :rows="2"></el-input>
+      </el-form-item>
+      <!-- TODO 上传封面 -->
+      <el-form-item label="内容" prop="content">
+        <RichText v-model="form.content"></RichText>
+      </el-form-item>
       <el-form-item label="状态">
         <el-radio-group v-model="form.isShow" prop="isShow">
           <el-radio :label="true">显示</el-radio>
@@ -63,14 +66,16 @@ export default {
       form: {
         author: '',
         title: '',
-        // content: '',
+        brief: '',
+        content: '',
         isShow: false,
         sort: 1
       },
       rules: {
         author: [{ required: true, message: '请输入作者', trigger: 'change' }],
-        title: [{ required: true, message: '请输入标题', trigger: 'change' }]
-        // content: [{ required: true, message: '请输入链接地址', trigger: 'change' }]
+        title: [{ required: true, message: '请输入标题', trigger: 'change' }],
+        brief: [{ required: true, message: '请输入简介', trigger: 'change' }],
+        content: [{ required: true, message: '请输入内容', trigger: 'change' }]
       },
 
       typeOptions: []
@@ -112,13 +117,13 @@ export default {
       this.$refs.form.validate(async valid => {
         if (valid) {
           const params = Object.assign({}, this.form);
+          params.cover = '';
           if (this.id) params.id = this.id;
           const { success, msg } = await saveItem(params);
           if (success) {
             this.$success('保存成功！');
             this.modal = false;
-          } else {
-            this.$error(msg);
+            this.$g_emit('base_info_reload');
           }
         }
       });

src/views/baseManagement/infoManagement/toolbar.vue

@@ -23,7 +23,7 @@ export default {
           type: 'dateArray',
           name: 'date',
           label: '发布日期',
-          apiName: ['start', 'end']
+          apiName: ['startTime', 'endTime']
         }
       ]
     };

src/views/baseManagement/problemFeedbackManagement/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="">
-    <toolbar @onSearch="filterData" />
+    <toolbar @on-filter="filterData" @on-reset="filterData" />
 
     <base-table
       class="m-10 bg-w p-20 br-10"

src/views/financialManagement/fundDetail/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="">
-    <toolbar @onSearch="filterData" />
+    <toolbar @on-filter="filterData" @on-reset="filterData" />
 
     <base-table
       class="m-10 bg-w p-20 br-10"

src/views/financialManagement/orderManagement/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="">
-    <toolbar @onSearch="filterData" />
+    <toolbar @on-filter="filterData" @on-reset="filterData" />
 
     <base-table
       class="m-10 bg-w p-20 br-10"

src/views/helpInfo/information/modal/ItemModal.vue

@@ -15,7 +15,6 @@
         <el-input v-model="form.name"></el-input>
       </el-form-item>
       <el-form-item label="内容" prop="content">
-        <!-- TODO 富文本编辑框 -->
         <RichText v-model="form.content"></RichText>
       </el-form-item>
       <el-form-item label="分类" prop="helpGroupId">

src/views/memberManagement/memberList/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="">
-    <toolbar @onSearch="filterData" />
+    <toolbar @on-filter="filterData" @on-reset="filterData" />
 
     <base-table
       class="m-10 bg-w p-20 br-10"

src/views/photoManagement/eventsList/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="">
-    <toolbar @onSearch="filterData" />
+    <toolbar @on-filter="filterData" @on-reset="filterData" />
 
     <base-table
       class="m-10 bg-w p-20 br-10"

src/views/photoManagement/imageGoodsManagement/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="">
-    <toolbar @onSearch="filterData" />
+    <toolbar @on-filter="filterData" @on-reset="filterData" />
 
     <base-table
       class="m-10 bg-w p-20 br-10"

src/views/photoManagement/uploadManagement/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="">
-    <toolbar @onSearch="filterData" />
+    <toolbar @on-filter="filterData" @on-reset="filterData" />
 
     <base-table
       class="m-10 bg-w p-20 br-10"

src/views/photographerManagement/photoVerify/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="">
-    <toolbar @onSearch="filterData" />
+    <toolbar @on-filter="filterData" @on-reset="filterData" />
 
     <base-table
       class="m-10 bg-w p-20 br-10"

src/views/photographerManagement/photographerVerify/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="">
-    <toolbar @onSearch="filterData" />
+    <toolbar @on-filter="filterData" @on-reset="filterData" />
 
     <base-table
       class="m-10 bg-w p-20 br-10"

src/views/pointsManagement/pointsDetail/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="">
-    <toolbar @onSearch="filterData" />
+    <toolbar @on-filter="filterData" @on-reset="filterData" />
 
     <base-table
       class="m-10 bg-w p-20 br-10"

src/views/sceneManagement/sceneList/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="">
-    <toolbar @onSearch="filterData" />
+    <toolbar @on-filter="filterData" @on-reset="filterData" />
 
     <div class="m-10 bg-w p-20 br-10">
       <el-button type="primary" icon="el-icon-plus" @click="handleSubmit"

src/views/sceneManagement/sceneVerify/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="">
-    <toolbar @onSearch="filterData" />
+    <toolbar @on-filter="filterData" @on-reset="filterData" />
 
     <base-table
       class="m-10 bg-w p-20 br-10"

src/views/statistics/downloadImage/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="">
-    <toolbar @onSearch="filterData" />
+    <toolbar @on-filter="filterData" @on-reset="filterData" />
 
     <base-table
       class="m-10 bg-w p-20 br-10"

src/views/statistics/uploadImage/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="">
-    <toolbar @onSearch="filterData" />
+    <toolbar @on-filter="filterData" @on-reset="filterData" />
 
     <base-table
       class="m-10 bg-w p-20 br-10"

src/views/statistics/withdrawalRecord/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="">
-    <toolbar @onSearch="filterData" />
+    <toolbar @on-filter="filterData" @on-reset="filterData" />
 
     <base-table
       class="m-10 bg-w p-20 br-10"

src/views/systemManagement/accountManagement/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="">
-    <toolbar @onSearch="filterData" />
+    <toolbar @on-filter="filterData" @on-reset="filterData" />
 
     <div class="m-10 bg-w p-20 br-10">
       <el-button type="primary" icon="el-icon-plus" @click="handleSubmit"

src/views/systemManagement/roleManagement/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="">
-    <toolbar @onSearch="filterData" />
+    <toolbar @on-filter="filterData" @on-reset="filterData" />
 
     <div class="m-10 bg-w p-20 br-10">
       <el-button type="primary" icon="el-icon-plus" @click="handleSubmit"