From f5dc71993f9dc481e78aa8232f07c735f2b1460c Mon Sep 17 00:00:00 2001 From: "@fawn-nine" <1271023382@qq.com> Date: Fri, 13 Oct 2023 13:32:32 +0800 Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E5=88=86=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/bookShop/commodityDetail.vue | 10 ++++-- pages/bookShop/settlement.vue | 15 +++++--- pages/clock/clock.vue | 56 ++++++++++++++++-------------- pages/clock/index.vue | 24 +++++-------- pages/eBook/bookContent.vue | 38 ++++++++++---------- pages/library/library.vue | 4 +-- pages/peanut/mine.vue | 27 +------------- pages/peanut/searchFor.vue | 12 ++++--- 8 files changed, 85 insertions(+), 101 deletions(-) diff --git a/pages/bookShop/commodityDetail.vue b/pages/bookShop/commodityDetail.vue index 584acaf..730a03c 100644 --- a/pages/bookShop/commodityDetail.vue +++ b/pages/bookShop/commodityDetail.vue @@ -8,7 +8,7 @@ - + @@ -319,7 +319,13 @@ previewImage(url) { console.log(url) uni.previewImage({ - urls: [url] + urls: [url], + longPressActions:{ + itemList:['很抱歉，暂不支持保存图片到本地'], + success:function(res){ + console.log(res,'+++++') + } + } }); }, // 获取html格式的评论1 diff --git a/pages/bookShop/settlement.vue b/pages/bookShop/settlement.vue index fab2780..2771bcf 100644 --- a/pages/bookShop/settlement.vue +++ b/pages/bookShop/settlement.vue @@ -287,15 +287,20 @@ this.shangIDNum = e.list } // this.getYunFei() - - }, - onShow() { if (this.typeId == 1) { this.getCartList() } else if (this.typeId == 0) { this.getShangList(this.shangIDNum); - } + } + }, + onShow() { + // if (this.typeId == 1) { + // this.getCartList() + + // } else if (this.typeId == 0) { + // this.getShangList(this.shangIDNum); + // } this.getData() this.getOS() }, @@ -433,7 +438,7 @@ for (let i = 0; i < this.cartIDNum.length; i++) { this.cartList.push(res.cartList[this.cartIDNum[i]]) } - // console.log(this.cartList, '购物车列表') + console.log(this.cartList, '购物车列表') this.getCourpe() this.getUserAddress() diff --git a/pages/clock/clock.vue b/pages/clock/clock.vue index 79b430d..efa4f08 100644 --- a/pages/clock/clock.vue +++ b/pages/clock/clock.vue @@ -129,34 +129,38 @@ - - - {{item2.nickName?item2.nickName:'匿名用户'}} - 回复了 - {{item2.puserNickName?item2.puserNickName:'匿名用户'}} - - - - - - + + + - - - - 回复 + + {{item2.nickName?item2.nickName:'匿名用户'}} + 回复了 + {{item2.puserNickName?item2.puserNickName:'匿名用户'}} + + + + + + + + + + 回复 + + {{item2.createTime}} + + - {{item2.createTime}} - - - + + diff --git a/pages/clock/index.vue b/pages/clock/index.vue index d67a8cf..5dabd4a 100644 --- a/pages/clock/index.vue +++ b/pages/clock/index.vue @@ -11,9 +11,9 @@ - + @@ -59,21 +59,13 @@ }, // 跳转到打卡页面 goToClock(val){ - if(val.clockIn != 1){ - uni.showModal({ - title: '提示', - cancelText: '暂不购买', - confirmText:'立即购买', - content: '购买后才可参与本书打卡哦~', - success: function (res) { - if (res.confirm) { - console.log('点击了去购买'); - } - } - }); - }else{ - console.log(val,'val') + console.log(val,'val') + if(this.contentShow == 1){ this.onPageJump('../clock/clock?bookid='+val.id) + }else{ + uni.navigateTo({ + url: '../eBook/bookContent?Id=' + val.id + }); } }, diff --git a/pages/eBook/bookContent.vue b/pages/eBook/bookContent.vue index 7a9691f..3e6b67a 100644 --- a/pages/eBook/bookContent.vue +++ b/pages/eBook/bookContent.vue @@ -194,25 +194,25 @@ this.freeChapterCount = res.book.freeChapterCount this.bokMesDet.userId = this.userInfo.id - if (this.bookMessage.publisherName.indexOf(',') > 0) { - this.bookMessage.publisherName = this.bookMessage.publisherName.split(',') - this.bookMessage.publisherId = this.bookMessage.publisherId.split(',') - this.bookMessage.publisherNIList = [] - for (let i in this.bookMessage.publisherName) { - this.bookMessage.publisherNIList.push({ - title: this.bookMessage.publisherName[i] - }) - } - for (let j in this.bookMessage.publisherId) { - this.bookMessage.publisherNIList[j].id = this.bookMessage.publisherId[j] - } - } else { - this.bookMessage.publisherNIList = [] - this.bookMessage.publisherNIList.push({ - 'title': this.bookMessage.publisherName, - 'id': this.bookMessage.publisherId - }) - } + // if (this.bookMessage.publisherName.indexOf(',') > 0) { + // this.bookMessage.publisherName = this.bookMessage.publisherName.split(',') + // this.bookMessage.publisherId = this.bookMessage.publisherId.split(',') + // this.bookMessage.publisherNIList = [] + // for (let i in this.bookMessage.publisherName) { + // this.bookMessage.publisherNIList.push({ + // title: this.bookMessage.publisherName[i] + // }) + // } + // for (let j in this.bookMessage.publisherId) { + // this.bookMessage.publisherNIList[j].id = this.bookMessage.publisherId[j] + // } + // } else { + // this.bookMessage.publisherNIList = [] + // this.bookMessage.publisherNIList.push({ + // 'title': this.bookMessage.publisherName, + // 'id': this.bookMessage.publisherId + // }) + // } }); // 获取电子目录 diff --git a/pages/library/library.vue b/pages/library/library.vue index 021cf76..2cbe13f 100644 --- a/pages/library/library.vue +++ b/pages/library/library.vue @@ -87,7 +87,7 @@ - 评 书 + 书 评 @@ -390,7 +390,7 @@ .btns{ margin-left: 20rpx; width: calc(100% - 200rpx); box-sizing: border-box; font-size: 34rpx; justify-content: space-between; .item{ margin-bottom:30rpx; width: 20%; text-align: center; image{ - display: block; margin-right: 10rpx; height: 112rpx; + display: block; height: 108rpx; } .v1{margin-top: -30rpx;} } diff --git a/pages/peanut/mine.vue b/pages/peanut/mine.vue index 3466096..5f715a3 100644 --- a/pages/peanut/mine.vue +++ b/pages/peanut/mine.vue @@ -216,32 +216,7 @@ // 新写分享 newOnShare(){ this.$refs.share.open() - }, - //分享app - // onShare(){ - // let shareData = { - // shareUrl:"https://www.nuttyreading.com/nuttyreading.apk", - // shareTitle:"疯子读书", - // type:'0', - // summary:'疯子读书,请使用浏览器打开本链接，自动下载安装包', // 分享内容的摘要 - // shareContent:"疯子读书,请使用浏览器打开本链接，自动下载安装包", - // shareImg:"static/fengziIcon.jpg", - // appId : "wx47134a8f15083734", // 默认不传type的时候，必须传appId和appPath才会显示小程序图标 - // appPath : "https://www.nuttyreading.com/nuttyreading.apk", - // appWebUrl : "https://www.nuttyreading.com/nuttyreading.apk", - // }; - // // 调用 - // let shareObj = appShare(shareData,res => { - // console.log("疯子读书",res); - // // 分享成功后关闭弹窗 - // // 第一种关闭弹窗的方式 - // closeShare(); - // }); - // setTimeout(() => { - // // 第二种关闭弹窗的方式 - // shareObj.close(); - // },5000); - // }, + }, // 注销账户 logout(){ diff --git a/pages/peanut/searchFor.vue b/pages/peanut/searchFor.vue index 9723401..01b0ba0 100644 --- a/pages/peanut/searchFor.vue +++ b/pages/peanut/searchFor.vue @@ -49,13 +49,14 @@ - - - + + + + @@ -285,8 +286,9 @@ } } - .sear_list { - margin: 50rpx 30rpx 0 30rpx; display: flex; flex-wrap: wrap; justify-content: space-between; + .sear_list { border: 1px solid red; + margin: 50rpx 30rpx 0 30rpx; display: flex; flex-wrap: wrap; + // justify-content: space-between; .bl_tioa { width: 30%;