From c978fab954a33b66f801ab750c32c7cab8c1fddd Mon Sep 17 00:00:00 2001 From: duan <1004387497@qq.com> Date: Mon, 30 Dec 2024 22:30:10 +0800 Subject: [PATCH] =?UTF-8?q?ios=20=E9=A6=96=E9=A1=B5=20=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=20=E6=88=91=E7=9A=84=20=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/config.js | 15 +- common/httpRequest.js | 3 +- me/detail/detailIOS.nvue | 2 +- pages.json | 66 +- pages/index/components/contentlist.vue | 127 ++ pages/index/index.vue | 2 +- pages/index/index2.vue | 159 +++ pages/login/login.vue | 1034 ++++++++--------- pages/me/index.vue | 230 ++-- pages/task/index.vue | 107 +- static/dwbimgs/money.png | Bin 0 -> 1691 bytes static/dwbimgs/one.png | Bin 0 -> 1205 bytes static/dwbimgs/renwubg.png | Bin 0 -> 1990 bytes static/dwbimgs/three.png | Bin 0 -> 1445 bytes static/dwbimgs/two.png | Bin 0 -> 1343 bytes static/dwbimgs/xing (1).png | Bin 0 -> 1211 bytes static/dwbimgs/xing (2).png | Bin 0 -> 1398 bytes static/gonggaobg.png | Bin 0 -> 588 bytes static/indexbh.png | Bin 0 -> 264076 bytes static/logo.png | Bin 0 -> 5325 bytes uni_modules/uni-icons/changelog.md | 42 + .../components/uni-icons/uni-icons.uvue | 91 ++ .../components/uni-icons/uni-icons.vue | 110 ++ .../components/uni-icons/uniicons.css | 664 +++++++++++ .../components/uni-icons/uniicons.ttf | Bin 0 -> 35824 bytes .../components/uni-icons/uniicons_file.ts | 664 +++++++++++ .../components/uni-icons/uniicons_file_vue.js | 649 +++++++++++ uni_modules/uni-icons/package.json | 89 ++ uni_modules/uni-icons/readme.md | 8 + .../uni-scss/styles/setting/_styles.scss | 4 +- uni_modules/uni-scss/variables.scss | 20 +- utils/api.js | 2 +- uview-ui/components/u-navbar/u-navbar.vue | 8 +- 33 files changed, 3400 insertions(+), 696 deletions(-) create mode 100644 pages/index/components/contentlist.vue create mode 100644 pages/index/index2.vue create mode 100644 static/dwbimgs/money.png create mode 100644 static/dwbimgs/one.png create mode 100644 static/dwbimgs/renwubg.png create mode 100644 static/dwbimgs/three.png create mode 100644 static/dwbimgs/two.png create mode 100644 static/dwbimgs/xing (1).png create mode 100644 static/dwbimgs/xing (2).png create mode 100644 static/gonggaobg.png create mode 100644 static/indexbh.png create mode 100644 static/logo.png create mode 100644 uni_modules/uni-icons/changelog.md create mode 100644 uni_modules/uni-icons/components/uni-icons/uni-icons.uvue create mode 100644 uni_modules/uni-icons/components/uni-icons/uni-icons.vue create mode 100644 uni_modules/uni-icons/components/uni-icons/uniicons.css create mode 100644 uni_modules/uni-icons/components/uni-icons/uniicons.ttf create mode 100644 uni_modules/uni-icons/components/uni-icons/uniicons_file.ts create mode 100644 uni_modules/uni-icons/components/uni-icons/uniicons_file_vue.js create mode 100644 uni_modules/uni-icons/package.json create mode 100644 uni_modules/uni-icons/readme.md diff --git a/common/config.js b/common/config.js index d735171..ea17ba0 100644 --- a/common/config.js +++ b/common/config.js @@ -1,6 +1,6 @@ -const ROOTPATH1 = "https://dj-api.hnsiyao.cn/czg/"; // -const ROOTPATH = "https://dj-api.hnsiyao.cn/czg/"; //后台服务域名 -const ROOTPATH2 = "https://dj-h5.hnsiyao.cn"; //后台服务域名 +// const ROOTPATH1 = "https://dj-api.hnsiyao.cn/czg/"; // +// const ROOTPATH = "https://dj-api.hnsiyao.cn/czg/"; //后台服务域名 +// const ROOTPATH2 = "https://dj-h5.hnsiyao.cn"; //后台服务域名 // const ROOTPATH1 = "https://video.hnsiyao.cn/sqx_fast/"; // // const ROOTPATH = "https://video.hnsiyao.cn/sqx_fast/"; //后台服务域名 @@ -10,9 +10,12 @@ const ROOTPATH2 = "https://dj-h5.hnsiyao.cn"; //后台服务域名 // const ROOTPATH = "http://192.168.1.5:8100/sqx_fast/"; //后台服务域名 // const ROOTPATH2 = "http://192.168.1.5:8100"; //后台服务域名 -// const ROOTPATH1 = "https://api.tianjinzhitongdaohe.com/sqx_fast/"; // -// const ROOTPATH = "https://api.tianjinzhitongdaohe.com/sqx_fast/"; //后台服务域名 -// const ROOTPATH2 = "https://api.tianjinzhitongdaohe.com"; //后台服务域名 +// const ROOTPATH1 = "http://192.168.1.41:8100/czg"; // +const ROOTPATH1 = "https://web-api.hnsiyao.cn/czg"; // +const ROOTPATH = "https://web-api.hnsiyao.cn/czg"; //后台服务域名 +// const ROOTPATH = "http://192.168.1.41:8100/czg"; //后台服务域名 +const ROOTPATH2 = "https://video-h5.hnsiyao.cn"; //后台服务域名 + module.exports = { APIHOST: ROOTPATH, diff --git a/common/httpRequest.js b/common/httpRequest.js index 06baa2f..e142140 100644 --- a/common/httpRequest.js +++ b/common/httpRequest.js @@ -308,7 +308,8 @@ module.exports = { data: data, method: "GET", header: { - "content-type": header + "content-type": header, + token: uni.getStorageSync("token") }, success: function(result) { if (result.data.code == 401) { diff --git a/me/detail/detailIOS.nvue b/me/detail/detailIOS.nvue index c798d67..3064a3c 100644 --- a/me/detail/detailIOS.nvue +++ b/me/detail/detailIOS.nvue @@ -492,7 +492,7 @@ console.log('this bottom padding = ' + this.paddingBottom); - httpsRequest.getT("app/common/type/919", {}).then(res => { + httpsRequest.getT("/app/common/type/919", {}).then(res => { if (res.code === 0) { const sysInfo = uni.getSystemInfoSync(); let isIos = sysInfo.platform == 'ios' diff --git a/pages.json b/pages.json index c60dac1..ecff0e8 100644 --- a/pages.json +++ b/pages.json @@ -212,7 +212,7 @@ // #endif } - },{ + }, { "path": "pages/yodwbsHlmJ/aaacasadwqvb", "style": { "navigationBarTitleText": "追剧as", @@ -290,6 +290,14 @@ "navigationBarTitleText": "图片s", "navigationStyle": "custom" } + }, + { + "path": "pages/index/index2", + "style": { + "navigationBarTitleText": "斯耀短剧", + "enablePullDownRefresh": true, + "navigationStyle": "custom" + } } ], "subPackages": [{ @@ -305,16 +313,17 @@ "style": { "navigationBarTitleText": "我的余额" } - }, {"path": "HEWZtgyqRH/YGivHgyqkI" + }, { + "path": "HEWZtgyqRH/YGivHgyqkI" }, { "path": "HEWZtgyqRH/EsBgyqacOi" - },{ + }, { "path": "feedbackIndexczgw/issuer" - },{ + }, { "path": "feedbackIndexczgw/Invoicedgoods" - },{ + }, { "path": "feedback/toexamine" - },{ + }, { "path": "feedback/orderinquiry" }, { "path": "feedbackIndexczgw/feedbackIndexczgw", @@ -694,23 +703,23 @@ "enablePullDownRefresh": false } - }, + }, { "path": "payOrder/new/index", "style": { "navigationBarTitleText": "", "enablePullDownRefresh": false } - - }, + + }, { "path": "payOrder/new/newindex", "style": { "navigationBarTitleText": "", "enablePullDownRefresh": false } - - }, + + }, { "path": "setting/logOff", "style": { @@ -747,7 +756,7 @@ "enablePullDownRefresh": true } - },{ + }, { "path": "mFYpdwbMdk/mFYpdwbMdk", "style": { "navigationBarTitleText": "壁纸", @@ -796,7 +805,9 @@ "navigationStyle": "custom" } }, - {"path": "VjgyqAzklr/mEfjXGgyqJ"}, + { + "path": "VjgyqAzklr/mEfjXGgyqJ" + }, { "path": "VjgyqAzklr/YQqgyqeKub" }, @@ -932,24 +943,25 @@ "borderStyle": "black", "list": [{ + "pagePath": "pages/index/index2", + "iconPath": "static/tabbar/index@2x.png", + "selectedIconPath": "static/tabbar/index_@2x.png", + "text": "首页" + }, + { "pagePath": "pages/task/index", "iconPath": "static/tabbar/task@2x.png", "selectedIconPath": "static/tabbar/task_@2x.png", "text": "任务" }, - { - "pagePath": "pages/video/video", - "iconPath": "static/tabbar/index@2x.png", - "selectedIconPath": "static/tabbar/index_@2x.png", - "text": "刷剧" - } - // , // { - // "pagePath": "pages/index/index", + // "pagePath": "pages/video/video", // "iconPath": "static/tabbar/index@2x.png", // "selectedIconPath": "static/tabbar/index_@2x.png", // "text": "刷剧" // } + // , + // { // "pagePath": "pages/video/video", // "iconPath": "static/tabbar/learn@2x.png", @@ -963,12 +975,12 @@ // "selectedIconPath": "static/tabbar/zhuiju_.png", // "text": "追剧" // }, - // { - // "pagePath": "pages/me/index", - // "iconPath": "static/tabbar/me@2x.png", - // "selectedIconPath": "static/tabbar/me_@2x.png", - // "text": "我的" - // } + { + "pagePath": "pages/me/index", + "iconPath": "static/tabbar/me@2x.png", + "selectedIconPath": "static/tabbar/me_@2x.png", + "text": "我的" + } ] }, "condition": { //模式配置，仅开发期间生效 diff --git a/pages/index/components/contentlist.vue b/pages/index/components/contentlist.vue new file mode 100644 index 0000000..620bf08 --- /dev/null +++ b/pages/index/components/contentlist.vue @@ -0,0 +1,127 @@ + + + + + \ No newline at end of file diff --git a/pages/index/index.vue b/pages/index/index.vue index 59eb119..f3c6346 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -445,7 +445,7 @@ this.videoInfo = [] } - httpsRequest.getT("app/common/type/919", {}).then(res => { + httpsRequest.getT("/app/common/type/919", {}).then(res => { if (res.code == 0) { const sysInfo = uni.getSystemInfoSync(); let isIos = sysInfo.platform == 'ios' diff --git a/pages/index/index2.vue b/pages/index/index2.vue new file mode 100644 index 0000000..d8bb15d --- /dev/null +++ b/pages/index/index2.vue @@ -0,0 +1,159 @@ + + + + + \ No newline at end of file diff --git a/pages/login/login.vue b/pages/login/login.vue index 36b1b30..5d7ae19 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -42,571 +42,567 @@ \ No newline at end of file +// &:before, +// &:after { +// display: block; +// content: ''; +// width: 20px; +// height: 40px; +// background: #e10a07; +// } + +// &:before { +// transform: rotate(50deg); +// border-radius: 0 50px 0 0; +// } + +// &:after { +// position: absolute; +// right: -198px; +// top: 0; +// transform: rotate(-50deg); +// border-radius: 50px 0 0 0; +// /* background: pink; */ +// } +// } + +// .left-bottom-sign { +// position: absolute; +// left: -270px; +// bottom: -320px; +// /*border: 100upx solid #d0d1fd;*/ +// border-radius: 50%; +// padding: 90px; +// } + +// .welcome { +// position: relative; +// left: 30px; +// top: -55px; +// font-size: 28px; +// color: #555; +// text-shadow: 1px 0px 1px rgba(0, 0, 0, 0.3); +// } + +.input-content { + padding: 0 20px; +} + +// .input-item { +// display: flex; +// flex-direction: column; +// align-items: flex-start; +// justify-content: center; +// padding: 0 30px; +// background: $page-color-light; +// height: 64px; +// border-radius: 4px; +// margin-bottom: 30px; + +// &:last-child { +// margin-bottom: 0; +// } + +// .tit { +// height: 30px; +// line-height: 28px; +// font-size: $font-sm + 2upx; +// color: $font-color-base; +// } + +// input { +// height: 40px; +// font-size: $font-base + 2upx; +// color: $font-color-dark; +// width: 100%; +// } +// } + +.confirm-btn { + width: 300px; + height: 42px; + line-height: 42px; + border-radius: 30px; + margin-top: 40px; + // background: linear-gradient(to left, #3f5ecb 0, #5074FF 100%); + background: #ff7581; + color: #ffffff; + // font-size: $font-lg; + + &:after { + border-radius: 60px; + } +} + +// .confirm-btn1 { +// width: 300px; +// height: 42px; +// line-height: 42px; +// border-radius: 30px; +// margin-top: 40px; +// background: whitesmoke; +// color: grey; +// font-size: $font-lg; + +// &:after { +// border-radius: 60px; +// } +// } + +// .forget-section { +// font-size: $font-sm + 2upx; +// color: $font-color-spec; +// text-align: center; +// margin-top: 40px; +// } + +// .register-section { +// left: 0; +// margin-top: 30px; +// bottom: 30px; +// width: 100%; +// font-size: $font-sm + 2upx; +// color: $font-color-base; +// text-align: center; + +// text { +// color: $font-color-spec; +// margin-left: 10px; +// } +// } \ No newline at end of file diff --git a/pages/me/index.vue b/pages/me/index.vue index 0906c1d..5625159 100644 --- a/pages/me/index.vue +++ b/pages/me/index.vue @@ -1,9 +1,22 @@ @@ -261,11 +304,12 @@ import ttMsg from '../../components/ttMsg/ttMsg.vue' import httpsRequest from '../../common/httpRequest.js' import otherXuanfu from '@/components/other-xuafu.vue' - - + + export default { components: { - ttMsg,otherXuanfu + ttMsg, + otherXuanfu }, data() { return { @@ -283,6 +327,7 @@ }], isLogin: false, userName: '未登录', + list: [], isVIP: false, invitationCode: '', token: '', @@ -295,7 +340,7 @@ showCard: false, numCount: 0, rate: 0, - twoRate:0, + twoRate: 0, kmPaySel: '否', isWxIosPay: true, //微信下是否显示支付功能 userInfo: {}, @@ -304,18 +349,18 @@ }, onLoad() { this.getBannerList() - - this.zxczxczxczsw(1212,5) - this.zzzzzzzzzzzzzzzzs(1212.5) - this.zxcee(1212,5) - this.aaaaccx(1212,5) - this.wwrqx(1212,5) + + this.zxczxczxczsw(1212, 5) + this.zzzzzzzzzzzzzzzzs(1212.5) + this.zxcee(1212, 5) + this.aaaaccx(1212, 5) + this.wwrqx(1212, 5) }, onShow() { - + this.ymfgetDataList() const systemInfo = uni.getSystemInfoSync(); const isIOS = /iOS/.test(systemInfo.platform); - if ( !isIOS ) { + if (!isIOS) { this.isBack = true } this.isWxIosPay = uni.getStorageSync('isWxIosPay') @@ -335,8 +380,8 @@ this.userName = res.data.userName this.avatar = res.data.avatar this.invitationCode = res.data.invitationCode - this.rate = res.data.rate||0 - this.twoRate = res.data.twoRate||0 + this.rate = res.data.rate || 0 + this.twoRate = res.data.twoRate || 0 } }) @@ -374,7 +419,7 @@ } this.avatar = uni.getStorageSync('avatar') ? uni.getStorageSync('avatar') : '../../static/images/logo.png' - httpsRequest.getT("app/common/type/919", {}).then(res => { + httpsRequest.getT("/app/common/type/919", {}).then(res => { console.log(res); if (res.code === 0) { const sysInfo = uni.getSystemInfoSync(); @@ -464,6 +509,26 @@ } }) }, + //获取观看记录 + ymfgetDataList() { + let data = { + page: 1, + limit: 3, + classify: 3 + } + this.$Request.getT('/app/courseCollect/selectByUserId', data).then(res => { + if (res.code === 0) { + console.log(res,'debug') + let arr = [] + res.data.records.forEach((ele, index) => { + if (index < 3) { + arr.push(ele) + } + }) + this.list = arr + } + }) + }, /** * 获取积分 */ @@ -553,7 +618,7 @@ } r1 = Number(arg1.toString().replace(".", "")); r2 = Number(arg2.toString().replace(".", "")); - + }, /** * 保留小数n位，不进行四舍五入 @@ -576,7 +641,7 @@ return parseFloat(num).toFixed(decimal); } }, - + //乘法函数，用来得到精确的乘法结果 //说明：javascript的乘法结果会有误差，在两个浮点数相乘的时候会比较明显。这个函数返回较为精确的乘法结果。 //调用：mul(arg1,arg2) @@ -689,7 +754,7 @@ // #endif } }, - goNav(e,type) { + goNav(e, type) { console.log(e) let token = uni.getStorageSync('token') if (token) { @@ -702,7 +767,7 @@ url: e }) } - + } else { uni.navigateTo({ url: "/pages/login/login" @@ -881,7 +946,7 @@ .statistics-box-item-btn { width: 100%; text-align: center; - color: #999999; + color: #333; font-size: 26rpx; // margin-top: 20rpx } @@ -933,41 +998,45 @@ } .money { - width: 100%; height: auto; margin-top: 20rpx; - - .money-box { - width: 686rpx; - height: 100%; - border-radius: 24rpx; - background: #ffffff; - padding: 30rpx; - } - - .money-box-btn { - background: linear-gradient(90deg, #FF7581 0%, #F8A5AF 100%); - border-radius: 44rpx; - padding: 18rpx 30rpx; - font-size: 24rpx; - color: #ffffff; - font-weight: bold; - } - - .money-box-title-l { - color: #333333; - font-size: 28rpx; - font-weight: normal; - } - - .money-box-price { - color: #333333; - font-size: 48rpx; - font-weight: 800; - margin-top: 20rpx; + box-sizing: border-box; + background-color: #fff; + margin: 30rpx; + padding: 55rpx 24rpx; - } + // .money-box { + // width: 686rpx; + // height: 100%; + // border-radius: 24rpx; + // background: #ffffff; + // padding: 30rpx; + // } + + // .money-box-btn { + // background: linear-gradient(90deg, #FF7581 0%, #F8A5AF 100%); + // border-radius: 44rpx; + // padding: 18rpx 30rpx; + // font-size: 24rpx; + // color: #ffffff; + // font-weight: bold; + // } + + // .money-box-title-l { + // color: #333333; + // font-size: 28rpx; + // font-weight: normal; + // } + + // .money-box-price { + // color: #333333; + // font-size: 48rpx; + // font-weight: 800; + // margin-top: 20rpx; + + + // } } @@ -1015,4 +1084,9 @@ font-size: 24rpx; } } + + .df { + display: flex; + align-items: center; + } \ No newline at end of file diff --git a/pages/task/index.vue b/pages/task/index.vue index ceb8972..52dfc34 100644 --- a/pages/task/index.vue +++ b/pages/task/index.vue @@ -17,15 +17,14 @@ - - - 已连续签到 {{signDays}} 天 - +