huwhois 4 years ago
parent
commit
b4a72a7622

+ 6 - 5
src/views/common/home.vue

130
        url: this.$http.adornUrl('/admin/meeting/list'),
130
        url: this.$http.adornUrl('/admin/meeting/list'),
131
        method: 'get',
131
        method: 'get',
132
        params: this.$http.adornParams({
132
        params: this.$http.adornParams({
133
          page: this.pageIndex,
134
          limit: this.pageSize,
135
          key: this.dataForm.key
133
          // page: this.pageIndex,
134
          // limit: this.pageSize,
135
          // key: this.dataForm.key
136
        })
136
        })
137
      }).then(({ data }) => {
137
      }).then(({ data }) => {
138
        if (data && data.code === 0) {
138
        if (data && data.code === 0) {
139
          this.dataList = data.page.list
140
          this.totalPage = data.page.totalCount
139
          this.dataList = data.list
140
          // this.dataList = data.page.list
141
          // this.totalPage = data.page.totalCount
141
        } else {
142
        } else {
142
          this.dataList = []
143
          this.dataList = []
143
          this.totalPage = 0
144
          this.totalPage = 0

+ 6 - 5
src/views/modules/admin/meeting.vue

217
          url: this.$http.adornUrl('/admin/meeting/list'),
217
          url: this.$http.adornUrl('/admin/meeting/list'),
218
          method: 'get',
218
          method: 'get',
219
          params: this.$http.adornParams({
219
          params: this.$http.adornParams({
220
            'page': this.pageIndex,
221
            'limit': this.pageSize,
222
            'key': this.dataForm.key
220
            // 'page': this.pageIndex,
221
            // 'limit': this.pageSize,
222
            // 'key': this.dataForm.key
223
          })
223
          })
224
        }).then(({data}) => {
224
        }).then(({data}) => {
225
          if (data && data.code === 0) {
225
          if (data && data.code === 0) {
226
            this.dataList = data.page.list
227
            this.totalPage = data.page.totalCount
226
            this.dataList = data.list
227
            // this.dataList = data.page.list
228
            // this.totalPage = data.page.totalCount
228
          } else {
229
          } else {
229
            this.dataList = []
230
            this.dataList = []
230
            this.totalPage = 0
231
            this.totalPage = 0

+ 13 - 1
src/views/modules/admin/sign.vue

57
        prop="typeAttenders"
57
        prop="typeAttenders"
58
        header-align="center"
58
        header-align="center"
59
        align="center"
59
        align="center"
60
        label="参会类型">
60
        label="用户参会类型">
61
      </el-table-column>
61
      </el-table-column>
62
      <el-table-column
62
      <el-table-column
63
        prop="isPay"
63
        prop="isPay"
64
        header-align="center"
64
        header-align="center"
65
        align="center"
65
        align="center"
66
        label="是否已缴费">
66
        label="是否已缴费">
67
        <template slot-scope="scope">
68
          <span v-if="scope.row.isPay === 1">是</span>
69
          <span v-else>否</span>
70
        </template>
67
      </el-table-column>
71
      </el-table-column>
68
      <el-table-column
72
      <el-table-column
69
        prop="status"
73
        prop="status"
70
        header-align="center"
74
        header-align="center"
71
        align="center"
75
        align="center"
72
        label="签到状态">
76
        label="签到状态">
77
        <template slot-scope="scope">
78
          <span v-if="scope.row.status === 1">已签到</span>
79
          <span v-else>否</span>
80
        </template>
73
      </el-table-column>
81
      </el-table-column>
74
      <el-table-column
82
      <el-table-column
75
        prop="badge"
83
        prop="badge"
76
        header-align="center"
84
        header-align="center"
77
        align="center"
85
        align="center"
78
        label="胸卡">
86
        label="胸卡">
87
        <template slot-scope="scope">
88
          <span v-if="scope.row.badge === 1">是</span>
89
          <span v-else>否</span>
90
        </template>
79
      </el-table-column>
91
      </el-table-column>
80
      <el-table-column
92
      <el-table-column
81
        prop="servername"
93
        prop="servername"