zenghuapei
/
cyywl_server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request '合并代码' (#2) from feature/mall_product into master 

Reviewed-on: http://117.33.142.185:3000/zenghuapei/cyywl_server/pulls/2
pull/1/head
tianyu 2023-05-29 20:27:42 +08:00
parent 31e0ce4e7a bac30ebbbf
commit 8310ec40d1
10 changed files with 72 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeOrderServiceImpl.java
View File

@ -140,7 +140,9 @@ public class RechargeOrderServiceImpl implements RechargeOrderService {
LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
Assert.notNull(loginUser, "登录失效,请重新登录!");
List<RechargeOrderDO> orderDOS = rechargeOrderMapper.selectList(Wrappers.<RechargeOrderDO>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<RechargeOrderRespVO> rechargeOrderRespVOS = RechargeOrderConvert.INSTANCE.convertList(orderDOS);
List<String> collect1 = rechargeOrderRespVOS.stream().map(RechargeOrderBaseVO::getOrderId).collect(Collectors.toList());

6
yudao-ui-admin/src/components/ImageUpload/index.vue
View File

@ -24,6 +24,7 @@
<div class="el-upload__tip" slot="tip" v-if="showTip">
请上传
<template v-if="fileSize"> 大小不超过 <b style="color: #f56c6c">{{ fileSize }}MB</b> </template>
<template v-if="format"> 尺寸为 <b style="color: #f56c6c">{{ format }}</b> </template>
<template v-if="fileType"> 格式为 <b style="color: #f56c6c">{{ fileType.join("/") }}</b> </template>
的文件
</div>
@ -71,6 +72,11 @@ export default {
isShowTip: {
type: Boolean,
default: true
},
// 格式提示
format: {
type: String,
default: ''
}
},
data() {

2
yudao-ui-admin/src/views/mall/market/banner/index.vue
View File

@ -58,7 +58,7 @@
<el-input v-model="form.title" placeholder="请输入标题"/>
</el-form-item>
<el-form-item label="缩略图" prop="picUrl">
<imageUpload v-model="form.picUrl" :limit="1"/>
<imageUpload v-model="form.picUrl" :limit="1" :format="'163*163'"/>
</el-form-item>
<el-form-item label="跳转链接" prop="url">
<el-input v-model="form.url" placeholder="请输入跳转链接"/>

2
yudao-ui-admin/src/views/system/tenant/index.vue
View File

@ -151,7 +151,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="店铺LOGO图片" prop="logo">
<ImageUpload v-model="form.logo" :limit="1" :isShowTip="false"
<ImageUpload v-model="form.logo" :limit="1" :format="'163*163'"
class="upload-image"/>
</el-form-item>
</el-col>

3
yudao-ui-app/package.json
View File

@ -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"
}
}

4
yudao-ui-app/pages/index/index.vue
View File

@ -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;

18
yudao-ui-app/pages/member_application/index.vue
View File

@ -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

27
yudao-ui-app/pages/member_equity/index.vue
View File

@ -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;

32
yudao-ui-app/pages/member_others/index.vue
View File

@ -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)) {

5
yudao-ui-app/pages/member_renew/index.vue
View File

@ -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 {