Merge branch 'master' into wxl_01_15

dist/static/css/chunk-019954b4.93b799ba.css

@@ -0,0 +1 @@
+.el-button+.el-button[data-v-44b1b465]{margin-left:0}.hanlderWrap[data-v-44b1b465]{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;-webkit-box-align:center;-ms-flex-align:center;align-items:center}

dist/static/css/chunk-2928a062.ed85bd95.css

@@ -0,0 +1 @@
+.el-button--primary[data-v-6d8ea27e],.el-button--primary[data-v-6d8ea27e]:active,.el-button--primary[data-v-6d8ea27e]:focus,.el-button--primary[data-v-6d8ea27e]:hover{background:#14928a;border-color:#14928a;color:#fff}.el-row[data-v-6d8ea27e]{margin-top:40px}.el-col[data-v-6d8ea27e]{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-6d8ea27e]{width:200px;margin:0 20px}[data-v-6d8ea27e] .el-tree-node__content{height:40px!important}[data-v-6d8ea27e] .avatar-uploader .el-upload{border:1px dashed #d9d9d9;border-radius:6px;cursor:pointer;position:relative;overflow:hidden}.avatar-uploader .el-upload[data-v-6d8ea27e]:hover{border-color:#409eff}.avatar-uploader-icon[data-v-6d8ea27e]{font-size:28px;color:#8c939d;width:120px;height:120px;line-height:120px;text-align:center}.avatar[data-v-6d8ea27e]{width:120px;height:120px;display:block}

dist/static/css/chunk-2c369f8f.d9320587.css

@@ -0,0 +1 @@
+.el-button--primary[data-v-3d89579e],.el-button--primary[data-v-3d89579e]:active,.el-button--primary[data-v-3d89579e]:focus,.el-button--primary[data-v-3d89579e]:hover{background:#14928a;border-color:#14928a;color:#fff}.el-row[data-v-3d89579e]{margin-top:40px}.el-col[data-v-3d89579e]{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-3d89579e]{width:200px;margin:0 20px}[data-v-3d89579e] .el-tree-node__content{height:40px!important}.moreRule[data-v-3d89579e]{background:#f0f0f0;position:relative}.moreRule .el-form-item__error[data-v-3d89579e]{color:#f56c6c;font-size:12px;line-height:1;position:absolute;left:120px;top:100%;margin-top:-21px}.add[data-v-3d89579e]{margin-bottom:22px;background:#f0f0f0;padding-bottom:22px}.moreRuleIn .el-form-item[data-v-3d89579e]{display:inline-block}.moreRuleIn .el-form-item[data-v-3d89579e]:first-child .el-form-item__content{margin-left:120px!important}.moreRuleIn .el-form-item[data-v-3d89579e] .el-form-item__content{margin-left:0!important}.max[data-v-3d89579e],.min[data-v-3d89579e]{display:inline-block;width:180px;text-align:center;margin-right:10px}

dist/static/css/chunk-32bcb923.c914be93.css

@@ -1 +0,0 @@
-.micon[data-v-a4e34480]{position:absolute;top:3px;right:2px}

dist/static/css/chunk-43f42732.7a787327.css

@@ -1 +0,0 @@
-.m-container[data-v-59b4aa3c]{min-width:100%}.el-input[data-v-59b4aa3c]{width:400px}[data-v-59b4aa3c] .ql-editor{min-height:300px;padding:0}[data-v-59b4aa3c] .ql-container .ql-editor{max-height:500px}.el-button--primary[data-v-59b4aa3c],.el-button--primary[data-v-59b4aa3c]:active,.el-button--primary[data-v-59b4aa3c]:focus,.el-button--primary[data-v-59b4aa3c]:hover{background:#14928a;border-color:#14928a;color:#fff}.el-row[data-v-59b4aa3c]{margin-top:40px}.el-col[data-v-59b4aa3c]{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-59b4aa3c]{width:200px;margin:0 20px}[data-v-59b4aa3c] .el-tree-node__content{height:40px!important}[data-v-59b4aa3c] .avatar-uploader .el-upload{border:1px dashed #d9d9d9;border-radius:6px;cursor:pointer;position:relative;overflow:hidden}.avatar-uploader .el-upload[data-v-59b4aa3c]:hover{border-color:#409eff}.avatar-uploader-icon[data-v-59b4aa3c]{font-size:28px;color:#8c939d;width:240px;height:120px;line-height:120px;text-align:center}[data-v-59b4aa3c] .el-date-editor{width:400px}.avatar[data-v-59b4aa3c]{width:240px;height:120px;display:block}.ivu-upload[data-v-59b4aa3c]{display:none}

dist/static/css/chunk-4783dafe.8c75280c.css

@@ -0,0 +1 @@
+.el-input[data-v-533fdc69],.el-select[data-v-533fdc69],.el-textarea[data-v-533fdc69]{width:100%!important}.el-button--primary[data-v-533fdc69],.el-button--primary[data-v-533fdc69]:active,.el-button--primary[data-v-533fdc69]:focus,.el-button--primary[data-v-533fdc69]:hover{background:#14928a;border-color:#14928a;color:#fff}[data-v-533fdc69] .avatar-uploader .el-upload{border:1px dashed #d9d9d9;border-radius:6px;cursor:pointer;position:relative;overflow:hidden}[data-v-533fdc69] .avatar-uploader .el-upload:hover{border-color:#409eff}.uploadFile[data-v-533fdc69] .el-input__inner{padding:0;height:40px;line-height:32px}.avatar-uploader-icon[data-v-533fdc69]{font-size:28px;color:#8c939d;width:178px;height:178px;line-height:178px;text-align:center}.avatar[data-v-533fdc69]{width:178px;height:178px;display:block}

dist/static/css/chunk-49fdaf2c.c1b09a52.css

@@ -0,0 +1 @@
+.micon[data-v-475335b1]{position:absolute;top:3px;right:2px}.serverInfo[data-v-475335b1]{line-height:30px}.serverInfo span[data-v-475335b1]{color:#333;font-weight:700}.infoWrap[data-v-475335b1]{margin-top:30px}.infoWrap span[data-v-475335b1]{color:red;font-weight:400}.titleWrap[data-v-475335b1]{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}.m-container h2[data-v-475335b1]{-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}

dist/static/css/chunk-4dede8d0.cbdc2d58.css

@@ -1 +0,0 @@
-.el-button--primary[data-v-f192f888],.el-button--primary[data-v-f192f888]:active,.el-button--primary[data-v-f192f888]:focus,.el-button--primary[data-v-f192f888]:hover{background:#14928a;border-color:#14928a;color:#fff}.el-row[data-v-f192f888]{margin-top:40px}.el-col[data-v-f192f888]{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-f192f888]{width:200px;margin:0 20px}[data-v-f192f888] .el-tree-node__content{height:40px!important}

dist/static/css/chunk-531b4d2d.cb7eb07b.css

@@ -0,0 +1 @@
+.el-button--primary[data-v-a089cf0c],.el-button--primary[data-v-a089cf0c]:active,.el-button--primary[data-v-a089cf0c]:focus,.el-button--primary[data-v-a089cf0c]:hover{background:#14928a;border-color:#14928a;color:#fff}.el-row[data-v-a089cf0c]{margin-top:40px}.el-col[data-v-a089cf0c]{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-a089cf0c]{width:200px;margin:0 20px}[data-v-a089cf0c] .el-tree-node__content{height:40px!important}

dist/static/css/chunk-54fabc61.18f560aa.css

@@ -0,0 +1 @@
+.m-container[data-v-5750271c]{min-width:100%}.el-input[data-v-5750271c]{width:400px}[data-v-5750271c] .ql-editor{min-height:300px;padding:0}[data-v-5750271c] .ql-container .ql-editor{max-height:500px}.el-button--primary[data-v-5750271c],.el-button--primary[data-v-5750271c]:active,.el-button--primary[data-v-5750271c]:focus,.el-button--primary[data-v-5750271c]:hover{background:#14928a;border-color:#14928a;color:#fff}.el-row[data-v-5750271c]{margin-top:40px}.el-col[data-v-5750271c]{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-5750271c]{width:200px;margin:0 20px}[data-v-5750271c] .el-tree-node__content{height:40px!important}[data-v-5750271c] .avatar-uploader .el-upload{border:1px dashed #d9d9d9;border-radius:6px;cursor:pointer;position:relative;overflow:hidden}.avatar-uploader .el-upload[data-v-5750271c]:hover{border-color:#409eff}.avatar-uploader-icon[data-v-5750271c]{font-size:28px;color:#8c939d;width:240px;height:120px;line-height:120px;text-align:center}[data-v-5750271c] .el-date-editor{width:400px}.avatar[data-v-5750271c]{width:240px;height:120px;display:block}.ivu-upload[data-v-5750271c]{display:none}

dist/static/css/chunk-56dc5838.cd5a6f29.css

@@ -1 +0,0 @@
-.newBand[data-v-581b9d55]{display:inline-block;margin-right:10px}.right-code .title[data-v-581b9d55]{font-size:18px;text-align:center;padding-bottom:8px}[data-v-581b9d55] .studentInfo .el-dialog__body{padding-top:0;padding-bottom:0}[data-v-581b9d55] .studentInfo .multiple.el-select{width:185px!important}

dist/static/css/chunk-72b7aa74.fb5c3744.css → dist/static/css/chunk-59e20bd0.e3a2f246.css

@@ -1 +1 @@
-.computeMoney[data-v-1ce4a186]{margin-top:10px;float:right}.m-core[data-v-1ce4a186]{margin-top:30px}.m-core .el-input[data-v-1ce4a186]{width:180px}.m-core h4[data-v-1ce4a186]{font-size:16px;background-color:#ccc;color:#fff;width:100%;height:40px;line-height:40px;margin-bottom:20px;padding:0 20px}.vipMsg[data-v-1ce4a186]{margin-bottom:20px}.planList[data-v-1ce4a186]{padding:0 25px}.planList .planTop[data-v-1ce4a186]{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-1ce4a186]{font-size:14px}.planList .planCore .row[data-v-1ce4a186]{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-1ce4a186]{width:87px}.okBtn[data-v-1ce4a186]{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}
+.computeMoney[data-v-7c6929a2]{margin-top:10px;float:right}.m-core[data-v-7c6929a2]{margin-top:30px}.m-core .el-input[data-v-7c6929a2]{width:180px}.m-core h4[data-v-7c6929a2]{font-size:16px;background-color:#ccc;color:#fff;width:100%;height:40px;line-height:40px;margin-bottom:20px;padding:0 20px}.vipMsg[data-v-7c6929a2]{margin-bottom:20px}.planList[data-v-7c6929a2]{padding:0 25px}.planList .planTop[data-v-7c6929a2]{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-7c6929a2]{font-size:14px}.planList .planCore .row[data-v-7c6929a2]{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-7c6929a2]{width:87px}.okBtn[data-v-7c6929a2]{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}

dist/static/css/chunk-664a00d6.b49b80d4.css

@@ -1 +0,0 @@
-.el-button--primary[data-v-2eeaff79],.el-button--primary[data-v-2eeaff79]:active,.el-button--primary[data-v-2eeaff79]:focus,.el-button--primary[data-v-2eeaff79]:hover{background:#14928a;border-color:#14928a;color:#fff}.el-row[data-v-2eeaff79]{margin-top:40px}.el-col[data-v-2eeaff79]{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-2eeaff79]{width:200px;margin:0 20px}[data-v-2eeaff79] .el-tree-node__content{height:40px!important}[data-v-2eeaff79] .avatar-uploader .el-upload{border:1px dashed #d9d9d9;border-radius:6px;cursor:pointer;position:relative;overflow:hidden}.avatar-uploader .el-upload[data-v-2eeaff79]:hover{border-color:#409eff}.avatar-uploader-icon[data-v-2eeaff79]{font-size:28px;color:#8c939d;width:120px;height:120px;line-height:120px;text-align:center}.avatar[data-v-2eeaff79]{width:120px;height:120px;display:block}

dist/static/css/chunk-014c06fa.3ced70c7.css → dist/static/css/chunk-68b8622f.78087a34.css

@@ -1 +1 @@
-.vip-base[data-v-0b9de86e]{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}.vip-base[data-v-0b9de86e] .el-date-editor.el-input,.vip-base[data-v-0b9de86e] .el-date-editor.el-input__inner,.vip-base[data-v-0b9de86e] .el-input,.vip-base[data-v-0b9de86e] .el-select{width:180px!important}.vip-base .left[data-v-0b9de86e]{width:400px}.vip-base .tableWrap[data-v-0b9de86e]{margin-top:40px}.vip-base .tableWrap h4[data-v-0b9de86e]{font-size:16px;font-weight:400;margin-bottom:20px}.vip-base .right[data-v-0b9de86e]{clear:both}.vip-base .right .resetBtn[data-v-0b9de86e]{margin-top:30px;float:right}.vip-base .disBox[data-v-0b9de86e]{background-color:#f5f7fa;border-color:#e4e7ed;color:#c0c4cc;cursor:not-allowed;border-radius:4px;border:1px solid #dcdfe6;color:#333;padding:0 15px;width:180px}.title[data-v-b532b26c]{display:inline-block;width:108px;text-align:right;margin-right:10px}[data-v-b532b26c] .el-input-number .el-input__inner{text-align:left!important}.btnWrap[data-v-b532b26c]{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;margin-bottom:15px}
+.vip-base[data-v-0b9de86e]{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}.vip-base[data-v-0b9de86e] .el-date-editor.el-input,.vip-base[data-v-0b9de86e] .el-date-editor.el-input__inner,.vip-base[data-v-0b9de86e] .el-input,.vip-base[data-v-0b9de86e] .el-select{width:180px!important}.vip-base .left[data-v-0b9de86e]{width:400px}.vip-base .tableWrap[data-v-0b9de86e]{margin-top:40px}.vip-base .tableWrap h4[data-v-0b9de86e]{font-size:16px;font-weight:400;margin-bottom:20px}.vip-base .right[data-v-0b9de86e]{clear:both}.vip-base .right .resetBtn[data-v-0b9de86e]{margin-top:30px;float:right}.vip-base .disBox[data-v-0b9de86e]{background-color:#f5f7fa;border-color:#e4e7ed;color:#c0c4cc;cursor:not-allowed;border-radius:4px;border:1px solid #dcdfe6;color:#333;padding:0 15px;width:180px}.title[data-v-6f6eff75]{display:inline-block;width:108px;text-align:right;margin-right:10px}[data-v-6f6eff75] .el-input-number .el-input__inner{text-align:left!important}.btnWrap[data-v-6f6eff75]{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;margin-bottom:15px}

dist/static/css/chunk-7350de7e.5dc7da99.css

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

dist/static/css/chunk-8ecd6f4e.52a8701f.css

@@ -0,0 +1 @@
+.newBand[data-v-2865076e]{display:inline-block;margin-right:10px}.right-code .title[data-v-2865076e]{font-size:18px;text-align:center;padding-bottom:8px}[data-v-2865076e] .studentInfo .el-dialog__body{padding-top:0;padding-bottom:0}[data-v-2865076e] .studentInfo .multiple.el-select{width:185px!important}

dist/static/css/chunk-94387568.bd6d4f80.css

@@ -1 +0,0 @@
-.el-button--primary[data-v-72f51c7b],.el-button--primary[data-v-72f51c7b]:active,.el-button--primary[data-v-72f51c7b]:focus,.el-button--primary[data-v-72f51c7b]:hover{background:#14928a;border-color:#14928a;color:#fff}.el-row[data-v-72f51c7b]{margin-top:40px}.el-col[data-v-72f51c7b]{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-72f51c7b]{width:200px;margin:0 20px}[data-v-72f51c7b] .el-tree-node__content{height:40px!important}.moreRule[data-v-72f51c7b]{background:#f0f0f0;position:relative}.moreRule .el-form-item__error[data-v-72f51c7b]{color:#f56c6c;font-size:12px;line-height:1;position:absolute;left:120px;top:100%;margin-top:-21px}.add[data-v-72f51c7b]{margin-bottom:22px;background:#f0f0f0;padding-bottom:22px}.moreRuleIn .el-form-item[data-v-72f51c7b]{display:inline-block}.moreRuleIn .el-form-item[data-v-72f51c7b]:first-child .el-form-item__content{margin-left:120px!important}.moreRuleIn .el-form-item[data-v-72f51c7b] .el-form-item__content{margin-left:0!important}.max[data-v-72f51c7b],.min[data-v-72f51c7b]{display:inline-block;width:180px;text-align:center;margin-right:10px}

dist/static/css/chunk-aaa0daf4.d021abcd.css

@@ -1 +0,0 @@
-.el-input[data-v-59a739a9],.el-select[data-v-59a739a9],.el-textarea[data-v-59a739a9]{width:100%!important}.el-button--primary[data-v-59a739a9],.el-button--primary[data-v-59a739a9]:active,.el-button--primary[data-v-59a739a9]:focus,.el-button--primary[data-v-59a739a9]:hover{background:#14928a;border-color:#14928a;color:#fff}[data-v-59a739a9] .avatar-uploader .el-upload{border:1px dashed #d9d9d9;border-radius:6px;cursor:pointer;position:relative;overflow:hidden}[data-v-59a739a9] .avatar-uploader .el-upload:hover{border-color:#409eff}.uploadFile[data-v-59a739a9] .el-input__inner{padding:0;height:40px;line-height:32px}.avatar-uploader-icon[data-v-59a739a9]{font-size:28px;color:#8c939d;width:178px;height:178px;line-height:178px;text-align:center}.avatar[data-v-59a739a9]{width:178px;height:178px;display:block}

src/views/adapayAccount/form.vue

@@ -375,6 +375,7 @@ export default {
       this.files = null
       this.fileList = []
       this.form.multipartFile = null
+      this.$store.dispatch('delVisitedViews', this.$route)
       this.$router.push({
         path: "/insideSetting/adapayManager"
       });

src/views/adapayAccount/index.vue

@@ -292,7 +292,7 @@ export default {
           row: JSON.stringify(row)
         }
       }, (route) => {
-        route.meta.title = tagTitle + '汇会账号'
+        route.meta.title = tagTitle + '汇付账号'
       })
     },
     onUpdateAccount (row) {

src/views/app/entryOperation.vue

@@ -349,6 +349,7 @@ export default {
     messageTips (title, res) {
       if (res.code == 200) {
         this.$message.success(title + "成功");
+        this.$store.dispatch('delVisitedViews', this.$route)
         this.$router.push({
           path: "/insideSetting/entryActivities"
         });
@@ -357,6 +358,7 @@ export default {
       }
     },
     onCancel () {
+      this.$store.dispatch('delVisitedViews', this.$route)
       this.$router.push({
         path: "/insideSetting/entryActivities"
       });

src/views/buildVip/index.vue

@@ -1491,6 +1491,7 @@ export default {
                 //   message: '提交成功!'
                 // });
                 this.$message.success("提交成功");
+                this.$store.dispatch('delVisitedViews', this.$route)
                 this.$router.push({
                   path: "/business/vipList",
                   query: {
@@ -1501,6 +1502,7 @@ export default {
               });
             } else {
               this.$message.success("恭喜您创建成功");
+              this.$store.dispatch('delVisitedViews', this.$route)
               this.$router.push({
                 path: "/business/vipList",
                 query: {
@@ -1610,6 +1612,7 @@ export default {
       }
     },
     onCancel() {
+      this.$store.dispatch('delVisitedViews', this.$route)
       this.$router.push({
         path: "/business/vipList",
         query: {

src/views/businessManager/shopManager/shopOperation.vue

@@ -422,6 +422,7 @@ export default {
     messageTips (title, res) {
       if (res.code == 200) {
         this.$message.success(title + '成功')
+        this.$store.dispatch('delVisitedViews', this.$route)
         this.$router.push({
           path: '/shopManager/shopManager',
           query: {
@@ -434,6 +435,7 @@ export default {
       }
     },
     onCancel () {
+      this.$store.dispatch('delVisitedViews', this.$route)
       this.$router.push({
         path: '/shopManager/shopManager'
       })

src/views/categroyManager/insideSetting/adminOperation.vue

@@ -134,6 +134,7 @@ export default {
     messageTips (title, res) {
       if (res.code == 200) {
         this.$message.success('修改成功')
+        this.$store.dispatch('delVisitedViews', this.$route)
         this.$router.push({ path: '/specialSetup/adminManager', query: { page: this.page } })
       } else {
         this.$message.error(res.msg)
@@ -237,6 +238,7 @@ export default {
       this.checkAll = false
     },
     onCancel () {
+      this.$store.dispatch('delVisitedViews', this.$route)
       this.$router.push({
         path: '/specialSetup/adminManager',
         query: {

src/views/categroyManager/insideSetting/branchActiveOperation.vue

@@ -298,12 +298,14 @@ export default {
     messageTips (title, res) {
       if (res.code == 200) {
         this.$message.success('修改成功')
+        this.$store.dispatch('delVisitedViews', this.$route)
         this.$router.push({ path: '/vipClassSet/branchActive', query: { rules: this.pageInfo, searchForm: this.searchForm } })
       } else {
         this.$message.error(res.msg)
       }
     },
     onCancel () {
+      this.$store.dispatch('delVisitedViews', this.$route)
       this.$router.push({ path: '/vipClassSet/branchActive', query: { rules: this.pageInfo, searchForm: this.searchForm } })
     },
     resetForm () {

src/views/categroyManager/vipNewActive.vue

@@ -426,6 +426,7 @@ export default {
             if (res.code == 200) {
               this.$message.success("恭喜你,活动创建成功");
               this.onReSet();
+              this.$store.dispatch('delVisitedViews', this.$route)
               this.$router.push({
                 path: "/vipClassSet/vipActiveList"
               });
@@ -459,6 +460,7 @@ export default {
       this.$forceUpdate()
     },
     onCancel () {
+      this.$store.dispatch('delVisitedViews', this.$route)
       this.$router.push({
         path: "/vipClassSet/vipActiveList",
         query: { rules: this.rules, searchForm: this.searchForm }

src/views/contentManager/contentOperation.vue

@@ -633,6 +633,7 @@ export default {
     messageTips (title, res) {
       if (res.code == 200) {
         this.$message.success(title + "成功");
+        this.$store.dispatch('delVisitedViews', this.$route)
         this.$router.push({
           path: "/contentManager/contentManager",
           query: {
@@ -644,6 +645,7 @@ export default {
       }
     },
     onCancel () {
+      this.$store.dispatch('delVisitedViews', this.$route)
       this.$router.push({
         path: "/contentManager/contentManager",
         query: {

src/views/operateManager/modals/infoList.js

@@ -0,0 +1,11 @@
+export const infoList =[
+{ row1:'学员有声部课、VIP课、合奏课、网管课',row2:'本周有声部课',row3:'声部课老师课后布置作业',row4:'声部课老师统计服务指标'},
+{ row1:'学员有声部课、VIP课、合奏课、网管课',row2:'本周无声部课',row3:'声部课老师在课外训练布置作业',row4:'声部课老师统计服务指标'},
+{ row1:'学员有VIP课、合奏课、网管课',row2:'本周有VIP课',row3:'VIP课老师课后布置作业',row4:'VIP课老师统计服务指标'},
+{ row1:'学员有VIP课、合奏课、网管课',row2:'本周无VIP课',row3:'VIP课老师布置课外训练',row4:'VIP课老师统计服务指标'},
+{ row1:'学员有合奏课、网管课',row2:'无论本周是否有合奏课',row3:'该乐团声部班老师布置课外训练',row4:'声部班老师统计服务指标'},
+{ row1:'学员有合奏课、网管课',row2:'无论本周是否有合奏课',row3:'该乐团没有声部班则指导老师布置课外训练',row4:'指导老师统计服务指标'},
+{ row1:'学员有网管课',row2:'本周有网管课',row3:'网管课老师课后布置作业',row4:'网管课老师统计服务指标'},
+{ row1:'学员有网管课',row2:'本周无网管课',row3:'网管课老师布置课外训练',row4:'网管课老师统计服务指标'},
+{ row1:'学员没有任何课程但在进行中乐团在读',row2:'无课程',row3:'该乐团声部班老师布置课外训练',row4:'声部班老师统计服务指标'},
+{ row1:'学员没有任何课程但在进行中乐团在读',row2:'无课程',row3:'该乐团没有声部班则指导老师布置课外训练',row4:'指导老师统计服务指标'}]

src/views/operateManager/serverIndexList.vue

@@ -2,8 +2,12 @@
 <template>
   <div class="m-container">
     <h2>
+      <div class="titleWrap">
       <div class="squrt"></div>
       服务指标
+      </div>
+
+      <el-button type="text" icon="el-icon-question"  @click="lookServerDetail" style="color:red">服务指标规则</el-button>
     </h2>
     <div class="m-core">
       <save-form
@@ -144,6 +148,7 @@
           >
         </el-form-item>
       </save-form>
+
       <div class="tableWrap">
         <el-table
           style="width: 100%"
@@ -171,13 +176,12 @@
               </div>
             </template>
           </el-table-column>
-          <el-table-column
-            align="center"
-            prop="groupNames"
-            label="乐团名称"
-          >
+          <el-table-column align="center" prop="groupNames" label="乐团名称">
             <template slot-scope="scope">
-              <overflow-text width="100%" :text="scope.row.groupNames"></overflow-text>
+              <overflow-text
+                width="100%"
+                :text="scope.row.groupNames"
+              ></overflow-text>
             </template>
           </el-table-column>
           <el-table-column align="center" prop="teacherName" label="指导老师">
@@ -287,6 +291,82 @@
         />
       </div>
     </div>
+    <el-dialog title="服务指标规则说明" :visible.sync="lookServer">
+      <div class="serverInfo">
+        <p>作业布置&服务指标优先级：<span>声部课>VIP课>合奏课>网管课</span></p>
+        <p>
+          每
+          <span>周一凌晨</span> 系统根据学员的排课情况生成布置作业路径及服务指标
+        </p>
+        <p>
+          <span>多次课程</span>
+          只布置一次作业、统计一次服务指标（多乐团、多组VIP网管课除外）
+        </p>
+        <el-table
+         border
+         style="margin-top:30px"
+          :data="infoList"
+          :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
+          :span-method="arraySpanMethod"
+        >
+          <el-table-column
+            align="center"
+            prop="row1"
+            label="总体课程情况"
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            prop="row2"
+            label="本周课程情况"
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            prop="row3"
+            label="作业布置路径"
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            prop="row4"
+            label="服务指标统计"
+          ></el-table-column>
+        </el-table>
+        <div class="infoWrap">
+           <h4>其他情况：</h4>
+        <p>1.学员在 <span>多个乐团时</span> ，剩余课程中 <span>本周有声部课</span> 的乐团布置作业， <span>都有</span> 则都布置， <span>都没有</span>  则根据表格中的逻辑布置</p>
+        <p>2.学员存在 <span>多组VIP课</span> 时，若课程组 <span>老师相同</span> ，则仅布置一次作业（网管课同理）</p>
+        <p>3.学员存在 <span>多组VIP课</span> 时，若课程组 <span>老师不同，本周有课</span> 的VIP课程组布置作业，多个课程组本周都有课则布置多次（网管课同理）</p>
+        <p>4.学员存在 <span>多组VIP课</span> 时，若课程组 <span>老师不同，本周都没有课</span> ，则所有VIP老师  <span>都布置</span> 课外训练， <span>都统计</span> 服务指标</p>
+        </div>
+           <div class="infoWrap">
+           <h4>课程调整:</h4>
+        <p>本周 <span>课程调整时</span> ，重新根据该学员的 <span>本周课程情况更新</span> 作业布置路径及服务指标 则根据表格中的逻辑布置</p>
+        </div>
+                   <div class="infoWrap">
+           <h4>服务指标:</h4>
+           <p>服务指标按 <span>周为单位</span> 统计</p>
+            <p><span>周六周日</span> 的服务指标 <span>延迟到下周二更新</span> 实际安排数据（即周日的作业课程，在周二23:59:59时前布置作业都算一次实际安排）</p>
+        </div>
+          <div class="infoWrap">
+           <h4>服务指标开启/关闭:</h4>
+           <p>学员新增课程时，自动开启服务指标，</p>
+           <p>手动关闭服务指标的学员新增课程时，不会自动开启服务指标</p>
+           <p>学员退团、乐团关闭、VIP课程组结束、网管课课程组结束时，若学员不在任何【进行中】乐团【在读】，且无任何未开始课程（乐团课、VIP课、网管课），则关闭服务指标</p>
+        </div>
+           <div class="infoWrap">
+           <h4>服务指标解释：</h4>
+          <p><span>若本周学员有多次服务指标则生成多条数据</span> </p>
+          <p>预期安排：本周内服务指标次数（即本周应该给该学员布置的作业次数）</p>
+          <p>实际安排：本周通过服务指标作业布置路径给该学员布置作业的次数</p>
+          <p>提交次数：本周学员按照作业布置路径提交作业的次数</p>
+          <p>评价次数：本周老师评价通过作业布置路径提交的作业的次数</p>
+          <p>及时评价次数：学员提交作业后24小时内进行评价的次数</p>
+          <p>VIP课：本周VIP课程课时数</p>
+          <p>付费网管课：本周付费网管课课时数</p>
+          <p>作业提交时间：学员提交作业的时间</p>
+          <p>服务周期：本服务周期时间段</p>
+        </div>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -295,9 +375,11 @@ import axios from "axios";
 import { getToken } from "@/utils/auth";
 import pagination from "@/components/Pagination/index";
 import load from "@/utils/loading";
-import dayjs from 'dayjs'
+import dayjs from "dayjs";
 import { getEmployeeOrgan, getTeacher } from "@/api/buildTeam";
+import { infoList } from "./modals/infoList";
 import { findStudentExtracurricularExercisesSituations } from "@/api/afterSchool";
+
 // findStudentExtracurricularExercisesSituations
 let nowTime = new Date();
 nowTime =
@@ -333,6 +415,8 @@ export default {
         total: 0, // 总条数
         page_size: [10, 20, 40, 50], // 选择限制显示条数
       },
+      lookServer: false,
+      infoList: infoList,
       // imageIcon: require("@/assets/images/base/warning.png"),
     };
   },
@@ -365,7 +449,7 @@ export default {
   },
   methods: {
     dayjs,
-    init () {
+    init() {
       if (this.$route.query.teacherId) {
         this.searchForm.teacherId = this.$route.query.teacherId * 1;
       }
@@ -435,9 +519,9 @@ export default {
         teacherId: null,
         existVipCourse: null,
       };
-          this.searchForm.timer = [];
-    this.searchForm.timer.push(this.getNowDateAndMonday(nowTime));
-    this.searchForm.timer.push(this.getNowDateAndSunday(nowTime));
+      this.searchForm.timer = [];
+      this.searchForm.timer.push(this.getNowDateAndMonday(nowTime));
+      this.searchForm.timer.push(this.getNowDateAndSunday(nowTime));
       this.search();
     },
 
@@ -586,6 +670,24 @@ export default {
         },
       });
     },
+    lookServerDetail() {
+      this.lookServer = true;
+    },
+    arraySpanMethod({ row, column, rowIndex, columnIndex }) {
+      if (columnIndex === 0) {
+        if (rowIndex % 2 === 0) {
+          return {
+            rowspan: 2,
+            colspan: 1,
+          };
+        } else {
+          return {
+            rowspan: 0,
+            colspan: 0,
+          };
+        }
+      }
+    },
   },
 };
 </script>
@@ -595,4 +697,29 @@ export default {
   top: 3px;
   right: 2px;
 }
+.serverInfo {
+  line-height: 30px;
+  span {
+    color: #333;
+    font-weight: bold;
+  }
+}
+.infoWrap {
+  margin-top: 30px;
+  span {
+    color:red;
+     font-weight: normal;
+  }
+}
+.titleWrap {
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+  align-items: center;
+}
+.m-container{
+  h2{
+    justify-content: space-between;
+  }
+}
 </style>

src/views/teacherManager/teacherDetail/components/courseInfo.vue

@@ -80,7 +80,7 @@
                 "
                 v-permission="'courseSchedule/classGroupTeacherAdjust'"
                 @click="resetCourse(scope.row)"
-                >操作</el-button
+                >课程移交</el-button
               >
             </div>
           </template>
@@ -103,14 +103,18 @@
           prop="targetTeacherId"
           :rules="[{ required: true, message: '请选择老师', trigger: 'blur' }]"
         >
-          <el-select v-model="maskForm.targetTeacherId" clearable filterable>
+            <remote-search
+            :commit="'setTeachers'"
+            v-model="maskForm.targetTeacherId"
+          />
+          <!-- <el-select v-model="maskForm.targetTeacherId" clearable filterable>
             <el-option
               v-for="(item, index) in teacherList"
               :label="item.realName"
               :value="item.id"
               :key="index"
             ></el-option>
-          </el-select>
+          </el-select> -->
         </el-form-item>
         <!-- <el-form-item label="备注"
                       prop='memo'
@@ -178,11 +182,11 @@ export default {
     this.getList();
     this.musicGroupStatus = musicGroupStatus;
     // 获取指导老师
-    getTeacher({}).then((res) => {
-      if (res.code == 200) {
-        this.teacherList = res.data;
-      }
-    });
+    // getTeacher({}).then((res) => {
+    //   if (res.code == 200) {
+    //     this.teacherList = res.data;
+    //   }
+    // });
   },
   methods: {
     selectable(row, index) {

src/views/teacherManager/teacherList.vue

@@ -5,13 +5,17 @@
       老师列表
     </h2>
     <div class="m-core">
-      <div
-        class="newBand"
-        v-permission="'/teacherOperationAdd'"
-        @click="onTeacher('create')"
-      >
-        老师新增
+      <div class="hanlderWrap">
+        <div
+          class="newBand"
+          v-permission="'/teacherOperationAdd'"
+          @click="onTeacher('create')"
+        >
+          老师新增
+        </div>
+
       </div>
+
       <!-- 搜索标题 -->
       <save-form
         :inline="true"
@@ -43,15 +47,19 @@
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-select style="width: 100% !important;"
-                     filterable
-                     clearable
-                     v-model.trim="searchForm.subjectId"
-                     placeholder="专业技能">
-            <el-option v-for="(item, i) in selects.subjects"
-                         :key="i"
-                         :label="item.name"
-                         :value="item.id"></el-option>
+          <el-select
+            style="width: 100% !important"
+            filterable
+            clearable
+            v-model.trim="searchForm.subjectId"
+            placeholder="专业技能"
+          >
+            <el-option
+              v-for="(item, i) in selects.subjects"
+              :key="i"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
           </el-select>
           <!-- <el-select
             v-model.trim="searchForm.subjectId"
@@ -84,7 +92,9 @@
               v-for="item in selects.branchs"
               :key="item.id"
               :label="item.name"
-              :value="item.id"> </el-option>
+              :value="item.id"
+            >
+            </el-option>
           </el-select>
         </el-form-item>
         <el-form-item>
@@ -219,17 +229,17 @@
               }}</el-button>
             </template>
           </el-table-column>
-             <el-table-column align="center" label="转正日期">
+          <el-table-column align="center" label="转正日期">
             <template slot-scope="scope">
               <div>
-                {{scope.row.formalStaffDate | dayjsFormat}}
+                {{ scope.row.formalStaffDate | dayjsFormat }}
               </div>
             </template>
           </el-table-column>
-             <el-table-column align="center" label="离职日期">
+          <el-table-column align="center" label="离职日期">
             <template slot-scope="scope">
               <div>
-                {{scope.row.demissionDate | dayjsFormat}}
+                {{ scope.row.demissionDate | dayjsFormat }}
               </div>
             </template>
           </el-table-column>
@@ -282,6 +292,7 @@
         />
       </div>
     </div>
+
     <el-dialog
       title="修改密码"
       :visible.sync="passwrodVisiable"
@@ -302,7 +313,7 @@
             },
           ]"
         >
-          <copy-text>{{passwrodForm.phone}}</copy-text>
+          <copy-text>{{ passwrodForm.phone }}</copy-text>
         </el-form-item>
         <el-form-item
           label="输入密码"
@@ -386,6 +397,8 @@ export default {
         password2: "",
       },
       activatedRow: null,
+      lookServer: false,
+      infoList: [],
     };
   },
   // activated() {
@@ -403,9 +416,9 @@ export default {
     },
     async __init() {
       // 获取分部
-      await this.$store.dispatch('setBranchs')
+      await this.$store.dispatch("setBranchs");
 
-      await this.$store.dispatch('setSubjects')
+      await this.$store.dispatch("setSubjects");
     },
     onTeacher(type, row) {
       let params = {
@@ -413,21 +426,24 @@ export default {
       };
       if (row) {
         params.teacherId = row.id;
-        params.teacherName = row.realName
+        params.teacherName = row.realName;
       }
       let path = "/business/teacherOperation";
       if (type == "update") {
         path = "/business/teacherOperationUpdate";
       }
       //  teacherId=${scope.row.id}&teacherName=${scope.row.realName}
-      this.$router.push({
-        path: path,
-        query: params,
-      }, router => {
-        if(type != 'update') {
-          router.meta.title = '老师新增'
+      this.$router.push(
+        {
+          path: path,
+          query: params,
+        },
+        (router) => {
+          if (type != "update") {
+            router.meta.title = "老师新增";
+          }
         }
-      });
+      );
     },
     getList() {
       let params = this.searchForm;
@@ -550,6 +566,7 @@ export default {
         query: { teacherId: row.id, operatingTag: "1" },
       });
     },
+
   },
 };
 </script>
@@ -557,4 +574,11 @@ export default {
 .el-button + .el-button {
   margin-left: 0;
 }
+.hanlderWrap {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
+}
+
 </style>

src/views/teacherManager/teacherOperation/components/accompanySet.vue

@@ -284,6 +284,7 @@ export default {
         }).then(res => {
           if (res.code == 200) {
             this.$message.success("保存成功");
+            this.$store.dispatch('delVisitedViews', this.$route)
             this.$router.push({
               path: "/business/teacherList",
               query: { rules: this.Frules, search: this.Fsearch }