三力测试结构修改4

src/api/modules/exam.js

@@ -340,6 +340,14 @@ const exam = {
 		})
 
 	},
+	//获取三力测试模拟考题（KT）
+	studentThreeForceSelectTestQuestionInfoNewList(params){
+		return request({
+			url:"student/three/force/selectTestQuestionInfoNewList",
+			method:'get',
+			params
+		})
+	},
 	// 获取三力测试模拟考题
 	studentThreeForceSelectTestQuestionInfoList() {
 		return request({

src/otherPages/beforeThreeExam/index.vue

@@ -74,6 +74,20 @@
             </view>
           </view>
         </navigator>
+
+        <!-- <view class="mid1-submit-continue">
+            <view style="width: 300rpx;">
+              <view class="mid1-submit-continue-line1">
+                全部题库
+              </view>
+              <view class="mid1-submit-continue-line2">
+                顺序练习全部题目
+              </view>
+            </view>
+            <view class="mid1-submit-continue-button1">
+              开始练习
+            </view>
+          </view> -->
       </view>
     </view>
     <view class="mid2">
@@ -238,10 +252,11 @@ export default {
       display: flex;
       justify-content: space-between;
       flex-wrap: wrap;
-      height: 256rpx;
+      height: 236rpx;
       flex-direction: column;
       align-items: center;
       align-content: center;
+      flex-wrap: wrap;
 
 
       .mid1-submit-begin {

src/otherPages/collection/index.vue

@@ -15,6 +15,8 @@
           src="https://ndata.zzxcx.net/ctjk/mp-wx/collection/wrongBg3.png"
         ></image>
         <view class="choose-text1"> 做错题 </view>
+      
+      
         <view
           @click="
             () => {
@@ -22,10 +24,15 @@
             }
           "
           class="choose-text1"
-          style="right: 0; color: #8a9099; background: #f2f3f5"
+          style="left: 230rpx; color: #8a9099; background: #f2f3f5"
         >
           收藏题
         </view>
+        <view  @click="
+            () => {
+              type = 'three';
+            }
+          " style="left: 460rpx;color: #8a9099; background: #f2f3f5" class="choose-text1"> 三力收藏 </view>
         <view class="choose-text2" style="display: flex">
           <view class=""> 共 {{ wrongListCount }} 题 </view>
           <image
@@ -81,7 +88,75 @@
         >
           做错题
         </view>
-        <view style="right: 0" class="choose-text1"> 收藏题 </view>
+        <view style="left: 230rpx" class="choose-text1"> 收藏题 </view>
+        <view   @click="
+            () => {
+              type = 'three';
+            }
+          " style="left: 460rpx;background: #f2f3f5;" class="choose-text1"> 三力收藏 </view>
+
+        <view class="choose-text2" style="display: flex">
+          <view class=""> 共 {{ collectionListCount }} 题 </view>
+          <image
+            @tap.stop="goExercise('collect')"
+            mode="widthFix"
+            class="goArrow"
+            :src="goArrow"
+          />
+        </view>
+        <view class="choose-tool">
+          <view
+            :hover-stop-propagation="true"
+            data-type="collect"
+            @tap.stop="clearTopics('collect')"
+            style="color: #00a748"
+            class="clear"
+          >
+            清空收藏
+          </view>
+          <view
+            :hover-stop-propagation="true"
+            data-type="collect"
+            @tap.stop="
+              () => {
+                collectSyncShow = true;
+              }
+            "
+            style="color: #00a748"
+            class="sync"
+          >
+            同步收藏
+          </view>
+        </view>
+      </view>
+
+      <view
+        v-if="type == 'three'"
+        class="choose-img"
+        style="overflow: hidden; border-radius: 40rpx"
+      >
+        <image
+          style="width: 100%"
+          mode="widthFix"
+          src="https://ndata.zzxcx.net/ctjk/mp-wx/collection/collectionBg3.png"
+        ></image>
+        <view
+          @click="
+            () => {
+              type = 'wrong';
+            }
+          "
+          style="color: #8a9099; background: #f2f3f5"
+          class="choose-text1"
+        >
+          做错题
+        </view>
+        <view  @click="
+            () => {
+              type = 'collect';
+            }
+          " style="left: 230rpx;background: #f2f3f5;" class="choose-text1"> 收藏题 </view>
+        <view style="left: 460rpx;" class="choose-text1"> 三力收藏 </view>
 
         <view class="choose-text2" style="display: flex">
           <view class=""> 共 {{ collectionListCount }} 题 </view>
@@ -629,7 +704,7 @@ export default {
 
       top: 0rpx;
       color: #004e81;
-      width: 50%;
+      width: 230rpx;
       text-align: center;
     }
     .choose-text2 {

src/otherPages/threeExam/index.vue

@@ -415,8 +415,8 @@ export default {
   onLoad(query) {
     this.query = query;
     if (this.query.showSubmit == "1") {
-      api.exam.studentQuestion2InfoList({
-        subject: 9
+      api.exam.studentThreeForceSelectTestQuestionInfoNewList({
+       
       }).then((res) => {
         if (Array.isArray(res.rows) && res.rows.length > 0) {
           res.rows.forEach((element) => {