guojy 1 anno fa
parent
commit
756dd26b96

+ 0 - 0
static/images/courseLogin.png → src/assets/images/courseLogin.png


+ 0 - 0
static/images/course_dingdan.png → src/assets/images/course_dingdan.png


+ 0 - 0
static/images/course_ewm.png → src/assets/images/course_ewm.png


+ 0 - 0
static/images/course_team.png → src/assets/images/course_team.png


+ 1 - 1
src/utils/axiosKc.js

@@ -17,7 +17,7 @@ if (window.plus) {
 }
 let url = '';
 const request = axios.create({
-  baseURL: process.env.BASE_API, //
+  baseURL: process.env.BASE_API, 
   // baseURL: 'https://oa.g107.com',
   // baseURL:'http://192.168.0.66:8081',
   timeout: 20000,

+ 3 - 2
src/view/course/components/CourseTeam.vue

@@ -3,7 +3,7 @@
     <form action="/">
       <van-search
         v-model="searchValue"
-        placeholder="请输入搜索成员"
+        placeholder="请输入用户名搜索"
         @search="onSearch"
       />
     </form>
@@ -63,7 +63,8 @@ export default {
       }
     };
   },
-  computed: {},
+  computed: {
+  },
   created() {
     this.init();
   },

+ 2 - 1
src/view/course/error.vue

@@ -6,7 +6,8 @@
       left-arrow
       @click-left="onClickLeft"
     ></van-nav-bar>
-    <van-empty style="position: relative;left: 0;top: 50%;transform: translateY(-50%);" image="network" description="请求失败了呢" />
+    <!-- <van-empty style="position: relative;left: 0;top: 50%;transform: translateY(-50%);" image="network" description="请求失败了呢" /> -->
+    <video src="https://videos.cdn.g107.com/mkt/section01.mp4?Expires=1712801297&OSSAccessKeyId=LTAI4Fgbb97sjKZ9QBqTHsvg&Signature=z%2ByLkyjFpEXIjMeCYNkfZHudJms%3D" autoplay controls></video>
 </div>
 </template>
 

+ 4 - 4
src/view/course/home.vue

@@ -46,7 +46,7 @@
       <div class="tabs_content">
         <div class="tabsLi" @click="toUrl('/courseTeam/1')">
           <van-image
-            src="../../../static/images/course_team.png"
+            src="@/assets/images/course_team.png"
             style="width: .8rem;height: .8rem;"
             type="contain"
           />
@@ -54,7 +54,7 @@
         </div>
         <div class="tabsLi" @click="qropen">
           <van-image
-            src="../../../static/images/course_ewm.png"
+            src="@/assets/images/course_ewm.png"
             style="width: .8rem;height: .8rem;"
             type="contain"
           />
@@ -62,7 +62,7 @@
         </div>
         <div class="tabsLi" @click="toUrl('/courseTeam/2')">
           <van-image
-            src="../../../static/images/course_dingdan.png"
+            src="@/assets/images/course_dingdan.png"
             style="width: .8rem;height: .8rem;"
             type="contain"
           />
@@ -294,7 +294,7 @@ export default {
     creatQrCode() {
       if (!this.qrcodeStatus) {
         console.log(
-          `${window.location.href.split("#")[0]}#/courseHome?pid=${
+          `${window.location.href.split("#")[0]}#/courseLogin?pid=${
             JSON.parse(localStorage.getItem("wx_user_info")).id
           }`
         );

+ 1 - 1
src/view/course/user/login.vue

@@ -172,7 +172,7 @@ img {
   display: block;
 }
 .page {
-  background: url(../../../../static/images/courseLogin.png) no-repeat;
+  background: url('~@/assets/images/courseLogin.png') no-repeat;
   background-size: 100% 100%;
   .buibOuter {
     width: 100%;

+ 1 - 3
src/view/course/user/wxAuth.vue

@@ -50,7 +50,6 @@ export default {
             //   }
             // })
           }else{
-            console.log(19)
             this.$router.replace(`/courseHome`);
           }
         });
@@ -61,8 +60,7 @@ export default {
       isWxEnv(type,data).then(()=>{
         this.$router.replace(`/courseHome`);
       }).catch(()=>{
-        console.log(12)
-        // this.getUerInfo(this.wxid)
+        this.getUerInfo(this.wxid)
       })
     },
     //初始化判断

+ 13 - 5
src/view/course/video/video.vue

@@ -8,9 +8,10 @@
     ></van-nav-bar>
     <div class="courseContent">
       <div class="previewImg">
-        <video controls autoplay name="media">
+        <!-- <video controls autoplay name="media">
           <source :src="videoSrc" type="video/mp4">
-        </video>
+        </video> -->
+        <video :src="videoSrc" controls autoplay v-if="showVideo"></video>
       </div>
       <div class="title">
         <p>{{ courseDetail.name }}</p>
@@ -57,11 +58,10 @@
 <script>
 import {learnerCourseDetail,getVideoSrc} from '../api'
 export default {
-  name: "",
-  components: {},
-  props: [],
+  name: "video",
   data() {
     return {
+      showVideo:true,
       loading: false,
       finished: false,
       activeTab: 0,
@@ -75,6 +75,14 @@ export default {
       }
     };
   },
+  watch:{
+    videoSrc(){
+      this.showVideo = false;
+      this.$nextTick(()=>{
+        this.showVideo = true;
+      })
+    }
+  },
   created() {
     this.init();
   },

+ 16 - 18
src/view/user/wxInit.vue

@@ -116,25 +116,23 @@ export default {
               code: request.code
             }).then(res => {
               let data = res.data.data;
-              if (data.account_id !== 0) {
                 //微信已经绑定
-                localStorage.setItem("Wx-Token", data.wo_token); // 保存平台账号登录的token
-                getUSerInfo(data.wo_token).then(ress=>{
-                  localStorage.setItem("wx_user_info", JSON.stringify(ress));
-                  if(request.type == 10&&request.pid&&!ress.marketable){
-                    this.$router.push(`/courseHome?pid=${request.pid}`)
-                  }else if(request.type == 11&&request.expendCode&&request.subjectId){
-                    this.$router.push({
-                      path:`/course/courseDetail/${request.subjectId}`,
-                      query:{
-                        code:request.expendCode
-                      }
-                    })
-                  }else{
-                    this.$router.push('/courseHome')
-                  }
-                })
-              }
+              localStorage.setItem("Wx-Token", data.wo_token); // 保存平台账号登录的token
+              getUSerInfo(data.wo_token).then(ress=>{
+                localStorage.setItem("wx_user_info", JSON.stringify(ress));
+                if(request.type == 10&&request.pid!=undefined&&!ress.marketable){
+                  this.$router.push(`/courseLogin?pid=${request.pid}`)
+                }else if(request.type == 11&&request.expendCode&&request.subjectId){
+                  this.$router.push({
+                    path:`/courseDetail/${request.subjectId}`,
+                    query:{
+                      code:request.expendCode
+                    }
+                  })
+                }else{
+                  this.$router.push('/courseHome')
+                }
+              })
             });
         }
       }