From 9e0d2563ee3adc08b27f365e315855d776fd08f0 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期五, 11 七月 2025 10:00:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
pages.json | 83 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 80 insertions(+), 3 deletions(-)
diff --git a/pages.json b/pages.json
index 99b0f4d..e04b985 100644
--- a/pages.json
+++ b/pages.json
@@ -240,7 +240,7 @@
}
},
{
- "path": "pages/goods-manager/addGoods/addGoods",
+ "path": "pages/supplier/publish-goods/publishGoods",
"style": {
"enablePullDownRefresh": true,
"navigationBarTitleText": "鏂板鍟嗗搧",
@@ -365,6 +365,13 @@
"u-loadmore":"view",
"u-switch": "view"
}
+ }
+ },
+ {
+ "path" : "pages/supplier/publish-goods/goodsInfo",
+ "style" :
+ {
+ "navigationBarTitleText" : ""
}
}
],
@@ -809,6 +816,53 @@
}
},
{
+ "path" : "activity/applayActivityList",
+ "style" :
+ {
+ "navigationBarTitleText": "鐢宠娲诲姩鍒楄〃",
+ "enablePullDownRefresh": true, //涓嬫媺鍒锋柊
+ "componentPlaceholder": {
+ "u-form": "view",
+ "u-form-item": "view",
+ "u-input": "view",
+ "u-icon": "view",
+ "u-action-sheet": "view",
+ "u-checkbox-group": "view",
+ "u-checkbox": "view",
+ "u-navbar": "view",
+ "u-button": "view",
+ "u-image": "view",
+ "u-loadmore": "view",
+ "u-empty":"view"
+ }
+ }
+ },
+ {
+ "path" : "activity/addActivity",
+ "style" :
+ {
+ "navigationBarTitleText": "鐢宠娲诲姩",
+ "componentPlaceholder": {
+ "u-form": "view",
+ "u-form-item": "view",
+ "u-input": "view",
+ "u-icon": "view",
+ "u-action-sheet": "view",
+ "u-checkbox-group": "view",
+ "u-checkbox": "view",
+ "u-navbar": "view",
+ "u-button": "view",
+ "u-image": "view",
+ "u-loadmore": "view",
+ "u-empty":"view",
+ "u-datetime-picker":"view",
+ "u-radio-group":"view",
+ "u-radio":"view",
+ "u-cell":"view"
+ }
+ }
+ },
+ {
"path": "myCollect/myCollect",
"style": {
"navigationBarTitleText": "鎴戠殑鏀惰棌",
@@ -827,6 +881,14 @@
"u-loadmore": "view"
}
}
+ },
+ {
+ "path" : "myAttention",
+ "style" :
+ {
+ "navigationBarTitleText" : "鍏虫敞鍒楄〃",
+ "enablePullDownRefresh": true
+ }
}
]
},
@@ -836,8 +898,7 @@
{
"path": "shopPage",
"style": {
- "navigationBarTitleText": "",
- "navigationStyle": "custom"
+ "navigationBarTitleText": ""
}
},
{
@@ -1490,6 +1551,22 @@
"navigationStyle": "custom"
}
}]
+ },
+ {
+ "root": "pages/supplier/suppler-order",
+ "pages": [{
+ "path": "suppler-order",
+ "style": {
+ "navigationBarTitleText": "渚涘簲鍟嗙"
+ // "navigationStyle": "custom"
+ }
+ },{
+ "path": "order-detail",
+ "style": {
+ "navigationBarTitleText": "璁㈠崟璇︽儏"
+ // "navigationStyle": "custom"
+ }
+ }]
}
// ,
// {
--
Gitblit v1.8.0