Merge remote-tracking branch 'origin/dev' into dev

xiangpei

2025-07-09 a1c289e7dfc5d9a3b8dc7ca9b05857f276c05f8d

 pages.json

@@ -36,6 +36,13 @@
         }
      },
      {
         "path": "pages/kitchen/KitchenVideo",
         "style": {
            "navigationBarTitleText": "神厨",
            "navigationStyle": "custom" // 隐藏系统导航栏
         }
      },
      {
         "path": "pages/tabbar/home/title",
         "style": {
            "navigationBarTitleText": "消息"
@@ -68,7 +75,7 @@
      
         "style": {
            "navigationBarTitleText": "商品广场",
            // "navigationStyle": "custom", // 隐藏系统导航栏
            "navigationStyle": "custom", // 隐藏系统导航栏
            "navigationBarTextStyle": "black",
            // "disableScroll": true,
            "bounce": "none",
@@ -233,7 +240,7 @@
         }
      },
      {
         "path": "pages/goods-manager/addGoods/addGoods",
         "path": "pages/supplier/publish-goods/publishGoods",
         "style": {
            "enablePullDownRefresh": true,
            "navigationBarTitleText": "新增商品",
@@ -268,6 +275,42 @@
         "path": "pages/userPermissions/userPermissions",
         "style": {
            "navigationBarTitleText": "用户权限",
            "componentPlaceholder": {
               "u-icon": "view",
               "u-button": "view",
               "u-form": "view",
               "u-form-item": "view",
               "u-input": "view",
               "u-popup": "view",
               "u-search": "view",
               "u-loading": "view",
               "u-navbar": "view",
               "u-loadmore":"view"
            }
         }
      },
      {
         "path": "pages/news/news",
         "style": {
            "navigationBarTitleText": "新闻",
            "componentPlaceholder": {
               "u-icon": "view",
               "u-button": "view",
               "u-form": "view",
               "u-form-item": "view",
               "u-input": "view",
               "u-popup": "view",
               "u-search": "view",
               "u-loading": "view",
               "u-navbar": "view",
               "u-loadmore":"view"
            }
         }
      },
      {
         "path": "pages/news/detail",
         "style": {
            "navigationBarTitleText": "新闻详情",
            "componentPlaceholder": {
               "u-icon": "view",
               "u-button": "view",
@@ -322,6 +365,13 @@
               "u-loadmore":"view",
               "u-switch": "view"
            }
         }
      },
      {
         "path" : "pages/supplier/publish-goods/goodsInfo",
         "style" : 
         {
            "navigationBarTitleText" : ""
         }
      }
   ],
@@ -749,6 +799,7 @@
               "style": {
                  "navigationBarTitleText": "活动",
                  "enablePullDownRefresh": true, //下拉刷新
                  "navigationStyle": "custom", // 隐藏顶部导航栏
                  "componentPlaceholder": {
                     "u-form": "view",
                     "u-form-item": "view",
@@ -783,6 +834,14 @@
                     "u-loadmore": "view"
                  }
               }
            },
            {
               "path" : "myAttention",
               "style" : 
               {
                  "navigationBarTitleText" : "关注列表",
                  "enablePullDownRefresh": true
               }
            }
         ]
      },
@@ -792,8 +851,7 @@
            {
               "path": "shopPage",
               "style": {
                  "navigationBarTitleText": "",
                  "navigationStyle": "custom"
                  "navigationBarTitleText": ""
               }
            },
            {
@@ -993,6 +1051,13 @@
                  "componentPlaceholder": {
                     "u-button": "view"
                  }
               }
            },
            {
               "path" : "video-search",
               "style" : 
               {
                  "navigationBarTitleText" : ""
               }
            }
         ]
@@ -1435,16 +1500,24 @@
         "pages": [{
            "path": "healthVideo",
            "style": {
               "navigationBarTitleText": "大健康"
               "navigationBarTitleText": "大健康",
               "navigationStyle": "custom"
            }
         }]
      },
      {
         "root": "pages/kitchen",
         "root": "pages/supplier/suppler-order",
         "pages": [{
            "path": "KitchenVideo",
            "path": "suppler-order",
            "style": {
               "navigationBarTitleText": "厨神"
               "navigationBarTitleText": "供应商端"
               // "navigationStyle": "custom"
            }
         },{
            "path": "order-detail",
            "style": {
               "navigationBarTitleText": "订单详情"
               // "navigationStyle": "custom"
            }
         }]
      }
@@ -1487,10 +1560,10 @@
         },
         {
            // "pagePath": "pages/tabbar/category/category",
            "pagePath": "pages/commodity-square/commoditySquare",
            "pagePath": "pages/kitchen/KitchenVideo",
            "iconPath": "static/tabbar/category.png",
            "selectedIconPath": "static/tabbar/category-s.png",
            "text": "商城"
            "text": "神厨"
         },
         {
            "pagePath": "pages/tabbar/video/video",