diff --git a/apis/interfaces/user.js b/apis/interfaces/user.js index 37fe4d5..068aca7 100644 --- a/apis/interfaces/user.js +++ b/apis/interfaces/user.js @@ -46,7 +46,15 @@ const userClause = () => { // 邀请好友 const userInvite = () => { return request({ - url: 'articles/invite' + url: 'user/invite' + }) +} + +// 我的伙伴 +const userPartne = (data) => { + return request({ + url: 'user/relations', + data: data }) } @@ -56,5 +64,6 @@ export { userCustomer, userHelp, userClause, - userInvite + userInvite, + userPartne } diff --git a/pages.json b/pages.json index 259312e..9cf4aac 100644 --- a/pages.json +++ b/pages.json @@ -34,6 +34,13 @@ "style": { "navigationBarTitleText": "帮助中心" } + }, { + "path": "pages/user/partner", + "name": "userPartner", + "auth": true, + "style": { + "navigationBarTitleText": "我的伙伴" + } }, { "path": "pages/user/clause", "name": "userClause", @@ -42,10 +49,23 @@ "navigationBarTitleText": "服务条款" } }, { - "path": "pages/instrument/basics", - "name": "instrumentBasics", + "path": "pages/vip/vip", + "name": "vipIndex", "style": { - "navigationBarTitleText": "企业基础信息" + "navigationBarTitleText": "开通节点" + } + }, { + "path": "pages/vip/agree", + "name": "vipAgree", + "style": { + "navigationBarTitleText": "服务条款" + } + }, { + "path": "pages/setting/setting", + "name": "setting", + "auth": true, + "style": { + "navigationBarTitleText": "设置中心" } }, { "path": "pages/goods/management", @@ -170,15 +190,72 @@ }, "name": "ResetPassword" },{ - "path": "pages/wallet/fragment", + "path": "pages/verification/index", + "name": "verificationIndex", + "auth": true, "style": { - "navigationBarTitleText": "能量碎片记录", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#774ffd", - "navigationBarTextStyle": "white" - }, - "name": "Fragment" + "navigationBarTitleText": "扫码核销" + } },{ + "path": "pages/verification/history", + "name": "verificationHistory", + "auth": true, + "style": { + "navigationBarTitleText": "核销记录" + } + },{ + "path": "pages/shop/lists", + "name": "shopLists", + "auth": true, + "style": { + "navigationBarTitleText": "部门/门店" + } + },{ + "path": "pages/shop/create", + "name": "shopCreate", + "auth": true, + "style": { + "navigationBarTitleText": "创建部门/门店" + } + },{ + "path": "pages/employees/list", + "name": "employeesList", + "auth": true, + "style": { + "navigationBarTitleText": "员工管理" + } + },{ + "path": "pages/employees/add", + "name": "employeesAdd", + "auth": true, + "style": { + "navigationBarTitleText": "添加员工" + } + },{ + "path": "pages/instrument/Spread", + "name": "instrumentSpread", + "auth": true, + "style": { + "navigationBarTitleText": "营销推广码" + } + },{ + "path": "pages/instrument/basics", + "name": "instrumentBasics", + "auth": true, + "style": { + "navigationBarTitleText": "基础信息" + } + }, { + "path": "pages/wallet/fragment", + "style": { + "navigationBarTitleText": "能量碎片记录", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#774ffd", + "navigationBarTextStyle": "white" + }, + "name": "Fragment" + }, + { "path": "pages/wallet/addCard", "style": { "navigationBarTitleText": "添加银行卡", @@ -205,8 +282,7 @@ "navigationBarTextStyle": "white" }, "name": "withdrawList" - } - ], + }], "globalStyle": { "navigationStyle": "custom", "backgroundColor": "#F5F5F5" diff --git a/pages/certification/personal.vue b/pages/certification/personal.vue index 33ffa42..f0f0e9c 100644 --- a/pages/certification/personal.vue +++ b/pages/certification/personal.vue @@ -207,7 +207,7 @@ button{ height: 90rpx; line-height: 90rpx; - background-color: $mian-color-deep; + background-color: $mian-color; border-radius: 0; color: white; font-size: $title-size-lg; diff --git a/pages/employees/add.vue b/pages/employees/add.vue new file mode 100644 index 0000000..ed32964 --- /dev/null +++ b/pages/employees/add.vue @@ -0,0 +1,311 @@ + + + + + diff --git a/pages/employees/list.vue b/pages/employees/list.vue new file mode 100644 index 0000000..5b39527 --- /dev/null +++ b/pages/employees/list.vue @@ -0,0 +1,260 @@ + + + + + diff --git a/pages/index/index.vue b/pages/index/index.vue index 41cadb8..0d35411 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -1,51 +1,60 @@