Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev

.gitignore

@@ -25,3 +25,4 @@ yarn-error.log*
 /oms/dist/
 /project/*/index.js
 /project/*/dist
+/examples/entries.js

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>

project/shandong10086/apps.import.json

@@ -23,5 +23,10 @@
   "AppVillageActivity": "乡村活动",
   "AppAddressBook": "内部通讯录",
   "AppNavConfig": "小程序导航配置",
-  "AppConvenienceAddressBook": "便民通讯录"
-}
+  "AppConvenienceAddressBook": "便民通讯录",
+  "AppQuestionBank": "党史题库",
+  "AppMeetingChinaunion": "三会一课",
+  "AppPartyHistoryClass": "党员学习",
+  "AppPartyOrganization": "党组织管理",
+  "AppPartyMember": "党员管理"
+}

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()}],
       }
     }
   },

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">
@@ -91,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()}],
       }
     }
   },
@@ -112,12 +113,13 @@ 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("该产品已下架!")
         }
       })
     },
     submitAudit() {
       this.$refs.AuditForm.validate(v => {
-        console.log(v)
         if (v) {
           let {id} = this.detail
           this.instance.post("/appfinancialproduct/auditProduct", null, {

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"

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() {