Jelajahi Sumber

1205 18:28

搜索优化  vip活动优化
mo 5 tahun lalu
induk
melakukan
337c91493e
62 mengubah file dengan 130 tambahan dan 62 penghapusan
  1. 0 0
      dist/index.html
  2. 0 0
      dist/static/css/chunk-00be4261.7ab0029d.css
  3. 1 0
      dist/static/css/chunk-20dea751.a644c729.css
  4. 0 0
      dist/static/css/chunk-419ce36c.f8c7eadc.css
  5. 1 1
      dist/static/css/chunk-5d453422.abefc249.css
  6. 0 1
      dist/static/css/chunk-6c6a1408.20ee8028.css
  7. 0 0
      dist/static/css/chunk-7505a1cf.1d5ae716.css
  8. 1 1
      dist/static/css/chunk-eb900642.dde7b697.css
  9. 0 0
      dist/static/js/app.61f6a16d.js
  10. 0 0
      dist/static/js/app.72a21548.js
  11. 0 0
      dist/static/js/chunk-00be4261.66fa49e2.js
  12. 0 0
      dist/static/js/chunk-09c9fdd9.032b0c05.js
  13. 0 0
      dist/static/js/chunk-1c9ae0ee.ad92f637.js
  14. 0 0
      dist/static/js/chunk-1c9ae0ee.fc9819af.js
  15. 0 0
      dist/static/js/chunk-20c5063f.4247a039.js
  16. 0 0
      dist/static/js/chunk-20c5063f.abd6bfd0.js
  17. 0 0
      dist/static/js/chunk-20dea751.87a6587a.js
  18. 0 0
      dist/static/js/chunk-3a11e0dd.ad4fc8ba.js
  19. 0 0
      dist/static/js/chunk-419ce36c.ccbdea5b.js
  20. 0 0
      dist/static/js/chunk-419ce36c.f7286805.js
  21. 0 0
      dist/static/js/chunk-45556115.aecbe674.js
  22. 0 0
      dist/static/js/chunk-50d3b43e.b0bceccb.js
  23. 0 0
      dist/static/js/chunk-54726652.36181003.js
  24. 0 0
      dist/static/js/chunk-54726652.cad7144a.js
  25. 0 0
      dist/static/js/chunk-5d453422.74dcfc3e.js
  26. 0 0
      dist/static/js/chunk-5e5d6dc0.03dee610.js
  27. 0 0
      dist/static/js/chunk-5e5d6dc0.ff36f864.js
  28. 0 0
      dist/static/js/chunk-5ec46df2.3b70b001.js
  29. 0 0
      dist/static/js/chunk-5ec46df2.f879ca12.js
  30. 0 0
      dist/static/js/chunk-64c33787.20b0e706.js
  31. 0 0
      dist/static/js/chunk-6562cc02.2ffc8ae2.js
  32. 0 0
      dist/static/js/chunk-6562cc02.e7fd8718.js
  33. 0 0
      dist/static/js/chunk-6c6a1408.0a91af12.js
  34. 0 0
      dist/static/js/chunk-7505a1cf.a1f7f50f.js
  35. 0 0
      dist/static/js/chunk-874b5212.0d5e65fd.js
  36. 0 0
      dist/static/js/chunk-874b5212.aa2416f0.js
  37. 0 0
      dist/static/js/chunk-91a40020.1a4d6d5b.js
  38. 0 0
      dist/static/js/chunk-91a40020.51653408.js
  39. 0 0
      dist/static/js/chunk-a18ee526.c5c2e3ff.js
  40. 0 0
      dist/static/js/chunk-b1e176fc.e31ad88e.js
  41. 0 0
      dist/static/js/chunk-dc69ca8a.c360aaaf.js
  42. 0 0
      dist/static/js/chunk-dc69ca8a.e1d22b63.js
  43. 0 0
      dist/static/js/chunk-eb900642.8464ee81.js
  44. 0 0
      dist/static/js/chunk-edcf4054.95e9c933.js
  45. 0 0
      dist/static/js/chunk-edcf4054.f2e0957a.js
  46. 2 2
      src/views/buildVip/index.vue
  47. 5 1
      src/views/businessManager/orderManager/backMoney.vue
  48. 5 1
      src/views/businessManager/orderManager/expend.vue
  49. 50 30
      src/views/businessManager/orderManager/incomebuy.vue
  50. 1 1
      src/views/categroyManager/insideSetting/staffManager.vue
  51. 9 1
      src/views/categroyManager/vipActiveList.vue
  52. 1 0
      src/views/studentManager/components/studentOrder.vue
  53. 38 18
      src/views/studentManager/components/studentVip.vue
  54. 2 0
      src/views/studentManager/components/teamAndcourse.vue
  55. 2 1
      src/views/studentManager/studentList.vue
  56. 1 0
      src/views/teacherManager/teacherDetail/components/teacherRecord.vue
  57. 1 0
      src/views/teacherManager/teacherList.vue
  58. 4 1
      src/views/teamBuild/signupList.vue
  59. 1 0
      src/views/teamDetail/components/teamTeacherRecord.vue
  60. 1 0
      src/views/teamDetail/teamList.vue
  61. 1 0
      src/views/vipClass/vipDetail/components/vipStudentList.vue
  62. 3 3
      src/views/vipClass/vipList.vue

File diff ditekan karena terlalu besar
+ 0 - 0
dist/index.html


File diff ditekan karena terlalu besar
+ 0 - 0
dist/static/css/chunk-00be4261.7ab0029d.css


+ 1 - 0
dist/static/css/chunk-20dea751.a644c729.css

@@ -0,0 +1 @@
+.floor[data-v-24b8aeca]{padding-right:20px;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:end;-ms-flex-pack:end;justify-content:flex-end;width:100%;height:48px;line-height:48px;background:#edeef0;font-size:14px;color:#444;-webkit-box-align:center;-ms-flex-align:center;align-items:center;position:relative;z-index:1}.floor .remove[data-v-24b8aeca]{background:#f85043;margin-left:164px}.floor .add[data-v-24b8aeca],.floor .remove[data-v-24b8aeca]{width:98px;height:32px;border-radius:3px;color:#fff;line-height:32px;text-align:center;cursor:pointer}.floor .add[data-v-24b8aeca]{background:#14928a;margin-left:20px}.studentMask[data-v-24b8aeca]{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:start;-ms-flex-pack:start;justify-content:flex-start}.studentMask .left[data-v-24b8aeca]{width:200px;margin-right:20px}.studentMask .left .wrap[data-v-24b8aeca]{margin-bottom:20px}.studentMask .left h4[data-v-24b8aeca]{font-size:16px;color:#444;line-height:38px}.studentMask .left .chioseStudentList[data-v-24b8aeca]{height:500px;overflow-y:auto;border:1px solid #ccc}.studentMask .left .chioseStudentList .studentItem[data-v-24b8aeca]{padding-left:10px;line-height:25px}.studentMask .right[data-v-24b8aeca]{width:calc(100% - 200px)}.studentMask .right .tableList[data-v-24b8aeca]{max-height:500px;overflow-y:auto}.resetClassForm .el-date-editor.el-input[data-v-24b8aeca],.resetClassForm .el-date-editor.el-input__inner[data-v-24b8aeca]{width:180px}.el-date-editor.el-input[data-v-24b8aeca],.el-date-editor.el-input__inner[data-v-24b8aeca]{width:100px}

File diff ditekan karena terlalu besar
+ 0 - 0
dist/static/css/chunk-419ce36c.f8c7eadc.css


+ 1 - 1
dist/static/css/chunk-3a11e0dd.199ebe8f.css → dist/static/css/chunk-5d453422.abefc249.css

@@ -1 +1 @@
-.m-core[data-v-0c267af4]{margin-top:30px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-ms-flex-pack:distribute;justify-content:space-around}.m-core .el-input[data-v-0c267af4]{width:180px}.m-core h4[data-v-0c267af4]{font-size:16px;background-color:#ccc;color:#fff;text-align:center;width:100%;height:40px;line-height:40px;margin-bottom:20px}.m-core .center[data-v-0c267af4],.m-core .right[data-v-0c267af4],.m-core .vipLeft[data-v-0c267af4]{width:400px}.planList[data-v-0c267af4]{padding:0 25px}.planList .planTop[data-v-0c267af4]{height:40px;line-height:40px;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:justify;-ms-flex-pack:justify;justify-content:space-between;border-bottom:1px solid #ccc;margin-top:20px}.planList .planTop>p[data-v-0c267af4]{font-size:14px}.planList .planCore .row[data-v-0c267af4]{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:justify;-ms-flex-pack:justify;justify-content:space-between;-ms-flex-wrap:nowrap;flex-wrap:nowrap;height:40px;line-height:40px;font-size:14px;text-align:center}.planList .planCore .row div[data-v-0c267af4]{width:87px}.okBtn[data-v-0c267af4]{width:120px;height:40px;line-height:40px;text-align:center;color:#fff;border-radius:4px;margin-right:20px;cursor:pointer;background-color:#f97215;float:right}
+.m-core[data-v-3d27f5b0]{margin-top:30px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-ms-flex-pack:distribute;justify-content:space-around}.m-core .el-input[data-v-3d27f5b0]{width:180px}.m-core h4[data-v-3d27f5b0]{font-size:16px;background-color:#ccc;color:#fff;text-align:center;width:100%;height:40px;line-height:40px;margin-bottom:20px}.m-core .center[data-v-3d27f5b0],.m-core .right[data-v-3d27f5b0],.m-core .vipLeft[data-v-3d27f5b0]{width:400px}.planList[data-v-3d27f5b0]{padding:0 25px}.planList .planTop[data-v-3d27f5b0]{height:40px;line-height:40px;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:justify;-ms-flex-pack:justify;justify-content:space-between;border-bottom:1px solid #ccc;margin-top:20px}.planList .planTop>p[data-v-3d27f5b0]{font-size:14px}.planList .planCore .row[data-v-3d27f5b0]{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:justify;-ms-flex-pack:justify;justify-content:space-between;-ms-flex-wrap:nowrap;flex-wrap:nowrap;height:40px;line-height:40px;font-size:14px;text-align:center}.planList .planCore .row div[data-v-3d27f5b0]{width:87px}.okBtn[data-v-3d27f5b0]{width:120px;height:40px;line-height:40px;text-align:center;color:#fff;border-radius:4px;margin-right:20px;cursor:pointer;background-color:#f97215;float:right}

+ 0 - 1
dist/static/css/chunk-6c6a1408.20ee8028.css

@@ -1 +0,0 @@
-.floor[data-v-0ac88d70]{padding-right:20px;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:end;-ms-flex-pack:end;justify-content:flex-end;width:100%;height:48px;line-height:48px;background:#edeef0;font-size:14px;color:#444;-webkit-box-align:center;-ms-flex-align:center;align-items:center;position:relative;z-index:1}.floor .remove[data-v-0ac88d70]{background:#f85043;margin-left:164px}.floor .add[data-v-0ac88d70],.floor .remove[data-v-0ac88d70]{width:98px;height:32px;border-radius:3px;color:#fff;line-height:32px;text-align:center;cursor:pointer}.floor .add[data-v-0ac88d70]{background:#14928a;margin-left:20px}.studentMask[data-v-0ac88d70]{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:start;-ms-flex-pack:start;justify-content:flex-start}.studentMask .left[data-v-0ac88d70]{width:200px;margin-right:20px}.studentMask .left .wrap[data-v-0ac88d70]{margin-bottom:20px}.studentMask .left h4[data-v-0ac88d70]{font-size:16px;color:#444;line-height:38px}.studentMask .left .chioseStudentList[data-v-0ac88d70]{height:500px;overflow-y:auto;border:1px solid #ccc}.studentMask .left .chioseStudentList .studentItem[data-v-0ac88d70]{padding-left:10px;line-height:25px}.studentMask .right[data-v-0ac88d70]{width:calc(100% - 200px)}.studentMask .right .tableList[data-v-0ac88d70]{max-height:500px;overflow-y:auto}.resetClassForm .el-date-editor.el-input[data-v-0ac88d70],.resetClassForm .el-date-editor.el-input__inner[data-v-0ac88d70]{width:180px}.el-date-editor.el-input[data-v-0ac88d70],.el-date-editor.el-input__inner[data-v-0ac88d70]{width:100px}

File diff ditekan karena terlalu besar
+ 0 - 0
dist/static/css/chunk-7505a1cf.1d5ae716.css


+ 1 - 1
dist/static/css/chunk-50d3b43e.7c287403.css → dist/static/css/chunk-eb900642.dde7b697.css

@@ -1 +1 @@
-.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}.select[data-v-5eff98bd]{font-size:14px}.btnList[data-v-5eff98bd]{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:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.btnList div[data-v-5eff98bd]{margin-right:15px}
+.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}.select[data-v-1588124c]{font-size:14px}.btnList[data-v-1588124c]{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:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.btnList div[data-v-1588124c]{margin-right:15px}

File diff ditekan karena terlalu besar
+ 0 - 0
dist/static/js/app.61f6a16d.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/static/js/app.72a21548.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/static/js/chunk-00be4261.66fa49e2.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/static/js/chunk-09c9fdd9.032b0c05.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/static/js/chunk-1c9ae0ee.ad92f637.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/static/js/chunk-1c9ae0ee.fc9819af.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/static/js/chunk-20c5063f.4247a039.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/static/js/chunk-20c5063f.abd6bfd0.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/static/js/chunk-20dea751.87a6587a.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/static/js/chunk-3a11e0dd.ad4fc8ba.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/static/js/chunk-419ce36c.ccbdea5b.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/static/js/chunk-419ce36c.f7286805.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/static/js/chunk-45556115.aecbe674.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/static/js/chunk-50d3b43e.b0bceccb.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/static/js/chunk-54726652.36181003.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/static/js/chunk-54726652.cad7144a.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/static/js/chunk-5d453422.74dcfc3e.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/static/js/chunk-5e5d6dc0.03dee610.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/static/js/chunk-5e5d6dc0.ff36f864.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/static/js/chunk-5ec46df2.3b70b001.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/static/js/chunk-5ec46df2.f879ca12.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/static/js/chunk-64c33787.20b0e706.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/static/js/chunk-6562cc02.2ffc8ae2.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/static/js/chunk-6562cc02.e7fd8718.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/static/js/chunk-6c6a1408.0a91af12.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/static/js/chunk-7505a1cf.a1f7f50f.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/static/js/chunk-874b5212.0d5e65fd.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/static/js/chunk-874b5212.aa2416f0.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/static/js/chunk-91a40020.1a4d6d5b.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/static/js/chunk-91a40020.51653408.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/static/js/chunk-a18ee526.c5c2e3ff.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/static/js/chunk-b1e176fc.e31ad88e.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/static/js/chunk-dc69ca8a.c360aaaf.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/static/js/chunk-dc69ca8a.e1d22b63.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/static/js/chunk-eb900642.8464ee81.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/static/js/chunk-edcf4054.95e9c933.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/static/js/chunk-edcf4054.f2e0957a.js


+ 2 - 2
src/views/buildVip/index.vue

@@ -814,7 +814,7 @@ export default {
           if (online == 0) break
         }
         // 加一周
-        date.setDate(date.getDate() + 7);
+        // date.setDate(date.getDate() + 7);
       }
 
       // console.log(date1)
@@ -835,7 +835,7 @@ export default {
           if (offline == 0) break
         }
         // 加一周
-        date1.setDate(date1.getDate() + 7);
+        // date1.setDate(date1.getDate() + 7);
       }
       // console.log(this.timeTable);
       this.dialogFormVisible = false;

+ 5 - 1
src/views/businessManager/orderManager/backMoney.vue

@@ -31,7 +31,7 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getList"
+          <el-button @click="search"
                      type="danger">搜索</el-button>
           <el-button @click="onReSet"
                      type="primary">重置</el-button>
@@ -172,6 +172,10 @@ export default {
     this.getList()
   },
   methods: {
+    search () {
+      this.pageInfo.page = 1;
+      this.getList()
+    },
     onTeachingSubmit (formName, status) { // 添加数据
       this.$refs[formName].validate((valid) => {
         if (valid) {

+ 5 - 1
src/views/businessManager/orderManager/expend.vue

@@ -20,7 +20,7 @@
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getList"
+          <el-button @click="search"
                      type="danger">搜索</el-button>
           <!-- <el-button @click="onReSet"
                      type="primary">重置</el-button> -->
@@ -152,6 +152,10 @@ export default {
     this.getList()
   },
   methods: {
+    search () {
+      this.pageInfo.page = 1;
+      this.getList()
+    },
     getList () {
       let params = this.searchForm
       params.rows = this.pageInfo.limit

+ 50 - 30
src/views/businessManager/orderManager/incomebuy.vue

@@ -1,54 +1,70 @@
 <template>
   <div class="m-container">
-    <h2><div class="squrt"></div>充值列表</h2>
+    <h2>
+      <div class="squrt"></div>充值列表
+    </h2>
     <div class="m-core">
       <!-- 搜索类型 -->
       <el-form :inline="true"
-              class="searchForm"
-              v-model="searchForm">
+               class="searchForm"
+               v-model="searchForm">
         <el-form-item>
-          <el-select v-model="searchForm.paymentType" placeholder="交易类型">
-            <el-option v-for="(item, index) in orderStatus" :key="index" 
-              :label="item.label" :value="item.value"></el-option>
+          <el-select v-model="searchForm.paymentType"
+                     placeholder="交易类型">
+            <el-option v-for="(item, index) in orderStatus"
+                       :key="index"
+                       :label="item.label"
+                       :value="item.value"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-select v-model="searchForm.paymentStatus" placeholder="交易状态">
-            <el-option v-for="(item, index) in dealStatus" :key="index" 
-              :label="item.label" :value="item.value"></el-option>
+          <el-select v-model="searchForm.paymentStatus"
+                     placeholder="交易状态">
+            <el-option v-for="(item, index) in dealStatus"
+                       :key="index"
+                       :label="item.label"
+                       :value="item.value"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getList" type="danger">搜索</el-button>
-          <el-button @click="onReSet" type="primary">重置</el-button>
+          <el-button @click="search"
+                     type="danger">搜索</el-button>
+          <el-button @click="onReSet"
+                     type="primary">重置</el-button>
         </el-form-item>
       </el-form>
       <!-- 列表 -->
       <div class="tableWrap">
-        <el-table :data='tableList' :header-cell-style="{background:'#EDEEF0',color:'#444'}">
-          <el-table-column align='center' prop="transNo"
-                          label="交易流水号">
+        <el-table :data='tableList'
+                  :header-cell-style="{background:'#EDEEF0',color:'#444'}">
+          <el-table-column align='center'
+                           prop="transNo"
+                           label="交易流水号">
           </el-table-column>
-          <el-table-column align='center' prop="payTime"
-                          label="订单日期">
+          <el-table-column align='center'
+                           prop="payTime"
+                           label="订单日期">
           </el-table-column>
-          <el-table-column align='center' prop="actualAmount"
-                          label="实付金额">
+          <el-table-column align='center'
+                           prop="actualAmount"
+                           label="实付金额">
           </el-table-column>
-          <el-table-column align='center' prop="user.username"
-                          label="学员姓名">
+          <el-table-column align='center'
+                           prop="user.username"
+                           label="学员姓名">
           </el-table-column>
-          <el-table-column align='center' prop="paymentChannel"
-                          label="交易方式">
+          <el-table-column align='center'
+                           prop="paymentChannel"
+                           label="交易方式">
           </el-table-column>
           <el-table-column align='center'
-                          label="收款账户">
+                           label="收款账户">
             <template slot-scope="scope">
               {{ scope.row.paymentChannelType | paymentChannelType }}
             </template>
           </el-table-column>
           <el-table-column align='center'
-                          label="交易状态">
+                           label="交易状态">
             <template slot-scope="scope">
               {{ scope.row.status | dealStatus }}
             </template>
@@ -92,24 +108,28 @@ export default {
       },
     }
   },
-  mounted() {
+  mounted () {
     this.getList()
   },
   methods: {
-    getList () { 
+    search () {
+      this.pageInfo.page = 1;
+      this.getList();
+    },
+    getList () {
       let params = this.searchForm
       params.rows = this.pageInfo.limit
       params.page = this.pageInfo.page
       studentRechargeList(params).then(res => {
         let result = res.data
-        if(res.code == 200) {
+        if (res.code == 200) {
           this.tableList = result.rows
           this.pageInfo.total = result.total
         }
       })
     },
-    searchOrderDate(value) {
-      if(value) {
+    searchOrderDate (value) {
+      if (value) {
         this.searchForm.orderStartDate = value[0]
         this.searchForm.orderEndDate = value[1]
       } else {
@@ -117,7 +137,7 @@ export default {
         this.searchForm.orderEndDate = null
       }
     },
-    onReSet() { // 重置搜索
+    onReSet () { // 重置搜索
       this.orderDate = null
       this.searchForm = {
         orderStartDate: null,

+ 1 - 1
src/views/categroyManager/insideSetting/staffManager.vue

@@ -14,7 +14,7 @@
         <el-form-item>
           <el-input type="text"
                     v-model="searchForm.search"
-                    @keyup.enter.native='getList'
+                    @keyup.enter.native='search'
                     placeholder="姓名或手机号"></el-input>
         </el-form-item>
         <el-form-item>

+ 9 - 1
src/views/categroyManager/vipActiveList.vue

@@ -153,6 +153,7 @@
                          :label="item.name"
                          :value="item.id"></el-option>
             </el-select>
+            <el-button @click="onCheckAllBranch">适用所有分部</el-button>
           </el-form-item>
           <el-form-item label="活动描述"
                         prop="desc">
@@ -272,7 +273,7 @@
                         style='margin:0 10px;'></el-input>
               <el-checkbox v-if="activeType=='GIVE_CLASS'"
                            v-model="giveClassPaySalaryFlag"
-                           label="赠送课时是否结算课酬"></el-checkbox>
+                           label="赠送课时结算课酬"></el-checkbox>
             </div>
           </div>
         </div>
@@ -438,6 +439,13 @@ export default {
     }
   },
   methods: {
+    onCheckAllBranch () {
+      // 适用所有分部
+      this.resetForm.organ = []
+      this.organList.forEach(item => {
+        this.resetForm.organ.push(item.id)
+      })
+    },
     search () {
       this.rules.page = 1;
       this.getList();

+ 1 - 0
src/views/studentManager/components/studentOrder.vue

@@ -58,6 +58,7 @@
       </el-form-item>
       <el-form-item>
         <el-input type="text"
+                  @keyup.enter.native='search'
                   v-model="searchForm.remark"
                   placeholder="订单说明"></el-input>
       </el-form-item>

+ 38 - 18
src/views/studentManager/components/studentVip.vue

@@ -30,6 +30,7 @@
              v-model="searchForm">
       <el-form-item>
         <el-input placeholder="课程名称"
+                  @keyup.enter.native='onSearch'
                   v-model="searchForm.classGroupName"></el-input>
       </el-form-item>
       <el-form-item>
@@ -41,32 +42,42 @@
     <div class="tableWrap">
       <el-table :header-cell-style="{background:'#EDEEF0',color:'#444'}"
                 :data='tableList'>
-        <el-table-column label="VIP编号" align='center'
+        <el-table-column label="VIP编号"
+                         align='center'
                          prop='vipGroupId'>
         </el-table-column>
-        <el-table-column label="VIP课名称" align='center'
+        <el-table-column label="VIP课名称"
+                         align='center'
                          prop="vipGroupName">
         </el-table-column>
-        <el-table-column label="VIP课状态" align='center'>
+        <el-table-column label="VIP课状态"
+                         align='center'>
           <template slot-scope="scope">
             {{ scope.row.vipGroupStatus | vipCourseStatus }}
           </template>
         </el-table-column>
-        <el-table-column label="指导老师" align='center'
+        <el-table-column label="指导老师"
+                         align='center'
                          prop="teacherName">
         </el-table-column>
-        <el-table-column label="班级人数" align='center'
+        <el-table-column label="班级人数"
+                         align='center'
                          prop="studentNum">
         </el-table-column>
-        <el-table-column label="活动方案" align='center'
+        <el-table-column label="活动方案"
+                         align='center'
                          prop="activeName">
         </el-table-column>
-        <el-table-column label="开课时间" align='center'
+        <el-table-column label="开课时间"
+                         align='center'
                          prop="courseStartDate">
         </el-table-column>
-        <el-table-column label="当前课次" align='center' prop="currentClassTimes">
+        <el-table-column label="当前课次"
+                         align='center'
+                         prop="currentClassTimes">
         </el-table-column>
-        <el-table-column label="操作" align='center'>
+        <el-table-column label="操作"
+                         align='center'>
           <template slot-scope="scope">
             <el-button @click="onCourse(scope.row)"
                        type="text">课表</el-button>
@@ -78,18 +89,27 @@
                   :limit.sync="pageInfo.limit"
                   :page-sizes="pageInfo.page_size"
                   @pagination="getCourseList" />
-      
 
-      <el-dialog :title="dialogTitle" :visible.sync="dialogTableVisible">
+      <el-dialog :title="dialogTitle"
+                 :visible.sync="dialogTableVisible">
         <el-table :data="gridData">
-          <el-table-column prop="courseDate" label="时间" align='center' width="150"></el-table-column>
-          <el-table-column prop="classGroupName" label="课程名称" align='center' width="200"></el-table-column>
-          <el-table-column label="课程类型" align='center'>
-             <template slot-scope="scope">
+          <el-table-column prop="courseDate"
+                           label="时间"
+                           align='center'
+                           width="150"></el-table-column>
+          <el-table-column prop="classGroupName"
+                           label="课程名称"
+                           align='center'
+                           width="200"></el-table-column>
+          <el-table-column label="课程类型"
+                           align='center'>
+            <template slot-scope="scope">
               {{ scope.row.teachMode == 'ONLINE' ? '线上' : '线下' }}
             </template>
           </el-table-column>
-          <el-table-column prop="courseStatus" align='center' label="课程状态">
+          <el-table-column prop="courseStatus"
+                           align='center'
+                           label="课程状态">
             <template slot-scope="scope">
               {{ scope.row.courseStatus |coursesStatus }}
             </template>
@@ -146,10 +166,10 @@ export default {
         }
       })
     },
-    onCourse(row) {
+    onCourse (row) {
       findStudentVipGroups({ vipGroupId: row.vipGroupId }).then(res => {
         this.dialogTitle = row.vipGroupName
-        if(res.code == 200) {
+        if (res.code == 200) {
           this.gridData = res.data.rows
           this.dialogTableVisible = true
         }

+ 2 - 0
src/views/studentManager/components/teamAndcourse.vue

@@ -82,10 +82,12 @@
       </el-form-item>
       <el-form-item>
         <el-input placeholder="班级名称"
+                  @keyup.enter.native='search'
                   v-model="searchForm.classGroupName"></el-input>
       </el-form-item>
       <el-form-item>
         <el-input placeholder="老师姓名"
+                  @keyup.enter.native='search'
                   v-model="searchForm.teacherName"></el-input>
       </el-form-item>
       <el-form-item>

+ 2 - 1
src/views/studentManager/studentList.vue

@@ -22,11 +22,12 @@
         </el-form-item>
         <el-form-item>
           <el-input placeholder="学生姓名"
+                    @keyup.enter.native='onSearch'
                     v-model="searchForm.studentName"></el-input>
         </el-form-item>
         <el-form-item>
           <el-input placeholder="家长联系电话"
-                    @keyup.enter.native='getList'
+                    @keyup.enter.native='onSearch'
                     v-model="searchForm.search"></el-input>
         </el-form-item>
         <el-form-item>

+ 1 - 0
src/views/teacherManager/teacherDetail/components/teacherRecord.vue

@@ -26,6 +26,7 @@
       </el-form-item>
       <el-form-item>
         <el-input placeholder="课程名称"
+                  @keyup.enter.native='search'
                   v-model="searchForm.classGroupName"></el-input>
       </el-form-item>
       <el-form-item>

+ 1 - 0
src/views/teacherManager/teacherList.vue

@@ -13,6 +13,7 @@
                v-model="searchForm">
         <el-form-item>
           <el-input v-model="searchForm.search"
+                    @keyup.enter.native='getList'
                     placeholder="老师姓名或电话"></el-input>
         </el-form-item>
         <el-form-item>

+ 4 - 1
src/views/teamBuild/signupList.vue

@@ -167,6 +167,7 @@
           </el-table-column>
           <!-- v-if='status == "PAY"' -->
           <el-table-column label="学员状态"
+                           fixed='right'
                            prop="paymentStatus"
                            align='center'>
             <template slot-scope="scope">
@@ -176,6 +177,7 @@
             </template>
           </el-table-column>
           <el-table-column label="操作"
+                           fixed='right'
                            align='center'>
             <template slot-scope="scope">
               <div>
@@ -488,7 +490,6 @@ export default {
     },
     payStart () {
       this.paymentStatus = true;
-      this.getList();
     },
     getList () {
       let obj = {
@@ -531,6 +532,7 @@ export default {
                 }
               })
               this.status = 'PAY'
+              this.getList();
             }
           })
         } else {
@@ -831,6 +833,7 @@ export default {
       overflow: auto;
     }
     .right {
+      width: calc(100% - 340px);
       margin-left: 12px;
       flex-grow: 1;
     }

+ 1 - 0
src/views/teamDetail/components/teamTeacherRecord.vue

@@ -32,6 +32,7 @@
       </el-form-item>
       <el-form-item>
         <el-input v-model="searchForm.teacher"
+                  @keyup.enter.native='search'
                   placeholder="请输入老师姓名"></el-input>
       </el-form-item>
       <el-form-item>

+ 1 - 0
src/views/teamDetail/teamList.vue

@@ -19,6 +19,7 @@
                :model="topForm">
         <el-form-item prop='teamName'>
           <el-input v-model="topForm.teamName"
+                    @keyup.enter.native='search'
                     placeholder="请输入乐团名称"></el-input>
         </el-form-item>
         <el-form-item prop='orgin'>

+ 1 - 0
src/views/vipClass/vipDetail/components/vipStudentList.vue

@@ -49,6 +49,7 @@
                :inline="true">
         <el-form-item>
           <el-input placeholder="请输入学生姓名或手机号"
+                    @keyup.enter.native='search'
                     v-model='maskForm.search'></el-input>
         </el-form-item>
         <el-form-item>

+ 3 - 3
src/views/vipClass/vipList.vue

@@ -45,7 +45,7 @@
         </el-form-item>
         <el-form-item>
           <el-input v-model="searchForm.search"
-                    @keyup.enter.native='getList'
+                    @keyup.enter.native='search'
                     placeholder="课程名称"></el-input>
         </el-form-item>
         <el-form-item>
@@ -90,8 +90,8 @@
                            label="课程单价">
             <template slot-scope="scope">
               <div>
-                <p>线上课单价:{{scope.row.onlineClassesUnitPrice}}</p>
-                <p>线下课单价:{{scope.row.offlineClassesUnitPrice}}</p>
+                <p>线上:{{scope.row.onlineClassesUnitPrice}}</p>
+                <p>线下:{{scope.row.offlineClassesUnitPrice}}</p>
               </div>
             </template>
           </el-table-column>

Beberapa file tidak ditampilkan karena terlalu banyak file yang berubah dalam diff ini