Преглед изворни кода

1.新增pc登录页面 2.web_view预发布路径 3.视频播放改动

xuqiaoying пре 3 година
родитељ
комит
eeed82f766
5 измењених фајлова са 129 додато и 6 уклоњено
  1. 3 2
      common/request.js
  2. 15 1
      pages.json
  3. 2 2
      pages/wd/index.vue
  4. 83 1
      pages3/polyv/detail.vue
  5. 26 0
      pages4/login/pcLogin.vue

+ 3 - 2
common/request.js

@@ -13,9 +13,10 @@ export const BASE_URL = 'https://test.xyyxt.net'   //预发布
 // export const BASE_IMG_URL = 'https://file.xyyxt.net/'     //release
 export const BASE_IMG_URL = 'https://file-dev.xyyxt.net/'  //test
 
-
+// web_view的
 // export const WEBVIEW_URL = 'http://192.168.1.38:8082/'  //test
-export const WEBVIEW_URL = 'http://api.xyyxt.net:6066/'  //预发布
+// export const WEBVIEW_URL = 'http://api.xyyxt.net:6066/'  //预发布(弃用了)
+export const WEBVIEW_URL = 'https://testm.xyyxt.net/'  //预发布
 // export const WEBVIEW_URL = 'https://m.xyyxt.net/'  //release
 
 // export const socket_url = 'ws://42.192.164.187:19005/webSocket/'  //test

+ 15 - 1
pages.json

@@ -806,7 +806,21 @@
 					"bounce": "none"
 				}
 			}
-		}]
+		},
+        {
+			"path": "login/pcLogin",
+			"style": {
+				"navigationBarTitleText": "pc登录页",
+				"navigationBarBackgroundColor": "#0386FD",
+				"navigationBarTextStyle": "white",
+				"navigationStyle": "custom", // 隐藏系统导航栏
+				"app-plus": {
+					"titleNView": false, //禁用原生导航栏 
+					"bounce": "none"
+				}
+			}
+		}
+    ]
 			
 	},{
 		"root": "pages5",

+ 2 - 2
pages/wd/index.vue

@@ -28,7 +28,7 @@
 						个学习任务
 					</view>
 				</navigator> -->
-				<!-- <view class="two_menu">
+				<view class="two_menu">
 					<navigator  hover-class="none" url="/pages2/wd/class" class="small_menu">
 						<image src="/static/icon/my_icon3.png" class="my_icon"></image>
 						<view>我的网课</view>
@@ -37,7 +37,7 @@
 						<image src="/static/icon/my_icon4.png" class="my_icon"></image>
 						<view>我的题库通</view>
 					</view>
-				</view> -->
+				</view>
 				<navigator  hover-class="none" url="/pages5/liveDetail/list" class="menu_box" >
 					<view class="box_left">
 						<image src="/static/icon/my_icon12.png" class="my_icon"></image>

+ 83 - 1
pages3/polyv/detail.vue

@@ -60,6 +60,62 @@
               >从头播放</cover-view
             >
           </cover-view>
+          <view class="mulu">
+                <scroll-view class="box_in" scroll-y="true">
+                    <view class="menuBox" v-for="(item, index) in menuList" :key="index">
+                        <!--模块 -->
+                        <view v-if="item.type == 1"
+                        ><courseModule
+                            :orderGoodsId="orderGoodsId"
+                            :sectionMaxNum="goodsData.sectionMaxNum"
+                            :needOpen="menuIndex[0] === index ? true : false"
+                            :courseId="courseId"
+                            :preItem="menuList[index - 1]"
+                            :learningOrder="businessData.goodsLearningOrder"
+                            :goodsId="goodsId"
+                            :gradeId="gradeId"
+                            :isBuy="true"
+                            :menuItem="item"
+                            :levelId="item.menuId"
+                        ></courseModule
+                        ></view>
+                        <!--章 -->
+                        <view v-if="item.type == 2"
+                        ><courseChapter
+                                            :orderGoodsId="orderGoodsId"
+                            :sectionMaxNum="goodsData.sectionMaxNum"
+                            :needOpen="menuIndex[0] === index ? true : false"
+                            :courseId="courseId"
+                            :preItem="menuList[index - 1]"
+                            @playEnd="sectionPlayEnd($event, index)"
+                            :learningOrder="businessData.goodsLearningOrder"
+                            :goodsId="goodsId"
+                            :gradeId="gradeId"
+                            :isBuy="true"
+                            :menuItem="item"
+                            :levelId="'0-' + item.menuId"
+                        ></courseChapter
+                        ></view>
+                        <!--节 -->
+                        <view v-if="item.type == 3"
+                        ><courseSection
+                                            :orderGoodsId="orderGoodsId"
+                            :sectionMaxNum="goodsData.sectionMaxNum"
+                            @playEnd="sectionPlayEnd($event, index)"
+                            :courseId="courseId"
+                            :preItem="menuList[index - 1]"
+                            :learningOrder="businessData.goodsLearningOrder"
+                            :goodsId="goodsId"
+                            :gradeId="gradeId"
+                            :isBuy="true"
+                            :menuItem="item"
+                            :levelId="'0-0-' + item.menuId"
+                        ></courseSection
+                        ></view>
+                    </view>
+                </scroll-view>
+          </view>
+
         </view>
         <view
           class="video_box"
@@ -2491,7 +2547,19 @@ export default {
   display: flex;
   flex-direction: column;
   height: 100vh;
-
+    position: relative;
+    top: 0;
+    left: 0;
+    .pops {
+        position: absolute;
+        top: 0;
+        left: 0;
+        background: #ccc;
+        opacity: 0.5;
+        width: 100%;
+        height: 300rpx;
+        z-index: 9999;
+    }
   .box {
     flex: 1;
     overflow: hidden;
@@ -3109,6 +3177,20 @@ page {
     border-radius: 50%;
     color: rgba(255, 255, 255, 0.3);
   }
+  .mulu {
+    position: absolute;
+    top: 0rpx;
+    right: 0rpx;
+    width: 50%;
+    height: 100%;
+    background: rgba(0, 0, 0, 0.6);
+    color: #333;
+    // color: rgba(255, 255, 255, 0.3);
+    .box_in {
+        width: 100%;
+        height: 100%;
+    }
+  }
 }
 .rotoct {
   transform: rotate(90deg);

+ 26 - 0
pages4/login/pcLogin.vue

@@ -0,0 +1,26 @@
+<template>
+    <view>
+        pc端扫码登录
+        <view>sfdogh县第十四个丰厚的</view>
+        <view>sfdogh县第十四个丰厚的</view>
+        <view>sfdogh县第十四个丰厚的</view>
+        <view>sfdogh县第十四个丰厚的</view>
+        <view>sfdogh县第十四个丰厚的</view>
+    </view>
+</template>
+
+<script>
+export default {
+    data() {
+        return {
+
+        }
+    },
+    onLoad(query) {
+        console.log('扫描参数', query)
+        const q = decodeURIComponent(query.q)
+        const time = parseInt(query.scancode_time)
+        console.log('扫描后得:', q, time)
+	},
+}
+</script>