解决冲突

pages/index/index.vue

@@ -29,50 +29,14 @@
 					<!-- <image  src="../../static/index-nav-5.png" mode="widthFix"></image> -->
 				</view>
 			</view>
-<<<<<<< .mine
-			<view class="padding-top-sm flex align-center index-mian">
-				<view v-if="XCXIsSelect != '否'" class="flex align-center justify-between margin-right-sm"
-					 style="line-height: 68rpx;">
-					<image src="../../static/liliao-1.png" class="dingwei-img"></image>
-					<view class="localName">{{ city }}</view>
-				</view>
-=======
 			<view class="flex align-center index-mian">
-
-
-
-
-
->>>>>>> .theirs
-<<<<<<< .mine
 				<uni-search-bar placeholder="请输入项目名称" @service="serviceTrue" @confirm="search" :cancelext="'取消'" v-model="searchValue" @input="input"
 				 @clear="clear">
 				</uni-search-bar>
 				<view class="search-btn" @click="searchBtn" >
 					搜索
-=======
-				<view class="flex align-center justify-between">
-					<selectSwitchDitu  @change="switch1Change" :switchList="switchList"/>
-
-
-
->>>>>>> .theirs
 				</view>
-<<<<<<< .mine
 
-
-
-
-
-
-=======
-					<uni-search-bar style="width: 60%;" @service="serviceTrue" @confirm="search" :cancelext="'取消'" v-model="searchValue" @input="input"
-					 @clear="clear">
-					</uni-search-bar>
-					<view class="search-btn" @click="searchBtn">
-						搜索
-					</view>
->>>>>>> .theirs
 			</view>
 			<view class="index-nav-bottom width">
 				<image src="../../static/index-nav-6.png" mode="widthFix" @click="chaoji"></image>