Merge branch 'master' into opt_xuexiaojiaofei

.gitignore

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

debug.log

@@ -7,3 +7,4 @@
 [1218/093715.178:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)
 [1223/094343.219:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)
 [1224/093236.399:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)
+[1225/094724.194:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)

dist/static/css/chunk-e4f38068.ed51a636.css → dist/static/css/chunk-262540f8.85ac9d90.css

@@ -1 +1 @@
-.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}

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/resetTeaming/components/strudentPayInfo.vue

@@ -334,7 +334,7 @@
                :inline="true"
                label-width="120px"
                label-position="right"
-               ref="resetPayForm">
+               ref="resetPayForm"  @submit.native.prevent>
         <!-- <el-form-item label="学员姓名"
                       :rules="[{ required: true, message: '学员姓名',trigger: 'blur'}]"
                       prop="startDate">

src/views/resetTeaming/modals/pay-items.vue

@@ -189,7 +189,9 @@ export default {
       } catch (error) {}
     },
     toDetail(row) {
-      // this.$listeners.close();
+      if (this.payUserType === 'STUDENT') {
+        this.$listeners.close();
+      }
       this.$nextTick(() => {
           this.$listeners.lookDetail(row)
       })

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>