diff --git a/src/jtools/pay/index.js b/src/jtools/pay/index.js index 7156f57..b326e73 100644 --- a/src/jtools/pay/index.js +++ b/src/jtools/pay/index.js @@ -70,6 +70,7 @@ export default class JtoolsPay { params.openId = uni.getStorageSync('openId'); } prePay(params).then(res => { + console.log('预支付',res); if (res.code == '0000') { resolve(res); } diff --git a/src/pages/index/components/Subject2.vue b/src/pages/index/components/Subject2.vue index ad4d6ab..b4cb490 100644 --- a/src/pages/index/components/Subject2.vue +++ b/src/pages/index/components/Subject2.vue @@ -36,7 +36,7 @@ - + 基础操作讲解 @@ -138,6 +138,7 @@ return { ...item, projectId:item.videoId, + subDesc:this.baseList[0].description, videoTime:this.formateTime(item.videoTime) } }) @@ -172,6 +173,7 @@ this.diverTypeIndex = this.diverTypeIndex == 0 ? 1 : 0 this.videoIndex = 0 this.getVideoList() + this.getOperateList() }, checkVideo(val) { this.projectId = this.operateList[val]?.projectId diff --git a/src/pages/index/videoVip.vue b/src/pages/index/videoVip.vue index 43465e6..f590c88 100644 --- a/src/pages/index/videoVip.vue +++ b/src/pages/index/videoVip.vue @@ -4,7 +4,7 @@ - {{item.memberName}} + {{item.memberName}} ¥ {{item.price}} @@ -57,7 +57,7 @@ checkedId:0, priceList:[], order:{ - money:0.01, + money:0, description:'会员充值' } } @@ -75,11 +75,12 @@ ...mapState(useUserStore, ["userInfo"]) }, methods:{ - handlePay(){ - console.log(this.order); + async handlePay(){ if(this.loading){ this.loading=false + await this.getWXOpenId() new Pay('wechat', this.order); + this.loading=true } }, getWXOpenId() { @@ -98,6 +99,7 @@ this.priceList=resp.data this.checkedId=this.priceList[0].memberId this.order.outTradeNo=this.priceList[0].memberId + this.order.money=this.priceList[0].price this.nowPrice=this.priceList[0].price this.priceList.forEach(item=>{ if(item.subjects.length>1){ @@ -110,6 +112,7 @@ this.checkedId=val this.order.outTradeNo=val this.nowPrice=price + this.order.money=price } } } @@ -143,7 +146,7 @@ } .checked_bottom{ width: 218rpx; - border-radius: 0 0 16rpx 12rpx; + border-radius: 0 0 16rpx 5rpx; background-color: #FF6E02; color:#fff } diff --git a/src/pages/me/vip.vue b/src/pages/me/vip.vue index 44f8514..2e49f7a 100644 --- a/src/pages/me/vip.vue +++ b/src/pages/me/vip.vue @@ -104,13 +104,16 @@ 全部 > - - - - - 真实考场模拟 - + + + + + + + + 真实考场模拟 + @@ -309,4 +312,17 @@ export default { border: 2rpx solid #CF8B6D; border-radius: 16rpx; } + .contain-box { + width: 406rpx; + height: 228rpx; + background: #00B74F; + border-radius: 16rpx; + } + .play_btn_2 { + width: 65rpx; + height: 65rpx; + position: absolute; + left: 165.5rpx; + top: 78rpx + } \ No newline at end of file diff --git a/src/pages/questionBank/baseOperate.vue b/src/pages/questionBank/baseOperate.vue index e897511..61342bb 100644 --- a/src/pages/questionBank/baseOperate.vue +++ b/src/pages/questionBank/baseOperate.vue @@ -71,6 +71,7 @@ arr = arr.map(item => { return { ...item, + subDesc:this.allVideoList[0].description, projectId:item.videoId, videoTime:this.formateTime(item.videoTime) } diff --git a/src/pages/questionBank/videoDetail.vue b/src/pages/questionBank/videoDetail.vue index 35788cd..171ab0e 100644 --- a/src/pages/questionBank/videoDetail.vue +++ b/src/pages/questionBank/videoDetail.vue @@ -1,12 +1,11 @@