Merge branch 'dev/1.0' of https://git.aigc-quickapp.com/Uniapp/lucky_shop into dev/1.0

2026-01-08 15:36:57 +08:00
parent 4f9c353e9a 52b5f5b006
commit ec05534ff1
3 changed files with 471 additions and 394 deletions
--- a/lang/zh-cn/order/activist.js
+++ b/lang/zh-cn/order/activist.js
@@ -1,6 +1,6 @@
-export const lang = {
-	//title为每个页面的标题
-	title: '售后',
-	checkDetail: '查看详情',
-	emptyTips: '暂无售后记录'
-}
+export const lang = {
+	//title为每个页面的标题
+	title: '售后',
+	checkDetail: '查看详情',
+	emptyTips: '暂无售后记录'
+}
--- a/pages_goods/list.vue
+++ b/pages_goods/list.vue
@@ -321,6 +321,7 @@ export default {
 <style scoped>
 >>>.uni-tag--primary.uni-tag--inverted {
 	background-color: #f5f5f5 !important;
+	
 }

 /deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
--- a/pages_tool/contact/contact.vue
+++ b/pages_tool/contact/contact.vue