Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

src/components/sale/orderlist.vue

@@ -140,7 +140,7 @@
                 }}
               </div>
               <div>{{ item.CreateByName }}</div>
-              <div>课程顾问：{{ item.ConsultantName||'无' }}</div>
+              <!-- <div>课程顾问：{{ item.ConsultantName||'无' }}</div> -->
               <div>市场专员：{{ item.EnterName ||'无' }}</div>
 
               <div style="margin-top: 10px">{{ item.CreateTime }}</div>

src/pages/sale/courseList.vue

@@ -514,6 +514,7 @@
           IsQPrice: 1, //是否查询优惠价格设置
           IsQTeacher: 1, //是否查询课程讲师
           CourseSubject: "", //所属科目
+          SaleState:1,
         },
         pageCount: 0,
         CourseSubjectList: [], //科目列表

src/pages/stuMan/stuList.vue

@@ -587,11 +587,11 @@
             field: "GuestName",
             required: true
           },
-          {
-            name: "CurseManager",
-            label: "课程顾问",
-            align: "left"
-          },
+          // {
+          //   name: "CurseManager",
+          //   label: "课程顾问",
+          //   align: "left"
+          // },
           {
             name: "TeacherManager",
             label: "协助老师",