提交一下 重新打包

1

dist/static/css/chunk-339bd0ae.f7a9bd67.css

@@ -0,0 +1,5 @@
+<<<<<<< HEAD:dist/static/css/chunk-339bd0ae.f7a9bd67.css
+.topWrap[data-v-6e7253f5]{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}.topWrap div[data-v-6e7253f5]{margin-right:10px}
+=======
+.topWrap[data-v-0ee5269b]{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}.topWrap div[data-v-0ee5269b]{margin-right:10px}
+>>>>>>> master:dist/static/css/chunk-708c69ee.ded2f7f9.css

dist/static/css/chunk-6021f785.e3a0e515.css

@@ -0,0 +1,5 @@
+<<<<<<< HEAD:dist/static/css/chunk-6021f785.e3a0e515.css
+.vip-base[data-v-db9bc724]{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-db9bc724] .el-date-editor.el-input,.vip-base[data-v-db9bc724] .el-date-editor.el-input__inner,.vip-base[data-v-db9bc724] .el-input,.vip-base[data-v-db9bc724] .el-select{width:180px!important}.vip-base .left[data-v-db9bc724]{width:400px}.vip-base .tableWrap[data-v-db9bc724]{margin-top:40px}.vip-base .tableWrap h4[data-v-db9bc724]{font-size:16px;font-weight:400;margin-bottom:20px}.vip-base .right[data-v-db9bc724]{clear:both}.vip-base .right .resetBtn[data-v-db9bc724]{margin-top:30px;float:right}.vip-base .disBox[data-v-db9bc724]{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;height:40px}.title[data-v-21d25beb]{display:inline-block;width:108px;text-align:right;margin-right:10px}[data-v-21d25beb] .el-input-number .el-input__inner{text-align:left!important}.btnWrap[data-v-21d25beb]{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}
+=======
+.vip-base[data-v-db9bc724]{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-db9bc724] .el-date-editor.el-input,.vip-base[data-v-db9bc724] .el-date-editor.el-input__inner,.vip-base[data-v-db9bc724] .el-input,.vip-base[data-v-db9bc724] .el-select{width:180px!important}.vip-base .left[data-v-db9bc724]{width:400px}.vip-base .tableWrap[data-v-db9bc724]{margin-top:40px}.vip-base .tableWrap h4[data-v-db9bc724]{font-size:16px;font-weight:400;margin-bottom:20px}.vip-base .right[data-v-db9bc724]{clear:both}.vip-base .right .resetBtn[data-v-db9bc724]{margin-top:30px;float:right}.vip-base .disBox[data-v-db9bc724]{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;height:40px}.title[data-v-3595f7cd]{display:inline-block;width:108px;text-align:right;margin-right:10px}[data-v-3595f7cd] .el-input-number .el-input__inner{text-align:left!important}.btnWrap[data-v-3595f7cd]{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}
+>>>>>>> master:dist/static/css/chunk-ada3b8ce.615f67b0.css

dist/static/css/chunk-708c69ee.ded2f7f9.css

@@ -1 +1,9 @@
-.topWrap[data-v-0ee5269b]{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}.topWrap div[data-v-0ee5269b]{margin-right:10px}
+<<<<<<< HEAD
+.topWrap[data-v-0ee5269b]{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}.topWrap div[data-v-0ee5269b]{margin-right:10px}
+=======
+<<<<<<< HEAD:dist/static/css/chunk-339bd0ae.f7a9bd67.css
+.topWrap[data-v-6e7253f5]{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}.topWrap div[data-v-6e7253f5]{margin-right:10px}
+=======
+.topWrap[data-v-0ee5269b]{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}.topWrap div[data-v-0ee5269b]{margin-right:10px}
+>>>>>>> master:dist/static/css/chunk-708c69ee.ded2f7f9.css
+>>>>>>> ol_12_30

dist/static/css/chunk-ada3b8ce.615f67b0.css

@@ -1 +1,9 @@
-.vip-base[data-v-db9bc724]{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-db9bc724] .el-date-editor.el-input,.vip-base[data-v-db9bc724] .el-date-editor.el-input__inner,.vip-base[data-v-db9bc724] .el-input,.vip-base[data-v-db9bc724] .el-select{width:180px!important}.vip-base .left[data-v-db9bc724]{width:400px}.vip-base .tableWrap[data-v-db9bc724]{margin-top:40px}.vip-base .tableWrap h4[data-v-db9bc724]{font-size:16px;font-weight:400;margin-bottom:20px}.vip-base .right[data-v-db9bc724]{clear:both}.vip-base .right .resetBtn[data-v-db9bc724]{margin-top:30px;float:right}.vip-base .disBox[data-v-db9bc724]{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;height:40px}.title[data-v-3595f7cd]{display:inline-block;width:108px;text-align:right;margin-right:10px}[data-v-3595f7cd] .el-input-number .el-input__inner{text-align:left!important}.btnWrap[data-v-3595f7cd]{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}
+<<<<<<< HEAD
+.vip-base[data-v-db9bc724]{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-db9bc724] .el-date-editor.el-input,.vip-base[data-v-db9bc724] .el-date-editor.el-input__inner,.vip-base[data-v-db9bc724] .el-input,.vip-base[data-v-db9bc724] .el-select{width:180px!important}.vip-base .left[data-v-db9bc724]{width:400px}.vip-base .tableWrap[data-v-db9bc724]{margin-top:40px}.vip-base .tableWrap h4[data-v-db9bc724]{font-size:16px;font-weight:400;margin-bottom:20px}.vip-base .right[data-v-db9bc724]{clear:both}.vip-base .right .resetBtn[data-v-db9bc724]{margin-top:30px;float:right}.vip-base .disBox[data-v-db9bc724]{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;height:40px}.title[data-v-3595f7cd]{display:inline-block;width:108px;text-align:right;margin-right:10px}[data-v-3595f7cd] .el-input-number .el-input__inner{text-align:left!important}.btnWrap[data-v-3595f7cd]{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}
+=======
+<<<<<<< HEAD:dist/static/css/chunk-6021f785.e3a0e515.css
+.vip-base[data-v-db9bc724]{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-db9bc724] .el-date-editor.el-input,.vip-base[data-v-db9bc724] .el-date-editor.el-input__inner,.vip-base[data-v-db9bc724] .el-input,.vip-base[data-v-db9bc724] .el-select{width:180px!important}.vip-base .left[data-v-db9bc724]{width:400px}.vip-base .tableWrap[data-v-db9bc724]{margin-top:40px}.vip-base .tableWrap h4[data-v-db9bc724]{font-size:16px;font-weight:400;margin-bottom:20px}.vip-base .right[data-v-db9bc724]{clear:both}.vip-base .right .resetBtn[data-v-db9bc724]{margin-top:30px;float:right}.vip-base .disBox[data-v-db9bc724]{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;height:40px}.title[data-v-21d25beb]{display:inline-block;width:108px;text-align:right;margin-right:10px}[data-v-21d25beb] .el-input-number .el-input__inner{text-align:left!important}.btnWrap[data-v-21d25beb]{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}
+=======
+.vip-base[data-v-db9bc724]{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-db9bc724] .el-date-editor.el-input,.vip-base[data-v-db9bc724] .el-date-editor.el-input__inner,.vip-base[data-v-db9bc724] .el-input,.vip-base[data-v-db9bc724] .el-select{width:180px!important}.vip-base .left[data-v-db9bc724]{width:400px}.vip-base .tableWrap[data-v-db9bc724]{margin-top:40px}.vip-base .tableWrap h4[data-v-db9bc724]{font-size:16px;font-weight:400;margin-bottom:20px}.vip-base .right[data-v-db9bc724]{clear:both}.vip-base .right .resetBtn[data-v-db9bc724]{margin-top:30px;float:right}.vip-base .disBox[data-v-db9bc724]{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;height:40px}.title[data-v-3595f7cd]{display:inline-block;width:108px;text-align:right;margin-right:10px}[data-v-3595f7cd] .el-input-number .el-input__inner{text-align:left!important}.btnWrap[data-v-3595f7cd]{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}
+>>>>>>> master:dist/static/css/chunk-ada3b8ce.615f67b0.css
+>>>>>>> ol_12_30

dist/static/css/chunk-cdcdb9ae.31ffee39.css

@@ -0,0 +1,5 @@
+<<<<<<< HEAD:dist/static/css/chunk-cdcdb9ae.31ffee39.css
+.computeMoney[data-v-04d26b12]{margin-top:10px;float:right}.m-core[data-v-04d26b12]{margin-top:30px}.m-core .el-input[data-v-04d26b12]{width:180px}.m-core h4[data-v-04d26b12]{font-size:16px;background-color:#ccc;color:#fff;width:100%;height:40px;line-height:40px;margin-bottom:20px;padding:0 20px}.m-core .right[data-v-04d26b12]{margin-top:20px}.vipMsg[data-v-04d26b12]{margin-bottom:20px}.planList[data-v-04d26b12]{padding:0 25px}.planList .planTop[data-v-04d26b12]{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-04d26b12]{font-size:14px}.planList .planCore .row[data-v-04d26b12]{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-04d26b12]{width:87px}.planList .nomore[data-v-04d26b12]{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;-webkit-box-align:center;-ms-flex-align:center;align-items:center;height:40px}.okBtn[data-v-04d26b12]{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}.submitP[data-v-04d26b12]{margin-bottom:20px;font-size:14px;padding-left:24px}
+=======
+.computeMoney[data-v-482b75e6]{margin-top:10px;float:right}.m-core[data-v-482b75e6]{margin-top:30px}.m-core .el-input[data-v-482b75e6]{width:180px}.m-core h4[data-v-482b75e6]{font-size:16px;background-color:#ccc;color:#fff;width:100%;height:40px;line-height:40px;margin-bottom:20px;padding:0 20px}.m-core .right[data-v-482b75e6]{margin-top:20px}.vipMsg[data-v-482b75e6]{margin-bottom:20px}.planList[data-v-482b75e6]{padding:0 25px}.planList .planTop[data-v-482b75e6]{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-482b75e6]{font-size:14px}.planList .planCore .row[data-v-482b75e6]{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-482b75e6]{width:87px}.planList .nomore[data-v-482b75e6]{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;-webkit-box-align:center;-ms-flex-align:center;align-items:center;height:40px}.okBtn[data-v-482b75e6]{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}.submitP[data-v-482b75e6]{margin-bottom:20px;font-size:14px;padding-left:24px}
+>>>>>>> master:dist/static/css/chunk-de87d9fc.59f7b4a6.css

dist/static/css/chunk-de87d9fc.59f7b4a6.css

@@ -1 +1,9 @@
-.computeMoney[data-v-482b75e6]{margin-top:10px;float:right}.m-core[data-v-482b75e6]{margin-top:30px}.m-core .el-input[data-v-482b75e6]{width:180px}.m-core h4[data-v-482b75e6]{font-size:16px;background-color:#ccc;color:#fff;width:100%;height:40px;line-height:40px;margin-bottom:20px;padding:0 20px}.m-core .right[data-v-482b75e6]{margin-top:20px}.vipMsg[data-v-482b75e6]{margin-bottom:20px}.planList[data-v-482b75e6]{padding:0 25px}.planList .planTop[data-v-482b75e6]{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-482b75e6]{font-size:14px}.planList .planCore .row[data-v-482b75e6]{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-482b75e6]{width:87px}.planList .nomore[data-v-482b75e6]{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;-webkit-box-align:center;-ms-flex-align:center;align-items:center;height:40px}.okBtn[data-v-482b75e6]{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}.submitP[data-v-482b75e6]{margin-bottom:20px;font-size:14px;padding-left:24px}
+<<<<<<< HEAD
+.computeMoney[data-v-482b75e6]{margin-top:10px;float:right}.m-core[data-v-482b75e6]{margin-top:30px}.m-core .el-input[data-v-482b75e6]{width:180px}.m-core h4[data-v-482b75e6]{font-size:16px;background-color:#ccc;color:#fff;width:100%;height:40px;line-height:40px;margin-bottom:20px;padding:0 20px}.m-core .right[data-v-482b75e6]{margin-top:20px}.vipMsg[data-v-482b75e6]{margin-bottom:20px}.planList[data-v-482b75e6]{padding:0 25px}.planList .planTop[data-v-482b75e6]{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-482b75e6]{font-size:14px}.planList .planCore .row[data-v-482b75e6]{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-482b75e6]{width:87px}.planList .nomore[data-v-482b75e6]{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;-webkit-box-align:center;-ms-flex-align:center;align-items:center;height:40px}.okBtn[data-v-482b75e6]{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}.submitP[data-v-482b75e6]{margin-bottom:20px;font-size:14px;padding-left:24px}
+=======
+<<<<<<< HEAD:dist/static/css/chunk-cdcdb9ae.31ffee39.css
+.computeMoney[data-v-04d26b12]{margin-top:10px;float:right}.m-core[data-v-04d26b12]{margin-top:30px}.m-core .el-input[data-v-04d26b12]{width:180px}.m-core h4[data-v-04d26b12]{font-size:16px;background-color:#ccc;color:#fff;width:100%;height:40px;line-height:40px;margin-bottom:20px;padding:0 20px}.m-core .right[data-v-04d26b12]{margin-top:20px}.vipMsg[data-v-04d26b12]{margin-bottom:20px}.planList[data-v-04d26b12]{padding:0 25px}.planList .planTop[data-v-04d26b12]{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-04d26b12]{font-size:14px}.planList .planCore .row[data-v-04d26b12]{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-04d26b12]{width:87px}.planList .nomore[data-v-04d26b12]{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;-webkit-box-align:center;-ms-flex-align:center;align-items:center;height:40px}.okBtn[data-v-04d26b12]{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}.submitP[data-v-04d26b12]{margin-bottom:20px;font-size:14px;padding-left:24px}
+=======
+.computeMoney[data-v-482b75e6]{margin-top:10px;float:right}.m-core[data-v-482b75e6]{margin-top:30px}.m-core .el-input[data-v-482b75e6]{width:180px}.m-core h4[data-v-482b75e6]{font-size:16px;background-color:#ccc;color:#fff;width:100%;height:40px;line-height:40px;margin-bottom:20px;padding:0 20px}.m-core .right[data-v-482b75e6]{margin-top:20px}.vipMsg[data-v-482b75e6]{margin-bottom:20px}.planList[data-v-482b75e6]{padding:0 25px}.planList .planTop[data-v-482b75e6]{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-482b75e6]{font-size:14px}.planList .planCore .row[data-v-482b75e6]{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-482b75e6]{width:87px}.planList .nomore[data-v-482b75e6]{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;-webkit-box-align:center;-ms-flex-align:center;align-items:center;height:40px}.okBtn[data-v-482b75e6]{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}.submitP[data-v-482b75e6]{margin-bottom:20px;font-size:14px;padding-left:24px}
+>>>>>>> master:dist/static/css/chunk-de87d9fc.59f7b4a6.css
+>>>>>>> ol_12_30

dist/static/js/chunk-33bb2ea4.60df9b84.js

@@ -1,4 +1,12 @@
+<<<<<<< HEAD:dist/static/js/chunk-33bb2ea4.60df9b84.js
 (window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-33bb2ea4","chunk-e1e767e6","chunk-4e56be9c","chunk-584f76a2","chunk-4c5113fa","chunk-59c1227c","chunk-4a5f46a6","chunk-806f3882","chunk-171bdaae","chunk-6e855f0c","chunk-c8c7f280"],{"010e":function(e,t,a){(function(e,t){t(a("c1df"))})(0,(function(e){"use strict";
+=======
+<<<<<<< HEAD:dist/static/js/chunk-588eee5a.36ce9178.js
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-588eee5a","chunk-e1e767e6","chunk-4e56be9c","chunk-584f76a2","chunk-4c5113fa","chunk-59c1227c","chunk-4a5f46a6","chunk-081a8b8e","chunk-171bdaae","chunk-6e855f0c","chunk-c8c7f280"],{"010e":function(e,t,a){(function(e,t){t(a("c1df"))})(0,(function(e){"use strict";
+=======
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-d29430f6","chunk-e1e767e6","chunk-4e56be9c","chunk-584f76a2","chunk-4c5113fa","chunk-59c1227c","chunk-4a5f46a6","chunk-806f3882","chunk-171bdaae","chunk-6e855f0c","chunk-c8c7f280"],{"010e":function(e,t,a){(function(e,t){t(a("c1df"))})(0,(function(e){"use strict";
+>>>>>>> master:dist/static/js/chunk-d29430f6.b1ac825f.js
+>>>>>>> ol_12_30:dist/static/js/chunk-588eee5a.36ce9178.js
 //! moment.js locale configuration
 var t=e.defineLocale("uz-latn",{months:"Yanvar_Fevral_Mart_Aprel_May_Iyun_Iyul_Avgust_Sentabr_Oktabr_Noyabr_Dekabr".split("_"),monthsShort:"Yan_Fev_Mar_Apr_May_Iyun_Iyul_Avg_Sen_Okt_Noy_Dek".split("_"),weekdays:"Yakshanba_Dushanba_Seshanba_Chorshanba_Payshanba_Juma_Shanba".split("_"),weekdaysShort:"Yak_Dush_Sesh_Chor_Pay_Jum_Shan".split("_"),weekdaysMin:"Ya_Du_Se_Cho_Pa_Ju_Sha".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"D MMMM YYYY, dddd HH:mm"},calendar:{sameDay:"[Bugun soat] LT [da]",nextDay:"[Ertaga] LT [da]",nextWeek:"dddd [kuni soat] LT [da]",lastDay:"[Kecha soat] LT [da]",lastWeek:"[O'tgan] dddd [kuni soat] LT [da]",sameElse:"L"},relativeTime:{future:"Yaqin %s ichida",past:"Bir necha %s oldin",s:"soniya",ss:"%d soniya",m:"bir daqiqa",mm:"%d daqiqa",h:"bir soat",hh:"%d soat",d:"bir kun",dd:"%d kun",M:"bir oy",MM:"%d oy",y:"bir yil",yy:"%d yil"},week:{dow:1,doy:7}});return t}))},"027d":function(e,t,a){},"02fb":function(e,t,a){(function(e,t){t(a("c1df"))})(0,(function(e){"use strict";
 //! moment.js locale configuration

src/store/modules/permission.js

@@ -625,32 +625,6 @@ function setDetailRoute(accessedRoutes) {
           }
         },
         {
-          name: 'couponUpdate',
-          path: 'couponUpdate',
-          component: () => import('@/views/couponManager/couponUpdate'),
-          hidden: true,
-          meta: {
-            noCache: '1',
-            title: '优惠券详情',
-            belongTopMenu: "/operateManager",
-            activeMenu: '/couponManager',
-            id: 'xx19'
-          }
-        },
-        {
-          name: '2021memeberActionManager',
-          path: '/2021memeberActionManager',
-          component: () => import('@/views/2021memeberActionManager'),
-          hidden: true,
-          meta: {
-            noCache: '1',
-            title: '2021会员活动',
-            belongTopMenu: "/operateManager",
-            activeMenu: '/activeMarketing',
-            id: 'xx19'
-          }
-        },
-        {
           name: '2021double11List',
           path: '/2021double11List',
           component: () => import('@/views/activityScheduling/2021double11List'),

src/views/2021memeberActionManager/index.vue

@@ -1,7 +1,7 @@
 <!--  -->
 <template>
   <div class="m-container">
-    <el-page-header
+        <el-page-header
       @back="onCancel"
       :content="'2021十一会员活动'"
     ></el-page-header>
@@ -409,7 +409,7 @@ export default {
         "您确定导出会员活动列表?"
       );
     },
-    onCancel() {
+      onCancel() {
       this.$store.dispatch("delVisitedViews", this.$route);
       this.$router.push("/activeMarketing");
     },

src/views/activityScheduling/2021double11List.vue

@@ -322,7 +322,7 @@ export default {
     onCreateQRCode(row) {
       // 生成报名二维码
       this.qrcodeStatus = true;
-      this.codeUrl = vaildTeachingUrl() + "/#/statisticOctober1st";
+      this.codeUrl = vaildTeachingUrl() + "/#/statistic-20211111";
     },
     gotoDetail(row) {
       // console.log('跳转详情')

src/views/activityScheduling/activeMarketing.vue

@@ -174,13 +174,9 @@ export default {
     },
     lookDetail(row) {
       if (row.id == 1) {
-        console.log("id为1");
-        this.$router.push('/2021memeberActionManager')
-
+        this.$router.push("/2021memeberActionManager");
       } else if (row.id == 2) {
-        this.$router.push('/2021double11List')
-
-        console.log("id为2");
+        this.$router.push("/2021double11List");
       }
     },
   },