Merge branch 'master' into online

dist/static/css/chunk-0f26e1a4.4dfc1c7b.css

@@ -1 +1,5 @@
-.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}.el-button--primary[data-v-29a34556],.el-button--primary[data-v-29a34556]:active,.el-button--primary[data-v-29a34556]:focus,.el-button--primary[data-v-29a34556]:hover{background:#14928a;border-color:#14928a;color:#fff}[data-v-29a34556] .el-image-viewer__close{color:#fff;opacity:1}[data-v-29a34556] .el-date-editor.el-input,[data-v-29a34556] .el-select{width:100%!important}[data-v-29a34556] .el-table .cell{display:-webkit-box;overflow:hidden;text-overflow:ellipsis;-webkit-line-clamp:3;-webkit-box-orient:vertical}
+<<<<<<< HEAD:dist/static/css/chunk-0f26e1a4.4dfc1c7b.css
+.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}.el-button--primary[data-v-29a34556],.el-button--primary[data-v-29a34556]:active,.el-button--primary[data-v-29a34556]:focus,.el-button--primary[data-v-29a34556]:hover{background:#14928a;border-color:#14928a;color:#fff}[data-v-29a34556] .el-image-viewer__close{color:#fff;opacity:1}[data-v-29a34556] .el-date-editor.el-input,[data-v-29a34556] .el-select{width:100%!important}[data-v-29a34556] .el-table .cell{display:-webkit-box;overflow:hidden;text-overflow:ellipsis;-webkit-line-clamp:3;-webkit-box-orient:vertical}
+=======
+.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}.el-button--primary[data-v-31cec2d1],.el-button--primary[data-v-31cec2d1]:active,.el-button--primary[data-v-31cec2d1]:focus,.el-button--primary[data-v-31cec2d1]:hover{background:#14928a;border-color:#14928a;color:#fff}[data-v-31cec2d1] .el-image-viewer__close{color:#fff;opacity:1}[data-v-31cec2d1] .el-date-editor.el-input,[data-v-31cec2d1] .el-select{width:100%!important}[data-v-31cec2d1] .el-table .cell{display:-webkit-box;overflow:hidden;text-overflow:ellipsis;-webkit-line-clamp:3;-webkit-box-orient:vertical}
+>>>>>>> master:dist/static/css/chunk-40f7152e.c47ee2ba.css

dist/static/css/chunk-40f7152e.c47ee2ba.css

@@ -0,0 +1,5 @@
+<<<<<<< HEAD:dist/static/css/chunk-0f26e1a4.4dfc1c7b.css
+.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}.el-button--primary[data-v-29a34556],.el-button--primary[data-v-29a34556]:active,.el-button--primary[data-v-29a34556]:focus,.el-button--primary[data-v-29a34556]:hover{background:#14928a;border-color:#14928a;color:#fff}[data-v-29a34556] .el-image-viewer__close{color:#fff;opacity:1}[data-v-29a34556] .el-date-editor.el-input,[data-v-29a34556] .el-select{width:100%!important}[data-v-29a34556] .el-table .cell{display:-webkit-box;overflow:hidden;text-overflow:ellipsis;-webkit-line-clamp:3;-webkit-box-orient:vertical}
+=======
+.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}.el-button--primary[data-v-31cec2d1],.el-button--primary[data-v-31cec2d1]:active,.el-button--primary[data-v-31cec2d1]:focus,.el-button--primary[data-v-31cec2d1]:hover{background:#14928a;border-color:#14928a;color:#fff}[data-v-31cec2d1] .el-image-viewer__close{color:#fff;opacity:1}[data-v-31cec2d1] .el-date-editor.el-input,[data-v-31cec2d1] .el-select{width:100%!important}[data-v-31cec2d1] .el-table .cell{display:-webkit-box;overflow:hidden;text-overflow:ellipsis;-webkit-line-clamp:3;-webkit-box-orient:vertical}
+>>>>>>> master:dist/static/css/chunk-40f7152e.c47ee2ba.css

src/views/levelManager/levelManager.vue

@@ -8,14 +8,21 @@
             <!-- 搜索标题 -->
             <el-form :inline="true" class="searchForm" v-model.trim="searchForm">
                 <el-form-item>
+                    <el-input
+                        v-model.trim="searchForm.city"
+                        @keyup.enter.native="city"
+                        placeholder="请输入城市名"
+                    ></el-input>
+                </el-form-item>
+                <el-form-item>
                     <el-select
                         class="multiple"
                         v-model.trim="searchForm.status"
                         filterable
                         clearable
-                        placeholder="请选择报名状态">
-                        <el-option value="reg" label="报名"></el-option>
-                        <el-option value="pay" label="缴费"></el-option>
+                        placeholder="请选择缴费状态">
+                        <el-option value="reg" label="未缴费"></el-option>
+                        <el-option value="pay" label="已缴费"></el-option>
                     </el-select>
                 </el-form-item>
                 <el-form-item>
@@ -42,7 +49,7 @@
             <div class="tableWrap">
                 <el-table :data="tableList"
                 :header-cell-style="{background:'#EDEEF0',color:'#444'}">>
-                <el-table-column width="120px" align="center" prop="id" label="编号"></el-table-column>
+                <el-table-column width="90px" align="center" prop="id" label="编号"></el-table-column>
                 <el-table-column align="center" prop="name" label="姓名"></el-table-column>
                 <el-table-column align="center" prop="orderNo" label="订单编号"></el-table-column>
                 <el-table-column align="center" prop="transNo" label="交易流水号"></el-table-column>
@@ -52,12 +59,24 @@
                     </template>
                 </el-table-column>
                 <el-table-column align="center" prop="idcard" label="身份证号"></el-table-column>
+                <el-table-column align="center" prop="mobile" label="联系电话"></el-table-column>
+                <el-table-column align="center" prop="city" label="城市"></el-table-column>
                 <el-table-column align="center" prop="subject" label="报考乐器"></el-table-column>
                 <el-table-column align="center" prop="level" label="报考级别"></el-table-column>
                 <el-table-column align="center" prop="theoryLevel" label="乐理级别"></el-table-column>
-                <el-table-column align="center" label="报名状态">
+                <el-table-column align="center" label="缴费状态">
+                    <template slot-scope="scope">
+                        {{ scope.row.status == 2 ? '已缴费' : '未缴费' }}
+                    </template>
+                </el-table-column>
+                <el-table-column align="center" prop="money" label="报考级别费用">
+                    <template slot-scope="scope">
+                        {{ scope.row.money }}元
+                    </template>
+                </el-table-column>
+                <el-table-column align="center" prop="theoryMoney" label="乐理级别费用">
                     <template slot-scope="scope">
-                        {{ scope.row.status == 2 ? '缴费' : '报名' }}
+                        {{ scope.row.theoryMoney }}元
                     </template>
                 </el-table-column>
                 <el-table-column align="center" label="证书">
@@ -106,6 +125,7 @@ export default {
     return {
         orderDate: null,
         searchForm: {
+            city: null,
             status: null,
             startTime: null,
             endTime: null
@@ -133,6 +153,7 @@ export default {
     getList() {
         let searchForm = this.searchForm
         let params = {
+            city: searchForm.city ? searchForm.city : null,
             status: searchForm.status ? searchForm.status : null,
             startTime: searchForm.startTime ? searchForm.startTime : null,
             endTime: searchForm.endTime ? searchForm.endTime : null,
@@ -163,6 +184,7 @@ export default {
         let url = "/api-web/export/degreeRegistration";
         let searchForm = this.searchForm
         let params = {
+            city: searchForm.city ? searchForm.city : null,
             status: searchForm.status ? searchForm.status : null,
             startTime: searchForm.startTime ? searchForm.startTime : null,
             endTime: searchForm.endTime ? searchForm.endTime : null