diff --git a/fuintAdmin/src/views/member/userInfoOrder/balanceRecord.vue b/fuintAdmin/src/views/member/userInfoOrder/balanceRecord.vue index 53538f8e6..ba920080c 100644 --- a/fuintAdmin/src/views/member/userInfoOrder/balanceRecord.vue +++ b/fuintAdmin/src/views/member/userInfoOrder/balanceRecord.vue @@ -5,49 +5,70 @@ 升数卡记录
- - - - - - - - + + + + + - - - + + + + + + + + + + + + +
- - - - - - - - + + + + + + + + + +
+ + \ No newline at end of file diff --git a/gasStation-uni/pagesHome/PointsMall/PointsMall.vue b/gasStation-uni/pagesHome/PointsMall/PointsMall.vue index c71d2c8db..30b059c5f 100644 --- a/gasStation-uni/pagesHome/PointsMall/PointsMall.vue +++ b/gasStation-uni/pagesHome/PointsMall/PointsMall.vue @@ -9,13 +9,19 @@ - - {{myPoints}} - - - {{storeName}} - + + + {{myPoints}} 积分 + + + {{storeName}} + + + + + + @@ -44,49 +50,51 @@ 我的订单 - - - - - 全部 - - - - {{item.categoryName}} - - - - - - - + + + + 全部 + - - {{item.giftName}} + + {{item.categoryName}} + - - - - - - - {{item.exchangePoints}} - + - ￥{{item.exchangeAmount}} + + + + + + + + {{item.giftName}} + + + + + + + + {{item.exchangePoints}} + + + ￥{{item.exchangeAmount}} + + + + 库存:{{item.remainingInventory === -1?"不限":item.remainingInventory}} - 库存:{{item.remainingInventory === -1?"不限":item.remainingInventory}} + + 立即兑换 - - 立即兑换 - + @@ -247,22 +255,20 @@ \ No newline at end of file diff --git a/gasStation-uni/pagesHome/myPointsOrder/myPointsOrder.vue b/gasStation-uni/pagesHome/myPointsOrder/myPointsOrder.vue index 0bfc5966d..3238d952e 100644 --- a/gasStation-uni/pagesHome/myPointsOrder/myPointsOrder.vue +++ b/gasStation-uni/pagesHome/myPointsOrder/myPointsOrder.vue @@ -15,7 +15,7 @@ - + @@ -24,7 +24,8 @@ {{item.giftName}} {{item.createTime}} - {{item.amount?"￥"+item.amount:''}} + + {{item.amount?"￥"+item.amount:''}} {{item.amount && item.integral ? '+':''}} {{item.integral?item.integral+'积分':''}} @@ -33,17 +34,17 @@ - + 确认收货 - + 点击退款 - + 去付款 @@ -103,9 +104,15 @@ methods: { getindex(index) { this.actinput = index - console.log("index", index) if (index != 0) { this.query.orderStatus = index + // if (index == 1) { + // this.query.orderStatus = '已发货' + + // }else { + // this.query.orderStatus = this.taplist[index].title + + // } } else { this.query.orderStatus = '' } @@ -129,6 +136,40 @@ } }) }, + + // 订单详情 + orderDetails(data) { + console.log("dara", data) + uni.$on('pointsGoodsDetailsUn', function() { + uni.$emit('pointsGoodsDetails', data) + + }) + uni.navigateTo({ + url: '/pagesHome/PointsGoodsDetails/PointsGoodsDetails', + }) + }, + confirmTheReceipt(data) { + let params = { + id: data, + orderStatus: '已完成' + } + request({ + url: 'business/integral/integralOrders/editUni', + method: 'put', + data: params + }).then((res) => { + if (res.code == 200) { + this.orderList = res.data.records + this.getIntegralOrderList() + } + }) + }, + refund(data) { + + }, + payment(data) { + + }, } } diff --git a/gasStation-uni/pagesHome/order/order.vue b/gasStation-uni/pagesHome/order/order.vue index b131e41bd..a132152a0 100644 --- a/gasStation-uni/pagesHome/order/order.vue +++ b/gasStation-uni/pagesHome/order/order.vue @@ -157,6 +157,8 @@ } }) uni.$emit('un') + // 根据storeId查询店铺信息 + this.getInfoByStoreId() }, onShow() { @@ -199,7 +201,9 @@ // remaining_inventory console.log('当前值为: ' + e.value) console.log('当前值为123: ' + this.goodsInfo.remainingInventory) - if (e.value >= this.goodsInfo.remainingInventory) { + + //判断库存 + if (e.value >= this.goodsInfo.remainingInventory && this.goodsInfo.remainingInventory != -1) { // -1为无限库存 e.value = this.goodsInfo.remainingInventory this.value = this.goodsInfo.remainingInventory this.flag = true @@ -345,6 +349,7 @@ }, // 根据storeId查询店铺信息 getInfoByStoreId() { + console.log("helllllllllllllllllllllllllo") request({ url: '/business/storeInformation/store/storeInfoUni', method: 'get', diff --git a/gasStation-uni/pagesMy/VIP/vip.vue b/gasStation-uni/pagesMy/VIP/vip.vue index 12492bb56..a5cca2c22 100644 --- a/gasStation-uni/pagesMy/VIP/vip.vue +++ b/gasStation-uni/pagesMy/VIP/vip.vue @@ -73,6 +73,7 @@ + diff --git a/gasStation-uni/pagesMy/integral/integral.vue b/gasStation-uni/pagesMy/integral/integral.vue index a07799820..ad8401eb0 100644 --- a/gasStation-uni/pagesMy/integral/integral.vue +++ b/gasStation-uni/pagesMy/integral/integral.vue @@ -18,7 +18,9 @@ 积分签到 - 已签到 + 已签到 + 未开通签到 + @@ -55,7 +57,9 @@ title: '', myPoints: 0, // 我的积分 flag: true, - storeId: uni.getStorageSync('storeId') + flag2: true, + storeId: uni.getStorageSync('storeId'), + chainStoreId: uni.getStorageSync('chainStoreId'), } }, @@ -66,13 +70,20 @@ this.getUserInfoList(); this.getTodayIsSignIn(); }, + + // onLoad() { + // this.getUserInfoList(); + // this.getTodayIsSignIn(); + // }, methods: { // 查询我的积分 getUserInfoList() { request({ url: '/business/userManager/user/getByUniApp', method: 'get', - // params:{} + params: { + chainStoreId: this.chainStoreId + } }).then((res) => { if (res.code == 200) { this.myPoints = res.data.points @@ -100,8 +111,14 @@ if (res.code == 200) { if (res.data != 0) { this.flag = false - } else { + } else if ( + res.data == -2 + ) { this.flag = true + this.flag2 = true + } else { + this.flag2 = false + } } }) diff --git a/gasStation-uni/static/imgs/chongzhi.png b/gasStation-uni/static/imgs/chongzhi.png new file mode 100644 index 000000000..451a9e513 Binary files /dev/null and b/gasStation-uni/static/imgs/chongzhi.png differ diff --git a/gasStation-uni/static/imgs/hby.png b/gasStation-uni/static/imgs/hby.png new file mode 100644 index 000000000..79f2ec0a2 Binary files /dev/null and b/gasStation-uni/static/imgs/hby.png differ