diff --git a/bundle_b/pages/local_shop/components/shop-list.vue b/bundle_b/pages/local_shop/components/shop-list.vue index 3e720fb..63eac08 100644 --- a/bundle_b/pages/local_shop/components/shop-list.vue +++ b/bundle_b/pages/local_shop/components/shop-list.vue @@ -64,11 +64,15 @@ mixins: [MescrollMixin, MescrollMoreItemMixin], data() { return { + downOption: { + auto: false + }, upOption: { - noMoreSize: 4, //如果列表已无数据,可设置列表的总数量要大于半页才显示无更多数据;避免列表数据过少(比如只有一条数据),显示无更多数据会不好看; 默认5 + auto: false, + noMoreSize: 4, empty: { - icon: 'https://zjeloong.oss-cn-hangzhou.aliyuncs.com/uniapp/order_null.png', - tip: '暂无商品', // 提示 + icon: `${this.$aliOSS}uniapp/order_null.png`, + tip: '暂无订单~', fixed: true } }, @@ -88,14 +92,14 @@ type: Number } }, - created() { - uni.$on("refresh_local_shop_list", () => { - this.refresh() - }) - }, - destroyed() { - uni.$off("refresh_local_shop_list") - }, + // created() { + // uni.$on("refresh_local_shop_list", () => { + // this.refresh() + // }) + // }, + // destroyed() { + // uni.$off("refresh_local_shop_list") + // }, methods: { // 排序 sortChange(i) { diff --git a/bundle_b/pages/local_shop/local_pay.vue b/bundle_b/pages/local_shop/local_pay.vue index 9afd468..a75bef5 100644 --- a/bundle_b/pages/local_shop/local_pay.vue +++ b/bundle_b/pages/local_shop/local_pay.vue @@ -500,7 +500,7 @@ this.successPopup = !this.successPopup setTimeout(() => { uni.navigateTo({ - url: '/bundle_b/pages/subsidy_shop/subsidy_shop' + url: '/bundle_b/pages/subsidy_shop/subsidy_shop?user_id=' + this.user_id }) }, 500) }, diff --git a/bundle_b/pages/subsidy_shop/components/subsidy-list.vue b/bundle_b/pages/subsidy_shop/components/subsidy-list.vue index 8ec923d..fd6b65f 100644 --- a/bundle_b/pages/subsidy_shop/components/subsidy-list.vue +++ b/bundle_b/pages/subsidy_shop/components/subsidy-list.vue @@ -57,7 +57,11 @@ }, current: { type: Number - } + }, + userId: { + type: Number, + default: 0 + }, }, data() { return { @@ -106,7 +110,8 @@ page_size: pageSize, page_no: pageNum, type: orderType, - state: this.index + state: this.index, + user_id: this.userId }).then(({ data }) => { diff --git a/bundle_b/pages/subsidy_shop/subsidy_shop.vue b/bundle_b/pages/subsidy_shop/subsidy_shop.vue index 67f094f..254b22b 100644 --- a/bundle_b/pages/subsidy_shop/subsidy_shop.vue +++ b/bundle_b/pages/subsidy_shop/subsidy_shop.vue @@ -89,7 +89,7 @@ - + @@ -162,10 +162,15 @@ payInfo: '', payMoney: '', isWithdrawl: false, - withdrawlBillionId: 0 + withdrawlBillionId: 0, + userId: 0 }; }, onLoad(options) { + if(options?.user_id) { + this.userId = options.user_id + } + this.changeShow(0); this.getBillionsWithdrawConfigFun(); uni.$on('refreshBillionsWithdrawConfigFun', this.getBillionsWithdrawConfigFun) @@ -332,13 +337,15 @@ }) data.money = data.withdrawl_money + + let result = '' if (this.isWithdrawl) { - const result = await advance({ + result = await advance({ billions_id: this.withdrawlBillionId, money: data.money }); } else { - const result = await applyBillionsWithdrawl(data); + result = await applyBillionsWithdrawl(data); } if (result.code == 1) { diff --git a/config/app.js b/config/app.js index c96ed87..ff61e54 100644 --- a/config/app.js +++ b/config/app.js @@ -17,7 +17,7 @@ const IS_H5 = false /** S API BaseURL **/ const baseURLMap = { // 开发环境 - development: 'https://dlh.hainings.com', + development: 'https://dlh.stnav.com', // 生产环境 production: IS_H5 ? location.origin : 'https://dlh.hainings.com', //app https://dlh.zjeloong.com diff --git a/pages.json b/pages.json index 83e9227..d3238b6 100644 --- a/pages.json +++ b/pages.json @@ -1010,7 +1010,7 @@ "navigationBarTitleText": "我的返补" }, "meta": { - "auth": true + "auth": false } }, { diff --git a/pages/index/index.vue b/pages/index/index.vue index 82e67d8..b43604c 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -316,7 +316,7 @@ } .capsule-tips::after { content: ''; - border-bottom: 14rpx solid rgba(0, 0, 0, 0.7); + border-bottom: 14rpx solid rgba(0, 0, 0, .7); border-right: 14rpx solid transparent; border-left: 14rpx solid transparent; position: absolute; @@ -327,7 +327,7 @@ .cate-btn { padding: 12rpx 16rpx 12rpx 20rpx; border-radius: 60rpx 0 0 60rpx; - background-color: rgba(256, 256, 256, .4); + background-color: rgba(0, 0, 0, .4); } }