sc

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

src/pages/login/login.vue

@@ -10,13 +10,13 @@
         <u-input class="sl-input" border="none" v-model="loginForm.phone" type="number" maxlength="11"
           placeholder="输入手机号" />
       </view>
-      <view class="list-call">
+      <!-- <view class="list-call">
         <u-input class="sl-input" v-model="loginForm.code" type="text" maxlength="6" border="none" placeholder="输入验证码">
           <template #suffix>
             <text class="fs14 mr10" style="color: #05C341;" @tap="getCode">{{ countDown == 0 ? '获取验证码' : countDown }}</text>
           </template>
         </u-input>
-      </view>
+      </view> -->
     </view>
 
     <view class="button-login" @tap="bindLogin()">
@@ -41,7 +41,7 @@ export default {
     return {
       loginForm: {
         phone: '',
-        code: ''
+        code: '000000'
       },
       countDown: 0,
       js: undefined

src/pages/me/myGift.vue

@@ -16,7 +16,7 @@
             <view v-if="item.status == 0" class="btn" @tap="handleHelp(item)">助力</view>
 			 <view v-else-if="item.status == 1" class="btn" @tap="handleWriteoff(item)">核销</view>
 			 <img v-else-if="item.status == 2" src="/static/image/mine/writeoff.png" style="width: 120rpx;height: 120rpx;" />
-			<view v-else class="btn" @tap="handleWriteoff(item)">核销</view>
+			 <img v-else src="/static/image/mine/outtime.png" style="width: 120rpx;height: 120rpx;" />
           </view>
         </view>
       </u-list-item>

src/pages/questionBank/examResult.vue

@@ -56,7 +56,7 @@
 	import GradesChart from "./components/GradesChart.vue"
 	import storage from '@/jtools/storage';
 	import {
-		testTotal
+		testTotal,getTestQuestionId
 	} from '@/jtools/api/question';
 	export default {
 		components: {
@@ -182,15 +182,28 @@
 				}else{
 					const list =JSON.stringify(this.wrongList)
 					uni.navigateTo({
-						url:"/pages/questionBank/questionBank?navTitle=错题&subject="+this.subject+"&questionList="+list
+						url:"/pages/questionBank/questionBank?navTitle=错题&subject="+this.subject+"&questionIdList="+list
 					})
 				}
 			},
 			//重新考试
 			toExams(){
+				getTestQuestionId({
+					versionId: this.version,
+					carTypeId: storage.get('carType') || '1001',
+					subject: this.subject,
+				}).then(async (resp) => {
+					if (resp.code === '0000') {
+						const arr = resp.data
+						const listJson = JSON.stringify(arr)
 						uni.navigateTo({
-					url:"/pages/questionBank/practiceExams?subject="+this.subject
+							url: "/pages/questionBank/practiceExams?title=模拟考试&subject=" + this.subject + "&questionIdList=" + listJson
 						})
+					}
+				})
+				// uni.navigateTo({
+				// 	url:"/pages/questionBank/practiceExams?subject="+this.subject
+				// })
 			},
 		},
 	}