From da6e8d611e421a5195138d0da7610c1fc6227855 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期三, 28 五月 2025 11:10:32 +0800
Subject: [PATCH] Merge branch 'dev' of http://42.193.1.25:9521/r/lmk-shop-wx into dev
---
pages/passport/wechatMPLogin.vue | 6 +++---
manifest.json | 2 +-
pages.json | 8 ++++++++
pages/mine/set/personMsg.vue | 11 ++++++++---
pages/tabbar/index/home.vue | 27 +++++++++++++++++----------
5 files changed, 37 insertions(+), 17 deletions(-)
diff --git a/manifest.json b/manifest.json
index 2a053fc..01f9fd8 100644
--- a/manifest.json
+++ b/manifest.json
@@ -192,7 +192,7 @@
"mp-weixin" : {
/* 灏忕▼搴忕壒鏈夌浉鍏� */
"usingComponents" : true,
- "appid" : "wx4d124729082dda27",
+ "appid" : "wx68b8b82ae4ebc63a",
"optimization" : {
"subPackages" : true
},
diff --git a/pages.json b/pages.json
index e4123e3..d7c60c8 100644
--- a/pages.json
+++ b/pages.json
@@ -566,6 +566,14 @@
"color": "#FFFFFF"
}]
}
+ },
+ "componentPlaceholder": {
+ "u-form": "view",
+ "u-form-item": "view",
+ "u-input": "view",
+ "u-radio-group": "view",
+ "u-radio": "view",
+ "u-picker": "view"
}
}
}, {
diff --git a/pages/mine/set/personMsg.vue b/pages/mine/set/personMsg.vue
index bc11b32..26bac13 100644
--- a/pages/mine/set/personMsg.vue
+++ b/pages/mine/set/personMsg.vue
@@ -41,14 +41,19 @@
</view>
</template>
<script>
-import '@/uview-components/uview-ui'
+import UForm from "@/uview-components/uview-ui/components/u-form/u-form.vue";
+import UFormItem from "@/uview-components/uview-ui/components/u-form-item/u-form-item.vue";
+import UInput from "@/uview-components/uview-ui/components/u-input/u-input.vue";
+import URadioGroup from "@/uview-components/uview-ui/components/u-radio-group/u-radio-group.vue";
+import URadio from "@/uview-components/uview-ui/components/u-radio/u-radio.vue";
+import UPicker from "@/uview-components/uview-ui/components/u-picker/u-picker.vue";
+
import { saveUserInfo, getUserInfo } from "@/api/members.js";
import { upload } from "@/api/common.js";
import storage from "@/utils/storage.js";
-import uFormItem from "@/uview-components/uview-ui/components/u-form-item/u-form-item.vue";
import city from "@/components/m-city/m-city.vue";
export default {
- components: { uFormItem, "m-city": city },
+ components: { UForm,UFormItem,UInput,URadioGroup,URadio,UPicker, "m-city": city },
data() {
return {
lightColor: this.$lightColor, //楂樹寒棰滆壊
diff --git a/pages/passport/wechatMPLogin.vue b/pages/passport/wechatMPLogin.vue
index 41199bc..b48772c 100644
--- a/pages/passport/wechatMPLogin.vue
+++ b/pages/passport/wechatMPLogin.vue
@@ -38,9 +38,9 @@
</template>
<script>
- import UCheckBox from '@/uview-components/uview-ui/components/u-checkbox/u-checkbox.vue';
+ import UCheckbox from '@/uview-components/uview-ui/components/u-checkbox/u-checkbox.vue';
import UNavbar from '@/uview-components/uview-ui/components/u-navbar/u-navbar.vue';
- import UModel from '@/uview-components/uview-ui/components/u-modal/u-modal.vue';
+ import UModal from '@/uview-components/uview-ui/components/u-modal/u-modal.vue';
import {
mpAutoLogin
} from "@/api/connect.js";
@@ -54,7 +54,7 @@
import storage from "@/utils/storage.js";
import config from '@/config/config'
export default {
- components: {UCheckBox, UModel,UNavbar},
+ components: {UCheckbox, UModal,UNavbar},
data() {
return {
lightColor:this.$lightColor,
diff --git a/pages/tabbar/index/home.vue b/pages/tabbar/index/home.vue
index 4ed067f..d7a4d70 100644
--- a/pages/tabbar/index/home.vue
+++ b/pages/tabbar/index/home.vue
@@ -101,7 +101,7 @@
<text class="iconfont close-icon" @click="closeCommentPopup"></text>
</view>
- <scroll-view class="comment-list" scroll-y>
+ <scroll-view class="comment-list" scroll-y :show-scrollbar="false" @scrolltolower="getCommentPage">
<view v-if="commentLoading" class="loading">
<uni-load-more status="loading"></uni-load-more>
</view>
@@ -111,10 +111,10 @@
</view>
<view v-else class="comment-item" v-for="comment in comments" :key="comment.id">
- <image class="avatar" :src="comment.user.avatar || '/static/default-avatar.png'"></image>
+ <image class="avatar" :src="comment.userAvatar || '/static/default-avatar.png'"></image>
<view class="comment-content">
- <text class="nickname">{{comment.user.nickname}}</text>
- <text class="content">{{comment.content}}</text>
+ <text class="nickname">{{comment.userNickname}}</text>
+ <text class="content">{{comment.commentContent}}</text>
<text class="time">{{formatTime(comment.createTime)}}</text>
</view>
</view>
@@ -260,12 +260,19 @@
replyId: null
}
},
+ async getCommentPage() {
+ this.commentQuery.pageNumber += 1;
+ getVideoComments(this.commentQuery).then(res => {
+ this.comments.push(res.data.data)
+ })
+ },
// 鏄剧ず璇勮寮圭獥
async showComments(item) {
this.commentForm.videoId = item.id;
this.$refs.commentPopup.open();
this.commentLoading = true;
this.commentQuery.videoId = item.id
+ // 棣栨鍔犺浇璇勮鍒嗛〉澶у皬澧炲姞涓�鍊嶏紝浠ヤ骇鐢熸粴鍔ㄦ潯锛屽悗缁彲瑙﹀彂
getVideoComments(this.commentQuery).then(res => {
this.comments = res.data.data
}).catch(() => {
@@ -620,7 +627,7 @@
background-color: #fff;
border-radius: 20rpx 20rpx 0 0;
padding-bottom: env(safe-area-inset-bottom);
- height: 50vh;
+ height: 60vh;
display: flex;
flex-direction: column;
}
@@ -645,14 +652,14 @@
.comment-list {
flex: 1;
- padding: 20rpx;
+ padding: 0rpx 20rpx 20rpx 20rpx;
box-sizing: border-box;
+ height: calc(60vh - 260rpx);
}
.comment-item {
display: flex;
- padding: 20rpx 0;
- border-bottom: 1rpx solid #f5f5f5;
+ padding: 10rpx 0;
}
.avatar {
@@ -667,14 +674,14 @@
}
.nickname {
- font-size: 26rpx;
+ font-size: 24rpx;
color: #666;
display: block;
margin-bottom: 10rpx;
}
.content {
- font-size: 30rpx;
+ font-size: 24rpx;
color: #333;
display: block;
margin-bottom: 10rpx;
--
Gitblit v1.8.0