root 9 månader sedan
förälder
incheckning
58c8910b88
1 ändrade filer med 0 tillägg och 7 borttagningar
  1. 0 7
      pages/index/index.vue

+ 0 - 7
pages/index/index.vue

@@ -6,19 +6,12 @@
 		</view>
 		<view class='main_scale_out'>
 			<a href="/webo/?flag=20210617000853&uid=b1778397670a11eea1c3525400e76da4&source=0">
-<<<<<<< HEAD
-				<!-- <image class='main_scale_top_img' src="../../static/images/topImg.png" mode="widthFix"></image> -->
-=======
 				<image class='main_scale_top_img' src="../../static/images/topImg.png" mode="widthFix"></image>
->>>>>>> e4a217fb30fa759feae09081f8f7cb81fa9387e6
 			</a>
 			<view class='main_scale_name'>
-				<!-- <img style='width:50px;height:30px' src='/static/images/main-left.png' /> -->
 				<view class='main_top_name'>{{scaleInfoNew.scaleName}}</view>
-				<!-- <img style='width:50px;height:28px' src='/static/images/main-right.png' /> -->
 			</view>
 
-			<!-- <view class='main_scale_des'>{{scaleDes}}</view> -->
 			<view class='main_scale_num'>{{scaleInfoNew.testNum}}人测试过</view>
 		</view>
 		<view class='main_scale_cpll_out'>