zm/nuttyreading-html
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'xie1010'

Browse Source
This commit is contained in:
@fawn-nine
2023-10-13 13:33:56 +08:00
parent fcc84b91a0 f5dc71993f
commit ddd68f8736
8 changed files with 83 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pages/bookShop/commodityDetail.vue
View File

@@ -8,7 +8,7 @@
<swiper :indicator-dots="true" :autoplay="true" :interval="3000" :duration="1000"
style="width: 100%;height: 100%;">
<swiper-item v-for="(item,index) in swiperlist" :key="index" style="width: 100%;height: 100%;">
<image :src="item" mode="aspectFit" style="width: 100%;height: 100%;"></image>
<image :src="item" mode="aspectFit" style="width: 100%;height: 100%;" @click="previewImage(item)"></image>
</swiper-item>
</swiper>
</view>
@@ -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

15
pages/bookShop/settlement.vue
View File

@@ -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()

56
pages/clock/clock.vue
View File

@@ -129,34 +129,38 @@
<view class="zhuiping item" v-if="item.subCommentList.length > 0" style="padding-left: 50px;">
<view class="subPItem" v-for="item2 in item.subCommentList" :key="item2.key">
<view class="touxiang zhuipingTX flexbox">
<image v-if="!item2.avatar || item2.avatar == ''" src="../../static/icon/morenAvavter.png"
mode="aspectFit"></image>
<image v-else :src="item2.avatar" mode="aspectFit"></image>
<text class="username nowrap subPName">{{item2.nickName?item2.nickName:'匿名用户'}}</text>
<text class="username nowrap" style="padding: 0 10rpx; color: #c7c7c7;">回复了</text>
<text class="username nowrap">{{item2.puserNickName?item2.puserNickName:'匿名用户'}}</text>
</view>
<view class="contentBox" style="width: 100% !important;">
<!-- <div class="pjimgs flexbox">
<view class="item" v-for="(item1,index) in item2.imageList">
<image v-if="item1.length > 10" @click="previewImage(item1)" :src="item1"
mode="aspectFill" style="width:100%; height: 50px;"></image>
</view>
</div> -->
<view class="content" style="width: 100%;" @click="showPingLun(item2)">
<view class="" v-html="item2.phtml"></view>
<!-- <view class="" v-html="item2.content"></view> -->
<view class="left">
<image v-if="!item2.avatar || item2.avatar == ''" src="../../static/icon/morenAvavter.png"
mode="aspectFit"></image>
<image v-else :src="item2.avatar" mode="aspectFit"></image>
</view>
<view class="flexbox" style="text-align: right; align-items: center; justify-content: space-between;">
<view class="flexbox" @click="showPingLun(item2)" style="align-items: center; ">
<u-icon style="display: inline ;margin-left: 10rpx; " name="chat" color="#999"
size="18" ></u-icon>
<text class="time" style="display: inline ;margin-right: 20rpx; ">回复</text>
<view class="neirong" style="text-align: left;">
<text class="username nowrap subPName">{{item2.nickName?item2.nickName:'匿名用户'}}</text>
<text class="username nowrap" style="padding: 0 10rpx; color: #c7c7c7;">回复了</text>
<text class="username nowrap">{{item2.puserNickName?item2.puserNickName:'匿名用户'}}</text>
<view class="contentBox" style="width: 100% !important; padding-left: 3px;">
<!-- <div class="pjimgs flexbox">
<view class="item" v-for="(item1,index) in item2.imageList">
<image v-if="item1.length > 10" @click="previewImage(item1)" :src="item1"
mode="aspectFill" style="width:100%; height: 50px;"></image>
</view>
</div> -->
<view class="content" style="width: 100%;" @click="showPingLun(item2)">
<view class="" v-html="item2.phtml"></view>
<!-- <view class="" v-html="item2.content"></view> -->
</view>
<view class="flexbox" style="text-align: right; align-items: center; justify-content: space-between;">
<view class="flexbox" @click="showPingLun(item2)" style="align-items: center;justify-content: space-between; ">
<u-icon style="display: inline ;margin-left: 10rpx; " name="chat" color="#999"
size="18" ></u-icon>
<text class="time" style="display: inline ;margin-right: 20rpx; ">回复</text>
</view>
<text class="time">{{item2.createTime}}</text>
</view>
</view>
<text class="time">{{item2.createTime}}</text>
</view>
</view>
</view>
</view>
</view>
</view>
</view>

20
pages/clock/index.vue
View File

@@ -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
});
}
},

38
pages/eBook/bookContent.vue
View File

@@ -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
// })
// }
});
// 获取电子目录

4
pages/library/library.vue
View File

@@ -87,7 +87,7 @@
<view class="">
<image src="../../static/icon/home3.png" mode="aspectFit"></image>
</view>
<view class="v1"><text>评 书</text></view>
<view class="v1"><text>书 评</text></view>
</view>
<view class="item " >
<!-- <u-icon name="chat" color="#fcbd71" size="24"></u-icon> -->
@@ -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;}
}

27
pages/peanut/mine.vue
View File

@@ -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(){

12
pages/peanut/searchFor.vue
View File

@@ -49,13 +49,14 @@
</view>
</view>
<view v-if="this.show==1&&this.bookList==''">
<u-divider text="暂无数据"></u-divider>
</view>
<view style="padding-bottom: 20rpx;">
<u-back-top :scroll-top="scrollTop"></u-back-top>
</view>
</view>
<view v-if="this.show==1&&this.bookList==''">
<u-divider text="暂无数据"></u-divider>
</view>
<music-play :playData="playData"></music-play>
</view>
</template>
@@ -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%;