diff --git a/components/commBookItemThree/index.vue b/components/commBookItemThree/index.vue index 23934ed..7ce5fa0 100644 --- a/components/commBookItemThree/index.vue +++ b/components/commBookItemThree/index.vue @@ -12,8 +12,6 @@ - - 已加入书架 diff --git a/pages/login/login.vue b/pages/login/login.vue index bbcb42e..a779d9f 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -32,7 +32,6 @@ }; }, onLoad(options) { - console.log(options,"=================") // this.bookTitle = options.t; this.bookSid = options.sid; this.chapterorder = options.c; @@ -59,7 +58,7 @@ uni.hideLoading(); if (res.status == 1) { uni.navigateTo({ - url: `/pages/loginMobile/loginMobile?phone=${mobile}&sid=${bookSid}i=${bookId}&c=${chapterorder}&to=${toPath}` + url: `/pages/loginMobile/loginMobile?phone=${mobile}&sid=${bookSid}&i=${bookId}&c=${chapterorder}&to=${toPath}` }) } }).catch((err) => { diff --git a/pages/loginMobile/loginMobile.vue b/pages/loginMobile/loginMobile.vue index 0e98aa5..f226c5e 100644 --- a/pages/loginMobile/loginMobile.vue +++ b/pages/loginMobile/loginMobile.vue @@ -50,10 +50,11 @@ const toPath = this.toPath; let toPathUrl = '' const toPathObj = { - '1': `/pages/novelReading/novelReading` + '1': `/pages/novelReading/novelReading?sid=${bookSid}&id=${bookId}&c=${chapterorder}`, + '2':`/pages/myInfo/myInfo/index` } if (toPathObj[toPath]) { - toPathUrl = `${toPathObj[toPath]}?&sid=${bookSid}i=${bookId}&c=${chapterorder}` + toPathUrl = `${toPathObj[toPath]}` } else { toPathUrl = `/pages/bookCity/bookCity/index` } diff --git a/pages/myInfo/myInfo/index.vue b/pages/myInfo/myInfo/index.vue index b5e6f86..bfe0c00 100644 --- a/pages/myInfo/myInfo/index.vue +++ b/pages/myInfo/myInfo/index.vue @@ -41,8 +41,6 @@ }, data() { return { - - } }, onShow() { diff --git a/pages/myInfo/myInfo/myUserInfo.vue b/pages/myInfo/myInfo/myUserInfo.vue index d541855..ff2edc7 100644 --- a/pages/myInfo/myInfo/myUserInfo.vue +++ b/pages/myInfo/myInfo/myUserInfo.vue @@ -1,55 +1,57 @@ @@ -86,13 +88,19 @@ url: `/pages/voucherCenter/index` }) } else { - this.showModal = true; + uni.navigateTo({ + url: `/pages/login/login?to=2` + }) + // this.showModal = true; + // uni.showModal({ + // title:'' + // }) } }, - modalCancel() { - this.showModal = false; - }, + // modalCancel() { + // this.showModal = false; + // }, modalConfirm() { uni.navigateTo({ url: `/pages/login/login`, @@ -131,92 +139,97 @@ .myUserInfo_content { width: 100%; height: 100%; - display: flex; - flex-direction: column; - justify-content: space-between; - ._info_user_information { - display: flex; - align-items: center; - - ._information_left { - ._information_left_sculpture { - width: 120rpx; - height: 120rpx; - } - } - - ._information_right { - margin-left: 36rpx; - - ._information_right_name_box { - display: flex; - align-items: center; - - ._information_right_name { - font-size: 40rpx; - font-weight: 700; - line-height: 1; - max-width: 400rpx; - white-space: nowrap; //不支持换行 - overflow: hidden; //隐藏多出部分文字 - text-overflow: ellipsis; //用省略号代替多出部分文字 - - } - - ._information_right_vip { - width: 36rpx; - height: 36rpx; - margin-left: 8rpx; - } - } - - ._information_right_userId { - font-size: 26rpx; - color: #888888; - margin-top: 16rpx; - } - } - } - - ._info_box_money { + .myUserInfo_body { + width: 100%; + height: 100%; display: flex; + flex-direction: column; justify-content: space-between; - align-items: center; - ._money_coin_info { - flex: 1; - padding-right: 26rpx; + ._info_user_information { display: flex; + align-items: center; - ._book_coin { - flex: 1; - display: flex; + ._information_left { + ._information_left_sculpture { + width: 120rpx; + height: 120rpx; + } + } - ._book_coin_box { + ._information_right { + margin-left: 36rpx; + + ._information_right_name_box { display: flex; - flex-direction: column; + align-items: center; + + ._information_right_name { + font-size: 40rpx; + font-weight: 700; + line-height: 1; + max-width: 400rpx; + white-space: nowrap; //不支持换行 + overflow: hidden; //隐藏多出部分文字 + text-overflow: ellipsis; //用省略号代替多出部分文字 - ._coin_num { - font-size: 36rpx; - color: #FF728F; - margin-left: 18rpx; } - ._coin_name { - display: flex; - font-size: 26rpx; - color: #666666; + ._information_right_vip { + width: 36rpx; + height: 36rpx; + margin-left: 8rpx; } } + + ._information_right_userId { + font-size: 26rpx; + color: #888888; + margin-top: 16rpx; + } } } - ._money_recharge_btn { - width: 148rpx; + ._info_box_money { + display: flex; + justify-content: space-between; + align-items: center; - .u-button { - height: 66rpx; + ._money_coin_info { + flex: 1; + padding-right: 26rpx; + display: flex; + + ._book_coin { + flex: 1; + display: flex; + + ._book_coin_box { + display: flex; + flex-direction: column; + + ._coin_num { + font-size: 36rpx; + color: #FF728F; + margin-left: 18rpx; + } + + ._coin_name { + display: flex; + font-size: 26rpx; + color: #666666; + } + } + } + } + + ._money_recharge_btn { + width: 148rpx; + + .u-button { + height: 66rpx; + } } } } diff --git a/pages/myInfo/myInfo/otherCellInfo.vue b/pages/myInfo/myInfo/otherCellInfo.vue index f235b9d..04fcddd 100644 --- a/pages/myInfo/myInfo/otherCellInfo.vue +++ b/pages/myInfo/myInfo/otherCellInfo.vue @@ -2,22 +2,28 @@ - + :titleStyle="m.titleStyle" size="large" :url="m.toPath" :icon="m.icon"> + + + + \ No newline at end of file diff --git a/pages/novelReading/novelReading.vue b/pages/novelReading/novelReading.vue index 6ff25ba..2aabaad 100644 --- a/pages/novelReading/novelReading.vue +++ b/pages/novelReading/novelReading.vue @@ -3,15 +3,14 @@ - + + :slide="20" :enablePreload="false" @loadmore="loadmoreContent" @clickTo="handelShowStepUp" + :clickOption="{width:200,height: 400,left:'auto',top:'auto'}" :topGap="0" :bottomGap="20" + @change="currentChange">