From e025d6ab0a483b51f31256849d2f5bbf2beb3199 Mon Sep 17 00:00:00 2001 From: lnn19986213 <1667908750@qq.com> Date: Tue, 19 Sep 2023 13:33:56 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/pageHome/pageHome.vue | 28 ++++++++++-- src/pagesA/msg/chat/chat.vue | 4 ++ src/pagesB/ArtWorks/ArtWorks.vue | 4 +- src/pagesB/ArtWorks/artWorkDetail.vue | 2 +- src/pagesB/MyPoints/MyPoints.vue | 41 +++++++++++++++-- src/pagesB/improveData/improveData.vue | 16 +------ src/pagesB/orderHall/orderHall.vue | 2 +- src/pagesC/ArtActivities/ArtActivities.vue | 15 ++++--- src/pagesC/OrderDetail/OrderDetail.vue | 14 +++++- src/pagesC/activity/activity.vue | 2 +- src/pagesC/mediaProp/mediaProp.vue | 35 ++++++++++++--- src/pagesC/shop/Shop.vue | 2 +- src/pagesD/jgsz/detail.vue | 9 ++-- src/pagesD/jgsz/index.vue | 12 ++--- src/pagesD/wyxx/index.vue | 52 ++++++++++++++++------ src/pagesD/xskz/index.vue | 5 ++- src/request/interface.js | 4 +- 17 files changed, 180 insertions(+), 67 deletions(-) diff --git a/src/pages/pageHome/pageHome.vue b/src/pages/pageHome/pageHome.vue index 97f4d80..c2b237b 100644 --- a/src/pages/pageHome/pageHome.vue +++ b/src/pages/pageHome/pageHome.vue @@ -10,7 +10,7 @@ - + @@ -259,9 +259,10 @@ let _this = this this.http.request('/indexImage/list', {}, "GET").then(res => { if (res.code == 200) { - res.data.forEach(function(item) { - _this.list.push(item.imagePath) - }) + // res.data.forEach(function(item) { + // _this.list.push(item.imagePath) + // }) + this.list = res.data // this.load = false this.getEnjoy() } @@ -439,6 +440,25 @@ url: '/pagesC/ActivitiesDetail/ActivitiesDetail?id=' + id }) }, + // 轮播图详情 + goSwiDetail(index) { + let id = this.list[index].linkPath + let isOutLink = this.list[index].isOutLink + let linkType = this.list[index].linkType + if(isOutLink){ + if(linkType == 'activity'){ + uni.navigateTo({ + url: '/pagesC/ActivitiesDetail/ActivitiesDetail?id=' + id + }) + }else if(linkType == 'dynamic'){ + uni.navigateTo({ + url: '/pagesC/activity/activityDetail?id=' + id + }) + } + } + + }, + callPhone() { uni.makePhoneCall({ // 手机号 diff --git a/src/pagesA/msg/chat/chat.vue b/src/pagesA/msg/chat/chat.vue index 23efaa7..d3c94b0 100644 --- a/src/pagesA/msg/chat/chat.vue +++ b/src/pagesA/msg/chat/chat.vue @@ -681,6 +681,10 @@ position: fixed; z-index: 20; bottom: 0; + padding-bottom: constant(safe-area-inset-bottom); + padding-bottom: env(safe-area-inset-bottom); + // 先constant再env + .voice, .more { diff --git a/src/pagesB/ArtWorks/ArtWorks.vue b/src/pagesB/ArtWorks/ArtWorks.vue index 686bcec..715920c 100644 --- a/src/pagesB/ArtWorks/ArtWorks.vue +++ b/src/pagesB/ArtWorks/ArtWorks.vue @@ -80,7 +80,7 @@ - {{ v.createdAt }} + {{ v.releaseDate }} @@ -129,7 +129,7 @@ // this.pages++ // this.getMoreData(); // }, - onShow() { + onLoad() { this.list1 = [{ name: '全部', type: '', diff --git a/src/pagesB/ArtWorks/artWorkDetail.vue b/src/pagesB/ArtWorks/artWorkDetail.vue index 07a64af..62caf53 100644 --- a/src/pagesB/ArtWorks/artWorkDetail.vue +++ b/src/pagesB/ArtWorks/artWorkDetail.vue @@ -29,7 +29,7 @@ {{ detailData.user.userName }} - 发布于{{detailData.createdAt}} + 发布于{{detailData.releaseDate}} diff --git a/src/pagesB/MyPoints/MyPoints.vue b/src/pagesB/MyPoints/MyPoints.vue index 5d123b7..fe3a416 100644 --- a/src/pagesB/MyPoints/MyPoints.vue +++ b/src/pagesB/MyPoints/MyPoints.vue @@ -59,7 +59,7 @@ 已完成 - 未完成 + 未完成 @@ -106,7 +106,7 @@ 已完成 - 未完成 + 未完成 @@ -138,7 +138,7 @@ userPointCount: 0, }; }, - onLoad() { + onShow() { this.getPoint() }, methods: { @@ -150,6 +150,41 @@ url: '/pagesB/MyPoints/pointDetail' }) }, + toFinish(val) { + if(val == '购买商品' || val == '首次购买商品'){ + uni.redirectTo({ + url: '/pagesC/shop/Shop' + }) + }else if(val == '收藏一件作品' || val == '关注一名作者' || val == '查看一件作品' || val == '点赞一件作品'){ + uni.navigateTo({ + url: '/pagesB/ArtWorks/ArtWorks' + }) + }else if(val == '查看一条政策'){ + uni.navigateTo({ + url: '/pagesC/PolicyExpress/PolicyExpress' + }) + }else if(val == '查看一条动态'){ + uni.redirectTo({ + url: '/pagesC/activity/activity' + }) + }else if(val == '首次上传作品'){ + uni.navigateTo({ + url: '/pagesB/PublishWorks/PublishWorks' + }) + }else if(val == '首次文艺接单'){ + uni.navigateTo({ + url: '/pagesB/orderHall/orderHall' + }) + }else if(val == '首次上传头像'){ + uni.navigateTo({ + url: '/pagesB/PersonalCenter/PersonalCenter' + }) + }else if(val == '首次参加文艺活动'){ + uni.navigateTo({ + url: '/pagesC/ArtActivities/ArtActivities' + }) + } + }, getPoint() { let _this = this this.dayWork = [] diff --git a/src/pagesB/improveData/improveData.vue b/src/pagesB/improveData/improveData.vue index c97dcf7..9b4b7f3 100644 --- a/src/pagesB/improveData/improveData.vue +++ b/src/pagesB/improveData/improveData.vue @@ -370,21 +370,9 @@ }, { min: 6, max: 20, - message: '密码长度应大于等于6个字符小于20个字符!', + message: '密码需由长度不小于12位的大小写英文、数字及特殊符号组成!', trigger: ['blur', 'change'] - }, { - trigger: ['blur', 'change'], - validator: (rule, value, callback) => { - var passwordreg = - /^(?![0-9]+$)(?![a-z]+$)(?![A-Z]+$)(?!([^(0-9a-zA-Z)])+$).{6,20}$/; - if (!passwordreg.test(value)) { - callback(new Error('密码包含 数字,英文,字符中的两种以上')) - } else { - callback() - } - } - - }], + },], 'userInfo.serverInstrutor': [{ type: 'string', required: true, diff --git a/src/pagesB/orderHall/orderHall.vue b/src/pagesB/orderHall/orderHall.vue index 9711dbb..b5ab487 100644 --- a/src/pagesB/orderHall/orderHall.vue +++ b/src/pagesB/orderHall/orderHall.vue @@ -94,7 +94,7 @@ export default { this.pages++ this.getData(); }, - onShow () { + onLoad () { this.pages = 1 this.load = true this.mainList = [] diff --git a/src/pagesC/ArtActivities/ArtActivities.vue b/src/pagesC/ArtActivities/ArtActivities.vue index 8a8f6b9..09e27c5 100644 --- a/src/pagesC/ArtActivities/ArtActivities.vue +++ b/src/pagesC/ArtActivities/ArtActivities.vue @@ -14,6 +14,7 @@ + @@ -40,11 +41,12 @@ onLoad() { this.isAdmin = uni.getStorageSync('isAdmin') this.userType = uni.getStorageSync('userType') - }, - onShow() { this.pages = 1 this.list2 = [] this.getData() + }, + onShow() { + }, // 下拉刷新 onPullDownRefresh() { @@ -100,10 +102,10 @@