11

11

src/store/modules/user.js

@@ -78,7 +78,7 @@ const actions = {
           resolve(data)
         }
       }).catch(error => {
-        reject(error)
+        reject('获取用户信息错误,请重新登录')
       })
     })
   },

src/views/categroyManager/vipActiveList.vue

@@ -10,7 +10,12 @@
            @click="gotoNewActive">新建</div>
       <el-form :inline="true"
                class="searchForm"
-               v-model.trim="searchForm">
+               ref='searchForm'
+               :model="searchForm">
+        <el-form-item prop="search">
+          <el-input v-model.trim="searchForm.search"
+                    placeholder="请输入活动编号、名称"></el-input>
+        </el-form-item>
         <el-form-item prop="organId">
           <el-select class="multiple"
                      filterable
@@ -24,7 +29,7 @@
                        :value="item.id"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item prop="organId">
+        <el-form-item prop="enable">
           <el-select filterable
                      style="width:180px!important"
                      v-model="searchForm.enable"
@@ -41,6 +46,10 @@
           <el-button @click="search"
                      type="danger">搜索</el-button>
         </el-form-item>
+        <el-form-item>
+          <el-button type='primary'
+                     @click="onReset">重置</el-button>
+        </el-form-item>
       </el-form>
       <div class="tableWrap">
         <el-table :data="tableList"
@@ -384,7 +393,7 @@ export default {
         total: 0, // 总条数
         page_size: [10, 20, 40, 50] // 选择限制显示条数
       },
-      searchForm: { organId: null, enable: null },
+      searchForm: { organId: null, enable: null, search: '' },
       organList: [],
       dialogVisible: false,
       resetForm: {
@@ -609,13 +618,24 @@ export default {
       this.rules.page = 1;
       this.getList();
     },
+    onReset () {
+      // this.searchForm = {
+      //   enable: null,
+      //   search: null,
+      //   organId: null,
+      // }
+      this.$refs['searchForm'].resetFields();
+      this.search()
+    },
     getList () {
       let enable = this.searchForm.enable
+      let search = this.searchForm.search
       vipGroupActivity({
         organId: this.searchForm.organId,
         rows: this.rules.limit,
         page: this.rules.page,
-        enable
+        enable,
+        search
       }).then(res => {
         if (res.code == 200) {
           this.tableList = res.data.rows;

src/views/sporadicManager/sporadicList.vue

@@ -405,6 +405,7 @@ export default {
         type: [{ required: true, message: '请选择收费类型', trigger: 'change' }],
         money: [{ required: true, message: '请输入收费金额', trigger: 'change' }],
         title: [{ required: true, message: '请输入标题名称', trigger: 'change' }],
+        desc: [{ required: true, message: '请输入收费详情' }]
       },
       pageInfo: {
         // 分页规则
@@ -439,6 +440,7 @@ export default {
         money: [{ required: true, message: '请输入收费金额', trigger: 'change' }],
         title: [{ required: true, message: '请输入标题名称', trigger: 'change' }],
         studentId: [{ required: true, message: '请输入学员编号', trigger: 'blur' }],
+        desc: [{ required: true, message: '请输入收费详情' }]
       },
     }
   }, mounted () {

vue.config.js

@@ -21,8 +21,8 @@ const name = defaultSettings.title || '管乐迷后台管理系统' // page titl
 // let target = 'http://192.168.3.139:8000' // 箭河
 // let target = 'http://192.168.3.28:8000' //邹璇
 // let target = 'http://192.168.3.8:8000' //勇哥
-// let target = 'http://dev.dayaedu.com' // 测试服
-let target = 'http://192.168.3.196:8080' // 乔
+let target = 'http://dev.dayaedu.com' // 测试服
+// let target = 'http://192.168.3.196:8080' // 乔
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {
   /**