angelo
/
web-retail-h5
3
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'lx-dev' of gitee.com:cabbage_qd/web-base-h5 into lx-online

This commit is contained in:
woody 2025-05-21 10:05:08 +08:00
parent 37049df9ec 2df9abaf42
commit 663deb7c3c
2 changed files with 31 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pages/bonus/index.vue
View File

@ -9,7 +9,8 @@
</view> </view>
</scroll-view> </scroll-view>
<view class="sum-val"> <view class="sum-val">
昨日实发合计: <span>{{toSum | toThousandthAndKeepDecimal}}</span> <view v-if="monthIncomeTotal" >本月合计: <span>{{monthIncomeTotal | toThousandthAndKeepDecimal}}</span></view>
<view>昨日合计: <span>{{toSum | toThousandthAndKeepDecimal}}</span></view>
</view> </view>
<template> <template>
<sgsy v-if="navIndex==0" ref="sgsyData" :checkRule="marketList[0].isShow" :num="page.pageNum" /> <sgsy v-if="navIndex==0" ref="sgsyData" :checkRule="marketList[0].isShow" :num="page.pageNum" />
@ -93,7 +94,8 @@
page: { page: {
pageSize: 50, pageSize: 50,
pageNum: 1, pageNum: 1,
} },
monthIncomeTotal: 0,
} }
}, },
components: { components: {
@ -112,7 +114,9 @@
methods: { methods: {
getSum() { getSum() {
api1.queryBonusTotal({}).then((res) => { api1.queryBonusTotal({}).then((res) => {
console.log(res, '....res====aa')
this.toSum = res.rows[0].realIncomeTotal this.toSum = res.rows[0].realIncomeTotal
this.monthIncomeTotal = res.rows[0].monthIncomeTotal
}) })
}, },
bindPickerChange(e) { bindPickerChange(e) {
@ -148,12 +152,15 @@
<style lang="scss"> <style lang="scss">
.sum-val { .sum-val {
background-color: #fff; background-color: #fff;
height: 100rpx; // height: 100rpx;
line-height: 100rpx; line-height: 60rpx;
text-align: right; text-align: right;
margin-top: 10rpx; margin-top: 10rpx;
padding-right: 20rpx; padding-right: 20rpx;
display: flex;
flex-direction: column;
align-items: flex-end;
justify-content: flex-end;
span { span {
font-size: 34rpx; font-size: 34rpx;
font-weight: bold; font-weight: bold;

26
pages/specialArea/details.vue
View File

@ -156,7 +156,7 @@
<view class="pop_a"> <view class="pop_a">
<view class="pop_tt"> <view class="pop_tt">
<view class="pop_t"> <view class="pop_t">
<img :src="imgUrlList[1]" alt="" /> <img :src="imgUrlList[0]" alt="" />
<view>{{ <view>{{
goodDetail.goodsPrice | numberToCurrency | isLocal goodDetail.goodsPrice | numberToCurrency | isLocal
}}</view> }}</view>
@ -251,6 +251,7 @@ export default {
isWidth: 375, isWidth: 375,
pkCountry: 1, pkCountry: 1,
countDown: "", countDown: "",
bannerImgList: []
}; };
}, },
@ -267,11 +268,11 @@ export default {
}, },
computed: { computed: {
...mapGetters(["user", "shopCarLength"]), ...mapGetters(["user", "shopCarLength"]),
bannerImgList() { // bannerImgList() {
const list = this.imgUrlList.map(item => item) // const list = this.imgUrlList.map(item => item)
list.splice(1,1) // list.splice(1,1)
return list // return list
} // }
}, },
methods: { methods: {
toIndex() { toIndex() {
@ -359,7 +360,6 @@ export default {
// this.goodDetail.sales = sl // this.goodDetail.sales = sl
// this.mainImgUrl = res.data.videoUrl // this.mainImgUrl = res.data.videoUrl
this.imgUrlList = [ this.imgUrlList = [
res.data.videoUrl,
res.data.cover, res.data.cover,
res.data.cover1, res.data.cover1,
res.data.cover2, res.data.cover2,
@ -368,9 +368,21 @@ export default {
res.data.cover5, res.data.cover5,
res.data.cover6, res.data.cover6,
]; ];
this.bannerImgList = [
res.data.videoUrl,
res.data.cover1,
res.data.cover2,
res.data.cover3,
res.data.cover4,
res.data.cover5,
res.data.cover6,
];
this.imgUrlList = this.imgUrlList.filter( this.imgUrlList = this.imgUrlList.filter(
(item) => item && item.trim() (item) => item && item.trim()
); );
this.bannerImgList = this.bannerImgList.filter(
(item) => item && item.trim()
);
this.goodDetail.productParams.forEach((item, index) => { this.goodDetail.productParams.forEach((item, index) => {
item.waresItemsParamsList.forEach((ctem, cndex) => { item.waresItemsParamsList.forEach((ctem, cndex) => {
ctem.quantity = 0; ctem.quantity = 0;