diff --git a/api/order.js b/api/order.js index 2ec24f4..f36867e 100644 --- a/api/order.js +++ b/api/order.js @@ -88,3 +88,17 @@ export function getExpress(params) { params }); } + +// 本地商家账单 +export function getLocalOrderList(data) { + return request.get('localStore/getLocalOrderList', { + params: data + }) +} + +// 自己-本地生活账单 +export function getLocalUserOrderList(data) { + return request.get('localStore/getLocalUserOrderList', { + params: data + }) +} \ No newline at end of file diff --git a/api/store.js b/api/store.js index fdb4046..87dc908 100644 --- a/api/store.js +++ b/api/store.js @@ -219,6 +219,10 @@ export function getNewGoods(params) { return request.get('goods/newGoods', {params}); } -export function getLocalAllStore(params) { - return request.post("LocalStore/getLocalAllStoreList", params) +export function getLocalList(params) { + return request.post("LocalStore/getLocalList", params) +} + +export function getLocalMenu(params) { + return request.post("index/getLocalMenu", params) } diff --git a/api/user.js b/api/user.js index 23abd51..a9d549e 100644 --- a/api/user.js +++ b/api/user.js @@ -365,3 +365,7 @@ export function localShopLogin(data) { export function makeMyWxImage() { return request.get('procurement/makeMyWxImage') } + +export function localBalance(data) { + return request.post('pay/localBalance', data) +} diff --git a/bundle_b/pages/subsidy_shop/components/subsidy-list.vue b/bundle_b/pages/subsidy_shop/components/subsidy-list.vue index 3b7f8bc..f69bd5a 100644 --- a/bundle_b/pages/subsidy_shop/components/subsidy-list.vue +++ b/bundle_b/pages/subsidy_shop/components/subsidy-list.vue @@ -4,17 +4,18 @@ :down="downOption" :up="upOption"> - + {{queuesNumber}} 正在排队 - - ¥{{queuesMoney}} + + ¥{{queuesMoney}} 当前已返补 + ¥{{queuesMoney}} - + ¥{{highSubsidy}} 商家最高补贴 @@ -74,7 +75,8 @@ highSubsidy: 0, getSubsidy: 0, queuesNumber: 0, - queuesMoney: 0 + queuesMoney: 0, + showQueuesMoney: false }; }, created() { @@ -90,6 +92,8 @@ this.mescroll.resetUpScroll() }, async upCallback(page) { + this.showQueuesMoney = false + let pageNum = page.num; // 页码, 默认从1开始 let pageSize = page.size; // 页长, 默认每页10条 let { @@ -165,4 +169,54 @@ .subsidy-shop-block { margin: 20rpx; } + + .subsidy-child-item { + position: relative; + + .exchang-tips { + width: auto; + color: #FFFFFF; + padding: 6rpx 18rpx; + border-radius: 14rpx; + background: rgba(0, 0, 0, 0.7); + position: relative; + position: absolute; + z-index: 9999; + top: -50rpx; + left: 50%; + transform: translateX(-50%); + font-size: 24rpx; + } + + .exchang-tips::after { + content: ''; + border-top: 14rpx solid rgba(0, 0, 0, 0.7); + border-right: 14rpx solid transparent; + border-left: 14rpx solid transparent; + position: absolute; + top: 100%; + left: 50%; + transform: translateX(-50%); + border-bottom-width: 7px; + border-bottom-style: solid; + border-bottom-color: transparent; + border-right-width: 7px; + border-right-style: solid; + border-right-color: transparent; + border-left-width: 7px; + border-left-style: solid; + border-left-color: transparent; + border-top-width: 7px; + border-top-style: solid; + border-top-color: rgba(0, 0, 0, 0.7); + } + } + + .w-33 { + width: 33.33%; + } + + .w-50 { + width: 50%; + } \ No newline at end of file diff --git a/bundle_b/pages/subsidy_shop/subsidy_shop.vue b/bundle_b/pages/subsidy_shop/subsidy_shop.vue index 3d10e75..6673c06 100644 --- a/bundle_b/pages/subsidy_shop/subsidy_shop.vue +++ b/bundle_b/pages/subsidy_shop/subsidy_shop.vue @@ -191,7 +191,7 @@ } if (this.currentTab == 0){ // 充值 - if (!data.recharge_money) { + if (!Number(data.recharge_money)) { this.$toast({ title: '请输入充值金额' }); @@ -205,20 +205,20 @@ return; } - if (data.recharge_money < this.widthDrawConfig.min_recharge) { + if (Number(data.recharge_money) < Number(this.widthDrawConfig.min_recharge)) { this.$toast({ title: '最小充值金额为¥' + this.widthDrawConfig.min_recharge }); return; } - if (data.recharge_money > this.widthDrawConfig.able_withdraw) { + if (Number(data.recharge_money) > Number(this.widthDrawConfig.able_withdraw)) { this.$toast({ title: '可充值金额不足' }); return; } - + uni.showLoading({ title: '加载中...', mask: true diff --git a/pages.json b/pages.json index e325bd9..35039c4 100644 --- a/pages.json +++ b/pages.json @@ -1178,6 +1178,15 @@ "auth": true } }, + { + "path": "pages/local_shop/local_bill", + "style": { + "navigationBarTitleText": "商家账单" + }, + "meta": { + "auth": true + } + }, { "path": "pages/subsidy_withdrawal/index", "style": { @@ -1213,6 +1222,42 @@ "meta": { "auth": false } + }, + { + "path": "pages/local_shop_category/index", + "style": { + "navigationBarTitleText": "企业服务" + }, + "meta": { + "auth": true + } + }, + { + "path": "pages/local_shop_pay/order", + "style": { + "navigationBarTitleText": "支付账单" + }, + "meta": { + "auth": true + } + }, + { + "path": "pages/local_shop_pay/detail", + "style": { + "navigationBarTitleText": "订单详情" + }, + "meta": { + "auth": true + } + }, + { + "path": "pages/local_shop/local_shop_detail", + "style": { + "navigationBarTitleText": "店铺详情" + }, + "meta": { + "auth": true + } } ] }