From 87fcacf38c24176157f1047fc655d14303bf8c84 Mon Sep 17 00:00:00 2001 From: liuye Date: Sun, 23 Apr 2023 11:38:09 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E4=BB=A3=E5=85=91=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppRedemptionPoints.vue | 36 ++++++++++--------- .../fd/AppRedemptionPoints/goodsList.vue | 26 +++++++++----- .../fd/AppRedemptionPoints/myOrderList.vue | 8 +++-- .../fd/AppRedemptionPoints/placeOrder.vue | 9 +++-- .../fd/AppRedemptionPoints/productDetails.vue | 6 ++-- 5 files changed, 51 insertions(+), 34 deletions(-) diff --git a/src/project/fd/AppRedemptionPoints/AppRedemptionPoints.vue b/src/project/fd/AppRedemptionPoints/AppRedemptionPoints.vue index 16ed4eaa..d371881d 100644 --- a/src/project/fd/AppRedemptionPoints/AppRedemptionPoints.vue +++ b/src/project/fd/AppRedemptionPoints/AppRedemptionPoints.vue @@ -5,15 +5,16 @@ search-icon-color="#999" color="#666" @search="getListInit">
-
+
- 张三 + + {{item.name}}
- 积分总额：2350 - 积分余额：2350 + 积分总额：{{item.allIntegral}} + 积分余额：{{item.integral}}
-
+

帮兑换

@@ -51,19 +52,19 @@ export default { this.getList() }, getList() { - // this.$http.post(`/app/appconvenientaddressbook/list`, null, { - // params: { - // current: this.current, - // name: this.keyword - // } - // }).then(res => { - // if (res.code == 0) { - // this.list = this.current == 1 ? res.data.records : [...this.list, ...res.data.records] - // } - // }) + this.$http.post(`/app/appwechatuserqujing/listByFdAppletUserByGirdMember`, null, { + params: { + current: this.current, + con: this.keyword + } + }).then(res => { + if (res.code == 0) { + this.list = this.current == 1 ? res.data.records : [...this.list, ...res.data.records] + } + }) }, - toGoodsList() { - uni.navigateTo({url: './goodsList'}) + toGoodsList(item) { + uni.navigateTo({url: `./goodsList?openId=${item.openId}&userId=${item.id}&integralUserId=${item.integralUserId}`}) } }, onReachBottom() { @@ -100,6 +101,7 @@ export default { width: 40px; height: 40px; margin-right: 12px; + vertical-align: bottom; } } .total { diff --git a/src/project/fd/AppRedemptionPoints/goodsList.vue b/src/project/fd/AppRedemptionPoints/goodsList.vue index a3fc6b91..5ed180a3 100644 --- a/src/project/fd/AppRedemptionPoints/goodsList.vue +++ b/src/project/fd/AppRedemptionPoints/goodsList.vue @@ -6,7 +6,7 @@

积分余额

{{total}}

-
我的订单
+
ta的订单
{ this.getList() @@ -117,7 +123,7 @@ export default { }, methods: { getTotal() { - this.$http.post(`/app/appintegraluser/integralUserInfoFD`).then(res => { + this.$http.post(`/app/appintegraluser/integralUserInfoFD?integralUserId=${this.integralUserId}`).then(res => { if (res?.data) { this.total = res.data.integral || 0 } @@ -131,13 +137,15 @@ export default { this.getList() }, getList() { - this.$http.post(`/app/appintegralsupermarketshop/goodsListXCX`, null, { + this.$http.post(`/app/appintegralsupermarketshop/goodsListWXCP`, null, { params: { goodsType: this.currentTabs, //商品类型，0：全部、1：免费兑、2：京东低价商品，默认0 orderType: this.currentType == 0 ? 1 : 0, //排序类型，0：积分升序、1：上架时间倒序，默认0 filterIntegral: this.currentType == 2 ? true : false, //过滤我可兑换的，默认false integralRange: this.currentType == 1 ? this.currentPoint : '', //积分区间类型，0：全部、1：50分以下、2:100分以下、3：200分以下、4：5000分以下默认0 - current: this.current + current: this.current, + userId: this.userId, + openId: this.openId } }).then(res => { if (res.code === 0) { @@ -165,14 +173,14 @@ export default { this.getListInit() }, toProductDetail(item) { - uni.navigateTo({url: `./productDetails?shopGoodsId=${item.shopGoodsId}&total=${this.total}`}) + uni.navigateTo({url: `./productDetails?shopGoodsId=${item.shopGoodsId}&total=${this.total}&userId=${this.userId}`}) }, toMyOrder() { - uni.navigateTo({url: './myOrderList'}) + uni.navigateTo({url: `./myOrderList?userId=${this.userId}`}) }, toOrder(item) { if(this.total >= item.integralPrice && item.stock > 0) { - uni.navigateTo({url: `./placeOrder?shopGoodsId=${item.shopGoodsId}&total=${this.total}&backLevel=3`}) + uni.navigateTo({url: `./placeOrder?shopGoodsId=${item.shopGoodsId}&total=${this.total}&backLevel=3&userId=${this.userId}`}) } }, }, diff --git a/src/project/fd/AppRedemptionPoints/myOrderList.vue b/src/project/fd/AppRedemptionPoints/myOrderList.vue index 995c6878..6001138b 100644 --- a/src/project/fd/AppRedemptionPoints/myOrderList.vue +++ b/src/project/fd/AppRedemptionPoints/myOrderList.vue @@ -56,13 +56,15 @@ export default { 'background': '#2D7DFF' }, list: [], - current: 1 + current: 1, + userId: '' } }, computed: { ...mapState(['user']), }, - onLoad() { + onLoad(option) { + this.userId = option.userId this.$dict.load(['integralSGOStatus', 'integralSGType']).then(() => { this.getList() }) @@ -81,7 +83,7 @@ export default { params: { current: this.current, status: this.currentTabs == 0 ? '' : this.currentTabs - 1, - createUserId: this.user.id + createUserId: this.userId } }).then(res => { if (res.code === 0) { diff --git a/src/project/fd/AppRedemptionPoints/placeOrder.vue b/src/project/fd/AppRedemptionPoints/placeOrder.vue index 52572bed..2b898415 100644 --- a/src/project/fd/AppRedemptionPoints/placeOrder.vue +++ b/src/project/fd/AppRedemptionPoints/placeOrder.vue @@ -62,13 +62,15 @@ export default { total: 0, goodsInfo: {}, goodsNum: 1, - backLevel: 0 + backLevel: 0, + userId: '' } }, computed: { ...mapState(['user']), }, onLoad(option) { + this.userId = option.userId this.shopGoodsId = option.shopGoodsId this.total = option.total this.backLevel = option.backLevel @@ -94,11 +96,12 @@ export default { this.show = false }, confirmOrder() { - this.$http.post(`/app/appintegralsupermarketorder/add`, { + this.$http.post(`/app/appintegralsupermarketorder/addWXCP`, { shopId: this.goodsInfo.shopId, goodsId: this.goodsInfo.id, remarks: this.value, - quantity: this.goodsNum + quantity: this.goodsNum, + createUserId: this.userId }).then(res => { if (res.code === 0) { this.toSuccess() diff --git a/src/project/fd/AppRedemptionPoints/productDetails.vue b/src/project/fd/AppRedemptionPoints/productDetails.vue index 35c1a67d..a4bb064e 100644 --- a/src/project/fd/AppRedemptionPoints/productDetails.vue +++ b/src/project/fd/AppRedemptionPoints/productDetails.vue @@ -33,7 +33,8 @@ export default { return { shopGoodsId: '', goodsInfo: {}, - total: 0 + total: 0, + userId: '' } }, computed: { @@ -41,6 +42,7 @@ export default { }, onLoad(option) { this.shopGoodsId = option.shopGoodsId + this.userId = option.userId this.total = option.total this.$dict.load(['integralSGType']).then(() => { this.getDetail() @@ -59,7 +61,7 @@ export default { }, toOrder() { if(this.total >= this.goodsInfo.integralPrice && this.goodsInfo.stock > 0 && this.goodsInfo.status == 1) { - uni.navigateTo({url: `./placeOrder?shopGoodsId=${this.goodsInfo.shopGoodsId}&total=${this.total}&backLevel=4`}) + uni.navigateTo({url: `./placeOrder?shopGoodsId=${this.goodsInfo.shopGoodsId}&total=${this.total}&backLevel=4&userId=${this.userId}`}) } }, },