diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeOrderServiceImpl.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeOrderServiceImpl.java index 3f81dd772..cece4dc71 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeOrderServiceImpl.java +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeOrderServiceImpl.java @@ -140,7 +140,9 @@ public class RechargeOrderServiceImpl implements RechargeOrderService { LoginUser loginUser = SecurityFrameworkUtils.getLoginUser(); Assert.notNull(loginUser, "登录失效,请重新登录!"); List orderDOS = rechargeOrderMapper.selectList(Wrappers.lambdaQuery() - .eq(RechargeOrderDO::getUid, loginUser.getId()).ne(RechargeOrderDO::getPaid, 0)); + .eq(RechargeOrderDO::getUid, loginUser.getId()) + .ne(RechargeOrderDO::getPaid, 0) + .orderByDesc(RechargeOrderDO::getCreateTime)); if (!CollectionUtils.isEmpty(orderDOS)) { List rechargeOrderRespVOS = RechargeOrderConvert.INSTANCE.convertList(orderDOS); List collect1 = rechargeOrderRespVOS.stream().map(RechargeOrderBaseVO::getOrderId).collect(Collectors.toList()); diff --git a/yudao-ui-admin/src/components/ImageUpload/index.vue b/yudao-ui-admin/src/components/ImageUpload/index.vue index d8d17d64f..2eb9bc069 100644 --- a/yudao-ui-admin/src/components/ImageUpload/index.vue +++ b/yudao-ui-admin/src/components/ImageUpload/index.vue @@ -24,6 +24,7 @@
请上传 + 的文件
@@ -71,6 +72,11 @@ export default { isShowTip: { type: Boolean, default: true + }, + // 格式提示 + format: { + type: String, + default: '' } }, data() { diff --git a/yudao-ui-admin/src/views/mall/market/banner/index.vue b/yudao-ui-admin/src/views/mall/market/banner/index.vue index a311be9d4..2a53cbe32 100644 --- a/yudao-ui-admin/src/views/mall/market/banner/index.vue +++ b/yudao-ui-admin/src/views/mall/market/banner/index.vue @@ -58,7 +58,7 @@ - + diff --git a/yudao-ui-admin/src/views/system/tenant/index.vue b/yudao-ui-admin/src/views/system/tenant/index.vue index d026fa14b..c0a16c341 100755 --- a/yudao-ui-admin/src/views/system/tenant/index.vue +++ b/yudao-ui-admin/src/views/system/tenant/index.vue @@ -151,7 +151,7 @@ - diff --git a/yudao-ui-app/package.json b/yudao-ui-app/package.json index 397776a07..b2e6b5ee9 100644 --- a/yudao-ui-app/package.json +++ b/yudao-ui-app/package.json @@ -12,7 +12,6 @@ "dependencies": { "clipboard": "^2.0.11", "html-to-image": "^1.11.11", - "html2canvas": "^1.4.1", "qrcode": "^1.5.3" }, "uni-app": { @@ -29,7 +28,7 @@ "title": "生产版", "env": { "UNI_PLATFORM": "h5", - "isVConsole": false, + "isVConsole": true, "APP_BASE_URL": "http://api.cyywl.top" } } diff --git a/yudao-ui-app/pages/index/index.vue b/yudao-ui-app/pages/index/index.vue index d3402fe90..b0ea2ae03 100644 --- a/yudao-ui-app/pages/index/index.vue +++ b/yudao-ui-app/pages/index/index.vue @@ -837,7 +837,7 @@ .header_bottom { position: absolute; margin-left: 43rpx; - bottom: 12%; + bottom: 9%; width: 664rpx; height: 238rpx; @@ -852,7 +852,7 @@ } .notice { - margin-top: -6%; + margin-top: -1%; margin-left: 48rpx; width: 658rpx; height: 67rpx; diff --git a/yudao-ui-app/pages/member_application/index.vue b/yudao-ui-app/pages/member_application/index.vue index a8d4d354c..9b56e030b 100644 --- a/yudao-ui-app/pages/member_application/index.vue +++ b/yudao-ui-app/pages/member_application/index.vue @@ -98,15 +98,27 @@ if(res.data.some((item) => !!parseInt(item.isExist))){ uni.setTabBarItem({ index: 2, - pagePath: '/pages/member_equity/index' + pagePath: '/pages/member_equity/index', + visible:true + }) + uni.setTabBarItem({ + index: 1, + pagePath: '/pages/member_application/index', + visible:false }) uni.switchTab({ url:'/pages/member_equity/index' }) }else{ uni.setTabBarItem({ - index: 2, - pagePath: '/pages/member_application/index' + index: 1, + pagePath: '/pages/member_application/index', + visible:true + }) + uni.setTabBarItem({ + index: 2, + pagePath: '/pages/member_equity/index', + visible:false }) } this.memberData = res.data diff --git a/yudao-ui-app/pages/member_equity/index.vue b/yudao-ui-app/pages/member_equity/index.vue index 5ca58bc0d..05f2ec981 100644 --- a/yudao-ui-app/pages/member_equity/index.vue +++ b/yudao-ui-app/pages/member_equity/index.vue @@ -81,15 +81,15 @@ list: [ { img:'../../static/images/member240.png', - name:360 + name:"360" }, { img:'../../static/images/member400.png', - name:600 + name:"600" }, { - img:'../../static/images/member960.png', - name:900 + img:'../../static/images/member640.png', + name:"960" }, ], vipData:['普通会员','中级会员','高级会员'], @@ -104,15 +104,27 @@ if(resful.data.some((item) => !!parseInt(item.isExist))){ uni.setTabBarItem({ index: 2, - pagePath: '/pages/member_equity/index' + pagePath: '/pages/member_equity/index', + visible:true, + }) + uni.setTabBarItem({ + index: 1, + pagePath: '/pages/member_application/index', + visible:false, }) }else{ + uni.setTabBarItem({ + index: 1, + pagePath: '/pages/member_application/index', + visible:true, + }) uni.setTabBarItem({ index: 2, - pagePath: '/pages/member_application/index' + pagePath: '/pages/member_equity/index', + visible:false, }) uni.switchTab({ - url:'/pages/member_application/index' + url:'/pages/member_application/index', }) } const res = await memberHeadInfo() @@ -258,7 +270,6 @@ } .right-button { - border: 1px solid; border-radius: 18rpx; margin-top: 10rpx; padding: 7rpx 16rpx; diff --git a/yudao-ui-app/pages/member_others/index.vue b/yudao-ui-app/pages/member_others/index.vue index 90a84e55b..d2a0dff89 100644 --- a/yudao-ui-app/pages/member_others/index.vue +++ b/yudao-ui-app/pages/member_others/index.vue @@ -114,6 +114,7 @@ }, { validator: (rule, value, callback) => { + return this.form.userPhone == this.form.confirmPhone }, message: '手机号不一致', @@ -136,23 +137,28 @@ } }, watch:{ + 'form.userPhone' (){ + this.verify() + }, 'form.confirmPhone' (){ - this.$refs.uForm.validate().then(async res => { - uni.showLoading({ - title: '加载中', - mask: true - }); - try{ - const res = await memberByHomeGradeInfo(this.form.confirmPhone) - this.memberData = res.data - } finally{ - uni.hideLoading(); - } - }) - + this.verify() } }, methods: { + verify(){ + this.$refs.uForm.validate().then(async res => { + uni.showLoading({ + title: '加载中', + mask: true + }); + try{ + const res = await memberByHomeGradeInfo(this.form.confirmPhone) + this.memberData = res.data + } finally{ + uni.hideLoading(); + } + }) + }, handleMember(value, index) { if (!!parseInt(value.isExist)) return if (this.activeIndex.includes(index)) { diff --git a/yudao-ui-app/pages/member_renew/index.vue b/yudao-ui-app/pages/member_renew/index.vue index 7e49f45b9..00b61550a 100644 --- a/yudao-ui-app/pages/member_renew/index.vue +++ b/yudao-ui-app/pages/member_renew/index.vue @@ -217,6 +217,11 @@ import store from '@/store/index'; padding: 0 30rpx; background: #fff !important; } + + ::v-deep .u-form-item__body__right__message{ + margin-top: 10rpx; + color: #fff; + } } .phone-money {