Browse Source

粉丝

master
Bobi 6 months ago
parent
commit
868db2ac43
7 changed files with 237 additions and 61 deletions
  1. +1
    -0
      pages_order/activity/activityDetail.vue
  2. +1
    -0
      pages_order/components/list/workList/workItem.vue
  3. +10
    -10
      pages_order/mine/setting.vue
  4. +3
    -0
      pages_order/renting/rentingList.vue
  5. +142
    -35
      pages_order/scenicSpot/scenicSpotDetail.vue
  6. +68
    -11
      pages_order/scenicSpot/scenicSpotList.vue
  7. +12
    -5
      pages_order/work/workList.vue

+ 1
- 0
pages_order/activity/activityDetail.vue View File

@ -19,6 +19,7 @@
{{ detail.isComment }}条评论
</view>
<!-- <view class="Leavingamessage"
@click="openLocation(detail.latitude, detail.longitude)"
v-if="detail.latitude && detail.longitude">


+ 1
- 0
pages_order/components/list/workList/workItem.vue View File

@ -128,6 +128,7 @@
display: flex;
margin-top: 10rpx;
color: #fff;
.shop {
color: #888;


+ 10
- 10
pages_order/mine/setting.vue View File

@ -15,8 +15,8 @@
iconStyle="font-size: 34rpx;"
rightIconStyle="font-size: 34rpx;">
<template #icon>
<image src="../static/setting/1.png" mode=""
style="width: 30rpx;height: 30rpx;"></image>
<!-- <image src="../static/setting/1.png" mode="" -->
<!-- style="width: 30rpx;height: 30rpx;"></image> -->
</template>
</uv-cell>
@ -28,8 +28,8 @@
iconStyle="font-size: 34rpx;"
rightIconStyle="font-size: 34rpx;">
<template #icon>
<image src="../static/setting/1.png" mode=""
style="width: 30rpx;height: 30rpx;"></image>
<!-- <image src="../static/setting/1.png" mode=""
style="width: 30rpx;height: 30rpx;"></image> -->
</template>
</uv-cell>
@ -41,8 +41,8 @@
iconStyle="font-size: 34rpx;"
rightIconStyle="font-size: 34rpx;">
<template #icon>
<image src="../static/setting/1.png" mode=""
style="width: 30rpx;height: 30rpx;"></image>
<!-- <image src="../static/setting/1.png" mode=""
style="width: 30rpx;height: 30rpx;"></image> -->
</template>
</uv-cell>
@ -55,8 +55,8 @@
iconStyle="font-size: 34rpx;"
rightIconStyle="font-size: 34rpx;">
<template #icon>
<image src="../static/setting/1.png" mode=""
style="width: 30rpx;height: 30rpx;"></image>
<!-- <image src="../static/setting/1.png" mode=""
style="width: 30rpx;height: 30rpx;"></image> -->
</template>
</uv-cell>
@ -72,8 +72,8 @@
iconStyle="font-size: 34rpx;"
rightIconStyle="font-size: 34rpx;">
<template #icon>
<image src="../static/setting/1.png" mode=""
style="width: 30rpx;height: 30rpx;"></image>
<!-- <image src="../static/setting/1.png" mode=""
style="width: 30rpx;height: 30rpx;"></image> -->
</template>
</uv-cell>


+ 3
- 0
pages_order/renting/rentingList.vue View File

@ -68,6 +68,9 @@
<style scoped lang="scss">
.page{
.page pageList{
background-color: blue;
}
min-height: 100vh;
background-color: #fff;
.list{


+ 142
- 35
pages_order/scenicSpot/scenicSpotDetail.vue View File

@ -3,49 +3,73 @@
<navbar leftClick @leftClick="$utils.navigateBack" title="详情" />
<view class="swipe">
<uv-swiper
:list="detail.images"
indicator
height="420rpx"></uv-swiper>
<uv-swiper :list="detail.images" indicator height="540rpx"></uv-swiper>
</view>
<view class="box">
<view class="title">
{{ detail.name }}
<view class="spot">
3A景区
</view>
</view>
<view class="createBy">
<view class="">
发布时间{{ $dayjs(detail.createTime).format('YYYY-MM-DD') }}
<view class="pig">
江华同志故居位于永州市江华瑶族自治县大石桥...
</view>
<hr />
<view class="mie">
<view class="dog">
开园时间 830-17.30
</view>
<view class="look">
入园须知
</view>
<uv-icon name="arrow-right"></uv-icon>
</view>
<hr />
<!-- <view class="createBy">
<view class="">
// {{ $dayjs(detail.createTime).format('YYYY-MM-DD') }}
</view>
</view> -->
<!-- <view class="createBy">
<view class="">
地址{{ detail.address }}
</view>
</view> -->
<addressSpot
:address="detail.address"
:latitude="detail.latitude"
:longitude="detail.longitude"
/>
<view class="ditu">
<view class="weizhi">
湖南省永州市大石桥镇
</view>
<addressSpot :address="detail.address" :latitude="detail.latitude" :longitude="detail.longitude" />
</view>
<view class="content">
<!-- <view class="content">
<uv-parse :content="detail.details"></uv-parse>
</view> -->
<view class="convenient">
<view class="Evaluate ">
景区评论
</view>
<view class="Details">
景区详情
</view>
<view class="Gohere">
去这里
</view>
</view>
</view>
<commentList
@getData="getData"
:list="list"
:params="params"
/>
</view>
<commentList @getData="getData" :list="list" :params="params" />
</view>
</template>
@ -60,27 +84,28 @@
data() {
return {
detail: {},
mixinsListApi : 'getCommentPage',
params : {
type : '3',
orderId : '',
name : '',
mixinsListApi: 'getCommentPage',
params: {
type: '3',
orderId: '',
name: '',
},
id : 0,
id: 0,
}
},
onLoad(options) {
// this.$route.query
console.log(options)
this.id = options.id
this.queryParams.type = this.params.type
this.queryParams.orderId = options.id
this.params.orderId = options.id
},
onPullDownRefresh(){
onPullDownRefresh() {
this.getDetail()
},
onShow() {
@ -93,16 +118,19 @@
}
},
methods: {
click(item) {
console.log('item', item);
},
getDetail() {
this.$api('getScenicDetail', {
id : this.id
id: this.id
}, res => {
uni.stopPullDownRefresh()
if (res.code == 200) {
this.params.name = res.result.name
this.detail = res.result
this.detail.images = res.result.images && res.result.images.split(',')
}
})
@ -118,10 +146,51 @@
width: 100vw;
background-color: #fff;
box-sizing: border-box;
.title {
display: flex;
font-size: 34rpx;
font-weight: 600;
color: #000;
.spot {
margin: 0rpx 20rpx;
padding: 5rpx;
background-color: $uni-color;
border-radius: 10rpx;
color: #fff;
font-size: 30rpx;
letter-spacing: 5rpx;
}
}
.pig {
margin: 50rpx 0rpx;
font-size: 25rpx;
color: $uni-color;
}
.mie {
display: flex;
justify-content: space-between;
.dog {
margin: 30rpx 0rpx;
font-size: 25rpx;
color: $uni-color;
}
.look {
margin: 30rpx 0rpx;
margin-left: 320rpx;
font-size: 25rpx;
}
}
hr {
opacity: 0.5;
}
.createBy {
@ -140,6 +209,17 @@
}
}
.ditu {
display: flex;
justify-content: space-between;
.weizhi {
font-size: 25rpx;
margin-top: 25rpx;
opacity: 0.7;
}
}
.controls {
margin-top: 30rpx;
}
@ -149,5 +229,32 @@
font-size: 28rpx;
}
}
.convenient {
display: flex;
justify-content: space-between;
padding: 10rpx 20rpx;
margin-top: 20rpx;
.Evaluate:hover {
text-decoration: underline;
text-decoration-color: $uni-color;
text-decoration-thickness: 8rpx;
text-decoration-widht: 100rpx;
}
.Details:hover {
text-decoration: underline;
text-decoration-color: $uni-color;
text-decoration-thickness: 8rpx;
text-decoration-widht: 100rpx;
}
.Gohere:hover {
text-decoration: underline;
text-decoration-color: $uni-color;
text-decoration-thickness: 8rpx;
text-decoration-widht: 100rpx;
}
}
}
</style>

+ 68
- 11
pages_order/scenicSpot/scenicSpotList.vue View File

@ -1,6 +1,10 @@
<template>
<view class="page pageList">
<navbar title="景点" leftClick @leftClick="$utils.navigateBack" />
<view class="top-bg"></view>
<view style="padding: 10rpx 30rpx;">
<uv-search bgColor="#fff" @search="getData" :showAction="false" searchIconSize="30rpx"
placeholder="请输入搜索关键字..." v-model="queryParams.title"></uv-search>
@ -10,17 +14,31 @@
<screenRen @clickItem="clickItem" />
</view>
<view class="waterfall">
<uv-waterfall ref="waterfall" v-model="list"
<view class="waterfall" v-for="(item,index) in list"
@click="$utils.navigateTo('/pages_order/scenicSpot/scenicSpotDetail?id=' + item.id)">
<view class="images">
<image :src="item.titleImage" mode="aspectFill"></image>
<view class="scenicspot">
景点
</view>
</view>
<view class="font">
{{item.name}}
</view>
</view>
<!-- <uv-waterfall ref="waterfall" v-model="list"
:add-time="10"
:left-gap="leftGap"
:right-gap="rightGap"
:column-gap="columnGap"
@changeList="changeList">
@changeList="changeList"> -->
<!-- 第一列数据 -->
<template v-slot:list1>
<!-- <template v-slot:list1> -->
<!-- 为了磨平部分平台的BUG必须套一层view -->
<view>
<!-- <view>
<view v-for="(item, index) in list1" :key="item.id" class="waterfall-item"
@click="$utils.navigateTo('/pages_order/scenicSpot/scenicSpotDetail?id=' + item.id)">
<view class="waterfall-item__image" :style="[imageStyle(item)]">
@ -36,11 +54,11 @@
</view>
</view>
</view>
</template>
</template> -->
<!-- 第二列数据 -->
<template v-slot:list2>
<!-- <template v-slot:list2> -->
<!-- 为了磨平部分平台的BUG必须套一层view -->
<view>
<!-- <view>
<view v-for="(item, index) in list2" :key="item.id" class="waterfall-item"
@click="$utils.navigateTo('/pages_order/scenicSpot/scenicSpotDetail?id=' + item.id)">
<view class="waterfall-item__image" :style="[imageStyle(item)]">
@ -57,8 +75,7 @@
</view>
</view>
</template>
</uv-waterfall>
</view>
</uv-waterfall> -->
<!-- <view class="list">
@ -132,11 +149,51 @@
<style scoped lang="scss">
.page {
background-color: #fff;
background-color: white;
.list {
padding: 0 20rpx;
}
}
.top-bg{
position: absolute;
height: 400rpx;
// background: linear-gradient(blue, pink);
}
.waterfall{
margin: 50rpx 0rpx;
image{
width: 100%;
height: 100%;
}
.images{
position: relative;
height: 350rpx;
margin: 5rpx 30rpx;
border-radius: 30rpx;
overflow: hidden;
.scenicspot{
position: absolute;
top: 0;
left: 0;
height: 50rpx;
width: 100rpx;
background-color: $uni-color;
color: white;
display: flex;
justify-content: center;
align-items: center;
border-bottom-right-radius: 30rpx;
}
}
.font{
margin: 10rpx 35rpx;
opacity: 0.8;
letter-spacing: 3rpx;
}
}
$show-lines: 1;
@import '@/uni_modules/uv-ui-tools/libs/css/variable.scss';


+ 12
- 5
pages_order/work/workList.vue View File

@ -1,12 +1,17 @@
<template>
<view class="page pageList">
<navbar title="工作" leftClick @leftClick="$utils.navigateBack" />
<view class="page pageList">]
<navbar title="工作" leftClick @leftClick="$utils.navigateBack" />
<view style="padding: 10rpx 20rpx;">
<uv-search bgColor="#fff" @search="getData" :showAction="false" searchIconSize="30rpx"
placeholder="请输入搜索关键字..." v-model="queryParams.title"></uv-search>
</view>
<uv-search bgColor="#fff" @search="getData" :showAction="false" searchIconSize="30rpx"
placeholder="请输入搜索关键字..." v-model="queryParams.title">
</uv-search>
</view>
<view class="">
<screenRen @clickItem="clickItem" />
</view>
@ -54,5 +59,7 @@
<style scoped lang="scss">
.page{
background-color: #fff;
}
</style>

Loading…
Cancel
Save