Merge branch 'weapp' into rn

package.json

@@ -60,7 +60,7 @@
     "@tarojs/taro-router-rn": "^1.3.12",
     "@tarojs/taro-redux-rn": "^1.3.12",
     "react": "16.3.1",
-    "react-native": "0.55.4"
+    "react-native": "0.59.8"
   },
   "devDependencies": {
     "@tarojs/plugin-babel": "1.3.12",
@@ -93,4 +93,4 @@
     "tslint-react": "^4.0.0",
     "typescript": "^3.0.1"
   }
-}
\ No newline at end of file
+}

src/conpoments/device_item/index.scss

@@ -9,11 +9,12 @@
 }
 
 .device-item-img-wrapper {
+  @include eject(box-sizing, border-box);
+
   width: 320px;
   height: 180px;
   padding: 4.5px 8px;
   border-radius: 8px;
-  box-sizing: border-box;
   border: 1px solid $border-color;
 }
 

src/conpoments/modal/index.scss

@@ -24,8 +24,8 @@
 }
 
 .modal-title {
-  display: block;
-  // font-size: 26px;
+  @include eject(display, block);
+
   text-align: center;
   padding-bottom: 20px;
   border: 0 solid $border-color;

src/pages/home/device/add/index.scss

@@ -13,12 +13,13 @@
 }
 
 .add-device-pin-input {
+  @include eject(box-sizing, border-box);
+
   width: 100%;
   height: 60px;
   padding: 10px;
   margin: 20px 0;
   border-radius: 6px;
-  box-sizing: border-box;
   border: 1px solid $border-color;
 }
 

src/pages/home/tempaltes/conpoments/temp_item/index.scss

@@ -14,13 +14,12 @@
 }
 
 .temp-name {
-  // display: block;
   @include eject(display, block);
+  @include eject(box-sizing, border-box);
 
   width: 100%;
   font-size: 28px;
   padding-top: 10px;
-  box-sizing: border-box;
   background-color: white;
 }
 

src/pages/home/tempaltes/scss/index.scss

@@ -17,13 +17,14 @@
 }
 
 .search {
+  @include eject(box-sizing, border-box);
+
   padding: 0;
   width: 100%;
   height: 100%;
   font-size: 26px;
   color: #969799;
   padding-left: 20px;
-  box-sizing: border-box;
   background-color: #f7f8fa;
 }
 
@@ -33,12 +34,13 @@
 }
 
 .scroll-view {
+  @include eject(box-sizing, border-box);
+
   width: 100%;
   height: 100%;
   padding-top: 20px;
   padding-left: 20px;
   padding-right: 20px;
-  box-sizing: border-box;
 }
 
 .list-wrapper {