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

src/api/sale/sale.js

@@ -158,3 +158,47 @@ export function setClassOrderCareOf(data) {
     data
   })
 }
+/**
+ *  订单取消
+ *
+ */
+export function cancelClassOrder(data) {
+  return request({
+    url: '/order/CancelClassOrder',
+    method: 'post',
+    data
+  })
+}
+/**
+ *  获取订单详情
+ *
+ */
+export function getClassOrderInfo(data) {
+  return request({
+    url: '/order/GetClassOrderInfo',
+    method: 'post',
+    data
+  })
+}
+/**
+ *  获取备注列表
+ *
+ */
+export function getClassOrderRemarkList(data) {
+  return request({
+    url: '/order/GetClassOrderRemarkList',
+    method: 'post',
+    data
+  })
+}
+/**
+ *  获取订单操作日志列表
+ *
+ */
+export function getClassOrderLogList(data) {
+  return request({
+    url: '/order/GetClassOrderLogList',
+    method: 'post',
+    data
+  })
+}

src/pages/sale/studentList.vue

@@ -251,7 +251,6 @@
         this.msg.pageIndex = val;
         this.getRolelist()
       },
-      //获取菜单分页列表
       getRolelist() {
         this.loading = true;
         getOrderGuestPageList(this.msg).then(res => {