updata

src/api/my.js

@@ -11,13 +11,34 @@ export function getMyQuestion(data) {
   })
 }
 
-/* 模拟考试设置角色 */
+/**
+ * 获取我的试题详情
+ */
+export function getMyQuestionDetail(data) {
+  return httpRequest.get('/zy/v2/examination/question/detail', data)
+}
+
+/* 删除试题 */
 export function deleteQuestion(data) {
   return httpRequest.post('/zy/v2/examination/delete-my-question', data, {
     headers: { 'Content-Type': 'multipart/form-data' }
   })
 }
 
+/* 收藏试题 */
+export function collectQuestion(data) {
+  return httpRequest.post('/zy/v2/examination/question/add', data, {
+    headers: { 'Content-Type': 'multipart/form-data' }
+  })
+}
+
+/* 意见反馈 */
+export function submitFeedback(data) {
+  return httpRequest.post('/zy/v2/feedback/commit', data, {
+    headers: { 'Content-Type': 'multipart/form-data' }
+  })
+}
+
 // /* 获取考试状态 */
 // export function getExamStatus(data) {
 //   return httpRequest.get('/zy/v2/examination/examination-papers-status', data, {

src/modules/exam-module/src/ExamTopic.vue

@@ -82,6 +82,7 @@
           <div class="btn right" @click="submitShowPop" v-show="!nextBtnShow && isExamEnd">交卷</div>
         </div>
         <div class="padd new-btn" v-else>
+          <div class="btn left" @click="swiper.slidePrev()" v-if="isExamEnd">返回答题</div>
           <div class="btn right" @click="submitShowPop" v-if="isExamEnd">交卷</div>
         </div>
       </div>
@@ -852,11 +853,6 @@ export default {
       align-items: center;
       height: 100%;
     }
-    .new-btn{
-      .btn{
-        width: 100%;
-      }
-    }
     .analysis{
       white-space: nowrap;
       margin-right: .3rem;

src/pages/my/feedback.vue

+<template>
+  <div>
+    <div class="feed-box">
+      <div class="title">留下您的宝贵意见，我们会第一时间联系您</div>
+      <textarea name="" id="" v-model="contentText"></textarea>
+      <div class="title">您的联系方式</div>
+      <input type="number" v-model="mobile">
+    </div>
+    <div class="feed-btn" @click="submit">提交</div>
+  </div>
+</template>
+
+<script>
+import * as api from '@/api/my.js'
+import { Toast } from 'vant'
+export default {
+  metaInfo: {
+    title: '意见反馈'
+  },
+  components: {
+    [Toast.name]: Toast
+  },
+  data() {
+    return {
+      contentText: '',
+      mobile: ''
+    }
+  },
+  methods: {
+    submit() {
+      if (this.contentText === '') {
+        Toast({ message: '请输入意见' })
+        return false
+      }
+      if (!/^1[34578]\d{9}$/.test(this.mobile)) {
+        Toast({ message: '请输入正确手机号' })
+        return false
+      }
+      api.submitFeedback({ title: this.mobile, contents: this.contentText }).then(res => {
+        Toast({ message: '已提交' })
+        this.contentText = ''
+        this.mobile = ''
+      })
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.feed-box{
+  padding: 0 .4rem;
+  .title{
+    color: #222;
+    font-size: .3rem;
+    line-height: 1.1rem;
+    font-weight: bold;
+  }
+  textarea{
+    padding:.1rem .2rem;
+    resize:none;
+    width:6.3rem;
+    height:3.77rem;
+    border-radius:.07rem;
+    border:0.01px solid rgba(204,204,204,1);
+    font-size:.26rem;
+    color:rgba(34,34,34,1);
+    line-height: .43rem;
+  }
+  input{
+    padding:0 .2rem;
+    outline: none;
+    width:6.3rem;
+    height:.8rem;
+    border-radius:.07rem;
+    border:.01rem solid rgba(204,204,204,1);
+    color:rgba(34,34,34,1);
+    font-size:.26rem;
+  }
+}
+.feed-btn{
+  position: fixed;
+  bottom: .4rem;
+  left: 50%;
+  -webkit-transform: translateX(-50%);
+  text-align: center;
+  line-height: .7rem;
+  width:6.7rem;
+  height:.7rem;
+  background:rgba(43,124,233,1);
+  border-radius:.12rem;
+  font-weight:bold;
+  color:rgba(255,255,255,1);
+  line-height: .7rem;
+}
+</style>

src/pages/my/index.vue

@@ -29,10 +29,10 @@ export default {
           title: '已购课程',
           url: '/my/buyCourses'
         },
-        // {
-        //   title: '已做试题',
-        //   url: '/my/exam'
-        // }
+        {
+          title: '已做试题',
+          url: '/my/questionsList'
+        },
         // {
         //   title: '已学课程',
         //   url: '/my/buyCourses'
@@ -41,10 +41,10 @@ export default {
         //   title: '消息/通知',
         //   url: '/my/buyCourses'
         // },
-        // {
-        //   title: '意见反馈',
-        //   url: '/my/buyCourses'
-        // }
+        {
+          title: '意见反馈',
+          url: '/my/feedback'
+        },
         {
           title: '联系客服',
           url: '/my/service'

src/pages/pay/index.vue

@@ -10,10 +10,12 @@
       <div class="num">
         ¥
         <span>199</span>.00
+        <!-- <i>课程有效期剩余30天</i> -->
       </div>
       <div class="btn" @click="goPay" v-if="orderStatus === 100">立即购买</div>
       <div class="btn active" v-if="orderStatus === 1" @click="goHome">已购买</div>
       <div class="btn" v-if="orderStatus === -1" @click="goMyOrder">待支付</div>
+      <!-- <div class="btn xf" @click="goMyOrder">续费</div> -->
     </div>
     <pay-we-chart :requestParam="requestParam"></pay-we-chart>
   </div>
@@ -119,6 +121,10 @@ export default {
   .num {
     font-size: 0.26rem;
     color: #ff6767;
+    font-weight: bold;
+    i{
+      font-weight: normal;
+    }
     span {
       font-size: 0.4rem;
     }
@@ -134,6 +140,11 @@ export default {
     font-size: 0.3rem;
     margin: 0.15rem 0;
   }
+  .xf {
+    width:2.51rem;
+    height:.7rem;
+    background:rgba(198,24,24,1);
+  }
   .active {
     background: #ccc;
   }

src/router/routes.js

@@ -112,9 +112,16 @@ export default [
   },
   // 我的-已做试题
   {
-    path: '/my/exam',
-    name: 'examQuestions',
-    component: () => import('../pages/my/examQuestions.vue'),
+    path: '/my/questionsList',
+    name: 'questionsList',
+    component: () => import('../pages/my/questionsList.vue'),
+    meta: { requiredLogin: true }
+  },
+  // 我的-已做试题详情
+  {
+    path: '/my/questionsDetails',
+    name: 'questionsDetails',
+    component: () => import('../pages/my/questionsDetails.vue'),
     meta: { requiredLogin: true }
   },
   // 我的-发票页面
@@ -124,11 +131,18 @@ export default [
     component: () => import('../pages/my/invoice.vue'),
     meta: { requiredLogin: true }
   },
+  // 我的-联系客服
   {
     path: '/my/service',
     name: 'myService',
     component: () => import('../pages/my/service.vue')
   },
+  // 我的-意见反馈
+  {
+    path: '/my/feedback',
+    name: 'myFeedback',
+    component: () => import('../pages/my/feedback.vue')
+  },
   // 支付
   {
     path: '/pay',