Merge branch 'master' of http://114.55.169.15:3000/huxiaofeng666/jwl-applet into dev-hxf

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

src/pages/index/trueTest.vue

@@ -133,7 +133,7 @@
     onLoad(option) {
       this.subject = option.subject || 1
       if(option.questionIdList){
-				const idList=JSON.parse(op.questionIdList)
+				const idList=JSON.parse(option.questionIdList)
 			  let	arr = this[`orderQuestion_subject${this.subject}`].filter(qItem=>idList.includes(qItem.questionId))
 				this.list = arr.map(it => ({
 				  ...it,

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>