Home Explore Help
Sign In
yonge
/
dy-admin-manager
3
1
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge branch 'master' into iteration_adminOptimiz

lex-xin 4 years ago
parent
cd886b7953 e67ad2bdc8
commit
041b79d7ce
73 changed files with 6 additions and 6 deletions
Split View Show Diff Stats
  1. 1 0
      .gitignore
  2. 1 0
      debug.log
  3. 0 1
      dist/index.html
  4. 1 0
      dist/static/css/chunk-0174893d.a726912f.css
  5. 0 0
      dist/static/css/chunk-1851af68.a56c9b49.css
  6. 0 0
      dist/static/css/chunk-2d571ec4.77ed8155.css
  7. 0 1
      dist/static/css/chunk-2e595c1c.b997868d.css
  8. 0 0
      dist/static/css/chunk-3498618d.8f37548e.css
  9. 0 0
      dist/static/css/chunk-453eaa74.4f4fbaeb.css
  10. 0 0
      dist/static/css/chunk-4e8940b6.cb6216b5.css
  11. 0 0
      dist/static/css/chunk-7ab8a073.8b965ef4.css
  12. 0 0
      dist/static/css/chunk-a3906c32.0c9433fb.css
  13. 0 0
      dist/static/css/chunk-a5b3d4fa.fcba304f.css
  14. 0 0
      dist/static/css/chunk-b5ac83b4.149b40ee.css
  15. 0 1
      dist/static/css/chunk-bbec85ca.bff65be3.css
  16. 0 0
      dist/static/css/chunk-c54c3800.06cf64cd.css
  17. 0 0
      dist/static/js/app.94492f8f.js
  18. 0 0
      dist/static/js/app.b5c0c6d5.js
  19. 0 0
      dist/static/js/app.ce94407b.js
  20. 0 0
      dist/static/js/chunk-0174893d.27a9783e.js
  21. 0 0
      dist/static/js/chunk-05ffe0fa.a2955258.js
  22. 0 0
      dist/static/js/chunk-0a7f29ae.1ee4bc3c.js
  23. 0 0
      dist/static/js/chunk-1815843d.e773a150.js
  24. 0 0
      dist/static/js/chunk-1851af68.8a102e27.js
  25. 0 0
      dist/static/js/chunk-1851af68.a479c13f.js
  26. 0 0
      dist/static/js/chunk-1ee4ba0a.0d90a0ed.js
  27. 0 0
      dist/static/js/chunk-2138c99a.ca45a28a.js
  28. 0 0
      dist/static/js/chunk-2ba1af38.27631967.js
  29. 0 0
      dist/static/js/chunk-2d571ec4.7340c808.js
  30. 0 0
      dist/static/js/chunk-2e595c1c.1029091b.js
  31. 0 0
      dist/static/js/chunk-2ed70ae6.148e41b2.js
  32. 0 0
      dist/static/js/chunk-2f7453d4.f5ed7e3d.js
  33. 0 0
      dist/static/js/chunk-3498618d.003027cc.js
  34. 0 0
      dist/static/js/chunk-388cd106.035d2e0f.js
  35. 0 0
      dist/static/js/chunk-38a32091.822a8db6.js
  36. 0 0
      dist/static/js/chunk-38d0e891.8a6b861f.js
  37. 0 0
      dist/static/js/chunk-3be84a5c.79c13a17.js
  38. 0 0
      dist/static/js/chunk-3d2011f9.11b87884.js
  39. 0 0
      dist/static/js/chunk-3e13d4a2.7d1b7e1c.js
  40. 0 0
      dist/static/js/chunk-453eaa74.8a437cbb.js
  41. 0 0
      dist/static/js/chunk-457658a9.ae59fe78.js
  42. 0 0
      dist/static/js/chunk-466448b1.5005dcd2.js
  43. 0 0
      dist/static/js/chunk-4917c78a.ac2ae631.js
  44. 0 0
      dist/static/js/chunk-4e8940b6.c6b64f4d.js
  45. 0 0
      dist/static/js/chunk-54c0711a.b4ed9785.js
  46. 0 0
      dist/static/js/chunk-5f5ffb00.b70c6b08.js
  47. 0 0
      dist/static/js/chunk-64749b76.ee7bb341.js
  48. 0 0
      dist/static/js/chunk-6578dcfe.40ad178c.js
  49. 0 0
      dist/static/js/chunk-6c1f1cfb.9fb63175.js
  50. 0 0
      dist/static/js/chunk-6c31664d.4063625f.js
  51. 0 0
      dist/static/js/chunk-6c520f7e.6d88935c.js
  52. 0 0
      dist/static/js/chunk-71820c9a.e52e9e84.js
  53. 0 0
      dist/static/js/chunk-739fed81.7e5bf264.js
  54. 0 0
      dist/static/js/chunk-750a728a.9a372d9a.js
  55. 0 0
      dist/static/js/chunk-76fe77e0.e7497f4c.js
  56. 0 0
      dist/static/js/chunk-78cdb885.fe99acd1.js
  57. 0 0
      dist/static/js/chunk-7ab8a073.c5ac2d59.js
  58. 0 0
      dist/static/js/chunk-8533a718.c2d3f87e.js
  59. 0 0
      dist/static/js/chunk-88027f02.19e14d4f.js
  60. 0 0
      dist/static/js/chunk-98ac2284.17ee8c22.js
  61. 0 0
      dist/static/js/chunk-a3906c32.dab6df6a.js
  62. 0 0
      dist/static/js/chunk-a5b3d4fa.cddb742b.js
  63. 0 0
      dist/static/js/chunk-b5ac83b4.aaa45e86.js
  64. 0 0
      dist/static/js/chunk-bbec85ca.0088cae5.js
  65. 0 0
      dist/static/js/chunk-c54c3800.4c9b6e9f.js
  66. 0 0
      dist/static/js/chunk-c7f5974e.92615e21.js
  67. 0 0
      dist/static/js/chunk-d85af3e4.45bfcd2e.js
  68. 0 0
      dist/static/js/chunk-e6c3ed9c.58c77bf0.js
  69. 0 0
      dist/static/js/chunk-f4a6e8b2.471079e3.js
  70. 0 0
      dist/static/js/chunk-fb41c584.4e7c8cfc.js
  71. 1 1
      src/views/resetTeaming/components/resetPayList.vue
  72. 1 1
      src/views/resetTeaming/components/resetPayListSchool.vue
  73. 1 1
      src/views/resetTeaming/modals/pay-items.vue

+ 1 - 0
.gitignore
View File 

@@ -19,3 +19,4 @@ debug.log
 
 debug.log
 
 debug.log
 
 debug.log
 
+debug.log

+ 1 - 0
debug.log
View File 

@@ -4,3 +4,4 @@
 
 [1211/093733.478:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)
 
 [1214/094206.298:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)
 
 [1216/112417.508:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)
 
+[1218/093715.178:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)

File diff suppressed because it is too large
+ 0 - 1
dist/index.html


+ 1 - 0
dist/static/css/chunk-0174893d.a726912f.css
View File 

@@ -0,0 +1 @@
 
+.el-button+.el-button[data-v-22f507de]{margin-left:0}

+ 0 - 0
dist/static/css/chunk-1851af68.78d605d4.css → dist/static/css/chunk-1851af68.a56c9b49.css
View File


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/chunk-2d571ec4.77ed8155.css


+ 0 - 1
dist/static/css/chunk-2e595c1c.b997868d.css
View File 

@@ -1 +0,0 @@
 
-.number-input[data-v-0c89bf50]{width:100%}.number-input[data-v-0c89bf50] .el-input__inner,.number-input[data-v-bc860d70] .el-input__inner{text-align:left}

File diff suppressed because it is too large
+ 0 - 0
dist/static/css/chunk-3498618d.8f37548e.css


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/chunk-453eaa74.4f4fbaeb.css


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/chunk-4e8940b6.cb6216b5.css


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/chunk-7ab8a073.8b965ef4.css


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/chunk-a3906c32.0c9433fb.css


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/chunk-a5b3d4fa.fcba304f.css


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/chunk-b5ac83b4.149b40ee.css


+ 0 - 1
dist/static/css/chunk-bbec85ca.bff65be3.css
View File 

@@ -1 +0,0 @@
 
-.el-button+.el-button[data-v-6ee46fcf]{margin-left:0}

File diff suppressed because it is too large
+ 0 - 0
dist/static/css/chunk-c54c3800.06cf64cd.css


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.94492f8f.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.b5c0c6d5.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.ce94407b.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-0174893d.27a9783e.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-05ffe0fa.a2955258.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-0a7f29ae.1ee4bc3c.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-1815843d.e773a150.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-1851af68.8a102e27.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-1851af68.a479c13f.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-1ee4ba0a.0d90a0ed.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-2138c99a.ca45a28a.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-2ba1af38.27631967.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-2d571ec4.7340c808.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-2e595c1c.1029091b.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-2ed70ae6.148e41b2.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-2f7453d4.f5ed7e3d.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-3498618d.003027cc.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-388cd106.035d2e0f.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-38a32091.822a8db6.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-38d0e891.8a6b861f.js


+ 0 - 0
dist/static/js/chunk-3be84a5c.bbe46f9f.js → dist/static/js/chunk-3be84a5c.79c13a17.js
View File


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-3d2011f9.11b87884.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-3e13d4a2.7d1b7e1c.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-453eaa74.8a437cbb.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-457658a9.ae59fe78.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-466448b1.5005dcd2.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-4917c78a.ac2ae631.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-4e8940b6.c6b64f4d.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-54c0711a.b4ed9785.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-5f5ffb00.b70c6b08.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-64749b76.ee7bb341.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-6578dcfe.40ad178c.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-6c1f1cfb.9fb63175.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-6c31664d.4063625f.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-6c520f7e.6d88935c.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-71820c9a.e52e9e84.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-739fed81.7e5bf264.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-750a728a.9a372d9a.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-76fe77e0.e7497f4c.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-78cdb885.fe99acd1.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-7ab8a073.c5ac2d59.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-8533a718.c2d3f87e.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-88027f02.19e14d4f.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-98ac2284.17ee8c22.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-a3906c32.dab6df6a.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-a5b3d4fa.cddb742b.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-b5ac83b4.aaa45e86.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-bbec85ca.0088cae5.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-c54c3800.4c9b6e9f.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-c7f5974e.92615e21.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-d85af3e4.45bfcd2e.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-e6c3ed9c.58c77bf0.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-f4a6e8b2.471079e3.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-fb41c584.4e7c8cfc.js


+ 1 - 1
src/views/resetTeaming/components/resetPayList.vue
View File 

@@ -41,7 +41,7 @@
 
         <el-table-column align="center"
 
                          prop="batchNo"
 
                          width="200"
 
-                         label="订单编号"></el-table-column>
 
+                         label="缴费批次"></el-table-column>
 
         <el-table-column align="center"
 
                          prop="paymentType"
 
                          label="缴费类型">

+ 1 - 1
src/views/resetTeaming/components/resetPayListSchool.vue
View File 

@@ -41,7 +41,7 @@
 
         <el-table-column align="center"
 
                          prop="batchNo"
 
                          width="200"
 
-                         label="订单编号"></el-table-column>
 
+                         label="缴费批次"></el-table-column>
 
         <el-table-column align="center"
 
                          prop="paymentType"
 
                          label="缴费类型">

+ 1 - 1
src/views/resetTeaming/modals/pay-items.vue
View File 

@@ -5,7 +5,7 @@
 
         align="center"
 
         prop="batchNo"
 
         width="200"
 
-        label="批次号"
 
+        label="缴费批次"
 
       ></el-table-column>
 
       <el-table-column
 
         align="center"

Some files were not shown because too many files changed in this diff