Merge remote-tracking branch 'origin/dev' into dev

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/AppLoanAudit/loanList.vue

@@ -77,8 +77,8 @@ export default {
     },
     handleFilterApplyTime() {
       this.page.current = 1
-      this.search.applyStartDate = this.search.applyTime?.[0]
-      this.search.applyEndDate = this.search.applyTime?.[1]
+      this.search.applyStartDate = this.search.applyTime?.[0].substring(0,10)
+      this.search.applyEndDate = this.search.applyTime?.[1].substring(0,10)
       this.getTableData()
     }
   },