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

peng

2025-07-03 0d64f3e54a56c2e69ff154c91a799adb17b070bd

 pages.json

@@ -2,8 +2,8 @@
   "easycom": {
      "autoscan": true,
      "custom": {
         "^u-(.*)": "@/components/uview-components/uview-ui/components/u-$1/u-$1.vue", //uview,
         "^uni-(.*)": "@/uni_modules/uni-$1/components/uni-$1/uni-$1.vue" // uniapp组件
         "^u-(.*)": "@/components/uview-components/uview-ui/components/u-$1/u-$1.vue" //uview,
         // "^uni-(.*)": "@/uni_modules/uni-$1/components/uni-$1/uni-$1.vue" // uniapp组件
      }
   },
   // "preloadRule": {
@@ -36,6 +36,13 @@
         }
      },
      {
         "path": "pages/kitchen/KitchenVideo",
         "style": {
            "navigationBarTitleText": "神厨",
            "navigationStyle": "custom" // 隐藏系统导航栏
         }
      },
      {
         "path": "pages/tabbar/home/title",
         "style": {
            "navigationBarTitleText": "消息"
@@ -63,12 +70,14 @@
         }
      },
      {
         "path": "pages/tabbar/category/category",
         // "path": "pages/tabbar/category/category",
         "path": "pages/commodity-square/commoditySquare",
		
         "style": {
            "navigationBarTitleText": "分类",
            "navigationBarTitleText": "商品广场",
            "navigationStyle": "custom", // 隐藏系统导航栏
            "navigationBarTextStyle": "black",
            "disableScroll": true,
            // "disableScroll": true,
            "bounce": "none",
            "scrollIndicator": "none",
            "componentPlaceholder": {
@@ -132,16 +141,6 @@
            }
         }
      },
      // {
      //    "path": "components/popups/popups",
      //    "style": {
      //       "navigationBarTitleText": "",
      //       "navigationStyle": "custom",
      //       "componentPlaceholder": {
      //          "u-icon": "view"
      //       }
      //    }
      // },
      {
         "path": "components/m-buy/goods",
         "style": {
@@ -258,6 +257,21 @@
         }
      },
      {
         "path": "pages/goods-manager/updateSkus/updateSkus",
         "style": {
            "enablePullDownRefresh": true,
            "navigationBarTitleText": "调整库存",
            "componentPlaceholder": {
               "u-icon": "view",
               "u-button": "view",
               "u-form": "view",
               "u-form-item": "view",
               "u-input": "view",
               "u-popup": "view"
            }
         }
      },
      {
         "path": "pages/userPermissions/userPermissions",
         "style": {
            "navigationBarTitleText": "用户权限",
@@ -270,14 +284,15 @@
               "u-popup": "view",
               "u-search": "view",
               "u-loading": "view",
               "u-navbar": "view"
               "u-navbar": "view",
               "u-loadmore":"view"
            }
         }
      },
      {
         "path": "pages/customerManager/customerManager",
         "path": "pages/news/news",
         "style": {
            "navigationBarTitleText": "客户管理",
            "navigationBarTitleText": "新闻",
            "componentPlaceholder": {
               "u-icon": "view",
               "u-button": "view",
@@ -287,12 +302,49 @@
               "u-popup": "view",
               "u-search": "view",
               "u-loading": "view",
               "u-checkbox": "view",
               "u-checkbox-group": "view",
               "u-navbar": "view"
               "u-navbar": "view",
               "u-loadmore":"view"
            }
         }
      },
      {
         "path": "pages/news/detail",
         "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/customerManager/customerManager",
      //    "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-checkbox": "view",
      //          "u-checkbox-group": "view",
      //          "u-navbar": "view",
      //          "u-loadmore":"view"
      //       }
      //    }
      // },
      {
         "path": "pages/userPermissions/addStoreMember",
         "style": {
@@ -309,7 +361,9 @@
               "u-loading": "view",
               "u-checkbox": "view",
               "u-checkbox-group": "view",
               "u-navbar": "view"
               "u-navbar": "view",
               "u-loadmore":"view",
               "u-switch": "view"
            }
         }
      }
@@ -738,6 +792,7 @@
               "style": {
                  "navigationBarTitleText": "活动",
                  "enablePullDownRefresh": true, //下拉刷新
                  "navigationStyle": "custom", // 隐藏顶部导航栏
                  "componentPlaceholder": {
                     "u-form": "view",
                     "u-form-item": "view",
@@ -781,8 +836,7 @@
            {
               "path": "shopPage",
               "style": {
                  "navigationBarTitleText": "",
                  "navigationStyle": "custom"
                  "navigationBarTitleText": ""
               }
            },
            {
@@ -982,6 +1036,13 @@
                  "componentPlaceholder": {
                     "u-button": "view"
                  }
               }
            },
            {
               "path" : "video-search",
               "style" : 
               {
                  "navigationBarTitleText" : ""
               }
            }
         ]
@@ -1418,7 +1479,28 @@
               }
            }
         ]
      },
      {
         "root": "pages/health",
         "pages": [{
            "path": "healthVideo",
            "style": {
               "navigationBarTitleText": "大健康",
               "navigationStyle": "custom"
            }
         }]
      }
      // ,
      // {
      //    "root": "pages/commodity-square",
      //    "pages": [{
      //       "path" : "commoditySquare",
      //       "style" :
      //       {
      //          "navigationBarTitleText" : "商品广场"
      //       }
      //    }]
      // }
   ],
   "globalStyle": {
      "navigationBarTextStyle": "black",
@@ -1446,10 +1528,11 @@
            "text": "首页"
         },
         {
            "pagePath": "pages/tabbar/category/category",
            // "pagePath": "pages/tabbar/category/category",
            "pagePath": "pages/kitchen/KitchenVideo",
            "iconPath": "static/tabbar/category.png",
            "selectedIconPath": "static/tabbar/category-s.png",
            "text": "商城"
            "text": "神厨"
         },
         {
            "pagePath": "pages/tabbar/video/video",