xuqiaoying il y a 3 ans
Parent
commit
722e7fec2b

+ 4 - 4
src/axios.js

@@ -1,20 +1,20 @@
 import axios from 'axios'
 import store from './store'
 import { Message } from 'element-ui'
-export const BASE_URL = 'https://api.xyyxt.net'   //release
+// export const BASE_URL = 'https://api.xyyxt.net'   //release
 // export const BASE_URL = 'http://42.192.164.187:19005'    //test
 // export const BASE_URL = 'https://test.xyyxt.net'   //预发布
 // export const BASE_URL = 'http://192.168.1.7:5055'    //dev
 // export const BASE_URL = 'http://192.168.1.24:5055'    //dev
-// export const BASE_URL = 'http://120.79.166.78:19012'    //测试-外网
+export const BASE_URL = 'http://120.79.166.78:19012'    //测试-外网
 // export const BASE_URL = 'http://42.192.164.187:19005'    //test
 // export const BASE_URL = 'http://192.168.1.222:5055'    //测试
 export const tenantId = '867735392558919680'
 
 
 //图片上传api
-export const BASE_IMG_URL = 'https://file.xyyxt.net/'     //release
-// export const BASE_IMG_URL = 'https://file-dev.xyyxt.net/'  //test
+// export const BASE_IMG_URL = 'https://file.xyyxt.net/'     //release
+export const BASE_IMG_URL = 'https://file-dev.xyyxt.net/'  //test
 
 import tools from './common/tools'
 import router from './router'

+ 42 - 25
src/pages/course-detail/index.vue

@@ -191,14 +191,7 @@
                                                   </div>
                                                 </div>
                                               </template>
-                                              <template
-                                                v-if="checkSection(section)"
-                                              >
-                                                <div class="btn btn--green" 
-                                                @click="getResource(section,2)">
-                                                  习题
-                                                </div>
-                                              </template>
+                                              
                                               <template
                                                 v-if="section.durationTime > 0"
                                               >
@@ -266,6 +259,15 @@
                                                   已结束
                                                 </div>
                                               </template>
+
+                                              <template
+                                                v-if="checkSection(section)"
+                                              >
+                                                <div class="exercises" @click="getResource(section,2)">
+                                                  习题
+                                                  <i class="el-icon-arrow-right icons"></i>
+                                                </div>
+                                              </template>
                                             </template>
 
                                             <template v-if="section.type == 2">
@@ -452,14 +454,7 @@
                                                   }}</span>
                                                 </div>
                                               </div>
-                                              <template
-                                                v-if="checkSection(section)"
-                                              >
-                                                <div class="btn btn--green" 
-                                                @click="getResource(section,2)">
-                                                  习题
-                                                </div>
-                                              </template>
+                                              
                                               <template
                                                 v-if="section.durationTime > 0"
                                               >
@@ -527,6 +522,15 @@
                                                   已结束
                                                 </div>
                                               </template>
+
+                                              <template
+                                                v-if="checkSection(section)"
+                                              >
+                                                <div class="exercises" @click="getResource(section,2)">
+                                                  习题
+                                                  <i class="el-icon-arrow-right icons"></i>
+                                                </div>
+                                              </template>
                                             </template>
 
                                             <template v-if="section.type == 2">
@@ -638,14 +642,7 @@
                                             </div>
                                           </div>
                                         </template>
-                                        <template
-                                            v-if="checkSectionList(menu)"
-                                        >
-                                          <div class="btn btn--green" 
-                                            @click.stop="getResource(menu,2,true)">
-                                            习题
-                                          </div>
-                                        </template>
+                                        
                                         <template v-if="menu.durationTime > 0">
                                           <div class="during">
                                             {{
@@ -699,6 +696,19 @@
                                             已结束
                                           </div>
                                         </template>
+
+                                        <template
+                                            v-if="checkSectionList(menu)"
+                                        >
+                                          <!-- <div class="btn btn--green" 
+                                            @click.stop="getResource(menu,2,true)">
+                                            习题
+                                          </div> -->
+                                          <div class="exercises" @click="getResource(menu,2,true)">
+                                            习题
+                                            <i class="el-icon-arrow-right icons"></i>
+                                          </div>
+                                        </template>
                                       </div>
                                     </div>
                                   </div>
@@ -5061,7 +5071,8 @@ export default {
           chapterId: chapter.chapterId || chapter.menuId,
           courseId:this.courseId,
           gradeId:this.gradeId}).then((res) => {
-            this.sectionExam = res.data
+          this.sectionExam = [...this.sectionExam, ...res.data]
+            // this.sectionExam = res.data
       })
       chapter.showList = !chapter.showList;
       if (!chapter.list.length) {
@@ -7601,6 +7612,12 @@ export default {
                             color: #007aff;
                           }
                         }
+                        .exercises {
+                          cursor: pointer;
+                          font-size: 14px;
+                          color: #498AFE;
+                        }
+
                       }
                     }
                   }

+ 1 - 0
src/pages/course-exam/index.vue

@@ -1605,6 +1605,7 @@ export default {
         // }
         this.$request
           .bankRecord({
+            courseId: this.courseId,
             chapterId: this.chapterId || 0,
             moduleId: this.moduleId || 0,
             sectionId: this.sectionId || 0,

+ 4 - 6
src/pages/person-center/my-course/index.vue

@@ -202,9 +202,8 @@
                         <el-col :span="2" :offset="1" v-if="checkSection(is)">
                           <el-button
                             size="mini"
-                            type="primary"
+                            type="text"
                             style="width: 90px !important"
-                            plain
                             @click="getResource(item, is,2)"
                             >习题</el-button
                           >
@@ -376,9 +375,8 @@
                     <el-col :span="2" :offset="1" v-if="checkSection(i)">
                       <el-button
                         size="mini"
-                        type="primary"
+                        type="text"
                         style="width: 90px !important"
-                        plain
                         @click="getResource(item, i,2)"
                         >习题</el-button
                       >
@@ -532,9 +530,8 @@
                 <el-col :span="2" :offset="1" v-if="checkSectionList(items)">
                   <el-button
                     size="mini"
-                    type="primary"
+                    type="text"
                     style="width: 90px !important"
-                    plain
                     @click="getResource(item, items,2,true)"
                     >习题</el-button
                   >
@@ -1914,6 +1911,7 @@ export default {
   border-radius: 4px;
 }
 .sizeStyle {
+  font-size: 12px;
   background-color: #fff !important;
   border-color: #979ea5 !important;
   color: #979ea5 !important;