diff --git a/Utils/Api.js b/Utils/Api.js index 3dcd27f..f58041d 100644 --- a/Utils/Api.js +++ b/Utils/Api.js @@ -264,69 +264,146 @@ export const enrollActivity = params => { // 配置费率 export const configRosterRate = params => { return POST('POST', `${base}/bankActivity/configRosterRate`, params).then(res => res.data); -} - -//进件复议 +} + +//进件复议 export const reconsider = params => { return POST('POST', `${base}/mer/reconsider`, params).then(res => res.data); -} - -//根据商户查询结算 +} + +//根据商户查询结算 export const getSettleAcctByMer = params => { return POST('GET', `${base}/merSettleAcct/getSettleAcctByMer`, params).then(res => res.data); -} - -// 查询商户渠道平台列表 +} + +// 查询商户渠道平台列表 export const getMerPlatformList = params => { return POST('GET', `${base}/merPlatform/getMerPlatformList`, params).then(res => res.data); -} - -// 查询商户 +} + +// 查询商户 export const getMerList = params => { return POST('GET', `${base}/mer/getMerList`, params).then(res => res.data); -} - // 查询业务员 +} +// 查询业务员 export const querySalesmanList = params => { return POST('GET', `${base}/salesman/querySalesmanList`, params).then(res => res.data); -} -//查询订单详情 +} +//查询订单详情 export const getOrderByOutTradeOrder = params => { return POST('GET', `${base}/tradeOrder/getOrderByOutTradeOrder`, params).then(res => res.data); -} -// #根据商户查询费率 +} +// #根据商户查询费率 export const getRateByMer = params => { return POST('GET', `${base}/merRate/getRateByMer`, params).then(res => res.data); -} -// #编辑费率申请 +} +// #编辑费率申请 export const editRateApply = params => { return POST('POST', `${base}/merRate/editRateApply`, params).then(res => res.data); -} -// #查询最新申请信息 +} +// #查询最新申请信息 export const getNewRateApplyDetail = params => { return POST('GET', `${base}/merRate/getNewRateApplyDetail`, params).then(res => res.data); -} - -//#查询费率申请详情 +} + +//#查询费率申请详情 export const getRateApplyDetail = params => { return POST('GET', `${base}/merRate/getRateApplyDetail`, params).then(res => res.data); -} -// # 设备绑定门店 +} + +// # 设备绑定门店 export const devicebindStore = params => { return POST('POST', `${base}/device/bindStore`, params).then(res => res.data); -} - -//# 设备解绑门店 +} + +//# 设备解绑门店 export const unbindStore = params => { return POST('POST', `${base}/device/unbindStore`, params).then(res => res.data); -} - -//切换渠道 +} + +//切换渠道 export const switchPlatform = params => { return POST('POST', `${base}/merPlatform/switchPlatform`, params).then(res => res.data); +} + +//获取账户信息 +export const queryAccount = params => { + return POST('GET', `${base}/rebateMerAccount/queryAccount`, params).then(res => res.data); +} + +//获取账户交易记录 +export const queryAccountRecordList = params => { + return POST('GET', `${base}/rebateMerAccount/queryAccountRecordList`, params).then(res => res.data); +} + +//获取账户交易详情 +export const queryAccountRecordDetail = params => { + return POST('GET', `${base}/rebateMerAccount/queryAccountRecordDetail`, params).then(res => res.data); +} + +//账户充值 +export const rebateCreate = params => { + return POST('POST', `${base}/rebateMerAccountOrder/create`, params).then(res => res.data); +} + +//获取账户充值记录 +export const queryOrderList = params => { + return POST('GET', `${base}/rebateMerAccountOrder/queryOrderList`, params).then(res => res.data); +} + +//获取充值订单详情 +export const queryOrderDetail = params => { + return POST('GET', `${base}/rebateMerAccountOrder/queryOrderDetail`, params).then(res => res.data); +} + + +////////活动///// +//添加活动 +export const addActivity = params => { + return POST('POST', `${base}/rebateActivity/addActivity`, params).then(res => res.data); +} + +//修改活动 +export const updateActivity = params => { + return POST('POST', `${base}/rebateActivity/updateActivity`, params).then(res => res.data); +} + +//开启活动 +export const openActivity = params => { + return POST('POST', `${base}/rebateActivity/openActivity`, params).then(res => res.data); +} + +//关闭活动 +export const closeActivity = params => { + return POST('POST', `${base}/rebateActivity/closeActivity`, params).then(res => res.data); +} + +//调整、修改活动结束时间 +export const updateActivityEndTime = params => { + return POST('POST', `${base}/rebateActivity/updateActivityEndTime`, params).then(res => res.data); } +//查询活动详情 +export const getActivityDetail = params => { + return POST('GET', `${base}/rebateActivity/getActivityDetail`, params).then(res => res.data); +} +//活动列表 +export const getActivityList = params => { + return POST('GET', `${base}/rebateActivity/getActivityList`, params).then(res => res.data); +} +//充值活动金额 +export const recharge = params => { + return POST('POST', `${base}/rebateActivityAccount/recharge`, params).then(res => res.data); +} +//回收活动余额 +export const recover = params => { + return POST('POST', `${base}/rebateActivityAccount/recover`, params).then(res => res.data); +} - +//查询活动余额 +export const getActivityAccount = params => { + return POST('GET', `${base}/rebateActivityAccount/getActivityAccount`, params).then(res => res.data); +} diff --git a/pages.json b/pages.json index 761ea0a..6ed0c08 100644 --- a/pages.json +++ b/pages.json @@ -28,7 +28,7 @@ "style": { "navigationBarTextStyle": "white", "navigationBarTitleText": "设备申请列表", - "enablePullDownRefresh": false, + "enablePullDownRefresh": false, "onReachBottomDistance": 50, "app-plus": { "titleNView": false, //禁用原生导航栏 @@ -41,7 +41,7 @@ "style": { "navigationBarTextStyle": "white", "navigationBarTitleText": "订单详情", - "enablePullDownRefresh": false, + "enablePullDownRefresh": false, "onReachBottomDistance": 50, "app-plus": { "titleNView": false, //禁用原生导航栏 @@ -54,7 +54,7 @@ "style": { "navigationBarTextStyle": "white", "navigationBarTitleText": "我的设备", - "enablePullDownRefresh": false, + "enablePullDownRefresh": false, "onReachBottomDistance": 50, "app-plus": { "titleNView": false, //禁用原生导航栏 @@ -286,7 +286,7 @@ "style": { "navigationBarTitleText": "设备订单", "navigationBarTextStyle": "white", - "enablePullDownRefresh": false, + "enablePullDownRefresh": false, "onReachBottomDistance": 50, "app-plus": { "titleNView": false, //禁用原生导航栏 @@ -299,7 +299,7 @@ "style": { "navigationBarTitleText": "选择支行", "navigationBarTextStyle": "white", - "enablePullDownRefresh": false, + "enablePullDownRefresh": false, "onReachBottomDistance": 50, "app-plus": { "titleNView": false, //禁用原生导航栏 @@ -312,7 +312,7 @@ "style": { "navigationBarTitleText": "开通分账", "navigationBarTextStyle": "white", - "enablePullDownRefresh": false, + "enablePullDownRefresh": false, "onReachBottomDistance": 50, "app-plus": { "titleNView": false, //禁用原生导航栏 @@ -325,7 +325,7 @@ "style": { "navigationBarTitleText": "绑定接收方", "navigationBarTextStyle": "white", - "enablePullDownRefresh": false, + "enablePullDownRefresh": false, "onReachBottomDistance": 50, "app-plus": { "titleNView": false, //禁用原生导航栏 @@ -338,7 +338,7 @@ "style": { "navigationBarTitleText": "绑定分账接收方", "navigationBarTextStyle": "white", - "enablePullDownRefresh": false, + "enablePullDownRefresh": false, "onReachBottomDistance": 50, "app-plus": { "titleNView": false, //禁用原生导航栏 @@ -351,7 +351,7 @@ "style": { "navigationBarTitleText": "接收方列表", "navigationBarTextStyle": "white", - "enablePullDownRefresh": false, + "enablePullDownRefresh": false, "onReachBottomDistance": 50, "app-plus": { "titleNView": false, //禁用原生导航栏 @@ -364,7 +364,7 @@ "style": { "navigationBarTitleText": "选择地址", "navigationBarTextStyle": "white", - "enablePullDownRefresh": false, + "enablePullDownRefresh": false, "onReachBottomDistance": 50, "app-plus": { "titleNView": false, //禁用原生导航栏 @@ -377,7 +377,7 @@ "style": { "navigationBarTitleText": "修改结算信息", "navigationBarTextStyle": "white", - "enablePullDownRefresh": false, + "enablePullDownRefresh": false, "onReachBottomDistance": 50, "app-plus": { "titleNView": false, //禁用原生导航栏 @@ -390,7 +390,7 @@ "style": { "navigationBarTitleText": "结算信息", "navigationBarTextStyle": "white", - "enablePullDownRefresh": false, + "enablePullDownRefresh": false, "onReachBottomDistance": 50, "app-plus": { "titleNView": false, //禁用原生导航栏 @@ -403,7 +403,7 @@ "style": { "navigationBarTitleText": "结算详情", "navigationBarTextStyle": "white", - "enablePullDownRefresh": false, + "enablePullDownRefresh": false, "onReachBottomDistance": 50, "app-plus": { "titleNView": false, //禁用原生导航栏 @@ -416,7 +416,7 @@ "style": { "navigationBarTitleText": "分配桌码", "navigationBarTextStyle": "white", - "enablePullDownRefresh": false, + "enablePullDownRefresh": false, "onReachBottomDistance": 50, "app-plus": { "titleNView": false, //禁用原生导航栏 @@ -429,7 +429,7 @@ "style": { "navigationBarTitleText": "权益活动", "navigationBarTextStyle": "white", - "enablePullDownRefresh": false, + "enablePullDownRefresh": false, "onReachBottomDistance": 50, "app-plus": { "titleNView": false, //禁用原生导航栏 @@ -442,7 +442,150 @@ "style": { "navigationBarTitleText": "活动详情", "navigationBarTextStyle": "white", - "enablePullDownRefresh": false, + "enablePullDownRefresh": false, + "onReachBottomDistance": 50, + "app-plus": { + "titleNView": false, //禁用原生导航栏 + "softinputNavBar": "none" + } + } + + }, { + "path": "pages/index/equity-activity-review/equity-activity-review", + "style": { + "navigationBarTitleText": "活动审核", + "navigationBarTextStyle": "white", + "enablePullDownRefresh": false, + "onReachBottomDistance": 50, + "app-plus": { + "titleNView": false, //禁用原生导航栏 + "softinputNavBar": "none" + } + } + + }, { + "path": "pages/index/order-list-details/order-list-details", + "style": { + "navigationBarTitleText": "订单详情", + "navigationBarTextStyle": "white", + "enablePullDownRefresh": false, + "onReachBottomDistance": 50, + "app-plus": { + "titleNView": false, //禁用原生导航栏 + "softinputNavBar": "none" + } + } + + }, { + "path": "pages/index/normal-Merchant/normal-Merchant", + "style": { + "navigationBarTitleText": "商户", + "navigationBarTextStyle": "white", + "enablePullDownRefresh": false, + "onReachBottomDistance": 50, + "app-plus": { + "titleNView": false, //禁用原生导航栏 + "softinputNavBar": "none" + } + } + + }, { + "path": "pages/index/modifyRate/modifyRate", + "style": { + "navigationBarTitleText": "修改费率", + "navigationBarTextStyle": "white", + "enablePullDownRefresh": false, + "onReachBottomDistance": 50, + "app-plus": { + "titleNView": false, //禁用原生导航栏 + "softinputNavBar": "none" + } + } + + }, { + "path": "pages/index/rateReview/rateReview", + "style": { + "navigationBarTitleText": "审核费率", + "navigationBarTextStyle": "white", + "enablePullDownRefresh": false, + "onReachBottomDistance": 50, + "app-plus": { + "titleNView": false, //禁用原生导航栏 + "softinputNavBar": "none" + } + } + + }, { + "path": "pages/index/activity_Funds/activity_Funds", + "style": { + "navigationBarTitleText": "活动金", + "navigationBarTextStyle": "white", + "enablePullDownRefresh": false, + "onReachBottomDistance": 50, + "app-plus": { + "titleNView": false, //禁用原生导航栏 + "softinputNavBar": "none" + } + } + + }, { + "path": "pages/index/activity_Funds_activityList/activity_Funds_activityList", + "style": { + "navigationBarTitleText": "活动列表", + "navigationBarTextStyle": "white", + "enablePullDownRefresh": false, + "onReachBottomDistance": 50, + "app-plus": { + "titleNView": false, //禁用原生导航栏 + "softinputNavBar": "none" + } + } + + }, { + "path": "pages/index/activity_Funds_transaction_records/activity_Funds_transaction_records", + "style": { + "navigationBarTitleText": "交易记录", + "navigationBarTextStyle": "white", + "enablePullDownRefresh": false, + "onReachBottomDistance": 50, + "app-plus": { + "titleNView": false, //禁用原生导航栏 + "softinputNavBar": "none" + } + } + + }, { + "path": "pages/index/activity_Funds_recharge_record/activity_Funds_recharge_record", + "style": { + "navigationBarTitleText": "充值记录", + "navigationBarTextStyle": "white", + "enablePullDownRefresh": false, + "onReachBottomDistance": 50, + "app-plus": { + "titleNView": false, //禁用原生导航栏 + "softinputNavBar": "none" + } + } + + }, { + "path": "pages/index/activity_transaction_details/activity_transaction_details", + "style": { + "navigationBarTitleText": "交易详情", + "navigationBarTextStyle": "white", + "enablePullDownRefresh": false, + "onReachBottomDistance": 50, + "app-plus": { + "titleNView": false, //禁用原生导航栏 + "softinputNavBar": "none" + } + } + + }, { + "path": "pages/index/activity_recharge_details/activity_recharge_details", + "style": { + "navigationBarTitleText": "充值详情", + "navigationBarTextStyle": "white", + "enablePullDownRefresh": false, "onReachBottomDistance": 50, "app-plus": { "titleNView": false, //禁用原生导航栏 @@ -452,28 +595,13 @@ } ,{ - "path" : "pages/index/equity-activity-review/equity-activity-review", - "style" : - { - "navigationBarTitleText": "活动审核", - "navigationBarTextStyle": "white", - "enablePullDownRefresh": false, - "onReachBottomDistance": 50, - "app-plus": { - "titleNView": false, //禁用原生导航栏 - "softinputNavBar": "none" - } - } - - } - ,{ - "path" : "pages/index/order-list-details/order-list-details", + "path" : "pages/index/recharge_balance/recharge_balance", "style" : { - "navigationBarTitleText": "订单详情", + "navigationBarTitleText": "活动金充值", "navigationBarTextStyle": "white", "enablePullDownRefresh": false, - "onReachBottomDistance": 50, + "onReachBottomDistance": 50, "app-plus": { "titleNView": false, //禁用原生导航栏 "softinputNavBar": "none" @@ -482,10 +610,10 @@ } ,{ - "path" : "pages/index/normal-Merchant/normal-Merchant", + "path" : "pages/index/activity_details/activity_details", "style" : { - "navigationBarTitleText": "商户", + "navigationBarTitleText": "活动详情", "navigationBarTextStyle": "white", "enablePullDownRefresh": false, "onReachBottomDistance": 50, @@ -497,10 +625,10 @@ } ,{ - "path" : "pages/index/modifyRate/modifyRate", + "path" : "pages/index/activity_add/activity_add", "style" : { - "navigationBarTitleText": "修改费率", + "navigationBarTitleText": "添加活动", "navigationBarTextStyle": "white", "enablePullDownRefresh": false, "onReachBottomDistance": 50, @@ -511,21 +639,6 @@ } } - ,{ - "path" : "pages/index/rateReview/rateReview", - "style" : - { - "navigationBarTitleText": "审核费率", - "navigationBarTextStyle": "white", - "enablePullDownRefresh": false, - "onReachBottomDistance": 50, - "app-plus": { - "titleNView": false, //禁用原生导航栏 - "softinputNavBar": "none" - } - } - - } ], "subpackages": [{ "root": "subpackages", diff --git a/pages/index/activity_Funds/activity_Funds.vue b/pages/index/activity_Funds/activity_Funds.vue new file mode 100644 index 0000000..2baa478 --- /dev/null +++ b/pages/index/activity_Funds/activity_Funds.vue @@ -0,0 +1,156 @@ + + + + + \ No newline at end of file diff --git a/pages/index/activity_Funds_activityList/activity_Funds_activityList.vue b/pages/index/activity_Funds_activityList/activity_Funds_activityList.vue new file mode 100644 index 0000000..06278f2 --- /dev/null +++ b/pages/index/activity_Funds_activityList/activity_Funds_activityList.vue @@ -0,0 +1,407 @@ + + + + + \ No newline at end of file diff --git a/pages/index/activity_Funds_recharge_record/activity_Funds_recharge_record.vue b/pages/index/activity_Funds_recharge_record/activity_Funds_recharge_record.vue new file mode 100644 index 0000000..dd7742b --- /dev/null +++ b/pages/index/activity_Funds_recharge_record/activity_Funds_recharge_record.vue @@ -0,0 +1,139 @@ + + + + + \ No newline at end of file diff --git a/pages/index/activity_Funds_transaction_records/activity_Funds_transaction_records.vue b/pages/index/activity_Funds_transaction_records/activity_Funds_transaction_records.vue new file mode 100644 index 0000000..1e8e23a --- /dev/null +++ b/pages/index/activity_Funds_transaction_records/activity_Funds_transaction_records.vue @@ -0,0 +1,141 @@ + + + + + \ No newline at end of file diff --git a/pages/index/activity_add/activity_add.vue b/pages/index/activity_add/activity_add.vue new file mode 100644 index 0000000..536984d --- /dev/null +++ b/pages/index/activity_add/activity_add.vue @@ -0,0 +1,443 @@ + + + + + \ No newline at end of file diff --git a/pages/index/activity_details/activity_details.vue b/pages/index/activity_details/activity_details.vue new file mode 100644 index 0000000..9f54ef2 --- /dev/null +++ b/pages/index/activity_details/activity_details.vue @@ -0,0 +1,137 @@ + + + + + \ No newline at end of file diff --git a/pages/index/activity_recharge_details/activity_recharge_details.vue b/pages/index/activity_recharge_details/activity_recharge_details.vue new file mode 100644 index 0000000..c5a3771 --- /dev/null +++ b/pages/index/activity_recharge_details/activity_recharge_details.vue @@ -0,0 +1,103 @@ + + + + + + \ No newline at end of file diff --git a/pages/index/activity_transaction_details/activity_transaction_details.vue b/pages/index/activity_transaction_details/activity_transaction_details.vue new file mode 100644 index 0000000..9283bd7 --- /dev/null +++ b/pages/index/activity_transaction_details/activity_transaction_details.vue @@ -0,0 +1,91 @@ + + + + + + \ No newline at end of file diff --git a/pages/index/recharge_balance/recharge_balance.vue b/pages/index/recharge_balance/recharge_balance.vue new file mode 100644 index 0000000..d2454d2 --- /dev/null +++ b/pages/index/recharge_balance/recharge_balance.vue @@ -0,0 +1,371 @@ + + + + + \ No newline at end of file diff --git a/pages/index/salesOrderList/salesOrderList.vue b/pages/index/salesOrderList/salesOrderList.vue index 4a3d464..54b31ac 100644 --- a/pages/index/salesOrderList/salesOrderList.vue +++ b/pages/index/salesOrderList/salesOrderList.vue @@ -88,7 +88,7 @@ this.isLoadMore = true this.pageNum += 1 this.serviceList = []; - this.getDeviceList(); + this.getOrderList(); } }, onShow() { diff --git a/pages/tabBar/home/home.vue b/pages/tabBar/home/home.vue index 4cc97cd..63e097e 100644 --- a/pages/tabBar/home/home.vue +++ b/pages/tabBar/home/home.vue @@ -127,6 +127,11 @@ title: '门店管理', url: '../../index/doorManage/doorManage', img: '../../../static/img/home3.png' + }, + { + title: '活动金', + url: '../../index/activity_Funds/activity_Funds', + img: '../../../static/img/gift.png' } ] return; diff --git a/static/img/activity1.png b/static/img/activity1.png new file mode 100644 index 0000000..d74208c Binary files /dev/null and b/static/img/activity1.png differ diff --git a/static/img/gift.png b/static/img/gift.png new file mode 100644 index 0000000..e1a982a Binary files /dev/null and b/static/img/gift.png differ diff --git a/uni.scss b/uni.scss index 2f9fc01..ce284c9 100644 --- a/uni.scss +++ b/uni.scss @@ -348,6 +348,9 @@ $uni-font-size-paragraph:30upx; width: 85%; } +.width49 { + width: 49%; +} .width50 { width: 50%; @@ -467,6 +470,10 @@ $uni-font-size-paragraph:30upx; height: 120px; } +.height140{ + height: 140px; +} + .height150{ height: 150px; } diff --git a/unpackage/dist/build/h5/index.html b/unpackage/dist/build/h5/index.html index 3dc33ad..e002e31 100644 --- a/unpackage/dist/build/h5/index.html +++ b/unpackage/dist/build/h5/index.html @@ -1,2 +1,2 @@ 惠支付
\ No newline at end of file + document.write('')
\ No newline at end of file