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

Merge branch 'master' of http://git.feashow.cn/odjbin/city-store-transfer

Browse Source
This commit is contained in:
邓洁
2023-11-27 23:11:02 +08:00
parent 53939da52e 6ebb1fc8d8
commit 096440bbfc
14 changed files with 79 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pages/detail/detail.vue
View File

@@ -32,6 +32,9 @@
<text>行业：{{shopInfo.trade1+'-'}}{{shopInfo.trade2}}</text> <text>行业：{{shopInfo.trade1+'-'}}{{shopInfo.trade2}}</text>
<text>区域：{{shopInfo.area1}}</text> <text>区域：{{shopInfo.area1}}</text>
<text v-if="search">地址：{{shopInfo.adress}}</text> <text v-if="search">地址：{{shopInfo.adress}}</text>
<view class="xq_rz" v-if="shopInfo.is_auth=='1'">
<image src="../../static/shoplist/xq_rz.png" style="width: 240rpx;height: 171rpx;"></image>
</view>
</view> </view>
<view class="bgc"> <view class="bgc">
@@ -211,6 +214,7 @@
} }
.location-detail { .location-detail {
position: relative;
display: flex; display: flex;
// margin-top: 50rpx; // margin-top: 50rpx;
background-color: #fff; background-color: #fff;
@@ -218,6 +222,12 @@
padding-left: 16rpx; padding-left: 16rpx;
line-height: 33px; line-height: 33px;
font-size: 15px; font-size: 15px;
.xq_rz {
position: absolute;
top: 30rpx;
right: 15rpx;
}
} }
.seller-shop-detail { .seller-shop-detail {

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

@@ -1,5 +1,6 @@
<template> <template>
<view> <view>
<view class="sticky">
<view class="search-box-bg"> <view class="search-box-bg">
<view class="bug-fix"></view> <view class="bug-fix"></view>
<view class="search-box"> <view class="search-box">
@@ -14,6 +15,8 @@
<view> <view>
<DropDown @getQueryInfo="getShopList" ref="dropdown" @cancelPageNum="cancelPageNum"></DropDown> <DropDown @getQueryInfo="getShopList" ref="dropdown" @cancelPageNum="cancelPageNum"></DropDown>
</view> </view>
</view>
<view class="marginLR10"> <view class="marginLR10">
<ShowShopList :showStyle="2" :adlinkPath="adlinkPath" :listType="3" :shopInfoList="shopInfoList" /> <ShowShopList :showStyle="2" :adlinkPath="adlinkPath" :listType="3" :shopInfoList="shopInfoList" />
</view> </view>

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

@@ -1,5 +1,6 @@
<template> <template>
<view> <view>
<view class="sticky">
<view class="search-box-bg"> <view class="search-box-bg">
<view class="bug-fix"></view> <view class="bug-fix"></view>
<view class="search-box"> <view class="search-box">
@@ -14,6 +15,8 @@
<view> <view>
<DropDown @getQueryInfo="getShopList" ref="dropdown" @cancelPageNum="cancelPageNum"></DropDown> <DropDown @getQueryInfo="getShopList" ref="dropdown" @cancelPageNum="cancelPageNum"></DropDown>
</view> </view>
</view>
<view class="marginLR10"> <view class="marginLR10">
<ShowShopList :showStyle="2" :adlinkPath="adlinkPath" :listType="4" :shopInfoList="shopInfoList" /> <ShowShopList :showStyle="2" :adlinkPath="adlinkPath" :listType="4" :shopInfoList="shopInfoList" />
</view> </view>

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

@@ -1,5 +1,6 @@
<template> <template>
<view> <view>
<view class="sticky">
<view class="search-box-bg"> <view class="search-box-bg">
<view class="bug-fix"></view> <view class="bug-fix"></view>
<view class="search-box"> <view class="search-box">
@@ -14,6 +15,8 @@
<view> <view>
<DropDown @getQueryInfo="getShopList" ref="dropdown" @cancelPageNum="cancelPageNum"></DropDown> <DropDown @getQueryInfo="getShopList" ref="dropdown" @cancelPageNum="cancelPageNum"></DropDown>
</view> </view>
</view>
<view class="marginLR10"> <view class="marginLR10">
<SearchShopList :showStyle="1" :searchInfoList="searchInfoList" /> <SearchShopList :showStyle="1" :searchInfoList="searchInfoList" />
</view> </view>

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

@@ -1,5 +1,6 @@
<template> <template>
<view> <view>
<view class="sticky">
<view class="search-box-bg"> <view class="search-box-bg">
<view class="bug-fix"></view> <view class="bug-fix"></view>
<view class="search-box"> <view class="search-box">
@@ -14,6 +15,8 @@
<view> <view>
<DropDown @getQueryInfo="getShopList" ref="dropdown" @cancelPageNum="cancelPageNum"></DropDown> <DropDown @getQueryInfo="getShopList" ref="dropdown" @cancelPageNum="cancelPageNum"></DropDown>
</view> </view>
</view>
<view class="marginLR10"> <view class="marginLR10">
<ShowShopList :showStyle="1" :shopInfoList="shopInfoList" /> <ShowShopList :showStyle="1" :shopInfoList="shopInfoList" />
</view> </view>
@@ -155,8 +158,6 @@
.search-box-bg { .search-box-bg {
width: 100%; width: 100%;
position: relative;
z-index: 3;
background-color: #F8F8F8; background-color: #F8F8F8;
.bug-fix { .bug-fix {

3
pages/published/published.vue
View File

@@ -1,5 +1,6 @@
<template> <template>
<view> <view>
<view class="sticky">
<view class="search-box"> <view class="search-box">
<view class="search-box-input"> <view class="search-box-input">
<u-input placeholder="热门搜索" placeholder-style="color: #969696" prefixIcon="search" <u-input placeholder="热门搜索" placeholder-style="color: #969696" prefixIcon="search"
@@ -7,6 +8,8 @@
</u-input> </u-input>
</view> </view>
</view> </view>
</view>
<view class="content"> <view class="content">
<ShowShopList v-if="listId == 0" :isEdit="true" :showStyle="1" :shopInfoList="searchInfoList" @delItem="handleDel" <ShowShopList v-if="listId == 0" :isEdit="true" :showStyle="1" :shopInfoList="searchInfoList" @delItem="handleDel"
@updateItem="handleUpdate1"></ShowShopList> @updateItem="handleUpdate1"></ShowShopList>

2
pages/shopAddress/shopAddress.vue
View File

@@ -6,7 +6,7 @@
<view class="dropdown-bug"> <view class="dropdown-bug">
</view> </view>
<view class="marginLR10"> <view class="marginLR10 sticky">
<DropDown @getQueryInfo="getShopList" ref="dropdown" @cancelPageNum="cancelPageNum"></DropDown> <DropDown @getQueryInfo="getShopList" ref="dropdown" @cancelPageNum="cancelPageNum"></DropDown>
</view> </view>
<view class="marginLR10"> <view class="marginLR10">

2
pages/shopTransfer/shopTransfer.vue
View File

@@ -7,7 +7,7 @@
<view class="dropdown-bug"> <view class="dropdown-bug">
</view> </view>
<view class="marginLR10"> <view class="marginLR10 sticky">
<DropDown @getQueryInfo="getShopList" ref="dropdown" @cancelPageNum="cancelPageNum"></DropDown> <DropDown @getQueryInfo="getShopList" ref="dropdown" @cancelPageNum="cancelPageNum"></DropDown>
</view> </view>
<view class="marginLR10"> <view class="marginLR10">

BIN
static/shoplist/xq_rz.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 45 KiB

BIN
static/tabbar/di_icon_dzh.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
static/tabbar/di_icon_syh.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 987 B

After

Width:  |  Height:  |  Size: 1008 B

BIN
static/tabbar/di_icon_wdh.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 987 B

After

Width:  |  Height:  |  Size: 1017 B

BIN
static/tabbar/di_icon_zrh.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

7
uni.scss
View File

@@ -74,3 +74,10 @@ $uni-color-subtitle: #555555; // 二级标题颜色
$uni-font-size-subtitle:26px; $uni-font-size-subtitle:26px;
$uni-color-paragraph: #3F536E; // 文章段落颜色 $uni-color-paragraph: #3F536E; // 文章段落颜色
$uni-font-size-paragraph:15px; $uni-font-size-paragraph:15px;
.sticky {
position: sticky;
top: 0;
z-index: 9;
}