From c72aa8a36a6d3d317ec295de7ed6da3928d1ee3e Mon Sep 17 00:00:00 2001
From: doublekou <951513186@qq.com>
Date: Mon, 4 Dec 2023 13:07:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=85=91=E6=8D=A2=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E5=90=8D=E7=A7=B0=E5=92=8C=E5=85=91=E6=8D=A2=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                          | 12 ++++++++----
 .env.production                           |  5 +++--
 src/views/system/down/currentDownload.vue |  5 +++++
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/.env.development b/.env.development
index 69922a4..37f1361 100644
--- a/.env.development
+++ b/.env.development
@@ -8,12 +8,16 @@
 ENV = 'development'
 
 # 接口地址 http://8.130.96.163:8899
-VUE_APP_BASE_API  = 'http://39.100.77.21:8899'
+# 线上
+ VUE_APP_BASE_API  = 'https://baiyee.vip'
+# 测试
+# VUE_APP_BASE_API  = 'http://39.100.77.21:8899'
 # VUE_APP_BASE_API  = 'http://172.18.0.225:8899'//xy
-# # VUE_APP_BASE_API  = 'http://172.18.0.228:8899'//ts
+# ts
+VUE_APP_BASE_API  = 'http://172.18.0.228:8899'
 #VUE_APP_BASE_API  = 'http://172.18.1.8:8899jt'
-# VUE_APP_BASE_API  = 'http://39.100.77.21:8899'
-VUE_APP_BASE_IMG  = 'http://39.100.77.21:8899'
+# VUE_APP_BASE_IMG  = 'https://baiyee.vip'
+# VUE_APP_BASE_IMG  = 'http://39.100.77.21:8899'
 VUE_APP_WS_API = 'wss://baiyee.vip'
 
 # 是否启用 babel-plugin-dynamic-import-node插件
diff --git a/.env.production b/.env.production
index 526b230..ae687ed 100644
--- a/.env.production
+++ b/.env.production
@@ -9,7 +9,8 @@ ENV = 'production'
 
 # 如果使用 Nginx 代理后端接口，那么此处需要改为 '/'，文件查看 Docker 部署篇，Nginx 配置
 # 接口地址，注意协议，如果你没有配置 ssl，需要将 https 改为 http
-VUE_APP_BASE_API  = 'http://39.100.77.21:8899'
-VUE_APP_BASE_IMG  = 'http://39.100.77.21:8899'
+VUE_APP_BASE_API  = 'https://baiyee.vip'
+VUE_APP_BASE_IMG  = 'https://baiyee.vip'
+# http://39.100.77.21:8899
 # 如果接口是 http 形式， wss 需要改为 ws
 VUE_APP_WS_API = 'wss://baiyee.vip'
\ No newline at end of file
diff --git a/src/views/system/down/currentDownload.vue b/src/views/system/down/currentDownload.vue
index 3d25cb2..0d5e8b7 100644
--- a/src/views/system/down/currentDownload.vue
+++ b/src/views/system/down/currentDownload.vue
@@ -23,6 +23,11 @@
       <el-table ref="table" v-loading="crud.loading" :data="crud.data" :header-cell-style="{'text-align':'left'}" style="width: 100%;">
         <el-table-column :show-overflow-tooltip="true" prop="companyName" label="公司名称" />
         <el-table-column :show-overflow-tooltip="true" prop="taskName" label="任务名称" />
+        <el-table-column :show-overflow-tooltip="true" prop="deliveryTaskName" label="兑换任务名称" />
+        <el-table-column :show-overflow-tooltip="true" prop="exchangeType" label="兑换方式">
+          <template slot-scope="scope">
+            <span>{{ scope.row.exchangeType===1?'方式一':'方式二' }}</span>
+          </template></el-table-column>
         <el-table-column :show-overflow-tooltip="true" prop="clueNum" label="资源条数" />
         <el-table-column :show-overflow-tooltip="true" prop="createTime" width="135" label="创建日期">
           <template slot-scope="scope">