diff --git a/api/activity.js b/api/activity.js index 0398ede..9e7d885 100644 --- a/api/activity.js +++ b/api/activity.js @@ -261,4 +261,4 @@ export function spuTopList(data) { return request.get(`product/spu/get_hot_ranking`, data, { noAuth: true }); -} \ No newline at end of file +} diff --git a/api/admin.js b/api/admin.js index b76e28a..0cab031 100644 --- a/api/admin.js +++ b/api/admin.js @@ -225,6 +225,15 @@ export function getMerNewQRcode(where, merId) { login: true }); } + +/** + * 商户拉新记录 + */ +export function pullNewUserRecord(where, merId) { + return request.get(`server/${merId}/record`, where, { + noAuth: true + }); +} /** * 营业额统计 * @returns {*} diff --git a/config/app.js b/config/app.js index d94b1a2..479ac47 100644 --- a/config/app.js +++ b/config/app.js @@ -9,8 +9,8 @@ let httpApiThree let wsApi // 在打包之前请检查当前环境是否正确 -// const env = 'dev'; // 开发 -const env = 'prod'; // 生产 +const env = 'dev'; // 开发 +// const env = 'prod'; // 生产 // const env = 'prew'; // 预上线 switch (env) { diff --git a/pages.json b/pages.json index 70451ba..e37a73d 100644 --- a/pages.json +++ b/pages.json @@ -277,6 +277,15 @@ "navigationBarTitleText" : "选择地址", "enablePullDownRefresh" : false } + }, + { + "path" : "pages/activeCode/activeCode", + "style" : + { + "navigationBarTitleText" : "推广二维码", + "navigationStyle": "custom", + "enablePullDownRefresh": false + } } ], "subPackages": [{ diff --git a/pages/activeCode/activeCode.vue b/pages/activeCode/activeCode.vue new file mode 100644 index 0000000..1ceec5f --- /dev/null +++ b/pages/activeCode/activeCode.vue @@ -0,0 +1,224 @@ + + + + + \ No newline at end of file diff --git a/pages/moreProject/moreProject.vue b/pages/moreProject/moreProject.vue index 6d1ca4b..685ed7a 100644 --- a/pages/moreProject/moreProject.vue +++ b/pages/moreProject/moreProject.vue @@ -244,11 +244,11 @@ 补货订单 - + + +