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

peng

4 天以前 5027240f2bbc9a7f74b8cc661c265eb9d52eb43a

 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": {
@@ -26,12 +26,6 @@
            "navigationStyle": "custom" // 隐藏顶部导航栏
         }
      },
      // {
      //    "path": "pages/tabbar/index/home1",
      //    "style": {
      //       "navigationBarTitleText": ""
      //    }
      // },
      {
         "path": "pages/tabbar/home/index",
         "style": {
@@ -254,6 +248,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": "用户权限",