From 2a2819e1cae93e70ad2ce0ae3f72149dc4fcbb9c Mon Sep 17 00:00:00 2001 From: lipenggao Date: Fri, 12 Jul 2024 15:57:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.json | 2 +- pages/consumption/consumption.ts | 4 ++-- pages/consumption/consumption.ttml | 10 +++++----- pages/home/home.ttml | 28 ++++++++++++++-------------- pages/pay/pay.ttml | 21 +++++++++++++-------- pages/pay/pay.ttss | 21 +++++++++++++++++++++ pages/theater/theater.ts | 5 ++--- pages/videoDetail/videoDetail.ts | 9 +++++++-- pages/videoDetail/videoDetail.ttml | 5 +++++ pages/videoDetail/videoDetail.ttss | 5 +++++ project.config.json | 19 ++++++++++++++++++- utils/config.ts | 2 +- utils/httpReques.ts | 14 ++++++++++++-- 13 files changed, 106 insertions(+), 39 deletions(-) diff --git a/app.json b/app.json index 4a9a9c6..ab59ad1 100644 --- a/app.json +++ b/app.json @@ -15,7 +15,7 @@ "window": { "backgroundTextStyle": "light", "navigationBarBackgroundColor": "#080B16", - "navigationBarTitleText": "初晴剧场", + "navigationBarTitleText": "古言剧场", "navigationBarTextStyle": "white" }, "tabBar": { diff --git a/pages/consumption/consumption.ts b/pages/consumption/consumption.ts index dbe944c..55b693a 100644 --- a/pages/consumption/consumption.ts +++ b/pages/consumption/consumption.ts @@ -5,8 +5,8 @@ Page({ moneyLogList: [], moneyFlag: false }, - onLoad(options) { - + onLoad() { + // options }, onShow() { httpRequest('/moneylog', 'POST').then((res: any) => { diff --git a/pages/consumption/consumption.ttml b/pages/consumption/consumption.ttml index d4ae996..a8a3ffa 100644 --- a/pages/consumption/consumption.ttml +++ b/pages/consumption/consumption.ttml @@ -3,8 +3,8 @@ - + @@ -24,8 +24,8 @@ 话费{{item.price}}K币购买{{item.chaptername}} - + 继续观看 @@ -36,7 +36,7 @@ - + diff --git a/pages/home/home.ttml b/pages/home/home.ttml index f65ab7b..8bb1c87 100644 --- a/pages/home/home.ttml +++ b/pages/home/home.ttml @@ -27,7 +27,7 @@ - + 最新短剧 @@ -79,7 +79,7 @@ - + 热播短剧 @@ -111,7 +111,7 @@ - + 更多热剧 @@ -137,7 +137,7 @@ {{item.name}} - + {{item.description}} @@ -148,7 +148,7 @@ - + 更多好剧 @@ -177,15 +177,7 @@ - - - 订阅 - - - - - - + 已订阅 @@ -194,6 +186,14 @@ + + + 订阅 + + + + + diff --git a/pages/pay/pay.ttml b/pages/pay/pay.ttml index a9f4777..e646f4d 100644 --- a/pages/pay/pay.ttml +++ b/pages/pay/pay.ttml @@ -73,6 +73,11 @@ ￥ {{item.price}} + + + {{item.egold}}K币 + +{{item.giveegold}}K币 + @@ -136,14 +141,14 @@ 4、充值看点一般在10分钟内到账，如未到账请点击，页面客服按钮，联系客服 - - - - - 立即购买 - - - + + + + 立即购买 + + + + \ No newline at end of file diff --git a/pages/pay/pay.ttss b/pages/pay/pay.ttss index ccae608..b1409a5 100644 --- a/pages/pay/pay.ttss +++ b/pages/pay/pay.ttss @@ -186,9 +186,15 @@ align-items: center; width: 100%; height: 56rpx; + padding: 0 20rpx; } ._pay_b_to_u_b_it_con_da_text { + display: inline-block; + width: 100%; + text-overflow: ellipsis; + overflow: hidden; + white-space: nowrap; line-height: 1; font-size: 28rpx; color: #999999; @@ -197,6 +203,7 @@ ._pay_b_to_u_b_it_con_price { flex: 1; display: flex; + flex-direction: column; justify-content: center; align-items: center; line-height: 1 @@ -218,6 +225,16 @@ font-weight: 600; } +._pay_b_to_u_b_it_con_curr { + display: flex; + margin-top: 20rpx; +} + +._pay_b_to_u_b_it_con_cur_text { + font-size: 22rpx; + color: #999999; +} + ._pay_b_to_u_b_it_content._acv_bg_it { border-color: #5BBE04; background-color: rgba(91, 190, 4, 0.20); @@ -239,6 +256,10 @@ color: #5BBE04; } +._acv_bg_it ._pay_b_to_u_b_it_con_cur_text { + color: #5BBE04; +} + ._pay_b_privilege { width: 100%; padding-left: 32rpx; diff --git a/pages/theater/theater.ts b/pages/theater/theater.ts index 9c5f8d7..02dc661 100644 --- a/pages/theater/theater.ts +++ b/pages/theater/theater.ts @@ -8,8 +8,8 @@ Page({ module1: [], module2: [] }, - onLoad(options) { - + onLoad() { + // options }, onShow() { httpRequest('/top', 'POST').then((res: any) => { @@ -33,7 +33,6 @@ Page({ handelSortTap(ev: any) { const datasetcCtegoryid = ev.currentTarget.dataset.categoryid; const categoryid = this.data.categoryid; - console.log(datasetcCtegoryid, categoryid) if (categoryid != datasetcCtegoryid) { httpRequest('/top', 'POST', { categoryid: datasetcCtegoryid }).then((res: any) => { if (res.status == 1) { diff --git a/pages/videoDetail/videoDetail.ts b/pages/videoDetail/videoDetail.ts index c6aecf7..abf3d06 100644 --- a/pages/videoDetail/videoDetail.ts +++ b/pages/videoDetail/videoDetail.ts @@ -72,7 +72,7 @@ Page({ let nextbatchList = []; const nextbatchRes: any = await httpRequest('/nextbatch', 'POST', params); - if (nextbatchRes.status == 1 && Array.isArray(nextbatchRes.data)) { + if (nextbatchRes?.status == 1 && Array.isArray(nextbatchRes?.data)) { nextbatchList = nextbatchRes.data; } @@ -367,7 +367,7 @@ Page({ title: `广告加载中...`, }); adBanner = tt.createRewardedVideoAd({ - adUnitId: "82jc4t11786rd3thuq", + adUnitId: "wh0y4vcxsbk7ixwktg", }); adBanner.show().then((res: any) => { console.log("视频广告展示"); @@ -465,5 +465,10 @@ Page({ this.setData({ unlockFlag: false }) + }, + showUnlockFlag() { + this.setData({ + unlockFlag: true + }) } }) \ No newline at end of file diff --git a/pages/videoDetail/videoDetail.ttml b/pages/videoDetail/videoDetail.ttml index 6e88af8..38b8e29 100644 --- a/pages/videoDetail/videoDetail.ttml +++ b/pages/videoDetail/videoDetail.ttml @@ -96,6 +96,11 @@ + + + 点击屏蔽再次解锁 + + diff --git a/pages/videoDetail/videoDetail.ttss b/pages/videoDetail/videoDetail.ttss index 667b158..7c7003e 100644 --- a/pages/videoDetail/videoDetail.ttss +++ b/pages/videoDetail/videoDetail.ttss @@ -511,4 +511,9 @@ page { overflow: hidden; white-space: nowrap; text-overflow: ellipsis; +} + +._k_ll_show_un_text { + font-size: 26rpx; + color: #fff; } \ No newline at end of file diff --git a/project.config.json b/project.config.json index cfcc7b5..64def74 100644 --- a/project.config.json +++ b/project.config.json @@ -1 +1,18 @@ -{"setting":{"urlCheck":true,"es6":true,"postcss":true,"minified":true,"newFeature":true,"autoCompile":true,"compileHotReLoad":true,"nativeCompile":true,"useCompilerPlugins":["typescript"]},"appid":"tt216c57d1be50cc7b01","projectname":"初晴剧场","douyinProjectType":"native"} +{ + "setting": { + "urlCheck": true, + "es6": true, + "postcss": true, + "minified": true, + "newFeature": true, + "autoCompile": true, + "compileHotReLoad": true, + "nativeCompile": true, + "useCompilerPlugins": [ + "typescript" + ] + }, + "appid": "tte8719ecc7742e53d01", + "projectname": "初晴剧场", + "douyinProjectType": "native" +} diff --git a/utils/config.ts b/utils/config.ts index de8e2f7..ab4a7fa 100644 --- a/utils/config.ts +++ b/utils/config.ts @@ -1,2 +1,2 @@ // export const basUrl = 'https://dymgjcweb.qinjiu8.com' -export const basUrl = 'https://dycqjcweb.jiulingliu.cn' \ No newline at end of file +export const basUrl = 'https://dybxjcapi.jiulingliu.cn' \ No newline at end of file diff --git a/utils/httpReques.ts b/utils/httpReques.ts index eaaf0d4..0d7e335 100644 --- a/utils/httpReques.ts +++ b/utils/httpReques.ts @@ -21,8 +21,18 @@ export const httpRequest = (url: string, method: any = 'GET', data: any = {}, he ...data, }, header: header, - success: (res) => { - resolve(res.data) + success: (res: any) => { + console.log(res,"pppppppp") + if (res.data.status == 1) { + resolve(res.data); + } else { + tt.showToast({ + title: res.data.msg || '请求失败', + icon: 'none' + }); + resolve(res.data); + } + }, fail: (err) => { reject(err)