From 863eac69aa9edcff9d600eae74a5666386973fa1 Mon Sep 17 00:00:00 2001
From: wanghongjun <1445693971@qq,com>
Date: Tue, 2 Apr 2024 17:37:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=87=91=E9=A2=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/category/index.vue      | 2 +-
 pages/user/shopcart/index.vue | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/pages/category/index.vue b/pages/category/index.vue
index f87869f..7098e2d 100644
--- a/pages/category/index.vue
+++ b/pages/category/index.vue
@@ -246,7 +246,7 @@
         // 设置列表数据
         await app.getCatList(page.num)
             .then(list => {
-              console.log('list',list)
+              //console.log('list',list)
               const curPageLen = list.data.length
               const totalSize = list.total
               app.mescroll.endBySize(curPageLen, totalSize)
diff --git a/pages/user/shopcart/index.vue b/pages/user/shopcart/index.vue
index be758d9..70f8e25 100644
--- a/pages/user/shopcart/index.vue
+++ b/pages/user/shopcart/index.vue
@@ -20,13 +20,13 @@
             <text class="goods-title-name">{{ item.detail.goods_name }}</text>
             <text class="goods-title-content">交易方式：{{ item.detail.goods_entrust?'转让':'授权' }}</text>
             <text class="goods-title-content">购买年限：{{ item.use_years }}年</text>
-            <text class="goods-title-content">单价：￥{{ item.goods_price }}</text>
+            <text class="goods-title-content">单价：￥{{ item.detail.price_str }}</text>
           </view>
           <view class="item-foot">
             <view class="goods-price">
               <text>合计：</text>
               <text class="unit">￥</text>
-              <text class="value">{{ item.use_years * item.goods_price }}</text>
+              <text class="value">{{ item.total_money_str }}</text>
             </view>
           </view>
         </view>
@@ -71,6 +71,7 @@
 import { inArray, arrayIntersect, debounce } from '@/utils/util'
 import { checkLogin, setCartTotalNum, setCartTabBadge } from '@/core/app'
 import * as UserApi from '@/api/user'
+import {formatAmount} from '@/api/order/comment'
 import EmptyCart from '@/components/empty-cart'
 import uniIcons from '../../../uni_modules/uni-icons/components/uni-icons/uni-icons'
 import {createOrder, delShopCart} from "../../../api/user";
@@ -159,6 +160,10 @@ export default {
             if (result.code == '200') {
               app.list = result.data
               app.total = result.data.length
+              app.list.forEach(item => {
+                item.total_money_str = formatAmount(item.total_money)
+                item.detail.price_str = formatAmount(Number(item.detail.price))
+              })
             }
             // 清除checkedIds中无效的ID
             app.onClearInvalidId()