soft5566 3 years ago
parent
commit
1673211ffd
1 changed files with 2 additions and 5 deletions
  1. 2 5
      pages/index/index.vue

+ 2 - 5
pages/index/index.vue

@@ -21,13 +21,10 @@
 					<image src="../../static/images/clockIn.png" mode=""></image>
 					<text>校园打卡</text>
 				</navigator> -->
-<<<<<<< HEAD
-=======
-				<navigator :url="'/pagesClockIn/money/money'" open-type="navigate" class="menu_item">
+				<!-- <navigator :url="'/pagesClockIn/money/money'" open-type="navigate" class="menu_item">
 					<image src="../../static/images/money.png" mode=""></image>
 					<text>学费缴纳</text>
-				</navigator>
->>>>>>> 7a29f577c010db0a0372ee381f1e9f4e53986777
+				</navigator> -->
 			</view>
 		</view>
 		<view class="qr_code" v-if="showQR_code">