lex-xin 5 年之前
父节点
当前提交
306ebb4703
共有 74 个文件被更改,包括 239 次插入51 次删除
  1. 0 0
      dist/index.html
  2. 1 1
      dist/static/css/chunk-1550753a.1d401a9e.css
  3. 0 0
      dist/static/css/chunk-343d83b2.c53789ae.css
  4. 0 1
      dist/static/css/chunk-46a3a09d.fd337a22.css
  5. 1 1
      dist/static/css/chunk-6e585f64.763fdad8.css
  6. 0 0
      dist/static/css/chunk-7d47c5f0.146c0c95.css
  7. 1 0
      dist/static/css/chunk-f924aed8.3c32bce4.css
  8. 0 0
      dist/static/js/app.2c4610fa.js
  9. 0 0
      dist/static/js/chunk-09753c97.c7219d3b.js
  10. 0 0
      dist/static/js/chunk-1550753a.74804ac8.js
  11. 0 0
      dist/static/js/chunk-15c0f272.0ebad35c.js
  12. 0 0
      dist/static/js/chunk-15c0f272.29eba8e9.js
  13. 0 0
      dist/static/js/chunk-179cb776.3f49c0d6.js
  14. 0 0
      dist/static/js/chunk-179cb776.c100dcdf.js
  15. 0 0
      dist/static/js/chunk-197c26e5.d8f48d80.js
  16. 0 0
      dist/static/js/chunk-258c6fac.b3552c12.js
  17. 0 0
      dist/static/js/chunk-258c6fac.d8cd5f8a.js
  18. 0 0
      dist/static/js/chunk-2d0b66fc.316d84fc.js
  19. 0 0
      dist/static/js/chunk-2d0b66fc.3b90b815.js
  20. 0 0
      dist/static/js/chunk-343d83b2.27bc801a.js
  21. 0 0
      dist/static/js/chunk-35d7984f.1776a75b.js
  22. 0 0
      dist/static/js/chunk-35d7984f.187b7f3d.js
  23. 0 0
      dist/static/js/chunk-4122c029.3cbbd2ae.js
  24. 0 0
      dist/static/js/chunk-41f382a0.8c148534.js
  25. 0 0
      dist/static/js/chunk-43d1d8c2.8541cdd5.js
  26. 0 0
      dist/static/js/chunk-45c67fda.4b41b597.js
  27. 0 0
      dist/static/js/chunk-45c67fda.f7cf10ed.js
  28. 0 0
      dist/static/js/chunk-46a3a09d.5096a834.js
  29. 0 0
      dist/static/js/chunk-47fe7b3e.3d803803.js
  30. 0 0
      dist/static/js/chunk-47fe7b3e.6ee303f8.js
  31. 0 0
      dist/static/js/chunk-50f2e23d.81491ccd.js
  32. 0 0
      dist/static/js/chunk-50f2e23d.a0a2324b.js
  33. 0 0
      dist/static/js/chunk-51307a0c.5b85050d.js
  34. 0 0
      dist/static/js/chunk-670d72f8.e991b095.js
  35. 0 0
      dist/static/js/chunk-67a67e2a.d346d830.js
  36. 0 0
      dist/static/js/chunk-6a610be0.0c5cf105.js
  37. 0 0
      dist/static/js/chunk-6a610be0.c547d1cc.js
  38. 0 0
      dist/static/js/chunk-6e585f64.fb2e3229.js
  39. 0 0
      dist/static/js/chunk-711bc3b2.8e024d58.js
  40. 0 0
      dist/static/js/chunk-711bc3b2.a76bfdab.js
  41. 0 0
      dist/static/js/chunk-72a1f64a.db2c2bad.js
  42. 0 0
      dist/static/js/chunk-73e101c4.61de6427.js
  43. 0 0
      dist/static/js/chunk-73e101c4.edb2192b.js
  44. 0 0
      dist/static/js/chunk-73ebb2e3.bd480ab5.js
  45. 0 0
      dist/static/js/chunk-73ebb2e3.d941d05d.js
  46. 0 0
      dist/static/js/chunk-7d47c5f0.cd2a5f80.js
  47. 0 0
      dist/static/js/chunk-9ea481f8.7365b60b.js
  48. 0 0
      dist/static/js/chunk-af8af8fe.74bd432b.js
  49. 0 0
      dist/static/js/chunk-af8af8fe.fdf66b40.js
  50. 0 0
      dist/static/js/chunk-d1dd2788.2fa90241.js
  51. 0 0
      dist/static/js/chunk-d1dd2788.eac7f890.js
  52. 0 0
      dist/static/js/chunk-d3512760.92f8a021.js
  53. 0 0
      dist/static/js/chunk-d3512760.a7f85deb.js
  54. 0 0
      dist/static/js/chunk-dc69ca8a.c1ce42eb.js
  55. 0 0
      dist/static/js/chunk-dc69ca8a.d2a4f396.js
  56. 0 0
      dist/static/js/chunk-ecff1cfa.1313376f.js
  57. 0 0
      dist/static/js/chunk-ecff1cfa.4b0fd5ed.js
  58. 0 0
      dist/static/js/chunk-edcf4054.a04d8e5b.js
  59. 0 0
      dist/static/js/chunk-edcf4054.c388a5e6.js
  60. 0 0
      dist/static/js/chunk-f924aed8.f8010edb.js
  61. 9 0
      src/api/buildTeam.js
  62. 1 1
      src/api/journal.js
  63. 1 1
      src/utils/searchArray.js
  64. 1 1
      src/utils/vueFilter.js
  65. 21 13
      src/views/businessManager/orderManager/expend.vue
  66. 0 17
      src/views/businessManager/orderManager/incomebuy.vue
  67. 1 1
      src/views/categroyManager/generalSettings/overallManager.vue
  68. 20 1
      src/views/categroyManager/insideSetting/addressManager.vue
  69. 143 0
      src/views/contentManager/components/training.vue
  70. 7 5
      src/views/contentManager/contentOperation.vue
  71. 7 3
      src/views/contentManager/index.vue
  72. 1 1
      src/views/journal/leaveOperation.vue
  73. 22 2
      src/views/teamBuild/teamSeting/components/setImprovement.vue
  74. 2 2
      vue.config.js

文件差异内容过多而无法显示
+ 0 - 0
dist/index.html


+ 1 - 1
dist/static/css/chunk-67a67e2a.48e142f0.css → dist/static/css/chunk-1550753a.1d401a9e.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}.bannerImg[data-v-5a0dd57e],.bannerImg[data-v-386f59a6],.bannerImg[data-v-aeae42b6]{height:60px}
+.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}.bannerImg[data-v-5a0dd57e],.bannerImg[data-v-386f59a6],.bannerImg[data-v-aeae42b6],.bannerImg[data-v-b41c001a]{height:60px}

文件差异内容过多而无法显示
+ 0 - 0
dist/static/css/chunk-343d83b2.c53789ae.css


+ 0 - 1
dist/static/css/chunk-46a3a09d.fd337a22.css

@@ -1 +0,0 @@
-.m-container[data-v-5c01b785]{min-width:100%}.el-input[data-v-5c01b785]{width:400px}[data-v-5c01b785] .ql-editor{min-height:300px}.el-button--primary[data-v-5c01b785],.el-button--primary[data-v-5c01b785]:active,.el-button--primary[data-v-5c01b785]:focus,.el-button--primary[data-v-5c01b785]:hover{background:#14928a;border-color:#14928a;color:#fff}.el-row[data-v-5c01b785]{margin-top:40px}.el-col[data-v-5c01b785]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;margin-bottom:20px;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end;margin-right:50%}.el-input-group[data-v-5c01b785]{width:200px;margin:0 20px}[data-v-5c01b785] .el-tree-node__content{height:40px!important}[data-v-5c01b785] .avatar-uploader .el-upload{border:1px dashed #d9d9d9;border-radius:6px;cursor:pointer;position:relative;overflow:hidden}.avatar-uploader .el-upload[data-v-5c01b785]:hover{border-color:#409eff}.avatar-uploader-icon[data-v-5c01b785]{font-size:28px;color:#8c939d;width:120px;height:120px;line-height:120px;text-align:center}.avatar[data-v-5c01b785]{width:120px;height:120px;display:block}

+ 1 - 1
dist/static/css/chunk-0d228736.e9efb44b.css → dist/static/css/chunk-6e585f64.763fdad8.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}[data-v-3e894e35] .el-input-group__append{background:#dcdfe6;border-color:#dcdfe6}[data-v-3e894e35] .el-input-group__append:active,[data-v-3e894e35] .el-input-group__append:focus,[data-v-3e894e35] .el-input-group__append:hover{background:#dcdfe6;border-color:#dcdfe6;color:#fff}.el-button--primary[data-v-3e894e35],.el-button--primary[data-v-3e894e35]:active,.el-button--primary[data-v-3e894e35]:focus,.el-button--primary[data-v-3e894e35]:hover{background:#14928a;border-color:#14928a;color:#fff}.el-row[data-v-3e894e35]{margin-top:40px}.el-col[data-v-3e894e35]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;margin-bottom:20px;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end;margin-right:50%}.el-input-group[data-v-3e894e35],.el-input[data-v-3e894e35]{width:200px;margin:0 20px}
+.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}[data-v-605e2db8] .el-input-group__append{background:#dcdfe6;border-color:#dcdfe6}[data-v-605e2db8] .el-input-group__append:active,[data-v-605e2db8] .el-input-group__append:focus,[data-v-605e2db8] .el-input-group__append:hover{background:#dcdfe6;border-color:#dcdfe6;color:#fff}.el-button--primary[data-v-605e2db8],.el-button--primary[data-v-605e2db8]:active,.el-button--primary[data-v-605e2db8]:focus,.el-button--primary[data-v-605e2db8]:hover{background:#14928a;border-color:#14928a;color:#fff}.el-row[data-v-605e2db8]{margin-top:40px}.el-col[data-v-605e2db8]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;margin-bottom:20px;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end;margin-right:50%}.el-input-group[data-v-605e2db8],.el-input[data-v-605e2db8]{width:200px;margin:0 20px}

文件差异内容过多而无法显示
+ 0 - 0
dist/static/css/chunk-7d47c5f0.146c0c95.css


+ 1 - 0
dist/static/css/chunk-f924aed8.3c32bce4.css

@@ -0,0 +1 @@
+.m-container[data-v-2e9a5f08]{min-width:100%}.el-input[data-v-2e9a5f08]{width:400px}[data-v-2e9a5f08] .ql-editor{min-height:300px}.el-button--primary[data-v-2e9a5f08],.el-button--primary[data-v-2e9a5f08]:active,.el-button--primary[data-v-2e9a5f08]:focus,.el-button--primary[data-v-2e9a5f08]:hover{background:#14928a;border-color:#14928a;color:#fff}.el-row[data-v-2e9a5f08]{margin-top:40px}.el-col[data-v-2e9a5f08]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;margin-bottom:20px;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end;margin-right:50%}.el-input-group[data-v-2e9a5f08]{width:200px;margin:0 20px}[data-v-2e9a5f08] .el-tree-node__content{height:40px!important}[data-v-2e9a5f08] .avatar-uploader .el-upload{border:1px dashed #d9d9d9;border-radius:6px;cursor:pointer;position:relative;overflow:hidden}.avatar-uploader .el-upload[data-v-2e9a5f08]:hover{border-color:#409eff}.avatar-uploader-icon[data-v-2e9a5f08]{font-size:28px;color:#8c939d;width:120px;height:120px;line-height:120px;text-align:center}.avatar[data-v-2e9a5f08]{width:120px;height:120px;display:block}

文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/app.2c4610fa.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-09753c97.c7219d3b.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-1550753a.74804ac8.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-15c0f272.0ebad35c.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-15c0f272.29eba8e9.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-179cb776.3f49c0d6.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-179cb776.c100dcdf.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-197c26e5.d8f48d80.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-258c6fac.b3552c12.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-258c6fac.d8cd5f8a.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-2d0b66fc.316d84fc.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-2d0b66fc.3b90b815.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-343d83b2.27bc801a.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-35d7984f.1776a75b.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-35d7984f.187b7f3d.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-4122c029.3cbbd2ae.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-41f382a0.8c148534.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-43d1d8c2.8541cdd5.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-45c67fda.4b41b597.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-45c67fda.f7cf10ed.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-46a3a09d.5096a834.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-47fe7b3e.3d803803.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-47fe7b3e.6ee303f8.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-50f2e23d.81491ccd.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-50f2e23d.a0a2324b.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-51307a0c.5b85050d.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-670d72f8.e991b095.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-67a67e2a.d346d830.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-6a610be0.0c5cf105.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-6a610be0.c547d1cc.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-6e585f64.fb2e3229.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-711bc3b2.8e024d58.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-711bc3b2.a76bfdab.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-72a1f64a.db2c2bad.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-73e101c4.61de6427.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-73e101c4.edb2192b.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-73ebb2e3.bd480ab5.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-73ebb2e3.d941d05d.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-7d47c5f0.cd2a5f80.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-9ea481f8.7365b60b.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-af8af8fe.74bd432b.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-af8af8fe.fdf66b40.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-d1dd2788.2fa90241.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-d1dd2788.eac7f890.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-d3512760.92f8a021.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-d3512760.a7f85deb.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-dc69ca8a.c1ce42eb.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-dc69ca8a.d2a4f396.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-ecff1cfa.1313376f.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-ecff1cfa.4b0fd5ed.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-edcf4054.a04d8e5b.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-edcf4054.c388a5e6.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-f924aed8.f8010edb.js


+ 9 - 0
src/api/buildTeam.js

@@ -660,4 +660,13 @@ export function getEmployeeOrgan (data) {
     method: 'get',
     params: data
   })
+}
+
+// 
+export function pushMessage(data) {
+  return request({
+    url: api + '/musicGroup/pushMessage',
+    method: 'post',
+    data: qs.stringify(data)
+  })
 }

+ 1 - 1
src/api/journal.js

@@ -75,7 +75,7 @@ export function musicGroupQuit(data) {
     })
 } 
 
-// 退申请审核
+// 退申请审核
 export function quitMusicGroup(data) {
     return request({
         url: api + '/musicGroupQuit/quitMusicGroup',

+ 1 - 1
src/utils/searchArray.js

@@ -55,7 +55,7 @@ const orderStatus = [
 const dealStatus = [
   { value: "ING", label: "交易中" },
   { value: "SUCCESS", label: "成功交易" },
-  { value: "FAilED", label: "交易失败" },
+  { value: "FAILED", label: "交易失败" },
   { value: "CLOSE", label: "交易关闭" }
 ]
 

+ 1 - 1
src/utils/vueFilter.js

@@ -204,7 +204,7 @@ Vue.filter('dealStatus', value => {
   let template = {
     ING: "交易中",
     SUCCESS: "成功交易",
-    FAilED: "交易失败",
+    FAILED: "交易失败",
     CLOSE: "交易关闭"
   }
   return template[value]

+ 21 - 13
src/views/businessManager/orderManager/expend.vue

@@ -23,13 +23,13 @@
           <el-table-column align='center' prop="createTime"
                           label="申请时间">
           </el-table-column>
-          <el-table-column align='center' prop="realName"
+          <el-table-column align='center' prop="user.realName"
                           label="学员姓名">
           </el-table-column>
           <el-table-column align='center' prop="amount"
                           label="提现金额">
           </el-table-column>
-          <el-table-column align='center' prop="balance"
+          <el-table-column align='center' prop="detail.balance"
                           label="账户余额(元)">
           </el-table-column>
           <el-table-column align='center' prop="bankCardNo" width="200"
@@ -44,20 +44,20 @@
           <el-table-column align='center'
                           label="支付账号">
             <template slot-scope="scope">
-              <el-input v-if="scope.row.status == 'ING'" type="text" v-model="scope.row.platformAccountNo" placeholder="支付账号"></el-input>
-              <span v-else>{{ scope.row.platformAccountNo }}</span>
+              <el-input v-if="scope.row.status == 'ING'" type="text" v-model="scope.row.detail.platformAccountNo" placeholder="支付账号"></el-input>
+              <span v-else>{{ scope.row.detail.platformAccountNo }}</span>
             </template>
           </el-table-column>
           <el-table-column align='center'
                           label="支付渠道">
             <template slot-scope="scope">
               <!-- <el-input type="text" v-model="scope.row.channel" placeholder="支付渠道"></el-input> -->
-              <el-select  v-if="scope.row.status == 'ING'"  v-model="scope.row.channel" placeholder="请选择" style="width: 100% !important;">
-                <el-option label="微信" value="WECHAT"> </el-option>
-                <el-option label="支付宝" value="ALIPAY"> </el-option>
-                <el-option label="银联" value="FAST_PAYMENT"> </el-option>
+              <el-select  v-if="scope.row.status == 'ING'"  v-model="scope.row.detail.transType" placeholder="请选择" style="width: 100% !important;">
+                <el-option label="微信" value="1"> </el-option>
+                <el-option label="支付宝" value="2"> </el-option>
+                <el-option label="银联" value="3"> </el-option>
               </el-select>
-              <span v-else>{{ scope.row.channel }}</span>
+              <span v-else>{{ getTypes(scope.row.detail.transType) }}</span>
             </template>
           </el-table-column>
           <el-table-column align='center'
@@ -71,7 +71,7 @@
                           label="操作">
             <template slot-scope="scope" v-if="scope.row.status == 'ING'">
               <el-button @click="onSure(scope.row, 'SUCCESS')" type="text">确认</el-button>
-              <el-button @click="onSure(scope.row, 'FAilED')" type="text">拒绝</el-button>
+              <el-button @click="onSure(scope.row, 'FAILED')" type="text">拒绝</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -123,11 +123,19 @@ export default {
         }
       })
     },
+    getTypes(index) {
+      let template = {
+        1: '微信',
+        2: '支付宝',
+        3: '银联'
+      }
+      return template[index]
+    },
     onSure(row, type) {
       let contentText = ''
       if(type == 'SUCCESS') {
         contentText = '您确定提现吗?'
-      } else if(type == 'FAilED') {
+      } else if(type == 'FAILED') {
         contentText = '您确定拒绝吗?'
       }
       console.log(row)
@@ -138,8 +146,8 @@ export default {
       }).then(() => {
         studentWithdrawConfirm({
           id: row.id,
-          platformAccountNo: row.platformAccountNo,
-          transType: row.channel,
+          platformAccountNo: row.detail.platformAccountNo,
+          transType: row.detail.transType,
           status: type,
           transNo: row.transNo
         }).then(res => {

+ 0 - 17
src/views/businessManager/orderManager/incomebuy.vue

@@ -7,17 +7,6 @@
               class="searchForm"
               v-model="searchForm">
         <el-form-item>
-          <el-date-picker style="width: 400px"
-            v-model="orderDate"
-            type="daterange"
-            value-format="yyyy-MM-dd"
-            @change="searchOrderDate"
-            range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期">
-          </el-date-picker>
-        </el-form-item>
-        <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>
@@ -40,15 +29,9 @@
           <el-table-column align='center' prop="transNo"
                           label="交易流水号">
           </el-table-column>
-          <el-table-column align='center' prop="orderNo"
-                          label="订单号">
-          </el-table-column>
           <el-table-column align='center' prop="payTime"
                           label="订单日期">
           </el-table-column>
-          <el-table-column align='center' prop="expectAmount"
-                          label="应付金额">
-          </el-table-column>
           <el-table-column align='center' prop="actualAmount"
                           label="实付金额">
           </el-table-column>

+ 1 - 1
src/views/categroyManager/generalSettings/overallManager.vue

@@ -7,7 +7,7 @@
         <el-col :span="12" v-for="(config, index) in configList" :key="config.id">
           {{ config.description[0] }}
           <el-input type="number" v-model="input[index]">
-            <template slot="append" v-if="config.paramName !== 'default_password'">{{ config.description[1] }}</template>
+            <template slot="append" v-if="config.description[1]">{{ config.description[1] }}</template>
           </el-input>
           <el-button @click="onSave(config, index)" type="primary">保存</el-button>
         </el-col>

+ 20 - 1
src/views/categroyManager/insideSetting/addressManager.vue

@@ -156,6 +156,7 @@
                :visible.sync="mapStatus"
                width="800px">
       <el-amap-search-box class="search-box"
+                          value="searchValue"
                           :search-option="searchOption"
                           :on-search-result="onSearchResult"></el-amap-search-box>
       <el-amap :zoom="zoom"
@@ -259,6 +260,7 @@ export default {
         autoFitView: true // 是否自动调整地图视野使绘制的 Marker点都处于视口的可见范围
       },
       breachList: [], // 分部列表
+      searchValue: '测试'
     }
   },
   mounted () {
@@ -310,11 +312,28 @@ export default {
     addMap () { // 
       this.mapStatus = true
       let poi = this.addressDetail.poi
+      let address = this.addressDetail.address
       // 获取经纬度
       if (poi) {
         this.markers = []
-        this.center = [poi.split(',')[0], poi.split(',')[1]];
+        this.center = [poi.split(',')[0], poi.split(',')[1]]
         this.markers.push([poi.split(',')[0], poi.split(',')[1]])
+      } else if(address && poi == '') {
+        let that = this
+        //构造地点查询类
+        let placeSearch = new AMap.PlaceSearch({
+          pageSize: 1, // 单页显示结果条数
+          pageIndex: 1, // 页码
+        })
+        //关键字查询
+        placeSearch.search(address, function(status, result) {
+          if (status === 'complete') {
+            let pois = result.poiList.pois[0]
+            poi = pois.location.lng + ',' + pois.location.lat
+            that.center = [pois.location.lng, pois.location.lat]
+            that.markers.push([pois.location.lng, pois.location.lat])
+          }
+        })
       }
     },
     onSearchResult (pois) { // 搜索出来的Marker

+ 143 - 0
src/views/contentManager/components/training.vue

@@ -0,0 +1,143 @@
+<template>
+  <div>
+    <!-- 搜索标题 -->
+    <div @click="openTeaching('create')"
+           class='newBand'>新建</div>
+    <!-- 列表 -->
+    <div class="tableWrap">
+      <el-table :data='tableList' :header-cell-style="{background:'#EDEEF0',color:'#444'}">
+        <el-table-column align='center'
+                         label="轮播图">
+          <template slot-scope="scope">
+            <img class="bannerImg" :src="scope.row.coverImage" alt="">
+          </template>
+        </el-table-column>
+        <el-table-column align='center' prop="title"
+                         label="标题">
+        </el-table-column>
+        <el-table-column align='center'
+                         label="跳转连接">
+          <template slot-scope="scope">
+            {{ scope.row.linkUrl + '/' + scope.row.id }}
+          </template>
+        </el-table-column>
+        <el-table-column align='center' prop="remark"
+                         label="是否使用">
+          <template slot-scope="scope">
+            {{ scope.row.status == 1 ? '是' : '否' }}
+          </template>
+        </el-table-column>
+        <el-table-column align='center' label="操作">
+            <template slot-scope="scope">
+              <el-button @click="openTeaching('update', scope.row)" type="text">修改</el-button>
+              <el-button v-if="scope.row.status == 1" @click="onStop(scope.row, 0)"  type="text">停用</el-button>
+              <el-button v-else @click="onStop(scope.row, 1)"  type="text">启用</el-button>
+              <el-button @click="onDel(scope.row)" type="text">删除</el-button>
+            </template>
+        </el-table-column>
+      </el-table>
+      <pagination :total="pageInfo.total"
+                :page.sync="pageInfo.page"
+                :limit.sync="pageInfo.limit"
+                :page-sizes="pageInfo.page_size"
+                @pagination="getList" />
+    </div>
+  </div>
+</template>
+<script>
+import { newsList, newsUpdate, newsDel } from '@/api/contentManager'
+import pagination from '@/components/Pagination/index'
+import store from '@/store'
+export default {
+  components: {
+    pagination
+  },
+  data () {
+    return {
+      tableList: [],
+      organId: store.getters.organ,
+      teacherId: this.$route.query.teacherId,
+      pageInfo: {
+        // 分页规则
+        limit: 10, // 限制显示条数
+        page: 1, // 当前页
+        total: 1, // 总条数
+        page_size: [10, 20, 40, 50] // 选择限制显示条数
+      }
+    }
+  },
+  mounted() {
+    this.getList()
+  },
+  methods: {
+    getList() {
+      let params = {
+        rows: this.pageInfo.limit,
+        page: this.pageInfo.page,
+        type: 4
+      }
+      newsList(params).then(res => {
+        if(res.code == 200) {
+          this.tableList = res.data.rows
+          this.pageInfo.total = res.data.total
+        }
+      })
+    },
+    openTeaching(type, rows) {
+        let params = {}
+        if(type == 'update') {
+          params.id = rows.id
+        }
+        params.type = 4
+        params.pageType = type
+        this.$router.push({
+            path: '/contentManager/contentOperation',
+            query: params
+        })
+    },
+    onDel(row) { // 删除
+      this.$confirm('确定是否删除?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        newsDel({ id: row.id }).then(res => {
+          if(res.code == 200) {
+            this.$message({
+              message: '删除成功',
+              type: 'success'
+            })
+            this.getList()
+          } else {
+              this.$message.error(res.msg)
+          }
+        })
+      }).catch(() => { })
+      
+    },
+    onStop(row, status) { // 停止
+      // newsUpdate
+      let tempStr = ['停用', '启用']
+      newsUpdate({
+        id: row.id,
+        status: status
+      }).then(res => {
+        if(res.code == 200) {
+          this.$message({
+            message: tempStr[status] + '成功',
+            type: 'success'
+          })
+          this.getList()
+        } else {
+            this.$message.error(res.msg)
+        }
+      })
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.bannerImg {
+  height: 60px;
+}
+</style>

+ 7 - 5
src/views/contentManager/contentOperation.vue

@@ -9,9 +9,9 @@
         <el-form-item label="标题" prop="title">
           <el-input v-model="form.title"></el-input>
         </el-form-item>
-        <el-form-item label="排序值">
+        <!-- <el-form-item label="排序值">
           <el-input  v-model="form.order"></el-input>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="链接地址" prop="linkUrl">
           <el-input v-model="form.linkUrl"></el-input>
         </el-form-item>
@@ -73,7 +73,7 @@ export default {
             },
             form: {
                 title: null,
-                order: null,
+                order: 0,
                 coverImage: null,
                 linkUrl: 'http://mstudev.dayaedu.com/#/specialdetail',
                 type: this.$route.query.type,
@@ -184,7 +184,8 @@ export default {
           let tempTitle = {
               1: "精彩活动",
               2: "热门资讯",
-              3: "活动列表"
+              3: "活动列表",
+              4: "专项训练"
           }
           return tempTitle[type]
         },
@@ -192,7 +193,8 @@ export default {
           let tempTitle = {
               3: 0,
               1: 1,
-              2: 2
+              2: 2,
+              4: 3
           }
           return tempTitle[type]
         },

+ 7 - 3
src/views/contentManager/index.vue

@@ -17,6 +17,10 @@
                      name="2">
           <information v-if="activeStatus[2]" />
         </el-tab-pane>
+        <el-tab-pane label="专项训练"
+                     name="3">
+          <training v-if="activeStatus[3]" />
+        </el-tab-pane>
       </el-tabs>
     </div>
   </div>
@@ -25,19 +29,19 @@
 import banner from './components/banner'
 import activity from './components/activity'
 import information from './components/information'
+import training from './components/training'
 export default {
-  components: { banner, activity, information },
+  components: { banner, activity, information, training },
   name: 'teacherDetail',
   data () {
     return {
       activeName: "0",
-      activeStatus: [true, false, false]
+      activeStatus: [true, false, false, false]
     }
   },
   created() {
     let type = this.$route.query.type
     if(type != null) {
-      console.log(type)
       this.activeName = type.toString()
       this.activeStatus[type] = true
     }

+ 1 - 1
src/views/journal/leaveOperation.vue

@@ -159,7 +159,7 @@ export default {
         id: showMessage.id,
         // remark: null,
         status: type,
-        userId: showMessage.user.id
+        userId: showMessage.userId
       }
       approve(params).then(res => {
         if(res.code == 200) {

+ 22 - 2
src/views/teamBuild/teamSeting/components/setImprovement.vue

@@ -1,7 +1,9 @@
 <template>
   <div class="m-container">
     <h2>
-      <div class='squrt'></div>基础技能班报名详情 <span @click="onCreateQRCode" style="font-size: 16px; padding-left: 20px; font-weight: 400;">查看报名连接</span>
+      <div class='squrt'></div>基础技能班报名详情 
+      <span @click="onCreateQRCode" style="font-size: 16px; padding-left: 20px; font-weight: 400;cursor: pointer; ">查看报名连接</span>
+      <span @click="onApply" style="font-size: 16px; padding-left: 20px; font-weight: 400;cursor: pointer;">开启报名</span>
     </h2>
     <div class='m-core'>
       <div class="tableWrap">
@@ -120,7 +122,7 @@
   </div>
 </template>
 <script>
-import { highClassGroups, teamSoundStudent, resetHighClass } from '@/api/buildTeam'
+import { highClassGroups, teamSoundStudent, resetHighClass, pushMessage } from '@/api/buildTeam'
 import { getClassAllStudent, addStudents, removeStudents } from '@/api/studentManager'
 import QRCode from 'qrcodejs2'
 export default {
@@ -155,6 +157,24 @@ export default {
     })
   },
   methods: {
+    onApply() {
+      this.$confirm('您确定开启报名吗?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          pushMessage({ musicGroupId: this.teamid }).then(res => {
+            let result = res.data
+            console.log(res)
+            if(res.code == 200) {
+              this.$message.success('报名成功')
+            } else {
+              this.$message.error(res.msg)
+            }
+          })
+        }).catch(() => { })
+      
+    },
     onCreateQRCode () { // 生成报名二维码
       this.qrcodeStatus = true
       let id = this.$route.query.id

+ 2 - 2
vue.config.js

@@ -16,11 +16,11 @@ const name = defaultSettings.title || 'vue Admin Template' // page title
 // const port = process.env.port || process.env.npm_config_port || 9528 // dev port
 // http://47.99.212.176:8000
 // 
-let target = 'http://192.168.3.27:8000' // 箭河
+// let target = 'http://192.168.3.27:8000' // 箭河
 // let target = 'http://192.168.3.28:8000' //邹璇
 // let target = 'http://192.168.3.8:8000' //勇哥
 // let target = 'http://47.99.212.176:8000' // 测试服
-// let target = 'http://192.168.3.48:8000' // 乔
+let target = 'http://192.168.3.48:8000' // 乔
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {
   /**

部分文件因为文件数量过多而无法显示