From 024ada89d6e29db63ff3fb5ba3ea133021b8a35b Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期一, 16 六月 2025 11:47:31 +0800
Subject: [PATCH] 提交
---
company/src/views/business/solutions.vue | 2 +-
company/.env.developmentCom | 4 ++++
2 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/company/.env.developmentCom b/company/.env.developmentCom
index b438032..77ad9b7 100644
--- a/company/.env.developmentCom
+++ b/company/.env.developmentCom
@@ -11,6 +11,10 @@
# VUE_APP_API = 'http://localhost:10031/'
+<<<<<<< HEAD
# VUE_APP_API = 'http://192.168.0.138:10031/'
+=======
+VUE_APP_API = 'http://192.168.0.138:10031/'
+>>>>>>> 5337d6006b45ca61881623ad2e8738e03ad3bde2
VUE_APP_API = 'https://www.yyb.red/yyb_web_api/'
diff --git a/company/src/views/business/solutions.vue b/company/src/views/business/solutions.vue
index 17f8511..bccc8f6 100644
--- a/company/src/views/business/solutions.vue
+++ b/company/src/views/business/solutions.vue
@@ -42,7 +42,7 @@
<span v-if="row.type === 1">濮旀墭<div style="color: blue;display: block" >{{ row.shopName || '-' }}</div></span>
</template>
</el-table-column>
- <el-table-column label="鎶曚繚浠锋牸" min-width="100px">
+ <el-table-column label="鏂规璐圭敤" min-width="100px">
<template slot-scope="{row}">
<span>{{row.price}}鍏�/浜�/</span>
<span v-if="row.timeUnit === 0">澶�</span>
--
Gitblit v1.9.3