Merge branch 'master' of http://git.cc-lotus.info/community/ruyi-ui

src/views/activity/activitylog.vue

@@ -193,6 +193,7 @@ export default {
         this.reset();
         this.$modal.msgSuccess((e == 1 ? '审核' : '驳回') + "成功");
       });
+      this.getList();
     },
     handleExport() {
       this.download('/community/activitylog/export', {

src/views/activity/index.vue

@@ -150,6 +150,16 @@
         <el-form-item label="奖励积分" prop="point">
           <el-input v-model="form.point" placeholder="请输入奖励积分" />
         </el-form-item>
+        <el-form-item label="活动类型" prop="type">
+          <el-select v-model="form.type" placeholder="请选择">
+            <el-option
+              v-for="item in typeOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+            </el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" placeholder="请输入备注" />
         </el-form-item>
@@ -207,7 +217,13 @@ export default {
       form: {},
       // 表单校验
       rules: {
-      }
+      },
+      typeOptions: [
+        { value: 'wt', label: '文体' },
+        { value: 'zb', label: '直播' },
+        { value: 'ms', label: '民生' },
+        { value: 'zy', label: '志愿' }
+      ]
     };
   },
   created() {

src/views/points/index.vue

@@ -233,6 +233,7 @@ export default {
           });
         }
       });
+      this.getList();
     },
     /** 导入按钮操作 */
     handleImport() {