diff --git a/app.js b/app.js index 6de4adf..2d30499 100644 --- a/app.js +++ b/app.js @@ -6,7 +6,7 @@ App({ }, globalData:{ token: null, - imgHttps: 'https://formall.oss-accelerate.aliyuncs.com/douyin/drawable-xhdpi/', + imgHttps: 'https://zhibotang.oss-cn-beijing.aliyuncs.com/douyin/drawable-xhdpi/', platform:null,//手机型号 }, onLaunch: function () { @@ -15,7 +15,7 @@ App({ try { var res = tt.getSystemInfoSync(); that.statusBarHeight = res.statusBarHeight - console.log(res,"型号"); + console.log(`手机型号为 ${res.platform}`); this.globalData.platform = res.platform } catch (error) { console.log(`获取系统信息失败`); diff --git a/app.json b/app.json index 8f6d7e4..ef3b2ca 100644 --- a/app.json +++ b/app.json @@ -1,5 +1,5 @@ { - "pages":[ + "pages": [ "pages/index/index", "pages/category/category", "pages/ranking/ranking", @@ -17,13 +17,12 @@ "pages/integral/integral" ], "usingComponents": {}, - "window":{ - "backgroundTextStyle":"light", + "window": { + "backgroundTextStyle": "light", "navigationBarBackgroundColor": "#000033", "navigationBarTitleText": "知播堂", - "navigationBarTextStyle":"white", - "navigationStyle":"custom" - + "navigationBarTextStyle": "white", + "navigationStyle": "custom" }, "tabBar": { "custom": true, @@ -51,7 +50,6 @@ "selectedIconPath": "assets/images/home_btn_ic_wd1.png" } ] - } - - -} + }, + "sitemapLocation": "sitemap.json" +} \ No newline at end of file diff --git a/components/navbar/navbar.js b/components/navbar/navbar.js index 78099a8..568f8a8 100644 --- a/components/navbar/navbar.js +++ b/components/navbar/navbar.js @@ -62,6 +62,7 @@ Component({ }, attached: function(){ let pages = getCurrentPages(); + console.log(pages,"pages"); if (pages.length <= 1) { this.setData({ back: false diff --git a/config/config.js b/config/config.js index ed773c0..33eab86 100644 --- a/config/config.js +++ b/config/config.js @@ -22,6 +22,9 @@ let config = { getPublicityDetail:"/wxCampaign/findById",//宣传页详情 apply:"/upSettlein/add",//提交入住申请 getCodePhone:"/upSettlein/sendLoginPhoneCode",//获取手机验证码 + phoneFromCode:"/user/phoneFromCode",//授权收手机号 + creditsave:"/order/creditsave",//ios积分抵扣 + creditList:"/credit/list",//积分记录 } } module.exports = config; \ No newline at end of file diff --git a/pages/category/category.js b/pages/category/category.js index 7682cbf..05cd8e6 100644 --- a/pages/category/category.js +++ b/pages/category/category.js @@ -1,6 +1,7 @@ const app = getApp() const navigationBarHeight = (getApp().statusBarHeight + 44)+"px" const navigationBarHeight2 = (getApp().statusBarHeight + 44) +const screenHeight = (getApp().screenHeight) const config = require("../../config/config.js"); const Http = require("../../utils/HttpBasics") Page({ @@ -8,6 +9,7 @@ Page({ imgHttps:app.globalData.imgHttps, navigationBarHeight, navigationBarHeight2, + screenHeight, activityFlag: 0, column: [], id:"",//选中分类id diff --git a/pages/classDetails/classDetails.js b/pages/classDetails/classDetails.js index d184e7d..4544fdb 100644 --- a/pages/classDetails/classDetails.js +++ b/pages/classDetails/classDetails.js @@ -5,10 +5,13 @@ const Http = require("../../utils/HttpBasics.js") Page({ data: { - direction:-90, + showGoDouDian: false, + direction: -90, screenFlag: false, showAddBox: {}, - signal: app.globalData.platform, + // signal: app.globalData.platform, + signal:'Android',//零时 写死不走积分 + flagSystem:app.globalData.platform, classTitle: "",//课程标题 showIos: false,//ios字符提示 showHie: false,//提示框 @@ -57,25 +60,27 @@ Page({ // goIndent(e){ // console.log(e.dataset.url); // }, - itiRecording(){//防止录屏初始化函数 - if(this.data.signal=='ios'){ + itiRecording() {//防止录屏初始化函数 + console.log(this.data.flagSystem); + if (this.data.flagSystem == 'ios') { this.onRecord() - }else{ + } else { this.disable() } }, - disable: function() {// 防止录屏录制 安卓 + disable: function () {// 防止录屏录制 安卓 tt.disableUserScreenRecord({ - success(res) { - console.log("disableUserScreenRecord 调用成功", res) - }, - fail(res) { - console.log("disableUserScreenRecord 调用失败", res); - }, + success(res) { + console.log("disableUserScreenRecord 调用成功", res) + }, + fail(res) { + console.log("disableUserScreenRecord 调用失败", res); + }, }) - }, + }, onRecord: function () { // 防止录屏录制 ios const callback = (res) => { + console.log("我执行了") if (res.state === 'start') { this.data.videoContext.pause()//暂停 this.data.videoContext.exitFullScreen()//退出全屏 @@ -228,7 +233,8 @@ Page({ }, success: (res) => { _this.setData({ - goPayFlag: false + goPayFlag: false, + btnSuspend: true, }) _this.getData() }, @@ -301,13 +307,61 @@ Page({ }) }, + goPay() { - this.order() - console.log("我支付了"); - this.setData({ - goPayFlag: false, - btnSuspend: true, - }) + if (this.data.signal == 'ios') { + tt.showLoading({ + title: '支付中...', // 内容 + }); + let _this = this + //获取积分信息 + Http.get({ + url: config.api.getUserInfo + }).then(res => { + //获取当前用户积分 + let integral = res.data.credit + if (Number(_this.data.data.salePrice) <= integral) {//判断用户积分是否大于购买该课程的积分 + Http.post({ + url: config.api.creditsave, + data: { + couponId: _this.data.id + } + }).then(res => { + tt.showToast({ + title: '购买成功', // 内容 + duration: 2000, + success: (res) => { + _this.setData({ + goPayFlag: false, + btnSuspend: true, + }) + _this.getData() + tt.hideLoading(); + } + }); + }).catch(err => { + tt.showToast({ + title: err.message ? err.message : err.data, + icon: "none" + }); + }) + } else { + tt.hideLoading(); + //积分不足 + this.setData({ + showGoDouDian: true + }) + } + + }).catch(err => { + tt.showToast({ + title: err.message ? err.message : err.data, + icon: "none" + }); + }) + } else { + this.order() + } }, time(e) { let time = e.detail.currentTime.toFixed(0); @@ -389,6 +443,26 @@ Page({ }) }) }, + openGood(e) { + this.setData({ + showGoDouDian: false, + }) + console.log(e.target.dataset.id); + tt.openEcGood({ + promotionId: e.target.dataset.id, + success(res) { + console.log("调用成功", res); + }, + fail(res) { + console.log("调用失败", res); + }, + }); + }, + hieGoDou() { + this.setData({ + showGoDouDian: false, + }) + }, getData() {//课程详情 Http.get({ url: config.api.classDetails, @@ -404,6 +478,7 @@ Page({ } else { this.getVideoUrl(res.data.videoId) } + console.log(res.data.view, "支付状态"); }).catch(err => { tt.showToast({ @@ -419,18 +494,18 @@ Page({ videoId: id } }).then(res => { - console.log(res.data.width,res.data.height); - if((res.data.width)*1>=(res.data.height)*1){ + console.log(res.data.width, res.data.height); + if ((res.data.width) * 1 >= (res.data.height) * 1) { //横屏 console.log("横屏"); this.setData({ - direction:-90 + direction: -90 }) - }else{ + } else { //竖屏 console.log("竖屏"); this.setData({ - direction:0 + direction: 0 }) } this.setData({ @@ -485,10 +560,10 @@ Page({ animation.translateX(400).step() this.setData({ showAddBox: animation.export(), - screenFlag:false,//初始化防录屏弹框 + screenFlag: false,//初始化防录屏弹框 }) - // this.itiRecording() - + this.itiRecording() + }, onShareAppMessage: function (shareOption) { console.log(this.data.data.dyTitle); @@ -497,18 +572,21 @@ Page({ return { channel: 'video', // 必写 video //     templateId: '',   // 分享的模版 id (如果未设置就是默认,下面会说如何设置) - title: '知播堂',     // 分享的标题 - //     desc: '我是简介',     // 分享的内容介绍目前没有用 + title: `${that.data.data.dyTitle}`,     // 分享的标题 + // desc: `${that.data.data.dyTitle}`,     // 分享的内容介绍目前没有用 //     path: `/pages/index/index`,  // 分享的路径 - extra: { - videoTopics: ["知播堂", that.data.data.dyTitle] // 只有抖音才会有的属性 - }, + // extra: { + // videoTopics: [ that.data.data.dyTitle] // 只有抖音才会有的属性 + // }, } } else { // 右上角分享 return { + extra: { + videoTopics: [ that.data.data.dyTitle] // 只有抖音才会有的属性 + }, templateId: '',         //分享的模版 id - title: '',            //分享的标题 - desc: '',           // 分享的内容 + title: `${that.data.data.dyTitle}`,            //分享的标题 + // desc: `${that.data.data.dyTitle}`,           // 分享的内容 //      path: ``, // 分享的路径 } } diff --git a/pages/classDetails/classDetails.ttml b/pages/classDetails/classDetails.ttml index 5de541f..0ecf9ed 100644 --- a/pages/classDetails/classDetails.ttml +++ b/pages/classDetails/classDetails.ttml @@ -5,7 +5,7 @@ ¥ {{data.salePriceStr}} 购买 - 暂不支持购买 + {{data.salePrice}}积分 {{data.title}} @@ -115,6 +115,12 @@ 购买须知 + + + + 小程序内购买课程为课程兑换权益,购买成功后将自动兑换到您的账户内,可在小程序中重复学习观看。 + + 如何观看以购买的课程? @@ -127,6 +133,7 @@ 知播堂的全部课程均属虚拟商品,购买后无特殊情况不支持退款,请在购买前预览并慎重购买,如课程存在内容与描述不符、违规行为,您有权自行联系老师,并向老师提出退款。 + @@ -179,13 +186,23 @@ ¥{{data.salePriceStr}} - ¥{{data.salePriceStr}} + ¥{{data.salePrice}}积分 - - + + 由于版权原因,此内容不支持iOS录屏 - \ No newline at end of file + + + 积分不足请去抖店充值 + + 取消 + + + + diff --git a/pages/classDetails/classDetails.ttss b/pages/classDetails/classDetails.ttss index 48990e2..c9c6d60 100644 --- a/pages/classDetails/classDetails.ttss +++ b/pages/classDetails/classDetails.ttss @@ -37,7 +37,7 @@ line-height: 90rpx; text-align: center; border-radius: 40rpx; - background-color: rgba(255, 255, 255, 0.3); + background-color: #07E881; color: #ffffff; position: absolute; left: 40%; top: 293rpx; @@ -328,29 +328,27 @@ height: 100%; } .shopping{ - margin-top: 15rpx; - height: 80rpx; - line-height: 80rpx; + margin: 15rpx 30rpx; + height: 70rpx; + line-height: 70rpx; text-align: center; - float: left; - padding: 0 60rpx; + float: right; + padding: 0 50rpx; background: linear-gradient(-4deg, #4EE09D, #02C96E); border-radius: 50rpx; - margin-left: 80rpx; color: #FFFFFF; font-size: 32rpx; font-family: OPPOSans; } .nOshopping{ - margin-top: 15rpx; - height: 80rpx; - line-height: 80rpx; + margin: 15rpx 30rpx; + height: 70rpx; + line-height: 70rpx; text-align: center; - float: left; - padding: 0 60rpx; - background-color: rgba(255, 255, 255, 0.1); + float: right; + padding: 0 30rpx; + background: linear-gradient(-4deg, #4EE09D, #02C96E); border-radius: 50rpx; - margin-left: 80rpx; color: #FFFFFF; font-size: 32rpx; font-family: OPPOSans; @@ -646,6 +644,15 @@ content: "答:"; color: #07E881; } +.answer1{ + color: #535E75; + font-size: 24rpx; + margin: 10rpx 20rpx 20rpx 20rpx; +} +.answer1::before{ + content: "注:"; + color: red; +} button::after { border: none; @@ -700,4 +707,46 @@ rich-text img{ /* width: 100%; */ max-width: 100%; /* max-height: 400rpx; */ -} \ No newline at end of file +} +.AAVV{ + background-color: #fff; + margin-bottom: 30rpx; +} +.goDouDianBox{ + width: 70%; + /* height: 300rpx; */ + background-color: #222633; + border-radius: 20rpx; + position: fixed; + top: 400rpx; + left: 15%; +} +.jifenText{ + text-align: center; + height: 180rpx; + color: #fff; + line-height: 180rpx; + +} +.esc{ + float: left; + width: 49%; + border-top: #3D4253 1rpx solid; + border-right: #3D4253 1rpx solid; + /* border-bottom: #3D4253 1rpx solid; */ + text-align: center; + height: 70rpx; + line-height: 70rpx; +} +.goDouDian{ + float: left; + width: 50%; + border-top: #3D4253 1rpx solid; + /* border-radius: #fff 1rpx solid; */ + /* border-bottom: #3D4253 1rpx solid; */ + text-align: center; + color: #4EE09D; + height: 70rpx; + line-height: 70rpx; + font-size: 28rpx; +} diff --git a/pages/course/course.ttss b/pages/course/course.ttss index 1430ef7..824f091 100644 --- a/pages/course/course.ttss +++ b/pages/course/course.ttss @@ -1,13 +1,13 @@ /* .headBox{ width: 100%; height: 320rpx; - background-image: url("https://formall.oss-accelerate.aliyuncs.com/douyin/drawable-xhdpi/course_bnt.png"); + background-image: url("https://zhibotang.oss-cn-beijing.aliyuncs.com/douyin/drawable-xhdpi/course_bnt.png"); background-size: 100% 320rpx; } .classHourBox{ width: 80%; height: 222rpx; - background-image: url("https://formall.oss-accelerate.aliyuncs.com/douyin/drawable-xhdpi/course_bnt_xuexi.png"); + background-image: url("https://zhibotang.oss-cn-beijing.aliyuncs.com/douyin/drawable-xhdpi/course_bnt_xuexi.png"); background-size: 100% 222rpx; margin-top:60rpx ; margin-left: auto; diff --git a/pages/index/index.js b/pages/index/index.js index be3cfa9..7b6f45a 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -268,6 +268,7 @@ Page({ title: '',            //分享的标题 desc: '',           // 分享的内容 //      path: ``, // 分享的路径 + imageUrl:"../../assets/images/1.png" } } }, diff --git a/pages/index/index.ttss b/pages/index/index.ttss index 46d5e50..0226e03 100644 --- a/pages/index/index.ttss +++ b/pages/index/index.ttss @@ -221,7 +221,7 @@ overflow: hidden; top: 0; width: 70rpx; height: 40rpx; - /* background-image: url('https://formall.oss-accelerate.aliyuncs.com/douyin/drawable-xhdpi/home_bnt_bq.png'); */ + /* background-image: url('https://zhibotang.oss-cn-beijing.aliyuncs.com/douyin/drawable-xhdpi/home_bnt_bq.png'); */ /* background-size:74rpx 40rpx; */ color: #ffffff; font-size: 24rpx; @@ -553,7 +553,7 @@ overflow: hidden; position: absolute; width: 42rpx; height: 55rpx; - background-image: url('https://formall.oss-accelerate.aliyuncs.com/douyin/drawable-xhdpi/home_rmph_ic_1.png'); + background-image: url('https://zhibotang.oss-cn-beijing.aliyuncs.com/douyin/drawable-xhdpi/home_rmph_ic_1.png'); background-size:42rpx 55rpx; background-repeat:no-repeat; color: #ffffff; @@ -566,7 +566,7 @@ overflow: hidden; position: absolute; width: 42rpx; height: 55rpx; - background-image: url('https://formall.oss-accelerate.aliyuncs.com/douyin/drawable-xhdpi/home_rmph_ic_2.png'); + background-image: url('https://zhibotang.oss-cn-beijing.aliyuncs.com/douyin/drawable-xhdpi/home_rmph_ic_2.png'); background-size:42rpx 55rpx; background-repeat:no-repeat; color: #ffffff; @@ -579,7 +579,7 @@ overflow: hidden; position: absolute; width: 42rpx; height: 55rpx; - background-image: url('https://formall.oss-accelerate.aliyuncs.com/douyin/drawable-xhdpi/home_rmph_ic_3.png'); + background-image: url('https://zhibotang.oss-cn-beijing.aliyuncs.com/douyin/drawable-xhdpi/home_rmph_ic_3.png'); background-size:42rpx 55rpx; background-repeat:no-repeat; color: #ffffff; @@ -592,7 +592,7 @@ overflow: hidden; position: absolute; width: 42rpx; height: 55rpx; - background-image: url('https://formall.oss-accelerate.aliyuncs.com/douyin/drawable-xhdpi/home_rmph_ic_4.png'); + background-image: url('https://zhibotang.oss-cn-beijing.aliyuncs.com/douyin/drawable-xhdpi/home_rmph_ic_4.png'); background-size:42rpx 55rpx; background-repeat:no-repeat; color: #ffffff; diff --git a/pages/integral/integral.js b/pages/integral/integral.js index 5b7ffd9..1e35b25 100644 --- a/pages/integral/integral.js +++ b/pages/integral/integral.js @@ -1,41 +1,77 @@ const app = getApp() const config = require("../../config/config") const Http = require("../../utils/HttpBasics.js") +const util = require("../../utils/util.js") const navigationBarHeight = (getApp().statusBarHeight + 44)+"px" Page({ data:{ imgHttps:app.globalData.imgHttps, navigationBarHeight, - list:[ - { - title:"积分充值", - type: 1, - id:123102410, - tiem:"2020-11-03", - num:2354121551, - }, - { - title:"积分消费", - type: 2, - id:1231023234, - tiem:"2020-10-03", - num:23545, - }, - { - title:"积分充值", - type: 1, - id:123104432, - tiem:"2020-11-03", - num:111, - }, - { - title:"积分充值", - type: 1, - id:1231422342, - tiem:"2020-11-03", - num:23, - }, + list:[ + ], + credit:"", + pageNum:1, + }, + //获取积分信息 + getUserData(){ + Http.get({ + url:config.api.getUserInfo + }).then(res=>{ + this.setData({ + credit:res.data.credit + }) + }).catch(err=>{ + tt.showToast({ + title: err.message ? err.message : err.data, + icon: "none" + }); + }) + }, + getList(){ + tt.showLoading({ + title: '加载中...', // 内容 + }); + Http.get({ + url:config.api.creditList, + data:{ + pageNum: this.data.pageNum, + pageSize: 10, + } + }).then(res=>{ + let tmepLsit = res.data.list + tmepLsit.map(item=>{ + item.createDate = util.formatTime(item.createDate,"yyyy-MM-dd hh:mm:ss") + }) + if(this.data.pageNum>1){ + let arr = this.data.list + this.setData({ + list:[...arr,...tmepLsit] + }) + + }else{ + this.setData({ + list:tmepLsit + }) + } + tt.hideLoading(); - ] + }).catch(err=>{ + tt.hideLoading(); + tt.showToast({ + title: err.message?err.message:err.data, // 内容 + }); + }) + }, + onLoad: function () { + this.getUserData() + this.getList() + }, + onReachBottom(){ + console.log("到底了"); + this.setData({ + pageNum:this.data.pageNum +1 + }) + this.getList() } + }) \ No newline at end of file diff --git a/pages/integral/integral.ttml b/pages/integral/integral.ttml index d64c432..1db0364 100644 --- a/pages/integral/integral.ttml +++ b/pages/integral/integral.ttml @@ -3,22 +3,22 @@ 积分余额 - 20151111.20 + {{credit}} 积分收支明细 - {{item.title}} + {{item.changePurpose}} 订单编号:{{item.id}} - {{item.tiem}} + {{item.createDate}} - - +{{item.num}} + + +{{item.creditNum}} - - -{{item.num}} + + {{item.creditNum}} diff --git a/pages/order/order.js b/pages/order/order.js index f4cae2d..ba33146 100644 --- a/pages/order/order.js +++ b/pages/order/order.js @@ -8,7 +8,7 @@ Page({ data: { navigationBarHeight, imgHttps: app.globalData.imgHttps, - pitch: 0,//选中支付类型 + pitch: 1,//选中支付类型 orderLsit: [],//订单列表 pageNum: 1, noDAtaFlag:false, @@ -140,7 +140,7 @@ Page({ url: config.api.getOrderLsit, data: { pageNum: this.data.pageNum, - pageSize: 3, + pageSize: 6, statusS: tempArr } }).then(res => { diff --git a/pages/publicity/publicity.ttss b/pages/publicity/publicity.ttss index dc0a452..e78a3e7 100644 --- a/pages/publicity/publicity.ttss +++ b/pages/publicity/publicity.ttss @@ -138,7 +138,7 @@ position: absolute; width: 52rpx; height: 65rpx; - background-image: url('https://formall.oss-accelerate.aliyuncs.com/douyin/drawable-xhdpi/home_rmph_ic_1.png'); + background-image: url('https://zhibotang.oss-cn-beijing.aliyuncs.com/douyin/drawable-xhdpi/home_rmph_ic_1.png'); background-size:52rpx 65rpx; color: #ffffff; text-align: center; @@ -150,7 +150,7 @@ position: absolute; width: 52rpx; height: 65rpx; - background-image: url('https://formall.oss-accelerate.aliyuncs.com/douyin/drawable-xhdpi/home_rmph_ic_2.png'); + background-image: url('https://zhibotang.oss-cn-beijing.aliyuncs.com/douyin/drawable-xhdpi/home_rmph_ic_2.png'); background-size:52rpx 65rpx; color: #ffffff; text-align: center; @@ -162,7 +162,7 @@ position: absolute; width: 52rpx; height: 65rpx; - background-image: url('https://formall.oss-accelerate.aliyuncs.com/douyin/drawable-xhdpi/home_rmph_ic_3.png'); + background-image: url('https://zhibotang.oss-cn-beijing.aliyuncs.com/douyin/drawable-xhdpi/home_rmph_ic_3.png'); background-size:52rpx 65rpx; color: #ffffff; text-align: center; @@ -174,7 +174,7 @@ position: absolute; width: 52rpx; height: 65rpx; - background-image: url('https://formall.oss-accelerate.aliyuncs.com/douyin/drawable-xhdpi/home_rmph_ic_4.png'); + background-image: url('https://zhibotang.oss-cn-beijing.aliyuncs.com/douyin/drawable-xhdpi/home_rmph_ic_4.png'); background-size:52rpx 65rpx; color: #ffffff; text-align: center; diff --git a/pages/ranking/ranking.ttss b/pages/ranking/ranking.ttss index 05f857c..2d33ba7 100644 --- a/pages/ranking/ranking.ttss +++ b/pages/ranking/ranking.ttss @@ -10,7 +10,7 @@ width: 100%; height: 480rpx; border-radius: 10rpx; - background-image: url('https://formall.oss-accelerate.aliyuncs.com/douyin/drawable-xhdpi/leaderboard_bnt.png'); + background-image: url('https://zhibotang.oss-cn-beijing.aliyuncs.com/douyin/drawable-xhdpi/leaderboard_bnt.png'); background-size: 100% 480rpx; background-position: 0 -1500rpx; } @@ -133,7 +133,7 @@ position: absolute; width: 52rpx; height: 65rpx; - background-image: url('https://formall.oss-accelerate.aliyuncs.com/douyin/drawable-xhdpi/home_rmph_ic_1.png'); + background-image: url('https://zhibotang.oss-cn-beijing.aliyuncs.com/douyin/drawable-xhdpi/home_rmph_ic_1.png'); background-size:52rpx 65rpx; color: #ffffff; text-align: center; @@ -145,7 +145,7 @@ position: absolute; width: 52rpx; height: 65rpx; - background-image: url('https://formall.oss-accelerate.aliyuncs.com/douyin/drawable-xhdpi/home_rmph_ic_2.png'); + background-image: url('https://zhibotang.oss-cn-beijing.aliyuncs.com/douyin/drawable-xhdpi/home_rmph_ic_2.png'); background-size:52rpx 65rpx; color: #ffffff; text-align: center; @@ -157,7 +157,7 @@ position: absolute; width: 52rpx; height: 65rpx; - background-image: url('https://formall.oss-accelerate.aliyuncs.com/douyin/drawable-xhdpi/home_rmph_ic_3.png'); + background-image: url('https://zhibotang.oss-cn-beijing.aliyuncs.com/douyin/drawable-xhdpi/home_rmph_ic_3.png'); background-size:52rpx 65rpx; color: #ffffff; text-align: center; @@ -169,7 +169,7 @@ position: absolute; width: 52rpx; height: 65rpx; - background-image: url('https://formall.oss-accelerate.aliyuncs.com/douyin/drawable-xhdpi/home_rmph_ic_4.png'); + background-image: url('https://zhibotang.oss-cn-beijing.aliyuncs.com/douyin/drawable-xhdpi/home_rmph_ic_4.png'); background-size:52rpx 65rpx; color: #ffffff; text-align: center; diff --git a/pages/search/search.js b/pages/search/search.js index 3a664a6..4972365 100644 --- a/pages/search/search.js +++ b/pages/search/search.js @@ -55,6 +55,9 @@ Page({ pageNum:this.data.pageNum, pageSize:8 } + if(this.data.inputValue!=""){ + data.isSearch = 1 + } }else{//作者 url = config.api.getAuthor data = { diff --git a/pages/sponsor/sponsor.ttss b/pages/sponsor/sponsor.ttss index 2808ba9..2eb45bb 100644 --- a/pages/sponsor/sponsor.ttss +++ b/pages/sponsor/sponsor.ttss @@ -1,6 +1,6 @@ .versionsBox{ height: 360rpx; - background-image: url('https://formall.oss-accelerate.aliyuncs.com/douyin/drawable-xhdpi/aboutUs_bnt.png'); + background-image: url('https://zhibotang.oss-cn-beijing.aliyuncs.com/douyin/drawable-xhdpi/aboutUs_bnt.png'); background-size: 100% 360rpx; } diff --git a/pages/upEnter/upEnter.ttss b/pages/upEnter/upEnter.ttss index add9b0c..58b68d2 100644 --- a/pages/upEnter/upEnter.ttss +++ b/pages/upEnter/upEnter.ttss @@ -1,7 +1,7 @@ .backImg{ width: 100%; height: 750rpx; - background-image: url('https://formall.oss-accelerate.aliyuncs.com/douyin/drawable-xhdpi/apply_bnt.png'); + background-image: url('https://zhibotang.oss-cn-beijing.aliyuncs.com/douyin/drawable-xhdpi/apply_bnt.png'); background-size: 100% 750rpx; } .messageBox{ diff --git a/pages/user/user.js b/pages/user/user.js index 3251a91..efcc324 100644 --- a/pages/user/user.js +++ b/pages/user/user.js @@ -5,11 +5,13 @@ const Http = require("../../utils/HttpBasics.js") const navigationBarHeight = (getApp().statusBarHeight + 44) + "px" Page({ data: { + signal: app.globalData.platform, navigationBarHeight, imgHttps: app.globalData.imgHttps, userData: "", userPhone: "", - showBindPhone: false,//绑定手机号边框 + phoneNum:"", + showBindPhone: false,//绑定手机号弹框 Num: 60, NumFlag: false, code: ""//验证码 @@ -36,6 +38,30 @@ Page({ code: value }) }, + phoneFromCode() {//授权手机号 + Http.post({ + url: config.api.phoneFromCode, + data: { + code: this.data.code, + phone: this.data.userPhone + } + }).then(res => { + tt.showToast({ + title: '授权成功', // 内容 + icon: "none" + }); + this.setData({ + showBindPhone: false + }) + this.getUserData() + }).catch(err => { + tt.showToast({ + title: err.message ? err.message : err.data, + icon: "none" + }); + }) + }, + getCode() {//获取验证码 console.log(this.data.userPhone); let myreg = /^[1][3,4,5,7,8,9][0-9]{9}$/; @@ -82,21 +108,21 @@ Page({ getUserData() {//获取用户信息 Http.get({ - url:config.api.getUserInfo - }).then(res=>{ - if(res.data.phone){ + url: config.api.getUserInfo + }).then(res => { + console.log(res.data.phone); + if (res.data.phone) { this.setData({ - userPhone:res.data.phone + phoneNum: res.data.phone }) } - }).catch(err=>{ + }).catch(err => { tt.showToast({ title: err.message ? err.message : err.data, icon: "none" }); }) }, - onLoad: function () { console.log(123); this.getUserData() diff --git a/pages/user/user.ttml b/pages/user/user.ttml index c217e72..c2a3f91 100644 --- a/pages/user/user.ttml +++ b/pages/user/user.ttml @@ -18,10 +18,10 @@ lazy-load="false" binderror="" bindload="" /> --> - +