11

debug.log

@@ -2,5 +2,8 @@
 [1127/100753.385:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)
 [1127/100753.402:ERROR:filesystem_win.cc(129)] GetFileAttributes C:\Users\lex\AppData\Local\Google\Chrome\User Data\Crashpad\attachments\6cd524b3-9b87-4263-8992-de833b809784: 系统找不到指定的路径。 (0x3)
 [1127/100753.406:ERROR:filesystem_win.cc(129)] GetFileAttributes C:\Users\lex\AppData\Local\Google\Chrome\User Data\Crashpad\attachments\8b20b593-2a91-4130-9aa1-1910ad894bc8: 系统找不到指定的路径。 (0x3)
+<<<<<<< HEAD
 [1127/151852.697:ERROR:filesystem_win.cc(129)] GetFileAttributes C:\Users\lex\AppData\Local\Google\Chrome\User Data\Crashpad\attachments\49509a15-3940-4f7a-900c-18ec901b5f9f: 系统找不到指定的路径。 (0x3)
 [1127/151913.823:ERROR:http_transport_win.cc(276)] WinHttpSendRequest: 操作成功完成。 (0x0)
+=======
+>>>>>>> master

dist/static/css/chunk-27d213b0.5fb79823.css

@@ -0,0 +1,5 @@
+<<<<<<< HEAD:dist/static/css/chunk-ba2bab20.6c4a215b.css
+.process[data-v-cd5d302a]{padding:10px;max-height:600px;overflow-y:auto}.select[data-v-57651dcb]{font-size:14px}.btnList[data-v-57651dcb]{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-57651dcb]{margin-right:15px}
+=======
+.process[data-v-f049a426]{padding:10px;max-height:600px;overflow-y:auto}.select[data-v-7a08b034]{font-size:14px}.btnList[data-v-7a08b034]{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-7a08b034]{margin-right:15px}
+>>>>>>> master:dist/static/css/chunk-27d213b0.5fb79823.css

dist/static/css/chunk-8c6aab84.f036280d.css

@@ -0,0 +1 @@
+[data-v-2c4330b1] .dialog-footer{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}

dist/static/css/chunk-ab57a31c.458003c7.css

@@ -0,0 +1 @@
+[data-v-cd4b7950] .el-calendar-day{-webkit-box-sizing:border-box;box-sizing:border-box;height:80px!important;min-width:118px}[data-v-cd4b7950] .current.is-selected{border:2px solid #137f79}[data-v-cd4b7950] .current.is-selected .el-calendar-day{height:76px!important}.vipDot[data-v-cd4b7950]{background-color:#2aaea6}.teamDot[data-v-cd4b7950],.vipDot[data-v-cd4b7950]{width:30px;height:30px;margin-top:10px;display:inline-block;border-radius:50%;text-align:center;line-height:30px;color:#fff;font-size:14px}.teamDot[data-v-cd4b7950]{background-color:#5a79f6}.newDot[data-v-cd4b7950]{width:30px;height:30px;margin-top:10px;background-color:#34b1f6;display:inline-block;border-radius:50%;text-align:center;line-height:30px;color:#fff;font-size:14px}

dist/static/css/chunk-ba2bab20.6c4a215b.css

@@ -1 +1,5 @@
-.process[data-v-cd5d302a]{padding:10px;max-height:600px;overflow-y:auto}.select[data-v-57651dcb]{font-size:14px}.btnList[data-v-57651dcb]{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-57651dcb]{margin-right:15px}
+<<<<<<< HEAD:dist/static/css/chunk-ba2bab20.6c4a215b.css
+.process[data-v-cd5d302a]{padding:10px;max-height:600px;overflow-y:auto}.select[data-v-57651dcb]{font-size:14px}.btnList[data-v-57651dcb]{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-57651dcb]{margin-right:15px}
+=======
+.process[data-v-f049a426]{padding:10px;max-height:600px;overflow-y:auto}.select[data-v-7a08b034]{font-size:14px}.btnList[data-v-7a08b034]{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-7a08b034]{margin-right:15px}
+>>>>>>> master:dist/static/css/chunk-27d213b0.5fb79823.css

src/views/resetTeaming/components/resetPayList.vue

@@ -202,17 +202,10 @@
                           placeholder="有效期开始日期"></el-date-picker>
         </el-form-item>
         <el-form-item label="缴费有效期结束"
-                      :rules="[
-            {
-              required: payForm.paymentPattern !== 2,
-              message: '请设置缴费有效期结束日期',
-              trigger: 'blur',
-            },
-          ]"
+                      :rules="[{ required: true, message: '请设置缴费有效期结束日期',trigger: 'blur'}]"
                       prop="paymentValidEndDate">
           <el-date-picker v-model.trim="payForm.paymentValidEndDate"
                           type="date"
-                          :disabled="payForm.paymentPattern === 2"
                           :picker-options="beginDate(payForm.paymentValidStartDate)"
                           value-format="yyyy-MM-dd"
                           placeholder="有效期结束日期"></el-date-picker>
@@ -499,9 +492,9 @@ export default {
       });
     },
     paymentPatternChange (val) {
-      if (val === 2) {
-        this.payForm.paymentValidEndDate = null;
-      }
+      // if (val === 2) {
+      //   this.payForm.paymentValidEndDate = null
+      // }
     },
     onCreateQRCode (row) { // 生成报名二维码
       this.qrcodeStatus = true

src/views/teamBuild/components/teamBaseInfo.vue

@@ -161,12 +161,12 @@
                       prop="paymentValidEndDate"
                       :rules="[
             {
-              required: !(isNotEditing() || topFrom.paymentPattern === 2),
+              required: !(isNotEditing()),
               message: '请选择缴费有效期结束',
             },
           ]">
           <el-date-picker :disabled="
-              isNotEditing() || topFrom.paymentPattern === 2 || basdisabled || !topFrom.paymentValidStartDate
+              isNotEditing() || basdisabled || !topFrom.paymentValidStartDate
             "
                           v-model="topFrom.paymentValidEndDate"
                           :picker-options="beginDate(topFrom.paymentValidStartDate)"
@@ -663,10 +663,10 @@ export default {
       }
     },
     changePaymentPattern (val) {
-      if (val === 2) {
-        // this.topFrom.paymentValidStartDate = null
-        this.$set(this.topFrom, 'paymentValidEndDate', '')
-      }
+      // if (val === 2) {
+      //   // this.topFrom.paymentValidStartDate = null
+      //   this.$set(this.topFrom, 'paymentValidEndDate', '')
+      // }
     },
     beginDate (end) {
       return {

src/views/teamDetail/teamCourseList.vue

@@ -52,7 +52,7 @@
           <el-select v-model.trim="searchForm.groupType"
                      clearable
                      filterable
-                     placeholder="课程租类型">
+                     placeholder="课程组类型">
             <el-option v-for="(item, index) in courseListType"
                        :key="index"
                        :value="item.value"

src/views/vipClass/vipDetail/components/fnanceInfo.vue

@@ -151,6 +151,7 @@ export default {
     __init () {
       let id = this.$route.query.id;
       this.id = id;
+      this.rules.page = 1
       this.getList();
     },
     search () {

src/views/vipClass/vipDetail/components/teacherRecord.vue

@@ -383,6 +383,7 @@ export default {
     __init () {
       let id = this.$route.query.id;
       this.id = id;
+      this.rules.page = 1
       // 获取vip教学记录
       this.getList()
       // 获取分部教学点

src/views/vipClass/vipDetail/components/vipStudentList.vue

@@ -319,6 +319,7 @@ export default {
     __init () {
       let id = this.$route.query.id;
       this.id = id;
+      this.rules.page = 1
       this.getStudents()
       findTeacherWithVipGroupOrganAndSubject({ vipGroupId: this.id }).then(res => {
         if (res.code == 200) {