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

.gitignore

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

examples/entries.js

@@ -1,22 +0,0 @@
-//引入当前工程所有的应用
-const install = function(Vue) {
-	if (install.installed) return Promise.resolve();
-	else {
-		let contexts = require.context('../project/xiushan', true, /(\/.+)\/App[^\/]+\.vue$/);
-		if (contexts) {
-			contexts.keys().map((e) => {
-				if (contexts(e).default) {
-					Vue.component(contexts(e).default.name, contexts(e).default);
-				}
-			});
-		}
-	}
-};
-// 判断是否是直接引入文件
-if (typeof window !== 'undefined' && window.Vue) {
-	install(window.Vue);
-}
-export default {
-	// 导出的对象必须具有 install，才能被 Vue.use() 方法安装
-	install
-};

project/shandong10086/apps/shandong/AppVillagersCircle/components/List.vue

@@ -23,7 +23,7 @@
             type="date"
             size="small"
             unlink-panels
-            placeholder="选择开始日期"
+            placeholder="请选择发布开始日期"
             @change="search.current = 1, getList()" />
           <el-date-picker
             value-format="yyyy-MM-dd"
@@ -31,7 +31,7 @@
             type="date"
             size="small"
             unlink-panels
-            placeholder="选择结束日期"
+            placeholder="请选择发布结束日期"
             @change="search.current = 1, getList()" />
         </template>
         <template #right>

project/xiushan/apps/finance/AppFinanceProduct/productDetail.vue

@@ -7,8 +7,7 @@
         </template>
       </ai-title>
       <template #content>
-        <el-alert show-icon v-if="!detail.id" type="error" title="该产品已下架" center/>
+        <el-form v-if="detail.id" size="small" label-width="120px">
-        <el-form v-else size="small" label-width="120px">
           <ai-card title="基本信息">
             <template #content>
               <el-row type="flex" class="flexWrap">

project/xiushan/apps/finance/AppLoanAudit/loanDetail.vue

@@ -86,7 +86,7 @@
           </el-form-item>
         </template>
         <el-form-item v-else-if="form.auditStatus==2" label="审批意见" prop="remark">
-          <el-input type="textarea" v-model="form.auditDescription" placeholder="请输入"/>
+          <el-input type="textarea" v-model="form.auditDescription" placeholder="请输入" maxlength="200" show-word-limit/>
         </el-form-item>
       </el-form>
     </ai-dialog>
@@ -125,6 +125,7 @@ export default {
         ],
         auditLifespan: [{required: true, message: "请选择 使用期限"}],
         loanDate: [{required: true, message: "请选择 放款日期"}],
+        remark: [{required: true, message: "请输入 审批意见"}],
       }
     }
   },

project/xiushan/apps/financing/AppGrabLog/grabDetail.vue

@@ -2,7 +2,7 @@
   <section class="grabDetail">
     <ai-detail>
       <ai-title slot="title" title="融资详情" isShowBottomBorder isShowBack @onBackClick="back">
-        <template v-if="isFinanceUser&&detail.status==0" #rightBtn>
+        <template v-if="isFinanceUser&&detail.status==1" #rightBtn>
           <el-button type="danger" @click="handleCancel">回退订单</el-button>
           <el-button type="primary" @click="dialog=true">放款</el-button>
         </template>