diff --git a/api/admin.js b/api/admin.js index 0cab031..fd3f912 100644 --- a/api/admin.js +++ b/api/admin.js @@ -345,4 +345,22 @@ export function purchaseOrder(where, merId) { */ export function logisticsCode(id) { return request.get(`order/logistics_code/${id}`); +} + +/* + 补贴完成进度 +*/ +export function getSubsidy(merId, data) { + return request.get(`server/${merId}/subsidy`, data, { + login: true + }); +} + +/* + 补贴记录 +*/ +export function getSubsidyRecord(merId, data) { + return request.get(`server/${merId}/subsidyRecord`, data, { + login: true + }); } \ No newline at end of file diff --git a/api/product.js b/api/product.js index 78ea251..8140b48 100644 --- a/api/product.js +++ b/api/product.js @@ -328,4 +328,5 @@ export function intention(data) { */ export function intentionbus(data) { return request.post(`intention/business`, data); -} \ No newline at end of file +} + diff --git a/pages.json b/pages.json index 60b8029..3a39aa5 100644 --- a/pages.json +++ b/pages.json @@ -279,6 +279,15 @@ "navigationStyle": "custom", "enablePullDownRefresh": false } + }, + { + "path" : "pages/activeCode/subsidy", + "style" : + { + "navigationBarTitleText" : "补贴进度", + "navigationStyle": "custom", + "enablePullDownRefresh" : false + } } ], "subPackages": [{ diff --git a/pages/activeCode/subsidy.vue b/pages/activeCode/subsidy.vue new file mode 100644 index 0000000..53152a3 --- /dev/null +++ b/pages/activeCode/subsidy.vue @@ -0,0 +1,350 @@ + + + + + \ No newline at end of file diff --git a/pages/moreProject/moreProject.vue b/pages/moreProject/moreProject.vue index 685ed7a..4f36008 100644 --- a/pages/moreProject/moreProject.vue +++ b/pages/moreProject/moreProject.vue @@ -244,11 +244,21 @@ 补货订单 - + 活动邀请码 + + + + 补贴进度 + + + + + 面对面交易 +