Merge branch 'dev/1.0' into custom/common

2026-01-08 15:10:46 +08:00
parent aa2f13f3b2
commit 23c954981b
92 changed files with 1975 additions and 382 deletions
--- a/pages_goods/cart.vue
+++ b/pages_goods/cart.vue
@@ -203,7 +203,7 @@
 							:emptyBtn="{ text: $lang('toGoodsCategoryPage'), url: '/pages_goods/category' }"></ns-empty>
 						<button type="primary" size="mini" class="button mini" v-if="!storeToken" @click="toLogin">{{
 							$lang('toLogin')
-							}}</button>
+						}}</button>

 					</view>
 				</block>
--- a/pages_goods/public/css/list.scss
+++ b/pages_goods/public/css/list.scss
@@ -400,7 +400,7 @@
 			.price {
 				color: var(--price-color);
 				color: #fff !important;
-				font-size: 15rpx !important;
+				font-size: 27rpx !important;
 				font-weight: bold !important;
 			}
 		}