From 6574be0ea2925a55ed356d4f213c9234fbe53e1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?21=E4=B8=96=E7=BA=AA=E5=B0=8F=E5=85=AB=E8=B7=AF?=
 <2529156631@qq.com>
Date: Sat, 26 Oct 2024 16:13:28 +0800
Subject: [PATCH 1/3] =?UTF-8?q?uniapp=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91?=
 =?UTF-8?q?=EF=BC=9A=E9=A1=B5=E9=9D=A2loading=20=E6=96=87=E5=AD=97?=
 =?UTF-8?q?=E5=92=8Cicon=E8=B0=83=E6=95=B4=E4=B8=BA=E4=B8=BB=E9=A2=98?=
 =?UTF-8?q?=E8=89=B2=E7=BA=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CoreShop/components/coreshop-page/coreshop-page.vue     | 6 ++++--
 CoreCms.Net.Uni-App/CoreShop/pages/cart/cart.vue            | 2 +-
 CoreCms.Net.Uni-App/CoreShop/pages/category/category.vue    | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-page.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-page.vue
index 3731b59d..c846633a 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-page.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-page.vue
@@ -13,7 +13,7 @@
 		</coreshop-page-content>
 		<template v-if="props.needLoadingPage">
 			<uv-loading-page :loading="props.loadingPage" :loading-text="props.loadingText"
-				:font-size="props.loadingTextFontSize" :bgColor="props.loadingBgColor"></uv-loading-page>
+				:font-size="props.loadingTextFontSize" :color="props.loadingColor" :loadingColor="loadingColor" :bgColor="props.loadingBgColor"></uv-loading-page>
 		</template>
 	</template>
 </template>
@@ -38,6 +38,7 @@
 		loadingText : string;
 		loadingTextFontSize : string;
 		loadingBgColor : string;
+		loadingColor:string;
 	}>(), {
 		isBack: true,
 		bgColor: '#eef2f6',
@@ -62,7 +63,8 @@
 		needLoadingPage: false,
 		loadingText: '加载中...',
 		loadingTextFontSize: '24rpx',
-		loadingBgColor: 'rgba(255, 255, 255, 0.2)'
+		loadingBgColor: 'rgba(255, 255, 255, 0.2)',
+		loadingColor:'#d33123'
 	});
 </script>
 <style lang="scss" scoped>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/cart/cart.vue b/CoreCms.Net.Uni-App/CoreShop/pages/cart/cart.vue
index 2e72313a..34d4b5b2 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/cart/cart.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/cart/cart.vue
@@ -100,7 +100,7 @@
 				</view>
 			</view>
 		</view>
-		<uv-loading-page :loading="loading" loading-text="加载中..." font-size="24rpx"
+		<uv-loading-page :loading="loading" loading-text="加载中..." color="#d33123" loadingColor="#d33123" font-size="24rpx"
 			bgColor="rgba(255, 255, 255, 0.2)"></uv-loading-page>
 	</view>
 </template>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/category/category.vue b/CoreCms.Net.Uni-App/CoreShop/pages/category/category.vue
index d479873c..3c9ec712 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/category/category.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/category/category.vue
@@ -115,7 +115,7 @@
 				</view>
 			</view>
 		</view>
-		<uv-loading-page :loading="loading" loading-text="加载中..." font-size="24rpx"
+		<uv-loading-page :loading="loading" loading-text="加载中..." color="#d33123" loadingColor="#d33123" font-size="24rpx"
 			bgColor="rgba(255, 255, 255, 0.2)"></uv-loading-page>
 	</view>
 </template>

From 7dc19e8caae48dd044e6a456b946882b593ed5f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?21=E4=B8=96=E7=BA=AA=E5=B0=8F=E5=85=AB=E8=B7=AF?=
 <2529156631@qq.com>
Date: Sat, 26 Oct 2024 16:37:32 +0800
Subject: [PATCH 2/3] =?UTF-8?q?uniapp=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91?=
 =?UTF-8?q?=EF=BC=9A=20=E8=B4=AD=E7=89=A9=E8=BD=A6=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E5=A2=9E/=E5=87=8F=E6=95=B0=E9=87=8F=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E8=B0=83=E7=94=A8=E6=8E=A5=E5=8F=A3=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CoreCms.Net.Uni-App/CoreShop/core/api/cart.ts    |  4 ++++
 CoreCms.Net.Uni-App/CoreShop/pages/cart/cart.vue | 15 +++++++--------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/CoreCms.Net.Uni-App/CoreShop/core/api/cart.ts b/CoreCms.Net.Uni-App/CoreShop/core/api/cart.ts
index a1473f61..95ecf138 100644
--- a/CoreCms.Net.Uni-App/CoreShop/core/api/cart.ts
+++ b/CoreCms.Net.Uni-App/CoreShop/core/api/cart.ts
@@ -51,4 +51,8 @@ export const queryRemoveCart = (data : any) : Promise<Response<any>> => {
 	return post('Api/Cart/DoDelete', {
 		data,
 	}, true);
+}
+
+export const setCartProductNum = (productId : number, nums : number) => {
+	return post('api/Cart/SetCartNum', { data: { id: productId, nums } })
 }
\ No newline at end of file
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/cart/cart.vue b/CoreCms.Net.Uni-App/CoreShop/pages/cart/cart.vue
index 34d4b5b2..cfc3aa10 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/cart/cart.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/cart/cart.vue
@@ -1,5 +1,5 @@
 <template>
-	<coreshop-navbar :isBack="false" mode="left" title="购物车"> </coreshop-navbar> 
+	<coreshop-navbar :isBack="false" mode="left" title="购物车"> </coreshop-navbar>
 	<view class="content-box p-25 page-bg">
 		<view class="cart-box" v-if="state.cartList.length > 0">
 			<view class="all-select" :style="{ 'top': `${statusBarHeight}px` }">
@@ -100,8 +100,8 @@
 				</view>
 			</view>
 		</view>
-		<uv-loading-page :loading="loading" loading-text="加载中..." color="#d33123" loadingColor="#d33123" font-size="24rpx"
-			bgColor="rgba(255, 255, 255, 0.2)"></uv-loading-page>
+		<uv-loading-page :loading="loading" loading-text="加载中..." color="#d33123" loadingColor="#d33123"
+			font-size="24rpx" bgColor="rgba(255, 255, 255, 0.2)"></uv-loading-page>
 	</view>
 </template>
 
@@ -109,7 +109,7 @@
 	import { reactive, nextTick, computed, ref } from 'vue';
 	import { onShow, onPullDownRefresh } from '@dcloudio/uni-app';
 	import { handleStaticResources, hanldeShowModal, handleRouteSwitchTab, handleRouteNavigateTo, handleShowToast } from '@/core/utils';
-	import { queryCartList, deleteGoodsSingle, deleteGoodsSome } from '@/core/api';
+	import { queryCartList, deleteGoodsSingle, deleteGoodsSome, setCartProductNum } from '@/core/api';
 	import type { Response, CartListType, ShopConfigStoreType } from '@/core/models';
 	import { useShopConfigStore } from '@/core/store';
 	import {
@@ -244,11 +244,10 @@
 	}
 
 	/** 商品加减 */
-	const handleChangeGoodsNum = (e : any, item : any) => {
+	const handleChangeGoodsNum = async (e : any, item : CartListType) => {
+		await setCartProductNum(item.productId, e.value);
 		item.nums = e.value;
-		nextTick(() => {
-			handleCalculatePrice();
-		})
+		handleCalculatePrice();
 	}
 
 	/** 单个删除 */

From b3329208d9342df0772ba2cf2dcdcacac66bfde8 Mon Sep 17 00:00:00 2001
From: 15093570141 <141405260+17521612761@users.noreply.github.com>
Date: Sun, 27 Oct 2024 19:27:18 +0800
Subject: [PATCH 3/3] =?UTF-8?q?uniapp=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91:?=
 =?UTF-8?q?=20=E9=80=82=E9=85=8Dapp=E7=AB=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/coreshop-article/coreshop-article.scss      | 7 +++----
 .../components/coreshop-article/coreshop-article.vue       | 2 +-
 .../coreshop-goods-card/coreshop-goods-card.scss           | 3 ++-
 .../home-article-classify/home-article-classify.scss       | 1 +
 .../components/home-service-good/home-service-good.scss    | 3 +--
 .../pages/subpackage/member/invite/invite/invite.scss      | 6 +++---
 .../CoreShop/pages/subpackage/member/set/index/index.vue   | 2 +-
 .../CoreShop/pages/subpackage/merchant/index/index.scss    | 4 ++--
 .../CoreShop/pages/subpackage/merchant/index/index.vue     | 4 ++--
 9 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-article/coreshop-article.scss b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-article/coreshop-article.scss
index 76bf49d7..ee0e23ac 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-article/coreshop-article.scss
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-article/coreshop-article.scss
@@ -1,7 +1,6 @@
-.article-box {
+.layout-article-box {
 	display: flex;
 	justify-content: space-between;
-
 	.article-img {
 		display: flex;
 
@@ -17,8 +16,7 @@
 		margin-left: 20rpx;
 		justify-content: space-between;
 		display: flex;
-		flex-direction: column;
-
+		flex-direction: column; 
 		.title {
 			height: 80rpx;
 			overflow: hidden;
@@ -30,6 +28,7 @@
 			height: 96rpx;
 			overflow: hidden;
 			font-size: 24rpx;
+			line-height: 32rpx;
 			color: #999;
 		}
 	}
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-article/coreshop-article.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-article/coreshop-article.vue
index c2cbc48d..1435824d 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-article/coreshop-article.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-article/coreshop-article.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class="article-box">
+	<view class="layout-article-box">
 		<view class="article-img" @click="handleClickArticle">
 			<image class="img" :src="props.data?.image || handleStaticResources('/static/images/common/empty.png')">
 			</image>
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-goods-card/coreshop-goods-card.scss b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-goods-card/coreshop-goods-card.scss
index 63d4017a..e05c37f8 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-goods-card/coreshop-goods-card.scss
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-goods-card/coreshop-goods-card.scss
@@ -20,7 +20,8 @@
 		.name-two {
 			font-size: 30rpx;
 			color: #292b2e;
-			height: 75rpx;
+			height: 75rpx; 
+			line-height: 40rpx; 
 			overflow: hidden;
 		}
 
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-article-classify/home-article-classify.scss b/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-article-classify/home-article-classify.scss
index 8ec24440..ff884d4e 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-article-classify/home-article-classify.scss
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-article-classify/home-article-classify.scss
@@ -3,6 +3,7 @@
 	border-radius: 15rpx;
 	background-color: #fff;
 	.title-box {
+		
 		display: flex;
 		align-items: center;
 		justify-content: space-between;
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-service-good/home-service-good.scss b/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-service-good/home-service-good.scss
index d9119abd..37de991b 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-service-good/home-service-good.scss
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-service-good/home-service-good.scss
@@ -13,8 +13,7 @@
 		}
 	}
 
-	.card-box {
-		display: flex;
+	.card-box { 
 		margin-top: 35rpx;
 
 		.goods-card {
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/member/invite/invite/invite.scss b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/member/invite/invite/invite.scss
index 6688cff9..2f073dab 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/member/invite/invite/invite.scss
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/member/invite/invite/invite.scss
@@ -10,7 +10,7 @@
 
 	.bg-title {
 		position: fixed;
-		top: 200rpx;
+		top: 155rpx;
 		left: 50%;
 		transform: translateX(-50%);
 		width: 508rpx;
@@ -18,9 +18,9 @@
 
 	.invite-box {
 		position: fixed;
-		top: 380rpx;
+		top: 50%;
 		left: 50%;
-		transform: translateX(-50%);
+		transform: translate(-50%,-50%);
 
 		.invite-code {
 			width: 500rpx;
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/member/set/index/index.vue b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/member/set/index/index.vue
index 9f8e2376..32491277 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/member/set/index/index.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/member/set/index/index.vue
@@ -9,7 +9,7 @@
 				<uv-icon name="arrow-right" size="18" color="#000"></uv-icon>
 			</view>
 			<!-- #ifdef APP-PLUS || APP-PLUS-NVUE -->
-			<view class="item-box">
+			<view class="item-box" @click="handleRouteNavigateTo(`/pages/subpackage/member/set/password/password`)">
 				<view class="title-box">
 					<uv-icon name="empty-list" size="18" color="#000"></uv-icon>
 					<view class="title">修改密码</view>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/merchant/index/index.scss b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/merchant/index/index.scss
index 3ad2d301..dcbc0e1b 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/merchant/index/index.scss
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/merchant/index/index.scss
@@ -90,12 +90,12 @@
 	justify-content: space-between;
 	.order,
 	.price {
-		width: 43%;
+		width: 45%;
 		font-size: 27rpx;
 		color: #000;
 		background-color: #fff;
 		border-radius: 15rpx;
-		padding: 20rpx;
+		padding: 20rpx 10rpx;
 		text-align: center;
 		background: rgba(76, 184, 157, 0.06);
 		border: 0.5px solid #b9e3d9;
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/merchant/index/index.vue b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/merchant/index/index.vue
index a3cca25c..74b9fd1b 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/merchant/index/index.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/merchant/index/index.vue
@@ -101,10 +101,10 @@
 
 			<view class="total-box">
 				<view class="order">
-					订单量（单）：{{state.totalCount}}
+					订单量(单)：{{state.totalCount}}
 				</view>
 				<view class="price">
-					交易额（单）：￥{{state.totalMoney}}
+					交易额(单)：￥{{state.totalMoney}}
 				</view>
 			</view>