合并

MrShi

5 小时以前 41115bb4b6d0161ff6d2c15ef6b3d5386a14ac9c

 admin/src/views/business/integral.vue

@@ -1,7 +1,7 @@
<template>
  <TableLayout :permissions="['business:integral:query']">
    <!-- 搜索表单 -->
    <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
    <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" >
      <el-form-item label="用户" prop="nickName">
        <el-input v-model="searchForm.nickName" placeholder="请输入用户昵称/或手机号" @keypress.enter.native="search"></el-input>
      </el-form-item>
@@ -26,7 +26,6 @@
          <el-option :key="18" :value="18" label="积分过期"></el-option>
        </el-select>
      </el-form-item>
      <div class="date-style" style="display: inline">
        <el-form-item label="变动时间" prop="starttime" >
          <el-date-picker
              style="width: 160px"
@@ -51,7 +50,6 @@
              placeholder="截止时间"
          ></el-date-picker>
        </el-form-item>
      </div>
      <section>
        <el-button type="primary" @click="search">搜索</el-button>
<!--