From a77e330d828d83ee0839a8047ba7817ab9c1b009 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A5=8F?= <1978476055@qq.com>
Date: Tue, 23 Jul 2024 10:02:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=97=E9=93=BA=E4=BF=9D=E8=AF=81=E9=87=91?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                     | 8 ++++----
 src/views/merchant/deposit/index.vue | 2 +-
 src/views/setting/devise/index.vue   | 2 ++
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.env.development b/.env.development
index 2c630c5..f3ba387 100644
--- a/.env.development
+++ b/.env.development
@@ -3,12 +3,12 @@ ENV = 'development'
 # http://192.168.1.43:8324/admin
 # http://mer.crmeb.net/admin
 # base api
-# VUE_APP_BASE_API = 'http://192.168.1.12:8080'
-VUE_APP_BASE_API = 'https://api.tropjoin.com'
+VUE_APP_BASE_API = 'http://shop.many.lo'
+# VUE_APP_BASE_API = 'https://api.tropjoin.com'
 
 # socket 连接地址
-# VUE_APP_WS_URL = 'ws://http://192.168.1.12:8080'
-VUE_APP_WS_URL = 'ws://https://api.tropjoin.com'
+VUE_APP_WS_URL = 'ws://http://shop.many.lo'
+# VUE_APP_WS_URL = 'ws://https://api.tropjoin.com'
 
 # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable,
 # to control whether the babel-plugin-dynamic-import-node plugin is enabled.
diff --git a/src/views/merchant/deposit/index.vue b/src/views/merchant/deposit/index.vue
index ddbfe85..0eb2dec 100644
--- a/src/views/merchant/deposit/index.vue
+++ b/src/views/merchant/deposit/index.vue
@@ -422,7 +422,7 @@
               >操作记录</el-button
             >
             <el-button
-              v-if="(type == 2 || type == 3 || type == 4) && scope.row.status != 1"
+              v-if="(type == 2 || type == 3 || type == 4) && scope.row.status == 0"
               type="text"
               size="small"
               @click="offline(scope.row.order_id)"
diff --git a/src/views/setting/devise/index.vue b/src/views/setting/devise/index.vue
index 1b06c18..95e8d9f 100644
--- a/src/views/setting/devise/index.vue
+++ b/src/views/setting/devise/index.vue
@@ -637,6 +637,7 @@ export default {
                     this.mConfig.push(tempItem);
                     this.activeIndex = this.mConfig.length - 1;
                     this.rConfig.push(tempItem);
+                    console.log(this.rConfig)
                 }else {
                     this.mConfig.splice(index+1, 0, tempItem);
                     this.activeIndex = index;
@@ -811,6 +812,7 @@ export default {
             }
             this.loading = true;
             let val = this.$store.state.mobildConfig.defaultArray;
+            console.log(val);
             if (!this.footActive) {
                 let timestamp = new Date().getTime() * 1000;
                 val[timestamp] = this.$store.state.mobildConfig.pageFooter;