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

zxl

4 天以前 c9928dd4f6d25e2339ea1400f59ec58674a927a7

 pages.json

@@ -277,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": {
@@ -316,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"
            }
         }
      }