From c5068f7ea1c99cc7caacc45188050b333ff9d46a Mon Sep 17 00:00:00 2001 From: zhaohengkun Date: Wed, 25 Sep 2024 14:56:16 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EventMarketing/openCardGift/popUp.vue | 24 ++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/fuintAdmin/src/views/EventMarketing/openCardGift/popUp.vue b/fuintAdmin/src/views/EventMarketing/openCardGift/popUp.vue index 063010237..2cac3c6b7 100644 --- a/fuintAdmin/src/views/EventMarketing/openCardGift/popUp.vue +++ b/fuintAdmin/src/views/EventMarketing/openCardGift/popUp.vue @@ -56,7 +56,7 @@
- + = suitTimeSlotAfter) { + callback(new Error('结束时间必须晚于开始时间')); + } else { + callback(); + } + }, + Typeindex3(index) { this.tindex3 = index this.ruleForm.suitTimeSlotType = index From 2c40ca4134a4354741fed004527ddc8b1e03358b Mon Sep 17 00:00:00 2001 From: cun-nan <19819293608@163.com> Date: Wed, 25 Sep 2024 15:10:46 +0800 Subject: [PATCH 02/10] 9.25 --- gasStation-uni/pages.json | 10 +- gasStation-uni/pages/index/index.vue | 7 +- gasStation-uni/pages/my/my.vue | 70 +++--- .../pagesHome/PointsMall/PointsMall.vue | 1 + .../pagesHome/userRegister/index.vue | 204 ++++++++++++++++++ gasStation-uni/pagesMy/setup/index.vue | 17 +- gasStation-uni/static/imgs/zc.png | Bin 0 -> 41120 bytes 7 files changed, 267 insertions(+), 42 deletions(-) create mode 100644 gasStation-uni/pagesHome/userRegister/index.vue create mode 100644 gasStation-uni/static/imgs/zc.png diff --git a/gasStation-uni/pages.json b/gasStation-uni/pages.json index 30904e7b6..1cd59e3b3 100644 --- a/gasStation-uni/pages.json +++ b/gasStation-uni/pages.json @@ -203,6 +203,13 @@ "style": { "navigationBarTitleText": "卡包" + } + }, + { + "path": "userRegister/index", + "style": { + "navigationBarTitleText": "会员注册" + } } ] @@ -342,8 +349,7 @@ { "path": "myorder/myorder", "style": { - "navigationBarTitleText": "我的订单", - "navigationStyle": "custom" + "navigationBarTitleText": "消费记录" } }, { diff --git a/gasStation-uni/pages/index/index.vue b/gasStation-uni/pages/index/index.vue index 0a982d520..dfe3facfe 100644 --- a/gasStation-uni/pages/index/index.vue +++ b/gasStation-uni/pages/index/index.vue @@ -38,7 +38,7 @@ 每日抽奖 - + 签到有礼 @@ -261,6 +261,11 @@ tabbar }, methods: { + goSignIn(){ + uni.navigateTo({ + url: '/pagesMy/signIn/index' + }) + }, goInvite() { uni.navigateTo({ url: '/pagesMy/invite/invite' diff --git a/gasStation-uni/pages/my/my.vue b/gasStation-uni/pages/my/my.vue index 5fc1be790..0732c91c4 100644 --- a/gasStation-uni/pages/my/my.vue +++ b/gasStation-uni/pages/my/my.vue @@ -6,9 +6,9 @@ - - - + + + @@ -19,15 +19,16 @@ - - - - - + + + + - 用户昵称 - 手机号: xxxxxxxxxxxx + {{user.name}} + 手机号: {{user.mobile}} @@ -46,7 +47,7 @@ {{countList.length || 0 }}次 | - + 优惠券 {{cardsList.length || 0 }} @@ -95,7 +96,7 @@ 积分商城 - + @@ -103,7 +104,7 @@ 个人资料 - + @@ -111,7 +112,7 @@ 邀请有礼 - + @@ -127,7 +128,7 @@ 成长值记录 - + @@ -135,12 +136,12 @@ 礼品卡 - + - 副卡管理 + 车队管理 @@ -151,7 +152,7 @@ 我的奖品 - + @@ -175,11 +176,9 @@ return { query: { storeId: '', - chainStoreId: '', - couponType: '', - useStatus: 0, - pageNo: 1, - pageSize: 10 + status: 0, + page: 1, + pageSize: 1000 }, querys: { mtUserId: '', @@ -299,7 +298,7 @@ url: 'business/userManager/user/getUser', method: 'get', }).then(res => { - console.log(res, 1541); + console.log(res, 302); if (res.data) { this.user = res.data uni.setStorageSync('userId', res.data.id) @@ -376,12 +375,17 @@ }, goCard() { uni.navigateTo({ - url: '/pagesMy/CardManagement/CardManagement' + url: '/pagesHome/RechargeRecords/RechargeRecords' }) }, - govip() { + goCar() { uni.navigateTo({ - url: '/pagesMy/VIP/vip' + url: '/pagesMy/licensePlate/index' + }) + }, + goFleet() { + uni.navigateTo({ + url: '/pagesMy/fleetInfo/index' }) }, goFeedback() { @@ -399,12 +403,12 @@ params: this.query }).then(res => { if (res.data) { - this.cardBalance = res.data.cardBalance, - this.myPoints = res.data.points, - /* if (res.data.refuelMoney!=null && res.data.refuelMoney!=""){ - this.refuelMoney = JSON.parse(res.data.refuelMoney); - } */ + this.cardBalance = res.data.cardBalance + this.myPoints = res.data.points + /* if (res.data.refuelMoney!=null && res.data.refuelMoney!=""){ this.refuelMoney = JSON.parse(res.data.refuelMoney); + } */ + this.refuelMoney = JSON.parse(res.data.refuelMoney); console.log("333333333333333", this.refuelMoney); } }) @@ -414,7 +418,7 @@ return; } request({ - url: 'business/marketingActivity/cardFavorable/applet', + url: 'cardCouponUser/queryPage', method: 'get', params: this.query }).then(res => { diff --git a/gasStation-uni/pagesHome/PointsMall/PointsMall.vue b/gasStation-uni/pagesHome/PointsMall/PointsMall.vue index 53b029ef0..3685eb3f6 100644 --- a/gasStation-uni/pagesHome/PointsMall/PointsMall.vue +++ b/gasStation-uni/pagesHome/PointsMall/PointsMall.vue @@ -139,6 +139,7 @@ }).then((res) => { if (res.code == 200) { this.integralGiftList = res.data.records + console.log(this.integralGiftList,142); } }) }, diff --git a/gasStation-uni/pagesHome/userRegister/index.vue b/gasStation-uni/pagesHome/userRegister/index.vue new file mode 100644 index 000000000..fa302cc74 --- /dev/null +++ b/gasStation-uni/pagesHome/userRegister/index.vue @@ -0,0 +1,204 @@ + + + + + \ No newline at end of file diff --git a/gasStation-uni/pagesMy/setup/index.vue b/gasStation-uni/pagesMy/setup/index.vue index 7d1c693ad..f591cfbdd 100644 --- a/gasStation-uni/pagesMy/setup/index.vue +++ b/gasStation-uni/pagesMy/setup/index.vue @@ -3,7 +3,7 @@ - 设置 + 个人资料 @@ -13,7 +13,7 @@ - + @@ -23,7 +23,7 @@ - + @@ -37,7 +37,12 @@ 性别 - {{user.sex}} + + 男 + 女 + 不详 + + 生日 @@ -51,13 +56,13 @@ 会员号 {{user.userNo}} --> - + - ￥3.5 + ￥{{item.market || 0}} { if (res.code == 200) { this.integralGiftList = res.data.records - console.log(this.integralGiftList,142); + console.log(res.data, 142); + }else{ + this.integralGiftList = [] } }) }, diff --git a/gasStation-uni/pagesHome/PointsRedemption/index.vue b/gasStation-uni/pagesHome/PointsRedemption/index.vue index 6156c3d45..a725358ba 100644 --- a/gasStation-uni/pagesHome/PointsRedemption/index.vue +++ b/gasStation-uni/pagesHome/PointsRedemption/index.vue @@ -6,13 +6,14 @@ 积分余额 {{cardBalance.points || 0}} - - 中建锦绣二期站可用 + + {{item.storeName}}可用 - + + - 虚拟 + {{item.giftName}} 300ml瓶装 兑换券 @@ -26,15 +27,21 @@ + + +