Merge branch 'online' into weeklyCalender

dist/static/css/chunk-0889504e.afa9475a.css

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

dist/static/css/chunk-e91d7154.36403654.css

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

src/views/adapayAccount/form.vue

@@ -205,6 +205,9 @@ export default {
             const query = this.$route.query
             this.payType = query.type
             this.row = query.row ? JSON.parse(query.row) : {}
+            this.files = null
+            this.fileList = []
+            this.form.multipartFile = null
             if(this.payType == 'update') {
                 const row = this.row
                 this.id = row.id
@@ -250,9 +253,6 @@ export default {
                 //     multipartFile: null,
                 //     zipCode: null
                 // }
-                this.files = null
-                this.fileList = []
-                this.form.multipartFile = null
                 this.$refs["accountForm"].resetFields()
             }
         },
@@ -323,6 +323,9 @@ export default {
             })
         },
         onCancel () {
+            this.files = null
+            this.fileList = []
+            this.form.multipartFile = null
             this.$router.push({
                 path: "/insideSetting/adapayManager"
             });

src/views/studentManager/components/teamAndcourse.vue

@@ -15,7 +15,16 @@
           <template slot-scope="scope">{{ scope.row.kitPurchaseMethod | instrumentType }}</template>
         </el-table-column>
         <el-table-column align="center" label="学员状态">
-          <template slot-scope="scope">{{ scope.row.userMusicGroupStatus | musicGroupStudentType }}</template>
+          <template slot-scope="scope">
+            {{ scope.row.userMusicGroupStatus | musicGroupStudentType }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="退团时间" prop="quitMusicGroupDate">
+          <template slot-scope="scope">
+            <span v-if="scope.row.userMusicGroupStatus == 'QUIT'">
+              {{ scope.row.quitMusicGroupDate | formatTimer }}
+            </span>
+          </template>
         </el-table-column>
         <el-table-column align="center" label="所选乐器">
           <template slot-scope="scope">

src/views/teamDetail/components/baseInfo.vue

@@ -149,7 +149,7 @@ export default {
         url,
         responseType: 'blob'
       }
-      this.$confirm('您确定导出发放清单', '提示', {
+      this.$confirm('您确定导出订货清单', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
@@ -174,7 +174,7 @@ export default {
               let ymd = nowTime.getFullYear() + '' + (nowTime.getMonth() + 1) + '' + nowTime.getDate() + '' +
                 nowTime.getHours() +
                 '' + nowTime.getMinutes()
-              let fname = this.$route.query.id + '-' + ymd + '发放清单' //下载文件的名字
+              let fname = this.$route.query.id + '-' + ymd + '订货清单' //下载文件的名字
               link.href = objectUrl
               link.setAttribute("download", fname)
               document.body.appendChild(link)

src/views/teamDetail/teamDetailedList.vue

@@ -141,7 +141,7 @@ export default {
         url,
         responseType: 'blob'
       }
-      this.$confirm('您确定导出发放清单', '提示', {
+      this.$confirm('您确定导出订货清单', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
@@ -164,7 +164,7 @@ export default {
               let link = document.createElement("a")
               let nowTime = new Date()
               let ymd = nowTime.getFullYear() + '' + (nowTime.getMonth() + 1) + '' + nowTime.getDate() + '' + nowTime.getHours() + '' + nowTime.getMinutes()
-              let fname = this.$route.query.id + '-' + ymd + '发放清单' //下载文件的名字
+              let fname = this.$route.query.id + '-' + ymd + '订货清单' //下载文件的名字
               link.href = objectUrl
               link.setAttribute("download", fname)
               document.body.appendChild(link)
@@ -172,7 +172,6 @@ export default {
             }
           })
           load.endLoading();
-          
         }).catch(error => {
             this.$message.error('导出数据失败，请联系管理员');
             load.endLoading();