去除确认有效

src/utils/request.js

@@ -14,7 +14,7 @@ let loading ;
 const service = axios.create({
   baseURL: process.env.VUE_APP_BASE_API, // url = base url + request url
   // withCredentials: true, // send cookies when cross-domain requests
-  timeout: 10000, // request timeout
+  timeout: 100000, // request timeout
   isLoading:true
 })
 

src/views/order/index.vue

@@ -194,13 +194,14 @@ export default {
               ['follow_by_merchant','el-icon-s-comment'],
               ['accept_by_merchant','el-icon-s-promotion'],
               ['return_by_merchant','el-icon-refresh-left'],
-              ['confirm_by_merchant','el-icon-check'],
+              // ['confirm_by_merchant','el-icon-check'],
               ['mark_cancel_by_merchant','el-icon-circle-close'],
               ['finish_by_merchant','el-icon-edit-outline']
             ])
             let btns = []
             if(typeof row?.merchant_actions == 'object'){
               for(let key in row.merchant_actions){
+                if(key!="confirm_by_merchant"){
                   btns.push(
                     <el-button
                       size="mini"
@@ -224,6 +225,8 @@ export default {
                       }>{row.merchant_actions[key]}</el-button>
                   )
                 }
+
+              }
             }
             btns.push(
               <el-button