合并前提交

pages/index/index.vue

@@ -17,10 +17,10 @@
 					<image src="../../static/images/air.png" mode=""></image>
 					<text>共享空调</text>
 				</navigator>
-				<navigator :url="'/pagesBus/bus/bus'" open-type="navigate" class="menu_item">
+				<!-- <navigator :url="'/pagesBus/bus/bus'" open-type="navigate" class="menu_item">
 					<image src="../../static/images/bus.png" mode=""></image>
 					<text>校车预约</text>
-				</navigator>
+				</navigator> -->
 				<!-- <navigator :url="'/pagesClockIn/index/index'" open-type="navigate" class="menu_item">
 					<image src="../../static/images/clockIn.png" mode=""></image>
 					<text>校园打卡</text>

static/api.js

@@ -1,7 +1,7 @@
 const WEXIN_BASE_URL = 'https://api.mch.weixin.qq.com' // wexin
 const WECARD_BASE_URL = 'https://open.wecard.qq.com' // wecard
-// const CODE_BASE_URL = 'https://chtech.ncjti.edu.cn/shuidian' // code
-const CODE_BASE_URL = 'https://jtishfw.ncjti.edu.cn/jxch-smartmp/HotWaters' // code
+const CODE_BASE_URL = 'https://chtech.ncjti.edu.cn/shuidian' // code
+// const CODE_BASE_URL = 'https://jtishfw.ncjti.edu.cn/jxch-smartmp/HotWaters' // code
 const AIR_BASE_URL = 'https://chtech.ncjti.edu.cn/air-conditioner-control' // air
 const IP_BASE_URL = 'https://pv.sohu.com/cityjson' // ip