From a38827061b6679a39d719dee72904ffbe49bd8e8 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期一, 04 八月 2025 11:14:17 +0800
Subject: [PATCH] 登录用户名，以及隐藏专题，新闻页面调整样式
---
pages/cusbar/home/template/tpl.js | 10 ++--
pages/passport/wechatMPLogin.vue | 17 +++++---
pages/tabbar/home/template/tpl.js | 10 ++--
pages.json | 12 +++---
pages/product/home/template/tpl.js | 10 ++--
pages/news/detail.vue | 20 +++++-----
6 files changed, 42 insertions(+), 37 deletions(-)
diff --git a/pages.json b/pages.json
index 3dfba05..9d92817 100644
--- a/pages.json
+++ b/pages.json
@@ -2065,12 +2065,12 @@
{
"root": "pages/cusbar",
"pages": [
- {
- "path": "special/special",
- "style": {
- "navigationBarTitleText": "涓撻"
- }
- },
+ // {
+ // "path": "special/special",
+ // "style": {
+ // "navigationBarTitleText": "涓撻"
+ // }
+ // },
{
"path": "cart/cartList",
"style": {
diff --git a/pages/cusbar/home/template/tpl.js b/pages/cusbar/home/template/tpl.js
index 5701e89..c977f1f 100644
--- a/pages/cusbar/home/template/tpl.js
+++ b/pages/cusbar/home/template/tpl.js
@@ -3,11 +3,11 @@
let val = item.url || item;
//閾炬帴璺宠浆鍒颁笓棰�
- if (val && val.id && val.pageType == "special") {
- uni.navigateTo({
- url: `/pages/tabbar/special/special?id=${val.id}`,
- });
- }
+ // if (val && val.id && val.pageType == "special") {
+ // uni.navigateTo({
+ // url: `/pages/tabbar/special/special?id=${val.id}`,
+ // });
+ // }
switch (val.___type || val.type) {
case "goods":
uni.navigateTo({
diff --git a/pages/news/detail.vue b/pages/news/detail.vue
index ceabba6..08bec07 100644
--- a/pages/news/detail.vue
+++ b/pages/news/detail.vue
@@ -20,7 +20,7 @@
<scroll-view scroll-y class="content-wrapper">
<rich-text
:nodes="formatContent(detailData.content)"
- class="content"
+ class="rich-content"
></rich-text>
</scroll-view>
</template>
@@ -121,6 +121,7 @@
padding: 30rpx;
min-height: 100vh;
background-color: #f8f8f8;
+
}
.loading-container {
@@ -164,15 +165,7 @@
}
}
}
-
-.content-wrapper {
- background-color: #fff;
- border-radius: 16rpx;
- padding: 30rpx;
- box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.05);
- height: calc(100vh - 300rpx);
-
- .content {
+ .rich-content {
font-size: 30rpx;
line-height: 1.8;
color: #333;
@@ -208,5 +201,12 @@
margin: 20rpx 0;
}
}
+.content-wrapper {
+ background-color: #fff;
+ border-radius: 16rpx;
+ padding: 30rpx;
+ box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.05);
+ height: calc(100vh - 300rpx);
+ box-sizing: border-box;
}
</style>
\ No newline at end of file
diff --git a/pages/passport/wechatMPLogin.vue b/pages/passport/wechatMPLogin.vue
index a703f3e..f833167 100644
--- a/pages/passport/wechatMPLogin.vue
+++ b/pages/passport/wechatMPLogin.vue
@@ -214,7 +214,7 @@
}
},
//鑾峰彇鎵嬫満鍙锋巿鏉�
- getPhoneNumber(e) {
+ getPhoneNumber(e) {
let iv = e.detail.iv;
let encryptedData = e.detail.encryptedData;
@@ -255,17 +255,22 @@
icon: "none",
});
//鑾峰彇鐢ㄦ埛淇℃伅
- getUserInfo().then((user) => {
+ getUserInfo().then(async (user) => {
console.log(user)
const form ={
memberId:user.data.result.id,
nickName:this.nickName
}
- updateMemberNickName(form).then(res =>{
+ let name = '';
+ await updateMemberNickName(form).then(res =>{
+ if(res.statusCode === 200){
+ name = res.data.data;
+ }
})
- user.data.result.nickName = this.nickName
- storage.setUserInfo(user.data.result);
- storage.setHasLogin(true);
+ user.data.result.nickName = name
+ storage.setUserInfo(user.data.result);
+ storage.setHasLogin(true);
+
uni.navigateBack({
delta: 1,
diff --git a/pages/product/home/template/tpl.js b/pages/product/home/template/tpl.js
index 5701e89..c977f1f 100644
--- a/pages/product/home/template/tpl.js
+++ b/pages/product/home/template/tpl.js
@@ -3,11 +3,11 @@
let val = item.url || item;
//閾炬帴璺宠浆鍒颁笓棰�
- if (val && val.id && val.pageType == "special") {
- uni.navigateTo({
- url: `/pages/tabbar/special/special?id=${val.id}`,
- });
- }
+ // if (val && val.id && val.pageType == "special") {
+ // uni.navigateTo({
+ // url: `/pages/tabbar/special/special?id=${val.id}`,
+ // });
+ // }
switch (val.___type || val.type) {
case "goods":
uni.navigateTo({
diff --git a/pages/tabbar/home/template/tpl.js b/pages/tabbar/home/template/tpl.js
index 5701e89..c977f1f 100644
--- a/pages/tabbar/home/template/tpl.js
+++ b/pages/tabbar/home/template/tpl.js
@@ -3,11 +3,11 @@
let val = item.url || item;
//閾炬帴璺宠浆鍒颁笓棰�
- if (val && val.id && val.pageType == "special") {
- uni.navigateTo({
- url: `/pages/tabbar/special/special?id=${val.id}`,
- });
- }
+ // if (val && val.id && val.pageType == "special") {
+ // uni.navigateTo({
+ // url: `/pages/tabbar/special/special?id=${val.id}`,
+ // });
+ // }
switch (val.___type || val.type) {
case "goods":
uni.navigateTo({
--
Gitblit v1.8.0