From daa9adbc0e2fded884ea9e51fbe44cd22f6756a1 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期六, 28 二月 2026 15:16:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
mini-program/pages/article-details/article-details.vue | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/mini-program/pages/article-details/article-details.vue b/mini-program/pages/article-details/article-details.vue
index dfca6ce..f4d484d 100644
--- a/mini-program/pages/article-details/article-details.vue
+++ b/mini-program/pages/article-details/article-details.vue
@@ -21,7 +21,7 @@
{{item.content}}
</view>
<view class="pl-item-info-list" v-if="item.multifileList && item.multifileList.length > 0">
- <view class="pl-item-info-list-image" v-for="(child, i) in item.multifileList" :key="i" @click="yulan(child.fileFullUrl, item.multifileList)">
+ <view class="pl-item-info-list-image" v-for="(child, i) in item.multifileList" :key="i" @click.stop="yulan(child.fileFullUrl, item.multifileList)">
<image :src="child.fileFullUrl" mode="widthFix"></image>
</view>
<view style="width: 132rpx; height: 0;"></view>
@@ -61,7 +61,7 @@
{{child.content}}
</view>
<view class="pl-item-info-list" v-if="child.multifileList && child.multifileList.length > 0">
- <view class="pl-item-info-list-image" v-for="(child1, i) in child.multifileList" :key="i">
+ <view class="pl-item-info-list-image" v-for="(child1, i) in child.multifileList" :key="i" @click.stop="yulan(child1.fileFullUrl, child.multifileList)">
<image :src="child1.fileFullUrl" mode="widthFix"></image>
</view>
<view style="width: 132rpx; height: 0;"></view>
@@ -135,13 +135,16 @@
</view>
</view>
</u-popup>
+ <Login ref="login" />
</view>
</template>
<script>
import { mapState } from 'vuex'
import { dateConversion } from '@/utils/utils.js'
+ import Login from '@/components/login/login.vue'
export default {
+ components: { Login },
computed: {
...mapState(['userInfo', 'token','recshopid','recuserid'])
},
@@ -196,6 +199,10 @@
},
// 鐐硅禐
dianzanpl(item) {
+ if (!this.userInfo) {
+ this.$refs.login.open()
+ return;
+ }
if (!item.zanStatus || item.zanStatus == 0) {
this.$u.api.zanCreate({
objId: item.id,
@@ -310,6 +317,10 @@
},
// 璇勮
sendComment() {
+ if (!this.userInfo) {
+ this.$refs.login.open()
+ return;
+ }
if (!this.value && this.multifileList.length === 0) return uni.showToast({
title: '璇勮鍐呭涓嶈兘涓虹┖',
icon: 'none'
@@ -375,6 +386,10 @@
})
},
shoucang(type) {
+ if (!this.userInfo) {
+ this.$refs.login.open()
+ return;
+ }
if (type === 1) {
this.$u.api.cancelbatch({
ids: this.info.id,
@@ -396,6 +411,10 @@
}
},
dianzan(type) {
+ if (!this.userInfo) {
+ this.$refs.login.open()
+ return;
+ }
if (type === 1) {
this.$u.api.zanCancel({
objId: this.info.id,
--
Gitblit v1.9.3