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

zxl

4 天以前 c9928dd4f6d25e2339ea1400f59ec58674a927a7

 pages.json

@@ -2,20 +2,20 @@
   "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": {
      "pages/tabbar/index/home": // 页面路径
      // 页面的预下载配置
      {
         "network": "all", // all(不限网络) wifi(仅wifi下预下载)
         "packages": [
            "components/uview-components"
         ] // 预下载分包的 root 或 name。__APP__ 表示主包
      }
   },
   // "preloadRule": {
   //    "pages/tabbar/index/home": // 页面路径
   //    // 页面的预下载配置
   //    {
   //       "network": "all", // all(不限网络) wifi(仅wifi下预下载)
   //       "packages": [
   //          "components/uview-components"
   //       ] // 预下载分包的 root 或 name。__APP__ 表示主包
   //    }
   // },
   "pages": [
      // 第一个就是首页
      {
@@ -26,12 +26,6 @@
            "navigationStyle": "custom" // 隐藏顶部导航栏
         }
      },
      // {
      //    "path": "pages/tabbar/index/home1",
      //    "style": {
      //       "navigationBarTitleText": ""
      //    }
      // },
      {
         "path": "pages/tabbar/home/index",
         "style": {
@@ -69,12 +63,14 @@
         }
      },
      {
         "path": "pages/tabbar/category/category",
         // "path": "pages/tabbar/category/category",
         "path": "pages/commodity-square/commoditySquare",
		
         "style": {
            "navigationBarTitleText": "分类",
            "navigationStyle": "custom", // 隐藏系统导航栏
            "navigationBarTitleText": "商品广场",
            // "navigationStyle": "custom", // 隐藏系统导航栏
            "navigationBarTextStyle": "black",
            "disableScroll": true,
            // "disableScroll": true,
            "bounce": "none",
            "scrollIndicator": "none",
            "componentPlaceholder": {
@@ -134,16 +130,6 @@
            "navigationStyle": "custom",
            "componentPlaceholder": {
               "u-popup": "view",
               "u-icon": "view"
            }
         }
      },
      {
         "path": "components/popups/popups",
         "style": {
            "navigationBarTitleText": "",
            "navigationStyle": "custom",
            "componentPlaceholder": {
               "u-icon": "view"
            }
         }
@@ -264,6 +250,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": "用户权限",
@@ -276,29 +277,31 @@
               "u-popup": "view",
               "u-search": "view",
               "u-loading": "view",
               "u-navbar": "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"
            }
         }
      },
      // {
      //    "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": {
@@ -315,25 +318,27 @@
               "u-loading": "view",
               "u-checkbox": "view",
               "u-checkbox-group": "view",
               "u-navbar": "view"
               "u-navbar": "view",
               "u-loadmore":"view",
               "u-switch": "view"
            }
         }
      }
   ],
   "subPackages": [
      {
         "root": "components/uview-components", // 必须与preloadRule中的名称完全一致
         "name": "uview-components",
         "pages": [
            {
               "path": "pages/empty-page/empty-page",
               "style": {
                  "navigationBarTitleText": "",
                  "disableScroll": true
               }
            }
         ]
      },
      // {
      //    "root": "components/uview-components", // 必须与preloadRule中的名称完全一致
      //    "name": "uview-components",
      //    "pages": [
      //       {
      //          "path": "pages/empty-page/empty-page",
      //          "style": {
      //             "navigationBarTitleText": "",
      //             "disableScroll": true
      //          }
      //       }
      //    ]
      // },
      {
         "root": "pages/mine",
         "pages": [
@@ -1424,7 +1429,27 @@
               }
            }
         ]
      },
      {
         "root": "pages/health",
         "pages": [{
            "path": "healthVideo",
            "style": {
               "navigationBarTitleText": "大健康"
            }
         }]
      }
      // ,
      // {
      //    "root": "pages/commodity-square",
      //    "pages": [{
      //       "path" : "commoditySquare",
      //       "style" :
      //       {
      //          "navigationBarTitleText" : "商品广场"
      //       }
      //    }]
      // }
   ],
   "globalStyle": {
      "navigationBarTextStyle": "black",
@@ -1452,7 +1477,8 @@
            "text": "首页"
         },
         {
            "pagePath": "pages/tabbar/category/category",
            // "pagePath": "pages/tabbar/category/category",
            "pagePath": "pages/commodity-square/commoditySquare",
            "iconPath": "static/tabbar/category.png",
            "selectedIconPath": "static/tabbar/category-s.png",
            "text": "商城"