From 8bb4f634b8f7e56c3064954d8fb7aaf95476206f Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Thu, 2 Dec 2021 15:49:50 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../regionalParty/activitys.vue               | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/views/modules/communityParty/regionalParty/activitys.vue b/src/views/modules/communityParty/regionalParty/activitys.vue
index fac50601..37fcbe08 100644
--- a/src/views/modules/communityParty/regionalParty/activitys.vue
+++ b/src/views/modules/communityParty/regionalParty/activitys.vue
@@ -82,6 +82,10 @@
                    type="green"
                    size="small"
                    @click="handleAdd">新增</el-button>
+        <el-button style="float:left"
+                   type="yellow"
+                   size="small"
+                   @click="handleExport">导出</el-button>
         <el-upload ref="upload"
                    :multiple='false'
                    :show-file-list='false'
@@ -95,11 +99,6 @@
                      size="small"
                      type="red">导入</el-button>
 
-          <el-button style="float:left"
-                     type="yellow"
-                     size="small"
-                     @click="handleExport">导出</el-button>
-
         </el-upload>
 
       </div>
@@ -470,14 +469,14 @@ export default {
 
     //导出表格
     async handleExport () {
-      let title = '—联建活动列表'
+      let title = '联建活动列表'
 
       const url = "/heart/icpartyactivity/export"
       let params = {
-        ownerName: this.ownerName,
-        ownerPhone: this.ownerPhone,
-        level: this.agencyObj.level,
-        id: this.agencyObj.id
+        agencyId: this.agencyId,
+
+        ...this.formData
+
       }
 
       app.ajax.exportFilePost(

From a3d11053c960803d0434e53b915805b272ca98c4 Mon Sep 17 00:00:00 2001
From: wangxianzhang <ZHANGYUGE6666>
Date: Mon, 6 Dec 2021 13:49:08 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E7=8E=AF=E5=A2=83=E5=9F=9F=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.production.uat | 2 +-
 public/index.html   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.env.production.uat b/.env.production.uat
index 08256341..14457f27 100644
--- a/.env.production.uat
+++ b/.env.production.uat
@@ -1,4 +1,4 @@
 NODE_ENV=production
-VUE_APP_API_SERVER =  https://epmet-dev.elinkservice.cn/api
+VUE_APP_API_SERVER =  https://epmet-test.elinkservice.cn/api
 VUE_APP_NODE_ENV=prod:uat
 VUE_APP_PUBLIC_PATH=epmet-oper
\ No newline at end of file
diff --git a/public/index.html b/public/index.html
index a156e939..e4e6978e 100644
--- a/public/index.html
+++ b/public/index.html
@@ -54,7 +54,7 @@
           <!-- 验收测试环境 aliyun -->
           <% if (process.env.VUE_APP_NODE_ENV==='prod:uat' ) { %>
             <script>
-              window.SITE_CONFIG['apiURL'] = 'https://epmet-dev.elinkservice.cn/api'
+              window.SITE_CONFIG['apiURL'] = 'https://epmet-test.elinkservice.cn/api'
             </script>
             <% } %>
               <!-- 生产环境 -->

From 3dd529c741a5a4feffb07bd9e649fba0a880c6e0 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Fri, 10 Dec 2021 15:23:43 +0800
Subject: [PATCH 3/3] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/communityParty/regionalParty/activitys.vue | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/views/modules/communityParty/regionalParty/activitys.vue b/src/views/modules/communityParty/regionalParty/activitys.vue
index dd7c5389..1638a07c 100644
--- a/src/views/modules/communityParty/regionalParty/activitys.vue
+++ b/src/views/modules/communityParty/regionalParty/activitys.vue
@@ -99,11 +99,8 @@
                      size="small"
                      type="red">导入</el-button>
 
-<<<<<<< HEAD
-        </el-upload>
-=======
+
         </el-upload> -->
-        >>>>>>> dev-shuju
 
       </div>