diff --git a/src/views/merchant/application/index.vue b/src/views/merchant/application/index.vue
index 14edd45..d314f2b 100644
--- a/src/views/merchant/application/index.vue
+++ b/src/views/merchant/application/index.vue
@@ -28,6 +28,18 @@
style="width: 280px"
/>
+
+
+
+
+
+
+
@@ -218,6 +240,8 @@ export default {
tableFrom: {
page: 1,
limit: 20,
+ audit_name:'',
+ audit_time:'',
date: "",
status: this.$route.query.status ? this.$route.query.status : "",
keyword: "",
@@ -228,6 +252,7 @@ export default {
mer_id: this.$route.query.id ? this.$route.query.id : "",
autoUpdate: true,
timeVal: [],
+ timeVals: [],
drawer: false
};
},
@@ -273,7 +298,9 @@ export default {
/**重置 */
searchReset(){
this.timeVal = []
+ this.timeVals = []
this.tableFrom.date = ""
+ this.tableFrom.audit_time = ""
this.$refs.searchForm.resetFields()
this.getList(1)
},
@@ -289,6 +316,13 @@ export default {
this.tableFrom.page = 1;
this.getList("");
},
+ // 具体日期
+ onchangeTimes(e) {
+ this.timeVals = e;
+ this.tableFrom.audit_time = this.timeVals ? this.timeVals.join("-") : "";
+ this.tableFrom.page = 1;
+ this.getList("");
+ },
// 商户分类;
getMerCategory() {
getMerCateApi().then(res => {
diff --git a/src/views/product/productExamine/proDetails.vue b/src/views/product/productExamine/proDetails.vue
index 32544f8..789cdeb 100644
--- a/src/views/product/productExamine/proDetails.vue
+++ b/src/views/product/productExamine/proDetails.vue
@@ -221,7 +221,7 @@