diff --git a/dist.zip b/dist.zip
new file mode 100644
index 0000000..4b69985
Binary files /dev/null and b/dist.zip differ
diff --git a/src/views/merchant/application/index.vue b/src/views/merchant/application/index.vue
index 4a33d06..9b64517 100644
--- a/src/views/merchant/application/index.vue
+++ b/src/views/merchant/application/index.vue
@@ -176,6 +176,33 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -241,7 +268,7 @@ export default {
mer_intention_id: this.$route.query.id ? this.$route.query.id : "",
category_id: "",
type_id: "",
- type: 1,//入驻申请
+ // type: 1,//入驻申请
},
mer_id: this.$route.query.id ? this.$route.query.id : "",
autoUpdate: true,
diff --git a/src/views/merchant/list/index.vue b/src/views/merchant/list/index.vue
index 4658c9e..9d395cb 100644
--- a/src/views/merchant/list/index.vue
+++ b/src/views/merchant/list/index.vue
@@ -84,14 +84,15 @@
-->
-
+
-
+
+
{{
@@ -103,8 +104,9 @@
}}
+
+
-