From a0f8e79c855045f823f7fb784c1ea205f4cebfac Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Wed, 2 Mar 2022 09:01:28 +0800
Subject: [PATCH 1/7] BUG 27890

---
 .../xiushan/apps/finance/AppFinanceProduct/productDetail.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/project/xiushan/apps/finance/AppFinanceProduct/productDetail.vue b/project/xiushan/apps/finance/AppFinanceProduct/productDetail.vue
index 6e479979..55131f47 100644
--- a/project/xiushan/apps/finance/AppFinanceProduct/productDetail.vue
+++ b/project/xiushan/apps/finance/AppFinanceProduct/productDetail.vue
@@ -7,7 +7,8 @@
         </template>
       </ai-title>
       <template #content>
-        <el-form size="small" label-width="120px">
+        <el-alert show-icon v-if="!detail.id" type="error" title="该产品已下架" center/>
+        <el-form v-else size="small" label-width="120px">
           <ai-card title="基本信息">
             <template #content>
               <el-row type="flex" class="flexWrap">
@@ -112,6 +113,8 @@ export default {
           this.detail = res.data
           this.detail.guaranteeModeLabel = res.data.guaranteeMode?.split(",").map(g => this.dict.getLabel("productGuaranteeMode", g))?.toString()
           this.detail.faceUserLabel = res.data.faceUser?.split(",").map(g => this.dict.getLabel("productFaceUser", g))?.toString()
+        } else {
+          this.$message.error("该产品已下架!")
         }
       })
     },

From 57ceab5d1336bd4c6b2a456652506bb59285b4c5 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Wed, 2 Mar 2022 09:07:45 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E6=8E=A5=E5=85=A5=E5=85=9A=E5=8F=B2?=
 =?UTF-8?q?=E9=A2=98=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/3.0.0/AppQuestionBank/AppQuestionBank.vue | 4 ++--
 project/shandong10086/apps.import.json             | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/packages/3.0.0/AppQuestionBank/AppQuestionBank.vue b/packages/3.0.0/AppQuestionBank/AppQuestionBank.vue
index 9dd85d5a..18d8f9fa 100644
--- a/packages/3.0.0/AppQuestionBank/AppQuestionBank.vue
+++ b/packages/3.0.0/AppQuestionBank/AppQuestionBank.vue
@@ -1,5 +1,5 @@
 <template>
-  <section class="AppFoundingHundred">
+  <section class="AppQuestionBank">
     <ai-list v-if="showList">
       <template #title>
         <ai-title title="党史题库" isShowBottomBorder></ai-title>
@@ -163,7 +163,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.AppFoundingHundred {
+.AppQuestionBank {
   height: 100%;
 }
 </style>
diff --git a/project/shandong10086/apps.import.json b/project/shandong10086/apps.import.json
index 6d9c4c66..4c95bc2b 100644
--- a/project/shandong10086/apps.import.json
+++ b/project/shandong10086/apps.import.json
@@ -23,5 +23,6 @@
   "AppVillageActivity": "乡村活动",
   "AppAddressBook": "内部通讯录",
   "AppNavConfig": "小程序导航配置",
-  "AppConvenienceAddressBook": "便民通讯录"
-}
\ No newline at end of file
+  "AppConvenienceAddressBook": "便民通讯录",
+  "AppQuestionBank": "党史题库"
+}

From 7a3e6ceb8f496deb17ce7e11c1f6257a6ef7d1d2 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Wed, 2 Mar 2022 09:21:41 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E5=B1=B1=E4=B8=9C=E7=A7=BB=E5=8A=A8?=
 =?UTF-8?q?=E6=8E=A5=E5=85=A5=E5=85=9A=E5=BB=BA=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 project/shandong10086/apps.import.json | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/project/shandong10086/apps.import.json b/project/shandong10086/apps.import.json
index 4c95bc2b..1c21b6cd 100644
--- a/project/shandong10086/apps.import.json
+++ b/project/shandong10086/apps.import.json
@@ -24,5 +24,9 @@
   "AppAddressBook": "内部通讯录",
   "AppNavConfig": "小程序导航配置",
   "AppConvenienceAddressBook": "便民通讯录",
-  "AppQuestionBank": "党史题库"
+  "AppQuestionBank": "党史题库",
+  "AppMeetingChinaunion": "三会一课",
+  "AppPartyHistoryClass": "党员学习",
+  "AppPartyOrganization": "党组织管理",
+  "AppPartyMember": "党员管理"
 }

From 26aa5377c590ed5134b9824e998cf06d115f3ecd Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Wed, 2 Mar 2022 09:28:11 +0800
Subject: [PATCH 4/7] BUG 27907

---
 project/xiushan/apps/finance/AppLoanAudit/loanDetail.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/project/xiushan/apps/finance/AppLoanAudit/loanDetail.vue b/project/xiushan/apps/finance/AppLoanAudit/loanDetail.vue
index e80a8843..81df6c45 100644
--- a/project/xiushan/apps/finance/AppLoanAudit/loanDetail.vue
+++ b/project/xiushan/apps/finance/AppLoanAudit/loanDetail.vue
@@ -94,6 +94,8 @@
 </template>
 
 <script>
+import {mapState} from "vuex";
+
 export default {
   name: "loanDetail",
   props: {
@@ -102,8 +104,9 @@ export default {
     permissions: Function
   },
   computed: {
+    ...mapState(['user']),
     isFinanceAdmin() {
-      return !!this.user.financeUser?.userRole == 1
+      return this.user.financeUser?.userRole == 1
     },
     isAuthing() {
       return this.detail.status == "0"

From 7cc808981394886e04ebcaf2ae9341f8213bc192 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Wed, 2 Mar 2022 09:31:09 +0800
Subject: [PATCH 5/7] BUG 27935

---
 .../apps/financing/AppFinancingNeeds/needsDetail.vue       | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/project/xiushan/apps/financing/AppFinancingNeeds/needsDetail.vue b/project/xiushan/apps/financing/AppFinancingNeeds/needsDetail.vue
index 8a626702..5c774979 100644
--- a/project/xiushan/apps/financing/AppFinancingNeeds/needsDetail.vue
+++ b/project/xiushan/apps/financing/AppFinancingNeeds/needsDetail.vue
@@ -1,7 +1,7 @@
 <template>
   <section class="needsDetail">
     <ai-detail>
-      <ai-title slot="title" title="融资详情" isShowBottomBorder isShowBack @onBackClick="$router.push({query:{}})">
+      <ai-title slot="title" title="融资详情" isShowBottomBorder isShowBack @onBackClick="back">
         <template #rightBtn>
           <el-button v-if="isFinanceUser" type="primary" @click="handleGrab">抢单</el-button>
           <el-button v-else type="danger" @click="handleCancel">取消发布</el-button>
@@ -86,10 +86,13 @@ export default {
         }).then(res => {
           if (res.code == 0) {
             this.$message.success("需求取消成功")
-            this.getDetail()
+            this.back()
           }
         })
       }).catch(() => 0)
+    },
+    back() {
+      this.$router.push({query: {}})
     }
   },
   created() {

From 375574a901a011cd2d4c8d4876e5a0c606d02e51 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Wed, 2 Mar 2022 09:52:05 +0800
Subject: [PATCH 6/7] bug 27937

---
 project/xiushan/apps/AppPortalUserManager/pumDetail.vue        | 2 +-
 .../xiushan/apps/finance/AppFinanceProduct/productDetail.vue   | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/project/xiushan/apps/AppPortalUserManager/pumDetail.vue b/project/xiushan/apps/AppPortalUserManager/pumDetail.vue
index 01bd9e14..e248d598 100644
--- a/project/xiushan/apps/AppPortalUserManager/pumDetail.vue
+++ b/project/xiushan/apps/AppPortalUserManager/pumDetail.vue
@@ -81,7 +81,7 @@ export default {
       form: {},
       rules: {
         auditStatus: [{required: true, message: "请选择审批结果"}],
-        auditDescription: [{validator: (r, v, cb) => this.form.auditStatus == 2 ? cb("请输入审批意见") : cb()}],
+        auditDescription: [{validator: (r, v, cb) => this.form.auditStatus == 2 && !v ? cb("请输入审批意见") : cb()}],
       }
     }
   },
diff --git a/project/xiushan/apps/finance/AppFinanceProduct/productDetail.vue b/project/xiushan/apps/finance/AppFinanceProduct/productDetail.vue
index 55131f47..27d86a83 100644
--- a/project/xiushan/apps/finance/AppFinanceProduct/productDetail.vue
+++ b/project/xiushan/apps/finance/AppFinanceProduct/productDetail.vue
@@ -92,7 +92,7 @@ export default {
     rules() {
       return {
         status: [{required: true, message: "请选择审批结果"}],
-        remark: [{validator: (r, v, cb) => this.form.status == 2 ? cb("请输入审批意见") : cb()}],
+        remark: [{validator: (r, v, cb) => this.form.status == 2 && !v ? cb("请输入审批意见") : cb()}],
       }
     }
   },
@@ -120,7 +120,6 @@ export default {
     },
     submitAudit() {
       this.$refs.AuditForm.validate(v => {
-        console.log(v)
         if (v) {
           let {id} = this.detail
           this.instance.post("/appfinancialproduct/auditProduct", null, {

From 15555a93042b94bab870944aa880e772efb6c5e5 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Wed, 2 Mar 2022 10:00:58 +0800
Subject: [PATCH 7/7] bug

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 5b70a77b..05bb8175 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,4 @@ yarn-error.log*
 /oms/dist/
 /project/*/index.js
 /project/*/dist
+/examples/entries.js