Skip to content

C
CFFP-HB
Commit 2a857987 by sunerhu
Options

1.错误的浏览器回弹效果--暂时注释

parent c262c2a4
Showing with 26 additions and 21 deletions
pages/courseDetail/courseDetail.vue
...@@ -25,9 +25,9 @@ ...@@ -25,9 +25,9 @@
<template v-if="isRenderVideo"> <template v-if="isRenderVideo">
<view> <view>
<video id="myVideo" :src="courseInfo.filePathOss" :initial-time="videoPlaybackInfo.maxViewTime" <video id="myVideo" :src="courseInfo.filePathOss" :initial-time="videoPlaybackInfo.maxViewTime"
object-fit="contain" class="videoBox" :poster="courseInfo.fileFirstImage" :title="courseInfo.fileTitle" object-fit="contain" class="videoBox" :poster="courseInfo.fileFirstImage"
@loadedmetadata="loadedmetadata" @play="playVideo" @pause="pause" @ended="ended" :title="courseInfo.fileTitle" @loadedmetadata="loadedmetadata" @play="playVideo" @pause="pause"
@timeupdate="timeupdate"></video> @ended="ended" @timeupdate="timeupdate"></video>
</view> </view>
</template> </template>
</view> </view>
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
<view class="courseTitleContent"> <view class="courseTitleContent">
<view class="courseTitle"> <view class="courseTitle">
<view class="" style="width: 70%;"> <view class="" style="width: 70%;">
<h4>{{courseInfo.fileTitle}}</h4> <h4>{{courseInfo.fileTitle}}</h4>
</view> </view>
<view class="shareF"> <view class="shareF">
<view class="awakenApp" @click="jumpapp()" v-if="coursesharing == 1"> <view class="awakenApp" @click="jumpapp()" v-if="coursesharing == 1">
...@@ -118,7 +118,7 @@ ...@@ -118,7 +118,7 @@
<view class="buyBox" @click="saveOrder()" v-if="courseInfo.status == 1"> <view class="buyBox" @click="saveOrder()" v-if="courseInfo.status == 1">
<text>{{loginType=='visitor' ? '登录/注册' : '购买'}}</text> <text>{{loginType=='visitor' ? '登录/注册' : '购买'}}</text>
</view> </view>
</view> </view>
</view> </view>
<boot-page v-if="sharelogin" ref="sharelogin" @close="close"></boot-page> <boot-page v-if="sharelogin" ref="sharelogin" @close="close"></boot-page>
...@@ -126,12 +126,15 @@ ...@@ -126,12 +126,15 @@
</view> </view>
</template> </template>
<script> <script>
import api from "../../api/api"; import api from "../../api/api";
import BootPage from "@/components/bootpage/bootpage.vue"; import BootPage from "@/components/bootpage/bootpage.vue";
import UniShareWx from "@/uni_modules/uni-share-wx/index.vue"; import UniShareWx from "@/uni_modules/uni-share-wx/index.vue";
import dataHandling from "@/util/dataHandling"; import dataHandling from "@/util/dataHandling";
import {hshare} from '@/util/fiveshare' // import {
// hshare
// } from '@/util/fiveshare'
import { import {
nanoid nanoid
} from 'nanoid'; } from 'nanoid';
...@@ -142,7 +145,7 @@ ...@@ -142,7 +145,7 @@
}, },
data() { data() {
return { return {
isRenderVideo:false, isRenderVideo: false,
fileId: null, fileId: null,
lecturerId: null, lecturerId: null,
tabType: 3, tabType: 3,
...@@ -288,8 +291,9 @@ ...@@ -288,8 +291,9 @@
console.log(res, 545415) console.log(res, 545415)
if (res['success']) { if (res['success']) {
this.orderId = res['data']['id']; this.orderId = res['data']['id'];
if(this.coursesharing == '1'){ if (this.coursesharing == '1') {
this.userId = localStorage.getItem('h5_userId')?localStorage.getItem('h5_userId'): this.userId this.userId = localStorage.getItem('h5_userId') ? localStorage.getItem('h5_userId') :
this.userId
} }
uni.navigateTo({ uni.navigateTo({
url: `/pages/orderConfirm/orderConfirm?fileId=${this.fileId}&orderId=${this.orderId}&userId=${this.userId}` url: `/pages/orderConfirm/orderConfirm?fileId=${this.fileId}&orderId=${this.orderId}&userId=${this.userId}`
...@@ -495,16 +499,16 @@ ...@@ -495,16 +499,16 @@
}) })
}, },
// H5 自定义分享 // H5 自定义分享
getshareData(){ // getshareData() {
let data = { // let data = {
title:this.courseInfo.fileTitle, // title: this.courseInfo.fileTitle,
desc:'加入我们开启学习之旅', // desc: '加入我们开启学习之旅',
link: window.location.href,//分享链接 // link: window.location.href, //分享链接
imgUrl: this.courseInfo.displayImage, //图片 // imgUrl: this.courseInfo.displayImage, //图片
} // }
var url = window.location.href.split('#')[0] // var url = window.location.href.split('#')[0]
hshare(data,url) // hshare(data, url)
}, // },
}, },
onLoad(option) { onLoad(option) {
this.fileId = option.fileId; this.fileId = option.fileId;
...@@ -522,8 +526,9 @@ ...@@ -522,8 +526,9 @@
localStorage.setItem('h5_userId', '') localStorage.setItem('h5_userId', '')
} }
uni.setStorageSync('h5_coursesharing', this.coursesharing); uni.setStorageSync('h5_coursesharing', this.coursesharing);
this.getshareData()
} }
// this.getshareData()
let dataForm = uni.getStorageSync('userinfodataForm') let dataForm = uni.getStorageSync('userinfodataForm')
this.realName = dataForm.realName this.realName = dataForm.realName
// this.switchTab(1); // this.switchTab(1);
......
pages/orderConfirm/orderConfirm.vue
...@@ -302,7 +302,7 @@ ...@@ -302,7 +302,7 @@
if(this.deviceType == 3){ if(this.deviceType == 3){
this.tipsFlag = true; this.tipsFlag = true;
this.paymentBtnDisabled = false; this.paymentBtnDisabled = false;
let url = window.location.href + `&isRedirect=1&userId=${this.userId}&amount=${this.amount}`; let url = window.location.href + `&isRedirect=1&amount=${this.amount}`;
window.history.replaceState(null, '',url); window.history.replaceState(null, '',url);
return; return;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment