odjbin/city-store-transfer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'dj' (#117) from dj into master

Browse Source 
Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/117
This commit is contained in:
odjbin
2023-11-27 15:49:12 +00:00
parent 6ebb1fc8d8 93d2bb04c7
commit 9f62244f16
9 changed files with 59 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
components/InputAndSwiper/InputAndSwiper.vue
View File

@@ -2,8 +2,9 @@
<view class="input-and-swiper-root">
<view class="search-box" v-if="type!=='0'">
<view class="search-box-input">
<u-input v-model="keyword" placeholder="请输入店铺名称进行搜索" placeholder-style="color: #969696" prefixIcon="search"
prefixIconStyle="font-size: 24px;color: #909399;" border="true" @clear="handleClear" clearable @change="changeInput">
<u-input v-model="keyword" placeholder="请输入标题进行搜索" placeholder-style="color: #969696" prefixIcon="search"
prefixIconStyle="font-size: 24px;color: #909399;" border="true" @clear="handleClear" clearable
@change="changeInput">
<template slot="suffix">
<view style="display: flex;align-items: center;">
<u-icon name="map-fill" color="#329866" size="22"></u-icon>

2
pages/index/NavBarPages/czxx/czxx.vue
View File

@@ -5,7 +5,7 @@
<view class="bug-fix"></view>
<view class="search-box">
<view class="search-box-input">
<u-input v-model="keyword" placeholder="热门搜索" placeholder-style="color: #969696" prefixIcon="search"
<u-input v-model="keyword" placeholder="请输入标题进行搜索" placeholder-style="color: #969696" prefixIcon="search"
prefixIconStyle="font-size: 24px;color: #909399;" border="true" @change="getInput">
</u-input>
</view>

2
pages/index/NavBarPages/xmzs/xmzs.vue
View File

@@ -5,7 +5,7 @@
<view class="bug-fix"></view>
<view class="search-box">
<view class="search-box-input">
<u-input v-model="keyword" placeholder="热门搜索" placeholder-style="color: #969696" prefixIcon="search"
<u-input v-model="keyword" placeholder="请输入标题进行搜索" placeholder-style="color: #969696" prefixIcon="search"
prefixIconStyle="font-size: 24px;color: #909399;" border="true" @change="getInput">
</u-input>
</view>

2
pages/index/NavBarPages/zdxx/zdxx.vue
View File

@@ -5,7 +5,7 @@
<view class="bug-fix"></view>
<view class="search-box">
<view class="search-box-input">
<u-input v-model="keyword" placeholder="热门搜索" placeholder-style="color: #969696" prefixIcon="search"
<u-input v-model="keyword" placeholder="请输入标题进行搜索" placeholder-style="color: #969696" prefixIcon="search"
prefixIconStyle="font-size: 24px;color: #909399;" border="true" @change="getInput">
</u-input>
</view>

2
pages/index/NavBarPages/zrxx/zrxx.vue
View File

@@ -5,7 +5,7 @@
<view class="bug-fix"></view>
<view class="search-box">
<view class="search-box-input">
<u-input v-model="keyword" placeholder="请输入店铺名称进行搜索" placeholder-style="color: #969696" prefixIcon="search"
<u-input v-model="keyword" placeholder="请输入标题进行搜索" placeholder-style="color: #969696" prefixIcon="search"
prefixIconStyle="font-size: 24px;color: #909399;" border="true" @change="getInput">
</u-input>
</view>

29
pages/shopAddress/shopAddress.vue
View File

@@ -1,18 +1,15 @@
<template>
<view class="root">
<view class="sticky">
<InputAndSwiper @getQueryInfo="getInput" :bannerURL="swiperList" :refresh="isRefresh"></InputAndSwiper>
<view>
<view class="dropdown-bug">
</view>
<view class="marginLR10 sticky">
<view class="marginLR10">
<DropDown @getQueryInfo="getShopList" ref="dropdown" @cancelPageNum="cancelPageNum"></DropDown>
</view>
</view>
<view class="marginLR10">
<SearchShopList :showStyle="1" :searchInfoList="searchInfoList" />
</view>
</view>
<view v-if="showNull" class="showNull">
<text>没有符合条件的数据, 请下拉刷新重置数据~
</text>
@@ -143,7 +140,11 @@
}
</script>
<style>
page {
background-color: #f8f8f8;
}
</style>
<style lang="scss" scoped>
.showNull {
display: flex;
@@ -153,22 +154,10 @@
color: darkgray;
}
page {
background-color: $uni-bg-color-grey;
}
.root {
position: relative;
}
.dropdown-bug {
position: absolute;
background-color: $uni-bg-color-grey;
height: 120rpx;
width: 100%;
transform: translateY(-20rpx);
z-index: 2;
}
.marginLR10 {
margin: 0 10px;

26
pages/shopTransfer/shopTransfer.vue
View File

@@ -1,19 +1,15 @@
<template>
<view class="root">
<view class="sticky">
<InputAndSwiper @getQueryInfo="getInput" :bannerURL="swiperList" :refresh="isRefresh">
</InputAndSwiper>
<view>
<view class="dropdown-bug">
</view>
<view class="marginLR10 sticky">
<view class="marginLR10 ">
<DropDown @getQueryInfo="getShopList" ref="dropdown" @cancelPageNum="cancelPageNum"></DropDown>
</view>
</view>
<view class="marginLR10">
<ShowShopList :showStyle="1" :shopInfoList="shopInfoList"></ShowShopList>
</view>
</view>
<view v-if="showNull" class="showNull">
<text>没有符合条件的数据, 请下拉刷新重置数据~
</text>
@@ -141,12 +137,12 @@
}
}
</script>
<style lang="scss" scoped>
<style>
page {
background-color: $uni-bg-color-grey;
background-color: #f8f8f8;
}
</style>
<style lang="scss" scoped>
.showNull {
display: flex;
align-items: center;
@@ -159,14 +155,6 @@
position: relative;
}
.dropdown-bug {
position: absolute;
background-color: $uni-bg-color-grey;
height: 120rpx;
width: 100%;
transform: translateY(-20rpx);
z-index: 2;
}
.marginLR10 {
margin: 0 10px;

1
uni.scss
View File

@@ -80,4 +80,5 @@ $uni-font-size-paragraph:15px;
position: sticky;
top: 0;
z-index: 9;
background-color: #F8F8F8;
}