From f93f0adbdf9168462d60addcded22f627e27f450 Mon Sep 17 00:00:00 2001
From: ninaSun <serena_online@163.com>
Date: Mon, 27 May 2024 18:08:02 +0800
Subject: [PATCH 1/2] update gitirnore

---
 .gitignore | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..40b6a5d
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,10 @@
+/unpackage/dist/*
+/unpackage/debug/*
+/unpackage/cache/*
+/unpackage/release/*
+/node_modules/*
+/unpackage
+/.idea/*
+deploy.sh
+.DS_Store
+/.hbuilderx/*
-- 
Gitee


From 87657e74c0a466a7f482b085eb6705568b2a35dd Mon Sep 17 00:00:00 2001
From: ninaSun <serena_online@163.com>
Date: Wed, 3 Jul 2024 15:49:24 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E3=80=81=E7=BB=93=E7=AE=97=E6=8A=A5=E9=94=99=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 order-module/checkout/checkout.vue      | 14 +++++++-------
 promotion-module/crowdfunding/index.vue | 15 +++++++++------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/order-module/checkout/checkout.vue b/order-module/checkout/checkout.vue
index 78f5ce7..277df9b 100644
--- a/order-module/checkout/checkout.vue
+++ b/order-module/checkout/checkout.vue
@@ -909,13 +909,13 @@ export default {
     },
     //获取购物清单，和结算金额
     getCarts() {
-      let fun = () => API_Trade.getCarts('checked', this.way)
-        if(this.isAssemble){
-          fun = API_Trade.getAssembleCarts()
-        }
-        if(this.crowdfundingShowFlag){
-          fun = API_Crowdfunding.getCart()
-        }
+      let fun = API_Trade.getCarts('checked', this.way)
+			if(this.isAssemble){
+				fun = API_Trade.getAssembleCarts()
+			}
+			if(this.crowdfundingShowFlag){
+				fun = API_Crowdfunding.getCart()
+			}
       fun.then(response => {
         const { cart_list, total_price,coupon_list} = response
         this.orderTotal = total_price
diff --git a/promotion-module/crowdfunding/index.vue b/promotion-module/crowdfunding/index.vue
index 8ac411e..eb8bd40 100644
--- a/promotion-module/crowdfunding/index.vue
+++ b/promotion-module/crowdfunding/index.vue
@@ -14,9 +14,9 @@
               <view class="u-line-2 u-m-b-30">
                 <view class="u-flex">
                   <view class="u-flex-9">
-                    <progress activeColor="rgb(249, 93, 53)" :percent="crowdfunding.price_percent" stroke-width="10" />
+                    <progress activeColor="rgb(249, 93, 53)" :percent="crowdfunding.price_percent" stroke-width="8" />
                   </view>
-                  <view class="u-flex-2" style="margin-left: 10rpx;color: rgb(249, 93, 53);font-weight: 700">
+                  <view class="u-flex-2" style="margin-left: 10rpx;color: rgb(249, 93, 53);font-weight: 700;font-size:28rpx;">
                     {{ formatProgressText(crowdfunding.price_percent_int) }}
                   </view>
                 </view>
@@ -24,7 +24,7 @@
               </view>
               <view class="u-flex">
                 <view class="u-flex-1">
-                  <custom-price :price="crowdfunding.curr_price" textColor="black" :size="40" :fontWeight="700"></custom-price>
+                  <custom-price :price="crowdfunding.curr_price" textColor="black" :size="30" :fontWeight="700"></custom-price>
                 </view>
                 <navigator style="margin-bottom: 5rpx;margin-right: 10rpx" hover-class="none"
                            :url="'/goods-module/goods?goods_id=' + crowdfunding.goods_sku.goods_id + '&from_nav=crowdfunding&sku_id=' + crowdfunding.goods_sku.sku_id + '&crowdfundingId=' + crowdfunding.id">
@@ -138,8 +138,9 @@ export default {
     .goods-item {
       padding: 20rpx;
       border: 2rpx solid #E4E7Ed;
-      margin: 20rpx;
+      margin: 30rpx 20rpx;
       border-radius: 20rpx;
+      box-shadow: 0 0 8rpx 0 rgba(0,0,0,0.1);
 
       .goods-img {
         width: 200rpx;
@@ -159,7 +160,8 @@ export default {
         color: rgb(221, 188, 154);
         background-color: rgb(26, 25, 25);
         border-radius: 35rpx;
-        font-size: 35rpx;
+				font-weight: 500;
+        font-size: 22rpx;
       }
 
       .divide{
@@ -171,7 +173,8 @@ export default {
       .crowdfunding-data{
         .font{
           color: rgb(158, 147, 136);
-          font-size: 28rpx;
+					font-weight: 500;
+          font-size: 25rpx;
         }
       }
     }
-- 
Gitee