Merge branch 'chronic-master' of…

Merge branch 'chronic-master' of http://gitlab.yiboshi.com/nightkis1995/frontend-h5 into chronic-master

src/resident/Resident.vue

@@ -26,6 +26,7 @@ export default {
                 buttonDefaultBorderColor: '#BFBFBF',
                 buttonNormalFontSize: '.16rem',
                 pickerConfirmActionColor: '#54CCBD',
+                checkboxCheckedIconColor: '#54CCBD',
                 // tab
                 tabsBottomBarColor: '#54CCBD',
                 // 级联选项
@@ -33,6 +34,7 @@ export default {
                 // 表单相关
                 cellVerticalPadding: '.15rem',
                 cellTextColor: '#262626',
+                fieldLabelColor: '#262626',
                 cellBorderColor: '#d9d9d9'
             }
         }