Browse Source

更新问题

lex 1 year ago
parent
commit
2ec645716d

+ 16 - 20
src/components/m-video/index.tsx

@@ -87,6 +87,7 @@ export default defineComponent({
       // if (browser().isApp) {
       //   controls.push('fullscreen');
       // }
+
       if (this.currentTime) {
         controls.push('current-time');
       }
@@ -106,11 +107,6 @@ export default defineComponent({
 
       this.player = new Plyr((this as any).$refs.video, params);
 
-      // fullscreen: {
-      //     enabled: true,
-      //     fallback: 'force',
-      //     iosNative: true
-      //   }
       this.player.elements.container
         ? (this.player.elements.container.style.height = this.height || '210px')
         : null;
@@ -132,27 +128,27 @@ export default defineComponent({
       });
 
       this.player.on('enterfullscreen', () => {
-        // console.log('fullscreen', this.player.elements);
-        // const fragment = document.createDocumentFragment();
-        // const i = document.createElement('i');
-        // i.id = 'fullscreen-back';
-        // i.className = 'van-icon van-icon-arrow-left video-back';
-        // i.addEventListener('click', () => {
-        //   this.player.fullscreen.exit();
-        // });
-        // console.log(document.getElementsByClassName('plyr'), i);
-        // fragment.appendChild(i);
-        // // const parentNode = document.getElementsByClassName('plyr')[0];
-        // // parentNode.insertBefore(fragment, parentNode.firstChild);
-        // this.player.elements.container.appendChild(fragment);
+        console.log('fullscreen', this.player.elements);
+        const fragment = document.createDocumentFragment();
+        const i = document.createElement('i');
+        i.id = 'fullscreen-back';
+        i.className = 'van-icon van-icon-arrow-left video-back';
+        i.addEventListener('click', () => {
+          this.player.fullscreen.exit();
+        });
+        console.log(document.getElementsByClassName('plyr'), i);
+        fragment.appendChild(i);
+        // const parentNode = document.getElementsByClassName('plyr')[0];
+        // parentNode.insertBefore(fragment, parentNode.firstChild);
+        this.player.elements.container.appendChild(fragment);
 
         this.$emit('enterfullscreen');
       });
 
       this.player.on('exitfullscreen', () => {
         console.log('exitfullscreen');
-        // const i = document.getElementById('fullscreen-back');
-        // i && i.remove();
+        const i = document.getElementById('fullscreen-back');
+        i && i.remove();
         this.$emit('exitfullscreen');
       });
     },

+ 4 - 4
src/views/collection-record/api.ts

@@ -1,9 +1,9 @@
 import request from '@/helpers/request';
 
 export const type_OrderTypes: { [_: string]: string } = {
-    VIP: "乐团Ai学练工具购买",
-    SCHOOL_REGISTER: "学生报名"
-}
+  VIP: '乐团Ai学练工具购买',
+  SCHOOL_REGISTER: '学生报名'
+};
 export const type_OrderStatus: { [_: string]: string } = {
   WAIT_PAY: '待支付',
   PAYING: '支付中',
@@ -71,7 +71,7 @@ export const api_userPaymentOrderRefundPayment = (
 /** 继续支付订单 */
 export const api_userPaymentOrderUnpaid = (params: any): Promise<any> => {
   return request.get('/edu-app/userPaymentOrder/unpaid', {
-    data: params
+    params
   });
 };
 /** 取消订单 */

+ 3 - 7
src/views/collection-record/component/item.tsx

@@ -2,7 +2,6 @@ import {
   Button,
   Cell,
   CellGroup,
-  Dialog,
   Field,
   Popup,
   Radio,
@@ -17,11 +16,9 @@ import {
   api_userPaymentOrderDetail,
   api_userPaymentOrderRefundPayment,
   api_userPaymentOrderUnpaid,
-  type_OrderStatus,
   type_OrderTypes
 } from '../api';
 import { postMessage } from '@/helpers/native-message';
-import { browser } from '@/helpers/utils';
 import { state } from '@/state';
 
 export default defineComponent({
@@ -102,12 +99,11 @@ export default defineComponent({
 
     /** 继续支付 */
     const onConfirmOrder = async () => {
+      console.log(props.item);
       data.confirmLoading = true;
       const res = await api_userPaymentOrderUnpaid({
-        params: {
-          orderNo: props.item.orderNo,
-          paymentType: props.item.orderType
-        }
+        orderNo: props.item.orderNo,
+        paymentType: props.item.orderType
       });
       data.confirmLoading = false;
       if (res?.code === 200) {

+ 5 - 6
src/views/layout/login.tsx

@@ -39,7 +39,6 @@ export default defineComponent({
       if (state.user.status === 'login' || state.user.status === 'error') {
         // eslint-disable-next-line @typescript-eslint/no-unused-vars
         const { returnUrl, isRegister, ...rest } = this.$route.query;
-        console.log("🚀 ~ this.$route.query:", this.$route.query)
         this.$router.replace({
           path: returnUrl as any,
           query: {
@@ -199,14 +198,14 @@ export default defineComponent({
           <Code
             phone={this.username}
             isRegister={this.isRegister}
-            onClose={(val) => {
-              this.imgCodeStatus = false
+            onClose={val => {
+              this.imgCodeStatus = false;
               if (val) {
                 requestAnimationFrame(() => {
                   requestAnimationFrame(() => {
-                    this.directNext()
-                  })
-                })
+                    this.directNext();
+                  });
+                });
               }
             }}
             onConfirm={this.directNext}

+ 8 - 1
src/views/student-register/digital-tools/index.module.less

@@ -64,11 +64,18 @@
     width: 90%;
     border-radius: 10px;
     overflow: hidden;
+    transform: none;
+    margin-top: -95px;
 
     :global {
+
       .plyr--video {
         height: 190px !important;
       }
+
+      .plyr--video.plyr--fullscreen-fallback {
+        height: 100% !important
+      }
     }
   }
-}
+}

+ 7 - 0
src/views/student-register/index.module.less

@@ -394,10 +394,17 @@
   width: 90%;
   border-radius: 10px;
   overflow: hidden;
+  transform: none;
+  margin-top: -95px;
 
   :global {
+
     .plyr--video {
       height: 190px !important;
     }
+
+    .plyr--video.plyr--fullscreen-fallback {
+      height: 100% !important
+    }
   }
 }

+ 2 - 0
src/views/student-register/register-modal/index.tsx

@@ -7,6 +7,7 @@ import MImgCode from '@/components/m-img-code';
 import { checkPhone } from '@/helpers/utils';
 import request from '@/helpers/request';
 import { useStudentRegisterStore } from '@/store/modules/student-register-store';
+import { setLoginInit, state } from '@/state';
 const studentRegisterStore = useStudentRegisterStore();
 const classList: any = [];
 for (let i = 1; i <= 40; i++) {
@@ -127,6 +128,7 @@ export default defineComponent({
         studentRegisterStore.setToken(
           data.token_type + ' ' + data.access_token
         );
+        setLoginInit();
 
         emit('close');
         emit('submit');