Merge pull request 'dev-hxf' (#28) from dev-hxf into master

Reviewed-on: http://114.55.169.15:3000/huxiaofeng666/jwl-applet/pulls/28

src/pages/me/info.vue

@@ -15,7 +15,7 @@
 					<u-icon name="arrow-right" color="#999" />
 				</view>
       </view>
-			<view class="flex jc-sb ai-c bb1" style="height: 110rpx;">
+			<!-- <view class="flex jc-sb ai-c bb1" style="height: 110rpx;">
 			  <view class="title">身份证号</view>
 			  <view class="m30lr fs14 cor-333">{{sfzNum}}</view>
 			</view>
@@ -23,7 +23,7 @@
 			  <view class="title">证件照</view>
 				<view class="m30lr fs14 cor-333 fl1"></view>
 			  <u-icon name="arrow-right" color="#999" />
-			</view>
+			</view> -->
     </view>
   </view>
 </template>

src/pages/questionBank/components/Question.vue

@@ -41,7 +41,17 @@
 									v-if="quesItem.clickAnswer&&!quesItem.trueAnswer.includes(quesItem.clickAnswer) || showBestAnswer">
 									<view class="answer_box">
 										<text class="fs18 fw600 cor-000">答案:{{getRightOp(quesItem.trueAnswer)}}</text>
-										<view class="fs18 cor-000" style="text-indent:2em;"> {{quesItem.bestAnswer}}</view>
+										<view v-if="showSkillInfo==='show'&&quesItem.skillInfo" class="fs18 cor-000 mt5">答题技巧：{{quesItem.skillInfo}}</view>
+									</view>
+									<view class="flex ai-c jc-c mt10">
+										<view style="height: 6rpx;width: 120rpx;background-color: rgb(232, 232, 232);"></view>
+										<view class="fs18 fw600 cor-000 p15lr">试题详解</view>
+										<view style="height: 6rpx;width: 120rpx;background-color: rgb(232, 232, 232);"></view>
+									</view>
+									<view class="mt10">
+										<view class="fw600 cor-000 mb10 flex ai-c">
+											<view style="background: linear-gradient(90deg, #11DF20 0%, #00B74F 100%);height: 36rpx;width: 8rpx;" class="mr5"></view>题目解析</view>
+										<view style="text-indent:2em;">{{quesItem.bestAnswer}}</view>
 									</view>
 								</view>
 							</template>
@@ -82,7 +92,17 @@
 								<view class="m14lr mt30" v-if="isShowAnswer">
 									<view class="answer_box">
 										<text class="fs18 fw600 cor-000">答案:{{getRightOp(quesItem.trueAnswer)}}</text>
-										<view class="fs18 cor-000" style="text-indent:2em;"> {{quesItem.bestAnswer}}</view>
+										<view v-if="showSkillInfo==='show'&&quesItem.skillInfo" class="fs18 cor-000"> 答题技巧：{{quesItem.skillInfo}}</view>
+										</view>
+										<view class="flex ai-c jc-c mt10">
+											<view style="height: 6rpx;width: 120rpx;background-color: rgb(232, 232, 232);"></view>
+											<view class="fs18 fw600 cor-000 p15lr">试题详解</view>
+											<view style="height: 6rpx;width: 120rpx;background-color: rgb(232, 232, 232);"></view>
+										</view>
+										<view class="mt10">
+											<view class="fw600 cor-000 mb10 flex ai-c">
+												<view style="background: linear-gradient(90deg, #11DF20 0%, #00B74F 100%);height: 36rpx;width: 8rpx;" class="mr5"></view>题目解析</view>
+											<view style="text-indent:2em;">{{quesItem.bestAnswer}}</view>
 										</view>
 								</view>
 							</template>
@@ -272,6 +292,7 @@
 	import storage from '@/jtools/storage';
 	import useQuestionStore from '@/jtools/store/question' //引入store
 	import {
+		querySysConfig,
 		submitTest
 	} from '@/jtools/api/question';
 	export default {
@@ -298,6 +319,8 @@
 		},
 		data() {
 			return {
+				showSkillInfo:'hidden',
+				currentType:storage.get('carType') || '1001',
 				onoff:'0',
 				navTitle: '',
 				originArray: '',
@@ -323,7 +346,14 @@
 				time: 0,
 			}
 		},
-
+		created() {
+			const carType=storage.get('carType') || '1001'
+			querySysConfig(carType, 'NeedSkillInfo').then(resp=>{
+				if(resp.code === '0000'){
+					this.showSkillInfo = resp.data.configValue
+				}
+			})
+		},
 		computed: {
 			...mapState(useQuestionStore, ["currentIndex_subject1", "currentIndex_subject4"]), //映射函数，取出tagslist
 			isShowAnswer() {