From 50a564a70d3cb46a6ab84db00a9d11f115656f59 Mon Sep 17 00:00:00 2001
From: 15820893422 <1978476055@qq.com>
Date: Wed, 24 Apr 2024 15:59:21 +0800
Subject: [PATCH] edit

---
 src/views/systemForm/setSystem/modifyStoreInfo.vue | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/views/systemForm/setSystem/modifyStoreInfo.vue b/src/views/systemForm/setSystem/modifyStoreInfo.vue
index 83eda68..a976e58 100644
--- a/src/views/systemForm/setSystem/modifyStoreInfo.vue
+++ b/src/views/systemForm/setSystem/modifyStoreInfo.vue
@@ -81,7 +81,7 @@
                   </div>
                 </div>
               </div>
-              <el-button v-if="!merData.offline.includes(10) || merData.ot_margin-merData.margin>0" type="success" size="small" class="mr10 pay_btn" @click="handleTransfer(10)">提交转账信息</el-button>
+              <el-button v-if="!merData.offline.includes(10) && merData.ot_margin-merData.margin>0" type="success" size="small" class="mr10 pay_btn" @click="handleTransfer(10)">提交转账信息</el-button>
             </div>
             <!--技术服务费-->
             <div v-if="merData.is_service == 1">
@@ -102,7 +102,7 @@
                   </div>
                 </div>
               </div>
-              <el-button v-if="!merData.offline.includes(30) || merData.ot_service_cost-merData.service_cost>0" type="success" size="small" class="mr10 pay_btn" @click="handleTransfer(30)">提交转账信息</el-button>
+              <el-button v-if="!merData.offline.includes(30) && merData.ot_service_cost-merData.service_cost>0" type="success" size="small" class="mr10 pay_btn" @click="handleTransfer(30)">提交转账信息</el-button>
             </div>
             <!--商品上架费-->
             <div v-if="merData.is_goods == 1">
@@ -122,7 +122,7 @@
                   </div>
                 </div>
               </div>
-              <el-button v-if="!merData.offline.includes(40) || merData.ot_goods_cost-merData.goods_cost>0" type="success" size="small" class="mr10 pay_btn" @click="handleTransfer(40)">提交转账信息</el-button>
+              <el-button v-if="!merData.offline.includes(40) && merData.ot_goods_cost-merData.goods_cost>0" type="success" size="small" class="mr10 pay_btn" @click="handleTransfer(40)">提交转账信息</el-button>
             </div>
             <!--已支付-->
             <div v-if="merData.is_margin == 10 " class="margin_main">
@@ -157,7 +157,7 @@
                   </div>
                 </div>
                 </div>
-                <el-button v-if="!merData.offline.includes('10') || merData.ot_margin-merData.margin>0" type="success" size="small" class="mr10 pay_btn" @click="handleTransfer(10)">提交转账信息</el-button>
+                <el-button v-if="!merData.offline.includes('10') && merData.ot_margin-merData.margin>0" type="success" size="small" class="mr10 pay_btn" @click="handleTransfer(10)">提交转账信息</el-button>
               </div>
             </div>
             <!-- 技术服务费 -->
@@ -192,7 +192,7 @@
                   </div>
                 </div>
                 </div>
-                <el-button v-if="!merData.offline.includes('30') || merData.ot_service_cost-merData.service_cost>0" type="success" size="small" class="mr10 pay_btn" @click="handleTransfer(30)">提交转账信息</el-button>
+                <el-button v-if="!merData.offline.includes('30') && merData.ot_service_cost-merData.service_cost>0" type="success" size="small" class="mr10 pay_btn" @click="handleTransfer(30)">提交转账信息</el-button>
               </div>
             </div>
             <!-- 上架费 -->
@@ -227,7 +227,7 @@
                   </div>
                 </div>
                 </div>
-                <el-button v-if="!merData.offline.includes('40') || merData.goods_cost-merData.goods_cost>0" type="success" size="small" class="mr10 pay_btn" @click="handleTransfer(40)">提交转账信息</el-button>
+                <el-button v-if="!merData.offline.includes('40') && merData.goods_cost-merData.goods_cost>0" type="success" size="small" class="mr10 pay_btn" @click="handleTransfer(40)">提交转账信息</el-button>
               </div>
             </div>
             <div v-if="merData.is_margin == -10 || merData.is_margin == -1" class="margin_main">