yangjun
/
sadjv3_user
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

解决冲突

This commit is contained in:
Mr.jiang 2024-07-15 16:35:41 +08:00
parent 547583334d
commit e2e1031426
1 changed files with 0 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
pages/index/index.vue
View File

@ -29,50 +29,14 @@
<!-- <image src="../../static/index-nav-5.png" mode="widthFix"></image> --> <!-- <image src="../../static/index-nav-5.png" mode="widthFix"></image> -->
</view> </view>
</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"> <view class="flex align-center index-mian">
>>>>>>> .theirs
<<<<<<< .mine
<uni-search-bar placeholder="请输入项目名称" @service="serviceTrue" @confirm="search" :cancelext="'取消'" v-model="searchValue" @input="input" <uni-search-bar placeholder="请输入项目名称" @service="serviceTrue" @confirm="search" :cancelext="'取消'" v-model="searchValue" @input="input"
@clear="clear"> @clear="clear">
</uni-search-bar> </uni-search-bar>
<view class="search-btn" @click="searchBtn" > <view class="search-btn" @click="searchBtn" >
搜索 搜索
=======
<view class="flex align-center justify-between">
<selectSwitchDitu @change="switch1Change" :switchList="switchList"/>
>>>>>>> .theirs
</view> </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>
<view class="index-nav-bottom width"> <view class="index-nav-bottom width">
<image src="../../static/index-nav-6.png" mode="widthFix" @click="chaoji"></image> <image src="../../static/index-nav-6.png" mode="widthFix" @click="chaoji"></image>