From e4cd96fca472cfb6f9278b5c20e14eb586be5d1b Mon Sep 17 00:00:00 2001 From: huliyong <2783385703@qq.com> Date: Wed, 30 Oct 2024 16:17:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common.scss | 4 + components/base/navbar.vue | 17 +- components/list/activity/activityItem.vue | 266 +++++++++++++++++++++ components/list/dynamic/dynamicItem.vue | 12 +- components/list/dynamic/dynamicItemEdit.vue | 12 +- pages/index/activity.vue | 10 +- pages/index/center.vue | 5 - pages/index/index.vue | 5 - pages_order/activity/activityDetail.vue | 12 +- .../components/list/comment/commentItem.vue | 33 +++ .../components/list/comment/commentList.vue | 90 ++++++- pages_order/gourmet/gourmetDetail.vue | 6 + pages_order/post/addPost.vue | 9 +- pages_order/post/postDetail.vue | 6 + pages_order/renting/rentingDetail.vue | 8 +- pages_order/scenicSpot/scenicSpotDetail.vue | 12 +- pages_order/work/workDetail.vue | 6 + 17 files changed, 466 insertions(+), 47 deletions(-) create mode 100644 components/list/activity/activityItem.vue diff --git a/common.scss b/common.scss index 5fd3072..585811f 100644 --- a/common.scss +++ b/common.scss @@ -37,4 +37,8 @@ margin: 0; width: 0; height: 0; +} + +.uv-textarea{ + min-height: 400rpx; } \ No newline at end of file diff --git a/components/base/navbar.vue b/components/base/navbar.vue index 909f33c..5bc527a 100644 --- a/components/base/navbar.vue +++ b/components/base/navbar.vue @@ -4,8 +4,14 @@ + + + @@ -72,9 +78,18 @@ }, data() { return { + length : getCurrentPages().length }; }, methods : { + toHome(){ + if(this.length != 1){ + return + } + uni.reLaunch({ + url: '/pages/index/index' + }) + } } } diff --git a/components/list/activity/activityItem.vue b/components/list/activity/activityItem.vue new file mode 100644 index 0000000..88b1267 --- /dev/null +++ b/components/list/activity/activityItem.vue @@ -0,0 +1,266 @@ + + + + + \ No newline at end of file diff --git a/components/list/dynamic/dynamicItem.vue b/components/list/dynamic/dynamicItem.vue index 786d2aa..88b1267 100644 --- a/components/list/dynamic/dynamicItem.vue +++ b/components/list/dynamic/dynamicItem.vue @@ -60,8 +60,8 @@ + @click.stop="previewImage(images, i)" + :key="i" v-for="(img, i) in images"> @@ -93,6 +93,14 @@ return { } }, + computed : { + images(){ + if(!this.item.image){ + return [] + } + return this.item.image.split(',') + } + }, methods: { callPhone(){ uni.makePhoneCall({ diff --git a/components/list/dynamic/dynamicItemEdit.vue b/components/list/dynamic/dynamicItemEdit.vue index 6dba739..81bb75a 100644 --- a/components/list/dynamic/dynamicItemEdit.vue +++ b/components/list/dynamic/dynamicItemEdit.vue @@ -47,8 +47,8 @@ + @click.stop="previewImage(images, i)" + :key="i" v-for="(img, i) in images"> @@ -73,6 +73,14 @@ } }, + computed : { + images(){ + if(!this.item.image){ + return [] + } + return this.item.image.split(',') + } + }, methods: { }, } diff --git a/pages/index/activity.vue b/pages/index/activity.vue index 0706801..3695b72 100644 --- a/pages/index/activity.vue +++ b/pages/index/activity.vue @@ -5,6 +5,12 @@ + @@ -14,12 +20,14 @@ \ No newline at end of file diff --git a/pages_order/gourmet/gourmetDetail.vue b/pages_order/gourmet/gourmetDetail.vue index 3587c6c..8a9c007 100644 --- a/pages_order/gourmet/gourmetDetail.vue +++ b/pages_order/gourmet/gourmetDetail.vue @@ -108,6 +108,12 @@ this.params.orderId = options.id }, + onShareAppMessage(res) { + return { + title: this.detail.title, + path: '/pages_order/gourmet/gourmetDetail?id=' + this.id + } + }, onPullDownRefresh() { this.getDetail() }, diff --git a/pages_order/post/addPost.vue b/pages_order/post/addPost.vue index 30e4d32..464bc97 100644 --- a/pages_order/post/addPost.vue +++ b/pages_order/post/addPost.vue @@ -264,12 +264,13 @@ this.form.latitude = res.latitude this.form.longitude = res.longitude - if (!res.address && res.name) { //用户直接选择城市的逻辑 + if (res.name) { //用户直接选择城市的逻辑 + // if (!res.address && res.name) { //用户直接选择城市的逻辑 return this.form.address = res.name } - if (res.address || res.name) { - return this.form.address = res.address + res.name - } + // if (res.address || res.name) { + // return this.form.address = res.address + res.name + // } this.form.address = '' //用户啥都没选就点击勾选 this.form.latitude = '' this.form.longitude = '' diff --git a/pages_order/post/postDetail.vue b/pages_order/post/postDetail.vue index c1e7218..aaac5bd 100644 --- a/pages_order/post/postDetail.vue +++ b/pages_order/post/postDetail.vue @@ -126,6 +126,12 @@ this.params.orderId = options.id }, + onShareAppMessage(res) { + return { + title: this.detail.title, + path: '/pages_order/post/postDetail?id=' + this.id + } + }, onPullDownRefresh() { this.getDetail() }, diff --git a/pages_order/renting/rentingDetail.vue b/pages_order/renting/rentingDetail.vue index 91a9b70..3a7cca3 100644 --- a/pages_order/renting/rentingDetail.vue +++ b/pages_order/renting/rentingDetail.vue @@ -22,7 +22,7 @@ + style="padding: 36rpx; background: #FFF;"> {{ detail.money }}元/月 {{ detail.title }} {{ detail.home }} @@ -158,6 +158,12 @@ this.params.orderId = options.id }, + onShareAppMessage(res) { + return { + title: this.detail.title, + path: '/pages_order/renting/rentingDetail?id=' + this.id + } + }, onPullDownRefresh() { this.getDetail() }, diff --git a/pages_order/scenicSpot/scenicSpotDetail.vue b/pages_order/scenicSpot/scenicSpotDetail.vue index 4f85b7b..ba545a5 100644 --- a/pages_order/scenicSpot/scenicSpotDetail.vue +++ b/pages_order/scenicSpot/scenicSpotDetail.vue @@ -81,14 +81,10 @@ this.getDetail() }, onShareAppMessage(res) { - // if (res.from === 'button') {// 来自页面内分享按钮 - // console.log(res.target) - // } - // return { - // title: this.item.title, - // desc: this.item.content && this.item.content.slice(0, 30), - // path: '/pages/publish/postDetail?id=' + this.id - // } + return { + title: this.detail.name, + path: '/pages_order/scenicSpot/scenicSpotDetail?id=' + this.id + } }, methods: { getDetail() { diff --git a/pages_order/work/workDetail.vue b/pages_order/work/workDetail.vue index 57468fc..286858e 100644 --- a/pages_order/work/workDetail.vue +++ b/pages_order/work/workDetail.vue @@ -135,6 +135,12 @@ onShow() { this.getDetail() }, + onShareAppMessage(res) { + return { + title: this.detail.title, + path: '/pages_order/work/workDetail?id=' + this.id + } + }, methods: { getDetail(){ let data = {