From 178e8ff5cba1b0e6d469c0f9f0821dad4be7ff74 Mon Sep 17 00:00:00 2001
From: Waiting <waitinghc@foxmail.com>
Date: Tue, 16 Apr 2024 01:39:23 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/sku-dialog.vue                       | 5 +++--
 src/pages/mall/index.vue                            | 4 ++--
 src/pages/mall/subs/goods/detail.vue                | 2 +-
 src/pages/mall/subs/search/index.vue                | 4 ++--
 src/pages/mine/subs/trade/components/trade-item.vue | 2 +-
 src/pages/mine/subs/trade/index.vue                 | 8 ++++----
 6 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/components/sku-dialog.vue b/src/components/sku-dialog.vue
index 20d3338..a92d786 100644
--- a/src/components/sku-dialog.vue
+++ b/src/components/sku-dialog.vue
@@ -3,7 +3,7 @@
     <view class='content'>
       <view class='c-flex-row' style='align-items: flex-start'>
         <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-price'>{{ flashPrice > 0 ? `${flashPrice}` : `${goodsDetailBean?.consumePrice || 0}` || 0
             }}
@@ -46,7 +46,7 @@
             </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>
       </view>
@@ -189,6 +189,7 @@ defineExpose({
     color: #333333;
     white-space: nowrap;
     text-overflow: ellipsis;
+    overflow: hidden;
   }
 
   .goods-price {
diff --git a/src/pages/mall/index.vue b/src/pages/mall/index.vue
index 01aab12..aa6300b 100644
--- a/src/pages/mall/index.vue
+++ b/src/pages/mall/index.vue
@@ -3,7 +3,7 @@
     <view class='search-view'>
       <view class='search-input' @click.stop='goPath("/pages/mall/subs/search/index")'>
         <image :src=' assetsUrl("ic_search.png")'></image>
-        <input placeholder='输入名称、款号搜索' />
+        <input placeholder='输入名称、款号搜索' :disabled='true' />
       </view>
     </view>
 
@@ -21,7 +21,7 @@
           <view v-for='(item, index) in goodsList' :key='index' class='goods-item'
                 @click.stop='goPath(`/pages/mall/subs/goods/detail?goodsId=${item.goodsId}`)'>
             <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>
             <image class='add-image' :src='assetsUrl("ic_add_goods.png")' @click.stop='addShoppingCart(item)' />
           </view>
diff --git a/src/pages/mall/subs/goods/detail.vue b/src/pages/mall/subs/goods/detail.vue
index 3438e7f..9e61eae 100644
--- a/src/pages/mall/subs/goods/detail.vue
+++ b/src/pages/mall/subs/goods/detail.vue
@@ -49,7 +49,7 @@
               :key='index'>
           <view class='recommend-item c-flex-column'>
             <image :src='item.images||defaultImage' />
-            <text>{{ item.goodsName }}</text>
+            <text>{{ item.goodsName||'未知' }}</text>
             <text class='goods-price'>{{ item.price }}</text>
           </view>
         </view>
diff --git a/src/pages/mall/subs/search/index.vue b/src/pages/mall/subs/search/index.vue
index cc9a92b..fc36802 100644
--- a/src/pages/mall/subs/search/index.vue
+++ b/src/pages/mall/subs/search/index.vue
@@ -12,7 +12,7 @@
         <view v-for='(item, index) in goodsList' :key='index' class='goods-item'
               @click.stop='goPath(`/pages/mall/subs/goods/detail?goodsId=${item.goodsId}`)'>
           <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>
           <image class='add-image' :src='assetsUrl("ic_add_goods.png")' @click.stop='addShoppingCart(item)' />
         </view>
@@ -113,7 +113,7 @@ const addShoppingCart = (goodsBean: GoodsBean) => {
       font-size: 28rpx;
       font-weight: 400;
       color: #333333;
-      -webkit-line-clamp: 2;
+      -webkit-line-clamp: 1;
       overflow: hidden;
       text-overflow: ellipsis;
       margin-top: 10rpx;
diff --git a/src/pages/mine/subs/trade/components/trade-item.vue b/src/pages/mine/subs/trade/components/trade-item.vue
index 42b9e8b..305fdd0 100644
--- a/src/pages/mine/subs/trade/components/trade-item.vue
+++ b/src/pages/mine/subs/trade/components/trade-item.vue
@@ -28,7 +28,7 @@ defineProps({
   display: flex;
   flex-direction: column;
   padding: 16rpx 23rpx 20rpx 30rpx;
-  margin: 10rpx 0;
+  margin: 20rpx 0 10rpx 0;
 }
 
 .category-title {
diff --git a/src/pages/mine/subs/trade/index.vue b/src/pages/mine/subs/trade/index.vue
index 3ccab56..0401d2a 100644
--- a/src/pages/mine/subs/trade/index.vue
+++ b/src/pages/mine/subs/trade/index.vue
@@ -26,7 +26,7 @@ import { getTradeList } from '@/api/user';
 import dayjs from 'dayjs';
 
 const tradeList = ref([]);
-const tradeType = ref('全部');
+const tradeType = ref('');
 const tradeDate = ref();
 const currentPageNum = ref(1);
 
@@ -43,7 +43,7 @@ const changeDate = (e: any) => {
 const changeTab = (index: number) => {
   switch (index) {
     case 0:
-      tradeType.value = '全部';
+      tradeType.value = '';
       break;
     case 1:
       tradeType.value = '会员充值';
@@ -58,8 +58,8 @@ const changeTab = (index: number) => {
 const fetchData = async (refresh: boolean = true) => {
   currentPageNum.value = refresh ? 1 : currentPageNum.value + 1;
   const { list } = await getTradeList({
-    startDate: tradeDate.value,
-    endDate: tradeDate.value,
+    // startDate: tradeDate.value,
+    // endDate: dayjs(tradeDate.value).add(1, 'day').format('YYYY-MM-DD'),
     name: tradeType.value,
     pageNum: currentPageNum.value,
     pageSize: 20