diff --git a/App.vue b/App.vue index 11ff243..15539dd 100644 --- a/App.vue +++ b/App.vue @@ -20,6 +20,7 @@ export default { }; }, onLoad(option) { + AutomaticCleaning() uni.getStorage({ key: "userinfo", success: (res) => { @@ -30,6 +31,16 @@ export default { }, }) }, + methods: { + //自动清理缓存 + AutomaticCleaning(){ + const lastCleanTime = uni.getStorageSync('last_clean_time') || 0; + const now = Date.now(); + if (now - lastCleanTime < 7 * 24 * 3600 * 1000) return; // 7 days + uni.clearStorage(); + uni.setStorageSync('last_clean_time', now); + } + }, provide() { return { $global: { diff --git a/TUIKit/components/TUIChat/message-input-toolbar/index.vue b/TUIKit/components/TUIChat/message-input-toolbar/index.vue index d27fab5..34dbb6c 100644 --- a/TUIKit/components/TUIChat/message-input-toolbar/index.vue +++ b/TUIKit/components/TUIChat/message-input-toolbar/index.vue @@ -45,7 +45,7 @@ v-for="(extension, index) in currentExtensionList.slice(0, slicePos)" :key="index" > - + /> --> - + diff --git a/TUIKit/components/TUIConversation/index.vue b/TUIKit/components/TUIConversation/index.vue index c958f8b..f16ca01 100644 --- a/TUIKit/components/TUIConversation/index.vue +++ b/TUIKit/components/TUIConversation/index.vue @@ -6,7 +6,7 @@ mode="scaleToFill" class="Navigationimg" /> - +
消息
{ height: 200rpx; z-index: 998; } -/* .Return { - width: 50rpx; - height: 50rpx; +.Return { + width: 70rpx; + height: 70rpx; position: absolute; - top: 100rpx; - left: 40rpx; + top: 120rpx; + left: 360rpx; z-index: 999; -} */ + font-weight: bold; +} diff --git a/components/Advertisement/Advertisement.vue b/components/Advertisement/Advertisement.vue index dda92d8..3a165a4 100644 --- a/components/Advertisement/Advertisement.vue +++ b/components/Advertisement/Advertisement.vue @@ -23,6 +23,8 @@ width: 100%; height: 100rpx; background: #ffffff; + border: 1px solid #e5e5e5; + border-radius: 10rpx; } /* 样式定义 */ \ No newline at end of file diff --git a/components/tabBar/tabBar.vue b/components/tabBar/tabBar.vue index 70fffb2..aa3c462 100644 --- a/components/tabBar/tabBar.vue +++ b/components/tabBar/tabBar.vue @@ -48,7 +48,7 @@ let tabList = reactive([ iconPath: "../../static/Forum.png", selectedIconPath: "../../static/Forumclick.png", text: "论坛", - pagePath: "", + pagePath: "/pages/Forum/Forum", middleClass: "", }, { diff --git a/components/topNavigation/topNavigation.vue b/components/topNavigation/topNavigation.vue index 6b7080a..ba9167d 100644 --- a/components/topNavigation/topNavigation.vue +++ b/components/topNavigation/topNavigation.vue @@ -4,13 +4,13 @@ @click="MakeAppointmentPK" :class="{ Selectcss: !Select, NoSelectcss: Select }" class="RealTime" - >PK大厅今日PK 今日PKPK大厅 @@ -29,14 +29,14 @@ export default { // 页面加载时执行 }, methods: { + MakeAppointmentPK() { + this.Select = false; + this.$emit("MakeAppointmentPK"); + }, RealTimePk() { this.Select = true; this.$emit("RealTimePk");//触发实时PK事件 }, - MakeAppointmentPK() { - this.Select = false; - this.$emit("MakeAppointmentPK");//触发预约PK事件 - }, screening() { this.$emit("screening");//触发筛选事件 }, diff --git a/pages.json b/pages.json index 58bf3b8..37d3313 100644 --- a/pages.json +++ b/pages.json @@ -36,6 +36,12 @@ "navigationBarTitleText": "修改pk信息" } }, + { + "path": "pages/Mine/minecomponents/serviceProtocol", + "style": { + "navigationBarTitleText": "服务协议" + } + }, { "path": "pages/Mine/minecomponents/DetailsPKRecords/DetailsPKRecords", "style": { @@ -59,6 +65,12 @@ "navigationBarTitleText": "登录" } }, + { + "path": "pages/Forum/Forum", + "style": { + "navigationBarTitleText": "论坛" + } + }, { "path": "pages/UserInformation/UserInformation", "style": { @@ -179,6 +191,10 @@ { "pagePath": "pages/index/index", "text": "聊天" + }, + { + "pagePath": "pages/Forum/Forum", + "text": "论坛" } ] } diff --git a/pages/Forum/Forum.vue b/pages/Forum/Forum.vue new file mode 100644 index 0000000..50007c4 --- /dev/null +++ b/pages/Forum/Forum.vue @@ -0,0 +1,56 @@ + + + + + \ No newline at end of file diff --git a/pages/Home/Home.vue b/pages/Home/Home.vue index bb4d1c3..edc2e30 100644 --- a/pages/Home/Home.vue +++ b/pages/Home/Home.vue @@ -83,11 +83,15 @@ export default { list: [], // 列表数据 detailsdata: {}, //详情数据 triggered: false, //下拉刷新标识 + RealTimePklist: [], // PK大厅列表数据 + MakeAppointmentPKlist: [], // 今日PK列表数据 + listtype: 1, // 列表类型 1 当天 2 大于当天 }; }, mounted() { // 页面加载完成后请求数据 - this.pkList(); + this.pkList({type:2}); + this.pkList({type:1}); }, onLoad() { uni.getStorage({ @@ -104,13 +108,6 @@ export default { success: (res) => { this.chatInfo = res.data; TUIlogin(this.chatInfo.appId, this.info.id, this.myuserSig.userSig); - // let options = { - // SDKAppID: this.chatInfo.appId, - // }; - // console.log("`````````````````````````````````````````", this.chatInfo); - // let chat = TencentCloudChat.create(options); - // console.log("chat````````````````````````````````````````", this.chat); - // chat.login({ userID: String(this.info.id), userSig: this.myuserSig.userSig }); }, }); }, @@ -119,11 +116,13 @@ export default { }); }, methods: { - goRealTimePk() { - console.log("goRealTimePk"); - }, goMakeAppointmentPK() { - console.log("goMakeAppointmentPK"); + this.listtype = 1; + this.list = this.MakeAppointmentPKlist; + }, + goRealTimePk() { + this.listtype = 2; + this.list = this.RealTimePklist; }, goAdvertisement() { // this.$global.lastPage = getCurrentPages().router; @@ -132,8 +131,13 @@ export default { onRefresherRefresh() { this.page = 0; this.list = []; + if(this.listtype === 1){ + this.MakeAppointmentPKlist = []; + }else{ + this.RealTimePklist = []; + } this.triggered = true; - this.pkList(); + this.pkList({type:this.listtype}); }, async goDetail(item) { uni.showLoading({ @@ -177,7 +181,8 @@ export default { } }, formatDate: formatDate, - async pkList() { + + async pkList(condition) { const res = await request({ url: "pk/pkList", method: "POST", @@ -185,21 +190,27 @@ export default { status: 0, page: this.page, size: this.size, + condition:condition }, userInfo: false, }); console.log(res); if (res.code === 200) { - this.list.push(...res.data); - console.log(this.list); this.triggered = false; + if (condition.type === 1) { + this.MakeAppointmentPKlist.push(...res.data); + this.list = this.MakeAppointmentPKlist; + } else { + this.RealTimePklist.push(...res.data); + this.list = this.RealTimePklist; + } + } } }, onScrollToLower() { this.page++; - this.pkList(); + this.pkList({type:this.listtype}); }, - }, components: { topNavigation, Advertisement, diff --git a/pages/Mine/Mine.vue b/pages/Mine/Mine.vue index 488488d..8554a95 100644 --- a/pages/Mine/Mine.vue +++ b/pages/Mine/Mine.vue @@ -54,16 +54,16 @@ - + - + - - 胜利 - 共一场 - 20:30 + + 胜利 + 共{{item.pkNumber}}场 + {{TimeFormatting(item.pkTime)}} @@ -84,7 +84,7 @@ 联系客服 - + -

联系方式

+ + + + + + + 联系客服 @@ -15,17 +21,46 @@ // 页面加载时执行 }, methods: { - // 方法定义 + onBack() { + // 返回上一页 + wx.navigateBack({ + delta: 1 + }) + } } } \ No newline at end of file diff --git a/pages/Mine/minecomponents/pkRecord.vue b/pages/Mine/minecomponents/pkRecord.vue index 038bd0f..74f11d0 100644 --- a/pages/Mine/minecomponents/pkRecord.vue +++ b/pages/Mine/minecomponents/pkRecord.vue @@ -102,31 +102,7 @@ export default { slidetext: "我发布的PK", // 导航栏文字 pkmyRecordlist: [], // PK记录列表 pkInvitationRecordlist: [], // PK记录列表 - pkRecordlist: [{ - winnerId: "1", - pkTime: "1626211200", - anchorIdA: "123", - anchorIconA: "https://img.yzcdn.cn/vant/cat.jpeg", - userAcoin: "100", - anchorIdB: "456", - anchorIconB: "https://img.yzcdn.cn/vant/dog.jpeg", - userBcoin: "200", - senderA: "123", - senderB: "456", - }, - { - winnerId: "2", - pkTime: "1626211200", - anchorIdA: "789", - anchorIconA: "https://img.yzcdn.cn/vant/cat.jpeg", - userAcoin: "100", - anchorIdB: "101", - anchorIconB: "https://img.yzcdn.cn/vant/dog.jpeg", - userBcoin: "200", - senderA: "789", - senderB: "101", - }, - ], // PK记录列表 + pkRecordlist: [], // PK记录列表 userinfo: {}, // 用户信息 page: 0, // 页码 }; diff --git a/pages/Mine/minecomponents/recompose/recompose.vue b/pages/Mine/minecomponents/recompose/recompose.vue index a0ec5a8..129795a 100644 --- a/pages/Mine/minecomponents/recompose/recompose.vue +++ b/pages/Mine/minecomponents/recompose/recompose.vue @@ -215,7 +215,7 @@ export default { this.Display = false; this.Hint = false; this.nameAnchor = ""; - this.genders = ""; + this.genders = 0; this.numberCoins = ""; this.remarks = ""; this.datetimesingle = ""; @@ -234,7 +234,7 @@ export default { //判断是否为空 if ( this.nameAnchor == "" && this.nameAnchor == null || - this.genders == "" && this.genders == null || + this.genders == 0 && this.genders == null || this.numberCoins =="" && this.numberCoins == null || this.datetimesingle == "" && this.datetimesingle == null || this.countrys == "" && his.countrys == null || diff --git a/pages/Mine/minecomponents/serviceProtocol.vue b/pages/Mine/minecomponents/serviceProtocol.vue new file mode 100644 index 0000000..a6293ca --- /dev/null +++ b/pages/Mine/minecomponents/serviceProtocol.vue @@ -0,0 +1,66 @@ + + + + + diff --git a/pages/NewAddedPk/NewAddedPk.vue b/pages/NewAddedPk/NewAddedPk.vue index 60ec8b3..5d8da11 100644 --- a/pages/NewAddedPk/NewAddedPk.vue +++ b/pages/NewAddedPk/NewAddedPk.vue @@ -1,5 +1,9 @@ -