Merge branch 'lj'

# Conflicts:
#	manifest.json
#	pages/index/index.vue
This commit is contained in:
LuoShijie
2023-11-04 12:29:00 +08:00
23 changed files with 603 additions and 242 deletions

View File

@@ -1,7 +1,7 @@
<template>
<view class="detail">
<view class="detail" ref="viewref">
<view class="swiper">
<u-swiper :list="list" height="300rpx" radius="0"></u-swiper>
<u-swiper :list="list" height="500rpx" radius="0"></u-swiper>
</view>
<view class="sub-detail u-flex">
<view class="title">
@@ -10,15 +10,15 @@
<view>
<u-grid :col="3">
<u-grid-item>
<view class="grid-text">22</view>
<view class="grid-textup">22</view>
<view class="grid-text">租金</view>
</u-grid-item>
<u-grid-item>
<view class="grid-text">22</view>
<view class="grid-textup">22</view>
<view class="grid-text">转让费</view>
</u-grid-item>
<u-grid-item>
<view class="grid-text">22</view>
<view class="grid-textup">22</view>
<view class="grid-text">面积</view>
</u-grid-item>
</u-grid>
@@ -34,28 +34,30 @@
<u-avatar :src="src"></u-avatar>
<u-cell title="张先生" label="123456"></u-cell>
</view>
<u-cell title="店铺介绍" label="美食杂货店是一个主打食品和日用杂货的淘宝222222222222222222222美食杂货店是一个主打食品和日用杂货的淘宝美食杂货店是一个主打食品和日用杂货的淘宝"></u-cell>
<u-cell title="店铺介绍" label="美食杂货店是一个主打食品和日用杂货的淘宝222222222222222222222美食杂货店是一个主打食品和日用杂货的淘宝美食杂货店是一个主打食品和日用杂货的淘宝" label-style="color = #5D5D5D"></u-cell>
</view>
<view class="bottom">
<view class="bot-tab">
<view class="tab-left">
<view class="share">
<view class="share" @click="share()">
<u-icon name="share-fill" color="green"></u-icon>
分享
</view>
<view class="customer">
<view class="customer" @click="assist()">
<u-icon name="server-fill" color="green"></u-icon>
客服
</view>
</view>
<view class="tab-right">
<view class="call">
打电话
<view class="tab-right" @click="phonecall()">
<view class="call" >
<text>打电话</text>
</view>
</view>
</view>
</view>
<view class="bug-figure">
</view>
</view>
</template>
@@ -76,11 +78,28 @@
},
data() {
return {
viewheight:'',
}
},
methods: {
// getHeight(){
// let height = this.$refs.viewref.$el.offsetHeight
// this.viewheight = height
// },
phonecall(){
console.log('打电话');
},
share(){
console.log('分享');
},
assist(){
console.log('客服');
}
},
mounted(){
// this.getHeight();
// console.log(viewheight)
}
}
</script>
@@ -90,12 +109,22 @@
// background-color: #F8F8F8;
height: 100%;
}
.bug-figure{
height: 100rpx;
}
.swiper {
}
.title{
padding: 20rpx;
background-color: #fff;
}
.grid-textup{
color: #CC3333;
font-size: 20px;
}
.grid-text{
color: #B3B3B3;
}
.location-detail{
display: flex;
margin-top: 20rpx;
@@ -120,7 +149,8 @@
background-color: #fff;
width: 100%;
z-index: 100;
height: 100rpx;
// height: 100rpx;
// bottom: calc(var(--window-bottom) + 20px);
}
.bot-tab{
display: flex;
@@ -131,19 +161,36 @@
width: 50%;
display: flex;
justify-content: space-around;
height: 100px;
height: 50px;
}
.coustom{
height: 100px;
}
.tab-right{
width: 50%;
height: 100%;
.customer{
// height: 50px;
display: flex;
justify-content: center;
align-items: center;
flex-direction: column;
width: 50%;
}
.tab-right{
width: 50%;
height: 50px;
display: flex;
justify-content: center;
align-items: center;
background-image: linear-gradient(to right, #E86262, #CC3333);
}
.share{
display: flex;
justify-content: center;
align-items: center;
flex-direction: column;
width: 50%;
}
.call{
color: #fff;
display: flex;
justify-content: center;
align-items: center;
flex-direction: column;
}
</style>

View File

@@ -1,26 +1,20 @@
<template>
<view class="home-base-bg">
<view class="search_box">
<TabBar :current-page="0"></TabBar>
<InputAndSwiper></InputAndSwiper>
<TabBar :current-page="0"></TabBar>
<HomeNavCard></HomeNavCard>
<view class="news-box">
<u-notice-bar
:text="newsTextLists"
:bg-color="$uni-bg-color"
></u-notice-bar>
<u-notice-bar :text="newsTextLists" :bg-color="$uni-bg-color"></u-notice-bar>
</view>
<ShowShopList></ShowShopList>
</view>
</view>
</template>
<script>
export default {
components: {
},
data() {
return {
@@ -28,14 +22,15 @@
'寒雨连江夜入吴',
'平明送客楚山孤',
'洛阳亲友如相问',
'一片冰心在玉壶'],
'一片冰心在玉壶'
],
}
},
onLoad() {
},
methods: {
}
}
</script>
@@ -46,5 +41,4 @@
width: 100%;
}
</style>

View File

@@ -12,11 +12,12 @@
</view>
<view class="publish">
<u-cell-group>
<u-cell icon="setting-fill" title="发布的店铺转让" is-link="true"></u-cell>
<u-cell icon="integral-fill" title="发布的找店选址" is-link="true"></u-cell>
<u-cell icon="integral-fill" title="发布的店铺出租" is-link="true"></u-cell>
<u-cell icon="integral-fill" title="发布的项目招商" is-link="true"></u-cell>
<u-cell icon="integral-fill" title="成功合伙人" is-link="true"></u-cell>
<u-cell icon="setting-fill" title="发布的店铺转让" is-link="true" @click="topublished('发布的店铺转让')"></u-cell>
<u-cell icon="integral-fill" title="发布的找店选址" is-link="true" @click="topublished('发布的找店选址')"></u-cell>
<u-cell icon="integral-fill" title="发布的店铺出租" is-link="true" @click="topublished('发布的店铺出租')"></u-cell>
<u-cell icon="integral-fill" title="发布的项目招商" is-link="true" @click="topublished('发布的项目招商')"></u-cell>
<u-cell icon="integral-fill" title="成功合伙人" is-link="true" @click="topublished('成功合伙人')"></u-cell>
<u-cell icon="integral-fill" title="我的匹配" is-link="true" @click="todetail"></u-cell>
</u-cell-group>
</view>
</view>
@@ -30,13 +31,23 @@
return {
src: 'https://cdn.uviewui.com/uview/album/2.jpg',
account:'11111111',
username:'用户名'
username:'用户名',
}
},
onLoad() {
// this.getInfo()
},
methods: {
topublished(title){
uni.navigateTo({
url:'/pages/published/published?titletext='+title
})
},
todetail(){
uni.navigateTo({
url:'/pages/detail/detail'
})
}
//---------页面调用接口示例------------
// getInfo() {
// this.$api.getUserInfo().then(res => {
@@ -60,6 +71,7 @@
gap: 10rpx;
.profile-bgi{
position: absolute;
width: 100%;
z-index: -1;
}
.avator{

View File

@@ -1,7 +1,6 @@
<template>
<view>
发布
<TabBar :current-page="2" />
发布店铺地址
</view>
</template>

View File

@@ -0,0 +1,22 @@
<template>
<view>
发布招商合作
</view>
</template>
<script>
export default {
data() {
return {
}
},
methods: {
}
}
</script>
<style>
</style>

View File

@@ -0,0 +1,22 @@
<template>
<view>
发布店铺出租
</view>
</template>
<script>
export default {
data() {
return {
}
},
methods: {
}
}
</script>
<style>
</style>

View File

@@ -0,0 +1,53 @@
<template>
<view class="form">
<u-form :model="form" ref="uForm">
<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-form-item>
<u-form-item label="简介">
<u-input v-model="form.intro" />
</u-form-item>
<u-form-item label="性别">
<u-input v-model="form.sex" type="select" />
</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>
<u-form-item label="味道">
<u-radio-group>
<u-radio>鲜甜</u-radio>
<u-radio>麻辣</u-radio>
</u-radio-group>
</u-form-item>
<u-form-item label="开关">
<u-switch slot="right"></u-switch>
</u-form-item>
</u-form>
</view>
</template>
<script>
export default {
data() {
return {
form:{
title:''
}
}
},
methods: {
}
}
</script>
<style lang="scss">
.form{
margin-left: 20px;
}
</style>

View File

@@ -0,0 +1,61 @@
<template>
<view>
<view class="search-box">
<view class="search-box-input">
<u-input placeholder="热门搜索" placeholder-style="color: #969696" prefixIcon="search"
prefixIconStyle="font-size: 24px;color: #909399;" border="true">
</u-input>
</view>
</view>
</view>
</template>
<script>
export default {
data() {
return {
titletext:''
}
},
methods: {
},
onLoad: function (option) {
wx.setNavigationBarTitle({
title: option.titletext
})
},
}
</script>
<style lang="scss">
.search-box {
position: absolute;
z-index: 1;
left: 50%;
width: 84.6%;
transform: translateX(-50%);
.search-box-input {
border-radius: 12rpx;
margin-top: 20rpx;
background-color: #fff;
opacity: 0.85;
.u-border {
border: none;
.u-input__content {
height: 62rpx;
border-radius: 12rpx;
background-color: #fff;
.u-input__content__field-wrapper__field {
font-size: 26rpx !important;
}
}
}
}
}
</style>