Merge remote-tracking branch 'origin/development' into development

src/components/order/index.vue

@@ -95,7 +95,7 @@
         </el-col>
          <el-col :span="3" :offset="3" v-if="!$store.state.readonly">
           <el-form-item>
-            <!-- <el-button type="success" plain @click="add">新增订单</el-button> -->
+            <el-button type="success" plain @click="add">新增订单</el-button>
           </el-form-item>
         </el-col>
       </el-row>
@@ -603,6 +603,7 @@
             json.name = name
         }
         getTeacherListApi(json).then(res=>{
+          console.log(res.list)
           this.teacherList = res.list
           this.loading = false
         });
@@ -614,7 +615,6 @@
         this.promoterDialog.show = true;
         this.promoterDialog.id = val.id;
         this.promoterDialog.teacher_id = val.invite_id;
-        console.log('this.promoterDialog updateTeacher', this.promoterDialog)
         this.getTeacherList()
       },
       remoteMethod(query) {