修复合并

src/api/course/courseWatchLog.js

@@ -4,8 +4,8 @@ import request from '@/utils/request'
 export function listCourseWatchLog(query) {
   return request({
     url: '/course/courseWatchLog/list',
-    method: 'get',
-    params: query
+    method: 'post',
+    data: query
   })
 }
 

src/views/hisStore/storeOrder/index.vue

@@ -654,7 +654,6 @@
             size="mini"
             type="text"
             @click="handleDetails(scope.row)"
-            v-hasPermi="['store:storeOrder:query']"
           >查看</el-button>
           <el-button
             size="mini"
@@ -1319,7 +1318,7 @@ import {
   importDeliveryNoteExpressTemplate, exportStoreOrderDetails, exportStoreOrderItemsDetails, exportShippingOrder,
   getErpAccount,
   queryErpPhone,
-  saveErpPhone,editErpPhone,batchCreateErpOrder,batchSetErpOrder,auditStoreOrder,orderRemark
+  saveErpPhone,editErpPhone,batchCreateErpOrder,batchSetErpOrder,auditStoreOrder,orderRemark,
   importShippingOrderTemplate,
   getMiniProgramList,
   batchDeliveryAllPendingOrders