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

Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product

pull/16/head
TianYu 2023-05-26 09:15:33 +08:00
parent 471cc57623 872ce8baf0
commit 09bb5b0893
6 changed files with 404 additions and 298 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -82,11 +82,14 @@ public class PhoneRecordServiceImpl implements PhoneRecordService {
@Override @Override
public Boolean deletePhoneGearByOrderId(Long orderId) { public Boolean deletePhoneGearByOrderId(Long orderId) {
log.info("-------------------------orderId{}",orderId);
List<PhoneRecordDO> recordDOS = phoneRecordMapper.selectList(Wrappers.<PhoneRecordDO>lambdaQuery().eq(PhoneRecordDO::getRechargeOrderId, orderId)); List<PhoneRecordDO> recordDOS = phoneRecordMapper.selectList(Wrappers.<PhoneRecordDO>lambdaQuery().eq(PhoneRecordDO::getRechargeOrderId, orderId));
log.info("-------------------------recordDOS{},{}",recordDOS,recordDOS.size());
if (!CollectionUtils.isEmpty(recordDOS)) { if (!CollectionUtils.isEmpty(recordDOS)) {
recordDOS.forEach(e->{ recordDOS.forEach(e->{
e.setDeleted(Boolean.TRUE); e.setDeleted(Boolean.TRUE);
phoneRecordMapper.updateById(e); int i = phoneRecordMapper.updateById(e);
log.info("-------------------------i{}---------------------",i);
}); });
} }
return null; return null;

2
yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesFreeMapper.xml
View File

@ -14,7 +14,7 @@
FROM FROM
eb_shipping_templates_free eb_shipping_templates_free
where where
temp_id = #{tempId, jdbcType=INTEGER} temp_id = #{tempId, jdbcType=INTEGER} AND `status` = 1
GROUP BY GROUP BY
`uniqid` `uniqid`
ORDER BY id ASC ORDER BY id ASC

2
yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesRegionMapper.xml
View File

@ -14,7 +14,7 @@
FROM FROM
eb_shipping_templates_region eb_shipping_templates_region
where where
temp_id = #{tempId, jdbcType=INTEGER} temp_id = #{tempId, jdbcType=INTEGER} AND `status` = 1
GROUP BY GROUP BY
`uniqid` `uniqid`
ORDER BY id ASC ORDER BY id ASC

5
yudao-ui-app/pages.json
View File

@ -15,6 +15,11 @@
"style": { "style": {
"navigationBarTitleText": "会员" "navigationBarTitleText": "会员"
} }
},{
"path": "pages/notice/index",
"style": {
"navigationBarTitleText": "公告详情"
}
}, },
{ {
"path": "pages/member_detail/index", "path": "pages/member_detail/index",

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

@ -4,14 +4,24 @@
<view class="header_top"> <view class="header_top">
<view class="content"> <view class="content">
<view class="left"> <view class="left">
<u--image class="image" :src="tenant.logo" width="160rpx" height="160rpx" shape="circle"></u--image> <u--image class="image" :src="tenant.logo" width="160rpx" height="160rpx" shape="circle">
</u--image>
</view> </view>
<view class="center"> <view class="center">
<view class="top">{{tenant.name}}</view> <view class="top">{{tenant.name}}</view>
<view class="text"> <view class="text">
<view class="detail"><u-icon style="display: inline-block;line-height: 28rpx;" name="file-text-fill" color="#fff" size="28rpx"></u-icon>简介:{{tenant.introduction}}</view> <view class="detail">
<view class="detail"><u-icon style="display: inline-block;line-height: 28rpx;" name="phone" color="#fff" size="28rpx"></u-icon>电话:{{tenant.serviceMobile}}</view> <u-icon style="display: inline-block;line-height: 28rpx;" name="file-text-fill"
<view class="detail"><u-icon style="display: inline-block;line-height: 28rpx;" name="clock" color="#fff" size="28rpx"></u-icon>服务时间:{{tenant.serviceTime}}</view> color="#fff" size="28rpx"></u-icon>简介:{{tenant.introduction}}
</view>
<view class="detail">
<u-icon style="display: inline-block;line-height: 28rpx;" name="phone" color="#fff"
size="28rpx"></u-icon>电话:{{tenant.serviceMobile}}
</view>
<view class="detail">
<u-icon style="display: inline-block;line-height: 28rpx;" name="clock" color="#fff"
size="28rpx"></u-icon>服务时间:{{tenant.serviceTime}}
</view>
</view> </view>
</view> </view>
<view class="right"> <view class="right">
@ -29,7 +39,7 @@
</navigator> </navigator>
</view> </view>
</view> </view>
<view class="notice"> <view class="notice" @tap="goNoticeDetail">
<u-notice-bar :text="text" fontSize="26rpx" color="#000" bgColor="transparent"></u-notice-bar> <u-notice-bar :text="text" fontSize="26rpx" color="#000" bgColor="transparent"></u-notice-bar>
</view> </view>
<view class="hot"> <view class="hot">
@ -45,11 +55,7 @@
</view> </view>
<view class="input"> <view class="input">
<u--input <u--input placeholder="请输入内容" v-model="value"></u--input>
placeholder="请输入内容"
v-model="value"
@change="change"
></u--input>
</view> </view>
<view class="button" @tap="searchSubmitValue"> <view class="button" @tap="searchSubmitValue">
搜索 搜索
@ -77,7 +83,9 @@
<image :src="item.image" mode=""></image> <image :src="item.image" mode=""></image>
<view class="name">{{item.storeName}}</view> <view class="name">{{item.storeName}}</view>
<text><u--text color="#E50202" mode="price" :text="item.price"></u--text></text> <text>
<u--text color="#E50202" mode="price" :text="item.price"></u--text>
</text>
</view> </view>
</view> </view>
<view class="" style="margin-top: 110rpx;"> <view class="" style="margin-top: 110rpx;">
@ -204,7 +212,7 @@
bastInfo: '', bastInfo: '',
fastInfo: '', fastInfo: '',
fastList: [], fastList: [],
text:'尊敬的业主：接环卫所通知，近期将对小区进行大扫除，请大家做好准备', text: '尊敬的业主：接环卫所通知，近期将对小区进行大扫除，请大家做好准备',
firstInfo: '', firstInfo: '',
salesInfo: '', salesInfo: '',
indicatorDots: false, indicatorDots: false,
@ -319,13 +327,13 @@
// ]); // ]);
getUserInfo().then(res => { getUserInfo().then(res => {
this.userInfo = res.data this.userInfo = res.data
getTenant(153).then(res=>{ getTenant(153).then(res => {
this.tenant = res.data this.tenant = res.data
this.text = res.data.notice this.text = res.data.notice
}) })
}) })
getHeader().then(res=>{ getHeader().then(res => {
console.log(res,'会员') console.log(res, '会员')
}) })
this.getBanners() this.getBanners()
this.getIndexPage() this.getIndexPage()
@ -341,8 +349,12 @@
}) })
}, },
methods: { methods: {
change(){ // 跳转公告详情
console.log(this.value,'value') goNoticeDetail() {
console.log('notice哇')
uni.navigateTo({
url: '/pages/notice/index'
})
}, },
// 搜索 // 搜索
searchSubmitValue: function() { searchSubmitValue: function() {
@ -356,32 +368,32 @@
}); });
}, },
// 加入购物车 // 加入购物车
addCart(id){ addCart(id) {
getSpuDetail(id).then(res => { getSpuDetail(id).then(res => {
console.log(res.data.productValue.默认.id,'1111111111111') console.log(res.data.productValue.默认.id, '1111111111111')
let unique = res.data.productValue.默认.id let unique = res.data.productValue.默认.id
postCartAdd({ postCartAdd({
productId: id, productId: id,
productAttrUnique: unique, productAttrUnique: unique,
cartNum: 1 cartNum: 1
}).then(res=> { }).then(res => {
console.log('加入成功') console.log('加入成功')
}) })
}) })
}, },
go(){ go() {
console.log(this.productList,'------') console.log(this.productList, '------')
}, },
// 获取banner和userInfo // 获取banner和userInfo
getBanners(){ getBanners() {
// console.log(this.$store.tenantId,'tenantId') // console.log(this.$store.tenantId,'tenantId')
getBanner().then(res=>{ getBanner().then(res => {
this.bannerList = res.data.list[0] this.bannerList = res.data.list[0]
console.log(this.bannerList,'banner') console.log(this.bannerList, 'banner')
}) })
console.log(this.userInfo.userId,'userInfo111111') console.log(this.userInfo.userId, 'userInfo111111')
}, },
getCoupon: function(id, index) { getCoupon: function(id, index) {
@ -497,12 +509,12 @@
}) })
}, },
// 首页商品 // 首页商品
getIndexPage(){ getIndexPage() {
let that = this let that = this
productPage().then(res=>{ productPage().then(res => {
console.log(res.data.list,'商品列表') console.log(res.data.list, '商品列表')
this.productList = this.productList.concat(res.data.list) this.productList = this.productList.concat(res.data.list)
console.log(this.productList,'---------') console.log(this.productList, '---------')
}) })
}, },
getcouponList() { getcouponList() {
@ -650,7 +662,7 @@
// 获取H5 搜索框高度 // 获取H5 搜索框高度
let appSearchH = uni.createSelectorQuery().select(".serch-wrapper"); let appSearchH = uni.createSelectorQuery().select(".serch-wrapper");
appSearchH.boundingClientRect(function(data) { appSearchH.boundingClientRect(function(data) {
if(data){ if (data) {
self.searchH = data.height self.searchH = data.height
} }
}).exec() }).exec()
@ -698,13 +710,14 @@
} }
</style> </style>
<style lang="scss"> <style lang="scss">
.box { .box {
.header { .header {
position: relative; position: relative;
width: 100%; width: 100%;
height: 544rpx; height: 544rpx;
background: url(@/static/images/shop/index_headerbg.png); background: url(@/static/images/shop/index_headerbg.png);
background-size: 100% 100%; background-size: 100% 100%;
.header_top { .header_top {
position: relative; position: relative;
width: 100%; width: 100%;
@ -717,6 +730,7 @@
align-items: center; align-items: center;
position: absolute; position: absolute;
top: 109rpx; top: 109rpx;
.left { .left {
width: 164rpx; width: 164rpx;
height: 164rpx; height: 164rpx;
@ -728,17 +742,21 @@
} }
} }
.center { .center {
width: 330rpx; width: 330rpx;
height: 170rpx; height: 170rpx;
.top { .top {
font-size: 30rpx; font-size: 30rpx;
font-family: PingFang SC; font-family: PingFang SC;
font-weight: 400; font-weight: 400;
color: #FFFFFF; color: #FFFFFF;
} }
.text { .text {
margin-top: 25rpx; margin-top: 25rpx;
.detail { .detail {
font-size: 24rpx; font-size: 24rpx;
font-family: PingFang SC; font-family: PingFang SC;
@ -747,6 +765,7 @@
} }
} }
} }
.right { .right {
width: 150rpx; width: 150rpx;
height: 170rpx; height: 170rpx;
@ -754,20 +773,24 @@
justify-content: space-around; justify-content: space-around;
flex-wrap: wrap; flex-wrap: wrap;
align-items: center; align-items: center;
.up { .up {
width: 110rpx; width: 110rpx;
height: 110rpx; height: 110rpx;
image { image {
width: 101rpx; width: 101rpx;
height: 110rpx; height: 110rpx;
} }
} }
text { text {
font-size: 22rpx; font-size: 22rpx;
font-family: PingFang SC; font-family: PingFang SC;
font-weight: 400; font-weight: 400;
color: #FFFFFF; color: #FFFFFF;
} }
.button { .button {
width: 119rpx; width: 119rpx;
height: 36rpx; height: 36rpx;
@ -783,12 +806,14 @@
} }
} }
} }
.header_bottom { .header_bottom {
position: absolute; position: absolute;
margin-left: 43rpx; margin-left: 43rpx;
bottom: 0; bottom: 0;
width: 664rpx; width: 664rpx;
height: 238rpx; height: 238rpx;
// background: url(@/static/images/shop/index_hbottom.png); // background: url(@/static/images/shop/index_hbottom.png);
// background-size: 100% 100%; // background-size: 100% 100%;
image { image {
@ -798,6 +823,7 @@
} }
} }
} }
.notice { .notice {
margin-top: 30rpx; margin-top: 30rpx;
margin-left: 48rpx; margin-left: 48rpx;
@ -810,6 +836,7 @@
align-items: center; align-items: center;
} }
.hot { .hot {
width: 663rpx; width: 663rpx;
height: 322rpx; height: 322rpx;
@ -823,22 +850,26 @@
height: 1rpx; height: 1rpx;
margin-bottom: 26rpx; margin-bottom: 26rpx;
} }
.top { .top {
width: 100%; width: 100%;
height: 55rpx; height: 55rpx;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
.left { .left {
height: 100%; height: 100%;
margin-left: 19rpx; margin-left: 19rpx;
display: flex; display: flex;
justify-content: space-around; justify-content: space-around;
.icon { .icon {
width: 40rpx; width: 40rpx;
height: 40rpx; height: 40rpx;
background: url(@/static/images/shop/index_hot.png); background: url(@/static/images/shop/index_hot.png);
background-size: 100% 100%; background-size: 100% 100%;
} }
text { text {
margin-left: 11rpx; margin-left: 11rpx;
font-size: 32rpx; font-size: 32rpx;
@ -847,9 +878,11 @@
color: #000000; color: #000000;
} }
} }
.right { .right {
width: 387rpx; width: 387rpx;
height: 100%; height: 100%;
.search { .search {
width: 387rpx; width: 387rpx;
height: 55rpx; height: 55rpx;
@ -858,6 +891,7 @@
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
border-radius: 27rpx; border-radius: 27rpx;
.icon { .icon {
margin-left: 10rpx; margin-left: 10rpx;
width: 37rpx; width: 37rpx;
@ -865,6 +899,7 @@
background: url(@/static/images/shop/index_search.png); background: url(@/static/images/shop/index_search.png);
background-size: 100% 100%; background-size: 100% 100%;
} }
.button { .button {
margin-right: 3rpx; margin-right: 3rpx;
width: 82rpx; width: 82rpx;
@ -881,21 +916,25 @@
} }
} }
} }
.bottom { .bottom {
margin-top: 27rpx; margin-top: 27rpx;
height: 200rpx; height: 200rpx;
overflow: scroll; overflow: scroll;
white-space: nowrap; white-space: nowrap;
.item { .item {
position: relative; position: relative;
display: inline-block; display: inline-block;
width: 370rpx; width: 370rpx;
height: 199rpx; height: 199rpx;
margin-left: 19rpx; margin-left: 19rpx;
image { image {
width: 370rpx; width: 370rpx;
height: 199rpx; height: 199rpx;
} }
.title { .title {
position: absolute; position: absolute;
left: 22rpx; left: 22rpx;
@ -911,6 +950,7 @@
font-weight: 400; font-weight: 400;
color: #FFFFFF; color: #FFFFFF;
} }
.rank { .rank {
width: 90rpx; width: 90rpx;
height: 34rpx; height: 34rpx;
@ -918,6 +958,7 @@
background: linear-gradient(0deg, #F74A7B 0%, #FFAFAF 100%); background: linear-gradient(0deg, #F74A7B 0%, #FFAFAF 100%);
border-radius: 8rpx; border-radius: 8rpx;
} }
.img1 { .img1 {
position: absolute; position: absolute;
left: 17rpx; left: 17rpx;
@ -925,6 +966,7 @@
width: 166rpx; width: 166rpx;
height: 71rpx; height: 71rpx;
} }
.img2 { .img2 {
position: absolute; position: absolute;
top: 22rpx; top: 22rpx;
@ -935,12 +977,14 @@
} }
} }
} }
.container { .container {
width: 663rpx; width: 663rpx;
margin-left: 44rpx; margin-left: 44rpx;
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
justify-content: space-between; justify-content: space-between;
.item { .item {
position: relative; position: relative;
margin-top: 28rpx; margin-top: 28rpx;
@ -954,6 +998,7 @@
width: 100%; width: 100%;
height: 294rpx; height: 294rpx;
} }
.name { .name {
margin-left: 15rpx; margin-left: 15rpx;
margin-bottom: 10rpx; margin-bottom: 10rpx;
@ -965,6 +1010,7 @@
font-weight: 400; font-weight: 400;
color: #000000; color: #000000;
} }
text { text {
position: absolute; position: absolute;
right: 20rpx; right: 20rpx;
@ -975,6 +1021,7 @@
font-weight: 400; font-weight: 400;
color: #E50202; color: #E50202;
} }
.car { .car {
position: absolute; position: absolute;
@ -985,15 +1032,16 @@
} }
} }
} }
} }
::v-deep .notice{
::v-deep .notice {
.u-icon__icon { .u-icon__icon {
color: #FF4802 !important; color: #FF4802 !important;
span { span {
font-size: 28rpx; font-size: 28rpx;
} }
} }
} }
</style> </style>

50
yudao-ui-app/pages/notice/index.vue Normal file
View File

@ -0,0 +1,50 @@
<template>
<view class="notice">
<view class="item">
{{text}}
</view>
</view>
</template>
<script>
import {
getTenant
} from '../../api/product.js'
import {
setVisit,
getUserInfo
} from '@/api/user.js'
export default {
data(){
return {
tanent: {},
text: '',
userInfo: {}
}
},
mounted(){
getUserInfo().then(res => {
this.userInfo = res.data
console.log(res.data)
getTenant(153).then(res => {
this.tenant = res.data
this.text = res.data.notice
})
})
}
}
</script>
<style>
.notice {
width: 100%;
height: 100%;
.item {
width: 800rpx;
height: 1000rpx;
background: #fff;
}
}
</style>