罗世杰：分支合并：首页商铺列表和找店列表完成，notice完善，navbar完成
# Conflicts: # pages/index/index.vue
This commit is contained in:
LuoShijie
@@ -73,7 +73,7 @@
|
||||
},
|
||||
methods: {
|
||||
quitSlide() {
|
||||
this.slideVisit = false
|
||||
this.slideVisit = false;
|
||||
},
|
||||
changeItem(item) {
|
||||
if (item.id == 2) {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<template>
|
||||
<view class="slide">
|
||||
<view class="mask" @click.self="quitSlide">
|
||||
<view class="mask" @click="quitSlide">
|
||||
<view class="content" @click.stop>
|
||||
<view class="container">
|
||||
<view class="content-1" @click="enterTransfer">
|
||||
@@ -26,34 +26,34 @@
|
||||
</template>
|
||||
|
||||
<script>
|
||||
export default{
|
||||
data(){
|
||||
return{
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
|
||||
}
|
||||
},
|
||||
methods:{
|
||||
quitSlide(){
|
||||
methods: {
|
||||
quitSlide() {
|
||||
this.$emit("quitSlide")
|
||||
},
|
||||
enterTransfer(){
|
||||
enterTransfer() {
|
||||
uni.navigateTo({
|
||||
url:'/pages/publish/publishTransfer/publishTransfer'
|
||||
url: '/pages/publish/publishTransfer/publishTransfer'
|
||||
})
|
||||
},
|
||||
enterAddress(){
|
||||
enterAddress() {
|
||||
uni.navigateTo({
|
||||
url:'/pages/publish/publishAddress/publishAddress'
|
||||
url: '/pages/publish/publishAddress/publishAddress'
|
||||
})
|
||||
},
|
||||
enterRent(){
|
||||
enterRent() {
|
||||
uni.navigateTo({
|
||||
url:'/pages/publish/publishRent/publishRent'
|
||||
url: '/pages/publish/publishRent/publishRent'
|
||||
})
|
||||
},
|
||||
enterInvestment(){
|
||||
enterInvestment() {
|
||||
uni.navigateTo({
|
||||
url:'/pages/publish/publishInvestment/publishInvestment'
|
||||
url: '/pages/publish/publishInvestment/publishInvestment'
|
||||
})
|
||||
}
|
||||
}
|
||||
@@ -79,7 +79,7 @@
|
||||
position: fixed;
|
||||
transform: translate(-50%, -50%);
|
||||
left: 50%; top: 40%;
|
||||
height: 25%;
|
||||
height: 20%;
|
||||
width: 90%;
|
||||
background-color: #fff;
|
||||
z-index: 40;
|
||||
@@ -115,6 +115,7 @@
|
||||
.text{
|
||||
font-size: 28rpx;
|
||||
display: block;
|
||||
color: #686868;
|
||||
}
|
||||
|
||||
</style>
|
||||
12
pages.json
12
pages.json
@@ -8,7 +8,7 @@
|
||||
}
|
||||
},
|
||||
"pages": [
|
||||
//pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
|
||||
//pages数组中第一项表示应用启动页
|
||||
{
|
||||
"path": "pages/index/index",
|
||||
"style": {
|
||||
@@ -21,6 +21,15 @@
|
||||
"enablePullDownRefresh": true
|
||||
}
|
||||
},
|
||||
{
|
||||
"path": "pages/index/map/map",
|
||||
"style": {
|
||||
"navigationBarTitleText": "速配地图",
|
||||
"navigationBarTextStyle": "white",
|
||||
"navigationBarBackgroundColor": "#339967",
|
||||
"enablePullDownRefresh": false
|
||||
}
|
||||
},
|
||||
{
|
||||
"path": "pages/shopTransfer/shopTransfer",
|
||||
"style": {
|
||||
@@ -30,7 +39,6 @@
|
||||
"enablePullDownRefresh": false
|
||||
}
|
||||
},
|
||||
//+
|
||||
{
|
||||
"path": "pages/shopAddress/shopAddress",
|
||||
"style": {
|
||||
|
||||
@@ -43,9 +43,7 @@
|
||||
|
||||
},
|
||||
computed: {
|
||||
isActive(currentIndex) {
|
||||
// 怎么完善此处的代码
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
</script>
|
||||
@@ -83,5 +81,4 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
</style>
|
||||
138
pages/index/map/map.vue
Normal file
138
pages/index/map/map.vue
Normal file
@@ -0,0 +1,138 @@
|
||||
<template>
|
||||
<view>
|
||||
<view class="search-box">
|
||||
<view class="search-box-input">
|
||||
<u-input placeholder="热门店铺" placeholder-style="color: #888888" prefixIcon="search"
|
||||
prefixIconStyle="font-size: 24px;color: #888888;" border="true">
|
||||
</u-input>
|
||||
</view>
|
||||
</view>
|
||||
<view class="content">
|
||||
<map id="map" @markertap="markerClick" :markers="marker" :show-location="true" :latitude="lat"
|
||||
:longitude="lng"></map>
|
||||
</view>
|
||||
<view class="down-shop">
|
||||
<ShowShopListItem :shopInfo="shopList"></ShowShopListItem>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
lat: '30.48772',
|
||||
lng: '104.080145',
|
||||
marker: [{
|
||||
id: 1,
|
||||
latitude: 30.488573,
|
||||
longitude: 104.081248,
|
||||
iconPath: '../../../static/map/sp_icon_dw.png',
|
||||
width: '58rpx',
|
||||
height: '72rpx',
|
||||
rotate: 0,
|
||||
alpha: 1
|
||||
},
|
||||
{
|
||||
id: 2,
|
||||
latitude: 30.48772,
|
||||
longitude: 104.080145,
|
||||
// iconPath: '../../../static/map/sp_icon_dw.png',
|
||||
width: '58rpx',
|
||||
height: '72rpx',
|
||||
rotate: 0,
|
||||
alpha: 1
|
||||
}
|
||||
],
|
||||
shopList: {
|
||||
imageUrl: 'https://alifei01.cfp.cn/creative/vcg/800/new/VCG41175510742.jpg',
|
||||
title: '琴行铺面转让',
|
||||
promotionNum: 23,
|
||||
price: 5000,
|
||||
date: '2023-11-02'
|
||||
}
|
||||
}
|
||||
},
|
||||
onShow() {
|
||||
// 地图
|
||||
this._mapContext = uni.createMapContext("map", this);
|
||||
this._mapContext.initMarkerCluster({
|
||||
enableDefaultStyle: false,
|
||||
zoomOnClick: true,
|
||||
gridSize: 60,
|
||||
complete(res) {
|
||||
console.log('initMarkerCluster', res)
|
||||
}
|
||||
});
|
||||
this._mapContext.on("markerClusterCreate", (e) => {
|
||||
console.log("markerClusterCreate", e);
|
||||
});
|
||||
},
|
||||
methods: {
|
||||
// 图标点击
|
||||
markerClick(e) {
|
||||
console.log('标记点击', e);
|
||||
let markerId = e.markerId; //点击标记点, 获取id, 查询店铺详情, 展示在下方
|
||||
this.marker.forEach(item => {
|
||||
if (markerId === item.id) {
|
||||
item.iconPath = ""
|
||||
} else {
|
||||
item.iconPath = "../../../static/map/sp_icon_dw.png"
|
||||
}
|
||||
})
|
||||
},
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang="scss">
|
||||
.search-box {
|
||||
position: absolute;
|
||||
z-index: 1;
|
||||
top: 20rpx;
|
||||
left: 50%;
|
||||
transform: translateX(-50%);
|
||||
|
||||
.search-box-input {
|
||||
width: 580rpx;
|
||||
height: 62rpx;
|
||||
background: #FFFFFF;
|
||||
border-radius: 12rpx;
|
||||
opacity: 0.85;
|
||||
}
|
||||
}
|
||||
|
||||
// 地图
|
||||
.content {
|
||||
width: 100%;
|
||||
height: 460rpx;
|
||||
|
||||
#map {
|
||||
width: 100%;
|
||||
height: 100vh;
|
||||
}
|
||||
}
|
||||
|
||||
.down-shop {
|
||||
width: 710rpx;
|
||||
// background-color: red;
|
||||
position: absolute;
|
||||
z-index: 1;
|
||||
bottom: 60rpx;
|
||||
left: 10%;
|
||||
transform: translateX(-10%);
|
||||
|
||||
.list-border {
|
||||
margin: 0;
|
||||
padding: 20rpx 20rpx 20rpx 27rpx;
|
||||
width: 94.5%;
|
||||
border-radius: 7rpx;
|
||||
box-shadow: 0rpx 1rpx 2rpx 0rpx rgba(224, 224, 224, 0.5), 0rpx 4rpx 12rpx 1rpx rgba(102, 102, 102, 0.37);
|
||||
|
||||
.rent-and-date text {
|
||||
margin-right: 30rpx !important;
|
||||
font-size: 24rpx;
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
@@ -30,7 +30,7 @@
|
||||
data() {
|
||||
return {
|
||||
src: 'https://cdn.uviewui.com/uview/album/2.jpg',
|
||||
account:'11111111',
|
||||
account:'123456',
|
||||
username:'用户名',
|
||||
}
|
||||
},
|
||||
@@ -63,7 +63,7 @@
|
||||
color: #fff;
|
||||
display: flex;
|
||||
width: 100%;
|
||||
height: auto;
|
||||
height: 275rpx;
|
||||
margin-bottom: 36rpx;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
@@ -72,6 +72,7 @@
|
||||
.profile-bgi{
|
||||
position: absolute;
|
||||
width: 100%;
|
||||
height: 500px;
|
||||
z-index: -1;
|
||||
}
|
||||
.avator{
|
||||
|
||||
@@ -1,31 +1,41 @@
|
||||
<template>
|
||||
<view class="form">
|
||||
<u-form :model="form" ref="uForm">
|
||||
<view class="upload">
|
||||
<u-upload max-count="5" upload-icon="photo"></u-upload>
|
||||
<text>发布房源图片({{count}}/5)</text>
|
||||
</view>
|
||||
|
||||
<u-form-item label="标题" label-position="top" border-bottom="true" labelStyle="margin-left: 20px">
|
||||
<u-input v-model="form.name" placeholder="请输入标题以便吸引人的注意哦" placeholder-style="font-size: 40rpx;font-weight:1px"></u-input>
|
||||
<u-input v-model="form.name" placeholder="请输入标题以便吸引人的注意哦" placeholder-class="input-class" border="none"></u-input>
|
||||
</u-form-item>
|
||||
<u-form-item label="简介">
|
||||
<u-input v-model="form.intro" />
|
||||
<u-form-item label="区域" label-position="top" border-bottom="true" labelStyle="margin-left: 20px">
|
||||
<u-cell is-link="true" @click="show1 = true"><text>111111</text>
|
||||
</u-cell>
|
||||
<u-picker mode="region" :show="show1" :closeOnClickOverlay="true" @close="show1 = false" :columns="columns" @confirm="confirm"></u-picker>
|
||||
</u-form-item>
|
||||
<u-form-item label="性别">
|
||||
<u-input v-model="form.sex" type="select" />
|
||||
<u-form-item label="地址" label-position="top" border-bottom="true" labelStyle="margin-left: 20px">
|
||||
<u-input v-model="form.name" placeholder="请输入店铺地址" placeholder-class="input-class" border="none"></u-input>
|
||||
</u-form-item>
|
||||
<u-form-item label="水果">
|
||||
<u-checkbox-group width="50%">
|
||||
<u-checkbox>苹果</u-checkbox>
|
||||
<u-checkbox>雪梨</u-checkbox>
|
||||
<u-checkbox>柠檬</u-checkbox>
|
||||
<u-checkbox>橘子</u-checkbox>
|
||||
</u-checkbox-group>
|
||||
<u-form-item label="区域" label-position="top" border-bottom="true" labelStyle="margin-left: 20px">
|
||||
<text @click="show2 = true">123</text>
|
||||
<u-picker mode="region" :show="show2" :closeOnClickOverlay="true" @close="show2 = false"></u-picker>
|
||||
</u-form-item>
|
||||
<u-form-item label="味道">
|
||||
<u-radio-group>
|
||||
<u-radio>鲜甜</u-radio>
|
||||
<u-radio>麻辣</u-radio>
|
||||
</u-radio-group>
|
||||
<u-form-item label="区域" label-position="top" border-bottom="true" labelStyle="margin-left: 20px">
|
||||
<text @click="show3 = true">123</text>
|
||||
<u-picker mode="region" :show="show3" :closeOnClickOverlay="true" @close="show3 = false"></u-picker>
|
||||
</u-form-item>
|
||||
<u-form-item label="开关">
|
||||
<u-switch slot="right"></u-switch>
|
||||
<u-form-item label="标题" label-position="top" border-bottom="true" labelStyle="margin-left: 20px">
|
||||
<u-input v-model="form.name" placeholder="请输入标题以便吸引人的注意哦" placeholder-class="input-class" border="none"></u-input>
|
||||
</u-form-item>
|
||||
<u-form-item label="标题" label-position="top" border-bottom="true" labelStyle="margin-left: 20px">
|
||||
<u-input v-model="form.name" placeholder="请输入标题以便吸引人的注意哦" placeholder-class="input-class" border="none"></u-input>
|
||||
</u-form-item>
|
||||
<u-form-item label="标题" label-position="top" border-bottom="true" labelStyle="margin-left: 20px">
|
||||
<u-input v-model="form.name" placeholder="请输入标题以便吸引人的注意哦" placeholder-class="input-class" border="none"></u-input>
|
||||
</u-form-item>
|
||||
<u-form-item label="标题" label-position="top" border-bottom="true" labelStyle="margin-left: 20px">
|
||||
<u-input v-model="form.name" placeholder="请输入标题以便吸引人的注意哦" placeholder-class="input-class" border="none"></u-input>
|
||||
</u-form-item>
|
||||
</u-form>
|
||||
</view>
|
||||
@@ -35,13 +45,27 @@
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
city:'',
|
||||
area:'',
|
||||
count:0,
|
||||
show1:false,
|
||||
show2:false,
|
||||
show3:false,
|
||||
form:{
|
||||
title:''
|
||||
}
|
||||
},
|
||||
columns:[
|
||||
['中国', '美国'],
|
||||
['深圳', '厦门', '上海', '拉萨']
|
||||
]
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
|
||||
confirm(e) {
|
||||
this.city = e.value[0]
|
||||
this.area = e.value[1]
|
||||
this.show1 = false
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
@@ -50,4 +74,17 @@
|
||||
.form{
|
||||
margin-left: 20px;
|
||||
}
|
||||
.input-class{
|
||||
font-size: 30rpx;
|
||||
font-weight:1px;
|
||||
border-style: none
|
||||
}
|
||||
.upload{
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
background-color: #F8F8F8;
|
||||
margin-right: 20px;
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -7,6 +7,7 @@
|
||||
</u-input>
|
||||
</view>
|
||||
</view>
|
||||
<ShowShopList></ShowShopList>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
@@ -31,7 +32,7 @@
|
||||
|
||||
<style lang="scss">
|
||||
.search-box {
|
||||
position: absolute;
|
||||
position: relative;
|
||||
z-index: 1;
|
||||
left: 50%;
|
||||
width: 84.6%;
|
||||
|
||||
BIN
static/map/sp_icon_dw.png
Normal file
BIN
static/map/sp_icon_dw.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 3.2 KiB |
BIN
static/map/sp_icon_hdw.png
Normal file
BIN
static/map/sp_icon_hdw.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 4.8 KiB |
Reference in New Issue
Block a user