Browse Source

1111

1111
mo 4 years ago
parent
commit
c85dfa8a0b

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


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


+ 0 - 1
dist/static/css/chunk-35e10135.7bfe6881.css

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

File diff suppressed because it is too large
+ 0 - 0
dist/static/css/chunk-6d8b0dba.2f6c57de.css


+ 1 - 0
dist/static/css/chunk-76f27a16.e1902b91.css

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

+ 1 - 1
dist/static/css/chunk-698984da.ee0d91eb.css → dist/static/css/chunk-decce012.e802ced7.css

@@ -1 +1 @@
-.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}.select[data-v-7ab52a6d]{font-size:14px}.btnList[data-v-7ab52a6d]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.btnList div[data-v-7ab52a6d]{margin-right:15px}
+.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}.select[data-v-374a5fb0]{font-size:14px}.btnList[data-v-374a5fb0]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.btnList div[data-v-374a5fb0]{margin-right:15px}

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


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


File diff suppressed because it is too large
+ 7 - 0
dist/static/js/chunk-2d0cfdd7.560bb190.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-35e10135.f0f1868e.js


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


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-76f27a16.73af9077.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-c8916fba.111f63d1.js


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


+ 7 - 6
src/views/teamBuild/components/teamSoundMoney.vue

@@ -1874,15 +1874,16 @@ export default {
       let csi = this.checkfor;
       let newStudent = this.newStudentfor
       // 加上判断是否有课程信息
+      const sbaseInfo = newStudent.baseInfo
+      if (sbaseInfo.ischeck && sbaseInfo.isStatus) {
+        const value = Number(parseFloat(sbaseInfo.nowValue ? sbaseInfo.nowValue : 0))
+        marketPrice += value;
+        amount += Number(parseFloat(sbaseInfo.value ? sbaseInfo.value : 0))
+      }
       if (mgs) {
         // console.log(csi)
         // amount += parseFloat(mgs);s
-        const sbaseInfo = newStudent.baseInfo
-        if (sbaseInfo.ischeck && sbaseInfo.isStatus) {
-          const value = Number(parseFloat(sbaseInfo.nowValue ? sbaseInfo.nowValue : 0))
-          marketPrice += value;
-          amount += Number(parseFloat(sbaseInfo.value ? sbaseInfo.value : 0))
-        }
+
 
         const allInfo = csi.allInfo
         if (allInfo.ischeck) {

+ 2 - 2
src/views/teamDetail/components/resetClass.vue

@@ -19,10 +19,10 @@
                        :value="item.value"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item>
+        <!-- <el-form-item>
           <div class="newBand"
                @click="startRegest">开启报名</div>
-        </el-form-item>
+        </el-form-item> -->
       </el-form>
       <div class="tableWrap"
            style>

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