Merge branch 'feat/lyf' into 'develop'

Feat/lyf

See merge request com.pica.cloud.education.frontend/pica.cloud.web-education-admin!284

src/components/icd/addDiagnose.vue

@@ -205,7 +205,6 @@
       },
       // 搜索框中输入文字 时 page=1 pageSize=30
       handleInputSearch() {
-        // debugger;
         clearTimeout(this.searchFlagTimer);
         let that = this;
         that.page = 1;

src/utils/yqrange/yqrangeApi.js

@@ -255,7 +255,6 @@ export const getGoodsExportUrl = (params) => {
 };
 
 export const getOrdersExportUrl = (params) => {
-  debugger
   return fetch({
     headers,
     url: getBaseUrl('/store/orders/admin/export'),
@@ -265,6 +264,45 @@ export const getOrdersExportUrl = (params) => {
   })
 };
 
+export const uploadExpress = (params) => {
+  return fetch({
+    headers,
+    url: getBaseUrl(`/store/batch/upload/express`),
+    method: 'POST',
+    data: params,
+    description: '批量更新物流操作',
+  })
+};
+
+export const uploadRefund = (params) => {
+  return fetch({
+    headers,
+    url: getBaseUrl(`/store/batch/upload/refund`),
+    method: 'POST',
+    data: params,
+    description: '批量取消退款操作',
+  })
+};
+
+export const getUploadExpressProgress = (id) => {
+  return fetch({
+    headers,
+    url: getBaseUrl(`store/batch/upload/progress/express/${id}`),
+    method: 'GET',
+    description: '查询批量更新物流处理进度，id为批次id',
+  })
+};
+
+export const getUploadRefundProgress = (id) => {
+  return fetch({
+    headers,
+    url: getBaseUrl(`store/batch/upload/progress/refund/${id}`),
+    method: 'GET',
+    description: '查询批量取消退款处理进度，id为批次id',
+  })
+};
+
+
 
 export const getExamAwardList = (params) => {
   return fetch({
@@ -347,3 +385,7 @@ export const delActivity = (params) => {
     description: '活动列表',
   })
 };
+
+
+
+

src/views/yqrange/edit-range.vue

@@ -511,7 +511,6 @@
         this.updatedTree = true;
       },
       getTreeCheck() {
-      debugger
         //重构归并树
         let checkedTree = operationData.getSimpleCheckedNodes(
           this.$refs.tree.store
@@ -1338,4 +1337,3 @@
     left: 0;
   }
   </style>
-  
\ No newline at end of file

static/UEditor/third-party/video-js/video.dev.js

@@ -4414,12 +4414,12 @@ vjs.SeekBar.prototype.onMouseMove = function(event){
 };
 
 vjs.SeekBar.prototype.onMouseUp = function(event){
-    debugger
+
   vjs.Slider.prototype.onMouseUp.call(this, event);
 
   this.player_.scrubbing = false;
   if (this.videoWasPlaying) {
-      debugger
+
     this.player_.play();
   }
 };