From fd25421eb06b392da6b4fc9cf4335e7580f3f37d Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Fri, 24 Feb 2023 10:49:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E7=A1=AE=E8=AE=A4=E6=9C=89?=
 =?UTF-8?q?=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/request.js      |  2 +-
 src/views/order/index.vue | 45 +++++++++++++++++++++------------------
 2 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/src/utils/request.js b/src/utils/request.js
index 6a85292..4bf6b98 100644
--- a/src/utils/request.js
+++ b/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
 })
 
diff --git a/src/views/order/index.vue b/src/views/order/index.vue
index 0c4915b..693f574 100644
--- a/src/views/order/index.vue
+++ b/src/views/order/index.vue
@@ -194,35 +194,38 @@ 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){
-                btns.push(
-                  <el-button
-                    size="mini"
-                    type="primary"
-                    icon={map.get(key)}
-                    plain
-                    style={
-                      {
-                        'margin':'0 6px 4px 0'
-                      }
-                    }
-                    on={
-                      {
-                        ['click']:e => {
-                          _this.$refs['operate'].form.item_id = row.id
-                          _this.$refs['operate'].form.action = key
-                          _this.$refs['operate'].isShow = true
-                          console.log(key)
+                if(key!="confirm_by_merchant"){
+                  btns.push(
+                    <el-button
+                      size="mini"
+                      type="primary"
+                      icon={map.get(key)}
+                      plain
+                      style={
+                        {
+                          'margin':'0 6px 4px 0'
                         }
                       }
-                    }>{row.merchant_actions[key]}</el-button>
-                )
+                      on={
+                        {
+                          ['click']:e => {
+                            _this.$refs['operate'].form.item_id = row.id
+                            _this.$refs['operate'].form.action = key
+                            _this.$refs['operate'].isShow = true
+                            console.log(key)
+                          }
+                        }
+                      }>{row.merchant_actions[key]}</el-button>
+                  )
+                }
+
               }
             }
             btns.push(