问题修复
This commit is contained in:
@@ -3,7 +3,7 @@
|
|||||||
<view class='content'>
|
<view class='content'>
|
||||||
<view class='c-flex-row' style='align-items: flex-start'>
|
<view class='c-flex-row' style='align-items: flex-start'>
|
||||||
<image class='goods-image' :src='goodsDetailBean?.images||defaultImage' />
|
<image class='goods-image' :src='goodsDetailBean?.images||defaultImage' />
|
||||||
<view class='c-flex-column' style='flex: 1'>
|
<view class='c-flex-column' style='flex: 1;display: inline-grid'>
|
||||||
<text class='goods-name'>{{ goodsDetailBean?.name || '未知' }}</text>
|
<text class='goods-name'>{{ goodsDetailBean?.name || '未知' }}</text>
|
||||||
<text class='goods-price'>{{ flashPrice > 0 ? `${flashPrice}` : `${goodsDetailBean?.consumePrice || 0}` || 0
|
<text class='goods-price'>{{ flashPrice > 0 ? `${flashPrice}` : `${goodsDetailBean?.consumePrice || 0}` || 0
|
||||||
}}
|
}}
|
||||||
@@ -46,7 +46,7 @@
|
|||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<button class='primary-button' :plain='currentSizeIndex<=0' :disabled='currentSizeIndex<=0' @click='confirm'>
|
<button class='primary-button' :plain='currentSizeIndex<0' :disabled='currentSizeIndex<0' @click='confirm'>
|
||||||
确定
|
确定
|
||||||
</button>
|
</button>
|
||||||
</view>
|
</view>
|
||||||
@@ -189,6 +189,7 @@ defineExpose({
|
|||||||
color: #333333;
|
color: #333333;
|
||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
text-overflow: ellipsis;
|
text-overflow: ellipsis;
|
||||||
|
overflow: hidden;
|
||||||
}
|
}
|
||||||
|
|
||||||
.goods-price {
|
.goods-price {
|
||||||
|
@@ -3,7 +3,7 @@
|
|||||||
<view class='search-view'>
|
<view class='search-view'>
|
||||||
<view class='search-input' @click.stop='goPath("/pages/mall/subs/search/index")'>
|
<view class='search-input' @click.stop='goPath("/pages/mall/subs/search/index")'>
|
||||||
<image :src=' assetsUrl("ic_search.png")'></image>
|
<image :src=' assetsUrl("ic_search.png")'></image>
|
||||||
<input placeholder='输入名称、款号搜索' />
|
<input placeholder='输入名称、款号搜索' :disabled='true' />
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
@@ -21,7 +21,7 @@
|
|||||||
<view v-for='(item, index) in goodsList' :key='index' class='goods-item'
|
<view v-for='(item, index) in goodsList' :key='index' class='goods-item'
|
||||||
@click.stop='goPath(`/pages/mall/subs/goods/detail?goodsId=${item.goodsId}`)'>
|
@click.stop='goPath(`/pages/mall/subs/goods/detail?goodsId=${item.goodsId}`)'>
|
||||||
<image class='goods-image' :src='item.images||defaultImage' />
|
<image class='goods-image' :src='item.images||defaultImage' />
|
||||||
<text class='goods-name'>{{ item.goodsName }}</text>
|
<text class='goods-name'>{{ item.goodsName || '未知' }}</text>
|
||||||
<text class='goods-price'>¥{{ item.price }}</text>
|
<text class='goods-price'>¥{{ item.price }}</text>
|
||||||
<image class='add-image' :src='assetsUrl("ic_add_goods.png")' @click.stop='addShoppingCart(item)' />
|
<image class='add-image' :src='assetsUrl("ic_add_goods.png")' @click.stop='addShoppingCart(item)' />
|
||||||
</view>
|
</view>
|
||||||
|
@@ -49,7 +49,7 @@
|
|||||||
:key='index'>
|
:key='index'>
|
||||||
<view class='recommend-item c-flex-column'>
|
<view class='recommend-item c-flex-column'>
|
||||||
<image :src='item.images||defaultImage' />
|
<image :src='item.images||defaultImage' />
|
||||||
<text>{{ item.goodsName }}</text>
|
<text>{{ item.goodsName||'未知' }}</text>
|
||||||
<text class='goods-price'>{{ item.price }}</text>
|
<text class='goods-price'>{{ item.price }}</text>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
@@ -12,7 +12,7 @@
|
|||||||
<view v-for='(item, index) in goodsList' :key='index' class='goods-item'
|
<view v-for='(item, index) in goodsList' :key='index' class='goods-item'
|
||||||
@click.stop='goPath(`/pages/mall/subs/goods/detail?goodsId=${item.goodsId}`)'>
|
@click.stop='goPath(`/pages/mall/subs/goods/detail?goodsId=${item.goodsId}`)'>
|
||||||
<image class='goods-image' :src='item.images||defaultImage' />
|
<image class='goods-image' :src='item.images||defaultImage' />
|
||||||
<text class='goods-name'>{{ item.goodsName }}</text>
|
<text class='goods-name'>{{ item.goodsName||'未知' }}</text>
|
||||||
<text class='goods-price'>¥{{ item.price }}</text>
|
<text class='goods-price'>¥{{ item.price }}</text>
|
||||||
<image class='add-image' :src='assetsUrl("ic_add_goods.png")' @click.stop='addShoppingCart(item)' />
|
<image class='add-image' :src='assetsUrl("ic_add_goods.png")' @click.stop='addShoppingCart(item)' />
|
||||||
</view>
|
</view>
|
||||||
@@ -113,7 +113,7 @@ const addShoppingCart = (goodsBean: GoodsBean) => {
|
|||||||
font-size: 28rpx;
|
font-size: 28rpx;
|
||||||
font-weight: 400;
|
font-weight: 400;
|
||||||
color: #333333;
|
color: #333333;
|
||||||
-webkit-line-clamp: 2;
|
-webkit-line-clamp: 1;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
text-overflow: ellipsis;
|
text-overflow: ellipsis;
|
||||||
margin-top: 10rpx;
|
margin-top: 10rpx;
|
||||||
|
@@ -28,7 +28,7 @@ defineProps({
|
|||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
padding: 16rpx 23rpx 20rpx 30rpx;
|
padding: 16rpx 23rpx 20rpx 30rpx;
|
||||||
margin: 10rpx 0;
|
margin: 20rpx 0 10rpx 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.category-title {
|
.category-title {
|
||||||
|
@@ -26,7 +26,7 @@ import { getTradeList } from '@/api/user';
|
|||||||
import dayjs from 'dayjs';
|
import dayjs from 'dayjs';
|
||||||
|
|
||||||
const tradeList = ref([]);
|
const tradeList = ref([]);
|
||||||
const tradeType = ref('全部');
|
const tradeType = ref('');
|
||||||
const tradeDate = ref();
|
const tradeDate = ref();
|
||||||
const currentPageNum = ref(1);
|
const currentPageNum = ref(1);
|
||||||
|
|
||||||
@@ -43,7 +43,7 @@ const changeDate = (e: any) => {
|
|||||||
const changeTab = (index: number) => {
|
const changeTab = (index: number) => {
|
||||||
switch (index) {
|
switch (index) {
|
||||||
case 0:
|
case 0:
|
||||||
tradeType.value = '全部';
|
tradeType.value = '';
|
||||||
break;
|
break;
|
||||||
case 1:
|
case 1:
|
||||||
tradeType.value = '会员充值';
|
tradeType.value = '会员充值';
|
||||||
@@ -58,8 +58,8 @@ const changeTab = (index: number) => {
|
|||||||
const fetchData = async (refresh: boolean = true) => {
|
const fetchData = async (refresh: boolean = true) => {
|
||||||
currentPageNum.value = refresh ? 1 : currentPageNum.value + 1;
|
currentPageNum.value = refresh ? 1 : currentPageNum.value + 1;
|
||||||
const { list } = await getTradeList({
|
const { list } = await getTradeList({
|
||||||
startDate: tradeDate.value,
|
// startDate: tradeDate.value,
|
||||||
endDate: tradeDate.value,
|
// endDate: dayjs(tradeDate.value).add(1, 'day').format('YYYY-MM-DD'),
|
||||||
name: tradeType.value,
|
name: tradeType.value,
|
||||||
pageNum: currentPageNum.value,
|
pageNum: currentPageNum.value,
|
||||||
pageSize: 20
|
pageSize: 20
|
||||||
|
Reference in New Issue
Block a user