y595705120 1 anno fa
parent
commit
4287ae5a37

+ 1 - 1
config/index.js

@@ -4,7 +4,7 @@
 //
 // const TARGET = "http://study.ndjsxh.cn:8888/"
 // const TARGET = "http://localhost:8000/"
-const TARGET = "http://sm.aishu.live/"
+const TARGET = "https://sm.ndjsxh.com/"
 const path = require('path')
 
 module.exports = {

BIN
question.xls


BIN
src/assets/logo.png


+ 1 - 1
src/containers/center/home/index.vue

@@ -7,7 +7,7 @@
         </div>
         <div class="clear mt20">
           <div class="m-history-course fl" v-for="item in list" @click="gotoPlay(item.courseId)"
-            :key="item.courseId" style="width:300px; margin-left:8px;cursor:pointer">
+            :key="item.courseId" style="width:300px; margin-left:8px;cursor:pointer;margin-top: 10px;">
             <div class="history-course-bd" style="width:260px">
               <p class="tit ng-binding">
                 {{item.name}}

+ 8 - 7
src/containers/center/market/index.vue

@@ -5,17 +5,18 @@
         <p class="fl">推荐课程</p>
       </div>
 
-      <el-row class=" mt20">
-        <el-col :span="6" v-for="item in typeList"  :key="item.id" v-if="item.isOpen">
-          <el-button :type="item.name!=type?'primary':'warning'" class="p20 w200"
+      <el-row class="mt20">
+        <span :span="3" v-for="item in typeList"  :key="item.id" >
+          <el-button type="text" :style="{'color':item.name!=type?'blue':'orange','font-size':'14px'}"  class="p20"
+            style="border:1px solid;width: 200px;margin: 0px 8px 8px 0px"
             @click="type=item.name">
             {{item.name}}
           </el-button>
-        </el-col>
+        </span>
       </el-row>
 
-      <ul class="m-course-list clear mt10 classlist" v-if="total>0">
-        <li v-for="(item,index) in list" :key="item.course_id" class="pt-sola mt20">
+      <ul class="m-course-list clear mt10 classlist" v-if="total>0" >
+        <li v-for="(item,index) in list" :key="item.course_id" class="pt-sola mt20" style="background-color: ghostwhite;border-radius: 5px;">
           <div>
             <div class="tit"><a>{{item.name}}</a></div>
             <div class="info">
@@ -33,7 +34,7 @@
               </p>
             </div>
             <div class="tc pt20 clear">
-              <el-button @click="gotoPlay(item.course_id)" v-if="item.is_pay==1" class="ui-btn">进入学习</el-button>
+              <el-button @click="gotoPlay(item.course_id)" v-if="item.is_pay==1" class="ui-btn" type="primary">进入学习</el-button>
               <el-button @click="goPay(index)" v-else-if="item.is_pay==2 || !!item.buyImg" class="ui-btn btn-o">补充材料</el-button>
               <el-button @click="goPay(index)" v-else class="ui-btn btn-o">购买课程</el-button>
             </div>

+ 4 - 1
src/containers/center/play/index.vue

@@ -339,7 +339,10 @@
         this.media = item;
         this.media.index = index
         httpServer('course.GetMedia', {id:item.id}).then( ({data, code}) => {
-          this.mediaUrl = data
+          this.mediaUrl = data.mediaUrl;
+          if( data.position >0){
+            item.position = data.position; 
+          }
           this.mediaType = 'hls';
           this.show = 4
           this.options.sources = [{src:this.mediaUrl,type: "application/x-mpegURL"}];

+ 1 - 1
src/containers/login/components/isLogin.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="course-my" style="background-color: white;">
       <div class="tc">
-        <img v-if="user.headImg" :src="user.headImg" style="margin: 10px auto;width: 160px; border-radius: 10%;" >
+        <img v-if="user.headImg" :src="user.headImg" style="margin: 10px auto;width: 180px; height: 180px;overflow: hidden; border-radius: 10%;" >
         </img>
         <img  v-else-if="user.gender=='男'" style="margin: 10px auto;width: 160px; border-radius: 10%;"
           src="../../../assets/images/user-man.jpg">