Merge branch 'dev' into 'master'

uniapp【优化】: 适配app端/购物车商品增/减数量没有调用接口更新/页面loading 文字和icon调整为主题色红

See merge request jianweie/coreshoppro!58

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;
 		}
 	}

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>

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;
 		}
 

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;

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 {

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;

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>

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;

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>