试卷

config/index.js

@@ -23,7 +23,7 @@ module.exports = {
 
     // Various Dev Server settings
 
-    host: '192.168.2.40', // can be overwritten by process.env.HOST
+    host: '192.168.2.39', // can be overwritten by process.env.HOST
     port: 8082, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: false,
     errorOverlay: true,

package-lock.json

@@ -1602,7 +1602,6 @@
       "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
       "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
       "dev": true,
-      "optional": true,
       "requires": {
         "hoek": "2.x.x"
       }
@@ -4743,8 +4742,7 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -4765,14 +4763,12 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -4787,20 +4783,17 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -4917,8 +4910,7 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "ini": {
           "version": "1.3.5",
@@ -4930,7 +4922,6 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -4945,7 +4936,6 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -4953,14 +4943,12 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "minipass": {
           "version": "2.3.5",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
@@ -4979,7 +4967,6 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -5060,8 +5047,7 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -5073,7 +5059,6 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -5159,8 +5144,7 @@
         "safe-buffer": {
           "version": "5.1.2",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -5196,7 +5180,6 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -5216,7 +5199,6 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -5260,14 +5242,12 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "yallist": {
           "version": "3.0.3",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         }
       }
     },
@@ -5684,8 +5664,7 @@
       "version": "2.16.3",
       "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
       "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "home-or-tmp": {
       "version": "2.0.0",
@@ -13965,6 +13944,22 @@
         "request-frame": "^1.5.3"
       }
     },
+    "xgplayer-hls.js": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/xgplayer-hls.js/-/xgplayer-hls.js-2.2.3.tgz",
+      "integrity": "sha512-CFsZanBHHRbqTmqYCFFONk76oWwJwbn+8LK/XkwBBrUrqGPQPmrXfjelGjKDDGfZ+w3xReC1nGom3IpN+lLoaQ==",
+      "requires": {
+        "deepmerge": "2.0.1",
+        "event-emitter": "^0.3.5"
+      },
+      "dependencies": {
+        "deepmerge": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-2.0.1.tgz",
+          "integrity": "sha512-VIPwiMJqJ13ZQfaCsIFnp5Me9tnjURiaIFxfz7EH0Ci0dTSQpZtSLrqOicXqEd/z2r+z+Klk9GzmnRsgpgbOsQ=="
+        }
+      }
+    },
     "xhr": {
       "version": "2.4.0",
       "resolved": "https://registry.npmjs.org/xhr/-/xhr-2.4.0.tgz",

package.json

@@ -33,7 +33,8 @@
     "vue-video-player": "^5.0.2",
     "vuex": "^3.1.2",
     "vux": "^2.9.4",
-    "xgplayer": "^2.8.3"
+    "xgplayer": "^2.8.3",
+    "xgplayer-hls.js": "^2.2.3"
   },
   "devDependencies": {
     "autoprefixer": "^7.1.2",

src/components/practice/button.vue

 <template>
   <div class="type-button">
-    <div class="button-wrap" @click="click">
+    <div class="button-wrap" @click="click" :class="{'prev':classType=='prev'}">
       <span class="button-name">{{name}}</span>
     </div>
   </div>
@@ -13,6 +13,10 @@ export default {
     name: {
       type: String,
       default: ""
+    },
+    classType:{
+      type: String,
+      default: ""
     }
   },
   data() {
@@ -47,5 +51,12 @@ export default {
       font-size: .15rem;
     }
   }
+  .prev{
+    background: #E3E3E3;
+    .button-name{
+      color: #333;
+    }
+  }
 }
+
 </style>

src/components/practice/pMultiple.vue

@@ -94,6 +94,9 @@ export default {
       this.activeName = []
     },
     choiseSelect(name){
+      console.log(this.activeName,222);
+      
+      if(!Array.isArray(this.activeName)) this.activeName =[]
       if(this.showButton !== 'curent') return 
       if(this.activeName.indexOf(name) != -1){
         this.activeName.splice(this.activeName.indexOf(name),1)

src/components/practice/single.vue

@@ -83,7 +83,7 @@ export default {
   },
   watch: {},
   methods: {
-    changeStatus(){ // 初始化状态
+    changeStatus(){ // 初始化状态 周周练
       this.currentStatus={
         answer1:0,
         answer2:0,

src/components/practice/textCase.vue

@@ -2,13 +2,12 @@
   <div class="type-text">
     <div class="answer-cnt"   :style="{'height':(open ? autoHeight:'2rem')}">
       <div class="detail-cnt" v-html="dataObj.content"></div>
-      <video class="video" v-if="dataObj.video" :src="videoUrl(dataObj.video)" controls="controls"
+      <!-- <video class="video" v-if="dataObj.video" :src="videoUrl(dataObj.video)" controls="controls"
           x5-playsinline="" playsinline="true" webkit-playsinline="true" x-webkit-airplay="true" 
-          x5-video-player-type="h5-page" x5-video-player-fullscreen="" x5-video-orientation="portraint"></video>
-      <!-- <div class="video" v-if="dataObj.video">
+          x5-video-player-type="h5-page" x5-video-player-fullscreen="" x5-video-orientation="portraint"></video> -->
+      <div class="video" v-if="dataObj.video">
         <div id="mse"></div>
-      </div> -->
-      
+      </div>
     </div>
     <div class="answer-text">
       <div class="icon-wrap" @click="open = !open">
@@ -20,8 +19,9 @@
 </template>
 
 <script>
-import { videoUrl } from '@/utils/global'
-// import Player from 'xgplayer'
+import { getVideo, videoUrl } from '@/utils/global'
+import Player from 'xgplayer'
+import HlsJsPlayer from 'xgplayer-hls.js';
 export default {
   name: 'textCase',
   props:{
@@ -33,6 +33,7 @@ export default {
   data() {
     return {
       videoUrl:videoUrl,
+      getVideo:getVideo,
       open:false,
       autoHeight:null,
       playerConfig:{
@@ -51,10 +52,9 @@ export default {
     this.autoHeight = this.autoHeigh(2.5) 
   },
   mounted() {
-    console.log(this.videoUrl(this.dataObj.video),11111111);
     
-    // this.playerConfig.url = this.videoUrl(this.dataObj.video)
-    // this.player = new Player(this.playerConfig)
+    this.playerConfig.url = this.getVideo(this.dataObj.video)
+    this.player = new HlsJsPlayer(this.playerConfig)
   },
   watch: {},
   methods: {

src/utils/global.js

@@ -26,3 +26,6 @@ export const videoUrl = function(link){
   // return `${process.env.BASE_API}/file/file/?fileName=${link}&isOnLine=true`
   return `${process.env.BASE_API}/file/file/download/${link}`
 }
+export const getVideo = function(data){
+  return `${process.env.BASE_API}/file/${data}/index.m3u8`
+}

src/views/home/home.vue

@@ -51,8 +51,8 @@
     watch: {},
     methods: {
       toMoon(){
-        Toast.fail('功能开发中')
-        // this.$router.push({name:'moonMatch'})
+        // Toast.fail('功能开发中')
+        this.$router.push({name:'moonMatch'})
       }
     },
   }

src/views/moonMatch/index.vue

@@ -99,8 +99,8 @@ export default {
         '-1':()=> false,
         '-2':()=> false,
       }
-      // status[item.examStatus]()
-      Toast.fail('功能开发中')
+      status[item.examStatus]()
+      // Toast.fail('功能开发中')
       // this.$router.push({name:'match',query:{id:item.id, title:item.name}})
     }
   }

src/views/weekPractice/practice.vue

@@ -190,6 +190,7 @@ export default {
           // }
         ]
       },
+      
       isShow:false,
       backStatus:false,
       collectionStatus:false,
@@ -220,8 +221,8 @@ export default {
         if(res.data.code == 0){
           this.list = res.data.data
           if(this.list.length === 0) return 
-          this.currentIndex = 1         // 当前选中索引值
-          this.currentObj = this.list[0]  // 当前选中题目
+          this.currentIndex = 4         // 当前选中索引值
+          this.currentObj = this.list[3]  // 当前选中题目
           this.rightAns = this.currentObj.rightanswer  // 当前正确答案
           this.colQuery.goodsId =  this.currentObj.questionid
           this.getColStatus()