packageBookService/pages/bookServices/detail/index.js
@@ -2590,7 +2590,6 @@ return childrenList }, uploadFile(e) { console.log(123) this.setData({ dialogBox: true, isShowUp: true @@ -2599,6 +2598,12 @@ closeDialog() { this.setData({ dialogBox: false, resourceInfo: { resourceName: '', fileType: '', description: '', agree: false }, }); }, onCloseProtocol() { @@ -2752,15 +2757,9 @@ }, handleRemove(e) { console.log(e) let md5 = e.currentTarget.dataset.md5 for (let i = 0; i < this.data.fileList.length; i++) { if (this.data.fileList.md5 == md5) { this.data.fileList.splice(i, 1) } } this.setData({ isShowUp: true, fileList: [] }); }, confirmM() { @@ -2803,9 +2802,7 @@ icon: "success", title: "请上传资源文件", }); this.setData({ dialogBox: false, }); this.closeDialog() }) } }) packageDomain/pages/publickBookForm/index.wxss
@@ -11,6 +11,8 @@ .content { height: calc(100vh - env(safe-area-inset-bottom)); box-sizing: border-box; flex-grow: 1; overflow-y: auto; } .tips { packagePersonal/pages/myOrder/index.js
@@ -183,15 +183,26 @@ } = e.currentTarget.dataset; let parentData = null; let bookId = book.orderSaleMethod.product.id; const type = book.orderSaleMethod.product.cmsTypeRefCode let url = '' if (type == 'jsek_mediaBook') { // 图书、云学习 parentData = await app.MG.store.getProductBySaleMethod({ 'saleMethodId': book.orderSaleMethod.id }) if (parentData.parentProduct.length > 0) { bookId = parentData.parentProduct[parentData.parentProduct.length - 1].id; } url = `/packageBookService/pages/bookServices/detail/index?id=${bookId}&name=${book.name}` } else if (type == 'jsek_digitalCourses') { // 课程 url = '/pages/digitalCourses/digitalCoursesDetails/index?id=' + book.orderSaleMethod.product.id + '&path=' + '' } else if (type == 'jsek_digitalTextbooks') { // 数字教材 url = '/pages/digitalTextbooks/digitalTextbooksDetails/index?id=' + book.orderSaleMethod.product.id } wx.navigateTo({ url: `/packageBookService/pages/bookServices/detail/index?id=${bookId}&name=${book.name}`, url }); }, @@ -333,7 +344,25 @@ /** * 用户点击右上角分享 */ onShareAppMessage() { onShareAppMessage() {}, // 处理订单类型显示 handleOrderType(book) { console.log(book); const type = book.orderSaleMethod.product.cmsTypeRefCode let title = '' if (type == 'jsek_mediaBook') { if (book.orderSaleMethod.type == 'defaultSaleMethod') { title = '图书服务-电子书' } else if (book.orderSaleMethod.type == 'createProductSaleMethod' && book.orderSaleMethod.cmsItemList == 0) { title = '图书服务-组卷' } else { title = '图书服务-云学习' } } else if (type == 'jsek_digitalCourses') { title = '数字教材' } else { title = '数字课程' } return title } }) packagePersonal/pages/myOrder/index.wxml
@@ -34,9 +34,10 @@ <view class="cmsName" wx:if="{{itemes.orderSaleMethod.type != 'defaultSaleMethod'}}">{{itemes.orderSaleMethod.cmsItemList[0].name}}</view> <view class="{{items.saleMethodLinks.length == 1 ? 'top' : ''}}"> <text class="typeBox">{{ itemes.orderSaleMethod.product.cmsTypeRefCode == 'jsek_mediaBook' ? itemes.orderSaleMethod.type == 'defaultSaleMethod' ? '图书服务-电子书' : itemes.orderSaleMethod.type == 'createProductSaleMethod' && itemes.orderSaleMethod.cmsItemList == 0 ? '图书服务-组卷' : '图书服务-云学习' : itemes.orderSaleMethod.type == 'createProductSaleMethod' && itemes.orderSaleMethod.cmsItemList == 0 ? '图书服务-组卷' : '图书服务-云学习' : itemes.orderSaleMethod.product.cmsTypeRefCode == 'jsek_digitalCourses' ? '数字课程' : '数字教材' }}</text> </view> </view> pages/bibliographyList/index.js
@@ -183,7 +183,7 @@ queryType: '*', paging: { start: '0', size: this.data.start * 9 size: this.data.start * 12 }, coverSize: { width: 260 @@ -231,7 +231,7 @@ queryType: '*', paging: { start: '0', size: this.data.start * 9 size: this.data.start * 12 }, coverSize: { width: 260 @@ -275,7 +275,7 @@ queryType: '*', paging: { start: '0', size: this.data.start * 9 size: this.data.start * 12 }, coverSize: { width: 260 pages/bibliographyList/index.wxml
@@ -1,7 +1,7 @@ <import src="index.skeleton.wxml" /> <template is="skeleton" wx:if="{{loading}}" /> <view wx:if="{{!loading}}"> <view wx:if="{{!loading}}" class="page" > <view wx:if="{{downloadLoadin}}" class="loadinBox"> <t-loading class="colors" theme="circular" size="70rpx" class="wrapper" /> </view> pages/bibliographyList/index.wxss
@@ -1,5 +1,10 @@ @import "./index.skeleton.wxss"; .page { width: 100%; height: 100%; } .back-icon { width: 48rpx; height: 100%; @@ -250,12 +255,12 @@ } .page-content { height: calc(100vh - 176rpx); height: calc(100vh - 168rpx -env(safe-area-inset-bottom)); background-color: #fff; } .scroll-box { height: calc(100vh - 220rpx - env(safe-area-inset-bottom)); height: calc(100vh - 264rpx - env(safe-area-inset-bottom)); padding-bottom: env(safe-area-inset-bottom); }
@@ -119,6 +119,24 @@ item.type = type; // 将type设置为item对象的属性，而不是使用setData item.name = item.linkCmsItems[0].name ? item.productMonWithLinkDto.product.name + ':' + item.linkCmsItems[0].name : item.productMonWithLinkDto.product.name item.saleMethod.price = this.numFormat(item.saleMethod.price) // if (item.productMonWithLinkDto.links[0].storeRefCode == 'jsek_digitalTextbooks') { item.typeTxt = '数字教材' item.productType = "数字教材" } else if (item.productMonWithLinkDto.links[0].storeRefCode == 'jsek_digitalCourses') { item.typeTxt = '数字课程' item.productType = "数字课程" } else { item.typeTxt = '电子书' item.productType = "图书服务-电子书" if (item.saleMethod.type == 'createProductItemSaleMethod') { item.typeTxt = '云学习' item.productType = "图书服务-云学习" } } // }); this.setData({ @@ -307,6 +325,15 @@ async onBook(e) { const item = e.currentTarget.dataset.item console.log(item); const type = item.productMonWithLinkDto.links[0].storeRefCode let url = '' if (type == 'jsek_digitalCourses') { // 课程 url = '/pages/digitalCourses/digitalCoursesDetails/index?id=' + item.productMonWithLinkDto.product.id + '&path=' + '' } else if (type == 'jsek_digitalTextbooks') { // 数字教材 url = '/pages/digitalTextbooks/digitalTextbooksDetails/index?id=' + item.productMonWithLinkDto.product.id } else { let parentData = null; parentData = await app.MG.store.getProductBySaleMethod({ 'saleMethodId': item.saleMethod.id @@ -316,8 +343,10 @@ if (parentData.parentProduct.length > 0) { bookId = parentData.parentProduct[parentData.parentProduct.length - 1].id; } url = '/packageBookService/pages/bookServices/detail/index?id=' + bookId + '&name=' + item.productMonWithLinkDto.product.name } wx.navigateTo({ url: '/packageBookService/pages/bookServices/detail/index?id=' + bookId + '&name=' + item.productMonWithLinkDto.product.name url }) } }); pages/cart/index.wxml
@@ -4,11 +4,7 @@ <!-- loading hidden --> <view hidden="{{hidden}}"> <scroll-view scroll-y="{{true}}" class="outsideContentBox" bindscrolltolower="onScrollToLower" > <scroll-view scroll-y="{{true}}" class="outsideContentBox" bindscrolltolower="onScrollToLower"> <view> <!-- <checkbox-group bindchange="HandelItemChange"> --> <view wx:if="{{shoppingCartData.length <= 0}}" class="noDataBox"> @@ -16,37 +12,27 @@ <empty /> </view> <!-- <button bind:tap="onLogin"> 去登录</button> --> <t-swipe-cell wx:for="{{shoppingCartData}}" wx:key="index" wx:for-item="item" wx:for-index="index" opened="{{swipeOpened}}" > <t-swipe-cell wx:for="{{shoppingCartData}}" wx:key="index" wx:for-item="item" wx:for-index="index" opened="{{swipeOpened}}"> <view class="itemWarp"> <t-cell bordered="{{false}}"> <view slot="title" class="titleBox"> <view wx:if="{{item.type == 'product'}}" style="width: 386rpx"> <view style="width: 386rpx"> <view class="boosName"> <text class="eBook">电子书</text> <text class="eBook">{{item.typeTxt}}</text> <text> {{item.name}}</text> </view> </view> <view wx:if="{{item.type == 'item'}}" style="width: 386rpx"> <!-- <view wx:if="{{item.type == 'item'}}" style="width: 386rpx"> <view class="boosName"> <text class="cloudLearning">云学习</text> <text> {{item.name}}</text> </view> </view> </view> --> </view> <view slot="description" class="descriptionBox"> <view> <view class="textBox" wx:if="{{item.type == 'product'}}" >图书服务-电子书</view > <view class="textBox" wx:if="{{item.type == 'item'}}" >图书服务-云学习</view > <view class="textBox" wx:if="{{item.type == 'product'}}">图书服务-电子书</view> <view class="textBox" wx:if="{{item.type == 'item'}}">图书服务-云学习</view> </view> <view wx:if="{{item.saleMethod.price != 0}}" class="price-box"> ￥{{item.saleMethod.price }} @@ -55,46 +41,19 @@ </view> <view slot="left-icon" class="left-icon"> <view class="contentCheckbox"> <t-checkbox icon="rectangle" value=" {{item.id}}" data-item="{{item}}" checked="{{item.checked}}" bindchange="HandelItemChange" /> <t-checkbox icon="rectangle" value=" {{item.id}}" data-item="{{item}}" checked="{{item.checked}}" bindchange="HandelItemChange" /> </view> <view class="left-image" data-item="{{item}}" bind:tap="onBook"> <image wx:if="{{item.imgUrl}}" src="{{item.imgUrl}}" class="imageStyle" mode="aspectFit" /> <image wx:else src="/static/images/default-book-img.png" class="imageStyle" mode="aspectFit" /> <image wx:if="{{item.imgUrl}}" src="{{item.imgUrl}}" class="imageStyle" mode="aspectFit" /> <image wx:else src="/static/images/default-book-img.png" class="imageStyle" mode="aspectFit" /> </view> </view> </t-cell> </view> <view slot="right" class="btn delete-btn" bind:tap="onDelete" data-item="{{item}}" >删除</view > <view slot="right" class="btn delete-btn" bind:tap="onDelete" data-item="{{item}}">删除</view> </t-swipe-cell> <view wx:if="{{shoppingCartData.length > 0}}" class="bottom-box"> <t-loading theme="circular" size="40rpx" class="wrapper" wx:if="{{isMore == true}}" /> <t-loading theme="circular" size="40rpx" class="wrapper" wx:if="{{isMore == true}}" /> <text wx:if="{{isMore == false}}">没有更多了</text> </view> </view> @@ -104,22 +63,13 @@ <view class="bottomBox"> <view class="checkGroupBox"> <checkbox-group bindchange="bottomChange"> <checkbox disabled="{{onDisabled}}" value="全选" checked="{{checkAll}}" >全选</checkbox > <checkbox disabled="{{onDisabled}}" value="全选" checked="{{checkAll}}">全选</checkbox> </checkbox-group> </view> <view class="settlementBox"> <view class="totalPrice" >总价:<text class="totalPriceText">￥{{totalPrice}}</text></view > <view class="totalPrice">总价:<text class="totalPriceText">￥{{totalPrice}}</text></view> <view class="buttonBox"> <t-button class="tButtonBox" size="small" shape="round" bind:tap="goPaymentPage" > <t-button class="tButtonBox" size="small" shape="round" bind:tap="goPaymentPage"> <view>去结算({{selectedCount}})</view> </t-button> </view> pages/cart/paymentPage/index.js
@@ -161,11 +161,29 @@ payPrice: res.payPrice.toFixed(2), ImmediatelyReceive: res.payPrice }) console.log(1, res.saleMethodLinks); res.saleMethodLinks.forEach(item => { const type = item.orderSaleMethod.type == 'createProductItemSaleMethod' ? 'item' : 'product'; item.type = type; // 将type设置为item对象的属性，而不是使用setData item.paymentIcon = getPublicImage(item.orderSaleMethod.product.icon) item.payPrice = this.numFormat(item.payPrice) item.orderSaleMethod.price = this.numFormat(item.orderSaleMethod.price) // if (item.orderSaleMethod.product.cmsTypeRefCode == 'jsek_digitalTextbooks') { item.typeTxt = '数字教材' item.productType = "数字教材" } else if (item.orderSaleMethod.product.cmsTypeRefCode == 'jsek_digitalCourses') { item.typeTxt = '数字课程' item.productType = "数字课程" } else { item.typeTxt = '电子书' item.productType = "图书服务-电子书" if (item.orderSaleMethod.type == 'createProductItemSaleMethod') { item.typeTxt = '云学习' item.productType = "图书服务-云学习" } } }) this.setData({ productList: res.saleMethodLinks, pages/cart/paymentPage/index.wxml
@@ -23,18 +23,18 @@ </view> <view class="cartListContent"> <view class="cartListDetails"> <view wx:if="{{item.type == 'product'}}" style="width: 386rpx"> <view style="width: 500rpx"> <view class="boosName"> <text class="eBook">电子书</text> <text class="eBook">{{item.typeTxt}}</text> <text> {{item.orderSaleMethod.product.name}}</text> </view> </view> <view wx:if="{{item.type == 'item'}}" style="width: 386rpx"> <!-- <view wx:if="{{item.type == 'item'}}" style="width: 386rpx"> <view class="boosName"> <text class="cloudLearning">云学习</text> <text> {{item.orderSaleMethod.product.name}}</text> </view> </view> </view> --> </view> <view class="textBox" wx:if="{{item.type == 'product'}}">图书服务-电子书</view> <view class="textBox" wx:if="{{item.type == 'item'}}">图书服务-云学习</view> pages/digitalCourses/digitalCoursesDetails/components/question/question.js
@@ -154,7 +154,7 @@ }; var data = { topicIdOrRefCode: "onlineQuestioning", name: "意见反馈", name: this.properties.bookInfo.name, content: JSON.stringify(submitData), type: "ProductComment", cmsTypeRefCode: "", pages/digitalCourses/digitalCoursesDetails/index.js
@@ -1013,22 +1013,22 @@ onCertificate() { // if (!this.data.isBuy) { // wx.showToast({ // title: "请先购买，体验完整服务", // icon: "none", // duration: 1000, // }); // return false // } // if (!this.data.isLearn) { // wx.showToast({ // title: "您的学习任务还未完成，暂不能申请证书，加油哦！", // icon: "none", // duration: 1000, // }); // return false // } if (!this.data.isBuy) { wx.showToast({ title: "请先购买，体验完整服务", icon: "none", duration: 1000, }); return false } if (!this.data.isLearn) { wx.showToast({ title: "您的学习任务还未完成，暂不能申请证书，加油哦！", icon: "none", duration: 1000, }); return false } if (this.data.isCertificate && this.data.isCertificate.state == 'WaitAudit') { wx.showToast({ title: "您申请的证书正在审核中", pages/digitalCourses/digitalCoursesDetails/index.wxml
@@ -283,7 +283,7 @@ 收藏 </view> </view> <view class="bottom-btn" bind:tap="onCertificate"> <view class="bottom-btn" bind:tap="onCertificate" wx:if="{{!isCertificate.state || isCertificate.state == 'Reject'}}"> <view class="applicationImageBox"> <image src="/static/images/digitalCourses/zhengshushenqing@2x.png" /> </view> pages/digitalCourses/index.wxml
@@ -36,7 +36,7 @@ <view class="ExternalInformationBox"> <view class="informationBox" wx:for="{{courseList}}" wx:key="index" wx:for-item="item" data-item="{{item}}"> <view class="book-img" bind:tap="courseDetail" data-item="{{item}}"> <image src="{{item.icon}}" mode="aspectFit" /> <image src="{{item.icon ? item.icon : '/static/images/digitalCourses/courseIcon.png'}}" mode="aspectFit" /> </view> <view class="book-Info"> <view class="book-name" bind:tap="courseDetail" data-item="{{item}}"> pages/digitalTextbooks/index.wxml
@@ -6,46 +6,20 @@ <view class="nacigationBar" style="width: 70%; height: {{navBarHeight}}px;"> <view class="back-icon"> <!-- <t-icon name="chevron-left" size="30" data-name="{{item}}" bind:click="goBack" /> --> <image src="/static/images/digitalTextbooks/chevron-left.png" bind:tap="goBack" mode="aspectFit" /> <image src="/static/images/digitalTextbooks/chevron-left.png" bind:tap="goBack" mode="aspectFit" /> </view> <t-search model:value="{{searchValue}}" shape="round" placeholder="请输入教材名称/ISBN/作者" class="navBar-search" style="width: 464rpx" bind:submit="searchBook" /> <t-search model:value="{{searchValue}}" shape="round" placeholder="请输入教材名称/ISBN/作者" class="navBar-search" style="width: 464rpx" bind:submit="searchBook" /> </view> <view class="heardTab"> <view class="tabBox"> <t-tabs defaultValue="{{0}}" bind:change="selectTab" t-class="custom-tabs" > <t-tab-panel wx:for="{{tabList}}" wx:key="index" wx:for-item="item" label="{{item.name}}" value="{{index}}" style="{{tabPanelstyle}}" > <t-tabs defaultValue="{{0}}" bind:change="selectTab" t-class="custom-tabs"> <t-tab-panel wx:for="{{tabList}}" wx:key="index" wx:for-item="item" label="{{item.name}}" value="{{index}}" style="{{tabPanelstyle}}"> </t-tab-panel> </t-tabs> </view> <view class="dropdown"> <t-dropdown-menu> <t-dropdown-item options="{{sorter.options}}" default-value="{{sorter.value}}" bindchange="onSort" /> <t-dropdown-item options="{{sorter.options}}" default-value="{{sorter.value}}" bindchange="onSort" /> </t-dropdown-menu> </view> </view> @@ -57,35 +31,15 @@ <view>数字教材列表</view> </view> </view> <scroll-view scroll-y="{{true}}" class="outsideContentBox" bindscrolltolower="onScrollToLower" > <scroll-view scroll-y="{{true}}" class="outsideContentBox" bindscrolltolower="onScrollToLower"> <view class="bookContentBox"> <view class="external" wx:for="{{digitalTextbooksData}}" wx:key="index" wx:for-item="item" wx:for-index="index" data-item="{{item}}" bind:tap="jumpDetails" > <view class="external" wx:for="{{digitalTextbooksData}}" wx:key="index" wx:for-item="item" wx:for-index="index" data-item="{{item}}" bind:tap="jumpDetails"> <view class="amountClick"> <t-icon name="browse" size="15" data-name="{{item}}" bind:click="goBack" /> <t-icon name="browse" size="15" data-name="{{item}}" bind:click="goBack" /> <view style="margin-left: 5rpx">{{item.viewCount}}</view> </view> <view class="imageBox"> <image src="{{item.icon ? item.icon : '/static/images/default-book-img.png'}}" mode="" /> <image src="{{item.icon ? item.icon : '/static/images/digitalTextbooks/textBookIcon.png'}}" mode="" /> </view> <view class="bookName">{{item.name}}</view> <view class="information"> pages/home/home.js
@@ -643,11 +643,15 @@ if (this.data.scoll) { if (e.detail.scrollTop < 20) { this.data.scoll = false // 避免频繁调用 setData if (this.data.isWhite) this.isChange(false); } } else { if (e.detail.scrollTop > 20) { this.data.scoll = true // 避免频繁调用 setData if (!this.data.isWhite) this.isChange(true); } } static/images/digitalCourses/courseIcon.png
