Merge branch 'test' into 'master'

package.json

@@ -34,7 +34,7 @@
     "nprogress": "^0.2.0",
     "popmotion": "^8.1.22",
     "qiniu-js": "^2.2.0",
-    "rym-element-ui": "^0.1.61",
+    "rym-element-ui": "^0.1.62",
     "vue-qr": "^1.2.8",
     "vuedraggable": "^2.16.0",
     "wangeditor": "^3.1.1"

src/assets/styles/index.scss

@@ -100,6 +100,12 @@ body {
 .el-button {
   padding: 0 8px;
 }
+
+.device-footer-btn {
+  flex: 1;
+  padding-left: 20px;
+}
+
 @media screen and (min-width: $bigScreenWidth) {
   #app {
     font-size: 14px;

src/containers/Dashboard/CustomerData/CustomerData.vue

@@ -5,7 +5,7 @@
         <operator-select
           :accessType="1"
           :value="filters.operateId"
-          @input="val => updateFilters({operateId: val,areaId:undefined})"
+          @input="val => updateFilters({operateId: val,areaId:[]})"
         />
       </search-item>
       <search-item label="区域">