Merge branch 'master' of https://e.coding.net/chuanghaikeji/smarCampus/waterElectricityMinApp

App.vue

@@ -8,6 +8,9 @@
 		},
 		onHide: function() {
 			// console.log('App Hide')
+		},
+		globalData: {
+			primaryColor: '#1296db'
 		}
 	}
 </script>

pages/reshui/reshui.vue

@@ -18,7 +18,7 @@
 						<text>开启设备</text>
 					</view>
 					<view>
-						<switch color="#1296db" :checked="isChecked" @change="switchChange" />
+						<switch :color="colorPrimary" :checked="isChecked" @change="switchChange" />
 					</view>
 				</view>
 				<view class="start_mid">
@@ -37,7 +37,7 @@
 				</view>
 			</view>
 			<view class="start_up_process">
-				<uni-steps :options="list1" active-color="#1296db" :active="active" />
+				<uni-steps :options="list1" :active-color="colorPrimary" :active="active" />
 			</view>
 			<view class="title">
 				消费记录
@@ -75,6 +75,7 @@
 		},
 		data() {
 			return {
+				colorPrimary: getApp().globalData.primaryColor,
 				date: getDate({
 					format: true
 				}),