diff --git a/pages/finance/finance.vue b/pages/finance/finance.vue index 43c0836..fb21cd2 100644 --- a/pages/finance/finance.vue +++ b/pages/finance/finance.vue @@ -50,39 +50,50 @@ export default { equityStructureData: [ { color: "#FC5E05", - title: "市场股东", - zb: "61%", - }, { - color: "#FCC139", - title: "原始股东", - zb: "22%", - }, { + title: "股东", + zb: "51%", + }, { color: "#BC52FD", - title: "团队激励", + title: "团队", zb: "10%", }, { + color: "#FCC139", + title: "推广", + zb: "29%", + },{ color: "#0474E0", - title: "机构投资", - zb: "7%", + title: "基金会", + zb: "10%", } ],// 股权架构 revenueData: [ { - color: "#FC5E05", - title: "股东分红", - zb: "2514.71", + title: "成本", + zb: "25%", }, { - color: "#FCC139", - title: "运营支撑", - zb: "1508.83", + title: "销售增值税", + zb: "13%", }, { - color: "#BC52FD", - title: "市场品牌推广", - zb: "502.94", + title: "市场激励", + zb: "12%", }, { - color: "#0474E0", - title: "基金投资", - zb: "502.94", + title: "分红", + zb: "15", + }, { + title: "年终分红", + zb: "4.5%", + }, { + title: "次年发展资金", + zb: "10.5%", + }, { + title: "股票护盘", + zb: "5%", + }, { + title: "RWA市值管理", + zb: "10%", + }, { + title: "RWA交易激励", + zb: "5%", } ],// 营收数据 }; diff --git a/pages/mine_package/mine_order/mine_order.vue b/pages/mine_package/mine_order/mine_order.vue index 1ccb74c..718c28e 100644 --- a/pages/mine_package/mine_order/mine_order.vue +++ b/pages/mine_package/mine_order/mine_order.vue @@ -2,7 +2,7 @@ - + - + @@ -77,6 +77,9 @@ 确认收货 + 去签署 + @@ -244,7 +247,6 @@ export default { // }, ], form: { - search: null,//搜索 page: 1, pageSize: 10, type: MINE_ORDER_TYPE.UNPAID,// 选中的类型 @@ -285,7 +287,8 @@ export default { signUrl: null, downShow: false, selectItem: null, - userInfo: null + userInfo: null, + search:'' } }, @@ -294,7 +297,7 @@ export default { this.form.type = type && type < 5 ? parseInt(type, 10) : MINE_ORDER_TYPE.UNPAID; this.loadData(); // 待收货判断是否签署 - if (this.form.type === MINE_ORDER_TYPE.NOT_RECEIVE) { + if (this.form.type === MINE_ORDER_TYPE.NOT_RECEIVE || this.form.type === MINE_ORDER_TYPE.SUCCEED) { this.checkSigned(); } this.userinfo(); @@ -333,6 +336,9 @@ export default { url: '/pages/mine/mine', }) }, + onBlur(){ + this.loadData(); + }, searchFun(val) { console.log("searchFun", val); }, @@ -342,7 +348,7 @@ export default { this.form.type = item.id; this.orderList = []; // 待收货判断是否签署 - if (this.form.type === MINE_ORDER_TYPE.NOT_RECEIVE) { + if (this.form.type === MINE_ORDER_TYPE.NOT_RECEIVE || this.form.type === MINE_ORDER_TYPE.SUCCEED) { this.checkSigned(); } if (item.id !== MINE_ORDER_TYPE.AFTER_SALE) { @@ -397,6 +403,9 @@ export default { page, pageSize, } + if(this.search){ + params['search'] = this.search; + } const data = await getOrderList(params); if (data && data.bizcode === 100) { return data.data