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 @@
+
+
+
+
+
+
+ 春耕采购补贴
+ 增收销售补贴
+
+
+ 补贴金额
+ 补贴状态
+
+
+ {{info.subsidy_amount}}元
+
+ 已到账
+ 未到账
+
+
+
+
+
+
+ 补贴进度
+
+
+
+ 春耕采购余额{{info.spring_subsidy_amount}}元
+ 采购余额{{info.spring_subsidy}}元
+
+
+
+
+
+ {{info.spring_subsidy_rate}}%
+
+
+
+ 已完成
+ 未完成
+
+
+
+
+ 销售目标金额{{info.sale_target}}元
+ 当前进度{{info.sale_amount}}元
+
+
+
+
+
+ {{info.sale_finish_rate}}%
+
+
+ 已完成
+ 未完成
+
+
+
+
+ 采购目标金额{{info.purchase_amount}}元
+ 当前进度{{info.purchase_target}}元
+
+
+
+
+
+ {{info.purchase_finish_rate}}%
+
+
+
+ 已完成
+ 未完成
+
+
+
+ *春耕采购余额使用完,采购金额和销售金额达到后才可获取补贴
+
+
+
+
+
+ 采购金额
+ 销售金额
+ 补贴金额
+ 状态
+
+
+ ¥{{ item.extra.purchase_amount }}
+ ¥{{ item.extra.sale_amount }}
+ ¥{{ item.coupon_price }}
+
+ 未到账
+ 已到账
+
+
+
+ 暂无数据
+
+
+
+
+
+
+
+
+
+
+
\ 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 @@
补货订单
-
+
活动邀请码
+
+
+
+ 补贴进度
+
+
+
+
+ 面对面交易
+