lex-xin 5 years ago
parent
commit
8d745438be

File diff suppressed because it is too large
+ 0 - 0
dist/css/VIPApply.5566ffa4.css


+ 0 - 1
dist/css/order.a252fe7b.css

@@ -1 +0,0 @@
-.order[data-v-31c319c2]{background:#fff;min-height:100vh}header[data-v-31c319c2]{height:.4rem;line-height:.4rem;color:#000;font-size:.17rem;background:#fff;-webkit-box-shadow:0 1px 8px 0 rgba(0,0,0,.07);box-shadow:0 1px 8px 0 rgba(0,0,0,.07);text-align:center}h2[data-v-31c319c2]{font-size:.16rem;color:#fff;padding:.1rem 0;text-align:center;background:#14928a}.table .title[data-v-31c319c2]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;text-align:center;border-bottom:1px solid #eaeaea}.table span[data-v-31c319c2]{-webkit-box-flex:1;-ms-flex:1;flex:1;padding:.08rem 0;font-size:.14rem}.table span[data-v-31c319c2]:first-child{width:.3rem;-webkit-box-flex:inherit;-ms-flex:inherit;flex:inherit}.table .content>div[data-v-31c319c2]{width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;text-align:center}.table .content>div[data-v-31c319c2]:nth-child(2n+2){background:#eaeaea}[data-v-31c319c2] .van-dropdown-menu{height:.4rem;position:absolute;right:.15rem;top:0}

+ 1 - 0
dist/css/order.ef03962f.css

@@ -0,0 +1 @@
+.order[data-v-06d6be58]{background:#fff;min-height:100vh}header[data-v-06d6be58]{height:.4rem;line-height:.4rem;color:#000;font-size:.17rem;background:#fff;-webkit-box-shadow:0 1px 8px 0 rgba(0,0,0,.07);box-shadow:0 1px 8px 0 rgba(0,0,0,.07);text-align:center}h2[data-v-06d6be58]{font-size:.16rem;color:#fff;padding:.1rem 0;text-align:center;background:#14928a}.table .title[data-v-06d6be58]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;text-align:center;border-bottom:1px solid #eaeaea}.table span[data-v-06d6be58]{-webkit-box-flex:1;-ms-flex:1;flex:1;padding:.08rem 0;font-size:.14rem}.table span[data-v-06d6be58]:first-child{width:.3rem;-webkit-box-flex:inherit;-ms-flex:inherit;flex:inherit}.table .content>div[data-v-06d6be58]{width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;text-align:center}.table .content>div[data-v-06d6be58]:nth-child(2n+2){background:#eaeaea}[data-v-06d6be58] .van-dropdown-menu{height:.4rem;position:absolute;right:.15rem;top:0}

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


File diff suppressed because it is too large
+ 0 - 0
dist/js/VIPApply.ef032933.js


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


File diff suppressed because it is too large
+ 0 - 0
dist/js/order.6712819f.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/order.c074dbe1.js


+ 8 - 3
src/views/teacher/VIPApply.vue

@@ -893,10 +893,15 @@ export default {
                 this.$toast('请输入线上课课酬')
                 return false
             }
-            if(!form.offlineTeacherSalary) {
-                this.$toast('请输入线下课课酬')
-                return false
+
+            // 如果只有线上课,则可以不需要地址
+            if(this.statusList.hasOffline) {
+                if(!form.offlineTeacherSalary) {
+                    this.$toast('请输入线下课课酬')
+                    return false
+                }
             }
+            
             if(form.giveTeachMode == 'ONLINE') {
                 form.onlineClassesNum = Number(form.onlineClassesNums) + Number(this.other.giveNum)
                 form.offlineClassesNum = Number(form.offlineClassesNums)

+ 2 - 2
src/views/teacher/order.vue

@@ -48,7 +48,7 @@
                             <span> {{ data.subjectName }} </span>
                             <span> {{ data.remark }} </span>
                             <span><van-button 
-                                    :disabled="data.payTime ? true : false" 
+                                    :disabled="data.paymentStatus == 2 ? true : false" 
                                     round 
                                     @click = "adjust(data)"
                                     type = "danger" 
@@ -117,7 +117,7 @@ export default {
     methods: {
         adjust(item) {
             // 开始调剂
-            if(!item.payTime) {
+            if(item.paymentStatus == 2) {
                 this.adjustStatus = true
                 this.changeStudent = item
             }

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