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

zxl

4 天以前 c9928dd4f6d25e2339ea1400f59ec58674a927a7

 pages.json

@@ -63,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": {
@@ -132,16 +134,6 @@
            }
         }
      },
      // {
      //    "path": "components/popups/popups",
      //    "style": {
      //       "navigationBarTitleText": "",
      //       "navigationStyle": "custom",
      //       "componentPlaceholder": {
      //          "u-icon": "view"
      //       }
      //    }
      // },
      {
         "path": "components/m-buy/goods",
         "style": {
@@ -285,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": {
@@ -324,7 +318,9 @@
               "u-loading": "view",
               "u-checkbox": "view",
               "u-checkbox-group": "view",
               "u-navbar": "view"
               "u-navbar": "view",
               "u-loadmore":"view",
               "u-switch": "view"
            }
         }
      }
@@ -1433,7 +1429,27 @@
               }
            }
         ]
      },
      {
         "root": "pages/health",
         "pages": [{
            "path": "healthVideo",
            "style": {
               "navigationBarTitleText": "大健康"
            }
         }]
      }
      // ,
      // {
      //    "root": "pages/commodity-square",
      //    "pages": [{
      //       "path" : "commoditySquare",
      //       "style" :
      //       {
      //          "navigationBarTitleText" : "商品广场"
      //       }
      //    }]
      // }
   ],
   "globalStyle": {
      "navigationBarTextStyle": "black",
@@ -1461,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": "商城"