From 37b05361d8d7fbc822b7c9ffe924369743118fc6 Mon Sep 17 00:00:00 2001 From: litian <2804272236@qq.com> Date: 星期二, 10 九月 2024 14:52:57 +0800 Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/TextbookReader --- src/views/readerPages/webHome.vue | 99 ++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 76 insertions(+), 23 deletions(-) diff --git a/src/views/readerPages/webHome.vue b/src/views/readerPages/webHome.vue index 1b677de..0b14be8 100644 --- a/src/views/readerPages/webHome.vue +++ b/src/views/readerPages/webHome.vue @@ -950,19 +950,8 @@ <calculatorNew></calculatorNew> </el-dialog> </template> -<script setup lang="ts"> -import heart from '@/assets/images/examination/collectIcon.png' -import isHeart from '@/assets/images/examination/collectClickIcon.png' -import { ref, reactive, watch, onMounted, onBeforeMount, onBeforeUnmount, inject, defineComponent } from 'vue' -import { useRouter, useRoute } from 'vue-router' -import useClipboard from 'vue-clipboard3' -import examination from '../examination/index.vue' -import calculator from '../components/calculator.vue' -import calculatorNew from '../components/calculatorNew.vue' -const { toClipboard } = useClipboard() const MG: any = inject('MG') const toolClass = inject('toolClass') -const qiankunActions = inject('qiankunActions') //鑾峰彇璺敱鍣� let router = useRouter() //鑾峰彇褰撳墠璺敱鐨勪俊鎭� @@ -1081,9 +1070,15 @@ const bookConfig = ref({}) const activeCatalog = ref() const reMarResult = ref() +const bookInfo = ref() +const isBuy = ref(false) +const tryPageCount = ref(0) onMounted(() => { if (token) { getUserInfo() + } + if (localStorage.getItem('bookId')) { + getBookInfo() } setTimeout(() => { canvasWith.value = document.querySelector('.content-box').offsetWidth @@ -1114,12 +1109,14 @@ window.qiankunActions.onGlobalStateChange((state, prev) => { console.log('鐖跺眰state鍙樺寲', state) window.qiankunState = state - - if (window.qiankunState && window.qiankunState.initTestBook) { - window.qiankunState.initTestBook( - localStorage.getItem('bookId') + '', - localStorage.getItem('tryPageCount') - ) + if (isBuy.value) { + if (window.qiankunState && window.qiankunState.initTestBook) { + window.qiankunState.initTestBook(localStorage.getItem('bookId') + '') + } + } else { + if (window.qiankunState && window.qiankunState.initTestBook) { + window.qiankunState.initTestBook(localStorage.getItem('bookId') + '', tryPageCount.value) + } } }) @@ -1231,6 +1228,44 @@ // } // } // ) + +//鏍规嵁refcode鑾峰彇鍥句功淇℃伅 + +const getBookInfo = () => { + const obj = { + storeInfo: 'jsek_digitalTextbooks', + path: '*', + queryType: '*', + coverSize: { + width: 150 + }, + paging: { + start: 0, + size: 6 + }, + filterList: [ + { + value: 'Normal', + field: 'state' + } + ], + fields: { + author: [], + RefCodes: [localStorage.getItem('bookId')], + probationPage: [] + } + } + MG.store.getProductList(obj).then((res) => { + console.log(res.datas, '鍥句功淇℃伅') + bookInfo.value = res.datas[0] + if (res.datas[0].purchasedSaleMethodIdList.includes(res.datas[0].defaultSaleMethodId)) { + isBuy.value = true + } else { + isBuy.value = false + } + tryPageCount.value = Number(res.datas[0].probationPage) + }) +} const getUserInfo = () => { MG.identity.getCurrentAppUser().then((res) => { @@ -1399,7 +1434,8 @@ { icon: huabi, name: '鐢荤瑪', - isShow: bookConfig.value.textbookComponents.indexOf('800109C0') > -1 + // isShow: bookConfig.value.textbookComponents.indexOf('800109C0') > -1 + isShow:true }, { icon: baiban, @@ -1500,8 +1536,8 @@ const handleNodeClick = (data) => { console.log(data) - if (localStorage.getItem('tryPageCount')) { - if (data.start < localStorage.getItem('tryPageCount')) { + if (!isBuy.value) { + if (data.start < tryPageCount.value) { headerData.process = data.start if (window.qiankunState && window.qiankunState.gotoPage) window.qiankunState.gotoPage(data.chapter, data.start) @@ -1817,7 +1853,10 @@ } else { getResourceData() } +<<<<<<< HEAD +======= +>>>>>>> bcee5cd49c38973e2c6c316e1405f27ab1b74db7 } const searchBtn = () => { if (searchShow.value) { @@ -1940,8 +1979,13 @@ } // 鏀惰棌鎸夐挳 const handleCollectResource = (id, md5, resourcePath, resourceType, source, resourceName) => { +<<<<<<< HEAD + if (collectResourceList.value.findIndex((item) => item.id == id) > -1) { + collectResourceList.value = collectResourceList.value.filter((item) => item.id != id) +======= if (collectResourceList.value.findIndex(item => item.id == id) > -1) { collectResourceList.value = collectResourceList.value.filter(item => item.id != id) +>>>>>>> bcee5cd49c38973e2c6c316e1405f27ab1b74db7 } else { collectResourceList.value.push({ id, @@ -1955,9 +1999,12 @@ MG.identity.setUserKey({ setKeyRequests: [ { - domain: "collectResource", +<<<<<<< HEAD + domain: 'collectResource', key: bookConfig.value.bookId, - value: JSON.stringify(collectResourceList.value), + value: JSON.stringify(collectResourceList.value) + } + ] }, ], }) @@ -2056,7 +2103,6 @@ //閿欓鏈� const wrongQuestionVisble = ref(false) const selectExercisesType = (type) => { - if (type == 'exercises') { getExercisesList() exercisesType.value = type @@ -4325,7 +4371,11 @@ } .questionList { +<<<<<<< HEAD + height: 83%; +======= height: 83% +>>>>>>> bcee5cd49c38973e2c6c316e1405f27ab1b74db7 } .question-bottom { @@ -4336,7 +4386,10 @@ width: 300px; padding: 20px 0; background-color: #fff; +<<<<<<< HEAD +======= +>>>>>>> bcee5cd49c38973e2c6c316e1405f27ab1b74db7 li { cursor: pointer; width: 65px; -- Gitblit v1.9.1