diff --git a/src/api/modules/coupon.js b/src/api/modules/coupon.js index a6dd50a..4e399d4 100644 --- a/src/api/modules/coupon.js +++ b/src/api/modules/coupon.js @@ -13,4 +13,16 @@ export const coupon = { addCoupon: (data) => { return $http.post(`/merchant-api/coupon/save`, data); }, + //新增优惠卷数量 + addNumCoupon: (data) => { + return $http.post(`/merchant-api/coupon/addNum`, data); + }, + //优惠卷状态 + couponStatus: (data) => { + return $http.post(`/merchant-api/coupon/update/status`, data); + }, + //删除优惠卷 + deleteCoupon: (data) => { + return $http.post(`/merchant-api/coupon/batch/delete`, data); + }, }; diff --git a/src/router/index.js b/src/router/index.js index 038d70c..2eea2dd 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -140,7 +140,7 @@ router.beforeEach((to, from, next) => { isMerchant: true, marketList: [], storeList: [], - marketId: "", + marketId: data.data.marketId, shopId: data.data.shopId, }); } else { diff --git a/src/views/modules/coupon/index.vue b/src/views/modules/coupon/index.vue index f552508..35a7036 100644 --- a/src/views/modules/coupon/index.vue +++ b/src/views/modules/coupon/index.vue @@ -11,27 +11,37 @@ :enableAutoQuery="false" > @@ -87,6 +97,13 @@ @queryList="$refs.oTable.reload()" ref="addOrUpdate" > + + + + @@ -94,16 +111,20 @@ + \ No newline at end of file diff --git a/src/views/modules/coupon/popup/new-powder.vue b/src/views/modules/coupon/popup/new-powder.vue new file mode 100644 index 0000000..e3867f6 --- /dev/null +++ b/src/views/modules/coupon/popup/new-powder.vue @@ -0,0 +1,307 @@ + + + \ No newline at end of file diff --git a/src/views/modules/wallet/index.vue b/src/views/modules/wallet/index.vue index a1d6f98..e4b5171 100644 --- a/src/views/modules/wallet/index.vue +++ b/src/views/modules/wallet/index.vue @@ -93,6 +93,7 @@ - 查询
- + - + - 查询 @@ -217,12 +227,13 @@
钱包账单
-
+
+ +
@@ -255,6 +278,7 @@ export default { components: { withdrawal }, data() { return { + value2: [], value1: [], userInfo: {}, tableData: [], @@ -263,18 +287,24 @@ export default { query: { pageNumber: 1, pageSize: 10, - cashOutStatus: "", }, formInline: { cashOutStatus: "", startCashOutTime: "", endCashOutTime: "", }, + form: { + pageNumber: 1, + pageSize: 10, + }, + formTimeData: {}, total: 0, + totalTwo: 0, }; }, created() { this.init(); + this.getWithdrawalRecord(); }, methods: { init() { @@ -282,28 +312,48 @@ export default { this.$api.wallet.myWallet().then((res) => { this.userInfo = res.data.data; }); - this.$api.wallet.WithdrawalRecord(this.query).then((res) => { - this.tableData = res.data.data.data; - }); - this.$api.wallet.totalAmount({ amountChangeType: "" }).then((res) => { - this.TotalData = res.data.data; - }); - this.$api.wallet.getBankInfo().then((res) => { - console.log(res, "bull"); - this.billList = res.data.data.data; - // this.total = res.data.data; - }); + this.$api.wallet + .totalAmount({ amountChangeType: "", ...this.formTimeData }) + .then((res) => { + this.TotalData = res.data.data; + }); + this.$api.wallet + .getBankInfo({ ...this.form, ...this.formTimeData }) + .then((res) => { + console.log(res, "bull"); + this.billList = res.data.data.data; + this.totalTwo = Number(res.data.data.total); + }); + }, + getWithdrawalRecord() { + this.$api.wallet + .WithdrawalRecord({ ...this.query, ...this.formInline }) + .then((res) => { + this.tableData = res.data.data.data; + this.total = Number(res.data.data.total); + }); }, handleSizeChange(val) { this.query.pageSize = val; - this.init(); + this.getWithdrawalRecord(); }, handleCurrentChange(val) { this.query.pageNumber = val; + this.getWithdrawalRecord(); + }, + handleSizeChangeTwo(val) { + this.form.pageSize = val; this.init(); }, - queryList() {}, - Reset() {}, + handleCurrentChangeTwo(val) { + this.form.pageNumber = val; + this.init(); + }, + Reset() { + this.value1 = []; + this.formInline = {}; + this.getWithdrawalRecord(); + }, addWithdrawal() { this.$api.mer_admin .bankCardPage({ @@ -340,15 +390,24 @@ export default { return "提现成功"; } }, - changeTime(row) { - if (row) { - this.formInline.startCashOutTime = row[0]; - this.formInline.endCashOutTime = row[1]; + changeTime(e) { + if (e) { + this.formInline.startCashOutTime = e[0]; + this.formInline.endCashOutTime = e[1]; } else { this.formInline.startCashOutTime = ""; this.formInline.endCashOutTime = ""; } }, + changeTimeTwo(e) { + if (e) { + this.formTimeData.startBillOrderTime = e[0]; + this.formTimeData.endBillOrderTime = e[1]; + } else { + this.formTimeData.startBillOrderTime = ""; + this.formTimeData.endBillOrderTime = ""; + } + }, getBillStatus(row) { if (row == 1) { return "待同步";