111

.gitignore

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

dist/static/css/chunk-262540f8.85ac9d90.css

@@ -0,0 +1,5 @@
+<<<<<<< HEAD:dist/static/css/chunk-e4f38068.ed51a636.css
+.schoolCell[data-v-4b0c9dd4]{width:400px;color:#333;background-color:#f5f7fa;border-color:#e4e7ed;height:40px;line-height:40px;outline:0;padding:0 15px;border-radius:4px;border:1px solid #dcdfe6;display:inline-block;-webkit-box-sizing:border-box;box-sizing:border-box;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}[data-v-4b0c9dd4] .el-textarea.is-disabled .el-textarea__inner{color:#333}.schoolCell[data-v-60a63170]{width:400px;color:#333;background-color:#f5f7fa;border-color:#e4e7ed;height:40px;line-height:40px;outline:0;padding:0 15px;border-radius:4px;border:1px solid #dcdfe6;display:inline-block;-webkit-box-sizing:border-box;box-sizing:border-box;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}[data-v-60a63170] .el-textarea.is-disabled .el-textarea__inner{color:#333}
+=======
+.schoolCell[data-v-3c59b407]{width:400px;color:#333;background-color:#f5f7fa;border-color:#e4e7ed;height:40px;line-height:40px;outline:0;padding:0 15px;border-radius:4px;border:1px solid #dcdfe6;display:inline-block;-webkit-box-sizing:border-box;box-sizing:border-box;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}[data-v-3c59b407] .el-textarea.is-disabled .el-textarea__inner{color:#333}.schoolCell[data-v-60a63170]{width:400px;color:#333;background-color:#f5f7fa;border-color:#e4e7ed;height:40px;line-height:40px;outline:0;padding:0 15px;border-radius:4px;border:1px solid #dcdfe6;display:inline-block;-webkit-box-sizing:border-box;box-sizing:border-box;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}[data-v-60a63170] .el-textarea.is-disabled .el-textarea__inner{color:#333}
+>>>>>>> 12/25morning:dist/static/css/chunk-262540f8.85ac9d90.css

dist/static/css/chunk-3bf4a834.4dd0d2df.css

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

dist/static/css/chunk-a20be7dc.94afc652.css

@@ -0,0 +1 @@
+[data-v-4b81f2e5] .el-button--primary,[data-v-4b81f2e5] .el-button--primary:active,[data-v-4b81f2e5] .el-button--primary:focus,[data-v-4b81f2e5] .el-button--primary:hover{background:#14928a;border-color:#14928a;color:#fff}[data-v-4b81f2e5] .el-date-editor.el-input{width:100%!important}[data-v-4b81f2e5] .el-select{width:98%!important}

dist/static/css/chunk-b05298f6.1aa8b397.css

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

dist/static/css/chunk-e4f38068.ed51a636.css

@@ -1 +1,5 @@
-.schoolCell[data-v-4b0c9dd4]{width:400px;color:#333;background-color:#f5f7fa;border-color:#e4e7ed;height:40px;line-height:40px;outline:0;padding:0 15px;border-radius:4px;border:1px solid #dcdfe6;display:inline-block;-webkit-box-sizing:border-box;box-sizing:border-box;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}[data-v-4b0c9dd4] .el-textarea.is-disabled .el-textarea__inner{color:#333}.schoolCell[data-v-60a63170]{width:400px;color:#333;background-color:#f5f7fa;border-color:#e4e7ed;height:40px;line-height:40px;outline:0;padding:0 15px;border-radius:4px;border:1px solid #dcdfe6;display:inline-block;-webkit-box-sizing:border-box;box-sizing:border-box;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}[data-v-60a63170] .el-textarea.is-disabled .el-textarea__inner{color:#333}
+<<<<<<< HEAD:dist/static/css/chunk-e4f38068.ed51a636.css
+.schoolCell[data-v-4b0c9dd4]{width:400px;color:#333;background-color:#f5f7fa;border-color:#e4e7ed;height:40px;line-height:40px;outline:0;padding:0 15px;border-radius:4px;border:1px solid #dcdfe6;display:inline-block;-webkit-box-sizing:border-box;box-sizing:border-box;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}[data-v-4b0c9dd4] .el-textarea.is-disabled .el-textarea__inner{color:#333}.schoolCell[data-v-60a63170]{width:400px;color:#333;background-color:#f5f7fa;border-color:#e4e7ed;height:40px;line-height:40px;outline:0;padding:0 15px;border-radius:4px;border:1px solid #dcdfe6;display:inline-block;-webkit-box-sizing:border-box;box-sizing:border-box;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}[data-v-60a63170] .el-textarea.is-disabled .el-textarea__inner{color:#333}
+=======
+.schoolCell[data-v-3c59b407]{width:400px;color:#333;background-color:#f5f7fa;border-color:#e4e7ed;height:40px;line-height:40px;outline:0;padding:0 15px;border-radius:4px;border:1px solid #dcdfe6;display:inline-block;-webkit-box-sizing:border-box;box-sizing:border-box;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}[data-v-3c59b407] .el-textarea.is-disabled .el-textarea__inner{color:#333}.schoolCell[data-v-60a63170]{width:400px;color:#333;background-color:#f5f7fa;border-color:#e4e7ed;height:40px;line-height:40px;outline:0;padding:0 15px;border-radius:4px;border:1px solid #dcdfe6;display:inline-block;-webkit-box-sizing:border-box;box-sizing:border-box;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}[data-v-60a63170] .el-textarea.is-disabled .el-textarea__inner{color:#333}
+>>>>>>> 12/25morning:dist/static/css/chunk-262540f8.85ac9d90.css

dist/static/css/chunk-f26d4e9c.35dba484.css

@@ -0,0 +1 @@
+.alert[data-v-0118353e]{margin:10px 0}.dialog-footer[data-v-290cb116]{margin-top:20px;display:block;text-align:right}.el-button--primary[data-v-13d6e4eb],.el-button--primary[data-v-13d6e4eb]:active,.el-button--primary[data-v-13d6e4eb]:focus,.el-button--primary[data-v-13d6e4eb]:hover{background:#14928a;border-color:#14928a;color:#fff}[data-v-13d6e4eb] .el-date-editor.el-input,[data-v-13d6e4eb] .el-select{width:100%!important}[data-v-13d6e4eb] .el-table .cell{display:-webkit-box;overflow:hidden;text-overflow:ellipsis;-webkit-line-clamp:3;-webkit-box-orient:vertical}[data-v-13d6e4eb] .el-dialog__body{padding:10px 20px}.newBand[data-v-13d6e4eb]{display:inline-block}

dist/static/css/chunk-fe0566a8.2ae1ccd0.css

@@ -0,0 +1 @@
+[data-v-886b7e8a] .el-button--primary,[data-v-886b7e8a] .el-button--primary:active,[data-v-886b7e8a] .el-button--primary:focus,[data-v-886b7e8a] .el-button--primary:hover{background:#14928a;border-color:#14928a;color:#fff}[data-v-886b7e8a] .el-dialog__body{padding:0 20px}[data-v-886b7e8a] .el-date-editor.el-input,[data-v-886b7e8a] .el-select{width:100%!important}

src/views/afterSchoolManager/afterSchoolList.vue

@@ -178,7 +178,7 @@ export default {
   },
   methods: {
     init () {
-      if(this.searchForm.listTimer.length <= 0) {
+      if(this.searchForm.listTimer && this.searchForm.listTimer.length <= 0) {
         let now = new Date();
         let startDate = new Date(Date.UTC(now.getFullYear(), now.getMonth(), now.getDate())).toISOString().slice(0, 10);
         let endDate = new Date(Date.UTC(now.getFullYear(), now.getMonth(), now.getDate())).toISOString().slice(0, 10);

src/views/categroyManager/insideSetting/addressManager.vue

@@ -10,7 +10,7 @@
       <save-form :inline="true"
                class="searchForm"
                @submit="search"
-               v-model.trim="searchForm">
+               :model="searchForm">
         <el-form-item>
           <el-input type="text"
                     clearable

src/views/teamBuild/components/soundSetComponents/chioseMusic.vue

@@ -20,7 +20,8 @@
               :label="item.name"
               :value="item.id"
               :disabled="checkDisabled(item)"
-            ></el-option>
+            >
+            </el-option>
           </el-select>
         </div>
         <div class="flexRow">

src/views/teamBuild/components/soundSetComponents/soundSetCore.vue

@@ -64,7 +64,12 @@
                   :key="index"
                   :label="item.name"
                   :value="item.id"
-                ></el-option>
+                >
+                  <span style="float: left">{{ item.name }}</span>
+                  <span style="float: right; color: #8492a6; font-size: 13px; padding-right:20px">{{
+                    item.groupPurchasePrice|moneyFormat
+                  }}元</span>
+                </el-option>
               </el-select>
             </div>
           </el-collapse-item>