合并

MrShi

18 小时以前 e4f9739d74323aacf09d139700f22a383910ee97

 admin/src/views/business/integral.vue

@@ -2,20 +2,20 @@
  <TableLayout :permissions="['business:integral:query']">
    <!-- 搜索表单 -->
    <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>
      <el-form-item label="获得/扣除" prop="type">
        <el-select v-model="searchForm.type"    placeholder="请选择收支类型"   @change="search" >
        <el-select v-model="searchForm.type"   style="width: 150px"  clearable  placeholder="请选择收支类型"   @change="search" >
          <el-option :key="0" :value="0" label="获得"></el-option>
          <el-option :key="1" :value="1" label="扣除"></el-option>
        </el-select>
      </el-form-item>
      <el-form-item label="用户" prop="nickName">
        <el-input v-model="searchForm.nickName" clearable placeholder="请输入用户昵称/或手机号" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="关联订单号" prop="orderCode">
        <el-input v-model="searchForm.orderCode" placeholder="请输入平台订单号" @keypress.enter.native="search"></el-input>
        <el-input v-model="searchForm.orderCode"  placeholder="订单号" clearable @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="消费类型" prop="objType">
        <el-select v-model="searchForm.objType"    placeholder="请选择消费类型"   @change="search" >
        <el-select v-model="searchForm.objType"  style="width: 150px"  clearable placeholder="请选择消费类型"   @change="search" >
          <el-option :key="0" :value="0" label="注册成功"></el-option>
          <el-option :key="3" :value="3" label="邀请好友得积分"></el-option>
          <el-option :key="12" :value="12" label="积分发放"></el-option>
@@ -28,8 +28,8 @@
      </el-form-item>
        <el-form-item label="变动时间" prop="starttime" >
          <el-date-picker
              style="width: 160px"
              clearable
              style="width: 190px;margin-right: 5px;"
              clearable @change="search"
              v-model="searchForm.starttime"
              type="datetime"
              value-format="yyyy-MM-dd HH:mm:ss"
@@ -40,8 +40,8 @@
        </el-form-item>
        <el-form-item label="-" label-width="10px" prop="endtime" >
          <el-date-picker
              style="width: 160px"
              clearable
              style="width: 190px"
              clearable @change="search"
              v-model="searchForm.endtime"
              type="datetime"
              value-format="yyyy-MM-dd HH:mm:ss"