erge branch 'master' of https://gitee.com/he2802/saas_applet

App.vue

@@ -1,4 +1,5 @@
 <script>
+	import plv from './pages3/static/polyv-sdk/index';
 	export default {
 		onLaunch: function(option) {
 			let inviteCode = option.inviteCode
@@ -6,9 +7,14 @@
 				console.log(inviteCode)
 				uni.setStorageSync("inviteCode",inviteCode)
 			}
+			console.log(plv)
+			 plv.setApp({
+				apiId: 'ezl5uy4zei',
+				apiSecret: '2bf5bb3c31d34531943df10284edd50b'
+			});
 
-		},
-		methods: {
+		}, 
+		methods: { 
 	
 		},
 		onShow: function() {

common/request.js

@@ -33,7 +33,7 @@ export const myRequest = (options) => {
 			},
 			success: async (res) => {
 				if (res.data.code == 401) {
-					if (num <= 3) {
+					if (num <= 2) {
 						if (!uni.getStorageSync('user_account')) {
 							uni.navigateTo({
 								url: '/pages/login/login'
@@ -43,7 +43,9 @@ export const myRequest = (options) => {
 							res = await doRequest(options)
 						}
 
-					};
+					}else{
+						uni.removeStorageSync('user_account')
+					}
 				}
 				resolve(res)
 			},

manifest.json

@@ -80,7 +80,7 @@
             "urlCheck" : false,
             "postcss" : true,
             "minified" : true,
-            "es6" : false
+            "es6" : true
         },
         "usingComponents" : true,
         "permission" : {

pages.json

@@ -653,11 +653,28 @@
 				"provider": "wx4a350a258a6f7876"
 			}
 		}
+	},{
+		"root": "pages3",
+		"pages": [{
+				"path": "polyv/polyv",
+				"style": {
+					"navigationBarTitleText": "保利威直播",
+					"app-plus": {
+						"bounce": "none"
+					},
+					"mp-weixin": {
+						"usingComponents": {
+						    "player": "/pages3/static/polyv-sdk/components/player/player"
+						  }
+					}
+				}
+		}]
+			
 	}],
 	"preloadRule": {
 		"pages/index/index": {
 			"network": "all",
-			"packages": ["pages2"]
+			"packages": []
 		}
 	},
 	"globalStyle": {
@@ -666,7 +683,7 @@
 		"navigationBarBackgroundColor": "#F8F8F8",
 		"backgroundColor": "#F8F8F8",
 		"usingComponents": {
-			"verify-mpsdk": "/wxcomponents/verify_mpsdk/index/index"
+			
 		}
 	},
 	"tabBar": {

pages/course/index.vue

@@ -158,6 +158,7 @@ export default {
 	},
 	onLoad(option) {
 		let eduStr = uni.getStorageSync('eduObj')
+		console.log(eduStr,987)
 		if(eduStr){
 			this.selObj = JSON.parse(eduStr)
 			this.subjectList({businessId:this.selObj.bId,projectId:this.selObj.pId,educationId:this.selObj.eId})

pages/login/login.vue

@@ -67,7 +67,7 @@ export default {
 						required: true, 
 						message: '请输入手机号', 
 						// 可以单个或者同时写两个触发验证方式 
-						trigger: ['change','blur'],
+						trigger: ['change'],
 					},
 					{
 						validator: (rule, value, callback) => {
@@ -77,7 +77,7 @@ export default {
 						},
 						message: '手机号码格式不正确',
 						// 触发器可以同时用blur和change
-						trigger: ['change','blur'],
+						trigger: ['change'],
 					}
 				],
 				account: [
@@ -85,7 +85,7 @@ export default {
 						required: true, 
 						message: '请输入手机号/学员身份证', 
 						// 可以单个或者同时写两个触发验证方式 
-						trigger: ['change','blur'],
+						trigger: ['change'],
 					}
 				],
 				pwd: [
@@ -93,7 +93,7 @@ export default {
 						required: true, 
 						message: '请输入密码', 
 						// 可以单个或者同时写两个触发验证方式 
-						trigger: ['change','blur'],
+						trigger: ['change'],
 					}
 				],
 				code: [
@@ -101,7 +101,7 @@ export default {
 						required: true, 
 						message: '请输入验证码', 
 						// 可以单个或者同时写两个触发验证方式 
-						trigger: ['change','blur'],
+						trigger: ['change'],
 					}
 				],
 			},

pages/shopping/shoppingCart.vue

@@ -182,7 +182,9 @@ export default {
 			examIndex: 0
 		};
 	},
-	onLoad(option) {},
+	onLoad(option) {
+		console.log(option,987)
+	},
 	onShow() {
 		this.isLogin = this.$method.isLogin();
 		if (this.isLogin) {

pages/wd/index.vue

@@ -38,7 +38,7 @@
 						<view>我的题库通</view>
 					</navigator>
 				</view>
-				<navigator  hover-class="none" url="/pages2/learn/my_learn" class="menu_box">
+				<navigator  hover-class="none" url="/pages2/learn/my_learn" class="menu_box" v-if="true">
 					<view class="box_left">
 						<image src="/static/icon/my_icon2.png" class="my_icon"></image>
 						<view>我的学时</view>
@@ -49,7 +49,7 @@
 						学时未通过
 					</view>
 				</navigator>
-				<navigator  hover-class="none" url="/pages2/exam/index" class="menu_box">
+				<navigator  hover-class="none" url="/pages2/exam/index" class="menu_box" v-if="true">
 					<view class="box_left">
 						<image src="/static/icon/my_icon10.png" class="my_icon"></image>
 						<view>我的考试</view>
@@ -85,6 +85,12 @@
 						<view>我的资料</view>
 					</view>
 				</navigator>
+				<navigator  hover-class="none" url="/pages3/polyv/polyv" class="menu_box">
+					<view class="box_left">
+						<image src="/static/icon/my_icon9.png" class="my_icon"></image>
+						<view>我的直播</view>
+					</view>
+				</navigator>
 				<view class="logout" @click="logout">退出</view>
 			</view>
 		</view>
@@ -108,7 +114,9 @@ export default {
 			userNums: {}
 		};
 	},
-	onLoad() {},
+	onLoad(option) {
+		console.log(option,987)
+	},
 	onShow() {
 		this.isLogin = this.$method.isLogin();
 		if(this.isLogin){

pages2/class/detail.vue

@@ -25,7 +25,7 @@
 					<u-col span="10">
 						<view class="video_t1">{{ detail.courseName }}</view>
 					</u-col>
-					<u-col span="2">
+					<u-col span="2" v-if="false">
 						<view class="video_t1_t" @click="openJY">
 							<image src="/static/icon/jy_icon.png" style="width: 40rpx;height: 40rpx;"></image>
 							讲义
@@ -344,6 +344,7 @@ export default {
 	},
 	onUnload() {
 		if (this.playSectionId > 0) {
+			console.log(234234)
 			//退出提交记录
 			this.ossAvatarUrl = '';
 			this.postStudyRecord();

pages2/register/forget.vue

@@ -41,7 +41,7 @@ export default {
 						required: true, 
 						message: '请输入手机号', 
 						// 可以单个或者同时写两个触发验证方式 
-						trigger: ['change','blur'],
+						trigger: ['change'],
 					},
 					{
 						validator: (rule, value, callback) => {
@@ -51,7 +51,7 @@ export default {
 						},
 						message: '手机号码格式不正确',
 						// 触发器可以同时用blur和change
-						trigger: ['change','blur'],
+						trigger: ['change'],
 					}
 				],
 				pwd: [
@@ -59,7 +59,7 @@ export default {
 						required: true, 
 						message: '请输入密码', 
 						// 可以单个或者同时写两个触发验证方式 
-						trigger: ['change','blur'],
+						trigger: ['change'],
 					}
 				],
 				pwdAgain: [
@@ -67,7 +67,7 @@ export default {
 						required: true, 
 						message: '请输入密码', 
 						// 可以单个或者同时写两个触发验证方式 
-						trigger: ['change','blur'],
+						trigger: ['change'],
 					}
 				],
 				code: [
@@ -75,7 +75,7 @@ export default {
 						required: true, 
 						message: '请输入验证码', 
 						// 可以单个或者同时写两个触发验证方式 
-						trigger: ['change','blur'],
+						trigger: ['change'],
 					}
 				],
 			},

pages2/register/register.vue

@@ -46,7 +46,7 @@ export default {
 						required: true, 
 						message: '请输入手机号', 
 						// 可以单个或者同时写两个触发验证方式 
-						trigger: ['change','blur'],
+						trigger: ['change'],
 					},
 					{
 						validator: (rule, value, callback) => {
@@ -56,7 +56,7 @@ export default {
 						},
 						message: '手机号码格式不正确',
 						// 触发器可以同时用blur和change
-						trigger: ['change','blur'],
+						trigger: ['change'],
 					}
 				],
 				pwd: [
@@ -64,7 +64,7 @@ export default {
 						required: true, 
 						message: '请输入密码', 
 						// 可以单个或者同时写两个触发验证方式 
-						trigger: ['change','blur'],
+						trigger: ['change'],
 					}
 				],
 				code: [
@@ -72,7 +72,7 @@ export default {
 						required: true, 
 						message: '请输入验证码', 
 						// 可以单个或者同时写两个触发验证方式 
-						trigger: ['change','blur'],
+						trigger: ['change'],
 					}
 				],
 			},

pages2/wd/info.vue

@@ -46,7 +46,7 @@
 							</pick-regions>
 						<u-icon name="arrow-right" color="#999999" size="28"></u-icon></view>
 					</view>
-					<view class="item">
+					<view class="item" @click="showPhoneModal = true">
 						<view>手机号码</view>
 						<view>{{ form.telphone }}<u-icon name="arrow-right" color="#999999" size="28"></u-icon></view>
 					</view>
@@ -70,6 +70,30 @@
 			<u-input v-model="idCard" placeholder="请输入身份证" />
 		</view>
 	</u-modal>
+	
+	<u-popup v-model="showPhoneModal" mode="bottom" class="modal" border-radius="32">
+		<view class="modal__content">
+			<view class="top">
+				<view class="top__line"></view>
+				<view class="top__text">更换手机号码</view>
+			</view>
+			<view class="form">
+				<u-form :model="telForm" ref="telForm">
+					<view class="input-wrap">
+						<u-form-item><u-input placeholder="手机号码" v-model="telForm.tel" /></u-form-item>
+						<u-form-item>
+							<u-input placeholder="验证码" v-model="telForm.code" />
+							<view  slot="right" @click="getCode" class="getcode">获取验证码</view>
+						</u-form-item>
+					</view>
+					<view class="btns">
+						<view class="cancel" @click="showPhoneModal = false;">取消</view>
+						<view class="submit">确认更换</view>
+					</view>
+				</u-form>
+			</view>
+		</view>
+	</u-popup>
 	<u-navbar   title="我的资料" :border-bottom="false" background="{ background: '#ffffff',opacity:0.4; }" title-color="#ffffff" back-icon-color="#ffffff">
 		
 	</u-navbar>
@@ -81,10 +105,15 @@
 export default {
 	data() {
 		return {
+			showPhoneModal:false,
 			form:{
 				avatar:'',
 				userBirth:new Date()
 			},
+			telForm:{
+				tel:'',
+				code:'',
+			},
 			array_sex: ['男', '女'],
 			n_show:false,
 			defaultRegionCode: '440112',
@@ -297,7 +326,7 @@ export default {
 	
 </style>
 
-<style scope>
+<style scope lang="scss">
 	.slot-content{
 		margin: 30rpx;
 		color: #606266;
@@ -357,4 +386,83 @@ export default {
 		margin: 0 auto;
 		margin-top: 50rpx;
 	}
+	
+	.modal {
+		&__content {
+			position:relative;
+			width: 750rpx;
+			height: 1208rpx;
+			background: #FFFFFF;
+			box-shadow: 0px 0px 16rpx 4rpx #919CB2;
+			border-radius: 32rpx 32rpx 0rpx 0rpx ;
+			overflow: hidden;
+			
+			.top {
+				border-bottom: 1rpx solid #eee;
+				&__line {
+					position: absolute;
+					top: 10rpx;
+					left: 50%;
+					transform: translateX(-50%);
+					width: 80rpx;
+					height: 8rpx;
+					background-color: #999;
+					border-radius: 4rpx;
+				}
+				
+				&__text {
+					height: 77rpx;
+					text-align: center;
+					line-height: 90rpx;
+					font-size: 24rpx;
+					color: #999;
+					position: relative;
+				}
+			}
+			
+			.form {
+				margin: 24rpx auto 0;
+				width: 686rpx;
+				height: 360rpx;
+				background: #FFFFFF;
+				border-radius: 24rpx 24rpx 24rpx 24rpx;
+				
+				.input-wrap {
+					padding:20rpx 80rpx;
+					
+					.getcode {
+						color:#007AFF;
+						font-size: 30rpx;
+					}
+				}
+				
+				.btns {
+					display: flex;
+					justify-content: space-between;
+					margin-top:160rpx;
+					.cancel {
+						text-align: center;
+						line-height: 80rpx;
+						color:#007AFF;
+						width: 200rpx;
+						height: 80rpx;
+						font-size: 30rpx;
+						background: #F5F5F5;
+						border-radius: 40rpx 40rpx 40rpx 40rpx;
+					}
+					
+					.submit {
+						text-align: center;
+						line-height: 80rpx;
+						color:#fff;
+						font-size: 30rpx;
+						width: 438rpx;
+						height: 80rpx;
+						background: #007AFF;
+						border-radius: 40rpx 40rpx 40rpx 40rpx;
+					}
+				}
+			}
+		}
+	}
 </style>

pages3/polyv/polyv.vue

@@ -0,0 +1,80 @@
+<template>
+	<view class="plv-mp-demo-page">
+	  <player
+	    class="plv-mp-demo-player"
+	    :videoOption="videoOption"
+	  />
+	</view>
+</template>
+
+<script>
+import plv from '../static/polyv-sdk/index';
+export default { 
+	data() {
+		return {
+			videoOption:{
+				mode: 'live',
+				uid: 'egsxlptzdq',
+				cid: '2553128',
+				openId: 'oQ5eX5BCtSjkE1ct8CzvxGWgh0hQ',
+				isAutoChange: false,
+				forceVideo: false,
+			},
+			detail: {}, 
+		};
+	},
+	mounted() {},
+	methods: {
+		setLiveOption(status) {
+		    const { userId, channelId, recordFileSimpleModel, playbackEnabled } = this.detail;
+		    const playRecordFile = playbackEnabled && recordFileSimpleModel && status === 'end';
+		
+		    this.videoOption = { 
+				mode: 'live',
+				uid: userId,
+				cid: channelId,
+				isAutoChange: false,
+				forceVideo: false,
+				vodsrc: playRecordFile ? recordFileSimpleModel.mp4 || recordFileSimpleModel.m3u8 : '',
+				liveMode: playRecordFile ? 2 : 1,
+			  }
+		}
+	},
+	onLoad(options) {
+			options.mode = 'live';
+			options.forceVideo = false;
+		    options.channelId = '2553128'; // 频道ID
+		    options.openId = 'oQ5eX5BCtSjkE1ct8CzvxGWgh0hQ'; // 用户openId
+		    // userName: ''; // 用户名
+		    // avatarUrl: ''; // 用户头像
+	        options.userId = 'egsxlptzdq' // 2.0.0及以上版本的demo需要使用 userId 设置学员唯一id
+		    plv.init(options)
+		      .then(({ detail, chat }) => {
+				  
+				  console.log(9999)
+		        this.detail = detail
+		        // 设置mode为live的videoOption
+		        // this.setLiveOption();
+		
+		        if (detail.isPPT) {
+		          chat.on(chat.events.SLICESTART, () => {
+		            // 开始直播
+		          });
+		        } else {
+		          plv.api.getOrdinaryLiveStatus(detail.stream);
+		        }
+		      });
+		
+		console.log(this.$refs.plv)
+	},
+	onUnload() {
+		 plv.destroy();
+	}
+};
+</script>
+
+<style scoped lang="scss">
+	.plv-mp-demo-page {
+		height:500rpx;
+	}
+</style>

pages3/static/polyv-sdk/common/answerCard/Language.js

@@ -0,0 +1 @@
+const LANGUAGE={TITLE:"答题卡",SCORE_TITLE:"评分",SUBMIT:"提交",MULTI_CHOICE:"(多选)",SUBMIT_DONE:"提交成功",CUT_OFF:"已截止",CORRECT_ANSWER:"回答正确",WRONG_ANSWER:"回答错误",NO_ANSWER:"未作答",AVERAGE:"平均得分",IKNOW:"我知道了",SUBMIT_FAILED:"提交失败",IGNORE:"忽略",ANSWER_END:"答题已结束",ANSWER_SUBMITED:"已答题"};module.exports=LANGUAGE;

pages3/static/polyv-sdk/common/api/index.js

@@ -0,0 +1 @@
+import{URL}from"../utils/config";import{request}from"./plv-request";const{mainHost:mainHost,routerHost:routerHost}=URL;export default{getOpenId:e=>request(mainHost+"/live/v3/applet/sdk/onlogin-sdk",{qs:{code:e}}),getUserId:e=>request(mainHost+"/live/v3/applet/sdk/get-chat-userId",{qs:{openId:e}}),getChannelDetail:e=>request(mainHost+"/live/v3/applet/sdk/get-channel-token-detail",{qs:{channelId:e}}),getOrdinaryLiveStatus:e=>request(mainHost+"/live_status/query",{qs:{stream:e}},!0),getPlayBackVideos:(e={})=>(e=Object.assign(e,{pageSize:500,page:1}),request(mainHost+"/live/v3/channel/playback/list-actual-playback",{qs:e})),getChannelKey:e=>request(`${mainHost}/live/v2/channels/${e}/mic-auth`,{qs:{type:"web",timestamp:(new Date).getTime()}},!0),agoraRelation(e){let t={"content-type":"application/x-www-form-urlencoded; charset=UTF-8"};return request(`${mainHost}/live/v3/agora/relation`,{body:e,method:"POST",headers:t})},getTRTCChannelKey:async e=>request(`${mainHost}/live/inner/v3/trtc/auth`,{qs:e},!0),getChapterRecords:e=>request(`${mainHost}/live/v3/channel/chat/get-ppt-records`,{qs:e}),getRestrict:e=>request(`${routerHost}/livejson.polyv.net/service/v3/restrict.json`,{qs:e},!0),getBackRestrict:e=>request(`${routerHost}/live.polyv.net/service/v3/restrict.json`,{qs:e},!0),getLatestSessionId:e=>request(`${mainHost}/live/channel-sessionid/query`,{qs:e})};

pages3/static/polyv-sdk/common/api/plv-request.js

@@ -0,0 +1 @@
+import md5 from"../utils/md5";import wxRequest from"../utils/request";import store from"../../store/index";function resortParam(t){const e=Object.keys(t).filter((t=>"sign"!==t)).sort();let r="";return e.forEach((e=>{r+=`${e}${t[e]}`})),r}function getSign(t,e){const r={...t},s=resortParam(t);return r.sign=md5(`plyMinApp${s}plyMinApp`).toUpperCase(),wxRequest(e,{qs:r})}function getSecretSign(t,e){const r=resortParam(t);return md5(`${e}${r}${e}`).toUpperCase()}export const request=async(t,e,r)=>{if(!r){const{apiId:t,apiSecret:r,verifyUrl:s}=store.get("app");for(const n in e)if(("qs"===n||"body"===n)&&e[n]){const o={...e[n]};if(o.appId=t,o.timestamp=Date.now(),s){const t=await getSign(o,s);o.sign=t.data.data.sign}else o.sign=getSecretSign(o,r);e[n]=o}}return wxRequest(t,e)};

pages3/static/polyv-sdk/common/authInfo/authInfo.wxml

@@ -0,0 +1,39 @@
+<template name="authInfo">
+  <view class="plv-auth-info" wx:if="{{ type === 'name' }}">
+    {{ name }}
+    <input type="text" data-index="{{ index }}" bindinput="infoInput" placeholder="{{ placeholder }}"/>
+  </view>
+  <view class="plv-auth-info" wx:if="{{ type === 'number' }}">
+    {{ name }}
+    <input type="digit" data-index="{{ index }}" bindinput="infoInput" placeholder="{{ placeholder }}"/>
+  </view>
+  <view class="plv-auth-info" wx:if="{{ type === 'text' }}">
+    {{ name }}
+    <input type="text" data-index="{{ index }}" bindinput="infoInput" placeholder="{{ placeholder }}"/>
+  </view>
+  <view class="plv-auth-info" wx:if="{{ type === 'mobile' }}">
+    {{ name }}
+    <input bindinput="telInput" type="number" placeholder="{{ placeholder }}"/>
+  </view>
+  <view wx:if="{{ type === 'mobile' && sms === 'Y' }}">
+    <view class="plv-auth-info">
+      <input bindinput="kaptchaInput" placeholder="请输入验证码"/>
+      <image bindtap="getInfoImage" src="{{ infoImage }}" />
+    </view>
+    <view class="plv-auth-info">
+      <input bindinput="msgInput" placeholder="短信验证码"/>
+      <button
+        bindtap="getInfoMsg"
+        plain
+        class="plv-info__get__msg {{ disable ? 'btn-disabled' : '' }}">{{ smsBtnText }}</button>
+    </view>
+  </view>
+  <view class="plv-auth-info" wx:if="{{ type === 'option' }}">
+    <text>{{ name }}</text>
+    <picker bindchange="bindPickerChange" data-index="{{ index }}" value="{{ infoParams[index] }}" range="{{ options }}">
+      <view class="picker">
+        {{ options[infoParams[index]] }}
+      </view>
+    </picker>
+  </view>
+</template>