From c4a02b30ba25e066f3dc720fe082e80fb846ea17 Mon Sep 17 00:00:00 2001 From: Jruome <2559028966@qq.com> Date: Fri, 19 May 2023 17:56:58 +0800 Subject: [PATCH 1/3] =?UTF-8?q?uniapp=20=E6=94=AF=E4=BB=98=E5=9B=9E?= =?UTF-8?q?=E8=B0=83=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yudao-ui-app/App.vue | 17 ++++++++--------- .../components/paymentMember/index.vue | 7 ++++--- .../pages/member_application/index.vue | 18 +++++++++++++----- yudao-ui-app/pages/member_others/index.vue | 4 ++-- yudao-ui-app/pages/member_record/index.vue | 1 - yudao-ui-app/pages/member_renew/index.vue | 4 ++-- 6 files changed, 29 insertions(+), 22 deletions(-) diff --git a/yudao-ui-app/App.vue b/yudao-ui-app/App.vue index e354edfd0..93f6dc010 100644 --- a/yudao-ui-app/App.vue +++ b/yudao-ui-app/App.vue @@ -31,15 +31,14 @@ id: 0 }, onLaunch: function(option) { - const res = memberGradeInfo().then((res) =>{ - if(res.data.some((item) => !!parseInt(item.isExist))){ - uni.setTabBarItem({ - index: 2, - text: 'text', - pagePath: '/pages/member_equity/index' - }) - } - }) + // const res = memberGradeInfo().then((res) =>{ + // if(res.data.some((item) => !!parseInt(item.isExist))){ + // uni.setTabBarItem({ + // index: 2, + // pagePath: '/pages/member_equity/index' + // }) + // } + // }) let that = this; // #ifdef H5 diff --git a/yudao-ui-app/components/paymentMember/index.vue b/yudao-ui-app/components/paymentMember/index.vue index 522ad8988..68f1ae112 100644 --- a/yudao-ui-app/components/paymentMember/index.vue +++ b/yudao-ui-app/components/paymentMember/index.vue @@ -88,9 +88,10 @@ }, function(res) { if (res.err_msg == "get_brand_wcpay_request:ok") { - uni.switchTab({ - url: '/pages/member_application/index' - }) + window.location.reload() + // uni.switchTab({ + // url: '/pages/member_application/index' + // }) } }) } diff --git a/yudao-ui-app/pages/member_application/index.vue b/yudao-ui-app/pages/member_application/index.vue index 391a76f64..e9bd74410 100644 --- a/yudao-ui-app/pages/member_application/index.vue +++ b/yudao-ui-app/pages/member_application/index.vue @@ -101,6 +101,15 @@ }, async onLoad() { const res = await memberGradeInfo() + if(res.data.some((item) => !!parseInt(item.isExist))){ + uni.setTabBarItem({ + index: 2, + pagePath: '/pages/member_equity/index' + }) + uni.switchTab({ + url:'/pages/member_equity/index' + }) + } this.memberData = res.data }, methods: { @@ -235,13 +244,12 @@ .box-title { position: absolute; - top: -5.5%; + top: -37rpx; left: -203rpx; margin-left: 50%; - image { width: 406rpx; - height: 87rpx; + height: 88rpx; position: relative; display: flex; align-items: center; @@ -399,13 +407,13 @@ .box-title { position: absolute; - top: -9%; + top: -37rpx; left: -203rpx; margin-left: 50%; image { width: 406rpx; - height: 87rpx; + height: 88rpx; position: relative; display: flex; align-items: center; diff --git a/yudao-ui-app/pages/member_others/index.vue b/yudao-ui-app/pages/member_others/index.vue index 9fe59ebfc..bdfe678b7 100644 --- a/yudao-ui-app/pages/member_others/index.vue +++ b/yudao-ui-app/pages/member_others/index.vue @@ -247,13 +247,13 @@ .box-title { position: absolute; - top: -5.5%; + top: -37rpx; left: -203rpx; margin-left: 50%; image { width: 406rpx; - height: 87rpx; + height: 88rpx; position: relative; display: flex; align-items: center; diff --git a/yudao-ui-app/pages/member_record/index.vue b/yudao-ui-app/pages/member_record/index.vue index c86551c7e..025daced7 100644 --- a/yudao-ui-app/pages/member_record/index.vue +++ b/yudao-ui-app/pages/member_record/index.vue @@ -44,7 +44,6 @@ } }) this.memberData = arr - console.log(this.memberData) }, watch:{ keyword :Debounce (function (){ diff --git a/yudao-ui-app/pages/member_renew/index.vue b/yudao-ui-app/pages/member_renew/index.vue index 648a8c4a0..51a67b33f 100644 --- a/yudao-ui-app/pages/member_renew/index.vue +++ b/yudao-ui-app/pages/member_renew/index.vue @@ -223,13 +223,13 @@ import store from '@/store/index'; .box-title { position: absolute; - top: -5.5%; + top: -37rpx; left: -203rpx; margin-left: 50%; image { width: 406rpx; - height: 87rpx; + height: 88rpx; position: relative; display: flex; align-items: center; From 89122e94872f31d3fad695245fee3c99d42dc987 Mon Sep 17 00:00:00 2001 From: tangqian Date: Fri, 19 May 2023 18:03:33 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat:=20=E6=94=AF=E4=BB=98=E5=AE=9D?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=94=AF=E4=BB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shop/controller/admin/notify/WxPayNotifyController.java | 2 ++ .../system/controller/admin/tenant/TenantController.java | 6 ++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/notify/WxPayNotifyController.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/notify/WxPayNotifyController.java index 5b338c907..32a5f41cb 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/notify/WxPayNotifyController.java +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/notify/WxPayNotifyController.java @@ -135,6 +135,8 @@ public class WxPayNotifyController { log.error("支付金额不匹配,订单实际支付金额:{},微信入参验证金额:{}", orderDO.getPayPrice(), payerTotal); return "failure"; } + orderDO.setRefundStatus(2); + rechargeOrderMapper.updateById(orderDO); // 修改订单状态 // 写入 response.setStatus(HttpServletResponse.SC_OK); diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/TenantController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/TenantController.java index 7a2d21906..7c9c6ab85 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/TenantController.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/TenantController.java @@ -9,10 +9,9 @@ import cn.iocoder.yudao.module.system.controller.admin.tenant.vo.tenant.*; import cn.iocoder.yudao.module.system.convert.tenant.TenantConvert; import cn.iocoder.yudao.module.system.dal.dataobject.tenant.TenantDO; import cn.iocoder.yudao.module.system.service.tenant.TenantService; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; -import me.chanjar.weixin.mp.api.WxMpService; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; @@ -23,7 +22,6 @@ import javax.validation.Valid; import java.io.IOException; import java.time.LocalDateTime; import java.time.temporal.ChronoUnit; -import java.time.temporal.TemporalUnit; import java.util.List; import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; From 9ba8a8a827481912d08f5c94e4da7c2c942922ac Mon Sep 17 00:00:00 2001 From: Jruome <2559028966@qq.com> Date: Fri, 19 May 2023 18:04:40 +0800 Subject: [PATCH 3/3] =?UTF-8?q?uniapp=20=E6=94=AF=E4=BB=98=E5=9B=9E?= =?UTF-8?q?=E8=B0=83=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yudao-ui-app/pages/member_equity/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yudao-ui-app/pages/member_equity/index.vue b/yudao-ui-app/pages/member_equity/index.vue index aa4c071fe..a6b73b01f 100644 --- a/yudao-ui-app/pages/member_equity/index.vue +++ b/yudao-ui-app/pages/member_equity/index.vue @@ -141,7 +141,7 @@ background-repeat: no-repeat; background-attachment: fixed; - + .box-member { padding: 36rpx 40rpx;