阶段性上传

pages/clock/clock.vue

@@ -477,7 +477,8 @@
 						if (res.code == 0) {
 							//console.log(res, '快捷签到')
 							uni.showToast({
-								title:'发布成功'
+								title:'发布成功',
+							    icon:'success'
 							})
 							this.addTextShow = false
 							this.formData.content = ''

pages/clock/index.vue

@@ -15,6 +15,9 @@
 					</u-row>					
 				</view>		
 		</view>
+		<view v-else>
+			<u-divider text="当前无可打卡书籍~"></u-divider>
+		</view>
 		<music-play :playData="playData"></music-play>
 		<z-navigation></z-navigation>
 	</view>

pages/listen/home.vue

@@ -13,9 +13,9 @@
 		<view class="contentButton">
 			<u-tabs :scrollable="false" bg-color="#d4d4d4" active-color="#2979ff" inactive-color="#606266" bar-height="10" :list="contentButtonList" @click="contentButtonClick" lineWidth="42" :inactiveStyle="{fontSize:'32rpx'}" :activeStyle="{color: '#303133',fontWeight: 'bold', transform: 'scale(1.01)'}"></u-tabs>
 		</view>
-		<view class="listenList" v-if="bookList.length > 0">
+		<view class="listenList" v-if="bookList.length > 0 || tjBookLIst.length > 0">
 			<view class="wrap" v-if="contentShow == 0">				 
-					<u-row gutter="16" justify="flex-start">
+					<u-row gutter="16" justify="flex-start" v-if="bookList.length > 0">
 						<u-col span="4" v-for="(item,index) in bookList" :key="index">
 							<view>
 							<view class="videoBox demo-layout bg-purple" @click="goToListenFree(item)">
@@ -26,10 +26,12 @@
 							<text class="bookName">{{item.bookName}}</text>							
 							</view>
 						</u-col>						
-					</u-row>					
-				</view>			
+					</u-row>	
+					<u-divider v-else text="暂无已购买书籍~"></u-divider>				
+				</view>	
+				
 				<view class="wrap" v-if="contentShow == 1">					
-						<u-row gutter="16" justify="flex-start">
+						<u-row gutter="16" justify="flex-start" v-if="tjBookLIst.length > 0">
 							<u-col span="4"  v-for="(item,index) in tjBookLIst" :key="index">
 								<view class="videoBox demo-layout bg-purple" @click="goDetail(item.product)">
 									<image :src="item.product.productImages" mode="scaleToFill" ></image>
@@ -47,8 +49,10 @@
 									</view>
 								</view> -->
 							</u-col>						
-						</u-row>						
+						</u-row>
+						<u-divider v-else text="暂无推荐书籍~"></u-divider>
 					</view>	
+					
 		</view>
 		<view>
 			<view v-if="status==0" style="text-align: center;">

pages/listen/listen.vue

@@ -219,7 +219,8 @@
 					},
 				}).then(res => {
 					 console.log(res,'历史记录')
-					if(res.readRate.chapterId){   
+					if(res.readRate != null){  
+						// 有听书进度时
 						var item = res.readRate
 						if(this.$bgm._options.src != '' && res.readRate.chapterId == this.userInfo.playingInfo.chapterId && res.readRate.bookId == this.userInfo.playingInfo.bookid ){
 							// console.log(this.$bgm)
@@ -231,7 +232,7 @@
 							return false
 						}						
 						this.onlineH.time = item.precent
-						// 有听书进度时
+						
 						this.onlineH.playIndex = this.libLIst.findIndex(function(info){
 							//	console.log(info,'info')
 							    if(item.chapterId == info.chapterId && item.bookId == info.bookid ){
@@ -243,6 +244,8 @@
 						// 没有听书进度
 						this.onlineH.playIndex = 0
 						this.onlineH.time = 0
+						console.log('到这++')
+						
 					}
 					console.log('到这')
 					this.$music.setList(this.libLIst,'autoPlay',this.onlineH.playIndex, this.onlineH.time)

utils/music.js

@@ -190,7 +190,7 @@ var music = {
 				store.commit('setUserInfo',{'playingInfo':bgm.musicList[bgm.playIndex] })
 				// console.log('线下的播放index是：',  store.state.userInfo.playingInfo)
 			}else{ 
-				// 没有听书进度				
+				
 			}
 			
 			if(op == 'autoPlay'){