packageBookService/pages/bookServices/detail/index.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
packageBookService/pages/bookServices/examination/examination.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
packageBookService/pages/bookServices/examination/examination.wxml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
packageBookService/pages/bookServices/examination/examination.wxss | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
packageBookService/pages/bookServices/examination/questionOptions/index.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
packageBookService/pages/bookServices/examination/questionOptions/index.wxml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
packageDomain/pages/resourceDetails/myVideo/index.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
packagePersonal/pages/myOrder/index.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
packageBookService/pages/bookServices/detail/index.js
@@ -193,19 +193,16 @@ bookId: options.id + "", barHeight: systInfo.statusBarHeight, navBarHeight: navBarHeight, }); this.setData({ options: { id: options.id, name: options.name, name: decodeURI(options.name), storeInfo: options.storeInfo, }, }); wx.setNavigationBarTitle({ title: options.name, title: decodeURI(options.name), }) const token = wx.getStorageSync(app.config.tokenKey) let token = wx.getStorageSync(app.config.tokenKey) if (!token) { loginInfo(app, (data) => { if (data) {} else {} @@ -213,7 +210,7 @@ } this.getBookInfo(options.id); // this.getResourceClass(); // 获取资源所属分类 token = wx.getStorageSync(app.config.tokenKey) if (token) { this.getShoppingCartProductGet(); this.getApplyInfo(options.id); packageBookService/pages/bookServices/examination/examination.js
@@ -53,7 +53,8 @@ startTime: "", //进入页面当前时间 pauseTime: 0, //暂停时间 showDialog: false, // 未提交退出拦截弹窗 showId: '' showId: '', isShowDialog: false, // 测试报告弹窗是否显示 }, /** @@ -549,7 +550,8 @@ submitStatus: true, loading: true, }); const child = this.selectComponent("#question-options"); const child = this.selectComponent('#question-options'); if ( this.data.answerType == "option" || this.data.answerType == "errorQuestion" || @@ -565,7 +567,11 @@ if (this.data.answerType == "option") { this.toggleCountdown(); this.recordAnswerData(); child.openTestReportDialog(); // this.selectComponent 拿不到 组件了, 改为监听组件传值 打开弹窗 // child.openTestReportDialog(); this.setData({ isShowDialog: true }) } else if ( this.data.answerType == "collectQuestion" || this.data.answerType == "errorQuestion" @@ -608,7 +614,10 @@ }), }, ], }); child.openTestReportDialog(); // child.openTestReportDialog(); this.setData({ isShowDialog: true }) } this.setData({ loading: false, @@ -1112,7 +1121,7 @@ // 简答 翻译 questionList[index].isRight = null; } else if (item.questionType == "completion") { if (item.answer == "string") { if (typeof item.answer == "string") { item.isRight = item.answer == item.userAnswer[0]; } else { if (item.answer.length != item.userAnswer.length) { packageBookService/pages/bookServices/examination/examination.wxml
@@ -3,95 +3,73 @@ <import src="examination.skeleton.wxml" /> <template is="skeleton" wx:if="{{loading}}" /> <!--导航区域 --> <!-- <view style="width: 100%; height: {{barHeight}}px;background-color: {{isNight ? '#191919' : '#fff'}} " ></view> <view class="nacigationBar" style="width: 100%; height: {{navBarHeight}}px; background-color: {{isNight ? '#191919' : '#fff'}}" class="page" wx:if="{{!loading}}" style="background-color:{{isNight ? '#222' : ''}}" > <view> <t-icon name="chevron-left" size="30" data-name="{{item}}" bind:click="goBack" color="{{isNight ? '#fff' : '#000'}}" /> <view class="page-content" style="background-color:{{isNight ? '#222' : ''}}"> <question-schedule wx:if="{{!loading}}" id="countDownRef" isNight="{{isNight}}" answerType="{{answerType}}" countdownTime="{{countdownTime}}" currentIndex="{{currentIndex}}" questionList="{{questionDataList}}" submitStatus="{{submitStatus}}" subjectiveGrade="{{subjectiveGrade}}" subjectiveNum="{{subjectiveNum}}" ></question-schedule> <question-list wx:if="{{!loading}}" sliderValue="{{sliderValue}}" isNight="{{isNight}}" answerType="{{answerType}}" currentIndex="{{currentIndex}}" questionList="{{questionDataList}}" submitStatus="{{submitStatus}}" noData="{{noData}}" bind:onChangeRadio="onChangeRadio" bind:onChangeInput="onChangeInput" bind:changeSwiper="changeSwiper" bind:viewParsing="viewParsing" ></question-list> </view> <view class="navbar-title" style="color: {{isNight ? '#fff' : '#000'}};" >{{answerTitle}}</view <!-- 底部区域--> <view class="page-bottom" style="background-color:{{isNight ? '#202020' : ''}}" wx:if="{{answerType !== 'errorQuestion' || (answerType == 'errorQuestion' && !loading)}}" > </view> --> <view class="page-content" style="background-color:{{isNight ? '#222' : ''}}"> <question-schedule wx:if="{{!loading}}" id="countDownRef" isNight="{{isNight}}" answerType="{{answerType}}" countdownTime="{{countdownTime}}" currentIndex="{{currentIndex}}" questionList="{{questionDataList}}" submitStatus="{{submitStatus}}" subjectiveGrade="{{subjectiveGrade}}" subjectiveNum="{{subjectiveNum}}" ></question-schedule> <question-list wx:if="{{!loading}}" sliderValue="{{sliderValue}}" isNight="{{isNight}}" answerType="{{answerType}}" currentIndex="{{currentIndex}}" questionList="{{questionDataList}}" submitStatus="{{submitStatus}}" noData="{{noData}}" bind:onChangeRadio="onChangeRadio" bind:onChangeInput="onChangeInput" bind:changeSwiper="changeSwiper" bind:viewParsing="viewParsing" ></question-list> <!-- <view class="lodaing-box" wx:if="{{loading}}"> <t-loading theme="circular" size="80rpx" class="wrapper" loading="{{loading}}" /></view> --> </view> <!-- 底部区域--> <view class="page-bottom" style="background-color:{{isNight ? '#202020' : ''}}" wx:if="{{answerType !== 'errorQuestion' || (answerType == 'errorQuestion' && !loading)}}" > <question-options id="question-options" isNight="{{isNight}}" submitStatus="{{submitStatus}}" answerType="{{answerType}}" countdownTime="{{countdownTime}}" currentIndex="{{currentIndex}}" questionDataList="{{questionDataList}}" cardList="{{cardList}}" subjectiveTotal="{{subjectiveTotal}}" subjectiveNum="{{subjectiveNum}}" subjectiveGrade="{{subjectiveGrade}}" correctNum="{{correctNum}}" mockSumTime="{{mockData.sumTime}}" showId="{{showId}}" bind:setCollect="setCollect" bind:submitPaper="submitPaper" bind:restart="restart" bind:goQuestion="goQuestion" bind:changeBGColor="changeBGColor" bind:onChangeSlider="onChangeSlider" bind:changeLoadingState="changeLoadingState" bind:changeNavBarColor="changeNavBarColor" ></question-options> <question-options id="question-options" isShowDialog="{{isShowDialog}}" isNight="{{isNight}}" submitStatus="{{submitStatus}}" answerType="{{answerType}}" countdownTime="{{countdownTime}}" currentIndex="{{currentIndex}}" questionDataList="{{questionDataList}}" cardList="{{cardList}}" subjectiveTotal="{{subjectiveTotal}}" subjectiveNum="{{subjectiveNum}}" subjectiveGrade="{{subjectiveGrade}}" correctNum="{{correctNum}}" mockSumTime="{{mockData.sumTime}}" showId="{{showId}}" bind:setCollect="setCollect" bind:submitPaper="submitPaper" bind:restart="restart" bind:goQuestion="goQuestion" bind:changeBGColor="changeBGColor" bind:onChangeSlider="onChangeSlider" bind:changeLoadingState="changeLoadingState" bind:changeNavBarColor="changeNavBarColor" ></question-options> </view> </view> <page-container packageBookService/pages/bookServices/examination/examination.wxss
@@ -1,6 +1,15 @@ /* pages/examination/examination.wxss */ @import "./examination.skeleton.wxss"; page { padding: 0 !important; } .page { width: 100%; height: 100vh; } .nacigationBar { display: flex; align-items: center; packageBookService/pages/bookServices/examination/questionOptions/index.js
@@ -54,6 +54,9 @@ }, showId: { type: String }, isShowDialog: { type: Boolean } }, @@ -93,6 +96,12 @@ this.timeout(); } }, isShowDialog: function (newValue, oldValue) { if (newValue) this.setData({ testReportState: newValue, }); } }, created() {}, packageBookService/pages/bookServices/examination/questionOptions/index.wxml
@@ -172,7 +172,7 @@ style="margin: 0px" > <view class="card {{radioItem == 'daytime' ? 'card--active' : ''}}"> <t-radio value="daytime" icon="none" borderless> <t-radio value="daytime" icon="none" borderless style="height: 100%"> <view class="radio-content" slot="content"> <image src="{{ radioItem == 'daytime' ? '/static/images/bookService/examination/rijian-click.png' : '/static/images/bookService/examination/rijian.png'}}" @@ -184,7 +184,7 @@ </t-radio> </view> <view class="card {{radioItem == 'night' ? 'card--active' : ''}}"> <t-radio value="night" icon="none" borderless> <t-radio value="night" icon="none" borderless style="height: 100%"> <view class="radio-content" slot="content"> <image src="{{ radioItem == 'night' ? '/static/images/bookService/examination/yejian-click.png' : '/static/images/bookService/examination/yejian.png'}}" packageDomain/pages/resourceDetails/myVideo/index.js
@@ -32,7 +32,7 @@ selectedId: null, topicId: '', titleName: '', submitTitle: "", submitTitle: "1", inputStyle: 'border: 2rpx solid rgba(220,220,220,1);border-radius: 12rpx; padding:16rpx', textvalue: '', style: 'height: 248rpx', @@ -66,6 +66,7 @@ * 生命周期函数--监听页面加载 */ onLoad(options) { console.log('资源', options); wx.setNavigationBarTitle({ title: '资源详情-视频' }); @@ -83,7 +84,7 @@ parentProductLinkPath: options.parentProductLinkPath, productLinkPath: options.productLinkPath, formPath: options.formPath, flag: false flag: false, }) if (options.parentName !== "教学资源" && options.parentName !== "云学习") { this.setData({ @@ -263,13 +264,12 @@ if (this.data.productLinkPath == items.productLinkPath) { if (this.data.formPath === "jsek_cloudLearning") { let file items.protectedFile || item.file ? file = items.protectedFile || item.file : file = items.freeFile items.protectedFile || items.file ? file = items.protectedFile || items.file : file = items.freeFile this.setData({ showData: app.config.requestCtx + '/file/api/ApiDownloadForAuthorize?md5=' + file + '&token=' + wx.getStorageSync(app.config.tokenKey), titleName: items.name }) this.aliVod(file, this.data.showData) } else { this.setData({ showData: items.file ? app.config.requestCtx + '/file/api/ApiDownload?md5=' + items.file : app.config.requestCtx + '/file/api/ApiDownload?md5=' + items.freeFile, @@ -285,7 +285,7 @@ }); this.setData({ loading: false, hidden: false hidden: false, }) }) }, @@ -332,6 +332,7 @@ showDataVod: res, }) } this.setData({}) } else if (currentVideo) { this.setData({ showDataVod: currentVideo, packagePersonal/pages/myOrder/index.js
@@ -49,7 +49,6 @@ * 生命周期函数--监听页面加载 */ onLoad(options) { console.log(options); this.getDataList(false) }, @@ -155,6 +154,10 @@ loading: false }) } else { wx.showToast({ icon: 'error', title: '暂无数据', }) this.setData({ skeletonLoding: false, loading: false @@ -166,6 +169,7 @@ }) }, onSearchOrder(e) { console.log(e.detail.value); this.setData({ searchText: e.detail.value, })