修复bug

common/httpList/goods.js

@@ -417,5 +417,25 @@ export default {
 			method: 'post',
 			data: data
 		})
+	},
+	
+	bankQuestionListFreeGoodsList(data) {
+		return myRequest({
+			url: '/bank/question/listFreeGoodsList',
+			method: 'get',
+			data: data
+		})
+	},
+	appCommonGoodsCourseModuleFreeExamList(data) {
+		return myRequest({
+			url: '/app/common/goods/course/moduleFreeExamList/'+data,
+			method: 'get',
+			noToken:true
+			
+		})
 	}
+	
+	
+	
+	
 }

pages.json

@@ -254,6 +254,18 @@
 					}
 				}
 			},
+			
+			{
+				"path": "bank/free_question",
+				"style": {
+					"navigationBarTitleText": "赠送题卷",
+					"navigationStyle": "custom", // 隐藏系统导航栏
+					"app-plus": {
+						"titleNView": false, //禁用原生导航栏 
+						"bounce": "none"
+					}
+				}
+			},
 			{
 				"path": "bank/question_record",
 				"style": {
@@ -750,6 +762,34 @@
 			}
 		}]
 			
+	},{
+		"root": "pages5",
+		"pages": [{
+			"path": "exam/index",
+			"style": {
+				"navigationBarTitleText": "我的模考",
+				"navigationBarBackgroundColor": "#0386FD",
+				"navigationBarTextStyle": "white",
+				"navigationStyle": "custom", // 隐藏系统导航栏
+				"app-plus": {
+					"titleNView": false, //禁用原生导航栏 
+					"bounce": "none"
+				}
+			}
+		},{
+			"path": "examList/index",
+			"style": {
+				"navigationBarTitleText": "模考预约",
+				"navigationBarBackgroundColor": "#0386FD",
+				"navigationBarTextStyle": "white",
+				"navigationStyle": "custom", // 隐藏系统导航栏
+				"app-plus": {
+					"titleNView": false, //禁用原生导航栏 
+					"bounce": "none"
+				}
+			}
+		}]
+			
 	}],
 	"preloadRule": {
 		"pages/index/index": {

pages/wd/index.vue

@@ -49,6 +49,16 @@
 						学时未通过
 					</view>
 				</navigator>
+				<navigator  hover-class="none" url="/pages5/exam/index" class="menu_box" >
+					<view class="box_left">
+						<image src="/static/icon/my_icon11.png" class="my_icon"></image>
+						<view>我的模考</view>
+					</view>
+					<view class="box_right">
+						<text>{{ userNums.periodSum }}</text>
+						个模考预约
+					</view>
+				</navigator>
 				<navigator  hover-class="none" url="/pages2/exam/index" class="menu_box" >
 					<view class="box_left">
 						<image src="/static/icon/my_icon10.png" class="my_icon"></image>

pages2/bank/questionBank.vue

@@ -380,11 +380,11 @@
                           class="textChild"
                           :nodes="option.content"
                         ></rich-text>
-                        <view v-if="item.imgUrl">
+                        <view v-if="option.imgUrl">
                           <image
                             style="width: 600rpx"
                             mode="widthFix"
-                            :src="$method.splitImgHost(item.imgUrl)"
+                            :src="$method.splitImgHost(option.imgUrl)"
                           ></image>
                         </view>
                       </view>
@@ -411,11 +411,11 @@
                       </text>
                       <view class="flex_auto">
                         <rich-text :nodes="option.content"></rich-text>
-                        <view v-if="item.imgUrl">
+                        <view v-if="option.imgUrl">
                           <image
                             style="width: 600rpx"
                             mode="widthFix"
-                            :src="$method.splitImgHost(item.imgUrl)"
+                            :src="$method.splitImgHost(option.imgUrl)"
                           ></image>
                         </view>
                       </view>
@@ -463,11 +463,11 @@
                       >
                       <view class="flex_auto">
                         <rich-text :nodes="option.content"></rich-text>
-                        <view v-if="item.imgUrl">
+                        <view v-if="option.imgUrl">
                           <image
                             style="width: 600rpx"
                             mode="widthFix"
-                            :src="$method.splitImgHost(item.imgUrl)"
+                            :src="$method.splitImgHost(option.imgUrl)"
                           ></image>
                         </view>
                       </view>
@@ -499,11 +499,11 @@
                       </text>
                       <view class="flex_auto">
                         <rich-text :nodes="option.content"></rich-text>
-                        <view v-if="item.imgUrl">
+                        <view v-if="option.imgUrl">
                           <image
                             style="width: 600rpx"
                             mode="widthFix"
-                            :src="$method.splitImgHost(item.imgUrl)"
+                            :src="$method.splitImgHost(option.imgUrl)"
                           ></image>
                         </view>
                       </view>
@@ -558,11 +558,11 @@
                       <view class="activeTI">{{ ast[childindex] }}</view>
                       <view class="flex_auto">
                         {{ option }}
-                        <view v-if="item.imgUrl">
+                        <view v-if="option.imgUrl">
                           <image
                             style="width: 600rpx"
                             mode="widthFix"
-                            :src="$method.splitImgHost(item.imgUrl)"
+                            :src="$method.splitImgHost(option.imgUrl)"
                           ></image>
                         </view>
                       </view>
@@ -589,11 +589,11 @@
                       </text>
                       <view class="flex_auto">
                         {{ option }}
-                        <view v-if="item.imgUrl">
+                        <view v-if="option.imgUrl">
                           <image
                             style="width: 600rpx"
                             mode="widthFix"
-                            :src="$method.splitImgHost(item.imgUrl)"
+                            :src="$method.splitImgHost(option.imgUrl)"
                           ></image>
                         </view>
                       </view>
@@ -1487,6 +1487,10 @@ export default {
         return "";
       }
     },
+		
+		hideDialog() {
+			this.showDialog = false
+		},
     /**
      * 请求题目列表
      */
@@ -1501,8 +1505,9 @@ export default {
             uni.showModal({
               showCancel: false,
               content: "该试卷暂无题目",
-              success: function (k) {
+              success: (k) => {
                 if (k.confirm) {
+									this.isSubmit = true;
                   uni.navigateBack();
                 }
               },

pages2/bank/questionBankAllExplain.vue

@@ -308,11 +308,11 @@
                           class="textChild"
                           :nodes="option.content"
                         ></rich-text>
-                        <view v-if="item.imgUrl">
+                        <view v-if="option.imgUrl">
                           <image
                             style="width: 600rpx"
                             mode="widthFix"
-                            :src="$method.splitImgHost(item.imgUrl)"
+                            :src="$method.splitImgHost(option.imgUrl)"
                           ></image>
                         </view>
                       </view>
@@ -338,11 +338,11 @@
                       >
                       <view class="flex_auto">
                         <rich-text :nodes="option.content"></rich-text>
-                        <view v-if="item.imgUrl">
+                        <view v-if="option.imgUrl">
                           <image
                             style="width: 600rpx"
                             mode="widthFix"
-                            :src="$method.splitImgHost(item.imgUrl)"
+                            :src="$method.splitImgHost(option.imgUrl)"
                           ></image>
                         </view>
                       </view>
@@ -374,11 +374,11 @@
                   </view>
                   <view class="titles">
                     <rich-text :nodes="ansItem.content"></rich-text>
-                    <view v-if="item.imgUrl">
+                    <view v-if="option.imgUrl">
                       <image
                         style="width: 600rpx"
                         mode="widthFix"
-                        :src="$method.splitImgHost(item.imgUrl)"
+                        :src="$method.splitImgHost(option.imgUrl)"
                       ></image>
                     </view>
                   </view>
@@ -395,11 +395,11 @@
                       >
                       <view class="flex_auto">
                         <rich-text :nodes="option.content"></rich-text>
-                        <view v-if="item.imgUrl">
+                        <view v-if="option.imgUrl">
                           <image
                             style="width: 600rpx"
                             mode="widthFix"
-                            :src="$method.splitImgHost(item.imgUrl)"
+                            :src="$method.splitImgHost(option.imgUrl)"
                           ></image>
                         </view>
                       </view>
@@ -473,11 +473,11 @@
 
                       <view class="flex_auto">
                         {{ option }}
-                        <view v-if="item.imgUrl">
+                        <view v-if="option.imgUrl">
                           <image
                             style="width: 600rpx"
                             mode="widthFix"
-                            :src="$method.splitImgHost(item.imgUrl)"
+                            :src="$method.splitImgHost(option.imgUrl)"
                           ></image>
                         </view>
                       </view>
@@ -503,11 +503,11 @@
                       >
                       <view class="flex_auto">
                         {{ option }}
-                        <view v-if="item.imgUrl">
+                        <view v-if="option.imgUrl">
                           <image
                             style="width: 600rpx"
                             mode="widthFix"
-                            :src="$method.splitImgHost(item.imgUrl)"
+                            :src="$method.splitImgHost(option.imgUrl)"
                           ></image>
                         </view>
                       </view>

pages2/bank/questionBankContinue.vue

@@ -213,8 +213,8 @@
 											<view class="activeTI">{{ ast[childIndex] }}</view>
 											<view class="flex_auto">
 												<rich-text class="textChild" :nodes="option.content"></rich-text>
-												<view v-if="item.imgUrl">
-													<image style="width:600rpx" mode="widthFix" :src="$method.splitImgHost(item.imgUrl)"></image>
+												<view v-if="option.imgUrl">
+													<image style="width:600rpx" mode="widthFix" :src="$method.splitImgHost(option.imgUrl)"></image>
 												</view>
 											</view>
 											
@@ -225,8 +225,8 @@
 											<text :class="{right:(option.optionsId == bank.ques[ansIndex]) || (option.optionsId == bank.ans[ansIndex]),wrong:(option.optionsId == bank.ques[ansIndex]) && (bank.ques[ansIndex] != bank.ans[ansIndex])}"  class="activeTI">{{ ast[childIndex] }}</text>
 											<view class="flex_auto">
 												<rich-text :nodes="option.content"></rich-text>
-												<view v-if="item.imgUrl">
-													<image style="width:600rpx" mode="widthFix" :src="$method.splitImgHost(item.imgUrl)"></image>
+												<view v-if="option.imgUrl">
+													<image style="width:600rpx" mode="widthFix" :src="$method.splitImgHost(option.imgUrl)"></image>
 												</view>
 											</view>
 										</view>
@@ -261,8 +261,8 @@
 											<view :class="{checked:option.checked}" class="activeTI">{{ ast[childindex] }}</view>
 											<view class="flex_auto">
 												<rich-text :nodes="option.content"></rich-text>
-												<view v-if="item.imgUrl">
-													<image style="width:600rpx" mode="widthFix" :src="$method.splitImgHost(item.imgUrl)"></image>
+												<view v-if="option.imgUrl">
+													<image style="width:600rpx" mode="widthFix" :src="$method.splitImgHost(option.imgUrl)"></image>
 												</view>
 											</view>
 										</view>
@@ -275,8 +275,8 @@
 											<text :class="{right:right(bankIndex,ansIndex,option),wrong:wrong(bankIndex,ansIndex,option)}"  class="activeTI">{{ ast[childindex] }}</text>
 											<view class="flex_auto">
 												<rich-text :nodes="option.content"></rich-text>
-												<view v-if="item.imgUrl">
-													<image style="width:600rpx" mode="widthFix" :src="$method.splitImgHost(item.imgUrl)"></image>
+												<view v-if="option.imgUrl">
+													<image style="width:600rpx" mode="widthFix" :src="$method.splitImgHost(option.imgUrl)"></image>
 												</view>
 											</view>
 										</view>
@@ -315,8 +315,8 @@
 											<view class="activeTI">{{ ast[childindex] }}</view>
 											<view class="flex_auto">
 												{{ option }}
-												<view v-if="item.imgUrl">
-													<image style="width:600rpx" mode="widthFix" :src="$method.splitImgHost(item.imgUrl)"></image>
+												<view v-if="option.imgUrl">
+													<image style="width:600rpx" mode="widthFix" :src="$method.splitImgHost(option.imgUrl)"></image>
 												</view>
 											</view>
 										</view>
@@ -326,8 +326,8 @@
 											<text :class="{right:(childindex == bank.ques[ansIndex]) || (childindex == bank.ans[ansIndex]),wrong:(childindex == bank.ques[ansIndex]) && (bank.ques[ansIndex] != bank.ans[ansIndex])}"  class="activeTI">{{ ast[childindex] }}</text>
 											<view class="flex_auto">
 												{{ option }}
-												<view v-if="item.imgUrl">
-													<image style="width:600rpx" mode="widthFix" :src="$method.splitImgHost(item.imgUrl)"></image>
+												<view v-if="option.imgUrl">
+													<image style="width:600rpx" mode="widthFix" :src="$method.splitImgHost(option.imgUrl)"></image>
 												</view>
 											</view>
 										</view>

pages2/bank/questionBankExplain.vue

@@ -149,8 +149,8 @@
 											<text :class="{right:(option.optionsId == bank.ques[ansIndex]) || (option.optionsId == bank.ans[ansIndex]),wrong:(option.optionsId == bank.ques[ansIndex]) && (bank.ques[ansIndex] != bank.ans[ansIndex])}"  class="activeTI">{{ ast[childIndex] }}</text>
 											<view class="flex_auto">
 												<rich-text :nodes="option.content"></rich-text>
-												<view v-if="item.imgUrl">
-													<image style="width:600rpx" mode="widthFix" :src="$method.splitImgHost(item.imgUrl)"></image>
+												<view v-if="option.imgUrl">
+													<image style="width:600rpx" mode="widthFix" :src="$method.splitImgHost(option.imgUrl)"></image>
 												</view>
 											</view>
 										</view>
@@ -184,8 +184,8 @@
 											<text :class="{right:right(bankIndex,ansIndex,option),wrong:wrong(bankIndex,ansIndex,option)}"  class="activeTI">{{ ast[childindex] }}</text>
 											<view class="flex_auto">
 												<rich-text :nodes="option.content"></rich-text>
-												<view v-if="item.imgUrl">
-													<image style="width:600rpx" mode="widthFix" :src="$method.splitImgHost(item.imgUrl)"></image>
+												<view v-if="option.imgUrl">
+													<image style="width:600rpx" mode="widthFix" :src="$method.splitImgHost(option.imgUrl)"></image>
 												</view>
 											</view>
 											
@@ -222,8 +222,8 @@
 											<text :class="{right:(childindex == bank.ques[ansIndex]) || (childindex == bank.ans[ansIndex]),wrong:(childindex == bank.ques[ansIndex]) && (bank.ques[ansIndex] != bank.ans[ansIndex])}"  class="activeTI">{{ ast[childindex] }}</text>
 											<view class="flex_auto">
 												{{ option }}
-												<view v-if="item.imgUrl">
-													<image style="width:600rpx" mode="widthFix" :src="$method.splitImgHost(item.imgUrl)"></image>
+												<view v-if="option.imgUrl">
+													<image style="width:600rpx" mode="widthFix" :src="$method.splitImgHost(option.imgUrl)"></image>
 												</view>
 											</view>
 											

pages2/bank/questionBankExplainDetail.vue

@@ -372,11 +372,11 @@
                           class="textChild"
                           :nodes="option.content"
                         ></rich-text>
-                        <view v-if="item.imgUrl">
+                        <view v-if="option.imgUrl">
                           <image
                             style="width: 600rpx"
                             mode="widthFix"
-                            :src="$method.splitImgHost(item.imgUrl)"
+                            :src="$method.splitImgHost(option.imgUrl)"
                           ></image>
                         </view>
                       </view>
@@ -402,11 +402,11 @@
                       >
                       <view class="flex_auto">
                         <rich-text :nodes="option.content"></rich-text>
-                        <view v-if="item.imgUrl">
+                        <view v-if="option.imgUrl">
                           <image
                             style="width: 600rpx"
                             mode="widthFix"
-                            :src="$method.splitImgHost(item.imgUrl)"
+                            :src="$method.splitImgHost(option.imgUrl)"
                           ></image>
                         </view>
                       </view>
@@ -455,11 +455,11 @@
                       >
                       <view class="flex_auto">
                         <rich-text :nodes="option.content"></rich-text>
-                        <view v-if="item.imgUrl">
+                        <view v-if="option.imgUrl">
                           <image
                             style="width: 600rpx"
                             mode="widthFix"
-                            :src="$method.splitImgHost(item.imgUrl)"
+                            :src="$method.splitImgHost(option.imgUrl)"
                           ></image>
                         </view>
                       </view>
@@ -488,11 +488,11 @@
                       >
                       <view class="flex_auto">
                         <rich-text :nodes="option.content"></rich-text>
-                        <view v-if="item.imgUrl">
+                        <view v-if="option.imgUrl">
                           <image
                             style="width: 600rpx"
                             mode="widthFix"
-                            :src="$method.splitImgHost(item.imgUrl)"
+                            :src="$method.splitImgHost(option.imgUrl)"
                           ></image>
                         </view>
                       </view>
@@ -547,11 +547,11 @@
                       <view class="activeTI">{{ ast[childindex] }}</view>
                       <view class="flex_auto">
                         {{ option }}
-                        <view v-if="item.imgUrl">
+                        <view v-if="option.imgUrl">
                           <image
                             style="width: 600rpx"
                             mode="widthFix"
-                            :src="$method.splitImgHost(item.imgUrl)"
+                            :src="$method.splitImgHost(option.imgUrl)"
                           ></image>
                         </view>
                       </view>
@@ -578,11 +578,11 @@
 
                       <view class="flex_auto">
                         {{ option }}
-                        <view v-if="item.imgUrl">
+                        <view v-if="option.imgUrl">
                           <image
                             style="width: 600rpx"
                             mode="widthFix"
-                            :src="$method.splitImgHost(item.imgUrl)"
+                            :src="$method.splitImgHost(option.imgUrl)"
                           ></image>
                         </view>
                       </view>

pages2/bank/questionBankWrongExplain.vue

@@ -307,11 +307,11 @@
                           class="textChild"
                           :nodes="option.content"
                         ></rich-text>
-                        <view v-if="item.imgUrl">
+                        <view v-if="option.imgUrl">
                           <image
                             style="width: 600rpx"
                             mode="widthFix"
-                            :src="$method.splitImgHost(item.imgUrl)"
+                            :src="$method.splitImgHost(option.imgUrl)"
                           ></image>
                         </view>
                       </view>
@@ -337,11 +337,11 @@
                       >
                       <view class="flex_auto">
                         <rich-text :nodes="option.content"></rich-text>
-                        <view v-if="item.imgUrl">
+                        <view v-if="option.imgUrl">
                           <image
                             style="width: 600rpx"
                             mode="widthFix"
-                            :src="$method.splitImgHost(item.imgUrl)"
+                            :src="$method.splitImgHost(option.imgUrl)"
                           ></image>
                         </view>
                       </view>
@@ -385,11 +385,11 @@
                       >
                       <view class="flex_auto">
                         <rich-text :nodes="option.content"></rich-text>
-                        <view v-if="item.imgUrl">
+                        <view v-if="option.imgUrl">
                           <image
                             style="width: 600rpx"
                             mode="widthFix"
-                            :src="$method.splitImgHost(item.imgUrl)"
+                            :src="$method.splitImgHost(option.imgUrl)"
                           ></image>
                         </view>
                       </view>
@@ -411,11 +411,11 @@
                       >
                       <view class="flex_auto">
                         <rich-text :nodes="option.content"></rich-text>
-                        <view v-if="item.imgUrl">
+                        <view v-if="option.imgUrl">
                           <image
                             style="width: 600rpx"
                             mode="widthFix"
-                            :src="$method.splitImgHost(item.imgUrl)"
+                            :src="$method.splitImgHost(option.imgUrl)"
                           ></image>
                         </view>
                       </view>
@@ -469,11 +469,11 @@
                       <view class="activeTI">{{ ast[childindex] }}</view>
                       <view class="flex_auto">
                         {{ option }}
-                        <view v-if="item.imgUrl">
+                        <view v-if="option.imgUrl">
                           <image
                             style="width: 600rpx"
                             mode="widthFix"
-                            :src="$method.splitImgHost(item.imgUrl)"
+                            :src="$method.splitImgHost(option.imgUrl)"
                           ></image>
                         </view>
                       </view>
@@ -499,11 +499,11 @@
                       >
                       <view class="flex_auto">
                         {{ option }}
-                        <view v-if="item.imgUrl">
+                        <view v-if="option.imgUrl">
                           <image
                             style="width: 600rpx"
                             mode="widthFix"
-                            :src="$method.splitImgHost(item.imgUrl)"
+                            :src="$method.splitImgHost(option.imgUrl)"
                           ></image>
                         </view>
                       </view>

pages2/bank/question_detail.vue

@@ -230,7 +230,10 @@ export default {
 						.then(res => {
 							this.$set(this.bankList[i], 'showList', true);
 							this.$set(this.bankList[i], 'list', res.data.data);
-							this.changeItem(i,this.bankList[i].list[0].chapterExamId,this.bankList[i].type,0,this.bankList[i].majorId)
+							if(this.bankList[i].list.length) {
+								this.changeItem(i,this.bankList[i].list[0].chapterExamId,this.bankList[i].type,0,this.bankList[i].majorId)
+							}
+							
 						});
 					break;
 				} else if(this.bankList[i].type == 2) { //第一个章展开下面的节

pages2/subject/collectBank.vue

@@ -352,11 +352,11 @@
                           class="textChild"
                           :nodes="option.content"
                         ></rich-text>
-                        <view v-if="item.imgUrl">
+                        <view v-if="option.imgUrl">
                           <image
                             style="width: 600rpx"
                             mode="widthFix"
-                            :src="$method.splitImgHost(item.imgUrl)"
+                            :src="$method.splitImgHost(option.imgUrl)"
                           ></image>
                         </view>
                       </view>
@@ -382,11 +382,11 @@
                       >
                       <view class="flex_auto">
                         <rich-text :nodes="option.content"></rich-text>
-                        <view v-if="item.imgUrl">
+                        <view v-if="option.imgUrl">
                           <image
                             style="width: 600rpx"
                             mode="widthFix"
-                            :src="$method.splitImgHost(item.imgUrl)"
+                            :src="$method.splitImgHost(option.imgUrl)"
                           ></image>
                         </view>
                       </view>
@@ -430,11 +430,11 @@
                       >
                       <view class="flex_auto">
                         <rich-text :nodes="option.content"></rich-text>
-                        <view v-if="item.imgUrl">
+                        <view v-if="option.imgUrl">
                           <image
                             style="width: 600rpx"
                             mode="widthFix"
-                            :src="$method.splitImgHost(item.imgUrl)"
+                            :src="$method.splitImgHost(option.imgUrl)"
                           ></image>
                         </view>
                       </view>
@@ -466,11 +466,11 @@
                       >
                       <view class="flex_auto">
                         <rich-text :nodes="option.content"></rich-text>
-                        <view v-if="item.imgUrl">
+                        <view v-if="option.imgUrl">
                           <image
                             style="width: 600rpx"
                             mode="widthFix"
-                            :src="$method.splitImgHost(item.imgUrl)"
+                            :src="$method.splitImgHost(option.imgUrl)"
                           ></image>
                         </view>
                       </view>
@@ -520,11 +520,11 @@
                       <view class="activeTI">{{ ast[childindex] }}</view>
                       <view class="flex_auto">
                         {{ option }}
-                        <view v-if="item.imgUrl">
+                        <view v-if="option.imgUrl">
                           <image
                             style="width: 600rpx"
                             mode="widthFix"
-                            :src="$method.splitImgHost(item.imgUrl)"
+                            :src="$method.splitImgHost(option.imgUrl)"
                           ></image>
                         </view>
                       </view>
@@ -550,11 +550,11 @@
                       >
                       <view class="flex_auto">
                         {{ option }}
-                        <view v-if="item.imgUrl">
+                        <view v-if="option.imgUrl">
                           <image
                             style="width: 600rpx"
                             mode="widthFix"
-                            :src="$method.splitImgHost(item.imgUrl)"
+                            :src="$method.splitImgHost(option.imgUrl)"
                           ></image>
                         </view>
                       </view>

pages2/subject/collectTypeBank.vue

@@ -346,11 +346,11 @@
                           class="textChild"
                           :nodes="option.content"
                         ></rich-text>
-                        <view v-if="item.imgUrl">
+                        <view v-if="option.imgUrl">
                           <image
                             style="width: 600rpx"
                             mode="widthFix"
-                            :src="$method.splitImgHost(item.imgUrl)"
+                            :src="$method.splitImgHost(option.imgUrl)"
                           ></image>
                         </view>
                       </view>
@@ -376,11 +376,11 @@
                       >
                       <view class="flex_auto">
                         <rich-text :nodes="option.content"></rich-text>
-                        <view v-if="item.imgUrl">
+                        <view v-if="option.imgUrl">
                           <image
                             style="width: 600rpx"
                             mode="widthFix"
-                            :src="$method.splitImgHost(item.imgUrl)"
+                            :src="$method.splitImgHost(option.imgUrl)"
                           ></image>
                         </view>
                       </view>
@@ -424,11 +424,11 @@
                       >
                       <view class="flex_auto">
                         <rich-text :nodes="option.content"></rich-text>
-                        <view v-if="item.imgUrl">
+                        <view v-if="option.imgUrl">
                           <image
                             style="width: 600rpx"
                             mode="widthFix"
-                            :src="$method.splitImgHost(item.imgUrl)"
+                            :src="$method.splitImgHost(option.imgUrl)"
                           ></image>
                         </view>
                       </view>
@@ -460,11 +460,11 @@
                       >
                       <view class="flex_auto">
                         <rich-text :nodes="option.content"></rich-text>
-                        <view v-if="item.imgUrl">
+                        <view v-if="option.imgUrl">
                           <image
                             style="width: 600rpx"
                             mode="widthFix"
-                            :src="$method.splitImgHost(item.imgUrl)"
+                            :src="$method.splitImgHost(option.imgUrl)"
                           ></image>
                         </view>
                       </view>
@@ -510,11 +510,11 @@
                       <view class="activeTI">{{ ast[childindex] }}</view>
                       <view class="flex_auto">
                         {{ option }}
-                        <view v-if="item.imgUrl">
+                        <view v-if="option.imgUrl">
                           <image
                             style="width: 600rpx"
                             mode="widthFix"
-                            :src="$method.splitImgHost(item.imgUrl)"
+                            :src="$method.splitImgHost(option.imgUrl)"
                           ></image>
                         </view>
                       </view>
@@ -540,11 +540,11 @@
                       >
                       <view class="flex_auto">
                         {{ option }}
-                        <view v-if="item.imgUrl">
+                        <view v-if="option.imgUrl">
                           <image
                             style="width: 600rpx"
                             mode="widthFix"
-                            :src="$method.splitImgHost(item.imgUrl)"
+                            :src="$method.splitImgHost(option.imgUrl)"
                           ></image>
                         </view>
                       </view>

pages2/subject/wrongBank.vue

@@ -346,11 +346,11 @@
                           class="textChild"
                           :nodes="option.content"
                         ></rich-text>
-                        <view v-if="item.imgUrl">
+                        <view v-if="option.imgUrl">
                           <image
                             style="width: 600rpx"
                             mode="widthFix"
-                            :src="$method.splitImgHost(item.imgUrl)"
+                            :src="$method.splitImgHost(option.imgUrl)"
                           ></image>
                         </view>
                       </view>
@@ -376,11 +376,11 @@
                       >
                       <view class="flex_auto">
                         <rich-text :nodes="option.content"></rich-text>
-                        <view v-if="item.imgUrl">
+                        <view v-if="option.imgUrl">
                           <image
                             style="width: 600rpx"
                             mode="widthFix"
-                            :src="$method.splitImgHost(item.imgUrl)"
+                            :src="$method.splitImgHost(option.imgUrl)"
                           ></image>
                         </view>
                       </view>
@@ -424,11 +424,11 @@
                       >
                       <view class="flex_auto">
                         <rich-text :nodes="option.content"></rich-text>
-                        <view v-if="item.imgUrl">
+                        <view v-if="option.imgUrl">
                           <image
                             style="width: 600rpx"
                             mode="widthFix"
-                            :src="$method.splitImgHost(item.imgUrl)"
+                            :src="$method.splitImgHost(option.imgUrl)"
                           ></image>
                         </view>
                       </view>
@@ -460,11 +460,11 @@
                       >
                       <view class="flex_auto">
                         <rich-text :nodes="option.content"></rich-text>
-                        <view v-if="item.imgUrl">
+                        <view v-if="option.imgUrl">
                           <image
                             style="width: 600rpx"
                             mode="widthFix"
-                            :src="$method.splitImgHost(item.imgUrl)"
+                            :src="$method.splitImgHost(option.imgUrl)"
                           ></image>
                         </view>
                       </view>
@@ -514,11 +514,11 @@
                       <view class="activeTI">{{ ast[childindex] }}</view>
                       <view class="flex_auto">
                         {{ option }}
-                        <view v-if="item.imgUrl">
+                        <view v-if="option.imgUrl">
                           <image
                             style="width: 600rpx"
                             mode="widthFix"
-                            :src="$method.splitImgHost(item.imgUrl)"
+                            :src="$method.splitImgHost(option.imgUrl)"
                           ></image>
                         </view>
                       </view>
@@ -544,11 +544,11 @@
                       >
                       <view class="flex_auto">
                         {{ option }}
-                        <view v-if="item.imgUrl">
+                        <view v-if="option.imgUrl">
                           <image
                             style="width: 600rpx"
                             mode="widthFix"
-                            :src="$method.splitImgHost(item.imgUrl)"
+                            :src="$method.splitImgHost(option.imgUrl)"
                           ></image>
                         </view>
                       </view>

pages2/subject/wrongTypeBank.vue

@@ -345,11 +345,11 @@
                           class="textChild"
                           :nodes="option.content"
                         ></rich-text>
-                        <view v-if="item.imgUrl">
+                        <view v-if="option.imgUrl">
                           <image
                             style="width: 600rpx"
                             mode="widthFix"
-                            :src="$method.splitImgHost(item.imgUrl)"
+                            :src="$method.splitImgHost(option.imgUrl)"
                           ></image>
                         </view>
                       </view>
@@ -375,11 +375,11 @@
                       >
                       <view class="flex_auto">
                         <rich-text :nodes="option.content"></rich-text>
-                        <view v-if="item.imgUrl">
+                        <view v-if="option.imgUrl">
                           <image
                             style="width: 600rpx"
                             mode="widthFix"
-                            :src="$method.splitImgHost(item.imgUrl)"
+                            :src="$method.splitImgHost(option.imgUrl)"
                           ></image>
                         </view>
                       </view>
@@ -423,11 +423,11 @@
                       >
                       <view class="flex_auto">
                         <rich-text :nodes="option.content"></rich-text>
-                        <view v-if="item.imgUrl">
+                        <view v-if="option.imgUrl">
                           <image
                             style="width: 600rpx"
                             mode="widthFix"
-                            :src="$method.splitImgHost(item.imgUrl)"
+                            :src="$method.splitImgHost(option.imgUrl)"
                           ></image>
                         </view>
                       </view>
@@ -459,11 +459,11 @@
                       >
                       <view class="flex_auto">
                         <rich-text :nodes="option.content"></rich-text>
-                        <view v-if="item.imgUrl">
+                        <view v-if="option.imgUrl">
                           <image
                             style="width: 600rpx"
                             mode="widthFix"
-                            :src="$method.splitImgHost(item.imgUrl)"
+                            :src="$method.splitImgHost(option.imgUrl)"
                           ></image>
                         </view>
                       </view>
@@ -513,11 +513,11 @@
                       <view class="activeTI">{{ ast[childindex] }}</view>
                       <view class="flex_auto">
                         {{ option }}
-                        <view v-if="item.imgUrl">
+                        <view v-if="option.imgUrl">
                           <image
                             style="width: 600rpx"
                             mode="widthFix"
-                            :src="$method.splitImgHost(item.imgUrl)"
+                            :src="$method.splitImgHost(option.imgUrl)"
                           ></image>
                         </view>
                       </view>
@@ -543,11 +543,11 @@
                       >
                       <view class="flex_auto">
                         {{ option }}
-                        <view v-if="item.imgUrl">
+                        <view v-if="option.imgUrl">
                           <image
                             style="width: 600rpx"
                             mode="widthFix"
-                            :src="$method.splitImgHost(item.imgUrl)"
+                            :src="$method.splitImgHost(option.imgUrl)"
                           ></image>
                         </view>
                       </view>

pages2/verify/input.vue

@@ -614,53 +614,77 @@ export default {
 		},
 		async downDocx(url) {
 			let self = this;
-			let data = JSON.parse(JSON.stringify(this.form));
+			
 			var ast = this.listData.some(item => {
 				return item.fieldKey === 'commitment_electr_signature';
 			});
 			if (ast) {
 				await this.subCanvas();
 			}
+			let data = JSON.parse(JSON.stringify(this.form));
 			if (data['commitment_electr_signature']) {
 				data.commitment_electr_signature = await this.$method.uploadFile(data.commitment_electr_signature, 0);
 			}
+			
+			console.log(data)
+			console.log(self.copyData)
 				console.log(444)
-			let arsty = {};
-			for (let k in data) {
-				for (let j in self.copyData) {
-					if (k === j) {
-						if (self.copyData[j].value === data[k]) {
-							arsty[k] = {
-								fieldKey: k,
-								value: data[k],
-								fieldName: (function() {
-									for (let i = 0; i < self.listData.length; i++) {
-										if (self.listData[i].fieldKey == k) {
-											return self.listData[i].fieldName;
+				
+			if(this.remarkStatus) {
+				var arsty = {};
+				for (let k in data) {
+					for (let j in self.copyData) {
+						if (k === j) {
+							if (self.copyData[j].value === data[k]) {
+								arsty[k] = {
+									fieldKey: k,
+									value: data[k],
+									fieldName: (function() {
+										for (let i = 0; i < self.listData.length; i++) {
+											if (self.listData[i].fieldKey == k) {
+												return self.listData[i].fieldName;
+											}
 										}
-									}
-								})(),
-								status: 0
-							};
-						} else {
-							arsty[k] = {
-								fieldKey: k,
-								value: data[k],
-								fieldName: (function() {
-									for (let i = 0; i < self.listData.length; i++) {
-										if (self.listData[i].fieldKey == k) {
-											return self.listData[i].fieldName;
+									})(),
+									status: 0
+								};
+							} else {
+								arsty[k] = {
+									fieldKey: k,
+									value: data[k],
+									fieldName: (function() {
+										for (let i = 0; i < self.listData.length; i++) {
+											if (self.listData[i].fieldKey == k) {
+												return self.listData[i].fieldName;
+											}
 										}
-									}
-								})(),
-								status: 1
-							};
+									})(),
+									status: 1
+								};
+							}
 						}
 					}
 				}
+			} else {
+				var arsty = {};
+				for (let k in data) {
+					arsty[k] = {
+						fieldKey: k,
+						value: data[k],
+						fieldName: (function() {
+							for (let i = 0; i < self.listData.length; i++) {
+								if (self.listData[i].fieldKey == k) {
+									return self.listData[i].fieldName;
+								}
+							}
+						})(),
+						status: 0
+					};
+				}
 			}
 			
 			
+			console.log(arsty)
 			this.$api.baseProfileStampV2AddWord({ goodsId: this.goodsId,keyValue:JSON.stringify(arsty) }).then(res => {
 				uni.downloadFile({
 					url: this.$method.splitImgHost(res.data.msg),
@@ -1062,6 +1086,10 @@ export default {
 				}).catch(err => {});
 			}
 		},
+		clearWord() {
+			this.$set(this.form, 'commitment_seal', '');
+			this.titleName = '';
+		},
 		backPage() {
 			uni.navigateBack();
 		},
@@ -1480,6 +1508,7 @@ export default {
 		subCanvas() {
 			return new Promise((resolve, reject) => {
 				var self = this;
+				console.log(self.form,'self.form')
 				if (self.form.commitment_electr_signature) {
 					resolve();
 					return;
@@ -1522,6 +1551,13 @@ page {
 	color: #fff;
 	border-bottom-right-radius: 24rpx;
 }
+.quzw {
+	width: 638rpx;
+	height: 638rpx;
+	position: relative;
+	border: 2rpx solid #eee;
+	border-radius: 8rpx;
+}
 .handWriting {
 	width: 100%;
 	height: 100%;

pages2/wd/question_bank.vue

@@ -9,6 +9,14 @@
 				<image src="/static/questionBank.png" class="my_bg"></image>
 			</view>
 		</navigator>
+		<navigator  hover-class="none" url="/pages2/bank/free_question">
+			<view class="my_question">
+				<view class="flex">
+					<view class="text">赠送题卷<u-icon name="arrow-right"></u-icon></view>
+				</view>
+				<image src="/static/questionPresent.png" class="my_bg"></image>
+			</view>
+		</navigator>
 		<view class="bottom">
 			<navigator  hover-class="none" url="/pages2/subject/collect">
 				<view class="item collect">
@@ -98,6 +106,7 @@
 		height: 240rpx;
 		border-radius: 24rpx;
 		padding:0 40rpx;
+		margin-bottom:16rpx;
 		
 		
 		.my_bg {
@@ -123,7 +132,6 @@
 	}
 	
 	.bottom {
-		margin-top:16rpx;
 		display: flex;
 		justify-content: space-between;
 		.item {

pages3/course/detail.vue

@@ -36,7 +36,7 @@
 			</view>
 			<u-line color="#D6D6DB" />
 			<view style="height: 80rpx;">
-				<view><u-tabs :list="list" item-width="50%" font-size="30" bar-width="24"  :current="current" @change="change" active-color="#007AFF"></u-tabs></view>
+				<view><u-tabs :list="list" :item-width="itemWidth()" font-size="30" bar-width="24"  :current="current" @change="change" active-color="#007AFF"></u-tabs></view>
 			</view>
 			
 		</view>
@@ -70,6 +70,18 @@
 				</view>
 			</view>
 		</view>
+		<view style="padding: 20rpx;padding-bottom: 100rpx;position: relative;" v-show="current==2">
+			<view >
+				<view v-for="(item,index) in freeMenuList" :key="index" >
+					<view class="courseItemBox" >
+						<view class="courseItem">
+							<view class="courseName">{{item.freeExamName}}</view>
+						</view>
+					</view>
+					
+				</view>
+			</view>
+		</view>
 		<view class="bottomBox" v-if="!hideBuyState">
 			<view class="priceTag">¥ {{toFixed(detail.standPrice)}}</view>
 			<view style="display: flex;color: #FFFFFF;align-items: center;">
@@ -94,19 +106,13 @@ export default {
 	data() {
 		return {
 			id:0,
-			list: [
-				{
-					name: '详情'
-				},
-				{
-					name: '大纲'
-				}
-			],
+			list: [],
 			menuIndex:[],
 			current:0,
 			detail:{},
 			courseList:[],
 			menuList:[],
+			freeMenuList:[],
 			startStatus:false,
 			playbackRate: [1.0],
 			isAllowSeek:'no',
@@ -125,6 +131,7 @@ export default {
 		this.id = option.id;
 		this.getDetail()
 		this.goodsCourseList()
+		this.appCommonGoodsCourseModuleFreeExamList();
 	},
 	onUnload(option) {
 		this.$store.commit('setPlaySectionId', {playSectionId  :0});
@@ -169,6 +176,38 @@ export default {
 	},
 	methods: {
 		 ...mapMutations(['updateChapterOpen']),
+		 itemWidth() {
+			 return (100/this.list.length)+'%'
+		 },
+		appCommonGoodsCourseModuleFreeExamList() {
+		 this.$api.appCommonGoodsCourseModuleFreeExamList(this.id).then(res => {
+			 if(res.data.data.length) {
+				this.freeMenuList = res.data.data;
+				 this.list =  [
+						{
+							name: '详情'
+						},
+						{
+							name: '大纲'
+						},
+						{
+							name: '赠送'
+						}
+					]
+				 } else {
+					 this.list =  [
+							{
+								name: '详情'
+							},
+							{
+								name: '大纲'
+							}
+						]
+				 }
+				 
+				 console.log(this.list)
+		 })
+		},
 		courseBusiness(){
 			this.$api.courseBusiness(this.detail.businessId).then(res => {
 				this.businessData = res.data.data;