Przeglądaj źródła

fix:考试类型的题目隐藏答案和解析

xuqiaoying 3 lat temu
rodzic
commit
dc5ab10f09

+ 2 - 2
common/request.js

@@ -5,8 +5,8 @@ import api from './api.js'
 var num = 1
 //接口api   
 // export const BASE_URL = 'https://api.xyyxt.net'   //release
-// export const BASE_URL = 'https://test.xyyxt.net'   //预发布
-export const BASE_URL = 'http://120.79.166.78:19012' // 测试环境
+export const BASE_URL = 'https://test.xyyxt.net'   //预发布
+// 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'    //后端本地更新到222
 // export const BASE_URL = 'http://192.168.1.24:5055'    //后端本地

+ 43 - 29
pages2/bank/questionBank.vue

@@ -71,6 +71,7 @@
                         item.optionsId == bank.ans,
                       wrong:
                         item.optionsId == bank.ques && bank.ques != bank.ans,
+                      user_choose: bankType == 2 && (item.optionsId == bank.ques),
                     }"
                     class="activeTI"
                   >
@@ -89,7 +90,7 @@
                 </view>
               </view>
             </view>
-            <view v-if="bank.ques">
+            <view v-if="bankType == 1 && bank.ques">
               <view class="pad_8 answer">
                 <view>正确答案:{{ ast[bank.ans - 1] }} </view>
                 <view>我的答案:{{ ast[bank.ques - 1] }}</view>
@@ -136,11 +137,12 @@
                   <text
                     :class="{
                       right:
-                        bank.ques.indexOf(item.optionsId) != -1 ||
-                        bank.ans.indexOf(item.optionsId) != -1,
+                        bankType == 1 && (bank.ques.indexOf(item.optionsId) != -1 ||
+                        bank.ans.indexOf(item.optionsId) != -1),
                       wrong:
-                        bank.ques.indexOf(item.optionsId) != -1 &&
-                        bank.ans.indexOf(item.optionsId) == -1,
+                        bankType == 1 && (bank.ques.indexOf(item.optionsId) != -1 &&
+                        bank.ans.indexOf(item.optionsId) == -1),
+                      user_choose: bankType == 2 && (bank.ques.indexOf(item.optionsId) != -1),
                     }"
                     class="activeTI"
                   >
@@ -166,7 +168,7 @@
                 >确认答案</view
               >
             </view>
-            <view v-if="bank.ques">
+            <view v-if="bankType == 1 && bank.ques">
               <view class="pad_8 answer">
                 <view>
                   正确答案:
@@ -224,8 +226,9 @@
                 >
                   <text
                     :class="{
-                      right: index == bank.ques || index == bank.ans,
-                      wrong: index == bank.ques && bank.ques != bank.ans,
+                      right: bankType == 1 && (index == bank.ques || index == bank.ans),
+                      wrong: bankType == 1 && (index == bank.ques && bank.ques != bank.ans),
+                      user_choose: bankType == 2 && (index == bank.ques),
                     }"
                     class="activeTI"
                   >
@@ -244,7 +247,7 @@
                 </view>
               </view>
             </view>
-            <view v-if="bank.ques">
+            <view v-if="bankType == 1 && bank.ques">
               <view class="pad_8 answer">
                 <view>正确答案:{{ ast[bank.ans] }}</view>
                 <view>我的答案:{{ ast[bank.ques] }}</view>
@@ -307,7 +310,7 @@
                 <view
                   class="ans_submit answerInfos"
                   v-if="
-                    bank.ques && (bank.ques.imageList.length || bank.ques.text)
+                    bankType == 1 && bank.ques && (bank.ques.imageList.length || bank.ques.text)
                   "
                 >
                   <view class="answerTitle">我的答案:</view>
@@ -325,7 +328,7 @@
             </view>
 
             <view
-              v-if="bank.ques && (bank.ques.imageList.length || bank.ques.text)"
+              v-if="bankType == 1 && bank.ques && (bank.ques.imageList.length || bank.ques.text)"
             >
               <view class="pad_8 answerInfos">
                 <view class="answerTitle">答案解析:</view>
@@ -399,11 +402,12 @@
                       <text
                         :class="{
                           right:
-                            option.optionsId == bank.ques[ansIndex] ||
-                            option.optionsId == bank.ans[ansIndex],
+                            bankType == 1 && (option.optionsId == bank.ques[ansIndex] ||
+                            option.optionsId == bank.ans[ansIndex]),
                           wrong:
-                            option.optionsId == bank.ques[ansIndex] &&
-                            bank.ques[ansIndex] != bank.ans[ansIndex],
+                            bankType == 1 && (option.optionsId == bank.ques[ansIndex] &&
+                            bank.ques[ansIndex] != bank.ans[ansIndex]),
+                          user_choose: bankType == 2 && (item.optionsId == bank.ques[ansIndex]),
                         }"
                         class="activeTI"
                       >
@@ -423,7 +427,7 @@
                   </view>
                 </view>
 
-                <view v-if="bank.ques[ansIndex]">
+                <view v-if="bankType == 1 && bank.ques[ansIndex]">
                   <view class="pad_8 answer">
                     <view>正确答案:{{ ast[bank.ans[ansIndex] - 1] }}</view>
                     <view>我的答案:{{ ast[bank.ques[ansIndex] - 1] }}</view>
@@ -490,8 +494,9 @@
                     >
                       <text
                         :class="{
-                          right: right(bankIndex, ansIndex, option),
-                          wrong: wrong(bankIndex, ansIndex, option),
+                          right: bankType == 1 && right(bankIndex, ansIndex, option),
+                          wrong: bankType == 1 && wrong(bankIndex, ansIndex, option),
+                          user_choose: bankType == 2 && (questionList[bankIndex].ques[ansIndex].indexOf(option.optionsId) != -1),
                         }"
                         class="activeTI"
                       >
@@ -510,7 +515,7 @@
                     </view>
                   </view>
                 </view>
-                <view v-if="bank.ques[ansIndex]">
+                <view v-if="bankType == 1 && bank.ques[ansIndex]">
                   <view class="pad_8 answer">
                     <view>
                       正确答案:
@@ -577,11 +582,12 @@
                       <text
                         :class="{
                           right:
-                            childindex == bank.ques[ansIndex] ||
-                            childindex == bank.ans[ansIndex],
+                            bankType == 1 && (childindex == bank.ques[ansIndex] ||
+                            childindex == bank.ans[ansIndex]),
                           wrong:
-                            childindex == bank.ques[ansIndex] &&
-                            bank.ques[ansIndex] != bank.ans[ansIndex],
+                            bankType == 1 && (childindex == bank.ques[ansIndex] &&
+                            bank.ques[ansIndex] != bank.ans[ansIndex]),
+                          user_choose: bankType == 2 && (childindex == bank.ques[ansIndex]),
                         }"
                         class="activeTI"
                       >
@@ -600,7 +606,7 @@
                     </view>
                   </view>
                 </view>
-                <view v-if="bank.ques[ansIndex]">
+                <view v-if="bankType == 1 && bank.ques[ansIndex]">
                   <view class="pad_8 answer">
                     <view>正确答案:{{ ast[bank.ans[ansIndex]] }}</view>
                     <view>我的答案:{{ ast[bank.ques[ansIndex]] }}</view>
@@ -678,7 +684,7 @@
                     <view
                       class="ans_submit answerInfos"
                       v-if="
-                        bank.ques[ansIndex] &&
+                        bankType == 1 && bank.ques[ansIndex] &&
                         (bank.ques[ansIndex].imageList.length ||
                           bank.ques[ansIndex].text)
                       "
@@ -699,8 +705,8 @@
                 </view>
                 <view
                   v-if="
-                    bank.ques[ansIndex].imageList.length ||
-                    bank.ques[ansIndex].text
+                    bankType == 1 && (bank.ques[ansIndex].imageList.length ||
+                    bank.ques[ansIndex].text)
                   "
                 >
                   <view class="pad_8 answerInfos">
@@ -947,6 +953,7 @@ export default {
     } else {
       //进入页面
       await this.bankExam();
+      // 请求题目列表
       this.goodsQuestionList();
     }
   },
@@ -985,6 +992,7 @@ export default {
     },
     /**
      * 获取试卷类型2考试,1练习
+     * bank/exam + data
      */
     bankExam() {
       return new Promise((resolve) => {
@@ -1492,7 +1500,7 @@ export default {
       this.showDialog = false;
     },
     /**
-     * 请求题目列表
+     * 请求题目列表 app/common/bank/question/list
      */
     goodsQuestionList() {
       this.$api
@@ -1675,10 +1683,14 @@ export default {
     radioSelect(optionsId, bindex) {
       if (this.questionList[bindex].ques) return;
       this.$set(this.questionList[bindex], "ques", optionsId);
+      if ((bindex + 1) < this.questionList.length) {
+        this.current = bindex + 1
+      }
       this.isDoOver();
 
       // 回答错误
       if (this.questionList[bindex].ques != this.questionList[bindex].ans) {
+        // /exam/wwrong/record 
         this.$api
           .examWrongRecord({
             orderGoodsId: this.orderGoodsId,
@@ -1747,6 +1759,7 @@ export default {
      * @param {Object} 多选确认
      */
     checkboxSubmit(bindex) {
+      // console.log('')
       if (this.questionList[bindex].ques) return;
       let arr = [];
       this.questionList[bindex].jsonStr.forEach((item) => {
@@ -1877,6 +1890,7 @@ export default {
       this.show = true;
     },
     changeIndex(index) {
+      console.log('点击变化', index)
       this.current = index;
     },
 
@@ -2653,7 +2667,7 @@ export default {
   color: #666;
   font-size: 30rpx;
 
-  &.right {
+  &.right, &.user_choose {
     color: #fff;
     background: #36c75a;
   }

+ 47 - 30
pages2/class/questionBank.vue

@@ -59,10 +59,11 @@
                   <text
                     :class="{
                       right:
-                        item.optionsId == bank.ques ||
-                        item.optionsId == bank.ans,
+                        bankType == 1 && (item.optionsId == bank.ques ||
+                        item.optionsId == bank.ans),
                       wrong:
-                        item.optionsId == bank.ques && bank.ques != bank.ans,
+                        bankType == 1 && (item.optionsId == bank.ques && bank.ques != bank.ans),
+                      user_choose: bankType == 2 && (item.optionsId == bank.ques),
                     }"
                     class="activeTI"
                   >
@@ -72,7 +73,7 @@
                 </view>
               </view>
             </view>
-            <view v-if="bank.ques">
+            <view v-if="bankType == 1 && bank.ques">
               <view class="pad_8 answer">
                 <view>正确答案:{{ ast[bank.ans - 1] }}</view>
                 <view>我的答案:{{ ast[bank.ques - 1] }}</view>
@@ -117,11 +118,12 @@
                   <text
                     :class="{
                       right:
-                        bank.ques.indexOf(item.optionsId) != -1 ||
-                        bank.ans.indexOf(item.optionsId) != -1,
+                        bankType == 1 && (bank.ques.indexOf(item.optionsId) != -1 ||
+                        bank.ans.indexOf(item.optionsId) != -1),
                       wrong:
-                        bank.ques.indexOf(item.optionsId) != -1 &&
-                        bank.ans.indexOf(item.optionsId) == -1,
+                        bankType == 1 && (bank.ques.indexOf(item.optionsId) != -1 &&
+                        bank.ans.indexOf(item.optionsId) == -1),
+                      user_choose: bankType == 2 && (bank.ques.indexOf(item.optionsId) != -1),
                     }"
                     class="activeTI"
                   >
@@ -131,7 +133,7 @@
                 </view>
               </view>
             </view>
-            <view v-if="bank.ques">
+            <view v-if="bankType == 1 && bank.ques">
               <view class="pad_8 answer">
                 <view>
                   正确答案:
@@ -182,8 +184,9 @@
                 >
                   <text
                     :class="{
-                      right: index == bank.ques || index == bank.ans,
-                      wrong: index == bank.ques && bank.ques != bank.ans,
+                      right: bankType == 1 && (index == bank.ques || index == bank.ans),
+                      wrong: bankType == 1 && (index == bank.ques && bank.ques != bank.ans),
+                      user_choose: bankType == 2 && (index == bank.ques),
                     }"
                     class="activeTI"
                   >
@@ -195,7 +198,7 @@
                 </view>
               </view>
             </view>
-            <view v-if="bank.ques">
+            <view v-if="bankType == 1 && bank.ques">
               <view class="pad_8 answer">
                 <view>正确答案:{{ ast[bank.ans] }}</view>
                 <view>我的答案:{{ ast[bank.ques] }}</view>
@@ -257,7 +260,7 @@
                 </view>
                 <view
                   class="ans_submit answerInfos"
-                  v-if="bank.ques.text || bank.ques.imageList.length"
+                  v-if="bankType == 1 && (bank.ques.text || bank.ques.imageList.length)"
                 >
                   <view class="answerTitle">我的答案:</view>
                   {{ bank.ques.text }}
@@ -273,7 +276,7 @@
               </view>
             </view>
             <view
-              v-if="bank.ques && (bank.ques.text || bank.ques.imageList.length)"
+              v-if="bankType == 1 && bank.ques && (bank.ques.text || bank.ques.imageList.length)"
             >
               <view class="pad_8 answerInfos">
                 <view class="answerTitle">答案解析:</view>
@@ -339,11 +342,12 @@
                       <text
                         :class="{
                           right:
-                            option.optionsId == bank.ques[ansIndex] ||
-                            option.optionsId == bank.ans[ansIndex],
+                            bankType == 1 && (option.optionsId == bank.ques[ansIndex] ||
+                            option.optionsId == bank.ans[ansIndex]),
                           wrong:
-                            option.optionsId == bank.ques[ansIndex] &&
-                            bank.ques[ansIndex] != bank.ans[ansIndex],
+                            bankType == 1 && (option.optionsId == bank.ques[ansIndex] &&
+                            bank.ques[ansIndex] != bank.ans[ansIndex]),
+                          user_choose: bankType == 2 && (option.optionsId == bank.ques[ansIndex]),
                         }"
                         class="activeTI"
                       >
@@ -355,7 +359,7 @@
                     </view>
                   </view>
                 </view>
-                <view v-if="bank.ques[ansIndex]">
+                <view v-if="bankType == 1 && bank.ques[ansIndex]">
                   <view class="pad_8 answer">
                     <view>正确答案:{{ ast[bank.ans[ansIndex] - 1] }}</view>
                     <view>我的答案:{{ ast[bank.ques[ansIndex] - 1] }}</view>
@@ -415,8 +419,9 @@
                     >
                       <text
                         :class="{
-                          right: right(bankIndex, ansIndex, option),
-                          wrong: wrong(bankIndex, ansIndex, option),
+                          right: bankType == 1 && right(bankIndex, ansIndex, option),
+                          wrong: bankType == 1 && wrong(bankIndex, ansIndex, option),
+                          user_choose: bankType == 2 && (questionList[bankIndex].ques[ansIndex].indexOf(option.optionsId) != -1),
                         }"
                         class="activeTI"
                       >
@@ -428,7 +433,7 @@
                     </view>
                   </view>
                 </view>
-                <view v-if="bank.ques[ansIndex]">
+                <view v-if="bankType == 1 && bank.ques[ansIndex]">
                   <view class="pad_8 answer">
                     <view>
                       正确答案:
@@ -488,11 +493,12 @@
                       <text
                         :class="{
                           right:
-                            childindex == bank.ques[ansIndex] ||
-                            childindex == bank.ans[ansIndex],
+                            bankType == 1 && (childindex == bank.ques[ansIndex] ||
+                            childindex == bank.ans[ansIndex]),
                           wrong:
-                            childindex == bank.ques[ansIndex] &&
-                            bank.ques[ansIndex] != bank.ans[ansIndex],
+                            bankType == 1 && (childindex == bank.ques[ansIndex] &&
+                            bank.ques[ansIndex] != bank.ans[ansIndex]),
+                          user_choose: bankType == 2 && (childindex == bank.ques[ansIndex]),
                         }"
                         class="activeTI"
                       >
@@ -504,7 +510,7 @@
                     </view>
                   </view>
                 </view>
-                <view v-if="bank.ques[ansIndex]">
+                <view v-if="bankType == 1 && bank.ques[ansIndex]">
                   <view class="pad_8 answer">
                     <view>正确答案:{{ ast[bank.ans[ansIndex]] }}</view>
                     <view>我的答案:{{ ast[bank.ques[ansIndex]] }}</view>
@@ -580,7 +586,7 @@
                     </view>
                     <view
                       class="ans_submit answerInfos"
-                      v-if="bank.ques[ansIndex]"
+                      v-if="bankType == 1 && bank.ques[ansIndex]"
                     >
                       <view class="answerTitle">我的答案</view>
                       {{ bank.ques[ansIndex].text }}
@@ -596,7 +602,7 @@
                     </view>
                   </view>
                 </view>
-                <view v-if="bank.ques[ansIndex]">
+                <view v-if="bankType == 1 && bank.ques[ansIndex]">
                   <view class="pad_8 answerInfos">
                     <view class="answerTitle">答案解析</view>
                     <view class="answerContent"
@@ -897,6 +903,7 @@ export default {
       }
     } else {
       await this.getGoodsDetail();
+      // 请求题目列表
       this.goodsQuestionList();
       this.bankExam();
     }
@@ -1816,8 +1823,12 @@ export default {
      * @param {Object} e单选点击
      */
     radioSelect(optionsId, bindex) {
+      console.log('单选', bindex, this.questionList[bindex])
       if (this.questionList[bindex].ques) return;
       this.$set(this.questionList[bindex], "ques", optionsId);
+      if ((bindex + 1) < this.questionList.length) {
+        this.current = bindex + 1
+      }
       this.isDoOver();
     },
 
@@ -1834,11 +1845,13 @@ export default {
      * @param {Object} 多选点击
      */
     checkboxSelect(optionsId, bindex, index) {
+      console.log('多选', bindex, index )
       this.$set(
         this.questionList[bindex].jsonStr[index],
         "checked",
         !this.questionList[bindex].jsonStr[index].checked
       );
+      console.log('this.questionList[bindex].jsonStr:', this.questionList[bindex].jsonStr[index])
     },
 
     /**
@@ -1865,6 +1878,7 @@ export default {
      * @param {Object} 多选确认
      */
     checkboxSubmit(bindex) {
+      console.log('this.questionList[bindex].jsonStr:', this.questionList[bindex].jsonStr)
       if (this.questionList[bindex].ques) return;
       let arr = [];
       this.questionList[bindex].jsonStr.forEach((item) => {
@@ -1926,6 +1940,7 @@ export default {
      * 判断题
      */
     judgeSelect(index, bindex) {
+      console.log('判断题',index, bindex )
       if (this.questionList[bindex].ques) return;
       this.$set(this.questionList[bindex], "ques", index + "");
       this.isDoOver();
@@ -1950,10 +1965,12 @@ export default {
       this.showDialog = false;
     },
     changeIndex(index) {
+      console.log('点击变化', index)
       this.current = index;
     },
 
     swiperChange(e) {
+      console.log('切换', e.detail.current, this.questionList.length)
       this.current = e.detail.current;
     },
 
@@ -2616,7 +2633,7 @@ export default {
   color: #666;
   font-size: 30rpx;
 
-  &.right {
+  &.right, &.user_choose {
     color: #fff;
     background: #36c75a;
   }

+ 37 - 31
pages5/examBank/index.vue

@@ -67,10 +67,11 @@
                   <text
                     :class="{
                       right:
-                        item.optionsId == bank.ques ||
-                        item.optionsId == bank.ans,
+                        bankType == 1 && (item.optionsId == bank.ques ||
+                        item.optionsId == bank.ans),
                       wrong:
-                        item.optionsId == bank.ques && bank.ques != bank.ans,
+                        bankType == 1 && item.optionsId == bank.ques && bank.ques != bank.ans,
+                      user_choose: bankType == 2 && (item.optionsId == bank.ques),
                     }"
                     class="activeTI"
                   >
@@ -89,7 +90,7 @@
                 </view>
               </view>
             </view>
-            <view v-if="bank.ques">
+            <view v-if="bankType == 1 && bank.ques">
               <view class="pad_8 answer">
                 <view>正确答案:{{ ast[bank.ans - 1] }} </view>
                 <view>我的答案:{{ ast[bank.ques - 1] }}</view>
@@ -136,11 +137,12 @@
                   <text
                     :class="{
                       right:
-                        bank.ques.indexOf(item.optionsId) != -1 ||
-                        bank.ans.indexOf(item.optionsId) != -1,
+                        bankType == 1 && (bank.ques.indexOf(item.optionsId) != -1 ||
+                        bank.ans.indexOf(item.optionsId) != -1),
                       wrong:
-                        bank.ques.indexOf(item.optionsId) != -1 &&
-                        bank.ans.indexOf(item.optionsId) == -1,
+                        bankType == 1 && (bank.ques.indexOf(item.optionsId) != -1 &&
+                        bank.ans.indexOf(item.optionsId) == -1),
+                      user_choose: bankType == 2 && (bank.ques.indexOf(item.optionsId) != -1),
                     }"
                     class="activeTI"
                   >
@@ -166,7 +168,7 @@
                 >确认答案</view
               >
             </view>
-            <view v-if="bank.ques">
+            <view v-if="bankType == 1 && bank.ques">
               <view class="pad_8 answer">
                 <view>
                   正确答案:
@@ -224,8 +226,9 @@
                 >
                   <text
                     :class="{
-                      right: index == bank.ques || index == bank.ans,
-                      wrong: index == bank.ques && bank.ques != bank.ans,
+                      right: bankType == 1 && (index == bank.ques || index == bank.ans),
+                      wrong: bankType == 1 && (index == bank.ques && bank.ques != bank.ans),
+                      user_choose: bankType == 2 && (index == bank.ques),
                     }"
                     class="activeTI"
                   >
@@ -244,7 +247,7 @@
                 </view>
               </view>
             </view>
-            <view v-if="bank.ques">
+            <view v-if="bankType == 1 && bank.ques">
               <view class="pad_8 answer">
                 <view>正确答案:{{ ast[bank.ans] }}</view>
                 <view>我的答案:{{ ast[bank.ques] }}</view>
@@ -307,7 +310,7 @@
                 <view
                   class="ans_submit answerInfos"
                   v-if="
-                    bank.ques && (bank.ques.imageList.length || bank.ques.text)
+                    bankType == 1 && bank.ques && (bank.ques.imageList.length || bank.ques.text)
                   "
                 >
                   <view class="answerTitle">我的答案:</view>
@@ -325,7 +328,7 @@
             </view>
 
             <view
-              v-if="bank.ques && (bank.ques.imageList.length || bank.ques.text)"
+              v-if="bankType == 1 && bank.ques && (bank.ques.imageList.length || bank.ques.text)"
             >
               <view class="pad_8 answerInfos">
                 <view class="answerTitle">答案解析:</view>
@@ -399,11 +402,12 @@
                       <text
                         :class="{
                           right:
-                            option.optionsId == bank.ques[ansIndex] ||
-                            option.optionsId == bank.ans[ansIndex],
+                            bankType == 1 && (option.optionsId == bank.ques[ansIndex] ||
+                            option.optionsId == bank.ans[ansIndex]),
                           wrong:
-                            option.optionsId == bank.ques[ansIndex] &&
-                            bank.ques[ansIndex] != bank.ans[ansIndex],
+                            bankType == 1 && (option.optionsId == bank.ques[ansIndex] &&
+                            bank.ques[ansIndex] != bank.ans[ansIndex]),
+                          user_choose: bankType == 2 && (option.optionsId == bank.ques[ansIndex]),
                         }"
                         class="activeTI"
                       >
@@ -423,7 +427,7 @@
                   </view>
                 </view>
 
-                <view v-if="bank.ques[ansIndex]">
+                <view v-if="bankType == 1 && bank.ques[ansIndex]">
                   <view class="pad_8 answer">
                     <view>正确答案:{{ ast[bank.ans[ansIndex] - 1] }}</view>
                     <view>我的答案:{{ ast[bank.ques[ansIndex] - 1] }}</view>
@@ -490,8 +494,9 @@
                     >
                       <text
                         :class="{
-                          right: right(bankIndex, ansIndex, option),
-                          wrong: wrong(bankIndex, ansIndex, option),
+                          right: bankType == 1 && right(bankIndex, ansIndex, option),
+                          wrong: bankType == 1 && wrong(bankIndex, ansIndex, option),
+                          user_choose: bankType == 2 && (questionList[bankIndex].ques[ansIndex].indexOf(option.optionsId) != -1),
                         }"
                         class="activeTI"
                       >
@@ -510,7 +515,7 @@
                     </view>
                   </view>
                 </view>
-                <view v-if="bank.ques[ansIndex]">
+                <view v-if="bankType == 1 && bank.ques[ansIndex]">
                   <view class="pad_8 answer">
                     <view>
                       正确答案:
@@ -577,11 +582,12 @@
                       <text
                         :class="{
                           right:
-                            childindex == bank.ques[ansIndex] ||
-                            childindex == bank.ans[ansIndex],
+                            bankType == 1 && (childindex == bank.ques[ansIndex] ||
+                            childindex == bank.ans[ansIndex]),
                           wrong:
-                            childindex == bank.ques[ansIndex] &&
-                            bank.ques[ansIndex] != bank.ans[ansIndex],
+                            bankType == 1 && (childindex == bank.ques[ansIndex] &&
+                            bank.ques[ansIndex] != bank.ans[ansIndex]),
+                          user_choose: bankType == 2 && (childindex == bank.ques[ansIndex]),
                         }"
                         class="activeTI"
                       >
@@ -600,7 +606,7 @@
                     </view>
                   </view>
                 </view>
-                <view v-if="bank.ques[ansIndex]">
+                <view v-if="bankType == 1 && bank.ques[ansIndex]">
                   <view class="pad_8 answer">
                     <view>正确答案:{{ ast[bank.ans[ansIndex]] }}</view>
                     <view>我的答案:{{ ast[bank.ques[ansIndex]] }}</view>
@@ -678,7 +684,7 @@
                     <view
                       class="ans_submit answerInfos"
                       v-if="
-                        bank.ques[ansIndex] &&
+                        bankType == 1 && bank.ques[ansIndex] &&
                         (bank.ques[ansIndex].imageList.length ||
                           bank.ques[ansIndex].text)
                       "
@@ -699,8 +705,8 @@
                 </view>
                 <view
                   v-if="
-                    bank.ques[ansIndex].imageList.length ||
-                    bank.ques[ansIndex].text
+                    bankType == 1 && (bank.ques[ansIndex].imageList.length ||
+                    bank.ques[ansIndex].text)
                   "
                 >
                   <view class="pad_8 answerInfos">
@@ -2537,7 +2543,7 @@ export default {
   color: #666;
   font-size: 30rpx;
 
-  &.right {
+  &.right, &.user_choose {
     color: #fff;
     background: #36c75a;
   }

+ 9 - 9
pages5/mockExam/examApply.vue

@@ -147,13 +147,13 @@ export default {
         // if (this.$method.isGoLogin()) { // 扫二维码进来的没登录需要跳到登录页,登录后返回
         //     return
         // }
-        console.log('222222222222222')
-        if (!uni.getStorageSync('user_account')) {
-			uni.navigateTo({
-				url: '/pages4/login/login?isBack=true'
-			})
-			return
-		}
+        // console.log('222222222222222')
+        // if (!uni.getStorageSync('user_account')) {
+		// 	uni.navigateTo({
+		// 		url: '/pages4/login/login?isBack=true'
+		// 	})
+		// 	return
+		// }
         this.getActivity()
     },
     // 必须要在onReady生命周期,因为onLoad生命周期组件可能尚未创建完毕
@@ -164,7 +164,7 @@ export default {
         // 获取活动信息
         getActivity() {
             this.$http({
-                url: `/apply/detail/${this.activityId}`,
+                url: `/app/common/detail/${this.activityId}`,
                 method: 'get'
             }).then((res) => {
                 if (res.data.code == 200) {
@@ -202,7 +202,7 @@ export default {
                     params.userMajors = this.examform.userMajors.join(',')
                     console.log('eret', params)
                     this.$http({
-                        url: '/apply/launch',
+                        url: '/app/common/launch',
                         method: 'post',
                         data: params,
                     }).then((res) => {