From 8128163b4f451600c3baff5573a40f91d565e60a Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Wed, 30 Nov 2022 10:45:12 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E5=AE=BD=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/base/resi.vue                     |  3 ++-
 .../orgActivity/activivityList/addActivity.vue      | 13 +++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index 63d9fb32e..d36571586 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -223,6 +223,7 @@
                            :form-info="item.formInfo && item.formInfo"
                            :support-add="item.supportAdd"
                            :form-id="item.columnName"
+                           :labelWidth="'140px'"
                            :form-list="item.itemList" />
               </el-tab-pane>
             </el-tabs>
@@ -275,7 +276,7 @@
                            :muti-list="item.mutiList"
                            :form-list="item.itemList"
                            :disabled="disabled"
-                           :label-width="'140px'"
+                           :labelWidth="'140px'"
                            :agency-id="editAgencyId" />
               </el-tab-pane>
             </el-tabs>
diff --git a/src/views/modules/communityParty/orgActivity/activivityList/addActivity.vue b/src/views/modules/communityParty/orgActivity/activivityList/addActivity.vue
index 3c122790b..bbc79ac31 100644
--- a/src/views/modules/communityParty/orgActivity/activivityList/addActivity.vue
+++ b/src/views/modules/communityParty/orgActivity/activivityList/addActivity.vue
@@ -149,7 +149,8 @@
                       label="附件"
                       label-width="150px"
                       prop="attach">
-          <el-upload :headers="$getElUploadHeaders()"  class="upload-demo"
+          <el-upload :headers="$getElUploadHeaders()"
+                     class="upload-demo"
                      :action="uploadUlr"
                      accept=".doc,.pdf,.xls,.docx,.xlsx,.jpg,.png,.jpeg,.bmp,.mp4,.wma,.m4a,.mp3"
                      :on-success="handleFileSuccess"
@@ -170,14 +171,14 @@
 
     </div>
 
-    <div class="div_btn">
+    <!-- <div class="div_btn">
       <el-button size="small"
                  @click="handleCancle">取 消</el-button>
       <el-button size="small"
                  type="primary"
                  :disabled="btnDisable"
                  @click="handleComfirm">确 定</el-button>
-    </div>
+    </div> -->
   </div>
 </template>
 
@@ -585,10 +586,10 @@ export default {
       }
     },
 
-    
-    handlePreview(src) {
+
+    handlePreview (src) {
       console.log(src)
-      if(src){
+      if (src) {
         window.open(src);
       }
     },

From 36bc927421a15afbccb57fc3faf1718ef43688c7 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Wed, 30 Nov 2022 14:22:58 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=85=8D=E7=99=BB=E6=90=BA=E5=B8=A6token?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/main-sidebar-sub-menu.vue | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/views/main-sidebar-sub-menu.vue b/src/views/main-sidebar-sub-menu.vue
index 132f6dcf8..a3a1bb1e3 100644
--- a/src/views/main-sidebar-sub-menu.vue
+++ b/src/views/main-sidebar-sub-menu.vue
@@ -31,6 +31,7 @@
 
 <script>
 import SubMenu from "./main-sidebar-sub-menu";
+import jointUrl from "dai-js/tools/jointUrl";
 export default {
   name: "sub-menu",
   props: {
@@ -50,7 +51,13 @@ export default {
       )[0];
       if (route) {
         console.log(route);
-        if (route.meta.iframeURL.endsWith("【跳转新页面】")) {
+        if (route.meta.iframeURL.endsWith("【跳转新页面免登】")) {
+          window.open(
+            jointUrl(route.meta.iframeURL.slice(0, -9), {
+              token: localStorage.getItem("token"),
+            })
+          );
+        } else if (route.meta.iframeURL.endsWith("【跳转新页面】")) {
           window.open(route.meta.iframeURL.slice(0, -7));
         } else {
           this.$router.push({ name: route.name });