修复bug

pages2/wd/class.vue

@@ -112,8 +112,12 @@
 										<view class="class-warm__text">
 											<view class="date">
 												<text v-if="item.periodStatus == 0">机构审核：学时审核不通过</text>
-												<text v-else-if="item.periodStatus == 1">机构审核：学时审核通过</text>
 												<text v-else-if="item.periodStatus == 2">学时待审核</text>
+												<text v-else-if="item.periodStatus == 1">
+													<text v-if="item.periodPlush > 0">学时已上报注册中心</text>
+													<text v-else>机构审核：学时审核通过</text>
+													
+												</text>
 											</view>
 										</view>
 									</view>
@@ -229,7 +233,16 @@
 				</view>
 			</view>
 		</u-popup>
-		
+		<u-modal v-model="showMark" title="提示" @confirm="markConfirm" confirm-text="复制学习网址" :show-cancel-button="true" cancel-text="关闭">
+			<view class="slot-content"><view>您的学习账号已经开通，请按照步骤操作，进行学习。</view>
+				<view>1.复制学习地址:{{markContent}}</view>
+				<view>2.在【浏览器中】打开复制的学习网址</view>
+				<view>3.打开学习网址后，选择【个人用户】进行登录</view>
+				<view>(1)账号：您个人的身份证号码</view>
+				<view>(2)密码：身份证号码，再加111111</view>
+			</view>
+			
+		</u-modal>
 	</view>
 </template>
 
@@ -237,6 +250,8 @@
 export default {
 	data() {
 		return {
+			markContent:'',
+			showMark:false,
 			list: [1, 2, 3],
 			goodsList: [],
 			selectClassModal:false,
@@ -269,6 +284,17 @@ export default {
 		}
 	},
 	methods: {
+		/**
+		 * 复制网址
+		 */
+		markConfirm() {
+			uni.setClipboardData({
+			    data: this.markContent,
+			    success: function () {
+			        console.log('success');
+			    }
+			});
+		},
 		/**
 		 * 返回刷新之前进入的课程数据
 		 */
@@ -353,10 +379,27 @@ export default {
 		},
 		async studyIn(v,i,item,index) {
 			
-			if(item.learnStatus == 1) { //跳转第三方h5
-				uni.navigateTo({
-					url:'/pages/webview/index?url='+item.officialLearningUrl
-				})
+			
+			if(item.interfaceAccountId > 0) { //学习账号已开通
+				
+				if(item.learnStatus == 1) { //跳转第三方h5
+					this.showMark = true;
+					this.markContent = item.officialLearningUrl
+					
+					return;
+					// uni.navigateTo({
+					// 	url:'/pages/webview/index?url='+item.officialLearningUrl
+					// })
+					// return;
+				} else {
+					uni.showModal({
+						showCancel: false,
+						content:'您的学习账号未开通，请稍后再尝试，有疑问，请联系020-87085982！'
+					});
+					return;
+				}
+				
+				
 				return;
 			}
 			
@@ -674,4 +717,8 @@ page {
 		}
 	}
 }
+
+.slot-content {
+	padding:0 20rpx;
+}
 </style>

pages3/polyv/detail.vue

@@ -368,7 +368,7 @@ export default {
 					self.$api.getbaseprofiletpId(self.goodsId).then(baseRes => {
 						if(baseRes.data.code === 200) {
 							if(baseRes.data.data) {
-								self.$api.getbaseprofiletpgetInfo({ goodsId: self.goodsId }).then(result => {
+								self.$api.getbaseprofiletpgetInfo({ goodsId: self.goodsId,orderGoodsId:self.orderGoodsId }).then(result => {
 									console.log(result,'result')
 									if (result.data.code === 200) {
 										if (!result.data.data || (result.data.data.status === 3 && result.data.data.changeStatus === 1)) {								
@@ -408,7 +408,7 @@ export default {
 												});
 											}
 										} else if (result.data.data.status === 1 && JSON.parse(res.data.rows[0].keyValue2)[0]) {
-											self.$api.getbaseprofileStampgetInfo({ goodsId: self.goodsId }).then(k => {
+											self.$api.getbaseprofileStampgetInfo({ goodsId: self.goodsId,orderGoodsId:self.orderGoodsId }).then(k => {
 												
 												if (k.data.code === 200) {
 													if (!k.data.data || (k.data.data.status === 3 && k.data.data.changeStatus === 1)) {
@@ -824,18 +824,27 @@ export default {
 			let photoNum = this.photoNum
 			if(!this.photoConfig){
 				this.photoConfig = true
-				let  spaceTime = Math.floor(totalVideoTime/photoNum) //拍照时间区间
-				if(spaceTime<5){//区间小于5秒
-					photoNum = Math.floor(totalVideoTime/5)
-					spaceTime = 5
-				}
-				if(photoNum<1){
-					photoNum = 1 //只要设置，至少拍一次
-					spaceTime = totalVideoTime
-				}
-				let initSpace = 0
+				// let  spaceTime = Math.floor(totalVideoTime/photoNum) //拍照时间区间
+				// if(spaceTime<5){//区间小于5秒
+				// 	photoNum = Math.floor(totalVideoTime/5)
+				// 	spaceTime = 5
+				// }
+				// if(photoNum<1){
+				// 	photoNum = 1 //只要设置，至少拍一次
+				// 	spaceTime = totalVideoTime
+				// }
+				// let initSpace = 0
 				//没有历史拍照间隔数据
 				if(this.photoList.length==0){
+					// if(totalVideoTime >= 6000) { //大于10分钟
+					// 	if(photoNum == 1) { //只拍1张
+							
+					// 	} else if(photoNum == 3){ //拍3张
+							
+					// 	}
+					// } else { //小于10分钟，只拍一张
+						
+					// }
 					for(let i=0;i<photoNum;i++){
 						let s = this.randomNum(initSpace,initSpace+spaceTime)
 						if(s>totalVideoTime){