diff --git a/pages.json b/pages.json
index a89dde2..3cfe834 100644
--- a/pages.json
+++ b/pages.json
@@ -97,6 +97,15 @@
{ // 个人中心二级页面
"root": "root/person",
"pages": [
+ {
+ "path": "marge",
+ "style": {
+ "navigationBarTitleText": "合并团队",
+ "backgroundColor": "#ededed",
+ "backgroundColorTop": "#ededed",
+ "backgroundColorBottom": "#ededed"
+ }
+ },
{
"path": "todayData",
"style": {
diff --git a/root/person/marge.vue b/root/person/marge.vue
new file mode 100644
index 0000000..02409e3
--- /dev/null
+++ b/root/person/marge.vue
@@ -0,0 +1,8 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/root/person/orderEdit.vue b/root/person/orderEdit.vue
index 13c0451..12304bd 100644
--- a/root/person/orderEdit.vue
+++ b/root/person/orderEdit.vue
@@ -17,6 +17,20 @@
@clickItem="teamSet"
/>
+
+
+
@@ -341,7 +355,11 @@ export default {
// });
// }
},
-
+ goMarge(){
+ uni.navigateTo({
+ url:'/root/person/marge'
+ })
+ },
teamSet() {
this.teamSetShow = true;
},